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

Merge branch 'master' into easy_chat

Browse Source
This commit is contained in:
PikalaxALT
2017-11-02 18:34:41 -04:00
parent 975e28c01e af197ccd3b
commit ed7ded0748
147 changed files with 37165 additions and 72938 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/bard_music.s
-130
View File
@@ -1,130 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_817C7DC
sub_817C7DC: @ 817C7DC
ldr r2, =gUnknown_0860A320
lsls r0, 2
adds r0, r2
ldr r0, [r0]
lsls r1, 1
adds r1, r0
movs r2, 0
ldrsh r0, [r1, r2]
bx lr
.pool
thumb_func_end sub_817C7DC
thumb_func_start sub_817C7F4
sub_817C7F4: @ 817C7F4
push {r4,r5,lr}
lsls r4, r0, 16
lsrs r5, r4, 16
adds r0, r5, 0
bl sub_811EB10
lsls r0, 24
cmp r0, 0
beq _0817C810
ldr r0, =gUnknown_0860A3AC
b _0817C84E
.pool
_0817C810:
lsrs r0, r4, 25
ldr r2, =0x000001ff
ands r2, r5
cmp r0, 0x13
bhi _0817C828
cmp r0, 0x12
bcs _0817C834
cmp r0, 0
beq _0817C82C
b _0817C83C
.pool
_0817C828:
cmp r0, 0x15
bne _0817C83C
_0817C82C:
ldr r1, =gUnknown_085F5494
b _0817C844
.pool
_0817C834:
ldr r1, =gUnknown_085FA1D8
b _0817C844
.pool
_0817C83C:
ldr r1, =gUnknown_0860A168
lsls r0, 2
adds r0, r1
ldr r1, [r0]
_0817C844:
lsls r0, r2, 1
adds r0, r2
lsls r0, 4
adds r1, r0
adds r0, r1, 0
_0817C84E:
pop {r4,r5}
pop {r1}
bx r1
.pool
thumb_func_end sub_817C7F4
thumb_func_start sub_817C858
sub_817C858: @ 817C858
push {r4-r7,lr}
mov r7, r8
push {r7}
adds r5, r0, 0
lsls r1, 16
lsrs r7, r1, 16
movs r0, 0
strh r0, [r5, 0x4]
movs r6, 0
ldr r0, =gUnknown_0860A3DC
mov r8, r0
adds r4, r5, 0
adds r4, 0x18
_0817C872:
lsls r0, r6, 3
ldr r1, [r5, 0x30]
adds r2, r1, r0
ldrb r0, [r2]
cmp r0, 0xFF
beq _0817C8A0
movs r1, 0x1
ldrsb r1, [r2, r1]
lsls r0, 2
add r0, r8
ldr r0, [r0]
adds r1, r0
strh r1, [r4]
adds r0, r7, 0
adds r0, 0x1E
adds r1, r6, 0
bl sub_817C7DC
strh r0, [r4, 0x2]
ldrh r0, [r4]
ldrh r1, [r5, 0x4]
adds r0, r1
strh r0, [r5, 0x4]
_0817C8A0:
adds r4, 0x4
adds r6, 0x1
cmp r6, 0x5
ble _0817C872
movs r0, 0
strb r0, [r5, 0x1]
strh r0, [r5, 0xA]
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_817C858
.align 2, 0 @ Don't pad with nop.
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
+41 -41
View File
@@ -67,8 +67,8 @@ _0805D192:
.pool
thumb_func_end FreeBattleSpritesData
thumb_func_start sub_805D19C
sub_805D19C: @ 805D19C
thumb_func_start ChooseMoveAndTargetInBattlePalace
ChooseMoveAndTargetInBattlePalace: @ 805D19C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -448,7 +448,7 @@ _0805D496:
pop {r1}
bx r1
.pool
thumb_func_end sub_805D19C
thumb_func_end ChooseMoveAndTargetInBattlePalace
thumb_func_start sub_805D4A8
sub_805D4A8: @ 805D4A8
@@ -834,8 +834,8 @@ _0805D800:
.pool
thumb_func_end sub_805D7EC
thumb_func_start move_anim_start_t2_for_situation
move_anim_start_t2_for_situation: @ 805D808
thumb_func_start DoStatusAnimation
DoStatusAnimation: @ 805D808
push {r4-r6,lr}
adds r4, r1, 0
lsls r0, 24
@@ -962,10 +962,10 @@ _0805D902:
pop {r4-r6}
pop {r0}
bx r0
thumb_func_end move_anim_start_t2_for_situation
thumb_func_end DoStatusAnimation
thumb_func_start move_anim_start_t3
move_anim_start_t3: @ 805D908
thumb_func_start DoBattleAnimationFromTable
DoBattleAnimationFromTable: @ 805D908
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -1070,7 +1070,7 @@ _0805D9CC:
ldr r0, =gUnknown_082C9320
adds r1, r5, 0
movs r2, 0
bl DoBattleAnim
bl LaunchBattleAnimation
ldr r0, =task0A_0803415C
movs r1, 0xA
bl CreateTask
@@ -1105,7 +1105,7 @@ _0805DA1E:
pop {r1}
bx r1
.pool
thumb_func_end move_anim_start_t3
thumb_func_end DoBattleAnimationFromTable
thumb_func_start task0A_0803415C
task0A_0803415C: @ 805DA48
@@ -1172,8 +1172,8 @@ _0805DABE:
bx r1
thumb_func_end sub_805DAA0
thumb_func_start move_anim_start_t4
move_anim_start_t4: @ 805DAC4
thumb_func_start DoSpecialBattleAnimation
DoSpecialBattleAnimation: @ 805DAC4
push {r4,lr}
adds r4, r0, 0
lsls r4, 24
@@ -1187,7 +1187,7 @@ move_anim_start_t4: @ 805DAC4
ldr r0, =gUnknown_082C937C
adds r1, r3, 0
movs r2, 0
bl DoBattleAnim
bl LaunchBattleAnimation
ldr r0, =task0A_08034248
movs r1, 0xA
bl CreateTask
@@ -1216,7 +1216,7 @@ move_anim_start_t4: @ 805DAC4
pop {r0}
bx r0
.pool
thumb_func_end move_anim_start_t4
thumb_func_end DoSpecialBattleAnimation
thumb_func_start task0A_08034248
task0A_08034248: @ 805DB34
@@ -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
@@ -2229,8 +2229,8 @@ _0805E3EA:
.pool
thumb_func_end sub_805E394
thumb_func_start sub_805E408
sub_805E408: @ 805E408
thumb_func_start CopyBattleSpriteInvisibility
CopyBattleSpriteInvisibility: @ 805E408
lsls r0, 24
lsrs r0, 24
ldr r1, =gBattleSpritesDataPtr
@@ -2258,7 +2258,7 @@ sub_805E408: @ 805E408
strb r0, [r3]
bx lr
.pool
thumb_func_end sub_805E408
thumb_func_end CopyBattleSpriteInvisibility
thumb_func_start sub_805E448
sub_805E448: @ 805E448
@@ -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
@@ -3111,7 +3111,7 @@ sub_805EB9C: @ 805EB9C
_0805EBC8:
lsls r0, r5, 24
lsrs r0, 24
bl AnimBankSpriteExists
bl IsBankSpritePresent
lsls r0, 24
cmp r0, 0
beq _0805EC60
@@ -3329,7 +3329,7 @@ sub_805ED70: @ 805ED70
cmp r0, 0
beq _0805EDAC
adds r0, r4, 0
bl AnimBankSpriteExists
bl IsBankSpritePresent
lsls r0, 24
cmp r0, 0
bne _0805EDC0
@@ -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/rom_80A5C6C.s → asm/battle_anim_80A5C6C.s
+9 -9
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:
@@ -726,7 +726,7 @@ GetAnimBankSpriteId: @ 80A6240
bne _080A6268
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
bl AnimBankSpriteExists
bl IsBankSpritePresent
lsls r0, 24
cmp r0, 0
beq _080A62B6
@@ -739,7 +739,7 @@ _080A6268:
bne _080A6288
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
bl AnimBankSpriteExists
bl IsBankSpritePresent
lsls r0, 24
cmp r0, 0
beq _080A62B6
@@ -1862,8 +1862,8 @@ _080A6A7E:
.pool
thumb_func_end GetBankByIdentity
thumb_func_start AnimBankSpriteExists
AnimBankSpriteExists: @ 80A6A90
thumb_func_start IsBankSpritePresent
IsBankSpritePresent: @ 80A6A90
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -1926,7 +1926,7 @@ _080A6B1A:
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end AnimBankSpriteExists
thumb_func_end IsBankSpritePresent
thumb_func_start IsDoubleBattle
IsDoubleBattle: @ 80A6B20
@@ -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:
asm/battle_anim_80A9C70.s
+1 -1
View File
@@ -869,7 +869,7 @@ move_anim_start_t2: @ 80AA364
strb r4, [r0]
ldr r0, =gUnknown_082C92FC
movs r2, 0
bl DoBattleAnim
bl LaunchBattleAnimation
ldr r0, =task0A_80788BC
movs r1, 0xA
bl CreateTask
asm/battle_anim_80FE840.s
+3 -3
View File
@@ -50443,8 +50443,8 @@ _081181CA:
bx r1
thumb_func_end sub_8118140
thumb_func_start battle_intro_launch
battle_intro_launch: @ 81181D4
thumb_func_start HandleIntroSlide
HandleIntroSlide: @ 81181D4
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -50521,7 +50521,7 @@ _08118258:
pop {r0}
bx r0
.pool
thumb_func_end battle_intro_launch
thumb_func_end HandleIntroSlide
thumb_func_start sub_811828C
sub_811828C: @ 811828C
asm/battle_controller_linkopponent.s
-6266
View File
File diff suppressed because it is too large Load Diff
asm/battle_controller_linkpartner.s
-5647
View File
File diff suppressed because it is too large Load Diff
asm/battle_controller_opponent.s
-6676
View File
File diff suppressed because it is too large Load Diff
asm/battle_controller_player.s
-10419
View File
File diff suppressed because it is too large Load Diff
asm/battle_controller_player_partner.s
-6347
View File
File diff suppressed because it is too large Load Diff
asm/battle_controller_recorded_opponent.s
-5969
View File
File diff suppressed because it is too large Load Diff
asm/battle_controller_recorded_player.s
-6144
View File
File diff suppressed because it is too large Load Diff
asm/battle_controller_safari.s
-1412
View File
File diff suppressed because it is too large Load Diff
asm/battle_controller_wally.s
-4787
View File
File diff suppressed because it is too large Load Diff
asm/battle_frontier_1.s
+6 -6
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
@@ -6971,7 +6971,7 @@ _08192598:
.pool
_081925AC:
ldr r0, [sp, 0x24]
bl sub_8162AA0
bl GetFrontierTrainerFrontSpriteId
_081925B2:
lsls r0, 24
lsrs r0, 24
@@ -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
@@ -8554,7 +8554,7 @@ _081932D4:
_081932E4:
lsls r0, r1, 16
lsrs r0, 16
bl sub_8162AA0
bl GetFrontierTrainerFrontSpriteId
_081932EC:
lsls r0, 24
lsrs r0, 24
@@ -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
@@ -8642,7 +8642,7 @@ _08193388:
_081933A4:
lsls r0, r1, 16
lsrs r0, 16
bl sub_8162AA0
bl GetFrontierTrainerFrontSpriteId
lsls r0, 24
lsrs r0, 24
_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_link_817C95C.s
+5 -98
View File
@@ -110,7 +110,7 @@ _0817CA4C:
ldr r1, =gStringInfo
ldr r1, [r1]
ldrh r1, [r1]
bl sub_817F33C
bl GetBankMoveSlotId
lsls r0, 24
lsrs r0, 24
mov r10, r0
@@ -2572,7 +2572,7 @@ _0817E122:
mov r1, r10
ldrb r0, [r1]
adds r1, r7, 0
bl sub_817F33C
bl GetBankMoveSlotId
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0x3
@@ -4793,8 +4793,8 @@ _0817F324:
.pool
thumb_func_end sub_817F2A8
thumb_func_start sub_817F33C
sub_817F33C: @ 817F33C
thumb_func_start GetBankMoveSlotId
GetBankMoveSlotId: @ 817F33C
push {r4-r7,lr}
lsls r0, 24
lsrs r5, r0, 24
@@ -4835,7 +4835,7 @@ _0817F388:
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_817F33C
thumb_func_end GetBankMoveSlotId
thumb_func_start sub_817F394
sub_817F394: @ 817F394
@@ -4888,97 +4888,4 @@ _0817F3E6:
bx r0
thumb_func_end sub_817F394
thumb_func_start nullsub_69
nullsub_69: @ 817F3EC
bx lr
thumb_func_end nullsub_69
thumb_func_start sub_817F3F0
sub_817F3F0: @ 817F3F0
push {r4-r6,lr}
mov r6, r9
mov r5, r8
push {r5,r6}
sub sp, 0x4
mov r9, r0
mov r8, r1
adds r5, r2, 0
adds r4, r3, 0
lsls r5, 16
negs r5, r5
lsls r4, 16
negs r4, r4
lsrs r4, 16
mov r0, r8
lsls r0, 16
asrs r0, 16
mov r8, r0
asrs r5, 16
adds r1, r5, 0
bl Cos
adds r6, r0, 0
lsls r4, 16
asrs r4, 16
mov r0, r8
adds r1, r4, 0
bl Sin
subs r6, r0
lsls r6, 16
lsrs r6, 16
mov r0, r8
adds r1, r4, 0
bl Cos
adds r2, r0, 0
mov r0, r8
adds r1, r5, 0
str r2, [sp]
bl Sin
ldr r2, [sp]
adds r2, r0
negs r5, r5
negs r4, r4
lsls r6, 16
asrs r6, 16
lsls r5, 16
asrs r5, 16
adds r6, r5
mov r0, r9
strh r6, [r0, 0x24]
lsls r2, 16
asrs r2, 16
lsls r4, 16
asrs r4, 16
adds r2, r4
strh r2, [r0, 0x26]
add sp, 0x4
pop {r3,r4}
mov r8, r3
mov r9, r4
pop {r4-r6}
pop {r0}
bx r0
thumb_func_end sub_817F3F0
thumb_func_start GetSpeciesBackAnimId
GetSpeciesBackAnimId: @ 817F474
push {lr}
lsls r0, 16
lsrs r0, 16
ldr r1, =gUnknown_0860A8C8
adds r0, r1
ldrb r0, [r0]
cmp r0, 0
bne _0817F48C
movs r0, 0
b _0817F492
.pool
_0817F48C:
subs r0, 0x1
lsls r0, 24
lsrs r0, 24
_0817F492:
pop {r1}
bx r1
thumb_func_end GetSpeciesBackAnimId
.align 2, 0 @ Don't pad with nop.
asm/battle_tower.s
+6 -6
View File
@@ -1329,8 +1329,8 @@ _08162A8A:
.pool
thumb_func_end sub_81628A0
thumb_func_start sub_8162AA0
sub_8162AA0: @ 8162AA0
thumb_func_start GetFrontierTrainerFrontSpriteId
GetFrontierTrainerFrontSpriteId: @ 8162AA0
push {r4,r5,lr}
lsls r0, 16
lsrs r4, r0, 16
@@ -1454,7 +1454,7 @@ _08162BCA:
pop {r1}
bx r1
.pool
thumb_func_end sub_8162AA0
thumb_func_end GetFrontierTrainerFrontSpriteId
thumb_func_start GetFrontierOpponentClass
GetFrontierOpponentClass: @ 8162BD8
@@ -5843,8 +5843,8 @@ _08165206:
.pool
thumb_func_end sub_816515C
thumb_func_start sub_8165244
sub_8165244: @ 8165244
thumb_func_start GetEreaderTrainerFrontSpriteId
GetEreaderTrainerFrontSpriteId: @ 8165244
ldr r1, =gUnknown_0831F578
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
@@ -5855,7 +5855,7 @@ sub_8165244: @ 8165244
ldrb r0, [r0]
bx lr
.pool
thumb_func_end sub_8165244
thumb_func_end GetEreaderTrainerFrontSpriteId
thumb_func_start GetEreaderTrainerClassId
GetEreaderTrainerClassId: @ 8165264
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/contest_link_80F57C4.s
+1 -1
View File
@@ -1415,7 +1415,7 @@ _080F64F2:
adds r0, r6, 0
adds r1, r5, 0
adds r2, r4, 0
bl sub_806E7CC
bl GetMonSpritePalStructFromOtIdPersonality
adds r4, r0, 0
bl LoadCompressedObjectPalette
adds r0, r6, 0
asm/easy_chat.s
+3 -3
View File
@@ -8984,8 +8984,8 @@ _0811EB0A:
bx r1
thumb_func_end sub_811EAA4
thumb_func_start sub_811EB10
sub_811EB10: @ 811EB10
thumb_func_start ECWord_CheckIfOutsideOfValidRange
ECWord_CheckIfOutsideOfValidRange: @ 811EB10
push {lr}
lsls r0, 16
lsrs r2, r0, 25
@@ -9029,7 +9029,7 @@ _0811EB5C:
_0811EB5E:
pop {r1}
bx r1
thumb_func_end sub_811EB10
thumb_func_end ECWord_CheckIfOutsideOfValidRange
thumb_func_start GetEasyChatWord
@ char *GetEasyChatWord(u8 groupId, u16 wordId)
asm/evolution_graphics.s
-1751
View File
File diff suppressed because it is too large Load Diff
asm/evolution_scene.s
-4216
View File
File diff suppressed because it is too large Load Diff
asm/field_effect.s
+1 -1
View File
@@ -694,7 +694,7 @@ sub_80B5FE8: @ 80B5FE8
lsls r5, 16
lsrs r5, 16
adds r0, r6, 0
bl sub_806E7CC
bl GetMonSpritePalStructFromOtIdPersonality
mov r8, r0
lsls r4, 16
asrs r4, 16
asm/item_menu.s
+3 -3
View File
@@ -47,14 +47,14 @@ sub_81AABB0: @ 81AABB0
lsls r0, 24
cmp r0, 0
bne _081AABCC
ldr r2, =sub_8059D50
ldr r2, =SetCB2ToReshowScreenAfterMenu2
movs r0, 0x1
movs r1, 0x5
bl GoToBagMenu
b _081AABD4
.pool
_081AABCC:
ldr r1, =sub_8059D50
ldr r1, =SetCB2ToReshowScreenAfterMenu2
movs r0, 0x1
bl sub_81C4F98
_081AABD4:
@@ -5634,7 +5634,7 @@ DoWallyTutorialBagMenu: @ 81ADD70
movs r0, 0x4
movs r1, 0x1
bl AddBagItem
ldr r2, =sub_8059D50
ldr r2, =SetCB2ToReshowScreenAfterMenu2
movs r0, 0xA
movs r1, 0
bl GoToBagMenu
asm/math_util.s
-202
View File
@@ -1,202 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_8151534
sub_8151534: @ 8151534
push {lr}
lsls r0, 16
asrs r0, 16
lsls r1, 16
asrs r1, 16
muls r0, r1
adds r1, r0, 0
cmp r0, 0
bge _08151548
adds r1, 0xFF
_08151548:
lsls r0, r1, 8
asrs r0, 16
pop {r1}
bx r1
thumb_func_end sub_8151534
thumb_func_start sub_8151550
sub_8151550: @ 8151550
push {lr}
adds r3, r1, 0
lsls r0, 24
lsrs r0, 24
lsls r3, 16
asrs r3, 16
lsls r2, 16
asrs r2, 16
muls r3, r2
movs r1, 0x1
lsls r1, r0
adds r0, r3, 0
bl __divsi3
lsls r0, 16
asrs r0, 16
pop {r1}
bx r1
thumb_func_end sub_8151550
thumb_func_start sub_8151574
sub_8151574: @ 8151574
push {r4-r7,lr}
adds r2, r1, 0
adds r4, r0, 0
asrs r5, r0, 31
asrs r3, r2, 31
adds r1, r5, 0
adds r0, r4, 0
bl __muldi3
adds r5, r1, 0
adds r4, r0, 0
adds r7, r5, 0
adds r6, r4, 0
cmp r5, 0
bge _0815159A
movs r6, 0xFF
movs r7, 0
adds r6, r4
adcs r7, r5
_0815159A:
lsls r3, r7, 24
lsrs r2, r6, 8
adds r0, r3, 0
orrs r0, r2
asrs r1, r7, 8
adds r5, r1, 0
adds r4, r0, 0
adds r0, r4, 0
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_8151574
thumb_func_start sub_81515B0
sub_81515B0: @ 81515B0
push {lr}
lsls r0, 16
lsrs r0, 16
lsls r1, 16
asrs r1, 16
cmp r1, 0
beq _081515CC
lsls r0, 16
asrs r0, 8
bl __divsi3
lsls r0, 16
asrs r0, 16
b _081515CE
_081515CC:
movs r0, 0
_081515CE:
pop {r1}
bx r1
thumb_func_end sub_81515B0
thumb_func_start sub_81515D4
sub_81515D4: @ 81515D4
push {lr}
lsls r0, 24
lsrs r3, r0, 24
lsls r1, 16
lsrs r0, r1, 16
lsls r2, 16
asrs r1, r2, 16
cmp r1, 0
beq _081515F6
lsls r0, 16
asrs r0, 16
lsls r0, r3
bl __divsi3
lsls r0, 16
asrs r0, 16
b _081515F8
_081515F6:
movs r0, 0
_081515F8:
pop {r1}
bx r1
thumb_func_end sub_81515D4
thumb_func_start sub_81515FC
sub_81515FC: @ 81515FC
push {r4-r6,lr}
adds r6, r1, 0
cmp r6, 0
beq _0815161C
adds r2, r0, 0
asrs r3, r0, 31
lsrs r5, r2, 24
lsls r4, r3, 8
adds r1, r5, 0
orrs r1, r4
lsls r0, r2, 8
adds r2, r6, 0
asrs r3, r6, 31
bl __divdi3
b _0815161E
_0815161C:
movs r0, 0
_0815161E:
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end sub_81515FC
thumb_func_start sub_8151624
sub_8151624: @ 8151624
push {lr}
adds r1, r0, 0
movs r0, 0x80
lsls r0, 9
lsls r1, 16
asrs r1, 16
bl __divsi3
lsls r0, 16
asrs r0, 16
pop {r1}
bx r1
thumb_func_end sub_8151624
thumb_func_start sub_815163C
sub_815163C: @ 815163C
push {lr}
lsls r0, 24
lsrs r0, 24
movs r2, 0x80
lsls r2, 1
lsls r2, r0
lsls r1, 16
asrs r1, 16
adds r0, r2, 0
bl __divsi3
lsls r0, 16
asrs r0, 16
pop {r1}
bx r1
thumb_func_end sub_815163C
thumb_func_start sub_815165C
sub_815165C: @ 815165C
push {lr}
adds r2, r0, 0
ldr r1, _08151674
ldr r0, _08151670
asrs r3, r2, 31
bl __divdi3
pop {r1}
bx r1
.align 2, 0
_08151670: .4byte 0x00010000
_08151674: .4byte 0x00000000
thumb_func_end sub_815165C
.align 2, 0 @ Don't pad with nop.
asm/mauville_old_man.s
+2 -2
View File
@@ -883,7 +883,7 @@ _081207BC:
adds r0, r1
ldrh r4, [r0]
adds r0, r4, 0
bl sub_817C7F4
bl GetWordSounds
str r0, [r6, 0x30]
movs r1, 0x3
ands r1, r4
@@ -892,7 +892,7 @@ _081207BC:
ands r4, r0
adds r1, r4
adds r0, r6, 0
bl sub_817C858
bl GetWordPhonemes
ldrb r0, [r6]
adds r0, 0x1
strb r0, [r6]
asm/party_menu.s
+4 -4
View File
@@ -13861,7 +13861,7 @@ sub_81B7810: @ 81B7810
cmp r4, 0
beq _081B7860
bl sub_81B06F4
ldr r0, =gUnknown_030061E8
ldr r0, =gCB2_AfterEvolution
ldr r1, [r6]
str r1, [r0]
ldrb r3, [r6, 0x9]
@@ -14307,7 +14307,7 @@ sub_81B7C74: @ 81B7C74
lsrs r5, r0, 24
movs r0, 0x5
bl PlaySE
ldr r2, =gUnknown_030061E8
ldr r2, =gCB2_AfterEvolution
ldr r1, =gUnknown_0203CEC8
ldr r0, [r1]
str r0, [r2]
@@ -15908,7 +15908,7 @@ sub_81B89AC: @ 81B89AC
str r0, [sp]
ldr r0, =sub_81B1370
str r0, [sp, 0x4]
ldr r0, =sub_8059D40
ldr r0, =SetCB2ToReshowScreenAfterMenu
str r0, [sp, 0x8]
movs r0, 0x1
adds r2, r4, 0
@@ -16828,7 +16828,7 @@ _081B9136:
thumb_func_start sub_81B9140
sub_81B9140: @ 81B9140
push {lr}
ldr r0, =sub_8059D40
ldr r0, =SetCB2ToReshowScreenAfterMenu
bl SetMainCallback2
pop {r0}
bx r0
asm/pokeball.s
+3 -3
View File
@@ -2685,8 +2685,8 @@ _080769EA:
.pool
thumb_func_end sub_80769CC
thumb_func_start sub_80769F4
sub_80769F4: @ 80769F4
thumb_func_start DoHitAnimHealthboxEffect
DoHitAnimHealthboxEffect: @ 80769F4
push {r4,r5,lr}
adds r4, r0, 0
lsls r4, 24
@@ -2714,7 +2714,7 @@ sub_80769F4: @ 80769F4
pop {r0}
bx r0
.pool
thumb_func_end sub_80769F4
thumb_func_end DoHitAnimHealthboxEffect
thumb_func_start oamc_804BEB4
oamc_804BEB4: @ 8076A38
asm/pokeblock_feed.s
+1 -1
View File
@@ -348,7 +348,7 @@ _08179E84:
adds r1, r0, 0
adds r0, r5, 0
adds r2, r4, 0
bl sub_806E7CC
bl GetMonSpritePalStructFromOtIdPersonality
adds r4, r0, 0
bl LoadCompressedObjectPalette
ldrh r0, [r4, 0x4]
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/pokemon_animation.s
+94
View File
@@ -4,6 +4,100 @@
.syntax unified
.text
thumb_func_start nullsub_69
nullsub_69: @ 817F3EC
bx lr
thumb_func_end nullsub_69
thumb_func_start sub_817F3F0
sub_817F3F0: @ 817F3F0
push {r4-r6,lr}
mov r6, r9
mov r5, r8
push {r5,r6}
sub sp, 0x4
mov r9, r0
mov r8, r1
adds r5, r2, 0
adds r4, r3, 0
lsls r5, 16
negs r5, r5
lsls r4, 16
negs r4, r4
lsrs r4, 16
mov r0, r8
lsls r0, 16
asrs r0, 16
mov r8, r0
asrs r5, 16
adds r1, r5, 0
bl Cos
adds r6, r0, 0
lsls r4, 16
asrs r4, 16
mov r0, r8
adds r1, r4, 0
bl Sin
subs r6, r0
lsls r6, 16
lsrs r6, 16
mov r0, r8
adds r1, r4, 0
bl Cos
adds r2, r0, 0
mov r0, r8
adds r1, r5, 0
str r2, [sp]
bl Sin
ldr r2, [sp]
adds r2, r0
negs r5, r5
negs r4, r4
lsls r6, 16
asrs r6, 16
lsls r5, 16
asrs r5, 16
adds r6, r5
mov r0, r9
strh r6, [r0, 0x24]
lsls r2, 16
asrs r2, 16
lsls r4, 16
asrs r4, 16
adds r2, r4
strh r2, [r0, 0x26]
add sp, 0x4
pop {r3,r4}
mov r8, r3
mov r9, r4
pop {r4-r6}
pop {r0}
bx r0
thumb_func_end sub_817F3F0
thumb_func_start GetSpeciesBackAnimId
GetSpeciesBackAnimId: @ 817F474
push {lr}
lsls r0, 16
lsrs r0, 16
ldr r1, =gUnknown_0860A8C8
adds r0, r1
ldrb r0, [r0]
cmp r0, 0
bne _0817F48C
movs r0, 0
b _0817F492
.pool
_0817F48C:
subs r0, 0x1
lsls r0, 24
lsrs r0, 24
_0817F492:
pop {r1}
bx r1
thumb_func_end GetSpeciesBackAnimId
thumb_func_start sub_817F498
sub_817F498: @ 817F498
asm/pokemon_summary_screen.s
+2 -2
View File
@@ -1087,7 +1087,7 @@ _081C4750:
ldrh r0, [r5, 0x2]
ldr r1, [r5, 0x48]
ldr r2, [r5, 0xC]
bl sub_806E7CC
bl GetMonSpritePalStructFromOtIdPersonality
adds r4, r0, 0
bl LoadCompressedObjectPalette
ldrh r0, [r4, 0x4]
@@ -2035,7 +2035,7 @@ sub_81C4EFC: @ 81C4EFC
thumb_func_start sub_81C4F10
sub_81C4F10: @ 81C4F10
push {lr}
ldr r1, =sub_8059D50
ldr r1, =SetCB2ToReshowScreenAfterMenu2
movs r0, 0x1
bl sub_81C4F98
pop {r0}
asm/recorded_battle.s
+5 -5
View File
@@ -312,8 +312,8 @@ _08185046:
.pool
thumb_func_end RecordedBattle_ClearBankAction
thumb_func_start sub_8185054
sub_8185054: @ 8185054
thumb_func_start RecordedBattle_ReadBankAction
RecordedBattle_ReadBankAction: @ 8185054
push {r4,lr}
sub sp, 0x4
lsls r0, 24
@@ -364,7 +364,7 @@ _081850C6:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_8185054
thumb_func_end RecordedBattle_ReadBankAction
thumb_func_start sub_81850D0
sub_81850D0: @ 81850D0
@@ -2274,7 +2274,7 @@ _0818611E:
b _081863EE
_08186142:
adds r0, r5, 0
bl sub_8185054
bl RecordedBattle_ReadBankAction
movs r5, 0
mov r0, sp
adds r0, 0x4
@@ -2326,7 +2326,7 @@ _0818617E:
_081861A6:
ldr r3, [sp, 0x4C]
lsrs r0, r3, 24
bl sub_8185054
bl RecordedBattle_ReadBankAction
strb r0, [r4]
ldrb r0, [r4]
lsls r0, 1
asm/rom6.s
+1 -1
View File
@@ -547,7 +547,7 @@ _081358D4:
thumb_func_start sub_81358F4
sub_81358F4: @ 81358F4
push {lr}
ldr r1, =sub_8059D50
ldr r1, =SetCB2ToReshowScreenAfterMenu2
movs r0, 0x1
bl sub_81357FC
pop {r0}
asm/script_pokemon_util_80F87D8.s
+1 -1
View File
@@ -732,7 +732,7 @@ _080F8DD8:
adds r0, r6, 0
mov r1, r8
adds r2, r5, 0
bl sub_806E7CC
bl GetMonSpritePalStructFromOtIdPersonality
adds r4, r0, 0
bl LoadCompressedObjectPalette
adds r0, r6, 0
asm/secret_base.s
-5872
View File
File diff suppressed because it is too large Load Diff
asm/trade.s
+6 -6
View File
@@ -10590,7 +10590,7 @@ _0807CEDC:
ldrb r0, [r0]
movs r1, 0
bl sub_807B4D0
ldr r1, =gUnknown_030061E8
ldr r1, =gCB2_AfterEvolution
ldr r0, =sub_807B60C
str r0, [r1]
ldr r7, =gUnknown_02032298
@@ -10615,7 +10615,7 @@ _0807CEDC:
adds r1, 0x8F
ldrb r2, [r1]
adds r1, r4, 0
bl sub_813E1D4
bl TradeEvolutionScene
b _0807CF48
.pool
_0807CF38:
@@ -12695,7 +12695,7 @@ _0807E328:
ldrb r0, [r0]
movs r1, 0
bl sub_807B4D0
ldr r1, =gUnknown_030061E8
ldr r1, =gCB2_AfterEvolution
ldr r0, =sub_807B60C
str r0, [r1]
ldr r7, =gUnknown_02032298
@@ -12720,7 +12720,7 @@ _0807E328:
adds r1, 0x8F
ldrb r2, [r1]
adds r1, r4, 0
bl sub_813E1D4
bl TradeEvolutionScene
b _0807E394
.pool
_0807E384:
@@ -12810,7 +12810,7 @@ _0807E434:
b _0807E4B2
.pool
_0807E444:
ldr r0, =gUnknown_030061E8
ldr r0, =gCB2_AfterEvolution
ldr r1, =sub_807EB50
mov r8, r1
str r1, [r0]
@@ -12836,7 +12836,7 @@ _0807E444:
adds r1, 0x8F
ldrb r2, [r1]
adds r1, r4, 0
bl sub_813E1D4
bl TradeEvolutionScene
b _0807E4AE
.pool
_0807E494: