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
ldr r0, =gText_Draw
movs r1, 0x15
bl sub_814F9EC
bl BattleHandleAddTextPrinter
b _08035D68
.pool
_08035C68:
@@ -1964,10 +1964,10 @@ _08035CE2:
_08035CFC:
ldr r0, =gText_Win
movs r1, 0x17
bl sub_814F9EC
bl BattleHandleAddTextPrinter
ldr r0, =gText_Loss
movs r1, 0x16
bl sub_814F9EC
bl BattleHandleAddTextPrinter
b _08035D68
.pool
_08035D20:
@@ -1985,19 +1985,19 @@ _08035D20:
_08035D36:
ldr r0, =gText_Win
movs r1, 0x16
bl sub_814F9EC
bl BattleHandleAddTextPrinter
ldr r0, =gText_Loss
movs r1, 0x17
bl sub_814F9EC
bl BattleHandleAddTextPrinter
b _08035D68
.pool
_08035D58:
ldr r0, =gText_Win
movs r1, 0x17
bl sub_814F9EC
bl BattleHandleAddTextPrinter
ldr r0, =gText_Loss
movs r1, 0x16
bl sub_814F9EC
bl BattleHandleAddTextPrinter
_08035D68:
pop {r0}
bx r0
@@ -2068,14 +2068,14 @@ _08035DDC:
_08035DE6:
adds r0, r1, 0
movs r1, 0x11
bl sub_814F9EC
bl BattleHandleAddTextPrinter
ldrb r1, [r4, 0x18]
movs r0, 0x4
b _08035E14
_08035DF4:
adds r0, r1, 0
movs r1, 0x12
bl sub_814F9EC
bl BattleHandleAddTextPrinter
ldrb r1, [r4, 0x18]
movs r0, 0x4
str r0, [sp]
@@ -2085,7 +2085,7 @@ _08035DF4:
_08035E08:
adds r0, r1, 0
movs r1, 0x13
bl sub_814F9EC
bl BattleHandleAddTextPrinter
ldrb r1, [r4, 0x18]
movs r0, 0x8
_08035E14:
@@ -2099,7 +2099,7 @@ _08035E1A:
_08035E22:
adds r0, r1, 0
movs r1, 0x14
bl sub_814F9EC
bl BattleHandleAddTextPrinter
ldrb r1, [r4, 0x18]
movs r0, 0x8
str r0, [sp]
@@ -2139,14 +2139,14 @@ _08035E66:
adds r1, r0, r4
adds r0, r1, 0
movs r1, 0xF
bl sub_814F9EC
bl BattleHandleAddTextPrinter
lsls r0, r6, 3
subs r0, r6
lsls r0, 2
adds r1, r0, r4
adds r0, r1, 0
movs r1, 0x10
bl sub_814F9EC
bl BattleHandleAddTextPrinter
movs r4, 0x7
str r4, [sp]
adds r0, r7, 0
asm/battle_7.s
+22 -22
View File
@@ -1258,11 +1258,11 @@ _0805DB76:
.pool
thumb_func_end task0A_08034248
thumb_func_start sub_805DB8C
sub_805DB8C: @ 805DB8C
thumb_func_start IsMoveWithoutAnimation
IsMoveWithoutAnimation: @ 805DB8C
movs r0, 0
bx lr
thumb_func_end sub_805DB8C
thumb_func_end IsMoveWithoutAnimation
thumb_func_start mplay_80342A4
mplay_80342A4: @ 805DB90
@@ -1357,7 +1357,7 @@ BattleLoadOpponentMonSpriteGfx: @ 805DC0C
.pool
_0805DC50:
ldrh r5, [r2, 0x2]
ldr r0, =gUnknown_020244BC
ldr r0, =gTransformedPersonalities
adds r0, r1, r0
ldr r6, [r0]
_0805DC58:
@@ -1510,7 +1510,7 @@ BattleLoadPlayerMonSpriteGfx: @ 805DD7C
.pool
_0805DDC0:
ldrh r5, [r2, 0x2]
ldr r0, =gUnknown_020244BC
ldr r0, =gTransformedPersonalities
adds r0, r1, r0
ldr r4, [r0]
_0805DDC8:
@@ -1670,8 +1670,8 @@ nullsub_24: @ 805DF34
bx lr
thumb_func_end nullsub_24
thumb_func_start sub_805DF38
sub_805DF38: @ 805DF38
thumb_func_start DecompressTrainerFrontPic
DecompressTrainerFrontPic: @ 805DF38
push {r4,lr}
adds r4, r0, 0
adds r0, r1, 0
@@ -1701,10 +1701,10 @@ sub_805DF38: @ 805DF38
pop {r0}
bx r0
.pool
thumb_func_end sub_805DF38
thumb_func_end DecompressTrainerFrontPic
thumb_func_start LoadBackTrainerBankSpriteGfx
LoadBackTrainerBankSpriteGfx: @ 805DF84
thumb_func_start DecompressTrainerBackPic
DecompressTrainerBackPic: @ 805DF84
push {r4,r5,lr}
adds r5, r0, 0
adds r4, r1, 0
@@ -1742,15 +1742,15 @@ LoadBackTrainerBankSpriteGfx: @ 805DF84
pop {r0}
bx r0
.pool
thumb_func_end LoadBackTrainerBankSpriteGfx
thumb_func_end DecompressTrainerBackPic
thumb_func_start nullsub_25
nullsub_25: @ 805DFE0
bx lr
thumb_func_end nullsub_25
thumb_func_start sub_805DFE4
sub_805DFE4: @ 805DFE4
thumb_func_start FreeTrainerFrontPicPalette
FreeTrainerFrontPicPalette: @ 805DFE4
push {lr}
lsls r0, 16
ldr r1, =gTrainerFrontPicPaletteTable
@@ -1761,7 +1761,7 @@ sub_805DFE4: @ 805DFE4
pop {r0}
bx r0
.pool
thumb_func_end sub_805DFE4
thumb_func_end FreeTrainerFrontPicPalette
thumb_func_start sub_805DFFC
sub_805DFFC: @ 805DFFC
@@ -2441,7 +2441,7 @@ _0805E59C:
adds r1, 0x4
adds r1, r2
ldr r1, [r1]
ldr r3, =gUnknown_020244BC
ldr r3, =gTransformedPersonalities
lsls r2, r7, 2
adds r2, r3
ldr r3, [r2]
@@ -2479,7 +2479,7 @@ _0805E618:
adds r1, 0x4
adds r1, r2
ldr r1, [r1]
ldr r3, =gUnknown_020244BC
ldr r3, =gTransformedPersonalities
lsls r2, r7, 2
adds r2, r3
ldr r3, [r2]
@@ -2795,8 +2795,8 @@ _0805E93E:
bx r0
thumb_func_end refresh_graphics_maybe
thumb_func_start sub_805E94C
sub_805E94C: @ 805E94C
thumb_func_start TrySetBehindSubstituteSpriteBit
TrySetBehindSubstituteSpriteBit: @ 805E94C
push {lr}
lsls r0, 24
lsrs r2, r0, 24
@@ -2817,7 +2817,7 @@ _0805E96C:
pop {r0}
bx r0
.pool
thumb_func_end sub_805E94C
thumb_func_end TrySetBehindSubstituteSpriteBit
thumb_func_start sub_805E974
sub_805E974: @ 805E974
@@ -3572,8 +3572,8 @@ _0805EF6A:
.pool
thumb_func_end sub_805EF14
thumb_func_start sub_805EF84
sub_805EF84: @ 805EF84
thumb_func_start ClearTemporarySpeciesSpriteData
ClearTemporarySpeciesSpriteData: @ 805EF84
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -3598,7 +3598,7 @@ _0805EFAC:
pop {r0}
bx r0
.pool
thumb_func_end sub_805EF84
thumb_func_end ClearTemporarySpeciesSpriteData
thumb_func_start AllocateMonSpritesGfx
AllocateMonSpritesGfx: @ 805EFBC
asm/battle_controller_linkopponent.s
+10 -10
View File
@@ -113,7 +113,7 @@ sub_8064470: @ 8064470
bne _080644C2
adds r0, r2, r5
ldrh r0, [r0, 0x6]
bl sub_805DFE4
bl FreeTrainerFrontPicPalette
ldrb r0, [r4]
adds r0, r6
ldrb r1, [r0]
@@ -3718,7 +3718,7 @@ sub_8066494: @ 8066494
lsls r1, 24
lsrs r1, 24
adds r0, r6, 0
bl sub_805EF84
bl ClearTemporarySpeciesSpriteData
ldr r0, =gBattlePartyID
lsls r4, r6, 1
adds r4, r0
@@ -4248,7 +4248,7 @@ _0806693A:
lsls r1, 2
adds r1, r6
ldrb r0, [r1, 0x13]
bl sub_806F000
bl PlayerGenderToFrontTrainerPicId
_08066948:
lsls r0, 16
lsrs r0, 16
@@ -4256,7 +4256,7 @@ _0806694C:
mov r8, r0
ldr r5, =gActiveBank
ldrb r1, [r5]
bl sub_805DF38
bl DecompressTrainerFrontPic
ldrb r0, [r5]
bl GetBankIdentity
adds r1, r0, 0
@@ -4385,7 +4385,7 @@ _08066A76:
mov r8, r0
ldr r6, =gActiveBank
ldrb r1, [r6]
bl sub_805DF38
bl DecompressTrainerFrontPic
ldrb r0, [r6]
bl GetBankIdentity
adds r1, r0, 0
@@ -4781,7 +4781,7 @@ _08066D32:
adds r0, 0x10
adds r1, r0
str r1, [r7]
ldr r2, =gUnknown_020244BC
ldr r2, =gTransformedPersonalities
ldrb r0, [r5]
lsls r0, 2
adds r0, r2
@@ -4790,7 +4790,7 @@ _08066D32:
mov r0, r8
ldrb r1, [r0]
adds r0, r6, 0
bl sub_805DB8C
bl IsMoveWithoutAnimation
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0
@@ -4991,7 +4991,7 @@ _08066FA8:
ldrb r2, [r2]
lsls r2, 8
orrs r1, r2
bl sub_805E94C
bl TrySetBehindSubstituteSpriteBit
ldr r0, [r7]
ldrb r1, [r6]
ldr r2, [r0, 0x4]
@@ -5028,7 +5028,7 @@ LinkOpponentHandlePrintString: @ 8066FF4
bl BufferStringBattle
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl sub_814F9EC
bl BattleHandleAddTextPrinter
ldr r1, =gBattleBankFunc
ldrb r0, [r5]
lsls r0, 2
@@ -5845,7 +5845,7 @@ sub_80676FC: @ 80676FC
push {r4,lr}
adds r4, r0, 0
ldrh r0, [r4, 0x6]
bl sub_805DFE4
bl FreeTrainerFrontPicPalette
adds r0, r4, 0
bl FreeSpriteOamMatrix
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 r1, r6
ldrb r1, [r1]
bl sub_805EF84
bl ClearTemporarySpeciesSpriteData
ldr r2, =gBattlePartyID
ldrb r0, [r5]
lsls r1, r0, 1
@@ -3314,7 +3314,7 @@ sub_814CC98: @ 814CC98
lsls r1, 24
lsrs r1, 24
adds r0, r6, 0
bl sub_805EF84
bl ClearTemporarySpeciesSpriteData
ldr r0, =gBattlePartyID
lsls r2, r6, 1
adds r2, r0
@@ -3696,7 +3696,7 @@ _0814D002:
ldr r5, =gActiveBank
ldrb r1, [r5]
adds r0, r4, 0
bl LoadBackTrainerBankSpriteGfx
bl DecompressTrainerBackPic
ldrb r0, [r5]
bl GetBankIdentity
adds r1, r0, 0
@@ -4107,7 +4107,7 @@ _0814D2CE:
adds r0, 0x10
adds r1, r0
str r1, [r7]
ldr r2, =gUnknown_020244BC
ldr r2, =gTransformedPersonalities
ldrb r0, [r5]
lsls r0, 2
adds r0, r2
@@ -4116,7 +4116,7 @@ _0814D2CE:
mov r0, r8
ldrb r1, [r0]
adds r0, r6, 0
bl sub_805DB8C
bl IsMoveWithoutAnimation
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0
@@ -4317,7 +4317,7 @@ _0814D544:
ldrb r2, [r2]
lsls r2, 8
orrs r1, r2
bl sub_805E94C
bl TrySetBehindSubstituteSpriteBit
ldr r0, [r7]
ldrb r1, [r6]
ldr r2, [r0, 0x4]
@@ -4354,7 +4354,7 @@ sub_814D590: @ 814D590
bl BufferStringBattle
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl sub_814F9EC
bl BattleHandleAddTextPrinter
ldr r1, =gBattleBankFunc
ldrb r0, [r5]
lsls r0, 2
asm/battle_controller_opponent.s
+14 -14
View File
@@ -112,7 +112,7 @@ sub_805F240: @ 805F240
bne _0805F292
adds r0, r2, r5
ldrh r0, [r0, 0x6]
bl sub_805DFE4
bl FreeTrainerFrontPicPalette
ldrb r0, [r4]
adds r0, r6
ldrb r1, [r0]
@@ -3879,7 +3879,7 @@ sub_80613DC: @ 80613DC
lsls r1, 24
lsrs r1, 24
adds r0, r6, 0
bl sub_805EF84
bl ClearTemporarySpeciesSpriteData
ldr r0, =gBattlePartyID
lsls r4, r6, 1
adds r4, r0
@@ -4311,7 +4311,7 @@ _080617CA:
ldr r5, =gActiveBank
ldrb r1, [r5]
mov r0, r8
bl sub_805DF38
bl DecompressTrainerFrontPic
ldrb r0, [r5]
bl GetBankIdentity
adds r1, r0, 0
@@ -4537,7 +4537,7 @@ _080619DE:
mov r8, r0
ldr r6, =gActiveBank
ldrb r1, [r6]
bl sub_805DF38
bl DecompressTrainerFrontPic
ldrb r0, [r6]
bl GetBankIdentity
adds r1, r0, 0
@@ -4928,14 +4928,14 @@ _08061C8A:
adds r1, 0x10
adds r2, r1
str r2, [r3]
ldr r3, =gUnknown_020244BC
ldr r3, =gTransformedPersonalities
ldrb r1, [r6]
lsls r1, 2
adds r1, r3
ldr r2, [r2]
str r2, [r1]
ldrb r1, [r5]
bl sub_805DB8C
bl IsMoveWithoutAnimation
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0
@@ -5130,7 +5130,7 @@ _08061EE8:
ldrb r2, [r2]
lsls r2, 8
orrs r1, r2
bl sub_805E94C
bl TrySetBehindSubstituteSpriteBit
ldr r0, [r7]
ldrb r1, [r6]
ldr r2, [r0, 0x4]
@@ -5167,7 +5167,7 @@ OpponentHandlePrintString: @ 8061F34
bl BufferStringBattle
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl sub_814F9EC
bl BattleHandleAddTextPrinter
ldr r1, =gBattleBankFunc
ldrb r0, [r5]
lsls r0, 2
@@ -5225,7 +5225,7 @@ OpponentHandleChooseMove: @ 8061FB8
movs r0, 0x1
movs r1, 0xA
_08061FD6:
bl EmitCmd33
bl EmitChoiceReturnValue
_08061FDA:
bl OpponentBufferExecCompleted
b _08062156
@@ -5329,7 +5329,7 @@ _0806209C:
movs r0, 0x1
movs r1, 0xA
adds r2, r4, 0
bl EmitCmd33
bl EmitChoiceReturnValue
b _08061FDA
.pool
_080620C4:
@@ -5360,7 +5360,7 @@ _080620C6:
movs r0, 0x1
movs r1, 0xA
adds r2, r4, 0
bl EmitCmd33
bl EmitChoiceReturnValue
b _08062152
.pool
_08062108:
@@ -5383,7 +5383,7 @@ _08062108:
orrs r2, r4
movs r0, 0x1
movs r1, 0xA
bl EmitCmd33
bl EmitChoiceReturnValue
b _08062152
.pool
_0806213C:
@@ -5395,7 +5395,7 @@ _0806213C:
orrs r2, r4
movs r0, 0x1
movs r1, 0xA
bl EmitCmd33
bl EmitChoiceReturnValue
_08062152:
bl OpponentBufferExecCompleted
_08062156:
@@ -6196,7 +6196,7 @@ sub_806280C: @ 806280C
push {r4,lr}
adds r4, r0, 0
ldrh r0, [r4, 0x6]
bl sub_805DFE4
bl FreeTrainerFrontPicPalette
adds r0, r4, 0
bl FreeSpriteOamMatrix
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
movs r0, 0x1
movs r1, 0xB
bl EmitCmd33
bl EmitChoiceReturnValue
strb r5, [r4]
bl IsDoubleBattle
lsls r0, 24
@@ -918,7 +918,7 @@ _081BB514:
lsrs r2, 16
movs r0, 0x1
movs r1, 0xB
bl EmitCmd33
bl EmitChoiceReturnValue
strb r5, [r4]
ldr r0, =sub_81BB628
str r0, [r6]
@@ -3840,7 +3840,7 @@ sub_81BD074: @ 81BD074
adds r6, r4, 0x2
adds r1, r6
ldrb r1, [r1]
bl sub_805EF84
bl ClearTemporarySpeciesSpriteData
ldr r2, =gBattlePartyID
ldrb r0, [r5]
lsls r1, r0, 1
@@ -3889,7 +3889,7 @@ sub_81BD0E4: @ 81BD0E4
lsls r1, 24
lsrs r1, 24
adds r0, r6, 0
bl sub_805EF84
bl ClearTemporarySpeciesSpriteData
ldr r0, =gBattlePartyID
lsls r2, r6, 1
adds r2, r0
@@ -4213,7 +4213,7 @@ _081BD3BE:
ldr r5, =gActiveBank
ldrb r1, [r5]
adds r0, r4, 0
bl LoadBackTrainerBankSpriteGfx
bl DecompressTrainerBackPic
ldrb r0, [r5]
bl GetBankIdentity
adds r1, r0, 0
@@ -4287,7 +4287,7 @@ _081BD494:
ldr r6, =gActiveBank
ldrb r1, [r6]
adds r0, r5, 0
bl sub_805DF38
bl DecompressTrainerFrontPic
ldrb r0, [r6]
bl GetBankIdentity
adds r1, r0, 0
@@ -4727,14 +4727,14 @@ _081BD7A2:
adds r1, 0x10
adds r2, r1
str r2, [r3]
ldr r3, =gUnknown_020244BC
ldr r3, =gTransformedPersonalities
ldrb r1, [r6]
lsls r1, 2
adds r1, r3
ldr r2, [r2]
str r2, [r1]
ldrb r1, [r5]
bl sub_805DB8C
bl IsMoveWithoutAnimation
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0
@@ -4929,7 +4929,7 @@ _081BDA00:
ldrb r2, [r2]
lsls r2, 8
orrs r1, r2
bl sub_805E94C
bl TrySetBehindSubstituteSpriteBit
ldr r0, [r7]
ldrb r1, [r6]
ldr r2, [r0, 0x4]
@@ -4966,7 +4966,7 @@ sub_81BDA4C: @ 81BDA4C
bl BufferStringBattle
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl sub_814F9EC
bl BattleHandleAddTextPrinter
ldr r1, =gBattleBankFunc
ldrb r0, [r4]
lsls r0, 2
@@ -5068,7 +5068,7 @@ _081BDB3C:
orrs r2, r5
movs r0, 0x1
movs r1, 0xA
bl EmitCmd33
bl EmitChoiceReturnValue
bl PlayerPartnerBufferExecCompleted
pop {r4-r6}
pop {r0}
asm/battle_controller_recorded_opponent.s
+12 -12
View File
@@ -129,7 +129,7 @@ sub_81865C8: @ 81865C8
bne _0818661A
adds r0, r2, r5
ldrh r0, [r0, 0x6]
bl sub_805DFE4
bl FreeTrainerFrontPicPalette
ldrb r0, [r4]
adds r0, r6
ldrb r1, [r0]
@@ -3716,7 +3716,7 @@ sub_81885D8: @ 81885D8
lsls r1, 24
lsrs r1, 24
adds r0, r6, 0
bl sub_805EF84
bl ClearTemporarySpeciesSpriteData
ldr r0, =gBattlePartyID
lsls r4, r6, 1
adds r4, r0
@@ -4078,7 +4078,7 @@ _08188910:
adds r0, r2
ldrb r0, [r0, 0x13]
_08188924:
bl sub_806F000
bl PlayerGenderToFrontTrainerPicId
_08188928:
lsls r0, 16
lsrs r0, 16
@@ -4086,7 +4086,7 @@ _0818892C:
mov r8, r0
ldr r5, =gActiveBank
ldrb r1, [r5]
bl sub_805DF38
bl DecompressTrainerFrontPic
ldrb r0, [r5]
bl GetBankIdentity
adds r1, r0, 0
@@ -4483,14 +4483,14 @@ _08188BE6:
adds r1, 0x10
adds r2, r1
str r2, [r3]
ldr r3, =gUnknown_020244BC
ldr r3, =gTransformedPersonalities
ldrb r1, [r6]
lsls r1, 2
adds r1, r3
ldr r2, [r2]
str r2, [r1]
ldrb r1, [r5]
bl sub_805DB8C
bl IsMoveWithoutAnimation
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0
@@ -4685,7 +4685,7 @@ _08188E44:
ldrb r2, [r2]
lsls r2, 8
orrs r1, r2
bl sub_805E94C
bl TrySetBehindSubstituteSpriteBit
ldr r0, [r7]
ldrb r1, [r6]
ldr r2, [r0, 0x4]
@@ -4722,7 +4722,7 @@ sub_8188E90: @ 8188E90
bl BufferStringBattle
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl sub_814F9EC
bl BattleHandleAddTextPrinter
ldr r1, =gBattleBankFunc
ldrb r0, [r4]
lsls r0, 2
@@ -4754,7 +4754,7 @@ sub_8188EF0: @ 8188EF0
lsrs r1, 24
movs r0, 0x1
movs r2, 0
bl EmitCmd33
bl EmitChoiceReturnValue
bl RecordedOpponentBufferExecCompleted
pop {r0}
bx r0
@@ -4785,7 +4785,7 @@ sub_8188F20: @ 8188F20
lsrs r2, 16
movs r0, 0x1
movs r1, 0xA
bl EmitCmd33
bl EmitChoiceReturnValue
b _08188F6C
.pool
_08188F48:
@@ -4803,7 +4803,7 @@ _08188F48:
orrs r2, r4
movs r0, 0x1
movs r1, 0xA
bl EmitCmd33
bl EmitChoiceReturnValue
_08188F6C:
bl RecordedOpponentBufferExecCompleted
pop {r4,r5}
@@ -5601,7 +5601,7 @@ sub_818962C: @ 818962C
push {r4,lr}
adds r4, r0, 0
ldrh r0, [r4, 0x6]
bl sub_805DFE4
bl FreeTrainerFrontPicPalette
adds r0, r4, 0
bl FreeSpriteOamMatrix
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 r1, r6
ldrb r1, [r1]
bl sub_805EF84
bl ClearTemporarySpeciesSpriteData
ldr r2, =gBattlePartyID
ldrb r0, [r5]
lsls r1, r0, 1
@@ -3690,7 +3690,7 @@ sub_818BA6C: @ 818BA6C
lsls r1, 24
lsrs r1, 24
adds r0, r6, 0
bl sub_805EF84
bl ClearTemporarySpeciesSpriteData
ldr r0, =gBattlePartyID
lsls r2, r6, 1
adds r2, r0
@@ -4063,14 +4063,14 @@ _0818BDC0:
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x8]
bl sub_806F000
bl PlayerGenderToFrontTrainerPicId
lsls r0, 16
lsrs r4, r0, 16
adds r5, r4, 0
ldr r6, =gActiveBank
ldrb r1, [r6]
adds r0, r5, 0
bl sub_805DF38
bl DecompressTrainerFrontPic
ldrb r0, [r6]
bl GetBankIdentity
adds r1, r0, 0
@@ -4182,7 +4182,7 @@ _0818BEDC:
ldr r5, =gActiveBank
ldrb r1, [r5]
adds r0, r4, 0
bl LoadBackTrainerBankSpriteGfx
bl DecompressTrainerBackPic
ldrb r0, [r5]
bl GetBankIdentity
adds r1, r0, 0
@@ -4583,14 +4583,14 @@ _0818C192:
adds r1, 0x10
adds r2, r1
str r2, [r3]
ldr r3, =gUnknown_020244BC
ldr r3, =gTransformedPersonalities
ldrb r1, [r6]
lsls r1, 2
adds r1, r3
ldr r2, [r2]
str r2, [r1]
ldrb r1, [r5]
bl sub_805DB8C
bl IsMoveWithoutAnimation
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0
@@ -4785,7 +4785,7 @@ _0818C3F0:
ldrb r2, [r2]
lsls r2, 8
orrs r1, r2
bl sub_805E94C
bl TrySetBehindSubstituteSpriteBit
ldr r0, [r7]
ldrb r1, [r6]
ldr r2, [r0, 0x4]
@@ -4822,7 +4822,7 @@ sub_818C43C: @ 818C43C
bl BufferStringBattle
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl sub_814F9EC
bl BattleHandleAddTextPrinter
ldr r1, =gBattleBankFunc
ldrb r0, [r4]
lsls r0, 2
@@ -4861,7 +4861,7 @@ sub_818C49C: @ 818C49C
lsrs r1, 24
movs r0, 0x1
movs r2, 0
bl EmitCmd33
bl EmitChoiceReturnValue
bl RecordedPlayerBufferExecCompleted
_0818C4C6:
pop {r0}
@@ -4897,7 +4897,7 @@ _0818C508:
lsrs r1, 24
movs r0, 0x1
movs r2, 0
bl EmitCmd33
bl EmitChoiceReturnValue
bl RecordedPlayerBufferExecCompleted
_0818C522:
pop {r0}
@@ -4929,7 +4929,7 @@ sub_818C538: @ 818C538
lsrs r2, 16
movs r0, 0x1
movs r1, 0xA
bl EmitCmd33
bl EmitChoiceReturnValue
b _0818C584
.pool
_0818C560:
@@ -4947,7 +4947,7 @@ _0818C560:
orrs r2, r4
movs r0, 0x1
movs r1, 0xA
bl EmitCmd33
bl EmitChoiceReturnValue
_0818C584:
bl RecordedPlayerBufferExecCompleted
pop {r4,r5}
asm/battle_controller_safari.s
+6 -6
View File
@@ -103,13 +103,13 @@ _0815942A:
movs r1, 0x7
_0815942E:
movs r2, 0
bl EmitCmd33
bl EmitChoiceReturnValue
b _08159440
_08159436:
movs r0, 0x1
movs r1, 0x8
movs r2, 0
bl EmitCmd33
bl EmitChoiceReturnValue
_08159440:
bl SafariBufferExecCompleted
b _0815954E
@@ -569,7 +569,7 @@ sub_8159800: @ 8159800
ldrb r0, [r0, 0x8]
ldr r5, =gActiveBank
ldrb r1, [r5]
bl LoadBackTrainerBankSpriteGfx
bl DecompressTrainerBackPic
ldr r0, [r4]
ldrb r6, [r0, 0x8]
ldrb r0, [r5]
@@ -792,7 +792,7 @@ dp01t_10_6_message: @ 81599DC
bl BufferStringBattle
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl sub_814F9EC
bl BattleHandleAddTextPrinter
ldr r1, =gBattleBankFunc
ldrb r0, [r4]
lsls r0, 2
@@ -862,7 +862,7 @@ sub_8159A94: @ 8159A94
str r1, [r0]
ldr r0, =gText_SafariZoneMenu
movs r1, 0x2
bl sub_814F9EC
bl BattleHandleAddTextPrinter
movs r4, 0
_08159AAE:
lsls r0, r4, 24
@@ -882,7 +882,7 @@ _08159AAE:
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0x1
bl sub_814F9EC
bl BattleHandleAddTextPrinter
pop {r4}
pop {r0}
bx r0
asm/battle_controller_wally.s
+11 -11
View File
@@ -121,7 +121,7 @@ _081684CE:
movs r1, 0x9
_081684E4:
movs r2, 0
bl EmitCmd33
bl EmitChoiceReturnValue
bl WallyBufferExecCompleted
ldr r1, [r4]
adds r1, 0x94
@@ -176,7 +176,7 @@ _08168540:
movs r0, 0x1
movs r1, 0x1
movs r2, 0
bl EmitCmd33
bl EmitChoiceReturnValue
bl WallyBufferExecCompleted
_08168564:
pop {r4,r5}
@@ -2998,7 +2998,7 @@ WallyHandleDrawTrainerPic: @ 8169EC8
ldr r4, =gActiveBank
ldrb r1, [r4]
movs r0, 0x6
bl LoadBackTrainerBankSpriteGfx
bl DecompressTrainerBackPic
ldrb r0, [r4]
bl GetBankIdentity
adds r1, r0, 0
@@ -3083,7 +3083,7 @@ WallyHandleTrainerSlide: @ 8169F94
ldr r4, =gActiveBank
ldrb r1, [r4]
movs r0, 0x6
bl LoadBackTrainerBankSpriteGfx
bl DecompressTrainerBackPic
ldrb r0, [r4]
bl GetBankIdentity
adds r1, r0, 0
@@ -3359,14 +3359,14 @@ WallyHandleMoveAnimation: @ 816A144
adds r1, 0x10
adds r2, r1
str r2, [r3]
ldr r3, =gUnknown_020244BC
ldr r3, =gTransformedPersonalities
ldrb r1, [r6]
lsls r1, 2
adds r1, r3
ldr r2, [r2]
str r2, [r1]
ldrb r1, [r5]
bl sub_805DB8C
bl IsMoveWithoutAnimation
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0
@@ -3538,7 +3538,7 @@ _0816A370:
ldrb r2, [r2]
lsls r2, 8
orrs r1, r2
bl sub_805E94C
bl TrySetBehindSubstituteSpriteBit
ldr r0, [r7]
ldrb r1, [r6]
ldr r2, [r0, 0x4]
@@ -3574,7 +3574,7 @@ WallyHandlePrintString: @ 816A3B8
bl BufferStringBattle
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl sub_814F9EC
bl BattleHandleAddTextPrinter
ldr r1, =gBattleBankFunc
ldrb r0, [r4]
lsls r0, 2
@@ -3644,7 +3644,7 @@ WallyHandleChooseAction: @ 816A470
str r1, [r0]
ldr r0, =gText_BattleMenu
movs r1, 0x2
bl sub_814F9EC
bl BattleHandleAddTextPrinter
movs r4, 0
_0816A48A:
lsls r0, r4, 24
@@ -3664,7 +3664,7 @@ _0816A48A:
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0x1
bl sub_814F9EC
bl BattleHandleAddTextPrinter
pop {r4}
pop {r0}
bx r0
@@ -3745,7 +3745,7 @@ _0816A550:
lsls r2, 1
movs r0, 0x1
movs r1, 0xA
bl EmitCmd33
bl EmitChoiceReturnValue
bl WallyBufferExecCompleted
_0816A574:
pop {r4}
asm/battle_frontier_1.s
+3 -3
View File
@@ -6956,7 +6956,7 @@ _08192574:
cmp r2, r0
bne _08192598
ldrb r0, [r1, 0x8]
bl sub_806F000
bl PlayerGenderToFrontTrainerPicId
lsls r0, 16
lsrs r0, 16
b _081925B6
@@ -8535,7 +8535,7 @@ _081932A2:
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x8]
bl sub_806F000
bl PlayerGenderToFrontTrainerPicId
lsls r0, 16
lsrs r0, 16
mov r2, r8
@@ -8621,7 +8621,7 @@ _0819335A:
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x8]
bl sub_806F000
bl PlayerGenderToFrontTrainerPicId
lsls r0, 16
lsrs r0, 16
b _081933B0
asm/battle_frontier_2.s
+10 -10
View File
@@ -20557,7 +20557,7 @@ _081A5306:
movs r1, 0
movs r2, 0x18
movs r3, 0xD
bl sub_8056A3C
bl HandleBattleWindow
b _081A553E
.pool
_081A531C:
@@ -20582,29 +20582,29 @@ _081A5328:
ldr r4, =gDisplayedStringBattle
adds r0, r4, 0
movs r1, 0xF
bl sub_814F9EC
bl BattleHandleAddTextPrinter
ldr r0, =gText_Vs
movs r1, 0x10
bl sub_814F9EC
bl BattleHandleAddTextPrinter
ldr r0, =gText_OpponentMon1Name
bl BattleStringExpandPlaceholdersToDisplayedString
adds r0, r4, 0
movs r1, 0x11
bl sub_814F9EC
bl BattleHandleAddTextPrinter
ldr r0, =gText_Mind
movs r1, 0x12
bl sub_814F9EC
bl BattleHandleAddTextPrinter
ldr r0, =gText_Skill
movs r1, 0x13
bl sub_814F9EC
bl BattleHandleAddTextPrinter
ldr r0, =gText_Body
movs r1, 0x14
bl sub_814F9EC
bl BattleHandleAddTextPrinter
ldr r0, =gText_Judgement
bl BattleStringExpandPlaceholdersToDisplayedString
adds r0, r4, 0
movs r1, 0x15
bl sub_814F9EC
bl BattleHandleAddTextPrinter
b _081A553E
.pool
_081A53B4:
@@ -20688,7 +20688,7 @@ _081A5464:
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0x15
bl sub_814F9EC
bl BattleHandleAddTextPrinter
ldrb r0, [r5]
adds r0, 0x1
strb r0, [r5]
@@ -20733,7 +20733,7 @@ _081A54D4:
movs r1, 0
movs r2, 0x18
movs r3, 0xD
bl sub_8056A3C
bl HandleBattleWindow
movs r0, 0
bl CopyBgTilemapBufferToVram
ldr r0, =gMPlay_BGM
asm/battle_transition.s
+1 -1
View File
@@ -4348,7 +4348,7 @@ sub_8148218: @ 8148218
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x8]
bl sub_806F000
bl PlayerGenderToFrontTrainerPicId
lsls r0, 24
lsrs r0, 24
movs r1, 0x88
asm/evolution_scene.s
+17 -17
View File
@@ -1338,7 +1338,7 @@ _0813E6E4:
bl StringExpandPlaceholders
adds r0, r4, 0
movs r1, 0
bl sub_814F9EC
bl BattleHandleAddTextPrinter
ldr r0, =gTasks
mov r2, r8
adds r1, r2, r7
@@ -1626,7 +1626,7 @@ _0813E99E:
bl StringExpandPlaceholders
adds r0, r4, 0
movs r1, 0
bl sub_814F9EC
bl BattleHandleAddTextPrinter
ldr r0, =0x00000173
bl PlayBGM
ldr r2, =gTasks
@@ -1868,7 +1868,7 @@ _0813EBE4:
_0813EBEC:
ldr r0, =gStringVar4
movs r1, 0
bl sub_814F9EC
bl BattleHandleAddTextPrinter
ldr r1, =gTasks
mov r2, r8
adds r0, r2, r7
@@ -1900,7 +1900,7 @@ _0813EC2A:
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl sub_814F9EC
bl BattleHandleAddTextPrinter
ldr r0, =gTasks
mov r3, r8
adds r1, r3, r7
@@ -1997,7 +1997,7 @@ _0813ED16:
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl sub_814F9EC
bl BattleHandleAddTextPrinter
ldr r0, =gTasks
mov r2, r8
adds r1, r2, r7
@@ -2026,7 +2026,7 @@ _0813ED62:
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl sub_814F9EC
bl BattleHandleAddTextPrinter
ldr r0, =gTasks
mov r3, r8
adds r1, r3, r7
@@ -2051,7 +2051,7 @@ _0813ED90:
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl sub_814F9EC
bl BattleHandleAddTextPrinter
ldr r0, =gTasks
mov r2, r8
adds r1, r2, r7
@@ -2084,10 +2084,10 @@ _0813EDEA:
movs r1, 0x8
movs r2, 0x1D
movs r3, 0xD
bl sub_8056A3C
bl HandleBattleWindow
ldr r0, =gText_BattleYesNoChoice
movs r1, 0xC
bl sub_814F9EC
bl BattleHandleAddTextPrinter
ldr r0, =gTasks
mov r3, r8
adds r1, r3, r7
@@ -2152,7 +2152,7 @@ _0813EE84:
movs r1, 0x8
movs r2, 0x1D
movs r3, 0xD
bl sub_8056A3C
bl HandleBattleWindow
movs r0, 0x5
bl PlaySE
ldr r0, =gBattleCommunication
@@ -2202,7 +2202,7 @@ _0813EF00:
movs r1, 0x8
movs r2, 0x1D
movs r3, 0xD
bl sub_8056A3C
bl HandleBattleWindow
movs r0, 0x5
bl PlaySE
ldr r1, =gTasks
@@ -2292,7 +2292,7 @@ _0813EFC8:
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl sub_814F9EC
bl BattleHandleAddTextPrinter
ldr r1, =gTasks
mov r2, r8
adds r0, r2, r7
@@ -2341,7 +2341,7 @@ _0813F05C:
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl sub_814F9EC
bl BattleHandleAddTextPrinter
ldr r0, =gTasks
mov r2, r8
adds r1, r2, r7
@@ -2370,7 +2370,7 @@ _0813F0AA:
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl sub_814F9EC
bl BattleHandleAddTextPrinter
ldr r0, =gTasks
mov r3, r8
adds r1, r3, r7
@@ -2398,7 +2398,7 @@ _0813F0D8:
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl sub_814F9EC
bl BattleHandleAddTextPrinter
ldr r1, =gTasks
mov r2, r8
adds r0, r2, r7
@@ -2414,7 +2414,7 @@ _0813F120:
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl sub_814F9EC
bl BattleHandleAddTextPrinter
ldr r1, =gTasks
mov r3, r8
adds r0, r3, r7
@@ -2434,7 +2434,7 @@ _0813F154:
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl sub_814F9EC
bl BattleHandleAddTextPrinter
ldr r1, =gTasks
mov r2, r8
adds r0, r2, r7
asm/pokedex.s
+1 -1
View File
@@ -7923,7 +7923,7 @@ _080BF982:
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x8]
bl sub_806F000
bl PlayerGenderToFrontTrainerPicId
lsls r0, 16
lsrs r0, 16
movs r1, 0x98
asm/rom_80A5C6C.s
+4 -4
View File
@@ -217,7 +217,7 @@ _080A5E04:
b _080A5E42
.pool
_080A5E3C:
ldr r0, =gUnknown_020244BC
ldr r0, =gTransformedPersonalities
adds r0, r1, r0
ldr r2, [r0]
_080A5E42:
@@ -307,7 +307,7 @@ _080A5EC8:
b _080A5F0A
.pool
_080A5F04:
ldr r0, =gUnknown_020244BC
ldr r0, =gTransformedPersonalities
adds r0, r1, r0
ldr r2, [r0]
_080A5F0A:
@@ -5522,7 +5522,7 @@ _080A86C4:
.pool
_080A871C:
ldrh r7, [r1, 0x2]
ldr r0, =gUnknown_020244BC
ldr r0, =gTransformedPersonalities
adds r0, r2, r0
ldr r2, [r0]
_080A8724:
@@ -5612,7 +5612,7 @@ _080A8790:
.pool
_080A87DC:
ldrh r7, [r1, 0x2]
ldr r0, =gUnknown_020244BC
ldr r0, =gTransformedPersonalities
adds r0, r2, r0
ldr r2, [r0]
_080A87E4: