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

import more pokeemerald names

Browse Source
This commit is contained in:
sceptillion
2017-12-17 02:56:44 -08:00
parent b5d877603b
commit ae3ef7fec6
163 changed files with 2820 additions and 2820 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/bag.s
+4 -4
View File
@@ -22,7 +22,7 @@ _0810B874:
ldr r0, _0810B8E4 @ =gUnknown_84530E4
bl sub_8003B24
_0810B87A:
bl sub_8002C28
bl DeactivateAllTextPrinters
movs r0, 0
movs r1, 0x64
movs r2, 0xE0
@@ -188,7 +188,7 @@ sub_810B994: @ 810B994
movs r0, 0x2
movs r1, 0
adds r2, r4, 0
bl sub_8002C48
bl PrintTextOnWindow
add sp, 0xC
pop {r4}
pop {r0}
@@ -260,7 +260,7 @@ sub_810BA3C: @ 810BA3C
ldrb r0, [r4]
bl ClearWindowTilemap
ldrb r0, [r4]
bl sub_8003E3C
bl RemoveWindow
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
movs r0, 0xFF
@@ -312,7 +312,7 @@ sub_810BA9C: @ 810BA9C
ldrb r0, [r4]
bl ClearWindowTilemap
ldrb r0, [r4]
bl sub_8003E3C
bl RemoveWindow
movs r0, 0x1
bl PutWindowTilemap
movs r0, 0
asm/battle_1.s
+1 -1
View File
@@ -185,7 +185,7 @@ sub_800F324: @ 800F324
bl sub_8001658
ldr r0, _0800F348 @ =gUnknown_8248330
bl sub_8003B24
bl sub_8002C28
bl DeactivateAllTextPrinters
pop {r0}
bx r0
.align 2, 0
asm/battle_2.s
+17 -17
View File
@@ -424,7 +424,7 @@ _0801012C: .4byte 0x00003108
_08010130: .4byte 0x0000311a
_08010134:
movs r0, 0xAF
bl sub_809C8E4
bl ItemIdToBerryType
lsls r0, 24
lsrs r0, 24
bl sub_809C8A0
@@ -568,7 +568,7 @@ _08010248: .4byte 0x0000311a
_0801024C: .4byte 0x0000311b
_08010250:
movs r0, 0xAF
bl sub_809C8E4
bl ItemIdToBerryType
lsls r0, 24
lsrs r0, 24
bl sub_809C8A0
@@ -1924,7 +1924,7 @@ _08010D9C:
subs r6, 0x1
cmp r6, 0
bge _08010D3A
bl sub_803DA14
bl ZeroPlayerPartyMons
bl ZeroEnemyPartyMons
ldr r1, _08010DD8 @ =gUnknown_2023E82
ldrb r0, [r1]
@@ -2446,7 +2446,7 @@ sub_80111BC: @ 80111BC
cmp r0, 0
bne _080111DE
bl sub_8011174
bl sub_8003ECC
bl FreeAllWindowBuffers
ldr r0, _080111E8 @ =gUnknown_30030F0
ldr r0, [r0, 0x8]
bl SetMainCallback2
@@ -6470,7 +6470,7 @@ _080130FA:
ldrh r0, [r1]
ldrb r1, [r1, 0x17]
lsrs r1, 7
bl sub_8040D38
bl GetAbilityBySpecies
mov r2, r9
ldrb r1, [r2]
muls r1, r7
@@ -7787,13 +7787,13 @@ sub_8013BD4: @ 8013BD4
ldrb r0, [r0]
cmp r0, 0
bne _08013C04
bl sub_8017B04
bl UpdateTurnCounters
lsls r0, 24
cmp r0, 0
beq _08013BF8
b _08013D20
_08013BF8:
bl sub_8018258
bl TurnBasedEffects
lsls r0, 24
cmp r0, 0
beq _08013C04
@@ -9988,7 +9988,7 @@ _08014E08:
cmp r0, 0
bne _08014E3C
ldr r0, _08014EC8 @ =0x00000822
bl sub_806E6D0
bl FlagGet
lsls r0, 24
cmp r0, 0
beq _08014E3C
@@ -10098,7 +10098,7 @@ _08014EF0:
cmp r0, 0
bne _08014F20
ldr r0, _08014F6C @ =0x00000822
bl sub_806E6D0
bl FlagGet
lsls r0, 24
cmp r0, 0
beq _08014F20
@@ -11515,7 +11515,7 @@ _08015A6C:
ldr r0, _08015A98 @ =sub_8015AA0
_08015A70:
str r0, [r1]
bl sub_8003ECC
bl FreeAllWindowBuffers
ldr r0, _08015A9C @ =gUnknown_2022B4C
ldr r0, [r0]
movs r1, 0x2
@@ -11576,7 +11576,7 @@ _08015AAE:
adds r0, r4, 0
adds r1, r2, 0
movs r2, 0x81
bl sub_80CDDF4
bl EvolutionScene
b _08015B1C
.align 2, 0
_08015AF4: .4byte gUnknown_3004FD4
@@ -11880,7 +11880,7 @@ _08015CF8:
str r0, [r2]
movs r0, 0xA5
movs r1, 0
bl sub_801D05C
bl GetMoveTarget
ldrb r1, [r6]
ldr r3, _08015D88 @ =gUnknown_2023FE8
ldr r2, [r3]
@@ -11969,7 +11969,7 @@ _08015DE4:
strb r0, [r1]
ldrh r0, [r2]
movs r1, 0
bl sub_801D05C
bl GetMoveTarget
ldrb r1, [r6]
ldr r3, _08015E44 @ =gUnknown_2023FE8
ldr r2, [r3]
@@ -12025,7 +12025,7 @@ _08015E48:
strb r0, [r1, 0xE]
ldrh r0, [r3]
movs r1, 0
bl sub_801D05C
bl GetMoveTarget
ldrb r1, [r6]
ldr r3, _08015EB8 @ =gUnknown_2023FE8
ldr r2, [r3]
@@ -12059,7 +12059,7 @@ _08015EBC:
strh r3, [r1]
ldrh r0, [r1]
movs r1, 0
bl sub_801D05C
bl GetMoveTarget
ldrb r1, [r4]
ldr r2, _08015F0C @ =gUnknown_2023FE8
ldr r2, [r2]
@@ -12696,7 +12696,7 @@ sub_8016418: @ 8016418
ldr r0, _08016488 @ =gUnknown_2022976
strh r1, [r0]
ldrb r0, [r4]
bl sub_801CFE4
bl ClearFuryCutterDestinyBondGrudge
ldr r5, _0801648C @ =gUnknown_2023D68
ldr r2, _08016490 @ =gUnknown_20233C4
ldrb r1, [r4]
@@ -13321,7 +13321,7 @@ _0801694C:
cmp r0, 0
bne _080169D8
ldrb r0, [r4]
bl sub_801CFE4
bl ClearFuryCutterDestinyBondGrudge
ldr r1, _0801697C @ =gUnknown_2023E82
movs r0, 0x3
strb r0, [r1, 0x5]
asm/battle_ai_script_commands.s
+29 -29
View File
@@ -3721,8 +3721,8 @@ _080C8878: .4byte gUnknown_2024284
_080C887C: .4byte gUnknown_2039A00
thumb_func_end sub_80C87BC
thumb_func_start sub_80C8880
sub_80C8880: @ 80C8880
thumb_func_start BattleAICmd_get_weather
BattleAICmd_get_weather: @ 80C8880
push {lr}
ldr r2, _080C88E0 @ =gUnknown_2023F1C
ldrh r1, [r2]
@@ -3779,7 +3779,7 @@ _080C88D4:
_080C88E0: .4byte gUnknown_2023F1C
_080C88E4: .4byte gUnknown_2023FF4
_080C88E8: .4byte gUnknown_2039A00
thumb_func_end sub_80C8880
thumb_func_end BattleAICmd_get_weather
thumb_func_start sub_80C88EC
sub_80C88EC: @ 80C88EC
@@ -4093,8 +4093,8 @@ _080C8B1E:
bx r0
thumb_func_end sub_80C8ABC
thumb_func_start sub_80C8B24
sub_80C8B24: @ 80C8B24
thumb_func_start BattleAICmd_if_can_faint
BattleAICmd_if_can_faint: @ 80C8B24
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -4207,10 +4207,10 @@ _080C8C10:
bx r0
.align 2, 0
_080C8C1C: .4byte gUnknown_2039A00
thumb_func_end sub_80C8B24
thumb_func_end BattleAICmd_if_can_faint
thumb_func_start sub_80C8C20
sub_80C8C20: @ 80C8C20
thumb_func_start BattleAICmd_if_cant_faint
BattleAICmd_if_cant_faint: @ 80C8C20
push {r4-r7,lr}
ldr r2, _080C8CBC @ =gUnknown_8250C04
ldr r7, _080C8CC0 @ =gUnknown_2023FF4
@@ -4311,7 +4311,7 @@ _080C8CF8:
bx r0
.align 2, 0
_080C8D00: .4byte gUnknown_2039A00
thumb_func_end sub_80C8C20
thumb_func_end BattleAICmd_if_cant_faint
thumb_func_start sub_80C8D04
sub_80C8D04: @ 80C8D04
@@ -4797,8 +4797,8 @@ _080C9080: .4byte gUnknown_2023D6C
_080C9084: .4byte gUnknown_8250C04
thumb_func_end sub_80C8FB0
thumb_func_start sub_80C9088
sub_80C9088: @ 80C9088
thumb_func_start BattleAICmd_if_any_move_disabled_or_encored
BattleAICmd_if_any_move_disabled_or_encored: @ 80C9088
push {r4,r5,lr}
ldr r0, _080C909C @ =gUnknown_2039A00
ldr r1, [r0]
@@ -4870,10 +4870,10 @@ _080C9108:
pop {r4,r5}
pop {r0}
bx r0
thumb_func_end sub_80C9088
thumb_func_end BattleAICmd_if_any_move_disabled_or_encored
thumb_func_start sub_80C9110
sub_80C9110: @ 80C9110
thumb_func_start BattleAICmd_if_curr_move_disabled_or_encored
BattleAICmd_if_curr_move_disabled_or_encored: @ 80C9110
push {r4,lr}
ldr r4, _080C9124 @ =gUnknown_2039A00
ldr r3, [r4]
@@ -4944,10 +4944,10 @@ _080C9198:
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_80C9110
thumb_func_end BattleAICmd_if_curr_move_disabled_or_encored
thumb_func_start sub_80C91A0
sub_80C91A0: @ 80C91A0
thumb_func_start BattleAICmd_flee
BattleAICmd_flee: @ 80C91A0
ldr r0, _080C91B0 @ =gUnknown_2023FF4
ldr r0, [r0]
ldr r2, [r0, 0x14]
@@ -4958,7 +4958,7 @@ sub_80C91A0: @ 80C91A0
bx lr
.align 2, 0
_080C91B0: .4byte gUnknown_2023FF4
thumb_func_end sub_80C91A0
thumb_func_end BattleAICmd_flee
thumb_func_start sub_80C91B4
sub_80C91B4: @ 80C91B4
@@ -5455,7 +5455,7 @@ BattleAICmd_call: @ 80C9530
ldr r4, _080C955C @ =gUnknown_2039A00
ldr r0, [r4]
adds r0, 0x5
bl sub_80C971C
bl AIStackPushVar
ldr r2, [r4]
ldrb r1, [r2, 0x1]
ldrb r0, [r2, 0x2]
@@ -5498,7 +5498,7 @@ _080C957C: .4byte gUnknown_2039A00
thumb_func_start BattleAICmd_end
BattleAICmd_end: @ 80C9580
push {lr}
bl sub_80C9768
bl AIStackPop
lsls r0, 24
cmp r0, 0
bne _080C959A
@@ -5713,8 +5713,8 @@ _080C9714:
_080C9718: .4byte gUnknown_2039A00
thumb_func_end sub_80C96CC
thumb_func_start sub_80C971C
sub_80C971C: @ 80C971C
thumb_func_start AIStackPushVar
AIStackPushVar: @ 80C971C
push {r4,lr}
ldr r1, _080C973C @ =gUnknown_2023FF4
ldr r1, [r1]
@@ -5733,10 +5733,10 @@ sub_80C971C: @ 80C971C
bx r0
.align 2, 0
_080C973C: .4byte gUnknown_2023FF4
thumb_func_end sub_80C971C
thumb_func_end AIStackPushVar
thumb_func_start sub_80C9740
sub_80C9740: @ 80C9740
thumb_func_start AIStackPushVar_cursor
AIStackPushVar_cursor: @ 80C9740
ldr r0, _080C9760 @ =gUnknown_2023FF4
ldr r0, [r0]
ldr r2, [r0, 0x1C]
@@ -5755,10 +5755,10 @@ sub_80C9740: @ 80C9740
.align 2, 0
_080C9760: .4byte gUnknown_2023FF4
_080C9764: .4byte gUnknown_2039A00
thumb_func_end sub_80C9740
thumb_func_end AIStackPushVar_cursor
thumb_func_start sub_80C9768
sub_80C9768: @ 80C9768
thumb_func_start AIStackPop
AIStackPop: @ 80C9768
push {lr}
ldr r3, _080C9780 @ =gUnknown_2023FF4
ldr r0, [r3]
@@ -5791,6 +5791,6 @@ _080C979E:
bx r1
.align 2, 0
_080C97A4: .4byte gUnknown_2039A00
thumb_func_end sub_80C9768
thumb_func_end AIStackPop
.align 2, 0 @ Don't pad with nop.
asm/battle_anim.s
+9 -9
View File
@@ -2658,8 +2658,8 @@ sub_807396C: @ 807396C
bx r0
thumb_func_end sub_807396C
thumb_func_start sub_8073978
sub_8073978: @ 8073978
thumb_func_start ScriptCmd_restorebg
ScriptCmd_restorebg: @ 8073978
push {lr}
ldr r1, _080739A8 @ =gUnknown_2037ED4
ldr r0, [r1]
@@ -2688,10 +2688,10 @@ _080739AC: .4byte sub_8073850
_080739B0: .4byte gUnknown_3005090
_080739B4: .4byte 0x0000ffff
_080739B8: .4byte gUnknown_2037F17
thumb_func_end sub_8073978
thumb_func_end ScriptCmd_restorebg
thumb_func_start sub_80739BC
sub_80739BC: @ 80739BC
thumb_func_start ScriptCmd_waitbgfadeout
ScriptCmd_waitbgfadeout: @ 80739BC
push {lr}
ldr r0, _080739D4 @ =gUnknown_2037F17
ldrb r0, [r0]
@@ -2717,7 +2717,7 @@ _080739E4:
bx r0
.align 2, 0
_080739EC: .4byte gUnknown_2037EE0
thumb_func_end sub_80739BC
thumb_func_end ScriptCmd_waitbgfadeout
thumb_func_start sub_80739F0
sub_80739F0: @ 80739F0
@@ -2748,8 +2748,8 @@ _08073A1A:
_08073A20: .4byte gUnknown_2037EE0
thumb_func_end sub_80739F0
thumb_func_start sub_8073A24
sub_8073A24: @ 8073A24
thumb_func_start ScriptCmd_changebg
ScriptCmd_changebg: @ 8073A24
push {r4,lr}
ldr r4, _08073A40 @ =gUnknown_2037ED4
ldr r1, [r4]
@@ -2765,7 +2765,7 @@ sub_8073A24: @ 8073A24
bx r0
.align 2, 0
_08073A40: .4byte gUnknown_2037ED4
thumb_func_end sub_8073A24
thumb_func_end ScriptCmd_changebg
thumb_func_start sub_8073A44
sub_8073A44: @ 8073A44
asm/battle_anim_8074480.s
+1 -1
View File
@@ -5133,7 +5133,7 @@ _08076A46:
str r2, [sp]
adds r2, r6, 0
mov r3, r8
bl sub_800F134
bl LoadSpecialPokePic_DontHandleDeoxys
b _08076A7C
.align 2, 0
_08076A54: .4byte gUnknown_2024018
asm/battle_anim_80DE2C0.s
+3 -3
View File
@@ -3294,8 +3294,8 @@ _080DFBDC: .4byte gUnknown_3005090
_080DFBE0: .4byte gUnknown_2024018
thumb_func_end sub_80DF9BC
thumb_func_start sub_80DFBE4
sub_80DFBE4: @ 80DFBE4
thumb_func_start c3_80DFBE4
c3_80DFBE4: @ 80DFBE4
push {r4,lr}
lsls r0, 24
lsrs r0, 24
@@ -3324,7 +3324,7 @@ _080DFC14: .4byte gUnknown_2037F02
_080DFC18: .4byte gUnknown_202063C
_080DFC1C: .4byte gUnknown_2023D44
_080DFC20: .4byte gUnknown_2037F1A
thumb_func_end sub_80DFBE4
thumb_func_end c3_80DFBE4
thumb_func_start sub_80DFC24
sub_80DFC24: @ 80DFC24
asm/battle_anim_80EEC0C.s
+10 -10
View File
@@ -939,7 +939,7 @@ _080EF39C:
bl GetMonData
lsls r0, 16
lsrs r0, 16
bl sub_80EF52C
bl ItemIdToBallId
lsls r0, 24
lsrs r0, 24
mov r8, r0
@@ -1056,7 +1056,7 @@ sub_80EF490: @ 80EF490
lsrs r4, 24
ldr r0, _080EF4B4 @ =gUnknown_2023D68
ldrh r0, [r0]
bl sub_80EF52C
bl ItemIdToBallId
lsls r0, 24
lsrs r0, 24
bl LoadBallGfx
@@ -1077,7 +1077,7 @@ sub_80EF4B8: @ 80EF4B8
lsrs r4, 24
ldr r0, _080EF4DC @ =gUnknown_2023D68
ldrh r0, [r0]
bl sub_80EF52C
bl ItemIdToBallId
lsls r0, 24
lsrs r0, 24
bl FreeBallGfx
@@ -1130,8 +1130,8 @@ _080EF524: .4byte gUnknown_2037F02
_080EF528: .4byte 0x0000fffe
thumb_func_end sub_80EF4E0
thumb_func_start sub_80EF52C
sub_80EF52C: @ 80EF52C
thumb_func_start ItemIdToBallId
ItemIdToBallId: @ 80EF52C
push {lr}
lsls r0, 16
lsrs r0, 16
@@ -1197,7 +1197,7 @@ _080EF5A4:
_080EF5A6:
pop {r1}
bx r1
thumb_func_end sub_80EF52C
thumb_func_end ItemIdToBallId
thumb_func_start sub_80EF5AC
sub_80EF5AC: @ 80EF5AC
@@ -1212,7 +1212,7 @@ sub_80EF5AC: @ 80EF5AC
mov r10, r0
ldr r0, _080EF674 @ =gUnknown_2023D68
ldrh r0, [r0]
bl sub_80EF52C
bl ItemIdToBallId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -1371,7 +1371,7 @@ _080EF6F8:
_080EF708:
ldr r0, _080EF7C8 @ =gUnknown_2023D68
ldrh r0, [r0]
bl sub_80EF52C
bl ItemIdToBallId
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -1656,7 +1656,7 @@ _080EF954:
str r0, [r4, 0x1C]
ldr r0, _080EF9AC @ =gUnknown_2023D68
ldrh r0, [r0]
bl sub_80EF52C
bl ItemIdToBallId
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0xB
@@ -2875,7 +2875,7 @@ sub_80F02B0: @ 80F02B0
str r0, [r4, 0x1C]
ldr r0, _080F0368 @ =gUnknown_2023D68
ldrh r0, [r0]
bl sub_80EF52C
bl ItemIdToBallId
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0xB
asm/battle_controller_link_opponent.s
+1 -1
View File
@@ -1356,7 +1356,7 @@ RecordedOpponentBufferExecCompleted: @ 803B124
movs r0, 0x2
movs r1, 0x4
mov r2, sp
bl sub_800D9EC
bl PrepareBufferDataTransferLink
ldr r1, _0803B174 @ =gUnknown_2022BC4
ldrb r0, [r4]
lsls r0, 9
asm/battle_controller_link_partner.s
+1 -1
View File
@@ -1008,7 +1008,7 @@ sub_80D49E8: @ 80D49E8
movs r0, 0x2
movs r1, 0x4
mov r2, sp
bl sub_800D9EC
bl PrepareBufferDataTransferLink
ldr r1, _080D4A38 @ =gUnknown_2022BC4
ldrb r0, [r4]
lsls r0, 9
asm/battle_controller_oak.s
+3 -3
View File
@@ -560,7 +560,7 @@ sub_80E79B8: @ 80E79B8
adds r1, r3
ldrb r4, [r1, 0x8]
bl DestroyTask
bl sub_8003ECC
bl FreeAllWindowBuffers
adds r0, r4, 0
bl sub_81278DC
_080E79F6:
@@ -636,7 +636,7 @@ sub_80E7A70: @ 80E7A70
ldr r1, _080E7AB4 @ =sub_80E7AC4
str r1, [r0]
bl nullsub_44
bl sub_8003ECC
bl FreeAllWindowBuffers
ldr r0, _080E7AB8 @ =gUnknown_2022B4C
ldr r0, [r0]
movs r1, 0x10
@@ -2623,7 +2623,7 @@ WallyBufferExecCompleted: @ 80E8A9C
movs r0, 0x2
movs r1, 0x4
mov r2, sp
bl sub_800D9EC
bl PrepareBufferDataTransferLink
ldr r1, _080E8AEC @ =gUnknown_2022BC4
ldrb r0, [r4]
lsls r0, 9
asm/battle_controller_opponent.s
+2 -2
View File
@@ -4176,7 +4176,7 @@ _08037D18:
ands r1, r0
cmp r1, 0
beq _08037D2C
bl sub_80E7420
bl GetEreaderTrainerFrontSpriteId
_08037D26:
lsls r0, 24
lsrs r0, 24
@@ -4395,7 +4395,7 @@ _08037EEC:
ands r1, r0
cmp r1, 0
beq _08037F00
bl sub_80E7420
bl GetEreaderTrainerFrontSpriteId
_08037EFA:
lsls r0, 24
lsrs r0, 24
asm/battle_controller_player.s
+102 -102
View File
@@ -17,7 +17,7 @@ sub_802E314: @ 802E314
ldrb r0, [r0]
lsls r0, 2
adds r0, r1
ldr r1, _0802E334 @ =sub_802E3B4
ldr r1, _0802E334 @ =PlayerBufferRunCommand
str r1, [r0]
ldr r1, _0802E338 @ =gUnknown_2024005
movs r0, 0
@@ -26,12 +26,12 @@ sub_802E314: @ 802E314
.align 2, 0
_0802E32C: .4byte gUnknown_3004FE0
_0802E330: .4byte gUnknown_2023BC4
_0802E334: .4byte sub_802E3B4
_0802E334: .4byte PlayerBufferRunCommand
_0802E338: .4byte gUnknown_2024005
thumb_func_end sub_802E314
thumb_func_start sub_802E33C
sub_802E33C: @ 802E33C
thumb_func_start PlayerBufferExecCompleted
PlayerBufferExecCompleted: @ 802E33C
push {r4,lr}
sub sp, 0x4
ldr r1, _0802E37C @ =gUnknown_3004FE0
@@ -39,7 +39,7 @@ sub_802E33C: @ 802E33C
ldrb r0, [r4]
lsls r0, 2
adds r0, r1
ldr r1, _0802E384 @ =sub_802E3B4
ldr r1, _0802E384 @ =PlayerBufferRunCommand
str r1, [r0]
ldr r0, _0802E388 @ =gUnknown_2022B4C
ldr r0, [r0]
@@ -53,7 +53,7 @@ sub_802E33C: @ 802E33C
movs r0, 0x2
movs r1, 0x4
mov r2, sp
bl sub_800D9EC
bl PrepareBufferDataTransferLink
ldr r1, _0802E38C @ =gUnknown_2022BC4
ldrb r0, [r4]
lsls r0, 9
@@ -64,7 +64,7 @@ sub_802E33C: @ 802E33C
.align 2, 0
_0802E37C: .4byte gUnknown_3004FE0
_0802E380: .4byte gUnknown_2023BC4
_0802E384: .4byte sub_802E3B4
_0802E384: .4byte PlayerBufferRunCommand
_0802E388: .4byte gUnknown_2022B4C
_0802E38C: .4byte gUnknown_2022BC4
_0802E390:
@@ -85,10 +85,10 @@ _0802E3A2:
.align 2, 0
_0802E3AC: .4byte gUnknown_2023BC8
_0802E3B0: .4byte gUnknown_825E45C
thumb_func_end sub_802E33C
thumb_func_end PlayerBufferExecCompleted
thumb_func_start sub_802E3B4
sub_802E3B4: @ 802E3B4
thumb_func_start PlayerBufferRunCommand
PlayerBufferRunCommand: @ 802E3B4
push {lr}
ldr r2, _0802E3E8 @ =gUnknown_2023BC8
ldr r1, _0802E3EC @ =gUnknown_825E45C
@@ -121,14 +121,14 @@ _0802E3F0: .4byte gUnknown_2023BC4
_0802E3F4: .4byte gUnknown_2022BC4
_0802E3F8: .4byte gUnknown_825089C
_0802E3FC:
bl sub_802E33C
bl PlayerBufferExecCompleted
_0802E400:
pop {r0}
bx r0
thumb_func_end sub_802E3B4
thumb_func_end PlayerBufferRunCommand
thumb_func_start sub_802E404
sub_802E404: @ 802E404
thumb_func_start CompleteOnBankSpritePosX_0
CompleteOnBankSpritePosX_0: @ 802E404
push {lr}
ldr r2, _0802E42C @ =gUnknown_202063C
ldr r1, _0802E430 @ =gUnknown_2023D44
@@ -144,7 +144,7 @@ sub_802E404: @ 802E404
ldrsh r0, [r0, r1]
cmp r0, 0
bne _0802E426
bl sub_802E33C
bl PlayerBufferExecCompleted
_0802E426:
pop {r0}
bx r0
@@ -152,7 +152,7 @@ _0802E426:
_0802E42C: .4byte gUnknown_202063C
_0802E430: .4byte gUnknown_2023D44
_0802E434: .4byte gUnknown_2023BC4
thumb_func_end sub_802E404
thumb_func_end CompleteOnBankSpritePosX_0
thumb_func_start sub_802E438
sub_802E438: @ 802E438
@@ -391,7 +391,7 @@ _0802E610:
movs r2, 0
bl EmitTwoReturnValues
_0802E616:
bl sub_802E33C
bl PlayerBufferExecCompleted
b _0802E634
.align 2, 0
_0802E61C: .4byte gUnknown_2022B4C
@@ -506,7 +506,7 @@ _0802E6B6:
ldrb r0, [r4]
movs r1, 0x1
bl dp11b_obj_free
bl sub_802E33C
bl PlayerBufferExecCompleted
b _0802E9DC
.align 2, 0
_0802E708: .4byte gUnknown_8250980
@@ -1042,7 +1042,7 @@ _0802EB3A:
movs r0, 0x1
movs r1, 0xA
bl EmitTwoReturnValues
bl sub_802E33C
bl PlayerBufferExecCompleted
b _0802EDBA
.align 2, 0
_0802EB78: .4byte gUnknown_2023FFC
@@ -1124,7 +1124,7 @@ _0802EC10:
movs r0, 0x1
movs r1, 0xA
bl EmitTwoReturnValues
bl sub_802E33C
bl PlayerBufferExecCompleted
bl ResetPaletteFadeControl
b _0802ED2C
.align 2, 0
@@ -1248,8 +1248,8 @@ _0802ED10:
ldrb r0, [r0]
movs r1, 0
bl sub_80309CC
bl sub_80308CC
bl sub_8030940
bl MoveSelectionDisplayPpNumber
bl MoveSelectionDisplayMoveType
_0802ED2C:
movs r0, 0xF0
lsls r0, 12
@@ -2006,9 +2006,9 @@ _0802F324:
ldrb r0, [r0]
movs r1, 0
bl sub_80309CC
bl sub_80308A8
bl sub_80308CC
bl sub_8030940
bl MoveSelectionDisplayPpString
bl MoveSelectionDisplayPpNumber
bl MoveSelectionDisplayMoveType
_0802F34C:
ldr r0, _0802F3A4 @ =gUnknown_30030F0
ldrh r1, [r0, 0x2E]
@@ -2057,9 +2057,9 @@ _0802F3B0:
ldr r0, _0802F3FC @ =sub_802EA10
_0802F3BA:
str r0, [r1]
bl sub_80308A8
bl sub_80308CC
bl sub_8030940
bl MoveSelectionDisplayPpString
bl MoveSelectionDisplayPpNumber
bl MoveSelectionDisplayMoveType
_0802F3C8:
ldr r0, _0802F400 @ =gUnknown_30030F0
ldrh r1, [r0, 0x2E]
@@ -2353,7 +2353,7 @@ sub_802F610: @ 802F610
str r0, [r3]
ldr r0, _0802F660 @ =sub_8011A1C
bl SetMainCallback2
bl sub_8003ECC
bl FreeAllWindowBuffers
b _0802F694
.align 2, 0
_0802F64C: .4byte gUnknown_3003F3C
@@ -2382,7 +2382,7 @@ _0802F664:
str r0, [r3]
ldr r0, _0802F6A4 @ =sub_8011A1C
bl SetMainCallback2
bl sub_8003ECC
bl FreeAllWindowBuffers
_0802F694:
pop {r0}
bx r0
@@ -2476,7 +2476,7 @@ sub_802F730: @ 802F730
ldr r0, _0802F764 @ =nullsub_8
cmp r1, r0
bne _0802F754
bl sub_802E33C
bl PlayerBufferExecCompleted
_0802F754:
pop {r0}
bx r0
@@ -2505,7 +2505,7 @@ sub_802F768: @ 802F768
ldr r0, _0802F79C @ =nullsub_8
cmp r1, r0
bne _0802F78C
bl sub_802E33C
bl PlayerBufferExecCompleted
_0802F78C:
pop {r0}
bx r0
@@ -2555,7 +2555,7 @@ sub_802F7A0: @ 802F7A0
lsls r0, 2
adds r0, r6
bl DestroySprite
bl sub_802E33C
bl PlayerBufferExecCompleted
_0802F7F4:
pop {r4-r6}
pop {r0}
@@ -2596,7 +2596,7 @@ sub_802F810: @ 802F810
adds r0, r2
movs r1, 0
strb r1, [r0, 0x9]
bl sub_802E33C
bl PlayerBufferExecCompleted
_0802F848:
pop {r4}
pop {r0}
@@ -3168,7 +3168,7 @@ sub_802FCAC: @ 802FCAC
ldr r2, _0802FD14 @ =gUnknown_2024284
adds r0, r2
bl HandleLowHpMusicChange
bl sub_802E33C
bl PlayerBufferExecCompleted
_0802FCFA:
pop {r4}
pop {r0}
@@ -3351,7 +3351,7 @@ _0802FE6C:
ldr r2, _0802FE90 @ =gUnknown_2024284
adds r0, r2
bl HandleLowHpMusicChange
bl sub_802E33C
bl PlayerBufferExecCompleted
_0802FE86:
pop {r4-r6}
pop {r0}
@@ -3369,7 +3369,7 @@ sub_802FE94: @ 802FE94
lsls r0, 16
cmp r0, 0
bne _0802FEA6
bl sub_802E33C
bl PlayerBufferExecCompleted
_0802FEA6:
pop {r0}
bx r0
@@ -4212,7 +4212,7 @@ sub_8030538: @ 8030538
adds r0, r1
ldrb r0, [r0]
bl SetHealthboxSpriteInvisible
bl sub_802E33C
bl PlayerBufferExecCompleted
_08030588:
pop {r4-r6}
pop {r0}
@@ -4263,7 +4263,7 @@ sub_80305A0: @ 80305A0
adds r0, r1
ldrb r0, [r0]
bl SetHealthboxSpriteInvisible
bl sub_802E33C
bl PlayerBufferExecCompleted
_080305F4:
pop {r4-r6}
pop {r0}
@@ -4284,7 +4284,7 @@ sub_8030610: @ 8030610
lsls r0, 16
cmp r0, 0
bne _08030622
bl sub_802E33C
bl PlayerBufferExecCompleted
_08030622:
pop {r0}
bx r0
@@ -4317,7 +4317,7 @@ sub_8030628: @ 8030628
adds r1, r3
ldrb r4, [r1, 0x8]
bl DestroyTask
bl sub_8003ECC
bl FreeAllWindowBuffers
adds r0, r4, 0
bl sub_81278DC
_08030666:
@@ -4383,7 +4383,7 @@ _080306D6:
bne _080306F0
bl PrintLinkStandbyMsg
_080306F0:
bl sub_802E33C
bl PlayerBufferExecCompleted
_080306F4:
pop {r0}
bx r0
@@ -4409,7 +4409,7 @@ sub_8030700: @ 8030700
ldr r1, _08030738 @ =CompleteWhenChoseItem
str r1, [r0]
bl nullsub_44
bl sub_8003ECC
bl FreeAllWindowBuffers
bl sub_8107ECC
_08030728:
pop {r0}
@@ -4439,7 +4439,7 @@ CompleteWhenChoseItem: @ 803073C
ldrh r1, [r0]
movs r0, 0x1
bl EmitOneReturnValue
bl sub_802E33C
bl PlayerBufferExecCompleted
_08030762:
pop {r0}
bx r0
@@ -4472,7 +4472,7 @@ CompleteOnSpecialAnimDone: @ 8030778
cmp r0, 0
bne _080307A2
_0803079E:
bl sub_802E33C
bl PlayerBufferExecCompleted
_080307A2:
pop {r0}
bx r0
@@ -4510,7 +4510,7 @@ DoHitAnimBlinkSpriteEffect: @ 80307B4
strb r0, [r2]
ldr r0, _080307FC @ =gUnknown_2024005
strb r3, [r0]
bl sub_802E33C
bl PlayerBufferExecCompleted
b _0803082A
.align 2, 0
_080307F0: .4byte gUnknown_2023D44
@@ -4602,8 +4602,8 @@ _080308A0: .4byte gUnknown_83FE770
_080308A4: .4byte gUnknown_8247094
thumb_func_end sub_8030830
thumb_func_start sub_80308A8
sub_80308A8: @ 80308A8
thumb_func_start MoveSelectionDisplayPpString
MoveSelectionDisplayPpString: @ 80308A8
push {r4,lr}
ldr r4, _080308C4 @ =gUnknown_202298C
ldr r1, _080308C8 @ =gUnknown_83FE766
@@ -4618,10 +4618,10 @@ sub_80308A8: @ 80308A8
.align 2, 0
_080308C4: .4byte gUnknown_202298C
_080308C8: .4byte gUnknown_83FE766
thumb_func_end sub_80308A8
thumb_func_end MoveSelectionDisplayPpString
thumb_func_start sub_80308CC
sub_80308CC: @ 80308CC
thumb_func_start MoveSelectionDisplayPpNumber
MoveSelectionDisplayPpNumber: @ 80308CC
push {r4-r7,lr}
ldr r5, _08030930 @ =gUnknown_2022BC4
ldr r7, _08030934 @ =gUnknown_2023BC4
@@ -4673,10 +4673,10 @@ _08030930: .4byte gUnknown_2022BC4
_08030934: .4byte gUnknown_2023BC4
_08030938: .4byte gUnknown_202298C
_0803093C: .4byte gUnknown_2023FFC
thumb_func_end sub_80308CC
thumb_func_end MoveSelectionDisplayPpNumber
thumb_func_start sub_8030940
sub_8030940: @ 8030940
thumb_func_start MoveSelectionDisplayMoveType
MoveSelectionDisplayMoveType: @ 8030940
push {r4-r6,lr}
ldr r5, _080309AC @ =gUnknown_2023BC4
ldrb r4, [r5]
@@ -4735,7 +4735,7 @@ _080309BC: .4byte gUnknown_83FE770
_080309C0: .4byte gUnknown_8250C04
_080309C4: .4byte gUnknown_2023FFC
_080309C8: .4byte gUnknown_824F1A0
thumb_func_end sub_8030940
thumb_func_end MoveSelectionDisplayMoveType
thumb_func_start sub_80309CC
sub_80309CC: @ 80309CC
@@ -4920,7 +4920,7 @@ CompleteOnFinishedStatusAnimation: @ 8030AFC
ands r0, r1
cmp r0, 0
bne _08030B1E
bl sub_802E33C
bl PlayerBufferExecCompleted
_08030B1E:
pop {r0}
bx r0
@@ -4946,7 +4946,7 @@ CompleteOnFinishedBattleAnimation: @ 8030B2C
ands r0, r1
cmp r0, 0
bne _08030B4E
bl sub_802E33C
bl PlayerBufferExecCompleted
_08030B4E:
pop {r0}
bx r0
@@ -5033,7 +5033,7 @@ _08030BEA:
movs r0, 0x1
mov r2, sp
bl EmitDataTransfer
bl sub_802E33C
bl PlayerBufferExecCompleted
add sp, 0x100
pop {r4-r6}
pop {r0}
@@ -6030,7 +6030,7 @@ _08031406:
movs r0, 0x1
adds r2, r4, 0
bl EmitDataTransfer
bl sub_802E33C
bl PlayerBufferExecCompleted
add sp, 0x58
pop {r4-r7}
pop {r0}
@@ -6082,7 +6082,7 @@ _0803147A:
cmp r5, 0x5
bls _0803146C
_08031486:
bl sub_802E33C
bl PlayerBufferExecCompleted
pop {r4,r5}
pop {r0}
bx r0
@@ -7273,7 +7273,7 @@ _08031EC2:
cmp r3, r0
bcc _08031EC2
_08031EE4:
bl sub_802E33C
bl PlayerBufferExecCompleted
pop {r4-r7}
pop {r0}
bx r0
@@ -7317,7 +7317,7 @@ PlayerHandleLoadMonSprite: @ 8031F00
ldrb r0, [r4]
lsls r0, 2
adds r0, r1
ldr r1, _08031F64 @ =sub_802E404
ldr r1, _08031F64 @ =CompleteOnBankSpritePosX_0
str r1, [r0]
pop {r4}
pop {r0}
@@ -7329,7 +7329,7 @@ _08031F54: .4byte gUnknown_2024284
_08031F58: .4byte gUnknown_202063C
_08031F5C: .4byte gUnknown_2023D44
_08031F60: .4byte gUnknown_3004FE0
_08031F64: .4byte sub_802E404
_08031F64: .4byte CompleteOnBankSpritePosX_0
thumb_func_end PlayerHandleLoadMonSprite
thumb_func_start PlayerHandleSwitchInAnim
@@ -7617,7 +7617,7 @@ _080321A8:
adds r0, r1
ldrb r0, [r0]
bl SetHealthboxSpriteInvisible
bl sub_802E33C
bl PlayerBufferExecCompleted
_080321DE:
pop {r4-r6}
pop {r0}
@@ -8287,7 +8287,7 @@ PlayerHandlePaletteFade: @ 803273C
movs r2, 0
movs r3, 0x10
bl BeginNormalPaletteFade
bl sub_802E33C
bl PlayerBufferExecCompleted
add sp, 0x4
pop {r0}
bx r0
@@ -8396,7 +8396,7 @@ _08032824:
cmp r0, 0
bne _08032824
_0803282E:
bl sub_802E33C
bl PlayerBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
@@ -8515,7 +8515,7 @@ _08032852:
lsrs r3, r0, 24
cmp r3, 0
beq _08032948
bl sub_802E33C
bl PlayerBufferExecCompleted
b _08032966
.align 2, 0
_08032924: .4byte gUnknown_2023BC4
@@ -8733,7 +8733,7 @@ _08032AB0:
lsls r0, 2
adds r0, r2
strb r4, [r0, 0x4]
bl sub_802E33C
bl PlayerBufferExecCompleted
_08032AEC:
pop {r3-r5}
mov r8, r3
@@ -8810,7 +8810,7 @@ sub_8032B70: @ 8032B70
.align 2, 0
_08032B88: .4byte gUnknown_2023BC4
_08032B8C:
bl sub_802E33C
bl PlayerBufferExecCompleted
_08032B90:
pop {r0}
bx r0
@@ -8968,9 +8968,9 @@ sub_8032CB4: @ 8032CB4
ldrb r0, [r0]
movs r1, 0
bl sub_80309CC
bl sub_80308A8
bl sub_80308CC
bl sub_8030940
bl MoveSelectionDisplayPpString
bl MoveSelectionDisplayPpNumber
bl MoveSelectionDisplayMoveType
pop {r0}
bx r0
.align 2, 0
@@ -9142,7 +9142,7 @@ sub_8032E28: @ 8032E28
movs r2, 0
movs r3, 0x10
bl BeginNormalPaletteFade
bl sub_802E33C
bl PlayerBufferExecCompleted
add sp, 0x4
pop {r0}
bx r0
@@ -9283,7 +9283,7 @@ PlayerHandleExpUpdate: @ 8032F4C
bl GetMonData
cmp r0, 0x63
bls _08032F84
bl sub_802E33C
bl PlayerBufferExecCompleted
b _08032FD0
.align 2, 0
_08032F78: .4byte gUnknown_2022BC4
@@ -9480,7 +9480,7 @@ PlayerHandleStatusXor: @ 80330C8
movs r1, 0x37
mov r2, sp
bl sub_804037C
bl sub_802E33C
bl PlayerBufferExecCompleted
add sp, 0x4
pop {r3}
mov r8, r3
@@ -9497,7 +9497,7 @@ _08033130: .4byte gUnknown_2022BC4
thumb_func_start sub_8033134
sub_8033134: @ 8033134
push {lr}
bl sub_802E33C
bl PlayerBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_8033134
@@ -9581,7 +9581,7 @@ _080331B0:
str r0, [r3, 0x8]
ldr r0, [r3, 0x8]
_080331DC:
bl sub_802E33C
bl PlayerBufferExecCompleted
pop {r4,r5}
pop {r0}
bx r0
@@ -9607,7 +9607,7 @@ PlayerHandlePlayBGM: @ 80331F4
lsls r1, 8
orrs r0, r1
bl PlayBGM
bl sub_802E33C
bl PlayerBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
@@ -9618,7 +9618,7 @@ _08033220: .4byte gUnknown_2023BC4
thumb_func_start sub_8033224
sub_8033224: @ 8033224
push {lr}
bl sub_802E33C
bl PlayerBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_8033224
@@ -9630,7 +9630,7 @@ PlayerHandleTwoReturnValues: @ 8033230
movs r1, 0
movs r2, 0
bl EmitTwoReturnValues
bl sub_802E33C
bl PlayerBufferExecCompleted
pop {r0}
bx r0
thumb_func_end PlayerHandleTwoReturnValues
@@ -9642,7 +9642,7 @@ PlayerHandleChosenMonReturnValue: @ 8033244
movs r1, 0
movs r2, 0
bl EmitChosenMonReturnValue
bl sub_802E33C
bl PlayerBufferExecCompleted
pop {r0}
bx r0
thumb_func_end PlayerHandleChosenMonReturnValue
@@ -9653,7 +9653,7 @@ PlayerHandleOneReturnValue: @ 8033258
movs r0, 0x1
movs r1, 0
bl EmitOneReturnValue
bl sub_802E33C
bl PlayerBufferExecCompleted
pop {r0}
bx r0
thumb_func_end PlayerHandleOneReturnValue
@@ -9664,7 +9664,7 @@ PlayerHandleOneReturnValue_Duplicate: @ 803326C
movs r0, 0x1
movs r1, 0
bl EmitOneReturnValue_Duplicate
bl sub_802E33C
bl PlayerBufferExecCompleted
pop {r0}
bx r0
thumb_func_end PlayerHandleOneReturnValue_Duplicate
@@ -9678,7 +9678,7 @@ PlayerHandleCmd37: @ 8033280
negs r0, r0
ands r0, r1
strb r0, [r2]
bl sub_802E33C
bl PlayerBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
@@ -9704,7 +9704,7 @@ PlayerHandleCmd38: @ 803329C
ands r0, r2
orrs r0, r1
strb r0, [r3]
bl sub_802E33C
bl PlayerBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
@@ -9721,7 +9721,7 @@ PlayerHandleCmd39: @ 80332D4
movs r0, 0x7F
ands r0, r1
strb r0, [r2]
bl sub_802E33C
bl PlayerBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
@@ -9743,7 +9743,7 @@ PlayerHandleCmd40: @ 80332EC
ands r0, r2
orrs r0, r1
strb r0, [r3]
bl sub_802E33C
bl PlayerBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
@@ -9768,7 +9768,7 @@ PlayerHandleHitAnimation: @ 8033314
lsls r0, 29
cmp r0, 0
bge _08033348
bl sub_802E33C
bl PlayerBufferExecCompleted
b _08033372
.align 2, 0
_0803333C: .4byte gUnknown_202063C
@@ -9808,7 +9808,7 @@ _08033380: .4byte DoHitAnimBlinkSpriteEffect
thumb_func_start sub_8033384
sub_8033384: @ 8033384
push {lr}
bl sub_802E33C
bl PlayerBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_8033384
@@ -9839,7 +9839,7 @@ _080333A4:
lsls r1, r3, 24
asrs r1, 24
bl PlaySE12WithPanning
bl sub_802E33C
bl PlayerBufferExecCompleted
pop {r4}
pop {r0}
bx r0
@@ -9864,7 +9864,7 @@ sub_80333D4: @ 80333D4
lsls r1, 8
orrs r0, r1
bl PlayFanfare
bl sub_802E33C
bl PlayerBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
@@ -9893,7 +9893,7 @@ PlayerHandleFaintingCry: @ 8033404
negs r1, r1
movs r2, 0x5
bl PlayCry3
bl sub_802E33C
bl PlayerBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
@@ -9918,7 +9918,7 @@ PlayerHandleIntroSlide: @ 8033444
movs r1, 0x1
orrs r0, r1
strh r0, [r2]
bl sub_802E33C
bl PlayerBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
@@ -10294,7 +10294,7 @@ PlayerHandleDrawPartyStatusSummary: @ 803376C
lsls r0, 24
cmp r0, 0
bne _0803379C
bl sub_802E33C
bl PlayerBufferExecCompleted
b _08033810
.align 2, 0
_08033794: .4byte gUnknown_2022BC4
@@ -10399,7 +10399,7 @@ sub_8033830: @ 8033830
adds r0, r2
movs r1, 0
strb r1, [r0, 0x5]
bl sub_802E33C
bl PlayerBufferExecCompleted
_08033868:
pop {r4}
pop {r0}
@@ -10437,7 +10437,7 @@ PlayerHandleCmd49: @ 8033878
ldr r1, _080338C4 @ =sub_80491B0
str r1, [r0]
_080338AA:
bl sub_802E33C
bl PlayerBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
@@ -10458,7 +10458,7 @@ sub_80338C8: @ 80338C8
ldrb r0, [r4]
movs r1, 0
bl dp11b_obj_free
bl sub_802E33C
bl PlayerBufferExecCompleted
pop {r4}
pop {r0}
bx r0
@@ -10502,7 +10502,7 @@ PlayerHandleSpriteInvisibility: @ 80338EC
ldrb r0, [r4]
bl CopyBattleSpriteInvisibility
_08033932:
bl sub_802E33C
bl PlayerBufferExecCompleted
pop {r4}
pop {r0}
bx r0
@@ -10544,7 +10544,7 @@ sub_803394C: @ 803394C
lsls r0, 24
cmp r0, 0
beq _08033998
bl sub_802E33C
bl PlayerBufferExecCompleted
b _080339A4
.align 2, 0
_08033990: .4byte gUnknown_2023BC4
@@ -10606,7 +10606,7 @@ _080339FC: .4byte gUnknown_2023BC4
_08033A00:
bl PrintLinkStandbyMsg
_08033A04:
bl sub_802E33C
bl PlayerBufferExecCompleted
pop {r4}
pop {r0}
bx r0
@@ -10660,7 +10660,7 @@ _08033A62:
movs r1, 0
strb r1, [r0]
_08033A68:
bl sub_802E33C
bl PlayerBufferExecCompleted
pop {r4}
pop {r0}
bx r0
@@ -10684,7 +10684,7 @@ sub_8033A78: @ 8033A78
bl FadeOutMapMusic
movs r0, 0x3
bl BeginFastPaletteFade
bl sub_802E33C
bl PlayerBufferExecCompleted
ldr r1, _08033ABC @ =gUnknown_3004FE0
ldrb r0, [r4]
lsls r0, 2
asm/battle_controller_pokedude.s
+3 -3
View File
@@ -568,7 +568,7 @@ sub_81564F0: @ 81564F0
adds r0, r1
ldrb r0, [r0]
bl DestroyTask
bl sub_8003ECC
bl FreeAllWindowBuffers
bl sub_8127968
_08156520:
pop {r0}
@@ -641,7 +641,7 @@ sub_8156594: @ 8156594
ldr r1, _081565D4 @ =sub_81565E8
str r1, [r0]
bl nullsub_44
bl sub_8003ECC
bl FreeAllWindowBuffers
ldr r0, _081565D8 @ =gUnknown_20370C0
ldrh r0, [r0]
cmp r0, 0x1
@@ -1992,7 +1992,7 @@ sub_8157084: @ 8157084
movs r0, 0x2
movs r1, 0x4
mov r2, sp
bl sub_800D9EC
bl PrepareBufferDataTransferLink
ldr r1, _081570D4 @ =gUnknown_2022BC4
ldrb r0, [r4]
lsls r0, 9
asm/battle_controller_safari.s
+1 -1
View File
@@ -495,7 +495,7 @@ SafariBufferExecCompleted: @ 80DD8C8
movs r0, 0x2
movs r1, 0x4
mov r2, sp
bl sub_800D9EC
bl PrepareBufferDataTransferLink
ldr r1, _080DD918 @ =gUnknown_2022BC4
ldrb r0, [r4]
lsls r0, 9
asm/battle_controllers.s
+67 -67
View File
@@ -29,7 +29,7 @@ _0800D256:
ldr r0, _0800D274 @ =sub_8081A90
movs r1, 0
bl CreateTask
bl sub_800D93C
bl CreateTasksForSendRecvLinkBuffers
_0800D262:
pop {r0}
bx r0
@@ -818,8 +818,8 @@ _0800D89C:
_0800D8AC: .4byte gUnknown_2023BCC
thumb_func_end sub_800D768
thumb_func_start sub_800D8B0
sub_800D8B0: @ 800D8B0
thumb_func_start PrepareBufferDataTransfer
PrepareBufferDataTransfer: @ 800D8B0
push {r4-r6,lr}
adds r4, r1, 0
lsls r0, 24
@@ -836,7 +836,7 @@ sub_800D8B0: @ 800D8B0
adds r0, r3, 0
adds r1, r2, 0
adds r2, r4, 0
bl sub_800D9EC
bl PrepareBufferDataTransferLink
b _0800D92E
.align 2, 0
_0800D8D8: .4byte gUnknown_2022B4C
@@ -891,10 +891,10 @@ _0800D92E:
.align 2, 0
_0800D934: .4byte gUnknown_20233C4
_0800D938: .4byte gUnknown_2023BC4
thumb_func_end sub_800D8B0
thumb_func_end PrepareBufferDataTransfer
thumb_func_start sub_800D93C
sub_800D93C: @ 800D93C
thumb_func_start CreateTasksForSendRecvLinkBuffers
CreateTasksForSendRecvLinkBuffers: @ 800D93C
push {r4-r6,lr}
ldr r0, _0800D9D4 @ =sub_800DB6C
movs r1, 0
@@ -975,10 +975,10 @@ _0800D9DC: .4byte gUnknown_3005090
_0800D9E0: .4byte Task_HandleCopyReceivedLinkBuffersData
_0800D9E4: .4byte gUnknown_202286D
_0800D9E8: .4byte gUnknown_202286E
thumb_func_end sub_800D93C
thumb_func_end CreateTasksForSendRecvLinkBuffers
thumb_func_start sub_800D9EC
sub_800D9EC: @ 800D9EC
thumb_func_start PrepareBufferDataTransferLink
PrepareBufferDataTransferLink: @ 800D9EC
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -1167,7 +1167,7 @@ _0800DB5C: .4byte gUnknown_2023D6B
_0800DB60: .4byte gUnknown_2023D6C
_0800DB64: .4byte gUnknown_2023D70
_0800DB68: .4byte gUnknown_2023D6E
thumb_func_end sub_800D9EC
thumb_func_end PrepareBufferDataTransferLink
thumb_func_start sub_800DB6C
sub_800DB6C: @ 800DB6C
@@ -1722,7 +1722,7 @@ EmitGetMonData: @ 800DFA4
strb r2, [r1, 0x2]
strb r3, [r1, 0x3]
movs r2, 0x4
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r4}
pop {r0}
bx r0
@@ -1744,7 +1744,7 @@ EmitGetRawMonData: @ 800DFC8
strb r2, [r1, 0x2]
strb r4, [r1, 0x3]
movs r2, 0x4
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r4,r5}
pop {r0}
bx r0
@@ -1781,7 +1781,7 @@ _0800E010:
_0800E01E:
adds r2, r5, 0x3
adds r0, r6, 0
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r4-r6}
pop {r0}
bx r0
@@ -1818,7 +1818,7 @@ _0800E05C:
adds r2, r4, 0x3
adds r0, r6, 0
adds r1, r5, 0
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r4-r6}
pop {r0}
bx r0
@@ -1837,7 +1837,7 @@ EmitLoadMonSprite: @ 800E070
strb r2, [r1, 0x1]
strb r2, [r1, 0x2]
strb r2, [r1, 0x3]
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -1857,7 +1857,7 @@ EmitSwitchInAnim: @ 800E090
strb r2, [r1, 0x2]
strb r3, [r1, 0x3]
movs r2, 0x4
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r4}
pop {r0}
bx r0
@@ -1876,7 +1876,7 @@ EmitReturnMonToBall: @ 800E0B4
strb r2, [r1]
strb r3, [r1, 0x1]
movs r2, 0x2
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -1895,7 +1895,7 @@ EmitDrawTrainerPic: @ 800E0D4
strb r2, [r1, 0x2]
strb r2, [r1, 0x3]
movs r2, 0x4
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -1914,7 +1914,7 @@ EmitTrainerSlide: @ 800E0F4
strb r2, [r1, 0x2]
strb r2, [r1, 0x3]
movs r2, 0x4
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -1933,7 +1933,7 @@ EmitTrainerSlideBack: @ 800E114
strb r2, [r1, 0x2]
strb r2, [r1, 0x3]
movs r2, 0x4
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -1952,7 +1952,7 @@ EmitFaintAnimation: @ 800E134
strb r2, [r1, 0x2]
strb r2, [r1, 0x3]
movs r2, 0x4
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -1971,7 +1971,7 @@ EmitPaletteFade: @ 800E154
strb r2, [r1, 0x2]
strb r2, [r1, 0x3]
movs r2, 0x4
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -1990,7 +1990,7 @@ EmitSuccessBallThrowAnim: @ 800E174
strb r2, [r1, 0x2]
strb r2, [r1, 0x3]
movs r2, 0x4
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -2008,7 +2008,7 @@ EmitBallThrowAnim: @ 800E194
strb r2, [r1]
strb r3, [r1, 0x1]
movs r2, 0x2
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -2047,7 +2047,7 @@ _0800E1E2:
adds r2, 0x2
adds r0, r6, 0
adds r1, r5, 0
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r4-r6}
pop {r0}
bx r0
@@ -2150,7 +2150,7 @@ _0800E2A6:
mov r0, r8
adds r1, r4, 0
movs r2, 0x2C
bl sub_800D8B0
bl PrepareBufferDataTransfer
add sp, 0x4
pop {r3}
mov r8, r3
@@ -2267,7 +2267,7 @@ _0800E378:
mov r0, r10
mov r1, r9
movs r2, 0x44
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r3-r5}
mov r8, r3
mov r9, r4
@@ -2380,7 +2380,7 @@ _0800E46C:
mov r0, r10
mov r1, r9
movs r2, 0x44
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r3-r5}
mov r8, r3
mov r9, r4
@@ -2418,7 +2418,7 @@ EmitChooseAction: @ 800E4D4
lsrs r2, 8
strb r2, [r1, 0x3]
movs r2, 0x4
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r4}
pop {r0}
bx r0
@@ -2437,7 +2437,7 @@ sub_800E500: @ 800E500
strb r2, [r1]
strb r3, [r1, 0x1]
movs r2, 0x2
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -2470,7 +2470,7 @@ _0800E53C:
bls _0800E53C
adds r0, r6, 0
movs r2, 0x18
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r4-r6}
pop {r0}
bx r0
@@ -2499,7 +2499,7 @@ _0800E56E:
ble _0800E56E
adds r0, r5, 0
movs r2, 0x4
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r4,r5}
pop {r0}
bx r0
@@ -2532,7 +2532,7 @@ _0800E5AA:
ble _0800E5AA
adds r0, r5, 0
movs r2, 0x8
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r4-r6}
pop {r0}
bx r0
@@ -2552,7 +2552,7 @@ EmitCmd23: @ 800E5CC
strb r2, [r1, 0x2]
strb r2, [r1, 0x3]
movs r2, 0x4
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -2581,7 +2581,7 @@ EmitHealthBarUpdate: @ 800E5EC
strb r1, [r3, 0x3]
adds r1, r3, 0
movs r2, 0x4
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r4}
pop {r0}
bx r0
@@ -2610,7 +2610,7 @@ EmitExpUpdate: @ 800E624
asrs r2, 8
strb r2, [r1, 0x3]
movs r2, 0x4
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r4}
pop {r0}
bx r0
@@ -2654,7 +2654,7 @@ EmitStatusIconUpdate: @ 800E658
lsrs r2, 24
strb r2, [r1, 0x8]
movs r2, 0x9
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r4-r6}
pop {r0}
bx r0
@@ -2686,7 +2686,7 @@ EmitStatusAnimation: @ 800E6AC
lsrs r2, 24
strb r2, [r1, 0x5]
movs r2, 0x6
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r4}
pop {r0}
bx r0
@@ -2705,7 +2705,7 @@ EmitStatusXor: @ 800E6E8
strb r2, [r1]
strb r3, [r1, 0x1]
movs r2, 0x2
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -2745,7 +2745,7 @@ _0800E738:
lsrs r2, 16
adds r0, r6, 0
adds r1, r5, 0
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r4-r6}
pop {r0}
bx r0
@@ -2801,7 +2801,7 @@ _0800E7A0:
lsls r2, 16
lsrs r2, 16
adds r0, r6, 0
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r4-r6}
pop {r0}
bx r0
@@ -2841,7 +2841,7 @@ _0800E7E6:
lsrs r2, 16
adds r0, r6, 0
adds r1, r5, 0
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r4-r6}
pop {r0}
bx r0
@@ -2881,7 +2881,7 @@ _0800E82E:
lsrs r2, 16
adds r0, r6, 0
adds r1, r5, 0
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r4-r6}
pop {r0}
bx r0
@@ -2905,7 +2905,7 @@ EmitTwoReturnValues: @ 800E848
lsrs r2, 8
strb r2, [r1, 0x3]
movs r2, 0x4
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r4}
pop {r0}
bx r0
@@ -2936,7 +2936,7 @@ _0800E888:
adds r0, r5, 0
adds r1, r2, 0
movs r2, 0x5
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r4,r5}
pop {r0}
bx r0
@@ -2961,7 +2961,7 @@ EmitOneReturnValue: @ 800E8AC
strb r4, [r3, 0x3]
adds r1, r3, 0
movs r2, 0x4
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r4}
pop {r0}
bx r0
@@ -2986,7 +2986,7 @@ EmitOneReturnValue_Duplicate: @ 800E8D8
strb r4, [r3, 0x3]
adds r1, r3, 0
movs r2, 0x4
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r4}
pop {r0}
bx r0
@@ -3006,7 +3006,7 @@ EmitCmd37: @ 800E904
strb r2, [r1, 0x2]
strb r2, [r1, 0x3]
movs r2, 0x4
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -3024,7 +3024,7 @@ EmitCmd38: @ 800E924
strb r2, [r1]
strb r3, [r1, 0x1]
movs r2, 0x2
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -3043,7 +3043,7 @@ EmitCmd39: @ 800E944
strb r2, [r1, 0x2]
strb r2, [r1, 0x3]
movs r2, 0x4
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -3062,7 +3062,7 @@ EmitCmd40: @ 800E964
strb r2, [r1, 0x2]
strb r2, [r1, 0x3]
movs r2, 0x4
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -3081,7 +3081,7 @@ EmitHitAnimation: @ 800E984
strb r2, [r1, 0x2]
strb r2, [r1, 0x3]
movs r2, 0x4
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -3100,7 +3100,7 @@ EmitCmd42: @ 800E9A4
strb r2, [r1, 0x2]
strb r2, [r1, 0x3]
movs r2, 0x4
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -3124,7 +3124,7 @@ EmitPlaySE: @ 800E9C4
strb r4, [r3, 0x3]
adds r1, r3, 0
movs r2, 0x4
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r4}
pop {r0}
bx r0
@@ -3149,7 +3149,7 @@ sub_800E9F0: @ 800E9F0
strb r4, [r3, 0x3]
adds r1, r3, 0
movs r2, 0x4
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r4}
pop {r0}
bx r0
@@ -3169,7 +3169,7 @@ EmitFaintingCry: @ 800EA1C
strb r2, [r1, 0x2]
strb r2, [r1, 0x3]
movs r2, 0x4
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -3187,7 +3187,7 @@ EmitIntroSlide: @ 800EA3C
strb r2, [r1]
strb r3, [r1, 0x1]
movs r2, 0x2
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -3206,7 +3206,7 @@ EmitIntroTrainerBallThrow: @ 800EA5C
strb r2, [r1, 0x2]
strb r2, [r1, 0x3]
movs r2, 0x4
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -3245,7 +3245,7 @@ _0800EAA4:
ble _0800EAA4
adds r0, r5, 0
movs r2, 0x34
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r4,r5}
pop {r0}
bx r0
@@ -3265,7 +3265,7 @@ EmitCmd49: @ 800EAC4
strb r2, [r1, 0x2]
strb r2, [r1, 0x3]
movs r2, 0x4
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -3284,7 +3284,7 @@ EmitCmd50: @ 800EAE4
strb r2, [r1, 0x2]
strb r2, [r1, 0x3]
movs r2, 0x4
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -3304,7 +3304,7 @@ EmitSpriteInvisibility: @ 800EB04
strb r2, [r1, 0x2]
strb r2, [r1, 0x3]
movs r2, 0x4
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -3327,7 +3327,7 @@ EmitBattleAnimation: @ 800EB28
lsrs r2, 8
strb r2, [r1, 0x3]
movs r2, 0x4
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r4}
pop {r0}
bx r0
@@ -3346,7 +3346,7 @@ sub_800EB54: @ 800EB54
strb r2, [r1]
strb r3, [r1, 0x1]
movs r2, 0x2
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -3364,7 +3364,7 @@ sub_800EB74: @ 800EB74
strb r2, [r1]
strb r3, [r1, 0x1]
movs r2, 0x2
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -3382,7 +3382,7 @@ sub_800EB94: @ 800EB94
strb r2, [r1]
strb r3, [r1, 0x1]
movs r2, 0x2
bl sub_800D8B0
bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
asm/battle_dome_cards.s
+3 -3
View File
@@ -92,7 +92,7 @@ _0810BC14:
adds r1, r5, 0
adds r2, r4, 0
adds r3, r6, 0
bl sub_800F134
bl LoadSpecialPokePic_DontHandleDeoxys
b _0810BC4E
.align 2, 0
_0810BC24: .4byte gUnknown_823654C
@@ -104,7 +104,7 @@ _0810BC28:
adds r0, r1
adds r1, r5, 0
adds r2, r4, 0
bl sub_800EC8C
bl DecompressPicFromTable
b _0810BC4E
.align 2, 0
_0810BC3C: .4byte gUnknown_823957C
@@ -114,7 +114,7 @@ _0810BC40:
adds r0, r1
adds r1, r5, 0
adds r2, r7, 0
bl sub_800EC8C
bl DecompressPicFromTable
_0810BC4E:
movs r0, 0
add sp, 0x4
asm/battle_gfx_sfx_util.s
+6 -6
View File
@@ -767,7 +767,7 @@ _0803436C:
adds r0, r2, 0
adds r2, r5, 0
adds r3, r6, 0
bl sub_800F108
bl HandleLoadSpecialPokePic_DontHandleDeoxys
mov r3, r8
lsls r2, r3, 4
movs r0, 0x80
@@ -956,7 +956,7 @@ _0803451C:
ldr r1, [r1]
adds r2, r5, 0
adds r3, r4, 0
bl sub_800F108
bl HandleLoadSpecialPokePic_DontHandleDeoxys
b _08034562
.align 2, 0
_08034538: .4byte gUnknown_2024008
@@ -1160,7 +1160,7 @@ sub_80346C4: @ 80346C4
ldr r1, [r0]
adds r0, r6, 0
movs r2, 0
bl sub_800EC8C
bl DecompressPicFromTable
mov r1, r8
ldr r0, [r1]
adds r0, 0x4
@@ -1863,7 +1863,7 @@ _08034C16:
ldr r1, [r1]
mov r2, r8
ldr r3, [sp, 0x4]
bl sub_800F108
bl HandleLoadSpecialPokePic_DontHandleDeoxys
ldr r0, [r4]
adds r0, 0x4
adds r0, r5
@@ -2137,7 +2137,7 @@ _08034E90:
adds r2, r4, r2
ldr r3, [r2]
mov r2, r8
bl sub_800F108
bl HandleLoadSpecialPokePic_DontHandleDeoxys
b _08034F5E
.align 2, 0
_08034EFC: .4byte gUnknown_2023BCE
@@ -2181,7 +2181,7 @@ _08034F10:
adds r2, r4, r2
ldr r3, [r2]
mov r2, r8
bl sub_800F108
bl HandleLoadSpecialPokePic_DontHandleDeoxys
_08034F5E:
str r4, [sp, 0x14]
ldr r0, _08035080 @ =gUnknown_202401C
asm/battle_interface.s
+20 -20
View File
@@ -2108,7 +2108,7 @@ _08048B98: .4byte 0x05000040
_08048B9C: .4byte gUnknown_2024284
_08048BA0:
ldrb r0, [r6]
bl sub_8049934
bl UpdateStatusIconInHealthbox
ldrb r0, [r6]
mov r2, r8
ldrh r1, [r2]
@@ -2218,7 +2218,7 @@ _08048C8C: .4byte 0x05000040
_08048C90: .4byte gUnknown_202402C
_08048C94:
ldrb r0, [r6]
bl sub_8049934
bl UpdateStatusIconInHealthbox
ldrb r0, [r6]
mov r2, r8
ldrh r1, [r2]
@@ -3838,8 +3838,8 @@ _0804992C: .4byte 0x06010000
_08049930: .4byte 0x05000008
thumb_func_end sub_804981C
thumb_func_start sub_8049934
sub_8049934: @ 8049934
thumb_func_start UpdateStatusIconInHealthbox
UpdateStatusIconInHealthbox: @ 8049934
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -3911,7 +3911,7 @@ _080499C0:
beq _080499E8
movs r0, 0x1B
adds r1, r7, 0
bl sub_8049BE4
bl GetStatusIconForBankId
lsls r0, 24
lsrs r0, 24
bl GetHealthboxElementGfxPtr
@@ -3928,7 +3928,7 @@ _080499E8:
beq _08049A06
movs r0, 0x15
adds r1, r7, 0
bl sub_8049BE4
bl GetStatusIconForBankId
lsls r0, 24
lsrs r0, 24
bl GetHealthboxElementGfxPtr
@@ -3942,7 +3942,7 @@ _08049A06:
beq _08049A24
movs r0, 0x21
adds r1, r7, 0
bl sub_8049BE4
bl GetStatusIconForBankId
lsls r0, 24
lsrs r0, 24
bl GetHealthboxElementGfxPtr
@@ -3956,7 +3956,7 @@ _08049A24:
beq _08049A42
movs r0, 0x1E
adds r1, r7, 0
bl sub_8049BE4
bl GetStatusIconForBankId
lsls r0, 24
lsrs r0, 24
bl GetHealthboxElementGfxPtr
@@ -3970,7 +3970,7 @@ _08049A42:
beq _08049A60
movs r0, 0x18
adds r1, r7, 0
bl sub_8049BE4
bl GetStatusIconForBankId
lsls r0, 24
lsrs r0, 24
bl GetHealthboxElementGfxPtr
@@ -4151,10 +4151,10 @@ _08049BD4: .4byte 0x06010000
_08049BD8: .4byte 0x04000018
_08049BDC: .4byte gUnknown_2024018
_08049BE0: .4byte 0x04000008
thumb_func_end sub_8049934
thumb_func_end UpdateStatusIconInHealthbox
thumb_func_start sub_8049BE4
sub_8049BE4: @ 8049BE4
thumb_func_start GetStatusIconForBankId
GetStatusIconForBankId: @ 8049BE4
push {lr}
lsls r0, 24
lsls r1, 24
@@ -4249,10 +4249,10 @@ _08049CA4:
adds r0, r2, 0
pop {r1}
bx r1
thumb_func_end sub_8049BE4
thumb_func_end GetStatusIconForBankId
thumb_func_start sub_8049CAC
sub_8049CAC: @ 8049CAC
thumb_func_start UpdateSafariBallsTextOnHealthbox
UpdateSafariBallsTextOnHealthbox: @ 8049CAC
push {r4,r5,lr}
sub sp, 0x4
adds r4, r0, 0
@@ -4295,7 +4295,7 @@ _08049D00: .4byte gUnknown_83FE80C
_08049D04: .4byte gUnknown_202063C
_08049D08: .4byte 0x06010040
_08049D0C: .4byte 0x06010800
thumb_func_end sub_8049CAC
thumb_func_end UpdateSafariBallsTextOnHealthbox
thumb_func_start UpdateLeftNoOfBallsTextOnHealthbox
UpdateLeftNoOfBallsTextOnHealthbox: @ 8049D10
@@ -4547,12 +4547,12 @@ _08049F16:
bne _08049F24
_08049F1E:
adds r0, r6, 0
bl sub_8049934
bl UpdateStatusIconInHealthbox
_08049F24:
cmp r7, 0xA
bne _08049F2E
adds r0, r6, 0
bl sub_8049CAC
bl UpdateSafariBallsTextOnHealthbox
_08049F2E:
adds r0, r7, 0
subs r0, 0xA
@@ -4624,7 +4624,7 @@ _08049FB8:
bne _08049FC6
_08049FC0:
adds r0, r6, 0
bl sub_8049934
bl UpdateStatusIconInHealthbox
_08049FC6:
add sp, 0x4
pop {r3-r5}
@@ -5582,7 +5582,7 @@ sub_804A6D8: @ 804A6D8
push {lr}
lsls r0, 24
lsrs r0, 24
bl sub_8003E3C
bl RemoveWindow
pop {r0}
bx r0
thumb_func_end sub_804A6D8
asm/battle_message.s
+8 -8
View File
@@ -899,7 +899,7 @@ _080D79C2:
adds r0, r1, 0
_080D79C4:
adds r1, r4, 0
bl sub_80D8418
bl ExpandBattleTextBuffPlaceholders
bl _080D8382
.align 2, 0
_080D79D0: .4byte gUnknown_2022AD8
@@ -1710,7 +1710,7 @@ _080D806E:
ands r1, r0
cmp r1, 0
beq _080D8084
bl sub_80E7440
bl GetEreaderTrainerClassId
lsls r0, 24
lsrs r0, 24
movs r1, 0xD
@@ -2033,7 +2033,7 @@ _080D82F0: .4byte gUnknown_2023FE8
_080D82F4: .4byte gUnknown_2024284
_080D82F8:
ldr r0, _080D830C @ =0x00000834
bl sub_806E6D0
bl FlagGet
lsls r0, 24
ldr r4, _080D8310 @ =gUnknown_83FD81A
cmp r0, 0
@@ -2179,8 +2179,8 @@ _080D83FA:
bx r1
thumb_func_end sub_80D7868
thumb_func_start sub_80D8418
sub_80D8418: @ 80D8418
thumb_func_start ExpandBattleTextBuffPlaceholders
ExpandBattleTextBuffPlaceholders: @ 80D8418
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -2516,7 +2516,7 @@ _080D86BA:
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_80D8418
thumb_func_end ExpandBattleTextBuffPlaceholders
thumb_func_start sub_80D86C8
sub_80D86C8: @ 80D86C8
@@ -2889,7 +2889,7 @@ _080D8982:
mov r0, sp
adds r1, r3, 0
movs r2, 0
bl sub_8002CF4
bl AddTextPrinter
movs r0, 0x80
mov r1, r8
ands r1, r0
@@ -2899,7 +2899,7 @@ _080D8982:
bl PutWindowTilemap
adds r0, r7, 0
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
_080D89A4:
add sp, 0x10
pop {r3}
asm/battle_records.s
+8 -8
View File
@@ -102,7 +102,7 @@ _080CD2E2:
_080CD302:
ldr r0, _080CD310 @ =gUnknown_83F6C68
bl sub_8003B24
bl sub_8002C28
bl DeactivateAllTextPrinters
b _080CD324
.align 2, 0
_080CD310: .4byte gUnknown_83F6C68
@@ -294,7 +294,7 @@ sub_80CD460: @ 80CD460
bl Free
movs r0, 0
bl sub_80CD4A4
bl sub_8003ECC
bl FreeAllWindowBuffers
adds r0, r4, 0
bl DestroyTask
_080CD490:
@@ -320,9 +320,9 @@ sub_80CD4A4: @ 80CD4A4
bl ClearWindowTilemap
adds r0, r4, 0
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
adds r0, r4, 0
bl sub_8003E3C
bl RemoveWindow
pop {r4}
pop {r0}
bx r0
@@ -856,8 +856,8 @@ _080CD8BE:
bx r0
thumb_func_end sub_80CD854
thumb_func_start sub_80CD8DC
sub_80CD8DC: @ 80CD8DC
thumb_func_start InitLinkBattleRecords
InitLinkBattleRecords: @ 80CD8DC
push {lr}
ldr r0, _080CD8F0 @ =gUnknown_300500C
ldr r0, [r0]
@@ -869,7 +869,7 @@ sub_80CD8DC: @ 80CD8DC
.align 2, 0
_080CD8F0: .4byte gUnknown_300500C
_080CD8F4: .4byte 0x00000a98
thumb_func_end sub_80CD8DC
thumb_func_end InitLinkBattleRecords
thumb_func_start sub_80CD8F8
sub_80CD8F8: @ 80CD8F8
@@ -1355,7 +1355,7 @@ sub_80CDCB4: @ 80CDCB4
bl PutWindowTilemap
adds r0, r4, 0
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
pop {r4}
pop {r0}
bx r0
asm/battle_script_commands.s
+24 -24
View File
@@ -13119,7 +13119,7 @@ _08023F84:
ldrh r0, [r1]
ldrb r1, [r1, 0x17]
lsrs r1, 7
bl sub_8040D38
bl GetAbilityBySpecies
ldrb r1, [r7]
muls r1, r6
adds r1, r4
@@ -15662,7 +15662,7 @@ _080254A8:
beq _080254B6
b _080256D0
_080254B6:
bl sub_8003ECC
bl FreeAllWindowBuffers
ldr r0, _080254E8 @ =gUnknown_2024284
ldr r1, _080254EC @ =gUnknown_2023FE8
ldr r1, [r1]
@@ -17430,7 +17430,7 @@ _08026304:
bl PutWindowTilemap
movs r0, 0xC
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
b _0802636E
_08026318:
bl IsDma3ManagerBusyWithBgCopy
@@ -17453,7 +17453,7 @@ _08026330:
bl sub_8026448
movs r0, 0xC
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
b _0802636E
.align 2, 0
_0802634C: .4byte gUnknown_30030F0
@@ -17489,12 +17489,12 @@ _08026380:
bl ClearWindowTilemap
movs r0, 0xD
movs r1, 0x1
bl sub_8003F20
bl CopyWindowToVram
movs r0, 0xC
bl ClearWindowTilemap
movs r0, 0xC
movs r1, 0x1
bl sub_8003F20
bl CopyWindowToVram
movs r0, 0x2
movs r1, 0x7
movs r2, 0x2
@@ -17622,7 +17622,7 @@ sub_8026480: @ 8026480
bl PutWindowTilemap
movs r0, 0xD
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
bl PutMonIconOnLvlUpBox
pop {r0}
bx r0
@@ -17746,7 +17746,7 @@ PutLevelAndGenderOnLvlUpBox: @ 8026524
strb r5, [r0, 0xD]
movs r1, 0xFF
movs r2, 0
bl sub_8002CF4
bl AddTextPrinter
movs r0, 0xF9
strb r0, [r6]
adds r6, 0x1
@@ -17808,10 +17808,10 @@ _08026624:
strb r1, [r0, 0x9]
movs r1, 0xFF
movs r2, 0
bl sub_8002CF4
bl AddTextPrinter
movs r0, 0xD
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
add sp, 0x10
pop {r3}
mov r8, r3
@@ -18501,7 +18501,7 @@ _08026B9C:
ldr r0, _08026BAC @ =gUnknown_2023D4A
ldrh r0, [r0]
movs r1, 0
bl sub_801D05C
bl GetMoveTarget
ldr r1, _08026BB0 @ =gUnknown_2023D6C
strb r0, [r1]
b _08026F4E
@@ -18832,7 +18832,7 @@ _08026DF6:
beq _08026E4E
adds r0, r5, 0
adds r1, r6, 0
bl sub_8040D38
bl GetAbilityBySpecies
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2B
@@ -18907,7 +18907,7 @@ _08026E94:
beq _08026EEC
adds r0, r5, 0
adds r1, r6, 0
bl sub_8040D38
bl GetAbilityBySpecies
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2B
@@ -19577,7 +19577,7 @@ _080273FC:
_08027426:
ldrh r0, [r4]
movs r1, 0
bl sub_801D05C
bl GetMoveTarget
ldr r1, _0802745C @ =gUnknown_2023D6C
strb r0, [r1]
ldr r5, _08027460 @ =gUnknown_2023D74
@@ -24065,7 +24065,7 @@ _08029794:
str r0, [r1]
ldrh r0, [r4]
movs r1, 0
bl sub_801D05C
bl GetMoveTarget
ldr r1, _080297F8 @ =gUnknown_2023D6C
strb r0, [r1]
pop {r3}
@@ -25562,7 +25562,7 @@ _0802A334:
str r0, [r2]
ldrh r0, [r4]
movs r1, 0
bl sub_801D05C
bl GetMoveTarget
ldr r1, _0802A3C0 @ =gUnknown_2023D6C
strb r0, [r1]
ldr r3, _0802A3C4 @ =gUnknown_2023D74
@@ -26197,7 +26197,7 @@ _0802A88C: .4byte gUnknown_825E45C
_0802A890:
adds r0, r5, 0
adds r1, r4, 0
bl sub_8040D38
bl GetAbilityBySpecies
lsls r0, 24
lsrs r0, 24
_0802A89C:
@@ -28930,7 +28930,7 @@ atkCC_callterrainattack: @ 802BE18
strh r0, [r4]
ldrh r0, [r4]
movs r1, 0
bl sub_801D05C
bl GetMoveTarget
ldr r1, _0802BE7C @ =gUnknown_2023D6C
strb r0, [r1]
ldr r3, _0802BE80 @ =gUnknown_81D65A8
@@ -30510,7 +30510,7 @@ _0802CA3C:
strh r0, [r4]
ldrh r0, [r4]
movs r1, 0
bl sub_801D05C
bl GetMoveTarget
ldr r1, _0802CAAC @ =gUnknown_2023D6C
strb r0, [r1]
ldr r1, _0802CAB0 @ =gUnknown_2023D74
@@ -32221,7 +32221,7 @@ sub_802D800: @ 802D800
strb r1, [r0, 0x5]
ldr r4, _0802D880 @ =gUnknown_2021CD0
ldr r0, _0802D884 @ =0x00004037
bl sub_806E568
bl VarGet
lsls r0, 24
lsrs r0, 24
bl GetBoxNamePtr
@@ -32250,7 +32250,7 @@ _0802D888: .4byte gUnknown_2021CF0
_0802D88C:
ldr r4, _0802D92C @ =gUnknown_2021CD0
ldr r0, _0802D930 @ =0x00004037
bl sub_806E568
bl VarGet
lsls r0, 24
lsrs r0, 24
bl GetBoxNamePtr
@@ -32280,7 +32280,7 @@ _0802D88C:
strb r0, [r1, 0x5]
_0802D8D6:
ldr r0, _0802D940 @ =0x00000834
bl sub_806E6D0
bl FlagGet
lsls r0, 24
cmp r0, 0
beq _0802D8EA
@@ -32451,7 +32451,7 @@ _0802DA3C:
beq _0802DA4A
b _0802DB6C
_0802DA4A:
bl sub_8003ECC
bl FreeAllWindowBuffers
adds r0, r5, 0
bl sub_8106B60
ldr r1, _0802DA60 @ =gUnknown_2023E82
@@ -32976,7 +32976,7 @@ _0802DE4E:
adds r2, 0x6D
movs r1, 0x2
bl GetMonData
bl sub_8003ECC
bl FreeAllWindowBuffers
mov r2, r10
ldrb r0, [r2]
eors r0, r4
asm/battle_setup.s
+26 -26
View File
@@ -25,7 +25,7 @@ sub_807F620: @ 807F620
.align 2, 0
_0807F640: .4byte gUnknown_3005098
_0807F644:
bl sub_80A0E60
bl c3_80A0DD8_is_running
cmp r0, 0
bne _0807F686
bl sub_812B478
@@ -46,7 +46,7 @@ _0807F65E:
ldr r0, _0807F68C @ =sub_800FD9C
bl SetMainCallback2
bl sub_806D7E8
bl sub_806D788
bl overworld_poison_timer_set
adds r0, r5, 0
bl DestroyTask
_0807F686:
@@ -628,13 +628,13 @@ sub_807FB40: @ 807FB40
bl sub_80800D0
cmp r0, 0x1
bne _0807FB80
ldr r0, _0807FB7C @ =sub_80566A4
ldr r0, _0807FB7C @ =c2_whiteout
bl SetMainCallback2
b _0807FB8C
.align 2, 0
_0807FB74: .4byte 0x01000100
_0807FB78: .4byte gUnknown_2023E8A
_0807FB7C: .4byte sub_80566A4
_0807FB7C: .4byte c2_whiteout
_0807FB80:
ldr r0, _0807FB94 @ =c2_exit_to_overworld_2_switch
bl SetMainCallback2
@@ -671,13 +671,13 @@ sub_807FBA0: @ 807FBA0
bl sub_80800D0
cmp r0, 0x1
bne _0807FBE0
ldr r0, _0807FBDC @ =sub_80566A4
ldr r0, _0807FBDC @ =c2_whiteout
bl SetMainCallback2
b _0807FBE6
.align 2, 0
_0807FBD4: .4byte 0x01000100
_0807FBD8: .4byte gUnknown_2023E8A
_0807FBDC: .4byte sub_80566A4
_0807FBDC: .4byte c2_whiteout
_0807FBE0:
ldr r0, _0807FBEC @ =c2_exit_to_overworld_1_continue_scripts_restart_music
bl SetMainCallback2
@@ -710,13 +710,13 @@ sub_807FBF0: @ 807FBF0
adds r1, r0, 0
cmp r1, 0
beq _0807FC30
ldr r0, _0807FC2C @ =sub_80566A4
ldr r0, _0807FC2C @ =c2_whiteout
bl SetMainCallback2
b _0807FC4C
.align 2, 0
_0807FC24: .4byte 0x01000100
_0807FC28: .4byte gUnknown_2023E8A
_0807FC2C: .4byte sub_80566A4
_0807FC2C: .4byte c2_whiteout
_0807FC30:
ldrb r0, [r4]
cmp r0, 0x1
@@ -910,7 +910,7 @@ sub_807FD90: @ 807FD90
bl sub_8058F78
lsls r0, 16
lsrs r4, r0, 16
bl sub_8055D30
bl sav1_get_flash_used_on_map
lsls r0, 24
cmp r0, 0
beq _0807FDC0
@@ -997,8 +997,8 @@ _0807FE48:
_0807FE50: .4byte gUnknown_2024284
thumb_func_end sub_807FDF4
thumb_func_start sub_807FE54
sub_807FE54: @ 807FE54
thumb_func_start reads_trainer_data_byte0
reads_trainer_data_byte0: @ 807FE54
push {r4,r5,lr}
lsls r0, 16
lsrs r0, 16
@@ -1121,7 +1121,7 @@ _0807FF2C:
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end sub_807FE54
thumb_func_end reads_trainer_data_byte0
thumb_func_start sub_807FF34
sub_807FF34: @ 807FF34
@@ -1251,7 +1251,7 @@ _0808001A:
lsrs r6, r0, 24
ldrh r0, [r4]
adds r1, r5, 0
bl sub_807FE54
bl reads_trainer_data_byte0
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -1683,7 +1683,7 @@ sub_8080378: @ 8080378
lsls r1, 19
adds r0, r1
lsrs r0, 16
bl sub_806E6D0
bl FlagGet
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -1741,7 +1741,7 @@ sub_80803E4: @ 80803E4
bl sub_80800B8
lsls r0, 16
lsrs r0, 16
bl sub_806E6D0
bl FlagGet
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -1754,7 +1754,7 @@ sub_80803FC: @ 80803FC
bl sub_80800B8
lsls r0, 16
lsrs r0, 16
bl sub_806E680
bl FlagSet
pop {r0}
bx r0
thumb_func_end sub_80803FC
@@ -1765,7 +1765,7 @@ sub_8080410: @ 8080410
bl sub_80800B8
lsls r0, 16
lsrs r0, 16
bl sub_806E680
bl FlagSet
pop {r0}
bx r0
thumb_func_end sub_8080410
@@ -1778,7 +1778,7 @@ HasTrainerAlreadyBeenFought: @ 8080424
lsls r1, 19
adds r0, r1
lsrs r0, 16
bl sub_806E6D0
bl FlagGet
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -1793,7 +1793,7 @@ trainer_flag_set: @ 808043C
lsls r1, 19
adds r0, r1
lsrs r0, 16
bl sub_806E680
bl FlagSet
pop {r0}
bx r0
thumb_func_end trainer_flag_set
@@ -1806,7 +1806,7 @@ trainer_flag_clear: @ 8080450
lsls r1, 19
adds r0, r1
lsrs r0, 16
bl sub_806E6A8
bl FlagClear
pop {r0}
bx r0
thumb_func_end trainer_flag_clear
@@ -1906,12 +1906,12 @@ _08080524:
cmp r0, 0x1
bne _08080540
_08080530:
ldr r0, _0808053C @ =sub_80566A4
ldr r0, _0808053C @ =c2_whiteout
bl SetMainCallback2
b _0808054E
.align 2, 0
_08080538: .4byte gUnknown_2023E8A
_0808053C: .4byte sub_80566A4
_0808053C: .4byte c2_whiteout
_08080540:
ldr r0, _08080554 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
bl SetMainCallback2
@@ -1945,12 +1945,12 @@ _08080578:
bl sub_80800D0
cmp r0, 0x1
bne _08080594
ldr r0, _08080590 @ =sub_80566A4
ldr r0, _08080590 @ =c2_whiteout
bl SetMainCallback2
b _080805A6
.align 2, 0
_0808058C: .4byte gUnknown_2023E8A
_08080590: .4byte sub_80566A4
_08080590: .4byte c2_whiteout
_08080594:
ldr r0, _080805AC @ =c2_exit_to_overworld_1_continue_scripts_restart_music
bl SetMainCallback2
@@ -1987,7 +1987,7 @@ _080805D4: .4byte sub_8080558
sub_80805D8: @ 80805D8
push {lr}
bl sub_80806D8
bl sub_806943C
bl ShowFieldMessage
pop {r0}
bx r0
thumb_func_end sub_80805D8
@@ -2028,7 +2028,7 @@ _08080614: .4byte gUnknown_81C555B
sub_8080618: @ 8080618
push {lr}
bl sub_8080734
bl sub_806943C
bl ShowFieldMessage
pop {r0}
bx r0
thumb_func_end sub_8080618
asm/battle_tower.s
+15 -15
View File
@@ -46,7 +46,7 @@ _080E59B8:
movs r0, 0x80
lsls r0, 7
movs r1, 0x5
bl sub_806E584
bl VarSet
b _080E5A00
_080E59D0:
lsls r0, r5, 24
@@ -71,7 +71,7 @@ _080E59F0:
lsls r0, 7
movs r1, 0x4
_080E59F6:
bl sub_806E584
bl VarSet
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -90,7 +90,7 @@ _080E5A00:
movs r0, 0x80
lsls r0, 7
movs r1, 0x5
bl sub_806E584
bl VarSet
_080E5A20:
bl sub_80E7064
pop {r4,r5}
@@ -644,7 +644,7 @@ sub_80E5E5C: @ 80E5E5C
push {lr}
ldr r0, _080E5E6C @ =0x00004010
movs r1, 0x12
bl sub_806E584
bl VarSet
pop {r0}
bx r0
.align 2, 0
@@ -1872,7 +1872,7 @@ sub_80E678C: @ 80E678C
adds r1, r4, 0
movs r2, 0x2
movs r3, 0x3
bl sub_80BD89C
bl ConvertEasyChatWordsToString
ldrb r0, [r5]
movs r1, 0x1
cmp r0, 0xFE
@@ -1909,7 +1909,7 @@ _080E67E4:
adds r1, r4, 0
movs r2, 0x3
movs r3, 0x2
bl sub_80BD89C
bl ConvertEasyChatWordsToString
_080E67F0:
pop {r4,r5}
pop {r0}
@@ -2799,7 +2799,7 @@ _080E6F0E:
ldr r4, _080E6FA4 @ =gUnknown_300500C
ldr r1, [r4]
adds r1, 0xA
bl sub_805490C
bl CopyUnalignedWord
adds r0, r5, 0x4
ldr r1, [r4]
bl StringCopy7
@@ -2912,7 +2912,7 @@ _080E7016:
movs r0, 0x80
lsls r0, 7
movs r1, 0
bl sub_806E584
bl VarSet
ldr r1, [r4]
ldr r0, _080E7040 @ =0x0000055c
adds r1, r0
@@ -3369,7 +3369,7 @@ _080E7372:
adds r0, 0xC
ldr r1, [r5]
adds r1, 0xA
bl sub_805490C
bl CopyUnalignedWord
adds r0, r7, 0x4
ldr r1, [r5]
bl StringCopy7
@@ -3435,8 +3435,8 @@ _080E7418: .4byte 0x00002cac
_080E741C: .4byte gUnknown_2024284
thumb_func_end sub_80E7348
thumb_func_start sub_80E7420
sub_80E7420: @ 80E7420
thumb_func_start GetEreaderTrainerFrontSpriteId
GetEreaderTrainerFrontSpriteId: @ 80E7420
ldr r1, _080E7434 @ =gUnknown_82538A8
ldr r0, _080E7438 @ =gUnknown_300500C
ldr r0, [r0]
@@ -3450,10 +3450,10 @@ sub_80E7420: @ 80E7420
_080E7434: .4byte gUnknown_82538A8
_080E7438: .4byte gUnknown_300500C
_080E743C: .4byte 0x000004a1
thumb_func_end sub_80E7420
thumb_func_end GetEreaderTrainerFrontSpriteId
thumb_func_start sub_80E7440
sub_80E7440: @ 80E7440
thumb_func_start GetEreaderTrainerClassId
GetEreaderTrainerClassId: @ 80E7440
ldr r1, _080E7454 @ =gUnknown_825393E
ldr r0, _080E7458 @ =gUnknown_300500C
ldr r0, [r0]
@@ -3467,7 +3467,7 @@ sub_80E7440: @ 80E7440
_080E7454: .4byte gUnknown_825393E
_080E7458: .4byte gUnknown_300500C
_080E745C: .4byte 0x000004a1
thumb_func_end sub_80E7440
thumb_func_end GetEreaderTrainerClassId
thumb_func_start sub_80E7460
sub_80E7460: @ 80E7460
asm/battle_util.s
+28 -28
View File
@@ -1100,7 +1100,7 @@ _08017668:
ldr r5, _080176B4 @ =gUnknown_2023BC4
ldrb r0, [r5]
adds r1, r4, 0
bl sub_8017A64
bl GetImprisonedMovesCount
lsls r0, 24
cmp r0, 0
beq _0801768E
@@ -1410,7 +1410,7 @@ _080178EC:
ldrh r1, [r5]
adds r0, r7, 0
str r3, [sp, 0x14]
bl sub_8017A64
bl GetImprisonedMovesCount
lsls r0, 24
ldr r3, [sp, 0x14]
cmp r0, 0
@@ -1588,8 +1588,8 @@ _08017A5A:
_08017A60: .4byte gUnknown_2023E8C
thumb_func_end sub_8017998
thumb_func_start sub_8017A64
sub_8017A64: @ 8017A64
thumb_func_start GetImprisonedMovesCount
GetImprisonedMovesCount: @ 8017A64
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -1670,10 +1670,10 @@ _08017AE8:
_08017AF8: .4byte gUnknown_2023BCC
_08017AFC: .4byte gUnknown_2023BF0
_08017B00: .4byte gUnknown_2023DFC
thumb_func_end sub_8017A64
thumb_func_end GetImprisonedMovesCount
thumb_func_start sub_8017B04
sub_8017B04: @ 8017B04
thumb_func_start UpdateTurnCounters
UpdateTurnCounters: @ 8017B04
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -2578,10 +2578,10 @@ _08018232:
.align 2, 0
_08018250: .4byte gUnknown_3004F84
_08018254: .4byte sub_8013BD4
thumb_func_end sub_8017B04
thumb_func_end UpdateTurnCounters
thumb_func_start sub_8018258
sub_8018258: @ 8018258
thumb_func_start TurnBasedEffects
TurnBasedEffects: @ 8018258
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -3858,7 +3858,7 @@ _08018C88: .4byte gUnknown_2023FE8
_08018C8C: .4byte gUnknown_2023BCC
_08018C90: .4byte gUnknown_2023DD0
_08018C94: .4byte 0xfeffffdf
thumb_func_end sub_8018258
thumb_func_end TurnBasedEffects
thumb_func_start sub_8018C98
sub_8018C98: @ 8018C98
@@ -5219,7 +5219,7 @@ _080197B8:
ldrb r0, [r4]
ldr r1, _08019800 @ =gUnknown_2023D4A
ldrh r1, [r1]
bl sub_8017A64
bl GetImprisonedMovesCount
lsls r0, 24
cmp r0, 0
bne _080197CC
@@ -5595,7 +5595,7 @@ _08019AAC:
beq _08019AF6
movs r0, 0x75
movs r1, 0x1
bl sub_801D05C
bl GetMoveTarget
strb r0, [r4]
_08019AF6:
ldr r1, _08019B1C @ =gUnknown_2023D74
@@ -11930,8 +11930,8 @@ _0801CFDC: .4byte gUnknown_2023D74
_0801CFE0: .4byte gUnknown_81D9622
thumb_func_end sub_801BC68
thumb_func_start sub_801CFE4
sub_801CFE4: @ 801CFE4
thumb_func_start ClearFuryCutterDestinyBondGrudge
ClearFuryCutterDestinyBondGrudge: @ 801CFE4
lsls r0, 24
lsrs r0, 24
ldr r2, _0801D01C @ =gUnknown_2023E0C
@@ -11965,7 +11965,7 @@ _0801D020: .4byte gUnknown_2023BE4
_0801D024: .4byte 0xfdffffff
_0801D028: .4byte gUnknown_2023DFC
_0801D02C: .4byte 0xffffbfff
thumb_func_end sub_801CFE4
thumb_func_end ClearFuryCutterDestinyBondGrudge
thumb_func_start sub_801D030
sub_801D030: @ 801D030
@@ -11991,8 +11991,8 @@ _0801D054: .4byte gUnknown_825011C
_0801D058: .4byte gUnknown_2023D74
thumb_func_end sub_801D030
thumb_func_start sub_801D05C
sub_801D05C: @ 801D05C
thumb_func_start GetMoveTarget
GetMoveTarget: @ 801D05C
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -12352,10 +12352,10 @@ _0801D39C:
.align 2, 0
_0801D3B8: .4byte gUnknown_2023D6B
_0801D3BC: .4byte gUnknown_2023FE8
thumb_func_end sub_801D05C
thumb_func_end GetMoveTarget
thumb_func_start sub_801D3C0
sub_801D3C0: @ 801D3C0
thumb_func_start HasObedientBitSet
HasObedientBitSet: @ 801D3C0
push {r4-r7,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -12412,7 +12412,7 @@ _0801D42A:
.align 2, 0
_0801D430: .4byte gUnknown_2023BCE
_0801D434: .4byte gUnknown_2024284
thumb_func_end sub_801D3C0
thumb_func_end HasObedientBitSet
thumb_func_start sub_801D438
sub_801D438: @ 801D438
@@ -12435,7 +12435,7 @@ sub_801D438: @ 801D438
cmp r0, 0x1
beq _0801D4F4
ldrb r0, [r4]
bl sub_801D3C0
bl HasObedientBitSet
cmp r0, 0
beq _0801D4BE
ldr r2, _0801D504 @ =gUnknown_2023BE4
@@ -12453,27 +12453,27 @@ sub_801D438: @ 801D438
cmp r0, 0
beq _0801D4F4
ldr r0, _0801D508 @ =0x00000827
bl sub_806E6D0
bl FlagGet
lsls r0, 24
cmp r0, 0
bne _0801D4F4
movs r6, 0xA
ldr r0, _0801D50C @ =0x00000821
bl sub_806E6D0
bl FlagGet
lsls r0, 24
cmp r0, 0
beq _0801D4A2
movs r6, 0x1E
_0801D4A2:
ldr r0, _0801D510 @ =0x00000823
bl sub_806E6D0
bl FlagGet
lsls r0, 24
cmp r0, 0
beq _0801D4B0
movs r6, 0x32
_0801D4B0:
ldr r0, _0801D514 @ =0x00000825
bl sub_806E6D0
bl FlagGet
lsls r0, 24
cmp r0, 0
beq _0801D4BE
@@ -12628,7 +12628,7 @@ _0801D5B6:
str r0, [r1]
ldrh r0, [r4]
movs r1, 0
bl sub_801D05C
bl GetMoveTarget
ldr r1, _0801D62C @ =gUnknown_2023D6C
strb r0, [r1]
ldr r2, _0801D630 @ =gUnknown_2023DD0
asm/berry.s
+9 -9
View File
@@ -242,8 +242,8 @@ _0809C8D8:
_0809C8E0: .4byte gUnknown_83DF7CC
thumb_func_end sub_809C8A0
thumb_func_start sub_809C8E4
sub_809C8E4: @ 809C8E4
thumb_func_start ItemIdToBerryType
ItemIdToBerryType: @ 809C8E4
push {lr}
lsls r0, 16
lsrs r1, r0, 16
@@ -264,10 +264,10 @@ _0809C904:
_0809C906:
pop {r1}
bx r1
thumb_func_end sub_809C8E4
thumb_func_end ItemIdToBerryType
thumb_func_start sub_809C90C
sub_809C90C: @ 809C90C
thumb_func_start BerryTypeToItemId
BerryTypeToItemId: @ 809C90C
push {lr}
lsls r0, 16
lsrs r1, r0, 16
@@ -288,10 +288,10 @@ _0809C92C:
_0809C92E:
pop {r1}
bx r1
thumb_func_end sub_809C90C
thumb_func_end BerryTypeToItemId
thumb_func_start sub_809C934
sub_809C934: @ 809C934
thumb_func_start GetBerryNameByBerryType
GetBerryNameByBerryType: @ 809C934
push {r4,lr}
adds r4, r1, 0
lsls r0, 24
@@ -306,6 +306,6 @@ sub_809C934: @ 809C934
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_809C934
thumb_func_end GetBerryNameByBerryType
.align 2, 0 @ Don't pad with nop.
asm/berry_fix_program.s
+1 -1
View File
@@ -62,7 +62,7 @@ sub_815F74C: @ 815F74C
push {r4,lr}
sub sp, 0x4
ldr r0, _0815F7C4 @ =0x0000ffff
bl sub_8000B94
bl DisableInterrupts
movs r0, 0x1
bl EnableInterrupts
bl m4aSoundVSyncOff
asm/berry_pouch.s
+14 -14
View File
@@ -927,13 +927,13 @@ sub_813D4D0: @ 813D4D0
bne _0813D514
movs r0, 0x2
movs r1, 0
bl sub_80F7AC0
bl GetMenuCursorDimensionByFont
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
movs r0, 0x2
movs r1, 0x1
bl sub_80F7AC0
bl GetMenuCursorDimensionByFont
lsls r0, 24
lsrs r0, 24
str r4, [sp]
@@ -945,7 +945,7 @@ sub_813D4D0: @ 813D4D0
bl FillWindowPixelRect
movs r0, 0
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
b _0813D52A
_0813D514:
ldr r2, _0813D534 @ =gUnknown_841623B
@@ -1349,7 +1349,7 @@ _0813D7E6:
beq _0813D7F2
bl Free
_0813D7F2:
bl sub_8003ECC
bl FreeAllWindowBuffers
pop {r0}
bx r0
.align 2, 0
@@ -1874,7 +1874,7 @@ _0813DC24:
lsrs r0, 24
cmp r0, 0x1
beq _0813DC38
bl sub_811B0D0
bl InUnionRoom
cmp r0, 0x1
bne _0813DC7C
_0813DC38:
@@ -1926,19 +1926,19 @@ _0813DC86:
lsrs r6, 24
movs r0, 0x2
movs r1, 0
bl sub_80F7AC0
bl GetMenuCursorDimensionByFont
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
movs r0, 0x2
movs r1, 0x2
bl sub_80F79D8
bl GetFontAttribute
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
movs r0, 0x2
movs r1, 0x1
bl sub_80F79D8
bl GetFontAttribute
adds r0, 0x2
lsls r0, 24
lsrs r0, 24
@@ -1956,10 +1956,10 @@ _0813DC86:
movs r1, 0x2
adds r2, r5, 0
movs r3, 0x2
bl sub_810FCD0
bl AddItemMenuActionTextPrinters
movs r0, 0x2
movs r1, 0x1
bl sub_80F79D8
bl GetFontAttribute
adds r0, 0x2
lsls r0, 24
lsrs r0, 24
@@ -3363,7 +3363,7 @@ sub_813E910: @ 813E910
push {r4,lr}
ldr r0, _0813E994 @ =gUnknown_84643B8
bl sub_8003B24
bl sub_8002C28
bl DeactivateAllTextPrinters
movs r0, 0
movs r1, 0x1
movs r2, 0xE0
@@ -3566,7 +3566,7 @@ sub_813EA98: @ 813EA98
ldrb r0, [r4]
bl ClearWindowTilemap
ldrb r0, [r4]
bl sub_8003E3C
bl RemoveWindow
movs r0, 0x2
bl schedule_bg_copy_tilemap_to_vram
movs r0, 0xFF
@@ -3593,7 +3593,7 @@ sub_813EACC: @ 813EACC
ldrb r0, [r4]
bl ClearWindowTilemap
ldrb r0, [r4]
bl sub_8003E3C
bl RemoveWindow
movs r0, 0x1
bl PutWindowTilemap
movs r0, 0
@@ -3654,7 +3654,7 @@ _0813EB44:
adds r0, r6, 0
movs r2, 0x13
movs r3, 0xD
bl sub_80BF474
bl DisplayMessageAndContinueTask
movs r0, 0x2
bl schedule_bg_copy_tilemap_to_vram
add sp, 0x10
asm/bike.s
+1 -1
View File
@@ -487,7 +487,7 @@ sub_80BD40C: @ 80BD40C
cmp r4, 0x4
bhi _080BD456
adds r0, r5, 0
bl sub_805A008
bl MetatileBehavior_IsCrackedIce
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
asm/blit.s
+10 -10
View File
@@ -5,8 +5,8 @@
.text
thumb_func_start sub_8004A60
sub_8004A60: @ 8004A60
thumb_func_start BlitBitmapRect4BitWithoutColorKey
BlitBitmapRect4BitWithoutColorKey: @ 8004A60
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -33,17 +33,17 @@ sub_8004A60: @ 8004A60
str r7, [sp, 0xC]
movs r4, 0xFF
str r4, [sp, 0x10]
bl sub_8004AA4
bl BlitBitmapRect4Bit
add sp, 0x14
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_8004A60
thumb_func_end BlitBitmapRect4BitWithoutColorKey
thumb_func_start sub_8004AA4
sub_8004AA4: @ 8004AA4
thumb_func_start BlitBitmapRect4Bit
BlitBitmapRect4Bit: @ 8004AA4
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -294,10 +294,10 @@ _08004C72:
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_8004AA4
thumb_func_end BlitBitmapRect4Bit
thumb_func_start sub_8004C84
sub_8004C84: @ 8004C84
thumb_func_start FillBitmapRect4Bit
FillBitmapRect4Bit: @ 8004C84
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -400,7 +400,7 @@ _08004D30:
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_8004C84
thumb_func_end FillBitmapRect4Bit
thumb_func_start sub_8004D40
sub_8004D40: @ 8004D40
asm/braille_text.s
+14 -14
View File
@@ -5,8 +5,8 @@
.text
thumb_func_start sub_814F884
sub_814F884: @ 814F884
thumb_func_start Font6Func
Font6Func: @ 814F884
push {r4-r6,lr}
adds r6, r0, 0
adds r4, r6, 0
@@ -382,7 +382,7 @@ _0814FB58:
b _0814FC96
_0814FB62:
adds r0, r3, 0
bl sub_814FC9C
bl DecompressGlyphFont6
adds r0, r6, 0
bl sub_8003014
ldr r0, _0814FB84 @ =gUnknown_3003DA0
@@ -399,7 +399,7 @@ _0814FB62:
_0814FB84: .4byte gUnknown_3003DA0
_0814FB88:
adds r0, r6, 0
bl sub_8005680
bl TextPrinterWait
lsls r0, 16
cmp r0, 0
beq _0814FB42
@@ -408,7 +408,7 @@ _0814FB88:
b _0814FB42
_0814FB9A:
adds r0, r6, 0
bl sub_8005634
bl TextPrinterWaitWithDownArrow
lsls r0, 16
cmp r0, 0
beq _0814FB42
@@ -428,7 +428,7 @@ _0814FB9A:
b _0814FB42
_0814FBC4:
adds r0, r6, 0
bl sub_8005634
bl TextPrinterWaitWithDownArrow
lsls r0, 16
cmp r0, 0
beq _0814FB42
@@ -504,7 +504,7 @@ _0814FC38:
_0814FC62:
ldrb r0, [r6, 0x4]
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
b _0814FB42
_0814FC6C:
strb r2, [r6, 0x1C]
@@ -536,10 +536,10 @@ _0814FC96:
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end sub_814F884
thumb_func_end Font6Func
thumb_func_start sub_814FC9C
sub_814FC9C: @ 814FC9C
thumb_func_start DecompressGlyphFont6
DecompressGlyphFont6: @ 814FC9C
push {r4,r5,lr}
lsls r0, 16
lsrs r2, r0, 19
@@ -584,12 +584,12 @@ sub_814FC9C: @ 814FC9C
.align 2, 0
_0814FCF8: .4byte gUnknown_846FB0C
_0814FCFC: .4byte gUnknown_3003DA0
thumb_func_end sub_814FC9C
thumb_func_end DecompressGlyphFont6
thumb_func_start sub_814FD00
sub_814FD00: @ 814FD00
thumb_func_start GetGlyphWidthFont6
GetGlyphWidthFont6: @ 814FD00
movs r0, 0x10
bx lr
thumb_func_end sub_814FD00
thumb_func_end GetGlyphWidthFont6
.align 2, 0 @ Don't pad with nop.
asm/buy_menu_helpers.s
+2 -2
View File
@@ -20,7 +20,7 @@ _0813F680:
ldr r0, _0813F6CC @ =gUnknown_846483C
bl sub_8003B24
_0813F686:
bl sub_8002C28
bl DeactivateAllTextPrinters
movs r0, 0
movs r1, 0x1
movs r2, 0xD0
@@ -153,7 +153,7 @@ sub_813F75C: @ 813F75C
movs r1, 0x2
movs r2, 0x13
movs r3, 0xE
bl sub_80BF474
bl DisplayMessageAndContinueTask
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
add sp, 0x10
asm/cable_club.s
+9 -9
View File
@@ -69,10 +69,10 @@ sub_808078C: @ 808078C
movs r1, 0x2
adds r2, r5, 0
movs r3, 0
bl sub_8002C48
bl PrintTextOnWindow
adds r0, r4, 0
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
add sp, 0xC
pop {r4,r5}
pop {r0}
@@ -94,7 +94,7 @@ sub_80807E8: @ 80807E8
bl sub_80F6F9C
adds r0, r4, 0
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
pop {r4}
pop {r0}
bx r0
@@ -1047,7 +1047,7 @@ sub_8080F78: @ 8080F78
bl sub_80807E8
bl EnableBothScriptContexts
ldrb r0, [r4, 0x12]
bl sub_8003E3C
bl RemoveWindow
adds r0, r5, 0
bl DestroyTask
_08080FA6:
@@ -1986,7 +1986,7 @@ _080816EC:
movs r0, 0x1
bl sub_8144714
_0808170A:
bl sub_811B0D0
bl InUnionRoom
cmp r0, 0x1
bne _08081724
ldr r1, _0808171C @ =gUnknown_30030F0
@@ -2073,7 +2073,7 @@ _080817A4:
b _08081820
_080817AE:
ldr r0, _080817BC @ =gUnknown_81BC4AC
bl sub_806943C
bl ShowFieldMessage
movs r0, 0x1
strh r0, [r5, 0x8]
b _08081820
@@ -2382,8 +2382,8 @@ sub_8081A04: @ 8081A04
_08081A18: .4byte sub_808177C
thumb_func_end sub_8081A04
thumb_func_start sub_8081A1C
sub_8081A1C: @ 8081A1C
thumb_func_start sp02A_crash_sound
sp02A_crash_sound: @ 8081A1C
push {lr}
ldr r0, _08081A2C @ =gUnknown_20370C4
ldrb r0, [r0]
@@ -2394,7 +2394,7 @@ sub_8081A1C: @ 8081A1C
.align 2, 0
_08081A2C: .4byte gUnknown_20370C4
_08081A30: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
thumb_func_end sub_8081A1C
thumb_func_end sp02A_crash_sound
thumb_func_start sub_8081A34
sub_8081A34: @ 8081A34
asm/calculate_base_damage.s
+4 -4
View File
@@ -163,7 +163,7 @@ _0803EE10:
bne _0803EEE8
movs r0, 0x82
lsls r0, 4
bl sub_806E6D0
bl FlagGet
lsls r0, 24
cmp r0, 0
beq _0803EE44
@@ -186,7 +186,7 @@ _0803EE44:
cmp r0, 0
bne _0803EEE8
ldr r0, _0803EF30 @ =0x00000824
bl sub_806E6D0
bl FlagGet
lsls r0, 24
cmp r0, 0
beq _0803EE7A
@@ -211,7 +211,7 @@ _0803EE7A:
cmp r0, 0
bne _0803EEE8
ldr r0, _0803EF34 @ =0x00000826
bl sub_806E6D0
bl FlagGet
lsls r0, 24
cmp r0, 0
beq _0803EEB2
@@ -237,7 +237,7 @@ _0803EEB2:
cmp r0, 0
bne _0803EEE8
ldr r0, _0803EF34 @ =0x00000826
bl sub_806E6D0
bl FlagGet
lsls r0, 24
cmp r0, 0
beq _0803EEE8
asm/clear_save_data_screen.s
+4 -4
View File
@@ -137,7 +137,7 @@ _080F5660:
bl sub_812E5A4
movs r0, 0x1
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
b _080F56E2
.align 2, 0
_080F5694: .4byte gUnknown_841EE80
@@ -244,7 +244,7 @@ _080F5744:
bl sub_812E5A4
movs r0, 0x1
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
bl sub_80D972C
_080F577A:
ldr r1, [r5]
@@ -307,7 +307,7 @@ _080F57D4:
bl sub_81100E8
adds r0, r6, 0
bl DestroyTask
bl sub_8003ECC
bl FreeAllWindowBuffers
ldr r0, [r5]
bl Free
str r4, [r5]
@@ -446,7 +446,7 @@ _080F5846:
bl ChangeBgY
ldr r0, _080F5948 @ =gUnknown_841EE68
bl sub_8003B24
bl sub_8002C28
bl DeactivateAllTextPrinters
movs r1, 0x82
lsls r1, 5
movs r0, 0
asm/coins.s
+6 -6
View File
@@ -150,7 +150,7 @@ sub_80D060C: @ 80D060C
movs r1, 0
mov r2, r9
mov r3, r8
bl sub_8002C48
bl PrintTextOnWindow
add sp, 0xC
pop {r3,r4}
mov r8, r3
@@ -194,7 +194,7 @@ sub_80D0674: @ 80D0674
adds r0, r6, 0
movs r1, 0x2
movs r3, 0
bl sub_8002C48
bl PrintTextOnWindow
str r4, [sp]
adds r0, r6, 0
mov r1, r8
@@ -242,7 +242,7 @@ sub_80D06D0: @ 80D06D0
adds r0, r1, 0
movs r1, 0
adds r2, r4, 0
bl sub_8002C48
bl PrintTextOnWindow
add sp, 0xC
pop {r4}
pop {r0}
@@ -280,7 +280,7 @@ sub_80D072C: @ 80D072C
add r0, sp, 0x10
movs r1, 0
adds r2, r4, 0
bl sub_810FE50
bl SetWindowTemplateFields
ldr r0, [sp, 0x10]
ldr r1, [sp, 0x14]
str r0, [sp, 0x18]
@@ -312,7 +312,7 @@ sub_80D072C: @ 80D072C
str r1, [sp, 0x4]
str r3, [sp, 0x8]
movs r1, 0x2
bl sub_8002C48
bl PrintTextOnWindow
adds r0, r6, 0
bl sub_80D06D0
add sp, 0x20
@@ -335,7 +335,7 @@ sub_80D07C8: @ 80D07C8
movs r1, 0x1
bl sub_810F4D8
ldrb r0, [r4]
bl sub_8003E3C
bl RemoveWindow
pop {r4}
pop {r0}
bx r0
asm/credits.s
+9 -9
View File
@@ -80,7 +80,7 @@ _080F3A48: .4byte gUnknown_203AB40
_080F3A4C:
movs r0, 0x80
lsls r0, 7
bl sub_806E6A8
bl FlagClear
ldr r1, _080F3A6C @ =gUnknown_2031DD8
movs r0, 0
strb r0, [r1]
@@ -155,7 +155,7 @@ sub_80F3AC4: @ 80F3AC4
ldr r0, [r4]
ldrb r0, [r0, 0xA]
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
ldr r1, [r4]
movs r0, 0x1
strb r0, [r1, 0xB]
@@ -176,7 +176,7 @@ sub_80F3B04: @ 80F3B04
cmp r0, 0
beq _080F3B20
ldrb r0, [r1, 0xA]
bl sub_8003E3C
bl RemoveWindow
bl sub_80563F0
ldr r1, [r4]
movs r0, 0
@@ -207,7 +207,7 @@ _080F3B40: .4byte gUnknown_203AB40
_080F3B44:
movs r0, 0x80
lsls r0, 7
bl sub_806E680
bl FlagSet
ldr r1, _080F3BB8 @ =gUnknown_2031DD8
movs r0, 0x2
strb r0, [r1]
@@ -708,7 +708,7 @@ _080F3F84:
ldr r0, [r7]
ldrb r0, [r0, 0xA]
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
ldr r1, [r7]
ldr r2, _080F3FC0 @ =gUnknown_8410CF4
ldrh r0, [r1, 0x6]
@@ -1110,13 +1110,13 @@ _080F4288:
_080F42C2:
movs r0, 0
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
movs r0, 0x1
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
movs r0, 0x2
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
add sp, 0x8
pop {r4}
pop {r0}
@@ -1519,7 +1519,7 @@ _080F4638:
lsrs r4, r0, 24
cmp r4, 0
bne _080F4668
bl sub_8003ECC
bl FreeAllWindowBuffers
movs r0, 0
bl GetBgTilemapBuffer
bl Free
asm/daycare.s
+34 -34
View File
@@ -162,7 +162,7 @@ StorePokemonInDaycare: @ 80454CC
push {r4-r6,lr}
adds r5, r0, 0
adds r4, r1, 0
bl sub_8097D08
bl MonHasMail
lsls r0, 24
cmp r0, 0
beq _08045524
@@ -245,7 +245,7 @@ sub_804555C: @ 804555C
thumb_func_start sub_8045580
sub_8045580: @ 8045580
push {lr}
bl sub_811FB0C
bl GetCursorSelectionMonId
lsls r0, 24
lsrs r0, 24
movs r1, 0x64
@@ -704,7 +704,7 @@ _08045906:
subs r1, 0x1
cmp r1, r2
bge _08045906
bl sub_8097CB4
bl ClearMailStruct
pop {r0}
bx r0
thumb_func_end ClearDaycareMonMisc
@@ -845,7 +845,7 @@ sub_80459F0: @ 80459F0
adds r4, r1
strh r0, [r4]
ldr r0, _08045A1C @ =0x00000266
bl sub_806E680
bl FlagSet
pop {r4}
pop {r0}
bx r0
@@ -868,7 +868,7 @@ sub_8045A20: @ 8045A20
orrs r1, r0
strh r1, [r4]
ldr r0, _08045A44 @ =0x00000266
bl sub_806E680
bl FlagSet
pop {r4}
pop {r0}
bx r0
@@ -1274,7 +1274,7 @@ _08045D24:
lsls r0, 16
lsrs r0, 16
ldr r1, _08045DE4 @ =gUnknown_20244F8
bl sub_8043DD4
bl GetLevelUpMovesBySpecies
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x4]
@@ -2154,8 +2154,8 @@ sub_80463FC: @ 80463FC
bx lr
thumb_func_end sub_80463FC
thumb_func_start sub_804640C
sub_804640C: @ 804640C
thumb_func_start _GetDaycareMonNicknames
_GetDaycareMonNicknames: @ 804640C
push {r4,lr}
sub sp, 0xC
adds r4, r0, 0
@@ -2192,12 +2192,12 @@ _0804644C:
_08046454: .4byte gUnknown_2021CD0
_08046458: .4byte gUnknown_2021D04
_0804645C: .4byte gUnknown_2021CF0
thumb_func_end sub_804640C
thumb_func_end _GetDaycareMonNicknames
thumb_func_start sub_8046460
sub_8046460: @ 8046460
thumb_func_start GetSelectedMonNickAndSpecies
GetSelectedMonNickAndSpecies: @ 8046460
push {r4,r5,lr}
bl sub_811FB0C
bl GetCursorSelectionMonId
lsls r0, 24
lsrs r0, 24
movs r5, 0x64
@@ -2206,7 +2206,7 @@ sub_8046460: @ 8046460
adds r0, r4
ldr r1, _08046498 @ =gUnknown_2021CD0
bl GetBoxMonNick
bl sub_811FB0C
bl GetCursorSelectionMonId
lsls r0, 24
lsrs r0, 24
muls r0, r5
@@ -2221,22 +2221,22 @@ sub_8046460: @ 8046460
.align 2, 0
_08046494: .4byte gUnknown_2024284
_08046498: .4byte gUnknown_2021CD0
thumb_func_end sub_8046460
thumb_func_end GetSelectedMonNickAndSpecies
thumb_func_start sub_804649C
sub_804649C: @ 804649C
thumb_func_start GetDaycareMonNicknames
GetDaycareMonNicknames: @ 804649C
push {lr}
ldr r0, _080464B0 @ =gUnknown_3005008
ldr r0, [r0]
movs r1, 0xBE
lsls r1, 6
adds r0, r1
bl sub_804640C
bl _GetDaycareMonNicknames
pop {r0}
bx r0
.align 2, 0
_080464B0: .4byte gUnknown_3005008
thumb_func_end sub_804649C
thumb_func_end GetDaycareMonNicknames
thumb_func_start sub_80464B4
sub_80464B4: @ 80464B4
@@ -2830,7 +2830,7 @@ DaycareAddTextPrinter: @ 8046898
mov r0, sp
movs r1, 0xFF
movs r2, 0
bl sub_8002CF4
bl AddTextPrinter
add sp, 0x10
pop {r4,r5}
pop {r0}
@@ -2961,8 +2961,8 @@ _080469EE:
_080469F8: .4byte gUnknown_3005008
thumb_func_end DaycarePrintMonInfo
thumb_func_start sub_80469FC
sub_80469FC: @ 80469FC
thumb_func_start Task_HandleDaycareLevelMenuInput
Task_HandleDaycareLevelMenuInput: @ 80469FC
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
@@ -3013,7 +3013,7 @@ _08046A46:
movs r1, 0x1
bl sub_80F6F9C
ldrb r0, [r4, 0xA]
bl sub_8003E3C
bl RemoveWindow
adds r0, r5, 0
bl DestroyTask
bl EnableBothScriptContexts
@@ -3037,7 +3037,7 @@ _08046A7C:
movs r1, 0x1
bl sub_80F6F9C
ldrb r0, [r4, 0xA]
bl sub_8003E3C
bl RemoveWindow
adds r0, r5, 0
bl DestroyTask
bl EnableBothScriptContexts
@@ -3047,10 +3047,10 @@ _08046AAC:
bx r0
.align 2, 0
_08046AB4: .4byte gUnknown_20370D0
thumb_func_end sub_80469FC
thumb_func_end Task_HandleDaycareLevelMenuInput
thumb_func_start sub_8046AB8
sub_8046AB8: @ 8046AB8
thumb_func_start ShowDaycareLevelMenu
ShowDaycareLevelMenu: @ 8046AB8
push {r4,r5,lr}
sub sp, 0x18
ldr r0, _08046B18 @ =gUnknown_825F7F4
@@ -3077,8 +3077,8 @@ sub_8046AB8: @ 8046AB8
lsrs r5, 24
adds r0, r4, 0
movs r1, 0x3
bl sub_8003F20
ldr r0, _08046B20 @ =sub_80469FC
bl CopyWindowToVram
ldr r0, _08046B20 @ =Task_HandleDaycareLevelMenuInput
movs r1, 0x3
bl CreateTask
lsls r0, 24
@@ -3097,12 +3097,12 @@ sub_8046AB8: @ 8046AB8
.align 2, 0
_08046B18: .4byte gUnknown_825F7F4
_08046B1C: .4byte gUnknown_825F814
_08046B20: .4byte sub_80469FC
_08046B20: .4byte Task_HandleDaycareLevelMenuInput
_08046B24: .4byte gUnknown_3005090
thumb_func_end sub_8046AB8
thumb_func_end ShowDaycareLevelMenu
thumb_func_start sub_8046B28
sub_8046B28: @ 8046B28
thumb_func_start ChooseSendDaycareMon
ChooseSendDaycareMon: @ 8046B28
push {lr}
bl sub_8128370
ldr r1, _08046B38 @ =gUnknown_30030F0
@@ -3113,12 +3113,12 @@ sub_8046B28: @ 8046B28
.align 2, 0
_08046B38: .4byte gUnknown_30030F0
_08046B3C: .4byte c2_exit_to_overworld_2_switch
thumb_func_end sub_8046B28
thumb_func_end ChooseSendDaycareMon
thumb_func_start sub_8046B40
sub_8046B40: @ 8046B40
push {lr}
bl sub_811FB0C
bl GetCursorSelectionMonId
lsls r0, 24
lsrs r0, 24
movs r1, 0x64
asm/decompress.s
+13 -13
View File
@@ -122,8 +122,8 @@ LoadCompressedObjectPaletteOverrideBuffer: @ 800EC5C
_0800EC88: .4byte 0xffff0000
thumb_func_end LoadCompressedObjectPaletteOverrideBuffer
thumb_func_start sub_800EC8C
sub_800EC8C: @ 800EC8C
thumb_func_start DecompressPicFromTable
DecompressPicFromTable: @ 800EC8C
push {r4,r5,lr}
adds r3, r0, 0
adds r4, r1, 0
@@ -149,7 +149,7 @@ _0800ECB4:
pop {r4,r5}
pop {r0}
bx r0
thumb_func_end sub_800EC8C
thumb_func_end DecompressPicFromTable
thumb_func_start sub_800ECC4
sub_800ECC4: @ 800ECC4
@@ -740,8 +740,8 @@ sub_800F0C4: @ 800F0C4
bx lr
thumb_func_end sub_800F0C4
thumb_func_start sub_800F0E0
sub_800F0E0: @ 800F0E0
thumb_func_start DecompressPicFromTable_DontHandleDeoxys
DecompressPicFromTable_DontHandleDeoxys: @ 800F0E0
push {lr}
adds r3, r0, 0
movs r0, 0xCE
@@ -760,10 +760,10 @@ _0800F0FC:
_0800F102:
pop {r0}
bx r0
thumb_func_end sub_800F0E0
thumb_func_end DecompressPicFromTable_DontHandleDeoxys
thumb_func_start sub_800F108
sub_800F108: @ 800F108
thumb_func_start HandleLoadSpecialPokePic_DontHandleDeoxys
HandleLoadSpecialPokePic_DontHandleDeoxys: @ 800F108
push {r4,r5,lr}
sub sp, 0x4
adds r4, r0, 0
@@ -779,17 +779,17 @@ _0800F11E:
str r1, [sp]
adds r0, r4, 0
adds r1, r5, 0
bl sub_800F134
bl LoadSpecialPokePic_DontHandleDeoxys
add sp, 0x4
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_0800F130: .4byte gUnknown_82350AC
thumb_func_end sub_800F108
thumb_func_end HandleLoadSpecialPokePic_DontHandleDeoxys
thumb_func_start sub_800F134
sub_800F134: @ 800F134
thumb_func_start LoadSpecialPokePic_DontHandleDeoxys
LoadSpecialPokePic_DontHandleDeoxys: @ 800F134
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -882,6 +882,6 @@ _0800F1D0:
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_800F134
thumb_func_end LoadSpecialPokePic_DontHandleDeoxys
.align 2, 0 @ Don't pad with nop.
asm/diploma.s
+8 -8
View File
@@ -255,7 +255,7 @@ sub_80F4DE0: @ 80F4DE0
bne _080F4E10
adds r0, r2, 0
bl DestroyTask
bl sub_8003ECC
bl FreeAllWindowBuffers
ldr r4, _080F4E1C @ =gUnknown_203AB48
ldr r0, [r4]
bl Free
@@ -396,7 +396,7 @@ _080F4E66:
bl ChangeBgY
ldr r0, _080F4F94 @ =gUnknown_8415A10
bl sub_8003B24
bl sub_8002C28
bl DeactivateAllTextPrinters
movs r1, 0x82
lsls r1, 5
movs r0, 0
@@ -513,18 +513,18 @@ _080F5014: .4byte gUnknown_203AB48
sub_80F5018: @ 80F5018
push {r4-r6,lr}
sub sp, 0xAC
bl sub_813CC90
bl UnkTextUtil_Reset
ldr r0, _080F5040 @ =gUnknown_300500C
ldr r1, [r0]
movs r0, 0
bl sub_813CCAC
bl UnkTextUtil_SetPtrI
bl sub_8088F84
lsls r0, 16
cmp r0, 0
beq _080F5048
ldr r1, _080F5044 @ =gUnknown_841B68F
movs r0, 0x1
bl sub_813CCAC
bl UnkTextUtil_SetPtrI
b _080F5050
.align 2, 0
_080F5040: .4byte gUnknown_300500C
@@ -532,14 +532,14 @@ _080F5044: .4byte gUnknown_841B68F
_080F5048:
ldr r1, _080F50E0 @ =gUnknown_841B698
movs r0, 0x1
bl sub_813CCAC
bl UnkTextUtil_SetPtrI
_080F5050:
movs r0, 0
movs r1, 0
bl FillWindowPixelBuffer
ldr r1, _080F50E4 @ =gUnknown_841B60E
add r0, sp, 0xC
bl sub_813CCC8
bl UnkTextUtil_StringExpandPlaceholders
movs r5, 0x1
negs r5, r5
movs r0, 0x2
@@ -562,7 +562,7 @@ _080F5050:
bl sub_812E51C
ldr r1, _080F50EC @ =gUnknown_841B619
add r0, sp, 0xC
bl sub_813CCC8
bl UnkTextUtil_StringExpandPlaceholders
movs r0, 0x2
add r1, sp, 0xC
adds r2, r5, 0
asm/easy_chat.s
+18 -18
View File
@@ -18,7 +18,7 @@ sub_80BD718: @ 80BD718
cmp r0, 0x11
blt _080BD74C
ldr r0, _080BD734 @ =0x0000082c
bl sub_806E6D0
bl FlagGet
b _080BD746
.align 2, 0
_080BD734: .4byte 0x0000082c
@@ -138,8 +138,8 @@ _080BD7F2:
bx r1
thumb_func_end sub_80BD78C
thumb_func_start sub_80BD7F8
sub_80BD7F8: @ 80BD7F8
thumb_func_start GetEasyChatWord
GetEasyChatWord: @ 80BD7F8
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -186,10 +186,10 @@ _080BD846:
bx r1
.align 2, 0
_080BD84C: .4byte gUnknown_83ECED4
thumb_func_end sub_80BD7F8
thumb_func_end GetEasyChatWord
thumb_func_start sub_80BD850
sub_80BD850: @ 80BD850
thumb_func_start CopyEasyChatWord
CopyEasyChatWord: @ 80BD850
push {r4-r6,lr}
adds r5, r0, 0
lsls r6, r1, 16
@@ -210,7 +210,7 @@ _080BD86C:
ldr r1, _080BD88C @ =0x000001ff
ands r1, r4
lsrs r0, r6, 25
bl sub_80BD7F8
bl GetEasyChatWord
adds r1, r0, 0
_080BD87E:
adds r0, r5, 0
@@ -227,10 +227,10 @@ _080BD896:
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end sub_80BD850
thumb_func_end CopyEasyChatWord
thumb_func_start sub_80BD89C
sub_80BD89C: @ 80BD89C
thumb_func_start ConvertEasyChatWordsToString
ConvertEasyChatWordsToString: @ 80BD89C
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -259,7 +259,7 @@ _080BD8CA:
ldrh r1, [r5]
adds r0, r4, 0
str r2, [sp]
bl sub_80BD850
bl CopyEasyChatWord
adds r4, r0, 0
ldrh r0, [r5]
ldr r2, [sp]
@@ -279,7 +279,7 @@ _080BD8F0:
ldrh r1, [r5]
adds r5, 0x2
adds r0, r4, 0
bl sub_80BD850
bl CopyEasyChatWord
adds r4, r0, 0
movs r0, 0xFE
strb r0, [r4]
@@ -304,7 +304,7 @@ _080BD90C:
.align 2, 0
_080BD924: .4byte 0xffff0000
_080BD928: .4byte 0x0000ffff
thumb_func_end sub_80BD89C
thumb_func_end ConvertEasyChatWordsToString
thumb_func_start sub_80BD92C
sub_80BD92C: @ 80BD92C
@@ -328,7 +328,7 @@ _080BD944:
ldr r1, _080BD95C @ =0x000001ff
ands r1, r4
lsrs r0, r5, 25
bl sub_80BD7F8
bl GetEasyChatWord
b _080BD962
.align 2, 0
_080BD95C: .4byte 0x000001ff
@@ -563,7 +563,7 @@ _080BDAF8:
ldr r4, _080BDB18 @ =gUnknown_2021D18
adds r0, r4, 0
adds r1, r5, 0
bl sub_80BD89C
bl ConvertEasyChatWordsToString
adds r0, r4, 0
bl ShowFieldAutoScrollMessage
_080BDB08:
@@ -592,7 +592,7 @@ _080BDB2E:
lsls r1, 16
lsrs r1, 16
ldr r0, _080BDB44 @ =gUnknown_2021CF0
bl sub_80BD850
bl CopyEasyChatWord
pop {r0}
bx r0
.align 2, 0
@@ -1084,7 +1084,7 @@ _080BDEB2:
cmp r3, 0x10
ble _080BDEB2
ldr r0, _080BDF34 @ =0x0000082c
bl sub_806E6D0
bl FlagGet
lsls r0, 24
cmp r0, 0
beq _080BDF0C
@@ -1232,7 +1232,7 @@ CopyEasyChatWordPadded: @ 80BDFC0
lsrs r1, 16
lsls r2, 16
lsrs r5, r2, 16
bl sub_80BD850
bl CopyEasyChatWord
adds r1, r0, 0
subs r4, r1, r4
lsls r4, 16
asm/egg_hatch.s
+31 -31
View File
@@ -173,8 +173,8 @@ _08046CE6:
bx r0
thumb_func_end sub_8046BFC
thumb_func_start sub_8046D60
sub_8046D60: @ 8046D60
thumb_func_start AddHatchedMonToParty
AddHatchedMonToParty: @ 8046D60
push {r4,r5,lr}
sub sp, 0x14
lsls r0, 24
@@ -253,19 +253,19 @@ sub_8046D60: @ 8046D60
_08046E14: .4byte gUnknown_2024284
_08046E18: .4byte gUnknown_202402C
_08046E1C: .4byte gUnknown_2021CD0
thumb_func_end sub_8046D60
thumb_func_end AddHatchedMonToParty
thumb_func_start sub_8046E20
sub_8046E20: @ 8046E20
thumb_func_start ScriptHatchMon
ScriptHatchMon: @ 8046E20
push {lr}
ldr r0, _08046E30 @ =gUnknown_20370C0
ldrb r0, [r0]
bl sub_8046D60
bl AddHatchedMonToParty
pop {r0}
bx r0
.align 2, 0
_08046E30: .4byte gUnknown_20370C0
thumb_func_end sub_8046E20
thumb_func_end ScriptHatchMon
thumb_func_start sub_8046E34
sub_8046E34: @ 8046E34
@@ -616,7 +616,7 @@ _08047090:
adds r1, r0, 0
movs r0, 0
bl SetBgTilemapBuffer
bl sub_8002C28
bl DeactivateAllTextPrinters
bl ResetPaletteFade
bl FreeAllSpritePalettes
bl ResetSpriteData
@@ -680,7 +680,7 @@ _080471C8:
ldr r0, _080471DC @ =gUnknown_3000E74
ldr r0, [r0]
ldrb r0, [r0, 0x4]
bl sub_8046D60
bl AddHatchedMonToParty
b _0804724A
.align 2, 0
_080471DC: .4byte gUnknown_3000E74
@@ -955,12 +955,12 @@ _0804741E:
lsls r0, 2
adds r2, 0x1C
adds r0, r2
ldr r1, _08047440 @ =sub_80476B0
ldr r1, _08047440 @ =SpriteCB_Egg_0
str r1, [r0]
b _08047684
.align 2, 0
_0804743C: .4byte gUnknown_202063C
_08047440: .4byte sub_80476B0
_08047440: .4byte SpriteCB_Egg_0
_08047444:
ldr r2, _0804746C @ =gUnknown_202063C
ldr r3, [r5]
@@ -1012,7 +1012,7 @@ _08047482:
adds r1, r4, 0
movs r2, 0
movs r3, 0x3
bl sub_8047A9C
bl EggHatchPrintMessage
ldr r0, _080474E4 @ =0x00000103
bl PlayFanfare
ldr r1, [r5]
@@ -1025,7 +1025,7 @@ _08047482:
ldr r0, [r5]
ldrb r0, [r0, 0x8]
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
b _08047684
.align 2, 0
_080474D4: .4byte gUnknown_2024284
@@ -1069,7 +1069,7 @@ _08047504:
adds r1, r4, 0
movs r2, 0
movs r3, 0x2
bl sub_8047A9C
bl EggHatchPrintMessage
ldr r1, [r5]
b _08047648
.align 2, 0
@@ -1213,7 +1213,7 @@ _08047654:
bne _08047684
ldr r0, [r5]
ldrb r0, [r0, 0x8]
bl sub_8003E3C
bl RemoveWindow
movs r0, 0
bl UnsetBgTilemapBuffer
movs r0, 0x1
@@ -1242,8 +1242,8 @@ _080476A8: .4byte gUnknown_2037AB8
_080476AC: .4byte c2_exit_to_overworld_2_switch
thumb_func_end sub_8047338
thumb_func_start sub_80476B0
sub_80476B0: @ 80476B0
thumb_func_start SpriteCB_Egg_0
SpriteCB_Egg_0: @ 80476B0
push {r4,lr}
adds r4, r0, 0
ldrh r0, [r4, 0x2E]
@@ -1253,13 +1253,13 @@ sub_80476B0: @ 80476B0
asrs r0, 16
cmp r0, 0x14
ble _080476D0
ldr r0, _080476CC @ =sub_8047708
ldr r0, _080476CC @ =SpriteCB_Egg_1
str r0, [r4, 0x1C]
movs r0, 0
strh r0, [r4, 0x2E]
b _08047700
.align 2, 0
_080476CC: .4byte sub_8047708
_080476CC: .4byte SpriteCB_Egg_1
_080476D0:
ldrh r0, [r4, 0x30]
adds r0, 0x14
@@ -1285,10 +1285,10 @@ _08047700:
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_80476B0
thumb_func_end SpriteCB_Egg_0
thumb_func_start sub_8047708
sub_8047708: @ 8047708
thumb_func_start SpriteCB_Egg_1
SpriteCB_Egg_1: @ 8047708
push {r4,lr}
adds r4, r0, 0
ldrh r0, [r4, 0x32]
@@ -1306,13 +1306,13 @@ sub_8047708: @ 8047708
asrs r0, 16
cmp r0, 0x14
ble _08047738
ldr r0, _08047734 @ =sub_804776C
ldr r0, _08047734 @ =SpriteCB_Egg_2
str r0, [r4, 0x1C]
strh r1, [r4, 0x2E]
strh r1, [r4, 0x32]
b _08047764
.align 2, 0
_08047734: .4byte sub_804776C
_08047734: .4byte SpriteCB_Egg_2
_08047738:
ldrh r0, [r4, 0x30]
adds r0, 0x14
@@ -1337,10 +1337,10 @@ _08047764:
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_8047708
thumb_func_end SpriteCB_Egg_1
thumb_func_start sub_804776C
sub_804776C: @ 804776C
thumb_func_start SpriteCB_Egg_2
SpriteCB_Egg_2: @ 804776C
push {r4-r6,lr}
adds r4, r0, 0
ldrh r0, [r4, 0x32]
@@ -1429,7 +1429,7 @@ _08047826:
pop {r4-r6}
pop {r0}
bx r0
thumb_func_end sub_804776C
thumb_func_end SpriteCB_Egg_2
thumb_func_start SpriteCB_Egg_3
SpriteCB_Egg_3: @ 804782C
@@ -1759,8 +1759,8 @@ _08047A94: .4byte gUnknown_8260184
_08047A98: .4byte gUnknown_202063C
thumb_func_end CreateEggShardSprite
thumb_func_start sub_8047A9C
sub_8047A9C: @ 8047A9C
thumb_func_start EggHatchPrintMessage
EggHatchPrintMessage: @ 8047A9C
push {r4-r6,lr}
mov r6, r8
push {r6}
@@ -1815,6 +1815,6 @@ sub_8047A9C: @ 8047A9C
bx r0
.align 2, 0
_08047B08: .4byte gUnknown_3000E74
thumb_func_end sub_8047A9C
thumb_func_end EggHatchPrintMessage
.align 2, 0 @ Don't pad with nop.
asm/event_data.s
+75 -75
View File
@@ -54,15 +54,15 @@ sub_806E110: @ 806E110
movs r2, 0x20
bl memset
ldr r0, _0806E154 @ =0x00000803
bl sub_806E6A8
bl FlagClear
ldr r0, _0806E158 @ =0x00000804
bl sub_806E6A8
bl FlagClear
ldr r0, _0806E15C @ =0x00000805
bl sub_806E6A8
bl FlagClear
ldr r0, _0806E160 @ =0x00000807
bl sub_806E6A8
bl FlagClear
ldr r0, _0806E164 @ =0x00000842
bl sub_806E6A8
bl FlagClear
pop {r0}
bx r0
.align 2, 0
@@ -85,7 +85,7 @@ sub_806E168: @ 806E168
strb r1, [r2, 0x1A]
strh r1, [r0]
ldr r0, _0806E18C @ =0x00000838
bl sub_806E6A8
bl FlagClear
pop {r0}
bx r0
.align 2, 0
@@ -107,7 +107,7 @@ sub_806E190: @ 806E190
adds r1, r2, 0
strh r1, [r0]
ldr r0, _0806E1BC @ =0x00000838
bl sub_806E680
bl FlagSet
pop {r0}
bx r0
.align 2, 0
@@ -126,13 +126,13 @@ sub_806E1C0: @ 806E1C0
cmp r0, 0xDA
bne _0806E1FC
ldr r0, _0806E1F0 @ =0x0000403c
bl sub_806E568
bl VarGet
lsls r0, 16
ldr r1, _0806E1F4 @ =0x03020000
cmp r0, r1
bne _0806E1FC
ldr r0, _0806E1F8 @ =0x00000838
bl sub_806E6D0
bl FlagGet
lsls r0, 24
cmp r0, 0
beq _0806E1FC
@@ -162,7 +162,7 @@ sub_806E204: @ 806E204
strh r1, [r0]
movs r0, 0x84
lsls r0, 4
bl sub_806E6A8
bl FlagClear
pop {r0}
bx r0
.align 2, 0
@@ -184,7 +184,7 @@ sub_806E22C: @ 806E22C
strh r1, [r0]
movs r0, 0x84
lsls r0, 4
bl sub_806E680
bl FlagSet
pop {r0}
bx r0
.align 2, 0
@@ -202,14 +202,14 @@ sub_806E25C: @ 806E25C
cmp r0, 0xB9
bne _0806E294
ldr r0, _0806E28C @ =0x0000404e
bl sub_806E568
bl VarGet
lsls r0, 16
ldr r1, _0806E290 @ =0x62580000
cmp r0, r1
bne _0806E294
movs r0, 0x84
lsls r0, 4
bl sub_806E6D0
bl FlagGet
lsls r0, 24
cmp r0, 0
beq _0806E294
@@ -230,7 +230,7 @@ _0806E296:
sub_806E29C: @ 806E29C
push {lr}
ldr r0, _0806E2A8 @ =0x00000839
bl sub_806E6A8
bl FlagClear
pop {r0}
bx r0
.align 2, 0
@@ -241,7 +241,7 @@ _0806E2A8: .4byte 0x00000839
sub_806E2AC: @ 806E2AC
push {lr}
ldr r0, _0806E2B8 @ =0x00000839
bl sub_806E680
bl FlagSet
pop {r0}
bx r0
.align 2, 0
@@ -252,7 +252,7 @@ _0806E2B8: .4byte 0x00000839
sub_806E2BC: @ 806E2BC
push {lr}
ldr r0, _0806E2CC @ =0x00000839
bl sub_806E6D0
bl FlagGet
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -266,40 +266,40 @@ sub_806E2D0: @ 806E2D0
push {lr}
movs r0, 0xF6
lsls r0, 2
bl sub_806E6A8
bl FlagClear
ldr r0, _0806E340 @ =0x000003d9
bl sub_806E6A8
bl FlagClear
ldr r0, _0806E344 @ =0x000003da
bl sub_806E6A8
bl FlagClear
ldr r0, _0806E348 @ =0x000003db
bl sub_806E6A8
bl FlagClear
movs r0, 0xF7
lsls r0, 2
bl sub_806E6A8
bl FlagClear
ldr r0, _0806E34C @ =0x000003dd
bl sub_806E6A8
bl FlagClear
ldr r0, _0806E350 @ =0x000003de
bl sub_806E6A8
bl FlagClear
ldr r0, _0806E354 @ =0x000003df
bl sub_806E6A8
bl FlagClear
movs r0, 0xF8
lsls r0, 2
bl sub_806E6A8
bl FlagClear
ldr r0, _0806E358 @ =0x000003e1
bl sub_806E6A8
bl FlagClear
ldr r0, _0806E35C @ =0x000003e2
bl sub_806E6A8
bl FlagClear
ldr r0, _0806E360 @ =0x000003e3
bl sub_806E6A8
bl FlagClear
movs r0, 0xF9
lsls r0, 2
bl sub_806E6A8
bl FlagClear
ldr r0, _0806E364 @ =0x000003e5
bl sub_806E6A8
bl FlagClear
ldr r0, _0806E368 @ =0x000003e6
bl sub_806E6A8
bl FlagClear
ldr r0, _0806E36C @ =0x000003e7
bl sub_806E6A8
bl FlagClear
pop {r0}
bx r0
.align 2, 0
@@ -322,31 +322,31 @@ sub_806E370: @ 806E370
push {lr}
ldr r0, _0806E3C0 @ =0x000040b5
movs r1, 0
bl sub_806E584
bl VarSet
ldr r0, _0806E3C4 @ =0x000040b6
movs r1, 0
bl sub_806E584
bl VarSet
ldr r0, _0806E3C8 @ =0x000040b7
movs r1, 0
bl sub_806E584
bl VarSet
ldr r0, _0806E3CC @ =0x000040b8
movs r1, 0
bl sub_806E584
bl VarSet
ldr r0, _0806E3D0 @ =0x000040b9
movs r1, 0
bl sub_806E584
bl VarSet
ldr r0, _0806E3D4 @ =0x000040ba
movs r1, 0
bl sub_806E584
bl VarSet
ldr r0, _0806E3D8 @ =0x000040bb
movs r1, 0
bl sub_806E584
bl VarSet
ldr r0, _0806E3DC @ =0x000040bc
movs r1, 0
bl sub_806E584
bl VarSet
ldr r0, _0806E3E0 @ =0x00004024
movs r1, 0
bl sub_806E584
bl VarSet
pop {r0}
bx r0
.align 2, 0
@@ -361,47 +361,47 @@ _0806E3DC: .4byte 0x000040bc
_0806E3E0: .4byte 0x00004024
thumb_func_end sub_806E370
thumb_func_start sub_806E3E4
sub_806E3E4: @ 806E3E4
thumb_func_start DisableResetRTC
DisableResetRTC: @ 806E3E4
push {lr}
ldr r0, _0806E3F8 @ =0x00004032
movs r1, 0
bl sub_806E584
bl VarSet
ldr r0, _0806E3FC @ =0x00000837
bl sub_806E6A8
bl FlagClear
pop {r0}
bx r0
.align 2, 0
_0806E3F8: .4byte 0x00004032
_0806E3FC: .4byte 0x00000837
thumb_func_end sub_806E3E4
thumb_func_end DisableResetRTC
thumb_func_start sub_806E400
sub_806E400: @ 806E400
thumb_func_start EnableResetRTC
EnableResetRTC: @ 806E400
push {lr}
ldr r0, _0806E418 @ =0x00004032
movs r1, 0x92
lsls r1, 4
bl sub_806E584
bl VarSet
ldr r0, _0806E41C @ =0x00000837
bl sub_806E680
bl FlagSet
pop {r0}
bx r0
.align 2, 0
_0806E418: .4byte 0x00004032
_0806E41C: .4byte 0x00000837
thumb_func_end sub_806E400
thumb_func_end EnableResetRTC
thumb_func_start sub_806E420
sub_806E420: @ 806E420
thumb_func_start CanResetRTC
CanResetRTC: @ 806E420
push {lr}
ldr r0, _0806E444 @ =0x00000837
bl sub_806E6D0
bl FlagGet
lsls r0, 24
cmp r0, 0
beq _0806E44C
ldr r0, _0806E448 @ =0x00004032
bl sub_806E568
bl VarGet
lsls r0, 16
movs r1, 0x92
lsls r1, 20
@@ -417,7 +417,7 @@ _0806E44C:
_0806E44E:
pop {r1}
bx r1
thumb_func_end sub_806E420
thumb_func_end CanResetRTC
thumb_func_start sub_806E454
sub_806E454: @ 806E454
@@ -563,8 +563,8 @@ _0806E564:
bx r1
thumb_func_end sub_806E528
thumb_func_start sub_806E568
sub_806E568: @ 806E568
thumb_func_start VarGet
VarGet: @ 806E568
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
@@ -580,10 +580,10 @@ _0806E57E:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_806E568
thumb_func_end VarGet
thumb_func_start sub_806E584
sub_806E584: @ 806E584
thumb_func_start VarSet
VarSet: @ 806E584
push {r4,lr}
lsls r0, 16
lsrs r0, 16
@@ -601,24 +601,24 @@ _0806E59E:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_806E584
thumb_func_end VarSet
thumb_func_start sub_806E5A4
sub_806E5A4: @ 806E5A4
thumb_func_start VarGetFieldObjectGraphicsId
VarGetFieldObjectGraphicsId: @ 806E5A4
push {lr}
lsls r0, 24
lsrs r0, 8
ldr r1, _0806E5BC @ =0x40100000
adds r0, r1
lsrs r0, 16
bl sub_806E568
bl VarGet
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
.align 2, 0
_0806E5BC: .4byte 0x40100000
thumb_func_end sub_806E5A4
thumb_func_end VarGetFieldObjectGraphicsId
thumb_func_start sub_806E5C0
sub_806E5C0: @ 806E5C0
@@ -719,8 +719,8 @@ _0806E678: .4byte 0xffffc007
_0806E67C: .4byte gUnknown_20370E0
thumb_func_end sub_806E5C0
thumb_func_start sub_806E680
sub_806E680: @ 806E680
thumb_func_start FlagSet
FlagSet: @ 806E680
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
@@ -741,10 +741,10 @@ _0806E6A0:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_806E680
thumb_func_end FlagSet
thumb_func_start sub_806E6A8
sub_806E6A8: @ 806E6A8
thumb_func_start FlagClear
FlagClear: @ 806E6A8
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
@@ -765,10 +765,10 @@ _0806E6C8:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_806E6A8
thumb_func_end FlagClear
thumb_func_start sub_806E6D0
sub_806E6D0: @ 806E6D0
thumb_func_start FlagGet
FlagGet: @ 806E6D0
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
@@ -792,7 +792,7 @@ _0806E6F6:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_806E6D0
thumb_func_end FlagGet
thumb_func_start sub_806E6FC
sub_806E6FC: @ 806E6FC
asm/evolution_scene.s
+20 -20
View File
@@ -14,8 +14,8 @@ sub_80CDD18: @ 80CDD18
bx r0
thumb_func_end sub_80CDD18
thumb_func_start sub_80CDD28
sub_80CDD28: @ 80CDD28
thumb_func_start Task_BeginEvolutionScene
Task_BeginEvolutionScene: @ 80CDD28
push {r4-r7,lr}
sub sp, 0x4
lsls r0, 24
@@ -69,7 +69,7 @@ _080CDD68:
adds r1, r4, 0
adds r2, r5, 0
adds r3, r6, 0
bl sub_80CDDF4
bl EvolutionScene
_080CDD98:
add sp, 0x4
pop {r4-r7}
@@ -78,10 +78,10 @@ _080CDD98:
.align 2, 0
_080CDDA0: .4byte gUnknown_2037AB8
_080CDDA4: .4byte gUnknown_2024284
thumb_func_end sub_80CDD28
thumb_func_end Task_BeginEvolutionScene
thumb_func_start sub_80CDDA8
sub_80CDDA8: @ 80CDDA8
thumb_func_start BeginEvolutionScene
BeginEvolutionScene: @ 80CDDA8
push {r4-r6,lr}
adds r4, r1, 0
adds r5, r2, 0
@@ -92,7 +92,7 @@ sub_80CDDA8: @ 80CDDA8
lsrs r5, 24
lsls r6, 24
lsrs r6, 24
ldr r0, _080CDDE8 @ =sub_80CDD28
ldr r0, _080CDDE8 @ =Task_BeginEvolutionScene
movs r1, 0
bl CreateTask
lsls r0, 24
@@ -113,13 +113,13 @@ sub_80CDDA8: @ 80CDDA8
pop {r0}
bx r0
.align 2, 0
_080CDDE8: .4byte sub_80CDD28
_080CDDE8: .4byte Task_BeginEvolutionScene
_080CDDEC: .4byte gUnknown_3005090
_080CDDF0: .4byte sub_80CDD18
thumb_func_end sub_80CDDA8
thumb_func_end BeginEvolutionScene
thumb_func_start sub_80CDDF4
sub_80CDDF4: @ 80CDDF4
thumb_func_start EvolutionScene
EvolutionScene: @ 80CDDF4
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -245,7 +245,7 @@ sub_80CDDF4: @ 80CDDF4
ldr r1, [r2]
ldr r1, [r1, 0x8]
adds r2, r5, 0
bl sub_800EC8C
bl DecompressPicFromTable
adds r0, r5, 0
ldr r1, [sp, 0x20]
mov r2, r9
@@ -301,7 +301,7 @@ sub_80CDDF4: @ 80CDDF4
ldr r1, [r2]
ldr r1, [r1, 0x10]
mov r2, r10
bl sub_800EC8C
bl DecompressPicFromTable
mov r0, r10
ldr r1, [sp, 0x20]
mov r2, r9
@@ -427,7 +427,7 @@ _080CE0D8: .4byte gUnknown_2037238
_080CE0DC: .4byte nullsub_76
_080CE0E0: .4byte sub_80D0050
_080CE0E4: .4byte sub_80CE710
thumb_func_end sub_80CDDF4
thumb_func_end EvolutionScene
thumb_func_start CB2_EvolutionSceneLoadGraphics
CB2_EvolutionSceneLoadGraphics: @ 80CE0E8
@@ -530,7 +530,7 @@ CB2_EvolutionSceneLoadGraphics: @ 80CE0E8
ldr r1, [r1]
ldr r1, [r1, 0x10]
adds r2, r5, 0
bl sub_800EC8C
bl DecompressPicFromTable
adds r0, r5, 0
mov r1, r9
adds r2, r6, 0
@@ -776,7 +776,7 @@ _080CE414:
ldr r1, [r1]
ldr r1, [r1, 0x10]
adds r2, r6, 0
bl sub_800EC8C
bl DecompressPicFromTable
adds r0, r6, 0
adds r1, r5, 0
adds r2, r4, 0
@@ -957,7 +957,7 @@ TradeEvolutionScene: @ 80CE540
ldr r1, [r1]
ldr r1, [r1, 0x8]
adds r2, r5, 0
bl sub_800EC8C
bl DecompressPicFromTable
adds r0, r5, 0
mov r1, r10
adds r2, r7, 0
@@ -1961,7 +1961,7 @@ _080CEEA0:
ldr r0, [r4]
bl Free
str r6, [r4]
bl sub_8003ECC
bl FreeAllWindowBuffers
ldr r0, _080CEECC @ =gUnknown_300537C
ldr r0, [r0]
bl SetMainCallback2
@@ -2432,7 +2432,7 @@ _080CF2B4:
beq _080CF2C2
b _080CF528
_080CF2C2:
bl sub_8003ECC
bl FreeAllWindowBuffers
ldr r0, _080CF2F8 @ =gUnknown_2024284
ldr r1, _080CF2FC @ =gUnknown_3005090
mov r3, r8
@@ -3702,7 +3702,7 @@ _080CFDC6:
movs r0, 0
bl GetBgTilemapBuffer
bl Free
bl sub_8003ECC
bl FreeAllWindowBuffers
ldr r0, _080CFE1C @ =gUnknown_2024284
ldr r1, _080CFE20 @ =gUnknown_3005090
adds r5, r7, r6
asm/fame_checker.s
+10 -10
View File
@@ -221,7 +221,7 @@ _0812C540:
_0812C578:
ldr r0, _0812C598 @ =gUnknown_845FC04
bl sub_8003B24
bl sub_8002C28
bl DeactivateAllTextPrinters
bl sub_812CEC0
ldr r4, _0812C59C @ =gUnknown_203B100
movs r0, 0x88
@@ -721,7 +721,7 @@ sub_812C990: @ 812C990
movs r0, 0x2
movs r1, 0x2
movs r3, 0
bl sub_80F6CD0
bl AddTextPrinterParametrized
add sp, 0x10
pop {r0}
bx r0
@@ -1243,7 +1243,7 @@ _0812CDAC:
movs r0, 0x2
movs r1, 0x2
adds r2, r4, 0
bl sub_80F6CD0
bl AddTextPrinterParametrized
movs r0, 0x2
bl sub_812CEE0
_0812CDEE:
@@ -1315,7 +1315,7 @@ sub_812CE04: @ 812CE04
movs r0, 0x2
movs r1, 0x2
adds r2, r6, 0
bl sub_80F6CD0
bl AddTextPrinterParametrized
movs r0, 0x2
bl sub_812CEE0
add sp, 0x10
@@ -1374,7 +1374,7 @@ sub_812CEE0: @ 812CEE0
bl PutWindowTilemap
adds r0, r4, 0
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
pop {r4}
pop {r0}
bx r0
@@ -1548,7 +1548,7 @@ _0812CFDA:
bl sub_812D094
movs r0, 0x3
bl sub_812D094
bl sub_8003ECC
bl FreeAllWindowBuffers
adds r0, r6, 0
bl DestroyTask
_0812D06C:
@@ -1579,9 +1579,9 @@ sub_812D094: @ 812D094
bl ClearWindowTilemap
adds r0, r4, 0
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
adds r0, r4, 0
bl sub_8003E3C
bl RemoveWindow
pop {r4}
pop {r0}
bx r0
@@ -3258,7 +3258,7 @@ sub_812DDAC: @ 812DDAC
movs r0, 0x2
movs r1, 0x2
movs r3, 0
bl sub_80F6CD0
bl AddTextPrinterParametrized
movs r0, 0x2
bl sub_812CEE0
add sp, 0x10
@@ -3525,7 +3525,7 @@ sub_812DFE4: @ 812DFE4
bl PutWindowTilemap
adds r0, r4, 0
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
pop {r4}
pop {r0}
bx r0
asm/field_control_avatar.s
+54 -54
View File
@@ -50,7 +50,7 @@ sub_806C8BC: @ 806C8BC
ldrb r1, [r0, 0x2]
mov r8, r1
ldrb r6, [r0, 0x3]
bl sub_806CE74
bl cur_mapdata_block_role_at_player_pos
lsls r0, 24
lsrs r0, 24
bl sub_8059D70
@@ -325,7 +325,7 @@ sub_806CAC8: @ 806CAC8
lsrs r6, r0, 24
mov r4, sp
mov r0, sp
bl sub_806CE20
bl player_get_pos_to_and_height
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]
@@ -400,7 +400,7 @@ _0806CB74:
_0806CB88:
mov r7, sp
mov r0, sp
bl sub_806CE38
bl player_get_next_pos_and_height
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]
@@ -425,7 +425,7 @@ _0806CB88:
_0806CBBC: .4byte gUnknown_3005078
_0806CBC0:
mov r0, sp
bl sub_806CE20
bl player_get_pos_to_and_height
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]
@@ -478,7 +478,7 @@ _0806CC28: .4byte gUnknown_3005078
_0806CC2C:
mov r4, sp
mov r0, sp
bl sub_806CE38
bl player_get_next_pos_and_height
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]
@@ -564,7 +564,7 @@ _0806CCCC:
orrs r0, r1
strb r0, [r2]
ldr r0, _0806CCF8 @ =0x0000083e
bl sub_806E680
bl FlagSet
movs r0, 0x6
bl sub_80722CC
bl sub_806F258
@@ -717,8 +717,8 @@ _0806CE18:
bx r0
thumb_func_end sub_806CDF8
thumb_func_start sub_806CE20
sub_806CE20: @ 806CE20
thumb_func_start player_get_pos_to_and_height
player_get_pos_to_and_height: @ 806CE20
push {r4,lr}
adds r4, r0, 0
adds r1, r4, 0x2
@@ -728,10 +728,10 @@ sub_806CE20: @ 806CE20
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_806CE20
thumb_func_end player_get_pos_to_and_height
thumb_func_start sub_806CE38
sub_806CE38: @ 806CE38
thumb_func_start player_get_next_pos_and_height
player_get_next_pos_and_height: @ 806CE38
push {r4,r5,lr}
sub sp, 0x4
adds r5, r0, 0
@@ -759,10 +759,10 @@ _0806CE6A:
pop {r4,r5}
pop {r0}
bx r0
thumb_func_end sub_806CE38
thumb_func_end player_get_next_pos_and_height
thumb_func_start sub_806CE74
sub_806CE74: @ 806CE74
thumb_func_start cur_mapdata_block_role_at_player_pos
cur_mapdata_block_role_at_player_pos: @ 806CE74
push {r4,lr}
sub sp, 0x4
mov r4, sp
@@ -782,7 +782,7 @@ sub_806CE74: @ 806CE74
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_806CE74
thumb_func_end cur_mapdata_block_role_at_player_pos
thumb_func_start sub_806CEA0
sub_806CEA0: @ 806CEA0
@@ -1026,7 +1026,7 @@ _0806D02A:
cmp r0, 0xFF
beq _0806D092
_0806D078:
bl sub_811B0D0
bl InUnionRoom
cmp r0, 0x1
bne _0806D0A0
adds r0, r6, r5
@@ -1173,7 +1173,7 @@ _0806D17A:
ldr r1, _0806D1CC @ =gUnknown_20370C4
strh r0, [r1]
ldrh r0, [r4]
bl sub_806E6D0
bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1615,7 +1615,7 @@ sub_806D548: @ 806D548
lsrs r0, 24
cmp r0, 0x1
bne _0806D570
bl sub_805C83C
bl PartyHasMonWithSurf
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1626,17 +1626,17 @@ sub_806D548: @ 806D548
_0806D56C: .4byte gUnknown_81A6B0D
_0806D570:
ldr r0, _0806D59C @ =0x00000824
bl sub_806E6D0
bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _0806D5A4
bl sub_805C83C
bl PartyHasMonWithSurf
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _0806D5A4
bl sub_805C8B0
bl IsPlayerFacingSurfableFishableWater
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1654,12 +1654,12 @@ _0806D5A4:
cmp r0, 0x1
bne _0806D5E0
ldr r0, _0806D5D0 @ =0x00000826
bl sub_806E6D0
bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _0806D5D8
bl sub_805C88C
bl IsPlayerSurfingNorth
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1757,7 +1757,7 @@ sub_806D660: @ 806D660
lsrs r2, 16
ldrb r3, [r0, 0x4]
adds r0, r4, 0
bl sub_806DDC0
bl mapheader_trigger_activate_at
cmp r0, 0
beq _0806D68C
bl ScriptContext1_SetupScript
@@ -1784,14 +1784,14 @@ sub_806D698: @ 806D698
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
bl sub_811B0D0
bl InUnionRoom
cmp r0, 0x1
beq _0806D72C
ldr r0, _0806D6E0 @ =gUnknown_203ADFA
ldrb r0, [r0]
cmp r0, 0x2
beq _0806D72C
bl sub_806D74C
bl AdjustFriendship_step
ldr r0, _0806D6E4 @ =gUnknown_2037078
ldrb r1, [r0]
movs r0, 0x40
@@ -1817,7 +1817,7 @@ _0806D6E0: .4byte gUnknown_203ADFA
_0806D6E4: .4byte gUnknown_2037078
_0806D6E8: .4byte gUnknown_81A8CED
_0806D6EC:
bl sub_806D79C
bl overworld_poison_step
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1861,15 +1861,15 @@ sub_806D738: @ 806D738
push {lr}
ldr r0, _0806D748 @ =0x00004021
movs r1, 0
bl sub_806E584
bl VarSet
pop {r0}
bx r0
.align 2, 0
_0806D748: .4byte 0x00004021
thumb_func_end sub_806D738
thumb_func_start sub_806D74C
sub_806D74C: @ 806D74C
thumb_func_start AdjustFriendship_step
AdjustFriendship_step: @ 806D74C
push {r4,r5,lr}
ldr r0, _0806D780 @ =0x00004021
bl sub_806E454
@@ -1899,22 +1899,22 @@ _0806D77A:
.align 2, 0
_0806D780: .4byte 0x00004021
_0806D784: .4byte gUnknown_2024284
thumb_func_end sub_806D74C
thumb_func_end AdjustFriendship_step
thumb_func_start sub_806D788
sub_806D788: @ 806D788
thumb_func_start overworld_poison_timer_set
overworld_poison_timer_set: @ 806D788
push {lr}
ldr r0, _0806D798 @ =0x00004022
movs r1, 0
bl sub_806E584
bl VarSet
pop {r0}
bx r0
.align 2, 0
_0806D798: .4byte 0x00004022
thumb_func_end sub_806D788
thumb_func_end overworld_poison_timer_set
thumb_func_start sub_806D79C
sub_806D79C: @ 806D79C
thumb_func_start overworld_poison_step
overworld_poison_step: @ 806D79C
push {r4,lr}
ldr r0, _0806D7D8 @ =gUnknown_2036DFC
ldrb r0, [r0, 0x17]
@@ -1951,7 +1951,7 @@ _0806D7E2:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_806D79C
thumb_func_end overworld_poison_step
thumb_func_start sub_806D7E8
sub_806D7E8: @ 806D7E8
@@ -2531,7 +2531,7 @@ sub_806DC30: @ 806DC30
lsls r2, 16
lsrs r2, 16
ldrb r3, [r3, 0x4]
bl sub_806DD38
bl map_warp_check
lsls r0, 24
asrs r0, 24
pop {r1}
@@ -2651,8 +2651,8 @@ _0806DD32:
bx r1
thumb_func_end sub_806DCD0
thumb_func_start sub_806DD38
sub_806DD38: @ 806DD38
thumb_func_start map_warp_check
map_warp_check: @ 806DD38
push {r4-r6,lr}
lsls r1, 16
lsrs r6, r1, 16
@@ -2694,10 +2694,10 @@ _0806DD7A:
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end sub_806DD38
thumb_func_end map_warp_check
thumb_func_start sub_806DD80
sub_806DD80: @ 806DD80
thumb_func_start trigger_activate
trigger_activate: @ 806DD80
push {r4,lr}
adds r4, r0, 0
cmp r4, 0
@@ -2713,7 +2713,7 @@ _0806DD96:
cmp r0, 0
beq _0806DDB0
ldrh r0, [r4, 0x6]
bl sub_806E568
bl VarGet
lsls r0, 16
lsrs r0, 16
ldrb r1, [r4, 0x8]
@@ -2730,10 +2730,10 @@ _0806DDB8:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_806DD80
thumb_func_end trigger_activate
thumb_func_start sub_806DDC0
sub_806DDC0: @ 806DDC0
thumb_func_start mapheader_trigger_activate_at
mapheader_trigger_activate_at: @ 806DDC0
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -2770,7 +2770,7 @@ _0806DDEC:
bne _0806DE0C
_0806DE02:
adds r0, r5, 0
bl sub_806DD80
bl trigger_activate
cmp r0, 0
bne _0806DE18
_0806DE0C:
@@ -2789,7 +2789,7 @@ _0806DE18:
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_806DDC0
thumb_func_end mapheader_trigger_activate_at
thumb_func_start sub_806DE28
sub_806DE28: @ 806DE28
@@ -2817,7 +2817,7 @@ sub_806DE28: @ 806DE28
bl sub_805FCD8
lsls r0, 16
lsrs r0, 16
bl sub_806E6A8
bl FlagClear
_0806DE64:
pop {r4,r5}
pop {r0}
@@ -2884,7 +2884,7 @@ sub_806DEC4: @ 806DEC4
lsrs r2, 16
ldrb r3, [r0, 0x4]
adds r0, r4, 0
bl sub_806DDC0
bl mapheader_trigger_activate_at
pop {r4}
pop {r1}
bx r1
@@ -3089,7 +3089,7 @@ GetFieldObjectScriptPointerForComparison: @ 806E050
lsrs r4, 24
mov r5, sp
mov r0, sp
bl sub_806CE38
bl player_get_next_pos_and_height
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]
@@ -3115,7 +3115,7 @@ sub_806E08C: @ 806E08C
bl player_get_direction_upper_nybble
mov r4, sp
mov r0, sp
bl sub_806CE20
bl player_get_pos_to_and_height
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]
asm/field_effect.s
+7 -7
View File
@@ -2018,7 +2018,7 @@ task00_8084310: @ 8084310
lsls r0, 24
cmp r0, 0
beq _08084376
bl sub_811FB0C
bl GetCursorSelectionMonId
ldr r1, _08084380 @ =gUnknown_20386E0
lsls r0, 24
lsrs r0, 24
@@ -2155,7 +2155,7 @@ _08084450: .4byte gUnknown_2037AB8
sub_8084454: @ 8084454
push {lr}
bl sub_8055DC4
bl sub_807DB58
bl pal_fill_for_maplights
bl sub_8111CF0
bl ScriptContext2_Enable
bl player_bitmagic
@@ -2538,7 +2538,7 @@ sub_8084708: @ 8084708
bne _08084760
ldr r0, _0808477C @ =0x00004001
movs r1, 0x1
bl sub_806E584
bl VarSet
movs r0, 0x8
bl sub_805BDEC
movs r0, 0x16
@@ -2886,7 +2886,7 @@ _080849F0: .4byte sub_80847C0
sub_80849F4: @ 80849F4
push {lr}
bl sub_8055DC4
bl sub_807DB58
bl pal_fill_for_maplights
bl sub_8111CF0
bl ScriptContext2_Enable
bl player_bitmagic
@@ -3910,7 +3910,7 @@ _080851B8: .4byte sub_8084F44
mapldr_080851BC: @ 80851BC
push {lr}
bl sub_8055DC4
bl sub_807DB58
bl pal_fill_for_maplights
bl sub_8111CF0
bl ScriptContext2_Enable
ldr r0, _080851E0 @ =gUnknown_3005020
@@ -4966,7 +4966,7 @@ _080859C4:
sub_80859D4: @ 80859D4
push {lr}
bl sub_8055DC4
bl sub_807DB58
bl pal_fill_for_maplights
bl sub_8111CF0
bl ScriptContext2_Enable
bl player_bitmagic
@@ -5432,7 +5432,7 @@ _08085D84: .4byte sub_8085B78
sub_8085D88: @ 8085D88
push {lr}
bl sub_8055DC4
bl sub_807DB58
bl pal_fill_for_maplights
bl sub_8111CF0
bl ScriptContext2_Enable
bl player_bitmagic
asm/field_fadetransition.s
+33 -33
View File
@@ -5,8 +5,8 @@
.text
thumb_func_start sub_807DB14
sub_807DB14: @ 807DB14
thumb_func_start palette_bg_faded_fill_white
palette_bg_faded_fill_white: @ 807DB14
push {lr}
sub sp, 0x4
ldr r0, _0807DB2C @ =0x7fff7fff
@@ -22,10 +22,10 @@ sub_807DB14: @ 807DB14
_0807DB2C: .4byte 0x7fff7fff
_0807DB30: .4byte gUnknown_20375F8
_0807DB34: .4byte 0x01000100
thumb_func_end sub_807DB14
thumb_func_end palette_bg_faded_fill_white
thumb_func_start sub_807DB38
sub_807DB38: @ 807DB38
thumb_func_start palette_bg_faded_fill_black
palette_bg_faded_fill_black: @ 807DB38
push {lr}
sub sp, 0x4
movs r0, 0
@@ -40,10 +40,10 @@ sub_807DB38: @ 807DB38
.align 2, 0
_0807DB50: .4byte gUnknown_20375F8
_0807DB54: .4byte 0x01000100
thumb_func_end sub_807DB38
thumb_func_end palette_bg_faded_fill_black
thumb_func_start sub_807DB58
sub_807DB58: @ 807DB58
thumb_func_start pal_fill_for_maplights
pal_fill_for_maplights: @ 807DB58
push {r4,lr}
bl get_map_light_from_warp0
adds r4, r0, 0
@@ -63,23 +63,23 @@ sub_807DB58: @ 807DB58
beq _0807DB94
b _0807DBA4
_0807DB82:
bl sub_807DB38
bl palette_bg_faded_fill_black
movs r0, 0
movs r1, 0
bl fade_screen
bl sub_807DB38
bl palette_bg_faded_fill_black
b _0807DBA4
_0807DB94:
bl sub_807DB14
bl palette_bg_faded_fill_white
movs r0, 0x2
movs r1, 0
bl fade_screen
bl sub_807DB14
bl palette_bg_faded_fill_white
_0807DBA4:
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_807DB58
thumb_func_end pal_fill_for_maplights
thumb_func_start sub_807DBAC
sub_807DBAC: @ 807DBAC
@@ -102,18 +102,18 @@ sub_807DBAC: @ 807DBAC
beq _0807DBE8
b _0807DBF8
_0807DBD6:
bl sub_807DB38
bl palette_bg_faded_fill_black
movs r0, 0
movs r1, 0x3
bl fade_screen
bl sub_807DB38
bl palette_bg_faded_fill_black
b _0807DBF8
_0807DBE8:
bl sub_807DB14
bl palette_bg_faded_fill_white
movs r0, 0x2
movs r1, 0x3
bl fade_screen
bl sub_807DB14
bl palette_bg_faded_fill_white
_0807DBF8:
pop {r4}
pop {r0}
@@ -123,11 +123,11 @@ _0807DBF8:
thumb_func_start sub_807DC00
sub_807DC00: @ 807DC00
push {lr}
bl sub_807DB38
bl palette_bg_faded_fill_black
movs r0, 0
movs r1, 0
bl fade_screen
bl sub_807DB38
bl palette_bg_faded_fill_black
pop {r0}
bx r0
thumb_func_end sub_807DC00
@@ -343,7 +343,7 @@ _0807DD9A:
ldrb r0, [r1, 0x4]
cmp r0, 0x1
beq _0807DDCA
bl sub_807DB58
bl pal_fill_for_maplights
_0807DDB0:
ldrh r0, [r4, 0x8]
adds r0, 0x1
@@ -367,7 +367,7 @@ sub_807DDD0: @ 807DDD0
push {lr}
bl ScriptContext2_Enable
bl sub_8055DC4
bl sub_807DB38
bl palette_bg_faded_fill_black
ldr r0, _0807DDEC @ =task_mpl_807DD60
movs r1, 0xA
bl CreateTask
@@ -410,7 +410,7 @@ _0807DE24:
lsls r0, 24
cmp r0, 0
beq _0807DE50
bl sub_807DB58
bl pal_fill_for_maplights
_0807DE32:
ldrh r0, [r4, 0x8]
adds r0, 0x1
@@ -435,7 +435,7 @@ sub_807DE58: @ 807DE58
push {lr}
bl ScriptContext2_Enable
bl sub_8055DC4
bl sub_807DB38
bl palette_bg_faded_fill_black
ldr r0, _0807DE74 @ =sub_807DDF0
movs r1, 0xA
bl CreateTask
@@ -491,10 +491,10 @@ sub_807DE78: @ 807DE78
.align 2, 0
_0807DED8: .4byte sub_807DFBC
_0807DEDC:
bl sub_807DB38
bl palette_bg_faded_fill_black
b _0807DF2E
_0807DEE2:
bl sub_807DB14
bl palette_bg_faded_fill_white
b _0807DF2E
_0807DEE8:
adds r0, r5, 0
@@ -551,7 +551,7 @@ sub_807DF4C: @ 807DF4C
lsls r0, 24
cmp r0, 0
bne _0807DF5A
bl sub_807DB58
bl pal_fill_for_maplights
b _0807DF5E
_0807DF5A:
bl sub_807DC00
@@ -588,7 +588,7 @@ sub_807DF7C: @ 807DF7C
sub_807DF94: @ 807DF94
push {lr}
bl sub_8055DC4
bl sub_807DB58
bl pal_fill_for_maplights
bl sub_8111CF0
movs r0, 0x28
bl sub_80722CC
@@ -1090,8 +1090,8 @@ sub_807E3BC: @ 807E3BC
bx r1
thumb_func_end sub_807E3BC
thumb_func_start sub_807E3C8
sub_807E3C8: @ 807E3C8
thumb_func_start task_mpl_807E3C8
task_mpl_807E3C8: @ 807E3C8
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -1106,7 +1106,7 @@ _0807E3E4:
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_807E3C8
thumb_func_end task_mpl_807E3C8
thumb_func_start sub_807E3EC
sub_807E3EC: @ 807E3EC
@@ -1114,13 +1114,13 @@ sub_807E3EC: @ 807E3EC
bl ScriptContext2_Enable
bl sub_8055DC4
bl sub_807DC00
ldr r0, _0807E408 @ =sub_807E3C8
ldr r0, _0807E408 @ =task_mpl_807E3C8
movs r1, 0xA
bl CreateTask
pop {r0}
bx r0
.align 2, 0
_0807E408: .4byte sub_807E3C8
_0807E408: .4byte task_mpl_807E3C8
thumb_func_end sub_807E3EC
thumb_func_start sub_807E40C
@@ -2189,7 +2189,7 @@ sub_807EC34: @ 807EC34
_0807EC6C: .4byte gUnknown_3005098
_0807EC70:
bl sub_8055DC4
bl sub_807DB58
bl pal_fill_for_maplights
bl ScriptContext2_Enable
adds r0, r5, 0x2
adds r1, r5, 0x4
asm/field_map_obj.s
+103 -103
View File
@@ -757,7 +757,7 @@ sub_805E384: @ 805E384
cmp r0, 0xE
bhi _0805E39A
ldrh r0, [r1, 0x14]
bl sub_806E680
bl FlagSet
_0805E39A:
pop {r0}
bx r0
@@ -806,7 +806,7 @@ _0805E3D8:
cmp r0, r8
bne _0805E3FA
ldrh r0, [r4, 0x14]
bl sub_806E6D0
bl FlagGet
lsls r0, 24
cmp r0, 0
beq _0805E3BC
@@ -952,7 +952,7 @@ RemoveFieldObjectByLocalIdAndMap: @ 805E4C8
bl GetFieldObjectFlagIdByFieldObjectId
lsls r0, 16
lsrs r0, 16
bl sub_806E680
bl FlagSet
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -1271,7 +1271,7 @@ SpawnFieldObject: @ 805E72C
add r2, sp, 0x20
mov r0, r9
add r1, sp, 0x8
bl sub_805E960
bl MakeObjectTemplateFromFieldObjectTemplate
ldrh r3, [r7, 0x6]
ldr r2, _0805E7A4 @ =0xffff0000
add r1, sp, 0x24
@@ -1517,8 +1517,8 @@ _0805E936:
bx r0
thumb_func_end sub_805E8E8
thumb_func_start sub_805E940
sub_805E940: @ 805E940
thumb_func_start MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex
MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex: @ 805E940
push {r4,lr}
lsls r0, 16
lsrs r0, 16
@@ -1533,10 +1533,10 @@ sub_805E940: @ 805E940
bx r0
.align 2, 0
_0805E95C: .4byte gUnknown_839FBC8
thumb_func_end sub_805E940
thumb_func_end MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex
thumb_func_start sub_805E960
sub_805E960: @ 805E960
thumb_func_start MakeObjectTemplateFromFieldObjectTemplate
MakeObjectTemplateFromFieldObjectTemplate: @ 805E960
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -1544,14 +1544,14 @@ sub_805E960: @ 805E960
ldrb r0, [r4, 0x1]
ldrb r1, [r4, 0x9]
adds r2, r5, 0
bl sub_805E940
bl MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex
pop {r4,r5}
pop {r0}
bx r0
thumb_func_end sub_805E960
thumb_func_end MakeObjectTemplateFromFieldObjectTemplate
thumb_func_start sub_805E978
sub_805E978: @ 805E978
thumb_func_start AddPseudoFieldObject
AddPseudoFieldObject: @ 805E978
push {r4-r6,lr}
sub sp, 0x1C
ldr r4, [sp, 0x2C]
@@ -1612,7 +1612,7 @@ _0805E9E4:
.align 2, 0
_0805E9F0: .4byte 0x0000ffff
_0805E9F4: .4byte gUnknown_202063C
thumb_func_end sub_805E978
thumb_func_end AddPseudoFieldObject
thumb_func_start sub_805E9F8
sub_805E9F8: @ 805E9F8
@@ -1968,7 +1968,7 @@ _0805EC86:
cmp r0, r1
blt _0805ECEC
ldrh r0, [r4, 0x14]
bl sub_806E6D0
bl FlagGet
lsls r0, 24
cmp r0, 0
bne _0805ECEC
@@ -2005,8 +2005,8 @@ _0805ED08: .4byte gUnknown_2036DFC
_0805ED0C: .4byte gUnknown_3005008
thumb_func_end sub_805EC30
thumb_func_start sub_805ED10
sub_805ED10: @ 805ED10
thumb_func_start RemoveFieldObjectsOutsideView
RemoveFieldObjectsOutsideView: @ 805ED10
push {r4-r6,lr}
movs r3, 0
ldr r6, _0805ED64 @ =gUnknown_2031DEC
@@ -2043,7 +2043,7 @@ _0805ED2E:
cmp r0, 0x1
bne _0805ED56
adds r0, r2, 0
bl sub_805ED70
bl RemoveFieldObjectIfOutsideView
_0805ED56:
lsls r0, r5, 24
lsrs r3, r0, 24
@@ -2056,10 +2056,10 @@ _0805ED56:
_0805ED64: .4byte gUnknown_2031DEC
_0805ED68: .4byte gUnknown_2036E38
_0805ED6C: .4byte 0x00010001
thumb_func_end sub_805ED10
thumb_func_end RemoveFieldObjectsOutsideView
thumb_func_start sub_805ED70
sub_805ED70: @ 805ED70
thumb_func_start RemoveFieldObjectIfOutsideView
RemoveFieldObjectIfOutsideView: @ 805ED70
push {r4-r7,lr}
adds r3, r0, 0
ldr r0, _0805EDEC @ =gUnknown_3005008
@@ -2125,7 +2125,7 @@ _0805EDE4:
bx r0
.align 2, 0
_0805EDEC: .4byte gUnknown_3005008
thumb_func_end sub_805ED70
thumb_func_end RemoveFieldObjectIfOutsideView
thumb_func_start sub_805EDF0
sub_805EDF0: @ 805EDF0
@@ -2225,7 +2225,7 @@ _0805EE70:
ldrb r1, [r6, 0x6]
add r3, sp, 0x20
mov r2, sp
bl sub_805E940
bl MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex
str r4, [sp, 0xC]
mov r0, sp
ldr r2, _0805EFEC @ =0x0000ffff
@@ -2767,7 +2767,7 @@ sub_805F2C8: @ 805F2C8
adds r0, 0x10
lsls r0, 24
lsrs r0, 24
bl sub_806E5A4
bl VarGetFieldObjectGraphicsId
adds r1, r0, 0
_0805F2E0:
cmp r1, 0x97
@@ -2794,7 +2794,7 @@ FieldObjectHandleDynamicGraphicsId: @ 805F2F8
adds r0, 0x10
lsls r0, 24
lsrs r0, 24
bl sub_806E5A4
bl VarGetFieldObjectGraphicsId
strb r0, [r4, 0x5]
_0805F30E:
pop {r4}
@@ -3669,7 +3669,7 @@ UpdateFieldObjectsForCameraUpdate: @ 805F924
adds r0, r4, 0
adds r1, r5, 0
bl sub_805EC30
bl sub_805ED10
bl RemoveFieldObjectsOutsideView
pop {r4,r5}
pop {r0}
bx r0
@@ -13278,8 +13278,8 @@ _08063D96:
bx r1
thumb_func_end FieldObjectClearAnimIfSpecialAnimFinished
thumb_func_start sub_8063DA0
sub_8063DA0: @ 8063DA0
thumb_func_start FieldObjectGetSpecialAnim
FieldObjectGetSpecialAnim: @ 8063DA0
push {lr}
adds r1, r0, 0
ldrb r0, [r1]
@@ -13293,7 +13293,7 @@ _08063DB0:
_08063DB2:
pop {r1}
bx r1
thumb_func_end sub_8063DA0
thumb_func_end FieldObjectGetSpecialAnim
thumb_func_start FieldObjectStep
FieldObjectStep: @ 8063DB8
@@ -13335,7 +13335,7 @@ _08063DF8:
bl DoGroundEffects_OnFinishStep
adds r0, r4, 0
adds r1, r5, 0
bl sub_80679AC
bl npc_obj_transfer_image_anim_pause_flag
adds r0, r4, 0
adds r1, r5, 0
bl sub_80679F8
@@ -13404,7 +13404,7 @@ _08063E88:
bl DoGroundEffects_OnFinishStep
adds r0, r4, 0
adds r1, r5, 0
bl sub_80679AC
bl npc_obj_transfer_image_anim_pause_flag
adds r0, r4, 0
adds r1, r5, 0
bl sub_80679F8
@@ -14609,8 +14609,8 @@ sub_8064678: @ 8064678
bx r0
thumb_func_end sub_8064678
thumb_func_start sub_80646FC
sub_80646FC: @ 80646FC
thumb_func_start do_go_anim
do_go_anim: @ 80646FC
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -14654,10 +14654,10 @@ sub_80646FC: @ 80646FC
bx r0
.align 2, 0
_08064754: .4byte gUnknown_83A6884
thumb_func_end sub_80646FC
thumb_func_end do_go_anim
thumb_func_start sub_8064758
sub_8064758: @ 8064758
thumb_func_start do_run_anim
do_run_anim: @ 8064758
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -14678,10 +14678,10 @@ sub_8064758: @ 8064758
pop {r4,r5}
pop {r0}
bx r0
thumb_func_end sub_8064758
thumb_func_end do_run_anim
thumb_func_start sub_8064788
sub_8064788: @ 8064788
thumb_func_start npc_obj_ministep_stop_on_arrival
npc_obj_ministep_stop_on_arrival: @ 8064788
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -14710,7 +14710,7 @@ _080647BA:
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end sub_8064788
thumb_func_end npc_obj_ministep_stop_on_arrival
thumb_func_start sub_80647C0
sub_80647C0: @ 80647C0
@@ -15496,7 +15496,7 @@ sub_8064D3C: @ 8064D3C
adds r5, r1, 0
movs r2, 0x1
movs r3, 0
bl sub_80646FC
bl do_go_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_8064D5C
@@ -15511,7 +15511,7 @@ sub_8064D3C: @ 8064D3C
sub_8064D5C: @ 8064D5C
push {r4,lr}
adds r4, r1, 0
bl sub_8064788
bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _08064D6E
@@ -15534,7 +15534,7 @@ sub_8064D7C: @ 8064D7C
adds r5, r1, 0
movs r2, 0x2
movs r3, 0
bl sub_80646FC
bl do_go_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_8064D9C
@@ -15549,7 +15549,7 @@ sub_8064D7C: @ 8064D7C
sub_8064D9C: @ 8064D9C
push {r4,lr}
adds r4, r1, 0
bl sub_8064788
bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _08064DAE
@@ -15572,7 +15572,7 @@ sub_8064DBC: @ 8064DBC
adds r5, r1, 0
movs r2, 0x3
movs r3, 0
bl sub_80646FC
bl do_go_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_8064DDC
@@ -15587,7 +15587,7 @@ sub_8064DBC: @ 8064DBC
sub_8064DDC: @ 8064DDC
push {r4,lr}
adds r4, r1, 0
bl sub_8064788
bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _08064DEE
@@ -15610,7 +15610,7 @@ sub_8064DFC: @ 8064DFC
adds r5, r1, 0
movs r2, 0x4
movs r3, 0
bl sub_80646FC
bl do_go_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_8064E1C
@@ -15625,7 +15625,7 @@ sub_8064DFC: @ 8064DFC
sub_8064E1C: @ 8064E1C
push {r4,lr}
adds r4, r1, 0
bl sub_8064788
bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _08064E2E
@@ -16287,7 +16287,7 @@ sub_80652CC: @ 80652CC
adds r5, r1, 0
movs r2, 0x1
movs r3, 0x1
bl sub_80646FC
bl do_go_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_80652EC
@@ -16302,7 +16302,7 @@ sub_80652CC: @ 80652CC
sub_80652EC: @ 80652EC
push {r4,lr}
adds r4, r1, 0
bl sub_8064788
bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _080652FE
@@ -16325,7 +16325,7 @@ sub_806530C: @ 806530C
adds r5, r1, 0
movs r2, 0x2
movs r3, 0x1
bl sub_80646FC
bl do_go_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_806532C
@@ -16340,7 +16340,7 @@ sub_806530C: @ 806530C
sub_806532C: @ 806532C
push {r4,lr}
adds r4, r1, 0
bl sub_8064788
bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _0806533E
@@ -16363,7 +16363,7 @@ sub_806534C: @ 806534C
adds r5, r1, 0
movs r2, 0x3
movs r3, 0x1
bl sub_80646FC
bl do_go_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_806536C
@@ -16378,7 +16378,7 @@ sub_806534C: @ 806534C
sub_806536C: @ 806536C
push {r4,lr}
adds r4, r1, 0
bl sub_8064788
bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _0806537E
@@ -16401,7 +16401,7 @@ sub_806538C: @ 806538C
adds r5, r1, 0
movs r2, 0x4
movs r3, 0x1
bl sub_80646FC
bl do_go_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_80653AC
@@ -16416,7 +16416,7 @@ sub_806538C: @ 806538C
sub_80653AC: @ 80653AC
push {r4,lr}
adds r4, r1, 0
bl sub_8064788
bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _080653BE
@@ -17386,7 +17386,7 @@ sub_8065AF0: @ 8065AF0
adds r5, r1, 0
movs r2, 0x1
movs r3, 0x2
bl sub_80646FC
bl do_go_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_8065B10
@@ -17401,7 +17401,7 @@ sub_8065AF0: @ 8065AF0
sub_8065B10: @ 8065B10
push {r4,lr}
adds r4, r1, 0
bl sub_8064788
bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _08065B22
@@ -17424,7 +17424,7 @@ sub_8065B30: @ 8065B30
adds r5, r1, 0
movs r2, 0x2
movs r3, 0x2
bl sub_80646FC
bl do_go_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_8065B50
@@ -17439,7 +17439,7 @@ sub_8065B30: @ 8065B30
sub_8065B50: @ 8065B50
push {r4,lr}
adds r4, r1, 0
bl sub_8064788
bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _08065B62
@@ -17462,7 +17462,7 @@ sub_8065B70: @ 8065B70
adds r5, r1, 0
movs r2, 0x3
movs r3, 0x2
bl sub_80646FC
bl do_go_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_8065B90
@@ -17477,7 +17477,7 @@ sub_8065B70: @ 8065B70
sub_8065B90: @ 8065B90
push {r4,lr}
adds r4, r1, 0
bl sub_8064788
bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _08065BA2
@@ -17500,7 +17500,7 @@ sub_8065BB0: @ 8065BB0
adds r5, r1, 0
movs r2, 0x4
movs r3, 0x2
bl sub_80646FC
bl do_go_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_8065BD0
@@ -17515,7 +17515,7 @@ sub_8065BB0: @ 8065BB0
sub_8065BD0: @ 8065BD0
push {r4,lr}
adds r4, r1, 0
bl sub_8064788
bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _08065BE2
@@ -17538,7 +17538,7 @@ sub_8065BF0: @ 8065BF0
adds r5, r1, 0
movs r2, 0x1
movs r3, 0x3
bl sub_80646FC
bl do_go_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_8065C10
@@ -17553,7 +17553,7 @@ sub_8065BF0: @ 8065BF0
sub_8065C10: @ 8065C10
push {r4,lr}
adds r4, r1, 0
bl sub_8064788
bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _08065C22
@@ -17576,7 +17576,7 @@ sub_8065C30: @ 8065C30
adds r5, r1, 0
movs r2, 0x2
movs r3, 0x3
bl sub_80646FC
bl do_go_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_8065C50
@@ -17591,7 +17591,7 @@ sub_8065C30: @ 8065C30
sub_8065C50: @ 8065C50
push {r4,lr}
adds r4, r1, 0
bl sub_8064788
bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _08065C62
@@ -17614,7 +17614,7 @@ sub_8065C70: @ 8065C70
adds r5, r1, 0
movs r2, 0x3
movs r3, 0x3
bl sub_80646FC
bl do_go_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_8065C90
@@ -17629,7 +17629,7 @@ sub_8065C70: @ 8065C70
sub_8065C90: @ 8065C90
push {r4,lr}
adds r4, r1, 0
bl sub_8064788
bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _08065CA2
@@ -17652,7 +17652,7 @@ sub_8065CB0: @ 8065CB0
adds r5, r1, 0
movs r2, 0x4
movs r3, 0x3
bl sub_80646FC
bl do_go_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_8065CD0
@@ -17667,7 +17667,7 @@ sub_8065CB0: @ 8065CB0
sub_8065CD0: @ 8065CD0
push {r4,lr}
adds r4, r1, 0
bl sub_8064788
bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _08065CE2
@@ -17690,7 +17690,7 @@ sub_8065CF0: @ 8065CF0
adds r5, r1, 0
movs r2, 0x1
movs r3, 0x4
bl sub_80646FC
bl do_go_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_8065D10
@@ -17705,7 +17705,7 @@ sub_8065CF0: @ 8065CF0
sub_8065D10: @ 8065D10
push {r4,lr}
adds r4, r1, 0
bl sub_8064788
bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _08065D22
@@ -17728,7 +17728,7 @@ sub_8065D30: @ 8065D30
adds r5, r1, 0
movs r2, 0x2
movs r3, 0x4
bl sub_80646FC
bl do_go_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_8065D50
@@ -17743,7 +17743,7 @@ sub_8065D30: @ 8065D30
sub_8065D50: @ 8065D50
push {r4,lr}
adds r4, r1, 0
bl sub_8064788
bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _08065D62
@@ -17766,7 +17766,7 @@ sub_8065D70: @ 8065D70
adds r5, r1, 0
movs r2, 0x3
movs r3, 0x4
bl sub_80646FC
bl do_go_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_8065D90
@@ -17781,7 +17781,7 @@ sub_8065D70: @ 8065D70
sub_8065D90: @ 8065D90
push {r4,lr}
adds r4, r1, 0
bl sub_8064788
bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _08065DA2
@@ -17804,7 +17804,7 @@ sub_8065DB0: @ 8065DB0
adds r5, r1, 0
movs r2, 0x4
movs r3, 0x4
bl sub_80646FC
bl do_go_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_8065DD0
@@ -17819,7 +17819,7 @@ sub_8065DB0: @ 8065DB0
sub_8065DD0: @ 8065DD0
push {r4,lr}
adds r4, r1, 0
bl sub_8064788
bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _08065DE2
@@ -17841,7 +17841,7 @@ sub_8065DF0: @ 8065DF0
adds r4, r0, 0
adds r5, r1, 0
movs r2, 0x1
bl sub_8064758
bl do_run_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_8065E10
@@ -17856,7 +17856,7 @@ sub_8065DF0: @ 8065DF0
sub_8065E10: @ 8065E10
push {r4,lr}
adds r4, r1, 0
bl sub_8064788
bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _08065E22
@@ -17878,7 +17878,7 @@ sub_8065E30: @ 8065E30
adds r4, r0, 0
adds r5, r1, 0
movs r2, 0x2
bl sub_8064758
bl do_run_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_8065E50
@@ -17893,7 +17893,7 @@ sub_8065E30: @ 8065E30
sub_8065E50: @ 8065E50
push {r4,lr}
adds r4, r1, 0
bl sub_8064788
bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _08065E62
@@ -17915,7 +17915,7 @@ sub_8065E70: @ 8065E70
adds r4, r0, 0
adds r5, r1, 0
movs r2, 0x3
bl sub_8064758
bl do_run_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_8065E90
@@ -17930,7 +17930,7 @@ sub_8065E70: @ 8065E70
sub_8065E90: @ 8065E90
push {r4,lr}
adds r4, r1, 0
bl sub_8064788
bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _08065EA2
@@ -17952,7 +17952,7 @@ sub_8065EB0: @ 8065EB0
adds r4, r0, 0
adds r5, r1, 0
movs r2, 0x4
bl sub_8064758
bl do_run_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_8065ED0
@@ -17967,7 +17967,7 @@ sub_8065EB0: @ 8065EB0
sub_8065ED0: @ 8065ED0
push {r4,lr}
adds r4, r1, 0
bl sub_8064788
bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _08065EE2
@@ -21029,7 +21029,7 @@ sub_806741C: @ 806741C
sub_806743C: @ 806743C
push {r4,lr}
adds r4, r1, 0
bl sub_8064788
bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _0806744E
@@ -21067,7 +21067,7 @@ sub_806745C: @ 806745C
sub_806747C: @ 806747C
push {r4,lr}
adds r4, r1, 0
bl sub_8064788
bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _0806748E
@@ -21105,7 +21105,7 @@ sub_806749C: @ 806749C
sub_80674BC: @ 80674BC
push {r4,lr}
adds r4, r1, 0
bl sub_8064788
bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _080674CE
@@ -21143,7 +21143,7 @@ sub_80674DC: @ 80674DC
sub_80674FC: @ 80674FC
push {r4,lr}
adds r4, r1, 0
bl sub_8064788
bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _0806750E
@@ -21206,7 +21206,7 @@ sub_806754C: @ 806754C
sub_806756C: @ 806756C
push {r4,lr}
adds r4, r1, 0
bl sub_8064788
bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _0806757E
@@ -21244,7 +21244,7 @@ sub_806758C: @ 806758C
sub_80675AC: @ 80675AC
push {r4,lr}
adds r4, r1, 0
bl sub_8064788
bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _080675BE
@@ -21282,7 +21282,7 @@ sub_80675CC: @ 80675CC
sub_80675EC: @ 80675EC
push {r4,lr}
adds r4, r1, 0
bl sub_8064788
bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _080675FE
@@ -21320,7 +21320,7 @@ sub_806760C: @ 806760C
sub_806762C: @ 806762C
push {r4,lr}
adds r4, r1, 0
bl sub_8064788
bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _0806763E
@@ -21386,7 +21386,7 @@ sub_8067684: @ 8067684
sub_80676A4: @ 80676A4
push {r4,lr}
adds r4, r1, 0
bl sub_8064788
bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _080676B6
@@ -21424,7 +21424,7 @@ sub_80676C4: @ 80676C4
sub_80676E4: @ 80676E4
push {r4,lr}
adds r4, r1, 0
bl sub_8064788
bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _080676F6
@@ -21462,7 +21462,7 @@ sub_8067704: @ 8067704
sub_8067724: @ 8067724
push {r4,lr}
adds r4, r1, 0
bl sub_8064788
bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _08067736
@@ -21500,7 +21500,7 @@ sub_8067744: @ 8067744
sub_8067764: @ 8067764
push {r4,lr}
adds r4, r1, 0
bl sub_8064788
bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _08067776
@@ -21842,8 +21842,8 @@ sub_80679A8: @ 80679A8
bx lr
thumb_func_end sub_80679A8
thumb_func_start sub_80679AC
sub_80679AC: @ 80679AC
thumb_func_start npc_obj_transfer_image_anim_pause_flag
npc_obj_transfer_image_anim_pause_flag: @ 80679AC
push {lr}
ldrb r0, [r0, 0x1]
lsls r0, 29
@@ -21858,7 +21858,7 @@ sub_80679AC: @ 80679AC
_080679C2:
pop {r0}
bx r0
thumb_func_end sub_80679AC
thumb_func_end npc_obj_transfer_image_anim_pause_flag
thumb_func_start sub_80679C8
sub_80679C8: @ 80679C8
asm/field_message_box.s
+13 -13
View File
@@ -108,8 +108,8 @@ _08069402:
_08069408: .4byte gUnknown_203709C
thumb_func_end sub_8069370
thumb_func_start sub_806940C
sub_806940C: @ 806940C
thumb_func_start task_add_textbox
task_add_textbox: @ 806940C
push {lr}
ldr r0, _0806941C @ =sub_8069370
movs r1, 0x50
@@ -118,10 +118,10 @@ sub_806940C: @ 806940C
bx r0
.align 2, 0
_0806941C: .4byte sub_8069370
thumb_func_end sub_806940C
thumb_func_end task_add_textbox
thumb_func_start sub_8069420
sub_8069420: @ 8069420
thumb_func_start task_del_textbox
task_del_textbox: @ 8069420
push {lr}
ldr r0, _08069438 @ =sub_8069370
bl FindTaskIdByFunc
@@ -135,10 +135,10 @@ _08069434:
bx r0
.align 2, 0
_08069438: .4byte sub_8069370
thumb_func_end sub_8069420
thumb_func_end task_del_textbox
thumb_func_start sub_806943C
sub_806943C: @ 806943C
thumb_func_start ShowFieldMessage
ShowFieldMessage: @ 806943C
push {r4,lr}
adds r1, r0, 0
ldr r4, _08069458 @ =gUnknown_203709C
@@ -159,7 +159,7 @@ _0806945E:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_806943C
thumb_func_end ShowFieldMessage
thumb_func_start ShowFieldAutoScrollMessage
ShowFieldAutoScrollMessage: @ 8069464
@@ -227,7 +227,7 @@ textbox_fdecode_auto_and_task_add: @ 80694C8
bl sub_8008FCC
movs r0, 0x1
bl sub_80F6D5C
bl sub_806940C
bl task_add_textbox
pop {r0}
bx r0
.align 2, 0
@@ -239,7 +239,7 @@ textbox_auto_and_task_add: @ 80694E4
push {lr}
movs r0, 0x1
bl sub_80F6D5C
bl sub_806940C
bl task_add_textbox
pop {r0}
bx r0
thumb_func_end textbox_auto_and_task_add
@@ -247,7 +247,7 @@ textbox_auto_and_task_add: @ 80694E4
thumb_func_start HideFieldMessageBox
HideFieldMessageBox: @ 80694F4
push {lr}
bl sub_8069420
bl task_del_textbox
movs r0, 0
movs r1, 0x1
bl sub_80F6F54
@@ -290,7 +290,7 @@ _08069532:
thumb_func_start sub_8069538
sub_8069538: @ 8069538
push {lr}
bl sub_8069420
bl task_del_textbox
movs r0, 0
movs r1, 0x1
bl sub_80F6F1C
asm/field_player_avatar.s
+51 -51
View File
@@ -66,7 +66,7 @@ sub_805B3E0: @ 805B3E0
cmp r0, 0
bne _0805B448
adds r0, r5, 0
bl sub_805B4B0
bl npc_clear_strange_bits
bl sub_805BE08
bl sub_805B5A0
lsls r0, 24
@@ -75,8 +75,8 @@ sub_805B3E0: @ 805B3E0
adds r0, r6, 0
mov r1, r8
adds r2, r7, 0
bl sub_805B4D4
bl sub_805B50C
bl MovePlayerAvatarUsingKeypadInput
bl PlayerAllowForcedMovementIfMovingSameDirection
_0805B448:
pop {r3}
mov r8, r3
@@ -104,7 +104,7 @@ sub_805B45C: @ 805B45C
cmp r0, 0
bne _0805B4A6
adds r0, r4, 0
bl sub_8063DA0
bl FieldObjectGetSpecialAnim
lsls r0, 24
movs r1, 0xDF
lsls r1, 24
@@ -132,8 +132,8 @@ _0805B4A8:
bx r1
thumb_func_end sub_805B45C
thumb_func_start sub_805B4B0
sub_805B4B0: @ 805B4B0
thumb_func_start npc_clear_strange_bits
npc_clear_strange_bits: @ 805B4B0
ldrb r2, [r0, 0x1]
movs r1, 0x11
negs r1, r1
@@ -152,10 +152,10 @@ sub_805B4B0: @ 805B4B0
bx lr
.align 2, 0
_0805B4D0: .4byte gUnknown_2037078
thumb_func_end sub_805B4B0
thumb_func_end npc_clear_strange_bits
thumb_func_start sub_805B4D4
sub_805B4D4: @ 805B4D4
thumb_func_start MovePlayerAvatarUsingKeypadInput
MovePlayerAvatarUsingKeypadInput: @ 805B4D4
push {r4,lr}
lsls r0, 24
lsrs r3, r0, 24
@@ -178,15 +178,15 @@ _0805B4F8: .4byte gUnknown_2037078
_0805B4FC:
adds r0, r3, 0
adds r1, r2, 0
bl sub_805B93C
bl MovePlayerNotOnBike
_0805B504:
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_805B4D4
thumb_func_end MovePlayerAvatarUsingKeypadInput
thumb_func_start sub_805B50C
sub_805B50C: @ 805B50C
thumb_func_start PlayerAllowForcedMovementIfMovingSameDirection
PlayerAllowForcedMovementIfMovingSameDirection: @ 805B50C
push {lr}
ldr r2, _0805B524 @ =gUnknown_2037078
ldrb r0, [r2, 0x2]
@@ -201,7 +201,7 @@ _0805B51E:
bx r0
.align 2, 0
_0805B524: .4byte gUnknown_2037078
thumb_func_end sub_805B50C
thumb_func_end PlayerAllowForcedMovementIfMovingSameDirection
thumb_func_start sub_805B528
sub_805B528: @ 805B528
@@ -776,8 +776,8 @@ sub_805B930: @ 805B930
bx r1
thumb_func_end sub_805B930
thumb_func_start sub_805B93C
sub_805B93C: @ 805B93C
thumb_func_start MovePlayerNotOnBike
MovePlayerNotOnBike: @ 805B93C
push {r4-r6,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -787,7 +787,7 @@ sub_805B93C: @ 805B93C
lsrs r5, 16
ldr r6, _0805B968 @ =gUnknown_835B814
adds r0, r4, 0
bl sub_805B96C
bl CheckMovementInputNotOnBike
lsls r0, 24
lsrs r0, 22
adds r0, r6
@@ -800,10 +800,10 @@ sub_805B93C: @ 805B93C
bx r0
.align 2, 0
_0805B968: .4byte gUnknown_835B814
thumb_func_end sub_805B93C
thumb_func_end MovePlayerNotOnBike
thumb_func_start sub_805B96C
sub_805B96C: @ 805B96C
thumb_func_start CheckMovementInputNotOnBike
CheckMovementInputNotOnBike: @ 805B96C
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -840,10 +840,10 @@ _0805B9A6:
bx r1
.align 2, 0
_0805B9AC: .4byte gUnknown_2037078
thumb_func_end sub_805B96C
thumb_func_end CheckMovementInputNotOnBike
thumb_func_start sub_805B9B0
sub_805B9B0: @ 805B9B0
thumb_func_start PlayerNotOnBikeNotMoving
PlayerNotOnBikeNotMoving: @ 805B9B0
push {lr}
bl player_get_direction_lower_nybble
lsls r0, 24
@@ -851,7 +851,7 @@ sub_805B9B0: @ 805B9B0
bl sub_805C1F4
pop {r0}
bx r0
thumb_func_end sub_805B9B0
thumb_func_end PlayerNotOnBikeNotMoving
thumb_func_start sub_805B9C4
sub_805B9C4: @ 805B9C4
@@ -915,7 +915,7 @@ _0805BA30:
cmp r5, 0
beq _0805BA8C
ldr r0, _0805BA6C @ =0x0000082f
bl sub_806E6D0
bl FlagGet
lsls r0, 24
cmp r0, 0
beq _0805BA8C
@@ -1277,7 +1277,7 @@ sub_805BCEC: @ 805BCEC
lsls r2, 24
lsrs r7, r2, 24
ldr r0, _0805BD98 @ =0x00000805
bl sub_806E6D0
bl FlagGet
lsls r0, 24
cmp r0, 0
beq _0805BDA0
@@ -1342,7 +1342,7 @@ sub_805BCEC: @ 805BCEC
_0805BD8A:
adds r0, r6, 0
adds r1, r7, 0
bl sub_805CCD0
bl task_add_bump_boulder
movs r0, 0x1
b _0805BDA2
.align 2, 0
@@ -2707,7 +2707,7 @@ sub_805C780: @ 805C780
ldr r0, _0805C7C4 @ =gUnknown_2036E38
adds r4, r0
adds r0, r4, 0
bl sub_805B4B0
bl npc_clear_strange_bits
ldrb r1, [r4, 0x18]
lsls r1, 28
lsrs r1, 28
@@ -2805,8 +2805,8 @@ _0805C838:
bx r1
thumb_func_end sub_805C824
thumb_func_start sub_805C83C
sub_805C83C: @ 805C83C
thumb_func_start PartyHasMonWithSurf
PartyHasMonWithSurf: @ 805C83C
push {r4,r5,lr}
movs r0, 0x8
bl TestPlayerAvatarFlags
@@ -2849,10 +2849,10 @@ _0805C882:
bx r1
.align 2, 0
_0805C888: .4byte gUnknown_2024284
thumb_func_end sub_805C83C
thumb_func_end PartyHasMonWithSurf
thumb_func_start sub_805C88C
sub_805C88C: @ 805C88C
thumb_func_start IsPlayerSurfingNorth
IsPlayerSurfingNorth: @ 805C88C
push {lr}
bl player_get_direction_upper_nybble
lsls r0, 24
@@ -2871,10 +2871,10 @@ _0805C8AA:
_0805C8AC:
pop {r1}
bx r1
thumb_func_end sub_805C88C
thumb_func_end IsPlayerSurfingNorth
thumb_func_start sub_805C8B0
sub_805C8B0: @ 805C8B0
thumb_func_start IsPlayerFacingSurfableFishableWater
IsPlayerFacingSurfableFishableWater: @ 805C8B0
push {r4,r5,lr}
sub sp, 0x4
ldr r0, _0805C924 @ =gUnknown_2037078
@@ -2938,7 +2938,7 @@ _0805C92E:
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end sub_805C8B0
thumb_func_end IsPlayerFacingSurfableFishableWater
thumb_func_start sub_805C938
sub_805C938: @ 805C938
@@ -3430,8 +3430,8 @@ _0805CCC2:
bx r0
thumb_func_end sub_805CC40
thumb_func_start sub_805CCD0
sub_805CCD0: @ 805CCD0
thumb_func_start task_add_bump_boulder
task_add_bump_boulder: @ 805CCD0
push {r4-r6,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -3439,7 +3439,7 @@ sub_805CCD0: @ 805CCD0
lsrs r4, 24
lsls r5, 24
lsrs r5, 24
ldr r6, _0805CD04 @ =sub_805CD0C
ldr r6, _0805CD04 @ =taskFF_bump_boulder
adds r0, r6, 0
movs r1, 0xFF
bl CreateTask
@@ -3457,12 +3457,12 @@ sub_805CCD0: @ 805CCD0
pop {r0}
bx r0
.align 2, 0
_0805CD04: .4byte sub_805CD0C
_0805CD04: .4byte taskFF_bump_boulder
_0805CD08: .4byte gUnknown_3005090
thumb_func_end sub_805CCD0
thumb_func_end task_add_bump_boulder
thumb_func_start sub_805CD0C
sub_805CD0C: @ 805CD0C
thumb_func_start taskFF_bump_boulder
taskFF_bump_boulder: @ 805CD0C
push {r4-r6,lr}
lsls r0, 24
lsrs r0, 24
@@ -3504,7 +3504,7 @@ _0805CD54: .4byte gUnknown_835B8A0
_0805CD58: .4byte gUnknown_3005090
_0805CD5C: .4byte gUnknown_2036E38
_0805CD60: .4byte gUnknown_2037078
thumb_func_end sub_805CD0C
thumb_func_end taskFF_bump_boulder
thumb_func_start sub_805CD64
sub_805CD64: @ 805CD64
@@ -3624,7 +3624,7 @@ sub_805CE20: @ 805CE20
movs r0, 0
strb r0, [r1, 0x6]
bl ScriptContext2_Disable
ldr r0, _0805CE7C @ =sub_805CD0C
ldr r0, _0805CE7C @ =taskFF_bump_boulder
bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
@@ -3636,7 +3636,7 @@ _0805CE70:
bx r1
.align 2, 0
_0805CE78: .4byte gUnknown_2037078
_0805CE7C: .4byte sub_805CD0C
_0805CE7C: .4byte taskFF_bump_boulder
thumb_func_end sub_805CE20
thumb_func_start sub_805CE80
@@ -4452,7 +4452,7 @@ _0805D4D4:
str r5, [sp, 0x8]
movs r0, 0
movs r1, 0x2
bl sub_8002C48
bl PrintTextOnWindow
ldrh r0, [r4, 0xC]
adds r0, 0x1
strh r0, [r4, 0xC]
@@ -4676,7 +4676,7 @@ sub_805D66C: @ 805D66C
movs r0, 0
movs r1, 0x2
movs r3, 0x1
bl sub_80F6CD0
bl AddTextPrinterParametrized
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -4851,7 +4851,7 @@ sub_805D7C0: @ 805D7C0
movs r0, 0
movs r1, 0x2
movs r3, 0x1
bl sub_80F6CD0
bl AddTextPrinterParametrized
movs r0, 0xD
strh r0, [r6, 0x8]
movs r0, 0x1
@@ -4904,7 +4904,7 @@ sub_805D838: @ 805D838
movs r0, 0
movs r1, 0x2
movs r3, 0x1
bl sub_80F6CD0
bl AddTextPrinterParametrized
ldrh r0, [r6, 0x8]
adds r0, 0x1
strh r0, [r6, 0x8]
asm/field_poison.s
+2 -2
View File
@@ -206,7 +206,7 @@ _080A05D0:
ldrb r0, [r4, 0x2]
bl sub_80A04B8
ldr r0, _080A05E4 @ =gUnknown_81A5476
bl sub_806943C
bl ShowFieldMessage
ldrh r0, [r4]
adds r0, 0x1
strh r0, [r4]
@@ -291,7 +291,7 @@ _080A0668:
cmp r7, 0
beq _080A067C
_080A0678:
bl sub_80A0E48
bl overworld_poison_effect
_080A067C:
cmp r6, 0
beq _080A0688
asm/field_screen_effect.s
+7 -7
View File
@@ -306,7 +306,7 @@ sub_807F028: @ 807F028
lsls r0, 24
lsrs r0, 24
adds r4, r0, 0
bl sub_8055D30
bl sav1_get_flash_used_on_map
lsls r0, 24
lsrs r0, 24
movs r5, 0
@@ -877,9 +877,9 @@ _0807F4A8:
bl PutWindowTilemap
adds r0, r5, 0
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
movs r0, 0x1
bl sub_80BFCB0
bl GetHealLocationPointer
adds r3, r0, 0
ldr r0, _0807F520 @ =gUnknown_3005008
ldr r2, [r0]
@@ -970,10 +970,10 @@ _0807F588:
bl ClearWindowTilemap
adds r0, r5, 0
movs r1, 0x1
bl sub_8003F20
bl CopyWindowToVram
adds r0, r5, 0
bl sub_8003E3C
bl sub_807DB38
bl RemoveWindow
bl palette_bg_faded_fill_black
bl sub_807DC00
ldrh r0, [r4, 0x8]
adds r0, 0x1
@@ -1010,7 +1010,7 @@ _0807F5EC: .4byte gUnknown_81A8DD8
sub_807F5F0: @ 807F5F0
push {lr}
bl ScriptContext2_Enable
bl sub_807DB38
bl palette_bg_faded_fill_black
ldr r0, _0807F618 @ =sub_807F45C
movs r1, 0xA
bl CreateTask
asm/field_specials.s
+90 -90
View File
@@ -77,7 +77,7 @@ _080CA688:
sub_80CA68C: @ 80CA68C
push {lr}
ldr r0, _080CA698 @ =gUnknown_2021D18
bl sub_806943C
bl ShowFieldMessage
pop {r0}
bx r0
.align 2, 0
@@ -190,7 +190,7 @@ sub_80CA758: @ 80CA758
push {lr}
ldr r0, _080CA768 @ =gUnknown_20370C0
ldrh r0, [r0]
bl sub_806E680
bl FlagSet
pop {r0}
bx r0
.align 2, 0
@@ -700,7 +700,7 @@ sub_80CAB08: @ 80CAB08
movs r0, 0x2A
bl sub_8054E90
ldr r0, _080CAB3C @ =0x0000083b
bl sub_806E680
bl FlagSet
movs r1, 0x1
mov r0, sp
strb r1, [r0]
@@ -753,7 +753,7 @@ _080CAB72:
sub_80CAB78: @ 80CAB78
push {r4-r6,lr}
ldr r0, _080CABB4 @ =0x00004031
bl sub_806E568
bl VarGet
lsls r0, 16
lsrs r0, 16
bl sub_80CBD94
@@ -1074,7 +1074,7 @@ sub_80CADC4: @ 80CADC4
movs r1, 0x2
add r2, sp, 0xC
movs r3, 0
bl sub_8002C48
bl PrintTextOnWindow
bl sub_809D424
add sp, 0x10
pop {r0}
@@ -1384,12 +1384,12 @@ sub_80CB054: @ 80CB054
push {r4-r6,lr}
ldr r5, _080CB08C @ =0x00004035
adds r0, r5, 0
bl sub_806E568
bl VarGet
lsls r0, 16
lsrs r4, r0, 16
ldr r6, _080CB090 @ =0x00004036
adds r0, r6, 0
bl sub_806E568
bl VarGet
lsls r0, 16
cmp r0, 0
beq _080CB0A0
@@ -1400,10 +1400,10 @@ sub_80CB054: @ 80CB054
bls _080CB098
ldr r1, _080CB094 @ =0x0000ffff
adds r0, r6, 0
bl sub_806E584
bl VarSet
adds r0, r5, 0
movs r1, 0
bl sub_806E584
bl VarSet
b _080CB0A0
.align 2, 0
_080CB08C: .4byte 0x00004035
@@ -1412,7 +1412,7 @@ _080CB094: .4byte 0x0000ffff
_080CB098:
adds r0, r5, 0
adds r1, r4, 0
bl sub_806E584
bl VarSet
_080CB0A0:
pop {r4-r6}
pop {r0}
@@ -1424,7 +1424,7 @@ sub_80CB0A8: @ 80CB0A8
push {r4,lr}
ldr r4, _080CB10C @ =0x00004036
adds r0, r4, 0
bl sub_806E568
bl VarGet
lsls r0, 16
lsrs r1, r0, 16
cmp r1, 0
@@ -1438,21 +1438,21 @@ _080CB0C0:
lsls r1, 16
lsrs r1, 16
adds r0, r4, 0
bl sub_806E584
bl VarSet
ldr r4, _080CB114 @ =0x0000403b
bl sub_80CB198
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
adds r0, r4, 0
bl sub_806E584
bl VarSet
ldr r0, _080CB118 @ =0x00004035
movs r1, 0
bl sub_806E584
bl VarSet
_080CB0EA:
ldr r4, _080CB11C @ =gUnknown_2021CD0
ldr r0, _080CB10C @ =0x00004036
bl sub_806E568
bl VarGet
lsls r0, 16
lsrs r0, 16
movs r1, 0xB
@@ -1735,7 +1735,7 @@ _080CB312:
_080CB314:
ldr r0, _080CB324 @ =0x0000403a
adds r1, r3, 0
bl sub_806E584
bl VarSet
pop {r4}
pop {r0}
bx r0
@@ -2088,7 +2088,7 @@ sub_80CB580: @ 80CB580
str r6, [sp, 0x8]
movs r1, 0x2
movs r3, 0
bl sub_8002C48
bl PrintTextOnWindow
ldr r1, _080CB634 @ =gUnknown_83F5B44
ldr r0, _080CB638 @ =gUnknown_20370C2
ldrh r0, [r0]
@@ -2112,12 +2112,12 @@ sub_80CB580: @ 80CB580
adds r0, r1, 0
movs r1, 0x2
adds r2, r5, 0
bl sub_8002C48
bl PrintTextOnWindow
ldrb r0, [r4]
bl PutWindowTilemap
ldrb r0, [r4]
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
_080CB614:
add sp, 0xC
pop {r3}
@@ -2143,7 +2143,7 @@ sub_80CB63C: @ 80CB63C
movs r1, 0x1
bl sub_810F4D8
ldrb r0, [r4]
bl sub_8003E3C
bl RemoveWindow
pop {r4}
pop {r0}
bx r0
@@ -2620,7 +2620,7 @@ _080CB9D2:
str r0, [sp, 0xC]
add r0, sp, 0x10
movs r1, 0
bl sub_810FE50
bl SetWindowTemplateFields
ldr r0, [sp, 0x10]
ldr r1, [sp, 0x14]
str r0, [sp, 0x18]
@@ -2656,7 +2656,7 @@ _080CB9D2:
lsls r0, 24
lsrs r0, 24
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
ldr r1, _080CBA74 @ =gUnknown_3005090
mov r2, r10
adds r0, r2, r7
@@ -2876,11 +2876,11 @@ sub_80CBBAC: @ 80CBBAC
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
ldrh r0, [r4, 0x22]
lsls r0, 24
lsrs r0, 24
bl sub_8003E3C
bl RemoveWindow
adds r0, r5, 0
bl DestroyTask
bl EnableBothScriptContexts
@@ -3108,7 +3108,7 @@ _080CBDAC: .4byte gUnknown_83F5D2C
sub_80CBDB0: @ 80CBDB0
push {lr}
ldr r0, _080CBDC8 @ =0x00004031
bl sub_806E568
bl VarGet
lsls r0, 16
lsrs r0, 16
bl sub_80CBD94
@@ -3179,7 +3179,7 @@ _080CBE20:
adds r0, 0x10
lsls r0, 24
lsrs r0, 24
bl sub_806E5A4
bl VarGetFieldObjectGraphicsId
lsls r0, 24
lsrs r0, 24
_080CBE40:
@@ -3669,7 +3669,7 @@ sub_80CC204: @ 80CC204
push {r4,lr}
movs r4, 0
ldr r0, _080CC2A4 @ =0x0000089b
bl sub_806E6D0
bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3677,7 +3677,7 @@ sub_80CC204: @ 80CC204
movs r4, 0x1
_080CC218:
ldr r0, _080CC2A8 @ =0x0000089c
bl sub_806E6D0
bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3686,7 +3686,7 @@ _080CC218:
orrs r4, r0
_080CC22A:
ldr r0, _080CC2AC @ =0x0000089d
bl sub_806E6D0
bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3697,7 +3697,7 @@ _080CC22A:
lsrs r4, r0, 24
_080CC240:
ldr r0, _080CC2B0 @ =0x0000089e
bl sub_806E6D0
bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3708,7 +3708,7 @@ _080CC240:
lsrs r4, r0, 24
_080CC256:
ldr r0, _080CC2B4 @ =0x0000089f
bl sub_806E6D0
bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3719,7 +3719,7 @@ _080CC256:
lsrs r4, r0, 24
_080CC26C:
ldr r0, _080CC2B8 @ =0x000008a1
bl sub_806E6D0
bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3731,7 +3731,7 @@ _080CC26C:
_080CC282:
movs r0, 0x8A
lsls r0, 4
bl sub_806E6D0
bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3811,7 +3811,7 @@ _080CC318:
lsls r1, 16
lsrs r1, 16
adds r0, r4, 0
bl sub_806E584
bl VarSet
adds r4, 0x1
mov r0, sp
ldrh r0, [r0, 0x2]
@@ -3821,7 +3821,7 @@ _080CC318:
lsls r1, 16
lsrs r1, 16
adds r0, r4, 0
bl sub_806E584
bl VarSet
adds r4, 0x1
mov r0, sp
ldrh r0, [r0, 0x4]
@@ -3831,7 +3831,7 @@ _080CC318:
lsls r1, 16
lsrs r1, 16
adds r0, r4, 0
bl sub_806E584
bl VarSet
adds r4, 0x1
mov r0, sp
ldrh r0, [r0, 0x6]
@@ -3841,7 +3841,7 @@ _080CC318:
lsls r1, 16
lsrs r1, 16
adds r0, r4, 0
bl sub_806E584
bl VarSet
adds r4, 0x1
mov r0, sp
ldrh r0, [r0, 0x8]
@@ -3851,7 +3851,7 @@ _080CC318:
lsls r1, 16
lsrs r1, 16
adds r0, r4, 0
bl sub_806E584
bl VarSet
adds r4, 0x1
mov r0, sp
ldrh r0, [r0, 0xA]
@@ -3861,11 +3861,11 @@ _080CC318:
lsls r1, 16
lsrs r1, 16
adds r0, r4, 0
bl sub_806E584
bl VarSet
ldr r0, _080CC3C4 @ =0x00004042
ldr r1, _080CC3C8 @ =gUnknown_20370C0
ldrh r1, [r1]
bl sub_806E584
bl VarSet
add sp, 0x24
pop {r4-r7}
pop {r0}
@@ -4099,7 +4099,7 @@ _080CC53C:
bne _080CC58C
ldr r5, _080CC584 @ =0x0000404d
adds r0, r5, 0
bl sub_806E568
bl VarGet
lsls r0, 16
lsrs r0, 16
cmp r0, 0x23
@@ -4109,9 +4109,9 @@ _080CC53C:
_080CC56A:
adds r0, r5, 0
adds r1, r4, 0
bl sub_806E584
bl VarSet
ldr r0, _080CC588 @ =0x00000808
bl sub_806E680
bl FlagSet
b _080CC596
.align 2, 0
_080CC57C: .4byte gUnknown_3005008
@@ -4135,7 +4135,7 @@ sub_80CC59C: @ 80CC59C
push {r4-r7,lr}
sub sp, 0x8
ldr r0, _080CC5F8 @ =0x0000404d
bl sub_806E568
bl VarGet
lsls r0, 16
lsrs r5, r0, 16
ldr r6, _080CC5FC @ =0xffffff00
@@ -4145,7 +4145,7 @@ sub_80CC59C: @ 80CC59C
ands r0, r4
str r0, [sp, 0x4]
ldr r0, _080CC604 @ =0x00000808
bl sub_806E6D0
bl FlagGet
lsls r0, 24
cmp r0, 0
bne _080CC5C4
@@ -4237,7 +4237,7 @@ _080CC668:
_080CC66C:
bl sub_8113550
ldr r0, _080CC678 @ =0x00000808
bl sub_806E6A8
bl FlagClear
b _080CC71E
.align 2, 0
_080CC678: .4byte 0x00000808
@@ -4310,14 +4310,14 @@ _080CC6FC:
bl sub_8113550
ldr r4, _080CC728 @ =0x00000808
adds r0, r4, 0
bl sub_806E6A8
bl FlagClear
cmp r5, 0x23
bne _080CC71E
ldr r0, _080CC72C @ =0x0000404d
movs r1, 0x20
bl sub_806E584
bl VarSet
adds r0, r4, 0
bl sub_806E680
bl FlagSet
_080CC71E:
add sp, 0x8
pop {r4-r7}
@@ -4408,7 +4408,7 @@ sub_80CC7B4: @ 80CC7B4
push {r4,r5,lr}
ldr r5, _080CC7E8 @ =0x00000843
adds r0, r5, 0
bl sub_806E6D0
bl FlagGet
lsls r0, 24
cmp r0, 0
bne _080CC7F0
@@ -4417,13 +4417,13 @@ sub_80CC7B4: @ 80CC7B4
lsls r4, 24
lsrs r4, 24
ldr r0, _080CC7EC @ =0x00004037
bl sub_806E568
bl VarGet
lsls r0, 16
lsrs r0, 16
cmp r4, r0
beq _080CC7F0
adds r0, r5, 0
bl sub_806E680
bl FlagSet
movs r0, 0x1
b _080CC7F2
.align 2, 0
@@ -4441,7 +4441,7 @@ _080CC7F2:
sub_80CC7F8: @ 80CC7F8
push {r4-r7,lr}
ldr r0, _080CC850 @ =0x00004037
bl sub_806E568
bl VarGet
lsls r0, 24
lsrs r0, 24
bl sub_80CC79C
@@ -4468,11 +4468,11 @@ _080CC816:
cmp r0, r4
beq _080CC83E
ldr r0, _080CC854 @ =0x00000843
bl sub_806E6A8
bl FlagClear
_080CC83E:
ldr r0, _080CC850 @ =0x00004037
lsrs r1, r7, 16
bl sub_806E584
bl VarSet
bl sub_80CC7B4
lsls r0, 24
lsrs r0, 24
@@ -4589,7 +4589,7 @@ sub_80CC918: @ 80CC918
push {r4,lr}
ldr r4, _080CC940 @ =0x00004025
adds r0, r4, 0
bl sub_806E568
bl VarGet
lsls r0, 16
lsrs r1, r0, 16
ldr r0, _080CC944 @ =0x000001f3
@@ -4599,7 +4599,7 @@ sub_80CC918: @ 80CC918
lsls r1, 16
lsrs r1, 16
adds r0, r4, 0
bl sub_806E584
bl VarSet
_080CC938:
pop {r4}
pop {r0}
@@ -4622,7 +4622,7 @@ sub_80CC948: @ 80CC948
bl sub_80436F8
ldr r0, _080CC970 @ =0x00004025
movs r1, 0
bl sub_806E584
bl VarSet
pop {r0}
bx r0
.align 2, 0
@@ -4645,7 +4645,7 @@ sub_80CC974: @ 80CC974
ldr r6, _080CC9AC @ =gUnknown_3005098
adds r4, r5, r6
movs r0, 0x3
bl sub_806E6D0
bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -4724,12 +4724,12 @@ sub_80CCA18: @ 80CCA18
cmp r0, 0
bne _080CCAE6
movs r0, 0x2
bl sub_806E6D0
bl FlagGet
lsls r0, 24
cmp r0, 0
beq _080CCAE6
movs r0, 0x5
bl sub_806E6D0
bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -4819,7 +4819,7 @@ sub_80CCAF4: @ 80CCAF4
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0x4
bl sub_806E6D0
bl FlagGet
lsls r0, 24
cmp r0, 0
beq _080CCB5A
@@ -4991,7 +4991,7 @@ _080CCC5C:
movs r0, 0xB8
lsls r0, 2
_080CCC6E:
bl sub_806E6D0
bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -5069,7 +5069,7 @@ sub_80CCCF8: @ 80CCCF8
cmp r0, 0xF
bne _080CCD14
ldr r0, _080CCD10 @ =0x000002de
bl sub_806E680
bl FlagSet
b _080CCD2C
.align 2, 0
_080CCD0C: .4byte gUnknown_20370C2
@@ -5078,17 +5078,17 @@ _080CCD14:
cmp r0, 0x10
bne _080CCD24
ldr r0, _080CCD20 @ =0x000002df
bl sub_806E680
bl FlagSet
b _080CCD2C
.align 2, 0
_080CCD20: .4byte 0x000002df
_080CCD24:
movs r0, 0xB8
lsls r0, 2
bl sub_806E680
bl FlagSet
_080CCD2C:
ldr r0, _080CCD74 @ =0x000002de
bl sub_806E6D0
bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -5098,7 +5098,7 @@ _080CCD2C:
lsrs r4, r0, 24
_080CCD40:
ldr r0, _080CCD78 @ =0x000002df
bl sub_806E6D0
bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -5109,7 +5109,7 @@ _080CCD40:
_080CCD54:
movs r0, 0xB8
lsls r0, 2
bl sub_806E6D0
bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -5137,7 +5137,7 @@ _080CCD7E:
sub_80CCD84: @ 80CCD84
push {lr}
ldr r0, _080CCDB8 @ =0x000002e3
bl sub_806E6D0
bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -5183,7 +5183,7 @@ sub_80CCDD0: @ 80CCDD0
movs r0, 0x14
bl sub_80722CC
ldr r0, _080CCDF8 @ =0x000002e3
bl sub_806E680
bl FlagSet
bl ScriptContext2_Disable
pop {r0}
bx r0
@@ -5211,7 +5211,7 @@ sub_80CCE10: @ 80CCE10
lsls r0, 24
lsrs r7, r0, 24
ldr r0, _080CCE30 @ =0x00000848
bl sub_806E6D0
bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -5225,17 +5225,17 @@ _080CCE34: .4byte gUnknown_20370D0
_080CCE38:
ldr r0, _080CCE80 @ =0x0000403e
mov r8, r0
bl sub_806E568
bl VarGet
lsls r0, 16
lsrs r5, r0, 16
ldr r4, _080CCE84 @ =0x00004026
adds r0, r4, 0
bl sub_806E568
bl VarGet
lsls r0, 16
lsrs r6, r0, 16
adds r0, r4, 0
movs r1, 0
bl sub_806E584
bl VarSet
cmp r5, 0
beq _080CCE90
ldr r0, _080CCE88 @ =gUnknown_83F637C
@@ -5248,7 +5248,7 @@ _080CCE38:
bl sub_80CCEE8
mov r0, r8
movs r1, 0
bl sub_806E584
bl VarSet
ldr r1, _080CCE8C @ =gUnknown_20370D0
movs r0, 0
strh r0, [r1]
@@ -5262,7 +5262,7 @@ _080CCE90:
cmp r5, 0xA
bne _080CCEB4
ldr r0, _080CCEAC @ =0x00000848
bl sub_806E680
bl FlagSet
ldr r1, _080CCEB0 @ =gUnknown_20370D0
movs r0, 0x2
_080CCE9E:
@@ -5284,7 +5284,7 @@ _080CCEB4:
bl sub_80CCEE8
ldr r0, _080CCEE0 @ =0x0000403e
adds r1, r5, 0
bl sub_806E584
bl VarSet
ldr r1, _080CCEE4 @ =gUnknown_20370D0
movs r0, 0x1
strh r0, [r1]
@@ -5409,7 +5409,7 @@ sub_80CCFBC: @ 80CCFBC
push {r4,lr}
ldr r4, _080CCFEC @ =0x00004026
adds r0, r4, 0
bl sub_806E568
bl VarGet
lsls r0, 16
lsrs r2, r0, 16
ldr r0, _080CCFF0 @ =gUnknown_3005008
@@ -5425,7 +5425,7 @@ sub_80CCFBC: @ 80CCFBC
bls _080CCFF8
adds r0, r4, 0
movs r1, 0
bl sub_806E584
bl VarSet
b _080CD000
.align 2, 0
_080CCFEC: .4byte 0x00004026
@@ -5434,7 +5434,7 @@ _080CCFF4: .4byte 0x00003802
_080CCFF8:
adds r0, r4, 0
adds r1, r2, 0
bl sub_806E584
bl VarSet
_080CD000:
pop {r4}
pop {r0}
@@ -5445,7 +5445,7 @@ _080CD000:
sub_80CD008: @ 80CD008
push {lr}
ldr r0, _080CD02C @ =0x0000403e
bl sub_806E568
bl VarGet
lsls r0, 24
lsrs r0, 19
ldr r1, _080CD030 @ =gUnknown_83F6206
@@ -5623,41 +5623,41 @@ sub_80CD154: @ 80CD154
cmp r4, 0x18
bls _080CD1AE
movs r0, 0xA5
bl sub_806E6A8
bl FlagClear
cmp r4, 0x31
bls _080CD172
movs r0, 0xA6
bl sub_806E6A8
bl FlagClear
_080CD172:
cmp r4, 0x4A
bls _080CD17C
movs r0, 0xA7
bl sub_806E6A8
bl FlagClear
_080CD17C:
cmp r4, 0x63
bls _080CD186
movs r0, 0xA8
bl sub_806E6A8
bl FlagClear
_080CD186:
cmp r4, 0x7C
bls _080CD190
movs r0, 0xA9
bl sub_806E6A8
bl FlagClear
_080CD190:
cmp r4, 0x95
bls _080CD19A
movs r0, 0xAA
bl sub_806E6A8
bl FlagClear
_080CD19A:
cmp r4, 0xAE
bls _080CD1A4
movs r0, 0xAB
bl sub_806E6A8
bl FlagClear
_080CD1A4:
cmp r4, 0xC7
bls _080CD1AE
movs r0, 0xAC
bl sub_806E6A8
bl FlagClear
_080CD1AE:
pop {r4}
pop {r0}
asm/field_tasks.s
+8 -8
View File
@@ -201,7 +201,7 @@ _0806E966:
cmp r0, r1
bne _0806E98C
adds r0, r3, 0x1
bl sub_806E680
bl FlagSet
b _0806E996
.align 2, 0
_0806E988: .4byte gUnknown_83A7330
@@ -226,7 +226,7 @@ sub_806E99C: @ 806E99C
_0806E9A4:
adds r5, r4, 0x1
adds r0, r5, 0
bl sub_806E6D0
bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -326,7 +326,7 @@ _0806EA52:
lsls r0, 24
lsrs r6, r0, 24
adds r0, r6, 0
bl sub_8059FF4
bl MetatileBehavior_IsThinIce
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -343,7 +343,7 @@ _0806EA52:
b _0806EAA2
_0806EA8E:
adds r0, r6, 0
bl sub_805A008
bl MetatileBehavior_IsCrackedIce
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -425,7 +425,7 @@ _0806EB04:
bl CurrentMapDrawMetatileAt
ldr r0, _0806EB50 @ =0x00004001
movs r1, 0x1
bl sub_806E584
bl VarSet
_0806EB3E:
movs r0, 0x1
strh r0, [r5, 0x2]
@@ -644,7 +644,7 @@ _0806ECCE:
beq _0806ECF8
ldr r0, _0806ED14 @ =0x00004030
movs r1, 0
bl sub_806E584
bl VarSet
_0806ECF8:
movs r1, 0x8
ldrsh r0, [r5, r1]
@@ -684,9 +684,9 @@ _0806ED2E:
sub_806ED38: @ 806ED38
push {lr}
ldr r0, _0806ED4C @ =0x00000829
bl sub_806E680
bl FlagSet
ldr r0, _0806ED50 @ =0x00000828
bl sub_806E680
bl FlagSet
pop {r0}
bx r0
.align 2, 0
asm/field_weather.s
+12 -12
View File
@@ -2768,8 +2768,8 @@ _0807B0FA:
bx r0
thumb_func_end sub_807B0C4
thumb_func_start sub_807B100
sub_807B100: @ 807B100
thumb_func_start SetSav1Weather
SetSav1Weather: @ 807B100
push {r4,r5,lr}
ldr r4, _0807B12C @ =gUnknown_3005008
ldr r1, [r4]
@@ -2791,10 +2791,10 @@ sub_807B100: @ 807B100
bx r0
.align 2, 0
_0807B12C: .4byte gUnknown_3005008
thumb_func_end sub_807B100
thumb_func_end SetSav1Weather
thumb_func_start sub_807B130
sub_807B130: @ 807B130
thumb_func_start sav1_get_weather_probably
sav1_get_weather_probably: @ 807B130
ldr r0, _0807B13C @ =gUnknown_3005008
ldr r0, [r0]
adds r0, 0x2E
@@ -2802,7 +2802,7 @@ sub_807B130: @ 807B130
bx lr
.align 2, 0
_0807B13C: .4byte gUnknown_3005008
thumb_func_end sub_807B130
thumb_func_end sav1_get_weather_probably
thumb_func_start sub_807B140
sub_807B140: @ 807B140
@@ -2833,8 +2833,8 @@ _0807B170: .4byte gUnknown_2036DFC
thumb_func_start sub_807B174
sub_807B174: @ 807B174
push {lr}
bl sub_807B100
bl sub_807B130
bl SetSav1Weather
bl sav1_get_weather_probably
lsls r0, 24
lsrs r0, 24
bl weather_set
@@ -2845,8 +2845,8 @@ sub_807B174: @ 807B174
thumb_func_start sub_807B18C
sub_807B18C: @ 807B18C
push {lr}
bl sub_807B100
bl sub_807B130
bl SetSav1Weather
bl sav1_get_weather_probably
lsls r0, 24
lsrs r0, 24
bl sub_8079D60
@@ -2857,7 +2857,7 @@ sub_807B18C: @ 807B18C
thumb_func_start sub_807B1A4
sub_807B1A4: @ 807B1A4
push {lr}
bl sub_807B130
bl sav1_get_weather_probably
lsls r0, 24
lsrs r0, 24
bl weather_set
@@ -2868,7 +2868,7 @@ sub_807B1A4: @ 807B1A4
thumb_func_start sub_807B1B8
sub_807B1B8: @ 807B1B8
push {lr}
bl sub_807B130
bl sav1_get_weather_probably
lsls r0, 24
lsrs r0, 24
bl sub_8079D60
asm/fldeff_cut.s
+2 -2
View File
@@ -145,7 +145,7 @@ sub_8097984: @ 8097984
push {lr}
movs r0, 0x1
bl FieldEffectStart
bl sub_811FB0C
bl GetCursorSelectionMonId
ldr r1, _0809799C @ =gUnknown_20386E0
lsls r0, 24
lsrs r0, 24
@@ -184,7 +184,7 @@ _080979CC: .4byte sub_8097A20
thumb_func_start sub_80979D0
sub_80979D0: @ 80979D0
push {lr}
bl sub_811FB0C
bl GetCursorSelectionMonId
ldr r1, _080979E8 @ =gUnknown_20386E0
lsls r0, 24
lsrs r0, 24
asm/fldeff_flash.s
+4 -4
View File
@@ -13,7 +13,7 @@ sub_80C9B2C: @ 80C9B2C
cmp r0, 0x1
bne _080C9B6C
ldr r0, _080C9B58 @ =0x00000806
bl sub_806E6D0
bl FlagGet
lsls r0, 24
cmp r0, 0
bne _080C9B6C
@@ -46,7 +46,7 @@ sub_80C9B74: @ 80C9B74
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
bl sub_811FB0C
bl GetCursorSelectionMonId
ldr r1, _080C9BA4 @ =gUnknown_20386E0
lsls r0, 24
lsrs r0, 24
@@ -75,7 +75,7 @@ sub_80C9BB0: @ 80C9BB0
movs r0, 0xC8
bl sub_80722CC
ldr r0, _080C9BC8 @ =0x00000806
bl sub_806E680
bl FlagSet
ldr r0, _080C9BCC @ =gUnknown_81BFB5F
bl ScriptContext1_SetupScript
pop {r0}
@@ -865,7 +865,7 @@ _080CA208:
lsls r0, 24
lsrs r0, 24
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
b _080CA294
_080CA224:
bl IsDma3ManagerBusyWithBgCopy
asm/fldeff_poison.s
+13 -13
View File
@@ -5,8 +5,8 @@
.text
thumb_func_start sub_80A0DD8
sub_80A0DD8: @ 80A0DD8
thumb_func_start task50_overworld_poison_effect
task50_overworld_poison_effect: @ 80A0DD8
push {lr}
lsls r0, 24
lsrs r2, r0, 24
@@ -66,33 +66,33 @@ _080A0E32:
_080A0E42:
pop {r0}
bx r0
thumb_func_end sub_80A0DD8
thumb_func_end task50_overworld_poison_effect
thumb_func_start sub_80A0E48
sub_80A0E48: @ 80A0E48
thumb_func_start overworld_poison_effect
overworld_poison_effect: @ 80A0E48
push {lr}
movs r0, 0x48
bl sub_80722CC
ldr r0, _080A0E5C @ =sub_80A0DD8
ldr r0, _080A0E5C @ =task50_overworld_poison_effect
movs r1, 0x50
bl CreateTask
pop {r0}
bx r0
.align 2, 0
_080A0E5C: .4byte sub_80A0DD8
thumb_func_end sub_80A0E48
_080A0E5C: .4byte task50_overworld_poison_effect
thumb_func_end overworld_poison_effect
thumb_func_start sub_80A0E60
sub_80A0E60: @ 80A0E60
thumb_func_start c3_80A0DD8_is_running
c3_80A0DD8_is_running: @ 80A0E60
push {lr}
ldr r0, _080A0E70 @ =sub_80A0DD8
ldr r0, _080A0E70 @ =task50_overworld_poison_effect
bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
.align 2, 0
_080A0E70: .4byte sub_80A0DD8
thumb_func_end sub_80A0E60
_080A0E70: .4byte task50_overworld_poison_effect
thumb_func_end c3_80A0DD8_is_running
.align 2, 0 @ Don't pad with nop.
asm/fldeff_softboiled.s
+3 -3
View File
@@ -8,7 +8,7 @@
thumb_func_start hm_prepare_dive_probably
hm_prepare_dive_probably: @ 80E5684
push {r4-r6,lr}
bl sub_811FB0C
bl GetCursorSelectionMonId
lsls r0, 24
lsrs r0, 24
movs r6, 0x64
@@ -20,7 +20,7 @@ hm_prepare_dive_probably: @ 80E5684
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
bl sub_811FB0C
bl GetCursorSelectionMonId
lsls r0, 24
lsrs r0, 24
muls r0, r6
@@ -60,7 +60,7 @@ sub_80E56DC: @ 80E56DC
strb r1, [r0, 0xB]
ldrb r1, [r0, 0x9]
strb r1, [r0, 0xA]
bl sub_811FB0C
bl GetCursorSelectionMonId
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
asm/fldeff_strength.s
+2 -2
View File
@@ -24,7 +24,7 @@ _080D0808:
b _080D0826
_080D080C:
ldr r4, _080D082C @ =gUnknown_20370D0
bl sub_811FB0C
bl GetCursorSelectionMonId
lsls r0, 24
lsrs r0, 24
strh r0, [r4]
@@ -50,7 +50,7 @@ _080D083C: .4byte sub_80D0840
thumb_func_start sub_80D0840
sub_80D0840: @ 80D0840
push {lr}
bl sub_811FB0C
bl GetCursorSelectionMonId
ldr r1, _080D0858 @ =gUnknown_20386E0
lsls r0, 24
lsrs r0, 24
asm/fldeff_sweetscent.s
+10 -10
View File
@@ -11,7 +11,7 @@ sub_80DE0B4: @ 80DE0B4
ldr r1, _080DE0C4 @ =gUnknown_203B0A0
movs r0, 0
strb r0, [r1, 0x9]
bl sub_80DE0E8
bl hm2_sweet_scent
pop {r0}
bx r0
.align 2, 0
@@ -24,7 +24,7 @@ sub_80DE0C8: @ 80DE0C8
ldr r0, _080DE0DC @ =hm_add_c3_launch_phase_2
str r0, [r1]
ldr r1, _080DE0E0 @ =gUnknown_203B0C4
ldr r0, _080DE0E4 @ =sub_80DE0E8
ldr r0, _080DE0E4 @ =hm2_sweet_scent
str r0, [r1]
movs r0, 0x1
bx lr
@@ -32,15 +32,15 @@ sub_80DE0C8: @ 80DE0C8
_080DE0D8: .4byte gUnknown_3005024
_080DE0DC: .4byte hm_add_c3_launch_phase_2
_080DE0E0: .4byte gUnknown_203B0C4
_080DE0E4: .4byte sub_80DE0E8
_080DE0E4: .4byte hm2_sweet_scent
thumb_func_end sub_80DE0C8
thumb_func_start sub_80DE0E8
sub_80DE0E8: @ 80DE0E8
thumb_func_start hm2_sweet_scent
hm2_sweet_scent: @ 80DE0E8
push {lr}
movs r0, 0x33
bl FieldEffectStart
bl sub_811FB0C
bl GetCursorSelectionMonId
ldr r1, _080DE100 @ =gUnknown_20386E0
lsls r0, 24
lsrs r0, 24
@@ -49,10 +49,10 @@ sub_80DE0E8: @ 80DE0E8
bx r0
.align 2, 0
_080DE100: .4byte gUnknown_20386E0
thumb_func_end sub_80DE0E8
thumb_func_end hm2_sweet_scent
thumb_func_start sub_80DE104
sub_80DE104: @ 80DE104
thumb_func_start FldEff_SweetScent
FldEff_SweetScent: @ 80DE104
push {lr}
bl sub_807B05C
bl oei_task_add
@@ -73,7 +73,7 @@ sub_80DE104: @ 80DE104
.align 2, 0
_080DE12C: .4byte gUnknown_3005090
_080DE130: .4byte sub_80DE134
thumb_func_end sub_80DE104
thumb_func_end FldEff_SweetScent
thumb_func_start sub_80DE134
sub_80DE134: @ 80DE134
asm/fldeff_teleport.s
+9 -9
View File
@@ -24,7 +24,7 @@ _080F670C:
ldr r0, _080F6724 @ =hm_add_c3_launch_phase_2
str r0, [r1]
ldr r1, _080F6728 @ =gUnknown_203B0C4
ldr r0, _080F672C @ =sub_80F6730
ldr r0, _080F672C @ =hm_teleport_run_dp02scr
str r0, [r1]
movs r0, 0x1
_080F671A:
@@ -34,16 +34,16 @@ _080F671A:
_080F6720: .4byte gUnknown_3005024
_080F6724: .4byte hm_add_c3_launch_phase_2
_080F6728: .4byte gUnknown_203B0C4
_080F672C: .4byte sub_80F6730
_080F672C: .4byte hm_teleport_run_dp02scr
thumb_func_end sub_80F66F0
thumb_func_start sub_80F6730
sub_80F6730: @ 80F6730
thumb_func_start hm_teleport_run_dp02scr
hm_teleport_run_dp02scr: @ 80F6730
push {lr}
bl sub_8054D08
movs r0, 0x3F
bl FieldEffectStart
bl sub_811FB0C
bl GetCursorSelectionMonId
ldr r1, _080F674C @ =gUnknown_20386E0
lsls r0, 24
lsrs r0, 24
@@ -52,10 +52,10 @@ sub_80F6730: @ 80F6730
bx r0
.align 2, 0
_080F674C: .4byte gUnknown_20386E0
thumb_func_end sub_80F6730
thumb_func_end hm_teleport_run_dp02scr
thumb_func_start sub_80F6750
sub_80F6750: @ 80F6750
thumb_func_start FldEff_UseTeleport
FldEff_UseTeleport: @ 80F6750
push {lr}
bl oei_task_add
lsls r0, 24
@@ -77,7 +77,7 @@ sub_80F6750: @ 80F6750
.align 2, 0
_080F6778: .4byte gUnknown_3005090
_080F677C: .4byte sub_80F6780
thumb_func_end sub_80F6750
thumb_func_end FldEff_UseTeleport
thumb_func_start sub_80F6780
sub_80F6780: @ 80F6780
asm/gpu_regs.s
+3 -3
View File
@@ -313,8 +313,8 @@ _08000B8C: .4byte gUnknown_30000C2
_08000B90: .4byte gUnknown_30000C1
thumb_func_end EnableInterrupts
thumb_func_start sub_8000B94
sub_8000B94: @ 8000B94
thumb_func_start DisableInterrupts
DisableInterrupts: @ 8000B94
push {r4,lr}
lsls r0, 16
lsrs r0, 16
@@ -334,7 +334,7 @@ sub_8000B94: @ 8000B94
.align 2, 0
_08000BB8: .4byte gUnknown_30000C2
_08000BBC: .4byte gUnknown_30000C1
thumb_func_end sub_8000B94
thumb_func_end DisableInterrupts
thumb_func_start UpdateRegDispstatIntrBits
UpdateRegDispstatIntrBits: @ 8000BC0
asm/hall_of_fame.s
+20 -20
View File
@@ -27,8 +27,8 @@ sub_80F1DC0: @ 80F1DC0
bx r0
thumb_func_end sub_80F1DC0
thumb_func_start sub_80F1DDC
sub_80F1DDC: @ 80F1DDC
thumb_func_start InitHallOfFameScreen
InitHallOfFameScreen: @ 80F1DDC
push {r4,lr}
sub sp, 0x4
ldr r0, _080F1DFC @ =gUnknown_30030F0
@@ -153,12 +153,12 @@ _080F1EF2:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_80F1DDC
thumb_func_end InitHallOfFameScreen
thumb_func_start sub_80F1EFC
sub_80F1EFC: @ 80F1EFC
push {r4,lr}
bl sub_80F1DDC
bl InitHallOfFameScreen
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0
@@ -191,7 +191,7 @@ _080F1F3C: .4byte gUnknown_203AB38
thumb_func_start sub_80F1F40
sub_80F1F40: @ 80F1F40
push {lr}
bl sub_80F1DDC
bl InitHallOfFameScreen
lsls r0, 24
cmp r0, 0
bne _080F1F66
@@ -521,10 +521,10 @@ _080F21B2:
movs r0, 0
movs r1, 0x2
movs r3, 0
bl sub_80F6CD0
bl AddTextPrinterParametrized
movs r0, 0
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
ldr r1, _080F2218 @ =gUnknown_3005090
mov r0, r8
add r0, r9
@@ -1089,7 +1089,7 @@ _080F2630:
bl FillWindowPixelBuffer
movs r0, 0
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
ldr r1, _080F268C @ =gUnknown_3005090
mov r2, r9
adds r0, r2, r6
@@ -1277,10 +1277,10 @@ _080F27AC:
movs r0, 0
movs r1, 0x2
movs r3, 0
bl sub_80F6CD0
bl AddTextPrinterParametrized
movs r0, 0
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
ldr r0, _080F2800 @ =Task_Hof_ExitOnKeyPressed
str r0, [r4]
_080F27F4:
@@ -1401,7 +1401,7 @@ _080F28B6:
bl HideBg
movs r0, 0x3
bl HideBg
bl sub_8003ECC
bl FreeAllWindowBuffers
movs r0, 0x1
bl UnsetBgTilemapBuffer
movs r0, 0x3
@@ -1444,10 +1444,10 @@ sub_80F2934: @ 80F2934
sub sp, 0x4
ldr r0, _080F2970 @ =0x00004085
movs r1, 0x1
bl sub_806E584
bl VarSet
movs r0, 0x80
lsls r0, 7
bl sub_806E680
bl FlagSet
ldr r1, _080F2974 @ =gUnknown_2031DD8
movs r0, 0x2
strb r0, [r1]
@@ -2299,7 +2299,7 @@ sub_80F3030: @ 80F3030
movs r0, 0x3
bl HideBg
bl sub_810F740
bl sub_8003ECC
bl FreeAllWindowBuffers
movs r0, 0x1
bl UnsetBgTilemapBuffer
movs r0, 0x3
@@ -2358,10 +2358,10 @@ sub_80F30A4: @ 80F30A4
movs r0, 0
movs r1, 0x2
movs r3, 0
bl sub_80F6CD0
bl AddTextPrinterParametrized
movs r0, 0
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
ldr r1, _080F3104 @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
@@ -2439,7 +2439,7 @@ sub_80F313C: @ 80F313C
bl sub_812E51C
movs r0, 0
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
add sp, 0xC
pop {r4,r5}
pop {r0}
@@ -2567,7 +2567,7 @@ _080F327C:
strb r0, [r1]
movs r0, 0x2
movs r1, 0x2
bl sub_80F79D8
bl GetFontAttribute
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -2715,7 +2715,7 @@ _080F3348:
_080F33BA:
movs r0, 0
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
add sp, 0x34
pop {r3}
mov r8, r3
@@ -2960,7 +2960,7 @@ _080F3582:
bl sub_812E51C
movs r0, 0x1
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
add sp, 0x2C
pop {r3-r5}
mov r8, r3
asm/heal_location.s
+14 -14
View File
@@ -5,8 +5,8 @@
.text
thumb_func_start sub_80BFC50
sub_80BFC50: @ 80BFC50
thumb_func_start GetHealLocationIndexFromMapGroupAndNum
GetHealLocationIndexFromMapGroupAndNum: @ 80BFC50
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
@@ -37,16 +37,16 @@ _080BFC82:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_80BFC50
thumb_func_end GetHealLocationIndexFromMapGroupAndNum
thumb_func_start sub_80BFC88
sub_80BFC88: @ 80BFC88
thumb_func_start GetHealLocationPointerFromMapGroupAndNum
GetHealLocationPointerFromMapGroupAndNum: @ 80BFC88
push {lr}
lsls r0, 16
lsrs r0, 16
lsls r1, 16
lsrs r1, 16
bl sub_80BFC50
bl GetHealLocationIndexFromMapGroupAndNum
cmp r0, 0
beq _080BFCA8
lsls r0, 3
@@ -60,10 +60,10 @@ _080BFCA8:
_080BFCAA:
pop {r1}
bx r1
thumb_func_end sub_80BFC88
thumb_func_end GetHealLocationPointerFromMapGroupAndNum
thumb_func_start sub_80BFCB0
sub_80BFCB0: @ 80BFCB0
thumb_func_start GetHealLocationPointer
GetHealLocationPointer: @ 80BFCB0
push {lr}
cmp r0, 0
beq _080BFCC8
@@ -80,7 +80,7 @@ _080BFCC8:
_080BFCCA:
pop {r1}
bx r1
thumb_func_end sub_80BFCB0
thumb_func_end GetHealLocationPointer
thumb_func_start sub_80BFCD0
sub_80BFCD0: @ 80BFCD0
@@ -88,7 +88,7 @@ sub_80BFCD0: @ 80BFCD0
adds r4, r0, 0
ldr r6, _080BFD24 @ =0x00004082
adds r0, r6, 0
bl sub_806E568
bl VarGet
lsls r0, 16
lsrs r5, r0, 16
cmp r5, 0x1
@@ -110,7 +110,7 @@ sub_80BFCD0: @ 80BFCD0
blt _080BFD0A
adds r0, r6, 0
movs r1, 0
bl sub_806E584
bl VarSet
_080BFD0A:
ldr r0, _080BFD34 @ =gUnknown_20370D2
strh r5, [r0]
@@ -143,7 +143,7 @@ _080BFD38:
asrs r1, 24
lsls r1, 16
lsrs r1, 16
bl sub_80BFC50
bl GetHealLocationIndexFromMapGroupAndNum
adds r6, r0, 0
ldr r2, _080BFD80 @ =gUnknown_83EEC98
subs r0, r6, 0x1
@@ -217,7 +217,7 @@ _080BFDC0:
strh r0, [r4, 0x6]
ldr r0, _080BFDE8 @ =0x00004082
movs r1, 0
bl sub_806E584
bl VarSet
b _080BFDF4
.align 2, 0
_080BFDE8: .4byte 0x00004082
asm/help_system.s
+8 -8
View File
@@ -1193,7 +1193,7 @@ _0813C1AC:
lsrs r4, r0, 24
_0813C1BC:
ldr r0, _0813C1DC @ =0x00000834
bl sub_806E6D0
bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1290,7 +1290,7 @@ _0813C282:
strh r0, [r4, 0x6]
ldr r0, [sp, 0x24]
movs r1, 0x1
bl sub_80F79D8
bl GetFontAttribute
lsls r0, 24
lsrs r0, 24
lsls r3, r6, 16
@@ -1300,7 +1300,7 @@ _0813C282:
adds r0, r4, 0
adds r1, r7, 0
mov r2, r10
bl sub_8004C84
bl FillBitmapRect4Bit
adds r0, r7, r6
lsls r0, 24
lsrs r7, r0, 24
@@ -1360,7 +1360,7 @@ _0813C2D4:
adds r1, r5, 0
movs r2, 0
movs r3, 0
bl sub_8004AA4
bl BlitBitmapRect4Bit
adds r0, r6, 0
bl GetKeypadIconWidth
b _0813C38E
@@ -1496,7 +1496,7 @@ _0813C402:
adds r0, r7, 0
mov r1, r8
movs r3, 0
bl sub_8004AA4
bl BlitBitmapRect4Bit
add sp, 0x14
pop {r3-r5}
mov r8, r3
@@ -1978,7 +1978,7 @@ sub_813C7CC: @ 813C7CC
push {r7}
movs r0, 0x2
movs r1, 0x1
bl sub_80F79D8
bl GetFontAttribute
adds r0, 0x1
lsls r0, 24
lsrs r0, 24
@@ -2026,7 +2026,7 @@ sub_813C828: @ 813C828
push {r4,lr}
movs r0, 0x2
movs r1, 0x1
bl sub_80F79D8
bl GetFontAttribute
adds r0, 0x1
lsls r0, 24
lsrs r0, 24
@@ -2058,7 +2058,7 @@ sub_813C860: @ 813C860
lsrs r4, 24
movs r0, 0x2
movs r1, 0x1
bl sub_80F79D8
bl GetFontAttribute
adds r0, 0x1
lsls r0, 24
lsrs r0, 24
asm/help_system_812B1E0.s
+12 -12
View File
@@ -190,7 +190,7 @@ _0812B2EC:
cmp r5, 0xF
bne _0812B320
ldr r0, _0812B328 @ =0x00000849
bl sub_806E6D0
bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -328,7 +328,7 @@ sub_812B40C: @ 812B40C
cmp r0, 0x2
beq _0812B440
ldr r0, _0812B43C @ =0x0000083c
bl sub_806E6D0
bl FlagGet
lsls r0, 24
cmp r0, 0
beq _0812B440
@@ -341,7 +341,7 @@ _0812B438: .4byte gUnknown_30053A0
_0812B43C: .4byte 0x0000083c
_0812B440:
ldr r0, _0812B454 @ =0x0000083c
bl sub_806E680
bl FlagSet
ldr r1, _0812B458 @ =gUnknown_203B0EE
movs r0, 0x1
strb r0, [r1]
@@ -753,7 +753,7 @@ sub_812B754: @ 812B754
push {lr}
movs r0, 0x96
lsls r0, 3
bl sub_806E6D0
bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1116,7 +1116,7 @@ _0812BAEA:
_0812BAF0:
ldr r0, _0812BAFC @ =0x00000821
_0812BAF2:
bl sub_806E6D0
bl FlagGet
_0812BAF6:
lsls r0, 24
lsrs r0, 24
@@ -1141,44 +1141,44 @@ _0812BB0A:
sub_812BB10: @ 812BB10
push {lr}
ldr r0, _0812BB7C @ =0x00000237
bl sub_806E6D0
bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _0812BB94
movs r0, 0x8E
lsls r0, 2
bl sub_806E6D0
bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _0812BB94
ldr r0, _0812BB80 @ =0x00000239
bl sub_806E6D0
bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _0812BB94
ldr r0, _0812BB84 @ =0x0000023a
bl sub_806E6D0
bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _0812BB94
ldr r0, _0812BB88 @ =0x0000023b
bl sub_806E6D0
bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _0812BB94
ldr r0, _0812BB8C @ =0x000002ef
bl sub_806E6D0
bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _0812BB94
ldr r0, _0812BB90 @ =0x000001f1
bl sub_806E6D0
bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
asm/hof_pc.s
+1 -1
View File
@@ -16,7 +16,7 @@ sub_80CA53C: @ 80CA53C
ands r0, r1
cmp r0, 0
bne _080CA564
bl sub_8003ECC
bl FreeAllWindowBuffers
movs r0, 0
bl sub_8001618
adds r0, r4, 0
asm/intro.s
+3 -3
View File
@@ -680,7 +680,7 @@ _080ECB02:
bl PutWindowTilemap
movs r0, 0
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
ldrb r0, [r5, 0x4]
adds r0, 0x1
strb r0, [r5, 0x4]
@@ -1018,7 +1018,7 @@ _080ECDCC:
bl BlitBitmapToWindow
movs r0, 0
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
b _080ECE70
.align 2, 0
_080ECE0C: .4byte 0x0000043c
@@ -2739,7 +2739,7 @@ _080EDC0C:
adds r0, r4, 0
bl Free
movs r0, 0x2
bl sub_8000B94
bl DisableInterrupts
movs r0, 0
bl SetHBlankCallback
ldr r0, _080EDC3C @ =sub_8078914
asm/item.s
+2 -2
View File
@@ -545,13 +545,13 @@ _0809A132:
movs r1, 0x1
bl sub_8099DBC
ldr r0, _0809A1B4 @ =0x00000847
bl sub_806E680
bl FlagSet
_0809A174:
ldr r0, _0809A1B0 @ =0x0000016d
cmp r6, r0
bne _0809A180
ldr r0, _0809A1B4 @ =0x00000847
bl sub_806E680
bl FlagSet
_0809A180:
adds r0, r7, 0
bl sub_8099ECC
asm/item_menu.s
+20 -20
View File
@@ -1239,13 +1239,13 @@ sub_810878C: @ 810878C
bne _081087C8
movs r0, 0x2
movs r1, 0
bl sub_80F7AC0
bl GetMenuCursorDimensionByFont
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
movs r0, 0x2
movs r1, 0x1
bl sub_80F7AC0
bl GetMenuCursorDimensionByFont
lsls r0, 24
lsrs r0, 24
str r4, [sp]
@@ -1729,7 +1729,7 @@ _08108B2A:
beq _08108B36
bl Free
_08108B36:
bl sub_8003ECC
bl FreeAllWindowBuffers
pop {r0}
bx r0
.align 2, 0
@@ -2190,7 +2190,7 @@ sub_8108E70: @ 8108E70
adds r0, r5, 0
movs r2, 0x6D
movs r3, 0xD
bl sub_80BF474
bl DisplayMessageAndContinueTask
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
add sp, 0x10
@@ -2534,7 +2534,7 @@ sub_8109168: @ 8109168
ands r0, r1
cmp r0, 0
bne _081091C6
bl sub_80BF630
bl GetLRKeysState
lsls r0, 24
lsrs r2, r0, 24
ldr r0, _081091A8 @ =gUnknown_30030F0
@@ -3469,7 +3469,7 @@ _0810993C:
lsrs r0, 24
cmp r0, 0x1
beq _08109950
bl sub_811B0D0
bl InUnionRoom
cmp r0, 0x1
bne _081099C4
_08109950:
@@ -3670,19 +3670,19 @@ _08109AD4:
lsrs r6, 24
movs r0, 0x2
movs r1, 0
bl sub_80F7AC0
bl GetMenuCursorDimensionByFont
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
movs r0, 0x2
movs r1, 0x2
bl sub_80F79D8
bl GetFontAttribute
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
movs r0, 0x2
movs r1, 0x1
bl sub_80F79D8
bl GetFontAttribute
adds r0, 0x2
lsls r0, 24
lsrs r0, 24
@@ -3699,10 +3699,10 @@ _08109AD4:
movs r1, 0x2
adds r2, r5, 0
movs r3, 0x2
bl sub_810FCD0
bl AddItemMenuActionTextPrinters
movs r0, 0x2
movs r1, 0x1
bl sub_80F79D8
bl GetFontAttribute
adds r0, 0x2
lsls r0, 24
lsrs r0, 24
@@ -4320,7 +4320,7 @@ _0810A052:
strh r0, [r7]
movs r0, 0
movs r1, 0x1
bl sub_8003F20
bl CopyWindowToVram
mov r0, r8
bl sub_810A2DC
pop {r3}
@@ -4366,7 +4366,7 @@ sub_810A0A8: @ 810A0A8
bl PutWindowTilemap
movs r0, 0
movs r1, 0x1
bl sub_8003F20
bl CopyWindowToVram
adds r0, r5, 0
bl itemid_80BF6D8_mail_related
lsls r0, 24
@@ -4649,7 +4649,7 @@ sub_810A324: @ 810A324
bl PutWindowTilemap
movs r0, 0
movs r1, 0x1
bl sub_8003F20
bl CopyWindowToVram
ldrh r0, [r5]
bl ItemId_GetBattleFunc
adds r1, r0, 0
@@ -5820,7 +5820,7 @@ _0810AD0C: .4byte sub_810A1D0
thumb_func_start sub_810AD10
sub_810AD10: @ 810AD10
push {r4-r6,lr}
bl sub_811B0D0
bl InUnionRoom
cmp r0, 0x1
bne _0810AD1E
movs r0, 0
@@ -6208,7 +6208,7 @@ _0810B01C:
bl PutWindowTilemap
movs r0, 0
movs r1, 0x1
bl sub_8003F20
bl CopyWindowToVram
ldrb r0, [r5]
movs r1, 0
movs r2, 0
@@ -6558,7 +6558,7 @@ _0810B29E:
bl sub_810876C
movs r0, 0
movs r1, 0x1
bl sub_8003F20
bl CopyWindowToVram
b _0810B36C
.align 2, 0
_0810B318: .4byte gUnknown_3005008
@@ -6734,7 +6734,7 @@ _0810B468:
bl PutWindowTilemap
movs r0, 0
movs r1, 0x1
bl sub_8003F20
bl CopyWindowToVram
ldrb r0, [r4]
movs r1, 0
movs r2, 0
@@ -6850,7 +6850,7 @@ _0810B564:
bl PutWindowTilemap
movs r0, 0
movs r1, 0x1
bl sub_8003F20
bl CopyWindowToVram
ldrb r0, [r5]
movs r1, 0
movs r2, 0
@@ -6985,7 +6985,7 @@ _0810B68C:
bl PutWindowTilemap
movs r0, 0
movs r1, 0x1
bl sub_8003F20
bl CopyWindowToVram
ldrb r0, [r6]
movs r1, 0
movs r2, 0
asm/item_menu_icons.s
+13 -13
View File
@@ -329,8 +329,8 @@ _08098724:
bx r1
thumb_func_end sub_80986EC
thumb_func_start sub_809872C
sub_809872C: @ 809872C
thumb_func_start CopyItemIconPicTo4x4Buffer
CopyItemIconPicTo4x4Buffer: @ 809872C
push {r4-r6,lr}
adds r6, r0, 0
adds r5, r1, 0
@@ -352,10 +352,10 @@ _08098734:
pop {r4-r6}
pop {r0}
bx r0
thumb_func_end sub_809872C
thumb_func_end CopyItemIconPicTo4x4Buffer
thumb_func_start sub_8098758
sub_8098758: @ 8098758
thumb_func_start AddItemIconObject
AddItemIconObject: @ 8098758
push {r4-r7,lr}
sub sp, 0x28
lsls r0, 16
@@ -378,7 +378,7 @@ sub_8098758: @ 8098758
ldr r0, [r1]
ldr r2, _08098800 @ =gUnknown_2039888
ldr r1, [r2]
bl sub_809872C
bl CopyItemIconPicTo4x4Buffer
ldr r1, _08098800 @ =gUnknown_2039888
ldr r0, [r1]
str r0, [sp, 0x18]
@@ -440,10 +440,10 @@ _08098812:
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_8098758
thumb_func_end AddItemIconObject
thumb_func_start sub_809881C
sub_809881C: @ 809881C
thumb_func_start AddItemIconObjectWithCustomObjectTemplate
AddItemIconObjectWithCustomObjectTemplate: @ 809881C
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -469,7 +469,7 @@ sub_809881C: @ 809881C
ldr r0, [r1]
ldr r2, _080988CC @ =gUnknown_2039888
ldr r1, [r2]
bl sub_809872C
bl CopyItemIconPicTo4x4Buffer
ldr r1, _080988CC @ =gUnknown_2039888
ldr r0, [r1]
str r0, [sp, 0x18]
@@ -532,7 +532,7 @@ _080988DA:
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_809881C
thumb_func_end AddItemIconObjectWithCustomObjectTemplate
thumb_func_start sub_80988E8
sub_80988E8: @ 80988E8
@@ -555,7 +555,7 @@ sub_80988E8: @ 80988E8
adds r0, r4, 0
adds r1, r4, 0
adds r2, r6, 0
bl sub_8098758
bl AddItemIconObject
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0x40
@@ -653,7 +653,7 @@ sub_80989A0: @ 80989A0
adds r0, r4, 0
adds r1, r4, 0
adds r2, r6, 0
bl sub_8098758
bl AddItemIconObject
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0x40
asm/item_pc.s
+15 -15
View File
@@ -861,13 +861,13 @@ sub_810DAD4: @ 810DAD4
bne _0810DB10
movs r0, 0x2
movs r1, 0
bl sub_80F79D8
bl GetFontAttribute
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
movs r0, 0x2
movs r1, 0x1
bl sub_80F79D8
bl GetFontAttribute
lsls r0, 24
lsrs r0, 24
str r4, [sp]
@@ -1076,7 +1076,7 @@ _0810DC66:
beq _0810DC72
bl Free
_0810DC72:
bl sub_8003ECC
bl FreeAllWindowBuffers
pop {r0}
bx r0
.align 2, 0
@@ -1852,7 +1852,7 @@ sub_810E274: @ 810E274
mov r8, r0
movs r0, 0x2
movs r1, 0x1
bl sub_80F79D8
bl GetFontAttribute
adds r0, 0x2
lsls r0, 24
lsrs r0, 24
@@ -1868,7 +1868,7 @@ sub_810E274: @ 810E274
bl PrintTextArray
movs r0, 0x2
movs r1, 0x1
bl sub_80F79D8
bl GetFontAttribute
adds r0, 0x2
lsls r0, 24
lsrs r0, 24
@@ -2072,7 +2072,7 @@ sub_810E418: @ 810E418
movs r1, 0x2
adds r2, r4, 0
movs r3, 0
bl sub_8002C48
bl PrintTextOnWindow
adds r0, r7, 0
subs r0, 0x8
adds r0, r6, r0
@@ -2100,7 +2100,7 @@ _0810E4B8:
adds r0, r1, 0
movs r1, 0x2
movs r3, 0
bl sub_8002C48
bl PrintTextOnWindow
adds r0, r7, 0
subs r0, 0x8
adds r0, r6, r0
@@ -2257,7 +2257,7 @@ sub_810E5E0: @ 810E5E0
str r4, [sp, 0x8]
adds r2, r5, 0
movs r3, 0
bl sub_8002C48
bl PrintTextOnWindow
adds r0, r6, 0
movs r1, 0x1
movs r2, 0x2
@@ -2590,7 +2590,7 @@ sub_810E8F0: @ 810E8F0
push {r4,lr}
ldr r0, _0810E974 @ =gUnknown_8453F98
bl sub_8003B24
bl sub_8002C28
bl DeactivateAllTextPrinters
movs r1, 0xF0
lsls r1, 2
movs r0, 0
@@ -2706,7 +2706,7 @@ sub_810E984: @ 810E984
strb r0, [r1, 0xD]
movs r0, 0x3
movs r1, 0x4
bl sub_80F79D8
bl GetFontAttribute
mov r1, sp
ands r5, r0
ldrb r0, [r1, 0xC]
@@ -2715,13 +2715,13 @@ sub_810E984: @ 810E984
strb r4, [r1, 0xC]
movs r0, 0x3
movs r1, 0x2
bl sub_80F79D8
bl GetFontAttribute
mov r1, sp
adds r6, r0
strb r6, [r1, 0xA]
movs r0, 0x3
movs r1, 0x3
bl sub_80F79D8
bl GetFontAttribute
mov r1, sp
add r8, r0
mov r0, r8
@@ -2729,7 +2729,7 @@ sub_810E984: @ 810E984
mov r0, sp
mov r1, r9
movs r2, 0
bl sub_8002CF4
bl AddTextPrinter
add sp, 0x10
pop {r3,r4}
mov r8, r3
@@ -2853,7 +2853,7 @@ sub_810EAF0: @ 810EAF0
ldrb r0, [r4]
bl ClearWindowTilemap
ldrb r0, [r4]
bl sub_8003E3C
bl RemoveWindow
movs r0, 0xFF
strb r0, [r4]
pop {r4}
@@ -2897,7 +2897,7 @@ sub_810EB30: @ 810EB30
adds r0, r4, 0
movs r1, 0x5
movs r3, 0xB
bl sub_80BF474
bl DisplayMessageAndContinueTask
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
add sp, 0x10
asm/item_use.s
+10 -10
View File
@@ -353,7 +353,7 @@ sub_80A122C: @ 80A122C
lsrs r4, r0, 24
movs r0, 0x83
lsls r0, 4
bl sub_806E6D0
bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -526,7 +526,7 @@ sub_80A137C: @ 80A137C
lsls r0, 24
cmp r0, 0
bne _080A13D4
bl sub_805C8B0
bl IsPlayerFacingSurfableFishableWater
lsls r0, 24
cmp r0, 0
beq _080A1404
@@ -1281,7 +1281,7 @@ sub_80A1998: @ 80A1998
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _080A19C0 @ =0x00004020
bl sub_806E568
bl VarGet
lsls r0, 16
cmp r0, 0
bne _080A19CC
@@ -1336,7 +1336,7 @@ sub_80A19E8: @ 80A19E8
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
bl sub_806E584
bl VarSet
bl sub_80A1A44
ldr r2, _080A1A3C @ =gUnknown_2021D18
ldr r3, _080A1A40 @ =sub_810A1F8
@@ -1404,9 +1404,9 @@ sub_80A1A94: @ 80A1A94
cmp r0, 0x2B
bne _080A1AF4
ldr r0, _080A1ADC @ =0x00000803
bl sub_806E680
bl FlagSet
ldr r0, _080A1AE0 @ =0x00000804
bl sub_806E6A8
bl FlagClear
ldrh r0, [r5]
ldr r1, _080A1AE4 @ =gUnknown_2021CF0
bl sub_8099E90
@@ -1430,9 +1430,9 @@ _080A1AF4:
cmp r0, 0x2A
bne _080A1B26
ldr r0, _080A1B2C @ =0x00000804
bl sub_806E680
bl FlagSet
ldr r0, _080A1B30 @ =0x00000803
bl sub_806E6A8
bl FlagClear
ldrh r0, [r5]
ldr r1, _080A1B34 @ =gUnknown_2021CF0
bl sub_8099E90
@@ -2132,7 +2132,7 @@ sub_80A2068: @ 80A2068
lsrs r4, r0, 24
ldr r0, _080A208C @ =gUnknown_203AD30
ldrh r0, [r0]
bl sub_8126C68
bl GetItemEffectType
lsls r0, 24
lsrs r0, 24
subs r0, 0x1
@@ -2261,7 +2261,7 @@ sub_80A2194: @ 80A2194
lsrs r4, r0, 24
ldr r0, _080A21B4 @ =gUnknown_203AD30
ldrh r0, [r0]
bl sub_8126C68
bl GetItemEffectType
lsls r0, 24
lsrs r0, 24
cmp r0, 0x15
asm/itemfinder.s
+2 -2
View File
@@ -251,7 +251,7 @@ _0813EE4E:
bl sub_80CC44C
lsls r0, 16
lsrs r0, 16
bl sub_806E6D0
bl FlagGet
lsls r0, 24
cmp r0, 0
bne _0813EEF2
@@ -499,7 +499,7 @@ _0813F020:
cmp r0, 0x1
beq _0813F066
adds r0, r5, 0
bl sub_806E6D0
bl FlagGet
lsls r0, 24
cmp r0, 0
bne _0813F066
asm/learn_move.s
+17 -17
View File
@@ -82,7 +82,7 @@ sub_80E469C: @ 80E469C
lsls r0, 16
cmp r0, 0
beq _080E476C
bl sub_8002C28
bl DeactivateAllTextPrinters
movs r5, 0
_080E46C6:
lsls r4, r5, 24
@@ -737,7 +737,7 @@ _080E4C7E:
ldr r6, _080E4CD4 @ =0x00000a6a
adds r2, r6
bl get_coro_args_x18_x1A
bl sub_8003ECC
bl FreeAllWindowBuffers
ldr r0, _080E4CD8 @ =gUnknown_2024284
ldr r5, [r7]
movs r2, 0x98
@@ -806,7 +806,7 @@ _080E4D18:
beq _080E4D26
b _080E4EDA
_080E4D26:
bl sub_8003ECC
bl FreeAllWindowBuffers
ldr r0, _080E4D40 @ =gUnknown_203AAB4
ldr r0, [r0]
bl Free
@@ -1049,7 +1049,7 @@ sub_80E4F0C: @ 80E4F0C
bl PutWindowTilemap
movs r0, 0x7
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
_080E4F42:
add sp, 0x8
pop {r4,r5}
@@ -1267,7 +1267,7 @@ sub_80E50CC: @ 80E50CC
ldr r5, _080E51EC @ =gUnknown_2024284
adds r0, r5
adds r1, 0xE8
bl sub_8043C84
bl GetMoveRelearnerMoves
ldr r1, [r7]
strb r0, [r1, 0x1A]
ldr r1, [r7]
@@ -1276,7 +1276,7 @@ sub_80E50CC: @ 80E50CC
muls r0, r6
adds r0, r5
adds r1, 0xE8
bl sub_8043C84
bl GetMoveRelearnerMoves
lsls r0, 24
lsrs r0, 24
mov r8, r0
@@ -1539,7 +1539,7 @@ sub_80E5300: @ 80E5300
strb r0, [r1]
movs r0, 0x6
movs r1, 0x1
bl sub_8003F20
bl CopyWindowToVram
pop {r4}
pop {r0}
bx r0
@@ -1717,10 +1717,10 @@ sub_80E5444: @ 80E5444
bl PutWindowTilemap
movs r0, 0
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
movs r0, 0x1
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
pop {r0}
bx r0
thumb_func_end sub_80E5444
@@ -1754,29 +1754,29 @@ _080E54EA:
bl FillWindowPixelBuffer
adds r0, r4, 0
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
adds r5, 0x1
cmp r5, 0x5
ble _080E54EA
_080E5504:
movs r0, 0x3
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
movs r0, 0x4
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
movs r0, 0x2
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
movs r0, 0x2
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
movs r0, 0x5
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
movs r0, 0x7
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
pop {r4,r5}
pop {r0}
bx r0
@@ -1825,7 +1825,7 @@ sub_80E5574: @ 80E5574
bl PutWindowTilemap
movs r0, 0x6
movs r1, 0x1
bl sub_8003F20
bl CopyWindowToVram
_080E5594:
adds r0, r4, 0
pop {r4}
asm/link.s
+8 -8
View File
@@ -346,7 +346,7 @@ sub_8009708: @ 8009708
bl sub_806E25C
strb r0, [r5, 0x10]
ldr r0, _08009788 @ =0x00000844
bl sub_806E6D0
bl FlagGet
lsls r0, 24
cmp r0, 0
beq _0800976E
@@ -3287,7 +3287,7 @@ _0800AD30:
lsls r0, 16
cmp r0, 0
beq _0800ADD8
bl sub_8002C28
bl DeactivateAllTextPrinters
bl reset_temp_tile_data_buffers
movs r0, 0x52
movs r1, 0
@@ -3403,10 +3403,10 @@ sub_800AE1C: @ 800AE1C
bl PutWindowTilemap
movs r0, 0
movs r1, 0
bl sub_8003F20
bl CopyWindowToVram
movs r0, 0x2
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
movs r0, 0
bl ShowBg
movs r0, 0x1
@@ -3451,10 +3451,10 @@ sub_800AED0: @ 800AED0
bl PutWindowTilemap
movs r0, 0x1
movs r1, 0
bl sub_8003F20
bl CopyWindowToVram
movs r0, 0x2
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
movs r0, 0
bl ShowBg
add sp, 0xC
@@ -3936,7 +3936,7 @@ sub_800B29C: @ 800B29C
push {lr}
sub sp, 0x4
movs r0, 0xC0
bl sub_8000B94
bl DisableInterrupts
ldr r1, _0800B2DC @ =0x04000128
movs r2, 0x80
lsls r2, 6
@@ -3977,7 +3977,7 @@ sub_800B2F4: @ 800B2F4
push {r4,r5,lr}
sub sp, 0x4
movs r0, 0xC0
bl sub_8000B94
bl DisableInterrupts
ldr r0, _0800B354 @ =0x04000134
movs r4, 0
strh r4, [r0]
asm/link_rfu.s
+12 -12
View File
@@ -3389,7 +3389,7 @@ _080FED50:
cmp r0, 0
bne _080FED62
ldr r0, _080FED7C @ =0x0000082d
bl sub_806E680
bl FlagSet
bl sub_80FEF2C
_080FED62:
adds r0, r4, 0
@@ -3493,7 +3493,7 @@ sub_80FEE24: @ 80FEE24
bl sub_80BDE70
bl sub_80FF010
bl sub_810011C
bl sub_8003ECC
bl FreeAllWindowBuffers
adds r0, r4, 0
bl SetMainCallback2
pop {r4}
@@ -6056,7 +6056,7 @@ _080FFFD4:
bl SetBgTilemapBuffer
ldr r0, _08100030 @ =gUnknown_843F8B0
bl sub_8003B24
bl sub_8002C28
bl DeactivateAllTextPrinters
bl sub_8100CBC
bl sub_8100C5C
movs r0, 0
@@ -6412,7 +6412,7 @@ _0810030C: .4byte gUnknown_843F8D8
_08100310:
ldrh r1, [r4]
mov r0, sp
bl sub_80BD850
bl CopyEasyChatWord
movs r0, 0x1
mov r1, sp
movs r2, 0
@@ -7729,7 +7729,7 @@ sub_8100D24: @ 8100D24
bl PutWindowTilemap
movs r0, 0
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
_08100D7A:
add sp, 0x14
pop {r4,r5}
@@ -7766,7 +7766,7 @@ _08100DAC:
str r0, [sp, 0x8]
adds r0, r5, 0
adds r2, r6, 0
bl sub_8002C48
bl PrintTextOnWindow
add sp, 0xC
pop {r4-r6}
pop {r0}
@@ -7942,7 +7942,7 @@ _08100EEC:
_08100F08:
movs r0, 0x1
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
add sp, 0x14
pop {r0}
bx r0
@@ -8098,7 +8098,7 @@ _08101046:
beq _08101068
adds r1, r0, 0
adds r0, r2, 0
bl sub_80BD850
bl CopyEasyChatWord
adds r2, r0, 0
adds r4, 0x2
b _08101096
@@ -8170,7 +8170,7 @@ _081010D6:
ldr r0, [r0]
ldrb r0, [r0, 0x2]
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
add sp, 0x14
pop {r3-r5}
mov r8, r3
@@ -8454,7 +8454,7 @@ _0810130A:
_0810130E:
movs r0, 0x2
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
pop {r4}
pop {r0}
bx r0
@@ -8747,7 +8747,7 @@ _0810152A:
_08101538:
movs r0, 0x2
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
add sp, 0xC
pop {r3-r5}
mov r8, r3
@@ -8822,7 +8822,7 @@ sub_81015BC: @ 81015BC
bl FillWindowPixelBuffer
movs r0, 0x2
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
pop {r0}
bx r0
thumb_func_end sub_81015BC
asm/link_rfu_2.s
+2 -2
View File
@@ -9178,7 +9178,7 @@ _080FCB88:
ands r1, r0
strb r1, [r7]
ldr r0, _080FCC34 @ =0x00000844
bl sub_806E6D0
bl FlagGet
lsls r0, 7
ldrb r1, [r7]
ands r4, r1
@@ -9191,7 +9191,7 @@ _080FCB88:
orrs r5, r0
strb r5, [r7, 0x1]
ldr r0, _080FCC38 @ =0x0000082c
bl sub_806E6D0
bl FlagGet
ands r6, r0
lsls r6, 1
ldrb r1, [r7, 0x1]
asm/link_rfu_3.s
+65 -65
View File
@@ -93,7 +93,7 @@ _081158F0:
_0811590E:
adds r0, r6, 0
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
add sp, 0x8
pop {r4-r6}
pop {r0}
@@ -398,7 +398,7 @@ _08115B5C:
bl PutWindowTilemap
ldrb r0, [r5, 0x10]
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
ldrb r0, [r5, 0xF]
movs r1, 0
bl sub_80F6F1C
@@ -422,7 +422,7 @@ _08115B5C:
bl PutWindowTilemap
ldrb r0, [r5, 0x11]
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
movs r0, 0
bl CopyBgTilemapBufferToVram
movs r0, 0x1
@@ -1148,11 +1148,11 @@ sub_81161E4: @ 81161E4
movs r0, 0
bl CopyBgTilemapBufferToVram
ldrb r0, [r4, 0x11]
bl sub_8003E3C
bl RemoveWindow
ldrb r0, [r4, 0xF]
bl sub_8003E3C
bl RemoveWindow
ldrb r0, [r4, 0x10]
bl sub_8003E3C
bl RemoveWindow
ldrb r0, [r4, 0x17]
bl DestroyTask
ldr r0, [r4, 0x8]
@@ -1916,7 +1916,7 @@ _08116838:
bl PutWindowTilemap
ldrb r0, [r6, 0xC]
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
ldrb r0, [r6, 0xB]
movs r1, 0
bl sub_80F6F1C
@@ -1942,7 +1942,7 @@ _08116838:
bl sub_8115924
ldrb r0, [r6, 0xD]
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
movs r0, 0
bl CopyBgTilemapBufferToVram
strb r4, [r6, 0xF]
@@ -2331,11 +2331,11 @@ _08116C10:
movs r0, 0
bl CopyBgTilemapBufferToVram
ldrb r0, [r6, 0xD]
bl sub_8003E3C
bl RemoveWindow
ldrb r0, [r6, 0xB]
bl sub_8003E3C
bl RemoveWindow
ldrb r0, [r6, 0xC]
bl sub_8003E3C
bl RemoveWindow
ldrb r0, [r6, 0x11]
bl DestroyTask
ldr r0, [r6]
@@ -3274,7 +3274,7 @@ sub_81173C0: @ 81173C0
lsrs r6, 16
bl sub_80A0058
bl copy_player_party_to_sav1
bl sub_804C320
bl copy_bags_and_unk_data_from_save_blocks
ldr r5, _0811742C @ =gUnknown_202273C
ldr r0, _08117430 @ =0x00002211
str r0, [r5, 0x14]
@@ -3339,7 +3339,7 @@ sub_8117440: @ 8117440
lsrs r5, 16
ldr r0, _081174AC @ =0x0000406f
adds r1, r3, 0
bl sub_806E584
bl VarSet
ldr r6, _081174B0 @ =gUnknown_3005008
ldr r1, [r6]
movs r0, 0x4
@@ -3399,7 +3399,7 @@ sub_81174B4: @ 81174B4
ldr r0, _08117524 @ =gUnknown_20370C0
strh r1, [r0]
ldr r0, _08117528 @ =0x0000406f
bl sub_806E584
bl VarSet
bl sub_800A088
ldr r1, _0811752C @ =gUnknown_3005030
strb r0, [r1]
@@ -3662,7 +3662,7 @@ _081177A0:
bl sub_8117594
bl sub_80A0058
bl copy_player_party_to_sav1
bl sub_804C320
bl copy_bags_and_unk_data_from_save_blocks
movs r0, 0x1
str r0, [sp]
movs r0, 0
@@ -3675,7 +3675,7 @@ _081177C8:
bl sub_80563F0
bl sub_80A0058
bl copy_player_party_to_sav1
bl sub_804C320
bl copy_bags_and_unk_data_from_save_blocks
ldr r0, _081177EC @ =gUnknown_2022618
movs r1, 0x1
bl sub_8117594
@@ -3691,7 +3691,7 @@ _081177F0:
bl sub_80563F0
bl sub_80A0058
bl copy_player_party_to_sav1
bl sub_804C320
bl copy_bags_and_unk_data_from_save_blocks
ldr r0, _08117814 @ =gUnknown_2022618
movs r1, 0x1
bl sub_8117594
@@ -3760,7 +3760,7 @@ _08117890:
movs r1, 0x5
movs r2, 0x1
bl sub_8117440
bl sub_811FB0C
bl GetCursorSelectionMonId
lsls r0, 24
lsrs r0, 24
ldr r1, _081178AC @ =sub_805671C
@@ -3783,7 +3783,7 @@ _081178C8:
movs r1, 0x5
movs r2, 0x1
bl sub_8117440
bl sub_811FB0C
bl GetCursorSelectionMonId
lsls r0, 24
lsrs r0, 24
ldr r1, _081178F8 @ =sub_805671C
@@ -4402,7 +4402,7 @@ _08117DEE:
movs r0, 0
bl CopyBgTilemapBufferToVram
ldrb r0, [r5, 0xF]
bl sub_8003E3C
bl RemoveWindow
ldrb r0, [r5, 0x17]
bl DestroyTask
ldr r0, [r5, 0x8]
@@ -4461,7 +4461,7 @@ _08117E80:
movs r0, 0
bl CopyBgTilemapBufferToVram
ldrb r0, [r5, 0xF]
bl sub_8003E3C
bl RemoveWindow
ldrb r0, [r5, 0x17]
bl DestroyTask
ldr r0, [r5, 0x8]
@@ -4648,7 +4648,7 @@ _08117FC0:
bl sub_8115924
ldrb r0, [r5, 0xD]
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
movs r0, 0
bl CopyBgTilemapBufferToVram
strb r4, [r5, 0xF]
@@ -4846,9 +4846,9 @@ _081181EC:
movs r0, 0
bl CopyBgTilemapBufferToVram
ldrb r0, [r5, 0xD]
bl sub_8003E3C
bl RemoveWindow
ldrb r0, [r5, 0xB]
bl sub_8003E3C
bl RemoveWindow
ldrb r0, [r5, 0x11]
bl DestroyTask
ldr r0, [r5]
@@ -5246,7 +5246,7 @@ _08118564:
movs r0, 0
bl CopyBgTilemapBufferToVram
ldrb r0, [r5, 0xB]
bl sub_8003E3C
bl RemoveWindow
_08118580:
ldrb r0, [r5, 0x11]
bl DestroyTask
@@ -5617,7 +5617,7 @@ _081188E4:
ldrh r0, [r4]
cmp r0, 0
beq _081189A4
bl sub_811FB0C
bl GetCursorSelectionMonId
lsls r0, 24
lsrs r5, r0, 24
ldrh r0, [r4]
@@ -5647,7 +5647,7 @@ _08118904:
.align 2, 0
_0811892C: .4byte gUnknown_8458D54
_08118930:
bl sub_811FB0C
bl GetCursorSelectionMonId
lsls r0, 24
lsrs r0, 24
adds r1, r4, 0
@@ -5683,7 +5683,7 @@ _08118970:
ldr r1, _0811899C @ =gUnknown_203B058
movs r0, 0x44
strb r0, [r1]
bl sub_811FB0C
bl GetCursorSelectionMonId
lsls r0, 24
lsrs r0, 24
adds r1, r4, 0
@@ -7460,7 +7460,7 @@ _081198E8: .4byte gUnknown_2021D18
thumb_func_start sub_81198EC
sub_81198EC: @ 81198EC
push {lr}
bl sub_811B0D0
bl InUnionRoom
cmp r0, 0x1
bne _081198FC
ldr r1, _08119900 @ =gUnknown_20370D0
@@ -8641,7 +8641,7 @@ sub_811A1AC: @ 811A1AC
bl PutWindowTilemap
adds r0, r4, 0
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
adds r0, r4, 0
add sp, 0x8
pop {r4}
@@ -8661,7 +8661,7 @@ sub_811A1FC: @ 811A1FC
movs r1, 0x1
bl sub_80F6F9C
adds r0, r4, 0
bl sub_8003E3C
bl RemoveWindow
pop {r4}
pop {r0}
bx r0
@@ -8705,7 +8705,7 @@ _0811A234:
strb r0, [r1]
ldrb r0, [r5]
movs r1, 0x1
bl sub_8003F20
bl CopyWindowToVram
ldrb r0, [r7]
adds r0, 0x1
strb r0, [r7]
@@ -8731,7 +8731,7 @@ _0811A274:
movs r1, 0x1
bl sub_80F6F9C
ldrb r0, [r5]
bl sub_8003E3C
bl RemoveWindow
movs r0, 0
strb r0, [r7]
mov r0, r8
@@ -8752,7 +8752,7 @@ _0811A2B0:
movs r1, 0x1
bl sub_80F6F9C
ldrb r0, [r5]
bl sub_8003E3C
bl RemoveWindow
strb r4, [r7]
movs r0, 0x2
negs r0, r0
@@ -8810,7 +8810,7 @@ _0811A308:
strb r0, [r5]
ldrb r0, [r4]
movs r1, 0x1
bl sub_8003F20
bl CopyWindowToVram
mov r1, r9
ldrb r0, [r1]
adds r0, 0x1
@@ -8847,7 +8847,7 @@ _0811A37E:
movs r1, 0x1
bl sub_80F6F9C
ldrb r0, [r4]
bl sub_8003E3C
bl RemoveWindow
ldrb r0, [r7]
bl sub_811A1FC
movs r0, 0
@@ -8872,7 +8872,7 @@ _0811A3AC:
movs r1, 0x1
bl sub_80F6F9C
ldrb r0, [r4]
bl sub_8003E3C
bl RemoveWindow
ldrb r0, [r7]
bl sub_811A1FC
mov r0, r8
@@ -9145,7 +9145,7 @@ _0811A5D2:
mov r0, sp
movs r1, 0xFF
movs r2, 0
bl sub_8002CF4
bl AddTextPrinter
add sp, 0x10
pop {r4,r5}
pop {r0}
@@ -10537,14 +10537,14 @@ _0811B056:
lsls r0, r4, 24
lsrs r0, 24
adds r1, r5, 0
bl sub_813CCAC
bl UnkTextUtil_SetPtrI
adds r5, 0xB
adds r4, 0x1
cmp r4, 0x3
ble _0811B056
ldr r1, _0811B074 @ =gUnknown_8457D44
adds r0, r7, 0
bl sub_813CCC8
bl UnkTextUtil_StringExpandPlaceholders
b _0811B080
.align 2, 0
_0811B074: .4byte gUnknown_8457D44
@@ -10601,8 +10601,8 @@ _0811B0CA:
bx r1
thumb_func_end sub_811B0A4
thumb_func_start sub_811B0D0
sub_811B0D0: @ 811B0D0
thumb_func_start InUnionRoom
InUnionRoom: @ 811B0D0
push {lr}
movs r2, 0
ldr r0, _0811B0EC @ =gUnknown_3005008
@@ -10619,7 +10619,7 @@ _0811B0E4:
bx r1
.align 2, 0
_0811B0EC: .4byte gUnknown_3005008
thumb_func_end sub_811B0D0
thumb_func_end InUnionRoom
thumb_func_start sub_811B0F0
sub_811B0F0: @ 811B0F0
@@ -10952,7 +10952,7 @@ sub_811B31C: @ 811B31C
ldr r0, _0811B4B0 @ =gUnknown_2039624
adds r1, r0
mov r8, r1
bl sub_813CC90
bl UnkTextUtil_Reset
mov r6, r9
adds r6, 0xAC
bl sub_80447F0
@@ -10966,11 +10966,11 @@ sub_811B31C: @ 811B31C
bl StringCopy
movs r0, 0
adds r1, r6, 0
bl sub_813CCAC
bl UnkTextUtil_SetPtrI
mov r1, r8
adds r1, 0x30
movs r0, 0x1
bl sub_813CCAC
bl UnkTextUtil_SetPtrI
movs r4, 0xB0
lsls r4, 1
add r4, r9
@@ -10984,7 +10984,7 @@ sub_811B31C: @ 811B31C
bl StringCopy
movs r0, 0x2
adds r1, r4, 0
bl sub_813CCAC
bl UnkTextUtil_SetPtrI
mov r5, r9
adds r5, 0xCA
mov r0, r8
@@ -10995,7 +10995,7 @@ sub_811B31C: @ 811B31C
bl sub_8008E78
movs r0, 0x3
adds r1, r5, 0
bl sub_813CCAC
bl UnkTextUtil_SetPtrI
movs r2, 0xD9
add r2, r9
mov r10, r2
@@ -11015,16 +11015,16 @@ sub_811B31C: @ 811B31C
bl sub_8008E78
movs r0, 0x4
mov r1, r10
bl sub_813CCAC
bl UnkTextUtil_SetPtrI
movs r0, 0x5
adds r1, r4, 0
bl sub_813CCAC
bl UnkTextUtil_SetPtrI
movs r4, 0xC8
lsls r4, 1
add r4, r9
ldr r1, _0811B4BC @ =gUnknown_84594C4
adds r0, r4, 0
bl sub_813CCC8
bl UnkTextUtil_StringExpandPlaceholders
ldr r0, _0811B4C0 @ =gUnknown_2021D18
adds r1, r4, 0
bl StringCopy
@@ -11041,7 +11041,7 @@ _0811B40A:
bl sub_8008E78
movs r0, 0
adds r1, r6, 0
bl sub_813CCAC
bl UnkTextUtil_SetPtrI
mov r2, r8
ldrh r1, [r2, 0x16]
cmp r1, r4
@@ -11056,7 +11056,7 @@ _0811B426:
bl sub_8008E78
movs r0, 0x2
adds r1, r4, 0
bl sub_813CCAC
bl UnkTextUtil_SetPtrI
mov r0, r8
ldrh r1, [r0, 0x20]
adds r0, r5, 0
@@ -11065,7 +11065,7 @@ _0811B426:
bl sub_8008E78
movs r0, 0x3
adds r1, r5, 0
bl sub_813CCAC
bl UnkTextUtil_SetPtrI
movs r7, 0
movs r6, 0x80
lsls r6, 19
@@ -11075,10 +11075,10 @@ _0811B426:
_0811B45E:
ldrh r1, [r5]
adds r0, r4, 0
bl sub_80BD850
bl CopyEasyChatWord
lsrs r0, r6, 24
adds r1, r4, 0
bl sub_813CCAC
bl UnkTextUtil_SetPtrI
movs r2, 0x80
lsls r2, 17
adds r6, r2
@@ -11092,7 +11092,7 @@ _0811B45E:
add r4, r9
ldr r1, _0811B4C8 @ =gUnknown_8459504
adds r0, r4, 0
bl sub_813CCC8
bl UnkTextUtil_StringExpandPlaceholders
ldr r5, _0811B4C0 @ =gUnknown_2021D18
adds r0, r5, 0
adds r1, r4, 0
@@ -11102,7 +11102,7 @@ _0811B45E:
bne _0811B4D0
ldr r1, _0811B4CC @ =gUnknown_8459588
adds r0, r4, 0
bl sub_813CCC8
bl UnkTextUtil_StringExpandPlaceholders
adds r0, r5, 0
adds r1, r4, 0
bl StringAppend
@@ -11127,7 +11127,7 @@ _0811B4D0:
adds r1, r0
ldr r1, [r1]
adds r0, r4, 0
bl sub_813CCC8
bl UnkTextUtil_StringExpandPlaceholders
adds r0, r5, 0
adds r1, r4, 0
bl StringAppend
@@ -11275,7 +11275,7 @@ sub_811B5DC: @ 811B5DC
adds r0, 0x63
lsls r0, 16
lsrs r0, 16
bl sub_806E6D0
bl FlagGet
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -11288,7 +11288,7 @@ sub_811B5F0: @ 811B5F0
adds r0, 0x63
lsls r0, 16
lsrs r0, 16
bl sub_806E680
bl FlagSet
pop {r0}
bx r0
thumb_func_end sub_811B5F0
@@ -11299,7 +11299,7 @@ sub_811B600: @ 811B600
adds r0, 0x63
lsls r0, 16
lsrs r0, 16
bl sub_806E6A8
bl FlagClear
pop {r0}
bx r0
thumb_func_end sub_811B600
@@ -11313,7 +11313,7 @@ sub_811B610: @ 811B610
lsrs r0, 16
lsls r1, 16
lsrs r1, 16
bl sub_806E584
bl VarSet
pop {r0}
bx r0
.align 2, 0
@@ -12808,7 +12808,7 @@ _0811C168:
bl PutWindowTilemap
movs r0, 0
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
ldrh r0, [r4]
adds r0, 0x1
strh r0, [r4]
@@ -12943,7 +12943,7 @@ _0811C2C0:
bne _0811C300
b _0811C52A
_0811C300:
bl sub_8002C28
bl DeactivateAllTextPrinters
movs r0, 0
bl ClearWindowTilemap
movs r0, 0
asm/link_rfu_4.s
+17 -17
View File
@@ -171,7 +171,7 @@ sub_8142504: @ 8142504
bl PutWindowTilemap
movs r0, 0x1
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
add sp, 0x14
pop {r4}
pop {r0}
@@ -190,7 +190,7 @@ sub_8142560: @ 8142560
bl ClearWindowTilemap
movs r0, 0x1
movs r1, 0x1
bl sub_8003F20
bl CopyWindowToVram
pop {r0}
bx r0
thumb_func_end sub_8142560
@@ -229,7 +229,7 @@ _081425A4:
movs r1, 0xD0
movs r2, 0x14
movs r3, 0x1
bl sub_80056C4
bl DrawDownArrow
ldr r0, _081425D4 @ =gUnknown_30030F0
ldrh r1, [r0, 0x2E]
movs r0, 0x3
@@ -254,7 +254,7 @@ _081425D8:
movs r1, 0xD0
movs r2, 0x14
movs r3, 0x1
bl sub_80056C4
bl DrawDownArrow
movs r0, 0
strb r0, [r4]
bl sub_8142560
@@ -289,7 +289,7 @@ sub_8142610: @ 8142610
movs r1, 0xD0
movs r2, 0x14
movs r3, 0x1
bl sub_80056C4
bl DrawDownArrow
add sp, 0xC
pop {r0}
bx r0
@@ -311,7 +311,7 @@ sub_8142638: @ 8142638
movs r1, 0xD0
movs r2, 0x14
movs r3, 0x1
bl sub_80056C4
bl DrawDownArrow
add sp, 0xC
pop {r0}
bx r0
@@ -478,7 +478,7 @@ _0814273A:
bl ClearWindowTilemap
movs r0, 0x2
movs r1, 0x1
bl sub_8003F20
bl CopyWindowToVram
_0814278A:
adds r0, r4, 0
add sp, 0x24
@@ -553,7 +553,7 @@ _081427E2:
bl sub_8150048
ldrb r0, [r4]
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
ldrb r0, [r4]
bl PutWindowTilemap
b _0814287E
@@ -623,9 +623,9 @@ _0814288C:
bl ClearWindowTilemap
ldrb r0, [r4]
movs r1, 0x1
bl sub_8003F20
bl CopyWindowToVram
ldrb r0, [r4]
bl sub_8003E3C
bl RemoveWindow
adds r0, r6, 0
b _081428EA
_081428C2:
@@ -637,9 +637,9 @@ _081428C2:
bl ClearWindowTilemap
ldrb r0, [r4]
movs r1, 0x1
bl sub_8003F20
bl CopyWindowToVram
ldrb r0, [r4]
bl sub_8003E3C
bl RemoveWindow
movs r0, 0x1
negs r0, r0
b _081428EA
@@ -714,7 +714,7 @@ _08142934:
bl sub_8150048
ldrb r0, [r5]
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
ldrb r0, [r5]
bl PutWindowTilemap
ldrb r0, [r6]
@@ -775,9 +775,9 @@ _081429D4:
bl ClearWindowTilemap
ldrb r0, [r5]
movs r1, 0x1
bl sub_8003F20
bl CopyWindowToVram
ldrb r0, [r5]
bl sub_8003E3C
bl RemoveWindow
adds r0, r4, 0
b _08142A3C
.align 2, 0
@@ -792,9 +792,9 @@ _08142A14:
bl ClearWindowTilemap
ldrb r0, [r5]
movs r1, 0x1
bl sub_8003F20
bl CopyWindowToVram
ldrb r0, [r5]
bl sub_8003E3C
bl RemoveWindow
movs r0, 0x2
negs r0, r0
b _08142A3C
asm/list_menu.s
+16 -16
View File
@@ -78,7 +78,7 @@ _08106F34:
strb r0, [r4, 0x6]
ldrb r0, [r4, 0x5]
movs r1, 0x1
bl sub_8003F20
bl CopyWindowToVram
movs r0, 0x1
strb r0, [r4, 0x4]
b _08106FE4
@@ -131,7 +131,7 @@ _08106FBA:
ldr r0, _08106FC8 @ =gUnknown_203ACF4
ldrb r0, [r0, 0x5]
movs r1, 0x1
bl sub_8003F20
bl CopyWindowToVram
b _08106FE4
.align 2, 0
_08106FC8: .4byte gUnknown_203ACF4
@@ -141,7 +141,7 @@ _08106FCC:
movs r2, 0
bl sub_810713C
ldrb r0, [r5, 0x5]
bl sub_8003E3C
bl RemoveWindow
movs r0, 0
strb r0, [r5, 0x4]
ldr r0, [r5]
@@ -176,7 +176,7 @@ ListMenuInit: @ 8106FF8
bl PutWindowTilemap
ldrb r0, [r5, 0x10]
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
adds r0, r4, 0
pop {r4,r5}
pop {r1}
@@ -219,7 +219,7 @@ _08107048:
_08107064:
ldrb r0, [r6, 0x10]
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
adds r0, r7, 0
add sp, 0x8
pop {r4-r7}
@@ -405,7 +405,7 @@ sub_8107180: @ 8107180
bl ListMenuDrawCursor
ldrb r0, [r4, 0x10]
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
pop {r4}
pop {r0}
bx r0
@@ -604,7 +604,7 @@ ListMenuGetYCoordForPrintingArrowCursor: @ 8107300
lsls r0, 26
lsrs r0, 26
movs r1, 0x1
bl sub_80F79D8
bl GetFontAttribute
ldrb r1, [r4, 0x16]
lsls r1, 26
lsrs r1, 29
@@ -850,7 +850,7 @@ ListMenuPrintEntries: @ 81074DC
lsls r0, 26
lsrs r0, 26
movs r1, 0x1
bl sub_80F79D8
bl GetFontAttribute
ldrb r1, [r4, 0x16]
lsls r1, 26
lsrs r1, 29
@@ -936,7 +936,7 @@ ListMenuDrawCursor: @ 8107594
lsls r0, 26
lsrs r0, 26
movs r1, 0x1
bl sub_80F79D8
bl GetFontAttribute
ldrb r1, [r6, 0x16]
lsls r1, 26
lsrs r1, 29
@@ -1071,7 +1071,7 @@ ListMenuAddCursorObject: @ 810768C
lsls r0, 26
lsrs r0, 26
movs r1, 0x1
bl sub_80F79D8
bl GetFontAttribute
mov r1, sp
lsls r0, 24
lsrs r0, 24
@@ -1114,7 +1114,7 @@ ListMenuErasePrintedCursor: @ 81076EC
lsls r0, r1, 26
lsrs r0, 26
movs r1, 0x1
bl sub_80F79D8
bl GetFontAttribute
adds r4, r0, 0
ldrb r0, [r7, 0x16]
lsls r0, 26
@@ -1126,7 +1126,7 @@ ListMenuErasePrintedCursor: @ 81076EC
lsls r0, 26
lsrs r0, 26
movs r1, 0
bl sub_80F7AC0
bl GetMenuCursorDimensionByFont
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
@@ -1134,7 +1134,7 @@ ListMenuErasePrintedCursor: @ 81076EC
lsls r0, 26
lsrs r0, 26
movs r1, 0x1
bl sub_80F7AC0
bl GetMenuCursorDimensionByFont
lsls r0, 24
lsrs r0, 24
ldrb r6, [r7, 0x10]
@@ -1340,7 +1340,7 @@ _0810789E:
lsls r0, 26
lsrs r0, 26
movs r1, 0x1
bl sub_80F79D8
bl GetFontAttribute
ldrb r1, [r6, 0x16]
lsls r1, 26
lsrs r1, 29
@@ -1537,7 +1537,7 @@ _08107A1A:
bl ListMenuCallSelectionChangedCallback
ldrb r0, [r4, 0x10]
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
b _08107A62
_08107A3A:
adds r0, r4, 0
@@ -1554,7 +1554,7 @@ _08107A3A:
bl ListMenuCallSelectionChangedCallback
ldrb r0, [r4, 0x10]
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
_08107A62:
movs r0, 0
_08107A64:
asm/load_save.s
+14 -14
View File
@@ -68,8 +68,8 @@ _0804C050: .4byte gUnknown_202552C
_0804C054: .4byte 0x01001ef4
thumb_func_end ClearSav1
thumb_func_start sub_804C058
sub_804C058: @ 804C058
thumb_func_start SetSaveBlocksPointers
SetSaveBlocksPointers: @ 804C058
push {r4,r5,lr}
ldr r4, _0804C08C @ =gUnknown_3005008
ldr r5, [r4]
@@ -100,7 +100,7 @@ _0804C094: .4byte gUnknown_2024588
_0804C098: .4byte gUnknown_202552C
_0804C09C: .4byte gUnknown_3005010
_0804C0A0: .4byte gUnknown_2029314
thumb_func_end sub_804C058
thumb_func_end SetSaveBlocksPointers
thumb_func_start sub_804C0A4
sub_804C0A4: @ 804C0A4
@@ -141,7 +141,7 @@ sub_804C0A4: @ 804C0A4
ldr r0, _0804C184 @ =gHeap + 0x4c8c
mov r2, r8
bl memcpy
bl sub_804C058
bl SetSaveBlocksPointers
ldr r1, _0804C168 @ =gUnknown_300500C
ldr r0, [r1]
adds r1, r5, 0
@@ -335,8 +335,8 @@ _0804C268: .4byte gUnknown_3005008
_0804C26C: .4byte gUnknown_2024284
thumb_func_end sub_804C230
thumb_func_start sub_804C270
sub_804C270: @ 804C270
thumb_func_start save_serialize_npcs
save_serialize_npcs: @ 804C270
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -373,7 +373,7 @@ _0804C286:
.align 2, 0
_0804C2B0: .4byte gUnknown_3005008
_0804C2B4: .4byte gUnknown_2036E38
thumb_func_end sub_804C270
thumb_func_end save_serialize_npcs
thumb_func_start sub_804C2B8
sub_804C2B8: @ 804C2B8
@@ -415,14 +415,14 @@ _0804C2F8: .4byte gUnknown_3005008
_0804C2FC: .4byte gUnknown_2036E38
thumb_func_end sub_804C2B8
thumb_func_start sub_804C300
sub_804C300: @ 804C300
thumb_func_start SaveSerializedGame
SaveSerializedGame: @ 804C300
push {lr}
bl copy_player_party_to_sav1
bl sub_804C270
bl save_serialize_npcs
pop {r0}
bx r0
thumb_func_end sub_804C300
thumb_func_end SaveSerializedGame
thumb_func_start sub_804C310
sub_804C310: @ 804C310
@@ -433,8 +433,8 @@ sub_804C310: @ 804C310
bx r0
thumb_func_end sub_804C310
thumb_func_start sub_804C320
sub_804C320: @ 804C320
thumb_func_start copy_bags_and_unk_data_from_save_blocks
copy_bags_and_unk_data_from_save_blocks: @ 804C320
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -578,7 +578,7 @@ _0804C430: .4byte gUnknown_2031764
_0804C434: .4byte 0x00000464
_0804C438: .4byte 0x0000054c
_0804C43C: .4byte 0x00002cd0
thumb_func_end sub_804C320
thumb_func_end copy_bags_and_unk_data_from_save_blocks
thumb_func_start sub_804C440
sub_804C440: @ 804C440
asm/mail.s
+9 -9
View File
@@ -27,10 +27,10 @@ sub_80BEBEC: @ 80BEBEC
ldr r2, [r4]
adds r1, r2, 0
adds r1, 0xF0
ldr r0, _080BEC40 @ =sub_80BD850
ldr r0, _080BEC40 @ =CopyEasyChatWord
str r0, [r1]
adds r1, 0x4
ldr r0, _080BEC44 @ =sub_80BD89C
ldr r0, _080BEC44 @ =ConvertEasyChatWordsToString
str r0, [r1]
ldrh r1, [r5, 0x20]
adds r0, r1, 0
@@ -47,8 +47,8 @@ sub_80BEBEC: @ 80BEBEC
.align 2, 0
_080BEC38: .4byte gUnknown_20399C4
_080BEC3C: .4byte 0x000020fc
_080BEC40: .4byte sub_80BD850
_080BEC44: .4byte sub_80BD89C
_080BEC40: .4byte CopyEasyChatWord
_080BEC44: .4byte ConvertEasyChatWordsToString
_080BEC48:
adds r1, r2, 0
adds r1, 0xEA
@@ -297,7 +297,7 @@ _080BEE74: .4byte 0x000010fc
_080BEE78:
ldr r0, _080BEE84 @ =gUnknown_83EE9A4
bl sub_8003B24
bl sub_8002C28
bl DeactivateAllTextPrinters
b _080BF0F4
.align 2, 0
_080BEE84: .4byte gUnknown_83EE9A4
@@ -665,7 +665,7 @@ _080BF152:
lsls r2, 30
lsrs r2, 30
movs r3, 0x1
bl sub_80BD89C
bl ConvertEasyChatWordsToString
ldr r0, [r7]
adds r0, 0xF8
ldr r1, [r0]
@@ -878,10 +878,10 @@ _080BF2CE:
bl sub_812E51C
movs r0, 0
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
movs r0, 0x1
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
add sp, 0xC
pop {r3,r4}
mov r8, r3
@@ -1023,7 +1023,7 @@ _080BF442:
movs r1, 0
bl memset
bl ResetPaletteFade
bl sub_8003ECC
bl FreeAllWindowBuffers
ldr r0, [r4]
bl Free
movs r0, 0
asm/mail_data.s
+11 -11
View File
@@ -5,8 +5,8 @@
.text
thumb_func_start sub_8097C84
sub_8097C84: @ 8097C84
thumb_func_start ClearMailData
ClearMailData: @ 8097C84
push {r4,r5,lr}
movs r4, 0
ldr r5, _08097CAC @ =gUnknown_3005008
@@ -18,7 +18,7 @@ _08097C8A:
adds r1, r0
ldr r0, [r5]
adds r0, r1
bl sub_8097CB4
bl ClearMailStruct
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -30,10 +30,10 @@ _08097C8A:
.align 2, 0
_08097CAC: .4byte gUnknown_3005008
_08097CB0: .4byte 0x00002cd0
thumb_func_end sub_8097C84
thumb_func_end ClearMailData
thumb_func_start sub_8097CB4
sub_8097CB4: @ 8097CB4
thumb_func_start ClearMailStruct
ClearMailStruct: @ 8097CB4
push {r4-r6,lr}
adds r3, r0, 0
ldr r0, _08097D04 @ =0x0000ffff
@@ -79,10 +79,10 @@ _08097CEE:
bx r0
.align 2, 0
_08097D04: .4byte 0x0000ffff
thumb_func_end sub_8097CB4
thumb_func_end ClearMailStruct
thumb_func_start sub_8097D08
sub_8097D08: @ 8097D08
thumb_func_start MonHasMail
MonHasMail: @ 8097D08
push {r4,lr}
adds r4, r0, 0
movs r1, 0xC
@@ -106,7 +106,7 @@ _08097D32:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_8097D08
thumb_func_end MonHasMail
thumb_func_start sub_8097D38
sub_8097D38: @ 8097D38
@@ -448,7 +448,7 @@ TakeMailFromMon: @ 8097FB8
push {r4,lr}
sub sp, 0x8
adds r4, r0, 0
bl sub_8097D08
bl MonHasMail
lsls r0, 24
cmp r0, 0
beq _08098008
asm/mailbox_pc.s
+2 -2
View File
@@ -85,7 +85,7 @@ sub_810EBE0: @ 810EBE0
ldrb r0, [r4]
bl ClearWindowTilemap
ldrb r0, [r4]
bl sub_8003E3C
bl RemoveWindow
movs r0, 0xFF
strb r0, [r4]
pop {r4}
@@ -216,7 +216,7 @@ _0810ECCE:
strb r4, [r5, 0x11]
movs r0, 0x2
movs r1, 0
bl sub_80F7AC0
bl GetMenuCursorDimensionByFont
strb r0, [r5, 0x12]
strb r4, [r5, 0x13]
ldrb r0, [r5, 0x16]
asm/main.s
+1 -1
View File
@@ -36,7 +36,7 @@ AgbMain: @ 80003A4
movs r1, 0xE0
lsls r1, 9
bl InitHeap
bl sub_80F79C8
bl SetDefaultFontsPointer
ldr r0, _08000468 @ =gUnknown_3003530
movs r4, 0
strb r4, [r0]
asm/main_menu.s
+12 -12
View File
@@ -150,7 +150,7 @@ sub_800C318: @ 800C318
bl ChangeBgY
ldr r0, _0800C4B8 @ =gUnknown_8234618
bl sub_8003B24
bl sub_8002C28
bl DeactivateAllTextPrinters
ldr r0, _0800C4BC @ =gUnknown_8234648
movs r1, 0
movs r2, 0x20
@@ -693,11 +693,11 @@ _0800C870:
bl PutWindowTilemap
movs r0, 0x1
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
movs r0, 0x2
_0800C8D8:
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
b _0800C994
.align 2, 0
_0800C8E0: .4byte gUnknown_8234688
@@ -764,13 +764,13 @@ _0800C8F0:
bl PutWindowTilemap
movs r0, 0x1
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
movs r0, 0x2
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
movs r0, 0x3
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
_0800C994:
ldr r0, _0800C9C4 @ =gUnknown_3005090
mov r2, r8
@@ -980,7 +980,7 @@ _0800CB2E:
ldr r1, _0800CB44 @ =gUnknown_2031DE0
movs r0, 0
strb r0, [r1]
bl sub_8003ECC
bl FreeAllWindowBuffers
adds r0, r6, 0
bl DestroyTask
bl sub_812EB2C
@@ -996,7 +996,7 @@ _0800CB48:
strh r1, [r0]
ldr r0, _0800CB6C @ =gUnknown_2031DE0
strb r2, [r0]
bl sub_8003ECC
bl FreeAllWindowBuffers
adds r0, r6, 0
bl sub_8110F14
b _0800CB84
@@ -1008,7 +1008,7 @@ _0800CB70:
ldr r0, _0800CB8C @ =sub_81422AC
bl SetMainCallback2
bl sub_812B478
bl sub_8003ECC
bl FreeAllWindowBuffers
adds r0, r6, 0
bl DestroyTask
_0800CB84:
@@ -1360,7 +1360,7 @@ sub_800CDF8: @ 800CDF8
bl PutWindowTilemap
movs r0, 0x4
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
ldr r1, _0800CE50 @ =0x000013dd
movs r0, 0x40
bl SetGpuReg
@@ -1495,7 +1495,7 @@ sub_800CF3C: @ 800CF3C
push {r4-r6,lr}
sub sp, 0x2C
ldr r0, _0800CF60 @ =0x00000829
bl sub_806E6D0
bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1563,7 +1563,7 @@ sub_800CFC4: @ 800CFC4
_0800CFCE:
lsls r0, r4, 16
lsrs r0, 16
bl sub_806E6D0
bl FlagGet
lsls r0, 24
cmp r0, 0
beq _0800CFE2
asm/map_name_popup.s
+6 -6
View File
@@ -11,7 +11,7 @@ sub_8098110: @ 8098110
adds r6, r0, 0
movs r0, 0x80
lsls r0, 7
bl sub_806E6D0
bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -173,7 +173,7 @@ _0809824C:
bl sub_8098400
ldrb r0, [r4, 0x10]
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
movs r0, 0x1
strh r0, [r4, 0x8]
movs r0, 0
@@ -196,7 +196,7 @@ _0809827E:
bl rbox_fill_rectangle
ldrb r0, [r4, 0x10]
movs r1, 0x1
bl sub_8003F20
bl CopyWindowToVram
movs r0, 0x1
strh r0, [r4, 0x14]
_080982A0:
@@ -214,7 +214,7 @@ _080982A6:
cmp r0, 0
beq _080982C6
ldrb r0, [r4, 0x10]
bl sub_8003E3C
bl RemoveWindow
strh r5, [r4, 0x12]
movs r0, 0x1
strh r0, [r4, 0x16]
@@ -367,7 +367,7 @@ _080983C6:
bl sub_8098400
adds r0, r4, 0
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
adds r0, r5, 0
add sp, 0x8
pop {r4-r6}
@@ -429,7 +429,7 @@ _08098434:
movs r1, 0x2
add r2, sp, 0xC
adds r3, r4, 0
bl sub_8002C48
bl PrintTextOnWindow
add sp, 0x28
pop {r4-r6}
pop {r0}
asm/map_preview_screen.s
+5 -5
View File
@@ -188,7 +188,7 @@ sub_80F8234: @ 80F8234
push {lr}
lsls r0, 24
lsrs r0, 24
bl sub_8003E3C
bl RemoveWindow
ldr r0, _080F8254 @ =gUnknown_203ABED
ldrb r0, [r0]
cmp r0, 0
@@ -426,7 +426,7 @@ _080F8422:
_080F842E:
ldrb r0, [r4, 0x16]
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
b _080F84EA
_080F8438:
bl IsDma3ManagerBusyWithBgCopy
@@ -601,7 +601,7 @@ _080F8582:
cmp r0, 0
bne _080F85A4
adds r0, r2, 0
bl sub_806E6D0
bl FlagGet
lsls r0, 24
cmp r0, 0
beq _080F85B4
@@ -631,7 +631,7 @@ sub_80F85BC: @ 80F85BC
lsls r0, 16
lsrs r4, r0, 16
adds r0, r4, 0
bl sub_806E6D0
bl FlagGet
lsls r0, 24
cmp r0, 0
bne _080F85D8
@@ -646,7 +646,7 @@ _080F85D8:
_080F85DC:
strb r0, [r1]
adds r0, r4, 0
bl sub_806E680
bl FlagSet
pop {r4}
pop {r0}
bx r0
asm/menews_jisan.s
+1 -1
View File
@@ -60,7 +60,7 @@ sub_8146C88: @ 8146C88
strb r1, [r0]
strb r1, [r0, 0x1]
ldr r0, _08146CA0 @ =0x00004028
bl sub_806E584
bl VarSet
pop {r0}
bx r0
.align 2, 0
asm/menu.s
+64 -64
View File
@@ -29,7 +29,7 @@ sub_810EDC4: @ 810EDC4
bne _0810EDFA
adds r0, r5, 0
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
_0810EDFA:
pop {r4,r5}
pop {r0}
@@ -67,7 +67,7 @@ sub_810EE0C: @ 810EE0C
bne _0810EE4A
adds r0, r6, 0
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
_0810EE4A:
pop {r4-r6}
pop {r0}
@@ -576,7 +576,7 @@ sub_810F260: @ 810F260
bne _0810F28E
adds r0, r5, 0
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
_0810F28E:
pop {r4,r5}
pop {r0}
@@ -651,7 +651,7 @@ SetWindowBorderStyle: @ 810F2E8
bne _0810F31E
adds r0, r5, 0
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
_0810F31E:
pop {r4,r5}
pop {r0}
@@ -689,7 +689,7 @@ sub_810F330: @ 810F330
bne _0810F36E
adds r0, r6, 0
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
_0810F36E:
pop {r4-r6}
pop {r0}
@@ -886,7 +886,7 @@ sub_810F4D8: @ 810F4D8
bne _0810F506
adds r0, r5, 0
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
_0810F506:
pop {r4,r5}
pop {r0}
@@ -1046,7 +1046,7 @@ sub_810F5E8: @ 810F5E8
beq _0810F63E
ldrb r0, [r4]
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
_0810F63E:
add sp, 0xC
pop {r4-r6}
@@ -1137,7 +1137,7 @@ _0810F6CE:
beq _0810F6F6
ldrb r0, [r6]
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
_0810F6F6:
add sp, 0x18
pop {r3}
@@ -1155,7 +1155,7 @@ sub_810F704: @ 810F704
cmp r0, 0xFF
beq _0810F714
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
_0810F714:
pop {r0}
bx r0
@@ -1174,7 +1174,7 @@ sub_810F71C: @ 810F71C
bl FillWindowPixelBuffer
ldrb r0, [r4]
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
_0810F734:
pop {r4}
pop {r0}
@@ -1196,9 +1196,9 @@ sub_810F740: @ 810F740
bl ClearWindowTilemap
ldrb r0, [r4]
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
ldrb r0, [r4]
bl sub_8003E3C
bl RemoveWindow
movs r0, 0xFF
strb r0, [r4]
_0810F768:
@@ -1326,7 +1326,7 @@ sub_810F818: @ 810F818
movs r1, 0x1
str r2, [sp, 0xC]
str r3, [sp, 0x10]
bl sub_80F7AC0
bl GetMenuCursorDimensionByFont
lsls r0, 24
lsrs r0, 24
str r0, [sp]
@@ -1365,13 +1365,13 @@ RedrawMenuCursor: @ 810F874
ldr r5, _0810F8FC @ =gUnknown_203ADE4
ldrb r0, [r5, 0x6]
movs r1, 0
bl sub_80F7AC0
bl GetMenuCursorDimensionByFont
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldrb r0, [r5, 0x6]
movs r1, 0x1
bl sub_80F7AC0
bl GetMenuCursorDimensionByFont
lsls r0, 24
lsrs r0, 24
ldrb r1, [r5, 0x5]
@@ -1405,7 +1405,7 @@ RedrawMenuCursor: @ 810F874
movs r4, 0
str r4, [sp, 0x4]
str r4, [sp, 0x8]
bl sub_8002C48
bl PrintTextOnWindow
add sp, 0xC
pop {r3,r4}
mov r8, r3
@@ -1496,14 +1496,14 @@ _0810F97A:
bx r1
thumb_func_end MoveMenuCursorNoWrapAround
thumb_func_start sub_810F98C
sub_810F98C: @ 810F98C
thumb_func_start GetMenuCursorPos
GetMenuCursorPos: @ 810F98C
ldr r0, _0810F994 @ =gUnknown_203ADE4
ldrb r0, [r0, 0x2]
bx lr
.align 2, 0
_0810F994: .4byte gUnknown_203ADE4
thumb_func_end sub_810F98C
thumb_func_end GetMenuCursorPos
thumb_func_start ProcessMenuInput
ProcessMenuInput: @ 810F998
@@ -1803,7 +1803,7 @@ _0810FBA0:
adds r0, r6, 0
mov r1, r10
mov r3, r9
bl sub_8002C48
bl PrintTextOnWindow
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -1812,7 +1812,7 @@ _0810FBA0:
_0810FBD0:
adds r0, r6, 0
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
add sp, 0xC
pop {r3-r5}
mov r8, r3
@@ -1892,7 +1892,7 @@ _0810FC30:
_0810FC68:
adds r0, r7, 0
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
add sp, 0x20
pop {r3-r5}
mov r8, r3
@@ -1925,7 +1925,7 @@ sub_810FC80: @ 810FC80
lsrs r5, 24
adds r0, r6, 0
movs r1, 0
bl sub_80F7AC0
bl GetMenuCursorDimensionByFont
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -1944,8 +1944,8 @@ sub_810FC80: @ 810FC80
bx r0
thumb_func_end sub_810FC80
thumb_func_start sub_810FCD0
sub_810FCD0: @ 810FCD0
thumb_func_start AddItemMenuActionTextPrinters
AddItemMenuActionTextPrinters: @ 810FCD0
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -1985,7 +1985,7 @@ sub_810FCD0: @ 810FCD0
strb r6, [r0, 0x5]
adds r0, r6, 0
movs r1, 0x5
bl sub_80F79D8
bl GetFontAttribute
mov r3, sp
lsls r0, 4
ldrb r2, [r3, 0xC]
@@ -1996,7 +1996,7 @@ sub_810FCD0: @ 810FCD0
strb r1, [r3, 0xC]
adds r0, r6, 0
movs r1, 0x6
bl sub_80F79D8
bl GetFontAttribute
mov r3, sp
adds r1, r5, 0
ands r1, r0
@@ -2009,7 +2009,7 @@ sub_810FCD0: @ 810FCD0
strb r0, [r3, 0xD]
adds r0, r6, 0
movs r1, 0x7
bl sub_80F79D8
bl GetFontAttribute
mov r3, sp
lsls r0, 4
ldrb r2, [r3, 0xD]
@@ -2019,7 +2019,7 @@ sub_810FCD0: @ 810FCD0
strb r1, [r3, 0xD]
adds r0, r6, 0
movs r1, 0x4
bl sub_80F79D8
bl GetFontAttribute
mov r1, sp
ands r5, r0
ldrb r0, [r1, 0xC]
@@ -2031,7 +2031,7 @@ sub_810FCD0: @ 810FCD0
strb r2, [r0, 0xA]
adds r0, r6, 0
movs r1, 0x3
bl sub_80F79D8
bl GetFontAttribute
mov r1, sp
strb r0, [r1, 0xB]
mov r0, sp
@@ -2060,7 +2060,7 @@ _0810FD9A:
mov r0, sp
movs r1, 0xFF
movs r2, 0
bl sub_8002CF4
bl AddTextPrinter
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -2069,7 +2069,7 @@ _0810FD9A:
_0810FDCA:
ldr r0, [sp, 0x10]
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
add sp, 0x18
pop {r3-r5}
mov r8, r3
@@ -2078,7 +2078,7 @@ _0810FDCA:
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_810FCD0
thumb_func_end AddItemMenuActionTextPrinters
thumb_func_start sub_810FDE4
sub_810FDE4: @ 810FDE4
@@ -2105,13 +2105,13 @@ sub_810FDE4: @ 810FDE4
mov r8, r0
adds r0, r4, 0
movs r1, 0
bl sub_80F79D8
bl GetFontAttribute
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
adds r0, r4, 0
movs r1, 0x2
bl sub_80F79D8
bl GetFontAttribute
lsls r0, 24
lsrs r0, 24
str r0, [sp]
@@ -2125,7 +2125,7 @@ sub_810FDE4: @ 810FDE4
adds r1, r4, 0
adds r2, r5, 0
movs r3, 0
bl sub_810FCD0
bl AddItemMenuActionTextPrinters
add sp, 0x14
pop {r3,r4}
mov r8, r3
@@ -2135,8 +2135,8 @@ sub_810FDE4: @ 810FDE4
bx r0
thumb_func_end sub_810FDE4
thumb_func_start sub_810FE50
sub_810FE50: @ 810FE50
thumb_func_start SetWindowTemplateFields
SetWindowTemplateFields: @ 810FE50
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -2223,7 +2223,7 @@ _0810FEF4: .4byte 0xffff00ff
_0810FEF8: .4byte 0xff00ffff
_0810FEFC: .4byte 0x00ffffff
_0810FF00: .4byte 0x0000ffff
thumb_func_end sub_810FE50
thumb_func_end SetWindowTemplateFields
thumb_func_start sub_810FF04
sub_810FF04: @ 810FF04
@@ -2257,7 +2257,7 @@ sub_810FF04: @ 810FF04
adds r1, r4, 0
adds r2, r5, 0
adds r3, r6, 0
bl sub_810FE50
bl SetWindowTemplateFields
ldr r0, [sp, 0x10]
ldr r1, [sp, 0x14]
str r0, [sp, 0x18]
@@ -2322,7 +2322,7 @@ sub_810FF60: @ 810FF60
strb r6, [r0, 0x5]
adds r0, r6, 0
movs r1, 0
bl sub_80F7AC0
bl GetMenuCursorDimensionByFont
add r1, sp, 0xC
add r0, r8
strb r0, [r1, 0x6]
@@ -2337,7 +2337,7 @@ sub_810FF60: @ 810FF60
strb r0, [r1, 0x9]
adds r0, r6, 0
movs r1, 0x5
bl sub_80F79D8
bl GetFontAttribute
add r3, sp, 0xC
lsls r0, 4
ldrb r2, [r3, 0xC]
@@ -2348,7 +2348,7 @@ sub_810FF60: @ 810FF60
strb r1, [r3, 0xC]
adds r0, r6, 0
movs r1, 0x6
bl sub_80F79D8
bl GetFontAttribute
add r3, sp, 0xC
adds r1, r5, 0
ands r1, r0
@@ -2361,7 +2361,7 @@ sub_810FF60: @ 810FF60
strb r0, [r3, 0xD]
adds r0, r6, 0
movs r1, 0x7
bl sub_80F79D8
bl GetFontAttribute
add r3, sp, 0xC
lsls r0, 4
ldrb r2, [r3, 0xD]
@@ -2371,7 +2371,7 @@ sub_810FF60: @ 810FF60
strb r1, [r3, 0xD]
adds r0, r6, 0
movs r1, 0x4
bl sub_80F79D8
bl GetFontAttribute
add r1, sp, 0xC
ands r5, r0
ldrb r0, [r1, 0xC]
@@ -2380,21 +2380,21 @@ sub_810FF60: @ 810FF60
strb r4, [r1, 0xC]
adds r0, r6, 0
movs r1, 0x2
bl sub_80F79D8
bl GetFontAttribute
add r1, sp, 0xC
strb r0, [r1, 0xA]
adds r0, r6, 0
movs r1, 0x3
bl sub_80F79D8
bl GetFontAttribute
add r1, sp, 0xC
strb r0, [r1, 0xB]
adds r0, r1, 0
movs r1, 0xFF
movs r2, 0
bl sub_8002CF4
bl AddTextPrinter
adds r0, r6, 0
movs r1, 0x1
bl sub_80F79D8
bl GetFontAttribute
add r1, sp, 0xC
ldrb r1, [r1, 0xB]
adds r0, r1
@@ -2471,7 +2471,7 @@ sub_81100E8: @ 81100E8
movs r1, 0x1
bl sub_810F4D8
ldrb r0, [r4]
bl sub_8003E3C
bl RemoveWindow
pop {r4}
pop {r0}
bx r0
@@ -2508,13 +2508,13 @@ sub_8110104: @ 8110104
str r5, [sp, 0x18]
mov r0, r9
movs r1, 0
bl sub_80F79D8
bl GetFontAttribute
lsls r0, 24
lsrs r0, 24
mov r10, r0
mov r0, r9
movs r1, 0x1
bl sub_80F79D8
bl GetFontAttribute
lsls r0, 24
lsrs r0, 24
movs r1, 0x10
@@ -2561,7 +2561,7 @@ _0811017C:
str r0, [sp, 0x8]
ldr r0, [sp, 0xC]
mov r1, r9
bl sub_8002C48
bl PrintTextOnWindow
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -2577,7 +2577,7 @@ _081101B8:
bcc _08110164
ldr r0, [sp, 0xC]
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
add sp, 0x20
pop {r3-r5}
mov r8, r3
@@ -2617,7 +2617,7 @@ sub_81101D8: @ 81101D8
str r5, [sp, 0x18]
mov r0, r10
movs r1, 0
bl sub_80F79D8
bl GetFontAttribute
lsls r0, 24
lsrs r0, 24
mov r9, r0
@@ -2658,7 +2658,7 @@ _08110230:
str r0, [sp, 0x8]
ldr r0, [sp, 0xC]
mov r1, r10
bl sub_8002C48
bl PrintTextOnWindow
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -2674,7 +2674,7 @@ _08110272:
bcc _0811021C
ldr r0, [sp, 0xC]
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
add sp, 0x1C
pop {r3-r5}
mov r8, r3
@@ -2829,7 +2829,7 @@ sub_811037C: @ 811037C
ldr r5, _08110448 @ =gUnknown_203ADE4
ldrb r0, [r5, 0x6]
movs r1, 0
bl sub_80F7AC0
bl GetMenuCursorDimensionByFont
mov r9, r0
mov r1, r9
lsls r1, 24
@@ -2837,7 +2837,7 @@ sub_811037C: @ 811037C
mov r9, r1
ldrb r0, [r5, 0x6]
movs r1, 0x1
bl sub_80F7AC0
bl GetMenuCursorDimensionByFont
adds r6, r0, 0
lsls r6, 24
lsrs r6, 24
@@ -2899,7 +2899,7 @@ sub_811037C: @ 811037C
str r3, [sp, 0x4]
str r3, [sp, 0x8]
adds r3, r4, 0
bl sub_8002C48
bl PrintTextOnWindow
add sp, 0xC
pop {r3-r5}
mov r8, r3
@@ -3145,7 +3145,7 @@ _08110600:
ands r0, r1
cmp r0, 0
bne _08110614
bl sub_80BF630
bl GetLRKeysState
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3162,7 +3162,7 @@ _08110620:
ands r0, r1
cmp r0, 0
bne _08110636
bl sub_80BF630
bl GetLRKeysState
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
@@ -3233,7 +3233,7 @@ _081106A4:
ands r0, r1
cmp r0, 0
bne _081106B8
bl sub_80BF630
bl GetLRKeysState
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3248,7 +3248,7 @@ _081106BE:
ands r0, r1
cmp r0, 0
bne _081106D4
bl sub_80BF630
bl GetLRKeysState
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
asm/menu2.s
+9 -9
View File
@@ -31,12 +31,12 @@ sub_812E51C: @ 812E51C
strb r0, [r1, 0x9]
adds r0, r4, 0
movs r1, 0x2
bl sub_80F79D8
bl GetFontAttribute
mov r1, sp
strb r0, [r1, 0xA]
adds r0, r4, 0
movs r1, 0x3
bl sub_80F79D8
bl GetFontAttribute
mov r1, sp
strb r0, [r1, 0xB]
mov r3, sp
@@ -67,7 +67,7 @@ sub_812E51C: @ 812E51C
mov r0, sp
adds r1, r5, 0
movs r2, 0
bl sub_8002CF4
bl AddTextPrinter
add sp, 0x10
pop {r4-r6}
pop {r0}
@@ -135,7 +135,7 @@ sub_812E5A4: @ 812E5A4
lsrs r1, 24
mov r0, sp
movs r2, 0
bl sub_8002CF4
bl AddTextPrinter
add sp, 0x10
pop {r3,r4}
mov r8, r3
@@ -191,7 +191,7 @@ sub_812E62C: @ 812E62C
strb r0, [r2, 0xC]
adds r0, r6, 0
movs r1, 0x5
bl sub_80F79D8
bl GetFontAttribute
mov r3, sp
lsls r0, 4
ldrb r2, [r3, 0xC]
@@ -202,7 +202,7 @@ sub_812E62C: @ 812E62C
strb r1, [r3, 0xC]
adds r0, r6, 0
movs r1, 0x6
bl sub_80F79D8
bl GetFontAttribute
mov r2, sp
adds r1, r4, 0
ands r1, r0
@@ -212,7 +212,7 @@ sub_812E62C: @ 812E62C
strb r5, [r2, 0xD]
adds r0, r6, 0
movs r1, 0x7
bl sub_80F79D8
bl GetFontAttribute
mov r2, sp
lsls r0, 4
ldrb r1, [r2, 0xD]
@@ -222,7 +222,7 @@ sub_812E62C: @ 812E62C
mov r0, sp
mov r1, r8
adds r2, r7, 0
bl sub_8002CF4
bl AddTextPrinter
add sp, 0x10
pop {r3,r4}
mov r8, r3
@@ -275,7 +275,7 @@ _0812E70A:
mov r0, r8
movs r1, 0x2
adds r2, r7, 0
bl sub_8002C48
bl PrintTextOnWindow
b _0812E75C
.align 2, 0
_0812E734: .4byte gUnknown_300500C
asm/menu_helpers.s
+14 -14
View File
@@ -5,8 +5,8 @@
.text
thumb_func_start sub_80BF474
sub_80BF474: @ 80BF474
thumb_func_start DisplayMessageAndContinueTask
DisplayMessageAndContinueTask: @ 80BF474
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -57,7 +57,7 @@ _080BF4B8:
adds r1, r7, 0
adds r2, r4, 0
adds r3, r5, 0
bl sub_80F6CD0
bl AddTextPrinterParametrized
ldr r1, _080BF50C @ =gUnknown_20399CC
ldr r0, [sp, 0x34]
str r0, [r1]
@@ -67,7 +67,7 @@ _080BF4B8:
add r0, r8
lsls r0, 3
adds r0, r1
ldr r1, _080BF514 @ =sub_80BF534
ldr r1, _080BF514 @ =Task_ContinueTaskAfterMessagePrints
str r1, [r0]
add sp, 0x10
pop {r3}
@@ -81,8 +81,8 @@ _080BF504: .4byte gUnknown_2021D18
_080BF508: .4byte gUnknown_3003E50
_080BF50C: .4byte gUnknown_20399CC
_080BF510: .4byte gUnknown_3005090
_080BF514: .4byte sub_80BF534
thumb_func_end sub_80BF474
_080BF514: .4byte Task_ContinueTaskAfterMessagePrints
thumb_func_end DisplayMessageAndContinueTask
thumb_func_start sub_80BF518
sub_80BF518: @ 80BF518
@@ -100,8 +100,8 @@ sub_80BF518: @ 80BF518
bx r1
thumb_func_end sub_80BF518
thumb_func_start sub_80BF534
sub_80BF534: @ 80BF534
thumb_func_start Task_ContinueTaskAfterMessagePrints
Task_ContinueTaskAfterMessagePrints: @ 80BF534
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -122,7 +122,7 @@ _080BF552:
.align 2, 0
_080BF558: .4byte gUnknown_20399D0
_080BF55C: .4byte gUnknown_20399CC
thumb_func_end sub_80BF534
thumb_func_end Task_ContinueTaskAfterMessagePrints
thumb_func_start sub_80BF560
sub_80BF560: @ 80BF560
@@ -230,8 +230,8 @@ _080BF628: .4byte gUnknown_3005090
_080BF62C: .4byte sub_80BF560
thumb_func_end sub_80BF5D0
thumb_func_start sub_80BF630
sub_80BF630: @ 80BF630
thumb_func_start GetLRKeysState
GetLRKeysState: @ 80BF630
push {lr}
ldr r0, _080BF650 @ =gUnknown_300500C
ldr r0, [r0]
@@ -263,7 +263,7 @@ _080BF666:
_080BF668:
pop {r1}
bx r1
thumb_func_end sub_80BF630
thumb_func_end GetLRKeysState
thumb_func_start sub_80BF66C
sub_80BF66C: @ 80BF66C
@@ -314,7 +314,7 @@ sub_80BF6A8: @ 80BF6A8
lsls r0, 1
cmp r1, r0
beq _080BF6C8
bl sub_811B0D0
bl InUnionRoom
cmp r0, 0x1
bne _080BF6D0
_080BF6C8:
@@ -337,7 +337,7 @@ itemid_80BF6D8_mail_related: @ 80BF6D8
bl sub_805642C
cmp r0, 0x1
beq _080BF6EE
bl sub_811B0D0
bl InUnionRoom
cmp r0, 0x1
bne _080BF700
_080BF6EE:
asm/metatile_behavior.s
+9 -9
View File
@@ -997,8 +997,8 @@ _08059FF0:
bx r1
thumb_func_end sub_8059FE0
thumb_func_start sub_8059FF4
sub_8059FF4: @ 8059FF4
thumb_func_start MetatileBehavior_IsThinIce
MetatileBehavior_IsThinIce: @ 8059FF4
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -1011,10 +1011,10 @@ _0805A002:
_0805A004:
pop {r1}
bx r1
thumb_func_end sub_8059FF4
thumb_func_end MetatileBehavior_IsThinIce
thumb_func_start sub_805A008
sub_805A008: @ 805A008
thumb_func_start MetatileBehavior_IsCrackedIce
MetatileBehavior_IsCrackedIce: @ 805A008
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -1027,7 +1027,7 @@ _0805A016:
_0805A018:
pop {r1}
bx r1
thumb_func_end sub_805A008
thumb_func_end MetatileBehavior_IsCrackedIce
thumb_func_start sub_805A01C
sub_805A01C: @ 805A01C
@@ -1068,8 +1068,8 @@ _0805A04C:
bx r1
thumb_func_end sub_805A03C
thumb_func_start sub_805A050
sub_805A050: @ 805A050
thumb_func_start MetatileBehavior_IsSurfableAndNotWaterfall
MetatileBehavior_IsSurfableAndNotWaterfall: @ 805A050
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -1091,7 +1091,7 @@ _0805A074:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_805A050
thumb_func_end MetatileBehavior_IsSurfableAndNotWaterfall
thumb_func_start sub_805A07C
sub_805A07C: @ 805A07C
asm/mevent.s
+2 -2
View File
@@ -1495,7 +1495,7 @@ sub_8144144: @ 8144144
lsls r0, 1
adds r0, r1
ldrh r0, [r0]
bl sub_806E6D0
bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1784,7 +1784,7 @@ _0814435C:
ldr r1, [r0]
adds r1, 0xA
adds r0, r5, 0
bl sub_805490C
bl CopyUnalignedWord
mov r2, r8
ldr r1, [r2]
adds r0, r6, 0
asm/mevent_8145654.s
+11 -11
View File
@@ -459,19 +459,19 @@ _081459F2:
lsls r1, 1
adds r0, r1
ldrb r0, [r0]
bl sub_8003E3C
bl RemoveWindow
ldr r0, [r4]
movs r1, 0xBC
lsls r1, 1
adds r0, r1
ldrb r0, [r0]
bl sub_8003E3C
bl RemoveWindow
ldr r0, [r4]
movs r1, 0xBB
lsls r1, 1
adds r0, r1
ldrb r0, [r0]
bl sub_8003E3C
bl RemoveWindow
b _08145A7A
.align 2, 0
_08145A2C: .4byte gUnknown_203F3C8
@@ -928,7 +928,7 @@ _08145D70:
add r4, r9
movs r0, 0x3
movs r1, 0x2
bl sub_80F79D8
bl GetFontAttribute
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -1125,7 +1125,7 @@ _08145F38:
adds r4, 0x10
movs r0, 0x3
movs r1, 0x2
bl sub_80F79D8
bl GetFontAttribute
lsls r0, 24
lsrs r2, r0, 24
ldr r0, [r7]
@@ -1244,7 +1244,7 @@ _08146038:
mov r1, r9
lsrs r0, r1, 24
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
add sp, 0x18
pop {r3-r5}
mov r8, r3
@@ -2072,13 +2072,13 @@ _0814670C:
lsls r1, 1
adds r0, r1
ldrb r0, [r0]
bl sub_8003E3C
bl RemoveWindow
ldr r0, [r4]
movs r2, 0xE4
lsls r2, 1
adds r0, r2
ldrb r0, [r0]
bl sub_8003E3C
bl RemoveWindow
b _081467C4
.align 2, 0
_08146738: .4byte gUnknown_203F3CC
@@ -2511,7 +2511,7 @@ sub_8146A30: @ 8146A30
add r4, r8
movs r0, 0x3
movs r1, 0x2
bl sub_80F79D8
bl GetFontAttribute
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -2596,14 +2596,14 @@ _08146AD0:
adds r0, r3
ldrb r0, [r0]
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
ldr r0, [r6]
movs r1, 0xE5
lsls r1, 1
adds r0, r1
ldrb r0, [r0]
movs r1, 0x3
bl sub_8003F20
bl CopyWindowToVram
add sp, 0xC
pop {r3}
mov r8, r3
asm/mevent_server.s
+9 -9
View File
@@ -953,7 +953,7 @@ sub_8144F1C: @ 8144F1C
ldr r1, _08144F3C @ =gUnknown_8468B6C
movs r2, 0
movs r3, 0x1
bl sub_8144FA0
bl mevent_srv_init_common
pop {r4}
pop {r0}
bx r0
@@ -972,7 +972,7 @@ sub_8144F40: @ 8144F40
ldr r1, _08144F60 @ =gUnknown_8468BCC
movs r2, 0
movs r3, 0x1
bl sub_8144FA0
bl mevent_srv_init_common
pop {r4}
pop {r0}
bx r0
@@ -1001,7 +1001,7 @@ _08144F78:
ldr r0, [r4]
ldr r1, [r0, 0x4]
strh r1, [r6]
bl sub_8144FF8
bl mevent_srv_free_resources
ldr r0, [r4]
bl Free
movs r0, 0
@@ -1014,8 +1014,8 @@ _08144F98:
bx r1
thumb_func_end sub_8144F64
thumb_func_start sub_8144FA0
sub_8144FA0: @ 8144FA0
thumb_func_start mevent_srv_init_common
mevent_srv_init_common: @ 8144FA0
push {r4-r6,lr}
mov r6, r9
mov r5, r8
@@ -1055,10 +1055,10 @@ sub_8144FA0: @ 8144FA0
pop {r4-r6}
pop {r0}
bx r0
thumb_func_end sub_8144FA0
thumb_func_end mevent_srv_init_common
thumb_func_start sub_8144FF8
sub_8144FF8: @ 8144FF8
thumb_func_start mevent_srv_free_resources
mevent_srv_free_resources: @ 8144FF8
push {r4,lr}
adds r4, r0, 0
ldr r0, [r4, 0x18]
@@ -1072,7 +1072,7 @@ sub_8144FF8: @ 8144FF8
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_8144FF8
thumb_func_end mevent_srv_free_resources
thumb_func_start sub_814501C
sub_814501C: @ 814501C
asm/money.s
+6 -6
View File
@@ -193,7 +193,7 @@ _0809FE7E:
adds r0, r6, 0
movs r1, 0
adds r2, r4, 0
bl sub_8002C48
bl PrintTextOnWindow
add sp, 0xC
pop {r4-r6}
pop {r0}
@@ -257,7 +257,7 @@ _0809FF14:
adds r0, r7, 0
movs r1, 0
mov r3, r8
bl sub_8002C48
bl PrintTextOnWindow
add sp, 0xC
pop {r3}
mov r8, r3
@@ -300,7 +300,7 @@ sub_809FF48: @ 809FF48
adds r0, r6, 0
movs r1, 0x2
movs r3, 0
bl sub_8002C48
bl PrintTextOnWindow
adds r0, r6, 0
mov r1, r8
movs r2, 0
@@ -354,7 +354,7 @@ sub_809FFB8: @ 809FFB8
add r0, sp, 0x10
movs r1, 0
adds r2, r4, 0
bl sub_810FE50
bl SetWindowTemplateFields
ldr r0, [sp, 0x10]
ldr r1, [sp, 0x14]
str r0, [sp, 0x18]
@@ -396,9 +396,9 @@ sub_80A0034: @ 80A0034
bl sub_810F4D8
ldrb r0, [r4]
movs r1, 0x2
bl sub_8003F20
bl CopyWindowToVram
ldrb r0, [r4]
bl sub_8003E3C
bl RemoveWindow
pop {r4}
pop {r0}
bx r0

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