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

Merge branch 'master' into unk_text_util_2

Browse Source
This commit is contained in:
PikalaxALT
2017-10-02 22:09:29 -04:00
committed by GitHub
parent 4cf1150002 0fe97e838e
commit 2701191a76
351 changed files with 35376 additions and 45563 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_1.s
+28 -28
View File
@@ -1548,7 +1548,7 @@ _080358E0:
.4byte _08035A70
_08035904:
ldr r4, =gUnknown_0831ABA8
ldr r5, =gUnknown_02022FF0
ldr r5, =gBattleTerrain
ldrb r1, [r5]
lsls r0, r1, 2
adds r0, r1
@@ -1888,7 +1888,7 @@ sub_8035C4C: @ 8035C4C
bne _08035C68
ldr r0, =gText_Draw
movs r1, 0x15
bl battle_show_message_maybe
bl sub_814F9EC
b _08035D68
.pool
_08035C68:
@@ -1964,10 +1964,10 @@ _08035CE2:
_08035CFC:
ldr r0, =gText_Win
movs r1, 0x17
bl battle_show_message_maybe
bl sub_814F9EC
ldr r0, =gText_Loss
movs r1, 0x16
bl battle_show_message_maybe
bl sub_814F9EC
b _08035D68
.pool
_08035D20:
@@ -1985,19 +1985,19 @@ _08035D20:
_08035D36:
ldr r0, =gText_Win
movs r1, 0x16
bl battle_show_message_maybe
bl sub_814F9EC
ldr r0, =gText_Loss
movs r1, 0x17
bl battle_show_message_maybe
bl sub_814F9EC
b _08035D68
.pool
_08035D58:
ldr r0, =gText_Win
movs r1, 0x17
bl battle_show_message_maybe
bl sub_814F9EC
ldr r0, =gText_Loss
movs r1, 0x16
bl battle_show_message_maybe
bl sub_814F9EC
_08035D68:
pop {r0}
bx r0
@@ -2068,14 +2068,14 @@ _08035DDC:
_08035DE6:
adds r0, r1, 0
movs r1, 0x11
bl battle_show_message_maybe
bl sub_814F9EC
ldrb r1, [r4, 0x18]
movs r0, 0x4
b _08035E14
_08035DF4:
adds r0, r1, 0
movs r1, 0x12
bl battle_show_message_maybe
bl sub_814F9EC
ldrb r1, [r4, 0x18]
movs r0, 0x4
str r0, [sp]
@@ -2085,7 +2085,7 @@ _08035DF4:
_08035E08:
adds r0, r1, 0
movs r1, 0x13
bl battle_show_message_maybe
bl sub_814F9EC
ldrb r1, [r4, 0x18]
movs r0, 0x8
_08035E14:
@@ -2099,7 +2099,7 @@ _08035E1A:
_08035E22:
adds r0, r1, 0
movs r1, 0x14
bl battle_show_message_maybe
bl sub_814F9EC
ldrb r1, [r4, 0x18]
movs r0, 0x8
str r0, [sp]
@@ -2139,14 +2139,14 @@ _08035E66:
adds r1, r0, r4
adds r0, r1, 0
movs r1, 0xF
bl battle_show_message_maybe
bl sub_814F9EC
lsls r0, r6, 3
subs r0, r6
lsls r0, 2
adds r1, r0, r4
adds r0, r1, 0
movs r1, 0x10
bl battle_show_message_maybe
bl sub_814F9EC
movs r4, 0x7
str r4, [sp]
adds r0, r7, 0
@@ -2236,7 +2236,7 @@ _08035F64:
ldrsh r0, [r5, r1]
cmp r0, 0
beq _08035FCC
ldr r4, =gUnknown_02022E18
ldr r4, =gBattle_BG1_X
ldrh r0, [r5, 0xA]
bl Sin2
lsls r0, 16
@@ -2251,7 +2251,7 @@ _08035F7E:
adds r0, r2, 0
subs r0, r1
strh r0, [r4]
ldr r4, =gUnknown_02022E1C
ldr r4, =gBattle_BG2_X
ldrh r0, [r5, 0xC]
bl Sin2
lsls r0, 16
@@ -2266,16 +2266,16 @@ _08035F9C:
adds r0, r3, 0
subs r0, r1
strh r0, [r4]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
ldr r2, =0x0000ffdc
adds r1, r2, 0
strh r1, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r1, [r0]
b _08036038
.pool
_08035FCC:
ldr r4, =gUnknown_02022E18
ldr r4, =gBattle_BG1_X
ldrh r0, [r5, 0xA]
bl Sin2
lsls r0, 16
@@ -2290,7 +2290,7 @@ _08035FDE:
adds r0, r3, 0
subs r0, r1
strh r0, [r4]
ldr r4, =gUnknown_02022E1A
ldr r4, =gBattle_BG1_Y
ldrh r0, [r5, 0xA]
bl Cos2
lsls r0, 16
@@ -2302,7 +2302,7 @@ _08035FFC:
asrs r0, 5
subs r0, 0xA4
strh r0, [r4]
ldr r4, =gUnknown_02022E1C
ldr r4, =gBattle_BG2_X
ldrh r0, [r5, 0xC]
bl Sin2
lsls r0, 16
@@ -2317,7 +2317,7 @@ _08036014:
adds r0, r2, 0
subs r0, r1
strh r0, [r4]
ldr r4, =gUnknown_02022E1E
ldr r4, =gBattle_BG2_Y
ldrh r0, [r5, 0xC]
bl Cos2
lsls r0, 16
@@ -2504,11 +2504,11 @@ sub_8036154: @ 8036154
movs r0, 0x4A
movs r1, 0x36
bl SetGpuReg
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
ldr r2, =0x0000ff5c
adds r1, r2, 0
strh r1, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r1, [r0]
ldr r0, =gUnknown_0831AA00
bl LoadCompressedObjectPicUsingHeap
@@ -2633,7 +2633,7 @@ _08036350:
cmp r0, 0
bne _0803639C
ldr r4, =gUnknown_0831ABA8
ldr r5, =gUnknown_02022FF0
ldr r5, =gBattleTerrain
ldrb r1, [r5]
lsls r0, r1, 2
adds r0, r1
@@ -2779,7 +2779,7 @@ _080364A8:
.4byte _08036518
_080364CC:
ldr r2, =gUnknown_0831ABA8
ldr r0, =gUnknown_02022FF0
ldr r0, =gBattleTerrain
ldrb r1, [r0]
lsls r0, r1, 2
adds r0, r1
@@ -2889,7 +2889,7 @@ _080365B4:
.4byte _08036624
_080365D8:
ldr r2, =gUnknown_0831ABA8
ldr r0, =gUnknown_02022FF0
ldr r0, =gBattleTerrain
ldrb r1, [r0]
lsls r0, r1, 2
adds r0, r1
@@ -3004,7 +3004,7 @@ _080366C8:
.4byte _08036740
_080366EC:
ldr r2, =gUnknown_0831ABA8
ldr r0, =gUnknown_02022FF0
ldr r0, =gBattleTerrain
ldrb r1, [r0]
lsls r0, r1, 2
adds r0, r1
asm/battle_2.s
+205 -205
View File
File diff suppressed because it is too large Load Diff
asm/battle_4.s
-31160
View File
File diff suppressed because it is too large Load Diff
asm/battle_5.s
+10 -10
View File
@@ -183,8 +183,8 @@ _080570D0:
.pool
thumb_func_end sub_8057028
thumb_func_start sub_80570F4
sub_80570F4: @ 80570F4
thumb_func_start AdjustFriendshipOnBattleFaint
AdjustFriendshipOnBattleFaint: @ 80570F4
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
@@ -195,11 +195,11 @@ sub_80570F4: @ 80570F4
cmp r0, 0
beq _08057140
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0x3
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r3, r0, 24
ldr r2, =gBattleMons
@@ -220,7 +220,7 @@ sub_80570F4: @ 80570F4
.pool
_08057140:
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r4, r0, 24
_0805714A:
@@ -285,7 +285,7 @@ _080571CE:
pop {r0}
bx r0
.pool
thumb_func_end sub_80570F4
thumb_func_end AdjustFriendshipOnBattleFaint
thumb_func_start sub_80571DC
sub_80571DC: @ 80571DC
@@ -414,7 +414,7 @@ _0805729A:
ldr r1, =0xf7ffffff
ands r0, r1
str r0, [r2]
bl b_movescr_stack_push_cursor
bl BattleScriptPushCursor
movs r0, 0x1
mov r2, r10
strb r0, [r2, 0x5]
@@ -474,7 +474,7 @@ _08057354:
ldr r1, =0xf7ffffff
ands r0, r1
str r0, [r2]
bl b_movescr_stack_push_cursor
bl BattleScriptPushCursor
ldr r0, =gBattleCommunication
strb r4, [r0, 0x5]
ldr r1, =gBattlescriptCurrInstr
@@ -523,7 +523,7 @@ _080573D4:
negs r1, r1
ands r0, r1
str r0, [r4]
bl b_movescr_stack_push_cursor
bl BattleScriptPushCursor
ldr r1, =gBattlescriptCurrInstr
ldr r0, =BattleScript_MoveUsedUnfroze
str r0, [r1]
@@ -562,7 +562,7 @@ _08057406:
movs r1, 0x28
movs r2, 0
movs r3, 0x4
bl EmitSetAttributes
bl EmitSetMonData
ldrb r0, [r4]
bl MarkBufferBankForExecution
_08057430:
asm/battle_7.s
+12 -12
View File
@@ -428,7 +428,7 @@ _0805D470:
movs r0, 0x1
ands r0, r1
eors r0, r2
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 16
_0805D48A:
@@ -579,7 +579,7 @@ sub_805D5F4: @ 805D5F4
cmp r0, 0
bne _0805D630
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
mov r8, r0
@@ -588,13 +588,13 @@ sub_805D5F4: @ 805D5F4
.pool
_0805D630:
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
mov r8, r0
movs r0, 0x2
_0805D63E:
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r7, r0, 24
ldr r1, =gBattleMons
@@ -2937,11 +2937,11 @@ _0805EA5A:
bx r0
thumb_func_end sub_805E990
thumb_func_start sub_805EA60
sub_805EA60: @ 805EA60
thumb_func_start BattleMusicStop
BattleMusicStop: @ 805EA60
push {r4-r6,lr}
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r4, r0, 24
ldr r5, =gUnknown_020244D0
@@ -2977,7 +2977,7 @@ _0805EAA2:
pop {r0}
bx r0
.pool
thumb_func_end sub_805EA60
thumb_func_end BattleMusicStop
thumb_func_start sub_805EAB4
sub_805EAB4: @ 805EAB4
@@ -3020,12 +3020,12 @@ sub_805EAE8: @ 805EAE8
cmp r0, 0
beq _0805EB7E
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
mov r8, r0
movs r0, 0x2
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
mov r9, r0
@@ -3203,7 +3203,7 @@ sub_805EC84: @ 805EC84
ldr r0, =gUnknown_0831C6A0
bl LoadCompressedObjectPic
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
@@ -3252,7 +3252,7 @@ sub_805EC84: @ 805EC84
cmp r0, 0
beq _0805ED56
movs r0, 0x3
bl GetBankByPlayerAI
bl GetBankByIdentity
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
asm/battle_9.s
+24 -24
View File
@@ -74,7 +74,7 @@ _08062C72:
lsrs r0, 24
mov r10, r0
ldr r4, =gBattleMons
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
movs r1, 0x58
@@ -87,7 +87,7 @@ _08062C72:
b _08062E2C
_08062C9E:
mov r0, r10
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r2, r0, 24
movs r6, 0
@@ -114,7 +114,7 @@ _08062CBA:
ldrh r1, [r4]
mov r3, r9
ldrb r2, [r3]
bl ai_rate_move
bl AI_TypeCalc
lsls r0, 24
lsrs r1, r0, 24
movs r0, 0x2
@@ -223,7 +223,7 @@ _08062D74:
movs r1, 0x2E
bl GetMonData
mov r0, r10
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r2, r0, 24
movs r4, 0
@@ -246,7 +246,7 @@ _08062DE0:
beq _08062E1E
ldrh r1, [r5]
ldrb r2, [r7]
bl ai_rate_move
bl AI_TypeCalc
lsls r0, 24
lsrs r1, r0, 24
movs r0, 0x2
@@ -347,7 +347,7 @@ _08062EB0:
eors r0, r4
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gAbsentBankFlags
ldrb r1, [r1]
ldr r2, =gBitTable
@@ -367,7 +367,7 @@ _08062F04:
eors r0, r4
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r7, r0, 24
b _08062F1E
@@ -705,7 +705,7 @@ ai_has_super_effective_move_on_field: @ 80631BC
lsls r0, 24
lsrs r0, 24
mov r10, r0
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r3, r0, 24
ldr r0, =gAbsentBankFlags
@@ -741,7 +741,7 @@ _0806320A:
ldrh r1, [r5]
mov r3, r8
ldrb r2, [r3]
bl ai_rate_move
bl AI_TypeCalc
lsls r0, 24
lsrs r1, r0, 24
movs r0, 0x2
@@ -779,7 +779,7 @@ _0806327C:
movs r1, 0x2
mov r0, r10
eors r0, r1
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r3, r0, 24
ldr r0, =gAbsentBankFlags
@@ -815,7 +815,7 @@ _080632AE:
ldrh r1, [r5]
mov r3, r8
ldrb r2, [r3]
bl ai_rate_move
bl AI_TypeCalc
lsls r0, 24
lsrs r1, r0, 24
movs r0, 0x2
@@ -951,7 +951,7 @@ _080633B8:
eors r0, r4
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gAbsentBankFlags
ldrb r1, [r1]
ldr r2, =gBitTable
@@ -972,7 +972,7 @@ _08063414:
eors r0, r4
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
mov r10, r0
@@ -1126,7 +1126,7 @@ _08063564:
adds r0, r1
ldrh r0, [r0]
adds r1, r4, 0
bl ai_rate_move
bl AI_TypeCalc
ldr r1, [sp]
ands r1, r0
cmp r1, 0
@@ -1161,7 +1161,7 @@ _080635A2:
beq _080635DE
ldrh r1, [r5]
ldrb r2, [r7]
bl ai_rate_move
bl AI_TypeCalc
lsls r0, 24
lsrs r1, r0, 24
movs r0, 0x2
@@ -1308,7 +1308,7 @@ _080636C4:
eors r0, r5
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gAbsentBankFlags
ldrb r1, [r1]
ldr r2, =gBitTable
@@ -1328,7 +1328,7 @@ _08063718:
eors r0, r5
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r6, r0, 24
b _08063732
@@ -1542,7 +1542,7 @@ _080638C2:
cmp r0, 0
bne _08063910
adds r0, r6, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r5, r0, 24
adds r6, r5, 0
@@ -1550,13 +1550,13 @@ _080638C2:
.pool
_08063910:
adds r0, r5, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r6, r0, 24
movs r0, 0x2
eors r5, r0
adds r0, r5, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r5, r0, 24
_08063928:
@@ -1688,7 +1688,7 @@ sub_8063A08: @ 8063A08
lsrs r2, 24
mov r8, r2
movs r7, 0
ldr r0, =gUnknown_0831ACE8
ldr r0, =gTypeEffectiveness
mov r10, r0
ldrb r0, [r0]
cmp r0, 0xFF
@@ -1789,7 +1789,7 @@ _08063AE0:
eors r0, r5
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gAbsentBankFlags
ldrb r1, [r1]
ldr r2, =gBitTable
@@ -1810,7 +1810,7 @@ _08063B20:
eors r0, r5
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x14]
@@ -1844,7 +1844,7 @@ _08063B6C:
eors r0, r1
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x4]
asm/battle_anim.s
+17 -17
View File
@@ -949,17 +949,17 @@ _080A4148:
ldrsh r0, [r6, r3]
cmp r0, 0
bne _080A4190
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
ldrh r0, [r0]
strh r0, [r1, 0xE]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
b _080A4198
.pool
_080A4190:
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
ldrh r0, [r0]
strh r0, [r1, 0xE]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
_080A4198:
ldrh r0, [r0]
strh r0, [r1, 0x10]
@@ -1266,7 +1266,7 @@ _080A43F8:
ldr r0, =gBankSpriteIds
adds r0, r6, r0
ldrb r4, [r0]
ldr r5, =gUnknown_02022E18
ldr r5, =gBattle_BG1_X
ldr r0, =gSprites
lsls r1, r4, 4
adds r1, r4
@@ -1294,7 +1294,7 @@ _080A43F8:
subs r0, 0x1
strh r0, [r5]
_080A447A:
ldr r5, =gUnknown_02022E1A
ldr r5, =gBattle_BG1_Y
ldr r2, =gSprites
lsls r1, r4, 4
adds r1, r4
@@ -1322,7 +1322,7 @@ _080A447A:
orrs r1, r2
strb r1, [r0]
_080A44B0:
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
ldrh r1, [r0]
movs r0, 0x14
bl SetGpuReg
@@ -1431,7 +1431,7 @@ _080A455E:
ldr r0, =gBankSpriteIds
adds r2, r5, r0
ldrb r4, [r2]
ldr r5, =gUnknown_02022E1C
ldr r5, =gBattle_BG2_X
ldr r3, =gSprites
lsls r1, r4, 4
adds r1, r4
@@ -1443,7 +1443,7 @@ _080A455E:
negs r0, r0
adds r0, 0x20
strh r0, [r5]
ldr r4, =gUnknown_02022E1E
ldr r4, =gBattle_BG2_Y
ldrh r0, [r1, 0x26]
ldrh r1, [r1, 0x22]
adds r0, r1
@@ -1653,19 +1653,19 @@ sub_80A477C: @ 80A477C
_080A479C:
movs r0, 0x1
bl sub_80A6C68
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
movs r1, 0
strh r1, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r1, [r0]
b _080A47C6
.pool
_080A47B8:
movs r0, 0x2
bl sub_80A6C68
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
strh r4, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r4, [r0]
_080A47C6:
add sp, 0x10
@@ -1714,13 +1714,13 @@ task_pA_ma0A_obj_to_bg_pal: @ 80A47D8
ldrsh r0, [r5, r1]
cmp r0, 0
bne _080A4870
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
lsls r0, r3, 16
asrs r0, 16
ldrh r3, [r5, 0xE]
adds r0, r3
strh r0, [r1]
ldr r1, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_Y
lsls r0, r2, 16
asrs r0, 16
ldrh r5, [r5, 0x10]
@@ -1740,13 +1740,13 @@ task_pA_ma0A_obj_to_bg_pal: @ 80A47D8
b _080A4896
.pool
_080A4870:
ldr r1, =gUnknown_02022E1C
ldr r1, =gBattle_BG2_X
lsls r0, r3, 16
asrs r0, 16
ldrh r3, [r5, 0xE]
adds r0, r3
strh r0, [r1]
ldr r1, =gUnknown_02022E1E
ldr r1, =gBattle_BG2_Y
lsls r0, r2, 16
asrs r0, 16
ldrh r5, [r5, 0x10]
asm/battle_anim_80D51AC.s
+1 -1
View File
@@ -200,7 +200,7 @@ _080D5320:
_080D5324:
movs r0, 0x3
_080D5326:
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
asm/battle_anim_80FE840.s
+119 -119
View File
@@ -12782,14 +12782,14 @@ sub_8104E74: @ 8104E74
lsrs r0, 24
cmp r0, 0x1
bne _08104ED4
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
ldrh r0, [r0]
strh r0, [r5, 0x14]
ldr r0, =0x04000014
b _08104EDC
.pool
_08104ED4:
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
ldrh r0, [r0]
strh r0, [r5, 0x14]
ldr r0, =0x04000018
@@ -15305,10 +15305,10 @@ sub_81062E8: @ 81062E8
movs r2, 0x1
bl lcd_bg_operations
_0810632A:
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
movs r1, 0
strh r1, [r0]
ldr r4, =gUnknown_02022E1A
ldr r4, =gBattle_BG1_Y
strh r1, [r4]
movs r0, 0x14
movs r1, 0
@@ -15540,10 +15540,10 @@ sub_81064F8: @ 81064F8
movs r2, 0x1
bl lcd_bg_operations
_0810653A:
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
movs r1, 0
strh r1, [r0]
ldr r4, =gUnknown_02022E1A
ldr r4, =gBattle_BG1_Y
strh r1, [r4]
movs r0, 0x14
movs r1, 0
@@ -18159,11 +18159,11 @@ _08107A32:
beq _08107AB4
ldr r1, =0x0000ffb0
adds r0, r1, 0
ldr r2, =gUnknown_02022E18
ldr r2, =gBattle_BG1_X
strh r0, [r2]
adds r1, 0x20
adds r0, r1, 0
ldr r2, =gUnknown_02022E1A
ldr r2, =gBattle_BG1_Y
strh r0, [r2]
movs r0, 0x2
strh r0, [r6, 0x8]
@@ -18183,12 +18183,12 @@ _08107AB4:
bne _08107AF8
ldr r2, =0x0000ff20
adds r0, r2, 0
ldr r2, =gUnknown_02022E18
ldr r2, =gBattle_BG1_X
strh r0, [r2]
movs r2, 0x80
lsls r2, 1
adds r0, r2, 0
ldr r2, =gUnknown_02022E1A
ldr r2, =gBattle_BG1_Y
strh r0, [r2]
movs r0, 0x2
strh r0, [r6, 0x8]
@@ -18198,11 +18198,11 @@ _08107AB4:
b _08107B0E
.pool
_08107AF8:
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r4, [r0]
ldr r1, =0x0000ffd0
adds r0, r1, 0
ldr r2, =gUnknown_02022E1A
ldr r2, =gBattle_BG1_Y
strh r0, [r2]
ldr r0, =0x0000fffe
strh r0, [r6, 0x8]
@@ -18210,11 +18210,11 @@ _08107AF8:
strh r0, [r6, 0xA]
strh r4, [r7, 0xE]
_08107B0E:
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
ldrh r1, [r0]
movs r0, 0x14
bl SetGpuReg
ldr r2, =gUnknown_02022E1A
ldr r2, =gBattle_BG1_Y
ldrh r1, [r2]
movs r0, 0x16
bl SetGpuReg
@@ -18264,8 +18264,8 @@ sub_8107B84: @ 8107B84
sub sp, 0x10
lsls r0, 24
lsrs r5, r0, 24
ldr r1, =gUnknown_02022E18
ldr r2, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_X
ldr r2, =gBattle_BG1_Y
ldr r0, =gTasks
lsls r4, r5, 2
adds r4, r5
@@ -18425,8 +18425,8 @@ sub_8107CC4: @ 8107CC4
lsls r0, 24
lsrs r0, 24
adds r5, r0, 0
ldr r7, =gUnknown_02022E18
ldr r0, =gUnknown_02022E1A
ldr r7, =gBattle_BG1_X
ldr r0, =gBattle_BG1_Y
mov r8, r0
ldr r6, =gTasks
lsls r0, r5, 2
@@ -21049,14 +21049,14 @@ sub_8109198: @ 8109198
cmp r4, r0
bne _081091DE
movs r0, 0x2
bl GetBankByPlayerAI
bl GetBankByIdentity
ldrb r1, [r5]
lsls r0, 24
lsrs r0, 24
cmp r1, r0
beq _081091D6
movs r0, 0x3
bl GetBankByPlayerAI
bl GetBankByIdentity
ldrb r1, [r5]
lsls r0, 24
lsrs r0, 24
@@ -21902,7 +21902,7 @@ _0810987E:
muls r1, r3
lsls r1, 16
asrs r1, 16
ldr r0, =gUnknown_085955CE
ldr r0, =gUnknown_085955CC+2
adds r2, r0
movs r3, 0
ldrsh r2, [r2, r3]
@@ -26948,10 +26948,10 @@ sub_810C0A0: @ 810C0A0
movs r2, 0x1
bl lcd_bg_operations
_0810C0E2:
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
movs r1, 0
strh r1, [r0]
ldr r4, =gUnknown_02022E1A
ldr r4, =gBattle_BG1_Y
strh r1, [r4]
movs r0, 0x14
movs r1, 0
@@ -26999,7 +26999,7 @@ sub_810C164: @ 810C164
sub sp, 0x10
lsls r0, 24
lsrs r4, r0, 24
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
ldr r2, =0x0000ffff
adds r0, r2, 0
ldrh r2, [r1]
@@ -27150,10 +27150,10 @@ _0810C29C:
movs r2, 0
bl lcd_bg_operations
_0810C2B0:
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
movs r1, 0
strh r1, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r1, [r0]
movs r0, 0x50
movs r1, 0
@@ -27230,10 +27230,10 @@ sub_810C324: @ 810C324
movs r2, 0x1
bl lcd_bg_operations
_0810C366:
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
movs r1, 0
strh r1, [r0]
ldr r4, =gUnknown_02022E1A
ldr r4, =gBattle_BG1_Y
strh r1, [r4]
movs r0, 0x14
movs r1, 0
@@ -27283,7 +27283,7 @@ sub_810C3F0: @ 810C3F0
sub sp, 0x10
lsls r0, 24
lsrs r4, r0, 24
ldr r2, =gUnknown_02022E18
ldr r2, =gBattle_BG1_X
ldr r3, =gTasks
lsls r1, r4, 2
adds r1, r4
@@ -27422,10 +27422,10 @@ _0810C50C:
movs r2, 0
bl lcd_bg_operations
_0810C520:
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
movs r1, 0
strh r1, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r1, [r0]
movs r0, 0x50
movs r1, 0
@@ -28050,7 +28050,7 @@ sub_810C9E4: @ 810C9E4
ldrh r0, [r4, 0x2]
lsls r0, 20
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r5, r0, 24
adds r0, r5, 0
@@ -30134,7 +30134,7 @@ _0810DB1A:
lsls r0, 24
cmp r0, 0
bne _0810DB50
ldr r1, =gUnknown_02022E20
ldr r1, =gBattle_BG3_X
ldrh r0, [r4, 0x1A]
lsls r0, 16
asrs r0, 24
@@ -30145,7 +30145,7 @@ _0810DB1A:
b _0810DB60
.pool
_0810DB50:
ldr r2, =gUnknown_02022E20
ldr r2, =gBattle_BG3_X
ldrh r1, [r4, 0x1A]
lsls r1, 16
asrs r1, 24
@@ -33064,7 +33064,7 @@ _0810F212:
bne _0810F2B8
_0810F22E:
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r4, r0, 24
adds r7, r4, 0
@@ -33193,7 +33193,7 @@ sub_810F340: @ 810F340
push {r4,r5,lr}
adds r5, r0, 0
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r4, r0, 24
movs r1, 0x3C
@@ -33370,7 +33370,7 @@ sub_810F46C: @ 810F46C
cmp r0, 0
bne _0810F502
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r4, r0, 24
adds r6, r4, 0
@@ -33441,7 +33441,7 @@ sub_810F524: @ 810F524
cmp r0, 0
bne _0810F57C
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
adds r4, r0, 0
@@ -34597,14 +34597,14 @@ _0810FE92:
lsrs r0, 24
cmp r0, 0x1
bne _0810FEB8
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
ldrh r0, [r0]
strh r0, [r4, 0x1C]
ldr r0, =0x04000014
b _0810FEC0
.pool
_0810FEB8:
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
ldrh r0, [r0]
strh r0, [r4, 0x1C]
ldr r0, =0x04000018
@@ -36221,9 +36221,9 @@ sub_8110BCC: @ 8110BCC
movs r2, 0x1
bl lcd_bg_operations
_08110C10:
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r5, [r0]
ldr r4, =gUnknown_02022E1A
ldr r4, =gBattle_BG1_Y
strh r5, [r4]
movs r0, 0x14
movs r1, 0
@@ -36293,7 +36293,7 @@ sub_8110CB0: @ 8110CB0
adds r2, r1, 0
cmp r0, 0
bne _08110CE4
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
ldr r3, =0x0000fffa
adds r0, r3, 0
ldrh r3, [r1]
@@ -36301,12 +36301,12 @@ sub_8110CB0: @ 8110CB0
b _08110CEA
.pool
_08110CE4:
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
ldrh r0, [r1]
adds r0, 0x6
_08110CEA:
strh r0, [r1]
ldr r1, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_Y
ldr r3, =0x0000ffff
adds r0, r3, 0
ldrh r3, [r1]
@@ -36442,10 +36442,10 @@ _08110DFC:
movs r2, 0
bl lcd_bg_operations
_08110E10:
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
movs r1, 0
strh r1, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r1, [r0]
movs r0, 0x50
movs r1, 0
@@ -41115,13 +41115,13 @@ sub_81133E8: @ 81133E8
bne _08113424
ldr r0, =0x04000014
str r0, [sp]
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
b _0811342A
.pool
_08113424:
ldr r0, =0x04000018
str r0, [sp]
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
_0811342A:
ldrh r0, [r0]
strh r0, [r4, 0xC]
@@ -42107,7 +42107,7 @@ _08113C1E:
add r4, sp, 0xC
adds r0, r4, 0
bl sub_80A6B30
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
ldrh r0, [r0]
strh r0, [r5, 0x1C]
ldr r1, =0x00003f42
@@ -42125,11 +42125,11 @@ _08113C1E:
lsls r0, 24
cmp r0, 0
bne _08113CB0
ldr r1, =gUnknown_02022E1C
ldr r1, =gBattle_BG2_X
b _08113CAA
.pool
_08113C80:
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
ldrh r0, [r0]
strh r0, [r5, 0x1C]
ldr r1, =0x00003f44
@@ -42146,7 +42146,7 @@ _08113C80:
lsls r0, 24
cmp r0, 0
bne _08113CB0
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
_08113CAA:
ldrh r0, [r1]
adds r0, 0xF0
@@ -42426,14 +42426,14 @@ _08113EF8:
ldr r1, =0x00003f42
movs r0, 0x50
bl SetGpuReg
ldr r1, =gUnknown_02022E1C
ldr r1, =gBattle_BG2_X
b _08113F2E
.pool
_08113F24:
ldr r1, =0x00003f44
movs r0, 0x50
bl SetGpuReg
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
_08113F2E:
ldrh r0, [r1]
adds r0, 0xF0
@@ -42447,7 +42447,7 @@ _08113F40:
bne _08113F68
mov r0, sp
bl sub_80A6B30
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
ldrh r0, [r0]
strh r0, [r5, 0x1C]
mov r0, sp
@@ -42459,7 +42459,7 @@ _08113F40:
b _08113F78
.pool
_08113F68:
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
ldrh r0, [r0]
strh r0, [r5, 0x1C]
movs r0, 0
@@ -43324,7 +43324,7 @@ _0811465C:
lsls r1, 4
movs r2, 0x20
bl LoadCompressedPalette
ldr r2, =gUnknown_02022E18
ldr r2, =gBattle_BG1_X
ldr r0, =gSprites
lsls r1, r4, 4
adds r1, r4
@@ -43334,7 +43334,7 @@ _0811465C:
negs r0, r0
adds r0, 0x60
strh r0, [r2]
ldr r2, =gUnknown_02022E1A
ldr r2, =gBattle_BG1_Y
ldrh r0, [r1, 0x22]
negs r0, r0
adds r0, 0x20
@@ -43399,7 +43399,7 @@ sub_8114748: @ 8114748
adds r0, 0x4
movs r5, 0
strh r0, [r4, 0x1C]
ldr r2, =gUnknown_02022E18
ldr r2, =gBattle_BG1_X
ldrh r3, [r2]
subs r1, r3, 0x4
strh r1, [r2]
@@ -43586,7 +43586,7 @@ _08114902:
beq _0811492E
_08114908:
adds r0, r4, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
@@ -44104,17 +44104,17 @@ _08114D3C:
strh r0, [r4, 0x1E]
cmp r0, 0x1
bne _08114D70
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
ldrh r0, [r0]
strh r0, [r4, 0x20]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
b _08114D78
.pool
_08114D70:
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
ldrh r0, [r0]
strh r0, [r4, 0x20]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
_08114D78:
ldrh r0, [r0]
strh r0, [r4, 0x22]
@@ -44189,11 +44189,11 @@ _08114DF6:
ldrsh r0, [r4, r1]
cmp r0, 0x1
bne _08114E20
ldr r1, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_Y
b _08114E22
.pool
_08114E20:
ldr r1, =gUnknown_02022E1E
ldr r1, =gBattle_BG2_Y
_08114E22:
ldrh r0, [r4, 0x22]
subs r0, r2
@@ -44210,11 +44210,11 @@ _08114E22:
ldrsh r0, [r4, r3]
cmp r0, 0x1
bne _08114E4C
ldr r1, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_Y
b _08114E4E
.pool
_08114E4C:
ldr r1, =gUnknown_02022E1E
ldr r1, =gBattle_BG2_Y
_08114E4E:
ldrh r0, [r4, 0x22]
subs r0, r2
@@ -44296,11 +44296,11 @@ sub_8114EB4: @ 8114EB4
lsrs r0, 24
cmp r0, 0x1
bne _08114F00
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
b _08114F02
.pool
_08114F00:
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
_08114F02:
strh r4, [r0]
adds r0, r5, 0
@@ -44450,11 +44450,11 @@ _08115018:
strh r0, [r4, 0x1E]
cmp r0, 0x1
bne _08115044
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
b _08115046
.pool
_08115044:
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
_08115046:
ldrh r0, [r0]
strh r0, [r4, 0x20]
@@ -44540,13 +44540,13 @@ sub_81150E0: @ 81150E0
lsrs r4, r2, 16
cmp r0, 0x1
bne _08115104
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
ldrh r3, [r0]
ldr r0, =0x04000014
b _0811510A
.pool
_08115104:
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
ldrh r3, [r0]
ldr r0, =0x04000018
_0811510A:
@@ -44805,7 +44805,7 @@ _08115314:
beq _08115340
cmp r0, 0x5
bne _08115380
ldr r0, =gUnknown_02022E20
ldr r0, =gBattle_BG3_X
ldrh r0, [r0]
strh r0, [r4, 0x22]
ldr r0, =sub_81153AC
@@ -44907,7 +44907,7 @@ _081153DA:
ands r0, r1
cmp r0, 0
bne _08115404
ldr r1, =gUnknown_02022E20
ldr r1, =gBattle_BG3_X
ldrh r0, [r3, 0x26]
ldrh r2, [r3, 0x22]
adds r0, r2
@@ -44915,7 +44915,7 @@ _081153DA:
b _0811540E
.pool
_08115404:
ldr r0, =gUnknown_02022E20
ldr r0, =gBattle_BG3_X
ldrh r1, [r3, 0x22]
ldrh r2, [r3, 0x26]
subs r1, r2
@@ -44951,7 +44951,7 @@ _08115430:
ands r1, r0
cmp r1, 0
bne _0811545C
ldr r1, =gUnknown_02022E20
ldr r1, =gBattle_BG3_X
ldrh r0, [r3, 0x24]
ldrh r2, [r3, 0x22]
adds r0, r2
@@ -44959,7 +44959,7 @@ _08115430:
b _08115466
.pool
_0811545C:
ldr r0, =gUnknown_02022E20
ldr r0, =gBattle_BG3_X
ldrh r1, [r3, 0x22]
ldrh r2, [r3, 0x24]
subs r1, r2
@@ -44987,7 +44987,7 @@ _08115484:
b _0811549C
.pool
_08115490:
ldr r1, =gUnknown_02022E20
ldr r1, =gBattle_BG3_X
ldrh r0, [r3, 0x22]
strh r0, [r1]
adds r0, r2, 0
@@ -45263,7 +45263,7 @@ _0811565A:
movs r0, 0xFF
ands r1, r0
strh r1, [r4, 0xC]
ldr r2, =gUnknown_02022E20
ldr r2, =gBattle_BG3_X
ldrh r0, [r4, 0xA]
strh r0, [r2]
ldr r0, =gUnknown_02022E22
@@ -45295,7 +45295,7 @@ sub_81156D0: @ 81156D0
ldrsh r0, [r2, r4]
cmp r1, r0
bne _08115710
ldr r0, =gUnknown_02022E20
ldr r0, =gBattle_BG3_X
movs r1, 0
strh r1, [r0]
ldr r0, =gUnknown_02022E22
@@ -45305,7 +45305,7 @@ sub_81156D0: @ 81156D0
b _0811571C
.pool
_08115710:
ldr r1, =gUnknown_02022E20
ldr r1, =gBattle_BG3_X
ldrh r0, [r2, 0xA]
strh r0, [r1]
ldr r1, =gUnknown_02022E22
@@ -46553,7 +46553,7 @@ _081160DC:
beq _081160F4
b _08116104
_081160E2:
ldr r1, =gUnknown_02022E20
ldr r1, =gBattle_BG3_X
b _081160F6
.pool
_081160EC:
@@ -46793,7 +46793,7 @@ sub_81162A4: @ 81162A4
strh r1, [r2, 0xE]
ldrh r1, [r3, 0x6]
strh r1, [r2, 0x18]
ldr r4, =gUnknown_02022E20
ldr r4, =gBattle_BG3_X
ldrh r1, [r3]
strh r1, [r4]
ldr r4, =gUnknown_02022E22
@@ -46824,7 +46824,7 @@ sub_81162F8: @ 81162F8
mov r12, r1
cmp r0, 0
bne _0811637E
ldr r0, =gUnknown_02022E20
ldr r0, =gBattle_BG3_X
ldrh r2, [r0]
movs r7, 0x8
ldrsh r1, [r3, r7]
@@ -47348,7 +47348,7 @@ sub_811675C: @ 811675C
ldrsh r0, [r0, r1]
bl sub_811583C
adds r2, r0, 0
ldr r0, =gUnknown_02022FF0
ldr r0, =gBattleTerrain
ldrb r0, [r0]
cmp r0, 0x9
bhi _08116832
@@ -47996,7 +47996,7 @@ _08116CAC:
adds r1, 0x1
movs r2, 0x2
bl LoadPalette
ldr r2, =gUnknown_02022E18
ldr r2, =gBattle_BG1_X
ldr r0, =gSprites
lsls r1, r4, 4
adds r1, r4
@@ -48006,7 +48006,7 @@ _08116CAC:
negs r0, r0
adds r0, 0x20
strh r0, [r2]
ldr r2, =gUnknown_02022E1A
ldr r2, =gBattle_BG1_Y
ldrh r0, [r1, 0x22]
negs r0, r0
adds r0, 0x20
@@ -48050,7 +48050,7 @@ sub_8116D64: @ 8116D64
movs r1, 0
mov r8, r1
strh r0, [r5, 0x1C]
ldr r7, =gUnknown_02022E1A
ldr r7, =gBattle_BG1_Y
ldrh r2, [r7]
subs r1, r2, 0x4
strh r1, [r7]
@@ -48537,10 +48537,10 @@ _081171F8:
movs r2, 0x20
bl LoadCompressedPalette
_08117206:
ldr r3, =gUnknown_02022E18
ldr r3, =gBattle_BG1_X
movs r2, 0
strh r2, [r3]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r2, [r0]
ldr r1, =gUnknown_0203A110
ldr r0, [r1]
@@ -48645,7 +48645,7 @@ sub_81172EC: @ 81172EC
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
ldr r2, =gUnknown_02022E1A
ldr r2, =gBattle_BG1_Y
ldr r1, =gTasks
lsls r0, r6, 2
adds r0, r6
@@ -49152,7 +49152,7 @@ sub_81176D8: @ 81176D8
ldrh r7, [r1, 0x1E]
adds r2, r7
strh r2, [r1, 0x1E]
ldr r6, =gUnknown_02022E20
ldr r6, =gBattle_BG3_X
lsls r0, r3, 16
asrs r0, 24
ldrh r4, [r6]
@@ -49497,10 +49497,10 @@ _081179CC:
ldr r0, [sp, 0x5C]
movs r2, 0x20
bl LoadCompressedPalette
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
movs r1, 0
strh r1, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r1, [r0]
ldr r1, =gTasks
mov r2, r9
@@ -49563,7 +49563,7 @@ _08117A7E:
ldrsh r0, [r3, r1]
cmp r0, 0
bge _08117AA4
ldr r2, =gUnknown_02022E1A
ldr r2, =gBattle_BG1_Y
lsls r1, r4, 16
asrs r1, 24
ldrh r0, [r2]
@@ -49572,7 +49572,7 @@ _08117A7E:
b _08117AB0
.pool
_08117AA4:
ldr r1, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_Y
lsls r0, r4, 16
asrs r0, 24
ldrh r2, [r1]
@@ -49759,7 +49759,7 @@ sub_8117C24: @ 8117C24
lsls r0, 24
lsrs r0, 24
ldr r2, =gBattleAnimArgs
ldr r1, =gUnknown_02022FF0
ldr r1, =gBattleTerrain
ldrb r1, [r1]
strh r1, [r2]
bl move_anim_task_del
@@ -50529,14 +50529,14 @@ sub_811828C: @ 811828C
lsls r0, 24
lsrs r0, 24
bl DestroyTask
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
movs r1, 0
strh r1, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r1, [r0]
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
strh r1, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r1, [r0]
movs r0, 0x50
movs r1, 0
@@ -50569,7 +50569,7 @@ task_battle_intro_80BC47C: @ 81182EC
sub sp, 0x4
lsls r0, 24
lsrs r4, r0, 24
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
ldrh r0, [r1]
adds r0, 0x6
strh r0, [r1]
@@ -50697,7 +50697,7 @@ _08118400:
ldrsh r0, [r2, r1]
cmp r0, 0x1
bne _08118420
ldr r2, =gUnknown_02022E1A
ldr r2, =gBattle_BG1_Y
ldrh r1, [r2]
ldr r0, =0x0000ffb0
cmp r1, r0
@@ -50706,7 +50706,7 @@ _08118400:
b _0811842C
.pool
_08118420:
ldr r2, =gUnknown_02022E1A
ldr r2, =gBattle_BG1_Y
ldrh r1, [r2]
ldr r0, =0x0000ffc8
cmp r1, r0
@@ -50861,13 +50861,13 @@ _08118568:
cmp r0, 0x4
bne _08118580
_0811856C:
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
ldrh r0, [r1]
adds r0, 0x8
b _0811857E
.pool
_08118578:
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
ldrh r0, [r1]
adds r0, 0x6
_0811857E:
@@ -50882,7 +50882,7 @@ _08118580:
adds r6, r0, 0
cmp r1, 0x4
bne _081185E4
ldr r7, =gUnknown_02022E1A
ldr r7, =gBattle_BG1_Y
ldrh r0, [r4, 0x14]
bl Cos2
lsls r0, 16
@@ -51202,7 +51202,7 @@ task_battle_intro_anim: @ 8118844
sub sp, 0x4
lsls r0, 24
lsrs r5, r0, 24
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
ldrh r0, [r1]
adds r0, 0x8
strh r0, [r1]
@@ -51505,7 +51505,7 @@ task00_battle_intro_wireless: @ 8118AC0
ldrsh r0, [r7, r2]
cmp r0, 0
bne _08118B36
ldr r2, =gUnknown_02022E18
ldr r2, =gBattle_BG1_X
ldrh r1, [r2]
movs r0, 0x80
lsls r0, 8
@@ -51519,7 +51519,7 @@ task00_battle_intro_wireless: @ 8118AC0
_08118AFE:
adds r0, r1, 0x3
strh r0, [r2]
ldr r1, =gUnknown_02022E1C
ldr r1, =gBattle_BG2_X
ldrh r0, [r1]
subs r0, 0x3
strh r0, [r1]
@@ -51878,10 +51878,10 @@ _08118DD4:
ldr r2, =0x0000ffd0
adds r0, r2, 0
strh r0, [r1]
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
movs r0, 0xF0
strh r0, [r1]
ldr r1, =gUnknown_02022E1C
ldr r1, =gBattle_BG2_X
subs r2, 0xC0
adds r0, r2, 0
strh r0, [r1]
@@ -51958,10 +51958,10 @@ _08118EC2:
subs r0, r1, 0x2
strh r0, [r3, 0xC]
_08118ED8:
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
ldrh r0, [r3, 0xC]
strh r0, [r1]
ldr r2, =gUnknown_02022E1C
ldr r2, =gBattle_BG2_X
negs r1, r0
strh r1, [r2]
lsls r0, 16
@@ -51977,7 +51977,7 @@ _08118F00:
ldrh r0, [r1]
adds r3, r0, 0x2
strh r3, [r1]
ldr r1, =gUnknown_02022E1E
ldr r1, =gBattle_BG2_Y
ldrh r0, [r1]
adds r0, 0x2
strh r0, [r1]
@@ -52078,7 +52078,7 @@ sub_8118FBC: @ 8118FBC
lsls r5, 16
lsrs r5, 16
adds r0, r4, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
ldr r1, =gBattleSpritesGfx
asm/battle_anim_815A0D4.s
+33 -33
View File
@@ -1655,11 +1655,11 @@ _0815AE08:
strh r2, [r5, 0x16]
cmp r7, 0x1
bne _0815AE30
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
b _0815AE32
.pool
_0815AE30:
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
_0815AE32:
ldrh r2, [r0]
strh r2, [r5, 0x18]
@@ -3385,7 +3385,7 @@ _0815BC02:
lsls r0, 24
cmp r0, 0
beq _0815BC34
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
ldr r3, =0x0000ffc8
b _0815BC5C
.pool
@@ -3396,19 +3396,19 @@ _0815BC34:
lsls r0, 24
cmp r0, 0
beq _0815BC58
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
ldr r2, =0x0000ff79
adds r0, r2, 0
b _0815BC5E
.pool
_0815BC58:
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
ldr r3, =0x0000fff6
_0815BC5C:
adds r0, r3, 0
_0815BC5E:
strh r0, [r1]
ldr r1, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_Y
movs r0, 0
strh r0, [r1]
mov r0, sp
@@ -3428,10 +3428,10 @@ _0815BC5E:
adds r1, r4
lsls r1, 3
adds r1, r0
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
ldrh r0, [r0]
strh r0, [r1, 0x1C]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
ldrh r0, [r0]
strh r0, [r1, 0x1E]
ldrh r0, [r1, 0x8]
@@ -3507,7 +3507,7 @@ _0815BD20:
ldrsh r0, [r4, r2]
cmp r0, 0
bne _0815BDF2
ldr r2, =gUnknown_02022E18
ldr r2, =gBattle_BG1_X
ldr r1, =gUnknown_085CE460
movs r3, 0xC
ldrsh r0, [r4, r3]
@@ -3577,10 +3577,10 @@ _0815BDC8:
movs r1, 0x4
movs r2, 0x1
bl lcd_bg_operations
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
movs r1, 0
strh r1, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r1, [r0]
movs r0, 0x50
movs r1, 0
@@ -3990,7 +3990,7 @@ _0815C124:
lsls r0, 24
cmp r0, 0
beq _0815C15C
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
ldr r3, =0x0000ffc8
adds r0, r3, 0
b _0815C1CA
@@ -4008,48 +4008,48 @@ _0815C15C:
bne _0815C1B4
cmp r4, 0x1
bne _0815C180
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
ldr r2, =0x0000ff65
adds r0, r2, 0
strh r0, [r1]
_0815C180:
cmp r4, 0x3
bne _0815C18C
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
ldr r3, =0x0000ff8d
adds r0, r3, 0
strh r0, [r1]
_0815C18C:
cmp r4, 0
bne _0815C196
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
movs r0, 0xE
strh r0, [r1]
_0815C196:
cmp r4, 0x2
bne _0815C1CC
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
ldr r2, =0x0000ffec
b _0815C1C8
.pool
_0815C1B4:
cmp r4, 0x1
bne _0815C1C0
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
ldr r3, =0x0000ff79
adds r0, r3, 0
strh r0, [r1]
_0815C1C0:
cmp r4, 0
bne _0815C1CC
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
ldr r2, =0x0000fff6
_0815C1C8:
adds r0, r2, 0
_0815C1CA:
strh r0, [r1]
_0815C1CC:
ldr r1, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_Y
movs r0, 0
strh r0, [r1]
mov r0, sp
@@ -4069,10 +4069,10 @@ _0815C1CC:
adds r1, r6
lsls r1, 3
adds r1, r0
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
ldrh r0, [r0]
strh r0, [r1, 0x1C]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
ldrh r0, [r0]
strh r0, [r1, 0x1E]
b _0815C2A4
@@ -4092,7 +4092,7 @@ _0815C224:
lsrs r0, 24
cmp r0, 0x1
bne _0815C268
ldr r2, =gUnknown_02022E18
ldr r2, =gBattle_BG1_X
ldr r1, =gUnknown_085CE4A4
movs r3, 0xC
ldrsh r0, [r5, r3]
@@ -4105,7 +4105,7 @@ _0815C224:
b _0815C27A
.pool
_0815C268:
ldr r2, =gUnknown_02022E18
ldr r2, =gBattle_BG1_X
ldr r1, =gUnknown_085CE4A4
movs r3, 0xC
ldrsh r0, [r5, r3]
@@ -4235,10 +4235,10 @@ _0815C36C:
movs r1, 0x4
movs r2, 0x1
bl lcd_bg_operations
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
movs r1, 0
strh r1, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r1, [r0]
movs r0, 0x50
movs r1, 0
@@ -6133,9 +6133,9 @@ _0815D2B4:
ldr r1, =0x00003f42
movs r0, 0x50
bl SetGpuReg
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
ldrh r5, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
b _0815D316
.pool
_0815D304:
@@ -6144,9 +6144,9 @@ _0815D304:
ldr r1, =0x00003f44
movs r0, 0x50
bl SetGpuReg
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
ldrh r5, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
_0815D316:
ldrh r3, [r0]
movs r7, 0
@@ -6223,17 +6223,17 @@ sub_815D398: @ 815D398
lsrs r0, 24
cmp r0, 0x1
bne _0815D3D8
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
ldrh r0, [r0]
str r0, [sp, 0x4]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
b _0815D3E0
.pool
_0815D3D8:
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
ldrh r0, [r0]
str r0, [sp, 0x4]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
_0815D3E0:
ldrh r0, [r0]
str r0, [sp, 0x8]
asm/battle_anim_8170478.s
+13 -13
View File
@@ -168,12 +168,12 @@ sub_8170478: @ 8170478
lsls r1, 4
movs r2, 0x20
bl LoadCompressedPalette
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
ldrh r0, [r7, 0x20]
negs r0, r0
adds r0, 0x20
strh r0, [r1]
ldr r1, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_Y
ldrh r0, [r7, 0x22]
negs r0, r0
subs r0, 0x20
@@ -225,7 +225,7 @@ sub_8170660: @ 8170660
adds r1, r0
movs r3, 0
strh r1, [r5, 0x22]
ldr r2, =gUnknown_02022E1A
ldr r2, =gBattle_BG1_Y
lsls r0, r1, 16
lsrs r0, 24
ldrh r4, [r2]
@@ -1283,7 +1283,7 @@ _08170F54:
lsls r4, 24
lsrs r4, 24
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
bl sub_80A82E4
@@ -1335,7 +1335,7 @@ _08170F54:
ldr r0, =SpriteCallbackDummy
str r0, [r4]
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gBankSpriteIds
lsls r0, 24
lsrs r0, 24
@@ -1371,7 +1371,7 @@ sub_8171030: @ 8171030
lsrs r5, r0, 24
ldr r6, =gSprites
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gBankSpriteIds
lsls r0, 24
lsrs r0, 24
@@ -1422,7 +1422,7 @@ sub_81710A8: @ 81710A8
lsrs r5, r0, 24
ldr r6, =gSprites
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r4, =gBankSpriteIds
lsls r0, 24
lsrs r0, 24
@@ -1438,7 +1438,7 @@ sub_81710A8: @ 81710A8
cmp r0, 0
bge _081710F4
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
adds r0, r4
@@ -5575,7 +5575,7 @@ sub_817330C: @ 817330C
movs r0, 0x1E
strh r0, [r4, 0x2E]
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
movs r1, 0
@@ -5587,7 +5587,7 @@ sub_817330C: @ 817330C
adds r0, r1
strh r0, [r4, 0x32]
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
@@ -5732,7 +5732,7 @@ sub_817345C: @ 817345C
.pool
_08173478:
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gAnimationBankAttacker
strb r0, [r1]
movs r0, 0x1
@@ -5740,12 +5740,12 @@ _08173478:
.pool
_0817348C:
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gAnimationBankAttacker
strb r0, [r1]
movs r0, 0
_08173498:
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gAnimationBankTarget
strb r0, [r1]
_081734A0:
asm/battle_controller_linkopponent.s
+2 -2
View File
@@ -5045,7 +5045,7 @@ sub_8066FF4: @ 8066FF4
bl BufferStringBattle
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl battle_show_message_maybe
bl sub_814F9EC
ldr r1, =gBattleBankFunc
ldrb r0, [r5]
lsls r0, 2
@@ -5565,7 +5565,7 @@ sub_806743C: @ 806743C
ldrb r0, [r0]
cmp r0, 0
beq _08067478
bl sub_805EA60
bl BattleMusicStop
ldrb r1, [r5]
lsls r1, 9
adds r0, r4, 0x1
asm/battle_controller_linkpartner.s
+2 -2
View File
@@ -4354,7 +4354,7 @@ sub_814D590: @ 814D590
bl BufferStringBattle
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl battle_show_message_maybe
bl sub_814F9EC
ldr r1, =gBattleBankFunc
ldrb r0, [r5]
lsls r0, 2
@@ -4874,7 +4874,7 @@ sub_814D9D8: @ 814D9D8
ldrb r0, [r0]
cmp r0, 0
beq _0814DA14
bl sub_805EA60
bl BattleMusicStop
ldrb r1, [r5]
lsls r1, 9
adds r0, r4, 0x1
asm/battle_controller_opponent.s
+9 -9
View File
@@ -5185,7 +5185,7 @@ sub_8061F34: @ 8061F34
bl BufferStringBattle
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl battle_show_message_maybe
bl sub_814F9EC
ldr r1, =gBattleBankFunc
ldrb r0, [r5]
lsls r0, 2
@@ -5323,7 +5323,7 @@ _08062062:
cmp r0, 0
beq _0806209C
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r5, =gBankTarget
strb r0, [r5]
ldr r0, =gAbsentBankFlags
@@ -5337,7 +5337,7 @@ _08062062:
cmp r1, 0
beq _0806209C
movs r0, 0x2
bl GetBankByPlayerAI
bl GetBankByIdentity
strb r0, [r5]
_0806209C:
ldr r0, =gBankTarget
@@ -5394,7 +5394,7 @@ _08062108:
lsls r1, 24
lsrs r1, 24
adds r0, r1, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
adds r2, r0, 0
lsls r2, 24
lsrs r2, 16
@@ -5406,7 +5406,7 @@ _08062108:
.pool
_0806213C:
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
adds r2, r0, 0
lsls r2, 24
lsrs r2, 16
@@ -5468,7 +5468,7 @@ sub_8062188: @ 8062188
cmp r0, 0
bne _080621D4
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r5, r0, 24
adds r7, r5, 0
@@ -5476,11 +5476,11 @@ sub_8062188: @ 8062188
.pool
_080621D4:
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r7, r0, 24
movs r0, 0x3
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r5, r0, 24
_080621E8:
@@ -6015,7 +6015,7 @@ sub_8062630: @ 8062630
ldrb r0, [r0]
cmp r0, 0
beq _0806266C
bl sub_805EA60
bl BattleMusicStop
ldrb r1, [r5]
lsls r1, 9
adds r0, r4, 0x1
asm/battle_controller_player.s
+30 -30
View File
@@ -358,7 +358,7 @@ _0805775A:
cmp r0, 0x2
bne _080577E8
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gAbsentBankFlags
ldrb r1, [r1]
ldr r2, =gBitTable
@@ -622,7 +622,7 @@ _080579F0:
mov r1, sp
adds r0, r1, r4
ldrb r0, [r0]
bl GetBankByPlayerAI
bl GetBankByIdentity
strb r0, [r5]
ldr r1, =gNoOfAllBanks
lsls r0, 24
@@ -750,7 +750,7 @@ _08057B14:
mov r1, sp
adds r0, r1, r4
ldrb r0, [r0]
bl GetBankByPlayerAI
bl GetBankByIdentity
strb r0, [r5]
ldr r1, =gNoOfAllBanks
lsls r0, 24
@@ -942,7 +942,7 @@ _08057CC4:
movs r0, 0x1
ands r0, r1
eors r0, r2
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gUnknown_03005D74
strb r0, [r1]
_08057CDE:
@@ -1035,7 +1035,7 @@ _08057D80:
.pool
_08057DA8:
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gAbsentBankFlags
ldrb r1, [r1]
ldr r2, =gBitTable
@@ -1052,7 +1052,7 @@ _08057DA8:
_08057DD0:
movs r0, 0x1
_08057DD2:
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gUnknown_03005D74
_08057DD8:
strb r0, [r1]
@@ -1247,7 +1247,7 @@ _08057F80:
bl battle_menu_cursor_related_2
ldr r0, =gText_BattleSwitchWhich
movs r1, 0xB
bl battle_show_message_maybe
bl sub_814F9EC
ldr r1, =gBattleBankFunc
ldr r0, =gActiveBank
ldrb r0, [r0]
@@ -4042,7 +4042,7 @@ sub_8059828: @ 8059828
push {lr}
ldr r0, =gMain
ldr r1, [r0, 0x4]
ldr r0, =sub_8038420
ldr r0, =BattleMainCB2
cmp r1, r0
bne _08059898
ldr r0, =gPaletteFade
@@ -4118,7 +4118,7 @@ sub_80598E0: @ 80598E0
push {lr}
ldr r0, =gMain
ldr r1, [r0, 0x4]
ldr r0, =sub_8038420
ldr r0, =BattleMainCB2
cmp r1, r0
bne _08059906
ldr r0, =gPaletteFade
@@ -4244,11 +4244,11 @@ sub_80599D4: @ 80599D4
movs r0, 0x5
bl PlaySE
ldrb r0, [r4]
bl sub_8056BAC
bl BattleDestroyCursorAt
movs r0, 0
strb r0, [r4]
movs r0, 0
bl sub_8056B74
bl BattleCreateCursorAt
_08059A02:
ldr r0, =gMain
ldrh r1, [r0, 0x2E]
@@ -4263,11 +4263,11 @@ _08059A02:
movs r0, 0x5
bl PlaySE
ldrb r0, [r4]
bl sub_8056BAC
bl BattleDestroyCursorAt
movs r0, 0x1
strb r0, [r4]
movs r0, 0x1
bl sub_8056B74
bl BattleCreateCursorAt
_08059A2C:
ldr r0, =gMain
ldrh r1, [r0, 0x2E]
@@ -4355,7 +4355,7 @@ _08059AC4:
lsls r1, 24
lsrs r1, 24
adds r0, r7, 0
bl battle_show_message_maybe
bl sub_814F9EC
ldrh r0, [r4]
cmp r0, 0
beq _08059AF4
@@ -4382,7 +4382,7 @@ sub_8059B18: @ 8059B18
bl StringCopy
adds r0, r4, 0
movs r1, 0x7
bl battle_show_message_maybe
bl sub_814F9EC
pop {r4}
pop {r0}
bx r0
@@ -4432,7 +4432,7 @@ sub_8059B3C: @ 8059B3C
bl ConvertIntToDecimalStringN
adds r0, r6, 0
movs r1, 0x9
bl battle_show_message_maybe
bl sub_814F9EC
_08059B98:
pop {r4-r7}
pop {r0}
@@ -4481,7 +4481,7 @@ sub_8059BB0: @ 8059BB0
bl StringCopy
adds r0, r6, 0
movs r1, 0xA
bl battle_show_message_maybe
bl sub_814F9EC
pop {r4-r6}
pop {r0}
bx r0
@@ -4637,7 +4637,7 @@ sub_8059CF8: @ 8059CF8
thumb_func_start sub_8059D40
sub_8059D40: @ 8059D40
push {lr}
ldr r0, =sub_80A92F8
ldr r0, =ReshowBattleScreenAfterMenu
bl SetMainCallback2
pop {r0}
bx r0
@@ -4647,7 +4647,7 @@ sub_8059D40: @ 8059D40
thumb_func_start sub_8059D50
sub_8059D50: @ 8059D50
push {lr}
ldr r0, =sub_80A92F8
ldr r0, =ReshowBattleScreenAfterMenu
bl SetMainCallback2
pop {r0}
bx r0
@@ -4718,7 +4718,7 @@ b_link_standby_message: @ 8059DC0
strh r1, [r0]
ldr r0, =gText_LinkStandby
movs r1, 0
bl battle_show_message_maybe
bl sub_814F9EC
_08059DE0:
pop {r0}
bx r0
@@ -8024,7 +8024,7 @@ sub_805BBC4: @ 805BBC4
ldr r5, =gActiveBank
ldrb r4, [r5]
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -8063,7 +8063,7 @@ sub_805BC18: @ 805BC18
strb r0, [r1]
ldrb r4, [r5]
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -8458,7 +8458,7 @@ sub_805BF80: @ 805BF80
bl BufferStringBattle
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl battle_show_message_maybe
bl sub_814F9EC
ldr r1, =gBattleBankFunc
ldrb r0, [r5]
lsls r0, 2
@@ -8534,7 +8534,7 @@ dp01t_12_6_battle_menu: @ 805C044
bl sub_817F2A8
ldr r0, =gText_BattleMenu
movs r1, 0x2
bl battle_show_message_maybe
bl sub_814F9EC
movs r4, 0
_0805C062:
lsls r0, r4, 24
@@ -8551,10 +8551,10 @@ _0805C062:
movs r1, 0
bl sub_8059CB4
ldr r0, =gText_WhatWillPkmnDo
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0x1
bl battle_show_message_maybe
bl sub_814F9EC
pop {r4}
pop {r0}
bx r0
@@ -8580,12 +8580,12 @@ sub_805C0B0: @ 805C0B0
bl sub_8056A3C
ldr r0, =gText_BattleYesNoChoice
movs r1, 0xC
bl battle_show_message_maybe
bl sub_814F9EC
ldr r1, =gUnknown_03005D74
movs r0, 0x1
strb r0, [r1]
movs r0, 0x1
bl sub_8056B74
bl BattleCreateCursorAt
ldr r1, =gBattleBankFunc
ldrb r0, [r4]
lsls r0, 2
@@ -8913,7 +8913,7 @@ _0805C3BC:
sub_805C3EC: @ 805C3EC
push {lr}
sub sp, 0x4
bl sub_805EA60
bl BattleMusicStop
movs r0, 0x1
negs r0, r0
movs r1, 0
@@ -9595,7 +9595,7 @@ sub_805C9B0: @ 805C9B0
ldrb r0, [r0]
cmp r0, 0
beq _0805C9EC
bl sub_805EA60
bl BattleMusicStop
ldrb r1, [r5]
lsls r1, 9
adds r0, r4, 0x1
asm/battle_controller_player_partner.s
+6 -6
View File
@@ -4966,7 +4966,7 @@ sub_81BDA4C: @ 81BDA4C
bl BufferStringBattle
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl battle_show_message_maybe
bl sub_814F9EC
ldr r1, =gBattleBankFunc
ldrb r0, [r4]
lsls r0, 2
@@ -5045,7 +5045,7 @@ _081BDB02:
cmp r0, 0
beq _081BDB3C
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r4, =gBankTarget
strb r0, [r4]
ldr r0, =gAbsentBankFlags
@@ -5059,7 +5059,7 @@ _081BDB02:
cmp r1, 0
beq _081BDB3C
movs r0, 0x3
bl GetBankByPlayerAI
bl GetBankByIdentity
strb r0, [r4]
_081BDB3C:
ldr r0, =gBankTarget
@@ -5093,11 +5093,11 @@ sub_81BDB7C: @ 81BDB7C
cmp r4, 0x6
bne _081BDBD0
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r6, r0, 24
movs r0, 0x2
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r5, r0, 24
movs r4, 0x3
@@ -5661,7 +5661,7 @@ sub_81BE03C: @ 81BE03C
ldrb r0, [r0]
cmp r0, 0
beq _081BE078
bl sub_805EA60
bl BattleMusicStop
ldrb r1, [r5]
lsls r1, 9
adds r0, r4, 0x1
asm/battle_controller_recorded_opponent.s
+2 -2
View File
@@ -4722,7 +4722,7 @@ sub_8188E90: @ 8188E90
bl BufferStringBattle
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl battle_show_message_maybe
bl sub_814F9EC
ldr r1, =gBattleBankFunc
ldrb r0, [r4]
lsls r0, 2
@@ -5304,7 +5304,7 @@ sub_818936C: @ 818936C
ldrb r0, [r0]
cmp r0, 0
beq _081893A8
bl sub_805EA60
bl BattleMusicStop
ldrb r1, [r5]
lsls r1, 9
adds r0, r4, 0x1
asm/battle_controller_recorded_player.s
+2 -2
View File
@@ -4822,7 +4822,7 @@ sub_818C43C: @ 818C43C
bl BufferStringBattle
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl battle_show_message_maybe
bl sub_814F9EC
ldr r1, =gBattleBankFunc
ldrb r0, [r4]
lsls r0, 2
@@ -5455,7 +5455,7 @@ sub_818C994: @ 818C994
ldrb r0, [r0]
cmp r0, 0
beq _0818C9D0
bl sub_805EA60
bl BattleMusicStop
ldrb r1, [r5]
lsls r1, 9
adds r0, r4, 0x1
asm/battle_controller_safari.s
+8 -8
View File
@@ -387,7 +387,7 @@ sub_8159698: @ 8159698
push {lr}
ldr r0, =gMain
ldr r1, [r0, 0x4]
ldr r0, =sub_8038420
ldr r0, =BattleMainCB2
cmp r1, r0
bne _081596BE
ldr r0, =gPaletteFade
@@ -700,7 +700,7 @@ sub_8159910: @ 8159910
ldr r5, =gActiveBank
ldrb r4, [r5]
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -739,7 +739,7 @@ sub_8159964: @ 8159964
strb r0, [r1]
ldrb r4, [r5]
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -792,7 +792,7 @@ dp01t_10_6_message: @ 81599DC
bl BufferStringBattle
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl battle_show_message_maybe
bl sub_814F9EC
ldr r1, =gBattleBankFunc
ldrb r0, [r4]
lsls r0, 2
@@ -862,7 +862,7 @@ sub_8159A94: @ 8159A94
str r1, [r0]
ldr r0, =gText_SafariZoneMenu
movs r1, 0x2
bl battle_show_message_maybe
bl sub_814F9EC
movs r4, 0
_08159AAE:
lsls r0, r4, 24
@@ -879,10 +879,10 @@ _08159AAE:
movs r1, 0
bl sub_8059CB4
ldr r0, =gText_WhatWillPkmnDo2
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0x1
bl battle_show_message_maybe
bl sub_814F9EC
pop {r4}
pop {r0}
bx r0
@@ -1161,7 +1161,7 @@ dp01t_34_6_move_anim_start_t3: @ 8159CC4
ldrb r0, [r0]
cmp r0, 0
beq _08159D00
bl sub_805EA60
bl BattleMusicStop
ldrb r1, [r5]
lsls r1, 9
adds r0, r4, 0x1
asm/battle_controller_wally.s
+8 -8
View File
@@ -299,7 +299,7 @@ sub_8168610: @ 8168610
push {lr}
ldr r0, =gMain
ldr r1, [r0, 0x4]
ldr r0, =sub_8038420
ldr r0, =BattleMainCB2
cmp r1, r0
bne _08168636
ldr r0, =gPaletteFade
@@ -3232,7 +3232,7 @@ sub_816A084: @ 816A084
ldr r5, =gActiveBank
ldrb r4, [r5]
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -3271,7 +3271,7 @@ sub_816A0D8: @ 816A0D8
strb r0, [r1]
ldrb r4, [r5]
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -3606,7 +3606,7 @@ sub_816A3B8: @ 816A3B8
bl BufferStringBattle
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl battle_show_message_maybe
bl sub_814F9EC
ldr r1, =gBattleBankFunc
ldrb r0, [r4]
lsls r0, 2
@@ -3676,7 +3676,7 @@ dp01t_12_1_battle_menu: @ 816A470
str r1, [r0]
ldr r0, =gText_BattleMenu
movs r1, 0x2
bl battle_show_message_maybe
bl sub_814F9EC
movs r4, 0
_0816A48A:
lsls r0, r4, 24
@@ -3693,10 +3693,10 @@ _0816A48A:
movs r1, 0
bl sub_8059CB4
ldr r0, =gText_WhatWillWallyDo
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0x1
bl battle_show_message_maybe
bl sub_814F9EC
pop {r4}
pop {r0}
bx r0
@@ -4150,7 +4150,7 @@ sub_816A840: @ 816A840
ldrb r0, [r0]
cmp r0, 0
beq _0816A87C
bl sub_805EA60
bl BattleMusicStop
ldrb r1, [r5]
lsls r1, 9
adds r0, r4, 0x1
asm/battle_frontier_1.s
+87 -87
View File
@@ -2599,10 +2599,10 @@ _0818FFFC:
b _081900A4
.pool
_0819002C:
ldr r0, =gUnknown_0831ACE8
ldr r0, =gTypeEffectiveness
adds r1, r6, r0
ldrb r0, [r1]
ldr r7, =gUnknown_0831ACE8
ldr r7, =gTypeEffectiveness
cmp r0, 0xFF
beq _081900A4
adds r4, r1, 0
@@ -2657,7 +2657,7 @@ _08190088:
_08190096:
adds r4, 0x3
adds r6, 0x3
ldr r1, =gUnknown_0831ACE8
ldr r1, =gTypeEffectiveness
adds r0, r6, r1
ldrb r0, [r0]
cmp r0, 0xFF
@@ -3165,27 +3165,27 @@ _0819044E:
strh r4, [r0]
ldr r0, =gUnknown_02022E16
strh r4, [r0]
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r4, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r4, [r0]
ldr r0, =gUnknown_02022E20
ldr r0, =gBattle_BG3_X
strh r4, [r0]
ldr r0, =gUnknown_02022E22
strh r4, [r0]
mov r2, r9
cmp r2, 0x2
bne _081904DC
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
strh r4, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r4, [r0]
b _081904E6
.pool
_081904DC:
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
strh r4, [r0]
ldr r1, =gUnknown_02022E1E
ldr r1, =gBattle_BG2_Y
movs r0, 0xA0
strh r0, [r1]
_081904E6:
@@ -4371,9 +4371,9 @@ _08190E98:
strh r1, [r0]
ldr r0, =gUnknown_02022E16
strh r1, [r0]
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r1, [r0]
ldr r1, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_Y
movs r0, 0xA0
strh r0, [r1]
b _08190EE6
@@ -4384,9 +4384,9 @@ _08190ED4:
ldr r1, =gUnknown_02022E16
movs r0, 0xA0
strh r0, [r1]
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r2, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r2, [r0]
_08190EE6:
cmp r6, 0x1
@@ -4396,9 +4396,9 @@ _08190EE6:
ldrb r1, [r0, 0x10]
cmp r1, 0
bne _08190F50
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
strh r1, [r0]
ldr r1, =gUnknown_02022E1E
ldr r1, =gBattle_BG2_Y
movs r6, 0xA0
lsls r6, 1
adds r0, r6, 0
@@ -4424,12 +4424,12 @@ _08190EE6:
b _08191084
.pool
_08190F50:
ldr r1, =gUnknown_02022E1C
ldr r1, =gBattle_BG2_X
movs r6, 0x80
lsls r6, 1
adds r0, r6, 0
strh r0, [r1]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
movs r4, 0
strh r4, [r0]
ldr r3, =gUnknown_0860D080
@@ -4473,9 +4473,9 @@ _08190F9C:
lsrs r0, 24
adds r1, 0x11
bl sub_8192F08
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
strh r5, [r0]
ldr r1, =gUnknown_02022E1E
ldr r1, =gBattle_BG2_Y
movs r3, 0xA0
lsls r3, 1
adds r0, r3, 0
@@ -4508,10 +4508,10 @@ _08190FF8:
lsrs r0, 24
adds r1, 0x11
bl sub_8192F08
ldr r1, =gUnknown_02022E1C
ldr r1, =gBattle_BG2_X
movs r0, 0
strh r0, [r1]
ldr r1, =gUnknown_02022E1E
ldr r1, =gBattle_BG2_Y
movs r2, 0xA0
lsls r2, 1
adds r0, r2, 0
@@ -4529,12 +4529,12 @@ _08190FF8:
b _08191084
.pool
_0819104C:
ldr r1, =gUnknown_02022E1C
ldr r1, =gBattle_BG2_X
movs r3, 0x80
lsls r3, 1
adds r0, r3, 0
strh r0, [r1]
ldr r1, =gUnknown_02022E1E
ldr r1, =gBattle_BG2_Y
movs r0, 0xA0
strh r0, [r1]
ldr r1, =gTasks
@@ -4770,9 +4770,9 @@ _08191234:
strh r1, [r0]
ldr r0, =gUnknown_02022E16
strh r1, [r0]
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r1, [r0]
ldr r1, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_Y
ldr r2, =0x0000ff60
adds r0, r2, 0
strh r0, [r1]
@@ -4785,9 +4785,9 @@ _08191278:
ldr r3, =0x0000ff60
adds r0, r3, 0
strh r0, [r1]
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r2, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r2, [r0]
_0819128C:
cmp r6, 0x2
@@ -4797,9 +4797,9 @@ _0819128C:
ldrb r1, [r0, 0x10]
cmp r1, 0
bne _081912F4
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
strh r1, [r0]
ldr r1, =gUnknown_02022E1E
ldr r1, =gBattle_BG2_Y
movs r0, 0xA0
strh r0, [r1]
ldr r3, =gUnknown_0860D080
@@ -4823,10 +4823,10 @@ _0819128C:
b _0819141C
.pool
_081912F4:
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
movs r4, 0
strh r4, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r4, [r0]
ldr r3, =gUnknown_0860D080
ldr r2, =gTasks
@@ -4869,9 +4869,9 @@ _0819133C:
lsrs r0, 24
adds r1, 0x11
bl sub_8192F08
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
strh r5, [r0]
ldr r1, =gUnknown_02022E1E
ldr r1, =gBattle_BG2_Y
movs r0, 0xA0
strh r0, [r1]
ldr r2, [r6]
@@ -4902,10 +4902,10 @@ _08191394:
lsrs r0, 24
adds r1, 0x11
bl sub_8192F08
ldr r1, =gUnknown_02022E1C
ldr r1, =gBattle_BG2_X
movs r0, 0
strh r0, [r1]
ldr r1, =gUnknown_02022E1E
ldr r1, =gBattle_BG2_Y
movs r0, 0xA0
strh r0, [r1]
ldr r2, [r6]
@@ -4921,12 +4921,12 @@ _08191394:
b _0819141C
.pool
_081913E4:
ldr r1, =gUnknown_02022E1C
ldr r1, =gBattle_BG2_X
movs r4, 0x80
lsls r4, 1
adds r0, r4, 0
strh r0, [r1]
ldr r1, =gUnknown_02022E1E
ldr r1, =gBattle_BG2_Y
movs r0, 0
strh r0, [r1]
ldr r1, =gTasks
@@ -5162,12 +5162,12 @@ _081915CC:
strh r1, [r0]
ldr r0, =gUnknown_02022E16
strh r1, [r0]
ldr r2, =gUnknown_02022E18
ldr r2, =gBattle_BG1_X
movs r6, 0x80
lsls r6, 1
adds r0, r6, 0
strh r0, [r2]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r1, [r0]
b _08191622
.pool
@@ -5179,9 +5179,9 @@ _0819160C:
strh r0, [r1]
ldr r0, =gUnknown_02022E16
strh r2, [r0]
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r2, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r2, [r0]
_08191622:
ldr r0, =gUnknown_0203CD78
@@ -5189,12 +5189,12 @@ _08191622:
ldrb r0, [r4, 0x10]
cmp r0, 0
bne _08191688
ldr r1, =gUnknown_02022E1C
ldr r1, =gBattle_BG2_X
movs r4, 0x80
lsls r4, 1
adds r0, r4, 0
strh r0, [r1]
ldr r1, =gUnknown_02022E1E
ldr r1, =gBattle_BG2_Y
movs r0, 0xA0
strh r0, [r1]
ldr r3, =gUnknown_0860D080
@@ -5218,12 +5218,12 @@ _08191622:
b _081916C6
.pool
_08191688:
ldr r1, =gUnknown_02022E1C
ldr r1, =gBattle_BG2_X
movs r6, 0x80
lsls r6, 1
adds r0, r6, 0
strh r0, [r1]
ldr r1, =gUnknown_02022E1E
ldr r1, =gBattle_BG2_Y
movs r0, 0
strh r0, [r1]
ldr r3, =gUnknown_0860D15C
@@ -5462,12 +5462,12 @@ _0819187C:
strh r1, [r0]
ldr r0, =gUnknown_02022E16
strh r1, [r0]
ldr r2, =gUnknown_02022E18
ldr r2, =gBattle_BG1_X
movs r6, 0x80
lsls r6, 1
adds r0, r6, 0
strh r0, [r2]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r1, [r0]
b _081918D2
.pool
@@ -5479,9 +5479,9 @@ _081918BC:
strh r0, [r1]
ldr r0, =gUnknown_02022E16
strh r2, [r0]
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r2, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r2, [r0]
_081918D2:
ldr r0, =gUnknown_0203CD78
@@ -5489,12 +5489,12 @@ _081918D2:
ldrb r0, [r2, 0x10]
cmp r0, 0
bne _08191924
ldr r1, =gUnknown_02022E1C
ldr r1, =gBattle_BG2_X
movs r4, 0x80
lsls r4, 1
adds r0, r4, 0
strh r0, [r1]
ldr r1, =gUnknown_02022E1E
ldr r1, =gBattle_BG2_Y
movs r0, 0xA0
strh r0, [r1]
ldr r1, =gTasks
@@ -5510,10 +5510,10 @@ _081918D2:
b _08191958
.pool
_08191924:
ldr r1, =gUnknown_02022E1C
ldr r1, =gBattle_BG2_X
movs r0, 0
strh r0, [r1]
ldr r1, =gUnknown_02022E1E
ldr r1, =gBattle_BG2_Y
movs r0, 0xA0
strh r0, [r1]
ldr r1, =gTasks
@@ -5749,12 +5749,12 @@ _08191B08:
strh r1, [r0]
ldr r0, =gUnknown_02022E16
strh r1, [r0]
ldr r2, =gUnknown_02022E18
ldr r2, =gBattle_BG1_X
movs r6, 0xFF
lsls r6, 8
adds r0, r6, 0
strh r0, [r2]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r1, [r0]
b _08191B5E
.pool
@@ -5766,9 +5766,9 @@ _08191B48:
strh r0, [r1]
ldr r0, =gUnknown_02022E16
strh r2, [r0]
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r2, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r2, [r0]
_08191B5E:
ldr r0, =gUnknown_0203CD78
@@ -5776,19 +5776,19 @@ _08191B5E:
ldrb r0, [r0, 0x10]
cmp r0, 0x1
bne _08191B94
ldr r1, =gUnknown_02022E1C
ldr r1, =gBattle_BG2_X
movs r0, 0
strh r0, [r1]
ldr r1, =gUnknown_02022E1E
ldr r1, =gBattle_BG2_Y
movs r0, 0xA0
strh r0, [r1]
b _08191B9E
.pool
_08191B94:
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
movs r1, 0
strh r1, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r1, [r0]
_08191B9E:
ldr r4, =gUnknown_0860D15C
@@ -6016,12 +6016,12 @@ _08191D68:
strh r1, [r0]
ldr r0, =gUnknown_02022E16
strh r1, [r0]
ldr r2, =gUnknown_02022E18
ldr r2, =gBattle_BG1_X
movs r6, 0xFF
lsls r6, 8
adds r0, r6, 0
strh r0, [r2]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r1, [r0]
b _08191DBE
.pool
@@ -6033,9 +6033,9 @@ _08191DA8:
strh r0, [r1]
ldr r0, =gUnknown_02022E16
strh r2, [r0]
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r2, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r2, [r0]
_08191DBE:
ldr r0, =gUnknown_0203CD78
@@ -6043,12 +6043,12 @@ _08191DBE:
ldrb r0, [r2, 0x10]
cmp r0, 0x2
bne _08191E10
ldr r1, =gUnknown_02022E1C
ldr r1, =gBattle_BG2_X
movs r4, 0x80
lsls r4, 1
adds r0, r4, 0
strh r0, [r1]
ldr r1, =gUnknown_02022E1E
ldr r1, =gBattle_BG2_Y
movs r0, 0xA0
strh r0, [r1]
ldr r1, =gTasks
@@ -6064,10 +6064,10 @@ _08191DBE:
b _08191E44
.pool
_08191E10:
ldr r1, =gUnknown_02022E1C
ldr r1, =gBattle_BG2_X
movs r0, 0
strh r0, [r1]
ldr r1, =gUnknown_02022E1E
ldr r1, =gBattle_BG2_Y
movs r0, 0xA0
strh r0, [r1]
ldr r1, =gTasks
@@ -6310,11 +6310,11 @@ _08191FF8:
ldrh r0, [r1]
subs r0, 0x4
strh r0, [r1]
ldr r1, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_Y
ldrh r0, [r1]
subs r0, 0x4
strh r0, [r1]
ldr r1, =gUnknown_02022E1E
ldr r1, =gBattle_BG2_Y
b _081920A4
.pool
_08192038:
@@ -6335,11 +6335,11 @@ _08192038:
ldrh r0, [r1]
adds r0, 0x4
strh r0, [r1]
ldr r1, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_Y
ldrh r0, [r1]
adds r0, 0x4
strh r0, [r1]
ldr r1, =gUnknown_02022E1E
ldr r1, =gBattle_BG2_Y
b _081920E8
.pool
_08192078:
@@ -6360,11 +6360,11 @@ _08192078:
ldrh r0, [r1]
subs r0, 0x4
strh r0, [r1]
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
ldrh r0, [r1]
subs r0, 0x4
strh r0, [r1]
ldr r1, =gUnknown_02022E1C
ldr r1, =gBattle_BG2_X
_081920A4:
ldrh r0, [r1]
subs r0, 0x4
@@ -6389,11 +6389,11 @@ _081920BC:
ldrh r0, [r1]
adds r0, 0x4
strh r0, [r1]
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
ldrh r0, [r1]
adds r0, 0x4
strh r0, [r1]
ldr r1, =gUnknown_02022E1C
ldr r1, =gBattle_BG2_X
_081920E8:
ldrh r0, [r1]
adds r0, 0x4
@@ -10109,7 +10109,7 @@ _08194074:
lsls r0, r4, 1
add r0, r10
ldrh r0, [r0]
bl ai_rate_move
bl AI_TypeCalc
lsls r0, 24
lsrs r5, r0, 24
movs r0, 0x6
@@ -10404,9 +10404,9 @@ _0819427C:
strh r4, [r0]
ldr r0, =gUnknown_02022E16
strh r4, [r0]
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r4, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r4, [r0]
movs r0, 0x2
movs r1, 0
@@ -11366,19 +11366,19 @@ sub_8194B70: @ 8194B70
ldrh r1, [r0]
movs r0, 0x12
bl SetGpuReg
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
ldrh r1, [r0]
movs r0, 0x14
bl SetGpuReg
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
ldrh r1, [r0]
movs r0, 0x16
bl SetGpuReg
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
ldrh r1, [r0]
movs r0, 0x18
bl SetGpuReg
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
ldrh r1, [r0]
movs r0, 0x1A
bl SetGpuReg
@@ -11494,11 +11494,11 @@ sub_8194CE4: @ 8194CE4
ldrh r1, [r0]
movs r0, 0x12
bl SetGpuReg
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
ldrh r1, [r0]
movs r0, 0x14
bl SetGpuReg
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
ldrh r1, [r0]
movs r0, 0x16
bl SetGpuReg
asm/battle_frontier_2.s
+15 -15
View File
@@ -20578,33 +20578,33 @@ _081A5328:
negs r0, r0
strb r0, [r1, 0x1]
ldr r0, =gText_JapaneseHonorific
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r4, =gDisplayedStringBattle
adds r0, r4, 0
movs r1, 0xF
bl battle_show_message_maybe
bl sub_814F9EC
ldr r0, =gText_Vs
movs r1, 0x10
bl battle_show_message_maybe
bl sub_814F9EC
ldr r0, =gText_RivalBuffer
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
adds r0, r4, 0
movs r1, 0x11
bl battle_show_message_maybe
bl sub_814F9EC
ldr r0, =gText_Mind
movs r1, 0x12
bl battle_show_message_maybe
bl sub_814F9EC
ldr r0, =gText_Skill
movs r1, 0x13
bl battle_show_message_maybe
bl sub_814F9EC
ldr r0, =gText_Body
movs r1, 0x14
bl battle_show_message_maybe
bl sub_814F9EC
ldr r0, =gText_Judgement
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
adds r0, r4, 0
movs r1, 0x15
bl battle_show_message_maybe
bl sub_814F9EC
b _081A553E
.pool
_081A53B4:
@@ -20685,10 +20685,10 @@ _081A5464:
movs r3, 0x1
bl sub_81A5558
ldr r0, =gText_Judgement
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0x15
bl battle_show_message_maybe
bl sub_814F9EC
ldrb r0, [r5]
adds r0, 0x1
strb r0, [r5]
@@ -31263,8 +31263,8 @@ _081AAA9E:
.pool
thumb_func_end sub_81AAA7C
thumb_func_start CalculateBattlePyramidPickupItemId
CalculateBattlePyramidPickupItemId: @ 81AAAE0
thumb_func_start GetBattlePyramidPickupItemId
GetBattlePyramidPickupItemId: @ 81AAAE0
push {r4-r6,lr}
ldr r0, =gSaveBlock2Ptr
ldr r1, [r0]
@@ -31331,6 +31331,6 @@ _081AAB5A:
pop {r1}
bx r1
.pool
thumb_func_end CalculateBattlePyramidPickupItemId
thumb_func_end GetBattlePyramidPickupItemId
.align 2, 0 @ Don't pad with nop.
asm/battle_interface.s
+4 -4
View File
@@ -5476,8 +5476,8 @@ _08075028:
bx r1
thumb_func_end sub_8074FE8
thumb_func_start sub_8075034
sub_8075034: @ 8075034
thumb_func_start GetScaledHPFraction
GetScaledHPFraction: @ 8075034
push {r4,lr}
lsls r2, 24
lsrs r2, 24
@@ -5499,7 +5499,7 @@ _08075058:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_8075034
thumb_func_end GetScaledHPFraction
thumb_func_start sub_8075060
sub_8075060: @ 8075060
@@ -5514,7 +5514,7 @@ sub_8075060: @ 8075060
b _0807508E
_08075072:
movs r2, 0x30
bl sub_8075034
bl GetScaledHPFraction
lsls r0, 24
lsrs r1, r0, 24
movs r0, 0x3
asm/battle_message.s
+23 -23
View File
@@ -687,7 +687,7 @@ _0814E6CC:
ldr r7, [r0]
_0814E6D8:
adds r0, r7, 0
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
_0814E6DE:
pop {r3-r5}
mov r8, r3
@@ -699,15 +699,15 @@ _0814E6DE:
.pool
thumb_func_end BufferStringBattle
thumb_func_start StrCpyDecodeToDisplayedStringBattle
StrCpyDecodeToDisplayedStringBattle: @ 814E6F0
thumb_func_start BattleStringExpandPlaceholdersToDisplayedString
BattleStringExpandPlaceholdersToDisplayedString: @ 814E6F0
push {lr}
ldr r1, =gDisplayedStringBattle
bl StrCpyDecodeBattle
bl BattleStringExpandPlaceholders
pop {r1}
bx r1
.pool
thumb_func_end StrCpyDecodeToDisplayedStringBattle
thumb_func_end BattleStringExpandPlaceholdersToDisplayedString
thumb_func_start AppendStatusString
AppendStatusString: @ 814E700
@@ -763,8 +763,8 @@ _0814E75A:
bx r1
thumb_func_end AppendStatusString
thumb_func_start StrCpyDecodeBattle
StrCpyDecodeBattle: @ 814E764
thumb_func_start BattleStringExpandPlaceholders
BattleStringExpandPlaceholders: @ 814E764
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -904,7 +904,7 @@ _0814E8EE:
adds r0, r1, 0
_0814E8F0:
adds r1, r4, 0
bl StrCpyDecodeBattleTextBuff
bl ExpandBattleTextBuffPlaceholders
bl _0814F5C0
.pool
_0814E904:
@@ -924,7 +924,7 @@ _0814E920:
.pool
_0814E92C:
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gBattlePartyID
lsls r0, 24
lsrs r0, 23
@@ -943,7 +943,7 @@ _0814E92C:
.pool
_0814E960:
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gBattlePartyID
lsls r0, 24
lsrs r0, 23
@@ -962,7 +962,7 @@ _0814E960:
.pool
_0814E994:
movs r0, 0x2
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gBattlePartyID
lsls r0, 24
lsrs r0, 23
@@ -981,7 +981,7 @@ _0814E994:
.pool
_0814E9C8:
movs r0, 0x3
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gBattlePartyID
lsls r0, 24
lsrs r0, 23
@@ -1126,7 +1126,7 @@ _0814EB36:
adds r1, r0, 0
movs r0, 0x1
ands r0, r1
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gBattlePartyID
lsls r0, 24
lsrs r0, 23
@@ -1147,7 +1147,7 @@ _0814EB74:
adds r1, r0, 0
movs r0, 0x1
ands r0, r1
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gBattlePartyID
lsls r0, 24
lsrs r0, 23
@@ -1177,7 +1177,7 @@ _0814EBB0:
adds r1, r0, 0
movs r0, 0x1
ands r0, r1
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gBattlePartyID
lsls r0, 24
lsrs r0, 23
@@ -1199,7 +1199,7 @@ _0814EBF8:
adds r1, r0, 0
movs r0, 0x1
ands r0, r1
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gBattlePartyID
lsls r0, 24
lsrs r0, 23
@@ -2335,10 +2335,10 @@ _0814F62A:
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end StrCpyDecodeBattle
thumb_func_end BattleStringExpandPlaceholders
thumb_func_start StrCpyDecodeBattleTextBuff
StrCpyDecodeBattleTextBuff: @ 814F648
thumb_func_start ExpandBattleTextBuffPlaceholders
ExpandBattleTextBuffPlaceholders: @ 814F648
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -2652,7 +2652,7 @@ _0814F8EA:
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end StrCpyDecodeBattleTextBuff
thumb_func_end ExpandBattleTextBuffPlaceholders
thumb_func_start sub_814F8F8
sub_814F8F8: @ 814F8F8
@@ -2773,8 +2773,8 @@ _0814F9E0:
.pool
thumb_func_end sub_814F950
thumb_func_start battle_show_message_maybe
battle_show_message_maybe: @ 814F9EC
thumb_func_start sub_814F9EC
sub_814F9EC: @ 814F9EC
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -2987,7 +2987,7 @@ _0814FB9C:
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end battle_show_message_maybe
thumb_func_end sub_814F9EC
thumb_func_start sub_814FBAC
sub_814FBAC: @ 814FBAC
asm/battle_setup.s
+6 -6
View File
@@ -585,7 +585,7 @@ sub_80B0AF8: @ 80B0AF8
_080B0B4C:
ldr r0, =c2_exit_to_overworld_2_switch
bl SetMainCallback2
ldr r1, =gUnknown_03005DAC
ldr r1, =gFieldCallback
ldr r0, =sub_80AF6F0
str r0, [r1]
_080B0B58:
@@ -704,7 +704,7 @@ _080B0C64:
lsls r0, r5, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl sub_8089588
bl MetatileBehavior_IsMB_0B
lsls r0, 24
cmp r0, 0
beq _080B0C78
@@ -734,7 +734,7 @@ _080B0C9C:
lsls r0, r5, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl sub_808962C
bl MetatileBehavior_IsDeepOrOceanWater
lsls r0, 24
cmp r0, 0
bne _080B0CF2
@@ -744,7 +744,7 @@ _080B0C9C:
cmp r0, 0
bne _080B0CE0
adds r0, r4, 0
bl sub_808959C
bl MetatileBehavior_IsMountain
lsls r0, 24
cmp r0, 0
beq _080B0CC8
@@ -757,7 +757,7 @@ _080B0CC8:
cmp r0, 0
beq _080B0CF6
adds r0, r4, 0
bl sub_80894D4
bl MetatileBehavior_GetBridgeSth
lsls r0, 24
cmp r0, 0
beq _080B0CE4
@@ -766,7 +766,7 @@ _080B0CE0:
b _080B0D1A
_080B0CE4:
adds r0, r4, 0
bl sub_80894AC
bl MetatileBehavior_IsBridge
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
asm/cable_car.s
+13 -13
View File
@@ -242,7 +242,7 @@ _0814FE96:
bls _0814FE96
ldr r0, =gUnknown_085CDB74
bl LoadSpritePalettes
ldr r0, =gUnknown_085CD67C
ldr r0, =gCableCarMtChimneyTilemap
adds r1, r5, 0
bl malloc_and_decompress
ldr r4, =gUnknown_0203ABAC
@@ -250,7 +250,7 @@ _0814FE96:
ldr r2, =0x000040fc
adds r1, r2
str r0, [r1]
ldr r0, =gUnknown_085CD7D4
ldr r0, =gCableCarTreeTilemap
adds r1, r5, 0
bl malloc_and_decompress
ldr r1, [r4]
@@ -258,14 +258,14 @@ _0814FE96:
lsls r3, 7
adds r1, r3
str r0, [r1]
ldr r0, =gUnknown_085CD958
ldr r0, =gCableCarMountainTilemap
adds r1, r5, 0
bl malloc_and_decompress
ldr r1, [r4]
ldr r2, =0x00004104
adds r1, r2
str r0, [r1]
ldr r0, =gUnknown_085CDB30
ldr r0, =gCableCarPylonStemTilemap
adds r1, r5, 0
bl malloc_and_decompress
ldr r1, [r4]
@@ -274,7 +274,7 @@ _0814FE96:
str r0, [r2]
ldr r0, =0x00004108
adds r1, r0
ldr r0, =gUnknown_085CDB1C
ldr r0, =gCableCarPylonHookTilemapEntries
str r0, [r1]
ldr r1, =gUnknown_08DBA5B8
movs r0, 0
@@ -775,7 +775,7 @@ _08150340:
str r3, [r2, 0x8]
ldr r0, [r2, 0x8]
bl warp_in
ldr r0, =gUnknown_03005DAC
ldr r0, =gFieldCallback
str r4, [r0]
ldr r0, =c2_load_new_map
bl SetMainCallback2
@@ -1908,7 +1908,7 @@ sub_8150D28: @ 8150D28
mov r5, r8
push {r5-r7}
sub sp, 0x28
ldr r1, =gUnknown_085CDBE4
ldr r1, =gCableCarPlayerGraphicsIDs
add r0, sp, 0xC
movs r2, 0x2
bl memcpy
@@ -1917,17 +1917,17 @@ sub_8150D28: @ 8150D28
lsrs r0, 16
mov r9, r0
add r6, sp, 0x10
ldr r1, =gUnknown_085CDBE6
ldr r1, =gMtChimneyHikerGraphicsIDs
adds r0, r6, 0
movs r2, 0x4
bl memcpy
add r5, sp, 0x14
ldr r1, =gUnknown_085CDBEA
ldr r1, =gMtChimneyHikerCoords
adds r0, r5, 0
movs r2, 0x8
bl memcpy
add r4, sp, 0x1C
ldr r1, =gUnknown_085CDBF2
ldr r1, =gMtChimneyHikerMovementDelayTable
adds r0, r4, 0
movs r2, 0x4
bl memcpy
@@ -1982,7 +1982,7 @@ _08150D86:
movs r0, 0x49
strh r0, [r1, 0x30]
_08150DD0:
ldr r4, =gUnknown_085CDB9C
ldr r4, =gSpriteTemplate_85CDB9C
adds r0, r4, 0
movs r1, 0xB0
movs r2, 0x2B
@@ -2088,7 +2088,7 @@ _08150E68:
movs r0, 0x27
strh r0, [r1, 0x30]
_08150ED4:
ldr r4, =gUnknown_085CDB9C
ldr r4, =gSpriteTemplate_85CDB9C
adds r0, r4, 0
movs r1, 0x68
movs r2, 0x9
@@ -2149,7 +2149,7 @@ _08150F3E:
ldr r3, =0xfff80000
adds r2, r3
asrs r2, 16
ldr r0, =gUnknown_085CDBCC
ldr r0, =gSpriteTemplate_85CDBCC
movs r3, 0x68
bl CreateSprite
lsls r0, 24
asm/contest.s
+31 -31
View File
@@ -50,15 +50,15 @@ sub_80D7678: @ 80D7678
strh r1, [r0]
ldr r0, =gUnknown_02022E16
strh r1, [r0]
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r1, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r1, [r0]
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
strh r1, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r1, [r0]
ldr r0, =gUnknown_02022E20
ldr r0, =gBattle_BG3_X
strh r1, [r0]
ldr r0, =gUnknown_02022E22
strh r1, [r0]
@@ -611,10 +611,10 @@ _080D7BF6:
.pool
_080D7C04:
bl sub_80DE224
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
movs r1, 0
strh r1, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r1, [r0]
movs r0, 0x2
bl BeginFastPaletteFade
@@ -1190,7 +1190,7 @@ _080D814C:
strh r0, [r4, 0x8]
b _080D822C
_080D8176:
ldr r1, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_Y
ldrh r0, [r1]
adds r0, 0x7
strh r0, [r1]
@@ -1324,23 +1324,23 @@ vblank_cb_battle: @ 80D827C
ldrh r1, [r0]
movs r0, 0x12
bl SetGpuReg
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
ldrh r1, [r0]
movs r0, 0x14
bl SetGpuReg
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
ldrh r1, [r0]
movs r0, 0x16
bl SetGpuReg
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
ldrh r1, [r0]
movs r0, 0x18
bl SetGpuReg
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
ldrh r1, [r0]
movs r0, 0x1A
bl SetGpuReg
ldr r0, =gUnknown_02022E20
ldr r0, =gBattle_BG3_X
ldrh r1, [r0]
movs r0, 0x1C
bl SetGpuReg
@@ -1389,7 +1389,7 @@ sub_80D833C: @ 80D833C
bne _080D840C
ldr r0, =gUnknown_02022E16
strh r1, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r1, [r0]
bl sub_80DCD48
ldr r1, =gPlttBufferUnfaded
@@ -1520,7 +1520,7 @@ sub_80D8490: @ 80D8490
ldr r0, =gUnknown_02022E16
movs r1, 0xA0
strh r1, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r1, [r0]
movs r6, 0
ldr r0, =gUnknown_02039F25
@@ -1773,7 +1773,7 @@ _080D86E4:
ldr r0, =gUnknown_02022E16
movs r1, 0
strh r1, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r1, [r0]
ldr r1, =gTasks
lsls r0, r7, 2
@@ -2044,7 +2044,7 @@ sub_80D895C: @ 80D895C
ldr r0, =gUnknown_02022E16
movs r1, 0
strh r1, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r1, [r0]
movs r0, 0
bl sub_80DC490
@@ -5325,7 +5325,7 @@ sub_80DA5E8: @ 80DA5E8
ldr r0, =gUnknown_02022E16
movs r1, 0
strh r1, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r1, [r0]
ldr r4, =gUnknown_02039F34
movs r3, 0
@@ -5404,9 +5404,9 @@ sub_80DA6B4: @ 80DA6B4
cmp r4, 0
bne _080DA6EA
bl sub_80DE224
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r4, [r0]
ldr r1, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_Y
movs r0, 0xA0
strh r0, [r1]
movs r0, 0x62
@@ -5432,7 +5432,7 @@ sub_80DA700: @ 80DA700
push {lr}
lsls r0, 24
lsrs r3, r0, 24
ldr r1, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_Y
ldrh r0, [r1]
subs r0, 0x7
strh r0, [r1]
@@ -5582,7 +5582,7 @@ sub_80DA830: @ 80DA830
bne _080DA860
adds r0, r2, 0
bl DestroyTask
ldr r0, =gUnknown_03005DAC
ldr r0, =gFieldCallback
ldr r1, =sub_80DA874
str r1, [r0]
bl FreeAllWindowBuffers
@@ -8519,7 +8519,7 @@ sub_80DBF68: @ 80DBF68
ldr r0, =gUnknown_02022E16
movs r1, 0
strh r1, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r1, [r0]
bl sub_80DB89C
ldr r0, =gUnknown_0827E8DA
@@ -12881,10 +12881,10 @@ sub_80DE224: @ 80DE224
ldrh r1, [r5]
movs r0, 0xC
bl SetGpuReg
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
movs r0, 0xF0
strh r0, [r1]
ldr r4, =gUnknown_02022E1A
ldr r4, =gBattle_BG1_Y
movs r0, 0xA0
strh r0, [r4]
movs r0, 0x14
@@ -13004,9 +13004,9 @@ sub_80DE350: @ 80DE350
ldrh r1, [r3]
movs r0, 0xA
bl SetGpuReg
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r5, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r5, [r0]
ldr r7, =gSprites
_080DE3CA:
@@ -13051,10 +13051,10 @@ sub_80DE424: @ 80DE424
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
movs r0, 0
strh r0, [r1]
ldr r1, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_Y
movs r0, 0xA0
strh r0, [r1]
movs r0, 0x62
@@ -13078,7 +13078,7 @@ sub_80DE464: @ 80DE464
push {lr}
lsls r0, 24
lsrs r3, r0, 24
ldr r1, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_Y
ldrh r0, [r1]
subs r0, 0x7
strh r0, [r1]
@@ -13233,7 +13233,7 @@ sub_80DE5C0: @ 80DE5C0
push {lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r1, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_Y
ldrh r0, [r1]
adds r0, 0x7
strh r0, [r1]
asm/contest_link_80F57C4.s
+12 -12
View File
@@ -97,15 +97,15 @@ _080F57E0:
strh r1, [r0]
ldr r0, =gUnknown_02022E16
strh r1, [r0]
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r1, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r1, [r0]
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
strh r1, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r1, [r0]
ldr r0, =gUnknown_02022E20
ldr r0, =gBattle_BG3_X
strh r1, [r0]
ldr r0, =gUnknown_02022E22
strh r1, [r0]
@@ -449,23 +449,23 @@ sub_80F5C24: @ 80F5C24
ldrh r1, [r0]
movs r0, 0x12
bl SetGpuReg
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
ldrh r1, [r0]
movs r0, 0x14
bl SetGpuReg
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
ldrh r1, [r0]
movs r0, 0x16
bl SetGpuReg
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
ldrh r1, [r0]
movs r0, 0x18
bl SetGpuReg
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
ldrh r1, [r0]
movs r0, 0x1A
bl SetGpuReg
ldr r0, =gUnknown_02022E20
ldr r0, =gBattle_BG3_X
ldrh r1, [r0]
movs r0, 0x1C
bl SetGpuReg
@@ -1838,7 +1838,7 @@ _080F68A8:
thumb_func_start sub_80F68B4
sub_80F68B4: @ 80F68B4
push {r4,r5,lr}
ldr r2, =gUnknown_02022E20
ldr r2, =gBattle_BG3_X
ldrh r3, [r2]
adds r0, r3, 0x2
strh r0, [r2]
@@ -1989,7 +1989,7 @@ sub_80F69B8: @ 80F69B8
_080F69DE:
adds r0, r7, 0
ldr r1, [sp, 0x28]
bl sub_80D2EDC
bl GetMonIconPtr
adds r3, r0, 0
lsls r0, r5, 9
adds r0, 0x80
asm/daycare.s
+16 -16
View File
@@ -5,8 +5,8 @@
.text
thumb_func_start pokemon_get_nick
pokemon_get_nick: @ 806FA2C
thumb_func_start GetMonNick
GetMonNick: @ 806FA2C
push {r4,lr}
sub sp, 0x14
adds r4, r1, 0
@@ -20,10 +20,10 @@ pokemon_get_nick: @ 806FA2C
pop {r4}
pop {r1}
bx r1
thumb_func_end pokemon_get_nick
thumb_func_end GetMonNick
thumb_func_start pokemon_get_nick_
pokemon_get_nick_: @ 806FA4C
thumb_func_start GetBoxMonNick
GetBoxMonNick: @ 806FA4C
push {r4,lr}
sub sp, 0x14
adds r4, r1, 0
@@ -37,7 +37,7 @@ pokemon_get_nick_: @ 806FA4C
pop {r4}
pop {r1}
bx r1
thumb_func_end pokemon_get_nick_
thumb_func_end GetBoxMonNick
thumb_func_start daycare_count_pokemon
daycare_count_pokemon: @ 806FA6C
@@ -177,7 +177,7 @@ sub_806FB38: @ 806FB38
adds r4, 0x7C
adds r0, r6, 0
adds r1, r4, 0
bl pokemon_get_nick
bl GetMonNick
adds r0, r4, 0
bl StripExtCtrlCodes
adds r4, 0xB
@@ -376,7 +376,7 @@ sub_806FCF8: @ 806FCF8
sub sp, 0x68
adds r5, r0, 0
ldr r1, =gStringVar1
bl pokemon_get_nick_
bl GetBoxMonNick
adds r0, r5, 0
movs r1, 0xB
bl GetBoxMonData
@@ -547,7 +547,7 @@ sub_806FE54: @ 806FE54
bl ConvertIntToDecimalStringN
ldr r1, =gStringVar1
adds r0, r5, 0
bl pokemon_get_nick_
bl GetBoxMonNick
adds r0, r4, 0
pop {r4,r5}
pop {r1}
@@ -565,7 +565,7 @@ sub_806FE88: @ 806FE88
lsrs r4, 24
ldr r1, =gStringVar1
adds r0, r5, 0
bl pokemon_get_nick_
bl GetBoxMonNick
movs r0, 0x64
muls r4, r0
adds r4, 0x64
@@ -2175,7 +2175,7 @@ _08070B34:
lsrs r0, 24
cmp r0, 0xFF
bne _08070BC0
bl sub_807228C
bl GetEggStepsToSubtract
lsls r0, 24
lsrs r6, r0, 24
movs r5, 0
@@ -2280,7 +2280,7 @@ sub_8070C04: @ 8070C04
beq _08070C2E
ldr r1, =gStringVar1
adds r0, r4, 0
bl pokemon_get_nick_
bl GetBoxMonNick
adds r0, r4, 0
movs r1, 0x7
mov r2, sp
@@ -2297,7 +2297,7 @@ _08070C2E:
beq _08070C44
ldr r1, =gStringVar2
adds r0, r4, 0
bl pokemon_get_nick_
bl GetBoxMonNick
_08070C44:
add sp, 0xC
pop {r4}
@@ -2317,7 +2317,7 @@ sub_8070C58: @ 8070C58
ldr r4, =gPlayerParty
adds r0, r4
ldr r1, =gStringVar1
bl pokemon_get_nick_
bl GetBoxMonNick
bl brm_get_pokemon_selection
lsls r0, 24
lsrs r0, 24
@@ -2788,7 +2788,7 @@ _08070FCC:
adds r5, r1, r0
adds r0, r4, 0
adds r1, r5, 0
bl pokemon_get_nick_
bl GetBoxMonNick
adds r0, r5, 0
adds r1, r4, 0
bl sub_8070F98
@@ -2944,7 +2944,7 @@ sub_8071110: @ 8071110
adds r5, r0
adds r0, r5, 0
mov r1, sp
bl pokemon_get_nick_
bl GetBoxMonNick
mov r0, sp
adds r1, r5, 0
bl sub_8070F98
asm/decoration.s
+18 -18
View File
@@ -1264,7 +1264,7 @@ sub_8127454: @ 8127454
ldr r1, =gStringVar1
bl StringCopy
lsls r4, 5
ldr r0, =gUnknown_085A5C09
ldr r0, =gDecorations + 1
adds r4, r0
adds r0, r5, 0
adds r1, r4, 0
@@ -2222,7 +2222,7 @@ _08127C0A:
lsls r4, r0, 16
lsls r0, r4, 8
lsrs r0, 24
bl sub_80892D8
bl MetatileBehavior_IsMB_B9
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2257,7 +2257,7 @@ _08127C64:
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl sub_8089328
bl MetatileBehavior_IsMB_B7
lsls r0, 24
lsrs r0, 24
movs r6, 0x1
@@ -3189,7 +3189,7 @@ sub_8128484: @ 8128484
lsrs r0, 24
lsls r1, 16
lsrs r4, r1, 16
bl sub_80892C4
bl MetatileBehavior_IsMB_B3
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3257,7 +3257,7 @@ sub_81284F4: @ 81284F4
lsls r0, r6, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl sub_80892C4
bl MetatileBehavior_IsMB_B3
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3266,7 +3266,7 @@ sub_81284F4: @ 81284F4
cmp r0, 0x21
bne _08128522
adds r0, r4, 0
bl sub_8089378
bl MetatileBehavior_IsMB_C2
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3274,7 +3274,7 @@ sub_81284F4: @ 81284F4
_08128522:
lsls r0, r6, 24
lsrs r0, 24
bl sub_8089314
bl MetatileBehavior_IsNormal
lsls r0, 24
cmp r0, 0
beq _08128534
@@ -3520,7 +3520,7 @@ _081286B8:
adds r5, r1, 0
ands r5, r0
adds r0, r4, 0
bl sub_8089314
bl MetatileBehavior_IsNormal
lsls r0, 24
cmp r0, 0
bne _08128724
@@ -3625,12 +3625,12 @@ _08128790:
adds r5, r1, 0
ands r5, r0
adds r0, r4, 0
bl sub_8089314
bl MetatileBehavior_IsNormal
lsls r0, 24
cmp r0, 0
bne _081287F2
adds r0, r4, 0
bl sub_8089328
bl MetatileBehavior_IsMB_B7
lsls r0, 24
cmp r0, 0
bne _081287F2
@@ -3707,7 +3707,7 @@ _08128868:
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl sub_8089328
bl MetatileBehavior_IsMB_B7
lsls r0, 24
cmp r0, 0
beq _0812890C
@@ -3772,7 +3772,7 @@ _081288D8:
bne _08128910
_08128900:
adds r0, r4, 0
bl sub_8089364
bl MetatileBehavior_IsMB_C3
lsls r0, 24
cmp r0, 0
bne _0812891C
@@ -3781,7 +3781,7 @@ _0812890C:
b _0812893E
_08128910:
adds r0, r4, 0
bl sub_8089350
bl MetatileBehavior_IsMB_B5
lsls r0, 24
cmp r0, 0
beq _08128900
@@ -4149,7 +4149,7 @@ _08128C30:
bl sub_812A3C8
ldr r0, =0x00000be5
bl FreeSpritePaletteByTag
ldr r1, =gUnknown_03005DAC
ldr r1, =gFieldCallback
ldr r0, =sub_8128CD4
str r0, [r1]
ldr r0, =c2_exit_to_overworld_2_switch
@@ -6182,13 +6182,13 @@ _08129CA8:
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl sub_8089288
bl MetatileBehavior_IsSecretBasePC
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _08129CDE
adds r0, r4, 0
bl sub_8089404
bl MetatileBehavior_IsMB_C5
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -6907,7 +6907,7 @@ _0812A280:
.pool
_0812A29C:
bl sub_812A3C8
ldr r0, =gUnknown_03005DAC
ldr r0, =gFieldCallback
ldr r1, =sub_812A334
str r1, [r0]
ldr r0, =c2_exit_to_overworld_2_switch
@@ -7083,7 +7083,7 @@ sub_812A3D4: @ 812A3D4
adds r1, r2
ldrb r1, [r1]
lsls r1, 5
ldr r2, =gUnknown_085A5C09
ldr r2, =gDecorations + 1
adds r1, r2
bl StringCopy
ldr r4, =gStringVar4
asm/egg_hatch.s
-1801
View File
File diff suppressed because it is too large Load Diff
asm/evolution_scene.s
+85 -85
View File
@@ -170,15 +170,15 @@ evolution_cutscene: @ 813DA8C
strh r2, [r0]
ldr r0, =gUnknown_02022E16
strh r2, [r0]
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r2, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r2, [r0]
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
strh r2, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r2, [r0]
ldr r1, =gUnknown_02022E20
ldr r1, =gBattle_BG3_X
movs r2, 0x80
lsls r2, 1
adds r0, r2, 0
@@ -186,7 +186,7 @@ evolution_cutscene: @ 813DA8C
ldr r0, =gUnknown_02022E22
movs r1, 0
strh r1, [r0]
ldr r1, =gUnknown_02022FF0
ldr r1, =gBattleTerrain
movs r0, 0x9
strb r0, [r1]
bl c2_berry_program_update_menu
@@ -464,22 +464,22 @@ sub_813DD7C: @ 813DD7C
strh r4, [r0]
ldr r0, =gUnknown_02022E16
strh r4, [r0]
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r4, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r4, [r0]
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
strh r4, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r4, [r0]
ldr r1, =gUnknown_02022E20
ldr r1, =gBattle_BG3_X
movs r2, 0x80
lsls r2, 1
adds r0, r2, 0
strh r0, [r1]
ldr r0, =gUnknown_02022E22
strh r4, [r0]
ldr r1, =gUnknown_02022FF0
ldr r1, =gBattleTerrain
movs r0, 0x9
strb r0, [r1]
bl c2_berry_program_update_menu
@@ -634,15 +634,15 @@ _0813DFE0:
strh r1, [r0]
ldr r0, =gUnknown_02022E16
strh r1, [r0]
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r1, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r1, [r0]
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
strh r1, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r1, [r0]
ldr r2, =gUnknown_02022E20
ldr r2, =gBattle_BG3_X
movs r3, 0x80
lsls r3, 1
adds r0, r3, 0
@@ -945,15 +945,15 @@ sub_813E1D4: @ 813E1D4
strh r4, [r0]
ldr r0, =gUnknown_02022E16
strh r4, [r0]
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r4, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r4, [r0]
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
strh r4, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r4, [r0]
ldr r1, =gUnknown_02022E20
ldr r1, =gBattle_BG3_X
movs r2, 0x80
lsls r2, 1
adds r0, r2, 0
@@ -1338,7 +1338,7 @@ _0813E6E4:
bl StringExpandPlaceholders
adds r0, r4, 0
movs r1, 0
bl battle_show_message_maybe
bl sub_814F9EC
ldr r0, =gTasks
mov r2, r8
adds r1, r2, r7
@@ -1626,7 +1626,7 @@ _0813E99E:
bl StringExpandPlaceholders
adds r0, r4, 0
movs r1, 0
bl battle_show_message_maybe
bl sub_814F9EC
ldr r0, =0x00000173
bl PlayBGM
ldr r2, =gTasks
@@ -1868,7 +1868,7 @@ _0813EBE4:
_0813EBEC:
ldr r0, =gStringVar4
movs r1, 0
bl battle_show_message_maybe
bl sub_814F9EC
ldr r1, =gTasks
mov r2, r8
adds r0, r2, r7
@@ -1892,15 +1892,15 @@ _0813EC1E:
beq _0813EC2A
b _0813F1A4
_0813EC2A:
bl sub_804F574
bl BufferMoveToLearnIntoBattleTextBuff2
ldr r0, =0x0000016f
bl PlayFanfare
ldr r0, =gBattleStringsTable
ldr r0, [r0, 0xC]
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl battle_show_message_maybe
bl sub_814F9EC
ldr r0, =gTasks
mov r3, r8
adds r1, r3, r7
@@ -1991,13 +1991,13 @@ _0813ED0A:
beq _0813ED16
b _0813F1A4
_0813ED16:
bl sub_804F574
bl BufferMoveToLearnIntoBattleTextBuff2
ldr r0, =gBattleStringsTable
ldr r0, [r0, 0x10]
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl battle_show_message_maybe
bl sub_814F9EC
ldr r0, =gTasks
mov r2, r8
adds r1, r2, r7
@@ -2023,10 +2023,10 @@ _0813ED56:
_0813ED62:
ldr r0, =gBattleStringsTable
ldr r0, [r0, 0x14]
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl battle_show_message_maybe
bl sub_814F9EC
ldr r0, =gTasks
mov r3, r8
adds r1, r3, r7
@@ -2048,10 +2048,10 @@ _0813ED90:
bne _0813EDCE
ldr r0, =gBattleStringsTable
ldr r0, [r0, 0x18]
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl battle_show_message_maybe
bl sub_814F9EC
ldr r0, =gTasks
mov r2, r8
adds r1, r2, r7
@@ -2087,7 +2087,7 @@ _0813EDEA:
bl sub_8056A3C
ldr r0, =gText_BattleYesNoChoice
movs r1, 0xC
bl battle_show_message_maybe
bl sub_814F9EC
ldr r0, =gTasks
mov r3, r8
adds r1, r3, r7
@@ -2100,7 +2100,7 @@ _0813EDEA:
ldr r0, =gBattleCommunication
strb r2, [r0, 0x1]
movs r0, 0
bl sub_8056B74
bl BattleCreateCursorAt
b _0813F1A4
.pool
_0813EE34:
@@ -2117,10 +2117,10 @@ _0813EE34:
movs r0, 0x5
bl PlaySE
ldrb r0, [r4, 0x1]
bl sub_8056BAC
bl BattleDestroyCursorAt
movs r0, 0
strb r0, [r4, 0x1]
bl sub_8056B74
bl BattleCreateCursorAt
_0813EE5C:
ldr r0, =gMain
ldrh r1, [r0, 0x2E]
@@ -2135,10 +2135,10 @@ _0813EE5C:
movs r0, 0x5
bl PlaySE
ldrb r0, [r4, 0x1]
bl sub_8056BAC
bl BattleDestroyCursorAt
movs r0, 0x1
strb r0, [r4, 0x1]
bl sub_8056B74
bl BattleCreateCursorAt
_0813EE84:
ldr r0, =gMain
ldrh r1, [r0, 0x2E]
@@ -2289,10 +2289,10 @@ _0813EFC8:
ldr r3, =0x000004cc
adds r0, r3
ldr r0, [r0]
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl battle_show_message_maybe
bl sub_814F9EC
ldr r1, =gTasks
mov r2, r8
adds r0, r2, r7
@@ -2338,10 +2338,10 @@ _0813F05C:
lsls r1, 2
adds r0, r1
ldr r0, [r0]
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl battle_show_message_maybe
bl sub_814F9EC
ldr r0, =gTasks
mov r2, r8
adds r1, r2, r7
@@ -2367,10 +2367,10 @@ _0813F09E:
_0813F0AA:
ldr r0, =gBattleStringsTable
ldr r0, [r0, 0x1C]
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl battle_show_message_maybe
bl sub_814F9EC
ldr r0, =gTasks
mov r3, r8
adds r1, r3, r7
@@ -2395,10 +2395,10 @@ _0813F0D8:
lsls r1, 2
adds r0, r1
ldr r0, [r0]
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl battle_show_message_maybe
bl sub_814F9EC
ldr r1, =gTasks
mov r2, r8
adds r0, r2, r7
@@ -2411,10 +2411,10 @@ _0813F0D8:
_0813F120:
ldr r0, =gBattleStringsTable
ldr r0, [r0, 0x20]
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl battle_show_message_maybe
bl sub_814F9EC
ldr r1, =gTasks
mov r3, r8
adds r0, r3, r7
@@ -2431,10 +2431,10 @@ _0813F120:
_0813F154:
ldr r0, =gBattleStringsTable
ldr r0, [r0, 0x24]
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl battle_show_message_maybe
bl sub_814F9EC
ldr r1, =gTasks
mov r2, r8
adds r0, r2, r7
@@ -3059,12 +3059,12 @@ _0813F756:
beq _0813F762
b _0813FCC4
_0813F762:
bl sub_804F574
bl BufferMoveToLearnIntoBattleTextBuff2
ldr r0, =0x0000016f
bl PlayFanfare
ldr r0, =gBattleStringsTable
ldr r0, [r0, 0xC]
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
@@ -3160,10 +3160,10 @@ _0813F846:
beq _0813F852
b _0813FCC4
_0813F852:
bl sub_804F574
bl BufferMoveToLearnIntoBattleTextBuff2
ldr r0, =gBattleStringsTable
ldr r0, [r0, 0x10]
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
@@ -3193,7 +3193,7 @@ _0813F892:
_0813F89E:
ldr r0, =gBattleStringsTable
ldr r0, [r0, 0x14]
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
@@ -3219,7 +3219,7 @@ _0813F8CC:
bne _0813F90C
ldr r0, =gBattleStringsTable
ldr r0, [r0, 0x18]
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
@@ -3299,7 +3299,7 @@ _0813F98C:
lsls r1, 3
adds r0, r1
ldr r0, [r0]
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
@@ -3336,7 +3336,7 @@ _0813F9E4:
lsls r1, 3
adds r0, r1
ldr r0, [r0]
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
@@ -3441,7 +3441,7 @@ _0813FAEC:
ldr r1, =0x000004cc
adds r0, r1
ldr r0, [r0]
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
@@ -3481,7 +3481,7 @@ _0813FB3C:
lsls r1, 2
adds r0, r1
ldr r0, [r0]
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
@@ -3511,7 +3511,7 @@ _0813FBB2:
_0813FBBE:
ldr r0, =gBattleStringsTable
ldr r0, [r0, 0x1C]
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
@@ -3540,7 +3540,7 @@ _0813FBEC:
lsls r1, 2
adds r0, r1
ldr r0, [r0]
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
@@ -3557,7 +3557,7 @@ _0813FBEC:
_0813FC38:
ldr r0, =gBattleStringsTable
ldr r0, [r0, 0x20]
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
@@ -3578,7 +3578,7 @@ _0813FC38:
_0813FC70:
ldr r0, =gBattleStringsTable
ldr r0, [r0, 0x24]
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
@@ -3638,23 +3638,23 @@ sub_813FCDC: @ 813FCDC
ldrh r1, [r0]
movs r0, 0x12
bl SetGpuReg
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
ldrh r1, [r0]
movs r0, 0x14
bl SetGpuReg
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
ldrh r1, [r0]
movs r0, 0x16
bl SetGpuReg
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
ldrh r1, [r0]
movs r0, 0x18
bl SetGpuReg
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
ldrh r1, [r0]
movs r0, 0x1A
bl SetGpuReg
ldr r0, =gUnknown_02022E20
ldr r0, =gBattle_BG3_X
ldrh r1, [r0]
movs r0, 0x1C
bl SetGpuReg
@@ -3682,23 +3682,23 @@ sub_813FD64: @ 813FD64
ldrh r1, [r0]
movs r0, 0x12
bl SetGpuReg
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
ldrh r1, [r0]
movs r0, 0x14
bl SetGpuReg
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
ldrh r1, [r0]
movs r0, 0x16
bl SetGpuReg
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
ldrh r1, [r0]
movs r0, 0x18
bl SetGpuReg
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
ldrh r1, [r0]
movs r0, 0x1A
bl SetGpuReg
ldr r0, =gUnknown_02022E20
ldr r0, =gBattle_BG3_X
ldrh r1, [r0]
movs r0, 0x1C
bl SetGpuReg
@@ -3852,9 +3852,9 @@ sub_813FEE8: @ 813FEE8
push {r6,r7}
lsls r0, 24
lsrs r5, r0, 24
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
mov r8, r0
ldr r1, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_Y
mov r9, r1
ldr r1, =gTasks
lsls r0, r5, 2
@@ -3865,12 +3865,12 @@ sub_813FEE8: @ 813FEE8
ldrsh r0, [r0, r2]
cmp r0, 0
bne _0813FF28
ldr r7, =gUnknown_02022E1C
ldr r6, =gUnknown_02022E1E
ldr r7, =gBattle_BG2_X
ldr r6, =gBattle_BG2_Y
b _0813FF2C
.pool
_0813FF28:
ldr r7, =gUnknown_02022E20
ldr r7, =gBattle_BG3_X
ldr r6, =gUnknown_02022E22
_0813FF2C:
lsls r4, r5, 2
@@ -4130,12 +4130,12 @@ sub_8140174: @ 8140174
movs r0, 0x50
movs r1, 0
bl SetGpuReg
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
movs r1, 0
strh r1, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r1, [r0]
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
strh r1, [r0]
movs r0, 0x1
movs r1, 0x5
asm/field_control_avatar.s
+49 -49
View File
@@ -51,7 +51,7 @@ process_overworld_input: @ 809BF08
bl cur_mapdata_block_role_at_player_pos
lsls r0, 24
lsrs r0, 24
bl sub_808904C
bl MetatileBehavior_IsMoveTile
lsls r0, 24
lsrs r7, r0, 24
cmp r6, 0x2
@@ -831,7 +831,7 @@ _0809C55C:
.pool
_0809C574:
adds r0, r5, 0
bl is_tile_x8B
bl MetatileBehavior_IsClosedSootopolisGymDoor
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -841,7 +841,7 @@ _0809C574:
.pool
_0809C58C:
adds r0, r5, 0
bl is_tile_xEA
bl MetatileBehavior_IsUnknownClosedDoor
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -851,7 +851,7 @@ _0809C58C:
.pool
_0809C5A4:
adds r0, r5, 0
bl is_tile_x84
bl MetatileBehavior_IsCableBoxResults1
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -859,7 +859,7 @@ _0809C5A4:
b _0809C6E4
_0809C5B4:
adds r0, r5, 0
bl is_tile_x87
bl MetatileBehavior_IsPokeblockFeeder
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -869,7 +869,7 @@ _0809C5B4:
.pool
_0809C5CC:
adds r0, r5, 0
bl is_tile_x8C
bl MetatileBehavior_IsTrickHousePuzzleDoor
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -879,7 +879,7 @@ _0809C5CC:
.pool
_0809C5E4:
adds r0, r5, 0
bl is_tile_x85
bl MetatileBehavior_IsRegionMap
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -889,7 +889,7 @@ _0809C5E4:
.pool
_0809C5FC:
adds r0, r5, 0
bl sub_8089A1C
bl MetatileBehavior_IsRunningShoesInstruction
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -899,7 +899,7 @@ _0809C5FC:
.pool
_0809C614:
adds r0, r5, 0
bl sub_8089A30
bl MetatileBehavior_IsPictureBookShelf
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -909,7 +909,7 @@ _0809C614:
.pool
_0809C62C:
adds r0, r5, 0
bl sub_8089A44
bl MetatileBehavior_IsBookShelf
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -919,7 +919,7 @@ _0809C62C:
.pool
_0809C644:
adds r0, r5, 0
bl sub_8089A58
bl MetatileBehavior_IsPokeCenterBookShelf
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -929,7 +929,7 @@ _0809C644:
.pool
_0809C65C:
adds r0, r5, 0
bl sub_8089A6C
bl MetatileBehavior_IsVase
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -939,7 +939,7 @@ _0809C65C:
.pool
_0809C674:
adds r0, r5, 0
bl sub_8089A80
bl MetatileBehavior_IsTrashCan
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -949,7 +949,7 @@ _0809C674:
.pool
_0809C68C:
adds r0, r5, 0
bl sub_8089A94
bl MetatileBehavior_IsShopShelf
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -959,7 +959,7 @@ _0809C68C:
.pool
_0809C6A4:
adds r0, r5, 0
bl sub_8089AA8
bl MetatileBehavior_IsBlueprint
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -970,7 +970,7 @@ _0809C6A4:
_0809C6BC:
adds r0, r5, 0
adds r1, r4, 0
bl sub_8089AD0
bl MetatileBehavior_IsPlayerFacingWirelessBoxResults
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -981,7 +981,7 @@ _0809C6BC:
_0809C6D4:
adds r0, r5, 0
adds r1, r4, 0
bl sub_8089AEC
bl MetatileBehavior_IsCableBoxResults2
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1023,7 +1023,7 @@ _0809C71C:
cmp r4, r0
bne _0809C7D0
adds r0, r5, 0
bl sub_8089288
bl MetatileBehavior_IsSecretBasePC
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1033,7 +1033,7 @@ _0809C71C:
.pool
_0809C74C:
adds r0, r5, 0
bl sub_808929C
bl MetatileBehavior_IsSecretBaseRegisterPC
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1043,7 +1043,7 @@ _0809C74C:
.pool
_0809C764:
adds r0, r5, 0
bl sub_80893DC
bl MetatileBehavior_IsMB_BF
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1053,7 +1053,7 @@ _0809C764:
.pool
_0809C77C:
adds r0, r5, 0
bl sub_80893F0
bl MetatileBehavior_IsSecretBaseTvOrShield
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1063,7 +1063,7 @@ _0809C77C:
.pool
_0809C794:
adds r0, r5, 0
bl sub_80892EC
bl MetatileBehavior_IsMB_C6
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1072,7 +1072,7 @@ _0809C794:
b _0809C7E2
_0809C7A8:
adds r0, r5, 0
bl sub_8089364
bl MetatileBehavior_IsMB_C3
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1081,7 +1081,7 @@ _0809C7A8:
b _0809C7E2
_0809C7BC:
adds r0, r5, 0
bl sub_8089350
bl MetatileBehavior_IsMB_B5
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1090,7 +1090,7 @@ _0809C7BC:
b _0809C7E2
_0809C7D0:
adds r0, r5, 0
bl sub_8089300
bl MetatileBehavior_IsSecretBasePoster
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1297,7 +1297,7 @@ sub_809C96C: @ 809C96C
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl sub_8089918
bl MetatileBehavior_IsCrackedFloorHole
lsls r0, 24
cmp r0, 0
beq _0809C988
@@ -1306,7 +1306,7 @@ sub_809C96C: @ 809C96C
.pool
_0809C988:
adds r0, r4, 0
bl sub_8089ABC
bl MetatileBehavior_IsBattlePyramidWarp
lsls r0, 24
cmp r0, 0
beq _0809C9A4
@@ -1318,7 +1318,7 @@ _0809C996:
.pool
_0809C9A4:
adds r0, r4, 0
bl sub_80893C8
bl MetatileBehavior_IsSecretBaseGlitterMat
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1327,7 +1327,7 @@ _0809C9A4:
b _0809C9E8
_0809C9B8:
adds r0, r4, 0
bl sub_80893B4
bl MetatileBehavior_IsSecretBaseSoundMat
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1376,7 +1376,7 @@ _0809CA04:
bne _0809CAF8
lsls r0, r4, 24
lsrs r0, 24
bl sub_808904C
bl MetatileBehavior_IsMoveTile
lsls r0, 24
cmp r0, 0
bne _0809CAF8
@@ -1467,7 +1467,7 @@ _0809CAF8:
cmp r0, 0x1
beq _0809CB28
movs r0, 0x1
bl sub_8137FC0
bl CountSSTidalStep
cmp r0, 0x1
bne _0809CB1C
ldr r0, =gUnknown_0823C050
@@ -1719,7 +1719,7 @@ sub_809CC9C: @ 809CC9C
.pool
_0809CCF8:
adds r0, r4, 0
bl sub_8089870
bl MetatileBehavior_IsLavaridgeB1FWarp
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1729,7 +1729,7 @@ _0809CCF8:
b _0809CD8C
_0809CD0E:
adds r0, r4, 0
bl is_role_x68
bl MetatileBehavior_IsLavaridge1FWarp
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1749,7 +1749,7 @@ _0809CD24:
b _0809CD8C
_0809CD3A:
adds r0, r4, 0
bl sub_80898AC
bl MetatileBehavior_IsWarpOrBridge
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1759,7 +1759,7 @@ _0809CD3A:
b _0809CD8C
_0809CD50:
adds r0, r4, 0
bl sub_8089904
bl MetatileBehavior_IsMtPyreHole
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1771,7 +1771,7 @@ _0809CD50:
.pool
_0809CD6C:
adds r0, r4, 0
bl sub_80898C0
bl MetatileBehavior_IsMossdeepGymWarp
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1797,7 +1797,7 @@ is_warp_tile: @ 809CD94
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl is_tile_x69_2_warp_door
bl MetatileBehavior_IsWarpDoor
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1815,19 +1815,19 @@ is_warp_tile: @ 809CD94
cmp r0, 0x1
beq _0809CE2A
adds r0, r4, 0
bl sub_8088F58
bl MetatileBehavior_IsNonAnimDoor
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _0809CE2A
adds r0, r4, 0
bl sub_8089870
bl MetatileBehavior_IsLavaridgeB1FWarp
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _0809CE2A
adds r0, r4, 0
bl is_role_x68
bl MetatileBehavior_IsLavaridge1FWarp
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1839,19 +1839,19 @@ is_warp_tile: @ 809CD94
cmp r0, 0x1
beq _0809CE2A
adds r0, r4, 0
bl sub_8089904
bl MetatileBehavior_IsMtPyreHole
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _0809CE2A
adds r0, r4, 0
bl sub_80898C0
bl MetatileBehavior_IsMossdeepGymWarp
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _0809CE2A
adds r0, r4, 0
bl sub_80898AC
bl MetatileBehavior_IsWarpOrBridge
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2048,7 +2048,7 @@ map_warp_consider_2_to_inside: @ 809CF78
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl sub_8089210
bl MetatileBehavior_IsSecretBaseOpen
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2062,7 +2062,7 @@ map_warp_consider_2_to_inside: @ 809CF78
.pool
_0809CFB0:
adds r0, r4, 0
bl is_tile_x69_2_warp_door
bl MetatileBehavior_IsWarpDoor
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2322,7 +2322,7 @@ dive_warp: @ 809D16C
bne _0809D1A4
lsls r0, r5, 24
lsrs r0, 24
bl sub_80895D0
bl MetatileBehavior_IsUnableToEmerge
lsls r0, 24
cmp r0, 0
bne _0809D1A4
@@ -2340,7 +2340,7 @@ dive_warp: @ 809D16C
_0809D1A4:
lsls r0, r5, 24
lsrs r0, 24
bl sub_80895B0
bl MetatileBehavior_IsDiveable
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2394,7 +2394,7 @@ sub_809D1E8: @ 809D1E8
cmp r0, 0x5
bne _0809D244
adds r0, r5, 0
bl sub_80895D0
bl MetatileBehavior_IsUnableToEmerge
lsls r0, 24
cmp r0, 0
bne _0809D244
@@ -2417,7 +2417,7 @@ sub_809D1E8: @ 809D1E8
.pool
_0809D244:
adds r0, r5, 0
bl sub_80895B0
bl MetatileBehavior_IsDiveable
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
asm/field_door.s
+4 -4
View File
@@ -589,7 +589,7 @@ sub_808A854: @ 808A854
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl sub_8088EFC
bl MetatileBehavior_IsDoor
lsls r0, 24
cmp r0, 0
beq _0808A876
@@ -612,7 +612,7 @@ sub_808A880: @ 808A880
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl sub_8088EFC
bl MetatileBehavior_IsDoor
lsls r0, 24
cmp r0, 0
beq _0808A8A2
@@ -635,7 +635,7 @@ sub_808A8AC: @ 808A8AC
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl sub_8088EFC
bl MetatileBehavior_IsDoor
lsls r0, 24
cmp r0, 0
beq _0808A8D8
@@ -664,7 +664,7 @@ task_overworld_door_add_if_role_69_for_opening_door_at: @ 808A8E4
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl sub_8088EFC
bl MetatileBehavior_IsDoor
lsls r0, 24
cmp r0, 0
beq _0808A910
asm/field_effect.s
+14 -14
View File
@@ -1945,7 +1945,7 @@ sub_80B69DC: @ 80B69DC
push {lr}
ldr r0, =c2_exit_to_overworld_2_switch
bl SetMainCallback2
ldr r1, =gUnknown_03005DAC
ldr r1, =gFieldCallback
ldr r0, =mapldr_080842E8
str r0, [r1]
pop {r0}
@@ -1962,7 +1962,7 @@ mapldr_080842E8: @ 80B69FC
bl CreateTask
bl ScriptContext2_Enable
bl player_bitmagic
ldr r1, =gUnknown_03005DAC
ldr r1, =gFieldCallback
movs r0, 0
str r0, [r1]
pop {r0}
@@ -2012,7 +2012,7 @@ _080B6A64:
bl warp_in
ldr r0, =c2_load_new_map
bl SetMainCallback2
ldr r1, =gUnknown_03005DAC
ldr r1, =gFieldCallback
ldr r0, =mapldr_08084390
str r0, [r1]
adds r0, r5, 0
@@ -2058,7 +2058,7 @@ mapldr_08084390: @ 80B6AA4
_080B6AE6:
bl ScriptContext2_Enable
bl player_bitmagic
ldr r1, =gUnknown_03005DAC
ldr r1, =gFieldCallback
movs r0, 0
str r0, [r1]
pop {r4}
@@ -2120,7 +2120,7 @@ sub_80B6B68: @ 80B6B68
ldr r0, =sub_80B6B94
movs r1, 0
bl CreateTask
ldr r1, =gUnknown_03005DAC
ldr r1, =gFieldCallback
movs r0, 0
str r0, [r1]
pop {r0}
@@ -2761,7 +2761,7 @@ sub_80B7060: @ 80B7060
bne _080B709C
bl sub_80E1570
bl warp_in
ldr r1, =gUnknown_03005DAC
ldr r1, =gFieldCallback
ldr r0, =sub_80B70B4
str r0, [r1]
ldr r0, =c2_load_new_map
@@ -2786,7 +2786,7 @@ sub_80B70B4: @ 80B70B4
ldr r0, =sub_80B70DC
movs r1, 0
bl CreateTask
ldr r1, =gUnknown_03005DAC
ldr r1, =gFieldCallback
movs r0, 0
str r0, [r1]
pop {r0}
@@ -3727,7 +3727,7 @@ sub_80B7814: @ 80B7814
cmp r0, 0x1
bne _080B784C
bl warp_in
ldr r1, =gUnknown_03005DAC
ldr r1, =gFieldCallback
ldr r0, =mapldr_080851BC
str r0, [r1]
ldr r0, =c2_load_new_map
@@ -3750,7 +3750,7 @@ mapldr_080851BC: @ 80B7868
bl sub_8085784
bl pal_fill_for_maplights
bl ScriptContext2_Enable
ldr r0, =gUnknown_03005DAC
ldr r0, =gFieldCallback
movs r1, 0
str r1, [r0]
ldr r0, =sub_80B7890
@@ -4202,7 +4202,7 @@ sub_80B7BF4: @ 80B7BF4
cmp r0, 0x1
bne _080B7C2C
bl warp_in
ldr r1, =gUnknown_03005DAC
ldr r1, =gFieldCallback
ldr r0, =sub_80B6B68
str r0, [r1]
ldr r0, =c2_load_new_map
@@ -4399,7 +4399,7 @@ _080B7D86:
bl FieldObjectSetDirection
bl sub_8084E14
bl warp_in
ldr r1, =gUnknown_03005DAC
ldr r1, =gFieldCallback
ldr r0, =mapldr_080859D4
str r0, [r1]
ldr r0, =c2_load_new_map
@@ -4462,7 +4462,7 @@ mapldr_080859D4: @ 80B7E48
bl pal_fill_for_maplights
bl ScriptContext2_Enable
bl player_bitmagic
ldr r1, =gUnknown_03005DAC
ldr r1, =gFieldCallback
movs r0, 0
str r0, [r1]
ldr r2, =gMapObjects
@@ -4885,7 +4885,7 @@ _080B81B8:
bl warp_in
ldr r0, =c2_load_new_map
bl SetMainCallback2
ldr r1, =gUnknown_03005DAC
ldr r1, =gFieldCallback
ldr r0, =mapldr_08085D88
str r0, [r1]
ldr r0, =sub_80B7FDC
@@ -4907,7 +4907,7 @@ mapldr_08085D88: @ 80B8200
bl pal_fill_for_maplights
bl ScriptContext2_Enable
bl player_bitmagic
ldr r1, =gUnknown_03005DAC
ldr r1, =gFieldCallback
movs r0, 0
str r0, [r1]
ldr r2, =gMapObjects
asm/field_effect_helpers.s
+3 -3
View File
@@ -130,13 +130,13 @@ npc_pal_op: @ 8153FAC
cmp r0, 0
bne _08154008
ldrb r0, [r5, 0x1F]
bl sub_80894D4
bl MetatileBehavior_GetBridgeSth
lsls r0, 24
lsrs r0, 24
cmp r0, 0
bne _08153FEE
ldrb r0, [r5, 0x1E]
bl sub_80894D4
bl MetatileBehavior_GetBridgeSth
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -702,7 +702,7 @@ _08154412:
cmp r0, r1
bne _08154490
ldrb r0, [r4, 0x1E]
bl sub_8088E64
bl MetatileBehavior_IsPokeGrass
lsls r0, 24
cmp r0, 0
bne _08154490
asm/field_player_avatar.s
+2 -2
View File
@@ -1223,7 +1223,7 @@ sub_808B238: @ 808B238
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl sub_8088F58
bl MetatileBehavior_IsNonAnimDoor
lsls r0, 24
cmp r0, 0
bne _0808B2D8
@@ -2255,7 +2255,7 @@ PlayCollisionSoundIfNotFacingWarp: @ 808B9EC
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl is_tile_x69_2_warp_door
bl MetatileBehavior_IsWarpDoor
lsls r0, 24
cmp r0, 0
bne _0808BA54
asm/field_screen.s
+13 -13
View File
@@ -8248,7 +8248,7 @@ sub_80AF334: @ 80AF334
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl sub_8088EFC
bl MetatileBehavior_IsDoor
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -8258,7 +8258,7 @@ sub_80AF334: @ 80AF334
.pool
_080AF36C:
adds r0, r4, 0
bl sub_8088F58
bl MetatileBehavior_IsNonAnimDoor
lsls r0, 24
lsrs r0, 24
ldr r1, =task_map_chg_seq_0807E2CC
@@ -8725,7 +8725,7 @@ sub_80AF734: @ 80AF734
bl play_some_sound
movs r0, 0x9
bl PlaySE
ldr r0, =gUnknown_03005DAC
ldr r0, =gFieldCallback
ldr r1, =mapldr_default
str r1, [r0]
ldr r0, =sub_80AFA0C
@@ -8743,7 +8743,7 @@ sp13E_warp_to_last_warp: @ 80AF76C
bl music_something
bl sub_80AF0B4
bl play_some_sound
ldr r0, =gUnknown_03005DAC
ldr r0, =gFieldCallback
ldr r1, =mapldr_default
str r1, [r0]
ldr r0, =sub_80AFA0C
@@ -8763,7 +8763,7 @@ sub_80AF79C: @ 80AF79C
movs r1, 0x8
bl fade_screen
bl play_some_sound
ldr r0, =gUnknown_03005DAC
ldr r0, =gFieldCallback
ldr r1, =sub_80AF3B0
str r1, [r0]
ldr r0, =sub_80AFA0C
@@ -8778,7 +8778,7 @@ sub_80AF79C: @ 80AF79C
sub_80AF7D0: @ 80AF7D0
push {lr}
bl ScriptContext2_Enable
ldr r0, =gUnknown_03005DAC
ldr r0, =gFieldCallback
ldr r1, =mapldr_default
str r1, [r0]
ldr r0, =sub_80AFA88
@@ -8793,7 +8793,7 @@ sub_80AF7D0: @ 80AF7D0
sp13F_fall_to_last_warp: @ 80AF7F4
push {lr}
bl sp13E_warp_to_last_warp
ldr r1, =gUnknown_03005DAC
ldr r1, =gFieldCallback
ldr r0, =sub_80B6B68
str r0, [r1]
pop {r0}
@@ -8847,7 +8847,7 @@ sub_80AF848: @ 80AF848
ldr r0, =sub_80AFA0C
movs r1, 0xA
bl CreateTask
ldr r1, =gUnknown_03005DAC
ldr r1, =gFieldCallback
ldr r0, =sub_80AF3E8
str r0, [r1]
pop {r0}
@@ -8869,7 +8869,7 @@ sub_80AF87C: @ 80AF87C
ldr r0, =sub_80AFA0C
movs r1, 0xA
bl CreateTask
ldr r1, =gUnknown_03005DAC
ldr r1, =gFieldCallback
ldr r0, =sub_80AF40C
str r0, [r1]
pop {r0}
@@ -8885,7 +8885,7 @@ sub_80AF8B8: @ 80AF8B8
ldr r0, =sub_80AFA0C
movs r1, 0xA
bl CreateTask
ldr r1, =gUnknown_03005DAC
ldr r1, =gFieldCallback
ldr r0, =sub_80FB768
str r0, [r1]
pop {r0}
@@ -9328,7 +9328,7 @@ sub_80AFC60: @ 80AFC60
bl play_some_sound
movs r0, 0x9
bl PlaySE
ldr r0, =gUnknown_03005DAC
ldr r0, =gFieldCallback
ldr r1, =sub_80AF3C8
str r1, [r0]
ldr r0, =task0A_fade_n_map_maybe
@@ -10078,7 +10078,7 @@ sub_80B0244: @ 80B0244
ldr r0, =sub_80AFA0C
movs r1, 0xA
bl CreateTask
ldr r1, =gUnknown_03005DAC
ldr r1, =gFieldCallback
ldr r0, =sub_80AF3E8
str r0, [r1]
pop {r0}
@@ -10090,7 +10090,7 @@ sub_80B0244: @ 80B0244
sub_80B0268: @ 80B0268
push {lr}
bl ScriptContext2_Enable
ldr r0, =gUnknown_03005DAC
ldr r0, =gFieldCallback
ldr r1, =mapldr_default
str r1, [r0]
ldr r0, =sub_80B01BC
asm/field_tasks.s
+16 -16
View File
@@ -221,7 +221,7 @@ sub_809DA30: @ 809DA30
lsls r1, 24
lsrs r4, r1, 24
adds r0, r4, 0
bl sub_8089764
bl MetatileBehavior_IsPacifilogVerticalLog1
lsls r0, 24
cmp r0, 0
beq _0809DA48
@@ -229,7 +229,7 @@ sub_809DA30: @ 809DA30
b _0809DA80
_0809DA48:
adds r0, r4, 0
bl sub_8089778
bl MetatileBehavior_IsPacifilogVerticalLog2
lsls r0, 24
cmp r0, 0
beq _0809DA5A
@@ -238,7 +238,7 @@ _0809DA48:
b _0809DA80
_0809DA5A:
adds r0, r4, 0
bl sub_808978C
bl MetatileBehavior_IsPacifilogHorizontalLog1
lsls r0, 24
cmp r0, 0
beq _0809DA6C
@@ -247,7 +247,7 @@ _0809DA5A:
b _0809DA80
_0809DA6C:
adds r0, r4, 0
bl sub_80897A0
bl MetatileBehavior_IsPacifilogHorizontalLog2
lsls r0, 24
cmp r0, 0
bne _0809DA7C
@@ -414,7 +414,7 @@ sub_809DB7C: @ 809DB7C
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl sub_8089764
bl MetatileBehavior_IsPacifilogVerticalLog1
lsls r0, 24
cmp r0, 0
beq _0809DBC0
@@ -427,7 +427,7 @@ _0809DBBC:
b _0809DC08
_0809DBC0:
adds r0, r4, 0
bl sub_8089778
bl MetatileBehavior_IsPacifilogVerticalLog2
lsls r0, 24
cmp r0, 0
beq _0809DBD8
@@ -439,7 +439,7 @@ _0809DBC0:
b _0809DBBC
_0809DBD8:
adds r0, r4, 0
bl sub_808978C
bl MetatileBehavior_IsPacifilogHorizontalLog1
lsls r0, 24
cmp r0, 0
beq _0809DBF0
@@ -451,7 +451,7 @@ _0809DBD8:
b _0809DBBC
_0809DBF0:
adds r0, r4, 0
bl sub_80897A0
bl MetatileBehavior_IsPacifilogHorizontalLog2
lsls r0, 24
cmp r0, 0
beq _0809DC06
@@ -496,7 +496,7 @@ sub_809DC18: @ 809DC18
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl sub_8089764
bl MetatileBehavior_IsPacifilogVerticalLog1
lsls r0, 24
cmp r0, 0
beq _0809DC5C
@@ -509,7 +509,7 @@ _0809DC58:
b _0809DCA4
_0809DC5C:
adds r0, r4, 0
bl sub_8089778
bl MetatileBehavior_IsPacifilogVerticalLog2
lsls r0, 24
cmp r0, 0
beq _0809DC74
@@ -521,7 +521,7 @@ _0809DC5C:
b _0809DC58
_0809DC74:
adds r0, r4, 0
bl sub_808978C
bl MetatileBehavior_IsPacifilogHorizontalLog1
lsls r0, 24
cmp r0, 0
beq _0809DC8C
@@ -533,7 +533,7 @@ _0809DC74:
b _0809DC58
_0809DC8C:
adds r0, r4, 0
bl sub_80897A0
bl MetatileBehavior_IsPacifilogHorizontalLog2
lsls r0, 24
cmp r0, 0
beq _0809DCA2
@@ -1326,7 +1326,7 @@ _0809E29A:
lsls r4, 24
lsrs r4, 24
adds r0, r4, 0
bl sub_8089604
bl MetatileBehavior_IsThinIce
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1341,7 +1341,7 @@ _0809E29A:
.pool
_0809E2E0:
adds r0, r4, 0
bl sub_8089618
bl MetatileBehavior_IsCrackedIce
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1630,7 +1630,7 @@ _0809E53E:
lsls r0, r6, 24
lsrs r6, r0, 24
adds r0, r6, 0
bl sub_8089918
bl MetatileBehavior_IsCrackedFloorHole
lsls r0, 24
cmp r0, 0
beq _0809E556
@@ -1658,7 +1658,7 @@ _0809E572:
ldrh r0, [r4]
strh r0, [r5, 0x6]
adds r0, r6, 0
bl sub_808992C
bl MetatileBehavior_IsCrackedFloor
lsls r0, 24
cmp r0, 0
beq _0809E5D2
asm/fldeff_80F9BCC.s
+3 -3
View File
@@ -584,7 +584,7 @@ sub_80FA004: @ 80FA004
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl sub_808923C
bl MetatileBehavior_IsSecretBaseCave
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -599,7 +599,7 @@ sub_80FA004: @ 80FA004
.pool
_080FA070:
adds r0, r4, 0
bl sub_808925C
bl MetatileBehavior_IsSecretBaseTree
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -614,7 +614,7 @@ _080FA070:
.pool
_080FA0A0:
adds r0, r4, 0
bl is_tile_x98
bl MetatileBehavior_IsSecretBaseShrub
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
asm/fldeff_cut.s
+5 -5
View File
@@ -130,7 +130,7 @@ _080D37F6:
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl sub_8088E64
bl MetatileBehavior_IsPokeGrass
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -175,7 +175,7 @@ _080D3890:
movs r0, 0x1
strb r0, [r1]
adds r0, r4, 0
bl sub_80899F8
bl MetatileBehavior_IsCuttableGrass
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x1
@@ -309,7 +309,7 @@ _080D395A:
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl sub_8088E64
bl MetatileBehavior_IsPokeGrass
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -339,7 +339,7 @@ _080D39F4:
b _080D395A
_080D39F8:
adds r0, r4, 0
bl sub_80899F8
bl MetatileBehavior_IsCuttableGrass
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x1
@@ -1344,7 +1344,7 @@ sub_80D423C: @ 80D423C
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl MetatileBehavior_IsLongGrass2
bl MetatileBehavior_IsLongGrass_Duplicate
lsls r0, 24
cmp r0, 0
beq _080D42AE
asm/intro.s
+9 -9
View File
@@ -376,11 +376,11 @@ task_intro_1: @ 816CF18
movs r0, 0x12
movs r1, 0x28
bl SetGpuReg
ldr r0, =gUnknown_085E13B4
ldr r0, =gIntro1BGLeavesGfx
movs r1, 0xC0
lsls r1, 19
bl LZ77UnCompVram
ldr r0, =gUnknown_085E07C4
ldr r0, =gIntro1BG0_Tilemap
ldr r1, =0x06008000
bl LZ77UnCompVram
ldr r1, =0x06008800
@@ -393,7 +393,7 @@ task_intro_1: @ 816CF18
ldr r5, =0x81000400
str r5, [r4, 0x8]
ldr r0, [r4, 0x8]
ldr r0, =gUnknown_085E0B78
ldr r0, =gIntro1BG1_Tilemap
ldr r1, =0x06009000
bl LZ77UnCompVram
ldr r1, =0x06009800
@@ -403,7 +403,7 @@ task_intro_1: @ 816CF18
str r1, [r4, 0x4]
str r5, [r4, 0x8]
ldr r0, [r4, 0x8]
ldr r0, =gUnknown_085E0EAC
ldr r0, =gIntro1BG2_Tilemap
ldr r1, =0x0600a000
bl LZ77UnCompVram
ldr r1, =0x0600a800
@@ -413,7 +413,7 @@ task_intro_1: @ 816CF18
str r1, [r4, 0x4]
str r5, [r4, 0x8]
ldr r0, [r4, 0x8]
ldr r0, =gUnknown_085E119C
ldr r0, =gIntro1BG3_Tilemap
ldr r1, =0x0600b000
bl LZ77UnCompVram
ldr r1, =0x0600b800
@@ -423,7 +423,7 @@ task_intro_1: @ 816CF18
str r1, [r4, 0x4]
str r5, [r4, 0x8]
ldr r0, [r4, 0x8]
ldr r0, =gUnknown_085E05C4
ldr r0, =gIntro1BGPals
movs r5, 0x80
lsls r5, 2
movs r1, 0
@@ -1779,14 +1779,14 @@ task_intro_10: @ 816DBAC
lsls r5, 24
lsrs r5, 24
bl intro_reset_and_hide_bgs
ldr r0, =gUnknown_085E3854
ldr r0, =gIntro3Pokeball_Gfx
movs r1, 0xC0
lsls r1, 19
bl LZ77UnCompVram
ldr r0, =gUnknown_085E3724
ldr r0, =gIntro3Pokeball_Tilemap
ldr r1, =0x06004000
bl LZ77UnCompVram
ldr r0, =gUnknown_085E3524
ldr r0, =gIntro3PokeballPal
movs r2, 0x80
lsls r2, 2
movs r1, 0
asm/item_menu.s
+4 -4
View File
@@ -5744,7 +5744,7 @@ unknown_ItemMenu_Show: @ 81ADE38
thumb_func_start bag_menu_leave_maybe_3
bag_menu_leave_maybe_3: @ 81ADE6C
push {lr}
ldr r0, =gUnknown_03005DAC
ldr r0, =gFieldCallback
ldr r1, =sub_819FA50
str r1, [r0]
ldr r0, =c2_exit_to_overworld_2_switch
@@ -5779,7 +5779,7 @@ unknown_ItemMenu_Give2: @ 81ADE8C
thumb_func_start bag_menu_leave_maybe_2
bag_menu_leave_maybe_2: @ 81ADEBC
push {lr}
ldr r0, =gUnknown_03005DAC
ldr r0, =gFieldCallback
ldr r1, =sub_818DEF4
str r1, [r0]
ldr r0, =c2_exit_to_overworld_2_switch
@@ -5810,7 +5810,7 @@ unknown_ItemMenu_Confirm2: @ 81ADEDC
thumb_func_start bag_menu_leave_maybe
bag_menu_leave_maybe: @ 81ADF00
push {lr}
ldr r0, =gUnknown_03005DAC
ldr r0, =gFieldCallback
ldr r1, =sub_818E564
str r1, [r0]
ldr r0, =c2_exit_to_overworld_2_switch
@@ -6237,7 +6237,7 @@ bag_menu_AddMoney_window: @ 81AE268
adds r0, r4, 0
movs r1, 0x1
movs r2, 0xE
bl set_window_border_style_and_print_money_box
bl PrintMoneyAmountInMoneyBoxWithBorder
movs r0, 0x13
movs r1, 0xB
bl AddMoneyLabelObject
asm/item_use.s
+4 -4
View File
@@ -77,7 +77,7 @@ SetUpItemUseOnFieldCallback: @ 80FD0DC
ldrsh r0, [r0, r1]
cmp r0, 0x1
beq _080FD110
ldr r1, =gUnknown_03005DAC
ldr r1, =gFieldCallback
ldr r0, =MapPostLoadHook_UseItem
str r0, [r1]
adds r0, r2, 0
@@ -464,7 +464,7 @@ _080FD3EC:
_080FD40C:
lsls r0, r6, 24
lsrs r0, 24
bl sub_8089510
bl MetatileBehavior_8089510
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1477,7 +1477,7 @@ _080FDB98:
b _080FDBDA
.pool
_080FDBC8:
ldr r0, =gUnknown_03005DAC
ldr r0, =gFieldCallback
ldr r1, =sub_80AF6D4
str r1, [r0]
movs r0, 0x1
@@ -1630,7 +1630,7 @@ sub_80FDD10: @ 80FDD10
ldr r1, =gUnknown_0203A0F4
ldr r0, =sub_80FDD74
str r0, [r1]
ldr r1, =gUnknown_03005DAC
ldr r1, =gFieldCallback
ldr r0, =MapPostLoadHook_UseItem
str r0, [r1]
ldr r0, =gUnknown_0203CE54
asm/learn_move.s
+1 -1
View File
@@ -49,7 +49,7 @@ sub_8160664: @ 8160664
bne _08160688
ldr r0, =sub_81606A0
bl SetMainCallback2
ldr r1, =gUnknown_03005DAC
ldr r1, =gFieldCallback
ldr r0, =sub_80AF168
str r0, [r1]
adds r0, r4, 0
asm/link.s
+2 -2
View File
@@ -24689,7 +24689,7 @@ _08016502:
ldr r1, =gUnknown_02022C40
movs r0, 0x1
strh r0, [r1]
ldr r1, =gUnknown_03005DAC
ldr r1, =gFieldCallback
ldr r0, =sub_80AF128
str r0, [r1]
ldr r1, =c2_exit_to_overworld_2_switch
@@ -24987,7 +24987,7 @@ _0801677E:
lsls r0, 22
lsrs r0, 22
strh r0, [r2]
ldr r1, =gUnknown_03005DAC
ldr r1, =gFieldCallback
ldr r0, =sub_80AF128
str r0, [r1]
ldr r1, =c2_exit_to_overworld_2_switch
asm/macros.inc
+31
View File
@@ -20,12 +20,43 @@
.2byte \tag
.endm
.macro null_obj_tiles
obj_tiles 0, 0, 0
.endm
.macro obj_pal address, tag
.4byte \address
.2byte \tag
.2byte 0@ padding
.endm
.macro null_obj_pal
obj_pal 0, 0
.endm
.macro paired_pals tag, address
.2byte \tag
.2byte 0 @ padding
.4byte \address
.endm
@ For object animation frames.
.macro obj_frame_tiles address, uncompressed_size
.4byte \address
.2byte \uncompressed_size
.2byte 0 @ padding
.endm
.macro spr_template tile_tag, pal_tag, oam, anims, images, affine_anims, callback
.2byte \tile_tag
.2byte \pal_tag
.4byte \oam
.4byte \anims
.4byte \images
.4byte \affine_anims
.4byte \callback
.endm
@ Berry trees have a table defining the palette slot used for each of their 5
@ stages. However, the first 2 stages always use the same slots regardless of
@ the type of tree and the slots of the last 3 stages always equal each other.
asm/macros/window.inc
+4
View File
@@ -8,6 +8,10 @@
.2byte \vram_tile_offset
.endm
.macro window_template_terminator
window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000
.endm
.macro glyph_width_func font_id, func
.4byte \font_id
.4byte \func
asm/main_menu.s
+1 -1
View File
@@ -2951,7 +2951,7 @@ task_new_game_prof_birch_speech_17: @ 8031090
str r0, [sp, 0x4]
movs r0, 0
movs r3, 0
bl do_choose_name_or_words_screen
bl DoNamingScreen
_080310EC:
add sp, 0x8
pop {r4,r5}
asm/menu.s
+2 -2
View File
@@ -5201,7 +5201,7 @@ sub_819A25C: @ 819A25C
lsrs r4, 24
lsls r0, 16
lsrs r0, 16
bl sub_80D30B0
bl GetValidMonIconPalettePtr
adds r1, r4, 0
movs r2, 0x20
bl LoadPalette
@@ -5228,7 +5228,7 @@ sub_819A27C: @ 819A27C
lsls r5, 16
lsrs r5, 16
movs r2, 0x1
bl sub_80D2EDC
bl GetMonIconPtr
adds r1, r0, 0
movs r0, 0x20
str r0, [sp]
asm/metatile_behavior.s
-2610
View File
File diff suppressed because it is too large Load Diff
asm/money.s
-311
View File
@@ -1,311 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_80E51B0
sub_80E51B0: @ 80E51B0
push {lr}
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
movs r1, 0x92
lsls r1, 3
adds r0, r1
ldr r1, =gSpecialVar_0x8005
ldrh r1, [r1]
bl IsEnoughMoney
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
.pool
thumb_func_end sub_80E51B0
thumb_func_start sub_80E51D4
sub_80E51D4: @ 80E51D4
push {lr}
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
movs r1, 0x92
lsls r1, 3
adds r0, r1
ldr r1, =gSpecialVar_0x8005
ldrh r1, [r1]
bl SubtractMoney
pop {r0}
bx r0
.pool
thumb_func_end sub_80E51D4
thumb_func_start PrintMoneyAmountInMoneyBox
@ void PrintMoneyAmountInMoneyBox(u8 windowId, int amount, s8 a3)
PrintMoneyAmountInMoneyBox: @ 80E51F4
push {lr}
sub sp, 0x4
adds r3, r1, 0
lsls r0, 24
lsrs r0, 24
lsls r2, 24
lsrs r2, 24
str r2, [sp]
movs r1, 0x26
movs r2, 0x1
bl PrintMoneyAmount
add sp, 0x4
pop {r0}
bx r0
thumb_func_end PrintMoneyAmountInMoneyBox
thumb_func_start PrintMoneyAmount
@ void PrintMoneyAmount(u8 windowId, char x, char y, int amount, u8 a5)
PrintMoneyAmount: @ 80E5214
push {r4-r7,lr}
mov r7, r8
push {r7}
sub sp, 0xC
ldr r4, [sp, 0x24]
lsls r0, 24
lsrs r7, r0, 24
lsls r1, 24
lsrs r1, 24
mov r8, r1
lsls r2, 24
lsrs r6, r2, 24
lsls r4, 24
lsrs r5, r4, 24
ldr r4, =gStringVar1
adds r0, r4, 0
adds r1, r3, 0
movs r2, 0
movs r3, 0x6
bl ConvertIntToDecimalStringN
adds r0, r4, 0
bl StringLength
lsls r0, 16
lsrs r0, 16
movs r1, 0x6
subs r1, r0
ldr r2, =gStringVar4
adds r0, r1, 0
subs r1, 0x1
cmp r0, 0
ble _080E5264
movs r3, 0x77
_080E5258:
strb r3, [r2]
adds r2, 0x1
adds r0, r1, 0
subs r1, 0x1
cmp r0, 0
bgt _080E5258
_080E5264:
ldr r1, =gText_PokedollarVar1
adds r0, r2, 0
bl StringExpandPlaceholders
ldr r2, =gStringVar4
str r6, [sp]
str r5, [sp, 0x4]
movs r0, 0
str r0, [sp, 0x8]
adds r0, r7, 0
movs r1, 0x1
mov r3, r8
bl PrintTextOnWindow
add sp, 0xC
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end PrintMoneyAmount
thumb_func_start set_window_border_style_and_print_money_box
@ void set_window_border_style_and_print_money_box(u8 windowId, u16 tileStart, u8 palette, int amount)
set_window_border_style_and_print_money_box: @ 80E5298
push {r4-r6,lr}
mov r6, r8
push {r6}
adds r6, r0, 0
adds r4, r1, 0
adds r5, r2, 0
mov r8, r3
lsls r6, 24
lsrs r6, 24
lsls r4, 16
lsrs r4, 16
lsls r5, 24
lsrs r5, 24
adds r0, r6, 0
movs r1, 0
adds r2, r4, 0
adds r3, r5, 0
bl SetWindowBorderStyle
adds r0, r6, 0
mov r1, r8
movs r2, 0
bl PrintMoneyAmountInMoneyBox
pop {r3}
mov r8, r3
pop {r4-r6}
pop {r0}
bx r0
thumb_func_end set_window_border_style_and_print_money_box
thumb_func_start sub_80E52D4
sub_80E52D4: @ 80E52D4
push {lr}
adds r1, r0, 0
ldr r0, =gUnknown_02039F98
ldrb r0, [r0]
movs r2, 0
bl PrintMoneyAmountInMoneyBox
pop {r0}
bx r0
.pool
thumb_func_end sub_80E52D4
thumb_func_start sub_80E52EC
@ void sub_80E52EC(int money, int x, int y)
sub_80E52EC: @ 80E52EC
push {r4-r6,lr}
mov r6, r8
push {r6}
sub sp, 0x18
mov r8, r0
adds r4, r1, 0
adds r3, r2, 0
lsls r4, 24
lsls r3, 24
lsrs r6, r4, 24
movs r0, 0x80
lsls r0, 17
adds r4, r0
lsrs r4, 24
lsrs r5, r3, 24
adds r3, r0
lsrs r3, 24
movs r0, 0xA
str r0, [sp]
movs r0, 0x2
str r0, [sp, 0x4]
movs r0, 0xF
str r0, [sp, 0x8]
movs r0, 0x8
str r0, [sp, 0xC]
add r0, sp, 0x10
movs r1, 0
adds r2, r4, 0
bl SetWindowTemplateFields
ldr r4, =gUnknown_02039F98
add r0, sp, 0x10
bl AddWindow
strb r0, [r4]
ldrb r0, [r4]
movs r1, 0
bl FillWindowPixelBuffer
ldrb r0, [r4]
bl PutWindowTilemap
ldrb r0, [r4]
movs r1, 0x1
bl CopyWindowToVram
ldrb r0, [r4]
movs r1, 0x85
lsls r1, 2
movs r2, 0xE
mov r3, r8
bl set_window_border_style_and_print_money_box
lsls r6, 19
movs r0, 0x98
lsls r0, 13
adds r6, r0
lsrs r6, 16
lsls r5, 19
movs r0, 0xB0
lsls r0, 12
adds r5, r0
lsrs r5, 16
adds r0, r6, 0
adds r1, r5, 0
bl AddMoneyLabelObject
add sp, 0x18
pop {r3}
mov r8, r3
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_80E52EC
thumb_func_start sub_80E5384
sub_80E5384: @ 80E5384
push {r4,lr}
bl RemoveMoneyLabelObject
ldr r4, =gUnknown_02039F98
ldrb r0, [r4]
movs r1, 0
bl sub_8198070
ldrb r0, [r4]
movs r1, 0x2
bl CopyWindowToVram
ldrb r0, [r4]
bl RemoveWindow
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_80E5384
thumb_func_start AddMoneyLabelObject
AddMoneyLabelObject: @ 80E53AC
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
lsls r4, 16
lsrs r4, 16
lsls r5, 16
lsrs r5, 16
ldr r0, =gUnknown_0858C2A4
bl LoadCompressedObjectPic
ldr r0, =gUnknown_0858C2AC
bl LoadCompressedObjectPalette
ldr r0, =gUnknown_0858C28C
lsls r4, 16
asrs r4, 16
lsls r5, 16
asrs r5, 16
adds r1, r4, 0
adds r2, r5, 0
movs r3, 0
bl CreateSprite
ldr r1, =gUnknown_02039F99
strb r0, [r1]
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end AddMoneyLabelObject
thumb_func_start RemoveMoneyLabelObject
RemoveMoneyLabelObject: @ 80E53F4
push {lr}
ldr r0, =gUnknown_02039F99
ldrb r1, [r0]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gSprites
adds r0, r1
bl DestroySpriteAndFreeResources
pop {r0}
bx r0
.pool
thumb_func_end RemoveMoneyLabelObject
.align 2, 0 @ Don't pad with nop.
asm/naming_screen.s
+11 -11
View File
@@ -5,9 +5,9 @@
.text
thumb_func_start do_choose_name_or_words_screen
@ int do_choose_name_or_words_screen(u8 type, sav2 *sav2_ptr, s16 player_gender, s16 a4, int a5, void ( *after_finishing_callback)())
do_choose_name_or_words_screen: @ 80E2D78
thumb_func_start DoNamingScreen
@ int DoNamingScreen(u8 type, sav2 *sav2_ptr, s16 player_gender, s16 a4, int a5, void ( *after_finishing_callback)())
DoNamingScreen: @ 80E2D78
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -65,7 +65,7 @@ _080E2DE2:
pop {r0}
bx r0
.pool
thumb_func_end do_choose_name_or_words_screen
thumb_func_end DoNamingScreen
thumb_func_start c2_choose_name_or_words_screen
c2_choose_name_or_words_screen: @ 80E2E04
@@ -840,7 +840,7 @@ pokemon_transfer_to_pc_with_message: @ 80E34E4
bl VarGet
lsls r0, 24
lsrs r0, 24
bl sav3_get_box_name
bl GetBoxNamePtr
adds r1, r0, 0
adds r0, r4, 0
bl StringCopy
@@ -859,7 +859,7 @@ _080E3534:
bl VarGet
lsls r0, 24
lsrs r0, 24
bl sav3_get_box_name
bl GetBoxNamePtr
adds r1, r0, 0
adds r0, r4, 0
bl StringCopy
@@ -874,7 +874,7 @@ _080E3534:
bl get_unknown_box_id
lsls r0, 24
lsrs r0, 24
bl sav3_get_box_name
bl GetBoxNamePtr
adds r1, r0, 0
adds r0, r4, 0
bl StringCopy
@@ -4197,7 +4197,7 @@ sub_80E5074: @ 80E5074
str r0, [sp, 0x4]
movs r0, 0
movs r3, 0
bl do_choose_name_or_words_screen
bl DoNamingScreen
add sp, 0x8
pop {r0}
bx r0
@@ -4217,7 +4217,7 @@ sub_80E509C: @ 80E509C
str r0, [sp, 0x4]
movs r0, 0x1
movs r3, 0
bl do_choose_name_or_words_screen
bl DoNamingScreen
add sp, 0x8
pop {r0}
bx r0
@@ -4237,7 +4237,7 @@ sub_80E50C4: @ 80E50C4
str r0, [sp, 0x4]
movs r0, 0x2
movs r3, 0
bl do_choose_name_or_words_screen
bl DoNamingScreen
add sp, 0x8
pop {r0}
bx r0
@@ -4257,7 +4257,7 @@ sub_80E50EC: @ 80E50EC
str r0, [sp, 0x4]
movs r0, 0x3
movs r3, 0
bl do_choose_name_or_words_screen
bl DoNamingScreen
add sp, 0x8
pop {r0}
bx r0
asm/party_menu.s
+8 -8
View File
@@ -5495,7 +5495,7 @@ _081B2F04:
asrs r1, 16
ldr r2, [r6]
ldrb r2, [r2, 0x1A]
bl sub_8075034
bl GetScaledHPFraction
lsls r0, 24
lsrs r5, r0, 24
ldrb r0, [r6, 0x8]
@@ -16228,7 +16228,7 @@ _081B8CBE:
bne _081B8CFC
movs r5, 0x1
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
mov r2, sp
ldr r1, =gBattlePartyID
lsls r0, 24
@@ -16255,7 +16255,7 @@ _081B8CF0:
_081B8CFC:
movs r5, 0x2
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
mov r1, sp
ldr r4, =gBattlePartyID
lsls r0, 24
@@ -16264,7 +16264,7 @@ _081B8CFC:
ldrh r0, [r0]
strb r0, [r1]
movs r0, 0x2
bl GetBankByPlayerAI
bl GetBankByIdentity
mov r1, sp
lsls r0, 24
lsrs r0, 23
@@ -16344,19 +16344,19 @@ sub_81B8D88: @ 81B8D88
cmp r0, 0
bne _081B8DB0
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0x2
b _081B8DBC
_081B8DB0:
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0x3
_081B8DBC:
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r6, r0, 24
bl sub_81B1250
@@ -17478,7 +17478,7 @@ sub_81B968C: @ 81B968C
str r0, [sp]
movs r0, 0x3
bl sub_81BF8EC
ldr r1, =gUnknown_03005DAC
ldr r1, =gFieldCallback
ldr r0, =sub_80AF168
str r0, [r1]
add sp, 0x4
asm/player_pc.s
+3 -3
View File
@@ -583,7 +583,7 @@ _0816B310:
thumb_func_start sub_816B31C
sub_816B31C: @ 816B31C
push {lr}
ldr r0, =gUnknown_03005DAC
ldr r0, =gFieldCallback
ldr r1, =mapldr_080EBC0C
str r1, [r0]
ldr r0, =c2_exit_to_overworld_2_switch
@@ -1276,7 +1276,7 @@ _0816B8E6:
thumb_func_start sub_816B900
sub_816B900: @ 816B900
push {lr}
ldr r0, =gUnknown_03005DAC
ldr r0, =gFieldCallback
ldr r1, =pal_fill_for_maplights_or_black
str r1, [r0]
ldr r0, =c2_exit_to_overworld_2_switch
@@ -1535,7 +1535,7 @@ _0816BB1C:
thumb_func_start sub_816BB28
sub_816BB28: @ 816BB28
push {lr}
ldr r0, =gUnknown_03005DAC
ldr r0, =gFieldCallback
ldr r1, =sub_816BB48
str r1, [r0]
ldr r0, =c2_exit_to_overworld_2_switch
asm/pokeball.s
+7 -7
View File
@@ -185,7 +185,7 @@ _08075548:
.pool
_08075584:
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gBankTarget
strb r0, [r1]
movs r0, 0x1
@@ -1199,13 +1199,13 @@ _08075DD4:
lsrs r0, 16
mov r9, r0
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
cmp r5, r0
beq _08075E00
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
cmp r5, r0
@@ -1261,13 +1261,13 @@ _08075E70:
.pool
_08075E80:
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
cmp r5, r0
beq _08075E9C
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
cmp r5, r0
@@ -1830,7 +1830,7 @@ _080762F8:
movs r0, 0x3A
ldrsh r4, [r5, r0]
movs r0, 0x2
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
cmp r4, r0
@@ -1903,7 +1903,7 @@ sub_8076398: @ 8076398
movs r0, 0x3A
ldrsh r4, [r5, r0]
movs r0, 0x3
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
cmp r4, r0
asm/pokedex.s
+3 -3
View File
@@ -8429,8 +8429,8 @@ _080BFDB4:
.pool
thumb_func_end sub_80BFD7C
thumb_func_start sub_80BFDF4
sub_80BFDF4: @ 80BFDF4
thumb_func_start CreateDexDisplayMonDataTask
CreateDexDisplayMonDataTask: @ 80BFDF4
push {r4-r6,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -8460,7 +8460,7 @@ sub_80BFDF4: @ 80BFDF4
pop {r1}
bx r1
.pool
thumb_func_end sub_80BFDF4
thumb_func_end CreateDexDisplayMonDataTask
thumb_func_start sub_80BFE38
sub_80BFE38: @ 80BFE38
asm/pokemon_2.s
-356
View File
@@ -1,356 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start CopyPlayerPartyMonToBattleData
CopyPlayerPartyMonToBattleData: @ 806B9FC
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x18
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x14]
lsls r1, 24
lsrs r1, 24
mov r9, r1
movs r0, 0x64
mov r5, r9
muls r5, r0
ldr r0, =gPlayerParty
adds r5, r0
adds r0, r5, 0
movs r1, 0xB
movs r2, 0
bl GetMonData
ldr r1, =gBattleMons
mov r8, r1
movs r1, 0x58
ldr r2, [sp, 0x14]
adds r4, r2, 0
muls r4, r1
mov r3, r8
adds r6, r4, r3
strh r0, [r6]
adds r0, r5, 0
movs r1, 0xC
movs r2, 0
bl GetMonData
strh r0, [r6, 0x2E]
movs r6, 0
mov r0, r8
adds r0, 0x24
adds r7, r4, r0
_0806BA4E:
adds r1, r6, 0
adds r1, 0xD
adds r0, r5, 0
movs r2, 0
bl GetMonData
movs r1, 0xC
add r1, r8
mov r10, r1
adds r1, r4, r1
strh r0, [r1]
adds r1, r6, 0
adds r1, 0x11
adds r0, r5, 0
movs r2, 0
bl GetMonData
strb r0, [r7]
adds r7, 0x1
adds r4, 0x2
adds r6, 0x1
cmp r6, 0x3
ble _0806BA4E
movs r0, 0x64
mov r4, r9
muls r4, r0
ldr r0, =gPlayerParty
adds r4, r0
adds r0, r4, 0
movs r1, 0x15
movs r2, 0
bl GetMonData
movs r2, 0xC
negs r2, r2
add r2, r10
mov r9, r2
movs r1, 0x58
ldr r3, [sp, 0x14]
adds r5, r3, 0
muls r5, r1
adds r7, r5, r2
adds r1, r7, 0
adds r1, 0x3B
strb r0, [r1]
adds r0, r4, 0
movs r1, 0x20
movs r2, 0
bl GetMonData
adds r1, r7, 0
adds r1, 0x2B
strb r0, [r1]
adds r0, r4, 0
movs r1, 0x19
movs r2, 0
bl GetMonData
mov r1, r10
adds r1, 0x38
adds r1, r5, r1
str r0, [r1]
adds r0, r4, 0
movs r1, 0x27
movs r2, 0
bl GetMonData
movs r6, 0x1F
ands r0, r6
ldrb r2, [r7, 0x14]
movs r1, 0x20
negs r1, r1
ands r1, r2
orrs r1, r0
strb r1, [r7, 0x14]
adds r0, r4, 0
movs r1, 0x28
movs r2, 0
bl GetMonData
movs r1, 0x1F
mov r8, r1
mov r2, r8
ands r0, r2
lsls r0, 5
ldrh r2, [r7, 0x14]
ldr r1, =0xfffffc1f
ands r1, r2
orrs r1, r0
strh r1, [r7, 0x14]
adds r0, r4, 0
movs r1, 0x29
movs r2, 0
bl GetMonData
ands r0, r6
lsls r0, 2
ldrb r2, [r7, 0x15]
movs r1, 0x7D
negs r1, r1
ands r1, r2
orrs r1, r0
strb r1, [r7, 0x15]
adds r0, r4, 0
movs r1, 0x2A
movs r2, 0
bl GetMonData
movs r1, 0x1F
ands r1, r0
lsls r1, 15
ldr r0, [r7, 0x14]
ldr r2, =0xfff07fff
ands r0, r2
orrs r0, r1
str r0, [r7, 0x14]
adds r0, r4, 0
movs r1, 0x2B
movs r2, 0
bl GetMonData
mov r3, r8
ands r0, r3
lsls r0, 4
ldrh r2, [r7, 0x16]
ldr r1, =0xfffffe0f
ands r1, r2
orrs r1, r0
strh r1, [r7, 0x16]
adds r0, r4, 0
movs r1, 0x2C
movs r2, 0
bl GetMonData
ands r0, r6
lsls r0, 1
ldrb r2, [r7, 0x17]
movs r1, 0x3F
negs r1, r1
ands r1, r2
orrs r1, r0
strb r1, [r7, 0x17]
adds r0, r4, 0
movs r1, 0
movs r2, 0
bl GetMonData
mov r1, r10
adds r1, 0x3C
adds r1, r5, r1
str r0, [r1]
adds r0, r4, 0
movs r1, 0x37
movs r2, 0
bl GetMonData
mov r1, r10
adds r1, 0x40
adds r1, r5, r1
str r0, [r1]
adds r0, r4, 0
movs r1, 0x38
movs r2, 0
bl GetMonData
adds r1, r7, 0
adds r1, 0x2A
strb r0, [r1]
adds r0, r4, 0
movs r1, 0x39
movs r2, 0
bl GetMonData
strh r0, [r7, 0x28]
adds r0, r4, 0
movs r1, 0x3A
movs r2, 0
bl GetMonData
strh r0, [r7, 0x2C]
adds r0, r4, 0
movs r1, 0x3B
movs r2, 0
bl GetMonData
strh r0, [r7, 0x2]
adds r0, r4, 0
movs r1, 0x3C
movs r2, 0
bl GetMonData
strh r0, [r7, 0x4]
adds r0, r4, 0
movs r1, 0x3D
movs r2, 0
bl GetMonData
strh r0, [r7, 0x6]
adds r0, r4, 0
movs r1, 0x3E
movs r2, 0
bl GetMonData
strh r0, [r7, 0x8]
adds r0, r4, 0
movs r1, 0x3F
movs r2, 0
bl GetMonData
strh r0, [r7, 0xA]
adds r0, r4, 0
movs r1, 0x2D
movs r2, 0
bl GetMonData
movs r1, 0x1
ands r0, r1
lsls r0, 6
ldrb r2, [r7, 0x17]
movs r1, 0x41
negs r1, r1
ands r1, r2
orrs r1, r0
strb r1, [r7, 0x17]
adds r0, r4, 0
movs r1, 0x2E
movs r2, 0
bl GetMonData
lsls r0, 7
ldrb r2, [r7, 0x17]
movs r1, 0x7F
ands r1, r2
orrs r1, r0
strb r1, [r7, 0x17]
adds r0, r4, 0
movs r1, 0x1
movs r2, 0
bl GetMonData
mov r1, r10
adds r1, 0x48
adds r1, r5, r1
str r0, [r1]
ldr r2, =gBaseStats
ldrh r1, [r7]
lsls r0, r1, 3
subs r0, r1
lsls r0, 2
adds r0, r2
ldrb r0, [r0, 0x6]
adds r1, r7, 0
adds r1, 0x21
strb r0, [r1]
ldrh r1, [r7]
lsls r0, r1, 3
subs r0, r1
lsls r0, 2
adds r0, r2
ldrb r0, [r0, 0x7]
adds r1, r7, 0
adds r1, 0x22
strb r0, [r1]
ldrh r0, [r7]
ldrb r1, [r7, 0x17]
lsrs r1, 7
bl GetAbilityBySpecies
adds r1, r7, 0
adds r1, 0x20
strb r0, [r1]
adds r0, r4, 0
movs r1, 0x2
mov r2, sp
bl GetMonData
mov r0, r10
adds r0, 0x24
adds r0, r5, r0
mov r1, sp
bl StringCopy10
mov r2, r10
adds r2, 0x30
adds r2, r5, r2
adds r0, r4, 0
movs r1, 0x7
bl GetMonData
ldr r0, [sp, 0x14]
bl GetBankSide
ldr r1, =gBattleStruct
lsls r0, 24
lsrs r0, 23
adds r0, 0xA8
ldr r1, [r1]
adds r1, r0
ldrh r0, [r7, 0x28]
strh r0, [r1]
movs r2, 0x6
mov r1, r9
movs r6, 0x7
add r5, r10
adds r0, r5, 0
adds r0, 0x13
_0806BCB2:
strb r2, [r0]
subs r0, 0x1
subs r6, 0x1
cmp r6, 0
bge _0806BCB2
movs r2, 0
movs r0, 0x58
ldr r3, [sp, 0x14]
muls r0, r3
adds r1, 0x50
adds r0, r1
str r2, [r0]
ldr r0, [sp, 0x14]
bl sub_803FA70
ldr r0, [sp, 0x14]
movs r1, 0
bl sub_805EF84
add sp, 0x18
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end CopyPlayerPartyMonToBattleData
.align 2, 0 @ Don't pad with nop.
asm/pokemon_icon.s
+8 -8
View File
@@ -32,7 +32,7 @@ sub_80D2CC4: @ 80D2CC4
str r0, [sp, 0x18]
adds r0, r4, 0
adds r2, r5, 0
bl sub_80D2EDC
bl GetMonIconPtr
str r0, [sp, 0x1C]
ldr r0, =gUnknown_0857C5B4
str r0, [sp, 0x20]
@@ -271,9 +271,9 @@ _080D2ED2:
bx r1
thumb_func_end sub_80D2E84
thumb_func_start sub_80D2EDC
@ void *sub_80D2EDC(u16 speciesId, u32 personality, bool32)
sub_80D2EDC: @ 80D2EDC
thumb_func_start GetMonIconPtr
@ void *GetMonIconPtr(u16 speciesId, u32 personality, bool32)
GetMonIconPtr: @ 80D2EDC
push {r4,lr}
adds r4, r2, 0
lsls r0, 16
@@ -286,7 +286,7 @@ sub_80D2EDC: @ 80D2EDC
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_80D2EDC
thumb_func_end GetMonIconPtr
thumb_func_start sub_80D2EF8
sub_80D2EF8: @ 80D2EF8
@@ -534,8 +534,8 @@ sub_80D30A0: @ 80D30A0
.pool
thumb_func_end sub_80D30A0
thumb_func_start sub_80D30B0
sub_80D30B0: @ 80D30B0
thumb_func_start GetValidMonIconPalettePtr
GetValidMonIconPalettePtr: @ 80D30B0
push {lr}
lsls r0, 16
lsrs r2, r0, 16
@@ -556,7 +556,7 @@ _080D30C2:
pop {r1}
bx r1
.pool
thumb_func_end sub_80D30B0
thumb_func_end GetValidMonIconPalettePtr
thumb_func_start sub_80D30DC
sub_80D30DC: @ 80D30DC
asm/pokemon_item_effect.s
+1 -1
View File
@@ -1155,7 +1155,7 @@ _0806C6AE:
movs r0, 0
movs r1, 0
movs r2, 0
bl dp01_build_cmdbuf_x00_a_b_0
bl EmitGetMonData
ldrb r0, [r4]
bl MarkBufferBankForExecution
strb r5, [r4]
asm/pokemon_storage_system.s
+13 -13
View File
@@ -870,7 +870,7 @@ sub_80C7678: @ 80C7678
bl sub_80CAEA0
ldr r1, =gUnknown_02039D00
strb r0, [r1]
ldr r1, =gUnknown_03005DAC
ldr r1, =gFieldCallback
ldr r0, =mapldr_0808C6D8
str r0, [r1]
ldr r0, =c2_exit_to_overworld_2_switch
@@ -1019,7 +1019,7 @@ _080C777E:
_080C779E:
lsls r0, r5, 24
lsrs r0, 24
bl sav3_get_box_name
bl GetBoxNamePtr
ldr r1, =gText_Box
bl StringCopy
adds r4, r5, 0x1
@@ -1566,7 +1566,7 @@ sub_80C7BE4: @ 80C7BE4
lsls r4, 2
adds r0, r4
ldrb r0, [r0]
bl sav3_get_box_name
bl GetBoxNamePtr
mov r10, r0
mov r1, r9
ldr r0, [r1]
@@ -5424,7 +5424,7 @@ _080C9F1C:
bl StorageGetCurrentBox
lsls r0, 24
lsrs r0, 24
bl sav3_get_box_name
bl GetBoxNamePtr
adds r1, r0, 0
movs r0, 0
str r0, [sp]
@@ -5433,7 +5433,7 @@ _080C9F1C:
movs r0, 0x1
movs r2, 0
movs r3, 0
bl do_choose_name_or_words_screen
bl DoNamingScreen
b _080C9F56
.pool
_080C9F48:
@@ -10831,7 +10831,7 @@ sub_80CCB50: @ 80CCB50
ldr r5, =0x000021b8
adds r4, r5
mov r0, r8
bl sav3_get_box_name
bl GetBoxNamePtr
adds r1, r0, 0
adds r0, r4, 0
movs r2, 0
@@ -10852,7 +10852,7 @@ sub_80CCB50: @ 80CCB50
ldr r0, [sp, 0x2C]
bl LoadSpriteSheet
mov r0, r8
bl sav3_get_box_name
bl GetBoxNamePtr
bl sub_80CD00C
movs r4, 0
lsls r0, 16
@@ -10997,7 +10997,7 @@ _080CCDB0:
ldr r5, =0x000021b8
adds r4, r5
ldr r0, [sp, 0x28]
bl sav3_get_box_name
bl GetBoxNamePtr
adds r1, r0, 0
adds r0, r4, 0
movs r2, 0
@@ -11027,7 +11027,7 @@ _080CCDB0:
movs r2, 0x4
bl LoadPalette
ldr r0, [sp, 0x28]
bl sav3_get_box_name
bl GetBoxNamePtr
bl sub_80CD00C
lsls r0, 16
mov r1, r10
@@ -17910,7 +17910,7 @@ sub_80D07B0: @ 80D07B0
beq _080D0828
adds r0, r5, 0
movs r2, 0x1
bl sub_80D2EDC
bl GetMonIconPtr
adds r4, r0, 0
adds r0, r5, 0
bl sub_80D3080
@@ -21085,8 +21085,8 @@ _080D20CA:
bx r1
thumb_func_end GetBoxedMonPtr
thumb_func_start sav3_get_box_name
sav3_get_box_name: @ 80D20D0
thumb_func_start GetBoxNamePtr
GetBoxNamePtr: @ 80D20D0
push {lr}
lsls r0, 24
lsrs r2, r0, 24
@@ -21106,7 +21106,7 @@ _080D20EC:
pop {r1}
bx r1
.pool
thumb_func_end sav3_get_box_name
thumb_func_end GetBoxNamePtr
thumb_func_start sub_80D20F8
sub_80D20F8: @ 80D20F8
asm/pokenav.s
+4 -4
View File
@@ -13136,7 +13136,7 @@ _081CD8E4:
ldr r2, =0x00006325
adds r4, r2
adds r0, r3, 0
bl sav3_get_box_name
bl GetBoxNamePtr
adds r1, r0, 0
adds r0, r4, 0
_081CD8F4:
@@ -24164,7 +24164,7 @@ _081D2F2C:
adds r4, r5, 0x5
lsls r0, r7, 24
lsrs r0, 24
bl sav3_get_box_name
bl GetBoxNamePtr
adds r1, r0, 0
adds r0, r4, 0
_081D2F3A:
@@ -27356,7 +27356,7 @@ _081D4870:
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl sub_8088E64
bl MetatileBehavior_IsPokeGrass
lsls r0, 24
lsrs r0, 24
_081D4888:
@@ -28559,7 +28559,7 @@ _081D5268:
ldr r0, =gUnknown_085EE097
bl sub_8018884
ldr r0, =gUnknown_03006370
ldr r1, =gUnknown_089A6550
ldr r1, =gMultiBootProgram_BerryGlitchFix_Start
ldr r2, =gUnknown_089A3470
subs r1, r2
bl sub_81D4D50
asm/porthole.s
-282
View File
@@ -1,282 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_80FB59C
sub_80FB59C: @ 80FB59C
push {r4-r6,lr}
sub sp, 0xC
mov r4, sp
adds r4, 0x5
mov r5, sp
adds r5, 0x6
add r6, sp, 0x8
add r0, sp, 0x4
adds r1, r4, 0
adds r2, r5, 0
adds r3, r6, 0
bl sub_8137FFC
lsls r0, 24
cmp r0, 0
bne _080FB5DE
add r0, sp, 0x4
ldrb r0, [r0]
lsls r0, 24
asrs r0, 24
movs r1, 0
ldrsb r1, [r4, r1]
movs r2, 0x1
negs r2, r2
movs r3, 0
ldrsb r3, [r5, r3]
movs r4, 0
ldrsb r4, [r6, r4]
str r4, [sp]
bl warp1_set
movs r0, 0x1
b _080FB5E0
_080FB5DE:
movs r0, 0
_080FB5E0:
add sp, 0xC
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end sub_80FB59C
thumb_func_start sub_80FB5E8
sub_80FB5E8: @ 80FB5E8
push {r4-r7,lr}
lsls r0, 24
lsrs r5, r0, 24
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
ldr r1, =gTasks + 0x8
adds r4, r0, r1
ldr r0, =0x000040b4
bl GetVarPointer
adds r7, r0, 0
ldr r0, =gSaveBlock1Ptr
ldr r3, [r0]
adds r6, r3, 0x4
movs r0, 0
ldrsh r2, [r4, r0]
cmp r2, 0x1
beq _080FB648
cmp r2, 0x1
bgt _080FB624
cmp r2, 0
beq _080FB62E
b _080FB6E2
.pool
_080FB624:
cmp r2, 0x2
beq _080FB68A
cmp r2, 0x3
beq _080FB6C4
b _080FB6E2
_080FB62E:
ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
cmp r0, 0
bne _080FB6E2
strh r2, [r4, 0x2]
movs r0, 0x2
strh r0, [r4]
b _080FB6E2
.pool
_080FB648:
ldr r0, =gMain
ldrh r1, [r0, 0x2E]
adds r0, r2, 0
ands r0, r1
cmp r0, 0
beq _080FB656
strh r2, [r4, 0x2]
_080FB656:
ldrb r1, [r6, 0x1]
ldrb r2, [r3, 0x4]
movs r0, 0xFF
bl sub_80D3340
lsls r0, 24
cmp r0, 0
beq _080FB6E2
movs r0, 0x1
bl sub_8137FC0
cmp r0, 0x1
bne _080FB686
ldrh r0, [r7]
cmp r0, 0x2
bne _080FB680
movs r0, 0x9
b _080FB682
.pool
_080FB680:
movs r0, 0xA
_080FB682:
strh r0, [r7]
b _080FB692
_080FB686:
movs r0, 0x2
strh r0, [r4]
_080FB68A:
movs r1, 0x2
ldrsh r0, [r4, r1]
cmp r0, 0
beq _080FB698
_080FB692:
movs r0, 0x3
strh r0, [r4]
b _080FB6E2
_080FB698:
ldrh r0, [r7]
cmp r0, 0x2
bne _080FB6AC
ldrb r1, [r6, 0x1]
ldrb r2, [r6]
ldr r3, =gUnknown_0858E8AB
b _080FB6B2
.pool
_080FB6AC:
ldrb r1, [r6, 0x1]
ldrb r2, [r6]
ldr r3, =gUnknown_0858E8AD
_080FB6B2:
movs r0, 0xFF
bl exec_movement
movs r0, 0x1
strh r0, [r4]
b _080FB6E2
.pool
_080FB6C4:
ldr r0, =0x00004001
bl FlagReset
movs r0, 0x80
lsls r0, 7
bl FlagReset
movs r0, 0
bl copy_saved_warp2_bank_and_enter_x_to_warp1
bl sp13E_warp_to_last_warp
adds r0, r5, 0
bl DestroyTask
_080FB6E2:
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_80FB5E8
thumb_func_start sub_80FB6EC
sub_80FB6EC: @ 80FB6EC
push {r4,lr}
sub sp, 0x4
ldr r1, =SpriteCallbackDummy
movs r0, 0
str r0, [sp]
movs r0, 0x8C
movs r2, 0x70
movs r3, 0x50
bl AddPseudoFieldObject
lsls r0, 24
lsrs r0, 24
ldr r2, =gSprites
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
adds r4, r1, r2
adds r2, r4, 0
adds r2, 0x3E
ldrb r1, [r2]
movs r0, 0x3
negs r0, r0
ands r0, r1
strb r0, [r2]
ldr r0, =0x000040b4
bl VarGet
lsls r0, 16
lsrs r0, 16
cmp r0, 0x2
bne _080FB74C
movs r0, 0x4
bl FieldObjectDirectionToImageAnimId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartSpriteAnim
b _080FB75E
.pool
_080FB74C:
movs r0, 0x3
bl FieldObjectDirectionToImageAnimId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartSpriteAnim
_080FB75E:
add sp, 0x4
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_80FB6EC
thumb_func_start sub_80FB768
sub_80FB768: @ 80FB768
push {lr}
bl sub_80FB6EC
ldr r2, =gMapObjects
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
adds r0, r2
ldrb r1, [r0, 0x1]
movs r2, 0x20
orrs r1, r2
strb r1, [r0, 0x1]
bl pal_fill_black
ldr r0, =sub_80FB5E8
movs r1, 0x50
bl CreateTask
bl ScriptContext2_Enable
pop {r0}
bx r0
.pool
thumb_func_end sub_80FB768
thumb_func_start sub_80FB7A4
sub_80FB7A4: @ 80FB7A4
push {lr}
ldr r0, =0x0000088d
bl FlagSet
ldr r0, =0x00004001
bl FlagSet
movs r0, 0x80
lsls r0, 7
bl FlagSet
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
movs r1, 0x4
ldrsb r1, [r0, r1]
movs r2, 0x5
ldrsb r2, [r0, r2]
movs r3, 0x1
negs r3, r3
movs r0, 0
bl saved_warp2_set
bl sub_80FB59C
bl sub_80AF8B8
pop {r0}
bx r0
.pool
thumb_func_end sub_80FB7A4
.align 2, 0 @ Don't pad with nop.
asm/recorded_battle.s
+5 -5
View File
@@ -236,8 +236,8 @@ _08184FA0:
.pool
thumb_func_end sub_8184E58
thumb_func_start sub_8184FBC
sub_8184FBC: @ 8184FBC
thumb_func_start RecordedBattle_SetBankAction
RecordedBattle_SetBankAction: @ 8184FBC
push {r4-r6,lr}
lsls r0, 24
lsrs r5, r0, 24
@@ -269,7 +269,7 @@ _08184FF0:
pop {r0}
bx r0
.pool
thumb_func_end sub_8184FBC
thumb_func_end RecordedBattle_SetBankAction
thumb_func_start sub_8185008
sub_8185008: @ 8185008
@@ -2212,7 +2212,7 @@ _081860C2:
ldr r1, [sp, 0x4C]
lsrs r0, r1, 24
movs r1, 0x6
bl sub_8184FBC
bl RecordedBattle_SetBankAction
movs r5, 0
ldr r2, =gUnknown_0203CC70
mov r8, r2
@@ -2241,7 +2241,7 @@ _081860F0:
lsrs r1, 24
ldr r2, [sp, 0x4C]
lsrs r0, r2, 24
bl sub_8184FBC
bl RecordedBattle_SetBankAction
b _08186118
.pool
_08186110:
asm/region_map.s
+1 -1
View File
@@ -1939,7 +1939,7 @@ sub_8123C00: @ 8123C00
adds r1, r4, 0
adds r2, r5, 0
adds r3, r6, 0
bl sub_8137FFC
bl GetSSTidalLocation
lsls r0, 24
lsrs r0, 24
mov r10, r5
asm/reshow_battle_screen.s
+12 -12
View File
@@ -10,8 +10,8 @@ nullsub_35: @ 80A92F4
bx lr
thumb_func_end nullsub_35
thumb_func_start sub_80A92F8
sub_80A92F8: @ 80A92F8
thumb_func_start ReshowBattleScreenAfterMenu
ReshowBattleScreenAfterMenu: @ 80A92F8
push {lr}
ldr r2, =gPaletteFade
ldrb r0, [r2, 0x8]
@@ -37,7 +37,7 @@ sub_80A92F8: @ 80A92F8
pop {r0}
bx r0
.pool
thumb_func_end sub_80A92F8
thumb_func_end ReshowBattleScreenAfterMenu
thumb_func_start c2_80777E8
c2_80777E8: @ 80A933C
@@ -103,15 +103,15 @@ _080A93B0:
strh r1, [r0]
ldr r0, =gUnknown_02022E16
strh r1, [r0]
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r1, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r1, [r0]
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
strh r1, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r1, [r0]
ldr r0, =gUnknown_02022E20
ldr r0, =gBattle_BG3_X
strh r1, [r0]
ldr r0, =gUnknown_02022E22
strh r1, [r0]
@@ -223,7 +223,7 @@ _080A94F0:
_080A94F8:
bl sub_805EC84
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -247,7 +247,7 @@ _080A94F8:
cmp r0, 0
beq _080A955C
movs r0, 0x3
bl GetBankByPlayerAI
bl GetBankByIdentity
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -286,7 +286,7 @@ _080A955C:
b _080A95D2
.pool
_080A95A4:
ldr r0, =vblank_cb_08078BB4
ldr r0, =VBlankCB_Battle
bl SetVBlankCallback
bl sub_80A95F4
movs r0, 0x1
@@ -301,7 +301,7 @@ _080A95A4:
movs r0, 0x7F
ands r0, r1
strb r0, [r2, 0x8]
ldr r0, =sub_8038420
ldr r0, =BattleMainCB2
bl SetMainCallback2
bl sub_805EF14
_080A95D2:
asm/roamer.s
-502
View File
@@ -1,502 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start ClearRoamerData
ClearRoamerData: @ 8161B34
push {r4,r5,lr}
ldr r5, =gSaveBlock1Ptr
ldr r0, [r5]
ldr r4, =0x000031dc
adds r0, r4
movs r1, 0
movs r2, 0x1C
bl memset
ldr r0, [r5]
adds r0, r4
ldr r1, =0x00000197
strh r1, [r0, 0x8]
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end ClearRoamerData
thumb_func_start ClearRoamerLocationData
ClearRoamerLocationData: @ 8161B60
push {r4-r6,lr}
movs r2, 0
ldr r6, =sRoamerLocation
ldr r4, =sLocationHistory
movs r3, 0
adds r5, r4, 0x1
_08161B6C:
lsls r1, r2, 1
adds r0, r1, r4
strb r3, [r0]
adds r1, r5
strb r3, [r1]
adds r0, r2, 0x1
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0x2
bls _08161B6C
movs r0, 0
strb r0, [r6]
strb r0, [r6, 0x1]
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end ClearRoamerLocationData
thumb_func_start CreateInitialRoamerMon
CreateInitialRoamerMon: @ 8161B94
push {r4-r7,lr}
mov r7, r8
push {r7}
sub sp, 0x10
lsls r0, 16
cmp r0, 0
bne _08161BBC
ldr r0, =gSaveBlock1Ptr
ldr r1, [r0]
ldr r2, =0x000031dc
adds r1, r2
ldr r2, =0x00000197
b _08161BC8
.pool
_08161BBC:
ldr r0, =gSaveBlock1Ptr
ldr r1, [r0]
ldr r2, =0x000031dc
adds r1, r2
movs r2, 0xCC
lsls r2, 1
_08161BC8:
strh r2, [r1, 0x8]
adds r7, r0, 0
ldr r6, =gEnemyParty
ldr r0, [r7]
ldr r5, =0x000031dc
adds r0, r5
ldrh r1, [r0, 0x8]
movs r4, 0
str r4, [sp]
str r4, [sp, 0x4]
str r4, [sp, 0x8]
str r4, [sp, 0xC]
adds r0, r6, 0
movs r2, 0x28
movs r3, 0x20
bl CreateMon
ldr r0, [r7]
adds r0, r5
movs r1, 0x28
strb r1, [r0, 0xC]
ldr r0, [r7]
adds r0, r5
strb r4, [r0, 0xD]
ldr r0, [r7]
adds r0, r5
movs r1, 0x1
strb r1, [r0, 0x13]
adds r0, r6, 0
movs r1, 0x42
bl GetMonData
ldr r1, [r7]
adds r1, r5
str r0, [r1]
adds r0, r6, 0
movs r1, 0
bl GetMonData
ldr r1, [r7]
adds r1, r5
str r0, [r1, 0x4]
adds r0, r6, 0
movs r1, 0x3A
bl GetMonData
ldr r1, [r7]
adds r1, r5
movs r2, 0
mov r8, r2
strh r0, [r1, 0xA]
adds r0, r6, 0
movs r1, 0x16
bl GetMonData
ldr r1, [r7]
adds r1, r5
strb r0, [r1, 0xE]
adds r0, r6, 0
movs r1, 0x17
bl GetMonData
ldr r1, [r7]
adds r1, r5
strb r0, [r1, 0xF]
adds r0, r6, 0
movs r1, 0x18
bl GetMonData
ldr r1, [r7]
adds r1, r5
strb r0, [r1, 0x10]
adds r0, r6, 0
movs r1, 0x21
bl GetMonData
ldr r1, [r7]
adds r1, r5
strb r0, [r1, 0x11]
adds r0, r6, 0
movs r1, 0x2F
bl GetMonData
ldr r1, [r7]
adds r1, r5
strb r0, [r1, 0x12]
ldr r4, =sRoamerLocation
mov r0, r8
strb r0, [r4]
bl Random
ldr r5, =sRoamerLocations
lsls r0, 16
lsrs r0, 16
movs r1, 0x14
bl __umodsi3
lsls r0, 16
lsrs r0, 16
lsls r1, r0, 1
adds r1, r0
lsls r1, 1
adds r1, r5
ldrb r0, [r1]
strb r0, [r4, 0x1]
add sp, 0x10
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end CreateInitialRoamerMon
thumb_func_start InitRoamer
InitRoamer: @ 8161CBC
push {lr}
bl ClearRoamerData
bl ClearRoamerLocationData
ldr r0, =gSpecialVar_0x8004
ldrh r0, [r0]
bl CreateInitialRoamerMon
pop {r0}
bx r0
.pool
thumb_func_end InitRoamer
thumb_func_start UpdateLocationHistoryForRoamer
UpdateLocationHistoryForRoamer: @ 8161CD8
ldr r0, =sLocationHistory
ldrb r1, [r0, 0x2]
strb r1, [r0, 0x4]
ldrb r1, [r0, 0x3]
strb r1, [r0, 0x5]
ldrb r1, [r0]
strb r1, [r0, 0x2]
ldrb r1, [r0, 0x1]
strb r1, [r0, 0x3]
ldr r1, =gSaveBlock1Ptr
ldr r2, [r1]
ldrb r1, [r2, 0x4]
strb r1, [r0]
ldrb r1, [r2, 0x5]
strb r1, [r0, 0x1]
bx lr
.pool
thumb_func_end UpdateLocationHistoryForRoamer
thumb_func_start RoamerMoveToOtherLocationSet
RoamerMoveToOtherLocationSet: @ 8161D00
push {r4,r5,lr}
movs r1, 0
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r2, =0x000031dc
adds r0, r2
ldrb r0, [r0, 0x13]
cmp r0, 0
beq _08161D3E
ldr r0, =sRoamerLocation
strb r1, [r0]
ldr r5, =sRoamerLocations
adds r4, r0, 0
_08161D1A:
bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x14
bl __umodsi3
lsls r0, 16
lsrs r0, 16
lsls r1, r0, 1
adds r1, r0
lsls r1, 1
adds r1, r5
ldrb r1, [r1]
ldrb r0, [r4, 0x1]
cmp r0, r1
beq _08161D1A
strb r1, [r4, 0x1]
_08161D3E:
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end RoamerMoveToOtherLocationSet
thumb_func_start RoamerMove
RoamerMove: @ 8161D54
push {r4-r7,lr}
movs r4, 0
bl Random
lsls r0, 16
movs r1, 0xF0
lsls r1, 12
ands r1, r0
cmp r1, 0
bne _08161D6E
bl RoamerMoveToOtherLocationSet
b _08161DE2
_08161D6E:
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, =0x000031dc
adds r0, r1
ldrb r0, [r0, 0x13]
cmp r0, 0
beq _08161DE2
ldr r7, =sRoamerLocation
ldr r3, =sRoamerLocations
_08161D80:
lsls r0, r4, 1
adds r0, r4
lsls r2, r0, 1
adds r1, r2, r3
ldrb r0, [r7, 0x1]
ldrb r1, [r1]
cmp r0, r1
bne _08161DD8
ldr r6, =sRoamerLocations
adds r5, r2, 0x1
ldr r4, =sLocationHistory
_08161D96:
bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x5
bl __umodsi3
lsls r0, 16
lsrs r0, 16
adds r0, r5
adds r0, r6
ldrb r1, [r0]
ldrb r0, [r4, 0x4]
cmp r0, 0
bne _08161DBA
ldrb r0, [r4, 0x5]
cmp r0, r1
beq _08161D96
_08161DBA:
cmp r1, 0xFF
beq _08161D96
strb r1, [r7, 0x1]
b _08161DE2
.pool
_08161DD8:
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x13
bls _08161D80
_08161DE2:
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end RoamerMove
thumb_func_start IsRoamerAt
IsRoamerAt: @ 8161DE8
push {lr}
lsls r0, 24
lsrs r2, r0, 24
lsls r1, 24
lsrs r1, 24
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r3, =0x000031dc
adds r0, r3
ldrb r0, [r0, 0x13]
cmp r0, 0
beq _08161E20
ldr r0, =sRoamerLocation
ldrb r3, [r0]
cmp r2, r3
bne _08161E20
ldrb r0, [r0, 0x1]
cmp r1, r0
bne _08161E20
movs r0, 0x1
b _08161E22
.pool
_08161E20:
movs r0, 0
_08161E22:
pop {r1}
bx r1
thumb_func_end IsRoamerAt
thumb_func_start CreateRoamerMonInstance
CreateRoamerMonInstance: @ 8161E28
push {r4,r5,lr}
sub sp, 0x4
ldr r5, =gEnemyParty
bl ZeroEnemyPartyMons
ldr r4, =gSaveBlock1Ptr
ldr r0, [r4]
ldr r1, =0x000031dc
adds r0, r1
ldrh r1, [r0, 0x8]
ldrb r2, [r0, 0xC]
ldr r3, [r0]
ldr r0, [r0, 0x4]
str r0, [sp]
adds r0, r5, 0
bl CreateMonWithIVsPersonality
ldr r2, [r4]
ldr r0, =0x000031e9
adds r2, r0
adds r0, r5, 0
movs r1, 0x37
bl SetMonData
ldr r2, [r4]
ldr r1, =0x000031e6
adds r2, r1
adds r0, r5, 0
movs r1, 0x39
bl SetMonData
ldr r2, [r4]
ldr r0, =0x000031ea
adds r2, r0
adds r0, r5, 0
movs r1, 0x16
bl SetMonData
ldr r2, [r4]
ldr r1, =0x000031eb
adds r2, r1
adds r0, r5, 0
movs r1, 0x17
bl SetMonData
ldr r2, [r4]
ldr r0, =0x000031ec
adds r2, r0
adds r0, r5, 0
movs r1, 0x18
bl SetMonData
ldr r2, [r4]
ldr r1, =0x000031ed
adds r2, r1
adds r0, r5, 0
movs r1, 0x21
bl SetMonData
ldr r2, [r4]
ldr r0, =0x000031ee
adds r2, r0
adds r0, r5, 0
movs r1, 0x2F
bl SetMonData
add sp, 0x4
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end CreateRoamerMonInstance
thumb_func_start TryStartRoamerEncounter
TryStartRoamerEncounter: @ 8161EDC
push {lr}
ldr r0, =gSaveBlock1Ptr
ldr r1, [r0]
ldrb r0, [r1, 0x4]
ldrb r1, [r1, 0x5]
bl IsRoamerAt
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _08161F10
bl Random
lsls r0, 16
movs r1, 0xC0
lsls r1, 10
ands r1, r0
cmp r1, 0
bne _08161F10
bl CreateRoamerMonInstance
movs r0, 0x1
b _08161F12
.pool
_08161F10:
movs r0, 0
_08161F12:
pop {r1}
bx r1
thumb_func_end TryStartRoamerEncounter
thumb_func_start UpdateRoamerHPStatus
UpdateRoamerHPStatus: @ 8161F18
push {r4-r6,lr}
adds r6, r0, 0
movs r1, 0x39
bl GetMonData
ldr r5, =gSaveBlock1Ptr
ldr r1, [r5]
ldr r4, =0x000031dc
adds r1, r4
strh r0, [r1, 0xA]
adds r0, r6, 0
movs r1, 0x37
bl GetMonData
ldr r1, [r5]
adds r1, r4
strb r0, [r1, 0xD]
bl RoamerMoveToOtherLocationSet
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end UpdateRoamerHPStatus
thumb_func_start SetRoamerInactive
SetRoamerInactive: @ 8161F4C
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, =0x000031dc
adds r0, r1
movs r1, 0
strb r1, [r0, 0x13]
bx lr
.pool
thumb_func_end SetRoamerInactive
thumb_func_start GetRoamerLocation
GetRoamerLocation: @ 8161F64
ldr r3, =sRoamerLocation
ldrb r2, [r3]
strb r2, [r0]
ldrb r0, [r3, 0x1]
strb r0, [r1]
bx lr
.pool
thumb_func_end GetRoamerLocation
.align 2, 0 @ Don't pad with nop.
asm/rom3.s
+86 -86
View File
@@ -2134,8 +2134,8 @@ _0803389C:
.pool
thumb_func_end sub_803375C
thumb_func_start dp01_build_cmdbuf_x00_a_b_0
dp01_build_cmdbuf_x00_a_b_0: @ 80338B4
thumb_func_start EmitGetMonData
EmitGetMonData: @ 80338B4
push {r4,lr}
adds r4, r1, 0
lsls r0, 24
@@ -2152,7 +2152,7 @@ dp01_build_cmdbuf_x00_a_b_0: @ 80338B4
pop {r0}
bx r0
.pool
thumb_func_end dp01_build_cmdbuf_x00_a_b_0
thumb_func_end EmitGetMonData
thumb_func_start dp01_build_cmdbuf_x01_a_b_0
dp01_build_cmdbuf_x01_a_b_0: @ 80338D8
@@ -2175,8 +2175,8 @@ dp01_build_cmdbuf_x01_a_b_0: @ 80338D8
.pool
thumb_func_end dp01_build_cmdbuf_x01_a_b_0
thumb_func_start EmitSetAttributes
EmitSetAttributes: @ 8033900
thumb_func_start EmitSetMonData
EmitSetMonData: @ 8033900
push {r4-r6,lr}
ldr r4, [sp, 0x10]
lsls r0, 24
@@ -2209,7 +2209,7 @@ _0803392E:
pop {r0}
bx r0
.pool
thumb_func_end EmitSetAttributes
thumb_func_end EmitSetMonData
thumb_func_start sub_8033940
sub_8033940: @ 8033940
@@ -2264,8 +2264,8 @@ dp01_build_cmdbuf_x04_4_4_4: @ 8033980
.pool
thumb_func_end dp01_build_cmdbuf_x04_4_4_4
thumb_func_start dp01_build_cmdbuf_x05_a_b_c
dp01_build_cmdbuf_x05_a_b_c: @ 80339A0
thumb_func_start EmitSwitchInAnim
EmitSwitchInAnim: @ 80339A0
push {r4,lr}
adds r4, r1, 0
lsls r0, 24
@@ -2282,10 +2282,10 @@ dp01_build_cmdbuf_x05_a_b_c: @ 80339A0
pop {r0}
bx r0
.pool
thumb_func_end dp01_build_cmdbuf_x05_a_b_c
thumb_func_end EmitSwitchInAnim
thumb_func_start dp01_build_cmdbuf_x06_a
dp01_build_cmdbuf_x06_a: @ 80339C4
thumb_func_start EmitReturnPokeToBall
EmitReturnPokeToBall: @ 80339C4
push {lr}
adds r3, r1, 0
lsls r0, 24
@@ -2299,7 +2299,7 @@ dp01_build_cmdbuf_x06_a: @ 80339C4
pop {r0}
bx r0
.pool
thumb_func_end dp01_build_cmdbuf_x06_a
thumb_func_end EmitReturnPokeToBall
thumb_func_start dp01_build_cmdbuf_x07_7_7_7
dp01_build_cmdbuf_x07_7_7_7: @ 80339E4
@@ -2319,8 +2319,8 @@ dp01_build_cmdbuf_x07_7_7_7: @ 80339E4
.pool
thumb_func_end dp01_build_cmdbuf_x07_7_7_7
thumb_func_start dp01_build_cmdbuf_x08_8_8_8
dp01_build_cmdbuf_x08_8_8_8: @ 8033A04
thumb_func_start EmitTrainerSlide
EmitTrainerSlide: @ 8033A04
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -2335,10 +2335,10 @@ dp01_build_cmdbuf_x08_8_8_8: @ 8033A04
pop {r0}
bx r0
.pool
thumb_func_end dp01_build_cmdbuf_x08_8_8_8
thumb_func_end EmitTrainerSlide
thumb_func_start dp01_build_cmdbuf_x09_9_9_9
dp01_build_cmdbuf_x09_9_9_9: @ 8033A24
thumb_func_start EmitTrainerSlideBack
EmitTrainerSlideBack: @ 8033A24
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -2353,10 +2353,10 @@ dp01_build_cmdbuf_x09_9_9_9: @ 8033A24
pop {r0}
bx r0
.pool
thumb_func_end dp01_build_cmdbuf_x09_9_9_9
thumb_func_end EmitTrainerSlideBack
thumb_func_start dp01_build_cmdbuf_x0A_A_A_A
dp01_build_cmdbuf_x0A_A_A_A: @ 8033A44
thumb_func_start EmitFaintAnimation
EmitFaintAnimation: @ 8033A44
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -2371,7 +2371,7 @@ dp01_build_cmdbuf_x0A_A_A_A: @ 8033A44
pop {r0}
bx r0
.pool
thumb_func_end dp01_build_cmdbuf_x0A_A_A_A
thumb_func_end EmitFaintAnimation
thumb_func_start dp01_build_cmdbuf_x0B_B_B_B
dp01_build_cmdbuf_x0B_B_B_B: @ 8033A64
@@ -2409,8 +2409,8 @@ dp01_build_cmdbuf_x0C_C_C_C: @ 8033A84
.pool
thumb_func_end dp01_build_cmdbuf_x0C_C_C_C
thumb_func_start dp01_build_cmdbuf_x0D_a
dp01_build_cmdbuf_x0D_a: @ 8033AA4
thumb_func_start EmitBallThrow
EmitBallThrow: @ 8033AA4
push {lr}
adds r3, r1, 0
lsls r0, 24
@@ -2424,7 +2424,7 @@ dp01_build_cmdbuf_x0D_a: @ 8033AA4
pop {r0}
bx r0
.pool
thumb_func_end dp01_build_cmdbuf_x0D_a
thumb_func_end EmitBallThrow
thumb_func_start sub_8033AC4
sub_8033AC4: @ 8033AC4
@@ -2465,8 +2465,8 @@ _08033AF2:
.pool
thumb_func_end sub_8033AC4
thumb_func_start dp01_build_cmdbuf_x0F_aa_b_cc_dddd_e_mlc_weather_00_x1Cbytes
dp01_build_cmdbuf_x0F_aa_b_cc_dddd_e_mlc_weather_00_x1Cbytes: @ 8033B0C
thumb_func_start EmitMoveAnimation
EmitMoveAnimation: @ 8033B0C
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -2568,7 +2568,7 @@ _08033BB6:
pop {r0}
bx r0
.pool
thumb_func_end dp01_build_cmdbuf_x0F_aa_b_cc_dddd_e_mlc_weather_00_x1Cbytes
thumb_func_end EmitMoveAnimation
thumb_func_start dp01_build_cmdbuf_x10_TODO
dp01_build_cmdbuf_x10_TODO: @ 8033BE4
@@ -2596,7 +2596,7 @@ dp01_build_cmdbuf_x10_TODO: @ 8033BE4
ldr r4, =gCurrentMove
ldrh r0, [r4]
strh r0, [r2, 0x4]
ldr r0, =gUnknown_020241EC
ldr r0, =gLastUsedMove
ldrh r0, [r0]
mov r1, r12
strh r0, [r1, 0x2]
@@ -2687,8 +2687,8 @@ _08033C88:
.pool
thumb_func_end dp01_build_cmdbuf_x10_TODO
thumb_func_start dp01_build_cmdbuf_x11_TODO
dp01_build_cmdbuf_x11_TODO: @ 8033CFC
thumb_func_start EmitPrintStringPlayerOnly
EmitPrintStringPlayerOnly: @ 8033CFC
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -2711,7 +2711,7 @@ dp01_build_cmdbuf_x11_TODO: @ 8033CFC
ldr r0, =gCurrentMove
ldrh r0, [r0]
strh r0, [r2, 0x4]
ldr r0, =gUnknown_020241EC
ldr r0, =gLastUsedMove
ldrh r0, [r0]
mov r1, r12
strh r0, [r1, 0x2]
@@ -2784,7 +2784,7 @@ _08033D7C:
pop {r0}
bx r0
.pool
thumb_func_end dp01_build_cmdbuf_x11_TODO
thumb_func_end EmitPrintStringPlayerOnly
thumb_func_start dp01_build_cmdbuf_x12_a_bb
dp01_build_cmdbuf_x12_a_bb: @ 8033DE4
@@ -2809,8 +2809,8 @@ dp01_build_cmdbuf_x12_a_bb: @ 8033DE4
.pool
thumb_func_end dp01_build_cmdbuf_x12_a_bb
thumb_func_start sub_8033E10
sub_8033E10: @ 8033E10
thumb_func_start EmitCmd13
EmitCmd13: @ 8033E10
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -2825,7 +2825,7 @@ sub_8033E10: @ 8033E10
pop {r0}
bx r0
.pool
thumb_func_end sub_8033E10
thumb_func_end EmitCmd13
thumb_func_start sub_8033E30
sub_8033E30: @ 8033E30
@@ -2888,8 +2888,8 @@ _08033E7E:
.pool
thumb_func_end sub_8033E6C
thumb_func_start dp01_build_cmdbuf_x16_a_b_c_ptr_d_e_f
dp01_build_cmdbuf_x16_a_b_c_ptr_d_e_f: @ 8033EA0
thumb_func_start EmitChoosePokemon
EmitChoosePokemon: @ 8033EA0
push {r4-r6,lr}
ldr r6, [sp, 0x10]
lsls r0, 24
@@ -2918,7 +2918,7 @@ _08033EBA:
pop {r0}
bx r0
.pool
thumb_func_end dp01_build_cmdbuf_x16_a_b_c_ptr_d_e_f
thumb_func_end EmitChoosePokemon
thumb_func_start dp01_build_cmdbuf_x17_17_17_17
dp01_build_cmdbuf_x17_17_17_17: @ 8033EDC
@@ -2938,8 +2938,8 @@ dp01_build_cmdbuf_x17_17_17_17: @ 8033EDC
.pool
thumb_func_end dp01_build_cmdbuf_x17_17_17_17
thumb_func_start dp01_build_cmdbuf_x18_0_aa_health_bar_update
dp01_build_cmdbuf_x18_0_aa_health_bar_update: @ 8033EFC
thumb_func_start EmitHealthBarUpdate
EmitHealthBarUpdate: @ 8033EFC
push {r4,lr}
lsls r0, 24
lsrs r0, 24
@@ -2965,10 +2965,10 @@ dp01_build_cmdbuf_x18_0_aa_health_bar_update: @ 8033EFC
pop {r0}
bx r0
.pool
thumb_func_end dp01_build_cmdbuf_x18_0_aa_health_bar_update
thumb_func_end EmitHealthBarUpdate
thumb_func_start dp01_build_cmdbuf_x19_a_bb
dp01_build_cmdbuf_x19_a_bb: @ 8033F34
thumb_func_start EmitExpUpdate
EmitExpUpdate: @ 8033F34
push {r4,lr}
adds r4, r1, 0
lsls r0, 24
@@ -2993,10 +2993,10 @@ dp01_build_cmdbuf_x19_a_bb: @ 8033F34
pop {r0}
bx r0
.pool
thumb_func_end dp01_build_cmdbuf_x19_a_bb
thumb_func_end EmitExpUpdate
thumb_func_start dp01_build_cmdbuf_x1A_aaaa_bbbb
dp01_build_cmdbuf_x1A_aaaa_bbbb: @ 8033F68
thumb_func_start EmitStatusIconUpdate
EmitStatusIconUpdate: @ 8033F68
push {r4-r6,lr}
adds r4, r1, 0
lsls r0, 24
@@ -3036,10 +3036,10 @@ dp01_build_cmdbuf_x1A_aaaa_bbbb: @ 8033F68
pop {r0}
bx r0
.pool
thumb_func_end dp01_build_cmdbuf_x1A_aaaa_bbbb
thumb_func_end EmitStatusIconUpdate
thumb_func_start dp01_build_cmdbuf_x1B_aaaa_b
dp01_build_cmdbuf_x1B_aaaa_b: @ 8033FBC
thumb_func_start EmitStatusAnimation
EmitStatusAnimation: @ 8033FBC
push {r4,lr}
adds r4, r1, 0
lsls r0, 24
@@ -3067,7 +3067,7 @@ dp01_build_cmdbuf_x1B_aaaa_b: @ 8033FBC
pop {r0}
bx r0
.pool
thumb_func_end dp01_build_cmdbuf_x1B_aaaa_b
thumb_func_end EmitStatusAnimation
thumb_func_start dp01_build_cmdbuf_x1C_a
dp01_build_cmdbuf_x1C_a: @ 8033FF8
@@ -3431,8 +3431,8 @@ dp01_build_cmdbuf_x28_28_28_28: @ 8034274
.pool
thumb_func_end dp01_build_cmdbuf_x28_28_28_28
thumb_func_start dp01_build_cmdbuf_x29_29_29_29
dp01_build_cmdbuf_x29_29_29_29: @ 8034294
thumb_func_start EmitHitAnimation
EmitHitAnimation: @ 8034294
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -3447,10 +3447,10 @@ dp01_build_cmdbuf_x29_29_29_29: @ 8034294
pop {r0}
bx r0
.pool
thumb_func_end dp01_build_cmdbuf_x29_29_29_29
thumb_func_end EmitHitAnimation
thumb_func_start dp01_build_cmdbuf_x2A_2A_2A_2A
dp01_build_cmdbuf_x2A_2A_2A_2A: @ 80342B4
thumb_func_start Emit_x2A
Emit_x2A: @ 80342B4
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -3465,10 +3465,10 @@ dp01_build_cmdbuf_x2A_2A_2A_2A: @ 80342B4
pop {r0}
bx r0
.pool
thumb_func_end dp01_build_cmdbuf_x2A_2A_2A_2A
thumb_func_end Emit_x2A
thumb_func_start dp01_build_cmdbuf_x2B_aa_0
dp01_build_cmdbuf_x2B_aa_0: @ 80342D4
thumb_func_start EmitEffectivenessSound
EmitEffectivenessSound: @ 80342D4
push {r4,lr}
lsls r0, 24
lsrs r0, 24
@@ -3489,10 +3489,10 @@ dp01_build_cmdbuf_x2B_aa_0: @ 80342D4
pop {r0}
bx r0
.pool
thumb_func_end dp01_build_cmdbuf_x2B_aa_0
thumb_func_end EmitEffectivenessSound
thumb_func_start sub_8034300
sub_8034300: @ 8034300
thumb_func_start EmitPlaySound
EmitPlaySound: @ 8034300
push {r4,lr}
lsls r0, 24
lsrs r0, 24
@@ -3512,10 +3512,10 @@ sub_8034300: @ 8034300
pop {r0}
bx r0
.pool
thumb_func_end sub_8034300
thumb_func_end EmitPlaySound
thumb_func_start dp01_build_cmdbuf_x2D_2D_2D_2D
dp01_build_cmdbuf_x2D_2D_2D_2D: @ 803432C
thumb_func_start EmitFaintingCry
EmitFaintingCry: @ 803432C
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -3530,7 +3530,7 @@ dp01_build_cmdbuf_x2D_2D_2D_2D: @ 803432C
pop {r0}
bx r0
.pool
thumb_func_end dp01_build_cmdbuf_x2D_2D_2D_2D
thumb_func_end EmitFaintingCry
thumb_func_start dp01_build_cmdbuf_x2E_a
dp01_build_cmdbuf_x2E_a: @ 803434C
@@ -3567,8 +3567,8 @@ dp01_build_cmdbuf_x2F_2F_2F_2F: @ 803436C
.pool
thumb_func_end dp01_build_cmdbuf_x2F_2F_2F_2F
thumb_func_start dp01_build_cmdbuf_x30_TODO
dp01_build_cmdbuf_x30_TODO: @ 803438C
thumb_func_start EmitCmd48
EmitCmd48: @ 803438C
push {r4,r5,lr}
adds r4, r1, 0
lsls r0, 24
@@ -3604,10 +3604,10 @@ _080343B4:
pop {r0}
bx r0
.pool
thumb_func_end dp01_build_cmdbuf_x30_TODO
thumb_func_end EmitCmd48
thumb_func_start dp01_build_cmdbuf_x31_31_31_31
dp01_build_cmdbuf_x31_31_31_31: @ 80343D4
thumb_func_start EmitCmd49
EmitCmd49: @ 80343D4
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -3622,7 +3622,7 @@ dp01_build_cmdbuf_x31_31_31_31: @ 80343D4
pop {r0}
bx r0
.pool
thumb_func_end dp01_build_cmdbuf_x31_31_31_31
thumb_func_end EmitCmd49
thumb_func_start dp01_build_cmdbuf_x32_32_32_32
dp01_build_cmdbuf_x32_32_32_32: @ 80343F4
@@ -3642,8 +3642,8 @@ dp01_build_cmdbuf_x32_32_32_32: @ 80343F4
.pool
thumb_func_end dp01_build_cmdbuf_x32_32_32_32
thumb_func_start dp01_build_cmdbuf_x33_a_33_33
dp01_build_cmdbuf_x33_a_33_33: @ 8034414
thumb_func_start EmitSpriteInvisibility
EmitSpriteInvisibility: @ 8034414
push {lr}
adds r3, r1, 0
lsls r0, 24
@@ -3659,10 +3659,10 @@ dp01_build_cmdbuf_x33_a_33_33: @ 8034414
pop {r0}
bx r0
.pool
thumb_func_end dp01_build_cmdbuf_x33_a_33_33
thumb_func_end EmitSpriteInvisibility
thumb_func_start dp01_build_cmdbuf_x34_a_bb_aka_battle_anim
dp01_build_cmdbuf_x34_a_bb_aka_battle_anim: @ 8034438
thumb_func_start EmitBattleAnimation
EmitBattleAnimation: @ 8034438
push {r4,lr}
adds r4, r1, 0
lsls r0, 24
@@ -3682,10 +3682,10 @@ dp01_build_cmdbuf_x34_a_bb_aka_battle_anim: @ 8034438
pop {r0}
bx r0
.pool
thumb_func_end dp01_build_cmdbuf_x34_a_bb_aka_battle_anim
thumb_func_end EmitBattleAnimation
thumb_func_start sub_8034464
sub_8034464: @ 8034464
thumb_func_start EmitLinkStandbyMsg
EmitLinkStandbyMsg: @ 8034464
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
@@ -3716,10 +3716,10 @@ _08034490:
pop {r0}
bx r0
.pool
thumb_func_end sub_8034464
thumb_func_end EmitLinkStandbyMsg
thumb_func_start dp01_build_cmdbuf_x38_a
dp01_build_cmdbuf_x38_a: @ 80344A8
thumb_func_start EmitResetActionMoveSelection
EmitResetActionMoveSelection: @ 80344A8
push {lr}
adds r3, r1, 0
lsls r0, 24
@@ -3733,10 +3733,10 @@ dp01_build_cmdbuf_x38_a: @ 80344A8
pop {r0}
bx r0
.pool
thumb_func_end dp01_build_cmdbuf_x38_a
thumb_func_end EmitResetActionMoveSelection
thumb_func_start dp01_build_cmdbuf_x37_a
dp01_build_cmdbuf_x37_a: @ 80344C8
thumb_func_start Emit_x37
Emit_x37: @ 80344C8
push {r4,r5,lr}
adds r5, r0, 0
lsls r5, 24
@@ -3770,6 +3770,6 @@ dp01_build_cmdbuf_x37_a: @ 80344C8
pop {r0}
bx r0
.pool
thumb_func_end dp01_build_cmdbuf_x37_a
thumb_func_end Emit_x37
.align 2, 0 @ Don't pad with nop.
asm/rom4.s
+16 -16
View File
@@ -1699,19 +1699,19 @@ _080853AC:
lsls r4, 24
lsrs r5, r4, 24
adds r0, r5, 0
bl sub_8088F74
bl MetatileBehavior_IsDeepSouthWarp
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _080853E8
adds r0, r5, 0
bl sub_8088F58
bl MetatileBehavior_IsNonAnimDoor
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _08085442
adds r0, r5, 0
bl sub_8088EFC
bl MetatileBehavior_IsDoor
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3136,12 +3136,12 @@ map_post_load_hook_exec: @ 8085EA0
_08085EBC:
movs r1, 0
str r1, [r4]
ldr r0, =gUnknown_03005DAC
ldr r0, =gFieldCallback
str r1, [r0]
b _08085EEA
.pool
_08085ECC:
ldr r0, =gUnknown_03005DAC
ldr r0, =gFieldCallback
ldr r0, [r0]
cmp r0, 0
beq _08085EE0
@@ -3151,7 +3151,7 @@ _08085ECC:
_08085EE0:
bl mapldr_default
_08085EE4:
ldr r1, =gUnknown_03005DAC
ldr r1, =gFieldCallback
movs r0, 0
str r0, [r1]
_08085EEA:
@@ -3174,8 +3174,8 @@ CB2_NewGame: @ 8085EF8
bl PlayTimeCounter_Start
bl ScriptContext1_Init
bl ScriptContext2_Disable
ldr r1, =gUnknown_03005DAC
ldr r0, =sub_80FB4E0
ldr r1, =gFieldCallback
ldr r0, =ExecuteTruckSequence
str r0, [r1]
ldr r1, =gUnknown_03005DB0
movs r0, 0
@@ -3214,7 +3214,7 @@ c2_whiteout: @ 8085F58
bl player_avatar_init_params_reset
bl ScriptContext1_Init
bl ScriptContext2_Disable
ldr r1, =gUnknown_03005DAC
ldr r1, =gFieldCallback
ldr r0, =sub_80AF3C8
str r0, [r1]
mov r1, sp
@@ -3304,7 +3304,7 @@ _08086062:
sub_8086074: @ 8086074
push {lr}
bl sub_808631C
ldr r0, =gUnknown_03005DAC
ldr r0, =gFieldCallback
ldr r1, =sub_80AF314
str r1, [r0]
ldr r0, =c2_80567AC
@@ -3399,12 +3399,12 @@ c2_8056854: @ 8086140
ldrb r0, [r0]
cmp r0, 0
beq _08086174
ldr r1, =gUnknown_03005DAC
ldr r1, =gFieldCallback
ldr r0, =sub_80AF314
b _08086178
.pool
_08086174:
ldr r1, =gUnknown_03005DAC
ldr r1, =gFieldCallback
ldr r0, =sub_80AF214
_08086178:
str r0, [r1]
@@ -3433,7 +3433,7 @@ sub_8086194: @ 8086194
sub_80861B0: @ 80861B0
push {lr}
bl sub_808631C
ldr r1, =gUnknown_03005DAC
ldr r1, =gFieldCallback
ldr r0, =sub_80AF188
str r0, [r1]
bl c2_exit_to_overworld_2_switch
@@ -3446,7 +3446,7 @@ sub_80861B0: @ 80861B0
c2_exit_to_overworld_1_continue_scripts_restart_music: @ 80861CC
push {lr}
bl sub_808631C
ldr r1, =gUnknown_03005DAC
ldr r1, =gFieldCallback
ldr r0, =sub_80AF168
str r0, [r1]
bl c2_exit_to_overworld_2_switch
@@ -3459,7 +3459,7 @@ c2_exit_to_overworld_1_continue_scripts_restart_music: @ 80861CC
sub_80861E8: @ 80861E8
push {lr}
bl sub_808631C
ldr r1, =gUnknown_03005DAC
ldr r1, =gFieldCallback
ldr r0, =sub_80AF3C8
str r0, [r1]
bl c2_exit_to_overworld_2_switch
@@ -3562,7 +3562,7 @@ _080862BE:
.pool
_080862F4:
bl sub_80EDB44
ldr r0, =gUnknown_03005DAC
ldr r0, =gFieldCallback
ldr r1, =sub_8086204
str r1, [r0]
ldr r0, =c1_overworld
asm/rom6.s
+8 -8
View File
@@ -1984,7 +1984,7 @@ sub_8136524: @ 8136524
lsrs r0, 24
cmp r0, 0x1
bhi _0813655A
ldr r1, =gUnknown_03005DAC
ldr r1, =gFieldCallback
ldr r0, =sub_80AF168
str r0, [r1]
_0813655A:
@@ -4651,7 +4651,7 @@ sub_8137C3C: @ 8137C3C
push {lr}
ldr r0, =c2_exit_to_overworld_2_switch
bl SetMainCallback2
ldr r1, =gUnknown_03005DAC
ldr r1, =gFieldCallback
ldr r0, =mapldr_080CA5C0
str r0, [r1]
pop {r0}
@@ -5062,8 +5062,8 @@ sub_8137FB0: @ 8137FB0
.pool
thumb_func_end sub_8137FB0
thumb_func_start sub_8137FC0
sub_8137FC0: @ 8137FC0
thumb_func_start CountSSTidalStep
CountSSTidalStep: @ 8137FC0
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
@@ -5091,10 +5091,10 @@ _08137FF6:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_8137FC0
thumb_func_end CountSSTidalStep
thumb_func_start sub_8137FFC
sub_8137FFC: @ 8137FFC
thumb_func_start GetSSTidalLocation
GetSSTidalLocation: @ 8137FFC
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -5203,7 +5203,7 @@ _081380CE:
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_8137FFC
thumb_func_end GetSSTidalLocation
thumb_func_start is_tile_that_overrides_player_control
is_tile_that_overrides_player_control: @ 81380D8
asm/rom_80A5C6C.s
+12 -12
View File
@@ -1830,8 +1830,8 @@ GetBankIdentity: @ 80A6A44
.pool
thumb_func_end GetBankIdentity
thumb_func_start GetBankByPlayerAI
GetBankByPlayerAI: @ 80A6A54
thumb_func_start GetBankByIdentity
GetBankByIdentity: @ 80A6A54
push {r4,lr}
lsls r0, 24
lsrs r3, r0, 24
@@ -1860,7 +1860,7 @@ _080A6A7E:
pop {r1}
bx r1
.pool
thumb_func_end GetBankByPlayerAI
thumb_func_end GetBankByIdentity
thumb_func_start sub_80A6A90
sub_80A6A90: @ 80A6A90
@@ -3496,7 +3496,7 @@ _080A76F2:
cmp r5, 0
beq _080A771A
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
bl b_side_obj__get_some_boolean
@@ -3504,7 +3504,7 @@ _080A76F2:
cmp r0, 0
beq _080A771A
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
adds r0, 0x10
@@ -3514,7 +3514,7 @@ _080A771A:
cmp r6, 0
beq _080A7746
movs r0, 0x2
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
bl b_side_obj__get_some_boolean
@@ -3522,7 +3522,7 @@ _080A771A:
cmp r0, 0
beq _080A7746
movs r0, 0x2
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
adds r1, r0, 0
@@ -3534,7 +3534,7 @@ _080A7746:
cmp r7, 0
beq _080A7772
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
bl b_side_obj__get_some_boolean
@@ -3542,7 +3542,7 @@ _080A7746:
cmp r0, 0
beq _080A7772
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
adds r1, r0, 0
@@ -3555,7 +3555,7 @@ _080A7772:
cmp r0, 0
beq _080A77A0
movs r0, 0x3
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
bl b_side_obj__get_some_boolean
@@ -3563,7 +3563,7 @@ _080A7772:
cmp r0, 0
beq _080A77A0
movs r0, 0x3
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
adds r1, r0, 0
@@ -3592,7 +3592,7 @@ sub_80A77B4: @ 80A77B4
push {lr}
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
pop {r1}
asm/roulette.s
+1 -1
View File
@@ -3273,7 +3273,7 @@ sub_8141E7C: @ 8141E7C
bl ResetPaletteFade
bl ResetSpriteData
bl sub_8140418
ldr r1, =gUnknown_03005DAC
ldr r1, =gFieldCallback
ldr r0, =sub_80AF168
str r0, [r1]
ldr r0, =c2_exit_to_overworld_2_switch
asm/save.s
-164
View File
@@ -1,164 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_8153688
sub_8153688: @ 8153688
push {r4,lr}
lsls r0, 24
lsrs r2, r0, 24
lsls r0, r2, 2
adds r0, r2
lsls r0, 3
ldr r1, =gTasks + 0x8
adds r4, r0, r1
movs r1, 0
ldrsh r0, [r4, r1]
cmp r0, 0xB
bls _081536A2
b _081537C2
_081536A2:
lsls r0, 2
ldr r1, =_081536B4
adds r0, r1
ldr r0, [r0]
mov pc, r0
.pool
.align 2, 0
_081536B4:
.4byte _081536E4
.4byte _081536F4
.4byte _081536FE
.4byte _0815371A
.4byte _0815372C
.4byte _08153742
.4byte _08153758
.4byte _08153762
.4byte _08153778
.4byte _0815378C
.4byte _08153796
.4byte _081537A8
_081536E4:
ldr r0, =gSoftResetDisabled
movs r1, 0x1
strb r1, [r0]
movs r0, 0x1
strh r0, [r4]
b _081537C2
.pool
_081536F4:
bl sub_800ADF8
movs r0, 0x2
strh r0, [r4]
b _081537C2
_081536FE:
bl sub_800A520
lsls r0, 24
cmp r0, 0
beq _081537C2
movs r1, 0x4
ldrsh r0, [r4, r1]
cmp r0, 0
bne _08153714
bl save_serialize_map
_08153714:
movs r0, 0x3
strh r0, [r4]
b _081537C2
_0815371A:
movs r1, 0x4
ldrsh r0, [r4, r1]
cmp r0, 0
bne _08153726
bl sub_8076D5C
_08153726:
bl sub_8153380
b _08153752
_0815372C:
ldrh r0, [r4, 0x2]
adds r0, 0x1
strh r0, [r4, 0x2]
lsls r0, 16
asrs r1, r0, 16
cmp r1, 0x5
bne _081537C2
movs r0, 0
strh r0, [r4, 0x2]
strh r1, [r4]
b _081537C2
_08153742:
bl sub_81533AC
lsls r0, 24
cmp r0, 0
beq _08153752
movs r0, 0x6
strh r0, [r4]
b _081537C2
_08153752:
movs r0, 0x4
strh r0, [r4]
b _081537C2
_08153758:
bl sub_81533E0
movs r0, 0x7
strh r0, [r4]
b _081537C2
_08153762:
movs r1, 0x4
ldrsh r0, [r4, r1]
cmp r0, 0
bne _0815376E
bl sav2_gender2_inplace_and_xFE
_0815376E:
bl sub_800ADF8
movs r0, 0x8
strh r0, [r4]
b _081537C2
_08153778:
bl sub_800A520
lsls r0, 24
cmp r0, 0
beq _081537C2
bl sub_8153408
movs r0, 0x9
strh r0, [r4]
b _081537C2
_0815378C:
bl sub_800ADF8
movs r0, 0xA
strh r0, [r4]
b _081537C2
_08153796:
bl sub_800A520
lsls r0, 24
cmp r0, 0
beq _081537C2
ldrh r0, [r4]
adds r0, 0x1
strh r0, [r4]
b _081537C2
_081537A8:
ldrh r0, [r4, 0x2]
adds r0, 0x1
strh r0, [r4, 0x2]
lsls r0, 16
asrs r0, 16
cmp r0, 0x5
ble _081537C2
ldr r1, =gSoftResetDisabled
movs r0, 0
strb r0, [r1]
adds r0, r2, 0
bl DestroyTask
_081537C2:
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_8153688
.align 2, 0 @ Don't pad with nop.
asm/scrcmd.s
+5 -5
View File
@@ -3977,7 +3977,7 @@ sub_809B114: @ 809B114
adds r4, r0
ldr r0, [r4]
lsrs r1, 11
ldr r2, =gUnknown_085A5C09
ldr r2, =gDecorations + 1
adds r1, r2
bl StringCopy
movs r0, 0
@@ -4183,7 +4183,7 @@ sC6_load_textvar_box_label: @ 809B2C8
ldr r4, [r4]
lsls r0, 24
lsrs r0, 24
bl sav3_get_box_name
bl GetBoxNamePtr
adds r1, r0, 0
adds r0, r4, 0
bl StringCopy
@@ -4468,7 +4468,7 @@ s93_display_money: @ 809B500
bl GetMoney
adds r1, r5, 0
adds r2, r4, 0
bl sub_80E52EC
bl DrawMoneyBox
_0809B530:
movs r0, 0
pop {r4,r5}
@@ -4480,7 +4480,7 @@ _0809B530:
thumb_func_start s94_hide_money
s94_hide_money: @ 809B53C
push {lr}
bl sub_80E5384
bl HideMoneyBox
movs r0, 0
pop {r1}
bx r1
@@ -4505,7 +4505,7 @@ s95_update_money: @ 809B548
lsls r1, 3
adds r0, r1
bl GetMoney
bl sub_80E52D4
bl ChangeAmountInMoneyBox
_0809B56E:
movs r0, 0
pop {r1}
asm/secret_base.s
+11 -11
View File
@@ -686,7 +686,7 @@ _080E900C:
_080E9030:
bl sub_80E8F9C
bl warp_in
ldr r0, =gUnknown_03005DAC
ldr r0, =gFieldCallback
ldr r1, =sub_80AF168
str r1, [r0]
ldr r0, =c2_load_new_map
@@ -863,7 +863,7 @@ sub_80E916C: @ 80E916C
adds r0, r5, 0
bl warp1_set
bl warp_in
ldr r1, =gUnknown_03005DAC
ldr r1, =gFieldCallback
ldr r0, =sub_80E9108
str r0, [r1]
ldr r0, =c2_load_new_map
@@ -1163,13 +1163,13 @@ _080E941E:
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl sub_8089350
bl MetatileBehavior_IsMB_B5
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _080E9462
adds r0, r4, 0
bl sub_8089364
bl MetatileBehavior_IsMB_C3
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1486,7 +1486,7 @@ _080E96F4:
movs r0, 0x7E
bl copy_saved_warp2_bank_and_enter_x_to_warp1
bl warp_in
ldr r0, =gUnknown_03005DAC
ldr r0, =gFieldCallback
ldr r1, =mapldr_default
str r1, [r0]
ldr r0, =c2_load_new_map
@@ -3288,7 +3288,7 @@ _080EA62C:
.pool
_080EA668:
adds r0, r5, 0
bl sub_80893C8
bl MetatileBehavior_IsSecretBaseGlitterMat
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3308,7 +3308,7 @@ _080EA680:
.pool
_080EA698:
adds r0, r5, 0
bl sub_808938C
bl MetatileBehavior_IsSecretBaseBalloon
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3377,7 +3377,7 @@ _080EA714:
.pool
_080EA72C:
adds r0, r5, 0
bl sub_80893A0
bl MetatileBehavior_IsMB_BE
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3409,7 +3409,7 @@ _080EA75E:
.pool
_080EA778:
adds r0, r5, 0
bl sub_80893B4
bl MetatileBehavior_IsSecretBaseSoundMat
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3429,7 +3429,7 @@ _080EA778:
.pool
_080EA7A8:
adds r0, r5, 0
bl MetatileBehavior_0xBB
bl MetatileBehavior_IsSecretBaseJumpMat
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3449,7 +3449,7 @@ _080EA7A8:
.pool
_080EA7D8:
adds r0, r5, 0
bl MetatileBehavior_0xBC
bl MetatileBehavior_IsSecretBaseSpinMat
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
asm/shop.s
+8 -8
View File
@@ -227,7 +227,7 @@ HandleShopMenuSell: @ 80DFC0C
@ int CB2_ExitSellMenu()
CB2_ExitSellMenu: @ 80DFC48
push {lr}
ldr r0, =gUnknown_03005DAC
ldr r0, =gFieldCallback
ldr r1, =MapPostLoadHook_ExitBuyOrSellMenu
str r1, [r0]
ldr r0, =c2_exit_to_overworld_2_switch
@@ -657,7 +657,7 @@ BuyMenuSetListEntry: @ 80E0000
.pool
_080E0020:
lsls r1, r4, 5
ldr r0, =gUnknown_085A5C09
ldr r0, =gDecorations + 1
adds r1, r0
adds r0, r5, 0
bl StringCopy
@@ -1125,7 +1125,7 @@ BuyMenuInitBgs: @ 80E036C
BuyMenuDecompressBgGraphics: @ 80E0424
push {lr}
sub sp, 0x4
ldr r1, =gUnknown_08D9AFBC
ldr r1, =gBuyMenuFrame_Gfx
movs r2, 0xE8
lsls r2, 2
ldr r3, =0x000003e3
@@ -1133,11 +1133,11 @@ BuyMenuDecompressBgGraphics: @ 80E0424
str r0, [sp]
movs r0, 0x1
bl decompress_and_copy_tile_data_to_vram
ldr r0, =gUnknown_08D9B0F0
ldr r0, =gBuyMenuFrame_Tilemap
ldr r1, =gUnknown_02039F70
ldr r1, [r1]
bl LZDecompressWram
ldr r0, =gUnknown_08D9B0C8
ldr r0, =gMenuMoneyPal
movs r1, 0xC0
movs r2, 0x20
bl LoadCompressedPalette
@@ -1259,7 +1259,7 @@ BuyMenuDrawGraphics: @ 80E0524
movs r0, 0
movs r1, 0x1
movs r2, 0xD
bl set_window_border_style_and_print_money_box
bl PrintMoneyAmountInMoneyBoxWithBorder
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x1
@@ -2106,7 +2106,7 @@ _080E0C28:
_080E0C38:
ldr r0, =gStringVar1
lsls r1, r5, 5
ldr r2, =gUnknown_085A5C09
ldr r2, =gDecorations + 1
adds r1, r2
bl StringCopy
ldr r0, =gStringVar2
@@ -2668,7 +2668,7 @@ ExitBuyMenu: @ 80E1168
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r1, =gUnknown_03005DAC
ldr r1, =gFieldCallback
ldr r0, =MapPostLoadHook_ExitBuyOrSellMenu
str r0, [r1]
movs r0, 0x1
asm/title_screen.s
+8 -8
View File
@@ -468,7 +468,7 @@ title_screen_vblank_callback: @ 80AA780
bl LoadOam
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
ldrh r1, [r0]
movs r0, 0x16
bl SetGpuReg
@@ -590,7 +590,7 @@ _080AA7E0:
b _080AAB1E
.pool
_080AA8C4:
ldr r0, =gTitleScreenPokemonLogoTiles
ldr r0, =gTitleScreenPokemonLogoGfx
movs r1, 0xC0
lsls r1, 19
bl LZ77UnCompVram
@@ -602,13 +602,13 @@ _080AA8C4:
lsls r2, 1
movs r1, 0
bl LoadPalette
ldr r0, =gTitleScreenRayquazaTiles
ldr r0, =gTitleScreenRayquazaGfx
ldr r1, =0x06008000
bl LZ77UnCompVram
ldr r0, =gUnknown_0853F83C
ldr r0, =gTitleScreenRayquazaTilemap
ldr r1, =0x0600d000
bl LZ77UnCompVram
ldr r0, =gTitleScreenCloudsTiles
ldr r0, =gTitleScreenCloudsGfx
ldr r1, =0x0600c000
bl LZ77UnCompVram
ldr r0, =gUnknown_08DDE458
@@ -627,7 +627,7 @@ _080AA8C4:
bl LoadCompressedObjectPic
ldr r0, =gUnknown_0854013C
bl LoadCompressedObjectPic
ldr r0, =gUnknown_08DDE438
ldr r0, =gTitleScreenEmeraldVersionPal
movs r1, 0x80
lsls r1, 1
movs r2, 0x20
@@ -1156,14 +1156,14 @@ _080AAE30:
ldrh r0, [r3, 0x10]
adds r0, 0x1
strh r0, [r3, 0x10]
ldr r2, =gUnknown_02022E1A
ldr r2, =gBattle_BG1_Y
movs r1, 0x10
ldrsh r0, [r3, r1]
lsrs r1, r0, 31
adds r0, r1
asrs r0, 1
strh r0, [r2]
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
movs r0, 0
strh r0, [r1]
_080AAE72:
asm/trade.s
+1 -1
View File
@@ -14195,7 +14195,7 @@ sub_807F110: @ 807F110
bne _0807F134
ldr r0, =sub_807B270
bl SetMainCallback2
ldr r1, =gUnknown_03005DAC
ldr r1, =gFieldCallback
ldr r0, =sub_80AF168
str r0, [r1]
adds r0, r4, 0
asm/trader.s
+3 -3
View File
@@ -113,7 +113,7 @@ _08133AC2:
_08133AF0:
ldrb r1, [r1]
lsls r1, 5
ldr r0, =gUnknown_085A5C09
ldr r0, =gDecorations + 1
adds r1, r0
movs r0, 0x1
movs r2, 0
@@ -172,7 +172,7 @@ _08133B70:
ldrb r0, [r7, 0x6]
ldrb r2, [r1]
lsls r2, 5
ldr r1, =gUnknown_085A5C09
ldr r1, =gDecorations + 1
adds r2, r1
lsls r1, r5, 4
adds r1, 0x1
@@ -450,7 +450,7 @@ sub_8133DA0: @ 8133DA0
ldr r1, =gSpecialVar_0x8004
ldrh r1, [r1]
lsls r1, 5
ldr r4, =gUnknown_085A5C09
ldr r4, =gDecorations + 1
adds r1, r4
bl StringCopy
ldr r0, =gStringVar2
asm/truck_scene.s
-589
View File
@@ -1,589 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_80FB0B0
sub_80FB0B0: @ 80FB0B0
push {r4,lr}
adds r4, r0, 0
movs r1, 0x78
bl __modsi3
cmp r0, 0
bne _080FB0C4
movs r0, 0x1
negs r0, r0
b _080FB0D6
_080FB0C4:
adds r0, r4, 0
movs r1, 0xA
bl __modsi3
cmp r0, 0x4
ble _080FB0D4
movs r0, 0
b _080FB0D6
_080FB0D4:
movs r0, 0x1
_080FB0D6:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_80FB0B0
thumb_func_start sub_80FB0DC
sub_80FB0DC: @ 80FB0DC
push {lr}
adds r0, 0x78
movs r1, 0xB4
bl __modsi3
cmp r0, 0
beq _080FB0EE
movs r0, 0
b _080FB0F2
_080FB0EE:
movs r0, 0x1
negs r0, r0
_080FB0F2:
pop {r1}
bx r1
thumb_func_end sub_80FB0DC
thumb_func_start sub_80FB0F8
sub_80FB0F8: @ 80FB0F8
push {r4,r5,lr}
sub sp, 0x4
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
ldr r0, =gTasks + 0x8
adds r5, r1, r0
movs r1, 0
ldrsh r0, [r5, r1]
adds r0, 0x1E
bl sub_80FB0DC
ldr r4, =gSaveBlock1Ptr
ldr r2, [r4]
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
lsls r0, 18
movs r3, 0xC0
lsls r3, 10
orrs r0, r3
asrs r0, 16
str r0, [sp]
movs r0, 0x1
movs r3, 0x3
bl sub_808E82C
movs r3, 0
ldrsh r0, [r5, r3]
bl sub_80FB0DC
ldr r2, [r4]
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
lsls r0, 17
ldr r3, =0xfffd0000
adds r0, r3
asrs r0, 16
str r0, [sp]
movs r0, 0x2
movs r3, 0
bl sub_808E82C
movs r1, 0
ldrsh r0, [r5, r1]
bl sub_80FB0DC
ldr r2, [r4]
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
movs r4, 0
movs r3, 0x3
negs r3, r3
lsls r0, 18
asrs r0, 16
str r0, [sp]
movs r0, 0x3
bl sub_808E82C
ldrh r0, [r5]
adds r0, 0x1
strh r0, [r5]
lsls r0, 16
ldr r1, =0x75300000
cmp r0, r1
bne _080FB180
strh r4, [r5]
_080FB180:
movs r3, 0
ldrsh r0, [r5, r3]
bl sub_80FB0B0
adds r1, r0, 0
lsls r1, 16
asrs r1, 16
movs r0, 0
bl SetCameraPanning
add sp, 0x4
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_80FB0F8
thumb_func_start sub_80FB1AC
sub_80FB1AC: @ 80FB1AC
push {r4-r7,lr}
sub sp, 0x4
lsls r0, 24
lsrs r2, r0, 24
lsls r0, r2, 2
adds r0, r2
lsls r3, r0, 3
ldr r4, =gTasks + 0x8
adds r7, r3, r4
ldrh r1, [r7]
adds r1, 0x1
strh r1, [r7]
ldrh r0, [r7, 0x4]
adds r0, 0x1
strh r0, [r7, 0x4]
lsls r1, 16
asrs r1, 16
cmp r1, 0x5
ble _080FB1DC
movs r0, 0
strh r0, [r7]
ldrh r0, [r7, 0x2]
adds r0, 0x1
strh r0, [r7, 0x2]
_080FB1DC:
ldrh r0, [r7, 0x2]
cmp r0, 0x13
bne _080FB1F0
adds r0, r2, 0
bl DestroyTask
b _080FB2A8
.pool
_080FB1F0:
ldr r2, =gUnknown_0858E898
movs r1, 0x2
ldrsh r0, [r7, r1]
adds r0, r2
ldrb r0, [r0]
lsls r0, 24
asrs r0, 24
cmp r0, 0x2
bne _080FB20C
adds r0, r4, 0
subs r0, 0x8
adds r0, r3, r0
ldr r1, =sub_80FB2C0
str r1, [r0]
_080FB20C:
movs r4, 0x2
ldrsh r0, [r7, r4]
adds r0, r2
movs r5, 0
ldrsb r5, [r0, r5]
lsls r5, 16
lsrs r5, 16
movs r1, 0x4
ldrsh r0, [r7, r1]
bl sub_80FB0B0
adds r1, r0, 0
lsls r5, 16
asrs r5, 16
lsls r1, 16
asrs r1, 16
adds r0, r5, 0
bl SetCameraPanning
movs r4, 0x4
ldrsh r0, [r7, r4]
adds r0, 0x1E
bl sub_80FB0DC
ldr r6, =gSaveBlock1Ptr
ldr r2, [r6]
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
movs r3, 0x3
subs r3, r5
lsls r3, 16
asrs r3, 16
lsls r0, 18
movs r4, 0xC0
lsls r4, 10
orrs r0, r4
asrs r0, 16
str r0, [sp]
movs r0, 0x1
bl sub_808E82C
movs r1, 0x4
ldrsh r0, [r7, r1]
bl sub_80FB0DC
ldr r2, [r6]
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
negs r3, r5
lsls r3, 16
asrs r3, 16
lsls r0, 17
ldr r4, =0xfffd0000
adds r0, r4
asrs r0, 16
str r0, [sp]
movs r0, 0x2
bl sub_808E82C
movs r1, 0x4
ldrsh r0, [r7, r1]
bl sub_80FB0DC
ldr r2, [r6]
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
movs r4, 0x3
negs r4, r4
adds r3, r4, 0
subs r3, r5
lsls r3, 16
asrs r3, 16
lsls r0, 18
asrs r0, 16
str r0, [sp]
movs r0, 0x3
bl sub_808E82C
_080FB2A8:
add sp, 0x4
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_80FB1AC
thumb_func_start sub_80FB2C0
sub_80FB2C0: @ 80FB2C0
push {r4-r6,lr}
mov r6, r8
push {r6}
sub sp, 0x4
lsls r0, 24
lsrs r0, 24
adds r3, r0, 0
lsls r0, r3, 2
adds r0, r3
lsls r0, 3
ldr r1, =gTasks + 0x8
adds r2, r0, r1
ldrh r0, [r2]
adds r0, 0x1
strh r0, [r2]
lsls r0, 16
asrs r0, 16
cmp r0, 0x5
ble _080FB2F0
movs r0, 0
strh r0, [r2]
ldrh r0, [r2, 0x2]
adds r0, 0x1
strh r0, [r2, 0x2]
_080FB2F0:
ldrh r0, [r2, 0x2]
cmp r0, 0x13
bne _080FB304
adds r0, r3, 0
bl DestroyTask
b _080FB358
.pool
_080FB304:
ldr r1, =gUnknown_0858E898
movs r3, 0x2
ldrsh r0, [r2, r3]
adds r0, r1
movs r1, 0
mov r8, r1
movs r6, 0
ldrsb r6, [r0, r6]
adds r0, r6, 0
bl SetCameraPanning
ldr r5, =gSaveBlock1Ptr
ldr r0, [r5]
ldrb r1, [r0, 0x5]
ldrb r2, [r0, 0x4]
movs r3, 0x3
subs r3, r6
movs r0, 0x3
str r0, [sp]
movs r0, 0x1
bl sub_808E82C
ldr r0, [r5]
ldrb r1, [r0, 0x5]
ldrb r2, [r0, 0x4]
negs r3, r6
mov r4, r8
subs r4, 0x3
str r4, [sp]
movs r0, 0x2
bl sub_808E82C
ldr r0, [r5]
ldrb r1, [r0, 0x5]
ldrb r2, [r0, 0x4]
subs r4, r6
mov r3, r8
str r3, [sp]
movs r0, 0x3
adds r3, r4, 0
bl sub_808E82C
_080FB358:
add sp, 0x4
pop {r3}
mov r8, r3
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_80FB2C0
thumb_func_start sub_80FB36C
sub_80FB36C: @ 80FB36C
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
ldr r1, =gTasks + 0x8
adds r4, r0, r1
movs r1, 0
ldrsh r0, [r4, r1]
cmp r0, 0x5
bls _080FB386
b _080FB4D8
_080FB386:
lsls r0, 2
ldr r1, =_080FB398
adds r0, r1
ldr r0, [r0]
mov pc, r0
.pool
.align 2, 0
_080FB398:
.4byte _080FB3B0
.4byte _080FB3E8
.4byte _080FB404
.4byte _080FB450
.4byte _080FB474
.4byte _080FB492
_080FB3B0:
ldrh r0, [r4, 0x2]
adds r0, 0x1
strh r0, [r4, 0x2]
lsls r0, 16
asrs r0, 16
cmp r0, 0x5A
beq _080FB3C0
b _080FB4D8
_080FB3C0:
movs r0, 0
bl SetCameraPanningCallback
movs r0, 0
strh r0, [r4, 0x2]
ldr r0, =sub_80FB0F8
movs r1, 0xA
bl CreateTask
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x4]
movs r0, 0x1
strh r0, [r4]
movs r0, 0x31
bl PlaySE
b _080FB4D8
.pool
_080FB3E8:
ldrh r0, [r4, 0x2]
adds r0, 0x1
strh r0, [r4, 0x2]
lsls r0, 16
asrs r0, 16
cmp r0, 0x96
bne _080FB4D8
bl pal_fill_black
movs r0, 0
strh r0, [r4, 0x2]
movs r0, 0x2
strh r0, [r4]
b _080FB4D8
_080FB404:
ldrh r0, [r4, 0x2]
adds r3, r0, 0x1
strh r3, [r4, 0x2]
ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0
bne _080FB4D8
lsls r1, r3, 16
movs r0, 0x96
lsls r0, 17
cmp r1, r0
ble _080FB4D8
strh r2, [r4, 0x2]
ldrb r0, [r4, 0x4]
bl DestroyTask
ldr r0, =sub_80FB1AC
movs r1, 0xA
bl CreateTask
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x6]
movs r0, 0x3
strh r0, [r4]
movs r0, 0x32
bl PlaySE
b _080FB4D8
.pool
_080FB450:
ldr r2, =gTasks
movs r0, 0x6
ldrsh r1, [r4, r0]
lsls r0, r1, 2
adds r0, r1
lsls r0, 3
adds r0, r2
ldrb r5, [r0, 0x4]
cmp r5, 0
bne _080FB4D8
bl InstallCameraPanAheadCallback
strh r5, [r4, 0x2]
movs r0, 0x4
strh r0, [r4]
b _080FB4D8
.pool
_080FB474:
ldrh r0, [r4, 0x2]
adds r0, 0x1
strh r0, [r4, 0x2]
lsls r0, 16
asrs r0, 16
cmp r0, 0x5A
bne _080FB4D8
movs r0, 0x33
bl PlaySE
movs r0, 0
strh r0, [r4, 0x2]
movs r0, 0x5
strh r0, [r4]
b _080FB4D8
_080FB492:
ldrh r0, [r4, 0x2]
adds r0, 0x1
strh r0, [r4, 0x2]
lsls r0, 16
asrs r0, 16
cmp r0, 0x78
bne _080FB4D8
movs r2, 0x82
lsls r2, 2
movs r0, 0xB
movs r1, 0x8
bl MapGridSetMetatileIdAt
movs r2, 0x84
lsls r2, 2
movs r0, 0xB
movs r1, 0x9
bl MapGridSetMetatileIdAt
movs r2, 0x86
lsls r2, 2
movs r0, 0xB
movs r1, 0xA
bl MapGridSetMetatileIdAt
bl DrawWholeMapView
movs r0, 0x34
bl PlaySE
adds r0, r5, 0
bl DestroyTask
bl ScriptContext2_Disable
_080FB4D8:
pop {r4,r5}
pop {r0}
bx r0
thumb_func_end sub_80FB36C
thumb_func_start sub_80FB4E0
sub_80FB4E0: @ 80FB4E0
push {lr}
sub sp, 0x4
ldr r2, =0x0000020d
movs r0, 0xB
movs r1, 0x8
bl MapGridSetMetatileIdAt
ldr r2, =0x00000215
movs r0, 0xB
movs r1, 0x9
bl MapGridSetMetatileIdAt
ldr r2, =0x0000021d
movs r0, 0xB
movs r1, 0xA
bl MapGridSetMetatileIdAt
bl DrawWholeMapView
bl ScriptContext2_Enable
movs r0, 0
str r0, [sp]
ldr r1, =gPlttBufferFaded
ldr r2, =0x01000100
mov r0, sp
bl CpuFastSet
ldr r0, =sub_80FB36C
movs r1, 0xA
bl CreateTask
add sp, 0x4
pop {r0}
bx r0
.pool
thumb_func_end sub_80FB4E0
thumb_func_start sub_80FB540
sub_80FB540: @ 80FB540
push {r4-r6,lr}
sub sp, 0x4
ldr r0, =sub_80FB36C
bl FuncIsActiveTask
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0
bne _080FB58A
ldr r4, =gSaveBlock1Ptr
ldr r0, [r4]
ldrb r1, [r0, 0x5]
ldrb r2, [r0, 0x4]
movs r0, 0x3
str r0, [sp]
movs r0, 0x1
movs r3, 0x3
bl sub_808E82C
ldr r0, [r4]
ldrb r1, [r0, 0x5]
ldrb r2, [r0, 0x4]
movs r5, 0x3
negs r5, r5
str r5, [sp]
movs r0, 0x2
movs r3, 0
bl sub_808E82C
ldr r0, [r4]
ldrb r1, [r0, 0x5]
ldrb r2, [r0, 0x4]
str r6, [sp]
movs r0, 0x3
adds r3, r5, 0
bl sub_808E82C
_080FB58A:
add sp, 0x4
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_80FB540
.align 2, 0 @ Don't pad with nop.
asm/tv.s
+6 -6
View File
@@ -7530,7 +7530,7 @@ sub_80EFDDC: @ 80EFDDC
mov r1, r10
adds r2, r5, 0
adds r3, r4, 0
bl do_choose_name_or_words_screen
bl DoNamingScreen
add sp, 0x8
pop {r3-r5}
mov r8, r3
@@ -7604,7 +7604,7 @@ sub_80EFEC4: @ 80EFEC4
mov r1, r8
adds r2, r5, 0
adds r3, r4, 0
bl do_choose_name_or_words_screen
bl DoNamingScreen
add sp, 0x8
pop {r3}
mov r8, r3
@@ -14911,7 +14911,7 @@ _080F4414:
ldr r0, =gStringVar2
ldrb r1, [r5, 0x4]
lsls r1, 5
ldr r2, =gUnknown_085A5C09
ldr r2, =gDecorations + 1
adds r1, r2
bl StringCopy
ldrb r0, [r5, 0x3]
@@ -14932,7 +14932,7 @@ _080F4448:
ldr r0, =gStringVar2
ldrb r1, [r5, 0x5]
lsls r1, 5
ldr r2, =gUnknown_085A5C09
ldr r2, =gDecorations + 1
adds r1, r2
bl StringCopy
ldrb r1, [r5, 0x3]
@@ -14970,7 +14970,7 @@ _080F449C:
ldr r0, =gStringVar2
ldrb r1, [r5, 0x6]
lsls r1, 5
ldr r4, =gUnknown_085A5C09
ldr r4, =gDecorations + 1
adds r1, r4
bl StringCopy
ldr r0, =gStringVar3
@@ -14983,7 +14983,7 @@ _080F44C0:
ldr r0, =gStringVar2
ldrb r1, [r5, 0x6]
lsls r1, 5
ldr r2, =gUnknown_085A5C09
ldr r2, =gDecorations + 1
adds r1, r2
_080F44CA:
bl StringCopy
asm/unknown_task.s
+5 -5
View File
@@ -275,23 +275,23 @@ _080BA21C:
b _080BA24E
.pool
_080BA224:
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
b _080BA24E
.pool
_080BA22C:
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
b _080BA24E
.pool
_080BA234:
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
b _080BA24E
.pool
_080BA23C:
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
b _080BA24E
.pool
_080BA244:
ldr r0, =gUnknown_02022E20
ldr r0, =gBattle_BG3_X
b _080BA24E
.pool
_080BA24C:
asm/walda_phrase.s
+2 -2
View File
@@ -22,7 +22,7 @@ walda_maybe: @ 81D99E4
adds r1, r4, 0
movs r2, 0
movs r3, 0
bl do_choose_name_or_words_screen
bl DoNamingScreen
add sp, 0x8
pop {r4}
pop {r0}
@@ -70,7 +70,7 @@ _081D9A68:
adds r1, r0, 0
adds r0, r4, 0
bl StringCopy
ldr r1, =gUnknown_03005DAC
ldr r1, =gFieldCallback
ldr r0, =sub_80AF168
str r0, [r1]
ldr r0, =c2_exit_to_overworld_2_switch
asm/wild_encounter.s
+6 -6
View File
@@ -68,7 +68,7 @@ _080B4920:
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl sub_8089660
bl MetatileBehavior_IsSurfableAndNotWaterfall
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1424,7 +1424,7 @@ _080B539C:
lsls r0, r6, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl sub_808952C
bl MetatileBehavior_IsLandWildEncounter
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1498,7 +1498,7 @@ _080B5418:
.pool
_080B543C:
adds r0, r4, 0
bl sub_8089558
bl MetatileBehavior_IsWaterWildEncounter
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1509,7 +1509,7 @@ _080B543C:
cmp r0, 0
beq _080B54FE
adds r0, r4, 0
bl sub_80894AC
bl MetatileBehavior_IsBridge
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1726,7 +1726,7 @@ _080B562C:
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl sub_808952C
bl MetatileBehavior_IsLandWildEncounter
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1769,7 +1769,7 @@ _080B568C:
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl sub_8089558
bl MetatileBehavior_IsWaterWildEncounter
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
asmdiff.sh
+7
View File
@@ -0,0 +1,7 @@
#!/bin/bash
OBJDUMP="$DEVKITARM/bin/arm-none-eabi-objdump -D -bbinary -marmv4t -Mforce-thumb"
OPTIONS="--start-address=$(($1)) --stop-address=$(($1 + $2))"
$OBJDUMP $OPTIONS baserom.gba > baserom.dump
$OBJDUMP $OPTIONS pokeemerald.gba > pokeemerald.dump
diff baserom.dump pokeemerald.dump
constants/constants.inc
+1
View File
@@ -13,6 +13,7 @@
.include "constants/trainer_constants.inc"
.include "constants/battle_frontier_constants.inc"
.include "constants/map_constants.inc"
.include "constants/map_object_constants.inc"
.include "constants/berry_constants.inc"
.include "constants/field_object_constants.inc"
.include "constants/contest_move_effects.inc"
constants/map_object_constants.inc
+230
View File
@@ -0,0 +1,230 @@
.set MAP_OBJ_GFX_BRENDAN_NORMAL, 0
.set MAP_OBJ_GFX_BRENDAN_MACH_BIKE, 1
.set MAP_OBJ_GFX_BRENDAN_SURFING, 2
.set MAP_OBJ_GFX_BRENDAN_FIELD_MOVE, 3
.set MAP_OBJ_GFX_QUINTY_PLUMP, 4
.set MAP_OBJ_GFX_LITTLE_BOY_1, 5
.set MAP_OBJ_GFX_LITTLE_GIRL_1, 6
.set MAP_OBJ_GFX_BOY_1, 7
.set MAP_OBJ_GFX_GIRL_1, 8
.set MAP_OBJ_GFX_BOY_2, 9
.set MAP_OBJ_GFX_GIRL_2, 10
.set MAP_OBJ_GFX_LITTLE_BOY_2, 11
.set MAP_OBJ_GFX_LITTLE_GIRL_2, 12
.set MAP_OBJ_GFX_BOY_3, 13
.set MAP_OBJ_GFX_GIRL_3, 14
.set MAP_OBJ_GFX_BOY_4, 15
.set MAP_OBJ_GFX_WOMAN_1, 16
.set MAP_OBJ_GFX_FAT_MAN, 17
.set MAP_OBJ_GFX_WOMAN_2, 18
.set MAP_OBJ_GFX_MAN_1, 19
.set MAP_OBJ_GFX_WOMAN_3, 20
.set MAP_OBJ_GFX_OLD_MAN_1, 21
.set MAP_OBJ_GFX_OLD_WOMAN_1, 22
.set MAP_OBJ_GFX_MAN_2, 23
.set MAP_OBJ_GFX_WOMAN_4, 24
.set MAP_OBJ_GFX_MAN_3, 25
.set MAP_OBJ_GFX_WOMAN_5, 26
.set MAP_OBJ_GFX_COOK, 27
.set MAP_OBJ_GFX_WOMAN_6, 28
.set MAP_OBJ_GFX_OLD_MAN_2, 29
.set MAP_OBJ_GFX_OLD_WOMAN_2, 30
.set MAP_OBJ_GFX_CAMPER, 31
.set MAP_OBJ_GFX_PICNICKER, 32
.set MAP_OBJ_GFX_MAN_4, 33
.set MAP_OBJ_GFX_WOMAN_7, 34
.set MAP_OBJ_GFX_YOUNGSTER, 35
.set MAP_OBJ_GFX_BUG_CATCHER, 36
.set MAP_OBJ_GFX_PSYCHIC_M, 37
.set MAP_OBJ_GFX_SCHOOL_KID_M, 38
.set MAP_OBJ_GFX_MANIAC, 39
.set MAP_OBJ_GFX_HEX_MANIAC, 40
.set MAP_OBJ_GFX_RAYQUAZA, 41
.set MAP_OBJ_GFX_SWIMMER_M, 42
.set MAP_OBJ_GFX_SWIMMER_F, 43
.set MAP_OBJ_GFX_BLACK_BELT, 44
.set MAP_OBJ_GFX_BEAUTY, 45
.set MAP_OBJ_GFX_SCIENTIST_1, 46
.set MAP_OBJ_GFX_LASS, 47
.set MAP_OBJ_GFX_GENTLEMAN, 48
.set MAP_OBJ_GFX_SAILOR, 49
.set MAP_OBJ_GFX_FISHERMAN, 50
.set MAP_OBJ_GFX_RUNNING_TRIATHLETE_M, 51
.set MAP_OBJ_GFX_RUNNING_TRIATHLETE_F, 52
.set MAP_OBJ_GFX_TUBER_F, 53
.set MAP_OBJ_GFX_TUBER_M, 54
.set MAP_OBJ_GFX_HIKER, 55
.set MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 56
.set MAP_OBJ_GFX_CYCLING_TRIATHLETE_F, 57
.set MAP_OBJ_GFX_NURSE, 58
.set MAP_OBJ_GFX_ITEM_BALL, 59
.set MAP_OBJ_GFX_BERRY_TREE, 60
.set MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES, 61
.set MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES, 62
.set MAP_OBJ_GFX_BRENDAN_ACRO_BIKE, 63
.set MAP_OBJ_GFX_PROF_BIRCH, 64
.set MAP_OBJ_GFX_MAN_5, 65
.set MAP_OBJ_GFX_MAN_6, 66
.set MAP_OBJ_GFX_REPORTER_M, 67
.set MAP_OBJ_GFX_REPORTER_F, 68
.set MAP_OBJ_GFX_BARD, 69
.set MAP_OBJ_GFX_HIPSTER, 70
.set MAP_OBJ_GFX_TRADER, 71
.set MAP_OBJ_GFX_STORYTELLER, 72
.set MAP_OBJ_GFX_GIDDY, 73
.set MAP_OBJ_GFX_UNUSED_MAUVILLE_OLD_MAN_1, 74
.set MAP_OBJ_GFX_UNUSED_MAUVILLE_OLD_MAN_2, 75
.set MAP_OBJ_GFX_UNUSED_NATU_DOLL, 76
.set MAP_OBJ_GFX_UNUSED_MAGNEMITE_DOLL, 77
.set MAP_OBJ_GFX_UNUSED_SQUIRTLE_DOLL, 78
.set MAP_OBJ_GFX_UNUSED_WOOPER_DOLL, 79
.set MAP_OBJ_GFX_UNUSED_PIKACHU_DOLL, 80
.set MAP_OBJ_GFX_UNUSED_PORYGON2_DOLL, 81
.set MAP_OBJ_GFX_CUTTABLE_TREE, 82
.set MAP_OBJ_GFX_MART_EMPLOYEE, 83
.set MAP_OBJ_GFX_ROOFTOP_SALE_WOMAN, 84
.set MAP_OBJ_GFX_TEALA, 85
.set MAP_OBJ_GFX_BREAKABLE_ROCK, 86
.set MAP_OBJ_GFX_PUSHABLE_BOULDER, 87
.set MAP_OBJ_GFX_MR_BRINEYS_BOAT, 88
.set MAP_OBJ_GFX_MAY_NORMAL, 89
.set MAP_OBJ_GFX_MAY_MACH_BIKE, 90
.set MAP_OBJ_GFX_MAY_ACRO_BIKE, 91
.set MAP_OBJ_GFX_MAY_SURFING, 92
.set MAP_OBJ_GFX_MAY_FIELD_MOVE, 93
.set MAP_OBJ_GFX_TRUCK, 94
.set MAP_OBJ_GFX_MACHOKE_CARRYING_BOX, 95
.set MAP_OBJ_GFX_MACHOKE_FACING_AWAY, 96
.set MAP_OBJ_GFX_BIRCHS_BAG, 97
.set MAP_OBJ_GFX_ZIGZAGOON, 98
.set MAP_OBJ_GFX_ARTIST, 99
.set MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 100
.set MAP_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE, 101
.set MAP_OBJ_GFX_RIVAL_BRENDAN_ACRO_BIKE, 102
.set MAP_OBJ_GFX_RIVAL_BRENDAN_SURFING, 103
.set MAP_OBJ_GFX_RIVAL_BRENDAN_FIELD_MOVE, 104
.set MAP_OBJ_GFX_RIVAL_MAY_NORMAL, 105
.set MAP_OBJ_GFX_RIVAL_MAY_MACH_BIKE, 106
.set MAP_OBJ_GFX_RIVAL_MAY_ACRO_BIKE, 107
.set MAP_OBJ_GFX_RIVAL_MAY_SURFING, 108
.set MAP_OBJ_GFX_RIVAL_MAY_FIELD_MOVE, 109
.set MAP_OBJ_GFX_CAMERAMAN, 110
.set MAP_OBJ_GFX_BRENDAN_UNDERWATER, 111
.set MAP_OBJ_GFX_MAY_UNDERWATER, 112
.set MAP_OBJ_GFX_MOVING_BOX, 113
.set MAP_OBJ_GFX_CABLE_CAR, 114
.set MAP_OBJ_GFX_SCIENTIST_2, 115
.set MAP_OBJ_GFX_MAN_7, 116
.set MAP_OBJ_GFX_AQUA_MEMBER_M, 117
.set MAP_OBJ_GFX_AQUA_MEMBER_F, 118
.set MAP_OBJ_GFX_MAGMA_MEMBER_M, 119
.set MAP_OBJ_GFX_MAGMA_MEMBER_F, 120
.set MAP_OBJ_GFX_SIDNEY, 121
.set MAP_OBJ_GFX_PHOEBE, 122
.set MAP_OBJ_GFX_GLACIA, 123
.set MAP_OBJ_GFX_DRAKE, 124
.set MAP_OBJ_GFX_ROXANNE, 125
.set MAP_OBJ_GFX_BRAWLY, 126
.set MAP_OBJ_GFX_WATTSON, 127
.set MAP_OBJ_GFX_FLANNERY, 128
.set MAP_OBJ_GFX_NORMAN, 129
.set MAP_OBJ_GFX_WINONA, 130
.set MAP_OBJ_GFX_LIZA, 131
.set MAP_OBJ_GFX_TATE, 132
.set MAP_OBJ_GFX_WALLACE, 133
.set MAP_OBJ_GFX_STEVEN, 134
.set MAP_OBJ_GFX_WALLY, 135
.set MAP_OBJ_GFX_LITTLE_BOY_3, 136
.set MAP_OBJ_GFX_BRENDAN_FISHING, 137
.set MAP_OBJ_GFX_MAY_FISHING, 138
.set MAP_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 139
.set MAP_OBJ_GFX_SS_TIDAL, 140
.set MAP_OBJ_GFX_SUBMARINE_SHADOW, 141
.set MAP_OBJ_GFX_PICHU_DOLL, 142
.set MAP_OBJ_GFX_PIKACHU_DOLL, 143
.set MAP_OBJ_GFX_MARILL_DOLL, 144
.set MAP_OBJ_GFX_TOGEPI_DOLL, 145
.set MAP_OBJ_GFX_CYNDAQUIL_DOLL, 146
.set MAP_OBJ_GFX_CHIKORITA_DOLL, 147
.set MAP_OBJ_GFX_TOTODILE_DOLL, 148
.set MAP_OBJ_GFX_JIGGLYPUFF_DOLL, 149
.set MAP_OBJ_GFX_MEOWTH_DOLL, 150
.set MAP_OBJ_GFX_CLEFAIRY_DOLL, 151
.set MAP_OBJ_GFX_DITTO_DOLL, 152
.set MAP_OBJ_GFX_SMOOCHUM_DOLL, 153
.set MAP_OBJ_GFX_TREECKO_DOLL, 154
.set MAP_OBJ_GFX_TORCHIC_DOLL, 155
.set MAP_OBJ_GFX_MUDKIP_DOLL, 156
.set MAP_OBJ_GFX_DUSKULL_DOLL, 157
.set MAP_OBJ_GFX_WYNAUT_DOLL, 158
.set MAP_OBJ_GFX_BALTOY_DOLL, 159
.set MAP_OBJ_GFX_KECLEON_DOLL, 160
.set MAP_OBJ_GFX_AZURILL_DOLL, 161
.set MAP_OBJ_GFX_SKITTY_DOLL, 162
.set MAP_OBJ_GFX_SWABLU_DOLL, 163
.set MAP_OBJ_GFX_GULPIN_DOLL, 164
.set MAP_OBJ_GFX_LOTAD_DOLL, 165
.set MAP_OBJ_GFX_SEEDOT_DOLL, 166
.set MAP_OBJ_GFX_PIKA_CUSHION, 167
.set MAP_OBJ_GFX_ROUND_CUSHION, 168
.set MAP_OBJ_GFX_KISS_CUSHION, 169
.set MAP_OBJ_GFX_ZIGZAG_CUSHION, 170
.set MAP_OBJ_GFX_SPIN_CUSHION, 171
.set MAP_OBJ_GFX_DIAMOND_CUSHION, 172
.set MAP_OBJ_GFX_BALL_CUSHION, 173
.set MAP_OBJ_GFX_GRASS_CUSHION, 174
.set MAP_OBJ_GFX_FIRE_CUSHION, 175
.set MAP_OBJ_GFX_WATER_CUSHION, 176
.set MAP_OBJ_GFX_BIG_SNORLAX_DOLL, 177
.set MAP_OBJ_GFX_BIG_RHYDON_DOLL, 178
.set MAP_OBJ_GFX_BIG_LAPRAS_DOLL, 179
.set MAP_OBJ_GFX_BIG_VENUSAUR_DOLL, 180
.set MAP_OBJ_GFX_BIG_CHARIZARD_DOLL, 181
.set MAP_OBJ_GFX_BIG_BLASTOISE_DOLL, 182
.set MAP_OBJ_GFX_BIG_WAILMER_DOLL, 183
.set MAP_OBJ_GFX_BIG_REGIROCK_DOLL, 184
.set MAP_OBJ_GFX_BIG_REGICE_DOLL, 185
.set MAP_OBJ_GFX_BIG_REGISTEEL_DOLL, 186
.set MAP_OBJ_GFX_LATIAS, 187
.set MAP_OBJ_GFX_LATIOS, 188
.set MAP_OBJ_GFX_BOY_5, 189
.set MAP_OBJ_GFX_CONTEST_JUDGE, 190
.set MAP_OBJ_GFX_BRENDAN_WATERING, 191
.set MAP_OBJ_GFX_MAY_WATERING, 192
.set MAP_OBJ_GFX_BRENDAN_DECORATING, 193
.set MAP_OBJ_GFX_MAY_DECORATING, 194
.set MAP_OBJ_GFX_ARCHIE, 195
.set MAP_OBJ_GFX_MAXIE, 196
.set MAP_OBJ_GFX_KYOGRE_1, 197
.set MAP_OBJ_GFX_GROUDON_1, 198
.set MAP_OBJ_GFX_FOSSIL, 199
.set MAP_OBJ_GFX_REGIROCK, 200
.set MAP_OBJ_GFX_REGICE, 201
.set MAP_OBJ_GFX_REGISTEEL, 202
.set MAP_OBJ_GFX_SKITTY, 203
.set MAP_OBJ_GFX_KECLEON_1, 204
.set MAP_OBJ_GFX_KYOGRE_2, 205
.set MAP_OBJ_GFX_GROUDON_2, 206
.set MAP_OBJ_GFX_RAYQUAZA_2, 207
.set MAP_OBJ_GFX_ZIGZAGOON_2, 208
.set MAP_OBJ_GFX_PIKACHU, 209
.set MAP_OBJ_GFX_AZUMARILL, 210
.set MAP_OBJ_GFX_WINGULL, 211
.set MAP_OBJ_GFX_KECLEON_2, 212
.set MAP_OBJ_GFX_TUBER_M_SWIMMING, 213
.set MAP_OBJ_GFX_AZURILL, 214
.set MAP_OBJ_GFX_MOM, 215
.set MAP_OBJ_GFX_LINK_BRENDAN, 216
.set MAP_OBJ_GFX_LINK_MAY, 217
.set SHADOW_SIZE_S, 0
.set SHADOW_SIZE_M, 1
.set SHADOW_SIZE_L, 2
.set SHADOW_SIZE_XL, 3
.set F_INANIMATE, 1 << 6
.set F_DISABLE_REFLECTION_PALETTE_LOAD, 1 << 7
.set TRACKS_NONE, 0
.set TRACKS_FOOT, 1
.set TRACKS_BIKE_TIRE, 2
data/battle_4.s
-140
View File
@@ -1,140 +0,0 @@
@ the second big chunk of data
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
gMoveEffectBS_Ptrs:: @ 831C224
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB386
.4byte gUnknown_082DB395
.4byte gUnknown_082DB3A4
.4byte gUnknown_082DB3B3
.4byte gUnknown_082DB3C9
.4byte gUnknown_082DB3E6
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB3C2
.4byte gUnknown_082DB3D6
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB3DD
.4byte gUnknown_082DB3F4
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB3F4
.align 2
window_template 0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x003f
.align 2
gUnknown_0831C2C8:: @ 831C2C8
.incbin "graphics/battle_interface/unk_battlebox.gbapal"
.align 2
gUnknown_0831C2E8:: @ 831C2E8
.incbin "graphics/battle_interface/unk_battlebox.4bpp.lz"
.align 2
.byte 0x3A, 0x3E, 0x3B, 0x3F, 0x3C, 0x3D, 0x00, 0x00
.align 2
gUnknown_0831C3B8:: @ 831C3B8
.byte 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00
.align 2
gUnknown_0831C3C0:: @ 831C3C0
.2byte 0xd75a @ tileTag
.2byte 0xd75a @ paletteTag
.4byte gUnknown_0831C3B8
.4byte gDummySpriteAnimTable
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte sub_804F450
.align 2
sProtectSuccessRates:: @ 831C3D8
.2byte 0xffff, 0x7fff, 0x3fff, 0x1fff
.align 2
gUnknown_0831C3E0:: @ 831C3E0
.2byte MOVE_METRONOME, MOVE_STRUGGLE, MOVE_SKETCH, MOVE_MIMIC
.2byte 0xfffe, MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_PROTECT
.2byte MOVE_DETECT, MOVE_ENDURE, MOVE_DESTINY_BOND, MOVE_SLEEP_TALK
.2byte MOVE_THIEF, MOVE_FOLLOW_ME, MOVE_SNATCH, MOVE_HELPING_HAND
.2byte MOVE_COVET, MOVE_TRICK, MOVE_FOCUS_PUNCH, 0xffff
.align 2
gUnknown_0831C408:: @ 831C408
.byte 0x01, 0xc8, 0x04, 0x96, 0x09, 0x64, 0x10, 0x50
.byte 0x20, 0x28, 0x30, 0x14
.align 2
gUnknown_0831C414:: @ 831C414
.2byte 0x004e, 0x004b, 0x0059, 0x0038
.2byte 0x0039, 0x003d, 0x009d, 0x00f7
.2byte 0x0081, 0x0081
.align 2
gUnknown_0831C428:: @ 831C428
.2byte 0x0064, 0x0014, 0x00fa, 0x0028
.2byte 0x01f4, 0x003c, 0x03e8, 0x0050
.2byte 0x07d0, 0x0064, 0xffff, 0xffff
.align 2
@ 831C440
.include "data/pickup_items.inc"
sTerrainToType:: @ 831C483
.byte 0x0c, 0x0c, 0x04, 0x0b, 0x0b, 0x0b, 0x05, 0x05
.byte 0x00, 0x00
sBallCatchBonuses:: @ 831C48D
.byte 0x14, 0x0f, 0x0a, 0x0f, 0x00, 0x00, 0x00
.align 2
gUnknown_0831C494:: @ 831C494
.byte 0x3d, 0x44, 0x3d, 0x44, 0x14, 0x2d, 0x54, 0x5c
.byte 0x46, 0x55, 0x20, 0x5c, 0x26, 0x45, 0x46, 0x55
.byte 0x14, 0x5a, 0x46, 0x5c, 0x1e, 0x32, 0x20, 0x5a
.byte 0x38, 0x4e, 0x38, 0x4e, 0x19, 0x28, 0x4b, 0x5a
.byte 0x45, 0x4b, 0x1c, 0x53, 0x23, 0x2d, 0x1d, 0x23
.byte 0x3e, 0x48, 0x1e, 0x32, 0x3a, 0x5f, 0x58, 0x5e
.byte 0x22, 0x2d, 0x1d, 0x28, 0x23, 0x28, 0x23, 0x5f
.byte 0x38, 0x4e, 0x38, 0x4e, 0x23, 0x50, 0x22, 0x5e
.byte 0x2c, 0x5e, 0x22, 0x28, 0x38, 0x4e, 0x38, 0x4e
.byte 0x1e, 0x58, 0x1e, 0x58, 0x1e, 0x2b, 0x1b, 0x21
.byte 0x28, 0x5a, 0x19, 0x57, 0x12, 0x58, 0x5a, 0x5f
.byte 0x58, 0x5e, 0x16, 0x2a, 0x2a, 0x5c, 0x2a, 0x2f
.byte 0x38, 0x4e, 0x38, 0x4e
.align 2
gUnknown_0831C4F8:: @ 831C4F8
.byte 0x03, 0x00, 0x01, 0x00, 0x00, 0x01, 0x03, 0x00
.byte 0x01, 0x02, 0x02, 0x00, 0x03, 0x01, 0x03, 0x01
.byte 0x02, 0x03, 0x03, 0x02, 0x01, 0x00, 0x02, 0x02
.byte 0x03, 0x00, 0x00, 0x00
data/battle_7.s
+44
View File
@@ -0,0 +1,44 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
gUnknown_0832C0D0:: @ 832C0D0
obj_tiles gUnknown_08C1F1C8, 0x1000, 0xd6ff
.align 2
gUnknown_0832C0D8:: @ 832C0D8
obj_tiles gUnknown_08C1F46C, 0x1000, 0xd701
.align 2
gUnknown_0832C0E0:: @ 832C0E0
obj_tiles gUnknown_08C1F5E8, 0x0800, 0xd6ff
.align 2
gUnknown_0832C0E8:: @ 832C0E8
obj_tiles gUnknown_08C1F5E8, 0x0800, 0xd700
.align 2
gUnknown_0832C0F0:: @ 832C0F0
obj_tiles gUnknown_08C1F76C, 0x0800, 0xd701
.align 2
gUnknown_0832C0F8:: @ 832C0F8
obj_tiles gUnknown_08C1F76C, 0x0800, 0xd702
.align 2
gUnknown_0832C100:: @ 832C100
obj_tiles gUnknown_08C1F8E8, 0x1000, 0xd70b
.align 2
gUnknown_0832C108:: @ 832C108
obj_tiles gUnknown_08C0237C, 0x0100, 0xd704
obj_tiles gUnknown_08C0237C, 0x0120, 0xd705
obj_tiles gUnknown_08C0237C, 0x0100, 0xd706
obj_tiles gUnknown_08C0237C, 0x0120, 0xd707
.align 2
gUnknown_0832C128:: @ 832C128
obj_pal gBattleInterface_BallStatusBarPal, 0xd6ff
obj_pal gBattleInterface_BallDisplayPal, 0xd704
data/battle_ai_scripts.s
+74 -1
View File
@@ -5,4 +5,77 @@
.align 2
gBattleAI_ScriptsTable:: @ 82DBEF8
.incbin "baserom.gba", 0x2dbef8, 0x2458
.4byte gBattleAIScript_82DBF78
.4byte gBattleAIScript_82DDE3F
.4byte gBattleAIScript_82DC7B0
.4byte gBattleAIScript_82DDE71
.4byte gBattleAIScript_82DDEDD
.4byte gBattleAIScript_82DDEC8
.4byte gBattleAIScript_82DDF09
.4byte gBattleAIScript_82DDFB4
.4byte gBattleAIScript_82DE193
.4byte gBattleAIScript_82DE2ED
.4byte gBattleAIScript_82DE34E
.4byte gBattleAIScript_82DE34E
.4byte gBattleAIScript_82DE34E
.4byte gBattleAIScript_82DE34E
.4byte gBattleAIScript_82DE34E
.4byte gBattleAIScript_82DE34E
.4byte gBattleAIScript_82DE34E
.4byte gBattleAIScript_82DE34E
.4byte gBattleAIScript_82DE34E
.4byte gBattleAIScript_82DE34E
.4byte gBattleAIScript_82DE34E
.4byte gBattleAIScript_82DE34E
.4byte gBattleAIScript_82DE34E
.4byte gBattleAIScript_82DE34E
.4byte gBattleAIScript_82DE34E
.4byte gBattleAIScript_82DE34E
.4byte gBattleAIScript_82DE34E
.4byte gBattleAIScript_82DE34E
.4byte gBattleAIScript_82DE34E
.4byte gBattleAIScript_82DE309
.4byte gBattleAIScript_82DE337
.4byte gBattleAIScript_82DE33E
gBattleAIScript_82DBF78:: @ 82DBF78
.incbin "baserom.gba", 0x2dbf78, 0x838
gBattleAIScript_82DC7B0:: @ 82DC7B0
.incbin "baserom.gba", 0x2dc7b0, 0x168F
gBattleAIScript_82DDE3F:: @ 82DDE3F
.incbin "baserom.gba", 0x2dde3f, 0x32
gBattleAIScript_82DDE71:: @ 82DDE71
.incbin "baserom.gba", 0x2dde71, 0x57
gBattleAIScript_82DDEC8:: @ 82DDEC8
.incbin "baserom.gba", 0x2ddec8, 0x15
gBattleAIScript_82DDEDD:: @ 82DDEDD
.incbin "baserom.gba", 0x2ddedd, 0x2c
gBattleAIScript_82DDF09:: @ 82DDF09
.incbin "baserom.gba", 0x2ddf09, 0xab
gBattleAIScript_82DDFB4:: @ 82DDFB4
.incbin "baserom.gba", 0x2ddfb4, 0x1df
gBattleAIScript_82DE193:: @ 82DE193
.incbin "baserom.gba", 0x2de193, 0x15a
gBattleAIScript_82DE2ED:: @ 82DE2ED
.incbin "baserom.gba", 0x2de2ed, 0x1c
gBattleAIScript_82DE309:: @ 82DE309
.incbin "baserom.gba", 0x2de309, 0x2e
gBattleAIScript_82DE337:: @ 82DE337
.incbin "baserom.gba", 0x2de337, 0x7
gBattleAIScript_82DE33E:: @ 82DE33E
.incbin "baserom.gba", 0x2de33e, 0x10
gBattleAIScript_82DE34E:: @ 82DE34E
.incbin "baserom.gba", 0x2de34e, 0x2
data/battle_anim_80FE840.s
+3877
View File
File diff suppressed because it is too large Load Diff
data/battle_anim_815A0D4.s
+66
View File
@@ -0,0 +1,66 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
gUnknown_085CE2A0:: @ 85CE2A0
.incbin "baserom.gba", 0x5ce2a0, 0xb0
gUnknown_085CE350:: @ 85CE350
.incbin "baserom.gba", 0x5ce350, 0x38
gUnknown_085CE388:: @ 85CE388
.incbin "baserom.gba", 0x5ce388, 0x18
gUnknown_085CE3A0:: @ 85CE3A0
.incbin "baserom.gba", 0x5ce3a0, 0x18
gUnknown_085CE3B8:: @ 85CE3B8
.incbin "baserom.gba", 0x5ce3b8, 0x28
gUnknown_085CE3E0:: @ 85CE3E0
.incbin "baserom.gba", 0x5ce3e0, 0x50
gUnknown_085CE430:: @ 85CE430
.incbin "baserom.gba", 0x5ce430, 0x30
gUnknown_085CE460:: @ 85CE460
.incbin "baserom.gba", 0x5ce460, 0x2c
gUnknown_085CE48C:: @ 85CE48C
.incbin "baserom.gba", 0x5ce48c, 0x18
gUnknown_085CE4A4:: @ 85CE4A4
.incbin "baserom.gba", 0x5ce4a4, 0x4
gUnknown_085CE4A8:: @ 85CE4A8
.incbin "baserom.gba", 0x5ce4a8, 0x8
gUnknown_085CE4B0:: @ 85CE4B0
.incbin "baserom.gba", 0x5ce4b0, 0x140
gUnknown_085CE5F0:: @ 85CE5F0
.incbin "baserom.gba", 0x5ce5f0, 0x15c
gUnknown_085CE74C:: @ 85CE74C
.incbin "baserom.gba", 0x5ce74c, 0x20
gUnknown_085CE76C:: @ 85CE76C
.incbin "baserom.gba", 0x5ce76c, 0x18
gUnknown_085CE784:: @ 85CE784
.incbin "baserom.gba", 0x5ce784, 0x68
gUnknown_085CE7EC:: @ 85CE7EC
.incbin "baserom.gba", 0x5ce7ec, 0x60
gUnknown_085CE84C:: @ 85CE84C
.incbin "baserom.gba", 0x5ce84c, 0x30
gUnknown_085CE87C:: @ 85CE87C
.incbin "baserom.gba", 0x5ce87c, 0x14c
gUnknown_085CE9C8:: @ 85CE9C8
.incbin "baserom.gba", 0x5ce9c8, 0x1e8
data/battle_anim_8170478.s
+14 -98
View File
@@ -97,113 +97,41 @@ gUnknown_085E51C0:: @ 85E51C0
.align 2
gUnknown_085E51F0:: @ 85E51F0
.2byte 0xd6ec @ tileTag
.2byte 0xd6ec @ paletteTag
.4byte gUnknown_08524904
.4byte gUnknown_085E519C
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
spr_template 0xd6ec, 0xd6ec, gUnknown_08524904, gUnknown_085E519C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
.2byte 0xd6ed @ tileTag
.2byte 0xd6ed @ paletteTag
.4byte gUnknown_08524904
.4byte gUnknown_085E519C
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
spr_template 0xd6ed, 0xd6ed, gUnknown_08524904, gUnknown_085E519C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
.2byte 0xd6ee @ tileTag
.2byte 0xd6ee @ paletteTag
.4byte gUnknown_08524904
.4byte gUnknown_085E519C
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
spr_template 0xd6ee, 0xd6ee, gUnknown_08524904, gUnknown_085E519C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
.2byte 0xd6ef @ tileTag
.2byte 0xd6ef @ paletteTag
.4byte gUnknown_08524904
.4byte gUnknown_085E519C
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
spr_template 0xd6ef, 0xd6ef, gUnknown_08524904, gUnknown_085E519C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_085E5250:: @ 85E5250
.2byte 0xd6f0 @ tileTag
.2byte 0xd6f0 @ paletteTag
.4byte gUnknown_08524904
.4byte gUnknown_085E519C
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
spr_template 0xd6f0, 0xd6f0, gUnknown_08524904, gUnknown_085E519C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
.2byte 0xd6f1 @ tileTag
.2byte 0xd6f1 @ paletteTag
.4byte gUnknown_08524904
.4byte gUnknown_085E519C
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
spr_template 0xd6f1, 0xd6f1, gUnknown_08524904, gUnknown_085E519C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
.2byte 0xd6f2 @ tileTag
.2byte 0xd6f2 @ paletteTag
.4byte gUnknown_08524904
.4byte gUnknown_085E519C
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
spr_template 0xd6f2, 0xd6f2, gUnknown_08524904, gUnknown_085E519C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
.2byte 0xd6f3 @ tileTag
.2byte 0xd6f3 @ paletteTag
.4byte gUnknown_08524904
.4byte gUnknown_085E519C
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
spr_template 0xd6f3, 0xd6f3, gUnknown_08524904, gUnknown_085E519C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
.2byte 0xd6f4 @ tileTag
.2byte 0xd6f4 @ paletteTag
.4byte gUnknown_08524904
.4byte gUnknown_085E519C
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
spr_template 0xd6f4, 0xd6f4, gUnknown_08524904, gUnknown_085E519C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
.2byte 0xd6f5 @ tileTag
.2byte 0xd6f5 @ paletteTag
.4byte gUnknown_08524904
.4byte gUnknown_085E519C
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
spr_template 0xd6f5, 0xd6f5, gUnknown_08524904, gUnknown_085E519C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
.2byte 0xd6f6 @ tileTag
.2byte 0xd6f6 @ paletteTag
.4byte gUnknown_08524904
.4byte gUnknown_085E519C
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
spr_template 0xd6f6, 0xd6f6, gUnknown_08524904, gUnknown_085E519C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
.2byte 0xd6f7 @ tileTag
.2byte 0xd6f7 @ paletteTag
.4byte gUnknown_08524904
.4byte gUnknown_085E519C
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
spr_template 0xd6f7, 0xd6f7, gUnknown_08524904, gUnknown_085E519C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_085E5310:: @ 85E5310
@@ -212,13 +140,7 @@ gUnknown_085E5310:: @ 85E5310
.2byte 0x0100, 0x0503, 0x0506, 0x0004
.align 2
.2byte 0x281d @ tileTag
.2byte 0x281d @ paletteTag
.4byte gUnknown_0852490C
.4byte gDummySpriteAnimTable
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte sub_817330C
spr_template 0x281d, 0x281d, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_817330C
.align 2
gUnknown_085E5350:: @ 8535350
@@ -229,11 +151,5 @@ gUnknown_085E5358:: @ 8535358
.4byte gUnknown_085E5350
.align 2
.2byte 0x274a @ tileTag
.2byte 0x274a @ paletteTag
.4byte gUnknown_08524914
.4byte gUnknown_085E5358
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte sub_817330C
spr_template 0x274a, 0x274a, gUnknown_08524914, gUnknown_085E5358, NULL, gDummySpriteAffineAnimTable, sub_817330C
data/battle_anims.s
+352
View File
@@ -0,0 +1,352 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
gUnknown_08524904:: @ 8524904
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_0852490C:: @ 852490C
.byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524914:: @ 8524914
.byte 0x00, 0x00, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_0852491C:: @ 852491C
.byte 0x00, 0x00, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524924:: @ 8524924
.byte 0x00, 0x40, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_0852492C:: @ 852492C
.byte 0x00, 0x40, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524934:: @ 8524934
.byte 0x00, 0x40, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_0852493C:: @ 852493C
.byte 0x00, 0x40, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524944:: @ 8524944
.byte 0x00, 0x80, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_0852494C:: @ 852494C
.byte 0x00, 0x80, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524954:: @ 8524954
.byte 0x00, 0x80, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_0852495C:: @ 852495C
.byte 0x00, 0x80, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524964:: @ 8524964
.byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_0852496C:: @ 852496C
.byte 0x00, 0x01, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524974:: @ 8524974
.byte 0x00, 0x01, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_0852497C:: @ 852497C
.byte 0x00, 0x01, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524984:: @ 8524984
.byte 0x00, 0x41, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_0852498C:: @ 852498C
.byte 0x00, 0x41, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524994:: @ 8524994
.byte 0x00, 0x41, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_0852499C:: @ 852499C
.byte 0x00, 0x41, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_085249A4:: @ 85249A4
.byte 0x00, 0x81, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_085249AC:: @ 85249AC
.byte 0x00, 0x81, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_085249B4:: @ 85249B4
.byte 0x00, 0x81, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_085249BC:: @ 85249BC
.byte 0x00, 0x81, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_085249C4:: @ 85249C4
.byte 0x00, 0x03, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_085249CC:: @ 85249CC
.byte 0x00, 0x03, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_085249D4:: @ 85249D4
.byte 0x00, 0x03, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_085249DC:: @ 85249DC
.byte 0x00, 0x03, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_085249E4:: @ 85249E4
.byte 0x00, 0x43, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_085249EC:: @ 85249EC
.byte 0x00, 0x43, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_085249F4:: @ 85249F4
.byte 0x00, 0x43, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_085249FC:: @ 85249FC
.byte 0x00, 0x43, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A04:: @ 8524A04
.byte 0x00, 0x83, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A0C:: @ 8524A0C
.byte 0x00, 0x83, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A14:: @ 8524A14
.byte 0x00, 0x83, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A1C:: @ 8524A1C
.byte 0x00, 0x83, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A24:: @ 8524A24
.byte 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A2C:: @ 8524A2C
.byte 0x00, 0x04, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A34:: @ 8524A34
.byte 0x00, 0x04, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A3C:: @ 8524A3C
.byte 0x00, 0x04, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A44:: @ 8524A44
.byte 0x00, 0x44, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A4C:: @ 8524A4C
.byte 0x00, 0x44, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A54:: @ 8524A54
.byte 0x00, 0x44, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A5C:: @ 8524A5C
.byte 0x00, 0x44, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A64:: @ 8524A64
.byte 0x00, 0x84, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A6C:: @ 8524A6C
.byte 0x00, 0x84, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A74:: @ 8524A74
.byte 0x00, 0x84, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A7C:: @ 8524A7C
.byte 0x00, 0x84, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A84:: @ 8524A84
.byte 0x00, 0x05, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A8C:: @ 8524A8C
.byte 0x00, 0x05, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A94:: @ 8524A94
.byte 0x00, 0x05, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A9C:: @ 8524A9C
.byte 0x00, 0x05, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524AA4:: @ 8524AA4
.byte 0x00, 0x45, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524AAC:: @ 8524AAC
.byte 0x00, 0x45, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524AB4:: @ 8524AB4
.byte 0x00, 0x45, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524ABC:: @ 8524ABC
.byte 0x00, 0x45, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524AC4:: @ 8524AC4
.byte 0x00, 0x85, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524ACC:: @ 8524ACC
.byte 0x00, 0x85, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524AD4:: @ 8524AD4
.byte 0x00, 0x85, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524ADC:: @ 8524ADC
.byte 0x00, 0x85, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524AE4:: @ 8524AE4
.byte 0x00, 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524AEC:: @ 8524AEC
.byte 0x00, 0x07, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524AF4:: @ 8524AF4
.byte 0x00, 0x07, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524AFC:: @ 8524AFC
.byte 0x00, 0x07, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524B04:: @ 8524B04
.byte 0x00, 0x47, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524B0C:: @ 8524B0C
.byte 0x00, 0x47, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524B14:: @ 8524B14
.byte 0x00, 0x47, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524B1C:: @ 8524B1C
.byte 0x00, 0x47, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524B24:: @ 8524B24
.byte 0x00, 0x87, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524B2C:: @ 8524B2C
.byte 0x00, 0x87, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524B34:: @ 8524B34
.byte 0x00, 0x87, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524B3C:: @ 8524B3C
.byte 0x00, 0x87, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
gUnknown_08524B44:: @ 8524B44
.incbin "baserom.gba", 0x524b44, 0x1d0
gUnknown_08524D14:: @ 8524D14
.incbin "baserom.gba", 0x524d14, 0x270
gUnknown_08524F84:: @ 8524F84
.incbin "baserom.gba", 0x524f84, 0x308
gUnknown_0852528C:: @ 852528C
.incbin "baserom.gba", 0x52528c, 0x120
gUnknown_085253AC:: @ 85253AC
.incbin "baserom.gba", 0x5253ac, 0x270
gUnknown_0852561C:: @ 852561C
.incbin "baserom.gba", 0x52561c, 0x270
gUnknown_0852588C:: @ 852588C
.incbin "baserom.gba", 0x52588c, 0x308
gUnknown_08525B94:: @ 8525B94
.incbin "baserom.gba", 0x525b94, 0x120
gUnknown_08525CB4:: @ 8525CB4
.incbin "baserom.gba", 0x525cb4, 0xa0
gUnknown_08525D54:: @ 8525D54
.incbin "baserom.gba", 0x525d54, 0x144
gUnknown_08525E98:: @ 8525E98
.incbin "baserom.gba", 0x525e98, 0xc0
gUnknown_08525F58:: @ 8525F58
.incbin "baserom.gba", 0x525f58, 0x20
gUnknown_08525F78:: @ 8525F78
.incbin "baserom.gba", 0x525f78, 0x10
gUnknown_08525F88:: @ 8525F88
.incbin "baserom.gba", 0x525f88, 0x4
gUnknown_08525F8C:: @ 8525F8C
.incbin "baserom.gba", 0x525f8c, 0x4
gUnknown_08525F90:: @ 8525F90
.incbin "baserom.gba", 0x525f90, 0x30
gUnknown_08525FC0:: @ 8525FC0
.incbin "baserom.gba", 0x525fc0, 0x18f80
gUnknown_0853EF40:: @ 853EF40
.incbin "baserom.gba", 0x53ef40, 0x8
gUnknown_0853EF48:: @ 853EF48
.incbin "baserom.gba", 0x53ef48, 0x18
gUnknown_0853EF60:: @ 853EF60
.incbin "baserom.gba", 0x53ef60, 0xf8
data/battle_controller_player.s
+4
View File
@@ -63,3 +63,7 @@ gPlayerBufferCommands:: @ 831C514
.4byte sub_805D094
.4byte nullsub_22
.align 2
gUnknown_0831C5F8:: @ 831C5F8
.byte 0x00, 0x02, 0x03, 0x01, 0x48, 0x48, 0x20, 0x5a
.byte 0x50, 0x50, 0x50, 0x58
data/battle_controller_safari.s
+15 -105
View File
@@ -75,31 +75,13 @@ gUnknown_085CE01C:: @ 85CE01C
.align 2
gUnknown_085CE020:: @ 85CE020
.2byte 0x2799 @ tileTag
.2byte 0x2799 @ paletteTag
.4byte gUnknown_08524A34
.4byte gUnknown_085CE01C
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte sub_80A77C8
spr_template 0x2799, 0x2799, gUnknown_08524A34, gUnknown_085CE01C, NULL, gDummySpriteAffineAnimTable, sub_80A77C8
.align 2
.2byte 0x2720 @ tileTag
.2byte 0x2720 @ paletteTag
.4byte gUnknown_08524934
.4byte gDummySpriteAnimTable
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte sub_815A0D4
spr_template 0x2720, 0x2720, gUnknown_08524934, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A0D4
.align 2
.2byte 0x2721 @ tileTag
.2byte 0x2721 @ paletteTag
.4byte gUnknown_08524904
.4byte gDummySpriteAnimTable
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte sub_80A78AC
spr_template 0x2721, 0x2721, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A78AC
.align 2
gUnknown_085CE068:: @ 85CE068
@@ -112,31 +94,13 @@ gUnknown_085CE078:: @ 85CE078
.align 2
gUnknown_085CE07C:: @ 85CE07C
.2byte 0x27ce @ tileTag
.2byte 0x27ce @ paletteTag
.4byte gUnknown_08524914
.4byte gUnknown_085CE078
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte sub_80A77C8
spr_template 0x27ce, 0x27ce, gUnknown_08524914, gUnknown_085CE078, NULL, gDummySpriteAffineAnimTable, sub_80A77C8
.align 2
.2byte 0x27cf @ tileTag
.2byte 0x27cf @ paletteTag
.4byte gUnknown_08524A3C
.4byte gDummySpriteAnimTable
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte sub_815A1B0
spr_template 0x27cf, 0x27cf, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A1B0
.align 2
.2byte 0x27cd @ tileTag
.2byte 0x27cd @ paletteTag
.4byte gUnknown_08524974
.4byte gDummySpriteAnimTable
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte sub_815A254
spr_template 0x27cd, 0x27cd, gUnknown_08524974, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A254
.align 2
gUnknown_085CE0C4:: @ 85CE0C4
@@ -158,22 +122,10 @@ gUnknown_085CE0FC:: @ 85CE0FC
.align 2
gUnknown_085CE104:: @ 85CE104
.2byte 0x27cb @ tileTag
.2byte 0x27cb @ paletteTag
.4byte gUnknown_08524AFC
.4byte gDummySpriteAnimTable
.4byte NULL
.4byte gUnknown_085CE0FC
.4byte sub_815A2F0
spr_template 0x27cb, 0x27cb, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_085CE0FC, sub_815A2F0
.align 2
.2byte 0x27a8 @ tileTag
.2byte 0x27a8 @ paletteTag
.4byte gUnknown_0852490C
.4byte gDummySpriteAnimTable
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte sub_815A6C4
spr_template 0x27a8, 0x27a8, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A6C4
.align 2
gUnknown_085CE134:: @ 85CE134
@@ -187,13 +139,7 @@ gUnknown_085CE14C:: @ 85CE14C
.align 2
gUnknown_085CE150:: @ 85CE150
.2byte 0x272b @ tileTag
.2byte 0x272b @ paletteTag
.4byte gUnknown_08524914
.4byte gUnknown_085CE14C
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte sub_815A7B0
spr_template 0x272b, 0x272b, gUnknown_08524914, gUnknown_085CE14C, NULL, gDummySpriteAffineAnimTable, sub_815A7B0
.align 2
gUnknown_085CE168:: @ 85CE168
@@ -215,13 +161,7 @@ gUnknown_085CE18C:: @ 85CE18C
.align 2
gUnknown_085CE190:: @ 85CE190
.2byte 0x27f4 @ tileTag
.2byte 0x27f4 @ paletteTag
.4byte gUnknown_08524974
.4byte gUnknown_085CE170
.4byte NULL
.4byte gUnknown_085CE18C
.4byte sub_815A7EC
spr_template 0x27f4, 0x27f4, gUnknown_08524974, gUnknown_085CE170, NULL, gUnknown_085CE18C, sub_815A7EC
.align 2
gUnknown_085CE1A8:: @ 85CE1A8
@@ -243,13 +183,7 @@ gUnknown_085CE1D8:: @ 85CE1D8
.align 2
gUnknown_085CE1DC:: @ 85CE1DC
.2byte 0x27d0 @ tileTag
.2byte 0x27d0 @ paletteTag
.4byte gUnknown_085249D4
.4byte gUnknown_085CE1BC
.4byte NULL
.4byte gUnknown_085CE1D8
.4byte sub_815A8AC
spr_template 0x27d0, 0x27d0, gUnknown_085249D4, gUnknown_085CE1BC, NULL, gUnknown_085CE1D8, sub_815A8AC
.align 2
gUnknown_085CE1F4:: @ 85CE1F4
@@ -270,31 +204,13 @@ gUnknown_085CE224:: @ 85CE224
.align 2
gUnknown_085CE22C:: @ 85CE22C
.2byte 0x27f3 @ tileTag
.2byte 0x27f3 @ paletteTag
.4byte gUnknown_085249DC
.4byte gDummySpriteAnimTable
.4byte NULL
.4byte gUnknown_085CE224
.4byte sub_815A934
spr_template 0x27f3, 0x27f3, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_085CE224, sub_815A934
.align 2
.2byte 0x2807 @ tileTag
.2byte 0x2807 @ paletteTag
.4byte gUnknown_08524914
.4byte gDummySpriteAnimTable
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte sub_815AAA4
spr_template 0x2807, 0x2807, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815AAA4
.align 2
.2byte 0x2807 @ tileTag
.2byte 0x2807 @ paletteTag
.4byte gUnknown_08524914
.4byte gDummySpriteAnimTable
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte sub_815ABD0
spr_template 0x2807, 0x2807, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815ABD0
.align 2
gUnknown_085CE274:: @ 85CE274
@@ -307,12 +223,6 @@ gUnknown_085CE284:: @ 85CE284
.align 2
gUnknown_085CE288:: @ 85CE288
.2byte 0x27f5 @ tileTag
.2byte 0x27f5 @ paletteTag
.4byte gUnknown_08524934
.4byte gUnknown_085CE284
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte sub_815ACD0
spr_template 0x27f5, 0x27f5, gUnknown_08524934, gUnknown_085CE284, NULL, gDummySpriteAffineAnimTable, sub_815ACD0
data/battle_interface.s
+180
View File
@@ -0,0 +1,180 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
gUnknown_0832C138:: @ 832C138
.byte 0x00, 0x40, 0x00, 0xc0, 0x00, 0x04, 0x00, 0x00
.align 2
gUnknown_0832C140:: @ 832C140
spr_template 0xd6ff, 0xd6ff, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0832C158:: @ 832C158
spr_template 0xd700, 0xd6ff, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0832C170:: @ 832C170
spr_template 0xd701, 0xd6ff, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0832C188:: @ 832C188
spr_template 0xd702, 0xd6ff, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0832C1A0:: @ 832C1A0
spr_template 0xd70b, 0xd6ff, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0832C1B8:: @ 832C1B8
.byte 0x00, 0x40, 0x00, 0x40, 0x00, 0x04, 0x00, 0x00
.align 2
gUnknown_0832C1C0:: @ 832C1C0
spr_template 0xd704, 0xd704, gUnknown_0832C1B8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80728B4
.align 2
gUnknown_0832C1D8:: @ 832C1D8
spr_template 0xd705, 0xd704, gUnknown_0832C1B8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80728B4
.align 2
gUnknown_0832C1F0:: @ 832C1F0
spr_template 0xd706, 0xd704, gUnknown_0832C1B8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80728B4
.align 2
gUnknown_0832C208:: @ 832C208
spr_template 0xd707, 0xd704, gUnknown_0832C1B8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80728B4
.align 2
gUnknown_0832C220:: @ 832C220
.byte 0xf0, 0x00, 0x0d, 0x40, 0x30, 0x00, 0x08, 0x42
.byte 0xf0, 0x20, 0x05, 0x43, 0x10, 0x20, 0x45, 0x43
.byte 0x30, 0x20, 0x85, 0x43
.align 2
gUnknown_0832C234:: @ 832C234
.byte 0xf0, 0x00, 0x0d, 0x44, 0x30, 0x00, 0x08, 0x46
.byte 0xf0, 0x20, 0x05, 0x47, 0x10, 0x20, 0x45, 0x47
.byte 0x30, 0x20, 0x85, 0x47
.align 2
gUnknown_0832C248:: @ 832C248
.byte 0xf0, 0x00, 0x0d, 0x40, 0x30, 0x00, 0x08, 0x42
.align 2
gUnknown_0832C250:: @ 832C250
.byte 0xf0, 0x00, 0x0d, 0x40, 0x30, 0x00, 0x08, 0x42
.align 2
gUnknown_0832C258:: @ 832C258
.byte 0xf0, 0x00, 0x05, 0x40, 0x10, 0x00, 0x45, 0x40
.align 2
gUnknown_0832C260:: @ 832C260
.byte 0xf0, 0x00, 0x05, 0x40, 0x10, 0x00, 0x45, 0x40
.byte 0xe0, 0x00, 0x80, 0x40
.align 2
gUnknown_0832C26C:: @ 832C26C
.4byte 0x00000005, gUnknown_0832C220
.4byte 0x00000002, gUnknown_0832C248
.4byte 0x00000005, gUnknown_0832C234
.4byte 0x00000002, gUnknown_0832C250
.align 2
gUnknown_0832C28C:: @ 832C28C
.4byte 0x00000002, gUnknown_0832C258
.4byte 0x00000003, gUnknown_0832C260
.align 2
gUnknown_0832C29C:: @ 832C29C
.byte 0xa0, 0x00, 0x05, 0x40, 0xc0, 0x00, 0x45, 0x40
.byte 0xe0, 0x00, 0x85, 0x40, 0x00, 0x00, 0xc5, 0x40
.align 2
gUnknown_0832C2AC:: @ 832C2AC
.byte 0xa0, 0x00, 0x05, 0x40, 0xc0, 0x00, 0x45, 0x40
.byte 0xe0, 0x00, 0x85, 0x40, 0x00, 0x00, 0x85, 0x40
.byte 0x20, 0x00, 0x85, 0x40, 0x40, 0x00, 0xc5, 0x40
.align 2
gUnknown_0832C2C4:: @ 832C2C4
.4byte 0x00000004, gUnknown_0832C29C
.align 2
gUnknown_0832C2CC:: @ 832C2CC
.4byte 0x00000006, gUnknown_0832C2AC
.align 2
gUnknown_0832C2D4:: @ 832C2D4
.2byte 0x0000, 0x0000, 0x3333, 0x3333, 0x4444, 0x4444, 0x2222, 0x2222
.2byte 0x7777, 0x7777, 0x7777, 0x7777, 0x7777, 0x7777, 0x7777, 0x7777
.2byte 0x0000, 0x0000, 0x3333, 0x3333, 0x4444, 0x4444, 0x2222, 0x2222
.2byte 0x7777, 0x7777, 0x7777, 0x7717, 0x1777, 0x7177, 0x7777, 0x7771
.2byte 0x0000, 0x0000, 0x3333, 0x3333, 0x4444, 0x4444, 0x2222, 0x2222
.2byte 0x7777, 0x7777, 0x7777, 0x7111, 0x7777, 0x7171, 0x7777, 0x7111
.align 2
gUnknown_0832C334:: @ 832C334
obj_tiles gBattleInterface_BallStatusBarGfx, 0x0200, 0xd70c
.align 2
gUnknown_0832C33C:: @ 832C33C
obj_pal gBattleInterface_BallStatusBarPal, 0xd710
.align 2
gUnknown_0832C344:: @ 832C344
obj_pal gBattleInterface_BallDisplayPal, 0xd712
.align 2
gUnknown_0832C34C:: @ 832C34C
obj_tiles gBattleInterface_BallDisplayGfx, 0x0080, 0xd714
.align 2
gUnknown_0832C354:: @ 832C354
.byte 0x00, 0x40, 0x00, 0xc0, 0x00, 0x04, 0x00, 0x00
.align 2
gUnknown_0832C35C:: @ 832C35C
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00
.align 2
gUnknown_0832C364:: @ 832C364
spr_template 0xd70c, 0xd710, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8074078
.align 2
gUnknown_0832C37C:: @ 832C37C
spr_template 0xd70c, 0xd710, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8074078
.align 2
gUnknown_0832C394:: @ 832C394
spr_template 0xd714, 0xd712, gUnknown_0832C35C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80740C4
.align 2
gUnknown_0832C3AC:: @ 832C3AC
spr_template 0xd714, 0xd712, gUnknown_0832C35C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80740C4
.align 2
gUnknown_0832C3C4:: @ 832C3C4
.byte 0xfc, 0x01, 0x01, 0xfc, 0x02, 0x02, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.align 2
gUnknown_0832C3D8:: @ 832C3D8
.byte 0xfc, 0x01, 0x01, 0xfc, 0x02, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.align 2
gUnknown_0832C3EC:: @ 832C3EC
.byte 0x98, 0x61, 0xf7, 0x0e, 0x94, 0x46, 0xd1, 0x72
.byte 0xdc, 0x29, 0x00, 0x00
.align 2
gUnknown_0832C3F8:: @ 832C3F8
.byte 0x00, 0x00, 0x00, 0x08, 0x02, 0x00, 0x00, 0x00
data/battle_message.s
+7 -4
View File
@@ -1659,8 +1659,11 @@ gBattleStringsTable:: @ 85CC270
.4byte gText_String49
.align 2
gUnknown_085CC834:: @ 85CC834
.2byte 0x0017, 0x0018, 0x0159, 0x001a, 0x014c, 0x00e2, 0x00e3, 0x0021
gMissStringIds:: @ 85CC834
.2byte 0x0017, 0x0018, 0x0159, 0x001a, 0x014c
gUnknown_085CC83E:: @ 85CC83E
.2byte 0x00e2, 0x00e3, 0x0021
.2byte 0x0112, 0x0165, 0x00e8, 0x00e9, 0x00e5, 0x00ed, 0x00f0, 0x00f3
.2byte 0x00ee, 0x00f4, 0x0066, 0x0067, 0x00ef, 0x00f5, 0x00ea, 0x00eb
.2byte 0x00ec, 0x0065, 0x0098, 0x00e5, 0x00e5, 0x004e, 0x0160, 0x004d
@@ -1682,8 +1685,8 @@ gUnknown_085CC834:: @ 85CC834
.2byte 0x00c7, 0x0163, 0x016a, 0x00c9, 0x0163, 0x016a, 0x0166, 0x0167
.2byte 0x0168, 0x00cb, 0x0137, 0x0177, 0x0178, 0x0179, 0x017a
gUnknown_085CC982:: @ 85CC982
.2byte 0x0014, 0x0023, 0x0053, 0x0080, 0x00fa, 0x0148, 0xffff
gTrappingMoves:: @ 85CC982
.2byte MOVE_BIND, MOVE_WRAP, MOVE_FIRE_SPIN, MOVE_CLAMP, MOVE_WHIRLPOOL, MOVE_SAND_TOMB, 0xffff
gText_PkmnIsEvolving:: @ 85CC990
.string "What?\n{STR_VAR_1} is evolving!$"
data/battle_scripts_1.s
+59 -59
View File
@@ -3,40 +3,40 @@
.section script_data, "aw", %progbits
gUnknown_082D86A8:: @ 82D86A8
gBattleScriptsForMoveEffects:: @ 82D86A8
.incbin "baserom.gba", 0x2d86a8, 0x388
gUnknown_082D8A30:: @ 82D8A30
BattleScript_PresentDamageTarget:: @ 82D8A30
.incbin "baserom.gba", 0x2d8a30, 0x1e
gUnknown_082D8A4E:: @ 82D8A4E
BattleScript_MoveEnd:: @ 82D8A4E
.incbin "baserom.gba", 0x2d8a4e, 0x12
gUnknown_082D8A60:: @ 82D8A60
BattleScript_PauseEffectivenessSoundResultMsgEndMove:: @ 82D8A60
.incbin "baserom.gba", 0x2d8a60, 0x274
gUnknown_082D8CD4:: @ 82D8CD4
BattleScript_StatUp:: @ 82D8CD4
.incbin "baserom.gba", 0x2d8cd4, 0x91
gUnknown_082D8D65:: @ 82D8D65
BattleScript_StatDown:: @ 82D8D65
.incbin "baserom.gba", 0x2d8d65, 0x6fd
BattleScript_MoveUsedMustRecharge:: @ 82D9462
.incbin "baserom.gba", 0x2d9462, 0xa7f
gUnknown_082D9EE1:: @ 82D9EE1
BattleScript_PresentHealTarget:: @ 82D9EE1
.incbin "baserom.gba", 0x2d9ee1, 0x1a
gUnknown_082D9EFB:: @ 82D9EFB
BattleScript_AlreadyAtFullHp:: @ 82D9EFB
.incbin "baserom.gba", 0x2d9efb, 0x21
gUnknown_082D9F1C:: @ 82D9F1C
BattleScript_ButItFailed:: @ 82D9F1C
.incbin "baserom.gba", 0x2d9f1c, 0x88e
gUnknown_082DA7AA:: @ 82DA7AA
BattleScript_FaintAttacker:: @ 82DA7AA
.incbin "baserom.gba", 0x2da7aa, 0xd
gUnknown_082DA7B7:: @ 82DA7B7
BattleScript_FaintTarget:: @ 82DA7B7
.incbin "baserom.gba", 0x2da7b7, 0xd
gUnknown_082DA7C4:: @ 82DA7C4
@@ -90,10 +90,10 @@ gUnknown_082DAB11:: @ 82DAB11
gUnknown_082DAB15:: @ 82DAB15
.incbin "baserom.gba", 0x2dab15, 0xa4
gUnknown_082DABB9:: @ 82DABB9
BattleScript_Pausex20:: @ 82DABB9
.incbin "baserom.gba", 0x2dabb9, 0x4
gUnknown_082DABBD:: @ 82DABBD
BattleScript_LevelUp:: @ 82DABBD
.incbin "baserom.gba", 0x2dabbd, 0x6f
gUnknown_082DAC2C:: @ 82DAC2C
@@ -135,10 +135,10 @@ BattleScript_BideNoEnergyToAttack:: @ 82DADC4
gUnknown_082DADD8:: @ 82DADD8
.incbin "baserom.gba", 0x2dadd8, 0x2b
gUnknown_082DAE03:: @ 82DAE03
BattleScript_MistProtected:: @ 82DAE03
.incbin "baserom.gba", 0x2dae03, 0xa
gUnknown_082DAE0D:: @ 82DAE0D
BattleScript_RageIsBuilding:: @ 82DAE0D
.incbin "baserom.gba", 0x2dae0d, 0x7
BattleScript_MoveUsedIsDisabled:: @ 82DAE14
@@ -156,7 +156,7 @@ gUnknown_082DAE2A:: @ 82DAE2A
BattleScript_EncoredNoMore:: @ 82DAE37
.incbin "baserom.gba", 0x2dae37, 0x7
gUnknown_082DAE3E:: @ 82DAE3E
BattleScript_DestinyBondTakesLife:: @ 82DAE3E
.incbin "baserom.gba", 0x2dae3e, 0x1b
gUnknown_082DAE59:: @ 82DAE59
@@ -174,19 +174,19 @@ gUnknown_082DAF05:: @ 82DAF05
gUnknown_082DAF20:: @ 82DAF20
.incbin "baserom.gba", 0x2daf20, 0x7
gUnknown_082DAF27:: @ 82DAF27
BattleScript_AllStatsUp:: @ 82DAF27
.incbin "baserom.gba", 0x2daf27, 0x9c
gUnknown_082DAFC3:: @ 82DAFC3
BattleScript_RapidSpinAway:: @ 82DAFC3
.incbin "baserom.gba", 0x2dafc3, 0x2
gUnknown_082DAFC5:: @ 82DAFC5
BattleScript_WrapFree:: @ 82DAFC5
.incbin "baserom.gba", 0x2dafc5, 0x11
gUnknown_082DAFD6:: @ 82DAFD6
BattleScript_LeechSeedFree:: @ 82DAFD6
.incbin "baserom.gba", 0x2dafd6, 0x7
gUnknown_082DAFDD:: @ 82DAFDD
BattleScript_SpikesFree:: @ 82DAFDD
.incbin "baserom.gba", 0x2dafdd, 0x7
gUnknown_082DAFE4:: @ 82DAFE4
@@ -198,7 +198,7 @@ BattleScript_NoMovesLeft:: @ 82DB072
gUnknown_082DB076:: @ 82DB076
.incbin "baserom.gba", 0x2db076, 0x4
gUnknown_082DB07A:: @ 82DB07A
BattleScript_NoPPForMove:: @ 82DB07A
.incbin "baserom.gba", 0x2db07a, 0xf
gUnknown_082DB089:: @ 82DB089
@@ -222,10 +222,10 @@ BattleScript_WishComesTrue:: @ 82DB0B7
BattleScript_IngrainTurnHeal:: @ 82DB0EE
.incbin "baserom.gba", 0x2db0ee, 0x29
gUnknown_082DB117:: @ 82DB117
BattleScript_AtkDefDown:: @ 82DB117
.incbin "baserom.gba", 0x2db117, 0x51
gUnknown_082DB168:: @ 82DB168
BattleScript_KnockedOff:: @ 82DB168
.incbin "baserom.gba", 0x2db168, 0xe
BattleScript_MoveUsedIsImprisoned:: @ 82DB176
@@ -237,22 +237,22 @@ gUnknown_082DB181:: @ 82DB181
gUnknown_082DB185:: @ 82DB185
.incbin "baserom.gba", 0x2db185, 0x8
gUnknown_082DB18D:: @ 82DB18D
BattleScript_GrudgeTakesPp:: @ 82DB18D
.incbin "baserom.gba", 0x2db18d, 0x7
gUnknown_082DB194:: @ 82DB194
BattleScript_MagicCoatBounce:: @ 82DB194
.incbin "baserom.gba", 0x2db194, 0x18
gUnknown_082DB1AC:: @ 82DB1AC
BattleScript_SnatchedMove:: @ 82DB1AC
.incbin "baserom.gba", 0x2db1ac, 0x1b
gUnknown_082DB1C7:: @ 82DB1C7
BattleScript_EnduredMsg:: @ 82DB1C7
.incbin "baserom.gba", 0x2db1c7, 0x7
gUnknown_082DB1CE:: @ 82DB1CE
BattleScript_OneHitKOMsg:: @ 82DB1CE
.incbin "baserom.gba", 0x2db1ce, 0x7
gUnknown_082DB1D5:: @ 82DB1D5
BattleScript_SAtkDown2:: @ 82DB1D5
.incbin "baserom.gba", 0x2db1d5, 0x2a
gUnknown_082DB1FF:: @ 82DB1FF
@@ -279,7 +279,7 @@ BattleScript_MoveUsedIsFrozen:: @ 82DB26A
BattleScript_MoveUsedUnfroze:: @ 82DB277
.incbin "baserom.gba", 0x2db277, 0xb
gUnknown_082DB282:: @ 82DB282
BattleScript_DefrostedViaFireMove:: @ 82DB282
.incbin "baserom.gba", 0x2db282, 0x9
BattleScript_MoveUsedIsParalyzed:: @ 82DB28B
@@ -300,7 +300,7 @@ BattleScript_MoveUsedIsConfused:: @ 82DB2BD
BattleScript_MoveUsedIsConfusedNoMore:: @ 82DB300
.incbin "baserom.gba", 0x2db300, 0x7
gUnknown_082DB307:: @ 82DB307
BattleScript_PrintPayDayMoneyString:: @ 82DB307
.incbin "baserom.gba", 0x2db307, 0x7
BattleScript_WrapTurnDmg:: @ 82DB30E
@@ -321,46 +321,46 @@ BattleScript_NightmareTurnDmg:: @ 82DB33F
BattleScript_CurseTurnDmg:: @ 82DB350
.incbin "baserom.gba", 0x2db350, 0x11
gUnknown_082DB361:: @ 82DB361
BattleScript_TargetPRLZHeal:: @ 82DB361
.incbin "baserom.gba", 0x2db361, 0x9
gUnknown_082DB36A:: @ 82DB36A
BattleScript_MoveEffectSleep:: @ 82DB36A
.incbin "baserom.gba", 0x2db36A, 0xE
BattleScript_YawnMakesAsleep:: @ 82DB378
.incbin "baserom.gba", 0x2db378, 0xE
gUnknown_082DB386:: @ 82DB386
BattleScript_MoveEffectPoison:: @ 82DB386
.incbin "baserom.gba", 0x2db386, 0xF
gUnknown_082DB395:: @ 82DB395
BattleScript_MoveEffectBurn:: @ 82DB395
.incbin "baserom.gba", 0x2db395, 0xF
gUnknown_082DB3A4:: @ 82DB3A4
BattleScript_MoveEffectFreeze:: @ 82DB3A4
.incbin "baserom.gba", 0x2db3A4, 0xF
gUnknown_082DB3B3:: @ 82DB3B3
BattleScript_MoveEffectParalysis:: @ 82DB3B3
.incbin "baserom.gba", 0x2db3B3, 0xF
gUnknown_082DB3C2:: @ 82DB3C2
BattleScript_MoveEffectUproar:: @ 82DB3C2
.incbin "baserom.gba", 0x2db3C2, 0x7
gUnknown_082DB3C9:: @ 82DB3C9
BattleScript_MoveEffectToxic:: @ 82DB3C9
.incbin "baserom.gba", 0x2db3C9, 0xD
gUnknown_082DB3D6:: @ 82DB3D6
BattleScript_MoveEffectPayDay:: @ 82DB3D6
.incbin "baserom.gba", 0x2db3D6, 0x7
gUnknown_082DB3DD:: @ 82DB3DD
BattleScript_MoveEffectWrap:: @ 82DB3DD
.incbin "baserom.gba", 0x2db3DD, 0x9
gUnknown_082DB3E6:: @ 82DB3E6
BattleScript_MoveEffectConfusion:: @ 82DB3E6
.incbin "baserom.gba", 0x2db3E6, 0xE
gUnknown_082DB3F4:: @ 82DB3F4
BattleScript_MoveEffectRecoil33:: @ 82DB3F4
.incbin "baserom.gba", 0x2db3F4, 0x2e
gUnknown_082DB422:: @ 82DB422
BattleScript_ItemSteal:: @ 82DB422
.incbin "baserom.gba", 0x2db422, 0xe
BattleScript_DrizzleActivates:: @ 82DB430
@@ -393,13 +393,13 @@ gUnknown_082DB4C1:: @ 82DB4C1
BattleScript_DroughtActivates:: @ 82DB52A
.incbin "baserom.gba", 0x2db52a, 0x14
gUnknown_082DB53E:: @ 82DB53E
BattleScript_TookAttack:: @ 82DB53E
.incbin "baserom.gba", 0x2db53e, 0x14
gUnknown_082DB552:: @ 82DB552
BattleScript_SturdyPreventsOHKO:: @ 82DB552
.incbin "baserom.gba", 0x2db552, 0xe
gUnknown_082DB560:: @ 82DB560
BattleScript_DampStopsExplosion:: @ 82DB560
.incbin "baserom.gba", 0x2db560, 0xe
BattleScript_MoveHPDrain_PPLoss:: @ 82DB56E
@@ -420,31 +420,31 @@ BattleScript_FlashFireBoost_PPLoss:: @ 82DB5A7
BattleScript_FlashFireBoost:: @ 82DB5A8
.incbin "baserom.gba", 0x2db5a8, 0x1f
gUnknown_082DB5C7:: @ 82DB5C7
BattleScript_AbilityNoStatLoss:: @ 82DB5C7
.incbin "baserom.gba", 0x2db5c7, 0xa
gUnknown_082DB5D1:: @ 82DB5D1
BattleScript_BRNPrevention:: @ 82DB5D1
.incbin "baserom.gba", 0x2db5d1, 0xc
gUnknown_082DB5DD:: @ 82DB5DD
BattleScript_PRLZPrevention:: @ 82DB5DD
.incbin "baserom.gba", 0x2db5dd, 0xc
gUnknown_082DB5E9:: @ 82DB5E9
BattleScript_PSNPrevention:: @ 82DB5E9
.incbin "baserom.gba", 0x2db5e9, 0xc
gUnknown_082DB5F5:: @ 82DB5F5
BattleScript_ObliviousPreventsAttraction:: @ 82DB5F5
.incbin "baserom.gba", 0x2db5f5, 0xe
gUnknown_082DB603:: @ 82DB603
BattleScript_FlinchPrevention:: @ 82DB603
.incbin "baserom.gba", 0x2db603, 0x1c
BattleScript_SoundproofProtected:: @ 82DB61F
.incbin "baserom.gba", 0x2db61f, 0x10
gUnknown_082DB62F:: @ 82DB62F
BattleScript_AbilityNoSpecificStatLoss:: @ 82DB62F
.incbin "baserom.gba", 0x2db62f, 0x10
gUnknown_082DB63F:: @ 82DB63F
BattleScript_StickyHoldActivates:: @ 82DB63F
.incbin "baserom.gba", 0x2db63f, 0xe
BattleScript_ColorChangeActivates:: @ 82DB64D
@@ -462,7 +462,7 @@ BattleScript_ApplySecondaryEffect:: @ 82DB67C
BattleScript_SynchronizeActivates:: @ 82DB67F
.incbin "baserom.gba", 0x2db67f, 0x3
gUnknown_082DB682:: @ 82DB682
BattleScript_NoItemSteal:: @ 82DB682
.incbin "baserom.gba", 0x2db682, 0xa
gUnknown_082DB68C:: @ 82DB68C
@@ -483,7 +483,7 @@ gUnknown_082DB6D9:: @ 82DB6D9
gUnknown_082DB6F0:: @ 82DB6F0
.incbin "baserom.gba", 0x2db6f0, 0xb
gUnknown_082DB6FB:: @ 82DB6FB
BattleScript_SubstituteFade:: @ 82DB6FB
.incbin "baserom.gba", 0x2db6fb, 0xb
BattleScript_BerryCurePrlzEnd2:: @ 82DB706
@@ -549,7 +549,7 @@ BattleScript_ItemHealHP_Ret:: @ 82DB7F7
gUnknown_082DB812:: @ 82DB812
.incbin "baserom.gba", 0x2db812, 0x4
gUnknown_082DB816:: @ 82DB816
BattleScript_HangedOnMsg:: @ 82DB816
.incbin "baserom.gba", 0x2db816, 0xe
BattleScript_BerryConfuseHealEnd2:: @ 82DB824
data/battle_scripts_2.s
+68 -9
View File
@@ -5,25 +5,84 @@
.align 2
gUnknown_082DBD08:: @ 82DBD08
.incbin "baserom.gba", 0x2dbd08, 0x34
.4byte gUnknown_082DBD68
.4byte gUnknown_082DBD68
.4byte gUnknown_082DBD68
.4byte gUnknown_082DBD68
.4byte gUnknown_082DBD68
.4byte gUnknown_082DBD7E
.4byte gUnknown_082DBD68
.4byte gUnknown_082DBD68
.4byte gUnknown_082DBD68
.4byte gUnknown_082DBD68
.4byte gUnknown_082DBD68
.4byte gUnknown_082DBD68
.4byte gUnknown_082DBD68
.align 2
gUnknown_082DBD3C:: @ 82DBD3C
.incbin "baserom.gba", 0x2dbd3c, 0x18
.4byte gUnknown_082DBE12
.4byte gUnknown_082DBE1C
.4byte gUnknown_082DBE1C
.4byte gUnknown_082DBE4B
.4byte gUnknown_082DBE6F
.4byte gUnknown_082DBE91
.align 2
gUnknown_082DBD54:: @ 82DBD54
.incbin "baserom.gba", 0x2dbd54, 0x4
.4byte gUnknown_082DBEB3
.align 2
gUnknown_082DBD58:: @ 82DBD58
.incbin "baserom.gba", 0x2dbd58, 0x2c
.4byte gUnknown_082DBEBD
.4byte gUnknown_082DBEC4
.4byte gUnknown_082DBECD
.4byte gUnknown_082DBEE3
gUnknown_082DBD84:: @ 82DBD84
gUnknown_082DBD68:: @ 82DBD68
.incbin "baserom.gba", 0x2dbd68, 0x16
gUnknown_082DBD7E:: @ 82DBD7E
.incbin "baserom.gba", 0x2dbd7e, 0x6
BattleScript_SuccessBallThrow:: @ 82DBD84
.incbin "baserom.gba", 0x2dbd84, 0x46
gUnknown_082DBDCA:: @ 82DBDCA
BattleScript_WallyBallThrow:: @ 82DBDCA
.incbin "baserom.gba", 0x2dbdca, 0xa
gUnknown_082DBDD4:: @ 82DBDD4
BattleScript_ShakeBallThrow:: @ 82DBDD4
.incbin "baserom.gba", 0x2dbdd4, 0x2e
gUnknown_082DBE02:: @ 82DBE02
.incbin "baserom.gba", 0x2dbe02, 0xf6
BattleScript_TrainerBallBlock:: @ 82DBE02
.incbin "baserom.gba", 0x2dbe02, 0x10
gUnknown_082DBE12:: @ 82DBE12
.incbin "baserom.gba", 0x2dbe12, 0xa
gUnknown_082DBE1C:: @ 82DBE1C
.incbin "baserom.gba", 0x2dbe1c, 0x2f
gUnknown_082DBE4B:: @ 82DBE4B
.incbin "baserom.gba", 0x2dbe4b, 0x24
gUnknown_082DBE6F:: @ 82DBE6F
.incbin "baserom.gba", 0x2dbe6f, 0x22
gUnknown_082DBE91:: @ 82DBE91
.incbin "baserom.gba", 0x2dbe91, 0x22
gUnknown_082DBEB3:: @ 82DBEB3
.incbin "baserom.gba", 0x2dbeb3, 0xA
gUnknown_082DBEBD:: @ 82DBEBD
.incbin "baserom.gba", 0x2dbebd, 0x7
gUnknown_082DBEC4:: @ 82DBEC4
.incbin "baserom.gba", 0x2dbec4, 0x9
gUnknown_082DBECD:: @ 82DBECD
.incbin "baserom.gba", 0x2dbecd, 0x16
gUnknown_082DBEE3:: @ 82DBEE3
.incbin "baserom.gba", 0x2dbee3, 0x15

Some files were not shown because too many files have changed in this diff Show More