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

Port mystery_event_script

Browse Source
This commit is contained in:
PikalaxALT
2018-12-03 20:21:35 -05:00
parent c500754d6b
commit 931f19d2ea
31 changed files with 433 additions and 806 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_interface.s
+1 -1
View File
@@ -3770,7 +3770,7 @@ sub_804981C: @ 804981C
lsls r0, 16
lsrs r0, 16
movs r1, 0x1
bl sub_8088E74
bl GetSetPokedexFlag
lsls r0, 24
cmp r0, 0
beq _0804991C
asm/battle_script_commands.s
+2 -2
View File
@@ -31945,7 +31945,7 @@ _0802D5D8:
lsls r0, 16
lsrs r0, 16
movs r1, 0x1
bl sub_8088E74
bl GetSetPokedexFlag
lsls r0, 24
movs r4, 0xA
cmp r0, 0
@@ -32356,7 +32356,7 @@ sub_802D95C: @ 802D95C
lsls r0, 16
lsrs r0, 16
movs r1, 0x1
bl sub_8088E74
bl GetSetPokedexFlag
lsls r0, 24
cmp r0, 0
beq _0802D9B4
asm/battle_tower.s
+5 -5
View File
@@ -143,7 +143,7 @@ sub_80E5A70: @ 80E5A70
add r4, sp, 0x28
movs r0, 0
strb r0, [r4]
bl sub_80E7490
bl ValidateEReaderTrainer
ldr r0, _080E5AA4 @ =gUnknown_20370D0
ldrh r0, [r0]
adds r7, r4, 0
@@ -1506,7 +1506,7 @@ sub_80E64C0: @ 80E64C0
lsls r0, 16
lsrs r0, 16
movs r1, 0x1
bl sub_8088E74
bl GetSetPokedexFlag
lsls r0, 24
cmp r0, 0
beq _080E6554
@@ -3497,8 +3497,8 @@ _080E7488: .4byte gSaveBlock2Ptr
_080E748C: .4byte 0x000004a4
thumb_func_end sub_80E7460
thumb_func_start sub_80E7490
sub_80E7490: @ 80E7490
thumb_func_start ValidateEReaderTrainer
ValidateEReaderTrainer: @ 80E7490
push {r4-r6,lr}
ldr r2, _080E74C0 @ =gUnknown_20370D0
movs r0, 0
@@ -3556,7 +3556,7 @@ _080E74F6:
bx r0
.align 2, 0
_080E74FC: .4byte gUnknown_20370D0
thumb_func_end sub_80E7490
thumb_func_end ValidateEReaderTrainer
thumb_func_start sub_80E7500
sub_80E7500: @ 80E7500
asm/berry.s
+3 -3
View File
@@ -89,8 +89,8 @@ _0809C7BC: .4byte 0x000030ec
_0809C7C0: .4byte 0x0100001a
thumb_func_end sub_809C794
thumb_func_start sub_809C7C4
sub_809C7C4: @ 809C7C4
thumb_func_start SetEnigmaBerry
SetEnigmaBerry: @ 809C7C4
push {r4-r7,lr}
adds r4, r0, 0
bl sub_809C794
@@ -144,7 +144,7 @@ _0809C828: .4byte 0x000030ec
_0809C82C: .4byte 0x00003108
_0809C830: .4byte 0x00000516
_0809C834: .4byte 0x00000529
thumb_func_end sub_809C7C4
thumb_func_end SetEnigmaBerry
thumb_func_start GetEnigmaBerryChecksum
GetEnigmaBerryChecksum: @ 809C838
asm/easy_chat.s
+7 -7
View File
@@ -622,8 +622,8 @@ _080BDB68: .4byte gSaveBlock1Ptr
_080BDB6C: .4byte 0x00002f10
thumb_func_end sub_80BDB48
thumb_func_start sub_80BDB70
sub_80BDB70: @ 80BDB70
thumb_func_start EnableRareWord
EnableRareWord: @ 80BDB70
push {lr}
lsls r0, 24
lsrs r1, r0, 24
@@ -648,7 +648,7 @@ _080BDB94:
.align 2, 0
_080BDB98: .4byte gSaveBlock1Ptr
_080BDB9C: .4byte 0x00002f10
thumb_func_end sub_80BDB70
thumb_func_end EnableRareWord
thumb_func_start sub_80BDBA0
sub_80BDBA0: @ 80BDBA0
@@ -687,7 +687,7 @@ sub_80BDBCC: @ 80BDBCC
b _080BDC32
_080BDBDC:
adds r0, r5, 0
bl sub_80BDB70
bl EnableRareWord
ldr r0, _080BDBF4 @ =0x000001ff
ands r4, r0
movs r1, 0xA0
@@ -841,7 +841,7 @@ _080BDCF6:
lsls r0, 16
lsrs r0, 16
movs r1, 0
bl sub_8088E74
bl GetSetPokedexFlag
lsls r0, 24
cmp r0, 0
beq _080BDD16
@@ -1769,7 +1769,7 @@ _080BE3BC:
lsls r0, 16
lsrs r0, 16
movs r1, 0
bl sub_8088E74
bl GetSetPokedexFlag
lsls r0, 24
lsrs r0, 24
b _080BE40C
@@ -1783,7 +1783,7 @@ _080BE3D6:
lsls r0, 16
lsrs r0, 16
movs r1, 0
bl sub_8088E74
bl GetSetPokedexFlag
lsls r0, 24
lsrs r0, 24
b _080BE40C
asm/egg_hatch.s
+2 -2
View File
@@ -214,10 +214,10 @@ AddHatchedMonToParty: @ 8046D60
lsrs r4, 16
adds r0, r4, 0
movs r1, 0x2
bl sub_8088E74
bl GetSetPokedexFlag
adds r0, r4, 0
movs r1, 0x3
bl sub_8088E74
bl GetSetPokedexFlag
ldr r1, _08046E1C @ =gStringVar1
adds r0, r5, 0
bl GetMonNick
asm/event_data.s
+3 -3
View File
@@ -170,8 +170,8 @@ _0806E224: .4byte 0x0000404e
_0806E228: .4byte gSaveBlock2Ptr
thumb_func_end sub_806E204
thumb_func_start sub_806E22C
sub_806E22C: @ 806E22C
thumb_func_start EnableNationalPokedex
EnableNationalPokedex: @ 806E22C
push {lr}
ldr r0, _0806E250 @ =0x0000404e
bl GetVarPointer
@@ -191,7 +191,7 @@ sub_806E22C: @ 806E22C
_0806E250: .4byte 0x0000404e
_0806E254: .4byte gSaveBlock2Ptr
_0806E258: .4byte 0x00006258
thumb_func_end sub_806E22C
thumb_func_end EnableNationalPokedex
thumb_func_start sub_806E25C
sub_806E25C: @ 806E25C
asm/evolution_scene.s
+6 -6
View File
@@ -1252,13 +1252,13 @@ _080CE80C:
lsls r0, 16
lsrs r0, 16
movs r1, 0x2
bl sub_8088E74
bl GetSetPokedexFlag
ldrh r0, [r4, 0xC]
bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r0, 16
movs r1, 0x3
bl sub_8088E74
bl GetSetPokedexFlag
mov r0, r9
movs r1, 0xB
bl GetMonData
@@ -1829,13 +1829,13 @@ _080CED3A:
lsls r0, 16
lsrs r0, 16
movs r1, 0x2
bl sub_8088E74
bl GetSetPokedexFlag
ldrh r0, [r4, 0xC]
bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r0, 16
movs r1, 0x3
bl sub_8088E74
bl GetSetPokedexFlag
movs r0, 0xE
bl IncrementGameStat
b _080CF528
@@ -3136,13 +3136,13 @@ _080CF8A8:
lsls r0, 16
lsrs r0, 16
movs r1, 0x2
bl sub_8088E74
bl GetSetPokedexFlag
ldrh r0, [r4, 0xC]
bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r0, 16
movs r1, 0x3
bl sub_8088E74
bl GetSetPokedexFlag
movs r0, 0xE
bl IncrementGameStat
b _080D003A
asm/field_specials.s
+3 -3
View File
@@ -1491,7 +1491,7 @@ _080CB128:
lsls r0, 16
lsrs r0, 16
movs r1, 0
bl sub_8088E74
bl GetSetPokedexFlag
lsls r0, 24
asrs r0, 24
cmp r0, 0x1
@@ -1521,7 +1521,7 @@ _080CB176:
lsls r0, 16
lsrs r0, 16
movs r1, 0
bl sub_8088E74
bl GetSetPokedexFlag
lsls r0, 24
asrs r0, 24
cmp r0, 0x1
@@ -3129,7 +3129,7 @@ sub_80CBDCC: @ 80CBDCC
lsls r0, 16
lsrs r0, 16
movs r1, 0x2
bl sub_8088E74
bl GetSetPokedexFlag
pop {r0}
bx r0
.align 2, 0
asm/mystery_event_script.s
-722
View File
@@ -1,722 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_80DA800
sub_80DA800: @ 80DA800
push {r4,lr}
lsls r0, 16
lsrs r0, 16
lsls r2, 16
lsrs r2, 16
movs r4, 0x1
ands r0, r4
cmp r0, 0
beq _080DA828
ands r1, r4
cmp r1, 0
beq _080DA828
ands r2, r4
cmp r2, 0
beq _080DA828
ands r3, r4
cmp r3, 0
beq _080DA828
movs r0, 0x1
b _080DA82A
_080DA828:
movs r0, 0
_080DA82A:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_80DA800
thumb_func_start SetIncompatible
SetIncompatible: @ 80DA830
push {lr}
ldr r0, _080DA844 @ =gStringVar4
ldr r1, _080DA848 @ =gUnknown_8488DFD
bl StringExpandPlaceholders
movs r0, 0x3
bl sub_80DA8E8
pop {r0}
bx r0
.align 2, 0
_080DA844: .4byte gStringVar4
_080DA848: .4byte gUnknown_8488DFD
thumb_func_end SetIncompatible
thumb_func_start InitMysteryEventScript
InitMysteryEventScript: @ 80DA84C
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
ldr r1, _080DA874 @ =gUnknown_81DBCF0
ldr r2, _080DA878 @ =0x081dbd34
bl InitScriptContext
adds r0, r4, 0
adds r1, r5, 0
bl SetupBytecodeScript
str r5, [r4, 0x64]
movs r0, 0
str r0, [r4, 0x68]
str r0, [r4, 0x6C]
str r0, [r4, 0x70]
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080DA874: .4byte gUnknown_81DBCF0
_080DA878: .4byte 0x081dbd34
thumb_func_end InitMysteryEventScript
thumb_func_start RunMysteryEventScriptCommand
RunMysteryEventScriptCommand: @ 80DA87C
push {r4,lr}
adds r4, r0, 0
bl RunScriptCommand
lsls r0, 24
cmp r0, 0
beq _080DA894
ldr r0, [r4, 0x70]
cmp r0, 0
beq _080DA894
movs r0, 0x1
b _080DA896
_080DA894:
movs r0, 0
_080DA896:
pop {r4}
pop {r1}
bx r1
thumb_func_end RunMysteryEventScriptCommand
thumb_func_start sub_80DA89C
sub_80DA89C: @ 80DA89C
push {lr}
adds r1, r0, 0
ldr r0, _080DA8AC @ =gUnknown_203AA3C
bl InitMysteryEventScript
pop {r0}
bx r0
.align 2, 0
_080DA8AC: .4byte gUnknown_203AA3C
thumb_func_end sub_80DA89C
thumb_func_start sub_80DA8B0
sub_80DA8B0: @ 80DA8B0
push {r4,r5,lr}
adds r5, r0, 0
ldr r4, _080DA8C8 @ =gUnknown_203AA3C
adds r0, r4, 0
bl RunMysteryEventScriptCommand
ldr r1, [r4, 0x6C]
str r1, [r5]
pop {r4,r5}
pop {r1}
bx r1
.align 2, 0
_080DA8C8: .4byte gUnknown_203AA3C
thumb_func_end sub_80DA8B0
thumb_func_start sub_80DA8CC
sub_80DA8CC: @ 80DA8CC
push {lr}
sub sp, 0x4
bl sub_80DA89C
_080DA8D4:
mov r0, sp
bl sub_80DA8B0
cmp r0, 0
bne _080DA8D4
ldr r0, [sp]
add sp, 0x4
pop {r1}
bx r1
thumb_func_end sub_80DA8CC
thumb_func_start sub_80DA8E8
sub_80DA8E8: @ 80DA8E8
ldr r1, _080DA8F0 @ =gUnknown_203AA3C
str r0, [r1, 0x6C]
bx lr
.align 2, 0
_080DA8F0: .4byte gUnknown_203AA3C
thumb_func_end sub_80DA8E8
thumb_func_start script_status_stop_and_ret_1
script_status_stop_and_ret_1: @ 80DA8F4
push {lr}
bl StopScript
movs r0, 0x1
pop {r1}
bx r1
thumb_func_end script_status_stop_and_ret_1
thumb_func_start MEScrCmd_checkcompat
MEScrCmd_checkcompat: @ 80DA900
push {r4-r7,lr}
adds r7, r0, 0
bl ScriptReadWord
str r0, [r7, 0x68]
adds r0, r7, 0
bl ScriptReadHalfword
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
adds r0, r7, 0
bl ScriptReadWord
adds r6, r0, 0
adds r0, r7, 0
bl ScriptReadHalfword
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r7, 0
bl ScriptReadWord
adds r3, r0, 0
adds r0, r5, 0
adds r1, r6, 0
adds r2, r4, 0
bl sub_80DA800
cmp r0, 0x1
bne _080DA944
str r0, [r7, 0x70]
b _080DA948
_080DA944:
bl SetIncompatible
_080DA948:
movs r0, 0x1
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end MEScrCmd_checkcompat
thumb_func_start sub_80DA950
sub_80DA950: @ 80DA950
movs r0, 0
bx lr
thumb_func_end sub_80DA950
thumb_func_start MEScrCmd_setstatus
MEScrCmd_setstatus: @ 80DA954
ldr r1, [r0, 0x8]
ldrb r2, [r1]
adds r1, 0x1
str r1, [r0, 0x8]
str r2, [r0, 0x6C]
movs r0, 0
bx lr
thumb_func_end MEScrCmd_setstatus
thumb_func_start MEScrCmd_setmsg
MEScrCmd_setmsg: @ 80DA964
push {r4,r5,lr}
adds r4, r0, 0
ldr r0, [r4, 0x8]
ldrb r5, [r0]
adds r0, 0x1
str r0, [r4, 0x8]
adds r0, r4, 0
bl ScriptReadWord
ldr r1, [r4, 0x68]
subs r0, r1
ldr r1, [r4, 0x64]
adds r1, r0, r1
cmp r5, 0xFF
beq _080DA988
ldr r0, [r4, 0x6C]
cmp r5, r0
bne _080DA98E
_080DA988:
ldr r0, _080DA998 @ =gStringVar4
bl StringExpandPlaceholders
_080DA98E:
movs r0, 0
pop {r4,r5}
pop {r1}
bx r1
.align 2, 0
_080DA998: .4byte gStringVar4
thumb_func_end MEScrCmd_setmsg
thumb_func_start MEScrCmd_runscript
MEScrCmd_runscript: @ 80DA99C
push {r4,lr}
adds r4, r0, 0
bl ScriptReadWord
ldr r1, [r4, 0x68]
subs r0, r1
ldr r1, [r4, 0x64]
adds r0, r1
bl ScriptContext2_RunNewScript
movs r0, 0
pop {r4}
pop {r1}
bx r1
thumb_func_end MEScrCmd_runscript
thumb_func_start MEScrCmd_setenigmaberry
MEScrCmd_setenigmaberry: @ 80DA9B8
push {r4-r7,lr}
mov r7, r9
mov r6, r8
push {r6,r7}
adds r7, r0, 0
bl IsEnigmaBerryValid
mov r8, r0
adds r0, r7, 0
bl ScriptReadWord
adds r4, r0, 0
ldr r0, [r7, 0x68]
subs r4, r0
ldr r0, [r7, 0x64]
adds r4, r0
ldr r0, _080DAA0C @ =gStringVar1
mov r9, r0
ldr r6, _080DAA10 @ =gSaveBlock1Ptr
ldr r1, [r6]
ldr r5, _080DAA14 @ =0x000030ec
adds r1, r5
movs r2, 0x7
bl StringCopyN
adds r0, r4, 0
bl sub_809C7C4
ldr r4, _080DAA18 @ =gStringVar2
ldr r1, [r6]
adds r1, r5
adds r0, r4, 0
movs r2, 0x7
bl StringCopyN
mov r0, r8
cmp r0, 0
bne _080DAA24
ldr r0, _080DAA1C @ =gStringVar4
ldr r1, _080DAA20 @ =gUnknown_8488C70
b _080DAA44
.align 2, 0
_080DAA0C: .4byte gStringVar1
_080DAA10: .4byte gSaveBlock1Ptr
_080DAA14: .4byte 0x000030ec
_080DAA18: .4byte gStringVar2
_080DAA1C: .4byte gStringVar4
_080DAA20: .4byte gUnknown_8488C70
_080DAA24:
mov r0, r9
adds r1, r4, 0
bl StringCompare
cmp r0, 0
beq _080DAA40
ldr r0, _080DAA38 @ =gStringVar4
ldr r1, _080DAA3C @ =gUnknown_8488CA2
b _080DAA44
.align 2, 0
_080DAA38: .4byte gStringVar4
_080DAA3C: .4byte gUnknown_8488CA2
_080DAA40:
ldr r0, _080DAA60 @ =gStringVar4
ldr r1, _080DAA64 @ =gUnknown_8488CCE
_080DAA44:
bl StringExpandPlaceholders
movs r0, 0x2
str r0, [r7, 0x6C]
bl IsEnigmaBerryValid
cmp r0, 0x1
bne _080DAA6C
ldr r0, _080DAA68 @ =0x00004033
movs r1, 0x1
bl VarSet
b _080DAA70
.align 2, 0
_080DAA60: .4byte gStringVar4
_080DAA64: .4byte gUnknown_8488CCE
_080DAA68: .4byte 0x00004033
_080DAA6C:
movs r0, 0x1
str r0, [r7, 0x6C]
_080DAA70:
movs r0, 0
pop {r3,r4}
mov r8, r3
mov r9, r4
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end MEScrCmd_setenigmaberry
thumb_func_start MEScrCmd_giveribbon
MEScrCmd_giveribbon: @ 80DAA80
push {r4,lr}
adds r4, r0, 0
ldr r2, [r4, 0x8]
ldrb r0, [r2]
adds r2, 0x1
str r2, [r4, 0x8]
ldrb r1, [r2]
adds r2, 0x1
str r2, [r4, 0x8]
bl GiveGiftRibbonToParty
ldr r0, _080DAAAC @ =gStringVar4
ldr r1, _080DAAB0 @ =gUnknown_8488CF6
bl StringExpandPlaceholders
movs r0, 0x2
str r0, [r4, 0x6C]
movs r0, 0
pop {r4}
pop {r1}
bx r1
.align 2, 0
_080DAAAC: .4byte gStringVar4
_080DAAB0: .4byte gUnknown_8488CF6
thumb_func_end MEScrCmd_giveribbon
thumb_func_start MEScrCmd_initramscript
MEScrCmd_initramscript: @ 80DAAB4
push {r4-r6,lr}
mov r6, r9
mov r5, r8
push {r5,r6}
sub sp, 0x4
adds r4, r0, 0
ldr r0, [r4, 0x8]
ldrb r1, [r0]
mov r9, r1
adds r0, 0x1
str r0, [r4, 0x8]
ldrb r1, [r0]
mov r8, r1
adds r1, r0, 0x1
str r1, [r4, 0x8]
ldrb r6, [r0, 0x1]
adds r1, 0x1
str r1, [r4, 0x8]
adds r0, r4, 0
bl ScriptReadWord
adds r5, r0, 0
ldr r0, [r4, 0x68]
subs r5, r0
ldr r0, [r4, 0x64]
adds r5, r0
adds r0, r4, 0
bl ScriptReadWord
adds r1, r0, 0
ldr r0, [r4, 0x68]
subs r1, r0
ldr r0, [r4, 0x64]
adds r1, r0
subs r1, r5
lsls r1, 16
lsrs r1, 16
str r6, [sp]
adds r0, r5, 0
mov r2, r9
mov r3, r8
bl InitRamScript
movs r0, 0
add sp, 0x4
pop {r3,r4}
mov r8, r3
mov r9, r4
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end MEScrCmd_initramscript
thumb_func_start sub_80DAB1C
sub_80DAB1C: @ 80DAB1C
push {r4,lr}
adds r4, r0, 0
bl sub_806E22C
ldr r0, _080DAB38 @ =gStringVar4
ldr r1, _080DAB3C @ =gUnknown_8488D2A
bl StringExpandPlaceholders
movs r0, 0x2
str r0, [r4, 0x6C]
movs r0, 0
pop {r4}
pop {r1}
bx r1
.align 2, 0
_080DAB38: .4byte gStringVar4
_080DAB3C: .4byte gUnknown_8488D2A
thumb_func_end sub_80DAB1C
thumb_func_start MEScrCmd_addrareword
MEScrCmd_addrareword: @ 80DAB40
push {r4,lr}
adds r4, r0, 0
ldr r1, [r4, 0x8]
ldrb r0, [r1]
adds r1, 0x1
str r1, [r4, 0x8]
bl sub_80BDB70
ldr r0, _080DAB64 @ =gStringVar4
ldr r1, _080DAB68 @ =gUnknown_8488D60
bl StringExpandPlaceholders
movs r0, 0x2
str r0, [r4, 0x6C]
movs r0, 0
pop {r4}
pop {r1}
bx r1
.align 2, 0
_080DAB64: .4byte gStringVar4
_080DAB68: .4byte gUnknown_8488D60
thumb_func_end MEScrCmd_addrareword
thumb_func_start sub_80DAB6C
sub_80DAB6C: @ 80DAB6C
push {r4,lr}
adds r4, r0, 0
bl SetIncompatible
movs r0, 0
str r0, [r4, 0x70]
movs r0, 0x1
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_80DAB6C
thumb_func_start sub_80DAB80
sub_80DAB80: @ 80DAB80
push {r4-r7,lr}
mov r7, r8
push {r7}
sub sp, 0x88
adds r6, r0, 0
bl ScriptReadWord
ldr r1, [r6, 0x68]
subs r0, r1
ldr r1, [r6, 0x64]
adds r5, r0, r1
movs r0, 0x64
adds r0, r5
mov r8, r0
add r4, sp, 0x24
adds r0, r4, 0
adds r1, r5, 0
movs r2, 0x64
bl memcpy
adds r0, r4, 0
movs r1, 0x41
bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
movs r0, 0xCE
lsls r0, 1
cmp r4, r0
bne _080DABD0
ldr r0, _080DABC8 @ =gStringVar1
ldr r1, _080DABCC @ =gText_EggNickname
movs r2, 0xB
bl StringCopyN
b _080DABDA
.align 2, 0
_080DABC8: .4byte gStringVar1
_080DABCC: .4byte gText_EggNickname
_080DABD0:
ldr r0, _080DABF0 @ =gStringVar1
ldr r1, _080DABF4 @ =gUnknown_8415A66
movs r2, 0xB
bl StringCopyN
_080DABDA:
ldr r0, _080DABF8 @ =gPlayerPartyCount
ldrb r0, [r0]
cmp r0, 0x6
bne _080DAC04
ldr r0, _080DABFC @ =gStringVar4
ldr r1, _080DAC00 @ =gUnknown_8488D8E
bl StringExpandPlaceholders
movs r0, 0x3
b _080DAC6E
.align 2, 0
_080DABF0: .4byte gStringVar1
_080DABF4: .4byte gUnknown_8415A66
_080DABF8: .4byte gPlayerPartyCount
_080DABFC: .4byte gStringVar4
_080DAC00: .4byte gUnknown_8488D8E
_080DAC04:
ldr r7, _080DAC80 @ =gUnknown_2024478
adds r0, r7, 0
adds r1, r5, 0
movs r2, 0x64
bl memcpy
mov r0, sp
mov r1, r8
movs r2, 0x24
bl memcpy
movs r0, 0xCE
lsls r0, 1
cmp r4, r0
beq _080DAC3E
adds r0, r4, 0
bl SpeciesToNationalPokedexNum
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r4, 0
movs r1, 0x2
bl sub_8088E74
adds r0, r4, 0
movs r1, 0x3
bl sub_8088E74
_080DAC3E:
adds r0, r7, 0
movs r1, 0xC
bl GetMonData
lsls r0, 16
lsrs r0, 16
bl itemid_is_mail
lsls r0, 24
cmp r0, 0
beq _080DAC5C
adds r0, r7, 0
mov r1, sp
bl GiveMailToMon2
_080DAC5C:
bl CompactPartySlots
bl CalculatePlayerPartyCount
ldr r0, _080DAC84 @ =gStringVar4
ldr r1, _080DAC88 @ =gUnknown_8488D7C
bl StringExpandPlaceholders
movs r0, 0x2
_080DAC6E:
str r0, [r6, 0x6C]
movs r0, 0
add sp, 0x88
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r1}
bx r1
.align 2, 0
_080DAC80: .4byte gUnknown_2024478
_080DAC84: .4byte gStringVar4
_080DAC88: .4byte gUnknown_8488D7C
thumb_func_end sub_80DAB80
thumb_func_start sub_80DAC8C
sub_80DAC8C: @ 80DAC8C
push {r4,lr}
adds r4, r0, 0
bl ScriptReadWord
adds r1, r0, 0
ldr r0, [r4, 0x68]
subs r1, r0
ldr r0, [r4, 0x64]
adds r1, r0
ldr r0, _080DACC8 @ =gSaveBlock2Ptr
ldr r0, [r0]
movs r2, 0x94
lsls r2, 3
adds r0, r2
movs r2, 0xBC
bl memcpy
bl sub_80E7490
ldr r0, _080DACCC @ =gStringVar4
ldr r1, _080DACD0 @ =gUnknown_8488DBD
bl StringExpandPlaceholders
movs r0, 0x2
str r0, [r4, 0x6C]
movs r0, 0
pop {r4}
pop {r1}
bx r1
.align 2, 0
_080DACC8: .4byte gSaveBlock2Ptr
_080DACCC: .4byte gStringVar4
_080DACD0: .4byte gUnknown_8488DBD
thumb_func_end sub_80DAC8C
thumb_func_start sub_80DACD4
sub_80DACD4: @ 80DACD4
push {r4,lr}
adds r4, r0, 0
bl SetIncompatible
movs r0, 0
str r0, [r4, 0x70]
movs r0, 0x1
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_80DACD4
thumb_func_start MEScrCmd_checksum
MEScrCmd_checksum: @ 80DACE8
push {r4-r6,lr}
adds r6, r0, 0
bl ScriptReadWord
adds r5, r0, 0
adds r0, r6, 0
bl ScriptReadWord
adds r4, r0, 0
ldr r0, [r6, 0x68]
subs r4, r0
ldr r0, [r6, 0x64]
adds r4, r0
adds r0, r6, 0
bl ScriptReadWord
adds r1, r0, 0
ldr r0, [r6, 0x68]
subs r1, r0
ldr r0, [r6, 0x64]
adds r1, r0
subs r1, r4
adds r0, r4, 0
bl CalcByteArraySum
cmp r5, r0
beq _080DAD26
movs r0, 0
str r0, [r6, 0x70]
movs r0, 0x1
str r0, [r6, 0x6C]
_080DAD26:
movs r0, 0x1
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end MEScrCmd_checksum
thumb_func_start MEScrCmd_crc
MEScrCmd_crc: @ 80DAD30
push {r4-r6,lr}
adds r6, r0, 0
bl ScriptReadWord
adds r5, r0, 0
adds r0, r6, 0
bl ScriptReadWord
adds r4, r0, 0
ldr r0, [r6, 0x68]
subs r4, r0
ldr r0, [r6, 0x64]
adds r4, r0
adds r0, r6, 0
bl ScriptReadWord
adds r1, r0, 0
ldr r0, [r6, 0x68]
subs r1, r0
ldr r0, [r6, 0x64]
adds r1, r0
subs r1, r4
adds r0, r4, 0
bl CalcCRC16
lsls r0, 16
lsrs r0, 16
cmp r5, r0
beq _080DAD72
movs r0, 0
str r0, [r6, 0x70]
movs r0, 0x1
str r0, [r6, 0x6C]
_080DAD72:
movs r0, 0x1
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end MEScrCmd_crc
.align 2, 0 @ Don't pad with nop.
asm/pokedex.s
+10 -10
View File
@@ -57,8 +57,8 @@ _08088E6C:
_08088E70: .4byte gUnknown_844E850
thumb_func_end sub_8088E38
thumb_func_start sub_8088E74
sub_8088E74: @ 8088E74
thumb_func_start GetSetPokedexFlag
GetSetPokedexFlag: @ 8088E74
push {lr}
lsls r0, 16
lsrs r0, 16
@@ -70,7 +70,7 @@ sub_8088E74: @ 8088E74
asrs r0, 24
pop {r1}
bx r1
thumb_func_end sub_8088E74
thumb_func_end GetSetPokedexFlag
thumb_func_start pokedex_count
pokedex_count: @ 8088E8C
@@ -101,7 +101,7 @@ _08088EB2:
lsrs r0, 16
movs r1, 0x1
_08088EBA:
bl sub_8088E74
bl GetSetPokedexFlag
lsls r0, 24
cmp r0, 0
beq _08088ECA
@@ -145,7 +145,7 @@ _08088EFC:
lsrs r0, 16
movs r1, 0x1
_08088F04:
bl sub_8088E74
bl GetSetPokedexFlag
lsls r0, 24
cmp r0, 0
beq _08088F14
@@ -176,7 +176,7 @@ _08088F28:
lsls r0, 16
lsrs r0, 16
movs r1, 0x1
bl sub_8088E74
bl GetSetPokedexFlag
lsls r0, 24
cmp r0, 0
bne _08088F48
@@ -203,7 +203,7 @@ _08088F5C:
lsrs r4, r0, 16
adds r0, r4, 0
movs r1, 0x1
bl sub_8088E74
bl GetSetPokedexFlag
lsls r0, 24
cmp r0, 0
bne _08088F74
@@ -230,7 +230,7 @@ _08088F88:
lsrs r4, r0, 16
adds r0, r4, 0
movs r1, 0x1
bl sub_8088E74
bl GetSetPokedexFlag
lsls r0, 24
cmp r0, 0
beq _08088FD6
@@ -244,7 +244,7 @@ _08088FA4:
lsrs r4, r0, 16
adds r0, r4, 0
movs r1, 0x1
bl sub_8088E74
bl GetSetPokedexFlag
lsls r0, 24
cmp r0, 0
beq _08088FD6
@@ -259,7 +259,7 @@ _08088FC2:
lsrs r4, r0, 16
adds r0, r4, 0
movs r1, 0x1
bl sub_8088E74
bl GetSetPokedexFlag
lsls r0, 24
cmp r0, 0
bne _08088FE0
asm/pokemon_3.s
+2 -2
View File
@@ -482,13 +482,13 @@ sub_8044898: @ 8044898
orrs r1, r0
lsrs r1, 31
adds r0, r4, 0
bl sub_8088E74
bl GetSetPokedexFlag
lsls r0, 24
cmp r0, 0
bne _080448EE
adds r0, r4, 0
adds r1, r5, 0
bl sub_8088E74
bl GetSetPokedexFlag
adds r0, r4, 0
bl NationalPokedexNumToSpecies
lsls r0, 16
asm/prof_pc.s
+1 -1
View File
@@ -155,7 +155,7 @@ _080CA4D8:
lsls r0, 16
lsrs r0, 16
movs r1, 0x1
bl sub_8088E74
bl GetSetPokedexFlag
lsls r0, 24
cmp r0, 0
beq _080CA500
asm/scrcmd.s
+1 -1
View File
@@ -525,7 +525,7 @@ ScrCmd_setmysteryeventstatus: @ 806A274
adds r1, 0x1
str r1, [r0, 0x8]
adds r0, r2, 0
bl sub_80DA8E8
bl SetMysteryEventScriptStatus
movs r0, 0
pop {r1}
bx r1
asm/script_pokemon_util_80A0058.s
+2 -2
View File
@@ -154,10 +154,10 @@ ScriptGiveMon: @ 80A011C
blt _080A0196
adds r0, r5, 0
movs r1, 0x2
bl sub_8088E74
bl GetSetPokedexFlag
adds r0, r5, 0
movs r1, 0x3
bl sub_8088E74
bl GetSetPokedexFlag
_080A0196:
adds r0, r7, 0
bl Free
asm/trade.s
+1 -1
View File
@@ -8131,7 +8131,7 @@ sub_80507A0: @ 80507A0
lsrs r4, 16
adds r0, r4, 0
movs r1, 0x2
bl sub_8088E74
bl GetSetPokedexFlag
adds r0, r4, 0
movs r1, 0x3
adds r2, r5, 0