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

Merge origin/master into pikalaxalt/link

Browse Source
This commit is contained in:
PikalaxALT
2017-11-16 08:36:51 -05:00
parent 50501396b2 c0d180a870
commit 236cbf96c8
2913 changed files with 158852 additions and 19880 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_5.s
-582
View File
@@ -1,582 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start AllocateBattleResrouces
AllocateBattleResrouces: @ 8056F28
push {r4-r6,lr}
ldr r5, =gBattleResources
ldr r6, =gBattleTypeFlags
ldr r0, [r6]
movs r1, 0x80
lsls r1, 19
ands r0, r1
cmp r0, 0
beq _08056F3E
bl sub_81D55D0
_08056F3E:
ldr r4, =gBattleStruct
movs r0, 0xA9
lsls r0, 2
bl AllocZeroed
str r0, [r4]
movs r0, 0x20
bl AllocZeroed
str r0, [r5]
movs r0, 0xA0
bl AllocZeroed
ldr r1, [r5]
str r0, [r1]
movs r0, 0x10
bl AllocZeroed
ldr r1, [r5]
str r0, [r1, 0x4]
movs r0, 0x24
bl AllocZeroed
ldr r1, [r5]
str r0, [r1, 0x8]
movs r0, 0x24
bl AllocZeroed
ldr r1, [r5]
str r0, [r1, 0xC]
movs r0, 0xC
bl AllocZeroed
ldr r1, [r5]
str r0, [r1, 0x10]
movs r0, 0x1C
bl AllocZeroed
ldr r1, [r5]
str r0, [r1, 0x14]
movs r0, 0x54
bl AllocZeroed
ldr r1, [r5]
str r0, [r1, 0x18]
movs r0, 0x24
bl AllocZeroed
ldr r1, [r5]
str r0, [r1, 0x1C]
ldr r4, =gLinkBattleSendBuffer
movs r5, 0x80
lsls r5, 5
adds r0, r5, 0
bl AllocZeroed
str r0, [r4]
ldr r4, =gLinkBattleRecvBuffer
adds r0, r5, 0
bl AllocZeroed
str r0, [r4]
ldr r4, =gUnknown_0202305C
movs r0, 0x80
lsls r0, 6
bl AllocZeroed
str r0, [r4]
ldr r4, =gUnknown_02023060
adds r0, r5, 0
bl AllocZeroed
str r0, [r4]
ldr r0, [r6]
movs r1, 0x80
lsls r1, 20
ands r0, r1
cmp r0, 0
beq _08056FFA
ldr r0, =0x00004054
bl VarGet
lsls r0, 16
lsrs r0, 16
ldr r2, =gSaveBlock1Ptr
lsls r1, r0, 2
adds r1, r0
lsls r1, 5
ldr r0, =0x00001a9c
adds r1, r0
ldr r0, [r2]
adds r0, r1
bl CreateSecretBaseEnemyParty
_08056FFA:
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end AllocateBattleResrouces
thumb_func_start FreeBattleResources
FreeBattleResources: @ 8057028
push {r4-r6,lr}
ldr r0, =gBattleTypeFlags
ldr r0, [r0]
movs r1, 0x80
lsls r1, 19
ands r0, r1
cmp r0, 0
beq _0805703C
bl sub_81D5694
_0805703C:
ldr r6, =gBattleResources
ldr r0, [r6]
cmp r0, 0
beq _080570D0
ldr r4, =gBattleStruct
ldr r0, [r4]
bl Free
movs r5, 0
str r5, [r4]
ldr r0, [r6]
ldr r0, [r0]
bl Free
ldr r0, [r6]
str r5, [r0]
ldr r0, [r0, 0x4]
bl Free
ldr r0, [r6]
str r5, [r0, 0x4]
ldr r0, [r0, 0x8]
bl Free
ldr r0, [r6]
str r5, [r0, 0x8]
ldr r0, [r0, 0xC]
bl Free
ldr r0, [r6]
str r5, [r0, 0xC]
ldr r0, [r0, 0x10]
bl Free
ldr r0, [r6]
str r5, [r0, 0x10]
ldr r0, [r0, 0x14]
bl Free
ldr r0, [r6]
str r5, [r0, 0x14]
ldr r0, [r0, 0x18]
bl Free
ldr r0, [r6]
str r5, [r0, 0x18]
ldr r0, [r0, 0x1C]
bl Free
ldr r0, [r6]
str r5, [r0, 0x1C]
bl Free
str r5, [r6]
ldr r4, =gLinkBattleSendBuffer
ldr r0, [r4]
bl Free
str r5, [r4]
ldr r4, =gLinkBattleRecvBuffer
ldr r0, [r4]
bl Free
str r5, [r4]
ldr r4, =gUnknown_0202305C
ldr r0, [r4]
bl Free
str r5, [r4]
ldr r4, =gUnknown_02023060
ldr r0, [r4]
bl Free
str r5, [r4]
_080570D0:
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end FreeBattleResources
thumb_func_start AdjustFriendshipOnBattleFaint
AdjustFriendshipOnBattleFaint: @ 80570F4
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r0, =gBattleTypeFlags
ldr r0, [r0]
movs r1, 0x1
ands r0, r1
cmp r0, 0
beq _08057140
movs r0, 0x1
bl GetBankByIdentity
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0x3
bl GetBankByIdentity
lsls r0, 24
lsrs r3, r0, 24
ldr r2, =gBattleMons
movs r0, 0x58
adds r1, r3, 0
muls r1, r0
adds r1, r2
adds r1, 0x2A
muls r0, r4
adds r0, r2
adds r0, 0x2A
ldrb r1, [r1]
ldrb r0, [r0]
cmp r1, r0
bls _0805714A
adds r4, r3, 0
b _0805714A
.pool
_08057140:
movs r0, 0x1
bl GetBankByIdentity
lsls r0, 24
lsrs r4, r0, 24
_0805714A:
ldr r2, =gBattleMons
movs r1, 0x58
adds r0, r4, 0
muls r0, r1
adds r0, r2
adds r3, r0, 0
adds r3, 0x2A
adds r0, r5, 0
muls r0, r1
adds r0, r2
adds r1, r0, 0
adds r1, 0x2A
ldrb r0, [r3]
ldrb r2, [r1]
cmp r0, r2
bls _080571B8
ldrb r1, [r1]
subs r0, r1
cmp r0, 0x1D
ble _08057198
ldr r1, =gBattlePartyID
lsls r0, r5, 1
adds r0, r1
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x8
bl AdjustFriendship
b _080571CE
.pool
_08057198:
ldr r1, =gBattlePartyID
lsls r0, r5, 1
adds r0, r1
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x6
bl AdjustFriendship
b _080571CE
.pool
_080571B8:
ldr r1, =gBattlePartyID
lsls r0, r5, 1
adds r0, r1
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x6
bl AdjustFriendship
_080571CE:
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end AdjustFriendshipOnBattleFaint
thumb_func_start sub_80571DC
sub_80571DC: @ 80571DC
push {r4-r7,lr}
lsls r0, 24
lsrs r4, r0, 24
lsls r1, 24
lsrs r7, r1, 24
adds r0, r4, 0
bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _08057248
movs r2, 0
ldr r6, =gBattlePartyID
lsls r3, r4, 1
ldr r5, =gUnknown_0203CF00
ldr r4, =gBattleStruct
_080571FE:
adds r0, r2, r5
ldr r1, [r4]
adds r1, r2, r1
adds r1, 0x60
ldrb r1, [r1]
strb r1, [r0]
adds r2, 0x1
cmp r2, 0x2
ble _080571FE
adds r0, r3, r6
ldrb r0, [r0]
bl pokemon_order_func
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r7, 0
bl pokemon_order_func
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_81B8FB0
movs r2, 0
ldr r4, =gBattleStruct
ldr r3, =gUnknown_0203CF00
_08057236:
ldr r0, [r4]
adds r0, r2, r0
adds r0, 0x60
adds r1, r2, r3
ldrb r1, [r1]
strb r1, [r0]
adds r2, 0x1
cmp r2, 0x2
ble _08057236
_08057248:
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_80571DC
thumb_func_start sub_805725C
sub_805725C: @ 805725C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x4
lsls r0, 24
lsrs r0, 24
mov r9, r0
movs r0, 0
mov r8, r0
ldr r1, =gBattleCommunication
mov r10, r1
b _08057284
.pool
_0805727C:
mov r2, r8
cmp r2, 0
beq _08057284
b _08057406
_08057284:
mov r1, r10
ldrb r0, [r1]
cmp r0, 0x1
bne _0805728E
b _08057390
_0805728E:
cmp r0, 0x1
ble _08057294
b _080573FC
_08057294:
cmp r0, 0
beq _0805729A
b _080573FC
_0805729A:
ldr r6, =gBattleMons
movs r0, 0x58
mov r5, r9
muls r5, r0
adds r0, r6, 0
adds r0, 0x4C
adds r4, r5, r0
ldr r0, [r4]
movs r7, 0x7
ands r0, r7
cmp r0, 0
beq _08057372
mov r0, r9
bl UproarWakeUpCheck
lsls r0, 24
cmp r0, 0
beq _080572FC
ldr r0, [r4]
movs r1, 0x8
negs r1, r1
ands r0, r1
str r0, [r4]
adds r2, r6, 0
adds r2, 0x50
adds r2, r5, r2
ldr r0, [r2]
ldr r1, =0xf7ffffff
ands r0, r1
str r0, [r2]
bl BattleScriptPushCursor
movs r0, 0x1
mov r2, r10
strb r0, [r2, 0x5]
ldr r1, =gBattlescriptCurrInstr
ldr r0, =BattleScript_MoveUsedWokeUp
str r0, [r1]
movs r0, 0x2
mov r8, r0
b _08057372
.pool
_080572FC:
adds r0, r5, r6
adds r0, 0x20
ldrb r0, [r0]
movs r2, 0x1
cmp r0, 0x30
bne _0805730A
movs r2, 0x2
_0805730A:
ldr r1, [r4]
adds r0, r1, 0
ands r0, r7
cmp r0, r2
bcs _0805731E
movs r0, 0x8
negs r0, r0
ands r1, r0
str r1, [r4]
b _08057322
_0805731E:
subs r0, r1, r2
str r0, [r4]
_08057322:
ldr r2, =gBattleMons
movs r0, 0x58
mov r1, r9
muls r1, r0
adds r0, r2, 0
adds r0, 0x4C
adds r0, r1, r0
ldr r4, [r0]
movs r0, 0x7
ands r4, r0
cmp r4, 0
beq _08057354
ldr r1, =gBattlescriptCurrInstr
ldr r0, =BattleScript_MoveUsedIsAsleep
str r0, [r1]
movs r1, 0x2
mov r8, r1
b _08057372
.pool
_08057354:
adds r2, 0x50
adds r2, r1, r2
ldr r0, [r2]
ldr r1, =0xf7ffffff
ands r0, r1
str r0, [r2]
bl BattleScriptPushCursor
ldr r0, =gBattleCommunication
strb r4, [r0, 0x5]
ldr r1, =gBattlescriptCurrInstr
ldr r0, =BattleScript_MoveUsedWokeUp
str r0, [r1]
movs r2, 0x2
mov r8, r2
_08057372:
ldr r1, =gBattleCommunication
ldrb r0, [r1]
adds r0, 0x1
strb r0, [r1]
mov r10, r1
b _080573FC
.pool
_08057390:
ldr r1, =gBattleMons
movs r0, 0x58
mov r2, r9
muls r2, r0
adds r0, r2, 0
adds r1, 0x4C
adds r4, r0, r1
ldr r0, [r4]
movs r1, 0x20
ands r0, r1
cmp r0, 0
beq _080573F4
bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x5
bl __umodsi3
lsls r0, 16
lsrs r5, r0, 16
cmp r5, 0
beq _080573D4
ldr r1, =gBattlescriptCurrInstr
ldr r0, =BattleScript_MoveUsedIsFrozen
str r0, [r1]
b _080573EC
.pool
_080573D4:
ldr r0, [r4]
movs r1, 0x21
negs r1, r1
ands r0, r1
str r0, [r4]
bl BattleScriptPushCursor
ldr r1, =gBattlescriptCurrInstr
ldr r0, =BattleScript_MoveUsedUnfroze
str r0, [r1]
mov r0, r10
strb r5, [r0, 0x5]
_080573EC:
movs r1, 0x2
mov r8, r1
ldr r2, =gBattleCommunication
mov r10, r2
_080573F4:
mov r1, r10
ldrb r0, [r1]
adds r0, 0x1
strb r0, [r1]
_080573FC:
mov r2, r10
ldrb r0, [r2]
cmp r0, 0x2
beq _08057406
b _0805727C
_08057406:
mov r0, r8
cmp r0, 0x2
bne _08057430
ldr r4, =gActiveBank
mov r1, r9
strb r1, [r4]
ldrb r1, [r4]
movs r0, 0x58
muls r0, r1
ldr r1, =gBattleMons + 0x4C
adds r0, r1
str r0, [sp]
movs r0, 0
movs r1, 0x28
movs r2, 0
movs r3, 0x4
bl EmitSetMonData
ldrb r0, [r4]
bl MarkBufferBankForExecution
_08057430:
mov r0, r8
add sp, 0x4
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r1}
bx r1
.pool
thumb_func_end sub_805725C
.align 2, 0 @ Don't pad with nop.
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/battle_frontier_1.s
+25 -25
View File
@@ -136,7 +136,7 @@ _0818EAC8:
.4byte _0818ECD0
.4byte _0818ECF4
_0818EAF0:
ldr r3, =gScriptResult
ldr r3, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
lsls r1, r5, 1
@@ -150,7 +150,7 @@ _0818EAF0:
b _0818ED10
.pool
_0818EB14:
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r2, [r0]
ldr r3, =0x00000cdc
@@ -170,7 +170,7 @@ _0818EB14:
b _0818ED10
.pool
_0818EB48:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000d08
@@ -180,7 +180,7 @@ _0818EB48:
b _0818ECBE
.pool
_0818EB64:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r3, =0x00000d08
@@ -190,7 +190,7 @@ _0818EB64:
b _0818ECBE
.pool
_0818EB80:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000d08
@@ -198,7 +198,7 @@ _0818EB80:
b _0818ECBA
.pool
_0818EB98:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r3, =0x00000d08
@@ -216,7 +216,7 @@ _0818EBB4:
bne _0818EC04
cmp r5, 0
beq _0818EBE8
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000d08
@@ -226,7 +226,7 @@ _0818EBB4:
b _0818ECBE
.pool
_0818EBE8:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r3, =0x00000d08
@@ -238,7 +238,7 @@ _0818EBE8:
_0818EC04:
cmp r5, 0
beq _0818EC24
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000d08
@@ -248,7 +248,7 @@ _0818EC04:
b _0818ECBE
.pool
_0818EC24:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r3, =0x00000d08
@@ -266,7 +266,7 @@ _0818EC40:
bne _0818EC90
cmp r5, 0
beq _0818EC74
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000d08
@@ -277,7 +277,7 @@ _0818EC40:
b _0818ED10
.pool
_0818EC74:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r3, =0x00000d08
@@ -289,7 +289,7 @@ _0818EC74:
_0818EC90:
cmp r5, 0
beq _0818ECB0
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000d08
@@ -299,7 +299,7 @@ _0818EC90:
b _0818ECBE
.pool
_0818ECB0:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r3, =0x00000d08
@@ -328,7 +328,7 @@ _0818ECD0:
b _0818ED10
.pool
_0818ECF4:
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r1, [r0]
ldr r3, =0x00000d0a
@@ -11707,12 +11707,12 @@ sub_8194EC0: @ 8194EC0
bl sub_8195358
cmp r4, r0
ble _08194EE8
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
b _08194EEC
.pool
_08194EE8:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x2
_08194EEC:
strh r0, [r1]
@@ -13130,7 +13130,7 @@ _08195A74:
beq _08195AB0
b _08195AD0
_08195A7A:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldr r1, [r5]
ldr r2, =0x00000dc6
adds r1, r2
@@ -13139,7 +13139,7 @@ _08195A7A:
b _08195AD0
.pool
_08195A90:
ldr r3, =gScriptResult
ldr r3, =gSpecialVar_Result
ldr r0, [r5]
lsls r1, r7, 1
lsls r2, r6, 2
@@ -13152,7 +13152,7 @@ _08195A90:
b _08195AD0
.pool
_08195AB0:
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
ldr r2, [r5]
ldr r0, =0x00000cdc
adds r2, r0
@@ -13285,7 +13285,7 @@ sub_8195BB0: @ 8195BB0
ldrh r0, [r2]
cmp r0, 0x31
bhi _08195C00
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
bl Random
lsls r0, 16
lsrs r0, 16
@@ -13297,12 +13297,12 @@ sub_8195BB0: @ 8195BB0
_08195C00:
cmp r0, 0x62
bhi _08195C10
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x3
b _08195C14
.pool
_08195C10:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x4
_08195C14:
strh r0, [r1]
@@ -13517,12 +13517,12 @@ sub_8195DB8: @ 8195DB8
adds r0, r1
movs r1, 0
strh r1, [r0]
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r5, [r0]
b _08195E06
.pool
_08195E00:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
_08195E06:
asm/battle_frontier_2.s
+89 -89
View File
@@ -2801,7 +2801,7 @@ sub_819BCF8: @ 819BCF8
lsls r0, 16
lsrs r0, 16
add r1, sp, 0xC
bl sub_81DB468
bl CopyMonCategoryText
movs r0, 0x1
add r1, sp, 0xC
movs r2, 0x76
@@ -4361,14 +4361,14 @@ _0819CA4E:
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r1, [r0]
b _0819CAFE
.pool
_0819CA68:
movs r0, 0x2
strh r0, [r4, 0x8]
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
b _0819CAFE
@@ -8831,7 +8831,7 @@ _0819EFF2:
lsls r0, 16
lsrs r0, 16
add r1, sp, 0xC
bl sub_81DB468
bl CopyMonCategoryText
movs r0, 0x1
add r1, sp, 0xC
movs r2, 0x76
@@ -11730,13 +11730,13 @@ _081A0734:
bne _081A0778
movs r0, 0x5
bl PlaySE
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x7F
strh r0, [r1]
b _081A0768
.pool
_081A0764:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r1, [r0]
_081A0768:
ldrb r0, [r4, 0xC]
@@ -11982,12 +11982,12 @@ sub_81A093C: @ 81A093C
lsrs r1, r0, 24
cmp r1, 0
bne _081A0954
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r1, [r0]
b _081A095A
.pool
_081A0954:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
_081A095A:
@@ -12046,7 +12046,7 @@ sub_81A0990: @ 81A0990
thumb_func_start sub_81A09B4
sub_81A09B4: @ 81A09B4
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
adds r0, 0xB1
@@ -12070,13 +12070,13 @@ sub_81A09D0: @ 81A09D0
subs r1, r0, 0x3
cmp r1, 0
bge _081A09F4
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
b _081A0A1C
.pool
_081A09F4:
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
cmp r1, 0x8
ble _081A09FE
movs r0, 0x1
@@ -12403,7 +12403,7 @@ sub_81A0CC0: @ 81A0CC0
lsrs r0, r1, 28
cmp r0, 0x2
bhi _081A0CE4
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x2
b _081A0D34
.pool
@@ -12431,22 +12431,22 @@ _081A0D08:
beq _081A0D24
b _081A0D30
_081A0D0E:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x4
b _081A0D34
.pool
_081A0D18:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x3
b _081A0D34
.pool
_081A0D24:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
b _081A0D34
.pool
_081A0D30:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x5
_081A0D34:
strh r0, [r1]
@@ -13078,7 +13078,7 @@ _081A1242:
lsls r0, 30
ldr r1, =gSpecialVar_0x8005
mov r12, r1
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
mov r8, r1
cmp r0, 0
beq _081A127C
@@ -13855,7 +13855,7 @@ _081A186C:
.4byte _081A1918
.4byte _081A1938
_081A188C:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000ca8
@@ -13865,7 +13865,7 @@ _081A188C:
b _081A1956
.pool
_081A18A8:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000ca9
@@ -13877,7 +13877,7 @@ _081A18A8:
b _081A1956
.pool
_081A18C8:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000cb2
@@ -13887,7 +13887,7 @@ _081A18C8:
b _081A1956
.pool
_081A18E4:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000ca9
@@ -13897,7 +13897,7 @@ _081A18E4:
b _081A1926
.pool
_081A1900:
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
ldr r1, =gBattleOutcome
ldrb r0, [r1]
strh r0, [r2]
@@ -13906,7 +13906,7 @@ _081A1900:
b _081A1956
.pool
_081A1918:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000ca9
@@ -13919,7 +13919,7 @@ _081A1926:
b _081A1956
.pool
_081A1938:
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r2, [r0]
movs r0, 0xD0
@@ -17183,7 +17183,7 @@ sub_81A35EC: @ 81A35EC
push {r4,lr}
ldr r0, =0x000040cf
bl VarGet
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
bl sub_81A3610
lsls r0, 24
lsrs r0, 24
@@ -17755,12 +17755,12 @@ sub_81A3B00: @ 81A3B00
ldr r0, =0x000003fe
cmp r1, r0
bne _081A3B20
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
b _081A3B24
.pool
_081A3B20:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
_081A3B24:
strh r0, [r1]
@@ -17988,7 +17988,7 @@ sub_81A3D30: @ 81A3D30
push {r4,lr}
ldr r0, =0x000040cf
bl VarGet
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
lsls r0, 24
lsrs r0, 24
bl sub_81A3B30
@@ -18044,13 +18044,13 @@ sub_81A3DA0: @ 81A3DA0
ands r2, r1
cmp r2, 0
beq _081A3DC4
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
b _081A3DC8
.pool
_081A3DC4:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r2, [r0]
_081A3DC8:
pop {r0}
@@ -18390,7 +18390,7 @@ _081A404E:
bne _081A40C8
cmp r7, 0
bne _081A40E4
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldrb r3, [r0]
str r6, [sp]
add r1, sp, 0x10
@@ -18406,7 +18406,7 @@ _081A404E:
b _081A40E4
.pool
_081A40C8:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldrb r3, [r0]
str r6, [sp]
add r1, sp, 0x10
@@ -18529,7 +18529,7 @@ _081A41E0:
strh r0, [r1]
ldr r0, =gSaveBlock2Ptr
ldr r2, [r0]
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldrb r0, [r0]
ldr r1, =0x00000ca9
adds r2, r1
@@ -18767,7 +18767,7 @@ _081A43EE:
thumb_func_start sub_81A4410
sub_81A4410: @ 81A4410
push {r4,lr}
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
bl MoveRecordedBattleToSaveData
strh r0, [r4]
ldr r0, =gSaveBlock2Ptr
@@ -21309,7 +21309,7 @@ _081A5994:
beq _081A59C8
b _081A59EE
_081A599A:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldr r2, =0x00000dd8
adds r1, r3, r2
ldrh r1, [r1]
@@ -21317,7 +21317,7 @@ _081A599A:
b _081A59EE
.pool
_081A59B0:
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
lsls r1, 1
ldr r4, =0x00000dda
adds r0, r3, r4
@@ -21328,7 +21328,7 @@ _081A59B0:
_081A59C8:
cmp r1, 0
beq _081A59E0
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
ldr r1, =0x00000cdc
adds r0, r3, r1
ldr r0, [r0]
@@ -21336,7 +21336,7 @@ _081A59C8:
b _081A59EA
.pool
_081A59E0:
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
ldr r4, =0x00000cdc
adds r0, r3, r4
ldr r0, [r0]
@@ -21550,12 +21550,12 @@ sub_81A5B88: @ 81A5B88
adds r0, r1
movs r1, 0
strh r1, [r0]
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r5, [r0]
b _081A5BD6
.pool
_081A5BD0:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
_081A5BD6:
@@ -22026,7 +22026,7 @@ _081A5FE4:
beq _081A6030
b _081A6044
_081A5FEA:
ldr r3, =gScriptResult
ldr r3, =gSpecialVar_Result
ldr r0, [r7]
lsls r1, r6, 1
lsls r2, r5, 2
@@ -22035,7 +22035,7 @@ _081A5FEA:
b _081A603C
.pool
_081A6000:
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
ldr r2, [r7]
ldr r0, =0x00000cdc
adds r2, r0
@@ -22054,7 +22054,7 @@ _081A6000:
b _081A6044
.pool
_081A6030:
ldr r3, =gScriptResult
ldr r3, =gSpecialVar_Result
ldr r0, [r7]
lsls r1, r6, 1
lsls r2, r5, 2
@@ -23248,7 +23248,7 @@ sub_81A6A08: @ 81A6A08
str r0, [r1]
movs r4, 0
add r5, sp, 0x14
ldr r7, =gScriptResult
ldr r7, =gSpecialVar_Result
movs r1, 0
_081A6A1E:
mov r2, sp
@@ -23407,7 +23407,7 @@ _081A6B18:
lsrs r4, r0, 24
cmp r4, 0x2
bls _081A6B0E
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
movs r4, 0x1
@@ -24180,7 +24180,7 @@ _081A7174:
.4byte _081A71E8
.4byte _081A720C
_081A7188:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldr r1, [r3]
ldr r3, =0x00000e02
adds r1, r3
@@ -24189,7 +24189,7 @@ _081A7188:
b _081A723A
.pool
_081A71A0:
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
ldr r1, [r3]
ldr r3, =0x00000ca9
adds r0, r1, r3
@@ -24203,7 +24203,7 @@ _081A71A0:
b _081A7238
.pool
_081A71C4:
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
ldr r1, [r3]
ldr r3, =0x00000ca9
adds r0, r1, r3
@@ -24217,7 +24217,7 @@ _081A71C4:
b _081A7238
.pool
_081A71E8:
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
ldr r1, [r3]
ldr r3, =0x00000ca9
adds r0, r1, r3
@@ -24233,7 +24233,7 @@ _081A71E8:
_081A720C:
cmp r2, 0
beq _081A7228
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
ldr r0, [r3]
ldr r1, =0x00000cdc
adds r0, r1
@@ -24243,7 +24243,7 @@ _081A720C:
b _081A7236
.pool
_081A7228:
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
ldr r0, [r3]
ldr r3, =0x00000cdc
adds r0, r3
@@ -24424,12 +24424,12 @@ sub_81A73B8: @ 81A73B8
ldrh r0, [r0]
cmp r0, 0xE
bls _081A73DC
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
b _081A73E0
.pool
_081A73DC:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
_081A73E0:
strh r0, [r1]
@@ -24440,7 +24440,7 @@ _081A73E0:
thumb_func_start sub_81A73EC
sub_81A73EC: @ 81A73EC
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldr r1, =gUnknown_0300128C
ldrb r1, [r1]
strh r1, [r0]
@@ -24528,27 +24528,27 @@ _081A7484:
beq _081A74A4
b _081A74C2
_081A748E:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
b _081A74C0
.pool
_081A7498:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
b _081A74C0
.pool
_081A74A4:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x2
b _081A74C0
.pool
_081A74B0:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x3
b _081A74C0
.pool
_081A74BC:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x4
_081A74C0:
strh r0, [r1]
@@ -24560,7 +24560,7 @@ _081A74C2:
thumb_func_start sub_81A74CC
sub_81A74CC: @ 81A74CC
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldr r1, =gUnknown_0300128D
ldrb r1, [r1]
strh r1, [r0]
@@ -24580,7 +24580,7 @@ sub_81A74E0: @ 81A74E0
adds r4, 0x1
adds r0, r4, 0
bl sub_81A7F38
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r4, [r0]
pop {r4}
pop {r0}
@@ -26066,7 +26066,7 @@ _081A807A:
thumb_func_start sub_81A8090
sub_81A8090: @ 81A8090
push {r4,lr}
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
bl InBattlePike
lsls r0, 24
lsrs r0, 24
@@ -26110,7 +26110,7 @@ sub_81A80DC: @ 81A80DC
push {r4-r7,lr}
mov r7, r8
push {r7}
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
movs r0, 0
strh r0, [r4]
movs r0, 0x1
@@ -26295,7 +26295,7 @@ _081A824C:
thumb_func_start sub_81A825C
sub_81A825C: @ 81A825C
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
movs r2, 0xE1
@@ -26311,7 +26311,7 @@ sub_81A825C: @ 81A825C
thumb_func_start sub_81A827C
sub_81A827C: @ 81A827C
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
ldr r1, =gUnknown_0861266C
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
@@ -26754,7 +26754,7 @@ _081A8634:
thumb_func_start sub_81A863C
sub_81A863C: @ 81A863C
push {r4,lr}
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
movs r0, 0
bl sub_81A8590
lsls r0, 24
@@ -26787,7 +26787,7 @@ sub_81A8658: @ 81A8658
ldrb r4, [r0]
adds r0, r4, 0
bl sub_81A7F38
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r4, [r0]
pop {r4}
pop {r0}
@@ -26821,7 +26821,7 @@ sub_81A86C0: @ 81A86C0
mov r6, r9
mov r5, r8
push {r5-r7}
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
movs r0, 0
@@ -26895,7 +26895,7 @@ _081A8766:
mov r0, r9
cmp r0, 0x1
bne _081A8778
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
b _081A8786
@@ -27919,13 +27919,13 @@ _081A8F70:
.4byte _081A9010
.4byte _081A9028
_081A8F8C:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldr r1, [r3]
ldr r3, =0x00000e18
b _081A8FFE
.pool
_081A8F9C:
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
ldr r0, [r3]
lsls r1, r4, 1
ldr r3, =0x00000e1a
@@ -27937,14 +27937,14 @@ _081A8F9C:
_081A8FB4:
cmp r4, 0
beq _081A8FCC
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
ldr r0, [r3]
ldr r1, =0x00000cdc
adds r0, r1
b _081A9030
.pool
_081A8FCC:
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
ldr r0, [r3]
ldr r3, =0x00000cdc
adds r0, r3
@@ -27954,14 +27954,14 @@ _081A8FCC:
b _081A9036
.pool
_081A8FE4:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldr r1, [r3]
ldr r2, =0x00000e1a
adds r1, r2
b _081A9000
.pool
_081A8FF8:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldr r1, [r3]
ldr r3, =0x00000e1c
_081A8FFE:
@@ -27972,7 +27972,7 @@ _081A9000:
b _081A903A
.pool
_081A9010:
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
ldr r0, [r3]
ldr r1, =0x00000cdc
adds r0, r1
@@ -27982,7 +27982,7 @@ _081A9010:
b _081A9036
.pool
_081A9028:
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
ldr r0, [r3]
ldr r3, =0x00000cdc
adds r0, r3
@@ -28211,12 +28211,12 @@ sub_81A91FC: @ 81A91FC
adds r0, r1
movs r1, 0
strh r1, [r0]
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r5, [r0]
b _081A924A
.pool
_081A9244:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
_081A924A:
@@ -28296,7 +28296,7 @@ CalculateBattlePyramidItemBallItemId: @ 81A9290
_081A92DE:
bl sub_81AA9E4
lsls r0, 24
ldr r1, =gScriptLastTalked
ldr r1, =gSpecialVar_LastTalked
ldrh r4, [r1]
ldr r1, =gUnknown_08613650
lsrs r0, 20
@@ -28401,7 +28401,7 @@ sub_81A93C8: @ 81A93C8
lsls r1, 4
adds r3, r0, r1
movs r2, 0
ldr r4, =gScriptLastTalked
ldr r4, =gSpecialVar_LastTalked
b _081A93F4
.pool
_081A93E4:
@@ -28712,7 +28712,7 @@ _081A9650:
thumb_func_start sub_81A966C
sub_81A966C: @ 81A966C
push {r4,lr}
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
bl InBattlePyramid
lsls r0, 24
lsrs r0, 24
@@ -28745,7 +28745,7 @@ _081A9698:
b _081A9754
.pool
_081A96B4:
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
ldrh r0, [r4]
cmp r0, 0x1
beq _081A9710
@@ -28775,7 +28775,7 @@ _081A96F4:
ldrh r0, [r0]
bl PlaySE
_081A96FC:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldrh r0, [r1]
adds r0, 0x1
strh r0, [r1]
@@ -29352,7 +29352,7 @@ _081A9B86:
strb r3, [r0, 0x6]
mov r7, r10
ldr r2, [r7]
ldr r0, =gScriptLastTalked
ldr r0, =gSpecialVar_LastTalked
ldrh r1, [r0]
subs r1, 0x1
lsls r0, r1, 1
@@ -29815,7 +29815,7 @@ _081A9F7A:
thumb_func_start sub_81A9F80
sub_81A9F80: @ 81A9F80
push {lr}
ldr r0, =gUnknown_08252C88
ldr r0, =BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88
bl ScriptContext1_SetupScript
pop {r0}
bx r0
@@ -29962,7 +29962,7 @@ _081AA0A6:
ldr r2, =0x00000169
adds r0, r2
lsls r0, 2
ldr r1, =gUnknown_08481DD4
ldr r1, =gMapAttributes
adds r0, r1
ldr r6, [r0]
ldr r2, [r6, 0xC]
@@ -30241,8 +30241,8 @@ sub_81AA2F8: @ 81AA2F8
push {r4,r5,lr}
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r5, =gUnknown_08252C4F
ldr r4, =gUnknown_08252C6A
ldr r5, =BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F
ldr r4, =BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A
movs r2, 0xC8
lsls r2, 4
adds r1, r0, r2
asm/battle_setup.s
+23 -23
View File
@@ -1328,7 +1328,7 @@ _080B1120:
thumb_func_start sub_80B1138
sub_80B1138: @ 80B1138
push {lr}
ldr r0, =set_256color_bg_bg0
ldr r0, =CB2_ChooseStarter
bl SetMainCallback2
ldr r1, =gMain
ldr r0, =sub_80B1158
@@ -1344,11 +1344,11 @@ sub_80B1158: @ 80B1158
sub sp, 0x8
ldr r0, =0x00004023
bl GetVarPointer
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
ldrh r1, [r2]
strh r1, [r0]
ldrh r0, [r2]
bl sub_8133EDC
bl GetStarterPokemon
lsls r0, 16
lsrs r0, 16
movs r1, 0
@@ -1669,7 +1669,7 @@ battle_80801F0: @ 80B13F8
ldrh r1, [r0]
cmp r1, 0
beq _080B141A
ldr r0, =gScriptLastTalked
ldr r0, =gSpecialVar_LastTalked
strh r1, [r0]
lsls r0, r1, 24
lsrs r0, 24
@@ -1728,7 +1728,7 @@ _080B1494:
ldr r0, =gUnknown_0854FF84
adds r1, r5, 0
bl TrainerBattleLoadArgs
ldr r0, =gUnknown_082713C2
ldr r0, =EventScript_2713C2
b _080B161E
.pool
_080B14A8:
@@ -1757,7 +1757,7 @@ _080B14D6:
adds r1, r5, 0
bl TrainerBattleLoadArgs
bl battle_80801F0
ldr r0, =gUnknown_0827138A
ldr r0, =EventScript_27138A
b _080B161E
.pool
_080B14EC:
@@ -1769,7 +1769,7 @@ _080B14EC:
ldrh r0, [r4]
bl sub_80B2234
strh r0, [r4]
ldr r0, =gUnknown_082713F8
ldr r0, =EventScript_2713F8
b _080B161E
.pool
_080B1514:
@@ -1781,7 +1781,7 @@ _080B1514:
ldrh r0, [r4]
bl sub_80B2234
strh r0, [r4]
ldr r0, =gUnknown_082713D1
ldr r0, =EventScript_2713D1
b _080B161E
.pool
_080B153C:
@@ -1793,7 +1793,7 @@ _080B153C:
adds r1, r5, 0
bl TrainerBattleLoadArgs
bl battle_80801F0
ldr r0, =gScriptLastTalked
ldr r0, =gSpecialVar_LastTalked
ldrb r0, [r0]
bl sub_81A9AA8
ldr r1, =gTrainerBattleOpponent_A
@@ -1803,7 +1803,7 @@ _080B156C:
ldr r0, =gUnknown_08550014
adds r1, r5, 0
bl TrainerBattleLoadArgs
ldr r0, =gScriptLastTalked
ldr r0, =gSpecialVar_LastTalked
ldrb r0, [r0]
bl sub_81A9AA8
_080B157C:
@@ -1833,7 +1833,7 @@ _080B15A8:
adds r1, r5, 0
bl TrainerBattleLoadArgs
bl battle_80801F0
ldr r0, =gScriptLastTalked
ldr r0, =gSpecialVar_LastTalked
ldrb r0, [r0]
bl battle_init
ldr r1, =gTrainerBattleOpponent_A
@@ -1843,7 +1843,7 @@ _080B15D8:
ldr r0, =gUnknown_08550014
adds r1, r5, 0
bl TrainerBattleLoadArgs
ldr r0, =gScriptLastTalked
ldr r0, =gSpecialVar_LastTalked
ldrb r0, [r0]
bl battle_init
b _080B157C
@@ -1866,7 +1866,7 @@ _080B1616:
adds r1, r5, 0
bl TrainerBattleLoadArgs
_080B161C:
ldr r0, =gUnknown_08271362
ldr r0, =EventScript_271362
_080B161E:
pop {r4,r5}
pop {r1}
@@ -1882,7 +1882,7 @@ SingleTrainerWantsBattle: @ 80B162C
lsrs r0, 24
ldr r2, =gSelectedMapObject
strb r0, [r2]
ldr r4, =gScriptLastTalked
ldr r4, =gSpecialVar_LastTalked
ldr r3, =gMapObjects
lsls r2, r0, 3
adds r2, r0
@@ -1893,7 +1893,7 @@ SingleTrainerWantsBattle: @ 80B162C
adds r1, 0x1
adds r0, r1, 0
bl BattleSetup_ConfigureTrainerBattle
ldr r0, =gUnknown_08271354
ldr r0, =EventScript_271354
bl ScriptContext1_SetupScript
bl ScriptContext2_Enable
pop {r4}
@@ -1910,7 +1910,7 @@ TwoTrainersWantBattle: @ 80B1670
lsrs r0, 24
ldr r2, =gSelectedMapObject
strb r0, [r2]
ldr r4, =gScriptLastTalked
ldr r4, =gSpecialVar_LastTalked
ldr r3, =gMapObjects
lsls r2, r0, 3
adds r2, r0
@@ -1931,7 +1931,7 @@ TwoTrainersWantBattle: @ 80B1670
@ void TwoTrainersWantBattleExecuteScript()
TwoTrainersWantBattleExecuteScript: @ 80B16A4
push {lr}
ldr r0, =gUnknown_08271354
ldr r0, =EventScript_271354
bl ScriptContext1_SetupScript
bl ScriptContext2_Enable
pop {r0}
@@ -2332,7 +2332,7 @@ sub_80B1A14: @ 80B1A14
ldrb r0, [r0]
cmp r0, 0x1
bhi _080B1A44
ldr r0, =gScriptLastTalked
ldr r0, =gSpecialVar_LastTalked
ldrb r0, [r0]
bl sub_81A9AA8
lsls r0, 16
@@ -2370,7 +2370,7 @@ _080B1A7C:
ldrb r0, [r0]
cmp r0, 0x1
bhi _080B1AAC
ldr r0, =gScriptLastTalked
ldr r0, =gSpecialVar_LastTalked
ldrb r0, [r0]
bl battle_init
adds r1, r0, 0
@@ -2420,7 +2420,7 @@ BattleSetup_GetScriptAddrAfterBattle: @ 80B1AF8
ldr r0, [r0]
cmp r0, 0
bne _080B1B04
ldr r0, =gUnknown_082C8436
ldr r0, =EventScript_2C8436
_080B1B04:
pop {r1}
bx r1
@@ -2457,7 +2457,7 @@ _080B1B3C:
b _080B1B56
.pool
_080B1B54:
ldr r0, =gUnknown_082742E6
ldr r0, =LavaridgeTown_Gym_1F_EventScript_2742E6
_080B1B56:
pop {r1}
bx r1
@@ -3484,7 +3484,7 @@ CheckIfMultipleTrainersWantBattle: @ 80B22D8
ldr r1, =gUnknown_02038BF8
movs r0, 0x1
strb r0, [r1]
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
b _080B230A
.pool
@@ -3492,7 +3492,7 @@ _080B2300:
ldr r1, =gUnknown_02038BF8
movs r0, 0
strb r0, [r1]
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
_080B230A:
strh r0, [r1]
asm/battle_tent.s
+9 -9
View File
@@ -57,7 +57,7 @@ sub_81B99D4: @ 81B99D4
thumb_func_start sub_81B9A28
sub_81B9A28: @ 81B9A28
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000e6a
@@ -196,12 +196,12 @@ sub_81B9B28: @ 81B9B28
adds r0, r1
movs r1, 0
strh r1, [r0]
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r5, [r0]
b _081B9B76
.pool
_081B9B70:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
_081B9B76:
@@ -263,7 +263,7 @@ sub_81B9BA0: @ 81B9BA0
thumb_func_start sub_81B9BF4
sub_81B9BF4: @ 81B9BF4
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000e6c
@@ -357,12 +357,12 @@ sub_81B9C98: @ 81B9C98
adds r0, r1
movs r1, 0
strh r1, [r0]
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r5, [r0]
b _081B9CE6
.pool
_081B9CE0:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
_081B9CE6:
@@ -436,7 +436,7 @@ sub_81B9D28: @ 81B9D28
thumb_func_start sub_81B9D7C
sub_81B9D7C: @ 81B9D7C
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000e6e
@@ -530,12 +530,12 @@ sub_81B9E20: @ 81B9E20
adds r0, r1
movs r1, 0
strh r1, [r0]
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r5, [r0]
b _081B9E6E
.pool
_081B9E68:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
_081B9E6E:
asm/battle_tower.s
+17 -17
View File
@@ -132,12 +132,12 @@ _08162094:
lsls r1, 24
lsrs r1, 24
bl sub_8164FCC
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
strh r0, [r1]
b _081620E8
.pool
_081620A8:
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
ldr r2, [r5]
ldr r0, =0x00000cdc
adds r2, r0
@@ -294,7 +294,7 @@ _081621EE:
adds r0, 0x1
strh r0, [r1]
bl sub_8163E90
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, [r5]
adds r0, r4
ldrh r0, [r0]
@@ -3547,11 +3547,11 @@ _08163E2C:
ldr r4, =gUnknown_02038BFC
movs r0, 0
strb r0, [r4]
ldr r0, =gUnknown_08224158
ldr r0, =MossdeepCity_SpaceCenter_2F_EventScript_224157 + 1
bl BattleSetup_ConfigureTrainerBattle
movs r0, 0x1
strb r0, [r4]
ldr r0, =gUnknown_08224167
ldr r0, =MossdeepCity_SpaceCenter_2F_EventScript_224166 + 1
bl BattleSetup_ConfigureTrainerBattle
ldr r0, =gPartnerTrainerId
strh r5, [r0]
@@ -4714,7 +4714,7 @@ sub_8164828: @ 8164828
lsls r0, 16
lsrs r0, 16
mov r8, r0
ldr r0, =gScriptLastTalked
ldr r0, =gSpecialVar_LastTalked
ldrh r0, [r0]
subs r5, r0, 0x2
ldr r0, =gSaveBlock2Ptr
@@ -5076,7 +5076,7 @@ sub_8164B74: @ 8164B74
adds r0, r2
ldrh r6, [r0]
bl GetMultiplayerId
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldrh r0, [r0]
cmp r0, 0x6
bls _08164BAC
@@ -5126,7 +5126,7 @@ _08164C18:
mov r1, sp
movs r2, 0x4
bl SendBlock
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
b _08164DB4
.pool
@@ -5204,7 +5204,7 @@ _08164CB0:
mov r4, r8
cmp r4, 0xD
ble _08164C68
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x2
b _08164DB4
.pool
@@ -5222,7 +5222,7 @@ _08164CE0:
adds r1, r3
movs r2, 0x28
bl SendBlock
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x3
b _08164DB4
.pool
@@ -5268,13 +5268,13 @@ _08164D14:
ldrb r0, [r0]
cmp r0, 0
bne _08164DB0
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x4
b _08164DB4
.pool
_08164D98:
bl sub_800AC34
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x5
b _08164DB4
.pool
@@ -5284,7 +5284,7 @@ _08164DA8:
cmp r0, 0
bne _08164DB6
_08164DB0:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x6
_08164DB4:
strh r0, [r1]
@@ -5625,7 +5625,7 @@ sub_816502C: @ 816502C
movs r0, 0x45
mov r10, r0
_0816506A:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
mov r9, r1
movs r0, 0
strh r0, [r1]
@@ -5681,7 +5681,7 @@ _081650D4:
cmp r6, r8
blt _0816508C
_081650DC:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldrh r0, [r0]
cmp r0, 0
beq _08165132
@@ -5901,7 +5901,7 @@ _08165294:
thumb_func_start sub_81652B4
sub_81652B4: @ 81652B4
push {r4-r6,lr}
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
movs r0, 0
strh r0, [r2]
ldr r1, =gSaveBlock2Ptr
@@ -5943,7 +5943,7 @@ _081652F2:
ldr r3, =0x00000bec
adds r0, r1, r3
bl sub_816534C
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
_08165316:
asm/berry_blender.s
+47 -47
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]
@@ -1190,7 +1190,7 @@ _080801F8:
movs r5, 0xAC
lsls r5, 1
adds r0, r5
ldr r1, =gScriptItemId
ldr r1, =gSpecialVar_ItemId
ldrh r1, [r1]
bl sub_807FE14
ldr r0, =gBlockSendBuffer
@@ -2043,7 +2043,7 @@ _080808F8:
_08080950:
bl sub_800B4C0
bl sub_8080588
ldr r4, =gScriptItemId
ldr r4, =gSpecialVar_ItemId
ldrh r1, [r4]
movs r0, 0
bl sub_8082FDC
@@ -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
@@ -7619,7 +7619,7 @@ _080837EA:
movs r1, 0x6
bl CreateTask
bl sub_80EECEC
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
movs r1, 0x1
bl RemoveBagItem
@@ -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/berry_fix_program.s
-8
View File
@@ -1,8 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
.align 2, 0 @ Don't pad with nop.
asm/berry_tag_screen.s
+1 -1
View File
@@ -12,7 +12,7 @@ sub_8177C14: @ 8177C14
ldr r0, =0x0000180c
bl AllocZeroed
str r0, [r4]
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
bl ItemIdToBerryType
ldr r1, [r4]
asm/cable_club.s
+14 -14
View File
@@ -433,7 +433,7 @@ sub_80B2688: @ 80B2688
bne _080B26EC
movs r0, 0x15
bl PlaySE
ldr r0, =gUnknown_082780B3
ldr r0, =OldaleTown_PokemonCenter_2F_Text_2780B3
bl ShowFieldAutoScrollMessage
ldr r0, =sub_80B270C
b _080B26FA
@@ -441,7 +441,7 @@ sub_80B2688: @ 80B2688
_080B26EC:
movs r0, 0x16
bl PlaySE
ldr r0, =gUnknown_08278131
ldr r0, =OldaleTown_PokemonCenter_2F_Text_278131
bl ShowFieldAutoScrollMessage
ldr r0, =sub_80B2918
_080B26FA:
@@ -544,7 +544,7 @@ sub_80B275C: @ 80B275C
movs r2, 0
movs r3, 0x1
bl ConvertIntToDecimalStringN
ldr r0, =gUnknown_082780F2
ldr r0, =OldaleTown_PokemonCenter_2F_Text_2780F2
bl ShowFieldAutoScrollMessage
mov r0, r9
subs r0, 0x8
@@ -597,7 +597,7 @@ sub_80B2804: @ 80B2804
cmp r0, 0
beq _080B2878
_080B2852:
ldr r0, =gUnknown_082780B3
ldr r0, =OldaleTown_PokemonCenter_2F_Text_2780B3
bl ShowFieldAutoScrollMessage
ldr r1, =gTasks
lsls r0, r5, 2
@@ -663,7 +663,7 @@ sub_80B28A8: @ 80B28A8
b _080B2908
.pool
_080B28F4:
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
adds r0, r7, 0
adds r1, r6, 0
bl sub_80B2478
@@ -703,7 +703,7 @@ sub_80B2918: @ 80B2918
bl sub_80B24F8
cmp r0, 0x1
beq _080B29E6
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
adds r0, r6, 0
adds r1, r5, 0
bl sub_80B2478
@@ -791,7 +791,7 @@ sub_80B2A08: @ 80B2A08
bl sub_80B24F8
cmp r0, 0x1
beq _080B2ACE
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldrh r0, [r0]
cmp r0, 0x4
bne _080B2A38
@@ -1067,7 +1067,7 @@ _080B2C7E:
movs r0, 0
bl SetSuppressLinkErrorMessage
bl ResetBlockReceivedFlags
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
adds r1, r5, 0
bl task_map_chg_seq_0807EC34
_080B2C9C:
@@ -1111,7 +1111,7 @@ sub_80B2CEC: @ 80B2CEC
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x5
strh r0, [r1]
ldr r0, =gTasks
@@ -1139,7 +1139,7 @@ sub_80B2D2C: @ 80B2D2C
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x6
strh r0, [r1]
ldr r0, =gTasks
@@ -1284,7 +1284,7 @@ sub_80B2E4C: @ 80B2E4C
thumb_func_start sub_80B2E74
sub_80B2E74: @ 80B2E74
push {lr}
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
ldr r1, =gLinkType
@@ -1353,7 +1353,7 @@ sub_80B2EE4: @ 80B2EE4
b _080B2FC6
.pool
_080B2F0C:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldrh r0, [r0]
cmp r0, 0x1
bne _080B2FA8
@@ -1415,7 +1415,7 @@ _080B2F74:
_080B2F82:
cmp r7, 0
beq _080B2FA8
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0xC
strh r0, [r1]
bl sub_800AD10
@@ -2296,7 +2296,7 @@ _080B3750:
beq _080B37B8
b _080B37CC
_080B375A:
ldr r0, =gUnknown_08278091
ldr r0, =OldaleTown_PokemonCenter_2F_Text_278091
bl ShowFieldMessage
movs r0, 0x1
strh r0, [r5, 0x8]
asm/contest.s
+9 -9
View File
@@ -6313,7 +6313,7 @@ _080DAE1E:
movs r0, 0x4
b _080DAE9A
_080DAE2E:
ldr r0, =gScriptContestCategory
ldr r0, =gSpecialVar_ContestCategory
ldrh r0, [r0]
cmp r0, 0x4
bhi _080DAE82
@@ -6358,7 +6358,7 @@ _080DAE82:
movs r0, 0
b _080DAE9A
_080DAE86:
ldr r0, =gUnknown_02039F2E
ldr r0, =gSpecialVar_ContestRank
adds r2, r1, 0
ldrh r1, [r0]
movs r0, 0x2
@@ -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
@@ -8456,7 +8456,7 @@ sub_80DBED4: @ 80DBED4
adds r0, r1
ldrb r1, [r0]
lsls r1, 1
ldr r0, =gScriptContestCategory
ldr r0, =gSpecialVar_ContestCategory
ldrh r0, [r0]
lsls r0, 3
adds r1, r0
@@ -11805,7 +11805,7 @@ sub_80DD9F0: @ 80DD9F0
ldrb r1, [r0, 0x1]
lsls r1, 29
lsrs r1, 29
ldr r0, =gScriptContestCategory
ldr r0, =gSpecialVar_ContestCategory
ldrh r2, [r0]
lsls r0, r2, 2
adds r0, r2
@@ -14260,7 +14260,7 @@ _080DEDE6:
b _080DEF90
.pool
_080DEE00:
ldr r0, =gScriptContestCategory
ldr r0, =gSpecialVar_ContestCategory
ldrh r0, [r0]
cmp r0, 0x4
bhi _080DEE4C
@@ -14369,7 +14369,7 @@ _080DEEF4:
mov r2, r10
ldr r0, [r2]
adds r0, r7
ldr r1, =gUnknown_02039F2E
ldr r1, =gSpecialVar_ContestRank
ldrh r1, [r1]
ldr r3, =0x00002eae
adds r0, r3
@@ -14383,7 +14383,7 @@ _080DEF02:
mov r2, r9
lsls r1, r2, 5
adds r0, r1
ldr r1, =gScriptContestCategory
ldr r1, =gSpecialVar_ContestCategory
ldrh r1, [r1]
ldr r3, =0x00002e9a
adds r0, r3
@@ -14485,7 +14485,7 @@ _080DEFE6:
b _080DF03A
.pool
_080DEFF8:
ldr r0, =gScriptContestCategory
ldr r0, =gSpecialVar_ContestCategory
ldrh r0, [r0]
cmp r0, 0x4
bhi _080DF038
asm/contest_ai.s
+1 -1
View File
@@ -1352,7 +1352,7 @@ sub_8156CF4: @ 8156CF4
ldr r0, =gContestResources
ldr r0, [r0]
ldr r1, [r0, 0xC]
ldr r0, =gScriptContestCategory
ldr r0, =gSpecialVar_ContestCategory
ldrh r0, [r0]
strh r0, [r1, 0x18]
ldr r1, =gAIScriptPtr
asm/contest_effect.s
+1 -1
View File
@@ -2590,7 +2590,7 @@ ContestEffectFunc_080E6778: @ 80E6778
adds r0, r3
ldrb r0, [r0, 0x1]
lsls r0, 29
ldr r1, =gScriptContestCategory
ldr r1, =gSpecialVar_ContestCategory
lsrs r0, 29
ldrh r1, [r1]
cmp r0, r1
asm/contest_link_80F57C4.s
+17 -17
View File
@@ -548,7 +548,7 @@ _080F5D2A:
movs r0, 0x8
strh r0, [r1]
bl InterviewBefore
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldrh r0, [r0]
cmp r0, 0x1
beq _080F5D58
@@ -556,7 +556,7 @@ _080F5D2A:
_080F5D58:
movs r0, 0x2
bl sub_813BADC
ldr r0, =gUnknown_02039F2E
ldr r0, =gSpecialVar_ContestRank
ldrb r0, [r0]
bl sub_80DEDA8
movs r0, 0xFE
@@ -673,7 +673,7 @@ _080F5E78:
movs r0, 0x25
bl IncrementGameStat
_080F5E92:
ldr r0, =gUnknown_02039F2E
ldr r0, =gSpecialVar_ContestRank
ldrb r0, [r0]
bl sub_80DEDA8
movs r0, 0xFE
@@ -2972,7 +2972,7 @@ sub_80F71C8: @ 80F71C8
b _080F7240
.pool
_080F71F8:
ldr r0, =gUnknown_02039F2E
ldr r0, =gSpecialVar_ContestRank
ldrh r2, [r0]
cmp r2, 0
bne _080F720C
@@ -3008,7 +3008,7 @@ _080F7236:
bl CopyToBgTilemapBufferRect
movs r5, 0xF
_080F7240:
ldr r0, =gScriptContestCategory
ldr r0, =gSpecialVar_ContestCategory
ldrh r0, [r0]
cmp r0, 0
bne _080F725C
@@ -4640,15 +4640,15 @@ sub_80F7F30: @ 80F7F30
adds r5, r0, 0
cmp r5, 0
beq _080F7F5E
ldr r4, =gScriptContestCategory
ldr r4, =gSpecialVar_ContestCategory
ldrb r0, [r4]
ldr r1, =gUnknown_02039F2E
ldr r1, =gSpecialVar_ContestRank
ldrb r1, [r1]
bl sub_80DAB8C
ldrb r0, [r4]
bl sub_80DB09C
_080F7F5E:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r5, [r0]
pop {r4,r5}
pop {r0}
@@ -4666,7 +4666,7 @@ sub_80F7F7C: @ 80F7F7C
muls r1, r0
ldr r0, =gPlayerParty
adds r2, r1, r0
ldr r0, =gScriptContestCategory
ldr r0, =gSpecialVar_ContestCategory
ldrh r0, [r0]
cmp r0, 0x4
bhi _080F7FEE
@@ -4704,7 +4704,7 @@ _080F7FDC:
movs r1, 0x36
_080F7FE0:
bl GetMonData
ldr r1, =gUnknown_02039F2E
ldr r1, =gSpecialVar_ContestRank
ldrh r1, [r1]
cmp r0, r1
bls _080F7FEE
@@ -4730,7 +4730,7 @@ sub_80F7FFC: @ 80F7FFC
beq _080F8010
b _080F8250
_080F8010:
ldr r0, =gScriptContestCategory
ldr r0, =gSpecialVar_ContestCategory
ldrh r0, [r0]
cmp r0, 0x4
bls _080F801A
@@ -4762,7 +4762,7 @@ _080F8048:
lsrs r1, r0, 24
mov r0, sp
strb r1, [r0]
ldr r0, =gUnknown_02039F2E
ldr r0, =gSpecialVar_ContestRank
ldrh r0, [r0]
cmp r1, r0
bls _080F806C
@@ -4812,7 +4812,7 @@ _080F80B8:
strb r0, [r4]
mov r0, sp
ldrb r2, [r0]
ldr r0, =gUnknown_02039F2E
ldr r0, =gSpecialVar_ContestRank
ldrh r0, [r0]
cmp r2, r0
bls _080F80DC
@@ -4861,7 +4861,7 @@ _080F8124:
strb r0, [r4]
mov r0, sp
ldrb r2, [r0]
ldr r0, =gUnknown_02039F2E
ldr r0, =gSpecialVar_ContestRank
ldrh r0, [r0]
cmp r2, r0
bls _080F8148
@@ -4908,7 +4908,7 @@ _080F8190:
strb r0, [r4]
mov r0, sp
ldrb r2, [r0]
ldr r0, =gUnknown_02039F2E
ldr r0, =gSpecialVar_ContestRank
ldrh r0, [r0]
cmp r2, r0
bhi _080F8250
@@ -4951,7 +4951,7 @@ _080F81F8:
strb r0, [r4]
mov r0, sp
ldrb r2, [r0]
ldr r0, =gUnknown_02039F2E
ldr r0, =gSpecialVar_ContestRank
ldrh r0, [r0]
cmp r2, r0
bhi _080F8250
@@ -5488,7 +5488,7 @@ _080F8678:
bl sub_80F86E0
ldr r1, =gUnknown_02039F2B
strb r0, [r1]
ldr r0, =gScriptContestCategory
ldr r0, =gSpecialVar_ContestCategory
ldrb r0, [r0]
bl sub_80DB09C
ldr r1, =sub_80FCF40
asm/contest_link_81D9DE4.s
+1 -1
View File
@@ -370,7 +370,7 @@ sub_81DA10C: @ 81DA10C
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, =gScriptContestCategory
ldr r0, =gSpecialVar_ContestCategory
ldrb r0, [r0]
bl sub_80DB09C
ldr r1, =sub_80FCF40
asm/contest_painting.s
+1 -1
View File
@@ -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
+2 -2
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
@@ -3675,7 +3675,7 @@ sub_8177388: @ 8177388
bl VarGet
lsls r0, 16
lsrs r0, 16
bl sub_8133EDC
bl GetStarterPokemon
lsls r0, 16
lsrs r0, 16
bl SpeciesToNationalPokedexNum
asm/daycare.s
+3 -3
View File
@@ -3075,12 +3075,12 @@ c3_080469FC: @ 8071204
b _0807124E
.pool
_0807123C:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r1, [r0]
b _0807124E
.pool
_08071248:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x2
strh r0, [r1]
_0807124E:
@@ -3109,7 +3109,7 @@ _08071284:
ands r0, r2
cmp r0, 0
beq _080712B4
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r1, [r0]
ldrb r0, [r4, 0x8]
movs r1, 0
asm/dewford_trend.s
+2 -2
View File
@@ -667,7 +667,7 @@ sub_81229C8: @ 81229C8
negs r0, r0
lsrs r4, r0, 31
_08122A0C:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r4, [r0]
pop {r4}
pop {r0}
@@ -677,7 +677,7 @@ _08122A0C:
thumb_func_start sub_8122A30
sub_8122A30: @ 8122A30
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r3, =0x00002e6c
asm/easy_chat.s
+3 -3
View File
@@ -1659,7 +1659,7 @@ _0811AFAC:
b _0811AFE6
.pool
_0811AFC0:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r1, [r0]
ldr r0, =gUnknown_0203A118
ldr r0, [r0]
@@ -1709,7 +1709,7 @@ _0811B00C:
.pool
_0811B020:
bl sub_811BE9C
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
bl sub_811B4EC
strh r0, [r4]
bl sub_811B3E4
@@ -1860,7 +1860,7 @@ _0811B118:
b _0811B14A
.pool
_0811B134:
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
bl sub_811B4EC
strh r0, [r4]
bl sub_811B3E4
asm/field_control_avatar.s
+45 -45
View File
@@ -184,7 +184,7 @@ sub_809C014: @ 809C014
push {r4-r6,lr}
sub sp, 0x8
adds r5, r0, 0
ldr r0, =gScriptLastTalked
ldr r0, =gSpecialVar_LastTalked
movs r1, 0
strh r1, [r0]
ldr r0, =gSelectedMapObject
@@ -443,13 +443,13 @@ _0809C214:
ldr r0, =gUnknown_0823B589
cmp r4, r0
beq _0809C244
ldr r0, =gUnknown_082766A2
ldr r0, =EventScript_2766A2
cmp r4, r0
beq _0809C244
ldr r0, =gUnknown_082766A6
ldr r0, =EventScript_2766A6
cmp r4, r0
beq _0809C244
ldr r0, =gUnknown_08271D92
ldr r0, =EventScript_271D92
cmp r4, r0
beq _0809C244
movs r0, 0x5
@@ -582,13 +582,13 @@ _0809C34C:
ble _0809C340
ldr r0, =gSelectedMapObject
strb r3, [r0]
ldr r1, =gScriptLastTalked
ldr r1, =gSpecialVar_LastTalked
adds r0, r2, r3
lsls r0, 2
adds r0, r5
ldrb r0, [r0, 0x8]
strh r0, [r1]
ldr r0, =gScriptFacing
ldr r0, =gSpecialVar_Facing
strh r6, [r0]
adds r0, r3, 0
bl GetFieldObjectScriptPointerByFieldObjectId
@@ -668,13 +668,13 @@ _0809C400:
_0809C40C:
ldr r0, =gSelectedMapObject
strb r4, [r0]
ldr r1, =gScriptLastTalked
ldr r1, =gSpecialVar_LastTalked
adds r0, r2, r4
lsls r0, 2
adds r0, r3
ldrb r0, [r0, 0x8]
strh r0, [r1]
ldr r0, =gScriptFacing
ldr r0, =gSpecialVar_Facing
strh r7, [r0]
bl InTrainerHill
cmp r0, 0x1
@@ -687,7 +687,7 @@ _0809C43C:
bl GetFieldObjectScriptPointerByFieldObjectId
_0809C442:
adds r1, r0, 0
ldr r0, =gScriptLastTalked
ldr r0, =gSpecialVar_LastTalked
ldrb r0, [r0]
bl GetRamScript
adds r1, r0, 0
@@ -721,7 +721,7 @@ TryGetInvisibleMapObjectScript: @ 809C458
ldr r2, [r0, 0x8]
cmp r2, 0
bne _0809C490
ldr r0, =gUnknown_082C8436
ldr r0, =EventScript_2C8436
b _0809C532
.pool
_0809C490:
@@ -778,7 +778,7 @@ _0809C4E2:
lsrs r0, 24
cmp r0, 0x1
beq _0809C4CC
ldr r0, =gUnknown_08271CB7
ldr r0, =EventScript_271CB7
b _0809C532
.pool
_0809C510:
@@ -790,7 +790,7 @@ _0809C510:
lsls r0, 24
cmp r0, 0
beq _0809C4CC
ldr r0, =gUnknown_082759F1
ldr r0, =EventScript_2759F1
b _0809C532
.pool
_0809C530:
@@ -816,7 +816,7 @@ TryGetMetatileBehaviorScript: @ 809C538
lsrs r0, 24
cmp r0, 0x1
bne _0809C55C
ldr r0, =gUnknown_0827EE0B
ldr r0, =EventScript_27EE0B
b _0809C7E4
.pool
_0809C55C:
@@ -826,7 +826,7 @@ _0809C55C:
lsrs r0, 24
cmp r0, 0x1
bne _0809C574
ldr r0, =gUnknown_08271D92
ldr r0, =EventScript_271D92
b _0809C7E4
.pool
_0809C574:
@@ -836,7 +836,7 @@ _0809C574:
lsrs r0, 24
cmp r0, 0x1
bne _0809C58C
ldr r0, =gUnknown_081E615D
ldr r0, =SootopolisCity_EventScript_1E615D
b _0809C7E4
.pool
_0809C58C:
@@ -846,7 +846,7 @@ _0809C58C:
lsrs r0, 24
cmp r0, 0x1
bne _0809C5A4
ldr r0, =gUnknown_082393F9
ldr r0, =SkyPillar_Outside_EventScript_2393F9
b _0809C7E4
.pool
_0809C5A4:
@@ -864,7 +864,7 @@ _0809C5B4:
lsrs r0, 24
cmp r0, 0x1
bne _0809C5CC
ldr r0, =gUnknown_082A4BAC
ldr r0, =EventScript_2A4BAC
b _0809C7E4
.pool
_0809C5CC:
@@ -874,7 +874,7 @@ _0809C5CC:
lsrs r0, 24
cmp r0, 0x1
bne _0809C5E4
ldr r0, =gUnknown_0826A22A
ldr r0, =Route110_TrickHouseEntrance_EventScript_26A22A
b _0809C7E4
.pool
_0809C5E4:
@@ -884,7 +884,7 @@ _0809C5E4:
lsrs r0, 24
cmp r0, 0x1
bne _0809C5FC
ldr r0, =gUnknown_0827208F
ldr r0, =EventScript_27208F
b _0809C7E4
.pool
_0809C5FC:
@@ -894,7 +894,7 @@ _0809C5FC:
lsrs r0, 24
cmp r0, 0x1
bne _0809C614
ldr r0, =gUnknown_08292DE5
ldr r0, =EventScript_292DE5
b _0809C7E4
.pool
_0809C614:
@@ -904,7 +904,7 @@ _0809C614:
lsrs r0, 24
cmp r0, 0x1
bne _0809C62C
ldr r0, =gUnknown_082725CE
ldr r0, =EventScript_2725CE
b _0809C7E4
.pool
_0809C62C:
@@ -914,7 +914,7 @@ _0809C62C:
lsrs r0, 24
cmp r0, 0x1
bne _0809C644
ldr r0, =gUnknown_082725D7
ldr r0, =EventScript_2725D7
b _0809C7E4
.pool
_0809C644:
@@ -924,7 +924,7 @@ _0809C644:
lsrs r0, 24
cmp r0, 0x1
bne _0809C65C
ldr r0, =gUnknown_082725E0
ldr r0, =EventScript_2725E0
b _0809C7E4
.pool
_0809C65C:
@@ -934,7 +934,7 @@ _0809C65C:
lsrs r0, 24
cmp r0, 0x1
bne _0809C674
ldr r0, =gUnknown_082725E9
ldr r0, =EventScript_2725E9
b _0809C7E4
.pool
_0809C674:
@@ -944,7 +944,7 @@ _0809C674:
lsrs r0, 24
cmp r0, 0x1
bne _0809C68C
ldr r0, =gUnknown_082725F2
ldr r0, =EventScript_2725F2
b _0809C7E4
.pool
_0809C68C:
@@ -954,7 +954,7 @@ _0809C68C:
lsrs r0, 24
cmp r0, 0x1
bne _0809C6A4
ldr r0, =gUnknown_082725FB
ldr r0, =EventScript_2725FB
b _0809C7E4
.pool
_0809C6A4:
@@ -964,7 +964,7 @@ _0809C6A4:
lsrs r0, 24
cmp r0, 0x1
bne _0809C6BC
ldr r0, =gUnknown_08272604
ldr r0, =EventScript_272604
b _0809C7E4
.pool
_0809C6BC:
@@ -975,7 +975,7 @@ _0809C6BC:
lsrs r0, 24
cmp r0, 0x1
bne _0809C6D4
ldr r0, =gUnknown_08277B8A
ldr r0, =OldaleTown_PokemonCenter_2F_EventScript_277B8A
b _0809C7E4
.pool
_0809C6D4:
@@ -997,7 +997,7 @@ _0809C6EC:
lsrs r0, 24
cmp r0, 0x1
bne _0809C704
ldr r0, =gUnknown_0827381B
ldr r0, =EventScript_27381B
b _0809C7E4
.pool
_0809C704:
@@ -1007,7 +1007,7 @@ _0809C704:
lsrs r0, 24
cmp r0, 0x1
bne _0809C71C
ldr r0, =gUnknown_082C8393
ldr r0, =TrainerHill_1F_EventScript_2C8393
b _0809C7E4
.pool
_0809C71C:
@@ -1125,7 +1125,7 @@ TryGetFieldMoveScript: @ 809C7EC
lsrs r0, 24
cmp r0, 0x1
bne _0809C824
ldr r0, =gUnknown_08271EA0
ldr r0, =EventScript_271EA0
b _0809C862
.pool
_0809C824:
@@ -1146,11 +1146,11 @@ _0809C824:
lsrs r0, 24
cmp r0, 0x1
bne _0809C858
ldr r0, =gUnknown_08290A49
ldr r0, =EventScript_290A49
b _0809C862
.pool
_0809C858:
ldr r0, =gUnknown_08290A83
ldr r0, =EventScript_290A83
b _0809C862
.pool
_0809C860:
@@ -1174,7 +1174,7 @@ sub_809C868: @ 809C868
lsrs r0, 24
cmp r0, 0x2
bne _0809C894
ldr r0, =gUnknown_08290B0F
ldr r0, =EventScript_290B0F
bl ScriptContext1_SetupScript
movs r0, 0x1
b _0809C896
@@ -1203,7 +1203,7 @@ sub_809C89C: @ 809C89C
lsrs r0, 24
cmp r0, 0x1
bne _0809C8D4
ldr r0, =gUnknown_08290B5A
ldr r0, =EventScript_290B5A
bl ScriptContext1_SetupScript
movs r0, 0x1
b _0809C8D6
@@ -1310,7 +1310,7 @@ _0809C988:
lsls r0, 24
cmp r0, 0
beq _0809C9A4
ldr r0, =gUnknown_08252BE8
ldr r0, =BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8
_0809C996:
bl ScriptContext1_SetupScript
movs r0, 0x1
@@ -1385,7 +1385,7 @@ _0809CA04:
lsrs r0, 24
cmp r0, 0x1
bne _0809CA48
ldr r0, =gUnknown_082736BC
ldr r0, =EventScript_2736BC
bl ScriptContext1_SetupScript
b _0809CB28
.pool
@@ -1396,7 +1396,7 @@ _0809CA48:
beq _0809CA64
movs r0, 0xD
bl IncrementGameStat
ldr r0, =gUnknown_08291FC0
ldr r0, =Route117_PokemonDayCare_EventScript_291FC0
bl ScriptContext1_SetupScript
b _0809CB28
.pool
@@ -1416,7 +1416,7 @@ _0809CA7C:
lsrs r0, 24
cmp r0, 0x1
bne _0809CA94
ldr r0, =gUnknown_08238EAF
ldr r0, =IslandCave_EventScript_238EAF
bl ScriptContext1_SetupScript
b _0809CB28
.pool
@@ -1424,7 +1424,7 @@ _0809CA94:
bl is_tile_that_overrides_player_control
cmp r0, 0x1
bne _0809CAA8
ldr r0, =gUnknown_081DF7BA
ldr r0, =MauvilleCity_EventScript_1DF7BA
bl ScriptContext1_SetupScript
b _0809CB28
.pool
@@ -1432,7 +1432,7 @@ _0809CAA8:
bl sub_8138120
cmp r0, 0x1
bne _0809CABC
ldr r0, =gUnknown_081F49EC
ldr r0, =Route119_EventScript_1F49EC
bl ScriptContext1_SetupScript
b _0809CB28
.pool
@@ -1440,7 +1440,7 @@ _0809CABC:
bl sub_8138168
cmp r0, 0x1
bne _0809CAD0
ldr r0, =gUnknown_081FA4D6
ldr r0, =LittlerootTown_ProfessorBirchsLab_EventScript_1FA4D6
bl ScriptContext1_SetupScript
b _0809CB28
.pool
@@ -1448,7 +1448,7 @@ _0809CAD0:
bl sub_81381B0
cmp r0, 0x1
bne _0809CAE4
ldr r0, =gUnknown_0821307B
ldr r0, =RustboroCity_Gym_EventScript_21307B
bl ScriptContext1_SetupScript
b _0809CB28
.pool
@@ -1456,7 +1456,7 @@ _0809CAE4:
bl sub_81381F8
cmp r0, 0x1
bne _0809CAF8
ldr r0, =gUnknown_08224175
ldr r0, =MossdeepCity_SpaceCenter_2F_EventScript_224175
bl ScriptContext1_SetupScript
b _0809CB28
.pool
@@ -1470,7 +1470,7 @@ _0809CAF8:
bl CountSSTidalStep
cmp r0, 0x1
bne _0809CB1C
ldr r0, =gUnknown_0823C050
ldr r0, =SSTidalCorridor_EventScript_23C050
bl ScriptContext1_SetupScript
b _0809CB28
.pool
asm/field_poison.s
+3 -3
View File
@@ -203,12 +203,12 @@ _080F96C0:
cmp r0, 0
beq _080F96F0
_080F96E6:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r5, [r0]
b _080F9718
.pool
_080F96F0:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
b _080F9718
@@ -224,7 +224,7 @@ _080F96FC:
b _080F9722
.pool
_080F9714:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r1, [r0]
_080F9718:
bl EnableBothScriptContexts
asm/field_region_map.s
-325
View File
@@ -1,325 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_817018C
sub_817018C: @ 817018C
push {r4,r5,lr}
adds r5, r0, 0
movs r0, 0
bl SetVBlankCallback
ldr r4, =gUnknown_0203BCD0
movs r0, 0x89
lsls r0, 4
bl Alloc
str r0, [r4]
ldr r1, =0x0000088c
adds r2, r0, r1
movs r1, 0
strh r1, [r2]
str r5, [r0]
ldr r0, =sub_81701C4
bl SetMainCallback2
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_817018C
thumb_func_start sub_81701C4
sub_81701C4: @ 81701C4
push {lr}
movs r0, 0
movs r1, 0
bl SetGpuReg
movs r0, 0x10
movs r1, 0
bl SetGpuReg
movs r0, 0x12
movs r1, 0
bl SetGpuReg
movs r0, 0x14
movs r1, 0
bl SetGpuReg
movs r0, 0x16
movs r1, 0
bl SetGpuReg
movs r0, 0x18
movs r1, 0
bl SetGpuReg
movs r0, 0x1A
movs r1, 0
bl SetGpuReg
movs r0, 0x1C
movs r1, 0
bl SetGpuReg
movs r0, 0x1E
movs r1, 0
bl SetGpuReg
bl ResetSpriteData
bl FreeAllSpritePalettes
movs r0, 0
bl ResetBgsAndClearDma3BusyFlags
ldr r1, =gUnknown_085E5068
movs r0, 0x1
movs r2, 0x2
bl InitBgsFromTemplates
ldr r0, =gUnknown_085E5070
bl InitWindows
bl DeactivateAllTextPrinters
movs r0, 0
movs r1, 0x27
movs r2, 0xD0
bl sub_809882C
bl clear_scheduled_bg_copies_to_vram
ldr r0, =sub_8170274
bl SetMainCallback2
ldr r0, =sub_8170260
bl SetVBlankCallback
pop {r0}
bx r0
.pool
thumb_func_end sub_81701C4
thumb_func_start sub_8170260
sub_8170260: @ 8170260
push {lr}
bl LoadOam
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_8170260
thumb_func_start sub_8170274
sub_8170274: @ 8170274
push {lr}
bl sub_8170290
bl AnimateSprites
bl BuildOamBuffer
bl UpdatePaletteFade
bl do_scheduled_bg_tilemap_copies_to_vram
pop {r0}
bx r0
thumb_func_end sub_8170274
thumb_func_start sub_8170290
sub_8170290: @ 8170290
push {r4,r5,lr}
sub sp, 0xC
ldr r1, =gUnknown_0203BCD0
ldr r0, [r1]
ldr r2, =0x0000088c
adds r0, r2
ldrh r0, [r0]
adds r4, r1, 0
cmp r0, 0x6
bls _081702A6
b _08170416
_081702A6:
lsls r0, 2
ldr r1, =_081702BC
adds r0, r1
ldr r0, [r0]
mov pc, r0
.pool
.align 2, 0
_081702BC:
.4byte _081702D8
.4byte _08170300
.4byte _08170358
.4byte _08170380
.4byte _08170394
.4byte _081703C0
.4byte _081703E8
_081702D8:
ldr r0, [r4]
adds r0, 0x8
movs r1, 0
bl sub_8122CDC
movs r0, 0
movs r1, 0
bl sub_8124288
movs r0, 0x1
movs r1, 0x1
bl sub_81240D4
ldr r1, [r4]
ldr r0, =0x0000088c
adds r1, r0
b _081703D8
.pool
_08170300:
movs r0, 0x1
movs r1, 0
movs r2, 0x27
movs r3, 0xD
bl SetWindowBorderStyle
ldr r5, =gText_Hoenn
movs r0, 0x1
adds r1, r5, 0
movs r2, 0x38
bl GetStringCenterAlignXOffset
adds r3, r0, 0
lsls r3, 24
lsrs r3, 24
movs r0, 0x1
str r0, [sp]
movs r4, 0
str r4, [sp, 0x4]
str r4, [sp, 0x8]
movs r1, 0x1
adds r2, r5, 0
bl PrintTextOnWindow
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
movs r0, 0
movs r1, 0
movs r2, 0x27
movs r3, 0xD
bl SetWindowBorderStyle
bl sub_8170428
movs r0, 0x1
negs r0, r0
str r4, [sp]
movs r1, 0
movs r2, 0x10
movs r3, 0
b _081703CC
.pool
_08170358:
movs r1, 0x82
lsls r1, 5
movs r0, 0
bl SetGpuRegBits
movs r0, 0
bl ShowBg
movs r0, 0x2
bl ShowBg
ldr r0, =gUnknown_0203BCD0
ldr r1, [r0]
ldr r0, =0x0000088c
adds r1, r0
b _081703D8
.pool
_08170380:
ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
cmp r0, 0
bne _08170416
ldr r1, [r4]
b _081703D4
.pool
_08170394:
bl sub_81230AC
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
bne _081703A6
bl sub_8170428
b _08170416
_081703A6:
cmp r0, 0x3
blt _08170416
cmp r0, 0x5
bgt _08170416
ldr r0, =gUnknown_0203BCD0
ldr r1, [r0]
ldr r0, =0x0000088c
adds r1, r0
b _081703D8
.pool
_081703C0:
movs r0, 0x1
negs r0, r0
movs r1, 0
str r1, [sp]
movs r2, 0
movs r3, 0x10
_081703CC:
bl BeginNormalPaletteFade
ldr r0, =gUnknown_0203BCD0
ldr r1, [r0]
_081703D4:
ldr r2, =0x0000088c
adds r1, r2
_081703D8:
ldrh r0, [r1]
adds r0, 0x1
strh r0, [r1]
b _08170416
.pool
_081703E8:
ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0
bne _08170416
bl sub_812305C
ldr r4, =gUnknown_0203BCD0
ldr r0, [r4]
ldr r0, [r0]
bl SetMainCallback2
ldr r0, [r4]
cmp r0, 0
beq _08170412
bl Free
str r5, [r4]
_08170412:
bl FreeAllWindowBuffers
_08170416:
add sp, 0xC
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_8170290
thumb_func_start sub_8170428
sub_8170428: @ 8170428
push {r4,lr}
sub sp, 0xC
ldr r4, =gUnknown_0203BCD0
ldr r0, [r4]
ldrb r0, [r0, 0xA]
cmp r0, 0
beq _08170460
movs r0, 0
movs r1, 0x11
bl FillWindowPixelBuffer
ldr r2, [r4]
adds r2, 0xC
movs r0, 0x1
str r0, [sp]
movs r0, 0
str r0, [sp, 0x4]
str r0, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
b _08170470
.pool
_08170460:
movs r0, 0
movs r1, 0x11
bl FillWindowPixelBuffer
movs r0, 0
movs r1, 0x3
bl CopyWindowToVram
_08170470:
add sp, 0xC
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_8170428
.align 2, 0 @ Don't pad with nop.
asm/field_screen.s
+1 -1
View File
@@ -10424,7 +10424,7 @@ sub_80B0534: @ 80B0534
lsls r1, 3
ldr r0, =gTasks + 0x8
adds r1, r0
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldrh r0, [r0]
cmp r0, 0
bne _080B0568
asm/fldeff_80F9BCC.s
+9 -9
View File
@@ -563,7 +563,7 @@ _080F9FFE:
sub_80FA004: @ 80FA004
push {r4,lr}
bl sub_80E8BC8
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldrh r0, [r0]
cmp r0, 0x1
beq _080FA0AE
@@ -647,7 +647,7 @@ sub_80FA0DC: @ 80FA0DC
lsls r0, 24
lsrs r0, 24
str r0, [r1]
ldr r0, =gUnknown_08275A86
ldr r0, =EventScript_275A86
bl ScriptContext1_SetupScript
pop {r0}
bx r0
@@ -782,7 +782,7 @@ sub_80FA1E8: @ 80FA1E8
lsls r0, 24
lsrs r0, 24
str r0, [r1]
ldr r0, =gUnknown_08275ADF
ldr r0, =EventScript_275ADF
bl ScriptContext1_SetupScript
pop {r0}
bx r0
@@ -955,7 +955,7 @@ sub_80FA34C: @ 80FA34C
lsls r0, 24
lsrs r0, 24
str r0, [r1]
ldr r0, =gUnknown_08275B38
ldr r0, =EventScript_275B38
bl ScriptContext1_SetupScript
pop {r0}
bx r0
@@ -2063,7 +2063,7 @@ _080FACC2:
ldr r0, =gStringVar2
ldr r1, =gText_Gold
bl StringCopy
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
ldr r0, =0x00004054
@@ -2087,7 +2087,7 @@ _080FAD14:
ldr r0, =gStringVar2
ldr r1, =gText_Silver
bl StringCopy
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
ldr r0, =0x00004054
@@ -2103,12 +2103,12 @@ _080FAD14:
b _080FAD8A
.pool
_080FAD60:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
b _080FAD70
.pool
_080FAD6C:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x2
_080FAD70:
strh r0, [r1]
@@ -2131,7 +2131,7 @@ _080FAD8A:
b _080FADCE
.pool
_080FADA4:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x3
strh r0, [r1]
ldr r0, =0x00004054
asm/fldeff_cut.s
+2 -2
View File
@@ -425,7 +425,7 @@ sub_80D3A9C: @ 80D3A9C
lsls r0, 24
lsrs r0, 24
str r0, [r1]
ldr r0, =gUnknown_08290705
ldr r0, =Route103_EventScript_290705
bl ScriptContext1_SetupScript
pop {r0}
bx r0
@@ -1323,7 +1323,7 @@ _080D41D4:
lsrs r0, 24
cmp r0, 0x1
bne _080D422A
ldr r0, =gUnknown_08267EDB
ldr r0, =FarawayIsland_Interior_EventScript_267EDB
bl ScriptContext1_SetupScript
_080D422A:
pop {r4-r6}
asm/fldeff_strength.s
+2 -2
View File
@@ -17,7 +17,7 @@ hm_prepare_rocksmash: @ 8145DC4
movs r0, 0
b _08145DF2
_08145DD8:
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
bl brm_get_pokemon_selection
lsls r0, 24
lsrs r0, 24
@@ -44,7 +44,7 @@ sub_8145E0C: @ 8145E0C
lsls r0, 24
lsrs r0, 24
str r0, [r1]
ldr r0, =gUnknown_082908FD
ldr r0, =FieryPath_EventScript_2908FD
bl ScriptContext1_SetupScript
pop {r0}
bx r0
asm/fldeff_sweetscent.s
+1 -1
View File
@@ -205,7 +205,7 @@ sub_815A090: @ 815A090
lsls r2, 1
bl CpuFastSet
bl sub_80AC3E4
ldr r0, =gUnknown_08290CAE
ldr r0, =EventScript_290CAE
bl ScriptContext1_SetupScript
adds r0, r4, 0
bl DestroyTask
asm/hall_of_fame.s
-3603
View File
File diff suppressed because it is too large Load Diff
asm/heal_location.s
-83
View File
@@ -1,83 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_8122C5C
sub_8122C5C: @ 8122C5C
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
lsls r1, 16
lsrs r1, 16
movs r3, 0
ldr r2, =gUnknown_0859F53C
_08122C6A:
movs r0, 0
ldrsb r0, [r2, r0]
cmp r0, r4
bne _08122C84
movs r0, 0x1
ldrsb r0, [r2, r0]
cmp r0, r1
bne _08122C84
adds r0, r3, 0x1
b _08122C8E
.pool
_08122C84:
adds r2, 0x8
adds r3, 0x1
cmp r3, 0x15
bls _08122C6A
movs r0, 0
_08122C8E:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_8122C5C
thumb_func_start sub_8122C94
sub_8122C94: @ 8122C94
push {lr}
lsls r0, 16
lsrs r0, 16
lsls r1, 16
lsrs r1, 16
bl sub_8122C5C
cmp r0, 0
beq _08122CB4
lsls r0, 3
ldr r1, =gUnknown_0859F534
adds r0, r1
b _08122CB6
.pool
_08122CB4:
movs r0, 0
_08122CB6:
pop {r1}
bx r1
thumb_func_end sub_8122C94
thumb_func_start sub_8122CBC
@ warpdata *sub_8122CBC(int a1)
sub_8122CBC: @ 8122CBC
push {lr}
cmp r0, 0
beq _08122CD4
cmp r0, 0x16
bhi _08122CD4
lsls r0, 3
ldr r1, =gUnknown_0859F534
adds r0, r1
b _08122CD6
.pool
_08122CD4:
movs r0, 0
_08122CD6:
pop {r1}
bx r1
thumb_func_end sub_8122CBC
.align 2, 0 @ Don't pad with nop.
asm/international_string_util.s
+3 -3
View File
@@ -52,8 +52,8 @@ _081DB462:
bx r1
thumb_func_end sub_81DB41C
thumb_func_start sub_81DB468
sub_81DB468: @ 81DB468
thumb_func_start CopyMonCategoryText
CopyMonCategoryText: @ 81DB468
push {lr}
adds r2, r0, 0
adds r0, r1, 0
@@ -70,7 +70,7 @@ sub_81DB468: @ 81DB468
pop {r0}
bx r0
.pool
thumb_func_end sub_81DB468
thumb_func_end CopyMonCategoryText
thumb_func_start sub_81DB494
sub_81DB494: @ 81DB494
asm/item_menu.s
+42 -42
View File
@@ -121,7 +121,7 @@ sub_81AAC28: @ 81AAC28
ldr r0, =gSpecialVar_0x8005
movs r1, 0
strh r1, [r0]
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r1, [r0]
pop {r0}
bx r0
@@ -135,7 +135,7 @@ sub_81AAC50: @ 81AAC50
movs r0, 0x7
movs r1, 0x5
bl GoToBagMenu
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
pop {r0}
@@ -150,7 +150,7 @@ sub_81AAC70: @ 81AAC70
movs r0, 0x8
movs r1, 0x5
bl GoToBagMenu
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
pop {r0}
@@ -2181,7 +2181,7 @@ _081ABE32:
_081ABE40:
movs r0, 0x5
bl PlaySE
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
mov r1, r10
strh r1, [r0]
ldr r0, =gTasks + 0x8
@@ -2215,7 +2215,7 @@ _081ABE68:
lsrs r0, 24
adds r1, r4, 0
bl BagGetItemIdByPocketPosition
ldr r1, =gScriptItemId
ldr r1, =gSpecialVar_ItemId
strh r0, [r1]
ldr r1, =gUnknown_08614054
ldrb r0, [r5, 0x4]
@@ -3125,7 +3125,7 @@ _081AC668:
.4byte _081AC70C
.4byte _081AC690
_081AC690:
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
bl ItemId_GetBattleUsage
lsls r0, 24
@@ -3170,7 +3170,7 @@ _081AC6E8:
b _081ACA10
.pool
_081AC70C:
ldr r4, =gScriptItemId
ldr r4, =gSpecialVar_ItemId
ldrh r0, [r4]
bl itemid_is_unique
lsls r0, 24
@@ -3205,7 +3205,7 @@ _081AC748:
b _081ACA10
.pool
_081AC76C:
ldr r4, =gScriptItemId
ldr r4, =gSpecialVar_ItemId
ldrh r0, [r4]
bl itemid_is_unique
lsls r0, 24
@@ -3240,7 +3240,7 @@ _081AC7A8:
b _081ACA10
.pool
_081AC7CC:
ldr r4, =gScriptItemId
ldr r4, =gSpecialVar_ItemId
ldrh r0, [r4]
bl itemid_is_unique
lsls r0, 24
@@ -3288,7 +3288,7 @@ _081AC840:
ldrb r0, [r0, 0x5]
cmp r0, 0x4
beq _081AC856
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
bl sub_8122148
lsls r0, 24
@@ -3358,7 +3358,7 @@ _081AC8D4:
ldr r1, =gUnknown_0861402C
movs r2, 0x4
bl memcpy
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
bl itemid_is_mail
lsls r0, 24
@@ -3396,7 +3396,7 @@ _081AC92C:
ldr r0, [r0]
ldr r1, =0x00000496
adds r0, r1
ldr r2, =gScriptItemId
ldr r2, =gSpecialVar_ItemId
ldrh r0, [r0]
ldrh r1, [r2]
cmp r0, r1
@@ -3472,7 +3472,7 @@ _081ACA12:
bne _081ACA50
movs r0, 0x1
bl ClearWindowTilemap
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
bl PrintTMHMMoveData
movs r0, 0x3
@@ -3484,7 +3484,7 @@ _081ACA12:
b _081ACA86
.pool
_081ACA50:
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
ldr r1, =gStringVar1
bl CopyItemName
@@ -3985,7 +3985,7 @@ ItemMenu_UseOutOfBattle: @ 81ACE7C
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r5, =gScriptItemId
ldr r5, =gSpecialVar_ItemId
ldrh r0, [r5]
bl ItemId_GetFieldFunc
cmp r0, 0
@@ -4015,7 +4015,7 @@ _081ACEB8:
ldrb r0, [r0, 0x5]
cmp r0, 0x3
beq _081ACEE8
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
bl ItemId_GetFieldFunc
adds r1, r0, 0
@@ -4055,7 +4055,7 @@ ItemMenu_Toss: @ 81ACEF4
b _081ACF6A
.pool
_081ACF24:
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
ldr r1, =gStringVar1
bl CopyItemName
@@ -4105,7 +4105,7 @@ BagMenuConfirmToss: @ 81ACF88
lsls r4, 3
ldr r0, =gTasks + 0x8
adds r4, r0
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
ldr r1, =gStringVar1
bl CopyItemName
@@ -4242,7 +4242,7 @@ BagMenuActuallyToss: @ 81AD0CC
lsls r4, 3
ldr r5, =gTasks + 0x8
adds r6, r4, r5
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
ldr r1, =gStringVar1
bl CopyItemName
@@ -4312,7 +4312,7 @@ Task_ActuallyToss: @ 81AD150
beq _081AD1CE
movs r0, 0x5
bl PlaySE
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
ldrh r1, [r5, 0x10]
bl RemoveBagItem
@@ -4369,7 +4369,7 @@ ItemMenu_Register: @ 81AD1EC
ldr r0, [r0]
ldr r2, =0x00000496
adds r1, r0, r2
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r2, [r0]
ldrh r0, [r1]
cmp r0, r2
@@ -4412,7 +4412,7 @@ ItemMenu_Give: @ 81AD278
lsrs r4, r0, 24
adds r6, r4, 0
bl bag_menu_remove_some_window
ldr r5, =gScriptItemId
ldr r5, =gSpecialVar_ItemId
ldrh r0, [r5]
bl itemid_80BF6D8_mail_related
lsls r0, 24
@@ -4476,7 +4476,7 @@ bag_menu_print_cant_be_held_msg: @ 81AD30C
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
ldr r1, =gStringVar1
bl CopyItemName
@@ -4567,7 +4567,7 @@ ItemMenu_UseInBattle: @ 81AD3DC
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r4, =gScriptItemId
ldr r4, =gSpecialVar_ItemId
ldrh r0, [r4]
bl ItemId_GetBattleFunc
cmp r0, 0
@@ -4601,7 +4601,7 @@ item_menu_type_2: @ 81AD41C
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r4, =gScriptItemId
ldr r4, =gSpecialVar_ItemId
ldrh r0, [r4]
bl itemid_80BF6D8_mail_related
lsls r0, 24
@@ -4662,7 +4662,7 @@ item_menu_type_b: @ 81AD4B4
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r5, =gScriptItemId
ldr r5, =gSpecialVar_ItemId
ldrh r0, [r5]
bl itemid_is_mail
lsls r0, 24
@@ -4751,7 +4751,7 @@ _081AD550:
bl player_bitmagic
bl sub_808B864
bl sub_808BCF4
ldr r2, =gScriptItemId
ldr r2, =gSpecialVar_ItemId
ldr r0, [r4]
adds r0, r5
ldrh r1, [r0]
@@ -4775,7 +4775,7 @@ _081AD5C4:
adds r0, r5
strh r7, [r0]
_081AD5CA:
ldr r0, =gUnknown_082736B3
ldr r0, =EventScript_2736B3
bl ScriptContext1_SetupScript
_081AD5D0:
movs r0, 0x1
@@ -4798,7 +4798,7 @@ display_sell_item_ask_str: @ 81AD5DC
lsls r0, 3
ldr r1, =gTasks + 0x8
adds r4, r0, r1
ldr r6, =gScriptItemId
ldr r6, =gSpecialVar_ItemId
ldrh r0, [r6]
bl itemid_get_market_price
lsls r0, 16
@@ -4861,7 +4861,7 @@ sub_81AD680: @ 81AD680
ldr r0, =gTasks + 0x8
adds r4, r0
ldr r6, =gStringVar1
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
bl itemid_get_market_price
lsls r0, 16
@@ -4944,7 +4944,7 @@ sub_81AD730: @ 81AD730
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
bl itemid_get_market_price
lsls r0, 16
@@ -4996,7 +4996,7 @@ sub_81AD794: @ 81AD794
ldrb r4, [r0]
movs r2, 0x10
ldrsh r5, [r6, r2]
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
bl itemid_get_market_price
lsls r0, 16
@@ -5061,7 +5061,7 @@ sub_81AD84C: @ 81AD84C
lsls r4, 3
ldr r0, =gTasks + 0x8
adds r4, r0
ldr r6, =gScriptItemId
ldr r6, =gSpecialVar_ItemId
ldrh r0, [r6]
ldr r1, =gStringVar2
bl CopyItemName
@@ -5122,7 +5122,7 @@ sub_81AD8C8: @ 81AD8C8
adds r5, r0
movs r0, 0x5F
bl PlaySE
ldr r2, =gScriptItemId
ldr r2, =gSpecialVar_ItemId
mov r8, r2
ldrh r0, [r2]
mov r3, r10
@@ -5241,7 +5241,7 @@ display_deposit_item_ask_str: @ 81AD9EC
b _081ADA5E
.pool
_081ADA18:
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
ldr r1, =gStringVar1
bl CopyItemName
@@ -5366,7 +5366,7 @@ sub_81ADB14: @ 81ADB14
movs r0, 0x1
movs r1, 0
bl FillWindowPixelBuffer
ldr r4, =gScriptItemId
ldr r4, =gSpecialVar_ItemId
ldrh r0, [r4]
bl itemid_is_unique
lsls r0, 24
@@ -5690,7 +5690,7 @@ _081ADDEC:
ldrb r0, [r4]
movs r1, 0x2
bl bag_menu_print_cursor_
ldr r1, =gScriptItemId
ldr r1, =gSpecialVar_ItemId
movs r0, 0x4
strh r0, [r1]
adds r0, r5, 0
@@ -5726,10 +5726,10 @@ unknown_ItemMenu_Show: @ 81ADE38
lsls r4, 24
lsrs r4, 24
ldr r1, =gSpecialVar_0x8005
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
strh r0, [r1]
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
bl bag_menu_remove_some_window
@@ -5760,11 +5760,11 @@ unknown_ItemMenu_Give2: @ 81ADE8C
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
movs r1, 0x1
bl RemoveBagItem
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
bl bag_menu_remove_some_window
@@ -5795,7 +5795,7 @@ unknown_ItemMenu_Confirm2: @ 81ADEDC
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
bl bag_menu_remove_some_window
asm/item_use.s
+19 -19
View File
@@ -11,7 +11,7 @@ SetUpItemUseCallback: @ 80FD060
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r1, =gScriptItemId
ldr r1, =gSpecialVar_ItemId
ldrh r0, [r1]
cmp r0, 0xAF
bne _080FD084
@@ -260,7 +260,7 @@ sub_80FD254: @ 80FD254
push {lr}
sub sp, 0x24
mov r1, sp
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
strh r0, [r1, 0x20]
ldr r1, =bag_menu_mail_related
@@ -381,7 +381,7 @@ ItemUseOnFieldCB_Bike: @ 80FD358
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
bl ItemId_GetSecondaryId
lsls r0, 24
@@ -515,7 +515,7 @@ ItemUseOnFieldCB_Rod: @ 80FD468
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
bl ItemId_GetSecondaryId
lsls r0, 24
@@ -1642,7 +1642,7 @@ sub_80FDD10: @ 80FDD10
b _080FDD68
.pool
_080FDD58:
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
bl ItemId_GetFieldFunc
adds r1, r0, 0
@@ -1661,12 +1661,12 @@ sub_80FDD74: @ 80FDD74
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
movs r1, 0x1
bl RemoveBagItem
bl ScriptContext2_Enable
ldr r0, =gUnknown_08274482
ldr r0, =Route102_EventScript_274482
bl ScriptContext1_SetupScript
adds r0, r4, 0
bl DestroyTask
@@ -1728,7 +1728,7 @@ sub_80FDE08: @ 80FDE08
lsls r4, 24
lsrs r4, 24
bl ScriptContext2_Enable
ldr r0, =gUnknown_082744C0
ldr r0, =Route102_EventScript_2744C0
bl ScriptContext1_SetupScript
adds r0, r4, 0
bl DestroyTask
@@ -1787,7 +1787,7 @@ sub_80FDE7C: @ 80FDE7C
lsls r4, 24
lsrs r4, 24
bl ScriptContext2_Enable
ldr r0, =gUnknown_08242CFC
ldr r0, =BattleFrontier_OutsideEast_EventScript_242CFC
bl ScriptContext1_SetupScript
adds r0, r4, 0
bl DestroyTask
@@ -1886,7 +1886,7 @@ ItemUseOutOfBattle_TMHM: @ 80FDF48
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r1, [r0]
movs r0, 0xA9
lsls r0, 1
@@ -1945,7 +1945,7 @@ task08_0809AD8C: @ 80FDFBC
cmp r0, 0
beq _080FE000
ldr r4, =gStringVar1
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
bl ItemIdToBattleMoveId
lsls r0, 16
@@ -2002,7 +2002,7 @@ sub_80FE03C: @ 80FE03C
thumb_func_start sub_80FE058
sub_80FE058: @ 80FE058
push {r4,lr}
ldr r4, =gScriptItemId
ldr r4, =gSpecialVar_ItemId
ldrh r0, [r4]
movs r1, 0x1
bl RemoveBagItem
@@ -2125,7 +2125,7 @@ sub_80FE164: @ 80FE164
cmp r0, 0
bne _080FE1C2
ldr r4, =0x00004021
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
bl ItemId_GetHoldEffectParam
adds r1, r0, 0
@@ -2205,7 +2205,7 @@ ItemUseOutOfBattle_BlackWhiteFlute: @ 80FE234
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r4, =gScriptItemId
ldr r4, =gSpecialVar_ItemId
ldrh r0, [r4]
ldr r1, =gStringVar2
bl CopyItemName
@@ -2361,7 +2361,7 @@ ItemUseInBattle_PokeBall: @ 80FE394
lsls r0, 24
cmp r0, 0
bne _080FE3D0
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
movs r1, 0x1
bl RemoveBagItem
@@ -2450,7 +2450,7 @@ sub_80FE440: @ 80FE440
ble _080FE4AC
movs r0, 0x1
bl PlaySE
ldr r4, =gScriptItemId
ldr r4, =gSpecialVar_ItemId
ldrh r0, [r4]
movs r1, 0x1
bl RemoveBagItem
@@ -2496,7 +2496,7 @@ ItemUseInBattle_StatIncrease: @ 80FE4B8
muls r0, r2
ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gScriptItemId
ldr r1, =gSpecialVar_ItemId
ldrh r1, [r1]
lsls r2, 24
lsrs r2, 24
@@ -2664,7 +2664,7 @@ ItemUseOutOfBattle_EnigmaBerry: @ 80FE650
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
bl GetItemEffectType
lsls r0, 24
@@ -2785,7 +2785,7 @@ ItemUseInBattle_EnigmaBerry: @ 80FE77C
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
bl GetItemEffectType
lsls r0, 24
asm/macros.inc
+1
View File
@@ -1,5 +1,6 @@
.include "asm/macros/asm.inc"
.include "asm/macros/function.inc"
.include "asm/macros/movement.inc"
.include "asm/macros/window.inc"
.include "asm/macros/pokemon_data.inc"
.include "asm/macros/ec.inc"
asm/macros/event.s → asm/macros/event.inc
+534 -422
View File
File diff suppressed because it is too large Load Diff
asm/macros/map.inc
+102 -2
View File
@@ -1,15 +1,115 @@
.macro new_map_group
.set cur_map_group, cur_map_group + 1
inc cur_map_group
.set cur_map_num, 0
.endm
.macro map_group map_name
.set GROUP_\map_name, cur_map_group
.set MAP_\map_name, cur_map_num
.set cur_map_num, cur_map_num + 1
inc cur_map_num
.endm
.macro map map_name
.byte GROUP_\map_name
.byte MAP_\map_name
.endm
.macro warp_map map_name
.byte MAP_\map_name
.byte GROUP_\map_name
.endm
.macro heal_location map_name, x, y
.byte GROUP_\map_name
.byte MAP_\map_name
.2byte \x
.2byte \y
.space 2
.endm
.equiv GROUP_NONE, 0x7f
.equiv MAP_NONE, 0x7f
.equiv GROUP_UNDEFINED, 0xff
.equiv MAP_UNDEFINED, 0xff
.macro map_script type, address
.byte \type
.4byte \address
.endm
.macro map_script_2 word1, word2, address
.2byte \word1
.2byte \word2
.4byte \address
.endm
.macro object_event index, gfx, replacement, filler1, x, y, elevation, movement_type, radius, filler2, trainer_type, sight_radius_tree_etc, script, event_flag, filler3, filler4
.byte \index, \gfx, \replacement, \filler1
.2byte \x
.2byte \y
.byte \elevation, \movement_type, \radius, \filler2
.2byte \trainer_type, \sight_radius_tree_etc
.4byte \script
.2byte \event_flag
.byte \filler3, \filler4
inc _num_npcs
.endm
.macro warp_def x, y, byte, warp, map
.2byte \x, \y
.byte \byte, \warp
warp_map \map
inc _num_warps
.endm
.macro coord_event x, y, byte1, byte2, word1, word2, word3, script
.2byte \x, \y
.byte \byte1, \byte2
.2byte \word1, \word2, \word3
.4byte \script
inc _num_traps
.endm
.macro bg_event x, y, byte, kind, word, arg6, arg7, arg8
.2byte \x, \y
.byte \byte, \kind
.2byte \word
.if \kind < 5
.4byte \arg6
.else
.2byte \arg6
.byte \arg7, \arg8
.endif
inc _num_signs
.endm
.macro map_events npcs, warps, traps, signs
.byte _num_npcs, _num_warps, _num_traps, _num_signs
.4byte \npcs, \warps, \traps, \signs
reset_map_events
.endm
.macro reset_map_events
.set _num_npcs, 0
.set _num_warps, 0
.set _num_traps, 0
.set _num_signs, 0
.endm
reset_map_events
.equiv connection_down, 1
.equiv connection_up, 2
.equiv connection_left, 3
.equiv connection_right, 4
.equiv connection_dive, 5
.equiv connection_emerge, 6
.macro connection direction, offset, map, filler
.4byte connection_\direction
.4byte \offset
map \map
.space 2
.endm
asm/macros/movement.inc
+123
View File
@@ -0,0 +1,123 @@
.macro create_movement name
enum _\name
.macro \name
.byte _\name
.endm
.endm
enum_start
create_movement step_00
create_movement step_01
create_movement step_02
create_movement step_03
create_movement slow_step_down
create_movement slow_step_up
create_movement slow_step_left
create_movement slow_step_right
create_movement step_down
create_movement step_up
create_movement step_left
create_movement step_right
create_movement fast_step_down
create_movement fast_step_up
create_movement fast_step_left
create_movement fast_step_right
create_movement step_10
create_movement step_11
create_movement step_12
create_movement step_13
create_movement step_14
create_movement step_15
create_movement step_16
create_movement step_17
create_movement step_18
create_movement step_19
create_movement step_1a
create_movement step_1b
create_movement step_1c
create_movement step_1d
create_movement step_1e
create_movement step_1f
create_movement step_20
create_movement step_21
create_movement step_22
create_movement step_23
create_movement step_24
create_movement step_25
create_movement step_26
create_movement step_27
create_movement step_28
create_movement step_29
create_movement step_2a
create_movement step_2b
create_movement step_2c
create_movement step_2d
create_movement step_2e
create_movement step_2f
create_movement step_30
create_movement step_31
create_movement step_32
create_movement step_33
create_movement step_34
create_movement step_35
create_movement step_36
create_movement step_37
create_movement step_38
create_movement step_39
create_movement step_3a
create_movement step_3b
create_movement step_3c
create_movement step_3d
create_movement step_3e
create_movement step_3f
create_movement step_40
create_movement step_41
create_movement step_42
create_movement step_43
create_movement step_44
create_movement step_45
create_movement step_46
create_movement step_47
create_movement step_48
create_movement step_49
create_movement step_4a
create_movement step_4b
create_movement step_4c
create_movement step_4d
create_movement step_4e
create_movement step_4f
create_movement step_50
create_movement step_51
create_movement step_52
create_movement step_53
create_movement step_54
create_movement step_55
create_movement step_56
create_movement step_57
create_movement step_58
create_movement step_59
create_movement step_5a
create_movement step_5b
create_movement step_5c
create_movement step_5d
create_movement step_5e
create_movement step_5f
create_movement step_60
create_movement step_61
create_movement step_62
create_movement step_63
enum_start 0x91
create_movement step_91
create_movement step_92
create_movement step_93
create_movement step_94
create_movement step_95
create_movement step_96
create_movement step_97
create_movement step_98
create_movement step_99
create_movement step_9A
enum_start 0xfe
create_movement step_end
asm/map_obj_lock.s
+1 -1
View File
@@ -256,7 +256,7 @@ sub_8098574: @ 8098574
lsls r0, 2
ldr r1, =gMapObjects
adds r0, r1
ldr r1, =gScriptFacing
ldr r1, =gSpecialVar_Facing
ldrb r1, [r1]
bl FieldObjectFaceOppositeDirection
pop {r0}
asm/mauville_old_man.s
+10 -10
View File
@@ -157,7 +157,7 @@ sub_81201C8: @ 81201C8
thumb_func_start sub_81201DC
sub_81201DC: @ 81201DC
push {r4,lr}
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
bl sub_81201C8
lsls r0, 24
lsrs r0, 24
@@ -170,7 +170,7 @@ sub_81201DC: @ 81201DC
thumb_func_start sub_81201F4
sub_81201F4: @ 81201F4
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r2, =0x00002e51
@@ -347,7 +347,7 @@ sub_8120340: @ 8120340
thumb_func_start sub_8120358
sub_8120358: @ 8120358
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r2, =0x00002e28
@@ -379,14 +379,14 @@ sub_812038C: @ 812038C
ldr r0, =0x0000ffff
cmp r1, r0
bne _081203AC
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
b _081203B6
.pool
_081203AC:
ldr r0, =gStringVar1
bl CopyEasyChatWord
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
_081203B6:
strh r0, [r1]
@@ -405,14 +405,14 @@ sub_81203C4: @ 81203C4
ldrb r0, [r2, 0x1]
cmp r0, 0xA
bne _081203EC
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
strb r0, [r2, 0x1]
b _081203F2
.pool
_081203EC:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
_081203F2:
@@ -503,7 +503,7 @@ _081204C4:
adds r0, 0x1
_081204C8:
strb r0, [r5, 0x1]
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
pop {r4-r6}
@@ -2382,13 +2382,13 @@ _0812132C:
cmp r4, r0
bne _0812135C
_0812134E:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
b _08121364
.pool
_0812135C:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r5, [r0]
ldr r0, =gUnknown_03001178
strb r4, [r0]
asm/party_menu.s
+33 -33
View File
@@ -1213,13 +1213,13 @@ sub_81B0BFC: @ 81B0BFC
muls r1, r0
ldr r0, =gPlayerParty
adds r6, r1, r0
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r4, [r0]
ldr r0, =gUnknown_0203CEC8
ldrb r0, [r0, 0xB]
cmp r0, 0xC
bne _081B0C40
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
ldr r0, =gSpecialVar_0x8005
@@ -4211,7 +4211,7 @@ _081B23E8:
movs r1, 0x4F
movs r2, 0xD0
bl sub_809882C
bl sub_8098C64
bl GetOverworldTextboxPalettePtr
movs r1, 0xE0
movs r2, 0x20
bl LoadPalette
@@ -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
@@ -7739,7 +7739,7 @@ c2_8123744: @ 81B41F0
mov r7, r8
push {r7}
sub sp, 0xC
ldr r6, =gScriptItemId
ldr r6, =gSpecialVar_ItemId
ldrh r0, [r6]
cmp r0, 0
bne _081B4224
@@ -7845,7 +7845,7 @@ sub_81B42D0: @ 81B42D0
ands r0, r1
cmp r0, 0
bne _081B432C
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r4, [r0]
ldr r0, =gUnknown_0203CEC8
mov r8, r0
@@ -7969,7 +7969,7 @@ _081B43FC:
beq _081B44DE
b _081B44EC
_081B4402:
ldr r5, =gScriptItemId
ldr r5, =gSpecialVar_ItemId
ldrh r0, [r5]
movs r1, 0x1
bl RemoveBagItem
@@ -8135,7 +8135,7 @@ sub_81B4578: @ 81B4578
lsls r0, 16
lsrs r0, 16
mov r8, r0
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldrh r7, [r0]
cmp r7, 0
bne _081B45F8
@@ -8212,7 +8212,7 @@ sub_81B4624: @ 81B4624
muls r0, r1
ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gScriptItemId
ldr r1, =gSpecialVar_ItemId
ldrh r1, [r1]
movs r2, 0
movs r3, 0
@@ -8220,7 +8220,7 @@ sub_81B4624: @ 81B4624
b _081B467C
.pool
_081B4670:
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
ldrh r1, [r1]
movs r2, 0
@@ -9892,7 +9892,7 @@ _081B55E8:
.pool
_081B5614:
ldr r1, =gUnknown_0203CEC8
ldr r0, =sub_8124690
ldr r0, =MCB2_FlyMap
b _081B5628
.pool
_081B5624:
@@ -11359,7 +11359,7 @@ _081B61BC:
movs r7, 0
movs r6, 0
_081B61C0:
ldr r4, =gScriptItemId
ldr r4, =gSpecialVar_ItemId
ldrh r0, [r4]
bl GetItemEffectType
lsls r0, 24
@@ -11787,7 +11787,7 @@ ItemUseCB_Medicine: @ 81B6588
muls r1, r0
ldr r0, =gPlayerParty
adds r5, r1, r0
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r6, [r0]
adds r0, r5, 0
adds r1, r6, 0
@@ -12032,7 +12032,7 @@ sub_81B67C8: @ 81B67C8
muls r1, r0
ldr r0, =gPlayerParty
adds r5, r1, r0
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r6, [r0]
adds r0, r6, 0
bl GetItemEffectType
@@ -12391,7 +12391,7 @@ dp05_ether: @ 81B6AFC
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
cmp r0, 0xAF
bne _081B6B20
@@ -12500,7 +12500,7 @@ ether_effect_related: @ 81B6BEC
lsrs r6, r0, 24
movs r4, 0
ldr r7, =gUnknown_0203CED6
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r5, [r0]
movs r0, 0xE
negs r0, r0
@@ -12729,7 +12729,7 @@ sub_81B6DC4: @ 81B6DC4
movs r0, 0xE
adds r0, r7
mov r8, r0
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r4, [r0]
ldr r1, =gStringVar1
adds r0, r5, 0
@@ -12818,7 +12818,7 @@ sub_81B6EB4: @ 81B6EB4
adds r5, r1, r0
adds r6, r2, 0
adds r6, 0xE
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r4, [r0]
movs r1, 0x2
ldrsh r0, [r6, r1]
@@ -12928,7 +12928,7 @@ _081B6FC0:
_081B6FDC:
cmp r0, 0x2
bne _081B6FE4
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r2, [r0]
_081B6FE4:
adds r0, r5, 0
@@ -13324,7 +13324,7 @@ _081B7306:
_081B7368:
cmp r0, 0x2
bne _081B7370
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r5, [r0]
_081B7370:
ldr r0, =gTasks
@@ -13409,7 +13409,7 @@ dp05_rare_candy: @ 81B7404
movs r1, 0x86
lsls r1, 2
adds r4, r6, r1
ldr r2, =gScriptItemId
ldr r2, =gSpecialVar_ItemId
mov r8, r2
adds r0, r5, 0
movs r1, 0x38
@@ -13467,7 +13467,7 @@ _081B74B4:
ldrb r0, [r0, 0x9]
adds r1, r5, 0
bl sub_81B754C
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
movs r1, 0x1
bl RemoveBagItem
@@ -14084,7 +14084,7 @@ sub_81B7A28: @ 81B7A28
lsls r0, 16
lsrs r7, r0, 16
ldrb r0, [r6, 0x9]
ldr r1, =gScriptItemId
ldr r1, =gSpecialVar_ItemId
ldrh r1, [r1]
movs r2, 0
bl ExecuteTableBasedItemEffect__
@@ -14236,7 +14236,7 @@ _081B7BC8:
ldr r1, =gUnknown_0203CEE8
movs r0, 0x1
strb r0, [r1]
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
movs r1, 0x1
bl RemoveBagItem
@@ -14312,7 +14312,7 @@ sub_81B7C74: @ 81B7C74
ldr r0, [r1]
str r0, [r2]
ldrb r0, [r1, 0x9]
ldr r4, =gScriptItemId
ldr r4, =gSpecialVar_ItemId
ldrh r1, [r4]
movs r2, 0
bl ExecuteTableBasedItemEffect__
@@ -14685,7 +14685,7 @@ _081B7F72:
movs r3, 0
bl sub_81B0038
ldr r1, =gUnknown_0203CEC8
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
strh r0, [r1, 0xC]
add sp, 0xC
@@ -14933,7 +14933,7 @@ sub_81B81A8: @ 81B81A8
bl GetMonData
lsls r0, 16
lsrs r7, r0, 16
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldrh r0, [r0]
cmp r0, 0
bne _081B8208
@@ -17381,7 +17381,7 @@ _081B95BA:
thumb_func_start sub_81B95E0
sub_81B95E0: @ 81B95E0
push {r4,r5,lr}
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
movs r4, 0
@@ -17490,7 +17490,7 @@ sub_81B968C: @ 81B968C
thumb_func_start sub_81B96D0
sub_81B96D0: @ 81B96D0
push {r4,r5,lr}
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
movs r4, 0
@@ -17741,13 +17741,13 @@ sub_81B98DC: @ 81B98DC
adds r1, r0, 0
cmp r1, 0
beq _081B990C
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
b _081B9910
.pool
_081B990C:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r1, [r0]
_081B9910:
pop {r0}
@@ -17760,7 +17760,7 @@ sub_81B9918: @ 81B9918
push {r4-r7,lr}
mov r7, r8
push {r7}
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
ldr r0, =gSpecialVar_0x8004
@@ -17813,7 +17813,7 @@ _081B9980:
bl sub_80D23A8
cmp r0, 0x1
beq _081B999C
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
_081B999C:
asm/player_pc.s
+2 -2
View File
@@ -379,12 +379,12 @@ sub_816B148: @ 816B148
ldrb r0, [r0, 0x8]
cmp r0, 0
bne _0816B174
ldr r0, =gUnknown_081F863F
ldr r0, =LittlerootTown_BrendansHouse_2F_EventScript_1F863F
bl ScriptContext1_SetupScript
b _0816B184
.pool
_0816B174:
ldr r0, =gUnknown_081F958F
ldr r0, =LittlerootTown_MaysHouse_2F_EventScript_1F958F
bl ScriptContext1_SetupScript
b _0816B184
.pool
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/pokeblock_feed.s
+2 -2
View File
@@ -380,7 +380,7 @@ _08179EEC:
b _08179F5E
.pool
_08179F00:
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrb r0, [r0]
bl sub_8179FEC
ldr r0, =gUnknown_0203BD1C
@@ -692,7 +692,7 @@ sub_817A1C4: @ 817A1C4
ldr r0, =gPlayerParty
adds r5, r0
ldr r1, =gSaveBlock1Ptr
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
lsls r0, 3
ldr r2, =0x00000848
asm/pokedex.s
+3 -3
View File
@@ -2311,7 +2311,7 @@ _080BC870:
movs r2, 0xBE
bl LoadPalette
_080BC87A:
bl sub_8098C64
bl GetOverworldTextboxPalettePtr
movs r1, 0xF0
movs r2, 0x20
bl LoadPalette
@@ -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
@@ -8950,7 +8950,7 @@ _080C028E:
add r4, sp, 0x10
adds r0, r6, 0
adds r1, r4, 0
bl sub_81DB468
bl CopyMonCategoryText
adds r0, r4, 0
b _080C02AE
.pool
asm/pokedex_area_screen.s
+4 -4
View File
@@ -362,7 +362,7 @@ sub_813CD04: @ 813CD04
adds r1, r3, 0
bl get_mapheader_by_bank_and_number
ldrb r0, [r0, 0x14]
bl sub_8123F9C
bl CorrectSpecialMapSecId
ldr r2, [r4]
movs r1, 0x88
lsls r1, 1
@@ -653,7 +653,7 @@ _0813CF5A:
adds r0, r4, 0
adds r1, r6, 0
str r3, [sp]
bl sub_8123E9C
bl GetRegionMapSectionIdAt
ldr r3, [sp]
ldr r2, [r3]
mov r7, r9
@@ -1338,11 +1338,11 @@ _0813D4F8:
bl sub_8122D88
movs r0, 0x1
movs r1, 0x1
bl sub_8124288
bl CreateRegionMapPlayerIcon
movs r1, 0x8
negs r1, r1
movs r0, 0
bl sub_8123824
bl PokedexAreaScreen_UpdateRegionMapVariablesAndVideoRegs
b _0813D584
.pool
_0813D520:
asm/pokemon_storage_system.s
+11 -227
View File
@@ -5,224 +5,8 @@
.text
thumb_func_start CountMonsInBox
CountMonsInBox: @ 80C6FA0
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
movs r4, 0
movs r5, 0
_080C6FAA:
lsls r1, r4, 24
lsrs r1, 24
adds r0, r6, 0
movs r2, 0xB
bl GetBoxMonDataFromAnyBox
cmp r0, 0
beq _080C6FC0
adds r0, r5, 0x1
lsls r0, 16
lsrs r5, r0, 16
_080C6FC0:
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
cmp r4, 0x1D
bls _080C6FAA
lsls r0, r5, 24
lsrs r0, 24
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end CountMonsInBox
thumb_func_start sub_80C6FD4
sub_80C6FD4: @ 80C6FD4
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
movs r4, 0
_080C6FDC:
lsls r1, r4, 24
lsrs r1, 24
adds r0, r5, 0
movs r2, 0xB
bl GetBoxMonDataFromAnyBox
cmp r0, 0
bne _080C6FF2
lsls r0, r4, 16
asrs r0, 16
b _080C7000
_080C6FF2:
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
cmp r4, 0x1D
bls _080C6FDC
movs r0, 0x1
negs r0, r0
_080C7000:
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end sub_80C6FD4
thumb_func_start sub_80C7008
sub_80C7008: @ 80C7008
push {r4-r6,lr}
movs r5, 0
movs r6, 0
_080C700E:
movs r0, 0x64
adds r1, r5, 0
muls r1, r0
ldr r0, =gPlayerParty
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
bl GetMonData
cmp r0, 0
beq _080C7036
adds r0, r4, 0
movs r1, 0x2D
bl GetMonData
cmp r0, 0
bne _080C7036
adds r0, r6, 0x1
lsls r0, 16
lsrs r6, r0, 16
_080C7036:
adds r0, r5, 0x1
lsls r0, 16
lsrs r5, r0, 16
cmp r5, 0x5
bls _080C700E
lsls r0, r6, 24
lsrs r0, 24
pop {r4-r6}
pop {r1}
bx r1
.pool
thumb_func_end sub_80C7008
thumb_func_start sub_80C7050
sub_80C7050: @ 80C7050
push {r4-r7,lr}
lsls r0, 24
movs r5, 0
movs r6, 0
lsrs r7, r0, 24
_080C705A:
cmp r5, r7
beq _080C7092
movs r0, 0x64
adds r1, r5, 0
muls r1, r0
ldr r0, =gPlayerParty
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
bl GetMonData
cmp r0, 0
beq _080C7092
adds r0, r4, 0
movs r1, 0x2D
bl GetMonData
cmp r0, 0
bne _080C7092
adds r0, r4, 0
movs r1, 0x39
bl GetMonData
cmp r0, 0
beq _080C7092
adds r0, r6, 0x1
lsls r0, 16
lsrs r6, r0, 16
_080C7092:
adds r0, r5, 0x1
lsls r0, 16
lsrs r5, r0, 16
cmp r5, 0x5
bls _080C705A
lsls r0, r6, 24
lsrs r0, 24
pop {r4-r7}
pop {r1}
bx r1
.pool
thumb_func_end sub_80C7050
thumb_func_start sub_80C70AC
sub_80C70AC: @ 80C70AC
push {lr}
ldr r0, =gSpecialVar_0x8004
ldrb r0, [r0]
bl sub_80C7050
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
.pool
thumb_func_end sub_80C70AC
thumb_func_start sub_80C70C4
sub_80C70C4: @ 80C70C4
push {r4,r5,lr}
movs r4, 0
movs r5, 0
_080C70CA:
movs r0, 0x64
muls r0, r4
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0xB
bl GetMonData
cmp r0, 0
beq _080C70E2
adds r0, r5, 0x1
lsls r0, 16
lsrs r5, r0, 16
_080C70E2:
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
cmp r4, 0x5
bls _080C70CA
lsls r0, r5, 24
lsrs r0, 24
pop {r4,r5}
pop {r1}
bx r1
.pool
thumb_func_end sub_80C70C4
thumb_func_start sub_80C70FC
sub_80C70FC: @ 80C70FC
push {r4,r5,lr}
adds r5, r0, 0
lsls r4, r2, 16
lsrs r4, 16
bl StringCopy
adds r1, r0, 0
adds r5, r4
cmp r1, r5
bcs _080C711A
movs r0, 0
_080C7112:
strb r0, [r1]
adds r1, 0x1
cmp r1, r5
bcc _080C7112
_080C711A:
movs r0, 0xFF
strb r0, [r1]
adds r0, r1, 0
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end sub_80C70FC
thumb_func_start sub_80C7128
thumb_func_start sub_80C7128
sub_80C7128: @ 80C7128
push {r4-r7,lr}
mov r7, r9
@@ -578,7 +362,7 @@ _080C73F6:
ldrsh r4, [r5, r3]
cmp r4, 0
bne _080C7428
bl sub_80C70C4
bl CountPartyMons
lsls r0, 24
lsrs r0, 24
cmp r0, 0x6
@@ -601,7 +385,7 @@ _080C7428:
ldrsh r0, [r5, r1]
cmp r0, 0x1
bne _080C745C
bl sub_80C70C4
bl CountPartyMons
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x1
@@ -2252,7 +2036,7 @@ _080C8230:
ldrb r0, [r0]
cmp r0, 0x2
bne _080C825C
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
cmp r0, 0
beq _080C825C
@@ -5458,7 +5242,7 @@ _080C9F56:
sub_80C9F6C: @ 80C9F6C
push {lr}
sub sp, 0x4
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r1, [r0]
mov r0, sp
strh r1, [r0]
@@ -13381,7 +13165,7 @@ sub_80CE19C: @ 80CE19C
lsls r0, 24
lsrs r6, r0, 24
adds r0, r6, 0
bl sub_80C6FD4
bl GetFirstFreeBoxSpot
lsls r0, 16
lsrs r4, r0, 16
asrs r0, 16
@@ -14127,7 +13911,7 @@ _080CE838:
ldr r2, =0x00002187
adds r1, r2
strb r0, [r1]
bl sub_80C70C4
bl CountPartyMons
ldr r1, [r4]
subs r0, 0x1
ldr r2, =0x00002186
@@ -14347,7 +14131,7 @@ sub_80CEA30: @ 80CEA30
bne _080CEA64
ldr r0, =gUnknown_02039D79
ldrb r0, [r0]
bl sub_80C7050
bl CountPartyAliveNonEggMonsExcept
lsls r0, 24
cmp r0, 0
bne _080CEA64
@@ -14376,7 +14160,7 @@ sub_80CEA6C: @ 80CEA6C
bne _080CEAAC
ldr r0, =gUnknown_02039D79
ldrb r0, [r0]
bl sub_80C7050
bl CountPartyAliveNonEggMonsExcept
lsls r0, 24
cmp r0, 0
bne _080CEAAC
@@ -14656,7 +14440,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 +14543,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
+16 -16
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]
@@ -3585,7 +3585,7 @@ _081C5C5C:
_081C5C88:
movs r0, 0x5
bl PlaySE
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
strh r4, [r0]
adds r0, r5, 0
bl sub_81C5B14
@@ -3594,7 +3594,7 @@ _081C5C88:
_081C5CA0:
movs r0, 0x5
bl PlaySE
ldr r2, =gScriptItemId
ldr r2, =gSpecialVar_ItemId
mov r12, r2
ldr r0, =gSaveBlock2Ptr
ldr r2, [r0]
@@ -3681,7 +3681,7 @@ sub_81C5D20: @ 81C5D20
b _081C5DD8
.pool
_081C5D74:
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
bl ItemId_GetBattleUsage
lsls r0, 24
@@ -3722,7 +3722,7 @@ _081C5DCE:
_081C5DD8:
strb r0, [r1]
_081C5DDA:
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
ldr r1, =gStringVar1
bl CopyItemName
@@ -4195,7 +4195,7 @@ sub_81C61E0: @ 81C61E0
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r4, =gScriptItemId
ldr r4, =gSpecialVar_ItemId
ldrh r0, [r4]
bl ItemId_GetPocket
lsls r0, 24
@@ -4315,7 +4315,7 @@ sub_81C62C4: @ 81C62C4
b _081C6334
.pool
_081C62F4:
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
ldr r1, =gStringVar1
bl CopyItemName
@@ -4362,7 +4362,7 @@ sub_81C6350: @ 81C6350
lsls r4, 3
ldr r0, =gTasks + 0x8
adds r4, r0
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
ldr r1, =gStringVar1
bl CopyItemName
@@ -4577,7 +4577,7 @@ sub_81C654C: @ 81C654C
lsls r4, 3
ldr r5, =gTasks + 0x8
adds r6, r4, r5
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
ldr r1, =gStringVar1
bl CopyItemName
@@ -4635,7 +4635,7 @@ sub_81C65CC: @ 81C65CC
beq _081C662E
movs r0, 0x5
bl PlaySE
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
ldrh r1, [r4, 0x10]
bl RemovePyramidBagItem
@@ -4671,7 +4671,7 @@ sub_81C6648: @ 81C6648
lsrs r4, r0, 24
adds r6, r4, 0
bl sub_81C61A8
ldr r5, =gScriptItemId
ldr r5, =gSpecialVar_ItemId
ldrh r0, [r5]
bl itemid_is_mail
lsls r0, 24
@@ -4713,7 +4713,7 @@ sub_81C66AC: @ 81C66AC
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
ldr r1, =gStringVar1
bl CopyItemName
@@ -4785,7 +4785,7 @@ sub_81C674C: @ 81C674C
lsls r0, 24
lsrs r4, r0, 24
adds r6, r4, 0
ldr r5, =gScriptItemId
ldr r5, =gSpecialVar_ItemId
ldrh r0, [r5]
bl itemid_80BF6D8_mail_related
lsls r0, 24
@@ -4820,7 +4820,7 @@ sub_81C679C: @ 81C679C
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r4, =gScriptItemId
ldr r4, =gSpecialVar_ItemId
ldrh r0, [r4]
bl ItemId_GetBattleFunc
cmp r0, 0
@@ -5238,7 +5238,7 @@ _081C6AF8:
bl Free
adds r0, r5, 0
bl Free
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
b _081C6BC6
@@ -5266,7 +5266,7 @@ _081C6B9C:
lsrs r6, r0, 24
cmp r6, 0x2
bls _081C6B9C
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
adds r0, r7, 0
asm/pokenav.s
+29 -29
View File
@@ -10864,7 +10864,7 @@ sub_81CC670: @ 81CC670
movs r0, 0x4
bl sub_81C763C
adds r4, r0, 0
bl sub_812305C
bl FreeRegionMapIconResources
bl sub_81CC9EC
ldrb r0, [r4, 0x8]
bl RemoveWindow
@@ -10886,7 +10886,7 @@ sub_81CC6A4: @ 81CC6A4
bl TransferPlttBuffer
bl LoadOam
bl ProcessSpriteCopyRequests
bl sub_81237B4
bl UpdateRegionMapVideoRegs
pop {r0}
bx r0
thumb_func_end sub_81CC6A4
@@ -10991,10 +10991,10 @@ _081CC784:
bne _081CC7AC
movs r0, 0x4
movs r1, 0x9
bl sub_8124288
bl CreateRegionMapPlayerIcon
movs r0, 0x5
movs r1, 0xA
bl sub_81240D4
bl CreateRegionMapCursor
bl sub_812454C
b _081CC77C
_081CC7AC:
@@ -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:
@@ -27683,7 +27683,7 @@ _081D4AF8:
movs r2, 0x80
orrs r1, r2
strb r1, [r0]
ldr r0, =gScriptFacing
ldr r0, =gSpecialVar_Facing
ldrh r0, [r0]
cmp r0, 0x2
beq _081D4B3A
@@ -29323,7 +29323,7 @@ _081D5854:
sub_81D58D8: @ 81D58D8
push {lr}
bl sub_80008E8
ldr r3, =gScriptResult
ldr r3, =gSpecialVar_Result
movs r0, 0
strh r0, [r3]
ldr r0, =gSaveBlock1Ptr
@@ -29381,7 +29381,7 @@ sub_81D5924: @ 81D5924
cmp r4, 0
beq _081D596C
_081D5952:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x2
strh r0, [r1]
b _081D59C0
@@ -29413,12 +29413,12 @@ _081D596C:
negs r0, r0
ands r0, r2
strb r0, [r1]
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r4, [r0]
b _081D59C0
.pool
_081D59BC:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r6, [r0]
_081D59C0:
pop {r3}
@@ -29444,7 +29444,7 @@ sub_81D59D0: @ 81D59D0
lsrs r5, r0, 24
cmp r5, 0
beq _081D59FC
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r3, [r0]
b _081D5A4E
.pool
@@ -29473,12 +29473,12 @@ _081D59FC:
adds r2, r0
ldr r0, [r2]
str r0, [r1]
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r5, [r0]
b _081D5A4E
.pool
_081D5A48:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
_081D5A4E:
@@ -29556,7 +29556,7 @@ sub_81D5AD0: @ 81D5AD0
negs r0, r0
ands r0, r1
strb r0, [r2]
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
b _081D5B20
.pool
@@ -29569,12 +29569,12 @@ _081D5B00:
negs r0, r0
ands r0, r1
strb r0, [r2]
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
b _081D5B20
.pool
_081D5B1C:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x2
_081D5B20:
strh r0, [r1]
@@ -29653,12 +29653,12 @@ sub_81D5BBC: @ 81D5BBC
movs r2, 0
movs r3, 0x1
bl ConvertIntToDecimalStringN
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
b _081D5BF0
.pool
_081D5BEC:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
_081D5BF0:
strh r0, [r1]
@@ -29672,7 +29672,7 @@ _081D5BF0:
sub_81D5C00: @ 81D5C00
push {lr}
bl sub_81D56B0
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
bl sub_81D5710
@@ -29721,12 +29721,12 @@ sub_81D5C5C: @ 81D5C5C
lsrs r1, r0, 24
cmp r1, 0
bne _081D5C74
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r1, [r0]
b _081D5C7A
.pool
_081D5C74:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
_081D5C7A:
@@ -30022,7 +30022,7 @@ _081D5E64:
movs r1, 0xF
ands r0, r1
strh r0, [r5, 0xE]
ldr r0, =gUnknown_082C83F0
ldr r0, =EventScript_2C83F0
str r0, [r5, 0x10]
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
@@ -30487,7 +30487,7 @@ _081D62A2:
thumb_func_start sub_81D62AC
sub_81D62AC: @ 81D62AC
ldr r0, =gUnknown_082C83F0
ldr r0, =EventScript_2C83F0
bx lr
.pool
thumb_func_end sub_81D62AC
@@ -30495,7 +30495,7 @@ sub_81D62AC: @ 81D62AC
thumb_func_start sub_81D62B4
sub_81D62B4: @ 81D62B4
push {lr}
ldr r0, =gScriptLastTalked
ldr r0, =gSpecialVar_LastTalked
ldrh r1, [r0]
movs r0, 0x5
bl sub_81D572C
@@ -30772,7 +30772,7 @@ _081D64D4:
thumb_func_start sub_81D64DC
sub_81D64DC: @ 81D64DC
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000ef9
@@ -30825,7 +30825,7 @@ sub_81D6534: @ 81D6534
cmp r0, 0x6
beq _081D6560
bl sub_81D5C00
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldrh r0, [r0]
cmp r0, 0
beq _081D6560
@@ -30851,12 +30851,12 @@ sub_81D6568: @ 81D6568
ands r0, r1
cmp r0, 0
beq _081D6590
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
b _081D6594
.pool
_081D6590:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
_081D6594:
strh r0, [r1]
asm/recorded_battle.s
+1 -1
View File
@@ -334,7 +334,7 @@ RecordedBattle_ReadBankAction: @ 8185054
cmp r0, 0xFF
bne _081850BC
_0818507A:
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
ldr r1, =gBattleOutcome
movs r0, 0x5
strb r0, [r1]
asm/region_map.s
-4288
View File
File diff suppressed because it is too large Load Diff
asm/rom4.s
+7 -7
View File
@@ -8,7 +8,7 @@
thumb_func_start sub_8084620
sub_8084620: @ 8084620
push {r4,lr}
ldr r0, =gUnknown_08271857
ldr r0, =EverGrandeCity_HallOfFame_EventScript_271857
bl ScriptContext2_RunNewScript
ldr r0, =gSaveBlock1Ptr
ldr r4, [r0]
@@ -64,7 +64,7 @@ sub_808469C: @ 808469C
bl FlagClear
ldr r0, =0x00000888
bl FlagClear
ldr r0, =gUnknown_08271862
ldr r0, =EverGrandeCity_HallOfFame_EventScript_271862
bl ScriptContext2_RunNewScript
pop {r0}
bx r0
@@ -419,7 +419,7 @@ get_mapdata_header: @ 80849A8
b _080849C6
.pool
_080849BC:
ldr r0, =gUnknown_08481DD4
ldr r0, =gMapAttributes
subs r1, 0x1
lsls r1, 2
adds r1, r0
@@ -535,7 +535,7 @@ _08084A8A:
get_mapheader_by_bank_and_number: @ 8084A90
lsls r0, 16
lsls r1, 16
ldr r2, =gUnknown_08486578
ldr r2, =gMapGroups
lsrs r0, 14
adds r0, r2
ldr r0, [r0]
@@ -841,7 +841,7 @@ sub_8084CCC: @ 8084CCC
sub sp, 0x4
lsls r0, 24
lsrs r0, 24
bl sub_8122CBC
bl GetHealLocationPointer
adds r4, r0, 0
cmp r4, 0
beq _08084CFA
@@ -885,7 +885,7 @@ Overworld_SetHealLocationWarp: @ 8084D1C
sub sp, 0x8
lsls r0, 24
lsrs r0, 24
bl sub_8122CBC
bl GetHealLocationPointer
adds r5, r0, 0
cmp r5, 0
beq _08084D50
@@ -1187,7 +1187,7 @@ sub_8084F6C: @ 8084F6C
sub sp, 0x8
lsls r0, 24
lsrs r0, 24
bl sub_8122CBC
bl GetHealLocationPointer
adds r5, r0, 0
cmp r5, 0
beq _08084FA0
asm/rom6.s
+44 -44
View File
@@ -31,7 +31,7 @@ npc_before_player_of_type: @ 8135424
ldrb r0, [r2, 0x5]
cmp r0, r5
bne _08135470
ldr r1, =gScriptLastTalked
ldr r1, =gSpecialVar_LastTalked
ldrb r0, [r2, 0x8]
strh r0, [r1]
movs r0, 0x1
@@ -262,7 +262,7 @@ sub_8135654: @ 8135654
lsls r0, 24
cmp r0, 0
beq _0813568C
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
bl brm_get_pokemon_selection
lsls r0, 24
lsrs r0, 24
@@ -307,7 +307,7 @@ sub_81356C4: @ 81356C4
lsls r0, 24
lsrs r0, 24
str r0, [r1]
ldr r0, =gUnknown_082907F0
ldr r0, =Route111_EventScript_2907F0
bl ScriptContext1_SetupScript
pop {r0}
bx r0
@@ -2136,11 +2136,11 @@ _081366B6:
_081366D0:
movs r0, 0x5
bl PlaySE
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldr r2, =0x0000ffff
adds r1, r2, 0
strh r1, [r0]
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
mov r1, r9
strh r1, [r0]
adds r0, r7, 0
@@ -2150,7 +2150,7 @@ _081366D0:
_081366F8:
movs r0, 0x5
bl PlaySE
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
strh r4, [r0]
adds r0, r7, 0
bl sub_8136938
@@ -2541,7 +2541,7 @@ sub_8136A50: @ 8136A50
sub_8136A74: @ 8136A74
push {lr}
ldr r2, =gSaveBlock1Ptr
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r1, [r0]
lsls r1, 3
ldr r0, =0x00000848
@@ -2586,7 +2586,7 @@ sub_8136AB4: @ 8136AB4
ldr r3, =gPokeblockNames
ldr r1, =gSaveBlock1Ptr
ldr r2, [r1]
ldr r1, =gScriptItemId
ldr r1, =gSpecialVar_ItemId
ldrh r1, [r1]
lsls r1, 3
adds r2, r1
@@ -2689,7 +2689,7 @@ sub_8136BC0: @ 8136BC0
ands r0, r1
cmp r0, 0
beq _08136C36
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrb r0, [r0]
bl sub_8136F68
movs r0, 0x5
@@ -2772,7 +2772,7 @@ sub_8136C8C: @ 8136C8C
lsls r0, 24
lsrs r0, 24
ldr r5, =gSaveBlock1Ptr
ldr r7, =gScriptItemId
ldr r7, =gSpecialVar_ItemId
ldrh r2, [r7]
lsls r2, 3
ldr r6, =0x00000848
@@ -2836,7 +2836,7 @@ sub_8136D2C: @ 8136D2C
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r5, =gScriptItemId
ldr r5, =gSpecialVar_ItemId
ldrb r0, [r5]
bl SafariZoneActivatePokeblockFeeder
ldr r0, =gStringVar1
@@ -2853,7 +2853,7 @@ sub_8136D2C: @ 8136D2C
adds r1, r3
ldr r1, [r1]
bl StringCopy
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldrh r0, [r5]
strh r0, [r1]
lsls r0, 24
@@ -2877,7 +2877,7 @@ sub_8136D90: @ 8136D90
lsrs r4, 24
ldr r6, =gSpecialVar_0x8004
ldr r0, =gSaveBlock1Ptr
ldr r5, =gScriptItemId
ldr r5, =gSpecialVar_ItemId
ldrh r1, [r5]
lsls r1, 3
ldr r2, =0x00000848
@@ -2888,7 +2888,7 @@ sub_8136D90: @ 8136D90
lsls r0, 24
lsrs r0, 24
strh r0, [r6]
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldrh r0, [r5]
strh r0, [r1]
lsls r0, 24
@@ -3333,7 +3333,7 @@ sub_81370FC: @ 81370FC
lsls r0, 24
cmp r0, 0
beq _08137134
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
bl brm_get_pokemon_selection
lsls r0, 24
lsrs r0, 24
@@ -3407,7 +3407,7 @@ sub_81371B4: @ 81371B4
bl PlaySE
ldr r0, =0x00000888
bl FlagSet
ldr r0, =gUnknown_082926F8
ldr r0, =EventScript_2926F8
bl ScriptContext1_SetupScript
pop {r0}
bx r0
@@ -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}
@@ -4899,7 +4899,7 @@ _08137E58:
lsls r0, 24
lsrs r4, r0, 24
_08137E5C:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r4, [r0]
pop {r4-r7}
pop {r0}
@@ -7214,7 +7214,7 @@ _081390E6:
cmp r0, 0xC
bne _0813913C
_08139128:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
b _0813914A
.pool
@@ -7224,7 +7224,7 @@ _0813913C:
lsrs r5, r0, 24
cmp r5, 0x5
bls _081390E6
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
_0813914A:
strh r0, [r1]
@@ -7673,7 +7673,7 @@ sub_81394D8: @ 81394D8
bl VarGet
lsls r0, 16
lsrs r0, 16
bl sub_8133EDC
bl GetStarterPokemon
lsls r0, 16
lsrs r6, r0, 16
bl CalculatePlayerPartyCount
@@ -8044,7 +8044,7 @@ _081397BE:
thumb_func_start sub_81397C4
sub_81397C4: @ 81397C4
push {r4,r5,lr}
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
ldrh r1, [r2]
ldr r0, =0x0000270f
cmp r1, r0
@@ -8123,7 +8123,7 @@ _08139862:
thumb_func_start sub_813986C
sub_813986C: @ 813986C
push {lr}
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldrh r0, [r0]
cmp r0, 0x4
bhi _081398B8
@@ -9381,7 +9381,7 @@ _0813A2BE:
strh r4, [r3, 0x26]
b _0813A2D2
_0813A2C6:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x7F
strh r0, [r1]
adds r0, r4, 0
@@ -9649,7 +9649,7 @@ sub_813A4EC: @ 813A4EC
b _0813A566
.pool
_0813A51C:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x7F
strh r0, [r1]
movs r0, 0x5
@@ -9657,7 +9657,7 @@ _0813A51C:
b _0813A54C
.pool
_0813A530:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r4, [r0]
movs r0, 0x5
bl PlaySE
@@ -10930,7 +10930,7 @@ task_deoxys_sound: @ 813AFDC
lsrs r0, 24
cmp r0, 0x1
bne _0813B004
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x3
b _0813B06A
.pool
@@ -10961,7 +10961,7 @@ _0813B004:
mov r0, r8
movs r1, 0
bl VarSet
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
b _0813B070
@@ -10971,7 +10971,7 @@ _0813B05C:
bne _0813B080
ldr r0, =0x000008d4
bl FlagSet
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x2
_0813B06A:
strh r0, [r1]
@@ -10991,7 +10991,7 @@ _0813B080:
ldr r0, =0x00004035
adds r1, r5, 0
bl VarSet
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
adds r0, r7, 0
@@ -11684,7 +11684,7 @@ _0813B62E:
ldrh r1, [r5]
cmp r1, 0x1
bne _0813B668
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r1, [r0]
b _0813B790
.pool
@@ -11698,7 +11698,7 @@ _0813B668:
ldrh r0, [r0]
cmp r0, 0x1
bne _0813B68C
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x2
b _0813B6AC
.pool
@@ -11710,12 +11710,12 @@ _0813B68C:
ldrh r0, [r0]
cmp r0, 0
bne _0813B6A8
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x3
b _0813B6AC
.pool
_0813B6A8:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
_0813B6AC:
strh r0, [r1]
@@ -11736,7 +11736,7 @@ _0813B6C2:
bl bitmask_all_link_players_but_self
lsls r0, 24
lsrs r0, 24
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r2, 0x2
bl SendBlock
b _0813B708
@@ -11751,7 +11751,7 @@ _0813B6E4:
lsls r0, 24
cmp r0, 0
beq _0813B790
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gBlockRecvBuffer
ldrh r0, [r0]
strh r0, [r1]
@@ -11773,20 +11773,20 @@ _0813B728:
lsls r0, 24
cmp r0, 0
bne _0813B74C
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldrh r0, [r0]
cmp r0, 0x2
bne _0813B790
ldr r0, =gUnknown_0824979B
ldr r0, =gText_YourPartnerHasRetired
bl ShowFieldAutoScrollMessage
b _0813B790
.pool
_0813B74C:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldrh r0, [r0]
cmp r0, 0x3
bne _0813B790
ldr r0, =gUnknown_0824979B
ldr r0, =gText_YourPartnerHasRetired
bl ShowFieldAutoScrollMessage
b _0813B790
.pool
@@ -12041,7 +12041,7 @@ _0813B94E:
thumb_func_start sub_813B968
sub_813B968: @ 813B968
push {r4,r5,lr}
ldr r5, =gScriptResult
ldr r5, =gSpecialVar_Result
ldr r0, =gSpecialVar_0x8004
ldrh r0, [r0]
movs r1, 0x7
asm/rom_8011DC0.s
+33 -33
View File
@@ -283,7 +283,7 @@ BerryBlenderLinkBecomeLeader: @ 801273C
movs r0, 0
strb r0, [r1, 0xC]
strb r0, [r1, 0xD]
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
strh r0, [r1]
pop {r0}
bx r0
@@ -1130,7 +1130,7 @@ _08012EE6:
bl EnableBothScriptContexts
adds r0, r4, 0
bl DestroyTask
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x5
strh r0, [r1]
b _08012F50
@@ -1139,7 +1139,7 @@ _08012EFC:
bl EnableBothScriptContexts
adds r0, r4, 0
bl DestroyTask
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x8
strh r0, [r1]
b _08012F50
@@ -1808,7 +1808,7 @@ BerryBlenderLinkJoinGroup: @ 80134A4
movs r0, 0
strb r0, [r1, 0x8]
strb r0, [r1, 0x9]
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
strh r0, [r1]
pop {r0}
bx r0
@@ -2433,13 +2433,13 @@ _08013AE4:
lsls r0, 24
cmp r0, 0
beq _08013B82
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
movs r1, 0x6
b _08013B58
.pool
_08013B14:
bl sub_800E084
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
movs r1, 0x5
b _08013B58
.pool
@@ -2465,7 +2465,7 @@ _08013B4A:
lsls r0, 24
cmp r0, 0
beq _08013B82
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
movs r1, 0x8
_08013B58:
strh r1, [r0]
@@ -3783,7 +3783,7 @@ _0801474C:
_08014764:
adds r0, r4, 0
bl DestroyTask
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
ldr r0, =gUnknown_02022C2C
@@ -3839,7 +3839,7 @@ _080147CC:
.4byte _08014992
.4byte _0801499C
_080147F0:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
ldr r0, =gUnknown_02022C2C
@@ -3983,7 +3983,7 @@ _0801494A:
bl sub_80B2AF4
cmp r0, 0
beq _08014980
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
movs r1, 0xB
strh r1, [r0]
movs r0, 0x7
@@ -4074,7 +4074,7 @@ sub_8014A00: @ 8014A00
strb r2, [r1, 0xC]
strb r2, [r1, 0xD]
strb r4, [r1, 0x18]
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r2, [r0]
pop {r4}
pop {r0}
@@ -4534,7 +4534,7 @@ _08014E4E:
beq _08014EF2
adds r0, r4, 0
bl DestroyTask
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x5
strh r0, [r1]
b _08014EF2
@@ -4623,7 +4623,7 @@ sub_8014EFC: @ 8014EFC
strb r2, [r1, 0x9]
subs r4, 0x15
strb r4, [r1, 0x12]
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r2, [r0]
pop {r4}
pop {r0}
@@ -4964,7 +4964,7 @@ _0801526A:
adds r0, r6, 0
bl DestroyTask
bl sub_800EDD4
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x5
strh r0, [r1]
b _080152A0
@@ -5012,7 +5012,7 @@ sub_80152A8: @ 80152A8
strb r2, [r1, 0x9]
subs r4, 0x15
strb r4, [r1, 0x12]
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r2, [r0]
pop {r4}
pop {r0}
@@ -5336,7 +5336,7 @@ _080155C2:
adds r0, r4, 0
bl DestroyTask
bl sub_800EDD4
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x5
strh r0, [r1]
b _08015604
@@ -5380,7 +5380,7 @@ UnionRoomSpecial: @ 801560C
strb r1, [r0, 0x16]
strh r1, [r0, 0x10]
strh r1, [r0, 0x12]
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r1, [r0]
movs r0, 0xD0
movs r1, 0x1
@@ -5623,7 +5623,7 @@ _08015878:
ldr r0, [r6, 0xC]
movs r1, 0x4
bl sub_80175EC
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
movs r0, 0x3
@@ -5725,7 +5725,7 @@ _080159A0:
movs r0, 0x4
bl _08016876
_080159A6:
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
ldrh r0, [r4]
cmp r0, 0
beq _08015A0A
@@ -7308,7 +7308,7 @@ var_800D_set_xB: @ 8016884
bl InUnionRoom
cmp r0, 0x1
bne _08016894
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0xB
strh r0, [r1]
_08016894:
@@ -12730,7 +12730,7 @@ _0801940C:
b _08019922
.pool
_0801942C:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldrh r0, [r0]
cmp r0, 0x5
beq _08019436
@@ -13231,7 +13231,7 @@ _080197F8:
b _08019922
.pool
_08019810:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldrh r0, [r0]
cmp r0, 0x5
beq _0801981A
@@ -21691,7 +21691,7 @@ _0801DC10:
thumb_func_start sub_801DC20
sub_801DC20: @ 801DC20
push {r4-r6,lr}
ldr r6, =gScriptResult
ldr r6, =gSpecialVar_Result
bl sub_801B044
adds r4, r0, 0
bl IsMysteryEventEnabled
@@ -27844,7 +27844,7 @@ _08020D74:
sub_8020D8C: @ 8020D8C
push {r4,lr}
sub sp, 0xC
ldr r1, =gScriptItemId
ldr r1, =gSpecialVar_ItemId
ldrh r0, [r1]
subs r0, 0x85
lsls r0, 16
@@ -27865,7 +27865,7 @@ _08020DB0:
ldrb r0, [r2, 0x8]
lsls r0, 5
adds r0, r2, r0
ldr r1, =gScriptItemId
ldr r1, =gSpecialVar_ItemId
ldrh r1, [r1]
subs r1, 0x85
adds r0, 0xA4
@@ -34261,7 +34261,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
@@ -41429,7 +41429,7 @@ sub_8027A48: @ 8027A48
sub_8027A5C: @ 8027A5C
push {r4-r6,lr}
movs r5, 0
ldr r6, =gScriptResult
ldr r6, =gSpecialVar_Result
_08027A62:
movs r0, 0x64
adds r1, r5, 0
@@ -41454,7 +41454,7 @@ _08027A94:
adds r5, 0x1
cmp r5, 0x5
ble _08027A62
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
_08027AA0:
@@ -46351,7 +46351,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]
@@ -51101,7 +51101,7 @@ _0802C924:
bl sub_802C908
cmp r0, 0
beq _0802C95C
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
b _0802C966
.pool
@@ -51109,7 +51109,7 @@ _0802C95C:
adds r5, 0x1
cmp r5, 0x5
ble _0802C924
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
_0802C966:
strh r0, [r1]
@@ -51243,7 +51243,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]
@@ -52594,7 +52594,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/script_menu.s
+15 -15
View File
@@ -24,7 +24,7 @@ ScriptMenu_Multichoice: @ 80E1E08
lsrs r0, 24
cmp r0, 0x1
beq _080E1E4C
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
movs r1, 0xFF
strh r1, [r0]
movs r0, 0
@@ -70,7 +70,7 @@ ScriptMenu_MultichoiceWithDefault: @ 80E1E58
lsrs r0, 24
cmp r0, 0x1
beq _080E1EA8
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0xFF
strh r0, [r1]
str r4, [sp]
@@ -358,13 +358,13 @@ _080E20B8:
bne _080E20FC
movs r0, 0x5
bl PlaySE
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x7F
strh r0, [r1]
b _080E20EC
.pool
_080E20E8:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r1, [r0]
_080E20EC:
ldrb r0, [r5, 0xC]
@@ -389,7 +389,7 @@ ScriptMenu_YesNo: @ 80E2108
lsrs r0, 24
cmp r0, 0x1
beq _080E2138
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0xFF
strh r0, [r1]
bl sub_8197930
@@ -410,7 +410,7 @@ _080E213A:
thumb_func_start sub_80E2140
sub_80E2140: @ 80E2140
push {lr}
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldrh r0, [r0]
cmp r0, 0xFF
beq _080E2154
@@ -465,12 +465,12 @@ _080E219C:
_080E21A4:
movs r0, 0x5
bl PlaySE
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
b _080E21B8
.pool
_080E21B4:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
_080E21B8:
strh r0, [r1]
@@ -517,7 +517,7 @@ ScriptMenu_MultichoiceGrid: @ 80E21D0
b _080E22E8
.pool
_080E2210:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
movs r1, 0xFF
strh r1, [r0]
movs r2, 0
@@ -655,13 +655,13 @@ sub_80E2308: @ 80E2308
bne _080E2360
movs r0, 0x5
bl PlaySE
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x7F
strh r0, [r1]
b _080E2350
.pool
_080E234C:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r1, [r0]
_080E2350:
ldrb r0, [r5, 0xC]
@@ -686,7 +686,7 @@ sp109_CreatePCMenu: @ 80E236C
lsrs r0, 24
cmp r0, 0x1
beq _080E2394
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0xFF
strh r0, [r1]
bl CreatePCMenu
@@ -893,7 +893,7 @@ sub_80E2548: @ 80E2548
lsrs r0, 24
cmp r0, 0x1
beq _080E2570
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0xFF
strh r0, [r1]
bl sub_80E2578
@@ -1266,7 +1266,7 @@ _080E2860:
thumb_func_start sub_80E2878
sub_80E2878: @ 80E2878
push {lr}
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
ldrh r0, [r2]
cmp r0, 0x7F
beq _080E288C
@@ -1648,7 +1648,7 @@ sp106_CreateStartMenu: @ 80E2B7C
lsrs r0, 24
cmp r0, 0x1
beq _080E2BA4
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0xFF
strh r0, [r1]
bl CreateStartMenu
asm/script_pokemon_util_80F87D8.s
+12 -12
View File
@@ -83,7 +83,7 @@ sub_80F8850: @ 80F8850
thumb_func_start sub_80F8864
sub_80F8864: @ 80F8864
push {lr}
ldr r0, =gScriptContestCategory
ldr r0, =gSpecialVar_ContestCategory
ldrh r0, [r0]
cmp r0, 0x4
bhi _080F88A4
@@ -157,7 +157,7 @@ sub_80F88E8: @ 80F88E8
ldrb r0, [r0]
cmp r0, 0
bne _080F8930
ldr r0, =gUnknown_02039F2E
ldr r0, =gSpecialVar_ContestRank
ldrh r0, [r0]
cmp r0, 0x3
bne _080F8930
@@ -601,7 +601,7 @@ sub_80F8C7C: @ 80F8C7C
ldrb r0, [r0]
cmp r0, 0
bne _080F8D18
ldr r0, =gUnknown_02039F2E
ldr r0, =gSpecialVar_ContestRank
ldrh r0, [r0]
cmp r0, 0x3
bne _080F8D18
@@ -952,7 +952,7 @@ sub_80F8FA0: @ 80F8FA0
ands r0, r1
cmp r0, 0
bne _080F8FD8
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
@@ -960,7 +960,7 @@ sub_80F8FA0: @ 80F8FA0
b _080F8FDE
.pool
_080F8FD8:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x4
strh r0, [r1]
_080F8FDE:
@@ -987,11 +987,11 @@ sub_80F8FE8: @ 80F8FE8
adds r0, r1
str r0, [r2]
lsrs r0, 16
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
b _080F902A
.pool
_080F9020:
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
bl Random
lsls r0, 16
lsrs r0, 16
@@ -1376,7 +1376,7 @@ _080F9310:
cmp r1, 0x2
bne _080F9318
_080F9314:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r1, [r0]
_080F9318:
pop {r0}
@@ -1550,12 +1550,12 @@ sub_80F9460: @ 80F9460
ldrb r1, [r0]
cmp r1, 0
bne _080F9478
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r1, [r0]
b _080F947E
.pool
_080F9478:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
_080F947E:
@@ -1590,12 +1590,12 @@ sub_80F94B8: @ 80F94B8
ldrb r1, [r0]
cmp r1, 0
bne _080F94D0
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r1, [r0]
b _080F94D6
.pool
_080F94D0:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
_080F94D6:
asm/start_menu.s
+6 -6
View File
@@ -868,7 +868,7 @@ _0809FF00:
bl sub_8197DF8
bl sub_80984F4
bl ScriptContext2_Disable
ldr r0, =gUnknown_08252C88
ldr r0, =BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88
bl ScriptContext1_SetupScript
movs r0, 0x1
b _0809FF22
@@ -974,13 +974,13 @@ task50_save_game: @ 809FFD0
_0809FFEC:
cmp r1, 0x3
bgt _080A0000
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
b _080A0000
.pool
_0809FFFC:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r1, [r0]
_080A0000:
adds r0, r4, 0
@@ -1089,7 +1089,7 @@ sub_80A00A0: @ 80A00A0
lsls r0, 24
cmp r0, 0
beq _080A00D4
ldr r0, =gUnknown_08252CA7
ldr r0, =BattleFrontier_BattlePyramidEmptySquare_Text_252CA7
ldr r1, =sub_80A00EC
bl sub_809FF98
b _080A00DC
@@ -1415,7 +1415,7 @@ sub_80A035C: @ 80A035C
movs r1, 0
bl sub_819746C
bl remove_start_menu_window_maybe
ldr r0, =gUnknown_08252CFB
ldr r0, =BattleFrontier_BattlePyramidEmptySquare_Text_252CFB
ldr r1, =sub_80A0388
bl sub_809FF98
movs r0, 0
@@ -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/starter_choose.s
-985
View File
@@ -1,985 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_8133EDC
sub_8133EDC: @ 8133EDC
push {lr}
lsls r0, 16
lsrs r1, r0, 16
cmp r1, 0x3
bls _08133EE8
movs r1, 0
_08133EE8:
ldr r0, =gUnknown_085B1DF8
lsls r1, 1
adds r1, r0
ldrh r0, [r1]
pop {r1}
bx r1
.pool
thumb_func_end sub_8133EDC
thumb_func_start sub_8133EF8
sub_8133EF8: @ 8133EF8
push {lr}
bl LoadOam
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_8133EF8
thumb_func_start set_256color_bg_bg0
set_256color_bg_bg0: @ 8133F0C
push {r4-r6,lr}
mov r6, r10
mov r5, r9
mov r4, r8
push {r4-r6}
sub sp, 0xC
movs r0, 0
bl SetVBlankCallback
movs r0, 0
movs r1, 0
bl SetGpuReg
movs r0, 0xE
movs r1, 0
bl SetGpuReg
movs r0, 0xC
movs r1, 0
bl SetGpuReg
movs r0, 0xA
movs r1, 0
bl SetGpuReg
movs r0, 0x8
movs r1, 0
bl SetGpuReg
movs r0, 0
movs r1, 0
movs r2, 0
bl ChangeBgX
movs r0, 0
movs r1, 0
movs r2, 0
bl ChangeBgY
movs r0, 0x1
movs r1, 0
movs r2, 0
bl ChangeBgX
movs r0, 0x1
movs r1, 0
movs r2, 0
bl ChangeBgY
movs r0, 0x2
movs r1, 0
movs r2, 0
bl ChangeBgX
movs r0, 0x2
movs r1, 0
movs r2, 0
bl ChangeBgY
movs r0, 0x3
movs r1, 0
movs r2, 0
bl ChangeBgX
movs r0, 0x3
movs r1, 0
movs r2, 0
bl ChangeBgY
add r1, sp, 0x4
movs r0, 0
strh r0, [r1]
ldr r2, =0x040000d4
str r1, [r2]
movs r1, 0xC0
lsls r1, 19
str r1, [r2, 0x4]
ldr r0, =0x8100c000
str r0, [r2, 0x8]
ldr r0, [r2, 0x8]
movs r0, 0
mov r9, r0
str r0, [sp, 0x8]
add r0, sp, 0x8
str r0, [r2]
movs r0, 0xE0
lsls r0, 19
str r0, [r2, 0x4]
ldr r0, =0x85000100
str r0, [r2, 0x8]
ldr r0, [r2, 0x8]
add r0, sp, 0x4
mov r3, r9
strh r3, [r0]
str r0, [r2]
movs r0, 0xA0
lsls r0, 19
str r0, [r2, 0x4]
ldr r0, =0x81000200
str r0, [r2, 0x8]
ldr r0, [r2, 0x8]
ldr r0, =gBirchHelpGfx
bl LZ77UnCompVram
ldr r0, =gBirchBagTilemap
ldr r1, =0x06003000
bl LZ77UnCompVram
ldr r0, =gBirchGrassTilemap
ldr r1, =0x06003800
bl LZ77UnCompVram
movs r0, 0
bl ResetBgsAndClearDma3BusyFlags
ldr r1, =gUnknown_085B1E00
movs r0, 0
movs r2, 0x3
bl InitBgsFromTemplates
ldr r0, =gUnknown_085B1DCC
bl InitWindows
bl DeactivateAllTextPrinters
movs r1, 0xAA
lsls r1, 2
movs r0, 0
movs r2, 0xD0
bl sub_809882C
bl clear_scheduled_bg_copies_to_vram
bl remove_some_task
bl ResetTasks
bl ResetSpriteData
bl ResetPaletteFade
bl FreeAllSpritePalettes
bl dp13_810BB8C
bl sub_8098C64
movs r1, 0xE0
movs r2, 0x20
bl LoadPalette
ldr r0, =gBirchBagGrassPal
movs r1, 0
movs r2, 0x40
bl LoadPalette
ldr r0, =gUnknown_085B1ED8
bl LoadCompressedObjectPic
ldr r0, =gUnknown_085B1EE8
bl LoadCompressedObjectPic
ldr r0, =gUnknown_085B1EF8
bl LoadSpritePalettes
movs r0, 0x1
negs r0, r0
mov r1, r9
str r1, [sp]
movs r1, 0
movs r2, 0x10
movs r3, 0
bl BeginNormalPaletteFade
movs r0, 0x1
bl EnableInterrupts
ldr r0, =sub_8133EF8
bl SetVBlankCallback
ldr r0, =sub_81341E0
bl SetMainCallback2
movs r0, 0x48
movs r1, 0x3F
bl SetGpuReg
movs r0, 0x4A
movs r1, 0x1F
bl SetGpuReg
movs r0, 0x40
movs r1, 0
bl SetGpuReg
movs r0, 0x44
movs r1, 0
bl SetGpuReg
movs r0, 0x50
movs r1, 0xFE
bl SetGpuReg
movs r0, 0x52
movs r1, 0
bl SetGpuReg
movs r0, 0x54
movs r1, 0x7
bl SetGpuReg
movs r1, 0xC1
lsls r1, 6
movs r0, 0
bl SetGpuReg
movs r0, 0
bl ShowBg
movs r0, 0x2
bl ShowBg
movs r0, 0x3
bl ShowBg
ldr r0, =sub_81341FC
movs r1, 0
bl CreateTask
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
adds r0, r1
movs r3, 0x1
mov r10, r3
mov r1, r10
strh r1, [r0, 0x8]
ldr r0, =gUnknown_085B1F10
movs r1, 0x78
movs r2, 0x38
movs r3, 0x2
bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r3, =gSprites
mov r8, r3
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
add r1, r8
strh r4, [r1, 0x2E]
ldr r6, =gUnknown_085B1F28
ldr r5, =gUnknown_085B1DEC
ldrb r1, [r5]
ldrb r2, [r5, 0x1]
adds r0, r6, 0
movs r3, 0x2
bl CreateSprite
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
add r1, r8
strh r4, [r1, 0x2E]
mov r0, r9
strh r0, [r1, 0x30]
ldrb r1, [r5, 0x2]
ldrb r2, [r5, 0x3]
adds r0, r6, 0
movs r3, 0x2
bl CreateSprite
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
add r1, r8
strh r4, [r1, 0x2E]
mov r3, r10
strh r3, [r1, 0x30]
ldrb r1, [r5, 0x4]
ldrb r2, [r5, 0x5]
adds r0, r6, 0
movs r3, 0x2
bl CreateSprite
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
add r1, r8
strh r4, [r1, 0x2E]
movs r0, 0x2
strh r0, [r1, 0x30]
ldr r1, =gUnknown_030011F8
movs r0, 0xFF
strh r0, [r1]
add sp, 0xC
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end set_256color_bg_bg0
thumb_func_start sub_81341E0
sub_81341E0: @ 81341E0
push {lr}
bl RunTasks
bl AnimateSprites
bl BuildOamBuffer
bl do_scheduled_bg_tilemap_copies_to_vram
bl UpdatePaletteFade
pop {r0}
bx r0
thumb_func_end sub_81341E0
thumb_func_start sub_81341FC
sub_81341FC: @ 81341FC
push {r4,lr}
sub sp, 0xC
lsls r0, 24
lsrs r0, 24
ldr r1, =gTasks
lsls r4, r0, 2
adds r4, r0
lsls r4, 3
adds r4, r1
ldrb r0, [r4, 0x8]
bl sub_81344C8
movs r2, 0xAA
lsls r2, 2
movs r0, 0
movs r1, 0
movs r3, 0xD
bl SetWindowBorderStyle
ldr r2, =gText_BirchInTrouble
movs r0, 0x1
str r0, [sp]
movs r0, 0
str r0, [sp, 0x4]
str r0, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
movs r0, 0
bl PutWindowTilemap
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
ldr r0, =sub_813425C
str r0, [r4]
add sp, 0xC
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_81341FC
thumb_func_start sub_813425C
sub_813425C: @ 813425C
push {r4-r7,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r2, =gTasks
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
adds r6, r0, r2
ldrh r7, [r6, 0x8]
ldrb r4, [r6, 0x8]
ldr r1, =gMain
ldrh r3, [r1, 0x2E]
movs r0, 0x1
ands r0, r3
cmp r0, 0
beq _081342F8
bl sub_8134604
ldr r0, =gUnknown_085B1F40
ldr r1, =gUnknown_085B1DEC
lsls r2, r4, 1
adds r3, r2, r1
ldrb r5, [r3]
adds r1, 0x1
adds r2, r1
ldrb r4, [r2]
adds r1, r5, 0
adds r2, r4, 0
movs r3, 0x1
bl CreateSprite
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0xC]
ldrh r0, [r6, 0x8]
bl sub_8133EDC
lsls r0, 16
lsrs r0, 16
adds r1, r5, 0
adds r2, r4, 0
bl sub_8134690
lsls r0, 24
lsrs r0, 24
ldr r4, =gSprites
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
adds r2, r4, 0
adds r2, 0x10
adds r2, r1, r2
ldr r3, =gUnknown_085B1ED0
str r3, [r2]
adds r4, 0x1C
adds r1, r4
ldr r2, =sub_8134774
str r2, [r1]
strh r0, [r6, 0xA]
ldr r0, =sub_8134340
str r0, [r6]
b _08134334
.pool
_081342F8:
movs r0, 0x20
ands r0, r3
cmp r0, 0
beq _08134314
cmp r4, 0
beq _08134314
subs r0, r7, 0x1
strh r0, [r6, 0x8]
ldr r0, =sub_8134640
str r0, [r6]
b _08134334
.pool
_08134314:
ldrh r1, [r1, 0x2E]
movs r0, 0x10
ands r0, r1
cmp r0, 0
beq _08134334
cmp r4, 0x1
bhi _08134334
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
adds r0, r2
ldrh r1, [r0, 0x8]
adds r1, 0x1
strh r1, [r0, 0x8]
ldr r1, =sub_8134640
str r1, [r0]
_08134334:
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_813425C
thumb_func_start sub_8134340
sub_8134340: @ 8134340
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r3, =gSprites
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r2, r1, r2
movs r0, 0xC
ldrsh r1, [r2, r0]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r1, r0, r3
adds r0, r1, 0
adds r0, 0x3F
ldrb r0, [r0]
lsls r0, 26
cmp r0, 0
bge _0813437E
movs r3, 0x20
ldrsh r0, [r1, r3]
cmp r0, 0x78
bne _0813437E
movs r3, 0x22
ldrsh r0, [r1, r3]
cmp r0, 0x40
bne _0813437E
ldr r0, =sub_8134390
str r0, [r2]
_0813437E:
pop {r0}
bx r0
.pool
thumb_func_end sub_8134340
thumb_func_start sub_8134390
sub_8134390: @ 8134390
push {r4,lr}
sub sp, 0xC
lsls r0, 24
lsrs r0, 24
ldr r1, =gTasks
lsls r4, r0, 2
adds r4, r0
lsls r4, 3
adds r4, r1
ldrh r0, [r4, 0x8]
bl sub_8133EDC
lsls r0, 16
lsrs r0, 16
movs r1, 0
bl PlayCry1
movs r0, 0
movs r1, 0x11
bl FillWindowPixelBuffer
ldr r2, =gText_ConfirmStarterChoice
movs r0, 0x1
str r0, [sp]
movs r0, 0
str r0, [sp, 0x4]
str r0, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
ldr r0, =gUnknown_085B1DDC
movs r1, 0xAA
lsls r1, 2
movs r2, 0xD
movs r3, 0
bl CreateYesNoMenu
ldr r0, =sub_8134400
str r0, [r4]
add sp, 0xC
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_8134390
thumb_func_start sub_8134400
sub_8134400: @ 8134400
push {r4-r6,lr}
lsls r0, 24
lsrs r4, r0, 24
bl sub_8198C58
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
beq _08134426
cmp r1, 0
bgt _08134420
movs r0, 0x1
negs r0, r0
cmp r1, r0
beq _08134450
b _0813449A
_08134420:
cmp r1, 0x1
beq _08134450
b _0813449A
_08134426:
ldr r2, =gScriptResult
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
adds r0, r1
ldrh r0, [r0, 0x8]
strh r0, [r2]
bl dp13_810BB8C
ldr r0, =gMain
ldr r0, [r0, 0x8]
bl SetMainCallback2
b _0813449A
.pool
_08134450:
movs r0, 0x5
bl PlaySE
ldr r0, =gTasks
lsls r5, r4, 2
adds r5, r4
lsls r5, 3
adds r5, r0
ldrb r4, [r5, 0xA]
ldr r6, =gSprites
lsls r0, r4, 4
adds r0, r4
lsls r0, 2
adds r0, r6
ldrb r0, [r0, 0x3]
lsls r0, 26
lsrs r0, 27
bl FreeOamMatrix
adds r0, r4, 0
bl sub_818D820
ldrb r0, [r5, 0xC]
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
adds r4, r6
ldrb r0, [r4, 0x3]
lsls r0, 26
lsrs r0, 27
bl FreeOamMatrix
adds r0, r4, 0
bl DestroySprite
ldr r0, =sub_81344AC
str r0, [r5]
_0813449A:
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_8134400
thumb_func_start sub_81344AC
sub_81344AC: @ 81344AC
lsls r0, 24
lsrs r0, 24
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r1, r2
ldr r0, =sub_81341FC
str r0, [r1]
bx lr
.pool
thumb_func_end sub_81344AC
thumb_func_start sub_81344C8
sub_81344C8: @ 81344C8
push {r4-r6,lr}
mov r6, r10
mov r5, r9
mov r4, r8
push {r4-r6}
sub sp, 0x34
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
adds r0, r5, 0
bl sub_8133EDC
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r4, 0
bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r0, 16
add r1, sp, 0xC
bl sub_81DB468
movs r0, 0xB
adds r1, r4, 0
muls r1, r0
mov r9, r1
ldr r0, =gSpeciesNames
add r9, r0
ldr r0, =gUnknown_085B1DE4
ldr r1, [r0, 0x4]
ldr r0, [r0]
str r0, [sp, 0x2C]
str r1, [sp, 0x30]
ldr r3, =gUnknown_085B1DF2
lsls r5, 1
adds r2, r5, r3
mov r10, r2
ldrb r0, [r2]
lsls r0, 8
ldr r1, =0xffff00ff
ldr r2, [sp, 0x2C]
ands r2, r1
orrs r2, r0
str r2, [sp, 0x2C]
adds r3, 0x1
adds r5, r3
ldrb r1, [r5]
lsls r1, 16
ldr r0, =0xff00ffff
ands r0, r2
orrs r0, r1
str r0, [sp, 0x2C]
add r0, sp, 0x2C
bl AddWindow
ldr r4, =gUnknown_030011F8
strh r0, [r4]
lsls r0, 24
lsrs r0, 24
movs r1, 0
bl FillWindowPixelBuffer
movs r0, 0x7
add r1, sp, 0xC
movs r2, 0x68
bl GetStringCenterAlignXOffset
adds r2, r0, 0
ldrb r0, [r4]
lsls r2, 24
lsrs r2, 24
ldr r1, =gUnknown_085B1E0C
mov r8, r1
str r1, [sp]
movs r6, 0
str r6, [sp, 0x4]
add r1, sp, 0xC
str r1, [sp, 0x8]
movs r1, 0x7
movs r3, 0x1
bl box_print
movs r0, 0x1
mov r1, r9
movs r2, 0x68
bl GetStringCenterAlignXOffset
adds r2, r0, 0
ldrb r0, [r4]
lsls r2, 24
lsrs r2, 24
mov r1, r8
str r1, [sp]
str r6, [sp, 0x4]
mov r1, r9
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0x11
bl box_print
ldrb r0, [r4]
bl PutWindowTilemap
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
mov r2, r10
ldrb r1, [r2]
lsls r0, r1, 27
movs r2, 0xFC
lsls r2, 24
adds r0, r2
adds r1, 0xD
lsls r1, 3
adds r1, 0x4
lsls r1, 24
ldrb r4, [r5]
lsls r5, r4, 27
lsrs r5, 24
adds r4, 0x4
lsls r4, 27
lsrs r4, 24
lsrs r1, 8
orrs r1, r0
lsrs r1, 16
movs r0, 0x40
bl SetGpuReg
lsls r5, 8
orrs r5, r4
movs r0, 0x44
adds r1, r5, 0
bl SetGpuReg
add sp, 0x34
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_81344C8
thumb_func_start sub_8134604
sub_8134604: @ 8134604
push {r4,lr}
ldr r4, =gUnknown_030011F8
ldrb r0, [r4]
movs r1, 0
bl FillWindowPixelBuffer
ldrb r0, [r4]
bl ClearWindowTilemap
ldrb r0, [r4]
bl RemoveWindow
movs r0, 0xFF
strh r0, [r4]
movs r0, 0x40
movs r1, 0
bl SetGpuReg
movs r0, 0x44
movs r1, 0
bl SetGpuReg
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_8134604
thumb_func_start sub_8134640
sub_8134640: @ 8134640
push {r4,lr}
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
bl sub_8134604
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
adds r0, r1
ldr r1, =sub_8134668
str r1, [r0]
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_8134640
thumb_func_start sub_8134668
sub_8134668: @ 8134668
push {r4,lr}
lsls r0, 24
lsrs r0, 24
ldr r1, =gTasks
lsls r4, r0, 2
adds r4, r0
lsls r4, 3
adds r4, r1
ldrb r0, [r4, 0x8]
bl sub_81344C8
ldr r0, =sub_813425C
str r0, [r4]
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_8134668
thumb_func_start sub_8134690
sub_8134690: @ 8134690
push {lr}
sub sp, 0x10
lsls r0, 16
lsrs r0, 16
lsls r1, 24
lsrs r1, 24
lsls r2, 24
lsrs r2, 24
str r1, [sp]
str r2, [sp, 0x4]
movs r1, 0xE
str r1, [sp, 0x8]
ldr r1, =0x0000ffff
str r1, [sp, 0xC]
movs r1, 0x8
movs r2, 0
movs r3, 0x1
bl sub_818D3E4
lsls r0, 24
lsrs r0, 24
ldr r1, =gSprites
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
adds r2, r1
ldrb r3, [r2, 0x5]
movs r1, 0xD
negs r1, r1
ands r1, r3
strb r1, [r2, 0x5]
add sp, 0x10
pop {r1}
bx r1
.pool
thumb_func_end sub_8134690
thumb_func_start sub_81346DC
sub_81346DC: @ 81346DC
push {r4,lr}
adds r4, r0, 0
ldr r2, =gUnknown_085B1E28
ldr r3, =gTasks
movs r0, 0x2E
ldrsh r1, [r4, r0]
lsls r0, r1, 2
adds r0, r1
lsls r0, 3
adds r0, r3
movs r1, 0x8
ldrsh r0, [r0, r1]
lsls r0, 1
adds r0, r2
ldrb r0, [r0]
strh r0, [r4, 0x20]
movs r0, 0x2E
ldrsh r1, [r4, r0]
lsls r0, r1, 2
adds r0, r1
lsls r0, 3
adds r0, r3
movs r1, 0x8
ldrsh r0, [r0, r1]
lsls r0, 1
adds r2, 0x1
adds r0, r2
ldrb r0, [r0]
strh r0, [r4, 0x22]
movs r1, 0x30
ldrsh r0, [r4, r1]
movs r1, 0x8
bl Sin
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x30]
lsls r0, 24
lsrs r0, 24
adds r0, 0x4
strh r0, [r4, 0x30]
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_81346DC
thumb_func_start sub_813473C
sub_813473C: @ 813473C
push {lr}
adds r3, r0, 0
ldr r2, =gTasks
movs r0, 0x2E
ldrsh r1, [r3, r0]
lsls r0, r1, 2
adds r0, r1
lsls r0, 3
adds r0, r2
movs r2, 0x8
ldrsh r1, [r0, r2]
movs r2, 0x30
ldrsh r0, [r3, r2]
cmp r1, r0
bne _08134768
adds r0, r3, 0
movs r1, 0x1
bl StartSpriteAnimIfDifferent
b _08134770
.pool
_08134768:
adds r0, r3, 0
movs r1, 0
bl StartSpriteAnimIfDifferent
_08134770:
pop {r0}
bx r0
thumb_func_end sub_813473C
thumb_func_start sub_8134774
sub_8134774: @ 8134774
push {lr}
adds r1, r0, 0
ldrh r2, [r1, 0x20]
movs r3, 0x20
ldrsh r0, [r1, r3]
cmp r0, 0x78
ble _08134786
subs r0, r2, 0x4
strh r0, [r1, 0x20]
_08134786:
ldrh r2, [r1, 0x20]
movs r3, 0x20
ldrsh r0, [r1, r3]
cmp r0, 0x77
bgt _08134794
adds r0, r2, 0x4
strh r0, [r1, 0x20]
_08134794:
ldrh r2, [r1, 0x22]
movs r3, 0x22
ldrsh r0, [r1, r3]
cmp r0, 0x40
ble _081347A2
subs r0, r2, 0x2
strh r0, [r1, 0x22]
_081347A2:
ldrh r2, [r1, 0x22]
movs r3, 0x22
ldrsh r0, [r1, r3]
cmp r0, 0x3F
bgt _081347B0
adds r0, r2, 0x2
strh r0, [r1, 0x22]
_081347B0:
pop {r0}
bx r0
thumb_func_end sub_8134774
.align 2, 0 @ Don't pad with nop.
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
asm/trader.s
+4 -4
View File
@@ -335,7 +335,7 @@ _08133CCA:
sub_8133CD8: @ 8133CD8
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r2, =0x00002e59
adds r0, r2
ldrb r0, [r0]
@@ -348,7 +348,7 @@ sub_8133CD8: @ 8133CD8
sub_8133CF4: @ 8133CF4
push {r4,r5,lr}
movs r4, 0
ldr r5, =gScriptResult
ldr r5, =gSpecialVar_Result
_08133CFA:
adds r0, r4, 0
bl CountDecorationCategoryN
@@ -365,7 +365,7 @@ _08133D10:
lsrs r4, r0, 24
cmp r4, 0x7
bls _08133CFA
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
_08133D20:
@@ -378,7 +378,7 @@ _08133D20:
thumb_func_start sub_8133D2C
sub_8133D2C: @ 8133D2C
push {r4-r6,lr}
ldr r6, =gScriptResult
ldr r6, =gSpecialVar_Result
movs r0, 0
strh r0, [r6]
ldr r4, =gDecorations
asm/trainer_see.s
+2 -2
View File
@@ -1300,7 +1300,7 @@ sub_80B45D0: @ 80B45D0
bne _080B460C
adds r0, 0x1
strb r0, [r1]
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
bl UnfreezeMapObjects
@@ -1313,7 +1313,7 @@ _080B460C:
movs r0, 0
strb r0, [r1]
_080B4610:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
_080B4616:
asm/use_pokeblock.s
+1 -1
View File
@@ -1016,7 +1016,7 @@ _08166BB6:
lsls r0, 24
cmp r0, 0
bne _08166BDA
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrb r0, [r0]
bl sub_8136F68
ldr r0, =sub_8166BEC
asm/wallclock.s
+1 -1
View File
@@ -153,7 +153,7 @@ _081348FC:
movs r2, 0x20
bl LoadPalette
_08134906:
bl sub_8098C64
bl GetOverworldTextboxPalettePtr
movs r1, 0xE0
movs r2, 0x20
bl LoadPalette
asm/wild_encounter.s
+3 -3
View File
@@ -1628,12 +1628,12 @@ rock_smash_wild_pokemon_encounter: @ 80B550C
bne _080B5568
bl sub_80B0698
_080B5554:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r4, [r0]
b _080B556E
.pool
_080B5568:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
_080B556E:
@@ -2026,7 +2026,7 @@ sub_80B5870: @ 80B5870
bl VarSet
cmp r4, 0
bne _080B58C4
ldr r0, =gUnknown_082A4B2A
ldr r0, =EventScript_RepelWoreOff
bl ScriptContext1_SetupScript
movs r0, 0x1
b _080B58C6