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

Merge branch 'master' of github.com:pret/pokefirered into trade

Browse Source
This commit is contained in:
PikalaxALT
2019-10-27 20:52:55 -04:00
parent b8fec3d9f6 922411abeb
commit 47534a1471
1365 changed files with 99717 additions and 70397 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_2.s
-13887
View File
File diff suppressed because it is too large Load Diff
asm/battle_anim.s
+4 -4
View File
@@ -281,9 +281,9 @@ _08072706:
strh r1, [r0]
ldr r0, _08072734 @ =gBattle_WIN0V
strh r1, [r0]
ldr r0, _08072738 @ =gUnknown_2022988
ldr r0, _08072738 @ =gBattle_WIN1H
strh r1, [r0]
ldr r0, _0807273C @ =gUnknown_202298A
ldr r0, _0807273C @ =gBattle_WIN1V
strh r1, [r0]
add sp, 0x4
pop {r3-r5}
@@ -298,8 +298,8 @@ _08072728: .4byte 0x0000ffff
_0807272C: .4byte gMPlayInfo_BGM
_08072730: .4byte gBattle_WIN0H
_08072734: .4byte gBattle_WIN0V
_08072738: .4byte gUnknown_2022988
_0807273C: .4byte gUnknown_202298A
_08072738: .4byte gBattle_WIN1H
_0807273C: .4byte gBattle_WIN1V
thumb_func_end LaunchBattleAnimation
thumb_func_start DestroyAnimSprite
asm/battle_anim_effects_2.s
+4 -4
View File
@@ -3902,7 +3902,7 @@ _080A8C60:
subs r0, r4
strh r0, [r1]
_080A8C6A:
ldr r1, _080A8C80 @ =sub_8075D9C
ldr r1, _080A8C80 @ =AnimSpriteOnMonPos
str r1, [r6, 0x1C]
adds r0, r6, 0
bl _call_via_r1
@@ -3912,7 +3912,7 @@ _080A8C6A:
bx r0
.align 2, 0
_080A8C7C: .4byte gBattleAnimArgs
_080A8C80: .4byte sub_8075D9C
_080A8C80: .4byte AnimSpriteOnMonPos
thumb_func_end sub_80A8BC4
thumb_func_start sub_80A8C84
@@ -4233,7 +4233,7 @@ _080A8F0E:
adds r0, r4, 0
movs r1, 0x1
bl StartSpriteAffineAnim
ldr r1, _080A8F34 @ =sub_8075D9C
ldr r1, _080A8F34 @ =AnimSpriteOnMonPos
str r1, [r4, 0x1C]
adds r0, r4, 0
bl _call_via_r1
@@ -4244,7 +4244,7 @@ _080A8F0E:
_080A8F28: .4byte 0x000027db
_080A8F2C: .4byte 0x01010000
_080A8F30: .4byte gBattleAnimArgs
_080A8F34: .4byte sub_8075D9C
_080A8F34: .4byte AnimSpriteOnMonPos
thumb_func_end sub_80A8EE8
thumb_func_start sub_80A8F38
asm/battle_anim_effects_3.s
+12 -12
View File
@@ -1481,11 +1481,11 @@ sub_80DEDD8: @ 80DEDD8
ldr r1, _080DEE14 @ =0x00001f3f
movs r0, 0x48
bl SetGpuReg
ldr r1, _080DEE18 @ =gUnknown_2022988
ldr r1, _080DEE18 @ =gBattle_WIN1H
ldr r2, _080DEE1C @ =0x000098f0
adds r0, r2, 0
strh r0, [r1]
ldr r1, _080DEE20 @ =gUnknown_202298A
ldr r1, _080DEE20 @ =gBattle_WIN1V
movs r0, 0xA0
strh r0, [r1]
ldr r0, _080DEE24 @ =gBattle_WIN0H
@@ -1499,19 +1499,19 @@ sub_80DEDD8: @ 80DEDD8
b _080DEE5C
.align 2, 0
_080DEE14: .4byte 0x00001f3f
_080DEE18: .4byte gUnknown_2022988
_080DEE18: .4byte gBattle_WIN1H
_080DEE1C: .4byte 0x000098f0
_080DEE20: .4byte gUnknown_202298A
_080DEE20: .4byte gBattle_WIN1V
_080DEE24: .4byte gBattle_WIN0H
_080DEE28: .4byte gBattle_WIN0V
_080DEE2C:
ldr r1, _080DEE68 @ =0x00001f3f
movs r0, 0x48
bl SetGpuReg
ldr r1, _080DEE6C @ =gUnknown_2022988
ldr r1, _080DEE6C @ =gBattle_WIN1H
movs r0, 0xF0
strh r0, [r1]
ldr r4, _080DEE70 @ =gUnknown_202298A
ldr r4, _080DEE70 @ =gBattle_WIN1V
ldr r1, _080DEE74 @ =0x000078a0
adds r0, r1, 0
strh r0, [r4]
@@ -1533,8 +1533,8 @@ _080DEE5C:
bx r0
.align 2, 0
_080DEE68: .4byte 0x00001f3f
_080DEE6C: .4byte gUnknown_2022988
_080DEE70: .4byte gUnknown_202298A
_080DEE6C: .4byte gBattle_WIN1H
_080DEE70: .4byte gBattle_WIN1V
_080DEE74: .4byte 0x000078a0
thumb_func_end sub_80DEDD8
@@ -1546,10 +1546,10 @@ sub_80DEE78: @ 80DEE78
ldr r1, _080DEEB0 @ =0x00003f3f
movs r0, 0x48
bl SetGpuReg
ldr r0, _080DEEB4 @ =gUnknown_2022988
ldr r0, _080DEEB4 @ =gBattle_WIN1H
movs r1, 0
strh r1, [r0]
ldr r0, _080DEEB8 @ =gUnknown_202298A
ldr r0, _080DEEB8 @ =gBattle_WIN1V
strh r1, [r0]
bl IsContest
lsls r0, 24
@@ -1567,8 +1567,8 @@ _080DEEA4:
bx r0
.align 2, 0
_080DEEB0: .4byte 0x00003f3f
_080DEEB4: .4byte gUnknown_2022988
_080DEEB8: .4byte gUnknown_202298A
_080DEEB4: .4byte gBattle_WIN1H
_080DEEB8: .4byte gBattle_WIN1V
thumb_func_end sub_80DEE78
thumb_func_start sub_80DEEBC
asm/battle_1.s → asm/battle_bg.s
+10 -10
View File
@@ -179,7 +179,7 @@ sub_800F324: @ 800F324
push {lr}
movs r0, 0
bl ResetBgsAndClearDma3BusyFlags
ldr r1, _0800F344 @ =gUnknown_8248320
ldr r1, _0800F344 @ =gBattleBgTemplates
movs r0, 0
movs r2, 0x4
bl InitBgsFromTemplates
@@ -189,7 +189,7 @@ sub_800F324: @ 800F324
pop {r0}
bx r0
.align 2, 0
_0800F344: .4byte gUnknown_8248320
_0800F344: .4byte gBattleBgTemplates
_0800F348: .4byte gUnknown_8248330
thumb_func_end sub_800F324
@@ -217,8 +217,8 @@ sub_800F34C: @ 800F34C
_0800F37C: .4byte 0x0000b040
thumb_func_end sub_800F34C
thumb_func_start sub_800F380
sub_800F380: @ 800F380
thumb_func_start LoadBattleMenuWindowGfx
LoadBattleMenuWindowGfx: @ 800F380
push {r4,r5,lr}
movs r0, 0x2
movs r1, 0x12
@@ -278,7 +278,7 @@ _0800F3FC: .4byte 0x0000675a
_0800F400: .4byte gPlttBufferFaded + 0xB8
_0800F404: .4byte gBattleTypeFlags
_0800F408: .4byte 0x00010010
thumb_func_end sub_800F380
thumb_func_end LoadBattleMenuWindowGfx
thumb_func_start sub_800F40C
sub_800F40C: @ 800F40C
@@ -309,7 +309,7 @@ LoadBattleTextboxAndBackground: @ 800F420
movs r1, 0
movs r2, 0x40
bl LoadCompressedPalette
bl sub_800F380
bl LoadBattleMenuWindowGfx
bl sub_800F40C
pop {r0}
bx r0
@@ -1143,8 +1143,8 @@ _0800FAD8: .4byte 0x000003ff
_0800FADC: .4byte 0xfffffc00
thumb_func_end sub_800F6FC
thumb_func_start sub_800FAE0
sub_800FAE0: @ 800FAE0
thumb_func_start DrawBattleEntryBackground
DrawBattleEntryBackground: @ 800FAE0
push {r4,lr}
ldr r0, _0800FB64 @ =gBattleTypeFlags
ldr r1, [r0]
@@ -1287,7 +1287,7 @@ _0800FC26:
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_800FAE0
thumb_func_end DrawBattleEntryBackground
thumb_func_start sub_800FC2C
sub_800FC2C: @ 800FC2C
@@ -1459,7 +1459,7 @@ _0800FD68:
.align 2, 0
_0800FD88: .4byte gUnknown_824EE34
_0800FD8C:
bl sub_800F380
bl LoadBattleMenuWindowGfx
b _0800FD94
_0800FD92:
movs r4, 0x1
asm/battle_controller_oak.s
-7887
View File
File diff suppressed because it is too large Load Diff
asm/battle_controller_pokedude.s
+103 -103
View File
@@ -10,8 +10,8 @@ nullsub_99: @ 81560A0
bx lr
thumb_func_end nullsub_99
thumb_func_start SetControllerToPokedude
SetControllerToPokedude: @ 81560A4
thumb_func_start SetControllerToPokeDude
SetControllerToPokeDude: @ 81560A4
ldr r1, _081560C8 @ =gBattlerControllerFuncs
ldr r0, _081560CC @ =gActiveBattler
ldrb r0, [r0]
@@ -36,7 +36,7 @@ _081560CC: .4byte gActiveBattler
_081560D0: .4byte sub_81560DC
_081560D4: .4byte gBattleStruct
_081560D8: .4byte gSpecialVar_0x8004
thumb_func_end SetControllerToPokedude
thumb_func_end SetControllerToPokeDude
thumb_func_start sub_81560DC
sub_81560DC: @ 81560DC
@@ -2862,7 +2862,7 @@ sub_81577B4: @ 81577B4
ldr r0, _081577E4 @ =gActiveBattler
ldrb r0, [r0]
lsls r2, r0, 9
ldr r1, _081577E8 @ =gUnknown_2022BC7
ldr r1, _081577E8 @ =gBattleBufferA + 3
adds r5, r2, r1
mov r8, r5
bl GetBattlerSide
@@ -2876,7 +2876,7 @@ sub_81577B4: @ 81577B4
b _081577F8
.align 2, 0
_081577E4: .4byte gActiveBattler
_081577E8: .4byte gUnknown_2022BC7
_081577E8: .4byte gBattleBufferA + 3
_081577EC: .4byte gPlayerParty
_081577F0:
movs r0, 0x64
@@ -3148,7 +3148,7 @@ _08157AA4:
ldr r0, _08157AB8 @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
ldr r0, _08157ABC @ =gUnknown_2022BC7
ldr r0, _08157ABC @ =gBattleBufferA + 3
adds r2, r0
adds r0, r6, 0
movs r1, 0xB
@@ -3156,12 +3156,12 @@ _08157AA4:
b _0815809A
.align 2, 0
_08157AB8: .4byte gActiveBattler
_08157ABC: .4byte gUnknown_2022BC7
_08157ABC: .4byte gBattleBufferA + 3
_08157AC0:
ldr r0, _08157AD4 @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
ldr r0, _08157AD8 @ =gUnknown_2022BC7
ldr r0, _08157AD8 @ =gBattleBufferA + 3
adds r2, r0
adds r0, r6, 0
movs r1, 0xC
@@ -3169,7 +3169,7 @@ _08157AC0:
b _0815809A
.align 2, 0
_08157AD4: .4byte gActiveBattler
_08157AD8: .4byte gUnknown_2022BC7
_08157AD8: .4byte gBattleBufferA + 3
_08157ADC:
movs r4, 0
movs r0, 0xC
@@ -3213,7 +3213,7 @@ _08157B2C:
ldr r5, _08157B80 @ =gActiveBattler
ldrb r2, [r5]
lsls r2, 9
ldr r4, _08157B84 @ =gUnknown_2022BC7
ldr r4, _08157B84 @ =gBattleBufferA + 3
adds r2, r4
adds r0, r6, 0
movs r1, 0x11
@@ -3249,7 +3249,7 @@ _08157B2C:
b _0815809A
.align 2, 0
_08157B80: .4byte gActiveBattler
_08157B84: .4byte gUnknown_2022BC7
_08157B84: .4byte gBattleBufferA + 3
_08157B88:
ldr r0, _08157BA4 @ =gActiveBattler
ldrb r2, [r0]
@@ -3270,7 +3270,7 @@ _08157BA8:
ldr r0, _08157BBC @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
ldr r0, _08157BC0 @ =gUnknown_2022BC7
ldr r0, _08157BC0 @ =gBattleBufferA + 3
adds r2, r0
adds r0, r6, 0
movs r1, 0x1
@@ -3278,12 +3278,12 @@ _08157BA8:
b _0815809A
.align 2, 0
_08157BBC: .4byte gActiveBattler
_08157BC0: .4byte gUnknown_2022BC7
_08157BC0: .4byte gBattleBufferA + 3
_08157BC4:
ldr r0, _08157BD8 @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
ldr r0, _08157BDC @ =gUnknown_2022BC7
ldr r0, _08157BDC @ =gBattleBufferA + 3
adds r2, r0
adds r0, r6, 0
movs r1, 0x19
@@ -3291,12 +3291,12 @@ _08157BC4:
b _0815809A
.align 2, 0
_08157BD8: .4byte gActiveBattler
_08157BDC: .4byte gUnknown_2022BC7
_08157BDC: .4byte gBattleBufferA + 3
_08157BE0:
ldr r0, _08157BF4 @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
ldr r0, _08157BF8 @ =gUnknown_2022BC7
ldr r0, _08157BF8 @ =gBattleBufferA + 3
adds r2, r0
adds r0, r6, 0
movs r1, 0x1A
@@ -3304,12 +3304,12 @@ _08157BE0:
b _0815809A
.align 2, 0
_08157BF4: .4byte gActiveBattler
_08157BF8: .4byte gUnknown_2022BC7
_08157BF8: .4byte gBattleBufferA + 3
_08157BFC:
ldr r0, _08157C10 @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
ldr r0, _08157C14 @ =gUnknown_2022BC7
ldr r0, _08157C14 @ =gBattleBufferA + 3
adds r2, r0
adds r0, r6, 0
movs r1, 0x1B
@@ -3317,12 +3317,12 @@ _08157BFC:
b _0815809A
.align 2, 0
_08157C10: .4byte gActiveBattler
_08157C14: .4byte gUnknown_2022BC7
_08157C14: .4byte gBattleBufferA + 3
_08157C18:
ldr r0, _08157C2C @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
ldr r0, _08157C30 @ =gUnknown_2022BC7
ldr r0, _08157C30 @ =gBattleBufferA + 3
adds r2, r0
adds r0, r6, 0
movs r1, 0x1C
@@ -3330,12 +3330,12 @@ _08157C18:
b _0815809A
.align 2, 0
_08157C2C: .4byte gActiveBattler
_08157C30: .4byte gUnknown_2022BC7
_08157C30: .4byte gBattleBufferA + 3
_08157C34:
ldr r0, _08157C48 @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
ldr r0, _08157C4C @ =gUnknown_2022BC7
ldr r0, _08157C4C @ =gBattleBufferA + 3
adds r2, r0
adds r0, r6, 0
movs r1, 0x1D
@@ -3343,12 +3343,12 @@ _08157C34:
b _0815809A
.align 2, 0
_08157C48: .4byte gActiveBattler
_08157C4C: .4byte gUnknown_2022BC7
_08157C4C: .4byte gBattleBufferA + 3
_08157C50:
ldr r0, _08157C64 @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
ldr r0, _08157C68 @ =gUnknown_2022BC7
ldr r0, _08157C68 @ =gBattleBufferA + 3
adds r2, r0
adds r0, r6, 0
movs r1, 0x1E
@@ -3356,12 +3356,12 @@ _08157C50:
b _0815809A
.align 2, 0
_08157C64: .4byte gActiveBattler
_08157C68: .4byte gUnknown_2022BC7
_08157C68: .4byte gBattleBufferA + 3
_08157C6C:
ldr r0, _08157C80 @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
ldr r0, _08157C84 @ =gUnknown_2022BC7
ldr r0, _08157C84 @ =gBattleBufferA + 3
adds r2, r0
adds r0, r6, 0
movs r1, 0x1F
@@ -3369,12 +3369,12 @@ _08157C6C:
b _0815809A
.align 2, 0
_08157C80: .4byte gActiveBattler
_08157C84: .4byte gUnknown_2022BC7
_08157C84: .4byte gBattleBufferA + 3
_08157C88:
ldr r0, _08157C9C @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
ldr r0, _08157CA0 @ =gUnknown_2022BC7
ldr r0, _08157CA0 @ =gBattleBufferA + 3
adds r2, r0
adds r0, r6, 0
movs r1, 0x20
@@ -3382,12 +3382,12 @@ _08157C88:
b _0815809A
.align 2, 0
_08157C9C: .4byte gActiveBattler
_08157CA0: .4byte gUnknown_2022BC7
_08157CA0: .4byte gBattleBufferA + 3
_08157CA4:
ldr r0, _08157CB8 @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
ldr r0, _08157CBC @ =gUnknown_2022BC7
ldr r0, _08157CBC @ =gBattleBufferA + 3
adds r2, r0
adds r0, r6, 0
movs r1, 0x22
@@ -3395,12 +3395,12 @@ _08157CA4:
b _0815809A
.align 2, 0
_08157CB8: .4byte gActiveBattler
_08157CBC: .4byte gUnknown_2022BC7
_08157CBC: .4byte gBattleBufferA + 3
_08157CC0:
ldr r0, _08157CD4 @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
ldr r0, _08157CD8 @ =gUnknown_2022BC7
ldr r0, _08157CD8 @ =gBattleBufferA + 3
adds r2, r0
adds r0, r6, 0
movs r1, 0x23
@@ -3408,12 +3408,12 @@ _08157CC0:
b _0815809A
.align 2, 0
_08157CD4: .4byte gActiveBattler
_08157CD8: .4byte gUnknown_2022BC7
_08157CD8: .4byte gBattleBufferA + 3
_08157CDC:
ldr r0, _08157CF0 @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
ldr r0, _08157CF4 @ =gUnknown_2022BC7
ldr r0, _08157CF4 @ =gBattleBufferA + 3
adds r2, r0
adds r0, r6, 0
movs r1, 0x24
@@ -3421,12 +3421,12 @@ _08157CDC:
b _0815809A
.align 2, 0
_08157CF0: .4byte gActiveBattler
_08157CF4: .4byte gUnknown_2022BC7
_08157CF4: .4byte gBattleBufferA + 3
_08157CF8:
ldr r0, _08157D0C @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
ldr r0, _08157D10 @ =gUnknown_2022BC7
ldr r0, _08157D10 @ =gBattleBufferA + 3
adds r2, r0
adds r0, r6, 0
movs r1, 0x25
@@ -3434,12 +3434,12 @@ _08157CF8:
b _0815809A
.align 2, 0
_08157D0C: .4byte gActiveBattler
_08157D10: .4byte gUnknown_2022BC7
_08157D10: .4byte gBattleBufferA + 3
_08157D14:
ldr r0, _08157D28 @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
ldr r0, _08157D2C @ =gUnknown_2022BC7
ldr r0, _08157D2C @ =gBattleBufferA + 3
adds r2, r0
adds r0, r6, 0
movs r1, 0x26
@@ -3447,12 +3447,12 @@ _08157D14:
b _0815809A
.align 2, 0
_08157D28: .4byte gActiveBattler
_08157D2C: .4byte gUnknown_2022BC7
_08157D2C: .4byte gBattleBufferA + 3
_08157D30:
ldr r5, _08157D8C @ =gActiveBattler
ldrb r2, [r5]
lsls r2, 9
ldr r4, _08157D90 @ =gUnknown_2022BC7
ldr r4, _08157D90 @ =gBattleBufferA + 3
adds r2, r4
adds r0, r6, 0
movs r1, 0x27
@@ -3492,12 +3492,12 @@ _08157D30:
b _08157E2A
.align 2, 0
_08157D8C: .4byte gActiveBattler
_08157D90: .4byte gUnknown_2022BC7
_08157D90: .4byte gBattleBufferA + 3
_08157D94:
ldr r0, _08157DA8 @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
ldr r0, _08157DAC @ =gUnknown_2022BC7
ldr r0, _08157DAC @ =gBattleBufferA + 3
adds r2, r0
adds r0, r6, 0
movs r1, 0x27
@@ -3505,12 +3505,12 @@ _08157D94:
b _0815809A
.align 2, 0
_08157DA8: .4byte gActiveBattler
_08157DAC: .4byte gUnknown_2022BC7
_08157DAC: .4byte gBattleBufferA + 3
_08157DB0:
ldr r0, _08157DC4 @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
ldr r0, _08157DC8 @ =gUnknown_2022BC7
ldr r0, _08157DC8 @ =gBattleBufferA + 3
adds r2, r0
adds r0, r6, 0
movs r1, 0x28
@@ -3518,12 +3518,12 @@ _08157DB0:
b _0815809A
.align 2, 0
_08157DC4: .4byte gActiveBattler
_08157DC8: .4byte gUnknown_2022BC7
_08157DC8: .4byte gBattleBufferA + 3
_08157DCC:
ldr r0, _08157DE0 @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
ldr r0, _08157DE4 @ =gUnknown_2022BC7
ldr r0, _08157DE4 @ =gBattleBufferA + 3
adds r2, r0
adds r0, r6, 0
movs r1, 0x29
@@ -3531,12 +3531,12 @@ _08157DCC:
b _0815809A
.align 2, 0
_08157DE0: .4byte gActiveBattler
_08157DE4: .4byte gUnknown_2022BC7
_08157DE4: .4byte gBattleBufferA + 3
_08157DE8:
ldr r0, _08157DFC @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
ldr r0, _08157E00 @ =gUnknown_2022BC7
ldr r0, _08157E00 @ =gBattleBufferA + 3
adds r2, r0
adds r0, r6, 0
movs r1, 0x2A
@@ -3544,12 +3544,12 @@ _08157DE8:
b _0815809A
.align 2, 0
_08157DFC: .4byte gActiveBattler
_08157E00: .4byte gUnknown_2022BC7
_08157E00: .4byte gBattleBufferA + 3
_08157E04:
ldr r0, _08157E18 @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
ldr r0, _08157E1C @ =gUnknown_2022BC7
ldr r0, _08157E1C @ =gBattleBufferA + 3
adds r2, r0
adds r0, r6, 0
movs r1, 0x2B
@@ -3557,12 +3557,12 @@ _08157E04:
b _0815809A
.align 2, 0
_08157E18: .4byte gActiveBattler
_08157E1C: .4byte gUnknown_2022BC7
_08157E1C: .4byte gBattleBufferA + 3
_08157E20:
ldr r0, _08157E34 @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
ldr r0, _08157E38 @ =gUnknown_2022BC7
ldr r0, _08157E38 @ =gBattleBufferA + 3
adds r2, r0
_08157E2A:
adds r0, r6, 0
@@ -3571,12 +3571,12 @@ _08157E2A:
b _0815809A
.align 2, 0
_08157E34: .4byte gActiveBattler
_08157E38: .4byte gUnknown_2022BC7
_08157E38: .4byte gBattleBufferA + 3
_08157E3C:
ldr r0, _08157E50 @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
ldr r0, _08157E54 @ =gUnknown_2022BC7
ldr r0, _08157E54 @ =gBattleBufferA + 3
adds r2, r0
adds r0, r6, 0
movs r1, 0
@@ -3584,12 +3584,12 @@ _08157E3C:
b _0815809A
.align 2, 0
_08157E50: .4byte gActiveBattler
_08157E54: .4byte gUnknown_2022BC7
_08157E54: .4byte gBattleBufferA + 3
_08157E58:
ldr r0, _08157E6C @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
ldr r0, _08157E70 @ =gUnknown_2022BC7
ldr r0, _08157E70 @ =gBattleBufferA + 3
adds r2, r0
adds r0, r6, 0
movs r1, 0x9
@@ -3597,12 +3597,12 @@ _08157E58:
b _0815809A
.align 2, 0
_08157E6C: .4byte gActiveBattler
_08157E70: .4byte gUnknown_2022BC7
_08157E70: .4byte gBattleBufferA + 3
_08157E74:
ldr r0, _08157E88 @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
ldr r0, _08157E8C @ =gUnknown_2022BC7
ldr r0, _08157E8C @ =gBattleBufferA + 3
adds r2, r0
adds r0, r6, 0
movs r1, 0x37
@@ -3610,12 +3610,12 @@ _08157E74:
b _0815809A
.align 2, 0
_08157E88: .4byte gActiveBattler
_08157E8C: .4byte gUnknown_2022BC7
_08157E8C: .4byte gBattleBufferA + 3
_08157E90:
ldr r0, _08157EA4 @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
ldr r0, _08157EA8 @ =gUnknown_2022BC7
ldr r0, _08157EA8 @ =gBattleBufferA + 3
adds r2, r0
adds r0, r6, 0
movs r1, 0x38
@@ -3623,12 +3623,12 @@ _08157E90:
b _0815809A
.align 2, 0
_08157EA4: .4byte gActiveBattler
_08157EA8: .4byte gUnknown_2022BC7
_08157EA8: .4byte gBattleBufferA + 3
_08157EAC:
ldr r0, _08157EC0 @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
ldr r0, _08157EC4 @ =gUnknown_2022BC7
ldr r0, _08157EC4 @ =gBattleBufferA + 3
adds r2, r0
adds r0, r6, 0
movs r1, 0x39
@@ -3636,12 +3636,12 @@ _08157EAC:
b _0815809A
.align 2, 0
_08157EC0: .4byte gActiveBattler
_08157EC4: .4byte gUnknown_2022BC7
_08157EC4: .4byte gBattleBufferA + 3
_08157EC8:
ldr r0, _08157EDC @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
ldr r0, _08157EE0 @ =gUnknown_2022BC7
ldr r0, _08157EE0 @ =gBattleBufferA + 3
adds r2, r0
adds r0, r6, 0
movs r1, 0x3A
@@ -3649,12 +3649,12 @@ _08157EC8:
b _0815809A
.align 2, 0
_08157EDC: .4byte gActiveBattler
_08157EE0: .4byte gUnknown_2022BC7
_08157EE0: .4byte gBattleBufferA + 3
_08157EE4:
ldr r0, _08157EF8 @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
ldr r0, _08157EFC @ =gUnknown_2022BC7
ldr r0, _08157EFC @ =gBattleBufferA + 3
adds r2, r0
adds r0, r6, 0
movs r1, 0x3B
@@ -3662,12 +3662,12 @@ _08157EE4:
b _0815809A
.align 2, 0
_08157EF8: .4byte gActiveBattler
_08157EFC: .4byte gUnknown_2022BC7
_08157EFC: .4byte gBattleBufferA + 3
_08157F00:
ldr r0, _08157F14 @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
ldr r0, _08157F18 @ =gUnknown_2022BC7
ldr r0, _08157F18 @ =gBattleBufferA + 3
adds r2, r0
adds r0, r6, 0
movs r1, 0x3C
@@ -3675,12 +3675,12 @@ _08157F00:
b _0815809A
.align 2, 0
_08157F14: .4byte gActiveBattler
_08157F18: .4byte gUnknown_2022BC7
_08157F18: .4byte gBattleBufferA + 3
_08157F1C:
ldr r0, _08157F30 @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
ldr r0, _08157F34 @ =gUnknown_2022BC7
ldr r0, _08157F34 @ =gBattleBufferA + 3
adds r2, r0
adds r0, r6, 0
movs r1, 0x3D
@@ -3688,12 +3688,12 @@ _08157F1C:
b _0815809A
.align 2, 0
_08157F30: .4byte gActiveBattler
_08157F34: .4byte gUnknown_2022BC7
_08157F34: .4byte gBattleBufferA + 3
_08157F38:
ldr r0, _08157F4C @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
ldr r0, _08157F50 @ =gUnknown_2022BC7
ldr r0, _08157F50 @ =gBattleBufferA + 3
adds r2, r0
adds r0, r6, 0
movs r1, 0x3E
@@ -3701,12 +3701,12 @@ _08157F38:
b _0815809A
.align 2, 0
_08157F4C: .4byte gActiveBattler
_08157F50: .4byte gUnknown_2022BC7
_08157F50: .4byte gBattleBufferA + 3
_08157F54:
ldr r0, _08157F68 @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
ldr r0, _08157F6C @ =gUnknown_2022BC7
ldr r0, _08157F6C @ =gBattleBufferA + 3
adds r2, r0
adds r0, r6, 0
movs r1, 0x3F
@@ -3714,12 +3714,12 @@ _08157F54:
b _0815809A
.align 2, 0
_08157F68: .4byte gActiveBattler
_08157F6C: .4byte gUnknown_2022BC7
_08157F6C: .4byte gBattleBufferA + 3
_08157F70:
ldr r0, _08157F84 @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
ldr r0, _08157F88 @ =gUnknown_2022BC7
ldr r0, _08157F88 @ =gBattleBufferA + 3
adds r2, r0
adds r0, r6, 0
movs r1, 0x16
@@ -3727,12 +3727,12 @@ _08157F70:
b _0815809A
.align 2, 0
_08157F84: .4byte gActiveBattler
_08157F88: .4byte gUnknown_2022BC7
_08157F88: .4byte gBattleBufferA + 3
_08157F8C:
ldr r0, _08157FA0 @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
ldr r0, _08157FA4 @ =gUnknown_2022BC7
ldr r0, _08157FA4 @ =gBattleBufferA + 3
adds r2, r0
adds r0, r6, 0
movs r1, 0x17
@@ -3740,12 +3740,12 @@ _08157F8C:
b _0815809A
.align 2, 0
_08157FA0: .4byte gActiveBattler
_08157FA4: .4byte gUnknown_2022BC7
_08157FA4: .4byte gBattleBufferA + 3
_08157FA8:
ldr r0, _08157FBC @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
ldr r0, _08157FC0 @ =gUnknown_2022BC7
ldr r0, _08157FC0 @ =gBattleBufferA + 3
adds r2, r0
adds r0, r6, 0
movs r1, 0x18
@@ -3753,12 +3753,12 @@ _08157FA8:
b _0815809A
.align 2, 0
_08157FBC: .4byte gActiveBattler
_08157FC0: .4byte gUnknown_2022BC7
_08157FC0: .4byte gBattleBufferA + 3
_08157FC4:
ldr r0, _08157FD8 @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
ldr r0, _08157FDC @ =gUnknown_2022BC7
ldr r0, _08157FDC @ =gBattleBufferA + 3
adds r2, r0
adds r0, r6, 0
movs r1, 0x21
@@ -3766,12 +3766,12 @@ _08157FC4:
b _0815809A
.align 2, 0
_08157FD8: .4byte gActiveBattler
_08157FDC: .4byte gUnknown_2022BC7
_08157FDC: .4byte gBattleBufferA + 3
_08157FE0:
ldr r0, _08157FF4 @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
ldr r0, _08157FF8 @ =gUnknown_2022BC7
ldr r0, _08157FF8 @ =gBattleBufferA + 3
adds r2, r0
adds r0, r6, 0
movs r1, 0x2F
@@ -3779,12 +3779,12 @@ _08157FE0:
b _0815809A
.align 2, 0
_08157FF4: .4byte gActiveBattler
_08157FF8: .4byte gUnknown_2022BC7
_08157FF8: .4byte gBattleBufferA + 3
_08157FFC:
ldr r0, _08158010 @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
ldr r0, _08158014 @ =gUnknown_2022BC7
ldr r0, _08158014 @ =gBattleBufferA + 3
adds r2, r0
adds r0, r6, 0
movs r1, 0x30
@@ -3792,12 +3792,12 @@ _08157FFC:
b _0815809A
.align 2, 0
_08158010: .4byte gActiveBattler
_08158014: .4byte gUnknown_2022BC7
_08158014: .4byte gBattleBufferA + 3
_08158018:
ldr r0, _0815802C @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
ldr r0, _08158030 @ =gUnknown_2022BC7
ldr r0, _08158030 @ =gBattleBufferA + 3
adds r2, r0
adds r0, r6, 0
movs r1, 0x32
@@ -3805,12 +3805,12 @@ _08158018:
b _0815809A
.align 2, 0
_0815802C: .4byte gActiveBattler
_08158030: .4byte gUnknown_2022BC7
_08158030: .4byte gBattleBufferA + 3
_08158034:
ldr r0, _08158048 @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
ldr r0, _0815804C @ =gUnknown_2022BC7
ldr r0, _0815804C @ =gBattleBufferA + 3
adds r2, r0
adds r0, r6, 0
movs r1, 0x33
@@ -3818,12 +3818,12 @@ _08158034:
b _0815809A
.align 2, 0
_08158048: .4byte gActiveBattler
_0815804C: .4byte gUnknown_2022BC7
_0815804C: .4byte gBattleBufferA + 3
_08158050:
ldr r0, _08158064 @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
ldr r0, _08158068 @ =gUnknown_2022BC7
ldr r0, _08158068 @ =gBattleBufferA + 3
adds r2, r0
adds r0, r6, 0
movs r1, 0x34
@@ -3831,12 +3831,12 @@ _08158050:
b _0815809A
.align 2, 0
_08158064: .4byte gActiveBattler
_08158068: .4byte gUnknown_2022BC7
_08158068: .4byte gBattleBufferA + 3
_0815806C:
ldr r0, _08158080 @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
ldr r0, _08158084 @ =gUnknown_2022BC7
ldr r0, _08158084 @ =gBattleBufferA + 3
adds r2, r0
adds r0, r6, 0
movs r1, 0x35
@@ -3844,12 +3844,12 @@ _0815806C:
b _0815809A
.align 2, 0
_08158080: .4byte gActiveBattler
_08158084: .4byte gUnknown_2022BC7
_08158084: .4byte gBattleBufferA + 3
_08158088:
ldr r0, _081580C4 @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
ldr r0, _081580C8 @ =gUnknown_2022BC7
ldr r0, _081580C8 @ =gBattleBufferA + 3
adds r2, r0
adds r0, r6, 0
movs r1, 0x36
@@ -3876,7 +3876,7 @@ _0815809A:
bx r0
.align 2, 0
_081580C4: .4byte gActiveBattler
_081580C8: .4byte gUnknown_2022BC7
_081580C8: .4byte gBattleBufferA + 3
_081580CC: .4byte gBattlerPartyIndexes
_081580D0: .4byte gPlayerParty
thumb_func_end sub_81577B4
@@ -5063,7 +5063,7 @@ sub_8158A88: @ 8158A88
ldr r0, _08158AC4 @ =gActiveBattler
ldrb r4, [r0]
lsls r4, 9
ldr r0, _08158AC8 @ =gUnknown_2022BC6
ldr r0, _08158AC8 @ =gBattleBufferA + 2
adds r4, r0
ldrh r0, [r4]
bl BufferStringBattle
@@ -5080,7 +5080,7 @@ sub_8158A88: @ 8158A88
_08158ABC: .4byte gBattle_BG0_X
_08158AC0: .4byte gBattle_BG0_Y
_08158AC4: .4byte gActiveBattler
_08158AC8: .4byte gUnknown_2022BC6
_08158AC8: .4byte gBattleBufferA + 2
_08158ACC: .4byte gDisplayedStringBattle
_08158AD0:
ldr r0, _08158AEC @ =gDisplayedStringBattle
@@ -6552,7 +6552,7 @@ _08159690:
strb r1, [r0]
ldrb r0, [r5]
lsls r4, r0, 9
ldr r3, _081596DC @ =gUnknown_2022BC8
ldr r3, _081596DC @ =gBattleBufferA + 4
adds r1, r4, r3
subs r2, r3, 0x3
adds r2, r4, r2
@@ -6573,7 +6573,7 @@ _081596CE:
.align 2, 0
_081596D4: .4byte gBattleSpritesDataPtr
_081596D8: .4byte gActiveBattler
_081596DC: .4byte gUnknown_2022BC8
_081596DC: .4byte gBattleBufferA + 4
_081596E0: .4byte gBattlerStatusSummaryTaskId
thumb_func_end sub_8159660
@@ -7081,7 +7081,7 @@ sub_8159AB8: @ 8159AB8
ldr r3, _08159B5C @ =gActiveBattler
ldrb r5, [r3]
lsls r1, r5, 9
ldr r0, _08159B60 @ =gUnknown_2022BC6
ldr r0, _08159B60 @ =gBattleBufferA + 2
adds r7, r1, r0
mov r12, r7
subs r0, 0x2
@@ -7150,7 +7150,7 @@ _08159B04:
_08159B54: .4byte gUnknown_8479198
_08159B58: .4byte gBattleStruct
_08159B5C: .4byte gActiveBattler
_08159B60: .4byte gUnknown_2022BC6
_08159B60: .4byte gBattleBufferA + 2
_08159B64: .4byte gBattlerControllerFuncs
_08159B68: .4byte gUnknown_3005EE0
_08159B6C:
asm/battle_interface.s
+2 -2
View File
@@ -4304,7 +4304,7 @@ UpdateLeftNoOfBallsTextOnHealthbox: @ 8049D10
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r1, _08049D84 @ =gUnknown_83FE81C
ldr r1, _08049D84 @ =gText_HighlightRed_Left
mov r0, sp
bl StringCopy
ldr r1, _08049D88 @ =gNumSafariBalls
@@ -4350,7 +4350,7 @@ UpdateLeftNoOfBallsTextOnHealthbox: @ 8049D10
pop {r0}
bx r0
.align 2, 0
_08049D84: .4byte gUnknown_83FE81C
_08049D84: .4byte gText_HighlightRed_Left
_08049D88: .4byte gNumSafariBalls
_08049D8C: .4byte gSprites
_08049D90: .4byte 0x060102c0
asm/battle_message.s
+13 -13
View File
@@ -20,7 +20,7 @@ BufferStringBattle: @ 80D7274
mov r8, r0
ldrb r1, [r0]
lsls r1, 9
ldr r0, _080D7338 @ =gUnknown_2022BC8
ldr r0, _080D7338 @ =gBattleBufferA + 4
adds r1, r0
str r1, [r4]
ldr r2, _080D733C @ =gLastUsedItem
@@ -107,7 +107,7 @@ _080D7326:
.align 2, 0
_080D7330: .4byte gUnknown_2039A34
_080D7334: .4byte gActiveBattler
_080D7338: .4byte gUnknown_2022BC8
_080D7338: .4byte gBattleBufferA + 4
_080D733C: .4byte gLastUsedItem
_080D7340: .4byte gLastUsedAbility
_080D7344: .4byte gBattleScripting
@@ -744,7 +744,7 @@ _080D7834:
ldr r5, [sp]
ldr r4, [sp, 0x4]
movs r3, 0
ldr r2, _080D7850 @ =gUnknown_82500CC
ldr r2, _080D7850 @ =gStatusConditionStringsTable
_080D783C:
ldr r1, [r2]
ldr r0, [r1]
@@ -756,7 +756,7 @@ _080D783C:
ldr r0, [r2, 0x4]
b _080D785E
.align 2, 0
_080D7850: .4byte gUnknown_82500CC
_080D7850: .4byte gStatusConditionStringsTable
_080D7854:
adds r2, 0x8
adds r3, 0x1
@@ -1647,13 +1647,13 @@ _080D7FF0:
ldrb r1, [r0]
movs r0, 0xD
muls r1, r0
ldr r0, _080D8004 @ =gUnknown_824FC40
ldr r0, _080D8004 @ =gAbilityNames
adds r4, r1, r0
b _080D8382
.align 2, 0
_080D7FFC: .4byte gUnknown_2039A30
_080D8000: .4byte gEffectBattler
_080D8004: .4byte gUnknown_824FC40
_080D8004: .4byte gAbilityNames
_080D8008:
ldr r3, _080D8020 @ =gTrainerBattleOpponent_A
ldrh r1, [r3]
@@ -1802,7 +1802,7 @@ _080D8120:
cmp r1, 0
beq _080D8134
mov r0, sp
bl sub_80E7460
bl CopyEReaderTrainerName5
mov r4, sp
b _080D8382
_080D8134:
@@ -1917,7 +1917,7 @@ _080D81E8:
_080D8204: .4byte gBattleTypeFlags
_080D8208: .4byte gStringVar4
_080D820C:
bl sub_80806EC
bl GetTrainerALoseText
adds r4, r0, 0
b _080D8382
_080D8214:
@@ -1937,7 +1937,7 @@ _080D8214:
_080D8230: .4byte gBattleTypeFlags
_080D8234: .4byte gStringVar4
_080D8238:
bl sub_8080710
bl GetTrainerWonSpeech
adds r4, r0, 0
b _080D8382
_080D8240:
@@ -2430,7 +2430,7 @@ _080D860C:
ldrb r1, [r0, 0x1]
movs r0, 0xD
muls r1, r0
ldr r0, _080D8624 @ =gUnknown_824FC40
ldr r0, _080D8624 @ =gAbilityNames
_080D8616:
adds r1, r0
_080D8618:
@@ -2439,7 +2439,7 @@ _080D8618:
adds r5, 0x2
b _080D86B0
.align 2, 0
_080D8624: .4byte gUnknown_824FC40
_080D8624: .4byte gAbilityNames
_080D8628:
adds r0, r5, r7
ldrb r2, [r0, 0x1]
@@ -2943,7 +2943,7 @@ SetPpNumbersPaletteInMoveSelection: @ 80D89DC
ldr r0, _080D8A38 @ =gActiveBattler
ldrb r2, [r0]
lsls r1, r2, 9
ldr r0, _080D8A3C @ =gUnknown_2022BC8
ldr r0, _080D8A3C @ =gBattleBufferA + 4
adds r1, r0
ldr r4, _080D8A40 @ =gUnknown_8D2FBB4
ldr r0, _080D8A44 @ =gMoveSelectionCursor
@@ -2983,7 +2983,7 @@ SetPpNumbersPaletteInMoveSelection: @ 80D89DC
bx r0
.align 2, 0
_080D8A38: .4byte gActiveBattler
_080D8A3C: .4byte gUnknown_2022BC8
_080D8A3C: .4byte gBattleBufferA + 4
_080D8A40: .4byte gUnknown_8D2FBB4
_080D8A44: .4byte gMoveSelectionCursor
_080D8A48: .4byte gPlttBufferUnfaded
asm/battle_setup.s
-2180
View File
File diff suppressed because it is too large Load Diff
asm/battle_tower.s
+51 -51
View File
@@ -358,8 +358,8 @@ _080E5C20: .4byte gSaveBlock2Ptr
_080E5C24: .4byte 0x0000056c
thumb_func_end sub_80E5B14
thumb_func_start sub_80E5C28
sub_80E5C28: @ 80E5C28
thumb_func_start ChooseNextBattleTowerTrainer
ChooseNextBattleTowerTrainer: @ 80E5C28
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -637,7 +637,7 @@ _080E5E4C: .4byte 0x00000572
_080E5E50: .4byte gSaveBlock2Ptr
_080E5E54: .4byte 0x0000056c
_080E5E58: .4byte 0x00000571
thumb_func_end sub_80E5C28
thumb_func_end ChooseNextBattleTowerTrainer
thumb_func_start sub_80E5E5C
sub_80E5E5C: @ 80E5E5C
@@ -651,14 +651,14 @@ sub_80E5E5C: @ 80E5E5C
_080E5E6C: .4byte 0x00004010
thumb_func_end sub_80E5E5C
thumb_func_start sub_80E5E70
sub_80E5E70: @ 80E5E70
thumb_func_start SetEReaderTrainerGfxId
SetEReaderTrainerGfxId: @ 80E5E70
push {lr}
movs r0, 0xC8
bl sub_80E5E5C
pop {r0}
bx r0
thumb_func_end sub_80E5E70
thumb_func_end SetEReaderTrainerGfxId
thumb_func_start sub_80E5E7C
sub_80E5E7C: @ 80E5E7C
@@ -1700,8 +1700,8 @@ _080E6640: .4byte gUnknown_84020C4
_080E6644: .4byte 0x0000ffff
thumb_func_end sub_80E6564
thumb_func_start sub_80E6648
sub_80E6648: @ 80E6648
thumb_func_start CheckPartyBattleTowerBanlist
CheckPartyBattleTowerBanlist: @ 80E6648
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -1854,7 +1854,7 @@ _080E6770:
_080E6780: .4byte gSpecialVar_0x8004
_080E6784: .4byte gSaveBlock2Ptr
_080E6788: .4byte 0x0000055c
thumb_func_end sub_80E6648
thumb_func_end CheckPartyBattleTowerBanlist
thumb_func_start sub_80E678C
sub_80E678C: @ 80E678C
@@ -1918,8 +1918,8 @@ _080E67F0:
_080E67F8: .4byte gStringVar4
thumb_func_end sub_80E678C
thumb_func_start sub_80E67FC
sub_80E67FC: @ 80E67FC
thumb_func_start PrintBattleTowerTrainerGreeting
PrintBattleTowerTrainerGreeting: @ 80E67FC
push {lr}
ldr r0, _080E6818 @ =gSaveBlock2Ptr
ldr r2, [r0]
@@ -1962,7 +1962,7 @@ _080E684C:
bx r0
.align 2, 0
_080E6850: .4byte 0xffffc154
thumb_func_end sub_80E67FC
thumb_func_end PrintBattleTowerTrainerGreeting
thumb_func_start sub_80E6854
sub_80E6854: @ 80E6854
@@ -2034,7 +2034,7 @@ sub_80E68C4: @ 80E68C4
ldr r1, _080E68F8 @ =sub_80E6854
str r1, [r0, 0x8]
bl CleanupOverworldWindowsAndTilemaps
ldr r0, _080E68FC @ =sub_800FD9C
ldr r0, _080E68FC @ =CB2_InitBattle
bl SetMainCallback2
adds r0, r4, 0
bl DestroyTask
@@ -2045,11 +2045,11 @@ _080E68EC:
.align 2, 0
_080E68F4: .4byte gMain
_080E68F8: .4byte sub_80E6854
_080E68FC: .4byte sub_800FD9C
_080E68FC: .4byte CB2_InitBattle
thumb_func_end sub_80E68C4
thumb_func_start sub_80E6900
sub_80E6900: @ 80E6900
thumb_func_start StartSpecialBattle
StartSpecialBattle: @ 80E6900
push {r4-r6,lr}
sub sp, 0x4
ldr r0, _080E691C @ =gUnknown_203AAB8
@@ -2168,10 +2168,10 @@ _080E69FC: .4byte gBattleTypeFlags
_080E6A00: .4byte 0x00000808
_080E6A04: .4byte gTrainerBattleOpponent_A
_080E6A08: .4byte sub_80E68C4
thumb_func_end sub_80E6900
thumb_func_end StartSpecialBattle
thumb_func_start sub_80E6A0C
sub_80E6A0C: @ 80E6A0C
thumb_func_start SetBattleTowerProperty
SetBattleTowerProperty: @ 80E6A0C
push {r4-r6,lr}
ldr r1, _080E6A34 @ =gSaveBlock2Ptr
ldr r0, [r1]
@@ -2469,10 +2469,10 @@ _080E6C80:
bx r0
.align 2, 0
_080E6C88: .4byte 0x0000055c
thumb_func_end sub_80E6A0C
thumb_func_end SetBattleTowerProperty
thumb_func_start sub_80E6C8C
sub_80E6C8C: @ 80E6C8C
thumb_func_start BattleTowerUtil
BattleTowerUtil: @ 80E6C8C
push {r4,lr}
ldr r1, _080E6CB4 @ =gSaveBlock2Ptr
ldr r0, [r1]
@@ -2652,10 +2652,10 @@ _080E6E08:
bx r0
.align 2, 0
_080E6E10: .4byte 0x0000055c
thumb_func_end sub_80E6C8C
thumb_func_end BattleTowerUtil
thumb_func_start sub_80E6E14
sub_80E6E14: @ 80E6E14
thumb_func_start SetBattleTowerParty
SetBattleTowerParty: @ 80E6E14
push {r4,r5,lr}
movs r2, 0
ldr r5, _080E6E3C @ =gUnknown_203B0D4
@@ -2671,7 +2671,7 @@ _080E6E1E:
adds r2, 0x1
cmp r2, 0x2
ble _080E6E1E
bl sub_80A03D8
bl ReducePlayerPartyToThree
pop {r4,r5}
pop {r0}
bx r0
@@ -2679,7 +2679,7 @@ _080E6E1E:
_080E6E3C: .4byte gUnknown_203B0D4
_080E6E40: .4byte gSaveBlock2Ptr
_080E6E44: .4byte 0x0000056d
thumb_func_end sub_80E6E14
thumb_func_end SetBattleTowerParty
thumb_func_start sub_80E6E48
sub_80E6E48: @ 80E6E48
@@ -2858,8 +2858,8 @@ _080E6FB0: .4byte 0x0000056d
_080E6FB4: .4byte gUnknown_2024220
thumb_func_end sub_80E6EE0
thumb_func_start sub_80E6FB8
sub_80E6FB8: @ 80E6FB8
thumb_func_start SaveBattleTowerProgress
SaveBattleTowerProgress: @ 80E6FB8
push {r4,r5,lr}
ldr r0, _080E703C @ =gSaveBlock2Ptr
ldr r1, [r0]
@@ -2933,15 +2933,15 @@ _080E7048: .4byte 0x00000564
_080E704C: .4byte gBattleOutcome
_080E7050: .4byte 0x0000055d
_080E7054: .4byte 0x0000055e
thumb_func_end sub_80E6FB8
thumb_func_end SaveBattleTowerProgress
thumb_func_start sub_80E7058
sub_80E7058: @ 80E7058
thumb_func_start BattleTower_SoftReset
BattleTower_SoftReset: @ 80E7058
push {lr}
bl DoSoftReset
pop {r0}
bx r0
thumb_func_end sub_80E7058
thumb_func_end BattleTower_SoftReset
thumb_func_start sub_80E7064
sub_80E7064: @ 80E7064
@@ -3142,8 +3142,8 @@ _080E71C8: .4byte 0x0000ffff
_080E71CC: .4byte 0x0000270f
thumb_func_end sub_80E7188
thumb_func_start sub_80E71D0
sub_80E71D0: @ 80E71D0
thumb_func_start DetermineBattleTowerPrize
DetermineBattleTowerPrize: @ 80E71D0
push {r4,r5,lr}
ldr r4, _080E7214 @ =gSaveBlock2Ptr
ldr r1, [r4]
@@ -3201,10 +3201,10 @@ _080E7240:
bx r0
.align 2, 0
_080E7248: .4byte gUnknown_84020DA
thumb_func_end sub_80E71D0
thumb_func_end DetermineBattleTowerPrize
thumb_func_start sub_80E724C
sub_80E724C: @ 80E724C
thumb_func_start GiveBattleTowerPrize
GiveBattleTowerPrize: @ 80E724C
push {r4-r6,lr}
ldr r5, _080E7288 @ =gSaveBlock2Ptr
ldr r1, [r5]
@@ -3255,10 +3255,10 @@ _080E72AA:
.align 2, 0
_080E72B0: .4byte gSpecialVar_Result
_080E72B4: .4byte 0x0000055e
thumb_func_end sub_80E724C
thumb_func_end GiveBattleTowerPrize
thumb_func_start sub_80E72B8
sub_80E72B8: @ 80E72B8
thumb_func_start AwardBattleTowerRibbons
AwardBattleTowerRibbons: @ 80E72B8
push {r4-r7,lr}
ldr r0, _080E7334 @ =gSaveBlock2Ptr
ldr r0, [r0]
@@ -3328,7 +3328,7 @@ _080E7338: .4byte 0x0000055c
_080E733C: .4byte gSpecialVar_Result
_080E7340: .4byte 0x0000056d
_080E7344: .4byte gPlayerParty
thumb_func_end sub_80E72B8
thumb_func_end AwardBattleTowerRibbons
thumb_func_start sub_80E7348
sub_80E7348: @ 80E7348
@@ -3469,8 +3469,8 @@ _080E7458: .4byte gSaveBlock2Ptr
_080E745C: .4byte 0x000004a1
thumb_func_end GetEreaderTrainerClassId
thumb_func_start sub_80E7460
sub_80E7460: @ 80E7460
thumb_func_start CopyEReaderTrainerName5
CopyEReaderTrainerName5: @ 80E7460
push {r4,lr}
adds r3, r0, 0
movs r2, 0
@@ -3495,7 +3495,7 @@ _080E746E:
.align 2, 0
_080E7488: .4byte gSaveBlock2Ptr
_080E748C: .4byte 0x000004a4
thumb_func_end sub_80E7460
thumb_func_end CopyEReaderTrainerName5
thumb_func_start ValidateEReaderTrainer
ValidateEReaderTrainer: @ 80E7490
@@ -3594,8 +3594,8 @@ _080E752A:
bx r0
thumb_func_end sub_80E7524
thumb_func_start sub_80E7538
sub_80E7538: @ 80E7538
thumb_func_start PrintEReaderTrainerGreeting
PrintEReaderTrainerGreeting: @ 80E7538
push {lr}
ldr r0, _080E754C @ =gSaveBlock2Ptr
ldr r0, [r0]
@@ -3607,7 +3607,7 @@ sub_80E7538: @ 80E7538
bx r0
.align 2, 0
_080E754C: .4byte gSaveBlock2Ptr
thumb_func_end sub_80E7538
thumb_func_end PrintEReaderTrainerGreeting
thumb_func_start sub_80E7550
sub_80E7550: @ 80E7550
@@ -3649,8 +3649,8 @@ _080E7594: .4byte gSaveBlock2Ptr
_080E7598: .4byte 0x000004bc
thumb_func_end sub_80E7550
thumb_func_start sub_80E759C
sub_80E759C: @ 80E759C
thumb_func_start Dummy_TryEnableBravoTrainerBattleTower
Dummy_TryEnableBravoTrainerBattleTower: @ 80E759C
push {lr}
movs r0, 0x1
_080E75A0:
@@ -3659,6 +3659,6 @@ _080E75A0:
bge _080E75A0
pop {r0}
bx r0
thumb_func_end sub_80E759C
thumb_func_end Dummy_TryEnableBravoTrainerBattleTower
.align 2, 0 @ Don't pad with nop.
asm/cable_club.s
+6 -6
View File
@@ -1625,7 +1625,7 @@ _08081404:
.align 2, 0
_0808140C: .4byte gBattleTypeFlags
_08081410:
bl sub_80A03D8
bl ReducePlayerPartyToThree
ldr r1, _08081440 @ =gBattleTypeFlags
movs r0, 0x4B
_08081418:
@@ -1637,7 +1637,7 @@ _0808141A:
lsls r2, 4
adds r0, r2, 0
strh r0, [r1]
ldr r0, _08081448 @ =sub_800FD9C
ldr r0, _08081448 @ =CB2_InitBattle
bl SetMainCallback2
ldr r1, _0808144C @ =gMain
ldr r0, _08081450 @ =sub_8081668
@@ -1651,7 +1651,7 @@ _0808143A:
.align 2, 0
_08081440: .4byte gBattleTypeFlags
_08081444: .4byte gTrainerBattleOpponent_A
_08081448: .4byte sub_800FD9C
_08081448: .4byte CB2_InitBattle
_0808144C: .4byte gMain
_08081450: .4byte sub_8081668
thumb_func_end sub_8081318
@@ -1848,7 +1848,7 @@ _080815D4:
.align 2, 0
_080815DC: .4byte gBattleTypeFlags
_080815E0:
bl sub_80A03D8
bl ReducePlayerPartyToThree
ldr r1, _08081610 @ =gBattleTypeFlags
movs r0, 0x4B
_080815E8:
@@ -1860,7 +1860,7 @@ _080815EA:
lsls r3, 4
adds r0, r3, 0
strh r0, [r1]
ldr r0, _08081618 @ =sub_800FD9C
ldr r0, _08081618 @ =CB2_InitBattle
bl SetMainCallback2
ldr r1, _0808161C @ =gMain
ldr r0, _08081620 @ =sub_8081668
@@ -1874,7 +1874,7 @@ _0808160A:
.align 2, 0
_08081610: .4byte gBattleTypeFlags
_08081614: .4byte gTrainerBattleOpponent_A
_08081618: .4byte sub_800FD9C
_08081618: .4byte CB2_InitBattle
_0808161C: .4byte gMain
_08081620: .4byte sub_8081668
thumb_func_end sub_8081454
asm/dodrio_berry_picking.s
+8 -8
View File
@@ -10324,7 +10324,7 @@ _0815579C:
ldr r0, [r3]
adds r0, r7
ldrb r0, [r0]
ldr r2, _08155858 @ =gUnknown_8417938
ldr r2, _08155858 @ =gText_Yes
movs r1, 0x2
mov r9, r1
str r1, [sp]
@@ -10336,7 +10336,7 @@ _0815579C:
ldr r0, [r2]
adds r0, r7
ldrb r0, [r0]
ldr r2, _0815585C @ =gUnknown_841793C
ldr r2, _0815585C @ =gText_No
movs r1, 0x10
str r1, [sp]
str r5, [sp, 0x4]
@@ -10377,8 +10377,8 @@ _0815579C:
_0815584C: .4byte 0x00003008
_08155850: .4byte 0x00003009
_08155854: .4byte gUnknown_841CDD7
_08155858: .4byte gUnknown_8417938
_0815585C: .4byte gUnknown_841793C
_08155858: .4byte gText_Yes
_0815585C: .4byte gText_No
_08155860: .4byte gFameCheckerText_ListMenuCursor
_08155864: .4byte 0x00003014
_08155868:
@@ -10425,7 +10425,7 @@ _081558B0:
ldr r0, [r2]
adds r0, r4
ldrb r0, [r0]
ldr r2, _08155914 @ =gUnknown_8417938
ldr r2, _08155914 @ =gText_Yes
movs r3, 0x2
mov r8, r3
str r3, [sp]
@@ -10440,7 +10440,7 @@ _081558B0:
ldr r0, [r2]
adds r0, r4
ldrb r0, [r0]
ldr r2, _08155918 @ =gUnknown_841793C
ldr r2, _08155918 @ =gText_No
movs r6, 0x10
str r6, [sp]
movs r3, 0xFF
@@ -10462,8 +10462,8 @@ _081558B0:
.align 2, 0
_0815590C: .4byte 0x00003020
_08155910: .4byte 0x00003009
_08155914: .4byte gUnknown_8417938
_08155918: .4byte gUnknown_841793C
_08155914: .4byte gText_Yes
_08155918: .4byte gText_No
_0815591C: .4byte gFameCheckerText_ListMenuCursor
_08155920:
str r6, [sp]
asm/easy_chat.s
+3 -3
View File
@@ -576,8 +576,8 @@ _080BDB14: .4byte 0x00002cc4
_080BDB18: .4byte gStringVar4
thumb_func_end sub_80BDA7C
thumb_func_start sub_80BDB1C
sub_80BDB1C: @ 80BDB1C
thumb_func_start BufferRandomHobbyOrLifestyleString
BufferRandomHobbyOrLifestyleString: @ 80BDB1C
push {lr}
bl Random
movs r1, 0x1
@@ -597,7 +597,7 @@ _080BDB2E:
bx r0
.align 2, 0
_080BDB44: .4byte gStringVar2
thumb_func_end sub_80BDB1C
thumb_func_end BufferRandomHobbyOrLifestyleString
thumb_func_start sub_80BDB48
sub_80BDB48: @ 80BDB48
asm/event_data.s
-867
View File
@@ -1,867 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start InitEventData
InitEventData: @ 806E0D0
push {r4,lr}
ldr r4, _0806E108 @ =gSaveBlock1Ptr
ldr r0, [r4]
movs r1, 0xEE
lsls r1, 4
adds r0, r1
movs r2, 0x90
lsls r2, 1
movs r1, 0
bl memset
ldr r0, [r4]
movs r1, 0x80
lsls r1, 5
adds r0, r1
movs r2, 0x80
lsls r2, 2
movs r1, 0
bl memset
ldr r0, _0806E10C @ =gUnknown_20370E0
movs r1, 0
movs r2, 0x10
bl memset
pop {r4}
pop {r0}
bx r0
.align 2, 0
_0806E108: .4byte gSaveBlock1Ptr
_0806E10C: .4byte gUnknown_20370E0
thumb_func_end InitEventData
thumb_func_start sub_806E110
sub_806E110: @ 806E110
push {lr}
ldr r0, _0806E150 @ =gSaveBlock1Ptr
ldr r0, [r0]
movs r1, 0xEE
lsls r1, 4
adds r2, r0, r1
movs r1, 0
str r1, [r2]
movs r1, 0x80
lsls r1, 5
adds r0, r1
movs r1, 0
movs r2, 0x20
bl memset
ldr r0, _0806E154 @ =0x00000803
bl FlagClear
ldr r0, _0806E158 @ =0x00000804
bl FlagClear
ldr r0, _0806E15C @ =0x00000805
bl FlagClear
ldr r0, _0806E160 @ =0x00000807
bl FlagClear
ldr r0, _0806E164 @ =0x00000842
bl FlagClear
pop {r0}
bx r0
.align 2, 0
_0806E150: .4byte gSaveBlock1Ptr
_0806E154: .4byte 0x00000803
_0806E158: .4byte 0x00000804
_0806E15C: .4byte 0x00000805
_0806E160: .4byte 0x00000807
_0806E164: .4byte 0x00000842
thumb_func_end sub_806E110
thumb_func_start sub_806E168
sub_806E168: @ 806E168
push {lr}
ldr r0, _0806E184 @ =0x0000403c
bl GetVarPointer
ldr r1, _0806E188 @ =gSaveBlock2Ptr
ldr r2, [r1]
movs r1, 0
strb r1, [r2, 0x1A]
strh r1, [r0]
ldr r0, _0806E18C @ =0x00000838
bl FlagClear
pop {r0}
bx r0
.align 2, 0
_0806E184: .4byte 0x0000403c
_0806E188: .4byte gSaveBlock2Ptr
_0806E18C: .4byte 0x00000838
thumb_func_end sub_806E168
thumb_func_start sub_806E190
sub_806E190: @ 806E190
push {lr}
ldr r0, _0806E1B0 @ =0x0000403c
bl GetVarPointer
ldr r1, _0806E1B4 @ =gSaveBlock2Ptr
ldr r2, [r1]
movs r1, 0xDA
strb r1, [r2, 0x1A]
ldr r2, _0806E1B8 @ =0x00000302
adds r1, r2, 0
strh r1, [r0]
ldr r0, _0806E1BC @ =0x00000838
bl FlagSet
pop {r0}
bx r0
.align 2, 0
_0806E1B0: .4byte 0x0000403c
_0806E1B4: .4byte gSaveBlock2Ptr
_0806E1B8: .4byte 0x00000302
_0806E1BC: .4byte 0x00000838
thumb_func_end sub_806E190
thumb_func_start sub_806E1C0
sub_806E1C0: @ 806E1C0
push {lr}
ldr r0, _0806E1EC @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x1A]
cmp r0, 0xDA
bne _0806E1FC
ldr r0, _0806E1F0 @ =0x0000403c
bl VarGet
lsls r0, 16
ldr r1, _0806E1F4 @ =0x03020000
cmp r0, r1
bne _0806E1FC
ldr r0, _0806E1F8 @ =0x00000838
bl FlagGet
lsls r0, 24
cmp r0, 0
beq _0806E1FC
movs r0, 0x1
b _0806E1FE
.align 2, 0
_0806E1EC: .4byte gSaveBlock2Ptr
_0806E1F0: .4byte 0x0000403c
_0806E1F4: .4byte 0x03020000
_0806E1F8: .4byte 0x00000838
_0806E1FC:
movs r0, 0
_0806E1FE:
pop {r1}
bx r1
thumb_func_end sub_806E1C0
thumb_func_start sub_806E204
sub_806E204: @ 806E204
push {lr}
ldr r0, _0806E224 @ =0x0000404e
bl GetVarPointer
ldr r1, _0806E228 @ =gSaveBlock2Ptr
ldr r2, [r1]
movs r1, 0
strb r1, [r2, 0x1B]
strh r1, [r0]
movs r0, 0x84
lsls r0, 4
bl FlagClear
pop {r0}
bx r0
.align 2, 0
_0806E224: .4byte 0x0000404e
_0806E228: .4byte gSaveBlock2Ptr
thumb_func_end sub_806E204
thumb_func_start EnableNationalPokedex
EnableNationalPokedex: @ 806E22C
push {lr}
ldr r0, _0806E250 @ =0x0000404e
bl GetVarPointer
ldr r1, _0806E254 @ =gSaveBlock2Ptr
ldr r2, [r1]
movs r1, 0xB9
strb r1, [r2, 0x1B]
ldr r2, _0806E258 @ =0x00006258
adds r1, r2, 0
strh r1, [r0]
movs r0, 0x84
lsls r0, 4
bl FlagSet
pop {r0}
bx r0
.align 2, 0
_0806E250: .4byte 0x0000404e
_0806E254: .4byte gSaveBlock2Ptr
_0806E258: .4byte 0x00006258
thumb_func_end EnableNationalPokedex
thumb_func_start IsNationalPokedexEnabled
IsNationalPokedexEnabled: @ 806E25C
push {lr}
ldr r0, _0806E288 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x1B]
cmp r0, 0xB9
bne _0806E294
ldr r0, _0806E28C @ =0x0000404e
bl VarGet
lsls r0, 16
ldr r1, _0806E290 @ =0x62580000
cmp r0, r1
bne _0806E294
movs r0, 0x84
lsls r0, 4
bl FlagGet
lsls r0, 24
cmp r0, 0
beq _0806E294
movs r0, 0x1
b _0806E296
.align 2, 0
_0806E288: .4byte gSaveBlock2Ptr
_0806E28C: .4byte 0x0000404e
_0806E290: .4byte 0x62580000
_0806E294:
movs r0, 0
_0806E296:
pop {r1}
bx r1
thumb_func_end IsNationalPokedexEnabled
thumb_func_start sub_806E29C
sub_806E29C: @ 806E29C
push {lr}
ldr r0, _0806E2A8 @ =0x00000839
bl FlagClear
pop {r0}
bx r0
.align 2, 0
_0806E2A8: .4byte 0x00000839
thumb_func_end sub_806E29C
thumb_func_start sub_806E2AC
sub_806E2AC: @ 806E2AC
push {lr}
ldr r0, _0806E2B8 @ =0x00000839
bl FlagSet
pop {r0}
bx r0
.align 2, 0
_0806E2B8: .4byte 0x00000839
thumb_func_end sub_806E2AC
thumb_func_start Flag_0x839_IsSet
Flag_0x839_IsSet: @ 806E2BC
push {lr}
ldr r0, _0806E2CC @ =0x00000839
bl FlagGet
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
.align 2, 0
_0806E2CC: .4byte 0x00000839
thumb_func_end Flag_0x839_IsSet
thumb_func_start sub_806E2D0
sub_806E2D0: @ 806E2D0
push {lr}
movs r0, 0xF6
lsls r0, 2
bl FlagClear
ldr r0, _0806E340 @ =0x000003d9
bl FlagClear
ldr r0, _0806E344 @ =0x000003da
bl FlagClear
ldr r0, _0806E348 @ =0x000003db
bl FlagClear
movs r0, 0xF7
lsls r0, 2
bl FlagClear
ldr r0, _0806E34C @ =0x000003dd
bl FlagClear
ldr r0, _0806E350 @ =0x000003de
bl FlagClear
ldr r0, _0806E354 @ =0x000003df
bl FlagClear
movs r0, 0xF8
lsls r0, 2
bl FlagClear
ldr r0, _0806E358 @ =0x000003e1
bl FlagClear
ldr r0, _0806E35C @ =0x000003e2
bl FlagClear
ldr r0, _0806E360 @ =0x000003e3
bl FlagClear
movs r0, 0xF9
lsls r0, 2
bl FlagClear
ldr r0, _0806E364 @ =0x000003e5
bl FlagClear
ldr r0, _0806E368 @ =0x000003e6
bl FlagClear
ldr r0, _0806E36C @ =0x000003e7
bl FlagClear
pop {r0}
bx r0
.align 2, 0
_0806E340: .4byte 0x000003d9
_0806E344: .4byte 0x000003da
_0806E348: .4byte 0x000003db
_0806E34C: .4byte 0x000003dd
_0806E350: .4byte 0x000003de
_0806E354: .4byte 0x000003df
_0806E358: .4byte 0x000003e1
_0806E35C: .4byte 0x000003e2
_0806E360: .4byte 0x000003e3
_0806E364: .4byte 0x000003e5
_0806E368: .4byte 0x000003e6
_0806E36C: .4byte 0x000003e7
thumb_func_end sub_806E2D0
thumb_func_start sub_806E370
sub_806E370: @ 806E370
push {lr}
ldr r0, _0806E3C0 @ =0x000040b5
movs r1, 0
bl VarSet
ldr r0, _0806E3C4 @ =0x000040b6
movs r1, 0
bl VarSet
ldr r0, _0806E3C8 @ =0x000040b7
movs r1, 0
bl VarSet
ldr r0, _0806E3CC @ =0x000040b8
movs r1, 0
bl VarSet
ldr r0, _0806E3D0 @ =0x000040b9
movs r1, 0
bl VarSet
ldr r0, _0806E3D4 @ =0x000040ba
movs r1, 0
bl VarSet
ldr r0, _0806E3D8 @ =0x000040bb
movs r1, 0
bl VarSet
ldr r0, _0806E3DC @ =0x000040bc
movs r1, 0
bl VarSet
ldr r0, _0806E3E0 @ =0x00004024
movs r1, 0
bl VarSet
pop {r0}
bx r0
.align 2, 0
_0806E3C0: .4byte 0x000040b5
_0806E3C4: .4byte 0x000040b6
_0806E3C8: .4byte 0x000040b7
_0806E3CC: .4byte 0x000040b8
_0806E3D0: .4byte 0x000040b9
_0806E3D4: .4byte 0x000040ba
_0806E3D8: .4byte 0x000040bb
_0806E3DC: .4byte 0x000040bc
_0806E3E0: .4byte 0x00004024
thumb_func_end sub_806E370
thumb_func_start DisableResetRTC
DisableResetRTC: @ 806E3E4
push {lr}
ldr r0, _0806E3F8 @ =0x00004032
movs r1, 0
bl VarSet
ldr r0, _0806E3FC @ =0x00000837
bl FlagClear
pop {r0}
bx r0
.align 2, 0
_0806E3F8: .4byte 0x00004032
_0806E3FC: .4byte 0x00000837
thumb_func_end DisableResetRTC
thumb_func_start EnableResetRTC
EnableResetRTC: @ 806E400
push {lr}
ldr r0, _0806E418 @ =0x00004032
movs r1, 0x92
lsls r1, 4
bl VarSet
ldr r0, _0806E41C @ =0x00000837
bl FlagSet
pop {r0}
bx r0
.align 2, 0
_0806E418: .4byte 0x00004032
_0806E41C: .4byte 0x00000837
thumb_func_end EnableResetRTC
thumb_func_start CanResetRTC
CanResetRTC: @ 806E420
push {lr}
ldr r0, _0806E444 @ =0x00000837
bl FlagGet
lsls r0, 24
cmp r0, 0
beq _0806E44C
ldr r0, _0806E448 @ =0x00004032
bl VarGet
lsls r0, 16
movs r1, 0x92
lsls r1, 20
cmp r0, r1
bne _0806E44C
movs r0, 0x1
b _0806E44E
.align 2, 0
_0806E444: .4byte 0x00000837
_0806E448: .4byte 0x00004032
_0806E44C:
movs r0, 0
_0806E44E:
pop {r1}
bx r1
thumb_func_end CanResetRTC
thumb_func_start GetVarPointer
GetVarPointer: @ 806E454
push {r4-r6,lr}
lsls r0, 16
lsrs r4, r0, 16
adds r6, r4, 0
ldr r0, _0806E468 @ =0x00003fff
cmp r4, r0
bhi _0806E46C
movs r0, 0
b _0806E518
.align 2, 0
_0806E468: .4byte 0x00003fff
_0806E46C:
lsls r0, r4, 16
cmp r0, 0
blt _0806E50C
ldr r0, _0806E484 @ =gUnknown_3005E88
ldrb r0, [r0]
cmp r0, 0x1
beq _0806E488
cmp r0, 0x1
ble _0806E4EE
cmp r0, 0x2
beq _0806E4B8
b _0806E4EE
.align 2, 0
_0806E484: .4byte gUnknown_3005E88
_0806E488:
movs r0, 0
adds r1, r4, 0
bl sub_8112D40
adds r2, r0, 0
cmp r2, 0
beq _0806E4EE
ldr r0, _0806E4B0 @ =gSaveBlock1Ptr
ldr r1, [r0]
ldr r3, _0806E4B4 @ =0xffffc000
adds r0, r4, r3
lsls r0, 1
movs r3, 0x80
lsls r3, 5
adds r1, r3
adds r1, r0
ldrh r0, [r2]
strh r0, [r1]
b _0806E4EE
.align 2, 0
_0806E4B0: .4byte gSaveBlock1Ptr
_0806E4B4: .4byte 0xffffc000
_0806E4B8:
ldr r0, _0806E4FC @ =0xffffc000
adds r5, r4, r0
lsls r0, r5, 16
lsrs r0, 16
movs r1, 0x1
bl sub_806E528
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _0806E4EE
ldr r0, _0806E500 @ =gUnknown_300507C
strh r5, [r0]
ldr r0, _0806E504 @ =gSaveBlock1Ptr
ldr r1, [r0]
ldr r2, _0806E4FC @ =0xffffc000
adds r0, r4, r2
lsls r0, 1
movs r3, 0x80
lsls r3, 5
adds r1, r3
adds r1, r0
ldrh r2, [r1]
movs r0, 0
adds r1, r4, 0
bl sub_8112DB0
_0806E4EE:
ldr r0, _0806E504 @ =gSaveBlock1Ptr
lsls r1, r6, 1
ldr r2, _0806E508 @ =0xffff9000
adds r1, r2
ldr r0, [r0]
adds r0, r1
b _0806E518
.align 2, 0
_0806E4FC: .4byte 0xffffc000
_0806E500: .4byte gUnknown_300507C
_0806E504: .4byte gSaveBlock1Ptr
_0806E508: .4byte 0xffff9000
_0806E50C:
ldr r0, _0806E520 @ =gSpecialVars
ldr r3, _0806E524 @ =0xffff8000
adds r1, r6, r3
lsls r1, 2
adds r1, r0
ldr r0, [r1]
_0806E518:
pop {r4-r6}
pop {r1}
bx r1
.align 2, 0
_0806E520: .4byte gSpecialVars
_0806E524: .4byte 0xffff8000
thumb_func_end GetVarPointer
thumb_func_start sub_806E528
sub_806E528: @ 806E528
push {lr}
lsls r0, 16
lsrs r2, r0, 16
adds r0, r2, 0
lsls r1, 24
cmp r1, 0
bne _0806E554
ldr r0, _0806E54C @ =0x0000022f
cmp r2, r0
bls _0806E548
ldr r1, _0806E550 @ =0xfffff800
adds r0, r2, r1
lsls r0, 16
lsrs r0, 16
cmp r0, 0x1F
bhi _0806E562
_0806E548:
movs r0, 0
b _0806E564
.align 2, 0
_0806E54C: .4byte 0x0000022f
_0806E550: .4byte 0xfffff800
_0806E554:
cmp r2, 0x2F
bls _0806E548
subs r0, 0x50
lsls r0, 16
lsrs r0, 16
cmp r0, 0x63
bls _0806E548
_0806E562:
movs r0, 0x1
_0806E564:
pop {r1}
bx r1
thumb_func_end sub_806E528
thumb_func_start VarGet
VarGet: @ 806E568
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
adds r0, r4, 0
bl GetVarPointer
cmp r0, 0
beq _0806E57C
ldrh r0, [r0]
b _0806E57E
_0806E57C:
adds r0, r4, 0
_0806E57E:
pop {r4}
pop {r1}
bx r1
thumb_func_end VarGet
thumb_func_start VarSet
VarSet: @ 806E584
push {r4,lr}
lsls r0, 16
lsrs r0, 16
lsls r1, 16
lsrs r4, r1, 16
bl GetVarPointer
cmp r0, 0
beq _0806E59C
strh r4, [r0]
movs r0, 0x1
b _0806E59E
_0806E59C:
movs r0, 0
_0806E59E:
pop {r4}
pop {r1}
bx r1
thumb_func_end VarSet
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 VarGet
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
.align 2, 0
_0806E5BC: .4byte 0x40100000
thumb_func_end VarGetFieldObjectGraphicsId
thumb_func_start sub_806E5C0
sub_806E5C0: @ 806E5C0
push {r4-r6,lr}
lsls r5, r0, 16
lsrs r4, r5, 16
adds r6, r4, 0
cmp r4, 0
bne _0806E5D0
movs r0, 0
b _0806E66E
_0806E5D0:
ldr r0, _0806E5E8 @ =0x00003fff
cmp r4, r0
bhi _0806E65C
ldr r0, _0806E5EC @ =gUnknown_3005E88
ldrb r0, [r0]
cmp r0, 0x1
beq _0806E5F0
cmp r0, 0x1
ble _0806E644
cmp r0, 0x2
beq _0806E618
b _0806E644
.align 2, 0
_0806E5E8: .4byte 0x00003fff
_0806E5EC: .4byte gUnknown_3005E88
_0806E5F0:
movs r0, 0x1
adds r1, r4, 0
bl sub_8112D40
adds r2, r0, 0
cmp r2, 0
beq _0806E644
ldr r0, _0806E614 @ =gSaveBlock1Ptr
ldr r0, [r0]
lsrs r1, r5, 19
movs r3, 0xEE
lsls r3, 4
adds r0, r3
adds r0, r1
ldrb r1, [r2]
strb r1, [r0]
b _0806E644
.align 2, 0
_0806E614: .4byte gSaveBlock1Ptr
_0806E618:
adds r0, r4, 0
movs r1, 0
bl sub_806E528
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _0806E644
ldr r0, _0806E654 @ =gUnknown_300507C
strh r4, [r0]
ldr r0, _0806E658 @ =gSaveBlock1Ptr
ldr r0, [r0]
lsrs r1, r5, 19
movs r2, 0xEE
lsls r2, 4
adds r0, r2
adds r0, r1
ldrb r2, [r0]
movs r0, 0x1
adds r1, r4, 0
bl sub_8112DB0
_0806E644:
ldr r0, _0806E658 @ =gSaveBlock1Ptr
lsrs r1, r6, 3
movs r3, 0xEE
lsls r3, 4
adds r1, r3
ldr r0, [r0]
b _0806E66C
.align 2, 0
_0806E654: .4byte gUnknown_300507C
_0806E658: .4byte gSaveBlock1Ptr
_0806E65C:
ldr r1, _0806E674 @ =0xffffc000
adds r0, r6, r1
cmp r0, 0
bge _0806E668
ldr r2, _0806E678 @ =0xffffc007
adds r0, r6, r2
_0806E668:
asrs r0, 3
ldr r1, _0806E67C @ =gUnknown_20370E0
_0806E66C:
adds r0, r1
_0806E66E:
pop {r4-r6}
pop {r1}
bx r1
.align 2, 0
_0806E674: .4byte 0xffffc000
_0806E678: .4byte 0xffffc007
_0806E67C: .4byte gUnknown_20370E0
thumb_func_end sub_806E5C0
thumb_func_start FlagSet
FlagSet: @ 806E680
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
adds r0, r4, 0
bl sub_806E5C0
adds r2, r0, 0
cmp r2, 0
beq _0806E6A0
movs r0, 0x7
ands r0, r4
movs r1, 0x1
lsls r1, r0
ldrb r0, [r2]
orrs r1, r0
strb r1, [r2]
_0806E6A0:
movs r0, 0
pop {r4}
pop {r1}
bx r1
thumb_func_end FlagSet
thumb_func_start FlagClear
FlagClear: @ 806E6A8
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
adds r0, r4, 0
bl sub_806E5C0
adds r2, r0, 0
cmp r2, 0
beq _0806E6C8
movs r0, 0x7
ands r0, r4
movs r1, 0x1
lsls r1, r0
ldrb r0, [r2]
bics r0, r1
strb r0, [r2]
_0806E6C8:
movs r0, 0
pop {r4}
pop {r1}
bx r1
thumb_func_end FlagClear
thumb_func_start FlagGet
FlagGet: @ 806E6D0
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
adds r0, r4, 0
bl sub_806E5C0
cmp r0, 0
beq _0806E6F4
ldrb r0, [r0]
movs r1, 0x7
ands r1, r4
asrs r0, r1
movs r1, 0x1
ands r0, r1
cmp r0, 0
beq _0806E6F4
movs r0, 0x1
b _0806E6F6
_0806E6F4:
movs r0, 0
_0806E6F6:
pop {r4}
pop {r1}
bx r1
thumb_func_end FlagGet
thumb_func_start sub_806E6FC
sub_806E6FC: @ 806E6FC
ldr r1, _0806E754 @ =gSpecialVar_0x8000
movs r0, 0
strh r0, [r1]
ldr r1, _0806E758 @ =gSpecialVar_0x8001
strh r0, [r1]
ldr r1, _0806E75C @ =gSpecialVar_0x8002
strh r0, [r1]
ldr r1, _0806E760 @ =gSpecialVar_0x8003
strh r0, [r1]
ldr r1, _0806E764 @ =gSpecialVar_0x8004
strh r0, [r1]
ldr r1, _0806E768 @ =gSpecialVar_0x8005
strh r0, [r1]
ldr r1, _0806E76C @ =gSpecialVar_0x8006
strh r0, [r1]
ldr r1, _0806E770 @ =gSpecialVar_0x8007
strh r0, [r1]
ldr r1, _0806E774 @ =gSpecialVar_0x8008
strh r0, [r1]
ldr r1, _0806E778 @ =gSpecialVar_0x8009
strh r0, [r1]
ldr r1, _0806E77C @ =gSpecialVar_0x800A
strh r0, [r1]
ldr r1, _0806E780 @ =gSpecialVar_0x800B
strh r0, [r1]
ldr r1, _0806E784 @ =gSpecialVar_Facing
strh r0, [r1]
ldr r1, _0806E788 @ =gSpecialVar_Result
strh r0, [r1]
ldr r1, _0806E78C @ =gSpecialVar_ItemId
strh r0, [r1]
ldr r1, _0806E790 @ =gSpecialVar_LastTalked
strh r0, [r1]
ldr r1, _0806E794 @ =gSpecialVar_MonBoxId
strh r0, [r1]
ldr r1, _0806E798 @ =gSpecialVar_MonBoxPos
strh r0, [r1]
ldr r1, _0806E79C @ =gUnknown_20370DA
strh r0, [r1]
ldr r1, _0806E7A0 @ =gUnknown_20370DC
strh r0, [r1]
ldr r1, _0806E7A4 @ =gUnknown_20370DE
strh r0, [r1]
bx lr
.align 2, 0
_0806E754: .4byte gSpecialVar_0x8000
_0806E758: .4byte gSpecialVar_0x8001
_0806E75C: .4byte gSpecialVar_0x8002
_0806E760: .4byte gSpecialVar_0x8003
_0806E764: .4byte gSpecialVar_0x8004
_0806E768: .4byte gSpecialVar_0x8005
_0806E76C: .4byte gSpecialVar_0x8006
_0806E770: .4byte gSpecialVar_0x8007
_0806E774: .4byte gSpecialVar_0x8008
_0806E778: .4byte gSpecialVar_0x8009
_0806E77C: .4byte gSpecialVar_0x800A
_0806E780: .4byte gSpecialVar_0x800B
_0806E784: .4byte gSpecialVar_Facing
_0806E788: .4byte gSpecialVar_Result
_0806E78C: .4byte gSpecialVar_ItemId
_0806E790: .4byte gSpecialVar_LastTalked
_0806E794: .4byte gSpecialVar_MonBoxId
_0806E798: .4byte gSpecialVar_MonBoxPos
_0806E79C: .4byte gUnknown_20370DA
_0806E7A0: .4byte gUnknown_20370DC
_0806E7A4: .4byte gUnknown_20370DE
thumb_func_end sub_806E6FC
.align 2, 0 @ Don't pad with nop.
asm/evolution_scene.s
+13 -13
View File
@@ -278,7 +278,7 @@ EvolutionScene: @ 80CDDF4
adds r6, r7, 0
adds r6, 0x1C
adds r0, r1, r6
ldr r2, _080CE0CC @ =nullsub_10
ldr r2, _080CE0CC @ =SpriteCallbackDummy2
str r2, [r0]
adds r1, r7
ldrb r2, [r1, 0x5]
@@ -331,7 +331,7 @@ EvolutionScene: @ 80CDDF4
adds r1, r3
lsls r1, 2
adds r6, r1, r6
ldr r2, _080CE0CC @ =nullsub_10
ldr r2, _080CE0CC @ =SpriteCallbackDummy2
str r2, [r6]
adds r1, r7
ldrb r0, [r1, 0x5]
@@ -420,7 +420,7 @@ _080CE0BC: .4byte gMonSpritesGfxPtr
_080CE0C0: .4byte gMultiuseSpriteTemplate
_080CE0C4: .4byte gDummySpriteAffineAnimTable
_080CE0C8: .4byte gSprites
_080CE0CC: .4byte nullsub_10
_080CE0CC: .4byte SpriteCallbackDummy2
_080CE0D0: .4byte sub_80CE8DC
_080CE0D4: .4byte gTasks
_080CE0D8: .4byte gPlttBufferUnfaded + 0x40
@@ -562,7 +562,7 @@ CB2_EvolutionSceneLoadGraphics: @ 80CE0E8
adds r0, r3, 0
adds r0, 0x1C
adds r0, r1, r0
ldr r2, _080CE2CC @ =nullsub_10
ldr r2, _080CE2CC @ =SpriteCallbackDummy2
str r2, [r0]
adds r1, r3
ldrb r2, [r1, 0x5]
@@ -623,7 +623,7 @@ _080CE2BC: .4byte gMonSpritesGfxPtr
_080CE2C0: .4byte gMultiuseSpriteTemplate
_080CE2C4: .4byte gDummySpriteAffineAnimTable
_080CE2C8: .4byte gSprites
_080CE2CC: .4byte nullsub_10
_080CE2CC: .4byte SpriteCallbackDummy2
_080CE2D0: .4byte nullsub_76
_080CE2D4: .4byte sub_80D0050
_080CE2D8: .4byte sub_80CE710
@@ -813,7 +813,7 @@ _080CE45C:
adds r0, r3, 0
adds r0, 0x1C
adds r0, r1, r0
ldr r2, _080CE4C4 @ =nullsub_10
ldr r2, _080CE4C4 @ =SpriteCallbackDummy2
str r2, [r0]
adds r1, r3
ldrb r2, [r1, 0x5]
@@ -836,7 +836,7 @@ _080CE4B4: .4byte gMultiuseSpriteTemplate
_080CE4B8: .4byte gDummySpriteAffineAnimTable
_080CE4BC: .4byte gUnknown_2039A20
_080CE4C0: .4byte gSprites
_080CE4C4: .4byte nullsub_10
_080CE4C4: .4byte SpriteCallbackDummy2
_080CE4C8: .4byte gMain
_080CE4CC:
ldr r0, _080CE4FC @ =gWirelessCommType
@@ -989,7 +989,7 @@ TradeEvolutionScene: @ 80CE540
adds r0, r3, 0
adds r0, 0x1C
adds r0, r1, r0
ldr r2, _080CE6D8 @ =nullsub_10
ldr r2, _080CE6D8 @ =SpriteCallbackDummy2
str r2, [r0]
adds r1, r3
ldrb r2, [r1, 0x5]
@@ -1074,7 +1074,7 @@ _080CE6C8: .4byte gMonSpritesGfxPtr
_080CE6CC: .4byte gMultiuseSpriteTemplate
_080CE6D0: .4byte gDummySpriteAffineAnimTable
_080CE6D4: .4byte gSprites
_080CE6D8: .4byte nullsub_10
_080CE6D8: .4byte SpriteCallbackDummy2
_080CE6DC: .4byte sub_80CF53C
_080CE6E0: .4byte gTasks
_080CE6E4: .4byte gBattle_BG0_X
@@ -1962,14 +1962,14 @@ _080CEEA0:
bl Free
str r6, [r4]
bl FreeAllWindowBuffers
ldr r0, _080CEECC @ =gUnknown_300537C
ldr r0, _080CEECC @ =gCB2_AfterEvolution
ldr r0, [r0]
bl SetMainCallback2
b _080CF528
.align 2, 0
_080CEEC4: .4byte gPaletteFade
_080CEEC8: .4byte gUnknown_2039A20
_080CEECC: .4byte gUnknown_300537C
_080CEECC: .4byte gCB2_AfterEvolution
_080CEED0:
ldr r0, _080CEF04 @ =gBattleCommunication
ldrb r1, [r0, 0x2]
@@ -3252,14 +3252,14 @@ _080CF9E0:
negs r0, r0
ands r0, r1
strb r0, [r2]
ldr r0, _080CFA10 @ =gUnknown_300537C
ldr r0, _080CFA10 @ =gCB2_AfterEvolution
ldr r0, [r0]
bl SetMainCallback2
b _080D003A
.align 2, 0
_080CFA08: .4byte gUnknown_2039A20
_080CFA0C: .4byte gTextFlags
_080CFA10: .4byte gUnknown_300537C
_080CFA10: .4byte gCB2_AfterEvolution
_080CFA14:
ldr r0, _080CFA60 @ =gBattleCommunication
ldrb r1, [r0, 0x2]
asm/field_control_avatar.s
+24 -24
View File
@@ -364,11 +364,11 @@ sub_806CAC8: @ 806CAC8
beq _0806CB74
movs r0, 0x5
bl IncrementGameStat
bl sub_8146CA4
bl sub_815D8C8
bl sub_80CC918
bl sub_80CB054
bl sub_80CCFBC
bl MENewsJisanStepCounter
bl IncrementRenewableHiddenItemStepCounter
bl RunMassageCooldownStepCounter
bl IncrementResortGorgeousStepCounter
bl BirthIslandDeoxysStepCounter
mov r0, sp
adds r1, r4, 0
adds r2, r6, 0
@@ -1100,11 +1100,11 @@ sub_806D0E4: @ 806D0E4
ldr r0, [r5, 0x8]
cmp r0, 0
bne _0806D120
ldr r0, _0806D11C @ =gUnknown_81C555B
ldr r0, _0806D11C @ =EventScript_1C555B
b _0806D1E6
.align 2, 0
_0806D118: .4byte gMapHeader
_0806D11C: .4byte gUnknown_81C555B
_0806D11C: .4byte EventScript_1C555B
_0806D120:
adds r0, r7, 0
adds r1, r6, 0
@@ -1330,10 +1330,10 @@ _0806D2F0:
lsrs r0, 24
cmp r0, 0x1
bne _0806D308
ldr r0, _0806D304 @ =gUnknown_81C549C
ldr r0, _0806D304 @ =EventScript_1C549C
b _0806D53E
.align 2, 0
_0806D304: .4byte gUnknown_81C549C
_0806D304: .4byte EventScript_1C549C
_0806D308:
adds r0, r4, 0
adds r1, r5, 0
@@ -1641,11 +1641,11 @@ _0806D570:
lsrs r0, 24
cmp r0, 0x1
bne _0806D5A4
ldr r0, _0806D5A0 @ =gUnknown_81A6AC8
ldr r0, _0806D5A0 @ =EventScript_1A6AC8
b _0806D5E2
.align 2, 0
_0806D59C: .4byte 0x00000824
_0806D5A0: .4byte gUnknown_81A6AC8
_0806D5A0: .4byte EventScript_1A6AC8
_0806D5A4:
adds r0, r4, 0
bl MetatileBehavior_IsWaterfall
@@ -1670,10 +1670,10 @@ _0806D5A4:
_0806D5D0: .4byte 0x00000826
_0806D5D4: .4byte gUnknown_81BE2B7
_0806D5D8:
ldr r0, _0806D5DC @ =gUnknown_81BE2FF
ldr r0, _0806D5DC @ =EventScript_81BE2FF
b _0806D5E2
.align 2, 0
_0806D5DC: .4byte gUnknown_81BE2FF
_0806D5DC: .4byte EventScript_81BE2FF
_0806D5E0:
movs r0, 0
_0806D5E2:
@@ -1822,11 +1822,11 @@ _0806D6EC:
lsrs r0, 24
cmp r0, 0x1
bne _0806D704
ldr r0, _0806D700 @ =gUnknown_81A8DFD
ldr r0, _0806D700 @ =EventScript_PoisonWhiteOut
bl ScriptContext1_SetupScript
b _0806D730
.align 2, 0
_0806D700: .4byte gUnknown_81A8DFD
_0806D700: .4byte EventScript_PoisonWhiteOut
_0806D704:
bl ShouldEggHatch
lsls r0, 24
@@ -1834,11 +1834,11 @@ _0806D704:
beq _0806D720
movs r0, 0xD
bl IncrementGameStat
ldr r0, _0806D71C @ =gUnknown_81BF546
ldr r0, _0806D71C @ =EventScript_81BF546
bl ScriptContext1_SetupScript
b _0806D730
.align 2, 0
_0806D71C: .4byte gUnknown_81BF546
_0806D71C: .4byte EventScript_81BF546
_0806D720:
bl SafariZoneTakeStep
lsls r0, 24
@@ -1953,13 +1953,13 @@ _0806D7E2:
bx r1
thumb_func_end DoPoisonFieldEffect_step
thumb_func_start sub_806D7E8
sub_806D7E8: @ 806D7E8
thumb_func_start RestartWildEncounterImmunitySteps
RestartWildEncounterImmunitySteps: @ 806D7E8
push {lr}
bl sub_80832D4
pop {r0}
bx r0
thumb_func_end sub_806D7E8
thumb_func_end RestartWildEncounterImmunitySteps
thumb_func_start is_it_battle_time_3
is_it_battle_time_3: @ 806D7F4
@@ -2150,13 +2150,13 @@ _0806D950:
ldr r0, [r0, 0x8]
cmp r0, 0
bne _0806D958
ldr r0, _0806D960 @ =gUnknown_81C555B
ldr r0, _0806D960 @ =EventScript_1C555B
_0806D958:
pop {r4}
pop {r1}
bx r1
.align 2, 0
_0806D960: .4byte gUnknown_81C555B
_0806D960: .4byte EventScript_1C555B
thumb_func_end sub_806D928
thumb_func_start mapheader_run_first_tag2_script_list_match_conditionally
@@ -2332,12 +2332,12 @@ _0806DAC4:
cmp r0, 0x1
bne _0806DAE4
bl ResetInitialPlayerAvatarState
ldr r0, _0806DAE0 @ =gUnknown_81C1361
ldr r0, _0806DAE0 @ =EventScript_1C1361
bl ScriptContext1_SetupScript
movs r0, 0x1
b _0806DAEE
.align 2, 0
_0806DAE0: .4byte gUnknown_81C1361
_0806DAE0: .4byte EventScript_1C1361
_0806DAE4:
bl DoWarp
movs r0, 0x1
asm/field_effect.s
+14 -14
View File
@@ -1989,7 +1989,7 @@ mapldr_080842E8: @ 80842E8
movs r1, 0
bl CreateTask
bl ScriptContext2_Enable
bl player_bitmagic
bl FreezeEventObjects
ldr r1, _0808430C @ =gFieldCallback
movs r0, 0
str r0, [r1]
@@ -2092,7 +2092,7 @@ mapldr_08084390: @ 8084390
bl FieldObjectTurn
_080843D2:
bl ScriptContext2_Enable
bl player_bitmagic
bl FreezeEventObjects
ldr r1, _080843F4 @ =gFieldCallback
movs r0, 0
str r0, [r1]
@@ -2158,7 +2158,7 @@ sub_8084454: @ 8084454
bl pal_fill_for_maplights
bl sub_8111CF0
bl ScriptContext2_Enable
bl player_bitmagic
bl FreezeEventObjects
ldr r0, _0808447C @ =sub_8084484
movs r1, 0
bl CreateTask
@@ -2626,7 +2626,7 @@ _080847F4: .4byte gUnknown_83CC050
sub_80847F8: @ 80847F8
push {r4,lr}
adds r4, r0, 0
bl player_bitmagic
bl FreezeEventObjects
bl CameraObjectReset2
ldrb r0, [r4, 0xA]
bl sub_809C448
@@ -2889,7 +2889,7 @@ sub_80849F4: @ 80849F4
bl pal_fill_for_maplights
bl sub_8111CF0
bl ScriptContext2_Enable
bl player_bitmagic
bl FreezeEventObjects
ldr r0, _08084A1C @ =sub_8084A24
movs r1, 0
bl CreateTask
@@ -3630,7 +3630,7 @@ sub_8084FA0: @ 8084FA0
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
bl player_bitmagic
bl FreezeEventObjects
bl CameraObjectReset2
movs r0, 0
bl SetCameraPanningCallback
@@ -3977,7 +3977,7 @@ sub_8085244: @ 8085244
adds r5, r0, 0
adds r4, r1, 0
bl CameraObjectReset2
bl player_bitmagic
bl FreezeEventObjects
ldr r1, _08085270 @ =gPlayerAvatar
movs r0, 0x1
strb r0, [r1, 0x6]
@@ -4239,7 +4239,7 @@ sub_8085440: @ 8085440
push {r4,r5,lr}
adds r5, r0, 0
adds r4, r1, 0
bl player_bitmagic
bl FreezeEventObjects
bl CameraObjectReset2
ldr r1, _0808546C @ =gPlayerAvatar
movs r0, 0x1
@@ -4482,7 +4482,7 @@ _0808561C:
sub_8085620: @ 8085620
push {lr}
bl ScriptContext2_Enable
bl player_bitmagic
bl FreezeEventObjects
ldr r0, _08085638 @ =sub_808563C
movs r1, 0x50
bl CreateTask
@@ -4969,7 +4969,7 @@ sub_80859D4: @ 80859D4
bl pal_fill_for_maplights
bl sub_8111CF0
bl ScriptContext2_Enable
bl player_bitmagic
bl FreezeEventObjects
ldr r1, _08085A14 @ =gFieldCallback
movs r0, 0
str r0, [r1]
@@ -5198,7 +5198,7 @@ sub_8085BA8: @ 8085BA8
push {r4,lr}
adds r4, r0, 0
bl ScriptContext2_Enable
bl player_bitmagic
bl FreezeEventObjects
bl CameraObjectReset2
bl GetPlayerFacingDirection
lsls r0, 24
@@ -5435,7 +5435,7 @@ mapldr_08085D88: @ 8085D88
bl pal_fill_for_maplights
bl sub_8111CF0
bl ScriptContext2_Enable
bl player_bitmagic
bl FreezeEventObjects
ldr r1, _08085DCC @ =gFieldCallback
movs r0, 0
str r0, [r1]
@@ -7000,7 +7000,7 @@ sub_80869C0: @ 80869C0
push {r6}
adds r4, r0, 0
bl ScriptContext2_Enable
bl player_bitmagic
bl FreezeEventObjects
ldr r5, _08086A18 @ =gPlayerAvatar
movs r0, 0x1
strb r0, [r5, 0x6]
@@ -7276,7 +7276,7 @@ sub_8086C00: @ 8086C00
push {r4,lr}
adds r4, r0, 0
bl ScriptContext2_Enable
bl player_bitmagic
bl FreezeEventObjects
ldr r1, _08086C20 @ =gPlayerAvatar
movs r0, 0x1
strb r0, [r1, 0x6]
asm/field_effect_helpers.s
+3 -3
View File
@@ -134,13 +134,13 @@ npc_pal_op: @ 80DAE54
cmp r0, 0
bne _080DAEB0
ldrb r0, [r5, 0x1F]
bl MetatileBehavior_ReturnFalse_7
bl MetatileBehavior_GetBridgeType
lsls r0, 24
lsrs r0, 24
cmp r0, 0
bne _080DAE96
ldrb r0, [r5, 0x1E]
bl MetatileBehavior_ReturnFalse_7
bl MetatileBehavior_GetBridgeType
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -1251,7 +1251,7 @@ _080DB6E8:
cmp r0, 0
bne _080DB73C
adds r0, r4, 0
bl MetatileBehavior_ReturnFalse_3
bl MetatileBehavior_IsLongGrass
lsls r0, 24
cmp r0, 0
beq _080DB73C
asm/field_ground_effect.s
+4 -4
View File
@@ -224,7 +224,7 @@ GetGroundEffectFlags_LongGrassOnSpawn: @ 8067CE8
push {r4,lr}
adds r4, r1, 0
ldrb r0, [r0, 0x1E]
bl MetatileBehavior_ReturnFalse_3
bl MetatileBehavior_IsLongGrass
lsls r0, 24
cmp r0, 0
beq _08067D00
@@ -243,7 +243,7 @@ GetGroundEffectFlags_LongGrassOnBeginStep: @ 8067D08
push {r4,lr}
adds r4, r1, 0
ldrb r0, [r0, 0x1E]
bl MetatileBehavior_ReturnFalse_3
bl MetatileBehavior_IsLongGrass
lsls r0, 24
cmp r0, 0
beq _08067D20
@@ -838,12 +838,12 @@ FieldObjectSetSpriteOamTableForLongGrass: @ 8068154
cmp r0, 0
blt _080681A8
ldrb r0, [r5, 0x1E]
bl MetatileBehavior_ReturnFalse_3
bl MetatileBehavior_IsLongGrass
lsls r0, 24
cmp r0, 0
beq _080681A8
ldrb r0, [r5, 0x1F]
bl MetatileBehavior_ReturnFalse_3
bl MetatileBehavior_IsLongGrass
lsls r0, 24
cmp r0, 0
beq _080681A8
asm/field_map_obj.s
+8 -8
View File
@@ -2774,14 +2774,14 @@ _0805F2E0:
bls _0805F2E6
movs r1, 0x10
_0805F2E6:
ldr r0, _0805F2F4 @ =gUnknown_839FDB0
ldr r0, _0805F2F4 @ =gMapObjectGraphicsInfoPointers
lsls r1, 2
adds r1, r0
ldr r0, [r1]
pop {r1}
bx r1
.align 2, 0
_0805F2F4: .4byte gUnknown_839FDB0
_0805F2F4: .4byte gMapObjectGraphicsInfoPointers
thumb_func_end GetFieldObjectGraphicsInfo
thumb_func_start FieldObjectHandleDynamicGraphicsId
@@ -12214,8 +12214,8 @@ _0806360C:
bx r1
thumb_func_end sub_80635DC
thumb_func_start npc_set_running_behaviour_etc
npc_set_running_behaviour_etc: @ 8063610
thumb_func_start SetTrainerMovementType
SetTrainerMovementType: @ 8063610
push {r4,lr}
mov r12, r0
lsls r1, 24
@@ -12253,10 +12253,10 @@ npc_set_running_behaviour_etc: @ 8063610
.align 2, 0
_08063654: .4byte gSprites
_08063658: .4byte gUnknown_839FBC8
thumb_func_end npc_set_running_behaviour_etc
thumb_func_end SetTrainerMovementType
thumb_func_start npc_running_behaviour_by_direction
npc_running_behaviour_by_direction: @ 806365C
thumb_func_start GetTrainerFacingDirectionMovementType
GetTrainerFacingDirectionMovementType: @ 806365C
lsls r0, 24
lsrs r0, 24
ldr r1, _08063668 @ =gUnknown_83A649C
@@ -12265,7 +12265,7 @@ npc_running_behaviour_by_direction: @ 806365C
bx lr
.align 2, 0
_08063668: .4byte gUnknown_83A649C
thumb_func_end npc_running_behaviour_by_direction
thumb_func_end GetTrainerFacingDirectionMovementType
thumb_func_start npc_block_way__next_tile
npc_block_way__next_tile: @ 806366C
asm/field_player_avatar.s
+2 -2
View File
@@ -3964,7 +3964,7 @@ sub_805D0F8: @ 805D0F8
lsls r4, 24
lsrs r4, 24
bl ScriptContext2_Enable
bl player_bitmagic
bl FreezeEventObjects
bl sav1_reset_battle_music_maybe
bl Overworld_ChangeMusicToDefault
ldr r2, _0805D148 @ =gPlayerAvatar
@@ -4005,7 +4005,7 @@ sub_805D154: @ 805D154
lsls r4, 24
lsrs r4, 24
bl ScriptContext2_Enable
bl player_bitmagic
bl FreezeEventObjects
ldr r2, _0805D19C @ =gPlayerAvatar
ldrb r1, [r2]
movs r0, 0xF7
asm/field_screen_effect.s
+5 -5
View File
@@ -306,7 +306,7 @@ sub_807F028: @ 807F028
lsls r0, 24
lsrs r0, 24
adds r4, r0, 0
bl sav1_get_flash_used_on_map
bl Overworld_GetFlashLevel
lsls r0, 24
lsrs r0, 24
movs r5, 0
@@ -985,25 +985,25 @@ _0807F5B6:
bne _0807F5E4
adds r0, r6, 0
bl DestroyTask
ldr r0, _0807F5CC @ =gUnknown_81A8D97
ldr r0, _0807F5CC @ =EventScript_AfterWhiteOutHeal
bl ScriptContext1_SetupScript
b _0807F5E4
.align 2, 0
_0807F5CC: .4byte gUnknown_81A8D97
_0807F5CC: .4byte EventScript_AfterWhiteOutHeal
_0807F5D0:
bl sub_807E418
cmp r0, 0x1
bne _0807F5E4
adds r0, r6, 0
bl DestroyTask
ldr r0, _0807F5EC @ =gUnknown_81A8DD8
ldr r0, _0807F5EC @ =EventScript_MomHeal
bl ScriptContext1_SetupScript
_0807F5E4:
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_0807F5EC: .4byte gUnknown_81A8DD8
_0807F5EC: .4byte EventScript_MomHeal
thumb_func_end sub_807F45C
thumb_func_start sub_807F5F0
asm/field_specials.s
-5729
View File
File diff suppressed because it is too large Load Diff
asm/fldeff_cut.s
+2 -2
View File
@@ -33,7 +33,7 @@ sub_8097898: @ 8097898
ldr r4, _080978CC @ =gUnknown_2039874
movs r0, 0
strb r0, [r4]
bl sub_80CCD84
bl CutMoveRuinValleyCheck
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -232,7 +232,7 @@ sub_8097A20: @ 8097A20
ldrb r0, [r0]
cmp r0, 0x1
bne _08097A3C
bl sub_80CCDD0
bl CutMoveOpenDottedHoleDoor
b _08097A42
.align 2, 0
_08097A38: .4byte gUnknown_2039874
asm/fldeff_flash.s
+2 -2
View File
@@ -76,13 +76,13 @@ sub_80C9BB0: @ 80C9BB0
bl PlaySE
ldr r0, _080C9BC8 @ =0x00000806
bl FlagSet
ldr r0, _080C9BCC @ =gUnknown_81BFB5F
ldr r0, _080C9BCC @ =EventScript_81BFB5F
bl ScriptContext1_SetupScript
pop {r0}
bx r0
.align 2, 0
_080C9BC8: .4byte 0x00000806
_080C9BCC: .4byte gUnknown_81BFB5F
_080C9BCC: .4byte EventScript_81BFB5F
thumb_func_end sub_80C9BB0
thumb_func_start sub_80C9BD0
asm/item_menu.s
+1 -1
View File
@@ -5845,7 +5845,7 @@ _0810AD1E:
cmp r6, 0x1
bne _0810AD90
bl ScriptContext2_Enable
bl player_bitmagic
bl FreezeEventObjects
bl sub_805C270
bl sub_805C780
ldr r2, _0810AD88 @ =gSpecialVar_ItemId
asm/learn_move.s
+5 -5
View File
@@ -15,8 +15,8 @@ sub_80E4620: @ 80E4620
bx r0
thumb_func_end sub_80E4620
thumb_func_start sub_80E4634
sub_80E4634: @ 80E4634
thumb_func_start DisplayMoveTutorMenu
DisplayMoveTutorMenu: @ 80E4634
push {lr}
sub sp, 0x4
bl ScriptContext2_Enable
@@ -35,7 +35,7 @@ sub_80E4634: @ 80E4634
bx r0
.align 2, 0
_080E465C: .4byte sub_80E4660
thumb_func_end sub_80E4634
thumb_func_end DisplayMoveTutorMenu
thumb_func_start sub_80E4660
sub_80E4660: @ 80E4660
@@ -1653,7 +1653,7 @@ _080E53F4:
movs r2, 0x2
movs r3, 0x2
bl sub_80E559C
ldr r1, _080E5440 @ =gUnknown_84886E8
ldr r1, _080E5440 @ =gMoveDescriptionPointers
subs r0, r5, 0x1
lsls r0, 2
adds r0, r1
@@ -1670,7 +1670,7 @@ _080E53F4:
bx r0
.align 2, 0
_080E543C: .4byte gBattleMoves
_080E5440: .4byte gUnknown_84886E8
_080E5440: .4byte gMoveDescriptionPointers
thumb_func_end sub_80E5340
thumb_func_start sub_80E5444
asm/link_rfu_2.s
+3 -3
View File
@@ -4012,8 +4012,8 @@ GetRfuPlayerCount: @ 80FA4EC
_080FA4F4: .4byte gUnknown_3005450
thumb_func_end GetRfuPlayerCount
thumb_func_start IsRfuTaskFinished
IsRfuTaskFinished: @ 80FA4F8
thumb_func_start IsLinkRfuTaskFinished
IsLinkRfuTaskFinished: @ 80FA4F8
push {lr}
movs r1, 0
ldr r0, _080FA50C @ =gUnknown_3005450
@@ -4027,7 +4027,7 @@ _080FA506:
bx r1
.align 2, 0
_080FA50C: .4byte gUnknown_3005450
thumb_func_end IsRfuTaskFinished
thumb_func_end IsLinkRfuTaskFinished
thumb_func_start sub_80FA510
sub_80FA510: @ 80FA510
asm/link_rfu_3.s
+2 -2
View File
@@ -12709,7 +12709,7 @@ _0811C096:
lsls r2, 4
adds r1, r2, 0
strh r1, [r0]
ldr r0, _0811C0DC @ =sub_800FD9C
ldr r0, _0811C0DC @ =CB2_InitBattle
bl SetMainCallback2
pop {r4-r7}
pop {r0}
@@ -12719,7 +12719,7 @@ _0811C0CC: .4byte gPlayerParty
_0811C0D0: .4byte gEnemyParty
_0811C0D4: .4byte gUnknown_203B0D4
_0811C0D8: .4byte gTrainerBattleOpponent_A
_0811C0DC: .4byte sub_800FD9C
_0811C0DC: .4byte CB2_InitBattle
thumb_func_end sub_811C04C
thumb_func_start sub_811C0E0
asm/macros/event.inc
+20 -3
View File
@@ -37,6 +37,13 @@
.4byte \destination
.endm
lt = 0
eq = 1
gt = 2
le = 3
ge = 4
ne = 5
@ If the result of the last comparison matches condition (see Comparison operators), calls destination.
.macro call_if condition, destination
.byte 0x07
@@ -1225,10 +1232,9 @@
.byte 0xb7
.endm
.macro setvaddress long, word
.macro setvaddress long
.byte 0xb8
.4byte \long
.2byte \word
.endm
.macro vgoto pointer
@@ -1406,7 +1412,7 @@
@ Supplementary
.macro goto_if_eq dest
goto_if 1, \dest
goto_if eq, \dest
.endm
.macro switch var
@@ -1442,3 +1448,14 @@
setorcopyvar 0x8002, \fanfare
callstd 9
.endm
.macro famechecker person:req, index:req, function=SetFlavorTextFlagFromSpecialVars
setvar VAR_0x8004, \person
setvar VAR_0x8005, \index
special \function
.endm
.macro set_gym_trainers gym:req
setvar VAR_0x8008, \gym
call EventScript_1A6B18
.endm
asm/macros/map.inc
+2 -2
View File
@@ -55,8 +55,8 @@
inc _num_signs
.endm
.macro bg_hidden_item_event x, y, height, item, flag, unknown
bg_event \x, \y, \height, 7, 0, \item, \flag, \unknown
.macro bg_hidden_item_event x, y, height, item, flag, quantity, underfoot
bg_event \x, \y, \height, 7, 0, \item, \flag, \quantity | (\underfoot << 7)
.endm
.macro map_events npcs, warps, traps, signs
asm/macros/movement.inc
+2
View File
@@ -110,6 +110,8 @@
create_movement step_65
create_movement step_66
create_movement step_67
create_movement step_68
create_movement step_69
enum_start 0x91
create_movement step_91
asm/mail.s
-1041
View File
File diff suppressed because it is too large Load Diff
asm/map_obj_80688E4.s
+3 -3
View File
@@ -82,8 +82,8 @@ _0806896E:
bx r1
thumb_func_end FreezeMapObject
thumb_func_start player_bitmagic
player_bitmagic: @ 8068974
thumb_func_start FreezeEventObjects
FreezeEventObjects: @ 8068974
push {r4,r5,lr}
movs r4, 0
ldr r5, _080689A8 @ =gMapObjects
@@ -114,7 +114,7 @@ _08068998:
.align 2, 0
_080689A8: .4byte gMapObjects
_080689AC: .4byte gPlayerAvatar
thumb_func_end player_bitmagic
thumb_func_end FreezeEventObjects
thumb_func_start FreezeMapObjectsExceptOne
FreezeMapObjectsExceptOne: @ 80689B0
asm/overworld.s
+34 -34
View File
@@ -15,7 +15,7 @@ sub_8054BC8: @ 8054BC8
movs r0, 0xA4
lsls r0, 2
adds r4, r0
bl sub_8054C04
bl ComputeWhiteOutMoneyLoss
adds r1, r0, 0
adds r0, r4, 0
bl RemoveMoney
@@ -31,17 +31,17 @@ _08054BFC: .4byte gUnknown_81A654B
_08054C00: .4byte gSaveBlock1Ptr
thumb_func_end sub_8054BC8
thumb_func_start sub_8054C04
sub_8054C04: @ 8054C04
thumb_func_start ComputeWhiteOutMoneyLoss
ComputeWhiteOutMoneyLoss: @ 8054C04
push {r4,lr}
bl sub_8054C70
bl CountBadgesForOverworldWhiteOutLossCalculation
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
bl GetPlayerPartyHighestLevel
lsls r0, 24
lsrs r0, 24
ldr r1, _08054C40 @ =gUnknown_826D294
ldr r1, _08054C40 @ =sWhiteOutMoneyLossMultipliers
adds r4, r1
ldrb r1, [r4]
lsls r1, 2
@@ -62,14 +62,14 @@ _08054C38:
pop {r1}
bx r1
.align 2, 0
_08054C40: .4byte gUnknown_826D294
_08054C40: .4byte sWhiteOutMoneyLossMultipliers
_08054C44: .4byte gSaveBlock1Ptr
thumb_func_end sub_8054C04
thumb_func_end ComputeWhiteOutMoneyLoss
thumb_func_start sub_8054C48
sub_8054C48: @ 8054C48
thumb_func_start Special_OverworldWhiteOutGetMoneyLoss
Special_OverworldWhiteOutGetMoneyLoss: @ 8054C48
push {r4,r5,lr}
bl sub_8054C04
bl ComputeWhiteOutMoneyLoss
adds r4, r0, 0
ldr r5, _08054C6C @ =gStringVar1
bl CountDigits
@@ -85,14 +85,14 @@ sub_8054C48: @ 8054C48
bx r0
.align 2, 0
_08054C6C: .4byte gStringVar1
thumb_func_end sub_8054C48
thumb_func_end Special_OverworldWhiteOutGetMoneyLoss
thumb_func_start sub_8054C70
sub_8054C70: @ 8054C70
thumb_func_start CountBadgesForOverworldWhiteOutLossCalculation
CountBadgesForOverworldWhiteOutLossCalculation: @ 8054C70
push {r4-r6,lr}
movs r6, 0
movs r5, 0
ldr r4, _08054C9C @ =gUnknown_826D29E
ldr r4, _08054C9C @ =sWhiteOutMoneyLossBadgeFlagIDs
_08054C78:
ldrh r0, [r4]
bl FlagGet
@@ -112,8 +112,8 @@ _08054C8A:
pop {r1}
bx r1
.align 2, 0
_08054C9C: .4byte gUnknown_826D29E
thumb_func_end sub_8054C70
_08054C9C: .4byte sWhiteOutMoneyLossBadgeFlagIDs
thumb_func_end CountBadgesForOverworldWhiteOutLossCalculation
thumb_func_start sub_8054CA0
sub_8054CA0: @ 8054CA0
@@ -749,7 +749,7 @@ warp_shift: @ 8055198
str r0, [r2, 0x4]
str r1, [r2, 0x8]
ldr r2, _080551D0 @ =gUnknown_2031DC4
ldr r0, _080551D4 @ =gUnknown_826D2B0
ldr r0, _080551D4 @ =sDummyWarpData
ldr r1, [r0, 0x4]
ldr r0, [r0]
str r0, [r2]
@@ -763,7 +763,7 @@ _080551C4: .4byte gUnknown_2031DB4
_080551C8: .4byte gSaveBlock1Ptr
_080551CC: .4byte gUnknown_2031DBC
_080551D0: .4byte gUnknown_2031DC4
_080551D4: .4byte gUnknown_826D2B0
_080551D4: .4byte sDummyWarpData
_080551D8: .4byte gUnknown_2031DCC
thumb_func_end warp_shift
@@ -1708,7 +1708,7 @@ sub_8055864: @ 8055864
bl TrySetMapSaveWarpStatus
bl sub_806E110
bl nullsub_74
bl sub_806D7E8
bl RestartWildEncounterImmunitySteps
adds r0, r5, 0
adds r1, r4, 0
bl sub_810C578
@@ -1717,7 +1717,7 @@ sub_8055864: @ 8055864
bl sub_8055CB8
bl sav1_reset_battle_music_maybe
bl mapheader_run_script_with_tag_x3
bl sub_815D8F8
bl TryRegenerateRenewableHiddenItems
bl not_trainer_hill_battle_pyramid
ldr r4, _0805591C @ =gMapHeader
ldr r0, [r4]
@@ -1771,7 +1771,7 @@ sub_8055920: @ 8055920
bl TrySetMapSaveWarpStatus
bl sub_806E110
bl nullsub_74
bl sub_806D7E8
bl RestartWildEncounterImmunitySteps
ldr r0, _080559A0 @ =gSaveBlock1Ptr
ldr r1, [r0]
movs r0, 0x4
@@ -1794,7 +1794,7 @@ _08055974:
bl sub_8055CB8
bl sav1_reset_battle_music_maybe
bl mapheader_run_script_with_tag_x3
bl sub_815D8F8
bl TryRegenerateRenewableHiddenItems
bl UpdateLocationHistoryForRoamer
bl RoamerMoveToOtherLocationSet
bl sub_8110920
@@ -2284,8 +2284,8 @@ _08055D28: .4byte gUnknown_83C68E0
_08055D2C: .4byte gSaveBlock1Ptr
thumb_func_end Overworld_SetFlashLevel
thumb_func_start sav1_get_flash_used_on_map
sav1_get_flash_used_on_map: @ 8055D30
thumb_func_start Overworld_GetFlashLevel
Overworld_GetFlashLevel: @ 8055D30
ldr r0, _08055D3C @ =gSaveBlock1Ptr
ldr r0, [r0]
adds r0, 0x30
@@ -2293,7 +2293,7 @@ sav1_get_flash_used_on_map: @ 8055D30
bx lr
.align 2, 0
_08055D3C: .4byte gSaveBlock1Ptr
thumb_func_end sav1_get_flash_used_on_map
thumb_func_end Overworld_GetFlashLevel
thumb_func_start SetCurrentMapLayout
SetCurrentMapLayout: @ 8055D40
@@ -3293,7 +3293,7 @@ _080564B0:
adds r2, r4, 0
bl sub_805B3E0
_080564BA:
bl sub_811092C
bl RunQuestLogCB
add sp, 0x4
pop {r4-r6}
pop {r0}
@@ -3328,7 +3328,7 @@ sub_80564C8: @ 80564C8
.align 2, 0
_08056508: .4byte gUnknown_3005E90
_0805650C:
bl sub_811092C
bl RunQuestLogCB
b _08056522
_08056512:
bl sub_8111CD0
@@ -3336,7 +3336,7 @@ _08056512:
lsrs r0, 24
cmp r0, 0x1
bne _08056522
bl sub_811092C
bl RunQuestLogCB
_08056522:
ldr r0, _08056530 @ =gUnknown_3005E90
bl sub_806C888
@@ -3522,8 +3522,8 @@ _0805669C: .4byte sub_8056534
_080566A0: .4byte sub_80565B4
thumb_func_end CB2_NewGame
thumb_func_start c2_whiteout
c2_whiteout: @ 80566A4
thumb_func_start CB2_WhiteOut
CB2_WhiteOut: @ 80566A4
push {lr}
sub sp, 0x4
ldr r1, _08056708 @ =gMain
@@ -3569,7 +3569,7 @@ _0805670C: .4byte gFieldCallback
_08056710: .4byte sub_807F5F0
_08056714: .4byte sub_8056534
_08056718: .4byte sub_80565B4
thumb_func_end c2_whiteout
thumb_func_end CB2_WhiteOut
thumb_func_start CB2_LoadMap
CB2_LoadMap: @ 805671C
@@ -3944,7 +3944,7 @@ VBlankCB_Field: @ 8056A14
thumb_func_start sub_8056A34
sub_8056A34: @ 8056A34
push {lr}
bl sav1_get_flash_used_on_map
bl Overworld_GetFlashLevel
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -6964,13 +6964,13 @@ sub_8058214: @ 8058214
thumb_func_start sub_8058230
sub_8058230: @ 8058230
push {lr}
ldr r0, _08058240 @ =gUnknown_81BB9F0
ldr r0, _08058240 @ =EventScript_1BB9F0
bl ScriptContext1_SetupScript
bl ScriptContext2_Enable
pop {r0}
bx r0
.align 2, 0
_08058240: .4byte gUnknown_81BB9F0
_08058240: .4byte EventScript_1BB9F0
thumb_func_end sub_8058230
thumb_func_start sub_8058244
asm/party_menu.s
+31 -31
View File
@@ -4284,7 +4284,7 @@ _08120B64:
lsls r0, 16
lsrs r0, 16
adds r1, r6, 0
bl sub_8120BE8
bl IsMonCompatibleWithMoveTutorMove
lsls r0, 24
cmp r0, 0
bne _08120B80
@@ -4293,7 +4293,7 @@ _08120B7C:
b _08120B9E
_08120B80:
mov r0, r8
bl sub_8120BA8
bl GetMoveTutorMove
_08120B86:
lsls r0, 16
lsrs r1, r0, 16
@@ -4315,8 +4315,8 @@ _08120B9E:
bx r1
thumb_func_end sub_8120B20
thumb_func_start sub_8120BA8
sub_8120BA8: @ 8120BA8
thumb_func_start GetMoveTutorMove
GetMoveTutorMove: @ 8120BA8
push {lr}
lsls r0, 24
lsrs r1, r0, 24
@@ -4333,19 +4333,19 @@ _08120BBC:
b _08120BD6
_08120BC2:
movs r0, 0xA9
lsls r0, 1
lsls r0, 1 @ MOVE_FRENZY_PLANT
b _08120BDE
_08120BC8:
ldr r0, _08120BCC @ =0x00000133
ldr r0, _08120BCC @ =0x00000133 @ MOVE_BLAST_BURN
b _08120BDE
.align 2, 0
_08120BCC: .4byte 0x00000133
_08120BD0:
movs r0, 0x9A
lsls r0, 1
lsls r0, 1 @ MOVE_HYDRO_CANNON
b _08120BDE
_08120BD6:
ldr r0, _08120BE4 @ =gUnknown_8459B60
ldr r0, _08120BE4 @ =gMoveTutorMoves
lsls r1, 1
adds r1, r0
ldrh r0, [r1]
@@ -4353,11 +4353,11 @@ _08120BDE:
pop {r1}
bx r1
.align 2, 0
_08120BE4: .4byte gUnknown_8459B60
thumb_func_end sub_8120BA8
_08120BE4: .4byte gMoveTutorMoves
thumb_func_end GetMoveTutorMove
thumb_func_start sub_8120BE8
sub_8120BE8: @ 8120BE8
thumb_func_start IsMonCompatibleWithMoveTutorMove
IsMonCompatibleWithMoveTutorMove: @ 8120BE8
push {lr}
lsls r0, 16
lsrs r0, 16
@@ -4375,19 +4375,19 @@ _08120C00:
beq _08120C12
b _08120C18
_08120C06:
cmp r0, 0x3
cmp r0, 3 @ SPECIES_VENUSAUR
beq _08120C34
b _08120C2A
_08120C0C:
cmp r0, 0x6
cmp r0, 6 @ SPECIES_CHARIZARD
beq _08120C34
b _08120C2A
_08120C12:
cmp r0, 0x9
cmp r0, 9 @ SPECIES_BLASTOISE
beq _08120C34
b _08120C2A
_08120C18:
ldr r1, _08120C30 @ =gUnknown_8459B7E
ldr r1, _08120C30 @ =gMoveTutorMoveCompatibilityTable
lsls r0, 1
adds r0, r1
ldrh r0, [r0]
@@ -4400,13 +4400,13 @@ _08120C2A:
movs r0, 0
b _08120C36
.align 2, 0
_08120C30: .4byte gUnknown_8459B7E
_08120C30: .4byte gMoveTutorMoveCompatibilityTable
_08120C34:
movs r0, 0x1
_08120C36:
pop {r1}
bx r1
thumb_func_end sub_8120BE8
thumb_func_end IsMonCompatibleWithMoveTutorMove
thumb_func_start sub_8120C3C
sub_8120C3C: @ 8120C3C
@@ -7206,7 +7206,7 @@ party_menu_link_mon_icon_anim: @ 812224C
lsrs r7, r3, 24
cmp r5, 0
beq _0812229A
ldr r1, _081222A4 @ =sub_809718C
ldr r1, _081222A4 @ =SpriteCB_MonIcon
ldr r0, [r4, 0x4]
ldrb r2, [r0]
ldrb r3, [r0, 0x1]
@@ -7240,7 +7240,7 @@ _0812229A:
pop {r0}
bx r0
.align 2, 0
_081222A4: .4byte sub_809718C
_081222A4: .4byte SpriteCB_MonIcon
_081222A8: .4byte gSprites
thumb_func_end party_menu_link_mon_icon_anim
@@ -7276,7 +7276,7 @@ _081222D4:
ldr r1, _081222F0 @ =gSprites
adds r0, r1
movs r1, 0
bl sub_8097414
bl MonIcon_SetAnim
b _0812234C
.align 2, 0
_081222F0: .4byte gSprites
@@ -7287,7 +7287,7 @@ _081222F4:
ldr r1, _08122308 @ =gSprites
adds r0, r1
movs r1, 0x1
bl sub_8097414
bl MonIcon_SetAnim
b _0812234C
.align 2, 0
_08122308: .4byte gSprites
@@ -7298,7 +7298,7 @@ _0812230C:
ldr r1, _08122320 @ =gSprites
adds r0, r1
movs r1, 0x2
bl sub_8097414
bl MonIcon_SetAnim
b _0812234C
.align 2, 0
_08122320: .4byte gSprites
@@ -7309,7 +7309,7 @@ _08122324:
ldr r1, _08122338 @ =gSprites
adds r0, r1
movs r1, 0x3
bl sub_8097414
bl MonIcon_SetAnim
b _0812234C
.align 2, 0
_08122338: .4byte gSprites
@@ -7320,7 +7320,7 @@ _0812233C:
ldr r1, _08122354 @ =gSprites
adds r0, r1
movs r1, 0x4
bl sub_8097414
bl MonIcon_SetAnim
_0812234C:
pop {r4}
pop {r0}
@@ -10642,7 +10642,7 @@ sub_8123D84: @ 8123D84
adds r0, r1
ldr r1, _08123DC8 @ =sub_8123DCC
movs r2, 0x1
bl sub_80BEBEC
bl ReadMail
pop {r0}
bx r0
.align 2, 0
@@ -15699,7 +15699,7 @@ sub_8126704: @ 8126704
cmp r4, 0
beq _08126754
bl sub_811F070
ldr r0, _08126750 @ =gUnknown_300537C
ldr r0, _08126750 @ =gCB2_AfterEvolution
ldr r1, [r6]
str r1, [r0]
ldrb r3, [r6, 0x9]
@@ -15713,7 +15713,7 @@ sub_8126704: @ 8126704
.align 2, 0
_08126748: .4byte gUnknown_203B0A0
_0812674C: .4byte gPlayerParty
_08126750: .4byte gUnknown_300537C
_08126750: .4byte gCB2_AfterEvolution
_08126754:
ldr r0, _08126768 @ =gTasks
lsls r1, r5, 2
@@ -16248,7 +16248,7 @@ _08126BCE:
thumb_func_start sub_8126BD4
sub_8126BD4: @ 8126BD4
push {r4,r5,lr}
ldr r1, _08126C10 @ =gUnknown_300537C
ldr r1, _08126C10 @ =gCB2_AfterEvolution
ldr r4, _08126C14 @ =gUnknown_203B0A0
ldr r0, [r4]
str r0, [r1]
@@ -16274,7 +16274,7 @@ sub_8126BD4: @ 8126BD4
pop {r0}
bx r0
.align 2, 0
_08126C10: .4byte gUnknown_300537C
_08126C10: .4byte gCB2_AfterEvolution
_08126C14: .4byte gUnknown_203B0A0
_08126C18: .4byte gSpecialVar_ItemId
_08126C1C: .4byte gPlayerParty
@@ -16549,7 +16549,7 @@ sub_8126DC8: @ 8126DC8
bl GetMonNickname
ldr r4, _08126E5C @ =gSpecialVar_0x8005
ldrb r0, [r4]
bl sub_8120BA8
bl GetMoveTutorMove
strh r0, [r7, 0xE]
ldr r0, _08126E60 @ =gStringVar2
movs r1, 0xE
asm/pokemon_icon.s
-848
View File
@@ -1,848 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start CreateMonIcon
CreateMonIcon: @ 8096E18
push {r4-r7,lr}
mov r7, r9
mov r6, r8
push {r6,r7}
sub sp, 0x30
adds r4, r0, 0
adds r6, r1, 0
ldr r0, [sp, 0x4C]
ldr r1, [sp, 0x50]
ldr r5, [sp, 0x54]
lsls r4, 16
lsrs r4, 16
lsls r2, 16
lsrs r2, 16
mov r8, r2
lsls r3, 16
lsrs r7, r3, 16
lsls r0, 24
lsrs r0, 24
mov r9, r0
ldr r0, _08096EB4 @ =gUnknown_83D4068
str r0, [sp, 0x18]
adds r0, r4, 0
adds r2, r5, 0
bl GetMonIconPtr
str r0, [sp, 0x1C]
ldr r0, _08096EB8 @ =gUnknown_83D40AC
str r0, [sp, 0x20]
ldr r0, _08096EBC @ =gUnknown_83D40E0
str r0, [sp, 0x24]
str r6, [sp, 0x28]
ldr r0, _08096EC0 @ =gUnknown_83D3E80
adds r0, r4, r0
ldr r1, _08096EC4 @ =0x0000dac0
adds r5, r1, 0
ldrb r0, [r0]
adds r1, r5, r0
add r0, sp, 0x2C
strh r1, [r0]
add r1, sp, 0x18
mov r0, sp
movs r2, 0x18
bl memcpy
movs r0, 0xCE
lsls r0, 1
cmp r4, r0
bls _08096E7E
mov r0, sp
strh r5, [r0, 0x14]
_08096E7E:
mov r0, r8
lsls r1, r0, 16
asrs r1, 16
lsls r2, r7, 16
asrs r2, 16
mov r0, sp
mov r3, r9
bl CreateMonIconSprite
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
lsls r0, r4, 4
adds r0, r4
lsls r0, 2
ldr r1, _08096EC8 @ =gSprites
adds r0, r1
bl UpdateMonIconFrame
adds r0, r4, 0
add sp, 0x30
pop {r3,r4}
mov r8, r3
mov r9, r4
pop {r4-r7}
pop {r1}
bx r1
.align 2, 0
_08096EB4: .4byte gUnknown_83D4068
_08096EB8: .4byte gUnknown_83D40AC
_08096EBC: .4byte gUnknown_83D40E0
_08096EC0: .4byte gUnknown_83D3E80
_08096EC4: .4byte 0x0000dac0
_08096EC8: .4byte gSprites
thumb_func_end CreateMonIcon
thumb_func_start sub_8096ECC
sub_8096ECC: @ 8096ECC
push {r4-r7,lr}
sub sp, 0x18
adds r4, r2, 0
adds r5, r3, 0
ldr r6, [sp, 0x2C]
lsls r0, 16
lsrs r0, 16
lsls r4, 16
lsrs r4, 16
lsls r5, 16
lsrs r5, 16
lsls r6, 24
lsrs r6, 24
mov r3, sp
ldr r2, _08096F44 @ =gUnknown_83D4068
str r2, [sp]
movs r2, 0
str r2, [sp, 0x4]
ldr r2, _08096F48 @ =gUnknown_83D40AC
str r2, [sp, 0x8]
ldr r2, _08096F4C @ =gUnknown_83D40E0
str r2, [sp, 0xC]
str r1, [sp, 0x10]
ldr r2, _08096F50 @ =gUnknown_83D3E80
adds r2, r0, r2
ldr r7, _08096F54 @ =0x0000dac0
adds r1, r7, 0
ldrb r2, [r2]
adds r1, r2
strh r1, [r3, 0x14]
ldr r1, [sp, 0x30]
bl sub_8097028
str r0, [sp, 0x4]
lsls r4, 16
asrs r4, 16
lsls r5, 16
asrs r5, 16
mov r0, sp
adds r1, r4, 0
adds r2, r5, 0
adds r3, r6, 0
bl CreateMonIconSprite
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
lsls r0, r4, 4
adds r0, r4
lsls r0, 2
ldr r1, _08096F58 @ =gSprites
adds r0, r1
bl UpdateMonIconFrame
adds r0, r4, 0
add sp, 0x18
pop {r4-r7}
pop {r1}
bx r1
.align 2, 0
_08096F44: .4byte gUnknown_83D4068
_08096F48: .4byte gUnknown_83D40AC
_08096F4C: .4byte gUnknown_83D40E0
_08096F50: .4byte gUnknown_83D3E80
_08096F54: .4byte 0x0000dac0
_08096F58: .4byte gSprites
thumb_func_end sub_8096ECC
thumb_func_start mon_icon_convert_unown_species_id
mon_icon_convert_unown_species_id: @ 8096F5C
push {lr}
lsls r0, 16
lsrs r2, r0, 16
cmp r2, 0xC9
bne _08096F86
adds r0, r1, 0
bl GetUnownLetterByPersonality
lsls r0, 16
lsrs r0, 16
cmp r0, 0
bne _08096F78
movs r0, 0xC9
b _08096F82
_08096F78:
movs r1, 0xCE
lsls r1, 1
adds r0, r1
lsls r0, 16
lsrs r0, 16
_08096F82:
adds r1, r0, 0
b _08096F92
_08096F86:
movs r0, 0xCE
lsls r0, 1
adds r1, r2, 0
cmp r1, r0
bls _08096F92
movs r1, 0
_08096F92:
adds r0, r1, 0
pop {r1}
bx r1
thumb_func_end mon_icon_convert_unown_species_id
thumb_func_start GetUnownLetterByPersonality
GetUnownLetterByPersonality: @ 8096F98
push {lr}
adds r2, r0, 0
cmp r2, 0
beq _08096FCE
movs r0, 0xC0
lsls r0, 18
ands r0, r2
lsrs r0, 18
movs r1, 0xC0
lsls r1, 10
ands r1, r2
lsrs r1, 12
orrs r0, r1
movs r1, 0xC0
lsls r1, 2
ands r1, r2
lsrs r1, 6
orrs r0, r1
movs r1, 0x3
ands r1, r2
orrs r0, r1
movs r1, 0x1C
bl __umodsi3
lsls r0, 16
lsrs r0, 16
b _08096FD0
_08096FCE:
movs r0, 0
_08096FD0:
pop {r1}
bx r1
thumb_func_end GetUnownLetterByPersonality
thumb_func_start sub_8096FD4
sub_8096FD4: @ 8096FD4
push {r4,lr}
sub sp, 0x4
lsls r0, 16
lsrs r4, r0, 16
adds r0, r4, 0
mov r1, sp
bl MailSpeciesToSpecies
lsls r0, 16
lsrs r0, 16
cmp r0, 0xC9
bne _0809700A
mov r0, sp
ldrh r0, [r0]
cmp r0, 0
bne _08096FFA
mov r1, sp
adds r0, 0xC9
b _08097002
_08096FFA:
mov r1, sp
movs r2, 0xCE
lsls r2, 1
adds r0, r2
_08097002:
strh r0, [r1]
mov r0, sp
ldrh r0, [r0]
b _08097020
_0809700A:
movs r0, 0xCE
lsls r0, 1
cmp r4, r0
bls _08097014
movs r4, 0
_08097014:
adds r0, r4, 0
movs r1, 0
bl mon_icon_convert_unown_species_id
lsls r0, 16
lsrs r0, 16
_08097020:
add sp, 0x4
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_8096FD4
thumb_func_start sub_8097028
sub_8097028: @ 8097028
push {lr}
adds r3, r1, 0
lsls r0, 16
lsrs r0, 16
ldr r2, _08097050 @ =gUnknown_83D37A0
lsls r1, r0, 2
adds r1, r2
ldr r2, [r1]
movs r1, 0xCD
lsls r1, 1
cmp r0, r1
bne _0809704A
cmp r3, 0x1
bne _0809704A
movs r0, 0x80
lsls r0, 3
adds r2, r0
_0809704A:
adds r0, r2, 0
pop {r1}
bx r1
.align 2, 0
_08097050: .4byte gUnknown_83D37A0
thumb_func_end sub_8097028
thumb_func_start GetMonIconPtr
GetMonIconPtr: @ 8097054
push {r4,lr}
adds r4, r2, 0
lsls r0, 16
lsrs r0, 16
bl mon_icon_convert_unown_species_id
lsls r0, 16
lsrs r0, 16
adds r1, r4, 0
bl sub_8097028
pop {r4}
pop {r1}
bx r1
thumb_func_end GetMonIconPtr
thumb_func_start sub_8097070
sub_8097070: @ 8097070
push {lr}
bl sub_80973D8
pop {r0}
bx r0
thumb_func_end sub_8097070
thumb_func_start LoadMonIconPalettes
LoadMonIconPalettes: @ 809707C
push {r4,r5,lr}
movs r4, 0
ldr r5, _0809709C @ =gUnknown_83D4038
_08097082:
lsls r0, r4, 3
adds r0, r5
bl LoadSpritePalette
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x5
bls _08097082
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_0809709C: .4byte gUnknown_83D4038
thumb_func_end LoadMonIconPalettes
thumb_func_start SafeLoadMonIconPalette
SafeLoadMonIconPalette: @ 80970A0
push {r4,lr}
lsls r0, 16
lsrs r1, r0, 16
movs r0, 0xCE
lsls r0, 1
cmp r1, r0
bls _080970B0
movs r1, 0
_080970B0:
ldr r0, _080970D8 @ =gUnknown_83D3E80
adds r0, r1, r0
ldrb r0, [r0]
ldr r1, _080970DC @ =gUnknown_83D4038
lsls r0, 3
adds r4, r0, r1
ldrh r0, [r4, 0x4]
bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
bne _080970D0
adds r0, r4, 0
bl LoadSpritePalette
_080970D0:
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080970D8: .4byte gUnknown_83D3E80
_080970DC: .4byte gUnknown_83D4038
thumb_func_end SafeLoadMonIconPalette
thumb_func_start sub_80970E0
sub_80970E0: @ 80970E0
push {r4,lr}
lsls r0, 16
lsrs r0, 16
ldr r1, _0809710C @ =gUnknown_83D3E80
adds r0, r1
ldrb r0, [r0]
ldr r1, _08097110 @ =gUnknown_83D4038
lsls r0, 3
adds r4, r0, r1
ldrh r0, [r4, 0x4]
bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
bne _08097106
adds r0, r4, 0
bl LoadSpritePalette
_08097106:
pop {r4}
pop {r0}
bx r0
.align 2, 0
_0809710C: .4byte gUnknown_83D3E80
_08097110: .4byte gUnknown_83D4038
thumb_func_end sub_80970E0
thumb_func_start FreeMonIconPalettes
FreeMonIconPalettes: @ 8097114
push {r4,r5,lr}
movs r4, 0
ldr r5, _08097134 @ =gUnknown_83D4038
_0809711A:
lsls r0, r4, 3
adds r0, r5
ldrh r0, [r0, 0x4]
bl FreeSpritePaletteByTag
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x5
bls _0809711A
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_08097134: .4byte gUnknown_83D4038
thumb_func_end FreeMonIconPalettes
thumb_func_start sub_8097138
sub_8097138: @ 8097138
push {lr}
lsls r0, 16
lsrs r1, r0, 16
movs r0, 0xCE
lsls r0, 1
cmp r1, r0
bls _08097148
movs r1, 0
_08097148:
ldr r0, _08097160 @ =gUnknown_83D3E80
adds r0, r1, r0
ldrb r0, [r0]
ldr r1, _08097164 @ =gUnknown_83D4038
lsls r0, 3
adds r0, r1
ldrh r0, [r0, 0x4]
bl FreeSpritePaletteByTag
pop {r0}
bx r0
.align 2, 0
_08097160: .4byte gUnknown_83D3E80
_08097164: .4byte gUnknown_83D4038
thumb_func_end sub_8097138
thumb_func_start sub_8097168
sub_8097168: @ 8097168
push {lr}
lsls r0, 16
lsrs r0, 16
ldr r1, _08097184 @ =gUnknown_83D3E80
adds r0, r1
ldrb r0, [r0]
ldr r1, _08097188 @ =gUnknown_83D4038
lsls r0, 3
adds r0, r1
ldrh r0, [r0, 0x4]
bl FreeSpritePaletteByTag
pop {r0}
bx r0
.align 2, 0
_08097184: .4byte gUnknown_83D3E80
_08097188: .4byte gUnknown_83D4038
thumb_func_end sub_8097168
thumb_func_start sub_809718C
sub_809718C: @ 809718C
push {lr}
bl UpdateMonIconFrame
pop {r0}
bx r0
thumb_func_end sub_809718C
thumb_func_start sub_8097198
sub_8097198: @ 8097198
push {r4-r6,lr}
lsls r0, 16
lsrs r4, r0, 16
cmp r4, 0xA0
bhi _080971C0
ldr r6, _080971C8 @ =gUnknown_83D4038
movs r5, 0x5
_080971A6:
ldr r0, [r6]
adds r1, r4, 0
movs r2, 0x20
bl LoadPalette
adds r0, r4, 0
adds r0, 0x10
lsls r0, 16
lsrs r4, r0, 16
adds r6, 0x8
subs r5, 0x1
cmp r5, 0
bge _080971A6
_080971C0:
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_080971C8: .4byte gUnknown_83D4038
thumb_func_end sub_8097198
thumb_func_start GetValidMonIconPalettePtr
GetValidMonIconPalettePtr: @ 80971CC
push {lr}
lsls r0, 16
lsrs r2, r0, 16
movs r0, 0xCE
lsls r0, 1
cmp r2, r0
bls _080971DC
movs r2, 0
_080971DC:
ldr r1, _080971F0 @ =gUnknown_83D4038
ldr r0, _080971F4 @ =gUnknown_83D3E80
adds r0, r2, r0
ldrb r0, [r0]
lsls r0, 3
adds r0, r1
ldr r0, [r0]
pop {r1}
bx r1
.align 2, 0
_080971F0: .4byte gUnknown_83D4038
_080971F4: .4byte gUnknown_83D3E80
thumb_func_end GetValidMonIconPalettePtr
thumb_func_start sub_80971F8
sub_80971F8: @ 80971F8
push {lr}
lsls r0, 16
lsrs r1, r0, 16
movs r0, 0xCE
lsls r0, 1
cmp r1, r0
bls _08097208
movs r1, 0
_08097208:
ldr r0, _08097214 @ =gUnknown_83D3E80
adds r0, r1, r0
ldrb r0, [r0]
pop {r1}
bx r1
.align 2, 0
_08097214: .4byte gUnknown_83D3E80
thumb_func_end sub_80971F8
thumb_func_start sub_8097218
sub_8097218: @ 8097218
lsls r0, 16
lsrs r0, 16
ldr r1, _08097224 @ =gUnknown_83D3E80
adds r0, r1
ldrb r0, [r0]
bx lr
.align 2, 0
_08097224: .4byte gUnknown_83D3E80
thumb_func_end sub_8097218
thumb_func_start UpdateMonIconFrame
UpdateMonIconFrame: @ 8097228
push {r4-r7,lr}
mov r7, r9
mov r6, r8
push {r6,r7}
adds r4, r0, 0
movs r7, 0
adds r6, r4, 0
adds r6, 0x2C
ldrb r2, [r6]
movs r0, 0x3F
mov r9, r0
ands r0, r2
cmp r0, 0
bne _080972DC
movs r1, 0x2A
adds r1, r4
mov r8, r1
ldrb r1, [r1]
ldr r0, [r4, 0x8]
lsls r1, 2
adds r1, r0
adds r5, r4, 0
adds r5, 0x2B
ldrb r0, [r5]
ldr r1, [r1]
lsls r0, 2
adds r0, r1
movs r1, 0
ldrsh r3, [r0, r1]
movs r0, 0x2
negs r0, r0
cmp r3, r0
beq _08097272
adds r0, 0x1
cmp r3, r0
bne _08097276
b _080972F0
_08097272:
strb r7, [r5]
b _080972F0
_08097276:
ldr r2, _080972D4 @ =gUnknown_83D40E8
ldrb r1, [r4, 0x3]
lsrs r1, 6
lsls r1, 1
ldrb r0, [r4, 0x1]
lsrs r0, 6
lsls r0, 3
adds r1, r0
adds r1, r2
ldrh r2, [r1]
adds r1, r2, 0
muls r1, r3
ldr r0, [r4, 0xC]
adds r0, r1
ldrh r1, [r4, 0x4]
lsls r1, 22
lsrs r1, 17
ldr r3, _080972D8 @ =0x06010000
adds r1, r3
bl RequestSpriteCopy
mov r0, r8
ldrb r1, [r0]
ldr r0, [r4, 0x8]
lsls r1, 2
adds r1, r0
ldrb r0, [r5]
ldr r1, [r1]
lsls r0, 2
adds r0, r1
ldr r0, [r0]
lsls r0, 10
lsrs r0, 26
mov r1, r9
ands r1, r0
ldrb r2, [r6]
movs r0, 0x40
negs r0, r0
ands r0, r2
orrs r0, r1
strb r0, [r6]
ldrb r0, [r5]
adds r0, 0x1
strb r0, [r5]
ldrb r7, [r5]
b _080972F0
.align 2, 0
_080972D4: .4byte gUnknown_83D40E8
_080972D8: .4byte 0x06010000
_080972DC:
lsls r0, r2, 26
lsrs r0, 26
subs r0, 0x1
movs r1, 0x3F
ands r0, r1
movs r1, 0x40
negs r1, r1
ands r1, r2
orrs r1, r0
strb r1, [r6]
_080972F0:
adds r0, r7, 0
pop {r3,r4}
mov r8, r3
mov r9, r4
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end UpdateMonIconFrame
thumb_func_start CreateMonIconSprite
CreateMonIconSprite: @ 8097300
push {r4-r6,lr}
mov r6, r9
mov r5, r8
push {r5,r6}
sub sp, 0x38
mov r9, r0
adds r4, r1, 0
adds r5, r2, 0
mov r8, r3
lsls r4, 16
lsrs r4, 16
lsls r5, 16
lsrs r5, 16
mov r0, r8
lsls r0, 24
lsrs r0, 24
mov r8, r0
movs r0, 0
str r0, [sp, 0x30]
ldr r2, _080973C8 @ =gUnknown_83D40E8
mov r0, r9
ldr r6, [r0]
ldrb r1, [r6, 0x3]
lsrs r1, 6
lsls r1, 1
ldrb r0, [r6, 0x1]
lsrs r0, 6
lsls r0, 3
adds r1, r0
adds r1, r2
ldrh r2, [r1]
ldr r1, _080973CC @ =0xffff0000
add r3, sp, 0x30
ldr r0, [r3, 0x4]
ands r0, r1
orrs r0, r2
str r0, [r3, 0x4]
add r1, sp, 0x18
ldr r0, _080973D0 @ =0x0000ffff
strh r0, [r1]
mov r0, r9
ldrh r2, [r0, 0x14]
mov r0, sp
adds r0, 0x1A
strh r2, [r0]
str r6, [sp, 0x1C]
mov r2, r9
ldr r0, [r2, 0x8]
str r0, [sp, 0x20]
str r3, [sp, 0x24]
ldr r0, [r2, 0xC]
str r0, [sp, 0x28]
ldr r0, [r2, 0x10]
str r0, [sp, 0x2C]
mov r0, sp
movs r2, 0x18
bl memcpy
lsls r4, 16
asrs r4, 16
lsls r5, 16
asrs r5, 16
mov r0, sp
adds r1, r4, 0
adds r2, r5, 0
mov r3, r8
bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r6, _080973D4 @ =gSprites
lsls r3, r0, 4
adds r3, r0
lsls r3, 2
adds r4, r3, r6
adds r5, r4, 0
adds r5, 0x2C
ldrb r1, [r5]
movs r2, 0x40
orrs r1, r2
strb r1, [r5]
adds r4, 0x3F
ldrb r2, [r4]
movs r1, 0x5
negs r1, r1
ands r1, r2
strb r1, [r4]
adds r6, 0xC
adds r3, r6
mov r2, r9
ldr r1, [r2, 0x4]
str r1, [r3]
add sp, 0x38
pop {r3,r4}
mov r8, r3
mov r9, r4
pop {r4-r6}
pop {r1}
bx r1
.align 2, 0
_080973C8: .4byte gUnknown_83D40E8
_080973CC: .4byte 0xffff0000
_080973D0: .4byte 0x0000ffff
_080973D4: .4byte gSprites
thumb_func_end CreateMonIconSprite
thumb_func_start sub_80973D8
sub_80973D8: @ 80973D8
push {lr}
sub sp, 0x8
movs r1, 0
str r1, [sp]
ldr r3, _0809740C @ =gUnknown_83D40E8
ldrb r2, [r0, 0x3]
lsrs r2, 6
lsls r2, 1
ldrb r1, [r0, 0x1]
lsrs r1, 6
lsls r1, 3
adds r2, r1
adds r2, r3
ldrh r3, [r2]
ldr r2, _08097410 @ =0xffff0000
ldr r1, [sp, 0x4]
ands r1, r2
orrs r1, r3
str r1, [sp, 0x4]
mov r1, sp
str r1, [r0, 0xC]
bl DestroySprite
add sp, 0x8
pop {r0}
bx r0
.align 2, 0
_0809740C: .4byte gUnknown_83D40E8
_08097410: .4byte 0xffff0000
thumb_func_end sub_80973D8
thumb_func_start sub_8097414
sub_8097414: @ 8097414
mov r12, r0
adds r0, 0x2A
movs r3, 0
strb r1, [r0]
mov r2, r12
adds r2, 0x2C
ldrb r1, [r2]
movs r0, 0x40
negs r0, r0
ands r0, r1
strb r0, [r2]
mov r0, r12
adds r0, 0x2B
strb r3, [r0]
bx lr
thumb_func_end sub_8097414
.align 2, 0 @ Don't pad with nop.
asm/pokemon_size_record.s
+12 -12
View File
@@ -323,8 +323,8 @@ sub_80A0904: @ 80A0904
_080A0914: .4byte 0x0000403d
thumb_func_end sub_80A0904
thumb_func_start sub_80A0918
sub_80A0918: @ 80A0918
thumb_func_start GetHeracrossSizeRecordInfo
GetHeracrossSizeRecordInfo: @ 80A0918
push {lr}
ldr r0, _080A092C @ =0x0000403d
bl GetVarPointer
@@ -335,10 +335,10 @@ sub_80A0918: @ 80A0918
bx r0
.align 2, 0
_080A092C: .4byte 0x0000403d
thumb_func_end sub_80A0918
thumb_func_end GetHeracrossSizeRecordInfo
thumb_func_start sub_80A0930
sub_80A0930: @ 80A0930
thumb_func_start CompareHeracrossSize
CompareHeracrossSize: @ 80A0930
push {r4,lr}
ldr r0, _080A0950 @ =0x0000403d
bl GetVarPointer
@@ -355,7 +355,7 @@ sub_80A0930: @ 80A0930
.align 2, 0
_080A0950: .4byte 0x0000403d
_080A0954: .4byte gSpecialVar_Result
thumb_func_end sub_80A0930
thumb_func_end CompareHeracrossSize
thumb_func_start sub_80A0958
sub_80A0958: @ 80A0958
@@ -369,8 +369,8 @@ sub_80A0958: @ 80A0958
_080A0968: .4byte 0x00004040
thumb_func_end sub_80A0958
thumb_func_start sub_80A096C
sub_80A096C: @ 80A096C
thumb_func_start GetMagikarpSizeRecordInfo
GetMagikarpSizeRecordInfo: @ 80A096C
push {lr}
ldr r0, _080A0980 @ =0x00004040
bl GetVarPointer
@@ -381,10 +381,10 @@ sub_80A096C: @ 80A096C
bx r0
.align 2, 0
_080A0980: .4byte 0x00004040
thumb_func_end sub_80A096C
thumb_func_end GetMagikarpSizeRecordInfo
thumb_func_start sub_80A0984
sub_80A0984: @ 80A0984
thumb_func_start CompareMagikarpSize
CompareMagikarpSize: @ 80A0984
push {r4,lr}
ldr r0, _080A09A4 @ =0x00004040
bl GetVarPointer
@@ -401,7 +401,7 @@ sub_80A0984: @ 80A0984
.align 2, 0
_080A09A4: .4byte 0x00004040
_080A09A8: .4byte gSpecialVar_Result
thumb_func_end sub_80A0984
thumb_func_end CompareMagikarpSize
thumb_func_start GiveGiftRibbonToParty
GiveGiftRibbonToParty: @ 80A09AC
asm/pokemon_storage_system.s
+9 -9
View File
@@ -1751,8 +1751,8 @@ _0808C69C:
_0808C6A4: .4byte gPaletteFade
thumb_func_end c3_0808C39C
thumb_func_start sub_808C6A8
sub_808C6A8: @ 808C6A8
thumb_func_start ShowPokemonStorageSystem
ShowPokemonStorageSystem: @ 808C6A8
push {lr}
ldr r0, _0808C6D0 @ =c3_0808C39C
movs r1, 0x50
@@ -1773,7 +1773,7 @@ sub_808C6A8: @ 808C6A8
.align 2, 0
_0808C6D0: .4byte c3_0808C39C
_0808C6D4: .4byte gTasks
thumb_func_end sub_808C6A8
thumb_func_end ShowPokemonStorageSystem
thumb_func_start mapldr_0808C6D8
mapldr_0808C6D8: @ 808C6D8
@@ -11179,7 +11179,7 @@ _08091248:
lsrs r4, 16
adds r0, r3, 0
movs r1, 0x1
bl sub_8097028
bl GetMonIconTiles
lsls r1, r4, 5
ldr r2, _08091288 @ =0x06010000
adds r1, r2
@@ -11271,11 +11271,11 @@ sub_80912E0: @ 80912E0
ldm r0!, {r3,r5,r7}
stm r2!, {r3,r5,r7}
adds r0, r6, 0
bl mon_icon_convert_unown_species_id
bl GetIconSpecies
mov r10, r0
mov r6, r10
mov r2, sp
ldr r1, _08091394 @ =gUnknown_83D3E80
ldr r1, _08091394 @ =gMonIconPaletteIndices
adds r1, r6, r1
ldr r3, _08091398 @ =0x0000dac0
adds r0, r3, 0
@@ -11329,7 +11329,7 @@ sub_80912E0: @ 80912E0
b _080913B4
.align 2, 0
_08091390: .4byte gUnknown_83CEBF0
_08091394: .4byte gUnknown_83D3E80
_08091394: .4byte gMonIconPaletteIndices
_08091398: .4byte 0x0000dac0
_0809139C: .4byte 0x0000ffff
_080913A0: .4byte gSprites
@@ -19235,7 +19235,7 @@ _0809515A:
movs r0, 0
bl HideBg
movs r0, 0x80
bl sub_8097198
bl LoadMonIconPalettesAt
b _080951F8
_08095168:
adds r0, r1, 0x2
@@ -19954,7 +19954,7 @@ sub_80956A4: @ 80956A4
bl GetMonIconPtr
adds r4, r0, 0
adds r0, r5, 0
bl sub_80971F8
bl GetValidMonIconPalIndex
adds r0, 0x8
lsls r0, 24
lsrs r0, 24
asm/pokemon_summary_screen.s
+9 -9
View File
@@ -4033,13 +4033,13 @@ _081366B8:
adds r0, r1
movs r1, 0xD
muls r1, r4
ldr r2, _081367A0 @ =gUnknown_824FC40
ldr r2, _081367A0 @ =gAbilityNames
adds r1, r2
bl StringCopy
ldr r0, [r6]
ldr r2, _081367A4 @ =0x000031cc
adds r0, r2
ldr r1, _081367A8 @ =gUnknown_824FB08
ldr r1, _081367A8 @ =gAbilityDescriptionPointers
lsls r4, 2
adds r4, r1
ldr r1, [r4]
@@ -4088,9 +4088,9 @@ _08136790: .4byte gExperienceTables
_08136794: .4byte gBaseStats
_08136798: .4byte 0x000031b0
_0813679C: .4byte 0x000031bc
_081367A0: .4byte gUnknown_824FC40
_081367A0: .4byte gAbilityNames
_081367A4: .4byte 0x000031cc
_081367A8: .4byte gUnknown_824FB08
_081367A8: .4byte gAbilityDescriptionPointers
_081367AC: .4byte 0x0000326c
thumb_func_end sub_8136350
@@ -6470,7 +6470,7 @@ _08137B1C:
str r1, [sp, 0x4]
str r6, [sp, 0x8]
str r5, [sp, 0xC]
ldr r3, _08137BC8 @ =gUnknown_84886E8
ldr r3, _08137BC8 @ =gMoveDescriptionPointers
mov r4, r8
ldrb r1, [r4]
lsls r1, 1
@@ -6502,7 +6502,7 @@ _08137BB8: .4byte 0x00003004
_08137BBC: .4byte gUnknown_8463FA4
_08137BC0: .4byte 0x0000316c
_08137BC4: .4byte 0x00003188
_08137BC8: .4byte gUnknown_84886E8
_08137BC8: .4byte gMoveDescriptionPointers
_08137BCC: .4byte 0x00003258
thumb_func_end sub_8137AF8
@@ -7652,7 +7652,7 @@ _081384C4: .4byte gEnemyParty
_081384C8: .4byte gLinkPlayers
_081384CC: .4byte 0x0000304c
_081384D0:
bl sub_80CC1E4
bl GetPlayerTrainerId
adds r4, r0, 0
ldr r0, _0813851C @ =0x0000ffff
ands r4, r0
@@ -10916,7 +10916,7 @@ sub_8139F20: @ 8139F20
bl GetMonData
lsls r0, 16
lsrs r0, 16
bl sub_8097138
bl SafeFreeMonIconPalette
ldr r0, [r4]
ldr r1, _08139F5C @ =0x00003014
adds r0, r1
@@ -10926,7 +10926,7 @@ sub_8139F20: @ 8139F20
lsls r0, 2
ldr r1, _08139F60 @ =gSprites
adds r0, r1
bl sub_8097070
bl DestroyMonIcon
pop {r4}
pop {r0}
bx r0
asm/post_battle_event_funcs.s
+5 -5
View File
@@ -106,16 +106,16 @@ _080CA3BC: .4byte 0x0000083b
_080CA3C0: .4byte CB2_DoHallOfFameScreen
thumb_func_end Special_HallOfFame
thumb_func_start sub_80CA3C4
sub_80CA3C4: @ 80CA3C4
thumb_func_start sp0C8_whiteout_maybe
sp0C8_whiteout_maybe: @ 80CA3C4
push {lr}
ldr r0, _080CA3D4 @ =c2_whiteout
ldr r0, _080CA3D4 @ =CB2_WhiteOut
bl SetMainCallback2
movs r0, 0
pop {r1}
bx r1
.align 2, 0
_080CA3D4: .4byte c2_whiteout
thumb_func_end sub_80CA3C4
_080CA3D4: .4byte CB2_WhiteOut
thumb_func_end sp0C8_whiteout_maybe
.align 2, 0 @ Don't pad with nop.
asm/script_menu.s
-2058
View File
File diff suppressed because it is too large Load Diff
asm/script_pokemon_util_80A0058.s
+7 -7
View File
@@ -420,8 +420,8 @@ _080A0378: .4byte gSpecialVar_Result
_080A037C: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
thumb_func_end sub_80A0350
thumb_func_start sub_80A0380
sub_80A0380: @ 80A0380
thumb_func_start ChooseBattleTowerPlayerParty
ChooseBattleTowerPlayerParty: @ 80A0380
push {lr}
ldr r1, _080A0394 @ =gMain
ldr r0, _080A0398 @ =sub_80A039C
@@ -433,7 +433,7 @@ sub_80A0380: @ 80A0380
.align 2, 0
_080A0394: .4byte gMain
_080A0398: .4byte sub_80A039C
thumb_func_end sub_80A0380
thumb_func_end ChooseBattleTowerPlayerParty
thumb_func_start sub_80A039C
sub_80A039C: @ 80A039C
@@ -450,7 +450,7 @@ sub_80A039C: @ 80A039C
_080A03B0: .4byte gUnknown_203B0D4
_080A03B4: .4byte gSpecialVar_Result
_080A03B8:
bl sub_80A03D8
bl ReducePlayerPartyToThree
ldr r1, _080A03D0 @ =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
@@ -465,8 +465,8 @@ _080A03D0: .4byte gSpecialVar_Result
_080A03D4: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
thumb_func_end sub_80A039C
thumb_func_start sub_80A03D8
sub_80A03D8: @ 80A03D8
thumb_func_start ReducePlayerPartyToThree
ReducePlayerPartyToThree: @ 80A03D8
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -530,6 +530,6 @@ _080A042C:
_080A0454: .4byte gPlayerParty
_080A0458: .4byte gUnknown_203B0D4
_080A045C: .4byte 0x05000096
thumb_func_end sub_80A03D8
thumb_func_end ReducePlayerPartyToThree
.align 2, 0 @ Don't pad with nop.
asm/script_pokemon_util_80BF8FC.s
+15 -15
View File
@@ -5,8 +5,8 @@
.text
thumb_func_start sub_80BF8FC
sub_80BF8FC: @ 80BF8FC
thumb_func_start Special_ChooseMonFromParty
Special_ChooseMonFromParty: @ 80BF8FC
push {lr}
sub sp, 0x4
bl ScriptContext2_Enable
@@ -34,10 +34,10 @@ sub_80BF8FC: @ 80BF8FC
.align 2, 0
_080BF934: .4byte sub_80BF97C
_080BF938: .4byte gTasks
thumb_func_end sub_80BF8FC
thumb_func_end Special_ChooseMonFromParty
thumb_func_start sub_80BF93C
sub_80BF93C: @ 80BF93C
thumb_func_start SelectMoveTutorMon
SelectMoveTutorMon: @ 80BF93C
push {lr}
sub sp, 0x4
bl ScriptContext2_Enable
@@ -65,7 +65,7 @@ sub_80BF93C: @ 80BF93C
.align 2, 0
_080BF974: .4byte sub_80BF97C
_080BF978: .4byte gTasks
thumb_func_end sub_80BF93C
thumb_func_end SelectMoveTutorMon
thumb_func_start sub_80BF97C
sub_80BF97C: @ 80BF97C
@@ -100,8 +100,8 @@ _080BF9B4: .4byte gPaletteFade
_080BF9B8: .4byte gTasks
thumb_func_end sub_80BF97C
thumb_func_start sub_80BF9BC
sub_80BF9BC: @ 80BF9BC
thumb_func_start SelectMove
SelectMove: @ 80BF9BC
push {r4,lr}
sub sp, 0x4
ldr r0, _080BF9F0 @ =gPlayerParty
@@ -132,7 +132,7 @@ _080BF9F8: .4byte gPlayerPartyCount
_080BF9FC: .4byte CB2_ReturnToField
_080BFA00: .4byte gFieldCallback
_080BFA04: .4byte FieldCallback_ReturnToEventScript2
thumb_func_end sub_80BF9BC
thumb_func_end SelectMove
thumb_func_start ScrSpecial_CountPokemonMoves
ScrSpecial_CountPokemonMoves: @ 80BFA08
@@ -333,8 +333,8 @@ sub_80BFAA8: @ 80BFAA8
_080BFBA4: .4byte gPPUpGetMask
thumb_func_end sub_80BFAA8
thumb_func_start sub_80BFBA8
sub_80BFBA8: @ 80BFBA8
thumb_func_start DeleteMonMove
DeleteMonMove: @ 80BFBA8
push {r4-r6,lr}
mov r6, r8
push {r6}
@@ -385,10 +385,10 @@ _080BFBFC:
_080BFC08: .4byte gSpecialVar_0x8004
_080BFC0C: .4byte gPlayerParty
_080BFC10: .4byte gSpecialVar_0x8005
thumb_func_end sub_80BFBA8
thumb_func_end DeleteMonMove
thumb_func_start sub_80BFC14
sub_80BFC14: @ 80BFC14
thumb_func_start IsSelectedMonEgg
IsSelectedMonEgg: @ 80BFC14
push {lr}
ldr r0, _080BFC38 @ =gSpecialVar_0x8004
ldrh r1, [r0]
@@ -417,6 +417,6 @@ _080BFC48:
bx r0
.align 2, 0
_080BFC4C: .4byte gSpecialVar_Result
thumb_func_end sub_80BFC14
thumb_func_end IsSelectedMonEgg
.align 2, 0 @ Don't pad with nop.
asm/trade.s
+30 -30
View File
@@ -169,7 +169,7 @@ _0804D048:
str r0, [sp, 0x4]
str r1, [sp, 0x8]
adds r0, r5, 0
ldr r1, _0804D144 @ =sub_809718C
ldr r1, _0804D144 @ =SpriteCB_MonIcon
bl CreateMonIcon
mov r2, r8
ldr r1, [r2]
@@ -228,7 +228,7 @@ _0804D0BE:
movs r0, 0
str r0, [sp, 0x8]
adds r0, r5, 0
ldr r1, _0804D144 @ =sub_809718C
ldr r1, _0804D144 @ =SpriteCB_MonIcon
bl CreateMonIcon
mov r2, r8
ldr r1, [r2]
@@ -255,7 +255,7 @@ _0804D134: .4byte gEnemyPartyCount
_0804D138: .4byte gTradeMonSpriteCoords
_0804D13C: .4byte gPlayerParty
_0804D140: .4byte 0xfff40000
_0804D144: .4byte sub_809718C
_0804D144: .4byte SpriteCB_MonIcon
_0804D148: .4byte gEnemyParty
_0804D14C: .4byte gMain
_0804D150:
@@ -790,7 +790,7 @@ sub_804D5A4: @ 804D5A4
ldrb r0, [r0]
cmp r0, 0
beq _0804D5FC
bl IsRfuTaskFinished
bl IsLinkRfuTaskFinished
lsls r0, 24
cmp r0, 0
beq _0804D620
@@ -3609,7 +3609,7 @@ _0804EBA2:
adds r0, r1
lsls r0, 2
add r0, r8
ldr r1, _0804ECAC @ =sub_809718C
ldr r1, _0804ECAC @ =SpriteCB_MonIcon
bl StoreSpriteCallbackInData6
ldr r2, _0804ECA4 @ =gUnknown_2031DA8
ldr r1, [r2]
@@ -3656,7 +3656,7 @@ _0804EC98:
_0804ECA0: .4byte gSprites
_0804ECA4: .4byte gUnknown_2031DA8
_0804ECA8: .4byte gTradeMonSpriteCoords
_0804ECAC: .4byte sub_809718C
_0804ECAC: .4byte SpriteCB_MonIcon
_0804ECB0: .4byte gUnknown_8260A32
_0804ECB4:
ldr r2, _0804ECE4 @ =gSprites
@@ -3675,7 +3675,7 @@ _0804ECB4:
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
ldr r0, _0804ECE8 @ =sub_809718C
ldr r0, _0804ECE8 @ =SpriteCB_MonIcon
cmp r1, r0
beq _0804ECDC
b _0804EE54
@@ -3685,7 +3685,7 @@ _0804ECDC:
b _0804EE54
.align 2, 0
_0804ECE4: .4byte gSprites
_0804ECE8: .4byte sub_809718C
_0804ECE8: .4byte SpriteCB_MonIcon
_0804ECEC:
ldr r1, _0804EE08 @ =gUnknown_8260834
ldr r0, [sp, 0x60]
@@ -5314,7 +5314,7 @@ _0804F988:
subs r1, r2
lsls r1, 24
lsrs r1, 24
bl sub_8097414
bl MonIcon_SetAnim
adds r4, 0x1
ldr r0, [r6]
adds r0, 0x36
@@ -7758,7 +7758,7 @@ _08050D98:
orrs r0, r7
str r0, [r1, 0x8]
ldr r0, [r1, 0x8]
ldr r1, _08050DD8 @ =gUnknown_08331F60
ldr r1, _08050DD8 @ =gUnknown_826601C
ldr r2, _08050DDC @ =0x06009000
ldr r0, _08050DD0 @ =0x040000d4
str r1, [r0]
@@ -7779,7 +7779,7 @@ _08050DC8: .4byte gTradeGba_Gfx
_08050DCC: .4byte 0x06004000
_08050DD0: .4byte 0x040000d4
_08050DD4: .4byte 0x80000800
_08050DD8: .4byte gUnknown_08331F60
_08050DD8: .4byte gUnknown_826601C
_08050DDC: .4byte 0x06009000
thumb_func_end sub_8050968
@@ -10010,7 +10010,7 @@ _0805223C:
ldrb r0, [r0]
movs r1, 0
bl sub_805080C
ldr r1, _08052284 @ =gUnknown_300537C
ldr r1, _08052284 @ =gCB2_AfterEvolution
ldr r0, _08052288 @ =sub_8050948
str r0, [r1]
ldr r7, _0805228C @ =gUnknown_2031DA4
@@ -10039,7 +10039,7 @@ _0805223C:
b _080522A8
.align 2, 0
_08052280: .4byte gSpecialVar_0x8005
_08052284: .4byte gUnknown_300537C
_08052284: .4byte gCB2_AfterEvolution
_08052288: .4byte sub_8050948
_0805228C: .4byte gUnknown_2031DA4
_08052290: .4byte gPlayerParty
@@ -12235,7 +12235,7 @@ _08053698:
ldrb r0, [r0]
movs r1, 0
bl sub_805080C
ldr r1, _080536E0 @ =gUnknown_300537C
ldr r1, _080536E0 @ =gCB2_AfterEvolution
ldr r0, _080536E4 @ =sub_8050948
str r0, [r1]
ldr r7, _080536E8 @ =gUnknown_2031DA4
@@ -12264,7 +12264,7 @@ _08053698:
b _08053704
.align 2, 0
_080536DC: .4byte gSpecialVar_0x8005
_080536E0: .4byte gUnknown_300537C
_080536E0: .4byte gCB2_AfterEvolution
_080536E4: .4byte sub_8050948
_080536E8: .4byte gUnknown_2031DA4
_080536EC: .4byte gPlayerParty
@@ -12362,7 +12362,7 @@ _080537A8:
.align 2, 0
_080537B4: .4byte gSoftResetDisabled
_080537B8:
ldr r0, _080537F4 @ =gUnknown_300537C
ldr r0, _080537F4 @ =gCB2_AfterEvolution
ldr r1, _080537F8 @ =sub_8053E8C
mov r8, r1
str r1, [r0]
@@ -12391,7 +12391,7 @@ _080537B8:
bl TradeEvolutionScene
b _0805380E
.align 2, 0
_080537F4: .4byte gUnknown_300537C
_080537F4: .4byte gCB2_AfterEvolution
_080537F8: .4byte sub_8053E8C
_080537FC: .4byte gUnknown_2031DA4
_08053800: .4byte gPlayerParty
@@ -12737,8 +12737,8 @@ _08053A94: .4byte gUnknown_826D1E4
_08053A98: .4byte SpriteCallbackDummy
thumb_func_end sub_8053A0C
thumb_func_start sub_8053A9C
sub_8053A9C: @ 8053A9C
thumb_func_start GetInGameTradeSpeciesInfo
GetInGameTradeSpeciesInfo: @ 8053A9C
push {r4-r6,lr}
ldr r0, _08053AD0 @ =gSpecialVar_0x8004
ldrh r0, [r0]
@@ -12769,7 +12769,7 @@ _08053AD4: .4byte gIngameTrades
_08053AD8: .4byte gStringVar1
_08053ADC: .4byte gSpeciesNames
_08053AE0: .4byte gStringVar2
thumb_func_end sub_8053A9C
thumb_func_end GetInGameTradeSpeciesInfo
thumb_func_start sub_8053AE4
sub_8053AE4: @ 8053AE4
@@ -13036,8 +13036,8 @@ _08053CEE:
_08053D28: .4byte gUnknown_826D1A8
thumb_func_end sub_8053CD4
thumb_func_start sub_8053D2C
sub_8053D2C: @ 8053D2C
thumb_func_start GetTradeSpecies
GetTradeSpecies: @ 8053D2C
push {r4-r6,lr}
ldr r6, _08053D58 @ =gSpecialVar_0x8005
ldrh r0, [r6]
@@ -13066,10 +13066,10 @@ _08053D62:
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end sub_8053D2C
thumb_func_end GetTradeSpecies
thumb_func_start sub_8053D68
sub_8053D68: @ 8053D68
thumb_func_start CreateInGameTradePokemon
CreateInGameTradePokemon: @ 8053D68
push {lr}
ldr r0, _08053D7C @ =gSpecialVar_0x8005
ldrb r0, [r0]
@@ -13081,7 +13081,7 @@ sub_8053D68: @ 8053D68
.align 2, 0
_08053D7C: .4byte gSpecialVar_0x8005
_08053D80: .4byte gSpecialVar_0x8004
thumb_func_end sub_8053D68
thumb_func_end CreateInGameTradePokemon
thumb_func_start sub_8053D84
sub_8053D84: @ 8053D84
@@ -13703,7 +13703,7 @@ _0805434C:
ldr r0, _08054378 @ =sub_804C718
cmp r1, r0
bne _08054384
bl IsRfuTaskFinished
bl IsLinkRfuTaskFinished
lsls r0, 24
cmp r0, 0
beq _08054396
@@ -13797,8 +13797,8 @@ _08054438: .4byte gWirelessCommType
_0805443C: .4byte gMain
thumb_func_end sub_80543C4
thumb_func_start sub_8054440
sub_8054440: @ 8054440
thumb_func_start DoInGameTradeScene
DoInGameTradeScene: @ 8054440
push {lr}
sub sp, 0x4
bl ScriptContext2_Enable
@@ -13818,7 +13818,7 @@ sub_8054440: @ 8054440
bx r0
.align 2, 0
_0805446C: .4byte sub_8054470
thumb_func_end sub_8054440
thumb_func_end DoInGameTradeScene
thumb_func_start sub_8054470
sub_8054470: @ 8054470
asm/trainer_card.s
+10 -10
View File
@@ -1215,7 +1215,7 @@ _080899AE:
bl VarGet
lsls r0, 16
lsrs r0, 16
bl sub_8096FD4
bl MailSpeciesToIconSpecies
adds r1, r5, 0
adds r1, 0x54
strh r0, [r1]
@@ -1223,7 +1223,7 @@ _080899AE:
bl VarGet
lsls r0, 16
lsrs r0, 16
bl sub_8096FD4
bl MailSpeciesToIconSpecies
adds r1, r5, 0
adds r1, 0x56
strh r0, [r1]
@@ -1231,7 +1231,7 @@ _080899AE:
bl VarGet
lsls r0, 16
lsrs r0, 16
bl sub_8096FD4
bl MailSpeciesToIconSpecies
adds r1, r5, 0
adds r1, 0x58
strh r0, [r1]
@@ -1239,7 +1239,7 @@ _080899AE:
bl VarGet
lsls r0, 16
lsrs r0, 16
bl sub_8096FD4
bl MailSpeciesToIconSpecies
adds r1, r5, 0
adds r1, 0x5A
strh r0, [r1]
@@ -1247,7 +1247,7 @@ _080899AE:
bl VarGet
lsls r0, 16
lsrs r0, 16
bl sub_8096FD4
bl MailSpeciesToIconSpecies
adds r1, r5, 0
adds r1, 0x5C
strh r0, [r1]
@@ -1255,7 +1255,7 @@ _080899AE:
bl VarGet
lsls r0, 16
lsrs r0, 16
bl sub_8096FD4
bl MailSpeciesToIconSpecies
adds r1, r5, 0
adds r1, 0x5E
strh r0, [r1]
@@ -3203,7 +3203,7 @@ _0808AAA4:
ldrh r0, [r1]
cmp r0, 0
beq _0808AAEE
bl sub_8097218
bl GetMonIconPaletteIndexFromSpecies
lsls r0, 24
lsrs r0, 24
lsls r1, r4, 20
@@ -3250,7 +3250,7 @@ _0808AB0C: .4byte 0x00000457
sub_808AB10: @ 808AB10
push {r4,r5,lr}
sub sp, 0x4
ldr r0, _0808AB40 @ =gUnknown_83D3740
ldr r0, _0808AB40 @ =gMonIconPalettes
ldr r4, _0808AB44 @ =gUnknown_20397A4
ldr r1, [r4]
ldr r5, _0808AB48 @ =0x00000396
@@ -3271,7 +3271,7 @@ sub_808AB10: @ 808AB10
beq _0808AB80
b _0808AB88
.align 2, 0
_0808AB40: .4byte gUnknown_83D3740
_0808AB40: .4byte gMonIconPalettes
_0808AB44: .4byte gUnknown_20397A4
_0808AB48: .4byte 0x00000396
_0808AB4C: .4byte 0x000004aa
@@ -3322,7 +3322,7 @@ _0808AB9A:
adds r0, r1
ldrh r0, [r0]
movs r1, 0
bl sub_8097028
bl GetMonIconTiles
adds r1, r0, 0
lsls r3, r4, 20
movs r0, 0x80
asm/trainer_see.s
+7 -7
View File
@@ -87,7 +87,7 @@ sub_8081B84: @ 8081B84
_08081BC0:
adds r0, r5, 0
adds r1, r6, 0
bl TrainerWantsBattle
bl ConfigureAndSetUpOneTrainerBattle
adds r0, r4, r5
lsls r0, 2
ldr r1, _08081BE0 @ =gMapObjects
@@ -718,16 +718,16 @@ _0808204A:
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
bl npc_running_behaviour_by_direction
bl GetTrainerFacingDirectionMovementType
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl npc_set_running_behaviour_etc
bl SetTrainerMovementType
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
bl npc_running_behaviour_by_direction
bl GetTrainerFacingDirectionMovementType
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -1277,17 +1277,17 @@ _0808246E:
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
bl npc_running_behaviour_by_direction
bl GetTrainerFacingDirectionMovementType
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl npc_set_running_behaviour_etc
bl SetTrainerMovementType
ldr r4, [sp]
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
bl npc_running_behaviour_by_direction
bl GetTrainerFacingDirectionMovementType
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
asm/union_room_chat.s
+4 -4
View File
@@ -4265,7 +4265,7 @@ sub_812A424: @ 812A424
bl PutWindowTilemap
ldr r0, [r6]
ldrb r0, [r0, 0x18]
ldr r2, _0812A514 @ =gUnknown_8417938
ldr r2, _0812A514 @ =gText_Yes
movs r5, 0x2
str r5, [sp]
movs r4, 0xFF
@@ -4276,7 +4276,7 @@ sub_812A424: @ 812A424
bl AddTextPrinterParameterized
ldr r0, [r6]
ldrb r0, [r0, 0x18]
ldr r2, _0812A518 @ =gUnknown_841793C
ldr r2, _0812A518 @ =gText_No
movs r1, 0x10
str r1, [sp]
str r4, [sp, 0x4]
@@ -4314,8 +4314,8 @@ _0812A504: .4byte 0xff00ffff
_0812A508: .4byte 0x00ffffff
_0812A50C: .4byte 0x0000ffff
_0812A510: .4byte gUnknown_203B0E4
_0812A514: .4byte gUnknown_8417938
_0812A518: .4byte gUnknown_841793C
_0812A514: .4byte gText_Yes
_0812A518: .4byte gText_No
thumb_func_end sub_812A424
thumb_func_start sub_812A51C
asm/wild_encounter.s
+12 -12
View File
@@ -878,7 +878,7 @@ _08082D78:
bl sub_8058F1C
lsls r0, 24
lsrs r0, 24
bl MetatileBehavior_ReturnFalse_6
bl MetatileBehavior_IsBridge
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -932,7 +932,7 @@ _08082DFA:
lsls r0, 24
cmp r0, 0
beq _08082E46
bl sub_807F78C
bl BattleSetup_StartRoamerBattle
movs r0, 0x1
b _08082E48
.align 2, 0
@@ -950,7 +950,7 @@ _08082E24:
cmp r0, 0x1
bne _08082E40
_08082E38:
bl sub_807F704
bl BattleSetup_StartWildBattle
movs r0, 0x1
b _08082E48
_08082E40:
@@ -966,8 +966,8 @@ _08082E48:
bx r1
thumb_func_end sub_8082CBC
thumb_func_start sub_8082E54
sub_8082E54: @ 8082E54
thumb_func_start Special_RockSmashEncounter
Special_RockSmashEncounter: @ 8082E54
push {r4,lr}
bl sub_8082934
lsls r0, 16
@@ -999,7 +999,7 @@ sub_8082E54: @ 8082E54
lsrs r4, r0, 24
cmp r4, 0x1
bne _08082EB0
bl sub_807F704
bl BattleSetup_StartWildBattle
_08082E9C:
ldr r0, _08082EAC @ =gSpecialVar_Result
strh r4, [r0]
@@ -1018,7 +1018,7 @@ _08082EB6:
bx r0
.align 2, 0
_08082EBC: .4byte gSpecialVar_Result
thumb_func_end sub_8082E54
thumb_func_end Special_RockSmashEncounter
thumb_func_start SweetScentWildEncounter
SweetScentWildEncounter: @ 8082EC0
@@ -1079,7 +1079,7 @@ _08082F1C:
cmp r0, 0x1
bne _08082F44
_08082F3C:
bl sub_807F78C
bl BattleSetup_StartRoamerBattle
movs r0, 0x1
b _08082F6E
_08082F44:
@@ -1096,7 +1096,7 @@ _08082F44:
_08082F58:
movs r2, 0
bl sub_8082AEC
bl sub_807F704
bl BattleSetup_StartWildBattle
movs r0, 0x1
b _08082F6E
.align 2, 0
@@ -1160,7 +1160,7 @@ sub_8082FB0: @ 8082FB0
bl sub_8082B64
movs r0, 0xC
bl IncrementGameStat
bl sub_807F704
bl BattleSetup_StartWildBattle
pop {r4,r5}
pop {r0}
bx r0
@@ -1302,14 +1302,14 @@ sub_80830B8: @ 80830B8
bl VarSet
cmp r4, 0
bne _08083104
ldr r0, _08083100 @ =gUnknown_81BFB65
ldr r0, _08083100 @ =EventScript_1BFB65
bl ScriptContext1_SetupScript
movs r0, 0x1
b _08083106
.align 2, 0
_080830F8: .4byte gUnknown_203ADFA
_080830FC: .4byte 0x00004020
_08083100: .4byte gUnknown_81BFB65
_08083100: .4byte EventScript_1BFB65
_08083104:
movs r0, 0
_08083106: