dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

label and do more work at player controller

Browse Source
This commit is contained in:
DizzyEggg
2017-10-22 01:04:02 +02:00
parent 3d1c16523e
commit 813b1bfd4a
36 changed files with 1411 additions and 4157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_1.s
+13 -13
View File
@@ -1888,7 +1888,7 @@ sub_8035C4C: @ 8035C4C
bne _08035C68 bne _08035C68
ldr r0, =gText_Draw ldr r0, =gText_Draw
movs r1, 0x15 movs r1, 0x15
bl sub_814F9EC bl BattleHandleAddTextPrinter
b _08035D68 b _08035D68
.pool .pool
_08035C68: _08035C68:
@@ -1964,10 +1964,10 @@ _08035CE2:
_08035CFC: _08035CFC:
ldr r0, =gText_Win ldr r0, =gText_Win
movs r1, 0x17 movs r1, 0x17
bl sub_814F9EC bl BattleHandleAddTextPrinter
ldr r0, =gText_Loss ldr r0, =gText_Loss
movs r1, 0x16 movs r1, 0x16
bl sub_814F9EC bl BattleHandleAddTextPrinter
b _08035D68 b _08035D68
.pool .pool
_08035D20: _08035D20:
@@ -1985,19 +1985,19 @@ _08035D20:
_08035D36: _08035D36:
ldr r0, =gText_Win ldr r0, =gText_Win
movs r1, 0x16 movs r1, 0x16
bl sub_814F9EC bl BattleHandleAddTextPrinter
ldr r0, =gText_Loss ldr r0, =gText_Loss
movs r1, 0x17 movs r1, 0x17
bl sub_814F9EC bl BattleHandleAddTextPrinter
b _08035D68 b _08035D68
.pool .pool
_08035D58: _08035D58:
ldr r0, =gText_Win ldr r0, =gText_Win
movs r1, 0x17 movs r1, 0x17
bl sub_814F9EC bl BattleHandleAddTextPrinter
ldr r0, =gText_Loss ldr r0, =gText_Loss
movs r1, 0x16 movs r1, 0x16
bl sub_814F9EC bl BattleHandleAddTextPrinter
_08035D68: _08035D68:
pop {r0} pop {r0}
bx r0 bx r0
@@ -2068,14 +2068,14 @@ _08035DDC:
_08035DE6: _08035DE6:
adds r0, r1, 0 adds r0, r1, 0
movs r1, 0x11 movs r1, 0x11
bl sub_814F9EC bl BattleHandleAddTextPrinter
ldrb r1, [r4, 0x18] ldrb r1, [r4, 0x18]
movs r0, 0x4 movs r0, 0x4
b _08035E14 b _08035E14
_08035DF4: _08035DF4:
adds r0, r1, 0 adds r0, r1, 0
movs r1, 0x12 movs r1, 0x12
bl sub_814F9EC bl BattleHandleAddTextPrinter
ldrb r1, [r4, 0x18] ldrb r1, [r4, 0x18]
movs r0, 0x4 movs r0, 0x4
str r0, [sp] str r0, [sp]
@@ -2085,7 +2085,7 @@ _08035DF4:
_08035E08: _08035E08:
adds r0, r1, 0 adds r0, r1, 0
movs r1, 0x13 movs r1, 0x13
bl sub_814F9EC bl BattleHandleAddTextPrinter
ldrb r1, [r4, 0x18] ldrb r1, [r4, 0x18]
movs r0, 0x8 movs r0, 0x8
_08035E14: _08035E14:
@@ -2099,7 +2099,7 @@ _08035E1A:
_08035E22: _08035E22:
adds r0, r1, 0 adds r0, r1, 0
movs r1, 0x14 movs r1, 0x14
bl sub_814F9EC bl BattleHandleAddTextPrinter
ldrb r1, [r4, 0x18] ldrb r1, [r4, 0x18]
movs r0, 0x8 movs r0, 0x8
str r0, [sp] str r0, [sp]
@@ -2139,14 +2139,14 @@ _08035E66:
adds r1, r0, r4 adds r1, r0, r4
adds r0, r1, 0 adds r0, r1, 0
movs r1, 0xF movs r1, 0xF
bl sub_814F9EC bl BattleHandleAddTextPrinter
lsls r0, r6, 3 lsls r0, r6, 3
subs r0, r6 subs r0, r6
lsls r0, 2 lsls r0, 2
adds r1, r0, r4 adds r1, r0, r4
adds r0, r1, 0 adds r0, r1, 0
movs r1, 0x10 movs r1, 0x10
bl sub_814F9EC bl BattleHandleAddTextPrinter
movs r4, 0x7 movs r4, 0x7
str r4, [sp] str r4, [sp]
adds r0, r7, 0 adds r0, r7, 0
asm/battle_7.s
+22 -22
View File
@@ -1258,11 +1258,11 @@ _0805DB76:
.pool .pool
thumb_func_end task0A_08034248 thumb_func_end task0A_08034248
thumb_func_start sub_805DB8C thumb_func_start IsMoveWithoutAnimation
sub_805DB8C: @ 805DB8C IsMoveWithoutAnimation: @ 805DB8C
movs r0, 0 movs r0, 0
bx lr bx lr
thumb_func_end sub_805DB8C thumb_func_end IsMoveWithoutAnimation
thumb_func_start mplay_80342A4 thumb_func_start mplay_80342A4
mplay_80342A4: @ 805DB90 mplay_80342A4: @ 805DB90
@@ -1357,7 +1357,7 @@ BattleLoadOpponentMonSpriteGfx: @ 805DC0C
.pool .pool
_0805DC50: _0805DC50:
ldrh r5, [r2, 0x2] ldrh r5, [r2, 0x2]
ldr r0, =gUnknown_020244BC ldr r0, =gTransformedPersonalities
adds r0, r1, r0 adds r0, r1, r0
ldr r6, [r0] ldr r6, [r0]
_0805DC58: _0805DC58:
@@ -1510,7 +1510,7 @@ BattleLoadPlayerMonSpriteGfx: @ 805DD7C
.pool .pool
_0805DDC0: _0805DDC0:
ldrh r5, [r2, 0x2] ldrh r5, [r2, 0x2]
ldr r0, =gUnknown_020244BC ldr r0, =gTransformedPersonalities
adds r0, r1, r0 adds r0, r1, r0
ldr r4, [r0] ldr r4, [r0]
_0805DDC8: _0805DDC8:
@@ -1670,8 +1670,8 @@ nullsub_24: @ 805DF34
bx lr bx lr
thumb_func_end nullsub_24 thumb_func_end nullsub_24
thumb_func_start sub_805DF38 thumb_func_start DecompressTrainerFrontPic
sub_805DF38: @ 805DF38 DecompressTrainerFrontPic: @ 805DF38
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
adds r0, r1, 0 adds r0, r1, 0
@@ -1701,10 +1701,10 @@ sub_805DF38: @ 805DF38
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_805DF38 thumb_func_end DecompressTrainerFrontPic
thumb_func_start LoadBackTrainerBankSpriteGfx thumb_func_start DecompressTrainerBackPic
LoadBackTrainerBankSpriteGfx: @ 805DF84 DecompressTrainerBackPic: @ 805DF84
push {r4,r5,lr} push {r4,r5,lr}
adds r5, r0, 0 adds r5, r0, 0
adds r4, r1, 0 adds r4, r1, 0
@@ -1742,15 +1742,15 @@ LoadBackTrainerBankSpriteGfx: @ 805DF84
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end LoadBackTrainerBankSpriteGfx thumb_func_end DecompressTrainerBackPic
thumb_func_start nullsub_25 thumb_func_start nullsub_25
nullsub_25: @ 805DFE0 nullsub_25: @ 805DFE0
bx lr bx lr
thumb_func_end nullsub_25 thumb_func_end nullsub_25
thumb_func_start sub_805DFE4 thumb_func_start FreeTrainerFrontPicPalette
sub_805DFE4: @ 805DFE4 FreeTrainerFrontPicPalette: @ 805DFE4
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
ldr r1, =gTrainerFrontPicPaletteTable ldr r1, =gTrainerFrontPicPaletteTable
@@ -1761,7 +1761,7 @@ sub_805DFE4: @ 805DFE4
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_805DFE4 thumb_func_end FreeTrainerFrontPicPalette
thumb_func_start sub_805DFFC thumb_func_start sub_805DFFC
sub_805DFFC: @ 805DFFC sub_805DFFC: @ 805DFFC
@@ -2441,7 +2441,7 @@ _0805E59C:
adds r1, 0x4 adds r1, 0x4
adds r1, r2 adds r1, r2
ldr r1, [r1] ldr r1, [r1]
ldr r3, =gUnknown_020244BC ldr r3, =gTransformedPersonalities
lsls r2, r7, 2 lsls r2, r7, 2
adds r2, r3 adds r2, r3
ldr r3, [r2] ldr r3, [r2]
@@ -2479,7 +2479,7 @@ _0805E618:
adds r1, 0x4 adds r1, 0x4
adds r1, r2 adds r1, r2
ldr r1, [r1] ldr r1, [r1]
ldr r3, =gUnknown_020244BC ldr r3, =gTransformedPersonalities
lsls r2, r7, 2 lsls r2, r7, 2
adds r2, r3 adds r2, r3
ldr r3, [r2] ldr r3, [r2]
@@ -2795,8 +2795,8 @@ _0805E93E:
bx r0 bx r0
thumb_func_end refresh_graphics_maybe thumb_func_end refresh_graphics_maybe
thumb_func_start sub_805E94C thumb_func_start TrySetBehindSubstituteSpriteBit
sub_805E94C: @ 805E94C TrySetBehindSubstituteSpriteBit: @ 805E94C
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
@@ -2817,7 +2817,7 @@ _0805E96C:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_805E94C thumb_func_end TrySetBehindSubstituteSpriteBit
thumb_func_start sub_805E974 thumb_func_start sub_805E974
sub_805E974: @ 805E974 sub_805E974: @ 805E974
@@ -3572,8 +3572,8 @@ _0805EF6A:
.pool .pool
thumb_func_end sub_805EF14 thumb_func_end sub_805EF14
thumb_func_start sub_805EF84 thumb_func_start ClearTemporarySpeciesSpriteData
sub_805EF84: @ 805EF84 ClearTemporarySpeciesSpriteData: @ 805EF84
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -3598,7 +3598,7 @@ _0805EFAC:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_805EF84 thumb_func_end ClearTemporarySpeciesSpriteData
thumb_func_start AllocateMonSpritesGfx thumb_func_start AllocateMonSpritesGfx
AllocateMonSpritesGfx: @ 805EFBC AllocateMonSpritesGfx: @ 805EFBC
asm/battle_controller_linkopponent.s
+10 -10
View File
@@ -113,7 +113,7 @@ sub_8064470: @ 8064470
bne _080644C2 bne _080644C2
adds r0, r2, r5 adds r0, r2, r5
ldrh r0, [r0, 0x6] ldrh r0, [r0, 0x6]
bl sub_805DFE4 bl FreeTrainerFrontPicPalette
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r6 adds r0, r6
ldrb r1, [r0] ldrb r1, [r0]
@@ -3718,7 +3718,7 @@ sub_8066494: @ 8066494
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
adds r0, r6, 0 adds r0, r6, 0
bl sub_805EF84 bl ClearTemporarySpeciesSpriteData
ldr r0, =gBattlePartyID ldr r0, =gBattlePartyID
lsls r4, r6, 1 lsls r4, r6, 1
adds r4, r0 adds r4, r0
@@ -4248,7 +4248,7 @@ _0806693A:
lsls r1, 2 lsls r1, 2
adds r1, r6 adds r1, r6
ldrb r0, [r1, 0x13] ldrb r0, [r1, 0x13]
bl sub_806F000 bl PlayerGenderToFrontTrainerPicId
_08066948: _08066948:
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
@@ -4256,7 +4256,7 @@ _0806694C:
mov r8, r0 mov r8, r0
ldr r5, =gActiveBank ldr r5, =gActiveBank
ldrb r1, [r5] ldrb r1, [r5]
bl sub_805DF38 bl DecompressTrainerFrontPic
ldrb r0, [r5] ldrb r0, [r5]
bl GetBankIdentity bl GetBankIdentity
adds r1, r0, 0 adds r1, r0, 0
@@ -4385,7 +4385,7 @@ _08066A76:
mov r8, r0 mov r8, r0
ldr r6, =gActiveBank ldr r6, =gActiveBank
ldrb r1, [r6] ldrb r1, [r6]
bl sub_805DF38 bl DecompressTrainerFrontPic
ldrb r0, [r6] ldrb r0, [r6]
bl GetBankIdentity bl GetBankIdentity
adds r1, r0, 0 adds r1, r0, 0
@@ -4781,7 +4781,7 @@ _08066D32:
adds r0, 0x10 adds r0, 0x10
adds r1, r0 adds r1, r0
str r1, [r7] str r1, [r7]
ldr r2, =gUnknown_020244BC ldr r2, =gTransformedPersonalities
ldrb r0, [r5] ldrb r0, [r5]
lsls r0, 2 lsls r0, 2
adds r0, r2 adds r0, r2
@@ -4790,7 +4790,7 @@ _08066D32:
mov r0, r8 mov r0, r8
ldrb r1, [r0] ldrb r1, [r0]
adds r0, r6, 0 adds r0, r6, 0
bl sub_805DB8C bl IsMoveWithoutAnimation
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
cmp r3, 0 cmp r3, 0
@@ -4991,7 +4991,7 @@ _08066FA8:
ldrb r2, [r2] ldrb r2, [r2]
lsls r2, 8 lsls r2, 8
orrs r1, r2 orrs r1, r2
bl sub_805E94C bl TrySetBehindSubstituteSpriteBit
ldr r0, [r7] ldr r0, [r7]
ldrb r1, [r6] ldrb r1, [r6]
ldr r2, [r0, 0x4] ldr r2, [r0, 0x4]
@@ -5028,7 +5028,7 @@ LinkOpponentHandlePrintString: @ 8066FF4
bl BufferStringBattle bl BufferStringBattle
ldr r0, =gDisplayedStringBattle ldr r0, =gDisplayedStringBattle
movs r1, 0 movs r1, 0
bl sub_814F9EC bl BattleHandleAddTextPrinter
ldr r1, =gBattleBankFunc ldr r1, =gBattleBankFunc
ldrb r0, [r5] ldrb r0, [r5]
lsls r0, 2 lsls r0, 2
@@ -5845,7 +5845,7 @@ sub_80676FC: @ 80676FC
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
ldrh r0, [r4, 0x6] ldrh r0, [r4, 0x6]
bl sub_805DFE4 bl FreeTrainerFrontPicPalette
adds r0, r4, 0 adds r0, r4, 0
bl FreeSpriteOamMatrix bl FreeSpriteOamMatrix
adds r0, r4, 0 adds r0, r4, 0
asm/battle_controller_linkpartner.s
+7 -7
View File
@@ -3265,7 +3265,7 @@ sub_814CC28: @ 814CC28
adds r6, r4, 0x2 adds r6, r4, 0x2
adds r1, r6 adds r1, r6
ldrb r1, [r1] ldrb r1, [r1]
bl sub_805EF84 bl ClearTemporarySpeciesSpriteData
ldr r2, =gBattlePartyID ldr r2, =gBattlePartyID
ldrb r0, [r5] ldrb r0, [r5]
lsls r1, r0, 1 lsls r1, r0, 1
@@ -3314,7 +3314,7 @@ sub_814CC98: @ 814CC98
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
adds r0, r6, 0 adds r0, r6, 0
bl sub_805EF84 bl ClearTemporarySpeciesSpriteData
ldr r0, =gBattlePartyID ldr r0, =gBattlePartyID
lsls r2, r6, 1 lsls r2, r6, 1
adds r2, r0 adds r2, r0
@@ -3696,7 +3696,7 @@ _0814D002:
ldr r5, =gActiveBank ldr r5, =gActiveBank
ldrb r1, [r5] ldrb r1, [r5]
adds r0, r4, 0 adds r0, r4, 0
bl LoadBackTrainerBankSpriteGfx bl DecompressTrainerBackPic
ldrb r0, [r5] ldrb r0, [r5]
bl GetBankIdentity bl GetBankIdentity
adds r1, r0, 0 adds r1, r0, 0
@@ -4107,7 +4107,7 @@ _0814D2CE:
adds r0, 0x10 adds r0, 0x10
adds r1, r0 adds r1, r0
str r1, [r7] str r1, [r7]
ldr r2, =gUnknown_020244BC ldr r2, =gTransformedPersonalities
ldrb r0, [r5] ldrb r0, [r5]
lsls r0, 2 lsls r0, 2
adds r0, r2 adds r0, r2
@@ -4116,7 +4116,7 @@ _0814D2CE:
mov r0, r8 mov r0, r8
ldrb r1, [r0] ldrb r1, [r0]
adds r0, r6, 0 adds r0, r6, 0
bl sub_805DB8C bl IsMoveWithoutAnimation
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
cmp r3, 0 cmp r3, 0
@@ -4317,7 +4317,7 @@ _0814D544:
ldrb r2, [r2] ldrb r2, [r2]
lsls r2, 8 lsls r2, 8
orrs r1, r2 orrs r1, r2
bl sub_805E94C bl TrySetBehindSubstituteSpriteBit
ldr r0, [r7] ldr r0, [r7]
ldrb r1, [r6] ldrb r1, [r6]
ldr r2, [r0, 0x4] ldr r2, [r0, 0x4]
@@ -4354,7 +4354,7 @@ sub_814D590: @ 814D590
bl BufferStringBattle bl BufferStringBattle
ldr r0, =gDisplayedStringBattle ldr r0, =gDisplayedStringBattle
movs r1, 0 movs r1, 0
bl sub_814F9EC bl BattleHandleAddTextPrinter
ldr r1, =gBattleBankFunc ldr r1, =gBattleBankFunc
ldrb r0, [r5] ldrb r0, [r5]
lsls r0, 2 lsls r0, 2
asm/battle_controller_opponent.s
+14 -14
View File
@@ -112,7 +112,7 @@ sub_805F240: @ 805F240
bne _0805F292 bne _0805F292
adds r0, r2, r5 adds r0, r2, r5
ldrh r0, [r0, 0x6] ldrh r0, [r0, 0x6]
bl sub_805DFE4 bl FreeTrainerFrontPicPalette
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r6 adds r0, r6
ldrb r1, [r0] ldrb r1, [r0]
@@ -3879,7 +3879,7 @@ sub_80613DC: @ 80613DC
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
adds r0, r6, 0 adds r0, r6, 0
bl sub_805EF84 bl ClearTemporarySpeciesSpriteData
ldr r0, =gBattlePartyID ldr r0, =gBattlePartyID
lsls r4, r6, 1 lsls r4, r6, 1
adds r4, r0 adds r4, r0
@@ -4311,7 +4311,7 @@ _080617CA:
ldr r5, =gActiveBank ldr r5, =gActiveBank
ldrb r1, [r5] ldrb r1, [r5]
mov r0, r8 mov r0, r8
bl sub_805DF38 bl DecompressTrainerFrontPic
ldrb r0, [r5] ldrb r0, [r5]
bl GetBankIdentity bl GetBankIdentity
adds r1, r0, 0 adds r1, r0, 0
@@ -4537,7 +4537,7 @@ _080619DE:
mov r8, r0 mov r8, r0
ldr r6, =gActiveBank ldr r6, =gActiveBank
ldrb r1, [r6] ldrb r1, [r6]
bl sub_805DF38 bl DecompressTrainerFrontPic
ldrb r0, [r6] ldrb r0, [r6]
bl GetBankIdentity bl GetBankIdentity
adds r1, r0, 0 adds r1, r0, 0
@@ -4928,14 +4928,14 @@ _08061C8A:
adds r1, 0x10 adds r1, 0x10
adds r2, r1 adds r2, r1
str r2, [r3] str r2, [r3]
ldr r3, =gUnknown_020244BC ldr r3, =gTransformedPersonalities
ldrb r1, [r6] ldrb r1, [r6]
lsls r1, 2 lsls r1, 2
adds r1, r3 adds r1, r3
ldr r2, [r2] ldr r2, [r2]
str r2, [r1] str r2, [r1]
ldrb r1, [r5] ldrb r1, [r5]
bl sub_805DB8C bl IsMoveWithoutAnimation
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
cmp r3, 0 cmp r3, 0
@@ -5130,7 +5130,7 @@ _08061EE8:
ldrb r2, [r2] ldrb r2, [r2]
lsls r2, 8 lsls r2, 8
orrs r1, r2 orrs r1, r2
bl sub_805E94C bl TrySetBehindSubstituteSpriteBit
ldr r0, [r7] ldr r0, [r7]
ldrb r1, [r6] ldrb r1, [r6]
ldr r2, [r0, 0x4] ldr r2, [r0, 0x4]
@@ -5167,7 +5167,7 @@ OpponentHandlePrintString: @ 8061F34
bl BufferStringBattle bl BufferStringBattle
ldr r0, =gDisplayedStringBattle ldr r0, =gDisplayedStringBattle
movs r1, 0 movs r1, 0
bl sub_814F9EC bl BattleHandleAddTextPrinter
ldr r1, =gBattleBankFunc ldr r1, =gBattleBankFunc
ldrb r0, [r5] ldrb r0, [r5]
lsls r0, 2 lsls r0, 2
@@ -5225,7 +5225,7 @@ OpponentHandleChooseMove: @ 8061FB8
movs r0, 0x1 movs r0, 0x1
movs r1, 0xA movs r1, 0xA
_08061FD6: _08061FD6:
bl EmitCmd33 bl EmitChoiceReturnValue
_08061FDA: _08061FDA:
bl OpponentBufferExecCompleted bl OpponentBufferExecCompleted
b _08062156 b _08062156
@@ -5329,7 +5329,7 @@ _0806209C:
movs r0, 0x1 movs r0, 0x1
movs r1, 0xA movs r1, 0xA
adds r2, r4, 0 adds r2, r4, 0
bl EmitCmd33 bl EmitChoiceReturnValue
b _08061FDA b _08061FDA
.pool .pool
_080620C4: _080620C4:
@@ -5360,7 +5360,7 @@ _080620C6:
movs r0, 0x1 movs r0, 0x1
movs r1, 0xA movs r1, 0xA
adds r2, r4, 0 adds r2, r4, 0
bl EmitCmd33 bl EmitChoiceReturnValue
b _08062152 b _08062152
.pool .pool
_08062108: _08062108:
@@ -5383,7 +5383,7 @@ _08062108:
orrs r2, r4 orrs r2, r4
movs r0, 0x1 movs r0, 0x1
movs r1, 0xA movs r1, 0xA
bl EmitCmd33 bl EmitChoiceReturnValue
b _08062152 b _08062152
.pool .pool
_0806213C: _0806213C:
@@ -5395,7 +5395,7 @@ _0806213C:
orrs r2, r4 orrs r2, r4
movs r0, 0x1 movs r0, 0x1
movs r1, 0xA movs r1, 0xA
bl EmitCmd33 bl EmitChoiceReturnValue
_08062152: _08062152:
bl OpponentBufferExecCompleted bl OpponentBufferExecCompleted
_08062156: _08062156:
@@ -6196,7 +6196,7 @@ sub_806280C: @ 806280C
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
ldrh r0, [r4, 0x6] ldrh r0, [r4, 0x6]
bl sub_805DFE4 bl FreeTrainerFrontPicPalette
adds r0, r4, 0 adds r0, r4, 0
bl FreeSpriteOamMatrix bl FreeSpriteOamMatrix
adds r0, r4, 0 adds r0, r4, 0
asm/battle_controller_player.s
+2 -3882
View File
File diff suppressed because it is too large Load Diff
asm/battle_controller_player_partner.s
+11 -11
View File
@@ -645,7 +645,7 @@ _081BB2E2:
lsrs r2, 16 lsrs r2, 16
movs r0, 0x1 movs r0, 0x1
movs r1, 0xB movs r1, 0xB
bl EmitCmd33 bl EmitChoiceReturnValue
strb r5, [r4] strb r5, [r4]
bl IsDoubleBattle bl IsDoubleBattle
lsls r0, 24 lsls r0, 24
@@ -918,7 +918,7 @@ _081BB514:
lsrs r2, 16 lsrs r2, 16
movs r0, 0x1 movs r0, 0x1
movs r1, 0xB movs r1, 0xB
bl EmitCmd33 bl EmitChoiceReturnValue
strb r5, [r4] strb r5, [r4]
ldr r0, =sub_81BB628 ldr r0, =sub_81BB628
str r0, [r6] str r0, [r6]
@@ -3840,7 +3840,7 @@ sub_81BD074: @ 81BD074
adds r6, r4, 0x2 adds r6, r4, 0x2
adds r1, r6 adds r1, r6
ldrb r1, [r1] ldrb r1, [r1]
bl sub_805EF84 bl ClearTemporarySpeciesSpriteData
ldr r2, =gBattlePartyID ldr r2, =gBattlePartyID
ldrb r0, [r5] ldrb r0, [r5]
lsls r1, r0, 1 lsls r1, r0, 1
@@ -3889,7 +3889,7 @@ sub_81BD0E4: @ 81BD0E4
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
adds r0, r6, 0 adds r0, r6, 0
bl sub_805EF84 bl ClearTemporarySpeciesSpriteData
ldr r0, =gBattlePartyID ldr r0, =gBattlePartyID
lsls r2, r6, 1 lsls r2, r6, 1
adds r2, r0 adds r2, r0
@@ -4213,7 +4213,7 @@ _081BD3BE:
ldr r5, =gActiveBank ldr r5, =gActiveBank
ldrb r1, [r5] ldrb r1, [r5]
adds r0, r4, 0 adds r0, r4, 0
bl LoadBackTrainerBankSpriteGfx bl DecompressTrainerBackPic
ldrb r0, [r5] ldrb r0, [r5]
bl GetBankIdentity bl GetBankIdentity
adds r1, r0, 0 adds r1, r0, 0
@@ -4287,7 +4287,7 @@ _081BD494:
ldr r6, =gActiveBank ldr r6, =gActiveBank
ldrb r1, [r6] ldrb r1, [r6]
adds r0, r5, 0 adds r0, r5, 0
bl sub_805DF38 bl DecompressTrainerFrontPic
ldrb r0, [r6] ldrb r0, [r6]
bl GetBankIdentity bl GetBankIdentity
adds r1, r0, 0 adds r1, r0, 0
@@ -4727,14 +4727,14 @@ _081BD7A2:
adds r1, 0x10 adds r1, 0x10
adds r2, r1 adds r2, r1
str r2, [r3] str r2, [r3]
ldr r3, =gUnknown_020244BC ldr r3, =gTransformedPersonalities
ldrb r1, [r6] ldrb r1, [r6]
lsls r1, 2 lsls r1, 2
adds r1, r3 adds r1, r3
ldr r2, [r2] ldr r2, [r2]
str r2, [r1] str r2, [r1]
ldrb r1, [r5] ldrb r1, [r5]
bl sub_805DB8C bl IsMoveWithoutAnimation
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
cmp r3, 0 cmp r3, 0
@@ -4929,7 +4929,7 @@ _081BDA00:
ldrb r2, [r2] ldrb r2, [r2]
lsls r2, 8 lsls r2, 8
orrs r1, r2 orrs r1, r2
bl sub_805E94C bl TrySetBehindSubstituteSpriteBit
ldr r0, [r7] ldr r0, [r7]
ldrb r1, [r6] ldrb r1, [r6]
ldr r2, [r0, 0x4] ldr r2, [r0, 0x4]
@@ -4966,7 +4966,7 @@ sub_81BDA4C: @ 81BDA4C
bl BufferStringBattle bl BufferStringBattle
ldr r0, =gDisplayedStringBattle ldr r0, =gDisplayedStringBattle
movs r1, 0 movs r1, 0
bl sub_814F9EC bl BattleHandleAddTextPrinter
ldr r1, =gBattleBankFunc ldr r1, =gBattleBankFunc
ldrb r0, [r4] ldrb r0, [r4]
lsls r0, 2 lsls r0, 2
@@ -5068,7 +5068,7 @@ _081BDB3C:
orrs r2, r5 orrs r2, r5
movs r0, 0x1 movs r0, 0x1
movs r1, 0xA movs r1, 0xA
bl EmitCmd33 bl EmitChoiceReturnValue
bl PlayerPartnerBufferExecCompleted bl PlayerPartnerBufferExecCompleted
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
asm/battle_controller_recorded_opponent.s
+12 -12
View File
@@ -129,7 +129,7 @@ sub_81865C8: @ 81865C8
bne _0818661A bne _0818661A
adds r0, r2, r5 adds r0, r2, r5
ldrh r0, [r0, 0x6] ldrh r0, [r0, 0x6]
bl sub_805DFE4 bl FreeTrainerFrontPicPalette
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r6 adds r0, r6
ldrb r1, [r0] ldrb r1, [r0]
@@ -3716,7 +3716,7 @@ sub_81885D8: @ 81885D8
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
adds r0, r6, 0 adds r0, r6, 0
bl sub_805EF84 bl ClearTemporarySpeciesSpriteData
ldr r0, =gBattlePartyID ldr r0, =gBattlePartyID
lsls r4, r6, 1 lsls r4, r6, 1
adds r4, r0 adds r4, r0
@@ -4078,7 +4078,7 @@ _08188910:
adds r0, r2 adds r0, r2
ldrb r0, [r0, 0x13] ldrb r0, [r0, 0x13]
_08188924: _08188924:
bl sub_806F000 bl PlayerGenderToFrontTrainerPicId
_08188928: _08188928:
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
@@ -4086,7 +4086,7 @@ _0818892C:
mov r8, r0 mov r8, r0
ldr r5, =gActiveBank ldr r5, =gActiveBank
ldrb r1, [r5] ldrb r1, [r5]
bl sub_805DF38 bl DecompressTrainerFrontPic
ldrb r0, [r5] ldrb r0, [r5]
bl GetBankIdentity bl GetBankIdentity
adds r1, r0, 0 adds r1, r0, 0
@@ -4483,14 +4483,14 @@ _08188BE6:
adds r1, 0x10 adds r1, 0x10
adds r2, r1 adds r2, r1
str r2, [r3] str r2, [r3]
ldr r3, =gUnknown_020244BC ldr r3, =gTransformedPersonalities
ldrb r1, [r6] ldrb r1, [r6]
lsls r1, 2 lsls r1, 2
adds r1, r3 adds r1, r3
ldr r2, [r2] ldr r2, [r2]
str r2, [r1] str r2, [r1]
ldrb r1, [r5] ldrb r1, [r5]
bl sub_805DB8C bl IsMoveWithoutAnimation
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
cmp r3, 0 cmp r3, 0
@@ -4685,7 +4685,7 @@ _08188E44:
ldrb r2, [r2] ldrb r2, [r2]
lsls r2, 8 lsls r2, 8
orrs r1, r2 orrs r1, r2
bl sub_805E94C bl TrySetBehindSubstituteSpriteBit
ldr r0, [r7] ldr r0, [r7]
ldrb r1, [r6] ldrb r1, [r6]
ldr r2, [r0, 0x4] ldr r2, [r0, 0x4]
@@ -4722,7 +4722,7 @@ sub_8188E90: @ 8188E90
bl BufferStringBattle bl BufferStringBattle
ldr r0, =gDisplayedStringBattle ldr r0, =gDisplayedStringBattle
movs r1, 0 movs r1, 0
bl sub_814F9EC bl BattleHandleAddTextPrinter
ldr r1, =gBattleBankFunc ldr r1, =gBattleBankFunc
ldrb r0, [r4] ldrb r0, [r4]
lsls r0, 2 lsls r0, 2
@@ -4754,7 +4754,7 @@ sub_8188EF0: @ 8188EF0
lsrs r1, 24 lsrs r1, 24
movs r0, 0x1 movs r0, 0x1
movs r2, 0 movs r2, 0
bl EmitCmd33 bl EmitChoiceReturnValue
bl RecordedOpponentBufferExecCompleted bl RecordedOpponentBufferExecCompleted
pop {r0} pop {r0}
bx r0 bx r0
@@ -4785,7 +4785,7 @@ sub_8188F20: @ 8188F20
lsrs r2, 16 lsrs r2, 16
movs r0, 0x1 movs r0, 0x1
movs r1, 0xA movs r1, 0xA
bl EmitCmd33 bl EmitChoiceReturnValue
b _08188F6C b _08188F6C
.pool .pool
_08188F48: _08188F48:
@@ -4803,7 +4803,7 @@ _08188F48:
orrs r2, r4 orrs r2, r4
movs r0, 0x1 movs r0, 0x1
movs r1, 0xA movs r1, 0xA
bl EmitCmd33 bl EmitChoiceReturnValue
_08188F6C: _08188F6C:
bl RecordedOpponentBufferExecCompleted bl RecordedOpponentBufferExecCompleted
pop {r4,r5} pop {r4,r5}
@@ -5601,7 +5601,7 @@ sub_818962C: @ 818962C
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
ldrh r0, [r4, 0x6] ldrh r0, [r4, 0x6]
bl sub_805DFE4 bl FreeTrainerFrontPicPalette
adds r0, r4, 0 adds r0, r4, 0
bl FreeSpriteOamMatrix bl FreeSpriteOamMatrix
adds r0, r4, 0 adds r0, r4, 0
asm/battle_controller_recorded_player.s
+13 -13
View File
@@ -3641,7 +3641,7 @@ sub_818B9FC: @ 818B9FC
adds r6, r4, 0x2 adds r6, r4, 0x2
adds r1, r6 adds r1, r6
ldrb r1, [r1] ldrb r1, [r1]
bl sub_805EF84 bl ClearTemporarySpeciesSpriteData
ldr r2, =gBattlePartyID ldr r2, =gBattlePartyID
ldrb r0, [r5] ldrb r0, [r5]
lsls r1, r0, 1 lsls r1, r0, 1
@@ -3690,7 +3690,7 @@ sub_818BA6C: @ 818BA6C
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
adds r0, r6, 0 adds r0, r6, 0
bl sub_805EF84 bl ClearTemporarySpeciesSpriteData
ldr r0, =gBattlePartyID ldr r0, =gBattlePartyID
lsls r2, r6, 1 lsls r2, r6, 1
adds r2, r0 adds r2, r0
@@ -4063,14 +4063,14 @@ _0818BDC0:
ldr r0, =gSaveBlock2Ptr ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x8] ldrb r0, [r0, 0x8]
bl sub_806F000 bl PlayerGenderToFrontTrainerPicId
lsls r0, 16 lsls r0, 16
lsrs r4, r0, 16 lsrs r4, r0, 16
adds r5, r4, 0 adds r5, r4, 0
ldr r6, =gActiveBank ldr r6, =gActiveBank
ldrb r1, [r6] ldrb r1, [r6]
adds r0, r5, 0 adds r0, r5, 0
bl sub_805DF38 bl DecompressTrainerFrontPic
ldrb r0, [r6] ldrb r0, [r6]
bl GetBankIdentity bl GetBankIdentity
adds r1, r0, 0 adds r1, r0, 0
@@ -4182,7 +4182,7 @@ _0818BEDC:
ldr r5, =gActiveBank ldr r5, =gActiveBank
ldrb r1, [r5] ldrb r1, [r5]
adds r0, r4, 0 adds r0, r4, 0
bl LoadBackTrainerBankSpriteGfx bl DecompressTrainerBackPic
ldrb r0, [r5] ldrb r0, [r5]
bl GetBankIdentity bl GetBankIdentity
adds r1, r0, 0 adds r1, r0, 0
@@ -4583,14 +4583,14 @@ _0818C192:
adds r1, 0x10 adds r1, 0x10
adds r2, r1 adds r2, r1
str r2, [r3] str r2, [r3]
ldr r3, =gUnknown_020244BC ldr r3, =gTransformedPersonalities
ldrb r1, [r6] ldrb r1, [r6]
lsls r1, 2 lsls r1, 2
adds r1, r3 adds r1, r3
ldr r2, [r2] ldr r2, [r2]
str r2, [r1] str r2, [r1]
ldrb r1, [r5] ldrb r1, [r5]
bl sub_805DB8C bl IsMoveWithoutAnimation
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
cmp r3, 0 cmp r3, 0
@@ -4785,7 +4785,7 @@ _0818C3F0:
ldrb r2, [r2] ldrb r2, [r2]
lsls r2, 8 lsls r2, 8
orrs r1, r2 orrs r1, r2
bl sub_805E94C bl TrySetBehindSubstituteSpriteBit
ldr r0, [r7] ldr r0, [r7]
ldrb r1, [r6] ldrb r1, [r6]
ldr r2, [r0, 0x4] ldr r2, [r0, 0x4]
@@ -4822,7 +4822,7 @@ sub_818C43C: @ 818C43C
bl BufferStringBattle bl BufferStringBattle
ldr r0, =gDisplayedStringBattle ldr r0, =gDisplayedStringBattle
movs r1, 0 movs r1, 0
bl sub_814F9EC bl BattleHandleAddTextPrinter
ldr r1, =gBattleBankFunc ldr r1, =gBattleBankFunc
ldrb r0, [r4] ldrb r0, [r4]
lsls r0, 2 lsls r0, 2
@@ -4861,7 +4861,7 @@ sub_818C49C: @ 818C49C
lsrs r1, 24 lsrs r1, 24
movs r0, 0x1 movs r0, 0x1
movs r2, 0 movs r2, 0
bl EmitCmd33 bl EmitChoiceReturnValue
bl RecordedPlayerBufferExecCompleted bl RecordedPlayerBufferExecCompleted
_0818C4C6: _0818C4C6:
pop {r0} pop {r0}
@@ -4897,7 +4897,7 @@ _0818C508:
lsrs r1, 24 lsrs r1, 24
movs r0, 0x1 movs r0, 0x1
movs r2, 0 movs r2, 0
bl EmitCmd33 bl EmitChoiceReturnValue
bl RecordedPlayerBufferExecCompleted bl RecordedPlayerBufferExecCompleted
_0818C522: _0818C522:
pop {r0} pop {r0}
@@ -4929,7 +4929,7 @@ sub_818C538: @ 818C538
lsrs r2, 16 lsrs r2, 16
movs r0, 0x1 movs r0, 0x1
movs r1, 0xA movs r1, 0xA
bl EmitCmd33 bl EmitChoiceReturnValue
b _0818C584 b _0818C584
.pool .pool
_0818C560: _0818C560:
@@ -4947,7 +4947,7 @@ _0818C560:
orrs r2, r4 orrs r2, r4
movs r0, 0x1 movs r0, 0x1
movs r1, 0xA movs r1, 0xA
bl EmitCmd33 bl EmitChoiceReturnValue
_0818C584: _0818C584:
bl RecordedPlayerBufferExecCompleted bl RecordedPlayerBufferExecCompleted
pop {r4,r5} pop {r4,r5}
asm/battle_controller_safari.s
+6 -6
View File
@@ -103,13 +103,13 @@ _0815942A:
movs r1, 0x7 movs r1, 0x7
_0815942E: _0815942E:
movs r2, 0 movs r2, 0
bl EmitCmd33 bl EmitChoiceReturnValue
b _08159440 b _08159440
_08159436: _08159436:
movs r0, 0x1 movs r0, 0x1
movs r1, 0x8 movs r1, 0x8
movs r2, 0 movs r2, 0
bl EmitCmd33 bl EmitChoiceReturnValue
_08159440: _08159440:
bl SafariBufferExecCompleted bl SafariBufferExecCompleted
b _0815954E b _0815954E
@@ -569,7 +569,7 @@ sub_8159800: @ 8159800
ldrb r0, [r0, 0x8] ldrb r0, [r0, 0x8]
ldr r5, =gActiveBank ldr r5, =gActiveBank
ldrb r1, [r5] ldrb r1, [r5]
bl LoadBackTrainerBankSpriteGfx bl DecompressTrainerBackPic
ldr r0, [r4] ldr r0, [r4]
ldrb r6, [r0, 0x8] ldrb r6, [r0, 0x8]
ldrb r0, [r5] ldrb r0, [r5]
@@ -792,7 +792,7 @@ dp01t_10_6_message: @ 81599DC
bl BufferStringBattle bl BufferStringBattle
ldr r0, =gDisplayedStringBattle ldr r0, =gDisplayedStringBattle
movs r1, 0 movs r1, 0
bl sub_814F9EC bl BattleHandleAddTextPrinter
ldr r1, =gBattleBankFunc ldr r1, =gBattleBankFunc
ldrb r0, [r4] ldrb r0, [r4]
lsls r0, 2 lsls r0, 2
@@ -862,7 +862,7 @@ sub_8159A94: @ 8159A94
str r1, [r0] str r1, [r0]
ldr r0, =gText_SafariZoneMenu ldr r0, =gText_SafariZoneMenu
movs r1, 0x2 movs r1, 0x2
bl sub_814F9EC bl BattleHandleAddTextPrinter
movs r4, 0 movs r4, 0
_08159AAE: _08159AAE:
lsls r0, r4, 24 lsls r0, r4, 24
@@ -882,7 +882,7 @@ _08159AAE:
bl BattleStringExpandPlaceholdersToDisplayedString bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle ldr r0, =gDisplayedStringBattle
movs r1, 0x1 movs r1, 0x1
bl sub_814F9EC bl BattleHandleAddTextPrinter
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
asm/battle_controller_wally.s
+11 -11
View File
@@ -121,7 +121,7 @@ _081684CE:
movs r1, 0x9 movs r1, 0x9
_081684E4: _081684E4:
movs r2, 0 movs r2, 0
bl EmitCmd33 bl EmitChoiceReturnValue
bl WallyBufferExecCompleted bl WallyBufferExecCompleted
ldr r1, [r4] ldr r1, [r4]
adds r1, 0x94 adds r1, 0x94
@@ -176,7 +176,7 @@ _08168540:
movs r0, 0x1 movs r0, 0x1
movs r1, 0x1 movs r1, 0x1
movs r2, 0 movs r2, 0
bl EmitCmd33 bl EmitChoiceReturnValue
bl WallyBufferExecCompleted bl WallyBufferExecCompleted
_08168564: _08168564:
pop {r4,r5} pop {r4,r5}
@@ -2998,7 +2998,7 @@ WallyHandleDrawTrainerPic: @ 8169EC8
ldr r4, =gActiveBank ldr r4, =gActiveBank
ldrb r1, [r4] ldrb r1, [r4]
movs r0, 0x6 movs r0, 0x6
bl LoadBackTrainerBankSpriteGfx bl DecompressTrainerBackPic
ldrb r0, [r4] ldrb r0, [r4]
bl GetBankIdentity bl GetBankIdentity
adds r1, r0, 0 adds r1, r0, 0
@@ -3083,7 +3083,7 @@ WallyHandleTrainerSlide: @ 8169F94
ldr r4, =gActiveBank ldr r4, =gActiveBank
ldrb r1, [r4] ldrb r1, [r4]
movs r0, 0x6 movs r0, 0x6
bl LoadBackTrainerBankSpriteGfx bl DecompressTrainerBackPic
ldrb r0, [r4] ldrb r0, [r4]
bl GetBankIdentity bl GetBankIdentity
adds r1, r0, 0 adds r1, r0, 0
@@ -3359,14 +3359,14 @@ WallyHandleMoveAnimation: @ 816A144
adds r1, 0x10 adds r1, 0x10
adds r2, r1 adds r2, r1
str r2, [r3] str r2, [r3]
ldr r3, =gUnknown_020244BC ldr r3, =gTransformedPersonalities
ldrb r1, [r6] ldrb r1, [r6]
lsls r1, 2 lsls r1, 2
adds r1, r3 adds r1, r3
ldr r2, [r2] ldr r2, [r2]
str r2, [r1] str r2, [r1]
ldrb r1, [r5] ldrb r1, [r5]
bl sub_805DB8C bl IsMoveWithoutAnimation
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
cmp r3, 0 cmp r3, 0
@@ -3538,7 +3538,7 @@ _0816A370:
ldrb r2, [r2] ldrb r2, [r2]
lsls r2, 8 lsls r2, 8
orrs r1, r2 orrs r1, r2
bl sub_805E94C bl TrySetBehindSubstituteSpriteBit
ldr r0, [r7] ldr r0, [r7]
ldrb r1, [r6] ldrb r1, [r6]
ldr r2, [r0, 0x4] ldr r2, [r0, 0x4]
@@ -3574,7 +3574,7 @@ WallyHandlePrintString: @ 816A3B8
bl BufferStringBattle bl BufferStringBattle
ldr r0, =gDisplayedStringBattle ldr r0, =gDisplayedStringBattle
movs r1, 0 movs r1, 0
bl sub_814F9EC bl BattleHandleAddTextPrinter
ldr r1, =gBattleBankFunc ldr r1, =gBattleBankFunc
ldrb r0, [r4] ldrb r0, [r4]
lsls r0, 2 lsls r0, 2
@@ -3644,7 +3644,7 @@ WallyHandleChooseAction: @ 816A470
str r1, [r0] str r1, [r0]
ldr r0, =gText_BattleMenu ldr r0, =gText_BattleMenu
movs r1, 0x2 movs r1, 0x2
bl sub_814F9EC bl BattleHandleAddTextPrinter
movs r4, 0 movs r4, 0
_0816A48A: _0816A48A:
lsls r0, r4, 24 lsls r0, r4, 24
@@ -3664,7 +3664,7 @@ _0816A48A:
bl BattleStringExpandPlaceholdersToDisplayedString bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle ldr r0, =gDisplayedStringBattle
movs r1, 0x1 movs r1, 0x1
bl sub_814F9EC bl BattleHandleAddTextPrinter
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
@@ -3745,7 +3745,7 @@ _0816A550:
lsls r2, 1 lsls r2, 1
movs r0, 0x1 movs r0, 0x1
movs r1, 0xA movs r1, 0xA
bl EmitCmd33 bl EmitChoiceReturnValue
bl WallyBufferExecCompleted bl WallyBufferExecCompleted
_0816A574: _0816A574:
pop {r4} pop {r4}
asm/battle_frontier_1.s
+3 -3
View File
@@ -6956,7 +6956,7 @@ _08192574:
cmp r2, r0 cmp r2, r0
bne _08192598 bne _08192598
ldrb r0, [r1, 0x8] ldrb r0, [r1, 0x8]
bl sub_806F000 bl PlayerGenderToFrontTrainerPicId
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
b _081925B6 b _081925B6
@@ -8535,7 +8535,7 @@ _081932A2:
ldr r0, =gSaveBlock2Ptr ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x8] ldrb r0, [r0, 0x8]
bl sub_806F000 bl PlayerGenderToFrontTrainerPicId
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
mov r2, r8 mov r2, r8
@@ -8621,7 +8621,7 @@ _0819335A:
ldr r0, =gSaveBlock2Ptr ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x8] ldrb r0, [r0, 0x8]
bl sub_806F000 bl PlayerGenderToFrontTrainerPicId
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
b _081933B0 b _081933B0
asm/battle_frontier_2.s
+10 -10
View File
@@ -20557,7 +20557,7 @@ _081A5306:
movs r1, 0 movs r1, 0
movs r2, 0x18 movs r2, 0x18
movs r3, 0xD movs r3, 0xD
bl sub_8056A3C bl HandleBattleWindow
b _081A553E b _081A553E
.pool .pool
_081A531C: _081A531C:
@@ -20582,29 +20582,29 @@ _081A5328:
ldr r4, =gDisplayedStringBattle ldr r4, =gDisplayedStringBattle
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0xF movs r1, 0xF
bl sub_814F9EC bl BattleHandleAddTextPrinter
ldr r0, =gText_Vs ldr r0, =gText_Vs
movs r1, 0x10 movs r1, 0x10
bl sub_814F9EC bl BattleHandleAddTextPrinter
ldr r0, =gText_OpponentMon1Name ldr r0, =gText_OpponentMon1Name
bl BattleStringExpandPlaceholdersToDisplayedString bl BattleStringExpandPlaceholdersToDisplayedString
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x11 movs r1, 0x11
bl sub_814F9EC bl BattleHandleAddTextPrinter
ldr r0, =gText_Mind ldr r0, =gText_Mind
movs r1, 0x12 movs r1, 0x12
bl sub_814F9EC bl BattleHandleAddTextPrinter
ldr r0, =gText_Skill ldr r0, =gText_Skill
movs r1, 0x13 movs r1, 0x13
bl sub_814F9EC bl BattleHandleAddTextPrinter
ldr r0, =gText_Body ldr r0, =gText_Body
movs r1, 0x14 movs r1, 0x14
bl sub_814F9EC bl BattleHandleAddTextPrinter
ldr r0, =gText_Judgement ldr r0, =gText_Judgement
bl BattleStringExpandPlaceholdersToDisplayedString bl BattleStringExpandPlaceholdersToDisplayedString
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x15 movs r1, 0x15
bl sub_814F9EC bl BattleHandleAddTextPrinter
b _081A553E b _081A553E
.pool .pool
_081A53B4: _081A53B4:
@@ -20688,7 +20688,7 @@ _081A5464:
bl BattleStringExpandPlaceholdersToDisplayedString bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle ldr r0, =gDisplayedStringBattle
movs r1, 0x15 movs r1, 0x15
bl sub_814F9EC bl BattleHandleAddTextPrinter
ldrb r0, [r5] ldrb r0, [r5]
adds r0, 0x1 adds r0, 0x1
strb r0, [r5] strb r0, [r5]
@@ -20733,7 +20733,7 @@ _081A54D4:
movs r1, 0 movs r1, 0
movs r2, 0x18 movs r2, 0x18
movs r3, 0xD movs r3, 0xD
bl sub_8056A3C bl HandleBattleWindow
movs r0, 0 movs r0, 0
bl CopyBgTilemapBufferToVram bl CopyBgTilemapBufferToVram
ldr r0, =gMPlay_BGM ldr r0, =gMPlay_BGM
asm/battle_transition.s
+1 -1
View File
@@ -4348,7 +4348,7 @@ sub_8148218: @ 8148218
ldr r0, =gSaveBlock2Ptr ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x8] ldrb r0, [r0, 0x8]
bl sub_806F000 bl PlayerGenderToFrontTrainerPicId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x88 movs r1, 0x88
asm/evolution_scene.s
+17 -17
View File
@@ -1338,7 +1338,7 @@ _0813E6E4:
bl StringExpandPlaceholders bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0 movs r1, 0
bl sub_814F9EC bl BattleHandleAddTextPrinter
ldr r0, =gTasks ldr r0, =gTasks
mov r2, r8 mov r2, r8
adds r1, r2, r7 adds r1, r2, r7
@@ -1626,7 +1626,7 @@ _0813E99E:
bl StringExpandPlaceholders bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0 movs r1, 0
bl sub_814F9EC bl BattleHandleAddTextPrinter
ldr r0, =0x00000173 ldr r0, =0x00000173
bl PlayBGM bl PlayBGM
ldr r2, =gTasks ldr r2, =gTasks
@@ -1868,7 +1868,7 @@ _0813EBE4:
_0813EBEC: _0813EBEC:
ldr r0, =gStringVar4 ldr r0, =gStringVar4
movs r1, 0 movs r1, 0
bl sub_814F9EC bl BattleHandleAddTextPrinter
ldr r1, =gTasks ldr r1, =gTasks
mov r2, r8 mov r2, r8
adds r0, r2, r7 adds r0, r2, r7
@@ -1900,7 +1900,7 @@ _0813EC2A:
bl BattleStringExpandPlaceholdersToDisplayedString bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle ldr r0, =gDisplayedStringBattle
movs r1, 0 movs r1, 0
bl sub_814F9EC bl BattleHandleAddTextPrinter
ldr r0, =gTasks ldr r0, =gTasks
mov r3, r8 mov r3, r8
adds r1, r3, r7 adds r1, r3, r7
@@ -1997,7 +1997,7 @@ _0813ED16:
bl BattleStringExpandPlaceholdersToDisplayedString bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle ldr r0, =gDisplayedStringBattle
movs r1, 0 movs r1, 0
bl sub_814F9EC bl BattleHandleAddTextPrinter
ldr r0, =gTasks ldr r0, =gTasks
mov r2, r8 mov r2, r8
adds r1, r2, r7 adds r1, r2, r7
@@ -2026,7 +2026,7 @@ _0813ED62:
bl BattleStringExpandPlaceholdersToDisplayedString bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle ldr r0, =gDisplayedStringBattle
movs r1, 0 movs r1, 0
bl sub_814F9EC bl BattleHandleAddTextPrinter
ldr r0, =gTasks ldr r0, =gTasks
mov r3, r8 mov r3, r8
adds r1, r3, r7 adds r1, r3, r7
@@ -2051,7 +2051,7 @@ _0813ED90:
bl BattleStringExpandPlaceholdersToDisplayedString bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle ldr r0, =gDisplayedStringBattle
movs r1, 0 movs r1, 0
bl sub_814F9EC bl BattleHandleAddTextPrinter
ldr r0, =gTasks ldr r0, =gTasks
mov r2, r8 mov r2, r8
adds r1, r2, r7 adds r1, r2, r7
@@ -2084,10 +2084,10 @@ _0813EDEA:
movs r1, 0x8 movs r1, 0x8
movs r2, 0x1D movs r2, 0x1D
movs r3, 0xD movs r3, 0xD
bl sub_8056A3C bl HandleBattleWindow
ldr r0, =gText_BattleYesNoChoice ldr r0, =gText_BattleYesNoChoice
movs r1, 0xC movs r1, 0xC
bl sub_814F9EC bl BattleHandleAddTextPrinter
ldr r0, =gTasks ldr r0, =gTasks
mov r3, r8 mov r3, r8
adds r1, r3, r7 adds r1, r3, r7
@@ -2152,7 +2152,7 @@ _0813EE84:
movs r1, 0x8 movs r1, 0x8
movs r2, 0x1D movs r2, 0x1D
movs r3, 0xD movs r3, 0xD
bl sub_8056A3C bl HandleBattleWindow
movs r0, 0x5 movs r0, 0x5
bl PlaySE bl PlaySE
ldr r0, =gBattleCommunication ldr r0, =gBattleCommunication
@@ -2202,7 +2202,7 @@ _0813EF00:
movs r1, 0x8 movs r1, 0x8
movs r2, 0x1D movs r2, 0x1D
movs r3, 0xD movs r3, 0xD
bl sub_8056A3C bl HandleBattleWindow
movs r0, 0x5 movs r0, 0x5
bl PlaySE bl PlaySE
ldr r1, =gTasks ldr r1, =gTasks
@@ -2292,7 +2292,7 @@ _0813EFC8:
bl BattleStringExpandPlaceholdersToDisplayedString bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle ldr r0, =gDisplayedStringBattle
movs r1, 0 movs r1, 0
bl sub_814F9EC bl BattleHandleAddTextPrinter
ldr r1, =gTasks ldr r1, =gTasks
mov r2, r8 mov r2, r8
adds r0, r2, r7 adds r0, r2, r7
@@ -2341,7 +2341,7 @@ _0813F05C:
bl BattleStringExpandPlaceholdersToDisplayedString bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle ldr r0, =gDisplayedStringBattle
movs r1, 0 movs r1, 0
bl sub_814F9EC bl BattleHandleAddTextPrinter
ldr r0, =gTasks ldr r0, =gTasks
mov r2, r8 mov r2, r8
adds r1, r2, r7 adds r1, r2, r7
@@ -2370,7 +2370,7 @@ _0813F0AA:
bl BattleStringExpandPlaceholdersToDisplayedString bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle ldr r0, =gDisplayedStringBattle
movs r1, 0 movs r1, 0
bl sub_814F9EC bl BattleHandleAddTextPrinter
ldr r0, =gTasks ldr r0, =gTasks
mov r3, r8 mov r3, r8
adds r1, r3, r7 adds r1, r3, r7
@@ -2398,7 +2398,7 @@ _0813F0D8:
bl BattleStringExpandPlaceholdersToDisplayedString bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle ldr r0, =gDisplayedStringBattle
movs r1, 0 movs r1, 0
bl sub_814F9EC bl BattleHandleAddTextPrinter
ldr r1, =gTasks ldr r1, =gTasks
mov r2, r8 mov r2, r8
adds r0, r2, r7 adds r0, r2, r7
@@ -2414,7 +2414,7 @@ _0813F120:
bl BattleStringExpandPlaceholdersToDisplayedString bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle ldr r0, =gDisplayedStringBattle
movs r1, 0 movs r1, 0
bl sub_814F9EC bl BattleHandleAddTextPrinter
ldr r1, =gTasks ldr r1, =gTasks
mov r3, r8 mov r3, r8
adds r0, r3, r7 adds r0, r3, r7
@@ -2434,7 +2434,7 @@ _0813F154:
bl BattleStringExpandPlaceholdersToDisplayedString bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle ldr r0, =gDisplayedStringBattle
movs r1, 0 movs r1, 0
bl sub_814F9EC bl BattleHandleAddTextPrinter
ldr r1, =gTasks ldr r1, =gTasks
mov r2, r8 mov r2, r8
adds r0, r2, r7 adds r0, r2, r7
asm/pokedex.s
+1 -1
View File
@@ -7923,7 +7923,7 @@ _080BF982:
ldr r0, =gSaveBlock2Ptr ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x8] ldrb r0, [r0, 0x8]
bl sub_806F000 bl PlayerGenderToFrontTrainerPicId
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
movs r1, 0x98 movs r1, 0x98
asm/rom_80A5C6C.s
+4 -4
View File
@@ -217,7 +217,7 @@ _080A5E04:
b _080A5E42 b _080A5E42
.pool .pool
_080A5E3C: _080A5E3C:
ldr r0, =gUnknown_020244BC ldr r0, =gTransformedPersonalities
adds r0, r1, r0 adds r0, r1, r0
ldr r2, [r0] ldr r2, [r0]
_080A5E42: _080A5E42:
@@ -307,7 +307,7 @@ _080A5EC8:
b _080A5F0A b _080A5F0A
.pool .pool
_080A5F04: _080A5F04:
ldr r0, =gUnknown_020244BC ldr r0, =gTransformedPersonalities
adds r0, r1, r0 adds r0, r1, r0
ldr r2, [r0] ldr r2, [r0]
_080A5F0A: _080A5F0A:
@@ -5522,7 +5522,7 @@ _080A86C4:
.pool .pool
_080A871C: _080A871C:
ldrh r7, [r1, 0x2] ldrh r7, [r1, 0x2]
ldr r0, =gUnknown_020244BC ldr r0, =gTransformedPersonalities
adds r0, r2, r0 adds r0, r2, r0
ldr r2, [r0] ldr r2, [r0]
_080A8724: _080A8724:
@@ -5612,7 +5612,7 @@ _080A8790:
.pool .pool
_080A87DC: _080A87DC:
ldrh r7, [r1, 0x2] ldrh r7, [r1, 0x2]
ldr r0, =gUnknown_020244BC ldr r0, =gTransformedPersonalities
adds r0, r2, r0 adds r0, r2, r0
ldr r2, [r0] ldr r2, [r0]
_080A87E4: _080A87E4:
include/battle.h
+11 -2
View File
@@ -326,7 +326,7 @@ struct UnknownFlags
struct DisableStruct struct DisableStruct
{ {
/*0x00*/ u32 unk0; /*0x00*/ u32 transformedMonPersonality;
/*0x04*/ u16 disabledMove; /*0x04*/ u16 disabledMove;
/*0x06*/ u16 encoredMove; /*0x06*/ u16 encoredMove;
/*0x08*/ u8 protectUses; /*0x08*/ u8 protectUses;
@@ -858,6 +858,16 @@ void BattleLoadOpponentMonSpriteGfx(struct Pokemon *mon, u8 bank);
void BattleLoadSubstituteSpriteGfx(u8 bank, bool8 arg1); void BattleLoadSubstituteSpriteGfx(u8 bank, bool8 arg1);
void nullsub_24(u16 arg0); void nullsub_24(u16 arg0);
void nullsub_25(u8 arg0); void nullsub_25(u8 arg0);
void ClearTemporarySpeciesSpriteData(u8 bank, bool8 dontClearSubstitute);
void sub_805D714(struct Sprite *sprite);
void DecompressTrainerBackPic(u16 backPicId, u8 bank);
void DecompressTrainerFrontPic(u16 frontPicId, u8 bank);
void FreeTrainerFrontPicPalette(u16 frontPicId);
void sub_805D7AC(struct Sprite *sprite);
bool8 IsMoveWithoutAnimation(u16 moveId, u8 animationTurn);
void sub_805EB9C(u8 arg0);
void sub_805E394(void);
void TrySetBehindSubstituteSpriteBit(u8 bank, u16 move);
enum enum
{ {
@@ -870,7 +880,6 @@ enum
BACK_PIC_WALLY, BACK_PIC_WALLY,
BACK_PIC_STEVEN BACK_PIC_STEVEN
}; };
void LoadBackTrainerBankSpriteGfx(u8 backPicId, u8 bank);
// rom_80A5C6C // rom_80A5C6C
u8 GetBankSide(u8 bank); u8 GetBankSide(u8 bank);
include/battle_controllers.h
+72 -19
View File
@@ -1,16 +1,69 @@
#ifndef GUARD_BATTLE_CONTROLLERS_H #ifndef GUARD_BATTLE_CONTROLLERS_H
#define GUARD_BATTLE_CONTROLLERS_H #define GUARD_BATTLE_CONTROLLERS_H
#define REQUEST_ALL_BATTLE 0x0 enum
#define REQUEST_SPECIES_BATTLE 0x1 {
#define REQUEST_HELDITEM_BATTLE 0x2 REQUEST_ALL_BATTLE,
#define REQUEST_MOVES_PP_BATTLE 0x3 REQUEST_SPECIES_BATTLE,
#define REQUEST_PPMOVE1_BATTLE 0x9 REQUEST_HELDITEM_BATTLE,
#define REQUEST_PPMOVE2_BATTLE 0xA REQUEST_MOVES_PP_BATTLE,
#define REQUEST_PPMOVE3_BATTLE 0xB REQUEST_MOVE1_BATTLE,
#define REQUEST_PPMOVE4_BATTLE 0xC REQUEST_MOVE2_BATTLE,
#define REQUEST_STATUS_BATTLE 0x28 REQUEST_MOVE3_BATTLE,
#define REQUEST_HP_BATTLE 0x2A REQUEST_MOVE4_BATTLE,
REQUEST_PP_DATA_BATTLE,
REQUEST_PPMOVE1_BATTLE,
REQUEST_PPMOVE2_BATTLE,
REQUEST_PPMOVE3_BATTLE,
REQUEST_PPMOVE4_BATTLE,
REQUEST_UNUSED_13_BATTLE,
REQUEST_UNUSED_14_BATTLE,
REQUEST_UNUSED_15_BATTLE,
REQUEST_UNUSED_16_BATTLE,
REQUEST_OTID_BATTLE,
REQUEST_EXP_BATTLE,
REQUEST_HP_EV_BATTLE,
REQUEST_ATK_EV_BATTLE,
REQUEST_DEF_EV_BATTLE,
REQUEST_SPEED_EV_BATTLE,
REQUEST_SPATK_EV_BATTLE,
REQUEST_SPDEF_EV_BATTLE,
REQUEST_FRIENDSHIP_BATTLE,
REQUEST_POKERUS_BATTLE,
REQUEST_MET_LOCATION_BATTLE,
REQUEST_MET_LEVEL_BATTLE,
REQUEST_MET_GAME_BATTLE,
REQUEST_POKEBALL_BATTLE,
REQUEST_ALL_IVS_BATTLE,
REQUEST_HP_IV_BATTLE,
REQUEST_ATK_IV_BATTLE,
REQUEST_DEF_IV_BATTLE,
REQUEST_SPEED_IV_BATTLE,
REQUEST_SPATK_IV_BATTLE,
REQUEST_SPDEF_IV_BATTLE,
REQUEST_PERSONALITY_BATTLE,
REQUEST_CHECKSUM_BATTLE,
REQUEST_STATUS_BATTLE,
REQUEST_LEVEL_BATTLE,
REQUEST_HP_BATTLE,
REQUEST_MAX_HP_BATTLE,
REQUEST_ATK_BATTLE,
REQUEST_DEF_BATTLE,
REQUEST_SPEED_BATTLE,
REQUEST_SPATK_BATTLE,
REQUEST_SPDEF_BATTLE,
REQUEST_COOL_BATTLE,
REQUEST_BEAUTY_BATTLE,
REQUEST_CUTE_BATTLE,
REQUEST_SMART_BATTLE,
REQUEST_TOUGH_BATTLE,
REQUEST_SHEEN_BATTLE,
REQUEST_COOL_RIBBON_BATTLE,
REQUEST_BEAUTY_RIBBON_BATTLE,
REQUEST_CUTE_RIBBON_BATTLE,
REQUEST_SMART_RIBBON_BATTLE,
REQUEST_TOUGH_RIBBON_BATTLE,
};
#define RESET_ACTION_MOVE_SELECTION 0 #define RESET_ACTION_MOVE_SELECTION 0
#define RESET_ACTION_SELECTION 1 #define RESET_ACTION_SELECTION 1
@@ -31,7 +84,7 @@ struct HpAndStatus
struct MovePpInfo struct MovePpInfo
{ {
u16 move[4]; u16 moves[4];
u8 pp[4]; u8 pp[4];
u8 ppBonuses; u8 ppBonuses;
}; };
@@ -59,7 +112,7 @@ enum
CONTROLLER_TRAINERSLIDE, CONTROLLER_TRAINERSLIDE,
CONTROLLER_TRAINERSLIDEBACK, CONTROLLER_TRAINERSLIDEBACK,
CONTROLLER_FAINTANIMATION, CONTROLLER_FAINTANIMATION,
CONTROLLER_11, CONTROLLER_PALETTEFADE,
CONTROLLER_12, CONTROLLER_12,
CONTROLLER_BALLTHROW, CONTROLLER_BALLTHROW,
CONTROLLER_PAUSE, CONTROLLER_PAUSE,
@@ -67,7 +120,7 @@ enum
CONTROLLER_PRINTSTRING, CONTROLLER_PRINTSTRING,
CONTROLLER_PRINTSTRINGPLAYERONLY, CONTROLLER_PRINTSTRINGPLAYERONLY,
CONTROLLER_CHOOSEACTION, CONTROLLER_CHOOSEACTION,
CONTROLLER_19, CONTROLLER_YESNOBOX,
CONTROLLER_CHOOSEMOVE, CONTROLLER_CHOOSEMOVE,
CONTROLLER_OPENBAG, CONTROLLER_OPENBAG,
CONTROLLER_CHOOSEPOKEMON, CONTROLLER_CHOOSEPOKEMON,
@@ -81,7 +134,7 @@ enum
CONTROLLER_DMA3TRANSFER, CONTROLLER_DMA3TRANSFER,
CONTROLLER_31, CONTROLLER_31,
CONTROLLER_32, CONTROLLER_32,
CONTROLLER_33, CONTROLLER_CHOICERETURNVALUE,
CONTROLLER_34, CONTROLLER_34,
CONTROLLER_35, CONTROLLER_35,
CONTROLLER_36, CONTROLLER_36,
@@ -117,9 +170,9 @@ void sub_8033648(void);
void PrepareBufferDataTransferLink(u8 bufferId, u16 size, u8 *data); void PrepareBufferDataTransferLink(u8 bufferId, u16 size, u8 *data);
// emitters // emitters
void EmitGetMonData(u8 bufferId, u8 arg1, u8 arg2); void EmitGetMonData(u8 bufferId, u8 requestId, u8 monsToCheck);
void EmitGetRawMonData(u8 bufferId, u8 monId, u8 bytes); // unused void EmitGetRawMonData(u8 bufferId, u8 monId, u8 bytes); // unused
void EmitSetMonData(u8 bufferId, u8 request, u8 c, u8 bytes, void *data); void EmitSetMonData(u8 bufferId, u8 requestId, u8 monsToCheck, u8 bytes, void *data);
void EmitSetRawMonData(u8 bufferId, u8 monId, u8 bytes, void *data); // unused void EmitSetRawMonData(u8 bufferId, u8 monId, u8 bytes, void *data); // unused
void EmitLoadMonSprite(u8 bufferId); void EmitLoadMonSprite(u8 bufferId);
void EmitSwitchInAnim(u8 bufferId, u8 partyId, bool8 dontClearSubstituteBit); void EmitSwitchInAnim(u8 bufferId, u8 partyId, bool8 dontClearSubstituteBit);
@@ -128,7 +181,7 @@ void EmitDrawTrainerPic(u8 bufferId);
void EmitTrainerSlide(u8 bufferId); void EmitTrainerSlide(u8 bufferId);
void EmitTrainerSlideBack(u8 bufferId); void EmitTrainerSlideBack(u8 bufferId);
void EmitFaintAnimation(u8 bufferId); void EmitFaintAnimation(u8 bufferId);
void EmitCmd11(u8 bufferId); // unused void EmitPaletteFade(u8 bufferId); // unused
void EmitCmd12(u8 bufferId); // unused void EmitCmd12(u8 bufferId); // unused
void EmitBallThrow(u8 bufferId, u8 caseId); void EmitBallThrow(u8 bufferId, u8 caseId);
void EmitPause(u8 bufferId, u8 toWait, void *data); // unused void EmitPause(u8 bufferId, u8 toWait, void *data); // unused
@@ -136,7 +189,7 @@ void EmitMoveAnimation(u8 bufferId, u16 move, u8 turnOfMove, u16 movePower, s32
void EmitPrintString(u8 bufferId, u16 stringId); void EmitPrintString(u8 bufferId, u16 stringId);
void EmitPrintStringPlayerOnly(u8 bufferId, u16 stringId); void EmitPrintStringPlayerOnly(u8 bufferId, u16 stringId);
void EmitChooseAction(u8 bufferId, u8 arg1, u16 arg2); void EmitChooseAction(u8 bufferId, u8 arg1, u16 arg2);
void EmitCmd19(u8 bufferId); void EmitYesNoBox(u8 bufferId);
void EmitChooseMove(u8 bufferId, bool8 isDoubleBattle, bool8 NoPpNumber, struct ChooseMoveStruct *movePpData); void EmitChooseMove(u8 bufferId, bool8 isDoubleBattle, bool8 NoPpNumber, struct ChooseMoveStruct *movePpData);
void EmitOpenBag(u8 bufferId, u8* arg1); void EmitOpenBag(u8 bufferId, u8* arg1);
void EmitChoosePokemon(u8 bufferId, u8 caseId, u8 arg2, u8 abilityId, u8* arg4); void EmitChoosePokemon(u8 bufferId, u8 caseId, u8 arg2, u8 abilityId, u8* arg4);
@@ -150,7 +203,7 @@ void EmitDataTransfer(u8 bufferId, u16 size, void *data);
void EmitDMA3Transfer(u8 bufferId, void *dst, u16 size, void *data); // unused void EmitDMA3Transfer(u8 bufferId, void *dst, u16 size, void *data); // unused
void EmitPlayBGM(u8 bufferId, u16 songId, void *unusedDumbDataParameter); // unused void EmitPlayBGM(u8 bufferId, u16 songId, void *unusedDumbDataParameter); // unused
void EmitCmd32(u8 bufferId, u16 size, void *c); // unused void EmitCmd32(u8 bufferId, u16 size, void *c); // unused
void EmitCmd33(u8 bufferId, u8 arg1, u16 arg2); void EmitChoiceReturnValue(u8 bufferId, u8 arg1, u16 arg2);
void EmitCmd34(u8 bufferId, u8 b, u8 *c); void EmitCmd34(u8 bufferId, u8 b, u8 *c);
void EmitCmd35(u8 bufferId, u16 b); void EmitCmd35(u8 bufferId, u16 b);
void EmitCmd36(u8 bufferId, u16 b); void EmitCmd36(u8 bufferId, u16 b);
include/battle_message.h
+1 -1
View File
@@ -204,7 +204,7 @@ struct StringInfoBattle
void BufferStringBattle(u16 stringID); void BufferStringBattle(u16 stringID);
u32 BattleStringExpandPlaceholdersToDisplayedString(const u8* src); u32 BattleStringExpandPlaceholdersToDisplayedString(const u8* src);
u32 BattleStringExpandPlaceholders(const u8* src, u8* dst); u32 BattleStringExpandPlaceholders(const u8* src, u8* dst);
void sub_814F9EC(const u8* text, u8 arg1); void BattleHandleAddTextPrinter(const u8* text, u8 arg1);
void SetPpNumbersPaletteInMoveSelection(void); void SetPpNumbersPaletteInMoveSelection(void);
u8 GetCurrentPpToMaxPpState(u8 currentPp, u8 maxPp); u8 GetCurrentPpToMaxPpState(u8 currentPp, u8 maxPp);
include/battle_script_commands.h
+5 -1
View File
@@ -25,6 +25,7 @@
#define VARIOUS_GET_MOVE_TARGET 3 #define VARIOUS_GET_MOVE_TARGET 3
#define VARIOUS_RESET_INTIMIDATE_TRACE_BITS 5 #define VARIOUS_RESET_INTIMIDATE_TRACE_BITS 5
#define VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP 6 #define VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP 6
#define VARIOUS_EMIT_YESNOBOX 13
#define VARIOUS_WAIT_CRY 18 #define VARIOUS_WAIT_CRY 18
#define VARIOUS_RETURN_OPPONENT_MON1 19 #define VARIOUS_RETURN_OPPONENT_MON1 19
#define VARIOUS_RETURN_OPPONENT_MON2 20 #define VARIOUS_RETURN_OPPONENT_MON2 20
@@ -41,6 +42,9 @@
#define STAT_CHANGE_WORKED 0 #define STAT_CHANGE_WORKED 0
#define STAT_CHANGE_DIDNT_WORK 1 #define STAT_CHANGE_DIDNT_WORK 1
#define WINDOW_CLEAR 0x1
#define WINDOW_x80 0x80
void AI_CalcDmg(u8 bankAtk, u8 bankDef); void AI_CalcDmg(u8 bankAtk, u8 bankDef);
u8 TypeCalc(u16 move, u8 bankAtk, u8 bankDef); u8 TypeCalc(u16 move, u8 bankAtk, u8 bankDef);
u8 AI_TypeCalc(u16 move, u16 targetSpecies, u8 targetAbility); u8 AI_TypeCalc(u16 move, u16 targetSpecies, u8 targetAbility);
@@ -49,7 +53,7 @@ void SetMoveEffect(bool8 primary, u8 certain);
void BattleDestroyYesNoCursorAt(u8 cursorPosition); void BattleDestroyYesNoCursorAt(u8 cursorPosition);
void BattleCreateYesNoCursorAt(u8 cursorPosition); void BattleCreateYesNoCursorAt(u8 cursorPosition);
void BufferMoveToLearnIntoBattleTextBuff2(void); void BufferMoveToLearnIntoBattleTextBuff2(void);
void sub_8056A3C(u8 xStart, u8 yStart, u8 xEnd, u8 yEnd, u8 flags); void HandleBattleWindow(u8 xStart, u8 yStart, u8 xEnd, u8 yEnd, u8 flags);
bool8 UproarWakeUpCheck(u8 bank); bool8 UproarWakeUpCheck(u8 bank);
extern void (* const gBattleScriptingCommandsTable[])(void); extern void (* const gBattleScriptingCommandsTable[])(void);
include/global.h
+2
View File
@@ -39,6 +39,8 @@ enum
VERSION_SAPPHIRE = 1, VERSION_SAPPHIRE = 1,
VERSION_RUBY = 2, VERSION_RUBY = 2,
VERSION_EMERALD = 3, VERSION_EMERALD = 3,
VERSION_FIRE_RED = 4,
VERSION_LEAF_GREEN = 5,
}; };
enum LanguageId { enum LanguageId {
include/pokemon.h
+3
View File
@@ -644,6 +644,9 @@ s8 GetMonFlavourRelation(struct Pokemon *mon, u8 a2);
s8 GetFlavourRelationByPersonality(u32 personality, u8 a2); s8 GetFlavourRelationByPersonality(u32 personality, u8 a2);
u8 GetItemEffectParamOffset(u16 itemId, u8 effectByte, u8 effectBit); u8 GetItemEffectParamOffset(u16 itemId, u8 effectByte, u8 effectBit);
u8 GetDefaultMoveTarget(u8 atkBank); u8 GetDefaultMoveTarget(u8 atkBank);
u16 PlayerGenderToFrontTrainerPicId(u8 playerGender);
void sub_806A1C0(u16 arg0, u8 bankIdentity);
void sub_806A12C(u16 trainerSpriteId, u8 bankIdentity);
#include "sprite.h" #include "sprite.h"
src/battle_2.c
+12 -12
View File
@@ -2121,7 +2121,7 @@ static void sub_8038F34(void)
if (sub_800A520() == TRUE) if (sub_800A520() == TRUE)
{ {
sub_800ADF8(); sub_800ADF8();
sub_814F9EC(gText_LinkStandby3, 0); BattleHandleAddTextPrinter(gText_LinkStandby3, 0);
gBattleCommunication[MULTIUSE_STATE]++; gBattleCommunication[MULTIUSE_STATE]++;
} }
break; break;
@@ -2247,15 +2247,15 @@ static void sub_803939C(void)
case 3: case 3:
if (!gPaletteFade.active) if (!gPaletteFade.active)
{ {
sub_814F9EC(gText_RecordBattleToPass, 0); BattleHandleAddTextPrinter(gText_RecordBattleToPass, 0);
gBattleCommunication[MULTIUSE_STATE]++; gBattleCommunication[MULTIUSE_STATE]++;
} }
break; break;
case 4: case 4:
if (!IsTextPrinterActive(0)) if (!IsTextPrinterActive(0))
{ {
sub_8056A3C(0x18, 8, 0x1D, 0xD, 0); HandleBattleWindow(0x18, 8, 0x1D, 0xD, 0);
sub_814F9EC(gText_BattleYesNoChoice, 0xC); BattleHandleAddTextPrinter(gText_BattleYesNoChoice, 0xC);
gBattleCommunication[CURSOR_POSITION] = 1; gBattleCommunication[CURSOR_POSITION] = 1;
BattleCreateYesNoCursorAt(1); BattleCreateYesNoCursorAt(1);
gBattleCommunication[MULTIUSE_STATE]++; gBattleCommunication[MULTIUSE_STATE]++;
@@ -2287,7 +2287,7 @@ static void sub_803939C(void)
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
if (gBattleCommunication[CURSOR_POSITION] == 0) if (gBattleCommunication[CURSOR_POSITION] == 0)
{ {
sub_8056A3C(0x18, 8, 0x1D, 0xD, 1); HandleBattleWindow(0x18, 8, 0x1D, 0xD, WINDOW_CLEAR);
gBattleCommunication[1] = MoveRecordedBattleToSaveData(); gBattleCommunication[1] = MoveRecordedBattleToSaveData();
gBattleCommunication[MULTIUSE_STATE] = 10; gBattleCommunication[MULTIUSE_STATE] = 10;
} }
@@ -2305,11 +2305,11 @@ static void sub_803939C(void)
case 6: case 6:
if (sub_800A520() == TRUE) if (sub_800A520() == TRUE)
{ {
sub_8056A3C(0x18, 8, 0x1D, 0xD, 1); HandleBattleWindow(0x18, 8, 0x1D, 0xD, WINDOW_CLEAR);
if (gMain.field_439_x4) if (gMain.field_439_x4)
{ {
sub_800ADF8(); sub_800ADF8();
sub_814F9EC(gText_LinkStandby3, 0); BattleHandleAddTextPrinter(gText_LinkStandby3, 0);
} }
gBattleCommunication[MULTIUSE_STATE]++; gBattleCommunication[MULTIUSE_STATE]++;
} }
@@ -2340,14 +2340,14 @@ static void sub_803939C(void)
{ {
PlaySE(SE_SAVE); PlaySE(SE_SAVE);
BattleStringExpandPlaceholdersToDisplayedString(gText_BattleRecordedOnPass); BattleStringExpandPlaceholdersToDisplayedString(gText_BattleRecordedOnPass);
sub_814F9EC(gDisplayedStringBattle, 0); BattleHandleAddTextPrinter(gDisplayedStringBattle, 0);
gBattleCommunication[1] = 0x80; gBattleCommunication[1] = 0x80;
gBattleCommunication[MULTIUSE_STATE]++; gBattleCommunication[MULTIUSE_STATE]++;
} }
else else
{ {
BattleStringExpandPlaceholdersToDisplayedString(gText_BattleRecordCouldntBeSaved); BattleStringExpandPlaceholdersToDisplayedString(gText_BattleRecordCouldntBeSaved);
sub_814F9EC(gDisplayedStringBattle, 0); BattleHandleAddTextPrinter(gDisplayedStringBattle, 0);
gBattleCommunication[1] = 0x80; gBattleCommunication[1] = 0x80;
gBattleCommunication[MULTIUSE_STATE]++; gBattleCommunication[MULTIUSE_STATE]++;
} }
@@ -2358,7 +2358,7 @@ static void sub_803939C(void)
if (gMain.field_439_x4) if (gMain.field_439_x4)
{ {
sub_800ADF8(); sub_800ADF8();
sub_814F9EC(gText_LinkStandby3, 0); BattleHandleAddTextPrinter(gText_LinkStandby3, 0);
} }
gBattleCommunication[MULTIUSE_STATE]++; gBattleCommunication[MULTIUSE_STATE]++;
} }
@@ -3690,7 +3690,7 @@ static void TryDoEventsBeforeFirstTurn(void)
TurnValuesCleanUp(FALSE); TurnValuesCleanUp(FALSE);
SpecialStatusesClear(); SpecialStatusesClear();
*(&gBattleStruct->field_91) = gAbsentBankFlags; *(&gBattleStruct->field_91) = gAbsentBankFlags;
sub_814F9EC(gText_EmptyString3, 0); BattleHandleAddTextPrinter(gText_EmptyString3, 0);
gBattleMainFunc = HandleTurnActionSelectionState; gBattleMainFunc = HandleTurnActionSelectionState;
ResetSentPokesToOpponentValue(); ResetSentPokesToOpponentValue();
@@ -3797,7 +3797,7 @@ void BattleTurnPassed(void)
*(gBattleStruct->field_5C + i) = 6; *(gBattleStruct->field_5C + i) = 6;
*(&gBattleStruct->field_91) = gAbsentBankFlags; *(&gBattleStruct->field_91) = gAbsentBankFlags;
sub_814F9EC(gText_EmptyString3, 0); BattleHandleAddTextPrinter(gText_EmptyString3, 0);
gBattleMainFunc = HandleTurnActionSelectionState; gBattleMainFunc = HandleTurnActionSelectionState;
gRandomTurnNumber = Random(); gRandomTurnNumber = Random();
src/battle_ai_switch_items.c
+9 -9
View File
@@ -39,7 +39,7 @@ static bool8 ShouldSwitchIfPerishSong(void)
&& gDisableStructs[gActiveBank].perishSong1 == 0) && gDisableStructs[gActiveBank].perishSong1 == 0)
{ {
*(gBattleStruct->field_294 + gActiveBank) = 6; *(gBattleStruct->field_294 + gActiveBank) = 6;
EmitCmd33(1, 2, 0); EmitChoiceReturnValue(1, 2, 0);
return TRUE; return TRUE;
} }
@@ -121,7 +121,7 @@ static bool8 ShouldSwitchIfWonderGuard(void)
{ {
// we found a mon // we found a mon
*(gBattleStruct->field_294 + gActiveBank) = i; *(gBattleStruct->field_294 + gActiveBank) = i;
EmitCmd33(1, 2, 0); EmitChoiceReturnValue(1, 2, 0);
return TRUE; return TRUE;
} }
} }
@@ -221,7 +221,7 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void)
{ {
// we found a mon // we found a mon
*(gBattleStruct->field_294 + gActiveBank) = i; *(gBattleStruct->field_294 + gActiveBank) = i;
EmitCmd33(1, 2, 0); EmitChoiceReturnValue(1, 2, 0);
return TRUE; return TRUE;
} }
} }
@@ -241,13 +241,13 @@ static bool8 ShouldSwitchIfNaturalCure(void)
if ((gUnknown_02024250[gActiveBank] == 0 || gUnknown_02024250[gActiveBank] == 0xFFFF) && Random() & 1) if ((gUnknown_02024250[gActiveBank] == 0 || gUnknown_02024250[gActiveBank] == 0xFFFF) && Random() & 1)
{ {
*(gBattleStruct->field_294 + gActiveBank) = 6; *(gBattleStruct->field_294 + gActiveBank) = 6;
EmitCmd33(1, 2, 0); EmitChoiceReturnValue(1, 2, 0);
return TRUE; return TRUE;
} }
else if (gBattleMoves[gUnknown_02024250[gActiveBank]].power == 0 && Random() & 1) else if (gBattleMoves[gUnknown_02024250[gActiveBank]].power == 0 && Random() & 1)
{ {
*(gBattleStruct->field_294 + gActiveBank) = 6; *(gBattleStruct->field_294 + gActiveBank) = 6;
EmitCmd33(1, 2, 0); EmitChoiceReturnValue(1, 2, 0);
return TRUE; return TRUE;
} }
@@ -258,7 +258,7 @@ static bool8 ShouldSwitchIfNaturalCure(void)
if (Random() & 1) if (Random() & 1)
{ {
*(gBattleStruct->field_294 + gActiveBank) = 6; *(gBattleStruct->field_294 + gActiveBank) = 6;
EmitCmd33(1, 2, 0); EmitChoiceReturnValue(1, 2, 0);
return TRUE; return TRUE;
} }
@@ -426,7 +426,7 @@ static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent)
if (moveFlags & MOVESTATUS_SUPEREFFECTIVE && Random() % moduloPercent == 0) if (moveFlags & MOVESTATUS_SUPEREFFECTIVE && Random() % moduloPercent == 0)
{ {
*(gBattleStruct->field_294 + gActiveBank) = i; *(gBattleStruct->field_294 + gActiveBank) = i;
EmitCmd33(1, 2, 0); EmitChoiceReturnValue(1, 2, 0);
return TRUE; return TRUE;
} }
} }
@@ -611,7 +611,7 @@ void AI_TrySwitchOrUseItem(void)
} }
} }
EmitCmd33(1, 0, (gActiveBank ^ BIT_SIDE) << 8); EmitChoiceReturnValue(1, 0, (gActiveBank ^ BIT_SIDE) << 8);
} }
#define TYPE_FORESIGHT 0xFE #define TYPE_FORESIGHT 0xFE
@@ -940,7 +940,7 @@ static bool8 ShouldUseItem(void)
if (shouldUse) if (shouldUse)
{ {
EmitCmd33(1, 1, 0); EmitChoiceReturnValue(1, 1, 0);
*(gBattleStruct->field_C0 + (gActiveBank / 2) * 2) = item; *(gBattleStruct->field_C0 + (gActiveBank / 2) * 2) = item;
gBattleResources->battleHistory->trainerItems[i] = 0; gBattleResources->battleHistory->trainerItems[i] = 0;
return shouldUse; return shouldUse;
src/battle_controller_linkopponent.c
+1 -1
View File
@@ -72,7 +72,7 @@ void nullsub_92(void);
void LinkOpponentBufferRunCommand(void); void LinkOpponentBufferRunCommand(void);
void (*const gLinkOpponentBufferCommands[CONTOLLER_CMDS_CONT])(void) = void (*const gLinkOpponentBufferCommands[CONTOLLER_CMDS_COUNT])(void) =
{ {
LinkOpponentHandleGetMonData, LinkOpponentHandleGetMonData,
LinkOpponentHandleGetRawMonData, LinkOpponentHandleGetRawMonData,
src/battle_controller_opponent.c
+1 -1
View File
@@ -72,7 +72,7 @@ void nullsub_91(void);
void OpponentBufferRunCommand(void); void OpponentBufferRunCommand(void);
void (*const gOpponentBufferCommands[CONTOLLER_CMDS_CONT])(void) = void (*const gOpponentBufferCommands[CONTOLLER_CMDS_COUNT])(void) =
{ {
OpponentHandleGetMonData, OpponentHandleGetMonData,
OpponentHandleGetRawMonData, OpponentHandleGetRawMonData,
src/battle_controller_player.c
+1086 -24
View File
File diff suppressed because it is too large Load Diff
src/battle_controller_wally.c
+1 -1
View File
@@ -72,7 +72,7 @@ void nullsub_118(void);
void WallyBufferRunCommand(void); void WallyBufferRunCommand(void);
void (*const gWallyBufferCommands[CONTOLLER_CMDS_CONT])(void) = void (*const gWallyBufferCommands[CONTOLLER_CMDS_COUNT])(void) =
{ {
WallyHandleGetMonData, WallyHandleGetMonData,
WallyHandleGetRawMonData, WallyHandleGetRawMonData,
src/battle_controllers.c
+18 -18
View File
@@ -939,11 +939,11 @@ static void Task_HandleCopyReceivedLinkBuffersData(u8 taskId)
} }
} }
void EmitGetMonData(u8 bufferId, u8 arg1, u8 arg2) void EmitGetMonData(u8 bufferId, u8 requestId, u8 monsToCheck)
{ {
gBattleBuffersTransferData[0] = CONTROLLER_GETMONDATA; gBattleBuffersTransferData[0] = CONTROLLER_GETMONDATA;
gBattleBuffersTransferData[1] = arg1; gBattleBuffersTransferData[1] = requestId;
gBattleBuffersTransferData[2] = arg2; gBattleBuffersTransferData[2] = monsToCheck;
gBattleBuffersTransferData[3] = 0; gBattleBuffersTransferData[3] = 0;
PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4); PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4);
} }
@@ -957,13 +957,13 @@ void EmitGetRawMonData(u8 bufferId, u8 monId, u8 bytes)
PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4); PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4);
} }
void EmitSetMonData(u8 bufferId, u8 request, u8 c, u8 bytes, void *data) void EmitSetMonData(u8 bufferId, u8 requestId, u8 monsToCheck, u8 bytes, void *data)
{ {
s32 i; s32 i;
gBattleBuffersTransferData[0] = CONTROLLER_SETMONDATA; gBattleBuffersTransferData[0] = CONTROLLER_SETMONDATA;
gBattleBuffersTransferData[1] = request; gBattleBuffersTransferData[1] = requestId;
gBattleBuffersTransferData[2] = c; gBattleBuffersTransferData[2] = monsToCheck;
for (i = 0; i < bytes; i++) for (i = 0; i < bytes; i++)
gBattleBuffersTransferData[3 + i] = *(u8*)(data++); gBattleBuffersTransferData[3 + i] = *(u8*)(data++);
PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 3 + bytes); PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 3 + bytes);
@@ -1042,12 +1042,12 @@ void EmitFaintAnimation(u8 bufferId)
PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4); PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4);
} }
void EmitCmd11(u8 bufferId) void EmitPaletteFade(u8 bufferId)
{ {
gBattleBuffersTransferData[0] = CONTROLLER_11; gBattleBuffersTransferData[0] = CONTROLLER_PALETTEFADE;
gBattleBuffersTransferData[1] = 11; gBattleBuffersTransferData[1] = CONTROLLER_PALETTEFADE;
gBattleBuffersTransferData[2] = 11; gBattleBuffersTransferData[2] = CONTROLLER_PALETTEFADE;
gBattleBuffersTransferData[3] = 11; gBattleBuffersTransferData[3] = CONTROLLER_PALETTEFADE;
PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4); PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4);
} }
@@ -1178,12 +1178,12 @@ void EmitChooseAction(u8 bufferId, u8 arg1, u16 arg2)
PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4); PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4);
} }
void EmitCmd19(u8 bufferId) void EmitYesNoBox(u8 bufferId)
{ {
gBattleBuffersTransferData[0] = CONTROLLER_19; gBattleBuffersTransferData[0] = CONTROLLER_YESNOBOX;
gBattleBuffersTransferData[1] = 19; gBattleBuffersTransferData[1] = CONTROLLER_YESNOBOX;
gBattleBuffersTransferData[2] = 19; gBattleBuffersTransferData[2] = CONTROLLER_YESNOBOX;
gBattleBuffersTransferData[3] = 19; gBattleBuffersTransferData[3] = CONTROLLER_YESNOBOX;
PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4); PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4);
} }
@@ -1337,9 +1337,9 @@ void EmitCmd32(u8 bufferId, u16 size, void *data)
PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, size + 3); PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, size + 3);
} }
void EmitCmd33(u8 bufferId, u8 arg1, u16 arg2) void EmitChoiceReturnValue(u8 bufferId, u8 arg1, u16 arg2)
{ {
gBattleBuffersTransferData[0] = CONTROLLER_33; gBattleBuffersTransferData[0] = CONTROLLER_CHOICERETURNVALUE;
gBattleBuffersTransferData[1] = arg1; gBattleBuffersTransferData[1] = arg1;
gBattleBuffersTransferData[2] = arg2; gBattleBuffersTransferData[2] = arg2;
gBattleBuffersTransferData[3] = (arg2 & 0xFF00) >> 8; gBattleBuffersTransferData[3] = (arg2 & 0xFF00) >> 8;
src/battle_message.c
+1 -1
View File
@@ -2209,7 +2209,7 @@ static void sub_814F950(u8* dst)
} }
} }
void sub_814F9EC(const u8 *text, u8 arg1) void BattleHandleAddTextPrinter(const u8 *text, u8 arg1)
{ {
const u8 *r8 = gUnknown_085CD660[gBattleScripting.field_24]; const u8 *r8 = gUnknown_085CD660[gBattleScripting.field_24];
bool32 r9; bool32 r9;
src/battle_script_commands.c
+24 -24
View File
@@ -6114,8 +6114,8 @@ static void atk5A_yesnoboxlearnmove(void)
switch (gBattleScripting.learnMoveState) switch (gBattleScripting.learnMoveState)
{ {
case 0: case 0:
sub_8056A3C(0x18, 8, 0x1D, 0xD, 0); HandleBattleWindow(0x18, 8, 0x1D, 0xD, 0);
sub_814F9EC(gText_BattleYesNoChoice, 0xC); BattleHandleAddTextPrinter(gText_BattleYesNoChoice, 0xC);
gBattleScripting.learnMoveState++; gBattleScripting.learnMoveState++;
gBattleCommunication[CURSOR_POSITION] = 0; gBattleCommunication[CURSOR_POSITION] = 0;
BattleCreateYesNoCursorAt(0); BattleCreateYesNoCursorAt(0);
@@ -6140,7 +6140,7 @@ static void atk5A_yesnoboxlearnmove(void)
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
if (gBattleCommunication[1] == 0) if (gBattleCommunication[1] == 0)
{ {
sub_8056A3C(0x18, 0x8, 0x1D, 0xD, 1); HandleBattleWindow(0x18, 0x8, 0x1D, 0xD, WINDOW_CLEAR);
BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
gBattleScripting.learnMoveState++; gBattleScripting.learnMoveState++;
} }
@@ -6214,7 +6214,7 @@ static void atk5A_yesnoboxlearnmove(void)
} }
break; break;
case 5: case 5:
sub_8056A3C(0x18, 8, 0x1D, 0xD, 1); HandleBattleWindow(0x18, 8, 0x1D, 0xD, WINDOW_CLEAR);
gBattlescriptCurrInstr += 5; gBattlescriptCurrInstr += 5;
break; break;
case 6: case 6:
@@ -6231,8 +6231,8 @@ static void atk5B_yesnoboxstoplearningmove(void)
switch (gBattleScripting.learnMoveState) switch (gBattleScripting.learnMoveState)
{ {
case 0: case 0:
sub_8056A3C(0x18, 8, 0x1D, 0xD, 0); HandleBattleWindow(0x18, 8, 0x1D, 0xD, 0);
sub_814F9EC(gText_BattleYesNoChoice, 0xC); BattleHandleAddTextPrinter(gText_BattleYesNoChoice, 0xC);
gBattleScripting.learnMoveState++; gBattleScripting.learnMoveState++;
gBattleCommunication[CURSOR_POSITION] = 0; gBattleCommunication[CURSOR_POSITION] = 0;
BattleCreateYesNoCursorAt(0); BattleCreateYesNoCursorAt(0);
@@ -6261,13 +6261,13 @@ static void atk5B_yesnoboxstoplearningmove(void)
else else
gBattlescriptCurrInstr += 5; gBattlescriptCurrInstr += 5;
sub_8056A3C(0x18, 0x8, 0x1D, 0xD, 1); HandleBattleWindow(0x18, 0x8, 0x1D, 0xD, WINDOW_CLEAR);
} }
else if (gMain.newKeys & B_BUTTON) else if (gMain.newKeys & B_BUTTON)
{ {
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
sub_8056A3C(0x18, 0x8, 0x1D, 0xD, 1); HandleBattleWindow(0x18, 0x8, 0x1D, 0xD, WINDOW_CLEAR);
} }
break; break;
} }
@@ -6527,8 +6527,8 @@ static void atk67_yesnobox(void)
switch (gBattleCommunication[0]) switch (gBattleCommunication[0])
{ {
case 0: case 0:
sub_8056A3C(0x18, 8, 0x1D, 0xD, 0); HandleBattleWindow(0x18, 8, 0x1D, 0xD, 0);
sub_814F9EC(gText_BattleYesNoChoice, 0xC); BattleHandleAddTextPrinter(gText_BattleYesNoChoice, 0xC);
gBattleCommunication[0]++; gBattleCommunication[0]++;
gBattleCommunication[CURSOR_POSITION] = 0; gBattleCommunication[CURSOR_POSITION] = 0;
BattleCreateYesNoCursorAt(0); BattleCreateYesNoCursorAt(0);
@@ -6552,13 +6552,13 @@ static void atk67_yesnobox(void)
{ {
gBattleCommunication[CURSOR_POSITION] = 1; gBattleCommunication[CURSOR_POSITION] = 1;
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
sub_8056A3C(0x18, 8, 0x1D, 0xD, 1); HandleBattleWindow(0x18, 8, 0x1D, 0xD, WINDOW_CLEAR);
gBattlescriptCurrInstr++; gBattlescriptCurrInstr++;
} }
else if (gMain.newKeys & A_BUTTON) else if (gMain.newKeys & A_BUTTON)
{ {
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
sub_8056A3C(0x18, 8, 0x1D, 0xD, 1); HandleBattleWindow(0x18, 8, 0x1D, 0xD, WINDOW_CLEAR);
gBattlescriptCurrInstr++; gBattlescriptCurrInstr++;
} }
break; break;
@@ -6674,7 +6674,7 @@ static void atk6C_draw_lvlupbox(void)
SetBgAttribute(1, BG_CTRL_ATTR_MOSAIC, 0); SetBgAttribute(1, BG_CTRL_ATTR_MOSAIC, 0);
ShowBg(0); ShowBg(0);
ShowBg(1); ShowBg(1);
sub_8056A3C(0x12, 7, 0x1D, 0x13, 0x80); HandleBattleWindow(0x12, 7, 0x1D, 0x13, WINDOW_x80);
gBattleScripting.atk6C_state = 4; gBattleScripting.atk6C_state = 4;
break; break;
case 4: case 4:
@@ -6704,7 +6704,7 @@ static void atk6C_draw_lvlupbox(void)
if (gMain.newKeys != 0) if (gMain.newKeys != 0)
{ {
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
sub_8056A3C(0x12, 7, 0x1D, 0x13, 0x81); HandleBattleWindow(0x12, 7, 0x1D, 0x13, WINDOW_x80 | WINDOW_CLEAR);
gBattleScripting.atk6C_state++; gBattleScripting.atk6C_state++;
} }
break; break;
@@ -7136,8 +7136,8 @@ static void atk76_various(void)
gDisableStructs[0].truantUnknownBit = 1; gDisableStructs[0].truantUnknownBit = 1;
gDisableStructs[1].truantUnknownBit = 1; gDisableStructs[1].truantUnknownBit = 1;
break; break;
case 13: case VARIOUS_EMIT_YESNOBOX:
EmitCmd19(0); EmitYesNoBox(0);
MarkBufferBankForExecution(gActiveBank); MarkBufferBankForExecution(gActiveBank);
break; break;
case 14: case 14:
@@ -7148,7 +7148,7 @@ static void atk76_various(void)
break; break;
case 16: case 16:
BattleStringExpandPlaceholdersToDisplayedString(gRefereeStringsTable[gBattlescriptCurrInstr[1]]); BattleStringExpandPlaceholdersToDisplayedString(gRefereeStringsTable[gBattlescriptCurrInstr[1]]);
sub_814F9EC(gDisplayedStringBattle, 0x16); BattleHandleAddTextPrinter(gDisplayedStringBattle, 0x16);
break; break;
case 17: case 17:
if (IsTextPrinterActive(0x16)) if (IsTextPrinterActive(0x16))
@@ -8443,7 +8443,7 @@ static void atk9B_transformdataexecution(void)
gBattleMons[gBankAttacker].status2 |= STATUS2_TRANSFORMED; gBattleMons[gBankAttacker].status2 |= STATUS2_TRANSFORMED;
gDisableStructs[gBankAttacker].disabledMove = 0; gDisableStructs[gBankAttacker].disabledMove = 0;
gDisableStructs[gBankAttacker].disableTimer1 = 0; gDisableStructs[gBankAttacker].disableTimer1 = 0;
gDisableStructs[gBankAttacker].unk0 = gBattleMons[gBankTarget].personality; gDisableStructs[gBankAttacker].transformedMonPersonality = gBattleMons[gBankTarget].personality;
gDisableStructs[gBankAttacker].unk18_b = 0; gDisableStructs[gBankAttacker].unk18_b = 0;
PREPARE_SPECIES_BUFFER(gBattleTextBuff1, gBattleMons[gBankTarget].species) PREPARE_SPECIES_BUFFER(gBattleTextBuff1, gBattleMons[gBankTarget].species)
@@ -9152,7 +9152,7 @@ static void atkA8_copymovepermanently(void) // sketch
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
{ {
movePpData.move[i] = gBattleMons[gBankAttacker].moves[i]; movePpData.moves[i] = gBattleMons[gBankAttacker].moves[i];
movePpData.pp[i] = gBattleMons[gBankAttacker].pp[i]; movePpData.pp[i] = gBattleMons[gBankAttacker].pp[i];
} }
movePpData.ppBonuses = gBattleMons[gBankAttacker].ppBonuses; movePpData.ppBonuses = gBattleMons[gBankAttacker].ppBonuses;
@@ -11238,7 +11238,7 @@ static void atkF2_display_dex_info(void)
} }
} }
void sub_8056A3C(u8 xStart, u8 yStart, u8 xEnd, u8 yEnd, u8 flags) void HandleBattleWindow(u8 xStart, u8 yStart, u8 xEnd, u8 yEnd, u8 flags)
{ {
s32 destY, destX; s32 destY, destX;
u16 var = 0; u16 var = 0;
@@ -11275,10 +11275,10 @@ void sub_8056A3C(u8 xStart, u8 yStart, u8 xEnd, u8 yEnd, u8 flags)
var = 0x1026; var = 0x1026;
} }
if (flags & 1) if (flags & WINDOW_CLEAR)
var = 0; var = 0;
if (flags & 0x80) if (flags & WINDOW_x80)
CopyToBgTilemapBufferRect_ChangePalette(1, &var, destX, destY, 1, 1, 0x11); CopyToBgTilemapBufferRect_ChangePalette(1, &var, destX, destY, 1, 1, 0x11);
else else
CopyToBgTilemapBufferRect_ChangePalette(0, &var, destX, destY, 1, 1, 0x11); CopyToBgTilemapBufferRect_ChangePalette(0, &var, destX, destY, 1, 1, 0x11);
@@ -11311,8 +11311,8 @@ static void atkF3_nickname_caught_poke(void)
switch (gBattleCommunication[MULTIUSE_STATE]) switch (gBattleCommunication[MULTIUSE_STATE])
{ {
case 0: case 0:
sub_8056A3C(0x18, 8, 0x1D, 0xD, 0); HandleBattleWindow(0x18, 8, 0x1D, 0xD, 0);
sub_814F9EC(gText_BattleYesNoChoice, 0xC); BattleHandleAddTextPrinter(gText_BattleYesNoChoice, 0xC);
gBattleCommunication[MULTIUSE_STATE]++; gBattleCommunication[MULTIUSE_STATE]++;
gBattleCommunication[CURSOR_POSITION] = 0; gBattleCommunication[CURSOR_POSITION] = 0;
BattleCreateYesNoCursorAt(0); BattleCreateYesNoCursorAt(0);
src/pokemon_2.c
+3 -2
View File
@@ -194,6 +194,7 @@ void sub_806A1C0(u16 arg0, u8 bankIdentity)
gUnknown_0202499C = gMonSpritesGfxPtr->templates[bankIdentity]; gUnknown_0202499C = gMonSpritesGfxPtr->templates[bankIdentity];
else else
gUnknown_0202499C = gUnknown_08329D98[bankIdentity]; gUnknown_0202499C = gUnknown_08329D98[bankIdentity];
gUnknown_0202499C.paletteTag = arg0; gUnknown_0202499C.paletteTag = arg0;
gUnknown_0202499C.anims = gUnknown_0830536C[arg0]; gUnknown_0202499C.anims = gUnknown_0830536C[arg0];
} }
@@ -1304,7 +1305,7 @@ void RemoveBattleMonPPBonus(struct BattlePokemon *mon, u8 moveIndex)
} }
void sub_803FA70(u8 bank); void sub_803FA70(u8 bank);
void sub_805EF84(u8 bank, bool8); void ClearTemporarySpeciesSpriteData(u8 bank, bool8);
extern struct BattlePokemon gBattleMons[4]; extern struct BattlePokemon gBattleMons[4];
@@ -1360,5 +1361,5 @@ void CopyPlayerPartyMonToBattleData(u8 bank, u8 partyIndex)
gBattleMons[bank].status2 = 0; gBattleMons[bank].status2 = 0;
sub_803FA70(bank); sub_803FA70(bank);
sub_805EF84(bank, FALSE); ClearTemporarySpeciesSpriteData(bank, FALSE);
} }
src/pokemon_3.c
+1 -1
View File
@@ -1659,7 +1659,7 @@ u16 sub_806EFF0(u16 arg0)
return gUnknown_0831F578[arg0]; return gUnknown_0831F578[arg0];
} }
u16 sub_806F000(u8 playerGender) u16 PlayerGenderToFrontTrainerPicId(u8 playerGender)
{ {
if (playerGender) if (playerGender)
return sub_806EFF0(0x3F); return sub_806EFF0(0x3F);
src/reshow_battle_screen.c
+2 -2
View File
@@ -220,9 +220,9 @@ static bool8 LoadBankSpriteGfx(u8 bank)
BattleLoadSubstituteSpriteGfx(bank, FALSE); BattleLoadSubstituteSpriteGfx(bank, FALSE);
} }
else if (gBattleTypeFlags & BATTLE_TYPE_SAFARI && bank == 0) else if (gBattleTypeFlags & BATTLE_TYPE_SAFARI && bank == 0)
LoadBackTrainerBankSpriteGfx(gSaveBlock2Ptr->playerGender, bank); DecompressTrainerBackPic(gSaveBlock2Ptr->playerGender, bank);
else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL && bank == 0) else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL && bank == 0)
LoadBackTrainerBankSpriteGfx(BACK_PIC_WALLY, bank); DecompressTrainerBackPic(BACK_PIC_WALLY, bank);
else if (!gBattleSpritesDataPtr->bankData[bank].behindSubstitute) else if (!gBattleSpritesDataPtr->bankData[bank].behindSubstitute)
BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[bank]], bank); BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[bank]], bank);
else else
sym_ewram.txt
+1 -1
View File
@@ -495,7 +495,7 @@ gBankInMenu: @ 20244B8
gDoingBattleAnim: @ 20244B9 gDoingBattleAnim: @ 20244B9
.space 0x3 .space 0x3
gUnknown_020244BC: @ 20244BC gTransformedPersonalities: @ 20244BC
.space 0x10 .space 0x10
gUnknown_020244CC: @ 20244CC gUnknown_020244CC: @ 20244CC