ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-03-26 23:54:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Labelling fix

Browse Source 
Oversight
This commit is contained in:
itskobold 2017-11-07 22:11:48 +00:00
parent aedec0865d
commit 860d5e026d
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
asm/mystery_event_script.s
View File

@ -43,7 +43,7 @@ _081537FE:
sub_8153804: @ 8153804 sub_8153804: @ 8153804
push {lr} push {lr}
ldr r0, =gStringVar4 ldr r0, =gStringVar4
ldr r1, =gUnknown_08674C86 ldr r1, =gText_MysteryGiftCantBeUsed
bl StringExpandPlaceholders bl StringExpandPlaceholders
movs r0, 0x3 movs r0, 0x3
bl SetMysteryEventScriptStatus bl SetMysteryEventScriptStatus
@ -461,7 +461,7 @@ sub_8153AE8: @ 8153AE8
cmp r0, 0 cmp r0, 0
bne _08153B54 bne _08153B54
ldr r0, =gStringVar4 ldr r0, =gStringVar4
ldr r1, =gUnknown_08674AE4 ldr r1, =gText_MysteryGiftBerry
b _08153B74 b _08153B74
.pool .pool
_08153B54: _08153B54:
@ -471,12 +471,12 @@ _08153B54:
cmp r0, 0 cmp r0, 0
beq _08153B70 beq _08153B70
ldr r0, =gStringVar4 ldr r0, =gStringVar4
ldr r1, =gUnknown_08674B16 ldr r1, =gText_MysteryGiftBerryTransform
b _08153B74 b _08153B74
.pool .pool
_08153B70: _08153B70:
ldr r0, =gStringVar4 ldr r0, =gStringVar4
ldr r1, =gUnknown_08674B42 ldr r1, =gText_MysteryGiftBerryObtained
_08153B74: _08153B74:
bl StringExpandPlaceholders bl StringExpandPlaceholders
movs r0, 0x2 movs r0, 0x2
@ -515,7 +515,7 @@ sub_8153BB0: @ 8153BB0
str r2, [r4, 0x8] str r2, [r4, 0x8]
bl GiveGiftRibbonToParty bl GiveGiftRibbonToParty
ldr r0, =gStringVar4 ldr r0, =gStringVar4
ldr r1, =gUnknown_08674B6A ldr r1, =gText_MysteryGiftSpecialRibbon
bl StringExpandPlaceholders bl StringExpandPlaceholders
movs r0, 0x2 movs r0, 0x2
str r0, [r4, 0x6C] str r0, [r4, 0x6C]
@ -584,7 +584,7 @@ sub_8153C4C: @ 8153C4C
adds r4, r0, 0 adds r4, r0, 0
bl EnableNationalPokedex bl EnableNationalPokedex
ldr r0, =gStringVar4 ldr r0, =gStringVar4
ldr r1, =gUnknown_08674B9E ldr r1, =gText_MysteryGiftNationalDex
bl StringExpandPlaceholders bl StringExpandPlaceholders
movs r0, 0x2 movs r0, 0x2
str r0, [r4, 0x6C] str r0, [r4, 0x6C]
@ -605,7 +605,7 @@ sub_8153C70: @ 8153C70
str r1, [r4, 0x8] str r1, [r4, 0x8]
bl sub_811EFC0 bl sub_811EFC0
ldr r0, =gStringVar4 ldr r0, =gStringVar4
ldr r1, =gUnknown_08674BD4 ldr r1, =gText_MysteryGiftRareWord
bl StringExpandPlaceholders bl StringExpandPlaceholders
movs r0, 0x2 movs r0, 0x2
str r0, [r4, 0x6C] str r0, [r4, 0x6C]
@ -685,7 +685,7 @@ _08153D22:
cmp r0, 0x6 cmp r0, 0x6
bne _08153D4C bne _08153D4C
ldr r0, =gStringVar4 ldr r0, =gStringVar4
ldr r1, =gUnknown_08674C02 ldr r1, =gText_MysteryGiftFullParty
bl StringExpandPlaceholders bl StringExpandPlaceholders
movs r0, 0x3 movs r0, 0x3
b _08153DB6 b _08153DB6
@ -732,7 +732,7 @@ _08153DA4:
bl party_compaction bl party_compaction
bl CalculatePlayerPartyCount bl CalculatePlayerPartyCount
ldr r0, =gStringVar4 ldr r0, =gStringVar4
ldr r1, =gUnknown_08674BF0 ldr r1, =gText_MysteryGiftSentOver
bl StringExpandPlaceholders bl StringExpandPlaceholders
movs r0, 0x2 movs r0, 0x2
_08153DB6: _08153DB6:
@ -765,7 +765,7 @@ sub_8153DD4: @ 8153DD4
bl memcpy bl memcpy
bl sub_81652B4 bl sub_81652B4
ldr r0, =gStringVar4 ldr r0, =gStringVar4
ldr r1, =gUnknown_08674C31 ldr r1, =gText_MysteryGiftNewTrainer
bl StringExpandPlaceholders bl StringExpandPlaceholders
movs r0, 0x2 movs r0, 0x2
str r0, [r4, 0x6C] str r0, [r4, 0x6C]