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

Merge branch 'master' of https://github.com/pret/pokeemerald

Browse Source 
also started fixing pointers in my dumps
This commit is contained in:
itskobold
2017-11-15 12:41:25 +00:00
parent e373cf4bb9 72b57b342e
commit 2acab81713
91 changed files with 4805 additions and 8893 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_7.s
-3815
View File
File diff suppressed because it is too large Load Diff
asm/battle_anim_80A5C6C.s
+8 -8
View File
@@ -586,8 +586,8 @@ _080A612E:
bx r1
thumb_func_end sub_80A60AC
thumb_func_start sub_80A6138
sub_80A6138: @ 80A6138
thumb_func_start GetBankSpriteDefault_Y
GetBankSpriteDefault_Y: @ 80A6138
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -597,10 +597,10 @@ sub_80A6138: @ 80A6138
lsrs r0, 24
pop {r1}
bx r1
thumb_func_end sub_80A6138
thumb_func_end GetBankSpriteDefault_Y
thumb_func_start sub_80A614C
sub_80A614C: @ 80A614C
thumb_func_start GetSubstituteSpriteDefault_Y
GetSubstituteSpriteDefault_Y: @ 80A614C
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -633,7 +633,7 @@ _080A6180:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_80A614C
thumb_func_end GetSubstituteSpriteDefault_Y
thumb_func_start sub_80A6190
sub_80A6190: @ 80A6190
@@ -5180,7 +5180,7 @@ _080A8412:
adds r0, r6, 0
ldr r1, [sp, 0x3C]
mov r2, r8
bl species_and_otid_get_pal
bl GetFrontSpritePalFromSpeciesAndPersonality
lsls r1, r5, 20
movs r2, 0x80
lsls r2, 17
@@ -5243,7 +5243,7 @@ _080A84B0:
adds r0, r6, 0
ldr r1, [sp, 0x3C]
mov r2, r8
bl species_and_otid_get_pal
bl GetFrontSpritePalFromSpeciesAndPersonality
lsls r1, r5, 20
movs r3, 0x80
lsls r3, 17
asm/battle_anim_80A9C70.s
+3 -3
View File
@@ -855,8 +855,8 @@ _080AA352:
.pool
thumb_func_end sub_80AA18C
thumb_func_start move_anim_start_t2
move_anim_start_t2: @ 80AA364
thumb_func_start LaunchStatusAnimation
LaunchStatusAnimation: @ 80AA364
push {r4,lr}
adds r4, r0, 0
lsls r4, 24
@@ -885,7 +885,7 @@ move_anim_start_t2: @ 80AA364
pop {r0}
bx r0
.pool
thumb_func_end move_anim_start_t2
thumb_func_end LaunchStatusAnimation
thumb_func_start task0A_80788BC
task0A_80788BC: @ 80AA3B4
asm/battle_anim_815A0D4.s
+3 -3
View File
@@ -3006,7 +3006,7 @@ _0815B8A8:
lsls r2, 3
adds r2, r3
ldrb r2, [r2, 0x1C]
bl sub_805E448
bl HandleSpeciesGfxDataChange
ldrb r1, [r5]
mov r0, sp
bl sub_80A6BFC
@@ -3310,7 +3310,7 @@ sub_815BB58: @ 815BB58
ldr r1, =gAnimBankTarget
ldrb r1, [r1]
movs r2, 0x1
bl sub_805E448
bl HandleSpeciesGfxDataChange
adds r0, r4, 0
bl DestroyAnimVisualTask
pop {r4}
@@ -10129,7 +10129,7 @@ _0815F2AC:
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0
bl refresh_graphics_maybe
bl LoadBattleMonGfxAndAnimate
bl IsContest
lsls r0, 24
cmp r0, 0
asm/battle_anim_8170478.s
+2 -2
View File
@@ -4825,7 +4825,7 @@ _08172CC8:
ldrb r1, [r5, 0x1E]
adds r0, r2, 0
adds r2, r6, 0
bl refresh_graphics_maybe
bl LoadBattleMonGfxAndAnimate
ldrh r0, [r5, 0x1C]
adds r0, 0x1
strh r0, [r5, 0x1C]
@@ -5030,7 +5030,7 @@ _08172E4E:
movs r3, 0x1
bl RequestDma3Fill
ldrb r0, [r4]
bl sub_805E974
bl ClearBehindSubstituteBit
adds r0, r5, 0
bl DestroyAnimVisualTask
_08172E84:
asm/berry_blender.s
+44 -44
View File
@@ -127,7 +127,7 @@ _0807F824:
b _0807F966
.pool
_0807F854:
ldr r1, =gUnknown_083390F4
ldr r1, =sBlenderCenterMap
movs r2, 0x80
lsls r2, 3
movs r0, 0x2
@@ -135,7 +135,7 @@ _0807F854:
bl CopyToBgTilemapBuffer
movs r0, 0x2
bl CopyBgTilemapBufferToVram
ldr r0, =gUnknown_083390D4
ldr r0, =sBlenderCenterPal
movs r2, 0x80
lsls r2, 1
movs r1, 0
@@ -216,14 +216,14 @@ _0807F910:
b _0807F966
.pool
_0807F940:
ldr r0, =gUnknown_083394F4
ldr r0, =sBlenderOuterPal
movs r1, 0x80
movs r2, 0x20
bl LoadPalette
b _0807F962
.pool
_0807F950:
ldr r0, =gUnknown_08339AC0
ldr r0, =sSpriteSheet_BlenderArrow
bl LoadSpriteSheet
ldr r0, =gUnknown_08339BD8
bl LoadSpriteSheet
@@ -243,9 +243,9 @@ _0807F980:
bl LoadSpriteSheet
ldr r0, =gUnknown_08339C58
bl LoadSpriteSheet
ldr r0, =gUnknown_08339AD0
ldr r0, =sSpritePal_BlenderArrow
bl LoadSpritePalette
ldr r0, =gUnknown_08339AC8
ldr r0, =sSpritePal_BlenderMisc
bl LoadSpritePalette
ldr r4, =gUnknown_020322A4
ldr r0, [r4]
@@ -482,12 +482,12 @@ _0807FBAC:
b _0807FCE2
_0807FBB8:
movs r4, 0
ldr r5, =gUnknown_083399C8
ldr r5, =sBlenderSyncArrowsPos
ldr r6, =gUnknown_020322A4
_0807FBBE:
ldrb r1, [r5]
ldrb r2, [r5, 0x1]
ldr r0, =gUnknown_08339AD8
ldr r0, =sBlenderSyncArrow_SpriteTemplate
movs r3, 0x1
bl CreateSprite
ldr r1, [r6]
@@ -553,7 +553,7 @@ _0807FC64:
ldr r4, [r6]
ldr r0, =0x000011b8
adds r4, r0
ldr r5, =gUnknown_0833973A
ldr r5, =gText_BerryBlenderStart
bl sav2_get_text_speed
adds r2, r0, 0
lsls r2, 24
@@ -833,7 +833,7 @@ _0807FE7C:
bne _0807FEC8
adds r0, r4, 0
adds r0, 0x1C
ldr r1, =gUnknown_083397D0
ldr r1, =sBlenderOpponentsNames
ldr r1, [r1, 0xC]
bl StringCopy
b _0807FED4
@@ -841,7 +841,7 @@ _0807FE7C:
_0807FEC8:
adds r0, r4, 0
adds r0, 0x1C
ldr r1, =gUnknown_083397D0
ldr r1, =sBlenderOpponentsNames
ldr r1, [r1]
bl StringCopy
_0807FED4:
@@ -866,7 +866,7 @@ _0807FEE8:
bl StringCopy
adds r0, r6, 0
adds r0, 0x1C
ldr r4, =gUnknown_083397D0
ldr r4, =sBlenderOpponentsNames
ldr r1, [r4, 0x10]
bl StringCopy
adds r0, r6, 0
@@ -896,7 +896,7 @@ _0807FF3C:
bl StringCopy
adds r0, r5, 0
adds r0, 0x1C
ldr r4, =gUnknown_083397D0
ldr r4, =sBlenderOpponentsNames
ldr r1, [r4, 0x14]
bl StringCopy
adds r0, r5, 0
@@ -1086,12 +1086,12 @@ _0808010C:
.pool
_08080120:
movs r5, 0
ldr r4, =gUnknown_083399C8
ldr r4, =sBlenderSyncArrowsPos
ldr r6, =gUnknown_020322A4
_08080126:
ldrb r1, [r4]
ldrb r2, [r4, 0x1]
ldr r0, =gUnknown_08339AD8
ldr r0, =sBlenderSyncArrow_SpriteTemplate
movs r3, 0x1
bl CreateSprite
ldr r1, [r6]
@@ -1160,7 +1160,7 @@ _080801C8:
ldr r0, [r4]
ldr r3, =0x000011b8
adds r0, r3
ldr r1, =gUnknown_0833981A
ldr r1, =sText_CommunicationStandby
movs r2, 0
bl sub_808417C
ldr r1, [r4]
@@ -2121,12 +2121,12 @@ _080809F0:
.pool
_08080A04:
movs r4, 0
ldr r5, =gUnknown_083399C8
ldr r5, =sBlenderSyncArrowsPos
ldr r6, =gUnknown_020322A4
_08080A0A:
ldrb r1, [r5]
ldrb r2, [r5, 0x1]
ldr r0, =gUnknown_08339AD8
ldr r0, =sBlenderSyncArrow_SpriteTemplate
movs r3, 0x1
bl CreateSprite
ldr r1, [r6]
@@ -3095,7 +3095,7 @@ sub_8081288: @ 8081288
mov r8, r7
lsls r1, 24
ldr r0, =gUnknown_08339B40
ldr r4, =gUnknown_083399C8
ldr r4, =sBlenderSyncArrowsPos
lsrs r1, 23
adds r2, r1, r4
ldrb r6, [r2]
@@ -5062,7 +5062,7 @@ _080822B0:
ldr r4, [r6]
ldr r5, =0x000011b8
adds r4, r5
ldr r5, =gUnknown_08339831
ldr r5, =sText_WouldLikeToBlendAnotherBerry
bl sav2_get_text_speed
adds r2, r0, 0
lsls r2, 24
@@ -5263,7 +5263,7 @@ _0808246C:
ldr r4, [r6]
ldr r0, =0x000011b8
adds r4, r0
ldr r5, =gUnknown_0833981A
ldr r5, =sText_CommunicationStandby
bl sav2_get_text_speed
adds r2, r0, 0
lsls r2, 24
@@ -5555,7 +5555,7 @@ _080826EC:
adds r1, r0
adds r0, r4, 0
bl StringCopy
ldr r1, =gUnknown_083398DD
ldr r1, =sText_ApostropheSPokeblockCaseIsFull
b _08082740
.pool
_0808271C:
@@ -5575,7 +5575,7 @@ _0808271C:
adds r1, r0
adds r0, r4, 0
bl StringCopy
ldr r1, =gUnknown_083398B0
ldr r1, =sText_HasNoBerriesToPut
_08082740:
adds r0, r4, 0
bl StringAppend
@@ -5856,7 +5856,7 @@ _080829AA:
adds r0, r1
strh r2, [r0]
ldr r0, =gStringVar4
ldr r1, =gUnknown_08339896
ldr r1, =sText_YourPokeblockCaseIsFull
bl StringCopy
b _08082A92
.pool
@@ -5872,7 +5872,7 @@ _080829D4:
adds r0, r1
strh r2, [r0]
ldr r0, =gStringVar4
ldr r1, =gUnknown_08339858
ldr r1, =sText_RunOutOfBerriesForBlending
bl StringCopy
b _08082A92
.pool
@@ -7276,7 +7276,7 @@ _080834DE:
b _08083854
.pool
_08083518:
ldr r4, =gUnknown_083398F5
ldr r4, =sText_BlendingResults
movs r0, 0x1
adds r1, r4, 0
movs r2, 0xA8
@@ -7329,7 +7329,7 @@ _08083564:
bl ConvertIntToDecimalStringN
ldr r0, [r7]
adds r0, 0x9F
ldr r1, =gUnknown_08339941
ldr r1, =sText_Dot
bl StringAppend
ldr r0, [r7]
adds r0, 0x9F
@@ -7374,7 +7374,7 @@ _08083564:
bl ConvertInternationalString
ldr r0, [r7]
adds r0, 0x9F
ldr r1, =gUnknown_08339914
ldr r1, =sText_SpaceBerry
bl StringAppend
ldr r1, [r7]
adds r1, 0x9F
@@ -7397,7 +7397,7 @@ _08083564:
cmp r6, r0
bcc _08083564
_0808361A:
ldr r1, =gUnknown_0833992E
ldr r1, =sText_MaximumSpeed
movs r3, 0xFF
mov r10, r3
str r3, [sp]
@@ -7425,7 +7425,7 @@ _0808361A:
bl ConvertIntToDecimalStringN
ldr r0, [r6]
adds r0, 0x9F
ldr r1, =gUnknown_08339941
ldr r1, =sText_Dot
bl StringAppend
ldr r0, [r6]
adds r0, 0x4E
@@ -7445,7 +7445,7 @@ _0808361A:
bl StringAppend
ldr r0, [r6]
adds r0, 0x9F
ldr r1, =gUnknown_0833993C
ldr r1, =sText_RPM
bl StringAppend
ldr r1, [r6]
adds r1, 0x9F
@@ -7463,7 +7463,7 @@ _0808361A:
movs r0, 0x5
movs r3, 0x51
bl sub_80840D4
ldr r1, =gUnknown_0833991B
ldr r1, =sText_Time
mov r2, r10
str r2, [sp]
mov r3, r9
@@ -7499,7 +7499,7 @@ _0808361A:
bl ConvertIntToDecimalStringN
ldr r0, [r6]
adds r0, 0x9F
ldr r1, =gUnknown_08339921
ldr r1, =sText_Min
bl StringAppend
adds r1, r4, 0
movs r2, 0x2
@@ -7507,7 +7507,7 @@ _0808361A:
bl ConvertIntToDecimalStringN
ldr r0, [r6]
adds r0, 0x9F
ldr r1, =gUnknown_08339928
ldr r1, =sText_Sec
bl StringAppend
ldr r1, [r6]
adds r1, 0x9F
@@ -7682,10 +7682,10 @@ sub_80838AC: @ 80838AC
ldr r1, [r0]
adds r0, r6, 0
bl StringCopy
ldr r1, =gUnknown_0833979D
ldr r1, =gText_WasMade
adds r0, r6, 0
bl StringAppend
ldr r1, =gUnknown_08339943
ldr r1, =sText_NewLine
adds r0, r6, 0
bl StringAppend
adds r0, r5, 0
@@ -7698,7 +7698,7 @@ sub_80838AC: @ 80838AC
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
ldr r1, =gUnknown_0833994F
ldr r1, =sText_TheLevelIs
adds r0, r6, 0
bl StringAppend
mov r0, sp
@@ -7709,7 +7709,7 @@ sub_80838AC: @ 80838AC
adds r0, r6, 0
mov r1, sp
bl StringAppend
ldr r1, =gUnknown_0833995D
ldr r1, =sText_TheFeelIs
adds r0, r6, 0
bl StringAppend
mov r0, sp
@@ -7720,10 +7720,10 @@ sub_80838AC: @ 80838AC
adds r0, r6, 0
mov r1, sp
bl StringAppend
ldr r1, =gUnknown_08339970
ldr r1, =sText_Dot2
adds r0, r6, 0
bl StringAppend
ldr r1, =gUnknown_0833979B
ldr r1, =gText_NewParagraph
adds r0, r6, 0
bl StringAppend
add sp, 0xC
@@ -8041,7 +8041,7 @@ _08083B9A:
movs r2, 0x1
movs r3, 0xD
bl SetWindowBorderStyle
ldr r4, =gUnknown_08339947
ldr r4, =sText_Ranking
movs r0, 0x1
adds r1, r4, 0
movs r2, 0xA8
@@ -8161,7 +8161,7 @@ _08083C84:
bl ConvertIntToDecimalStringN
ldr r0, [r7]
adds r0, 0x9F
ldr r1, =gUnknown_08339941
ldr r1, =sText_Dot
bl StringAppend
ldr r0, [r7]
adds r0, 0x9F
@@ -8395,7 +8395,7 @@ _08083E8A:
movs r3, 0x3
bl ConvertIntToDecimalStringN
adds r5, r0, 0
ldr r1, =gUnknown_08339941
ldr r1, =sText_Dot
bl StringAppend
adds r5, r0, 0
adds r0, r4, 0
@@ -8407,7 +8407,7 @@ _08083E8A:
movs r3, 0x2
bl ConvertIntToDecimalStringN
adds r5, r0, 0
ldr r1, =gUnknown_0833993C
ldr r1, =sText_RPM
bl StringAppend
movs r0, 0x1
add r1, sp, 0xC
asm/contest.s
+1 -1
View File
@@ -6763,7 +6763,7 @@ _080DB1CC:
adds r0, r5, 0
adds r1, r7, 0
adds r2, r6, 0
bl species_and_otid_get_pal
bl GetFrontSpritePalFromSpeciesAndPersonality
movs r1, 0x90
lsls r1, 1
movs r2, 0x20
asm/contest_painting.s
+3 -3
View File
@@ -386,7 +386,7 @@ sub_813010C: @ 813010C
ldr r1, =gText_Space
adds r0, r4, 0
bl StringAppend
ldr r1, =gUnknown_085B07D4
ldr r1, =gContestRankTextPointers
ldr r0, [r6]
ldrb r0, [r0, 0x1E]
lsls r0, 2
@@ -415,7 +415,7 @@ _08130190:
adds r1, 0xB
bl StringCopy
ldr r0, =gStringVar4
ldr r2, =gUnknown_085B07F4
ldr r2, =gContestPaintingDescriptionPointers
lsls r1, r5, 2
adds r1, r2
ldr r1, [r1]
@@ -572,7 +572,7 @@ sub_81302E8: @ 81302E8
ldr r1, [r0, 0x4]
ldr r2, [r0]
adds r0, r5, 0
bl species_and_otid_get_pal
bl GetFrontSpritePalFromSpeciesAndPersonality
ldr r7, =gUnknown_030061C4
ldr r1, [r7]
bl LZDecompressVram
asm/credits.s
+1 -1
View File
@@ -26,7 +26,7 @@ sub_81754DC: @ 81754DC
ands r0, r1
cmp r0, 0
beq _08175522
ldr r0, =gUnknown_0203BCE4
ldr r0, =gHasHallOfFameRecords
ldrb r0, [r0]
cmp r0, 0
beq _08175522
asm/hall_of_fame.s
-3603
View File
File diff suppressed because it is too large Load Diff
asm/link.s
+4 -4
View File
@@ -52022,7 +52022,7 @@ _080241A6:
movs r0, 0
movs r1, 0
bl sub_81973C4
ldr r2, =gUnknown_082C8959
ldr r2, =gText_SavingDontTurnOffPower
movs r0, 0
str r0, [sp]
movs r0, 0x2
@@ -64112,7 +64112,7 @@ _0802A3AE:
movs r0, 0
movs r1, 0
bl sub_81973C4
ldr r2, =gUnknown_082C8959
ldr r2, =gText_SavingDontTurnOffPower
str r4, [sp]
movs r0, 0x2
str r0, [sp, 0x4]
@@ -69004,7 +69004,7 @@ _0802CA32:
ldrh r0, [r7]
ldr r1, [r7, 0x4]
ldr r2, [r7, 0x8]
bl species_and_otid_get_pal
bl GetFrontSpritePalFromSpeciesAndPersonality
str r0, [sp, 0x20]
add r0, sp, 0x20
ldr r1, [r0, 0x4]
@@ -70355,7 +70355,7 @@ _0802D516:
strh r0, [r1, 0x12]
lsls r0, 24
lsrs r0, 24
ldr r2, =gUnknown_082C8959
ldr r2, =gText_SavingDontTurnOffPower
movs r1, 0x1
str r1, [sp]
movs r1, 0xFF
asm/party_menu.s
+1 -1
View File
@@ -4249,7 +4249,7 @@ _081B243E:
adds r0, r4, 0
movs r1, 0
bl FillWindowPixelBuffer
ldr r5, =gText_Confirm
ldr r5, =gMenuText_Confirm
movs r0, 0
adds r1, r5, 0
movs r2, 0x30
asm/pokeball.s
+3 -3
View File
@@ -936,7 +936,7 @@ _08075B9E:
.pool
_08075BB4:
adds r0, r3, 0
bl sub_805F110
bl ShouldPlayNormalPokeCry
cmp r0, 0x1
bne _08075BCC
lsls r1, r5, 24
@@ -976,7 +976,7 @@ _08075BF8:
cmp r0, 0
bne _08075CBA
adds r0, r3, 0
bl sub_805F110
bl ShouldPlayNormalPokeCry
cmp r0, 0x1
bne _08075C22
lsls r1, r5, 24
@@ -1066,7 +1066,7 @@ _08075CBA:
b _08075D04
_08075CC0:
adds r0, r3, 0
bl sub_805F110
bl ShouldPlayNormalPokeCry
cmp r0, 0x1
bne _08075CD8
lsls r1, r5, 24
asm/pokedex.s
+1 -1
View File
@@ -8824,7 +8824,7 @@ _080C0168:
adds r3, r5
ldrb r4, [r3, 0x5]
lsrs r4, 4
bl species_and_otid_get_pal
bl GetFrontSpritePalFromSpeciesAndPersonality
lsls r4, 4
movs r2, 0x80
lsls r2, 1
asm/pokemon_storage_system.s
+2 -2
View File
@@ -14656,7 +14656,7 @@ _080CEC86:
adds r1, r3
str r0, [r1]
adds r0, r6, 0
bl pokemon_get_pal
bl GetMonFrontSpritePal
ldr r1, [r4]
ldr r2, =0x00000cdc
adds r1, r2
@@ -14759,7 +14759,7 @@ _080CED7E:
adds r1, r4
ldrh r0, [r1]
mov r1, r9
bl species_and_otid_get_pal
bl GetFrontSpritePalFromSpeciesAndPersonality
ldr r1, [r5]
ldr r3, =0x00000cdc
adds r2, r1, r3
asm/pokemon_summary_screen.s
+1 -1
View File
@@ -1116,7 +1116,7 @@ sub_81C4778: @ 81C4778
bne _081C47AE
adds r0, r1, 0
adds r0, 0xC
bl sub_805F110
bl ShouldPlayNormalPokeCry
cmp r0, 0x1
bne _081C47A4
ldrh r0, [r4, 0x2]
asm/pokenav.s
+2 -2
View File
@@ -13532,7 +13532,7 @@ _081CDBD0:
adds r0, r4, 0
mov r1, r8
adds r2, r5, 0
bl species_and_otid_get_pal
bl GetFrontSpritePalFromSpeciesAndPersonality
mov r2, r9
lsls r1, r2, 7
adds r1, r7, r1
@@ -24408,7 +24408,7 @@ _081D30C4:
adds r0, r4, 0
adds r1, r6, 0
adds r2, r5, 0
bl species_and_otid_get_pal
bl GetFrontSpritePalFromSpeciesAndPersonality
mov r1, r9
bl LZ77UnCompWram
_081D311A:
asm/rom6.s
+4 -4
View File
@@ -4043,12 +4043,12 @@ sub_8137734: @ 8137734
lsrs r1, r0, 24
cmp r1, 0x1
bne _08137760
ldr r0, =gUnknown_0203BCE4
ldr r0, =gHasHallOfFameRecords
strb r1, [r0]
b _0813776C
.pool
_08137760:
ldr r1, =gUnknown_0203BCE4
ldr r1, =gHasHallOfFameRecords
movs r0, 0
strb r0, [r1]
adds r0, r4, 0
@@ -4165,7 +4165,7 @@ _08137838:
movs r1, 0x43
bl sub_80EE4DC
_0813785A:
ldr r0, =sub_8173694
ldr r0, =CB2_DoHallOfFameScreen
bl SetMainCallback2
movs r0, 0
add sp, 0x1C
@@ -4638,7 +4638,7 @@ sub_8137C10: @ 8137C10
thumb_func_start sub_8137C28
sub_8137C28: @ 8137C28
push {lr}
ldr r0, =sub_8174194
ldr r0, =CB2_DoHallOfFamePC
bl SetMainCallback2
bl ScriptContext2_Enable
pop {r0}
asm/start_menu.s
+1 -1
View File
@@ -1683,7 +1683,7 @@ _080A05AC:
movs r0, 0
movs r1, 0x11
bl FillWindowPixelBuffer
ldr r2, =gUnknown_082C8959
ldr r2, =gText_SavingDontTurnOffPower
movs r4, 0
str r4, [sp]
movs r0, 0x2
asm/trade.s
+2 -2
View File
@@ -13814,7 +13814,7 @@ _0807ED98:
movs r0, 0x32
strb r0, [r1]
ldr r4, =gStringVar4
ldr r1, =gUnknown_082C8959
ldr r1, =gText_SavingDontTurnOffPower
_0807EDA6:
adds r0, r4, 0
bl StringExpandPlaceholders
@@ -14668,7 +14668,7 @@ _0807F50A:
movs r1, 0x3
strb r1, [r0]
ldr r4, =gStringVar4
ldr r1, =gUnknown_082C8959
ldr r1, =gText_SavingDontTurnOffPower
adds r0, r4, 0
bl StringExpandPlaceholders
movs r0, 0