Port evolution_scene
This commit is contained in:
+3
-3
@@ -193,8 +193,8 @@ _0800F344: .4byte gBattleBgTemplates
|
||||
_0800F348: .4byte gUnknown_8248330
|
||||
thumb_func_end sub_800F324
|
||||
|
||||
thumb_func_start sub_800F34C
|
||||
sub_800F34C: @ 800F34C
|
||||
thumb_func_start InitBattleBgsVideo
|
||||
InitBattleBgsVideo: @ 800F34C
|
||||
push {lr}
|
||||
movs r0, 0xC5
|
||||
bl EnableInterrupts
|
||||
@@ -215,7 +215,7 @@ sub_800F34C: @ 800F34C
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0800F37C: .4byte 0x0000b040
|
||||
thumb_func_end sub_800F34C
|
||||
thumb_func_end InitBattleBgsVideo
|
||||
|
||||
thumb_func_start LoadBattleMenuWindowGfx
|
||||
LoadBattleMenuWindowGfx: @ 800F380
|
||||
|
||||
@@ -682,7 +682,7 @@ _080D77B8:
|
||||
_080D77C8: .4byte 0x00000181
|
||||
_080D77CC: .4byte gDisplayedStringBattle
|
||||
_080D77D0:
|
||||
ldr r1, _080D77F0 @ =gUnknown_83FDF3C
|
||||
ldr r1, _080D77F0 @ =gBattleStringsTable
|
||||
adds r0, r6, 0
|
||||
subs r0, 0xC
|
||||
lsls r0, 2
|
||||
@@ -700,7 +700,7 @@ _080D77E2:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080D77F0: .4byte gUnknown_83FDF3C
|
||||
_080D77F0: .4byte gBattleStringsTable
|
||||
thumb_func_end BufferStringBattle
|
||||
|
||||
thumb_func_start BattleStringExpandPlaceholdersToDisplayedString
|
||||
@@ -2230,14 +2230,14 @@ _080D847C:
|
||||
ldrb r0, [r0, 0x2]
|
||||
lsls r0, 8
|
||||
orrs r1, r0
|
||||
ldr r0, _080D8494 @ =gUnknown_83FDF3C
|
||||
ldr r0, _080D8494 @ =gBattleStringsTable
|
||||
subs r1, 0xC
|
||||
lsls r1, 2
|
||||
adds r1, r0
|
||||
ldr r1, [r1]
|
||||
b _080D868E
|
||||
.align 2, 0
|
||||
_080D8494: .4byte gUnknown_83FDF3C
|
||||
_080D8494: .4byte gBattleStringsTable
|
||||
_080D8498:
|
||||
ldrb r0, [r4, 0x1]
|
||||
cmp r0, 0x2
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
+7
-7
@@ -12790,7 +12790,7 @@ sub_8124EFC: @ 8124EFC
|
||||
muls r5, r0
|
||||
ldr r0, _08124F8C @ =gPlayerParty
|
||||
adds r5, r0
|
||||
bl sub_8138B2C
|
||||
bl GetMoveSlotToReplace
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
@@ -14661,7 +14661,7 @@ _08125E80: .4byte sub_8125E84
|
||||
sub_8125E84: @ 8125E84
|
||||
push {r4,r5,lr}
|
||||
sub sp, 0xC
|
||||
bl sub_8138B2C
|
||||
bl GetMoveSlotToReplace
|
||||
lsls r0, 24
|
||||
lsrs r2, r0, 24
|
||||
ldr r4, _08125ED0 @ =gUnknown_203B0A0
|
||||
@@ -14735,7 +14735,7 @@ sub_8125F14: @ 8125F14
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
bne _08125F46
|
||||
bl sub_8138B2C
|
||||
bl GetMoveSlotToReplace
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x4
|
||||
@@ -14783,7 +14783,7 @@ sub_8125F5C: @ 8125F5C
|
||||
muls r6, r0
|
||||
ldr r0, _08125FE8 @ =gPlayerParty
|
||||
adds r6, r0
|
||||
bl sub_8138B2C
|
||||
bl GetMoveSlotToReplace
|
||||
adds r5, r0, 0
|
||||
lsls r5, 24
|
||||
lsrs r5, 24
|
||||
@@ -14848,7 +14848,7 @@ sub_8125FFC: @ 8125FFC
|
||||
muls r5, r0
|
||||
ldr r0, _08126060 @ =gPlayerParty
|
||||
adds r5, r0
|
||||
bl sub_8138B2C
|
||||
bl GetMoveSlotToReplace
|
||||
adds r1, r0, 0
|
||||
lsls r1, 24
|
||||
lsrs r1, 24
|
||||
@@ -14908,14 +14908,14 @@ sub_812607C: @ 812607C
|
||||
muls r4, r0
|
||||
ldr r0, _081260D4 @ =gPlayerParty
|
||||
adds r4, r0
|
||||
bl sub_8138B2C
|
||||
bl GetMoveSlotToReplace
|
||||
adds r1, r0, 0
|
||||
lsls r1, 24
|
||||
lsrs r1, 24
|
||||
adds r0, r4, 0
|
||||
bl RemoveMonPPBonus
|
||||
ldrh r5, [r5, 0xE]
|
||||
bl sub_8138B2C
|
||||
bl GetMoveSlotToReplace
|
||||
adds r2, r0, 0
|
||||
lsls r2, 24
|
||||
lsrs r2, 24
|
||||
|
||||
@@ -8406,14 +8406,14 @@ sub_8138B20: @ 8138B20
|
||||
_08138B28: .4byte gUnknown_203B16C
|
||||
thumb_func_end sub_8138B20
|
||||
|
||||
thumb_func_start sub_8138B2C
|
||||
sub_8138B2C: @ 8138B2C
|
||||
thumb_func_start GetMoveSlotToReplace
|
||||
GetMoveSlotToReplace: @ 8138B2C
|
||||
ldr r0, _08138B34 @ =gUnknown_203B16E
|
||||
ldrb r0, [r0]
|
||||
bx lr
|
||||
.align 2, 0
|
||||
_08138B34: .4byte gUnknown_203B16E
|
||||
thumb_func_end sub_8138B2C
|
||||
thumb_func_end GetMoveSlotToReplace
|
||||
|
||||
thumb_func_start sub_8138B38
|
||||
sub_8138B38: @ 8138B38
|
||||
|
||||
Reference in New Issue
Block a user