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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
paul
2018-11-24 19:57:36 +01:00
parent 284bbf91af fecda40501
commit 4744a7d96e
283 changed files with 8974 additions and 14061 deletions
Download Patch File Download Diff File Expand all files Collapse all files
INSTALL.md
+6
View File
@@ -50,3 +50,9 @@ If the command for building pokefirered.gba does not work, run `nproc` and use t
## Windows 10
Install the [Windows Subsystem for Linux](https://docs.microsoft.com/windows/wsl/install-win10), then install [devkitARM](https://devkitpro.org/wiki/Getting_Started) inside the subsystem, and run the commands.
## Important note for all users
Until further notice, this repository is dependent on `baserom.gba`, which is a copy of Pokémon FireRed (U)(1.0) bearing the SHA1 sum `41cb23d8dccc8ebd7c649cd8fbb58eeace6e2fdc`. If you attempt to build and get the following error or similar, it's because `baserom.gba` is missing.
No rule to make target 'build/firered/data/librfu_rodata.o', needed by 'pokefirered.elf'. Stop.
Makefile
-5
View File
@@ -108,11 +108,6 @@ sound/%.bin: sound/%.aif ; $(AIF) $< $@
sound/songs/%.s: sound/songs/%.mid
cd $(@D) && ../../$(MID) $(<F)
$(C_BUILDDIR)/libc.o: CC1 := tools/agbcc/bin/old_agbcc
$(C_BUILDDIR)/libc.o: CFLAGS := -O2
$(C_BUILDDIR)/siirtc.o: CFLAGS := -mthumb-interwork
$(C_BUILDDIR)/agb_flash.o: CFLAGS := -O -mthumb-interwork
$(C_BUILDDIR)/agb_flash_1m.o: CFLAGS := -O -mthumb-interwork
$(C_BUILDDIR)/agb_flash_mx.o: CFLAGS := -O -mthumb-interwork
asm/battle_1.s
+10 -10
View File
@@ -228,7 +228,7 @@ sub_800F380: @ 800F380
movs r1, 0x22
movs r2, 0x10
bl sub_815001C
ldr r4, _0800F3F0 @ =gUnknown_20371F8
ldr r4, _0800F3F0 @ =gPlttBufferUnfaded
adds r0, r4, 0
adds r0, 0xB8
ldr r1, _0800F3F4 @ =0x00002529
@@ -242,7 +242,7 @@ sub_800F380: @ 800F380
adds r2, 0x2
ldr r1, _0800F3FC @ =0x0000675a
strh r1, [r2]
ldr r5, _0800F400 @ =gUnknown_20376B0
ldr r5, _0800F400 @ =gPlttBufferFaded + 0xB8
adds r1, r5, 0
movs r2, 0x4
bl CpuSet
@@ -271,11 +271,11 @@ _0800F3EA:
pop {r0}
bx r0
.align 2, 0
_0800F3F0: .4byte gUnknown_20371F8
_0800F3F0: .4byte gPlttBufferUnfaded
_0800F3F4: .4byte 0x00002529
_0800F3F8: .4byte 0x00007fff
_0800F3FC: .4byte 0x0000675a
_0800F400: .4byte gUnknown_20376B0
_0800F400: .4byte gPlttBufferFaded + 0xB8
_0800F404: .4byte gBattleTypeFlags
_0800F408: .4byte 0x00010010
thumb_func_end sub_800F380
@@ -703,7 +703,7 @@ _0800F734:
movs r5, 0
movs r6, 0x3
_0800F744:
ldr r0, _0800F760 @ =gUnknown_2022744
ldr r0, _0800F760 @ =gLinkPlayers + 8
adds r1, r5, r0
subs r0, 0x8
adds r4, r5, r0
@@ -717,7 +717,7 @@ _0800F744:
b _0800F7C2
.align 2, 0
_0800F75C: .4byte gBattleTypeFlags
_0800F760: .4byte gUnknown_2022744
_0800F760: .4byte gLinkPlayers + 8
_0800F764:
cmp r0, 0x2
beq _0800F790
@@ -838,12 +838,12 @@ _0800F850:
ldr r0, _0800F8CC @ =0x00002710
bl AllocSpritePalette
lsls r0, 24
ldr r2, _0800F8D0 @ =gUnknown_20371F8
ldr r2, _0800F8D0 @ =gPlttBufferUnfaded
lsrs r0, 19
ldr r3, _0800F8D4 @ =0x0000021e
adds r0, r3
adds r2, r0, r2
ldr r1, _0800F8D8 @ =gUnknown_20375F8
ldr r1, _0800F8D8 @ =gPlttBufferFaded
adds r0, r1
ldr r1, _0800F8DC @ =0x00007fff
strh r1, [r0]
@@ -895,9 +895,9 @@ _0800F850:
b _0800FAC4
.align 2, 0
_0800F8CC: .4byte 0x00002710
_0800F8D0: .4byte gUnknown_20371F8
_0800F8D0: .4byte gPlttBufferUnfaded
_0800F8D4: .4byte 0x0000021e
_0800F8D8: .4byte gUnknown_20375F8
_0800F8D8: .4byte gPlttBufferFaded
_0800F8DC: .4byte 0x00007fff
_0800F8E0: .4byte gUnknown_82482E8
_0800F8E4: .4byte gBattleStruct
asm/battle_2.s
+8 -8
View File
@@ -1620,7 +1620,7 @@ _08010AF0: .4byte gMain
_08010AF4: .4byte gBattleTypeFlags
_08010AF8: .4byte sub_80109C8
_08010AFC:
ldr r0, _08010B1C @ =gUnknown_2037AB8
ldr r0, _08010B1C @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1635,7 +1635,7 @@ _08010AFC:
bl sub_800AB9C
b _08010B82
.align 2, 0
_08010B1C: .4byte gUnknown_2037AB8
_08010B1C: .4byte gPaletteFade
_08010B20: .4byte gUnknown_3003F3C
_08010B24:
bl sub_800AAC0
@@ -2439,7 +2439,7 @@ _080111B8: .4byte 0x00000439
CB2_QuitRecordedBattle: @ 80111BC
push {lr}
bl UpdatePaletteFade
ldr r0, _080111E4 @ =gUnknown_2037AB8
ldr r0, _080111E4 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -2454,7 +2454,7 @@ _080111DE:
pop {r0}
bx r0
.align 2, 0
_080111E4: .4byte gUnknown_2037AB8
_080111E4: .4byte gPaletteFade
_080111E8: .4byte gMain
thumb_func_end CB2_QuitRecordedBattle
@@ -3726,7 +3726,7 @@ _08011C08:
strb r0, [r4]
b _08011C34
_08011C10:
ldr r0, _08011C3C @ =gUnknown_2037AB8
ldr r0, _08011C3C @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -3745,7 +3745,7 @@ _08011C34:
pop {r0}
bx r0
.align 2, 0
_08011C3C: .4byte gUnknown_2037AB8
_08011C3C: .4byte gPaletteFade
_08011C40: .4byte gMain
thumb_func_end sub_8011BB0
@@ -11485,7 +11485,7 @@ _08015A2C: .4byte gUnknown_2023D74
thumb_func_start sub_8015A30
sub_8015A30: @ 8015A30
push {lr}
ldr r0, _08015A58 @ =gUnknown_2037AB8
ldr r0, _08015A58 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -11505,7 +11505,7 @@ _08015A52:
ldr r0, _08015A68 @ =ReturnFromBattleToOverworld
b _08015A70
.align 2, 0
_08015A58: .4byte gUnknown_2037AB8
_08015A58: .4byte gPaletteFade
_08015A5C: .4byte gUnknown_3004FD4
_08015A60: .4byte gUnknown_2023E8A
_08015A64: .4byte gUnknown_3004F84
asm/battle_anim.s
+10 -10
View File
@@ -1307,7 +1307,7 @@ _08072E5E:
movs r0, 0x16
bl SetGpuReg
lsls r4, r7, 5
ldr r0, _08072F7C @ =gUnknown_20373F8
ldr r0, _08072F7C @ =gPlttBufferUnfaded + 0x200
adds r4, r0
add r0, sp, 0x10
ldrb r1, [r0, 0x8]
@@ -1353,7 +1353,7 @@ _08072F6C: .4byte gUnknown_2023D44
_08072F70: .4byte gUnknown_2022978
_08072F74: .4byte gSprites
_08072F78: .4byte gUnknown_202297A
_08072F7C: .4byte gUnknown_20373F8
_08072F7C: .4byte gPlttBufferUnfaded + 0x200
_08072F80: .4byte 0x04000008
_08072F84:
ldr r1, _08073094 @ =0x06006000
@@ -1440,7 +1440,7 @@ _08072F84:
movs r0, 0x1A
bl SetGpuReg
lsls r4, r7, 5
ldr r0, _080730B4 @ =gUnknown_20373F8
ldr r0, _080730B4 @ =gPlttBufferUnfaded + 0x200
adds r4, r0
adds r0, r4, 0
movs r1, 0x90
@@ -1487,7 +1487,7 @@ _080730A4: .4byte gUnknown_2023D44
_080730A8: .4byte gUnknown_202297C
_080730AC: .4byte gSprites
_080730B0: .4byte gUnknown_202297E
_080730B4: .4byte gUnknown_20373F8
_080730B4: .4byte gPlttBufferUnfaded + 0x200
_080730B8: .4byte 0x05000120
_080730BC: .4byte 0x04000008
thumb_func_end sub_8072E48
@@ -1640,7 +1640,7 @@ task_pA_ma0A_obj_to_bg_pal: @ 8073174
adds r0, r5
strh r0, [r1]
lsls r0, r6, 5
ldr r2, _08073200 @ =gUnknown_20377F8
ldr r2, _08073200 @ =gPlttBufferFaded + 0x200
adds r0, r2
mov r1, sp
ldrb r1, [r1, 0x8]
@@ -1656,7 +1656,7 @@ _080731F0: .4byte gTasks
_080731F4: .4byte gSprites
_080731F8: .4byte gUnknown_2022978
_080731FC: .4byte gUnknown_202297A
_08073200: .4byte gUnknown_20377F8
_08073200: .4byte gPlttBufferFaded + 0x200
_08073204: .4byte 0xfffffe00
_08073208: .4byte 0x04000008
_0807320C:
@@ -1673,7 +1673,7 @@ _0807320C:
adds r0, r5
strh r0, [r1]
lsls r0, r6, 5
ldr r1, _08073244 @ =gUnknown_20377F8
ldr r1, _08073244 @ =gPlttBufferFaded + 0x200
adds r0, r1
subs r1, 0xE0
ldr r2, _08073248 @ =0x04000008
@@ -1686,7 +1686,7 @@ _08073232:
.align 2, 0
_0807323C: .4byte gUnknown_202297C
_08073240: .4byte gUnknown_202297E
_08073244: .4byte gUnknown_20377F8
_08073244: .4byte gPlttBufferFaded + 0x200
_08073248: .4byte 0x04000008
thumb_func_end task_pA_ma0A_obj_to_bg_pal
@@ -2536,7 +2536,7 @@ sub_8073850: @ 8073850
.align 2, 0
_08073884: .4byte gTasks
_08073888:
ldr r2, _080738A4 @ =gUnknown_2037AB8
ldr r2, _080738A4 @ =gPaletteFade
ldrb r1, [r2, 0x7]
movs r0, 0x80
ands r0, r1
@@ -2551,7 +2551,7 @@ _08073888:
strb r0, [r1]
b _080738F0
.align 2, 0
_080738A4: .4byte gUnknown_2037AB8
_080738A4: .4byte gPaletteFade
_080738A8: .4byte gUnknown_2037F17
_080738AC:
cmp r3, 0x2
asm/battle_anim_8074480.s
+12 -12
View File
@@ -3149,8 +3149,8 @@ sub_8075B48: @ 8075B48
lsrs r0, 16
cmp r1, 0
bne _08075BC4
ldr r2, _08075BB8 @ =gUnknown_20371F8
ldr r1, _08075BBC @ =gUnknown_20375F8
ldr r2, _08075BB8 @ =gPlttBufferUnfaded
ldr r1, _08075BBC @ =gPlttBufferFaded
lsls r0, 1
adds r4, r0, r1
adds r5, r0, r2
@@ -3200,14 +3200,14 @@ _08075B60:
bge _08075B60
b _08075BD4
.align 2, 0
_08075BB8: .4byte gUnknown_20371F8
_08075BBC: .4byte gUnknown_20375F8
_08075BB8: .4byte gPlttBufferUnfaded
_08075BBC: .4byte gPlttBufferFaded
_08075BC0: .4byte 0xfffffc1f
_08075BC4:
lsls r1, r0, 1
ldr r0, _08075BDC @ =gUnknown_20371F8
ldr r0, _08075BDC @ =gPlttBufferUnfaded
adds r0, r1, r0
ldr r2, _08075BE0 @ =gUnknown_20375F8
ldr r2, _08075BE0 @ =gPlttBufferFaded
adds r1, r2
ldr r2, _08075BE4 @ =0x04000008
bl CpuSet
@@ -3216,8 +3216,8 @@ _08075BD4:
pop {r0}
bx r0
.align 2, 0
_08075BDC: .4byte gUnknown_20371F8
_08075BE0: .4byte gUnknown_20375F8
_08075BDC: .4byte gPlttBufferUnfaded
_08075BE0: .4byte gPlttBufferFaded
_08075BE4: .4byte 0x04000008
thumb_func_end sub_8075B48
@@ -5967,10 +5967,10 @@ _080770D4:
_080770D6:
strh r0, [r5, 0x14]
lsls r0, r4, 1
ldr r1, _08077104 @ =gUnknown_20371F8
ldr r1, _08077104 @ =gPlttBufferUnfaded
adds r0, r1
lsls r1, r6, 1
ldr r2, _08077108 @ =gUnknown_20375F8
ldr r2, _08077108 @ =gPlttBufferFaded
adds r1, r2
ldr r2, _0807710C @ =0x04000008
bl CpuSet
@@ -5986,8 +5986,8 @@ _080770D6:
pop {r0}
bx r0
.align 2, 0
_08077104: .4byte gUnknown_20371F8
_08077108: .4byte gUnknown_20375F8
_08077104: .4byte gPlttBufferUnfaded
_08077108: .4byte gPlttBufferFaded
_0807710C: .4byte 0x04000008
_08077110: .4byte gUnknown_2037F02
_08077114: .4byte sub_8077118
asm/battle_anim_8078178.s
+2 -2
View File
@@ -505,7 +505,7 @@ sub_8078528: @ 8078528
asrs r0, 16
cmp r0, 0x3
bne _080785B8
ldr r3, _080785C8 @ =gUnknown_20375F8
ldr r3, _080785C8 @ =gPlttBufferFaded
lsls r2, 4
mov r12, r2
ldr r1, _080785CC @ =0x0000010d
@@ -555,7 +555,7 @@ _080785B8:
.align 2, 0
_080785C0: .4byte 0x0000271a
_080785C4: .4byte gTasks
_080785C8: .4byte gUnknown_20375F8
_080785C8: .4byte gPlttBufferFaded
_080785CC: .4byte 0x0000010d
_080785D0: .4byte 0x0000010f
_080785D4: .4byte sub_80785D8
asm/battle_anim_80A22E8.s
+59 -59
View File
@@ -5084,7 +5084,7 @@ sub_80A49D4: @ 80A49D4
ble _080A4A32
movs r0, 0
strh r0, [r4, 0x30]
ldr r1, _080A4A7C @ =gUnknown_20375F8
ldr r1, _080A4A7C @ =gPlttBufferFaded
movs r2, 0x32
ldrsh r0, [r4, r2]
adds r0, 0x1
@@ -5153,7 +5153,7 @@ _080A4A6C:
strh r0, [r4, 0x2E]
b _080A4AC2
.align 2, 0
_080A4A7C: .4byte gUnknown_20375F8
_080A4A7C: .4byte gPlttBufferFaded
_080A4A80:
ldrh r0, [r4, 0x3A]
adds r0, 0x1
@@ -6117,7 +6117,7 @@ _080A51A4:
ldrb r1, [r4, 0x5]
lsrs r1, 4
lsls r0, r1, 5
ldr r2, _080A5204 @ =gUnknown_2037408
ldr r2, _080A5204 @ =gPlttBufferUnfaded + 0x210
adds r0, r2
lsls r1, 4
ldr r3, _080A5208 @ =0x00000101
@@ -6135,7 +6135,7 @@ _080A51A4:
b _080A5214
.align 2, 0
_080A5200: .4byte 0x00007fff
_080A5204: .4byte gUnknown_2037408
_080A5204: .4byte gPlttBufferUnfaded + 0x210
_080A5208: .4byte 0x00000101
_080A520C:
cmp r0, 0
@@ -8192,7 +8192,7 @@ _080A614C:
cmp r0, 0
beq _080A6178
movs r1, 0x1
ldr r2, _080A6190 @ =gUnknown_20375F8
ldr r2, _080A6190 @ =gPlttBufferFaded
_080A6164:
adds r0, r3, r1
lsls r0, 1
@@ -8216,9 +8216,9 @@ _080A6178:
b _080A6232
.align 2, 0
_080A618C: .4byte 0x00007fbb
_080A6190: .4byte gUnknown_20375F8
_080A6190: .4byte gPlttBufferFaded
_080A6194:
ldr r0, _080A61DC @ =gUnknown_2037AB8
ldr r0, _080A61DC @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -8257,7 +8257,7 @@ _080A61CA:
strh r0, [r4, 0xA]
b _080A6214
.align 2, 0
_080A61DC: .4byte gUnknown_2037AB8
_080A61DC: .4byte gPaletteFade
_080A61E0: .4byte gSprites
_080A61E4: .4byte gUnknown_83E3734
_080A61E8: .4byte gUnknown_83E3764
@@ -8288,7 +8288,7 @@ _080A6214:
.align 2, 0
_080A621C: .4byte 0x00007fbb
_080A6220:
ldr r0, _080A6240 @ =gUnknown_2037AB8
ldr r0, _080A6240 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -8304,7 +8304,7 @@ _080A6232:
pop {r0}
bx r0
.align 2, 0
_080A6240: .4byte gUnknown_2037AB8
_080A6240: .4byte gPaletteFade
thumb_func_end sub_80A60A8
thumb_func_start sub_80A6244
@@ -8534,7 +8534,7 @@ sub_80A63B4: @ 80A63B4
adds r0, 0x10
lsls r4, r0, 4
movs r5, 0x1
ldr r2, _080A6450 @ =gUnknown_20371F8
ldr r2, _080A6450 @ =gPlttBufferUnfaded
_080A640C:
adds r1, r3, r5
lsls r1, 1
@@ -8566,7 +8566,7 @@ _080A640C:
_080A6444: .4byte gTasks
_080A6448: .4byte 0x00002771
_080A644C: .4byte gSprites
_080A6450: .4byte gUnknown_20371F8
_080A6450: .4byte gPlttBufferUnfaded
_080A6454:
lsls r2, r0, 4
adds r2, r0
@@ -8796,7 +8796,7 @@ sub_80A65E8: @ 80A65E8
adds r0, r1
lsrs r3, r0, 16
movs r2, 0x1
ldr r5, _080A669C @ =gUnknown_20375F8
ldr r5, _080A669C @ =gPlttBufferFaded
_080A6614:
adds r1, r3, r2
lsls r1, 1
@@ -8834,7 +8834,7 @@ _080A6632:
adds r0, r1
lsrs r3, r0, 16
movs r2, 0x1
ldr r7, _080A669C @ =gUnknown_20375F8
ldr r7, _080A669C @ =gPlttBufferFaded
ldr r6, _080A6698 @ =gUnknown_83E3898
adds r4, r5, 0
_080A6660:
@@ -8867,7 +8867,7 @@ _080A667A:
bx r0
.align 2, 0
_080A6698: .4byte gUnknown_83E3898
_080A669C: .4byte gUnknown_20375F8
_080A669C: .4byte gPlttBufferFaded
thumb_func_end sub_80A65E8
thumb_func_start sub_80A66A0
@@ -11414,7 +11414,7 @@ sub_80A7A18: @ 80A7A18
movs r0, 0
strh r0, [r4, 0x30]
ldrh r5, [r4, 0x2E]
ldr r1, _080A7A84 @ =gUnknown_20375F8
ldr r1, _080A7A84 @ =gPlttBufferFaded
adds r0, r5, 0
adds r0, 0x8
lsls r0, 1
@@ -11457,7 +11457,7 @@ _080A7A7C:
pop {r0}
bx r0
.align 2, 0
_080A7A84: .4byte gUnknown_20375F8
_080A7A84: .4byte gPlttBufferFaded
thumb_func_end sub_80A7A18
thumb_func_start sub_80A7A88
@@ -18331,7 +18331,7 @@ sub_80AAFA4: @ 80AAFA4
adds r0, 0x1
lsls r0, 16
lsrs r5, r0, 16
ldr r1, _080AB020 @ =gUnknown_20375F8
ldr r1, _080AB020 @ =gPlttBufferFaded
lsls r0, r5, 1
adds r0, r1
ldrh r6, [r0]
@@ -18373,7 +18373,7 @@ _080AB016:
bx r0
.align 2, 0
_080AB01C: .4byte gTasks
_080AB020: .4byte gUnknown_20375F8
_080AB020: .4byte gPlttBufferFaded
thumb_func_end sub_80AAFA4
thumb_func_start sub_80AB024
@@ -19110,7 +19110,7 @@ sub_80AB5C8: @ 80AB5C8
asrs r0, 16
cmp r0, 0x4
bne _080AB65C
ldr r1, _080AB700 @ =gUnknown_20375F8
ldr r1, _080AB700 @ =gPlttBufferFaded
mov r0, sp
ldrb r0, [r0, 0x8]
lsls r0, 4
@@ -19236,7 +19236,7 @@ _080AB6EC:
_080AB6F4: .4byte gUnknown_2022978
_080AB6F8: .4byte gUnknown_202297A
_080AB6FC: .4byte gTasks
_080AB700: .4byte gUnknown_20375F8
_080AB700: .4byte gPlttBufferFaded
_080AB704: .4byte sub_80AB708
thumb_func_end sub_80AB5C8
@@ -32037,7 +32037,7 @@ sub_80B198C: @ 80B198C
movs r0, 0
strh r0, [r3, 0x1C]
ldrb r0, [r3, 0xC]
ldr r2, _080B1A10 @ =gUnknown_20375F8
ldr r2, _080B1A10 @ =gPlttBufferFaded
lsls r0, 4
movs r3, 0x84
lsls r3, 1
@@ -32083,7 +32083,7 @@ _080B1A04:
bx r0
.align 2, 0
_080B1A0C: .4byte gTasks
_080B1A10: .4byte gUnknown_20375F8
_080B1A10: .4byte gPlttBufferFaded
_080B1A14: .4byte 0x00000107
_080B1A18: .4byte 0x00000101
thumb_func_end sub_80B198C
@@ -35026,7 +35026,7 @@ sub_80B3044: @ 80B3044
movs r0, 0
strh r0, [r3, 0x30]
ldrh r4, [r3, 0x2E]
ldr r1, _080B30A8 @ =gUnknown_20375F8
ldr r1, _080B30A8 @ =gPlttBufferFaded
adds r0, r4, 0
adds r0, 0x8
lsls r0, 1
@@ -35067,7 +35067,7 @@ _080B30A2:
pop {r0}
bx r0
.align 2, 0
_080B30A8: .4byte gUnknown_20375F8
_080B30A8: .4byte gPlttBufferFaded
_080B30AC: .4byte sub_80B30B0
thumb_func_end sub_80B3044
@@ -40643,12 +40643,12 @@ _080B5C2C:
movs r2, 0x10
ldrsh r0, [r5, r2]
lsls r0, 1
ldr r1, _080B5C60 @ =gUnknown_20371F8
ldr r1, _080B5C60 @ =gPlttBufferUnfaded
adds r0, r1
movs r2, 0x24
ldrsh r1, [r5, r2]
lsls r1, 1
ldr r2, _080B5C64 @ =gUnknown_20375F8
ldr r2, _080B5C64 @ =gPlttBufferFaded
adds r1, r2
ldr r2, _080B5C68 @ =0x04000008
bl CpuSet
@@ -40659,8 +40659,8 @@ _080B5C2C:
bl BlendPalette
b _080B5D22
.align 2, 0
_080B5C60: .4byte gUnknown_20371F8
_080B5C64: .4byte gUnknown_20375F8
_080B5C60: .4byte gPlttBufferUnfaded
_080B5C64: .4byte gPlttBufferFaded
_080B5C68: .4byte 0x04000008
_080B5C6C: .4byte 0x00003c0d
_080B5C70:
@@ -41851,7 +41851,7 @@ sub_80B65F0: @ 80B65F0
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r0, _080B663C @ =gUnknown_2037AB8
ldr r0, _080B663C @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -41883,7 +41883,7 @@ _080B6636:
pop {r0}
bx r0
.align 2, 0
_080B663C: .4byte gUnknown_2037AB8
_080B663C: .4byte gPaletteFade
_080B6640: .4byte gUnknown_2022984
_080B6644: .4byte gUnknown_2022986
_080B6648: .4byte 0x00003f3f
@@ -48522,7 +48522,7 @@ sub_80B9A14: @ 80B9A14
sub_80B9A5C: @ 80B9A5C
push {lr}
adds r2, r0, 0
ldr r0, _080B9A78 @ =gUnknown_2037AB8
ldr r0, _080B9A78 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -48534,7 +48534,7 @@ _080B9A72:
pop {r0}
bx r0
.align 2, 0
_080B9A78: .4byte gUnknown_2037AB8
_080B9A78: .4byte gPaletteFade
thumb_func_end sub_80B9A5C
thumb_func_start sub_80B9A7C
@@ -48592,7 +48592,7 @@ sub_80B9AD0: @ 80B9AD0
strh r0, [r4, 0x2E]
b _080B9B54
_080B9AE4:
ldr r0, _080B9B00 @ =gUnknown_2037AB8
ldr r0, _080B9B00 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -48606,7 +48606,7 @@ _080B9AE4:
str r0, [r4, 0x1C]
b _080B9B54
.align 2, 0
_080B9B00: .4byte gUnknown_2037AB8
_080B9B00: .4byte gPaletteFade
_080B9B04: .4byte sub_80B9B5C
_080B9B08:
movs r2, 0x3C
@@ -48656,7 +48656,7 @@ _080B9B54:
sub_80B9B5C: @ 80B9B5C
push {r4,lr}
adds r4, r0, 0
ldr r0, _080B9B88 @ =gUnknown_2037AB8
ldr r0, _080B9B88 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -48675,7 +48675,7 @@ _080B9B82:
pop {r0}
bx r0
.align 2, 0
_080B9B88: .4byte gUnknown_2037AB8
_080B9B88: .4byte gPaletteFade
thumb_func_end sub_80B9B5C
thumb_func_start sub_80B9B8C
@@ -48806,7 +48806,7 @@ sub_80B9C7C: @ 80B9C7C
lsls r0, 24
lsrs r3, r0, 24
adds r4, r3, 0
ldr r0, _080B9CB4 @ =gUnknown_2037AB8
ldr r0, _080B9CB4 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -48831,7 +48831,7 @@ sub_80B9C7C: @ 80B9C7C
ldrb r2, [r3, 0x10]
b _080B9CC0
.align 2, 0
_080B9CB4: .4byte gUnknown_2037AB8
_080B9CB4: .4byte gPaletteFade
_080B9CB8: .4byte gTasks
_080B9CBC:
ldrb r1, [r3, 0x10]
@@ -49001,7 +49001,7 @@ sub_80B9DF0: @ 80B9DF0
lsls r0, 24
lsrs r3, r0, 24
adds r4, r3, 0
ldr r0, _080B9E28 @ =gUnknown_2037AB8
ldr r0, _080B9E28 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -49026,7 +49026,7 @@ sub_80B9DF0: @ 80B9DF0
ldrb r2, [r3, 0x10]
b _080B9E34
.align 2, 0
_080B9E28: .4byte gUnknown_2037AB8
_080B9E28: .4byte gPaletteFade
_080B9E2C: .4byte gTasks
_080B9E30:
ldrb r1, [r3, 0x10]
@@ -49146,7 +49146,7 @@ sub_80B9F04: @ 80B9F04
lsls r0, 24
lsrs r3, r0, 24
adds r4, r3, 0
ldr r0, _080B9F3C @ =gUnknown_2037AB8
ldr r0, _080B9F3C @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -49171,7 +49171,7 @@ sub_80B9F04: @ 80B9F04
ldrb r2, [r3, 0x10]
b _080B9F48
.align 2, 0
_080B9F3C: .4byte gUnknown_2037AB8
_080B9F3C: .4byte gPaletteFade
_080B9F40: .4byte gTasks
_080B9F44:
ldrb r1, [r3, 0x10]
@@ -49274,7 +49274,7 @@ sub_80B9FD8: @ 80B9FD8
.align 2, 0
_080B9FFC: .4byte gTasks
_080BA000:
ldr r0, _080BA01C @ =gUnknown_2037AB8
ldr r0, _080BA01C @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -49288,7 +49288,7 @@ _080BA000:
str r0, [r4]
b _080BA084
.align 2, 0
_080BA01C: .4byte gUnknown_2037AB8
_080BA01C: .4byte gPaletteFade
_080BA020: .4byte sub_80BA090
_080BA024:
ldrh r0, [r4, 0x16]
@@ -49353,7 +49353,7 @@ sub_80BA090: @ 80BA090
sub sp, 0x4
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _080BA0E0 @ =gUnknown_2037AB8
ldr r0, _080BA0E0 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -49387,7 +49387,7 @@ _080BA0D6:
pop {r0}
bx r0
.align 2, 0
_080BA0E0: .4byte gUnknown_2037AB8
_080BA0E0: .4byte gPaletteFade
_080BA0E4: .4byte gTasks
thumb_func_end sub_80BA090
@@ -50765,7 +50765,7 @@ sub_80BAB78: @ 80BAB78
push {lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r0, _080BAB94 @ =gUnknown_2037AB8
ldr r0, _080BAB94 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -50777,7 +50777,7 @@ _080BAB90:
pop {r0}
bx r0
.align 2, 0
_080BAB94: .4byte gUnknown_2037AB8
_080BAB94: .4byte gPaletteFade
thumb_func_end sub_80BAB78
thumb_func_start sub_80BAB98
@@ -52261,7 +52261,7 @@ _080BB79A:
adds r0, 0x10
cmp r2, r0
bge _080BB7C6
ldr r1, _080BB7D8 @ =gUnknown_20375F8
ldr r1, _080BB7D8 @ =gPlttBufferFaded
adds r3, r0, 0
_080BB7B6:
lsls r0, r2, 1
@@ -52282,7 +52282,7 @@ _080BB7C6:
pop {r0}
bx r0
.align 2, 0
_080BB7D8: .4byte gUnknown_20375F8
_080BB7D8: .4byte gPlttBufferFaded
thumb_func_end sub_80BB790
thumb_func_start sub_80BB7DC
@@ -53173,7 +53173,7 @@ _080BBEC8:
lsls r0, 5
adds r0, r1
lsls r1, r4, 5
ldr r2, _080BBF04 @ =gUnknown_20371F8
ldr r2, _080BBF04 @ =gPlttBufferUnfaded
adds r1, r2
movs r2, 0x20
bl memcpy
@@ -53187,7 +53187,7 @@ _080BBEC8:
_080BBEF8: .4byte gUnknown_2037F1B
_080BBEFC: .4byte gMonSpritesGfxPtr
_080BBF00: .4byte gUnknown_2037F02
_080BBF04: .4byte gUnknown_20371F8
_080BBF04: .4byte gPlttBufferUnfaded
thumb_func_end sub_80BBE6C
thumb_func_start sub_80BBF08
@@ -53243,7 +53243,7 @@ _080BBF5E:
adds r4, 0x10
_080BBF64:
lsls r0, r4, 5
ldr r1, _080BBF98 @ =gUnknown_20371F8
ldr r1, _080BBF98 @ =gPlttBufferUnfaded
adds r0, r1
ldr r1, _080BBF9C @ =gMonSpritesGfxPtr
ldr r2, [r1]
@@ -53266,7 +53266,7 @@ _080BBF64:
bx r0
.align 2, 0
_080BBF94: .4byte gUnknown_2037F1B
_080BBF98: .4byte gUnknown_20371F8
_080BBF98: .4byte gPlttBufferUnfaded
_080BBF9C: .4byte gMonSpritesGfxPtr
_080BBFA0: .4byte gUnknown_2037F02
thumb_func_end sub_80BBF08
@@ -53324,9 +53324,9 @@ _080BBFFA:
adds r4, 0x10
_080BC000:
lsls r1, r4, 5
ldr r0, _080BC024 @ =gUnknown_20371F8
ldr r0, _080BC024 @ =gPlttBufferUnfaded
adds r0, r1, r0
ldr r2, _080BC028 @ =gUnknown_20375F8
ldr r2, _080BC028 @ =gPlttBufferFaded
adds r1, r2
movs r2, 0x20
bl memcpy
@@ -53338,8 +53338,8 @@ _080BC000:
bx r0
.align 2, 0
_080BC020: .4byte gUnknown_2037F1B
_080BC024: .4byte gUnknown_20371F8
_080BC028: .4byte gUnknown_20375F8
_080BC024: .4byte gPlttBufferUnfaded
_080BC028: .4byte gPlttBufferFaded
thumb_func_end sub_80BBFA4
thumb_func_start sub_80BC02C
asm/battle_anim_80DE2C0.s
+6 -6
View File
@@ -606,7 +606,7 @@ sub_80DE718: @ 80DE718
asrs r0, 16
cmp r0, 0x4
bne _080DE788
ldr r0, _080DE7A8 @ =gUnknown_20375F8
ldr r0, _080DE7A8 @ =gPlttBufferFaded
lsls r2, r6, 4
adds r1, r2, 0
adds r1, 0xB
@@ -658,7 +658,7 @@ _080DE798:
bx r0
.align 2, 0
_080DE7A4: .4byte gTasks
_080DE7A8: .4byte gUnknown_20375F8
_080DE7A8: .4byte gPlttBufferFaded
_080DE7AC: .4byte gUnknown_2037F02
_080DE7B0: .4byte 0x0000ffff
thumb_func_end sub_80DE718
@@ -711,7 +711,7 @@ sub_80DE7DC: @ 80DE7DC
asrs r0, 16
cmp r0, 0x4
bne _080DE87E
ldr r0, _080DE8A0 @ =gUnknown_20375F8
ldr r0, _080DE8A0 @ =gPlttBufferFaded
lsls r2, r7, 4
adds r1, r2, 0
adds r1, 0xB
@@ -722,7 +722,7 @@ sub_80DE7DC: @ 80DE7DC
mov r10, r3
mov r9, r0
adds r5, r2, 0
ldr r2, _080DE8A4 @ =gUnknown_20371F8
ldr r2, _080DE8A4 @ =gPlttBufferUnfaded
mov r12, r2
lsls r0, r7, 5
add r0, r9
@@ -787,8 +787,8 @@ _080DE88E:
bx r0
.align 2, 0
_080DE89C: .4byte gTasks
_080DE8A0: .4byte gUnknown_20375F8
_080DE8A4: .4byte gUnknown_20371F8
_080DE8A0: .4byte gPlttBufferFaded
_080DE8A4: .4byte gPlttBufferUnfaded
_080DE8A8: .4byte gUnknown_2037F02
_080DE8AC: .4byte 0x0000ffff
thumb_func_end sub_80DE7DC
asm/battle_anim_80EEC0C.s
+8 -8
View File
@@ -495,7 +495,7 @@ sub_80EEFC8: @ 80EEFC8
lsls r4, 4
orrs r4, r3
lsls r0, 1
ldr r1, _080EF0B0 @ =gUnknown_20371F8
ldr r1, _080EF0B0 @ =gPlttBufferUnfaded
mov r8, r1
add r0, r8
mov r2, r9
@@ -557,7 +557,7 @@ _080EF0A0: .4byte gUnknown_3004FF0
_080EF0A4: .4byte gSprites
_080EF0A8: .4byte 0x0000d709
_080EF0AC: .4byte 0x0000d70a
_080EF0B0: .4byte gUnknown_20371F8
_080EF0B0: .4byte gPlttBufferUnfaded
thumb_func_end sub_80EEFC8
thumb_func_start sub_80EF0B4
@@ -2684,7 +2684,7 @@ _080F014E:
strh r0, [r4, 0x2E]
b _080F017C
_080F0156:
ldr r0, _080F0184 @ =gUnknown_2037AB8
ldr r0, _080F0184 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -2707,7 +2707,7 @@ _080F017C:
pop {r0}
bx r0
.align 2, 0
_080F0184: .4byte gUnknown_2037AB8
_080F0184: .4byte gPaletteFade
_080F0188: .4byte sub_80F018C
thumb_func_end sub_80F00A4
@@ -4953,7 +4953,7 @@ sub_80F12E0: @ 80F12E0
_080F1330: .4byte gTasks
_080F1334: .4byte gUnknown_840C1C4
_080F1338:
ldr r0, _080F1368 @ =gUnknown_2037AB8
ldr r0, _080F1368 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -4977,7 +4977,7 @@ _080F1360:
pop {r0}
bx r0
.align 2, 0
_080F1368: .4byte gUnknown_2037AB8
_080F1368: .4byte gPaletteFade
_080F136C: .4byte 0x00007fff
thumb_func_end sub_80F12E0
@@ -4987,7 +4987,7 @@ sub_80F1370: @ 80F1370
sub sp, 0x4
lsls r0, 24
lsrs r2, r0, 24
ldr r0, _080F13B0 @ =gUnknown_2037AB8
ldr r0, _080F13B0 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -5016,7 +5016,7 @@ _080F13A8:
pop {r0}
bx r0
.align 2, 0
_080F13B0: .4byte gUnknown_2037AB8
_080F13B0: .4byte gPaletteFade
_080F13B4: .4byte gTasks
_080F13B8: .4byte 0x00007fff
_080F13BC: .4byte sub_80F13C0
asm/battle_controller_oak.s
+34 -34
View File
@@ -464,7 +464,7 @@ _080E792A:
thumb_func_start sub_80E7930
sub_80E7930: @ 80E7930
push {lr}
ldr r0, _080E7960 @ =gUnknown_2037AB8
ldr r0, _080E7960 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -487,7 +487,7 @@ _080E795A:
pop {r0}
bx r0
.align 2, 0
_080E7960: .4byte gUnknown_2037AB8
_080E7960: .4byte gPaletteFade
_080E7964: .4byte gMain
_080E7968: .4byte 0x00000439
_080E796C: .4byte gUnknown_3004F80
@@ -536,7 +536,7 @@ _080E79B4: .4byte gActiveBattler
thumb_func_start sub_80E79B8
sub_80E79B8: @ 80E79B8
push {r4,lr}
ldr r0, _080E79FC @ =gUnknown_2037AB8
ldr r0, _080E79FC @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -568,7 +568,7 @@ _080E79F6:
pop {r0}
bx r0
.align 2, 0
_080E79FC: .4byte gUnknown_2037AB8
_080E79FC: .4byte gPaletteFade
_080E7A00: .4byte gUnknown_3004FE0
_080E7A04: .4byte gActiveBattler
_080E7A08: .4byte sub_80E7A14
@@ -584,7 +584,7 @@ sub_80E7A14: @ 80E7A14
ldr r0, _080E7A48 @ =sub_8011100
cmp r1, r0
bne _080E7A6A
ldr r0, _080E7A4C @ =gUnknown_2037AB8
ldr r0, _080E7A4C @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -603,7 +603,7 @@ sub_80E7A14: @ 80E7A14
.align 2, 0
_080E7A44: .4byte gMain
_080E7A48: .4byte sub_8011100
_080E7A4C: .4byte gUnknown_2037AB8
_080E7A4C: .4byte gPaletteFade
_080E7A50: .4byte gUnknown_203B0C0
_080E7A54: .4byte gUnknown_203B0C1
_080E7A58: .4byte gUnknown_203B0DC
@@ -622,7 +622,7 @@ _080E7A6A:
thumb_func_start sub_80E7A70
sub_80E7A70: @ 80E7A70
push {lr}
ldr r0, _080E7AA8 @ =gUnknown_2037AB8
ldr r0, _080E7AA8 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -646,7 +646,7 @@ sub_80E7A70: @ 80E7A70
bl sub_8107ECC
b _080E7AC0
.align 2, 0
_080E7AA8: .4byte gUnknown_2037AB8
_080E7AA8: .4byte gPaletteFade
_080E7AAC: .4byte gUnknown_3004FE0
_080E7AB0: .4byte gActiveBattler
_080E7AB4: .4byte sub_80E7AC4
@@ -666,7 +666,7 @@ sub_80E7AC4: @ 80E7AC4
ldr r0, _080E7B18 @ =sub_8011100
cmp r1, r0
bne _080E7B42
ldr r0, _080E7B1C @ =gUnknown_2037AB8
ldr r0, _080E7B1C @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -700,7 +700,7 @@ sub_80E7AC4: @ 80E7AC4
.align 2, 0
_080E7B14: .4byte gMain
_080E7B18: .4byte sub_8011100
_080E7B1C: .4byte gUnknown_2037AB8
_080E7B1C: .4byte gPaletteFade
_080E7B20: .4byte gUnknown_203AD30
_080E7B24: .4byte gBattleTypeFlags
_080E7B28: .4byte gUnknown_3004FE0
@@ -1731,7 +1731,7 @@ _080E8384:
.4byte _080E8500
.4byte _080E8530
_080E83A8:
ldr r0, _080E83EC @ =gUnknown_2037AB8
ldr r0, _080E83EC @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1763,9 +1763,9 @@ _080E83BA:
ldr r1, [r7]
b _080E8522
.align 2, 0
_080E83EC: .4byte gUnknown_2037AB8
_080E83EC: .4byte gPaletteFade
_080E83F0:
ldr r0, _080E8404 @ =gUnknown_2037AB8
ldr r0, _080E8404 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1776,7 +1776,7 @@ _080E83FE:
bl sub_80EB30C
b _080E851E
.align 2, 0
_080E8404: .4byte gUnknown_2037AB8
_080E8404: .4byte gPaletteFade
_080E8408:
ldr r0, _080E8418 @ =gUnknown_83FDAE2
bl BattleStringExpandPlaceholdersToDisplayedString
@@ -1823,7 +1823,7 @@ _080E8430:
_080E8460: .4byte gBitTable
_080E8464: .4byte gBattleStruct
_080E8468:
ldr r0, _080E8484 @ =gUnknown_2037AB8
ldr r0, _080E8484 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1836,7 +1836,7 @@ _080E8468:
bl sub_80D87BC
b _080E851E
.align 2, 0
_080E8484: .4byte gUnknown_2037AB8
_080E8484: .4byte gPaletteFade
_080E8488: .4byte gUnknown_83FDB92
_080E848C: .4byte gDisplayedStringBattle
_080E8490:
@@ -1873,7 +1873,7 @@ _080E8490:
_080E84D0: .4byte gBitTable
_080E84D4: .4byte gBattleStruct
_080E84D8:
ldr r0, _080E84F4 @ =gUnknown_2037AB8
ldr r0, _080E84F4 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1886,7 +1886,7 @@ _080E84D8:
bl sub_80D87BC
b _080E851E
.align 2, 0
_080E84F4: .4byte gUnknown_2037AB8
_080E84F4: .4byte gPaletteFade
_080E84F8: .4byte gUnknown_83FDBEF
_080E84FC: .4byte gDisplayedStringBattle
_080E8500:
@@ -1915,7 +1915,7 @@ _080E8522:
.align 2, 0
_080E852C: .4byte gBattleStruct
_080E8530:
ldr r0, _080E8568 @ =gUnknown_2037AB8
ldr r0, _080E8568 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1940,7 +1940,7 @@ _080E855E:
pop {r0}
bx r0
.align 2, 0
_080E8568: .4byte gUnknown_2037AB8
_080E8568: .4byte gPaletteFade
_080E856C: .4byte gBattleStruct
thumb_func_end sub_80E835C
@@ -2070,7 +2070,7 @@ _080E8634:
ldr r1, [r5]
b _080E86A6
_080E865A:
ldr r0, _080E866C @ =gUnknown_2037AB8
ldr r0, _080E866C @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -2079,7 +2079,7 @@ _080E865A:
bl sub_80EB30C
b _080E86A2
.align 2, 0
_080E866C: .4byte gUnknown_2037AB8
_080E866C: .4byte gPaletteFade
_080E8670:
adds r0, r2, 0
bl BattleStringExpandPlaceholdersToDisplayedString
@@ -2115,7 +2115,7 @@ _080E86A6:
.align 2, 0
_080E86B0: .4byte gBattleStruct
_080E86B4:
ldr r0, _080E86D8 @ =gUnknown_2037AB8
ldr r0, _080E86D8 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -2131,7 +2131,7 @@ _080E86B4:
bl WallyBufferExecCompleted
b _080E86E4
.align 2, 0
_080E86D8: .4byte gUnknown_2037AB8
_080E86D8: .4byte gPaletteFade
_080E86DC: .4byte gActiveBattler
_080E86E0:
bl OpponentBufferExecCompleted
@@ -2184,7 +2184,7 @@ _080E872C:
.4byte _080E8848
.4byte _080E8880
_080E8748:
ldr r0, _080E8780 @ =gUnknown_2037AB8
ldr r0, _080E8780 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -2211,10 +2211,10 @@ _080E875A:
ldr r1, [r5]
b _080E886C
.align 2, 0
_080E8780: .4byte gUnknown_2037AB8
_080E8780: .4byte gPaletteFade
_080E8784: .4byte gActiveBattler
_080E8788:
ldr r0, _080E87C8 @ =gUnknown_2037AB8
ldr r0, _080E87C8 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -2247,10 +2247,10 @@ _080E879A:
ldr r1, [r5]
b _080E886C
.align 2, 0
_080E87C8: .4byte gUnknown_2037AB8
_080E87C8: .4byte gPaletteFade
_080E87CC: .4byte gBitTable
_080E87D0:
ldr r0, _080E87E4 @ =gUnknown_2037AB8
ldr r0, _080E87E4 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -2259,7 +2259,7 @@ _080E87D0:
bl sub_80EB30C
b _080E8868
.align 2, 0
_080E87E4: .4byte gUnknown_2037AB8
_080E87E4: .4byte gPaletteFade
_080E87E8:
ldr r0, _080E87F8 @ =gUnknown_83FDCD2
bl BattleStringExpandPlaceholdersToDisplayedString
@@ -2304,7 +2304,7 @@ _080E8800:
_080E8840: .4byte gBitTable
_080E8844: .4byte gBattleStruct
_080E8848:
ldr r0, _080E8878 @ =gUnknown_2037AB8
ldr r0, _080E8878 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -2329,10 +2329,10 @@ _080E886C:
strb r0, [r1]
b _080E88AA
.align 2, 0
_080E8878: .4byte gUnknown_2037AB8
_080E8878: .4byte gPaletteFade
_080E887C: .4byte gBattleStruct
_080E8880:
ldr r0, _080E88B4 @ =gUnknown_2037AB8
ldr r0, _080E88B4 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -2356,7 +2356,7 @@ _080E88AA:
pop {r0}
bx r0
.align 2, 0
_080E88B4: .4byte gUnknown_2037AB8
_080E88B4: .4byte gPaletteFade
_080E88B8: .4byte gUnknown_203AD30
_080E88BC: .4byte gBattleStruct
thumb_func_end sub_80E8704
asm/battle_controller_player.s
+12 -12
View File
@@ -2396,7 +2396,7 @@ _0802F6A4: .4byte sub_8011A1C
thumb_func_start sub_802F6A8
sub_802F6A8: @ 802F6A8
push {lr}
ldr r0, _0802F6D0 @ =gUnknown_2037AB8
ldr r0, _0802F6D0 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -2415,7 +2415,7 @@ sub_802F6A8: @ 802F6A8
bl sub_800AAC0
b _0802F6E0
.align 2, 0
_0802F6D0: .4byte gUnknown_2037AB8
_0802F6D0: .4byte gPaletteFade
_0802F6D4: .4byte gBattleTypeFlags
_0802F6D8: .4byte gUnknown_3003F3C
_0802F6DC:
@@ -4293,7 +4293,7 @@ _08030622:
thumb_func_start sub_8030628
sub_8030628: @ 8030628
push {r4,lr}
ldr r0, _0803066C @ =gUnknown_2037AB8
ldr r0, _0803066C @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -4325,7 +4325,7 @@ _08030666:
pop {r0}
bx r0
.align 2, 0
_0803066C: .4byte gUnknown_2037AB8
_0803066C: .4byte gPaletteFade
_08030670: .4byte gUnknown_3004FE0
_08030674: .4byte gActiveBattler
_08030678: .4byte sub_8030684
@@ -4341,7 +4341,7 @@ sub_8030684: @ 8030684
ldr r0, _080306B8 @ =sub_8011100
cmp r1, r0
bne _080306F4
ldr r0, _080306BC @ =gUnknown_2037AB8
ldr r0, _080306BC @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -4360,7 +4360,7 @@ sub_8030684: @ 8030684
.align 2, 0
_080306B4: .4byte gMain
_080306B8: .4byte sub_8011100
_080306BC: .4byte gUnknown_2037AB8
_080306BC: .4byte gPaletteFade
_080306C0: .4byte gUnknown_203B0C0
_080306C4: .4byte gUnknown_203B0C1
_080306C8: .4byte gUnknown_203B0DC
@@ -4395,7 +4395,7 @@ _080306FC: .4byte gActiveBattler
thumb_func_start sub_8030700
sub_8030700: @ 8030700
push {lr}
ldr r0, _0803072C @ =gUnknown_2037AB8
ldr r0, _0803072C @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -4415,7 +4415,7 @@ _08030728:
pop {r0}
bx r0
.align 2, 0
_0803072C: .4byte gUnknown_2037AB8
_0803072C: .4byte gPaletteFade
_08030730: .4byte gUnknown_3004FE0
_08030734: .4byte gActiveBattler
_08030738: .4byte CompleteWhenChoseItem
@@ -4429,7 +4429,7 @@ CompleteWhenChoseItem: @ 803073C
ldr r0, _0803076C @ =sub_8011100
cmp r1, r0
bne _08030762
ldr r0, _08030770 @ =gUnknown_2037AB8
ldr r0, _08030770 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -4446,7 +4446,7 @@ _08030762:
.align 2, 0
_08030768: .4byte gMain
_0803076C: .4byte sub_8011100
_08030770: .4byte gUnknown_2037AB8
_08030770: .4byte gPaletteFade
_08030774: .4byte gUnknown_203AD30
thumb_func_end CompleteWhenChoseItem
@@ -4570,7 +4570,7 @@ _08030848:
ldrh r1, [r4]
movs r0, 0xD
muls r1, r0
ldr r0, _080308A4 @ =gUnknown_8247094
ldr r0, _080308A4 @ =gMoveNames
adds r1, r0
adds r0, r6, 0
bl StringAppend
@@ -4599,7 +4599,7 @@ _08030894: .4byte gUnknown_2022BC8
_08030898: .4byte gUnknown_3004FF8
_0803089C: .4byte gDisplayedStringBattle
_080308A0: .4byte gUnknown_83FE770
_080308A4: .4byte gUnknown_8247094
_080308A4: .4byte gMoveNames
thumb_func_end sub_8030830
thumb_func_start MoveSelectionDisplayPpString
asm/battle_controller_pokedude.s
+26 -26
View File
@@ -227,7 +227,7 @@ _0815624E:
thumb_func_start sub_8156254
sub_8156254: @ 8156254
push {lr}
ldr r0, _08156284 @ =gUnknown_2037AB8
ldr r0, _08156284 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -250,7 +250,7 @@ _0815627E:
pop {r0}
bx r0
.align 2, 0
_08156284: .4byte gUnknown_2037AB8
_08156284: .4byte gPaletteFade
_08156288: .4byte gMain
_0815628C: .4byte 0x00000439
_08156290: .4byte gUnknown_3004F80
@@ -550,7 +550,7 @@ sub_81564E4: @ 81564E4
thumb_func_start sub_81564F0
sub_81564F0: @ 81564F0
push {lr}
ldr r0, _08156524 @ =gUnknown_2037AB8
ldr r0, _08156524 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -574,7 +574,7 @@ _08156520:
pop {r0}
bx r0
.align 2, 0
_08156524: .4byte gUnknown_2037AB8
_08156524: .4byte gPaletteFade
_08156528: .4byte gUnknown_3004FE0
_0815652C: .4byte gActiveBattler
_08156530: .4byte sub_8156538
@@ -589,7 +589,7 @@ sub_8156538: @ 8156538
ldr r0, _0815656C @ =sub_8011100
cmp r1, r0
bne _0815658E
ldr r0, _08156570 @ =gUnknown_2037AB8
ldr r0, _08156570 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -608,7 +608,7 @@ sub_8156538: @ 8156538
.align 2, 0
_08156568: .4byte gMain
_0815656C: .4byte sub_8011100
_08156570: .4byte gUnknown_2037AB8
_08156570: .4byte gPaletteFade
_08156574: .4byte gUnknown_203B0C0
_08156578: .4byte gUnknown_203B0C1
_0815657C: .4byte gUnknown_203B0DC
@@ -627,7 +627,7 @@ _0815658E:
thumb_func_start sub_8156594
sub_8156594: @ 8156594
push {lr}
ldr r0, _081565C8 @ =gUnknown_2037AB8
ldr r0, _081565C8 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -652,7 +652,7 @@ _081565C4:
movs r0, 0x7
b _081565DE
.align 2, 0
_081565C8: .4byte gUnknown_2037AB8
_081565C8: .4byte gPaletteFade
_081565CC: .4byte gUnknown_3004FE0
_081565D0: .4byte gActiveBattler
_081565D4: .4byte sub_81565E8
@@ -674,7 +674,7 @@ sub_81565E8: @ 81565E8
ldr r0, _08156618 @ =sub_8011100
cmp r1, r0
bne _0815660E
ldr r0, _0815661C @ =gUnknown_2037AB8
ldr r0, _0815661C @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -691,7 +691,7 @@ _0815660E:
.align 2, 0
_08156614: .4byte gMain
_08156618: .4byte sub_8011100
_0815661C: .4byte gUnknown_2037AB8
_0815661C: .4byte gPaletteFade
_08156620: .4byte gUnknown_203AD30
thumb_func_end sub_81565E8
@@ -7222,7 +7222,7 @@ _08159BDC:
.4byte _08159C64
.4byte _08159CB4
_08159BF0:
ldr r0, _08159C10 @ =gUnknown_2037AB8
ldr r0, _08159C10 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -7238,9 +7238,9 @@ _08159BF0:
movs r3, 0x8
b _08159C90
.align 2, 0
_08159C10: .4byte gUnknown_2037AB8
_08159C10: .4byte gPaletteFade
_08159C14:
ldr r0, _08159C3C @ =gUnknown_2037AB8
ldr r0, _08159C3C @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -7259,7 +7259,7 @@ _08159C14:
adds r0, r5
b _08159C9E
.align 2, 0
_08159C3C: .4byte gUnknown_2037AB8
_08159C3C: .4byte gPaletteFade
_08159C40: .4byte gUnknown_2022976
_08159C44:
ldr r1, _08159C5C @ =gUnknown_2022976
@@ -7314,7 +7314,7 @@ _08159CA8: .4byte gMain
_08159CAC: .4byte gUnknown_3005EE0
_08159CB0: .4byte gActiveBattler
_08159CB4:
ldr r0, _08159CF8 @ =gUnknown_2037AB8
ldr r0, _08159CF8 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -7346,7 +7346,7 @@ _08159CEE:
pop {r0}
bx r0
.align 2, 0
_08159CF8: .4byte gUnknown_2037AB8
_08159CF8: .4byte gPaletteFade
_08159CFC: .4byte 0x00000137
_08159D00: .4byte gUnknown_2022976
thumb_func_end sub_8159BA8
@@ -7386,7 +7386,7 @@ _08159D34:
.4byte _08159E64
.4byte _08159EA4
_08159D50:
ldr r0, _08159D90 @ =gUnknown_2037AB8
ldr r0, _08159D90 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -7417,10 +7417,10 @@ _08159D62:
movs r3, 0x8
b _08159E80
.align 2, 0
_08159D90: .4byte gUnknown_2037AB8
_08159D90: .4byte gPaletteFade
_08159D94: .4byte gBattleStruct
_08159D98:
ldr r0, _08159DD0 @ =gUnknown_2037AB8
ldr r0, _08159DD0 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -7449,11 +7449,11 @@ _08159DAA:
str r3, [sp]
b _08159E7A
.align 2, 0
_08159DD0: .4byte gUnknown_2037AB8
_08159DD0: .4byte gPaletteFade
_08159DD4: .4byte gBitTable
_08159DD8: .4byte gBattleStruct
_08159DDC:
ldr r0, _08159DF0 @ =gUnknown_2037AB8
ldr r0, _08159DF0 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -7464,7 +7464,7 @@ _08159DEA:
bl sub_80EB30C
b _08159E84
.align 2, 0
_08159DF0: .4byte gUnknown_2037AB8
_08159DF0: .4byte gPaletteFade
_08159DF4:
bl sub_8159EF0
bl BattleStringExpandPlaceholdersToDisplayedString
@@ -7515,7 +7515,7 @@ _08159E58: .4byte gMain
_08159E5C: .4byte gBitTable
_08159E60: .4byte gBattleStruct
_08159E64:
ldr r0, _08159E98 @ =gUnknown_2037AB8
ldr r0, _08159E98 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -7544,11 +7544,11 @@ _08159E84:
strb r0, [r1, 0x2]
b _08159EDE
.align 2, 0
_08159E98: .4byte gUnknown_2037AB8
_08159E98: .4byte gPaletteFade
_08159E9C: .4byte gUnknown_3005EE0
_08159EA0: .4byte gActiveBattler
_08159EA4:
ldr r0, _08159EE8 @ =gUnknown_2037AB8
ldr r0, _08159EE8 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -7578,7 +7578,7 @@ _08159EDE:
pop {r0}
bx r0
.align 2, 0
_08159EE8: .4byte gUnknown_2037AB8
_08159EE8: .4byte gPaletteFade
_08159EEC: .4byte 0x00000137
thumb_func_end sub_8159D04
asm/battle_controller_safari.s
+6 -6
View File
@@ -330,7 +330,7 @@ _080DD7AC: .4byte SpriteCallbackDummy
thumb_func_start sub_80DD7B0
sub_80DD7B0: @ 80DD7B0
push {lr}
ldr r0, _080DD7E0 @ =gUnknown_2037AB8
ldr r0, _080DD7E0 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -353,7 +353,7 @@ _080DD7DA:
pop {r0}
bx r0
.align 2, 0
_080DD7E0: .4byte gUnknown_2037AB8
_080DD7E0: .4byte gPaletteFade
_080DD7E4: .4byte gMain
_080DD7E8: .4byte 0x00000439
_080DD7EC: .4byte gUnknown_3004F80
@@ -394,7 +394,7 @@ _080DD828: .4byte gActiveBattler
thumb_func_start sub_80DD82C
sub_80DD82C: @ 80DD82C
push {lr}
ldr r0, _080DD84C @ =gUnknown_2037AB8
ldr r0, _080DD84C @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -411,7 +411,7 @@ _080DD848:
pop {r0}
bx r0
.align 2, 0
_080DD84C: .4byte gUnknown_2037AB8
_080DD84C: .4byte gPaletteFade
_080DD850: .4byte gUnknown_3004FE0
_080DD854: .4byte gActiveBattler
_080DD858: .4byte CompleteWhenChosePokeblock
@@ -425,7 +425,7 @@ CompleteWhenChosePokeblock: @ 80DD85C
ldr r0, _080DD88C @ =sub_8011100
cmp r1, r0
bne _080DD882
ldr r0, _080DD890 @ =gUnknown_2037AB8
ldr r0, _080DD890 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -442,7 +442,7 @@ _080DD882:
.align 2, 0
_080DD888: .4byte gMain
_080DD88C: .4byte sub_8011100
_080DD890: .4byte gUnknown_2037AB8
_080DD890: .4byte gPaletteFade
_080DD894: .4byte gUnknown_203AD30
thumb_func_end CompleteWhenChosePokeblock
asm/battle_gfx_sfx_util.s
+16 -16
View File
@@ -854,9 +854,9 @@ _0803443C:
movs r2, 0x6
bl BlendPalette
lsls r1, r7, 1
ldr r0, _0803448C @ =gUnknown_20375F8
ldr r0, _0803448C @ =gPlttBufferFaded
adds r0, r1, r0
ldr r2, _08034490 @ =gUnknown_20371F8
ldr r2, _08034490 @ =gPlttBufferUnfaded
adds r1, r2
ldr r2, _08034494 @ =0x04000008
bl CpuSet
@@ -875,8 +875,8 @@ _0803447C: .4byte gBattleStruct
_08034480: .4byte gBattleMonForms
_08034484: .4byte gUnknown_2024018
_08034488: .4byte 0x00007fff
_0803448C: .4byte gUnknown_20375F8
_08034490: .4byte gUnknown_20371F8
_0803448C: .4byte gPlttBufferFaded
_08034490: .4byte gPlttBufferUnfaded
_08034494: .4byte 0x04000008
thumb_func_end BattleLoadOpponentMonSpriteGfx
@@ -1059,9 +1059,9 @@ _080345FC:
movs r2, 0x6
bl BlendPalette
lsls r1, r7, 1
ldr r0, _0803464C @ =gUnknown_20375F8
ldr r0, _0803464C @ =gPlttBufferFaded
adds r0, r1, r0
ldr r2, _08034650 @ =gUnknown_20371F8
ldr r2, _08034650 @ =gPlttBufferUnfaded
adds r1, r2
ldr r2, _08034654 @ =0x04000008
bl CpuSet
@@ -1080,8 +1080,8 @@ _0803463C: .4byte gBattleStruct
_08034640: .4byte gBattleMonForms
_08034644: .4byte gUnknown_2024018
_08034648: .4byte 0x00007fff
_0803464C: .4byte gUnknown_20375F8
_08034650: .4byte gUnknown_20371F8
_0803464C: .4byte gPlttBufferFaded
_08034650: .4byte gPlttBufferUnfaded
_08034654: .4byte 0x04000008
thumb_func_end sub_8034498
@@ -2029,9 +2029,9 @@ _08034D88:
bl BlendPalette
mov r3, r10
lsls r1, r3, 1
ldr r0, _08034E40 @ =gUnknown_20375F8
ldr r0, _08034E40 @ =gPlttBufferFaded
adds r0, r1, r0
ldr r2, _08034E44 @ =gUnknown_20371F8
ldr r2, _08034E44 @ =gPlttBufferUnfaded
adds r1, r2
ldr r2, _08034E48 @ =0x04000008
bl CpuSet
@@ -2054,8 +2054,8 @@ _08034E30: .4byte gUnknown_2024018
_08034E34: .4byte gBattleStruct
_08034E38: .4byte gBattleMonForms
_08034E3C: .4byte 0x00007fff
_08034E40: .4byte gUnknown_20375F8
_08034E44: .4byte gUnknown_20371F8
_08034E40: .4byte gPlttBufferFaded
_08034E44: .4byte gPlttBufferUnfaded
_08034E48: .4byte 0x04000008
_08034E4C:
mov r0, r9
@@ -2263,9 +2263,9 @@ _08034FFC:
bl BlendPalette
mov r2, r10
lsls r1, r2, 1
ldr r0, _080350AC @ =gUnknown_20375F8
ldr r0, _080350AC @ =gPlttBufferFaded
adds r0, r1, r0
ldr r2, _080350B0 @ =gUnknown_20371F8
ldr r2, _080350B0 @ =gPlttBufferUnfaded
adds r1, r2
ldr r2, _080350B4 @ =0x04000008
bl CpuSet
@@ -2327,8 +2327,8 @@ _0803509C: .4byte 0x00000181
_080350A0: .4byte gBattleStruct
_080350A4: .4byte gBattleMonForms
_080350A8: .4byte 0x00007fff
_080350AC: .4byte gUnknown_20375F8
_080350B0: .4byte gUnknown_20371F8
_080350AC: .4byte gPlttBufferFaded
_080350B0: .4byte gPlttBufferUnfaded
_080350B4: .4byte 0x04000008
_080350B8: .4byte gUnknown_2024018
thumb_func_end sub_8034BF4
asm/battle_interface.s
+2 -2
View File
@@ -4066,7 +4066,7 @@ _08049AF4:
movs r2, 0x2
bl FillPalette
lsls r4, 1
ldr r0, _08049BCC @ =gUnknown_20373F8
ldr r0, _08049BCC @ =gPlttBufferUnfaded + 0x200
adds r0, r4, r0
ldr r1, _08049BD0 @ =0x05000200
adds r4, r1
@@ -4145,7 +4145,7 @@ _08049BB6:
.align 2, 0
_08049BC4: .4byte gSprites
_08049BC8: .4byte gUnknown_826055A
_08049BCC: .4byte gUnknown_20373F8
_08049BCC: .4byte gPlttBufferUnfaded + 0x200
_08049BD0: .4byte 0x05000200
_08049BD4: .4byte 0x06010000
_08049BD8: .4byte 0x04000018
asm/battle_message.s
+14 -14
View File
@@ -473,7 +473,7 @@ _080D762C:
ldrh r2, [r2]
movs r1, 0xD
muls r1, r2
ldr r2, _080D764C @ =gUnknown_8247094
ldr r2, _080D764C @ =gMoveNames
adds r1, r2
bl StringCopy
_080D763C:
@@ -483,7 +483,7 @@ _080D763C:
b _080D77DC
.align 2, 0
_080D7648: .4byte gBattleTextBuff2
_080D764C: .4byte gUnknown_8247094
_080D764C: .4byte gMoveNames
_080D7650: .4byte gUnknown_83FD57B
_080D7654:
ldr r4, _080D7694 @ =gBattleTextBuff1
@@ -1505,11 +1505,11 @@ _080D7ED4:
_080D7ED6:
movs r0, 0xD
muls r1, r0
ldr r0, _080D7EE0 @ =gUnknown_8247094
ldr r0, _080D7EE0 @ =gMoveNames
adds r4, r1, r0
b _080D8382
.align 2, 0
_080D7EE0: .4byte gUnknown_8247094
_080D7EE0: .4byte gMoveNames
_080D7EE4:
ldr r0, _080D7F1C @ =gBattleTypeFlags
ldr r1, [r0]
@@ -1834,11 +1834,11 @@ _080D8162:
lsls r0, r7, 3
subs r0, r7
lsls r0, 2
ldr r1, _080D8170 @ =gUnknown_2022744
ldr r1, _080D8170 @ =gLinkPlayers + 8
adds r4, r0, r1
b _080D8382
.align 2, 0
_080D8170: .4byte gUnknown_2022744
_080D8170: .4byte gLinkPlayers + 8
_080D8174:
ldr r4, _080D8184 @ =gLinkPlayers
lsls r0, r7, 3
@@ -1888,12 +1888,12 @@ _080D81C8:
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
ldr r0, _080D81D8 @ =gUnknown_2022744
ldr r0, _080D81D8 @ =gLinkPlayers + 8
adds r4, r1, r0
b _080D8382
.align 2, 0
_080D81D4: .4byte gBattleScripting
_080D81D8: .4byte gUnknown_2022744
_080D81D8: .4byte gLinkPlayers + 8
_080D81DC:
ldr r0, _080D81E4 @ =gSaveBlock2Ptr
ldr r4, [r0]
@@ -2294,11 +2294,11 @@ _080D84EC:
orrs r1, r0
movs r0, 0xD
muls r1, r0
ldr r0, _080D8500 @ =gUnknown_8247094
ldr r0, _080D8500 @ =gMoveNames
adds r1, r0
b _080D868E
.align 2, 0
_080D8500: .4byte gUnknown_8247094
_080D8500: .4byte gMoveNames
_080D8504:
adds r0, r5, r7
ldrb r0, [r0, 0x1]
@@ -2958,7 +2958,7 @@ SetPpNumbersPaletteInMoveSelection: @ 80D89DC
ldrb r1, [r1]
bl GetCurrentPpToMaxPpState
lsls r0, 24
ldr r5, _080D8A48 @ =gUnknown_20371F8
ldr r5, _080D8A48 @ =gPlttBufferUnfaded
lsrs r0, 22
adds r0, r4
ldrh r1, [r0]
@@ -2968,7 +2968,7 @@ SetPpNumbersPaletteInMoveSelection: @ 80D89DC
ldrh r0, [r0, 0x2]
adds r5, 0xB6
strh r0, [r5]
ldr r4, _080D8A4C @ =gUnknown_20376B0
ldr r4, _080D8A4C @ =gPlttBufferFaded + 0xB8
adds r0, r2, 0
adds r1, r4, 0
movs r2, 0x1
@@ -2986,8 +2986,8 @@ _080D8A38: .4byte gActiveBattler
_080D8A3C: .4byte gUnknown_2022BC8
_080D8A40: .4byte gUnknown_8D2FBB4
_080D8A44: .4byte gUnknown_2023FFC
_080D8A48: .4byte gUnknown_20371F8
_080D8A4C: .4byte gUnknown_20376B0
_080D8A48: .4byte gPlttBufferUnfaded
_080D8A4C: .4byte gPlttBufferFaded + 0xB8
thumb_func_end SetPpNumbersPaletteInMoveSelection
thumb_func_start GetCurrentPpToMaxPpState
asm/battle_records.s
+4 -4
View File
@@ -189,7 +189,7 @@ sub_80CD3B8: @ 80CD3B8
push {lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r0, _080CD3DC @ =gUnknown_2037AB8
ldr r0, _080CD3DC @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -206,7 +206,7 @@ _080CD3D8:
pop {r0}
bx r0
.align 2, 0
_080CD3DC: .4byte gUnknown_2037AB8
_080CD3DC: .4byte gPaletteFade
_080CD3E0: .4byte gTasks
_080CD3E4: .4byte sub_80CD3E8
thumb_func_end sub_80CD3B8
@@ -281,7 +281,7 @@ sub_80CD460: @ 80CD460
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _080CD498 @ =gUnknown_2037AB8
ldr r0, _080CD498 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -302,7 +302,7 @@ _080CD490:
pop {r0}
bx r0
.align 2, 0
_080CD498: .4byte gUnknown_2037AB8
_080CD498: .4byte gPaletteFade
_080CD49C: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
_080CD4A0: .4byte gUnknown_2039A1C
thumb_func_end sub_80CD460
asm/battle_script_commands.s
+16 -16
View File
@@ -15654,7 +15654,7 @@ _0802549C:
.align 2, 0
_080254A4: .4byte gBattleScripting
_080254A8:
ldr r0, _080254E4 @ =gUnknown_2037AB8
ldr r0, _080254E4 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -15684,7 +15684,7 @@ _080254D8:
strb r0, [r1, 0x1F]
b _080256D0
.align 2, 0
_080254E4: .4byte gUnknown_2037AB8
_080254E4: .4byte gPaletteFade
_080254E8: .4byte gPlayerParty
_080254EC: .4byte gBattleStruct
_080254F0: .4byte gPlayerPartyCount
@@ -15692,7 +15692,7 @@ _080254F4: .4byte sub_8077764
_080254F8: .4byte gMoveToLearn
_080254FC: .4byte gBattleScripting
_08025500:
ldr r0, _0802552C @ =gUnknown_2037AB8
ldr r0, _0802552C @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -15716,7 +15716,7 @@ _0802551A:
strb r5, [r0, 0x1F]
b _080256D0
.align 2, 0
_0802552C: .4byte gUnknown_2037AB8
_0802552C: .4byte gPaletteFade
_08025530: .4byte gMain
_08025534: .4byte sub_8011100
_08025538: .4byte gBattleScripting
@@ -32443,7 +32443,7 @@ _0802DA24:
.align 2, 0
_0802DA38: .4byte 0x00007fff
_0802DA3C:
ldr r0, _0802DA5C @ =gUnknown_2037AB8
ldr r0, _0802DA5C @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -32458,10 +32458,10 @@ _0802DA4A:
strb r0, [r1, 0x1]
b _0802DB36
.align 2, 0
_0802DA5C: .4byte gUnknown_2037AB8
_0802DA5C: .4byte gPaletteFade
_0802DA60: .4byte gUnknown_2023E82
_0802DA64:
ldr r0, _0802DAAC @ =gUnknown_2037AB8
ldr r0, _0802DAAC @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -32497,7 +32497,7 @@ _0802DA72:
strb r0, [r4]
b _0802DB6C
.align 2, 0
_0802DAAC: .4byte gUnknown_2037AB8
_0802DAAC: .4byte gPaletteFade
_0802DAB0: .4byte gMain
_0802DAB4: .4byte sub_8011100
_0802DAB8: .4byte gTasks
@@ -32539,7 +32539,7 @@ _0802DAE0:
bl sub_810C1CC
str r4, [sp, 0x14]
add r0, sp, 0x14
ldr r1, _0802DB48 @ =gUnknown_20375F8
ldr r1, _0802DB48 @ =gPlttBufferFaded
ldr r2, _0802DB4C @ =0x05000080
bl CpuSet
ldr r0, _0802DB50 @ =0x0001ffff
@@ -32562,12 +32562,12 @@ _0802DB36:
.align 2, 0
_0802DB40: .4byte gBattleMons
_0802DB44: .4byte 0x0000ffff
_0802DB48: .4byte gUnknown_20375F8
_0802DB48: .4byte gPlttBufferFaded
_0802DB4C: .4byte 0x05000080
_0802DB50: .4byte 0x0001ffff
_0802DB54: .4byte gUnknown_2023E82
_0802DB58:
ldr r0, _0802DB74 @ =gUnknown_2037AB8
ldr r0, _0802DB74 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -32583,7 +32583,7 @@ _0802DB6C:
pop {r0}
bx r0
.align 2, 0
_0802DB74: .4byte gUnknown_2037AB8
_0802DB74: .4byte gPaletteFade
_0802DB78: .4byte gUnknown_2023D74
thumb_func_end sub_802D9D8
@@ -32946,7 +32946,7 @@ _0802DE36:
.align 2, 0
_0802DE3C: .4byte gUnknown_2023E82
_0802DE40:
ldr r0, _0802DEFC @ =gUnknown_2037AB8
ldr r0, _0802DEFC @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -33035,7 +33035,7 @@ _0802DE4E:
strb r0, [r1]
b _0802DFA6
.align 2, 0
_0802DEFC: .4byte gUnknown_2037AB8
_0802DEFC: .4byte gPaletteFade
_0802DF00: .4byte gBattlerPartyIndexes
_0802DF04: .4byte sBattler_AI
_0802DF08: .4byte gEnemyParty
@@ -33048,7 +33048,7 @@ _0802DF18:
ldr r0, _0802DF58 @ =sub_8011100
cmp r1, r0
bne _0802DFA6
ldr r0, _0802DF5C @ =gUnknown_2037AB8
ldr r0, _0802DF5C @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -33075,7 +33075,7 @@ _0802DF18:
.align 2, 0
_0802DF54: .4byte gMain
_0802DF58: .4byte sub_8011100
_0802DF5C: .4byte gUnknown_2037AB8
_0802DF5C: .4byte gPaletteFade
_0802DF60: .4byte gBattlerPartyIndexes
_0802DF64: .4byte sBattler_AI
_0802DF68: .4byte gEnemyParty
asm/battle_setup.s
+2 -2
View File
@@ -757,7 +757,7 @@ sub_807FC5C: @ 807FC5C
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 16
lsrs r5, r0, 16
lsls r0, r5, 24
@@ -907,7 +907,7 @@ GetBattleTransitionTypeByMap: @ 807FD90
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 16
lsrs r4, r0, 16
bl sav1_get_flash_used_on_map
asm/battle_transition.s
+16 -16
View File
@@ -138,8 +138,8 @@ Transition_Phase1: @ 80D09B0
push {r4,lr}
adds r4, r0, 0
bl sub_807B05C
ldr r0, _080D09DC @ =gUnknown_20375F8
ldr r1, _080D09E0 @ =gUnknown_20371F8
ldr r0, _080D09DC @ =gPlttBufferFaded
ldr r1, _080D09E0 @ =gPlttBufferUnfaded
ldr r2, _080D09E4 @ =0x04000100
bl CpuSet
ldr r1, _080D09E8 @ =gUnknown_83FA320
@@ -155,8 +155,8 @@ Transition_Phase1: @ 80D09B0
movs r0, 0x1
b _080D09FA
.align 2, 0
_080D09DC: .4byte gUnknown_20375F8
_080D09E0: .4byte gUnknown_20371F8
_080D09DC: .4byte gPlttBufferFaded
_080D09E0: .4byte gPlttBufferUnfaded
_080D09E4: .4byte 0x04000100
_080D09E8: .4byte gUnknown_83FA320
_080D09EC:
@@ -407,7 +407,7 @@ _080D0B9E:
thumb_func_start sub_80D0BA8
sub_80D0BA8: @ 80D0BA8
push {lr}
ldr r0, _080D0BCC @ =gUnknown_2037AB8
ldr r0, _080D0BCC @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -423,7 +423,7 @@ _080D0BC4:
pop {r1}
bx r1
.align 2, 0
_080D0BCC: .4byte gUnknown_2037AB8
_080D0BCC: .4byte gPaletteFade
_080D0BD0: .4byte sub_80D0ADC
thumb_func_end sub_80D0BA8
@@ -533,7 +533,7 @@ sub_80D0C78: @ 80D0C78
adds r0, r3, 0
movs r3, 0x2
bl sub_80D3E74
ldr r0, _080D0CE8 @ =gUnknown_2037AB8
ldr r0, _080D0CE8 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -558,7 +558,7 @@ _080D0CCA:
.align 2, 0
_080D0CE0: .4byte gUnknown_2039A2C
_080D0CE4: .4byte gUnknown_2038700
_080D0CE8: .4byte gUnknown_2037AB8
_080D0CE8: .4byte gPaletteFade
_080D0CEC: .4byte sub_80D0BD4
thumb_func_end sub_80D0C78
@@ -733,7 +733,7 @@ _080D0E18:
lsrs r4, r0, 16
cmp r5, 0x9F
bls _080D0E18
ldr r0, _080D0E78 @ =gUnknown_2037AB8
ldr r0, _080D0E78 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -757,7 +757,7 @@ _080D0E5E:
.align 2, 0
_080D0E70: .4byte gUnknown_2039A2C
_080D0E74: .4byte gUnknown_2038700
_080D0E78: .4byte gUnknown_2037AB8
_080D0E78: .4byte gPaletteFade
_080D0E7C: .4byte sub_80D0D54
thumb_func_end sub_80D0DF0
@@ -1522,7 +1522,7 @@ Phase2_Transition_PokeballsTrail_Func2: @ 80D144C
ands r5, r0
movs r1, 0
mov r8, r4
ldr r6, _080D14D4 @ =gUnknown_20386E0
ldr r6, _080D14D4 @ =gFieldEffectArguments
_080D147A:
lsls r5, 16
asrs r5, 16
@@ -1567,7 +1567,7 @@ _080D147A:
.align 2, 0
_080D14CC: .4byte gUnknown_83FA400
_080D14D0: .4byte gUnknown_83FA404
_080D14D4: .4byte gUnknown_20386E0
_080D14D4: .4byte gFieldEffectArguments
thumb_func_end Phase2_Transition_PokeballsTrail_Func2
thumb_func_start Phase2_Transition_PokeballsTrail_Func3
@@ -1596,7 +1596,7 @@ _080D1500: .4byte sub_80D13C8
FldEff_Pokeball: @ 80D1504
push {r4,r5,lr}
ldr r0, _080D1560 @ =gUnknown_83FA5CC
ldr r5, _080D1564 @ =gUnknown_20386E0
ldr r5, _080D1564 @ =gFieldEffectArguments
movs r2, 0
ldrsh r1, [r5, r2]
movs r3, 0x4
@@ -1639,7 +1639,7 @@ FldEff_Pokeball: @ 80D1504
bx r1
.align 2, 0
_080D1560: .4byte gUnknown_83FA5CC
_080D1564: .4byte gUnknown_20386E0
_080D1564: .4byte gFieldEffectArguments
_080D1568: .4byte gSprites
_080D156C: .4byte 0x0000ffff
thumb_func_end FldEff_Pokeball
@@ -2559,7 +2559,7 @@ _080D1C78:
ldrsh r0, [r6, r5]
cmp r0, 0
beq _080D1C9A
ldr r0, _080D1CC0 @ =gUnknown_2037AB8
ldr r0, _080D1CC0 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -2588,7 +2588,7 @@ _080D1C9A:
_080D1CB4: .4byte gUnknown_2039A2C
_080D1CB8: .4byte 0x1fff0000
_080D1CBC: .4byte gUnknown_2038700
_080D1CC0: .4byte gUnknown_2037AB8
_080D1CC0: .4byte gPaletteFade
_080D1CC4: .4byte sub_80D1B58
thumb_func_end sub_80D1BE8
asm/berry_pouch.s
+6 -6
View File
@@ -362,7 +362,7 @@ sub_813D048: @ 813D048
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _0813D074 @ =gUnknown_2037AB8
ldr r0, _0813D074 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -379,7 +379,7 @@ _0813D06C:
pop {r0}
bx r0
.align 2, 0
_0813D074: .4byte gUnknown_2037AB8
_0813D074: .4byte gPaletteFade
_0813D078: .4byte gUnknown_203F370
thumb_func_end sub_813D048
@@ -1399,7 +1399,7 @@ sub_813D844: @ 813D844
lsls r0, 3
ldr r1, _0813D87C @ =gTasks+0x8
adds r2, r0, r1
ldr r0, _0813D880 @ =gUnknown_2037AB8
ldr r0, _0813D880 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1419,7 +1419,7 @@ sub_813D844: @ 813D844
b _0813D896
.align 2, 0
_0813D87C: .4byte gTasks+0x8
_0813D880: .4byte gUnknown_2037AB8
_0813D880: .4byte gPaletteFade
_0813D884: .4byte gUnknown_203F37A
_0813D888: .4byte gUnknown_203F36C
_0813D88C:
@@ -1669,7 +1669,7 @@ sub_813DA68: @ 813DA68
lsls r0, 3
ldr r1, _0813DAD8 @ =gTasks+0x8
adds r7, r0, r1
ldr r0, _0813DADC @ =gUnknown_2037AB8
ldr r0, _0813DADC @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1714,7 +1714,7 @@ _0813DA9E:
b _0813DB48
.align 2, 0
_0813DAD8: .4byte gTasks+0x8
_0813DADC: .4byte gUnknown_2037AB8
_0813DADC: .4byte gPaletteFade
_0813DAE0: .4byte gUnknown_203F37A
_0813DAE4: .4byte gMain
_0813DAE8: .4byte gUnknown_203AD30
asm/bike.s
+37 -37
View File
@@ -42,7 +42,7 @@ sub_80BD0D4: @ 80BD0D4
lsls r2, 16
lsrs r2, 16
ldr r4, _080BD0F8 @ =gUnknown_83E7D10
ldr r3, _080BD0FC @ =gUnknown_2037078
ldr r3, _080BD0FC @ =gPlayerAvatar
ldrb r3, [r3, 0x8]
lsls r3, 2
adds r3, r4
@@ -55,7 +55,7 @@ sub_80BD0D4: @ 80BD0D4
bx r1
.align 2, 0
_080BD0F8: .4byte gUnknown_83E7D10
_080BD0FC: .4byte gUnknown_2037078
_080BD0FC: .4byte gPlayerAvatar
thumb_func_end sub_80BD0D4
thumb_func_start sub_80BD100
@@ -72,7 +72,7 @@ sub_80BD100: @ 80BD100
lsls r2, 16
lsrs r2, 16
mov r9, r2
ldr r5, _080BD15C @ =gUnknown_2037078
ldr r5, _080BD15C @ =gPlayerAvatar
ldrb r0, [r5, 0x5]
lsls r4, r0, 3
adds r4, r0
@@ -105,7 +105,7 @@ sub_80BD100: @ 80BD100
movs r0, 0x3
b _080BD1B6
.align 2, 0
_080BD15C: .4byte gUnknown_2037078
_080BD15C: .4byte gPlayerAvatar
_080BD160: .4byte gMapObjects
_080BD164: .4byte gMain
_080BD168:
@@ -124,11 +124,11 @@ _080BD176:
bne _080BD18C
_080BD17E:
strb r7, [r6]
ldr r1, _080BD188 @ =gUnknown_2037078
ldr r1, _080BD188 @ =gPlayerAvatar
movs r0, 0
b _080BD1B4
.align 2, 0
_080BD188: .4byte gUnknown_2037078
_080BD188: .4byte gPlayerAvatar
_080BD18C:
cmp r0, r7
beq _080BD1B0
@@ -148,7 +148,7 @@ _080BD18C:
lsrs r0, 24
b _080BD1B6
_080BD1B0:
ldr r1, _080BD1C4 @ =gUnknown_2037078
ldr r1, _080BD1C4 @ =gPlayerAvatar
movs r0, 0x2
_080BD1B4:
strb r0, [r1, 0x2]
@@ -161,13 +161,13 @@ _080BD1B6:
pop {r1}
bx r1
.align 2, 0
_080BD1C4: .4byte gUnknown_2037078
_080BD1C4: .4byte gPlayerAvatar
thumb_func_end sub_80BD100
thumb_func_start sub_80BD1C8
sub_80BD1C8: @ 80BD1C8
push {lr}
ldr r2, _080BD1E4 @ =gUnknown_2037078
ldr r2, _080BD1E4 @ =gPlayerAvatar
ldrb r1, [r2, 0x9]
strb r1, [r0]
movs r1, 0
@@ -179,7 +179,7 @@ sub_80BD1C8: @ 80BD1C8
pop {r1}
bx r1
.align 2, 0
_080BD1E4: .4byte gUnknown_2037078
_080BD1E4: .4byte gPlayerAvatar
thumb_func_end sub_80BD1C8
thumb_func_start sub_80BD1E8
@@ -199,7 +199,7 @@ sub_80BD1E8: @ 80BD1E8
lsls r0, 24
lsrs r5, r0, 24
adds r7, r5, 0
ldr r4, _080BD240 @ =gUnknown_2037078
ldr r4, _080BD240 @ =gPlayerAvatar
ldrb r1, [r4, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -226,7 +226,7 @@ sub_80BD1E8: @ 80BD1E8
lsrs r0, 24
b _080BD270
.align 2, 0
_080BD240: .4byte gUnknown_2037078
_080BD240: .4byte gPlayerAvatar
_080BD244: .4byte gMapObjects
_080BD248:
movs r0, 0x2
@@ -276,7 +276,7 @@ sub_80BD28C: @ 80BD28C
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _080BD2C0 @ =gUnknown_2037078
ldr r0, _080BD2C0 @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -298,7 +298,7 @@ _080BD2B2:
pop {r0}
bx r0
.align 2, 0
_080BD2C0: .4byte gUnknown_2037078
_080BD2C0: .4byte gPlayerAvatar
_080BD2C4: .4byte gMapObjects
thumb_func_end sub_80BD28C
@@ -308,7 +308,7 @@ sub_80BD2C8: @ 80BD2C8
lsls r0, 24
lsrs r4, r0, 24
adds r6, r4, 0
ldr r0, _080BD2F8 @ =gUnknown_2037078
ldr r0, _080BD2F8 @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -326,7 +326,7 @@ sub_80BD2C8: @ 80BD2C8
bl sub_80BD27C
b _080BD350
.align 2, 0
_080BD2F8: .4byte gUnknown_2037078
_080BD2F8: .4byte gPlayerAvatar
_080BD2FC: .4byte gMapObjects
_080BD300:
adds r0, r4, 0
@@ -420,7 +420,7 @@ sub_80BD3A0: @ 80BD3A0
adds r6, r0, 0
lsls r6, 24
lsrs r6, 24
ldr r0, _080BD404 @ =gUnknown_2037078
ldr r0, _080BD404 @ =gPlayerAvatar
ldrb r0, [r0, 0x5]
lsls r4, r0, 3
adds r4, r0
@@ -443,7 +443,7 @@ sub_80BD3A0: @ 80BD3A0
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r5, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
add r1, sp, 0x4
@@ -462,7 +462,7 @@ sub_80BD3A0: @ 80BD3A0
pop {r1}
bx r1
.align 2, 0
_080BD404: .4byte gUnknown_2037078
_080BD404: .4byte gPlayerAvatar
_080BD408: .4byte gMapObjects
thumb_func_end sub_80BD3A0
@@ -645,7 +645,7 @@ _080BD538:
sub_80BD540: @ 80BD540
push {r4,lr}
sub sp, 0x4
ldr r0, _080BD57C @ =gUnknown_2037078
ldr r0, _080BD57C @ =gPlayerAvatar
ldrb r1, [r0]
movs r0, 0x18
ands r0, r1
@@ -661,7 +661,7 @@ sub_80BD540: @ 80BD540
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl sub_80BD4B8
@@ -671,7 +671,7 @@ sub_80BD540: @ 80BD540
movs r0, 0
b _080BD582
.align 2, 0
_080BD57C: .4byte gUnknown_2037078
_080BD57C: .4byte gPlayerAvatar
_080BD580:
movs r0, 0x1
_080BD582:
@@ -690,7 +690,7 @@ player_should_look_direction_be_enforced_upon_movement: @ 80BD58C
cmp r0, 0
beq _080BD5C0
ldr r2, _080BD5B8 @ =gMapObjects
ldr r0, _080BD5BC @ =gUnknown_2037078
ldr r0, _080BD5BC @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -705,7 +705,7 @@ player_should_look_direction_be_enforced_upon_movement: @ 80BD58C
b _080BD5C2
.align 2, 0
_080BD5B8: .4byte gMapObjects
_080BD5BC: .4byte gUnknown_2037078
_080BD5BC: .4byte gPlayerAvatar
_080BD5C0:
movs r0, 0x1
_080BD5C2:
@@ -721,7 +721,7 @@ sub_80BD5C8: @ 80BD5C8
ldr r1, _080BD5F0 @ =gUnknown_2036E2C
movs r0, 0
strb r0, [r1]
ldr r0, _080BD5F4 @ =gUnknown_2037078
ldr r0, _080BD5F4 @ =gPlayerAvatar
ldrb r1, [r0]
movs r0, 0x6
ands r0, r1
@@ -734,7 +734,7 @@ sub_80BD5C8: @ 80BD5C8
b _080BD618
.align 2, 0
_080BD5F0: .4byte gUnknown_2036E2C
_080BD5F4: .4byte gUnknown_2037078
_080BD5F4: .4byte gPlayerAvatar
_080BD5F8:
adds r0, r2, 0
bl SetPlayerAvatarTransitionFlags
@@ -757,7 +757,7 @@ _080BD618:
thumb_func_start sub_80BD620
sub_80BD620: @ 80BD620
push {lr}
ldr r2, _080BD64C @ =gUnknown_2037078
ldr r2, _080BD64C @ =gPlayerAvatar
movs r3, 0
strb r3, [r2, 0x8]
strb r3, [r2, 0x9]
@@ -779,32 +779,32 @@ _080BD638:
pop {r0}
bx r0
.align 2, 0
_080BD64C: .4byte gUnknown_2037078
_080BD64C: .4byte gPlayerAvatar
thumb_func_end sub_80BD620
thumb_func_start Bike_UpdateBikeCounterSpeed
Bike_UpdateBikeCounterSpeed: @ 80BD650
lsls r0, 24
lsrs r0, 24
ldr r2, _080BD660 @ =gUnknown_2037078
ldr r2, _080BD660 @ =gPlayerAvatar
strb r0, [r2, 0xA]
lsrs r1, r0, 1
adds r0, r1
strb r0, [r2, 0xB]
bx lr
.align 2, 0
_080BD660: .4byte gUnknown_2037078
_080BD660: .4byte gPlayerAvatar
thumb_func_end Bike_UpdateBikeCounterSpeed
thumb_func_start sub_80BD664
sub_80BD664: @ 80BD664
ldr r1, _080BD670 @ =gUnknown_2037078
ldr r1, _080BD670 @ =gPlayerAvatar
movs r0, 0
strb r0, [r1, 0xA]
strb r0, [r1, 0xB]
bx lr
.align 2, 0
_080BD670: .4byte gUnknown_2037078
_080BD670: .4byte gPlayerAvatar
thumb_func_end sub_80BD664
thumb_func_start GetPlayerSpeed
@@ -815,7 +815,7 @@ GetPlayerSpeed: @ 80BD674
mov r0, sp
movs r2, 0x6
bl memcpy
ldr r2, _080BD6A0 @ =gUnknown_2037078
ldr r2, _080BD6A0 @ =gPlayerAvatar
ldrb r1, [r2]
movs r0, 0x2
ands r0, r1
@@ -829,7 +829,7 @@ GetPlayerSpeed: @ 80BD674
b _080BD6BE
.align 2, 0
_080BD69C: .4byte gUnknown_83E7D1C
_080BD6A0: .4byte gUnknown_2037078
_080BD6A0: .4byte gPlayerAvatar
_080BD6A4:
movs r0, 0x4
ands r0, r1
@@ -856,7 +856,7 @@ _080BD6BE:
Bike_HandleBumpySlopeJump: @ 80BD6C4
push {r4,r5,lr}
sub sp, 0x4
ldr r5, _080BD714 @ =gUnknown_2037078
ldr r5, _080BD714 @ =gPlayerAvatar
ldrb r1, [r5]
movs r0, 0x4
ands r0, r1
@@ -872,7 +872,7 @@ Bike_HandleBumpySlopeJump: @ 80BD6C4
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl MetatileBehavior_ReturnFalse_14
@@ -891,7 +891,7 @@ _080BD70C:
pop {r0}
bx r0
.align 2, 0
_080BD714: .4byte gUnknown_2037078
_080BD714: .4byte gPlayerAvatar
thumb_func_end Bike_HandleBumpySlopeJump
.align 2, 0 @ Don't pad with nop.
asm/blend_palette.s
+4 -4
View File
@@ -26,9 +26,9 @@ BlendPalette: @ 8045274
movs r6, 0
cmp r6, r12
bcs _080452FA
ldr r0, _0804530C @ =gUnknown_20371F8
ldr r0, _0804530C @ =gPlttBufferUnfaded
mov r10, r0
ldr r1, _08045310 @ =gUnknown_20375F8
ldr r1, _08045310 @ =gPlttBufferFaded
mov r9, r1
_080452A2:
mov r0, r8
@@ -85,8 +85,8 @@ _080452FA:
pop {r0}
bx r0
.align 2, 0
_0804530C: .4byte gUnknown_20371F8
_08045310: .4byte gUnknown_20375F8
_0804530C: .4byte gPlttBufferUnfaded
_08045310: .4byte gPlttBufferFaded
thumb_func_end BlendPalette
thumb_func_start sub_8045314
asm/cable_club.s
+10 -10
View File
@@ -1547,13 +1547,13 @@ _0808135C:
_08081374: .4byte gUnknown_202271A
_08081378: .4byte 0x00002211
_0808137C:
ldr r0, _08081388 @ =gUnknown_2037AB8
ldr r0, _08081388 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
b _080813A6
.align 2, 0
_08081388: .4byte gUnknown_2037AB8
_08081388: .4byte gPaletteFade
_0808138C:
ldrh r0, [r4, 0xA]
adds r0, 0x1
@@ -1706,7 +1706,7 @@ _080814A0:
_080814BC: .4byte gUnknown_202271A
_080814C0: .4byte 0x00002211
_080814C4:
ldr r0, _080814D8 @ =gUnknown_2037AB8
ldr r0, _080814D8 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1718,7 +1718,7 @@ _080814D2:
strh r0, [r6]
b _0808160A
.align 2, 0
_080814D8: .4byte gUnknown_2037AB8
_080814D8: .4byte gPaletteFade
_080814DC:
ldr r1, _080814EC @ =gUnknown_2022720
movs r0, 0
@@ -2183,7 +2183,7 @@ _08081882:
bl sub_800A068
b _080818B8
_08081894:
ldr r0, _080818A4 @ =gUnknown_2037AB8
ldr r0, _080818A4 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -2191,7 +2191,7 @@ _08081894:
bne _080818D8
b _080818B8
.align 2, 0
_080818A4: .4byte gUnknown_2037AB8
_080818A4: .4byte gPaletteFade
_080818A8:
ldr r1, _080818C0 @ =gUnknown_2031DA4
movs r0, 0
@@ -2259,7 +2259,7 @@ _0808191A:
bl sub_80F985C
b _08081950
_0808192C:
ldr r0, _0808193C @ =gUnknown_2037AB8
ldr r0, _0808193C @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -2267,7 +2267,7 @@ _0808192C:
bne _08081970
b _08081950
.align 2, 0
_0808193C: .4byte gUnknown_2037AB8
_0808193C: .4byte gPaletteFade
_08081940:
ldr r1, _08081958 @ =gUnknown_2031DA4
movs r0, 0
@@ -2408,7 +2408,7 @@ sub_8081A34: @ 8081A34
lsls r1, r4, 3
subs r1, r4
lsls r1, 2
ldr r2, _08081A7C @ =gUnknown_2022744
ldr r2, _08081A7C @ =gLinkPlayers + 8
adds r1, r2
bl StringCopy
adds r0, r4, 0
@@ -2429,7 +2429,7 @@ sub_8081A34: @ 8081A34
.align 2, 0
_08081A74: .4byte gUnknown_20370C4
_08081A78: .4byte gStringVar1
_08081A7C: .4byte gUnknown_2022744
_08081A7C: .4byte gLinkPlayers + 8
_08081A80: .4byte gStringVar2
_08081A84: .4byte gUnknown_83C6AB8
_08081A88:
asm/clear_save_data_screen.s
+4 -4
View File
@@ -91,7 +91,7 @@ _080F5618:
bl BeginNormalPaletteFade
b _080F56E2
_080F562A:
ldr r0, _080F5640 @ =gUnknown_2037AB8
ldr r0, _080F5640 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -101,7 +101,7 @@ _080F562A:
bl SetVBlankCallback
b _080F56E2
.align 2, 0
_080F5640: .4byte gUnknown_2037AB8
_080F5640: .4byte gPaletteFade
_080F5644:
bl sub_80F5820
b _080F56E2
@@ -296,7 +296,7 @@ _080F57B8:
.align 2, 0
_080F57D0: .4byte 0x0000ffff
_080F57D4:
ldr r0, _080F5808 @ =gUnknown_2037AB8
ldr r0, _080F5808 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -318,7 +318,7 @@ _080F57FE:
pop {r0}
bx r0
.align 2, 0
_080F5808: .4byte gUnknown_2037AB8
_080F5808: .4byte gPaletteFade
thumb_func_end sub_80F579C
thumb_func_start sub_80F580C
asm/credits.s
+26 -26
View File
@@ -242,13 +242,13 @@ _080F3B5E:
bl sub_80F3AA4
movs r0, 0xF0
bl sub_80F77CC
ldr r0, _080F3BC8 @ =gUnknown_20371F8
ldr r0, _080F3BC8 @ =gPlttBufferUnfaded
movs r2, 0xFF
lsls r2, 1
adds r0, r2
movs r1, 0
strh r1, [r0]
ldr r0, _080F3BCC @ =gUnknown_20375F8
ldr r0, _080F3BCC @ =gPlttBufferFaded
adds r0, r2
strh r1, [r0]
movs r0, 0x1
@@ -261,8 +261,8 @@ _080F3BB8: .4byte gUnknown_2031DD8
_080F3BBC: .4byte gUnknown_203AB40
_080F3BC0: .4byte gUnknown_8414588
_080F3BC4: .4byte 0x0000247c
_080F3BC8: .4byte gUnknown_20371F8
_080F3BCC: .4byte gUnknown_20375F8
_080F3BC8: .4byte gPlttBufferUnfaded
_080F3BCC: .4byte gPlttBufferFaded
thumb_func_end sub_80F3B2C
thumb_func_start sub_80F3BD0
@@ -326,13 +326,13 @@ _080F3C64:
bl sub_80F3AC4
movs r0, 0xF0
bl sub_80F77CC
ldr r0, _080F3C8C @ =gUnknown_20371F8
ldr r0, _080F3C8C @ =gPlttBufferUnfaded
movs r2, 0xFF
lsls r2, 1
adds r0, r2
movs r1, 0
strh r1, [r0]
ldr r0, _080F3C90 @ =gUnknown_20375F8
ldr r0, _080F3C90 @ =gPlttBufferFaded
adds r0, r2
strh r1, [r0]
ldr r0, _080F3C94 @ =gUnknown_203AB40
@@ -340,8 +340,8 @@ _080F3C64:
movs r0, 0x2
b _080F413C
.align 2, 0
_080F3C8C: .4byte gUnknown_20371F8
_080F3C90: .4byte gUnknown_20375F8
_080F3C8C: .4byte gPlttBufferUnfaded
_080F3C90: .4byte gPlttBufferFaded
_080F3C94: .4byte gUnknown_203AB40
_080F3C98:
movs r0, 0x44
@@ -606,7 +606,7 @@ _080F3E94:
_080F3EAC: .4byte gUnknown_203AB40
_080F3EB0: .4byte gUnknown_8410CF4
_080F3EB4:
ldr r0, _080F3F14 @ =gUnknown_2037AB8
ldr r0, _080F3F14 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -654,7 +654,7 @@ _080F3EB4:
movs r0, 0x8
b _080F3FB8
.align 2, 0
_080F3F14: .4byte gUnknown_2037AB8
_080F3F14: .4byte gPaletteFade
_080F3F18: .4byte gUnknown_84145BC
_080F3F1C: .4byte gUnknown_8410CF4
_080F3F20: .4byte gUnknown_8410E00
@@ -738,7 +738,7 @@ _080F3FBA:
.align 2, 0
_080F3FC0: .4byte gUnknown_8410CF4
_080F3FC4:
ldr r0, _080F3FE8 @ =gUnknown_2037AB8
ldr r0, _080F3FE8 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -756,7 +756,7 @@ _080F3FD6:
movs r0, 0xB
b _080F413C
.align 2, 0
_080F3FE8: .4byte gUnknown_2037AB8
_080F3FE8: .4byte gPaletteFade
_080F3FEC: .4byte gUnknown_203AB40
_080F3FF0:
ldr r0, [r7]
@@ -773,7 +773,7 @@ _080F3FFE:
movs r0, 0x6
b _080F413C
_080F400A:
ldr r0, _080F4050 @ =gUnknown_2037AB8
ldr r0, _080F4050 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -810,7 +810,7 @@ _080F404A:
movs r0, 0x1
b _080F4068
.align 2, 0
_080F4050: .4byte gUnknown_2037AB8
_080F4050: .4byte gPaletteFade
_080F4054: .4byte gUnknown_203AB40
_080F4058:
add r1, sp, 0x14
@@ -838,7 +838,7 @@ _080F4068:
.align 2, 0
_080F4080: .4byte gUnknown_203AB40
_080F4084:
ldr r0, _080F40B0 @ =gUnknown_2037AB8
ldr r0, _080F40B0 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -859,7 +859,7 @@ _080F4096:
movs r0, 0xE
b _080F413C
.align 2, 0
_080F40B0: .4byte gUnknown_2037AB8
_080F40B0: .4byte gPaletteFade
_080F40B4: .4byte gUnknown_203AB40
_080F40B8:
bl sub_80F4328
@@ -874,7 +874,7 @@ _080F40C2:
.align 2, 0
_080F40CC: .4byte gUnknown_203AB40
_080F40D0:
ldr r0, _080F40F8 @ =gUnknown_2037AB8
ldr r0, _080F40F8 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -894,7 +894,7 @@ _080F40E2:
movs r0, 0x10
b _080F413C
.align 2, 0
_080F40F8: .4byte gUnknown_2037AB8
_080F40F8: .4byte gPaletteFade
_080F40FC: .4byte gUnknown_203AB40
_080F4100:
bl sub_80F4674
@@ -953,7 +953,7 @@ _080F4156:
.align 2, 0
_080F416C: .4byte 0x00007fff
_080F4170:
ldr r0, _080F418C @ =gUnknown_2037AB8
ldr r0, _080F418C @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -968,7 +968,7 @@ _080F4182:
pop {r1}
bx r1
.align 2, 0
_080F418C: .4byte gUnknown_2037AB8
_080F418C: .4byte gPaletteFade
thumb_func_end sub_80F3BD0
thumb_func_start sub_80F4190
@@ -1382,7 +1382,7 @@ _080F4530:
bne _080F45DE
b _080F4630
_080F453A:
ldr r0, _080F4554 @ =gUnknown_2037AB8
ldr r0, _080F4554 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1397,7 +1397,7 @@ _080F4548:
strh r0, [r1, 0xE]
b _080F4630
.align 2, 0
_080F4554: .4byte gUnknown_2037AB8
_080F4554: .4byte gPaletteFade
_080F4558:
ldr r1, [r4]
ldrh r0, [r1, 0xC]
@@ -1511,7 +1511,7 @@ _080F4630:
strb r0, [r1, 0x1]
b _080F4668
_080F4638:
ldr r0, _080F4660 @ =gUnknown_2037AB8
ldr r0, _080F4660 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1529,7 +1529,7 @@ _080F4638:
movs r0, 0x1
b _080F466A
.align 2, 0
_080F4660: .4byte gUnknown_2037AB8
_080F4660: .4byte gPaletteFade
_080F4664: .4byte gUnknown_203AB40
_080F4668:
movs r0, 0
@@ -1697,7 +1697,7 @@ _080F47C2:
.align 2, 0
_080F47CC: .4byte gUnknown_203AB40
_080F47D0:
ldr r0, _080F47E8 @ =gUnknown_2037AB8
ldr r0, _080F47E8 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1709,7 +1709,7 @@ _080F47D0:
movs r0, 0x1
b _080F47EE
.align 2, 0
_080F47E8: .4byte gUnknown_2037AB8
_080F47E8: .4byte gPaletteFade
_080F47EC:
movs r0, 0
_080F47EE:
asm/crt0.s
+16 -15
View File
@@ -60,11 +60,11 @@ GPIOPortReadEnable: @ 80000C8
.4byte 0x8245EE0 @ gSpeciesNames
.4byte 0x8247094 @ gMoveNames
.4byte 0x84556F8 @ gDecorations
.4byte 0xEE0
.4byte 0x1000
.4byte 0x18
.4byte 0x5F8
.4byte 0x3A18
.4byte 0xEE0 @ offsetof(struct SaveBlock1, flags)
.4byte 0x1000 @ offsetof(struct SaveBlock1, vars)
.4byte 0x18 @ offsetof(struct SaveBlock2, pokedex)
.4byte 0x5F8 @ offsetof(struct SaveBlock1, seen1)
.4byte 0x3A18 @ offsetof(struct SaveBlock1, seen2)
.4byte 0x3C
.4byte 0x838
.4byte 0x839
@@ -74,16 +74,17 @@ GPIOPortReadEnable: @ 80000C8
.4byte 0xC121006
.4byte 0x8010B0F
.4byte 0xC
.4byte 0xF24
.4byte 0x3D68
.4byte 0x34
.4byte 0x38
.4byte 9
.4byte 0xA
.4byte 0
.4byte 8
.4byte 0xAD
.4byte 0xAD
.4byte 0xF24 @ sizeof(struct SaveBlock2)
.4byte 0x3D68 @ sizeof(struct SaveBlock1)
.4byte 0x34 @ offsetof(struct SaveBlock1, playerPartyCount)
.4byte 0x38 @ offsetof(struct SaveBlock1, playerParty)
.4byte 9 @ offsetof(struct SaveBlock2, specialSaveWarp)
.4byte 0xA @ offsetof(struct SaveBlock2, playerTrainerId)
.4byte 0 @ offsetof(struct SaveBlock2, playerName)
.4byte 8 @ offsetof(struct SaveBlock2, playerGender)
.4byte 0xAD @ offsetof(struct SaveBlock2, ?????? (0xAD))
.4byte 0xAD @ offsetof(struct SaveBlock2, ?????? (0xAD))
.4byte 0x30BB
.4byte 0x30A7
.4byte 0
asm/diploma.s
+4 -4
View File
@@ -147,7 +147,7 @@ _080F4D22:
.align 2, 0
_080F4D2C: .4byte sub_80F4BFC
_080F4D30:
ldr r0, _080F4D64 @ =gUnknown_2037AB8
ldr r0, _080F4D64 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -174,7 +174,7 @@ _080F4D5A:
pop {r0}
bx r0
.align 2, 0
_080F4D64: .4byte gUnknown_2037AB8
_080F4D64: .4byte gPaletteFade
_080F4D68: .4byte gTasks
_080F4D6C: .4byte sub_80F4D74
_080F4D70: .4byte gUnknown_203AB48
@@ -245,7 +245,7 @@ sub_80F4DE0: @ 80F4DE0
push {r4,r5,lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r0, _080F4E18 @ =gUnknown_2037AB8
ldr r0, _080F4E18 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -267,7 +267,7 @@ _080F4E10:
pop {r0}
bx r0
.align 2, 0
_080F4E18: .4byte gUnknown_2037AB8
_080F4E18: .4byte gPaletteFade
_080F4E1C: .4byte gUnknown_203AB48
_080F4E20: .4byte sub_80568FC
thumb_func_end sub_80F4DE0
asm/easy_chat.s
+2 -2
View File
@@ -166,11 +166,11 @@ _080BD820: .4byte gSpeciesNames
_080BD824:
movs r0, 0xD
muls r0, r2
ldr r1, _080BD830 @ =gUnknown_8247094
ldr r1, _080BD830 @ =gMoveNames
adds r0, r1
b _080BD846
.align 2, 0
_080BD830: .4byte gUnknown_8247094
_080BD830: .4byte gMoveNames
_080BD834:
ldr r1, _080BD84C @ =gUnknown_83ECED4
lsls r0, 3
asm/egg_hatch.s
+8 -8
View File
@@ -499,7 +499,7 @@ sub_8047004: @ 8047004
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _08047034 @ =gUnknown_2037AB8
ldr r0, _08047034 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -518,7 +518,7 @@ _0804702C:
pop {r0}
bx r0
.align 2, 0
_08047034: .4byte gUnknown_2037AB8
_08047034: .4byte gPaletteFade
_08047038: .4byte CB2_EggHatch_0
_0804703C: .4byte gUnknown_3005020
_08047040: .4byte sub_807DD24
@@ -912,7 +912,7 @@ _080473D8: .4byte gUnknown_8260134
_080473DC: .4byte gUnknown_3000E74
_080473E0: .4byte sub_80472E4
_080473E4:
ldr r0, _08047408 @ =gUnknown_2037AB8
ldr r0, _08047408 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -931,7 +931,7 @@ _080473F6:
ldr r1, [r5]
b _08047648
.align 2, 0
_08047408: .4byte gUnknown_2037AB8
_08047408: .4byte gPaletteFade
_0804740C:
ldr r1, [r5]
ldrb r0, [r1, 0x3]
@@ -1205,7 +1205,7 @@ _08047648:
.align 2, 0
_08047650: .4byte gUnknown_3000E74
_08047654:
ldr r0, _080476A8 @ =gUnknown_2037AB8
ldr r0, _080476A8 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1238,7 +1238,7 @@ _08047684:
pop {r0}
bx r0
.align 2, 0
_080476A8: .4byte gUnknown_2037AB8
_080476A8: .4byte gPaletteFade
_080476AC: .4byte c2_exit_to_overworld_2_switch
thumb_func_end sub_8047338
@@ -1489,7 +1489,7 @@ _0804788C:
ldrh r0, [r5, 0x2E]
adds r0, 0x1
strh r0, [r5, 0x2E]
ldr r0, _080478C8 @ =gUnknown_2037AB8
ldr r0, _080478C8 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1515,7 +1515,7 @@ _080478BA:
bx r0
.align 2, 0
_080478C4: .4byte 0x0000ffff
_080478C8: .4byte gUnknown_2037AB8
_080478C8: .4byte gPaletteFade
_080478CC: .4byte SpriteCB_Egg_5
thumb_func_end SpriteCB_Egg_4
asm/event_data.s
+9 -9
View File
@@ -78,7 +78,7 @@ _0806E164: .4byte 0x00000842
sub_806E168: @ 806E168
push {lr}
ldr r0, _0806E184 @ =0x0000403c
bl sub_806E454
bl GetVarPointer
ldr r1, _0806E188 @ =gSaveBlock2Ptr
ldr r2, [r1]
movs r1, 0
@@ -98,7 +98,7 @@ _0806E18C: .4byte 0x00000838
sub_806E190: @ 806E190
push {lr}
ldr r0, _0806E1B0 @ =0x0000403c
bl sub_806E454
bl GetVarPointer
ldr r1, _0806E1B4 @ =gSaveBlock2Ptr
ldr r2, [r1]
movs r1, 0xDA
@@ -154,7 +154,7 @@ _0806E1FE:
sub_806E204: @ 806E204
push {lr}
ldr r0, _0806E224 @ =0x0000404e
bl sub_806E454
bl GetVarPointer
ldr r1, _0806E228 @ =gSaveBlock2Ptr
ldr r2, [r1]
movs r1, 0
@@ -174,7 +174,7 @@ _0806E228: .4byte gSaveBlock2Ptr
sub_806E22C: @ 806E22C
push {lr}
ldr r0, _0806E250 @ =0x0000404e
bl sub_806E454
bl GetVarPointer
ldr r1, _0806E254 @ =gSaveBlock2Ptr
ldr r2, [r1]
movs r1, 0xB9
@@ -419,8 +419,8 @@ _0806E44E:
bx r1
thumb_func_end CanResetRTC
thumb_func_start sub_806E454
sub_806E454: @ 806E454
thumb_func_start GetVarPointer
GetVarPointer: @ 806E454
push {r4-r6,lr}
lsls r0, 16
lsrs r4, r0, 16
@@ -522,7 +522,7 @@ _0806E518:
.align 2, 0
_0806E520: .4byte gUnknown_815FD0C
_0806E524: .4byte 0xffff8000
thumb_func_end sub_806E454
thumb_func_end GetVarPointer
thumb_func_start sub_806E528
sub_806E528: @ 806E528
@@ -569,7 +569,7 @@ VarGet: @ 806E568
lsls r0, 16
lsrs r4, r0, 16
adds r0, r4, 0
bl sub_806E454
bl GetVarPointer
cmp r0, 0
beq _0806E57C
ldrh r0, [r0]
@@ -589,7 +589,7 @@ VarSet: @ 806E584
lsrs r0, 16
lsls r1, 16
lsrs r4, r1, 16
bl sub_806E454
bl GetVarPointer
cmp r0, 0
beq _0806E59C
strh r4, [r0]
asm/evolution_graphics.s
+12 -12
View File
@@ -997,8 +997,8 @@ sub_80F6080: @ 80F6080
movs r0, 0
strh r0, [r5, 0x26]
bl sub_80D0474
ldr r0, _080F60D0 @ =gUnknown_2037638
ldr r1, _080F60D4 @ =gUnknown_2037238
ldr r0, _080F60D0 @ =gPlttBufferFaded + 0x40
ldr r1, _080F60D4 @ =gPlttBufferUnfaded + 0x40
movs r2, 0x30
bl CpuSet
ldr r0, _080F60D8 @ =0xfff90f1c
@@ -1018,8 +1018,8 @@ sub_80F6080: @ 80F6080
bx r0
.align 2, 0
_080F60CC: .4byte gTasks
_080F60D0: .4byte gUnknown_2037638
_080F60D4: .4byte gUnknown_2037238
_080F60D0: .4byte gPlttBufferFaded + 0x40
_080F60D4: .4byte gPlttBufferUnfaded + 0x40
_080F60D8: .4byte 0xfff90f1c
_080F60DC: .4byte 0x00007fff
_080F60E0: .4byte sub_80F60E4
@@ -1103,7 +1103,7 @@ sub_80F6170: @ 80F6170
push {lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r0, _080F618C @ =gUnknown_2037AB8
ldr r0, _080F618C @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1115,7 +1115,7 @@ _080F6188:
pop {r0}
bx r0
.align 2, 0
_080F618C: .4byte gUnknown_2037AB8
_080F618C: .4byte gPaletteFade
thumb_func_end sub_80F6170
thumb_func_start sub_80F6190
@@ -1159,8 +1159,8 @@ sub_80F61C0: @ 80F61C0
movs r0, 0
strh r0, [r5, 0x26]
bl sub_80D0474
ldr r0, _080F6210 @ =gUnknown_2037638
ldr r1, _080F6214 @ =gUnknown_2037238
ldr r0, _080F6210 @ =gPlttBufferFaded + 0x40
ldr r1, _080F6214 @ =gPlttBufferUnfaded + 0x40
movs r2, 0x30
bl CpuSet
ldr r0, _080F6218 @ =0xfff90f00
@@ -1180,8 +1180,8 @@ sub_80F61C0: @ 80F61C0
bx r0
.align 2, 0
_080F620C: .4byte gTasks
_080F6210: .4byte gUnknown_2037638
_080F6214: .4byte gUnknown_2037238
_080F6210: .4byte gPlttBufferFaded + 0x40
_080F6214: .4byte gPlttBufferUnfaded + 0x40
_080F6218: .4byte 0xfff90f00
_080F621C: .4byte 0x00007fff
_080F6220: .4byte sub_80F6224
@@ -1369,7 +1369,7 @@ _080F62CE:
ldrb r1, [r2, 0x5]
lsrs r1, 4
lsls r1, 5
ldr r0, _080F63FC @ =gUnknown_20377F8
ldr r0, _080F63FC @ =gPlttBufferFaded + 0x200
mov r10, r0
add r1, r10
add r0, sp, 0x4
@@ -1422,7 +1422,7 @@ _080F63EC: .4byte 0x00007fff
_080F63F0: .4byte gTasks
_080F63F4: .4byte gSprites
_080F63F8: .4byte nullsub_86
_080F63FC: .4byte gUnknown_20377F8
_080F63FC: .4byte gPlttBufferFaded + 0x200
thumb_func_end sub_80F62B4
thumb_func_start sub_80F6400
asm/evolution_scene.s
+30 -30
View File
@@ -48,7 +48,7 @@ _080CDD50:
strh r0, [r6, 0x8]
b _080CDD98
_080CDD68:
ldr r0, _080CDDA0 @ =gUnknown_2037AB8
ldr r0, _080CDDA0 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -76,7 +76,7 @@ _080CDD98:
pop {r0}
bx r0
.align 2, 0
_080CDDA0: .4byte gUnknown_2037AB8
_080CDDA0: .4byte gPaletteFade
_080CDDA4: .4byte gPlayerParty
thumb_func_end Task_BeginEvolutionScene
@@ -375,7 +375,7 @@ EvolutionScene: @ 80CDDF4
strh r2, [r0, 0x1C]
ldr r1, _080CE0A8 @ =gUnknown_2039A20
ldr r0, [r1]
ldr r1, _080CE0D8 @ =gUnknown_2037238
ldr r1, _080CE0D8 @ =gPlttBufferUnfaded + 0x40
adds r0, 0x4
movs r2, 0x60
bl memcpy
@@ -423,7 +423,7 @@ _080CE0C8: .4byte gSprites
_080CE0CC: .4byte nullsub_10
_080CE0D0: .4byte sub_80CE8DC
_080CE0D4: .4byte gTasks
_080CE0D8: .4byte gUnknown_2037238
_080CE0D8: .4byte gPlttBufferUnfaded + 0x40
_080CE0DC: .4byte nullsub_76
_080CE0E0: .4byte sub_80D0050
_080CE0E4: .4byte sub_80CE710
@@ -1483,7 +1483,7 @@ _080CEA84: .4byte gSprites
_080CEA88: .4byte gUnknown_2039A20
_080CEA8C: .4byte gTasks
_080CEA90:
ldr r0, _080CEAC0 @ =gUnknown_2037AB8
ldr r0, _080CEAC0 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1505,7 +1505,7 @@ _080CEAA0:
adds r1, r0
b _080CEFDE
.align 2, 0
_080CEAC0: .4byte gUnknown_2037AB8
_080CEAC0: .4byte gPaletteFade
_080CEAC4: .4byte gStringVar4
_080CEAC8: .4byte gUnknown_83FE672
_080CEACC: .4byte gTasks
@@ -1572,7 +1572,7 @@ _080CEB28:
.align 2, 0
_080CEB54: .4byte gTasks
_080CEB58:
ldr r0, _080CEB84 @ =gUnknown_2037AB8
ldr r0, _080CEB84 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1593,7 +1593,7 @@ _080CEB68:
adds r1, r0
b _080CEFDE
.align 2, 0
_080CEB84: .4byte gUnknown_2037AB8
_080CEB84: .4byte gPaletteFade
_080CEB88: .4byte gUnknown_2023E82
_080CEB8C: .4byte gTasks
_080CEB90:
@@ -1748,7 +1748,7 @@ _080CECC0:
bl _080CF528
_080CECCE:
bl m4aMPlayAllStop
ldr r0, _080CED00 @ =gUnknown_2037238
ldr r0, _080CED00 @ =gPlttBufferUnfaded + 0x40
ldr r1, _080CED04 @ =gUnknown_2039A20
ldr r1, [r1]
adds r1, 0x4
@@ -1769,11 +1769,11 @@ _080CECCE:
adds r1, r0
b _080CEFDE
.align 2, 0
_080CED00: .4byte gUnknown_2037238
_080CED00: .4byte gPlttBufferUnfaded + 0x40
_080CED04: .4byte gUnknown_2039A20
_080CED08: .4byte gTasks
_080CED0C:
ldr r0, _080CED28 @ =gUnknown_2037AB8
ldr r0, _080CED28 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1788,7 +1788,7 @@ _080CED1C:
ldrh r0, [r4, 0xC]
b _080CEF28
.align 2, 0
_080CED28: .4byte gUnknown_2037AB8
_080CED28: .4byte gPaletteFade
_080CED2C:
bl IsCryFinished
lsls r0, 24
@@ -1922,7 +1922,7 @@ _080CEE40:
.align 2, 0
_080CEE5C: .4byte gTasks
_080CEE60:
ldr r0, _080CEEC4 @ =gUnknown_2037AB8
ldr r0, _080CEEC4 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r2, 0x80
adds r0, r2, 0
@@ -1967,7 +1967,7 @@ _080CEEA0:
bl SetMainCallback2
b _080CF528
.align 2, 0
_080CEEC4: .4byte gUnknown_2037AB8
_080CEEC4: .4byte gPaletteFade
_080CEEC8: .4byte gUnknown_2039A20
_080CEECC: .4byte gUnknown_300537C
_080CEED0:
@@ -2000,7 +2000,7 @@ _080CEF04: .4byte gUnknown_2023E82
_080CEF08: .4byte 0x0006001c
_080CEF0C: .4byte 0x00007fff
_080CEF10:
ldr r0, _080CEF38 @ =gUnknown_2037AB8
ldr r0, _080CEF38 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -2023,7 +2023,7 @@ _080CEF2E:
strh r0, [r4, 0x8]
b _080CF528
.align 2, 0
_080CEF38: .4byte gUnknown_2037AB8
_080CEF38: .4byte gPaletteFade
_080CEF3C:
bl IsCryFinished
lsls r0, 24
@@ -2424,7 +2424,7 @@ _080CF284:
_080CF2AC: .4byte gTasks
_080CF2B0: .4byte gMain
_080CF2B4:
ldr r0, _080CF2F4 @ =gUnknown_2037AB8
ldr r0, _080CF2F4 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -2455,14 +2455,14 @@ _080CF2C2:
strh r0, [r5, 0x14]
b _080CF528
.align 2, 0
_080CF2F4: .4byte gUnknown_2037AB8
_080CF2F4: .4byte gPaletteFade
_080CF2F8: .4byte gPlayerParty
_080CF2FC: .4byte gTasks
_080CF300: .4byte gPlayerPartyCount
_080CF304: .4byte CB2_EvolutionSceneLoadGraphics
_080CF308: .4byte gMoveToLearn
_080CF30C:
ldr r0, _080CF340 @ =gUnknown_2037AB8
ldr r0, _080CF340 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -2489,7 +2489,7 @@ _080CF324:
movs r0, 0xA
b _080CF526
.align 2, 0
_080CF340: .4byte gUnknown_2037AB8
_080CF340: .4byte gPaletteFade
_080CF344: .4byte sub_80CE710
_080CF348: .4byte gTasks
_080CF34C:
@@ -2887,7 +2887,7 @@ _080CF6AC:
.align 2, 0
_080CF6CC: .4byte gTasks
_080CF6D0:
ldr r0, _080CF724 @ =gUnknown_2037AB8
ldr r0, _080CF724 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -2925,7 +2925,7 @@ _080CF6E0:
bl SetGpuReg
bl _080D003A
.align 2, 0
_080CF724: .4byte gUnknown_2037AB8
_080CF724: .4byte gPaletteFade
_080CF728: .4byte gSprites
_080CF72C: .4byte gUnknown_2039A20
_080CF730: .4byte gUnknown_2023E82
@@ -3085,7 +3085,7 @@ _080CF86E:
ldrh r0, [r4, 0xC]
movs r1, 0
bl PlayCry1
ldr r0, _080CF894 @ =gUnknown_2037238
ldr r0, _080CF894 @ =gPlttBufferUnfaded + 0x40
ldr r1, _080CF898 @ =gUnknown_2039A20
ldr r1, [r1]
adds r1, 0x4
@@ -3094,7 +3094,7 @@ _080CF86E:
b _080CFA90
.align 2, 0
_080CF890: .4byte gTasks
_080CF894: .4byte gUnknown_2037238
_080CF894: .4byte gPlttBufferUnfaded + 0x40
_080CF898: .4byte gUnknown_2039A20
_080CF89C:
bl IsCryFinished
@@ -3305,7 +3305,7 @@ _080CFA68: .4byte gUnknown_2039A20
_080CFA6C: .4byte 0x0004001c
_080CFA70: .4byte 0x00007fff
_080CFA74:
ldr r0, _080CFA98 @ =gUnknown_2037AB8
ldr r0, _080CFA98 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -3326,7 +3326,7 @@ _080CFA90:
strh r0, [r4, 0x8]
b _080D003A
.align 2, 0
_080CFA98: .4byte gUnknown_2037AB8
_080CFA98: .4byte gPaletteFade
_080CFA9C:
bl IsCryFinished
lsls r0, 24
@@ -3679,7 +3679,7 @@ _080CFDA0: .4byte gUnknown_83FDF3C
_080CFDA4: .4byte gDisplayedStringBattle
_080CFDA8: .4byte gTasks
_080CFDAC:
ldr r0, _080CFE14 @ =gUnknown_2037AB8
ldr r0, _080CFE14 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -3724,7 +3724,7 @@ _080CFDC6:
strh r0, [r5, 0x14]
b _080D003A
.align 2, 0
_080CFE14: .4byte gUnknown_2037AB8
_080CFE14: .4byte gPaletteFade
_080CFE18: .4byte gUnknown_3003F3C
_080CFE1C: .4byte gPlayerParty
_080CFE20: .4byte gTasks
@@ -3732,7 +3732,7 @@ _080CFE24: .4byte gPlayerPartyCount
_080CFE28: .4byte CB2_TradeEvolutionSceneLoadGraphics
_080CFE2C: .4byte gMoveToLearn
_080CFE30:
ldr r0, _080CFE64 @ =gUnknown_2037AB8
ldr r0, _080CFE64 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -3759,7 +3759,7 @@ _080CFE4A:
movs r0, 0x9
b _080D0038
.align 2, 0
_080CFE64: .4byte gUnknown_2037AB8
_080CFE64: .4byte gPaletteFade
_080CFE68: .4byte gMain
_080CFE6C: .4byte sub_80CE72C
_080CFE70: .4byte gTasks
asm/fame_checker.s
+4 -4
View File
@@ -322,7 +322,7 @@ sub_812C664: @ 812C664
push {lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r0, _0812C688 @ =gUnknown_2037AB8
ldr r0, _0812C688 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -339,7 +339,7 @@ _0812C684:
pop {r0}
bx r0
.align 2, 0
_0812C688: .4byte gUnknown_2037AB8
_0812C688: .4byte gPaletteFade
_0812C68C: .4byte gTasks
_0812C690: .4byte sub_812C694
thumb_func_end sub_812C664
@@ -1455,7 +1455,7 @@ sub_812CF7C: @ 812CF7C
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
ldr r0, _0812D074 @ =gUnknown_2037AB8
ldr r0, _0812D074 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1556,7 +1556,7 @@ _0812D06C:
pop {r0}
bx r0
.align 2, 0
_0812D074: .4byte gUnknown_2037AB8
_0812D074: .4byte gPaletteFade
_0812D078: .4byte gUnknown_203B0FC
_0812D07C: .4byte gTasks
_0812D080: .4byte gSprites
asm/field_camera.s
+2 -2
View File
@@ -1222,7 +1222,7 @@ CameraPanningCB_PanAhead: @ 805AE74
.align 2, 0
_0805AE84: .4byte gUnknown_2036E2C
_0805AE88:
ldr r0, _0805AEA0 @ =gUnknown_2037078
ldr r0, _0805AEA0 @ =gPlayerAvatar
ldrb r0, [r0, 0x3]
cmp r0, 0x1
bne _0805AEA8
@@ -1235,7 +1235,7 @@ _0805AE88:
beq _0805AF10
b _0805AEAE
.align 2, 0
_0805AEA0: .4byte gUnknown_2037078
_0805AEA0: .4byte gPlayerAvatar
_0805AEA4: .4byte gUnknown_3000E9C
_0805AEA8:
ldr r1, _0805AED0 @ =gUnknown_3000E9C
asm/field_control_avatar.s
+42 -42
View File
@@ -34,8 +34,8 @@ sub_806C888: @ 806C888
bx r0
thumb_func_end sub_806C888
thumb_func_start sub_806C8BC
sub_806C8BC: @ 806C8BC
thumb_func_start FieldGetPlayerInput
FieldGetPlayerInput: @ 806C8BC
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -46,7 +46,7 @@ sub_806C8BC: @ 806C8BC
mov r4, sp
adds r4, 0x2
strh r2, [r4]
ldr r0, _0806CA14 @ =gUnknown_2037078
ldr r0, _0806CA14 @ =gPlayerAvatar
ldrb r1, [r0, 0x2]
mov r8, r1
ldrb r6, [r0, 0x3]
@@ -89,7 +89,7 @@ _0806C914:
ands r0, r1
cmp r0, 0
beq _0806C940
ldr r0, _0806CA14 @ =gUnknown_2037078
ldr r0, _0806CA14 @ =gPlayerAvatar
ldrb r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -107,7 +107,7 @@ _0806C940:
lsrs r0, 24
cmp r0, 0x1
bls _0806C9D0
ldr r0, _0806CA14 @ =gUnknown_2037078
ldr r0, _0806CA14 @ =gPlayerAvatar
ldrb r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -213,7 +213,7 @@ _0806C9F6:
movs r0, 0x2
b _0806CA3E
.align 2, 0
_0806CA14: .4byte gUnknown_2037078
_0806CA14: .4byte gPlayerAvatar
_0806CA18: .4byte gUnknown_203ADFA
_0806CA1C:
movs r0, 0x80
@@ -244,7 +244,7 @@ _0806CA40:
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_806C8BC
thumb_func_end FieldGetPlayerInput
thumb_func_start sub_806CA4C
sub_806CA4C: @ 806CA4C
@@ -339,7 +339,7 @@ sub_806CAC8: @ 806CAC8
ldrsh r0, [r0, r1]
movs r2, 0x2
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 16
lsrs r4, r0, 16
ldr r7, _0806CB70 @ =gUnknown_3005078
@@ -347,7 +347,7 @@ sub_806CAC8: @ 806CAC8
bl sub_806C888
ldrb r0, [r5, 0x2]
strb r0, [r7, 0x2]
bl sub_8081B30
bl CheckForTrainersWantingBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -406,7 +406,7 @@ _0806CB88:
ldrsh r0, [r0, r1]
movs r2, 0x2
ldrsh r1, [r7, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 16
lsrs r4, r0, 16
mov r0, sp
@@ -431,7 +431,7 @@ _0806CBC0:
ldrsh r0, [r0, r1]
movs r2, 0x2
ldrsh r1, [r7, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 16
lsrs r4, r0, 16
_0806CBD8:
@@ -441,7 +441,7 @@ _0806CBD8:
cmp r0, 0
beq _0806CBFC
mov r0, r8
bl sub_806D7F4
bl is_it_battle_time_3
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -464,7 +464,7 @@ _0806CBFC:
mov r0, sp
adds r1, r4, 0
adds r2, r6, 0
bl sub_806D964
bl mapheader_run_first_tag2_script_list_match_conditionally
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -484,7 +484,7 @@ _0806CC2C:
ldrsh r0, [r0, r1]
movs r2, 0x2
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 16
lsrs r4, r0, 16
ldrb r1, [r5]
@@ -541,7 +541,7 @@ _0806CC9C:
mov r0, sp
adds r1, r4, 0
adds r2, r6, 0
bl sub_806DCD0
bl map_warp_consider_2_to_inside
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -567,7 +567,7 @@ _0806CCCC:
bl FlagSet
movs r0, 0x6
bl PlaySE
bl sub_806F258
bl ShowStartMenu
b _0806CB6C
.align 2, 0
_0806CCF4: .4byte gUnknown_3005078
@@ -577,7 +577,7 @@ _0806CCFC:
ands r0, r1
cmp r0, 0
beq _0806CD20
bl sub_810AD10
bl UseRegisteredKeyItemOnField
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -708,7 +708,7 @@ sub_806CDF8: @ 806CDF8
bne _0806CE18
movs r0, 0x6
bl PlaySE
bl sub_806F258
bl ShowStartMenu
adds r0, r4, 0
bl DestroyTask
_0806CE18:
@@ -775,7 +775,7 @@ cur_mapdata_block_role_at_player_pos: @ 806CE74
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 16
lsrs r0, 16
add sp, 0x4
@@ -873,7 +873,7 @@ sub_806CF38: @ 806CF38
ldrsh r0, [r4, r1]
movs r2, 0x2
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl MetatileBehavior_IsCounter
@@ -1713,7 +1713,7 @@ sub_806D5E8: @ 806D5E8
lsrs r0, 24
cmp r0, 0x1
beq _0806D650
ldr r0, _0806D654 @ =gUnknown_2037078
ldr r0, _0806D654 @ =gPlayerAvatar
ldrb r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -1734,7 +1734,7 @@ _0806D650:
movs r0, 0x1
b _0806D65A
.align 2, 0
_0806D654: .4byte gUnknown_2037078
_0806D654: .4byte gPlayerAvatar
_0806D658:
movs r0, 0
_0806D65A:
@@ -1792,7 +1792,7 @@ sub_806D698: @ 806D698
cmp r0, 0x2
beq _0806D72C
bl AdjustFriendship_step
ldr r0, _0806D6E4 @ =gUnknown_2037078
ldr r0, _0806D6E4 @ =gPlayerAvatar
ldrb r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -1814,7 +1814,7 @@ sub_806D698: @ 806D698
b _0806D730
.align 2, 0
_0806D6E0: .4byte gUnknown_203ADFA
_0806D6E4: .4byte gUnknown_2037078
_0806D6E4: .4byte gPlayerAvatar
_0806D6E8: .4byte gUnknown_81A8CED
_0806D6EC:
bl overworld_poison_step
@@ -1872,7 +1872,7 @@ _0806D748: .4byte 0x00004021
AdjustFriendship_step: @ 806D74C
push {r4,r5,lr}
ldr r0, _0806D780 @ =0x00004021
bl sub_806E454
bl GetVarPointer
ldrh r1, [r0]
adds r1, 0x1
strh r1, [r0]
@@ -1921,7 +1921,7 @@ overworld_poison_step: @ 806D79C
cmp r0, 0x9
beq _0806D7E0
ldr r0, _0806D7DC @ =0x00004022
bl sub_806E454
bl GetVarPointer
adds r4, r0, 0
ldrh r0, [r4]
adds r0, 0x1
@@ -1961,15 +1961,15 @@ sub_806D7E8: @ 806D7E8
bx r0
thumb_func_end sub_806D7E8
thumb_func_start sub_806D7F4
sub_806D7F4: @ 806D7F4
thumb_func_start is_it_battle_time_3
is_it_battle_time_3: @ 806D7F4
push {lr}
bl sub_80833B0
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
thumb_func_end sub_806D7F4
thumb_func_end is_it_battle_time_3
thumb_func_start sub_806D804
sub_806D804: @ 806D804
@@ -2159,8 +2159,8 @@ _0806D958:
_0806D960: .4byte gUnknown_81C555B
thumb_func_end sub_806D928
thumb_func_start sub_806D964
sub_806D964: @ 806D964
thumb_func_start mapheader_run_first_tag2_script_list_match_conditionally
mapheader_run_first_tag2_script_list_match_conditionally: @ 806D964
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -2209,7 +2209,7 @@ _0806D9BC:
cmp r0, 0x1
bne _0806DA00
movs r4, 0
ldr r0, _0806D9FC @ =gUnknown_2037078
ldr r0, _0806D9FC @ =gPlayerAvatar
ldrb r1, [r0]
movs r0, 0x6
ands r0, r1
@@ -2230,7 +2230,7 @@ _0806D9E2:
movs r0, 0x1
b _0806DA02
.align 2, 0
_0806D9FC: .4byte gUnknown_2037078
_0806D9FC: .4byte gPlayerAvatar
_0806DA00:
movs r0, 0
_0806DA02:
@@ -2241,7 +2241,7 @@ _0806DA02:
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_806D964
thumb_func_end mapheader_run_first_tag2_script_list_match_conditionally
thumb_func_start sub_806DA10
sub_806DA10: @ 806DA10
@@ -2600,8 +2600,8 @@ _0806DCC4:
_0806DCCC: .4byte gSaveBlock1Ptr
thumb_func_end sub_806DC54
thumb_func_start sub_806DCD0
sub_806DCD0: @ 806DCD0
thumb_func_start map_warp_consider_2_to_inside
map_warp_consider_2_to_inside: @ 806DCD0
push {r4-r7,lr}
adds r6, r0, 0
lsls r1, 16
@@ -2649,7 +2649,7 @@ _0806DD32:
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_806DCD0
thumb_func_end map_warp_consider_2_to_inside
thumb_func_start map_warp_check
map_warp_check: @ 806DD38
@@ -2799,7 +2799,7 @@ sub_806DE28: @ 806DE28
ldrsh r0, [r5, r1]
movs r2, 0x12
ldrsh r1, [r5, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
cmp r0, 0x66
bne _0806DE64
movs r0, 0x25
@@ -2839,7 +2839,7 @@ sub_806DE70: @ 806DE70
asrs r0, 16
lsrs r6, r1, 16
asrs r1, 16
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
cmp r0, 0x20
bne _0806DEB8
cmp r5, 0
@@ -3017,7 +3017,7 @@ sub_806DFB8: @ 806DFB8
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r5, r0, 24
ldr r0, _0806E010 @ =gMapHeader
@@ -3095,7 +3095,7 @@ GetFieldObjectScriptPointerForComparison: @ 806E050
ldrsh r0, [r0, r1]
movs r2, 0x2
ldrsh r1, [r5, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -3121,7 +3121,7 @@ SetCableClubWarp: @ 806E08C
ldrsh r0, [r0, r1]
movs r2, 0x2
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
ldr r4, _0806E0CC @ =gMapHeader
adds r0, r4, 0
mov r1, sp
asm/field_door.s
+4 -4
View File
@@ -487,7 +487,7 @@ sub_805B268: @ 805B268
asrs r0, 16
lsls r1, r5, 16
asrs r1, 16
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl MetatileBehavior_IsWarpDoor_2
@@ -515,7 +515,7 @@ sub_805B29C: @ 805B29C
asrs r0, 16
lsls r1, r5, 16
asrs r1, 16
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl MetatileBehavior_IsWarpDoor_2
@@ -543,7 +543,7 @@ sub_805B2D0: @ 805B2D0
asrs r0, 16
lsls r1, r5, 16
asrs r1, 16
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl MetatileBehavior_IsWarpDoor_2
@@ -577,7 +577,7 @@ sub_805B310: @ 805B310
asrs r0, 16
lsls r1, r5, 16
asrs r1, 16
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl MetatileBehavior_IsWarpDoor_2
asm/field_effect.s
+191 -191
View File
File diff suppressed because it is too large Load Diff
asm/field_effect_helpers.s
+58 -58
View File
@@ -580,7 +580,7 @@ _080DB1D8: .4byte gSprites
thumb_func_start oei_shadow
oei_shadow: @ 80DB1DC
push {r4,r5,lr}
ldr r5, _080DB268 @ =gUnknown_20386E0
ldr r5, _080DB268 @ =gFieldEffectArguments
ldrb r0, [r5]
ldrb r1, [r5, 0x4]
ldrb r2, [r5, 0x8]
@@ -648,7 +648,7 @@ _080DB260:
pop {r1}
bx r1
.align 2, 0
_080DB268: .4byte gUnknown_20386E0
_080DB268: .4byte gFieldEffectArguments
_080DB26C: .4byte gMapObjects
_080DB270: .4byte gUnknown_83A0010
_080DB274: .4byte gUnknown_83FECD2
@@ -757,7 +757,7 @@ _080DB344: .4byte 0x00400001
oei_grass_normal: @ 80DB348
push {r4,r5,lr}
sub sp, 0x4
ldr r5, _080DB3E0 @ =gUnknown_20386E0
ldr r5, _080DB3E0 @ =gFieldEffectArguments
ldrh r1, [r5]
mov r0, sp
strh r1, [r0]
@@ -829,7 +829,7 @@ _080DB3D4:
pop {r1}
bx r1
.align 2, 0
_080DB3E0: .4byte gUnknown_20386E0
_080DB3E0: .4byte gFieldEffectArguments
_080DB3E4: .4byte gUnknown_83A0010
_080DB3E8: .4byte gSprites
thumb_func_end oei_grass_normal
@@ -888,7 +888,7 @@ _080DB438:
ldrsh r0, [r5, r2]
movs r2, 0x32
ldrsh r1, [r5, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r6, r0, 24
mov r0, r8
@@ -972,7 +972,7 @@ _080DB4F0: .4byte gMapObjects
thumb_func_start FldEff_JumpTallGrass
FldEff_JumpTallGrass: @ 80DB4F4
push {r4,lr}
ldr r4, _080DB558 @ =gUnknown_20386E0
ldr r4, _080DB558 @ =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -1021,7 +1021,7 @@ _080DB550:
pop {r1}
bx r1
.align 2, 0
_080DB558: .4byte gUnknown_20386E0
_080DB558: .4byte gFieldEffectArguments
_080DB55C: .4byte gUnknown_83A0010
_080DB560: .4byte gSprites
thumb_func_end FldEff_JumpTallGrass
@@ -1107,7 +1107,7 @@ _080DB5E8:
FldEff_LongGrass: @ 80DB5F4
push {r4,r5,lr}
sub sp, 0x4
ldr r5, _080DB690 @ =gUnknown_20386E0
ldr r5, _080DB690 @ =gFieldEffectArguments
ldrh r1, [r5]
mov r0, sp
strh r1, [r0]
@@ -1180,7 +1180,7 @@ _080DB684:
pop {r1}
bx r1
.align 2, 0
_080DB690: .4byte gUnknown_20386E0
_080DB690: .4byte gFieldEffectArguments
_080DB694: .4byte gUnknown_83A0010
_080DB698: .4byte gSprites
thumb_func_end FldEff_LongGrass
@@ -1239,7 +1239,7 @@ _080DB6E8:
ldrsh r0, [r5, r2]
movs r2, 0x32
ldrsh r1, [r5, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r4, r0, 24
mov r0, r8
@@ -1315,7 +1315,7 @@ _080DB794: .4byte gMapObjects
thumb_func_start FldEff_JumpLongGrass
FldEff_JumpLongGrass: @ 80DB798
push {r4,lr}
ldr r4, _080DB7FC @ =gUnknown_20386E0
ldr r4, _080DB7FC @ =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -1364,7 +1364,7 @@ _080DB7F4:
pop {r1}
bx r1
.align 2, 0
_080DB7FC: .4byte gUnknown_20386E0
_080DB7FC: .4byte gFieldEffectArguments
_080DB800: .4byte gUnknown_83A0010
_080DB804: .4byte gSprites
thumb_func_end FldEff_JumpLongGrass
@@ -1372,7 +1372,7 @@ _080DB804: .4byte gSprites
thumb_func_start sub_80DB808
sub_80DB808: @ 80DB808
push {r4-r6,lr}
ldr r6, _080DB89C @ =gUnknown_20386E0
ldr r6, _080DB89C @ =gFieldEffectArguments
ldrb r0, [r6]
ldrb r1, [r6, 0x4]
ldrb r2, [r6, 0x8]
@@ -1445,7 +1445,7 @@ _080DB894:
pop {r1}
bx r1
.align 2, 0
_080DB89C: .4byte gUnknown_20386E0
_080DB89C: .4byte gFieldEffectArguments
_080DB8A0: .4byte gMapObjects
_080DB8A4: .4byte gUnknown_83A0010
_080DB8A8: .4byte gSprites
@@ -1579,7 +1579,7 @@ _080DB99C: .4byte gSprites
thumb_func_start FldEff_SandFootprints
FldEff_SandFootprints: @ 80DB9A0
push {r4,lr}
ldr r4, _080DBA08 @ =gUnknown_20386E0
ldr r4, _080DBA08 @ =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -1628,7 +1628,7 @@ _080DB9FE:
pop {r1}
bx r1
.align 2, 0
_080DBA08: .4byte gUnknown_20386E0
_080DBA08: .4byte gFieldEffectArguments
_080DBA0C: .4byte gUnknown_83A0010
_080DBA10: .4byte gSprites
thumb_func_end FldEff_SandFootprints
@@ -1636,7 +1636,7 @@ _080DBA10: .4byte gSprites
thumb_func_start FldEff_DeepSandFootprints
FldEff_DeepSandFootprints: @ 80DBA14
push {r4,r5,lr}
ldr r4, _080DBA7C @ =gUnknown_20386E0
ldr r4, _080DBA7C @ =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -1686,7 +1686,7 @@ _080DBA74:
pop {r1}
bx r1
.align 2, 0
_080DBA7C: .4byte gUnknown_20386E0
_080DBA7C: .4byte gFieldEffectArguments
_080DBA80: .4byte gUnknown_83A0010
_080DBA84: .4byte gSprites
thumb_func_end FldEff_DeepSandFootprints
@@ -1694,7 +1694,7 @@ _080DBA84: .4byte gSprites
thumb_func_start FldEff_BikeTireTracks
FldEff_BikeTireTracks: @ 80DBA88
push {r4,r5,lr}
ldr r4, _080DBAF0 @ =gUnknown_20386E0
ldr r4, _080DBAF0 @ =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -1744,7 +1744,7 @@ _080DBAE8:
pop {r1}
bx r1
.align 2, 0
_080DBAF0: .4byte gUnknown_20386E0
_080DBAF0: .4byte gFieldEffectArguments
_080DBAF4: .4byte gUnknown_83A0010
_080DBAF8: .4byte gSprites
thumb_func_end FldEff_BikeTireTracks
@@ -1829,7 +1829,7 @@ _080DBB80:
thumb_func_start FldEff_Splash
FldEff_Splash: @ 80DBB88
push {r4-r6,lr}
ldr r6, _080DBC1C @ =gUnknown_20386E0
ldr r6, _080DBC1C @ =gFieldEffectArguments
ldrb r0, [r6]
ldrb r1, [r6, 0x4]
ldrb r2, [r6, 0x8]
@@ -1899,7 +1899,7 @@ _080DBC12:
pop {r1}
bx r1
.align 2, 0
_080DBC1C: .4byte gUnknown_20386E0
_080DBC1C: .4byte gFieldEffectArguments
_080DBC20: .4byte gMapObjects
_080DBC24: .4byte gUnknown_83A0010
_080DBC28: .4byte gSprites
@@ -1980,7 +1980,7 @@ _080DBCB4: .4byte gMapObjects
thumb_func_start FldEff_JumpSmallSplash
FldEff_JumpSmallSplash: @ 80DBCB8
push {r4,lr}
ldr r4, _080DBD1C @ =gUnknown_20386E0
ldr r4, _080DBD1C @ =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -2029,7 +2029,7 @@ _080DBD14:
pop {r1}
bx r1
.align 2, 0
_080DBD1C: .4byte gUnknown_20386E0
_080DBD1C: .4byte gFieldEffectArguments
_080DBD20: .4byte gUnknown_83A0010
_080DBD24: .4byte gSprites
thumb_func_end FldEff_JumpSmallSplash
@@ -2037,7 +2037,7 @@ _080DBD24: .4byte gSprites
thumb_func_start oei_water_drop_tall
oei_water_drop_tall: @ 80DBD28
push {r4,lr}
ldr r4, _080DBD8C @ =gUnknown_20386E0
ldr r4, _080DBD8C @ =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -2086,7 +2086,7 @@ _080DBD84:
pop {r1}
bx r1
.align 2, 0
_080DBD8C: .4byte gUnknown_20386E0
_080DBD8C: .4byte gFieldEffectArguments
_080DBD90: .4byte gUnknown_83A0010
_080DBD94: .4byte gSprites
thumb_func_end oei_water_drop_tall
@@ -2094,7 +2094,7 @@ _080DBD94: .4byte gSprites
thumb_func_start FldEff_FeetInFlowingWater
FldEff_FeetInFlowingWater: @ 80DBD98
push {r4-r7,lr}
ldr r7, _080DBE38 @ =gUnknown_20386E0
ldr r7, _080DBE38 @ =gFieldEffectArguments
ldrb r0, [r7]
ldrb r1, [r7, 0x4]
ldrb r2, [r7, 0x8]
@@ -2170,7 +2170,7 @@ _080DBE2E:
pop {r1}
bx r1
.align 2, 0
_080DBE38: .4byte gUnknown_20386E0
_080DBE38: .4byte gFieldEffectArguments
_080DBE3C: .4byte gMapObjects
_080DBE40: .4byte gUnknown_83A0010
_080DBE44: .4byte gSprites
@@ -2265,7 +2265,7 @@ oei_ripples: @ 80DBEF0
push {r4,lr}
ldr r0, _080DBF44 @ =gUnknown_83A0010
ldr r0, [r0, 0x14]
ldr r4, _080DBF48 @ =gUnknown_20386E0
ldr r4, _080DBF48 @ =gFieldEffectArguments
movs r2, 0
ldrsh r1, [r4, r2]
movs r3, 0x4
@@ -2306,14 +2306,14 @@ _080DBF3C:
bx r1
.align 2, 0
_080DBF44: .4byte gUnknown_83A0010
_080DBF48: .4byte gUnknown_20386E0
_080DBF48: .4byte gFieldEffectArguments
_080DBF4C: .4byte gSprites
thumb_func_end oei_ripples
thumb_func_start sub_80DBF50
sub_80DBF50: @ 80DBF50
push {r4-r6,lr}
ldr r6, _080DBFE4 @ =gUnknown_20386E0
ldr r6, _080DBFE4 @ =gFieldEffectArguments
ldrb r0, [r6]
ldrb r1, [r6, 0x4]
ldrb r2, [r6, 0x8]
@@ -2386,7 +2386,7 @@ _080DBFDC:
pop {r1}
bx r1
.align 2, 0
_080DBFE4: .4byte gUnknown_20386E0
_080DBFE4: .4byte gFieldEffectArguments
_080DBFE8: .4byte gMapObjects
_080DBFEC: .4byte gUnknown_83A0010
_080DBFF0: .4byte gSprites
@@ -2474,7 +2474,7 @@ _080DC088: .4byte gSprites
thumb_func_start FldEff_Unknown19
FldEff_Unknown19: @ 80DC08C
push {r4,lr}
ldr r4, _080DC0EC @ =gUnknown_20386E0
ldr r4, _080DC0EC @ =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -2521,7 +2521,7 @@ _080DC0E4:
pop {r1}
bx r1
.align 2, 0
_080DC0EC: .4byte gUnknown_20386E0
_080DC0EC: .4byte gFieldEffectArguments
_080DC0F0: .4byte gUnknown_83A0010
_080DC0F4: .4byte gSprites
thumb_func_end FldEff_Unknown19
@@ -2529,7 +2529,7 @@ _080DC0F4: .4byte gSprites
thumb_func_start FldEff_Unknown20
FldEff_Unknown20: @ 80DC0F8
push {r4,lr}
ldr r4, _080DC158 @ =gUnknown_20386E0
ldr r4, _080DC158 @ =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -2576,7 +2576,7 @@ _080DC150:
pop {r1}
bx r1
.align 2, 0
_080DC158: .4byte gUnknown_20386E0
_080DC158: .4byte gFieldEffectArguments
_080DC15C: .4byte gUnknown_83A0010
_080DC160: .4byte gSprites
thumb_func_end FldEff_Unknown20
@@ -2584,7 +2584,7 @@ _080DC160: .4byte gSprites
thumb_func_start FldEff_Unknown21
FldEff_Unknown21: @ 80DC164
push {r4,lr}
ldr r4, _080DC1C4 @ =gUnknown_20386E0
ldr r4, _080DC1C4 @ =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -2631,7 +2631,7 @@ _080DC1BC:
pop {r1}
bx r1
.align 2, 0
_080DC1C4: .4byte gUnknown_20386E0
_080DC1C4: .4byte gFieldEffectArguments
_080DC1C8: .4byte gUnknown_83A0010
_080DC1CC: .4byte gSprites
thumb_func_end FldEff_Unknown21
@@ -2639,7 +2639,7 @@ _080DC1CC: .4byte gSprites
thumb_func_start FldEff_Unknown22
FldEff_Unknown22: @ 80DC1D0
push {r4,lr}
ldr r4, _080DC230 @ =gUnknown_20386E0
ldr r4, _080DC230 @ =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -2686,7 +2686,7 @@ _080DC228:
pop {r1}
bx r1
.align 2, 0
_080DC230: .4byte gUnknown_20386E0
_080DC230: .4byte gFieldEffectArguments
_080DC234: .4byte gUnknown_83A0010
_080DC238: .4byte gSprites
thumb_func_end FldEff_Unknown22
@@ -2696,7 +2696,7 @@ ash: @ 80DC23C
push {r4,lr}
lsls r2, 16
lsrs r2, 16
ldr r4, _080DC26C @ =gUnknown_20386E0
ldr r4, _080DC26C @ =gFieldEffectArguments
lsls r0, 16
asrs r0, 16
str r0, [r4]
@@ -2717,14 +2717,14 @@ ash: @ 80DC23C
pop {r0}
bx r0
.align 2, 0
_080DC26C: .4byte gUnknown_20386E0
_080DC26C: .4byte gFieldEffectArguments
thumb_func_end ash
thumb_func_start oei_ash
oei_ash: @ 80DC270
push {r4,r5,lr}
sub sp, 0x4
ldr r5, _080DC2F0 @ =gUnknown_20386E0
ldr r5, _080DC2F0 @ =gFieldEffectArguments
ldrh r1, [r5]
mov r0, sp
strh r1, [r0]
@@ -2786,7 +2786,7 @@ _080DC2E6:
pop {r1}
bx r1
.align 2, 0
_080DC2F0: .4byte gUnknown_20386E0
_080DC2F0: .4byte gFieldEffectArguments
_080DC2F4: .4byte gUnknown_83A0010
_080DC2F8: .4byte gSprites
thumb_func_end oei_ash
@@ -2864,7 +2864,7 @@ sub_80DC348: @ 80DC348
ldrsh r1, [r4, r2]
bl CurrentMapDrawMetatileAt
ldr r2, _080DC3A0 @ =gMapObjects
ldr r0, _080DC3A4 @ =gUnknown_2037078
ldr r0, _080DC3A4 @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -2881,7 +2881,7 @@ sub_80DC348: @ 80DC348
bx r0
.align 2, 0
_080DC3A0: .4byte gMapObjects
_080DC3A4: .4byte gUnknown_2037078
_080DC3A4: .4byte gPlayerAvatar
thumb_func_end sub_80DC348
thumb_func_start sub_80DC3A8
@@ -2909,7 +2909,7 @@ _080DC3C8:
thumb_func_start sub_80DC3D0
sub_80DC3D0: @ 80DC3D0
push {r4,r5,lr}
ldr r4, _080DC43C @ =gUnknown_20386E0
ldr r4, _080DC43C @ =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -2960,7 +2960,7 @@ _080DC42C:
pop {r1}
bx r1
.align 2, 0
_080DC43C: .4byte gUnknown_20386E0
_080DC43C: .4byte gFieldEffectArguments
_080DC440: .4byte gUnknown_83A0010
_080DC444: .4byte gSprites
_080DC448: .4byte 0x0000ffff
@@ -3387,7 +3387,7 @@ _080DC73C: .4byte gSprites
thumb_func_start FldEff_Dust
FldEff_Dust: @ 80DC740
push {r4,lr}
ldr r4, _080DC7A4 @ =gUnknown_20386E0
ldr r4, _080DC7A4 @ =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -3436,7 +3436,7 @@ _080DC79C:
pop {r1}
bx r1
.align 2, 0
_080DC7A4: .4byte gUnknown_20386E0
_080DC7A4: .4byte gFieldEffectArguments
_080DC7A8: .4byte gUnknown_83A0010
_080DC7AC: .4byte gSprites
thumb_func_end FldEff_Dust
@@ -3444,7 +3444,7 @@ _080DC7AC: .4byte gSprites
thumb_func_start FldEff_SandPile
FldEff_SandPile: @ 80DC7B0
push {r4-r7,lr}
ldr r7, _080DC85C @ =gUnknown_20386E0
ldr r7, _080DC85C @ =gFieldEffectArguments
ldrb r0, [r7]
ldrb r1, [r7, 0x4]
ldrb r2, [r7, 0x8]
@@ -3527,7 +3527,7 @@ _080DC854:
pop {r1}
bx r1
.align 2, 0
_080DC85C: .4byte gUnknown_20386E0
_080DC85C: .4byte gFieldEffectArguments
_080DC860: .4byte gMapObjects
_080DC864: .4byte gUnknown_83A0010
_080DC868: .4byte gSprites
@@ -3641,7 +3641,7 @@ _080DC934: .4byte gMapObjects
thumb_func_start FldEff_Bubbles
FldEff_Bubbles: @ 80DC938
push {r4,lr}
ldr r4, _080DC990 @ =gUnknown_20386E0
ldr r4, _080DC990 @ =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -3684,7 +3684,7 @@ _080DC988:
pop {r1}
bx r1
.align 2, 0
_080DC990: .4byte gUnknown_20386E0
_080DC990: .4byte gFieldEffectArguments
_080DC994: .4byte gUnknown_83A0010
_080DC998: .4byte gSprites
thumb_func_end FldEff_Bubbles
@@ -3775,7 +3775,7 @@ ShowDisguiseFieldEffect: @ 80DCA10
lsrs r6, r1, 24
lsls r2, 24
lsrs r7, r2, 24
ldr r5, _080DCA44 @ =gUnknown_20386E0
ldr r5, _080DCA44 @ =gFieldEffectArguments
ldrb r0, [r5]
ldrb r1, [r5, 0x4]
ldrb r2, [r5, 0x8]
@@ -3789,7 +3789,7 @@ ShowDisguiseFieldEffect: @ 80DCA10
movs r0, 0x40
b _080DCAB4
.align 2, 0
_080DCA44: .4byte gUnknown_20386E0
_080DCA44: .4byte gFieldEffectArguments
_080DCA48:
ldr r1, _080DCAC0 @ =gUnknown_83A0010
lsls r0, r6, 2
@@ -4043,7 +4043,7 @@ _080DCC18:
thumb_func_start FldEff_Sparkle
FldEff_Sparkle: @ 80DCC1C
push {r4,lr}
ldr r4, _080DCC84 @ =gUnknown_20386E0
ldr r4, _080DCC84 @ =gFieldEffectArguments
ldr r0, [r4]
adds r0, 0x7
str r0, [r4]
@@ -4094,7 +4094,7 @@ _080DCC7C:
pop {r1}
bx r1
.align 2, 0
_080DCC84: .4byte gUnknown_20386E0
_080DCC84: .4byte gFieldEffectArguments
_080DCC88: .4byte gUnknown_83A0010
_080DCC8C: .4byte gSprites
thumb_func_end FldEff_Sparkle
asm/field_fadetransition.s
+18 -18
View File
@@ -11,7 +11,7 @@ palette_bg_faded_fill_white: @ 807DB14
sub sp, 0x4
ldr r0, _0807DB2C @ =0x7fff7fff
str r0, [sp]
ldr r1, _0807DB30 @ =gUnknown_20375F8
ldr r1, _0807DB30 @ =gPlttBufferFaded
ldr r2, _0807DB34 @ =0x01000100
mov r0, sp
bl CpuFastSet
@@ -20,7 +20,7 @@ palette_bg_faded_fill_white: @ 807DB14
bx r0
.align 2, 0
_0807DB2C: .4byte 0x7fff7fff
_0807DB30: .4byte gUnknown_20375F8
_0807DB30: .4byte gPlttBufferFaded
_0807DB34: .4byte 0x01000100
thumb_func_end palette_bg_faded_fill_white
@@ -30,7 +30,7 @@ palette_bg_faded_fill_black: @ 807DB38
sub sp, 0x4
movs r0, 0
str r0, [sp]
ldr r1, _0807DB50 @ =gUnknown_20375F8
ldr r1, _0807DB50 @ =gPlttBufferFaded
ldr r2, _0807DB54 @ =0x01000100
mov r0, sp
bl CpuFastSet
@@ -38,7 +38,7 @@ palette_bg_faded_fill_black: @ 807DB38
pop {r0}
bx r0
.align 2, 0
_0807DB50: .4byte gUnknown_20375F8
_0807DB50: .4byte gPlttBufferFaded
_0807DB54: .4byte 0x01000100
thumb_func_end palette_bg_faded_fill_black
@@ -461,7 +461,7 @@ sub_807DE78: @ 807DE78
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
@@ -1125,12 +1125,12 @@ _0807E408: .4byte task_mpl_807E3C8
thumb_func_start sub_807E40C
sub_807E40C: @ 807E40C
ldr r0, _0807E414 @ =gUnknown_2037AB8
ldr r0, _0807E414 @ =gPaletteFade
ldrb r0, [r0, 0x7]
lsrs r0, 7
bx lr
.align 2, 0
_0807E414: .4byte gUnknown_2037AB8
_0807E414: .4byte gPaletteFade
thumb_func_end sub_807E40C
thumb_func_start sub_807E418
@@ -1831,7 +1831,7 @@ sub_807E980: @ 807E980
lsls r0, 3
ldr r1, _0807E9C0 @ =gTasks+0x8
adds r5, r0, r1
ldr r2, _0807E9C4 @ =gUnknown_2037078
ldr r2, _0807E9C4 @ =gPlayerAvatar
ldrb r1, [r2, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -1855,7 +1855,7 @@ sub_807E980: @ 807E980
b _0807EA9A
.align 2, 0
_0807E9C0: .4byte gTasks+0x8
_0807E9C4: .4byte gUnknown_2037078
_0807E9C4: .4byte gPlayerAvatar
_0807E9C8: .4byte gMapObjects
_0807E9CC: .4byte gSprites
_0807E9D0:
@@ -1984,7 +1984,7 @@ sub_807EAC4: @ 807EAC4
lsls r0, 16
lsrs r0, 16
mov r12, r0
ldr r3, _0807EB58 @ =gUnknown_2037078
ldr r3, _0807EB58 @ =gPlayerAvatar
ldrb r2, [r3, 0x4]
lsls r0, r2, 4
adds r0, r2
@@ -2049,7 +2049,7 @@ _0807EB4C:
pop {r0}
bx r0
.align 2, 0
_0807EB58: .4byte gUnknown_2037078
_0807EB58: .4byte gPlayerAvatar
_0807EB5C: .4byte gSprites
_0807EB60: .4byte gMapObjects
thumb_func_end sub_807EAC4
@@ -2064,7 +2064,7 @@ sub_807EB64: @ 807EB64
mov r8, r2
lsls r5, 16
lsrs r5, 16
ldr r0, _0807EBB4 @ =gUnknown_2037078
ldr r0, _0807EBB4 @ =gPlayerAvatar
ldrb r0, [r0, 0x5]
lsls r4, r0, 3
adds r4, r0
@@ -2092,7 +2092,7 @@ sub_807EB64: @ 807EB64
pop {r0}
bx r0
.align 2, 0
_0807EBB4: .4byte gUnknown_2037078
_0807EBB4: .4byte gPlayerAvatar
_0807EBB8: .4byte gMapObjects
thumb_func_end sub_807EB64
@@ -2247,7 +2247,7 @@ sub_807ECBC: @ 807ECBC
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r6, r0, 24
adds r0, r6, 0
@@ -2266,7 +2266,7 @@ _0807ED06:
_0807ED0A:
movs r1, 0x4
_0807ED0C:
ldr r0, _0807ED94 @ =gUnknown_2037078
ldr r0, _0807ED94 @ =gPlayerAvatar
mov r8, r0
ldrb r0, [r0, 0x5]
lsls r4, r0, 3
@@ -2332,7 +2332,7 @@ _0807ED0C:
pop {r0}
bx r0
.align 2, 0
_0807ED94: .4byte gUnknown_2037078
_0807ED94: .4byte gPlayerAvatar
_0807ED98: .4byte gMapObjects
_0807ED9C: .4byte gSprites
thumb_func_end sub_807ECBC
@@ -2343,7 +2343,7 @@ sub_807EDA0: @ 807EDA0
adds r5, r0, 0
adds r6, r1, 0
ldr r4, [sp, 0x14]
ldr r0, _0807EDC8 @ =gUnknown_2037078
ldr r0, _0807EDC8 @ =gPlayerAvatar
ldrb r1, [r0, 0x4]
lsls r0, r1, 4
adds r0, r1
@@ -2359,7 +2359,7 @@ sub_807EDA0: @ 807EDA0
movs r0, 0
b _0807EDF8
.align 2, 0
_0807EDC8: .4byte gUnknown_2037078
_0807EDC8: .4byte gPlayerAvatar
_0807EDCC: .4byte gSprites
_0807EDD0:
ldrh r0, [r5]
asm/field_ground_effect.s
+33 -33
View File
@@ -118,13 +118,13 @@ FieldObjectUpdateMetatileBehaviors: @ 8067C24
ldrsh r0, [r4, r1]
movs r2, 0x16
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
strb r0, [r4, 0x1F]
movs r1, 0x10
ldrsh r0, [r4, r1]
movs r2, 0x12
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
strb r0, [r4, 0x1E]
pop {r4}
pop {r0}
@@ -616,7 +616,7 @@ _08067FA0:
adds r1, r6, r1
lsls r1, 16
asrs r1, 16
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl GetReflectionTypeByMetatileBehavior
@@ -632,7 +632,7 @@ _08067FA0:
adds r1, r6, r1
lsls r1, 16
asrs r1, 16
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl GetReflectionTypeByMetatileBehavior
@@ -661,7 +661,7 @@ _08067FFC:
adds r1, r6, r1
lsls r1, 16
asrs r1, 16
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl GetReflectionTypeByMetatileBehavior
@@ -678,7 +678,7 @@ _08067FFC:
adds r1, r6, r1
lsls r1, 16
asrs r1, 16
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl GetReflectionTypeByMetatileBehavior
@@ -695,7 +695,7 @@ _08067FFC:
adds r1, r6, r1
lsls r1, 16
asrs r1, 16
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl GetReflectionTypeByMetatileBehavior
@@ -712,7 +712,7 @@ _08067FFC:
adds r1, r6, r1
lsls r1, 16
asrs r1, 16
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl GetReflectionTypeByMetatileBehavior
@@ -801,7 +801,7 @@ _08068114:
asrs r0, 16
lsls r1, 16
asrs r1, 16
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
ldr r2, _08068144 @ =gUnknown_83A705C
@@ -1139,7 +1139,7 @@ _08068378:
thumb_func_start GroundEffect_SpawnOnTallGrass
GroundEffect_SpawnOnTallGrass: @ 806837C
push {lr}
ldr r3, _080683C0 @ =gUnknown_20386E0
ldr r3, _080683C0 @ =gFieldEffectArguments
movs r2, 0x10
ldrsh r1, [r0, r2]
str r1, [r3]
@@ -1172,14 +1172,14 @@ GroundEffect_SpawnOnTallGrass: @ 806837C
pop {r0}
bx r0
.align 2, 0
_080683C0: .4byte gUnknown_20386E0
_080683C0: .4byte gFieldEffectArguments
_080683C4: .4byte gSaveBlock1Ptr
thumb_func_end GroundEffect_SpawnOnTallGrass
thumb_func_start GroundEffect_StepOnTallGrass
GroundEffect_StepOnTallGrass: @ 80683C8
push {lr}
ldr r3, _0806840C @ =gUnknown_20386E0
ldr r3, _0806840C @ =gFieldEffectArguments
movs r2, 0x10
ldrsh r1, [r0, r2]
str r1, [r3]
@@ -1212,14 +1212,14 @@ GroundEffect_StepOnTallGrass: @ 80683C8
pop {r0}
bx r0
.align 2, 0
_0806840C: .4byte gUnknown_20386E0
_0806840C: .4byte gFieldEffectArguments
_08068410: .4byte gSaveBlock1Ptr
thumb_func_end GroundEffect_StepOnTallGrass
thumb_func_start GroundEffect_SpawnOnLongGrass
GroundEffect_SpawnOnLongGrass: @ 8068414
push {lr}
ldr r3, _08068458 @ =gUnknown_20386E0
ldr r3, _08068458 @ =gFieldEffectArguments
movs r2, 0x10
ldrsh r1, [r0, r2]
str r1, [r3]
@@ -1252,14 +1252,14 @@ GroundEffect_SpawnOnLongGrass: @ 8068414
pop {r0}
bx r0
.align 2, 0
_08068458: .4byte gUnknown_20386E0
_08068458: .4byte gFieldEffectArguments
_0806845C: .4byte gSaveBlock1Ptr
thumb_func_end GroundEffect_SpawnOnLongGrass
thumb_func_start GroundEffect_StepOnLongGrass
GroundEffect_StepOnLongGrass: @ 8068460
push {lr}
ldr r3, _080684A4 @ =gUnknown_20386E0
ldr r3, _080684A4 @ =gFieldEffectArguments
movs r2, 0x10
ldrsh r1, [r0, r2]
str r1, [r3]
@@ -1292,7 +1292,7 @@ GroundEffect_StepOnLongGrass: @ 8068460
pop {r0}
bx r0
.align 2, 0
_080684A4: .4byte gUnknown_20386E0
_080684A4: .4byte gFieldEffectArguments
_080684A8: .4byte gSaveBlock1Ptr
thumb_func_end GroundEffect_StepOnLongGrass
@@ -1386,7 +1386,7 @@ DoTracksGroundEffect_Footprints: @ 8068530
mov r0, sp
movs r2, 0x4
bl memcpy
ldr r1, _0806857C @ =gUnknown_20386E0
ldr r1, _0806857C @ =gFieldEffectArguments
movs r2, 0x14
ldrsh r0, [r5, r2]
str r0, [r1]
@@ -1412,7 +1412,7 @@ DoTracksGroundEffect_Footprints: @ 8068530
bx r0
.align 2, 0
_08068578: .4byte gUnknown_83A70A8
_0806857C: .4byte gUnknown_20386E0
_0806857C: .4byte gFieldEffectArguments
thumb_func_end DoTracksGroundEffect_Footprints
thumb_func_start DoTracksGroundEffect_BikeTireTracks
@@ -1423,7 +1423,7 @@ DoTracksGroundEffect_BikeTireTracks: @ 8068580
ldr r0, [r4, 0x14]
cmp r1, r0
beq _080685C2
ldr r2, _080685C8 @ =gUnknown_20386E0
ldr r2, _080685C8 @ =gFieldEffectArguments
movs r1, 0x14
ldrsh r0, [r4, r1]
str r0, [r2]
@@ -1454,7 +1454,7 @@ _080685C2:
pop {r0}
bx r0
.align 2, 0
_080685C8: .4byte gUnknown_20386E0
_080685C8: .4byte gFieldEffectArguments
_080685CC: .4byte gUnknown_83A70AC
thumb_func_end DoTracksGroundEffect_BikeTireTracks
@@ -1492,7 +1492,7 @@ GroundEffect_JumpOnTallGrass: @ 80685FC
sub sp, 0x4
adds r5, r0, 0
adds r6, r1, 0
ldr r1, _08068650 @ =gUnknown_20386E0
ldr r1, _08068650 @ =gFieldEffectArguments
movs r2, 0x10
ldrsh r0, [r5, r2]
str r0, [r1]
@@ -1528,13 +1528,13 @@ _08068646:
pop {r0}
bx r0
.align 2, 0
_08068650: .4byte gUnknown_20386E0
_08068650: .4byte gFieldEffectArguments
thumb_func_end GroundEffect_JumpOnTallGrass
thumb_func_start GroundEffect_JumpOnLongGrass
GroundEffect_JumpOnLongGrass: @ 8068654
push {lr}
ldr r2, _08068678 @ =gUnknown_20386E0
ldr r2, _08068678 @ =gFieldEffectArguments
movs r3, 0x10
ldrsh r1, [r0, r3]
str r1, [r2]
@@ -1551,13 +1551,13 @@ GroundEffect_JumpOnLongGrass: @ 8068654
pop {r0}
bx r0
.align 2, 0
_08068678: .4byte gUnknown_20386E0
_08068678: .4byte gFieldEffectArguments
thumb_func_end GroundEffect_JumpOnLongGrass
thumb_func_start GroundEffect_JumpOnShallowWater
GroundEffect_JumpOnShallowWater: @ 806867C
push {r4,lr}
ldr r3, _080686A8 @ =gUnknown_20386E0
ldr r3, _080686A8 @ =gFieldEffectArguments
movs r4, 0x10
ldrsh r2, [r0, r4]
str r2, [r3]
@@ -1577,13 +1577,13 @@ GroundEffect_JumpOnShallowWater: @ 806867C
pop {r0}
bx r0
.align 2, 0
_080686A8: .4byte gUnknown_20386E0
_080686A8: .4byte gFieldEffectArguments
thumb_func_end GroundEffect_JumpOnShallowWater
thumb_func_start GroundEffect_JumpOnWater
GroundEffect_JumpOnWater: @ 80686AC
push {r4,lr}
ldr r3, _080686D8 @ =gUnknown_20386E0
ldr r3, _080686D8 @ =gFieldEffectArguments
movs r4, 0x10
ldrsh r2, [r0, r4]
str r2, [r3]
@@ -1603,13 +1603,13 @@ GroundEffect_JumpOnWater: @ 80686AC
pop {r0}
bx r0
.align 2, 0
_080686D8: .4byte gUnknown_20386E0
_080686D8: .4byte gFieldEffectArguments
thumb_func_end GroundEffect_JumpOnWater
thumb_func_start GroundEffect_JumpLandingDust
GroundEffect_JumpLandingDust: @ 80686DC
push {r4,lr}
ldr r3, _08068708 @ =gUnknown_20386E0
ldr r3, _08068708 @ =gFieldEffectArguments
movs r4, 0x10
ldrsh r2, [r0, r4]
str r2, [r3]
@@ -1629,7 +1629,7 @@ GroundEffect_JumpLandingDust: @ 80686DC
pop {r0}
bx r0
.align 2, 0
_08068708: .4byte gUnknown_20386E0
_08068708: .4byte gFieldEffectArguments
thumb_func_end GroundEffect_JumpLandingDust
thumb_func_start GroundEffect_ShortGrass
@@ -1655,7 +1655,7 @@ GroundEffect_HotSprings: @ 806871C
thumb_func_start GroundEffect_Seaweed
GroundEffect_Seaweed: @ 806872C
push {lr}
ldr r2, _08068748 @ =gUnknown_20386E0
ldr r2, _08068748 @ =gFieldEffectArguments
movs r3, 0x10
ldrsh r1, [r0, r3]
str r1, [r2]
@@ -1667,7 +1667,7 @@ GroundEffect_Seaweed: @ 806872C
pop {r0}
bx r0
.align 2, 0
_08068748: .4byte gUnknown_20386E0
_08068748: .4byte gFieldEffectArguments
thumb_func_end GroundEffect_Seaweed
thumb_func_start DoFlaggedGroundEffects
asm/field_map_obj.s
+29 -29
View File
@@ -1012,7 +1012,7 @@ unref_sub_808D958: @ 805E55C
push {r4,lr}
movs r4, 0
_0805E560:
ldr r0, _0805E588 @ =gUnknown_2037078
ldr r0, _0805E588 @ =gPlayerAvatar
ldrb r0, [r0, 0x5]
cmp r4, r0
beq _0805E576
@@ -1032,7 +1032,7 @@ _0805E576:
pop {r0}
bx r0
.align 2, 0
_0805E588: .4byte gUnknown_2037078
_0805E588: .4byte gPlayerAvatar
_0805E58C: .4byte gMapObjects
thumb_func_end unref_sub_808D958
@@ -2418,7 +2418,7 @@ SetPlayerAvatarFieldObjectIdAndObjectId: @ 805F02C
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
ldr r5, _0805F058 @ =gUnknown_2037078
ldr r5, _0805F058 @ =gPlayerAvatar
strb r0, [r5, 0x5]
strb r1, [r5, 0x4]
ldr r1, _0805F05C @ =gMapObjects
@@ -2436,7 +2436,7 @@ SetPlayerAvatarFieldObjectIdAndObjectId: @ 805F02C
pop {r0}
bx r0
.align 2, 0
_0805F058: .4byte gUnknown_2037078
_0805F058: .4byte gPlayerAvatar
_0805F05C: .4byte gMapObjects
thumb_func_end SetPlayerAvatarFieldObjectIdAndObjectId
@@ -10369,7 +10369,7 @@ sub_80628E4: @ 80628E4
adds r6, r0, 0
adds r7, r1, 0
ldr r2, _08062908 @ =gMapObjects
ldr r3, _0806290C @ =gUnknown_2037078
ldr r3, _0806290C @ =gPlayerAvatar
ldrb r1, [r3, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -10386,7 +10386,7 @@ _08062904:
b _08062938
.align 2, 0
_08062908: .4byte gMapObjects
_0806290C: .4byte gUnknown_2037078
_0806290C: .4byte gPlayerAvatar
_08062910:
ldr r5, _08062940 @ =gUnknown_83A6390
bl player_get_x22
@@ -10533,7 +10533,7 @@ sub_80629B8: @ 80629B8
ldrsh r0, [r0, r2]
movs r2, 0
ldrsh r1, [r5, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl _call_via_r8
@@ -10622,7 +10622,7 @@ sub_8062A70: @ 8062A70
ldrsh r0, [r0, r2]
movs r2, 0
ldrsh r1, [r5, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl _call_via_r8
@@ -10711,7 +10711,7 @@ sub_8062B28: @ 8062B28
ldrsh r0, [r0, r2]
movs r2, 0
ldrsh r1, [r5, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl _call_via_r8
@@ -10800,7 +10800,7 @@ sub_8062BE0: @ 8062BE0
ldrsh r0, [r0, r2]
movs r2, 0
ldrsh r1, [r5, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl _call_via_r8
@@ -10925,7 +10925,7 @@ sub_8062CE0: @ 8062CE0
ldrsh r0, [r0, r2]
movs r2, 0
ldrsh r1, [r5, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl _call_via_r8
@@ -11021,7 +11021,7 @@ oac_hopping: @ 8062D98
ldrsh r0, [r0, r2]
movs r2, 0
ldrsh r1, [r5, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl _call_via_r8
@@ -11100,7 +11100,7 @@ mss_08062EA4: @ 8062EA4
adds r6, r0, 0
adds r7, r1, 0
ldr r2, _08062EC8 @ =gMapObjects
ldr r3, _08062ECC @ =gUnknown_2037078
ldr r3, _08062ECC @ =gPlayerAvatar
ldrb r1, [r3, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -11117,7 +11117,7 @@ _08062EC4:
b _08062EF8
.align 2, 0
_08062EC8: .4byte gMapObjects
_08062ECC: .4byte gUnknown_2037078
_08062ECC: .4byte gPlayerAvatar
_08062ED0:
ldr r5, _08062F00 @ =gUnknown_83A6390
bl player_get_x22
@@ -11168,7 +11168,7 @@ FieldObjectCB_TreeDisguise: @ 8062F08
cmp r0, 0
bne _08062F50
_08062F30:
ldr r1, _08062F70 @ =gUnknown_20386E0
ldr r1, _08062F70 @ =gFieldEffectArguments
adds r2, r1, 0x4
adds r3, r1, 0
adds r3, 0x8
@@ -11198,7 +11198,7 @@ _08062F50:
bx r0
.align 2, 0
_08062F6C: .4byte gMapObjects
_08062F70: .4byte gUnknown_20386E0
_08062F70: .4byte gFieldEffectArguments
_08062F74: .4byte sub_8062F78
thumb_func_end FieldObjectCB_TreeDisguise
@@ -11234,7 +11234,7 @@ FieldObjectCB_MountainDisguise: @ 8062F84
cmp r0, 0
bne _08062FCC
_08062FAC:
ldr r1, _08062FEC @ =gUnknown_20386E0
ldr r1, _08062FEC @ =gFieldEffectArguments
adds r2, r1, 0x4
adds r3, r1, 0
adds r3, 0x8
@@ -11264,7 +11264,7 @@ _08062FCC:
bx r0
.align 2, 0
_08062FE8: .4byte gMapObjects
_08062FEC: .4byte gUnknown_20386E0
_08062FEC: .4byte gFieldEffectArguments
_08062FF0: .4byte sub_8062F78
thumb_func_end FieldObjectCB_MountainDisguise
@@ -12593,7 +12593,7 @@ IsMetatileDirectionallyImpassable: @ 80638AC
asrs r0, 16
lsls r1, r7, 16
asrs r1, 16
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
ldr r1, [r4]
@@ -19462,7 +19462,7 @@ sub_8066910: @ 8066910
do_exclamation_mark_bubble_1: @ 8066920
push {r4,lr}
adds r4, r1, 0
ldr r1, _08066940 @ =gUnknown_20386E0
ldr r1, _08066940 @ =gFieldEffectArguments
adds r2, r1, 0x4
adds r3, r1, 0
adds r3, 0x8
@@ -19475,14 +19475,14 @@ do_exclamation_mark_bubble_1: @ 8066920
pop {r1}
bx r1
.align 2, 0
_08066940: .4byte gUnknown_20386E0
_08066940: .4byte gFieldEffectArguments
thumb_func_end do_exclamation_mark_bubble_1
thumb_func_start do_exclamation_mark_bubble_2
do_exclamation_mark_bubble_2: @ 8066944
push {r4,lr}
adds r4, r1, 0
ldr r1, _08066964 @ =gUnknown_20386E0
ldr r1, _08066964 @ =gFieldEffectArguments
adds r2, r1, 0x4
adds r3, r1, 0
adds r3, 0x8
@@ -19495,14 +19495,14 @@ do_exclamation_mark_bubble_2: @ 8066944
pop {r1}
bx r1
.align 2, 0
_08066964: .4byte gUnknown_20386E0
_08066964: .4byte gFieldEffectArguments
thumb_func_end do_exclamation_mark_bubble_2
thumb_func_start do_heart_bubble
do_heart_bubble: @ 8066968
push {r4,lr}
adds r4, r1, 0
ldr r1, _08066988 @ =gUnknown_20386E0
ldr r1, _08066988 @ =gFieldEffectArguments
adds r2, r1, 0x4
adds r3, r1, 0
adds r3, 0x8
@@ -19515,14 +19515,14 @@ do_heart_bubble: @ 8066968
pop {r1}
bx r1
.align 2, 0
_08066988: .4byte gUnknown_20386E0
_08066988: .4byte gFieldEffectArguments
thumb_func_end do_heart_bubble
thumb_func_start sub_806698C
sub_806698C: @ 806698C
push {r4,lr}
adds r4, r1, 0
ldr r1, _080669AC @ =gUnknown_20386E0
ldr r1, _080669AC @ =gFieldEffectArguments
adds r2, r1, 0x4
adds r3, r1, 0
adds r3, 0x8
@@ -19535,14 +19535,14 @@ sub_806698C: @ 806698C
pop {r1}
bx r1
.align 2, 0
_080669AC: .4byte gUnknown_20386E0
_080669AC: .4byte gFieldEffectArguments
thumb_func_end sub_806698C
thumb_func_start sub_80669B0
sub_80669B0: @ 80669B0
push {r4,lr}
adds r4, r1, 0
ldr r1, _080669D0 @ =gUnknown_20386E0
ldr r1, _080669D0 @ =gFieldEffectArguments
adds r2, r1, 0x4
adds r3, r1, 0
adds r3, 0x8
@@ -19555,7 +19555,7 @@ sub_80669B0: @ 80669B0
pop {r1}
bx r1
.align 2, 0
_080669D0: .4byte gUnknown_20386E0
_080669D0: .4byte gFieldEffectArguments
thumb_func_end sub_80669B0
thumb_func_start sub_80669D4
asm/field_player_avatar.s
+183 -183
View File
File diff suppressed because it is too large Load Diff
asm/field_screen_effect.s
+2 -2
View File
@@ -937,7 +937,7 @@ _0807F542:
lsls r0, 24
cmp r0, 0
beq _0807F5E4
ldr r0, _0807F57C @ =gUnknown_2037078
ldr r0, _0807F57C @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -957,7 +957,7 @@ _0807F542:
b _0807F5E4
.align 2, 0
_0807F578: .4byte gUnknown_841B5B6
_0807F57C: .4byte gUnknown_2037078
_0807F57C: .4byte gPlayerAvatar
_0807F580: .4byte gMapObjects
_0807F584: .4byte gTasks
_0807F588:
asm/field_specials.s
+10 -10
View File
@@ -21,7 +21,7 @@ _080CA62C: .4byte sub_80F4C10
thumb_func_start sub_80CA630
sub_80CA630: @ 80CA630
push {r4,lr}
ldr r0, _080CA65C @ =gUnknown_2037078
ldr r0, _080CA65C @ =gPlayerAvatar
ldrb r1, [r0]
movs r0, 0x1
ands r0, r1
@@ -40,7 +40,7 @@ _080CA644:
pop {r0}
bx r0
.align 2, 0
_080CA65C: .4byte gUnknown_2037078
_080CA65C: .4byte gPlayerAvatar
thumb_func_end sub_80CA630
thumb_func_start nullsub_74
@@ -4570,7 +4570,7 @@ _080CC8EC:
lsrs r0, 16
movs r1, 0xD
muls r1, r0
ldr r0, _080CC914 @ =gUnknown_8247094
ldr r0, _080CC914 @ =gMoveNames
adds r1, r0
adds r0, r4, 0
bl StringCopy
@@ -4581,7 +4581,7 @@ _080CC908:
bx r1
.align 2, 0
_080CC910: .4byte gStringVar1
_080CC914: .4byte gUnknown_8247094
_080CC914: .4byte gMoveNames
thumb_func_end sub_80CC8CC
thumb_func_start sub_80CC918
@@ -4717,7 +4717,7 @@ sub_80CCA18: @ 80CCA18
lsls r1, 3
ldr r0, _080CCAA4 @ =gTasks+0x8
adds r4, r1, r0
ldr r0, _080CCAA8 @ =gUnknown_2037AB8
ldr r0, _080CCAA8 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -4779,7 +4779,7 @@ _080CCA78:
b _080CCADE
.align 2, 0
_080CCAA4: .4byte gTasks+0x8
_080CCAA8: .4byte gUnknown_2037AB8
_080CCAA8: .4byte gPaletteFade
_080CCAAC: .4byte gUnknown_2036E28
_080CCAB0: .4byte gSaveBlock1Ptr
_080CCAB4: .4byte 0x00004f01
@@ -4847,7 +4847,7 @@ _080CCB36:
movs r0, 0x7
movs r1, 0x1
bl sub_8059948
ldr r0, _080CCB64 @ =gUnknown_2037AB8
ldr r0, _080CCB64 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -4866,7 +4866,7 @@ _080CCB5A:
bx r0
.align 2, 0
_080CCB60: .4byte gUnknown_83F60B0
_080CCB64: .4byte gUnknown_2037AB8
_080CCB64: .4byte gPaletteFade
thumb_func_end sub_80CCAF4
thumb_func_start sub_80CCB68
@@ -5338,7 +5338,7 @@ _080CCF32:
ldr r0, _080CCF64 @ =sub_80CCF98
movs r1, 0x8
bl CreateTask
ldr r3, _080CCF68 @ =gUnknown_20386E0
ldr r3, _080CCF68 @ =gFieldEffectArguments
movs r0, 0x1
str r0, [r3]
movs r0, 0x38
@@ -5361,7 +5361,7 @@ _080CCF32:
b _080CCF72
.align 2, 0
_080CCF64: .4byte sub_80CCF98
_080CCF68: .4byte gUnknown_20386E0
_080CCF68: .4byte gFieldEffectArguments
_080CCF6C: .4byte gUnknown_83F6366
_080CCF70:
movs r0, 0x5
asm/field_tasks.s
+3 -3
View File
@@ -322,7 +322,7 @@ _0806EA52:
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r6, r0, 24
adds r0, r6, 0
@@ -478,7 +478,7 @@ _0806EB8E:
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl MetatileBehavior_ReturnFalse_4
@@ -576,7 +576,7 @@ sub_806EC40: @ 806EC40
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 16
lsrs r7, r0, 16
ldrh r1, [r5, 0x8]
asm/field_weather.s
+44 -44
View File
@@ -22,7 +22,7 @@ sub_8079C08: @ 8079C08
lsrs r5, 24
ldr r0, _08079CD0 @ =gUnknown_83C2CE0
lsls r1, r5, 5
ldr r2, _08079CD4 @ =gUnknown_20373F8
ldr r2, _08079CD4 @ =gPlttBufferUnfaded + 0x200
adds r1, r2
ldr r2, _08079CD8 @ =0x04000008
bl CpuSet
@@ -101,7 +101,7 @@ _08079CC4:
.align 2, 0
_08079CCC: .4byte Task_WeatherMain
_08079CD0: .4byte gUnknown_83C2CE0
_08079CD4: .4byte gUnknown_20373F8
_08079CD4: .4byte gPlttBufferUnfaded + 0x200
_08079CD8: .4byte 0x04000008
_08079CDC: .4byte gUnknown_2037F34
_08079CE0: .4byte 0x000006d5
@@ -690,7 +690,7 @@ _0807A144:
_0807A164: .4byte gUnknown_2037F34
_0807A168: .4byte 0x000006c6
_0807A16C:
ldr r0, _0807A190 @ =gUnknown_2037AB8
ldr r0, _0807A190 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -711,7 +711,7 @@ _0807A18C:
pop {r0}
bx r0
.align 2, 0
_0807A190: .4byte gUnknown_2037AB8
_0807A190: .4byte gPaletteFade
_0807A194: .4byte 0x000006c1
_0807A198: .4byte 0x000006c6
thumb_func_end sub_807A084
@@ -889,9 +889,9 @@ _0807A2CE:
cmp r0, 0
bne _0807A30C
lsls r1, r6, 1
ldr r0, _0807A304 @ =gUnknown_20371F8
ldr r0, _0807A304 @ =gPlttBufferUnfaded
adds r0, r1, r0
ldr r2, _0807A308 @ =gUnknown_20375F8
ldr r2, _0807A308 @ =gPlttBufferFaded
adds r1, r2
movs r2, 0x8
bl CpuFastSet
@@ -907,8 +907,8 @@ _0807A2CE:
b _0807A38A
.align 2, 0
_0807A300: .4byte gUnknown_20386A4
_0807A304: .4byte gUnknown_20371F8
_0807A308: .4byte gUnknown_20375F8
_0807A304: .4byte gPlttBufferUnfaded
_0807A308: .4byte gPlttBufferFaded
_0807A30C:
cmp r0, 0x2
beq _0807A320
@@ -940,12 +940,12 @@ _0807A336:
mov r8, r3
adds r4, 0x1
mov r12, r4
ldr r0, _0807A398 @ =gUnknown_20375F8
ldr r0, _0807A398 @ =gPlttBufferFaded
mov r10, r0
_0807A34A:
adds r2, r6, 0
lsls r0, r2, 1
ldr r1, _0807A39C @ =gUnknown_20371F8
ldr r1, _0807A39C @ =gPlttBufferUnfaded
adds r0, r1
ldr r1, [r0]
lsls r0, r1, 27
@@ -983,15 +983,15 @@ _0807A38A:
bcc _0807A2CE
b _0807A3B6
.align 2, 0
_0807A398: .4byte gUnknown_20375F8
_0807A39C: .4byte gUnknown_20371F8
_0807A398: .4byte gPlttBufferFaded
_0807A39C: .4byte gPlttBufferUnfaded
_0807A3A0:
cmp r0, 0
blt _0807A3B6
lsls r1, r4, 5
ldr r0, _0807A3C8 @ =gUnknown_20371F8
ldr r0, _0807A3C8 @ =gPlttBufferUnfaded
adds r0, r1, r0
ldr r2, _0807A3CC @ =gUnknown_20375F8
ldr r2, _0807A3CC @ =gPlttBufferFaded
adds r1, r2
mov r3, r9
lsls r2, r3, 3
@@ -1006,8 +1006,8 @@ _0807A3B6:
pop {r0}
bx r0
.align 2, 0
_0807A3C8: .4byte gUnknown_20371F8
_0807A3CC: .4byte gUnknown_20375F8
_0807A3C8: .4byte gPlttBufferUnfaded
_0807A3CC: .4byte gPlttBufferFaded
thumb_func_end sub_807A294
thumb_func_start sub_807A3D0
@@ -1104,7 +1104,7 @@ _0807A472:
_0807A47E:
adds r4, r6, 0
lsls r0, r4, 1
ldr r1, _0807A510 @ =gUnknown_20371F8
ldr r1, _0807A510 @ =gPlttBufferUnfaded
adds r0, r1
ldr r1, [r0]
lsls r0, r1, 27
@@ -1148,7 +1148,7 @@ _0807A47E:
lsls r0, 16
lsrs r6, r0, 16
lsls r4, 1
ldr r0, _0807A514 @ =gUnknown_20375F8
ldr r0, _0807A514 @ =gPlttBufferFaded
adds r4, r0
lsrs r1, 14
lsrs r2, 19
@@ -1177,8 +1177,8 @@ _0807A4FC:
bx r0
.align 2, 0
_0807A50C: .4byte gUnknown_2038394
_0807A510: .4byte gUnknown_20371F8
_0807A514: .4byte gUnknown_20375F8
_0807A510: .4byte gPlttBufferUnfaded
_0807A514: .4byte gPlttBufferFaded
thumb_func_end sub_807A3D0
thumb_func_start sub_807A518
@@ -1231,12 +1231,12 @@ _0807A570:
movs r7, 0
adds r4, 0x1
mov r12, r4
ldr r0, _0807A5F0 @ =gUnknown_20375F8
ldr r0, _0807A5F0 @ =gPlttBufferFaded
mov r9, r0
_0807A57A:
adds r4, r5, 0
lsls r0, r4, 1
ldr r1, _0807A5F4 @ =gUnknown_20371F8
ldr r1, _0807A5F4 @ =gPlttBufferUnfaded
adds r0, r1
ldr r1, [r0]
lsls r3, r1, 27
@@ -1294,8 +1294,8 @@ _0807A5D4:
pop {r0}
bx r0
.align 2, 0
_0807A5F0: .4byte gUnknown_20375F8
_0807A5F4: .4byte gUnknown_20371F8
_0807A5F0: .4byte gPlttBufferFaded
_0807A5F4: .4byte gPlttBufferUnfaded
thumb_func_end sub_807A518
thumb_func_start sub_807A5F8
@@ -1349,7 +1349,7 @@ _0807A634:
mov r8, r0
_0807A658:
lsls r5, r6, 1
ldr r0, _0807A6DC @ =gUnknown_20371F8
ldr r0, _0807A6DC @ =gPlttBufferUnfaded
adds r0, r5, r0
ldr r2, [r0]
lsls r4, r2, 27
@@ -1401,7 +1401,7 @@ _0807A658:
asrs r0, 4
adds r2, r0
lsls r2, 24
ldr r0, _0807A6E0 @ =gUnknown_20375F8
ldr r0, _0807A6E0 @ =gPlttBufferFaded
adds r5, r0
lsrs r2, 14
lsrs r3, 19
@@ -1415,8 +1415,8 @@ _0807A658:
bcc _0807A658
b _0807A6F8
.align 2, 0
_0807A6DC: .4byte gUnknown_20371F8
_0807A6E0: .4byte gUnknown_20375F8
_0807A6DC: .4byte gPlttBufferUnfaded
_0807A6E0: .4byte gPlttBufferFaded
_0807A6E4:
lsls r0, r4, 20
lsrs r0, 16
@@ -1650,8 +1650,8 @@ _0807A882:
beq _0807A8C4
cmp r2, 0
beq _0807A896
ldr r0, _0807A8B4 @ =gUnknown_20375F8
ldr r1, _0807A8B8 @ =gUnknown_20371F8
ldr r0, _0807A8B4 @ =gPlttBufferFaded
ldr r1, _0807A8B8 @ =gPlttBufferUnfaded
movs r2, 0x80
lsls r2, 1
bl CpuFastSet
@@ -1671,8 +1671,8 @@ _0807A896:
strb r1, [r0]
b _0807A92C
.align 2, 0
_0807A8B4: .4byte gUnknown_20375F8
_0807A8B8: .4byte gUnknown_20371F8
_0807A8B4: .4byte gPlttBufferFaded
_0807A8B8: .4byte gPlttBufferUnfaded
_0807A8BC: .4byte gUnknown_2037F34
_0807A8C0: .4byte 0x000006c6
_0807A8C4:
@@ -1804,8 +1804,8 @@ _0807A9AE:
beq _0807A9F0
cmp r2, 0
beq _0807A9C2
ldr r0, _0807A9E0 @ =gUnknown_20375F8
ldr r1, _0807A9E4 @ =gUnknown_20371F8
ldr r0, _0807A9E0 @ =gPlttBufferFaded
ldr r1, _0807A9E4 @ =gPlttBufferUnfaded
movs r2, 0x80
lsls r2, 1
bl CpuFastSet
@@ -1824,8 +1824,8 @@ _0807A9C2:
strb r1, [r0]
b _0807AA56
.align 2, 0
_0807A9E0: .4byte gUnknown_20375F8
_0807A9E4: .4byte gUnknown_20371F8
_0807A9E0: .4byte gPlttBufferFaded
_0807A9E4: .4byte gPlttBufferUnfaded
_0807A9E8: .4byte gUnknown_2037F34
_0807A9EC: .4byte 0x000006c6
_0807A9F0:
@@ -1959,7 +1959,7 @@ _0807AAF0:
lsls r0, r4, 20
lsrs r4, r0, 16
movs r2, 0
ldr r6, _0807AB18 @ =gUnknown_20375F8
ldr r6, _0807AB18 @ =gPlttBufferFaded
ldr r0, _0807AB1C @ =0x000006c4
adds r3, r5, r0
_0807AAFC:
@@ -1976,19 +1976,19 @@ _0807AAFC:
b _0807AB68
.align 2, 0
_0807AB14: .4byte 0x000006ca
_0807AB18: .4byte gUnknown_20375F8
_0807AB18: .4byte gPlttBufferFaded
_0807AB1C: .4byte 0x000006c4
_0807AB20:
lsls r0, r4, 20
lsrs r4, r0, 16
lsls r1, r4, 1
ldr r0, _0807AB4C @ =gUnknown_20375F8
ldr r0, _0807AB4C @ =gPlttBufferFaded
adds r0, r1, r0
ldr r2, _0807AB50 @ =gUnknown_20371F8
ldr r2, _0807AB50 @ =gPlttBufferUnfaded
adds r1, r2
movs r2, 0x8
bl CpuFastSet
ldr r0, _0807AB54 @ =gUnknown_2037AB8
ldr r0, _0807AB54 @ =gPaletteFade
ldrh r2, [r0, 0x4]
lsls r2, 21
lsrs r2, 27
@@ -2000,9 +2000,9 @@ _0807AB20:
bl BlendPalette
b _0807AB68
.align 2, 0
_0807AB4C: .4byte gUnknown_20375F8
_0807AB50: .4byte gUnknown_20371F8
_0807AB54: .4byte gUnknown_2037AB8
_0807AB4C: .4byte gPlttBufferFaded
_0807AB50: .4byte gPlttBufferUnfaded
_0807AB54: .4byte gPaletteFade
_0807AB58:
lsls r0, r4, 20
lsrs r4, r0, 16
asm/fieldmap.s
+21 -21
View File
@@ -789,8 +789,8 @@ sub_8058F48: @ 8058F48
_08058F74: .4byte gMapHeader
thumb_func_end sub_8058F48
thumb_func_start sub_8058F78
sub_8058F78: @ 8058F78
thumb_func_start MapGridGetMetatileBehaviorAt
MapGridGetMetatileBehaviorAt: @ 8058F78
push {lr}
lsls r0, 16
asrs r0, 16
@@ -800,7 +800,7 @@ sub_8058F78: @ 8058F78
bl sub_8058F48
pop {r1}
bx r1
thumb_func_end sub_8058F78
thumb_func_end MapGridGetMetatileBehaviorAt
thumb_func_start sub_8058F8C
sub_8058F8C: @ 8058F8C
@@ -2125,35 +2125,35 @@ sub_80598CC: @ 80598CC
_080598EC: .4byte gUnknown_2036E28
_080598F0:
lsls r4, 1
ldr r0, _08059900 @ =gUnknown_20371F8
ldr r0, _08059900 @ =gPlttBufferUnfaded
adds r0, r4, r0
adds r1, r5, 0
bl TintPalette_GrayScale
b _0805992C
.align 2, 0
_08059900: .4byte gUnknown_20371F8
_08059900: .4byte gPlttBufferUnfaded
_08059904:
lsls r4, 1
ldr r0, _08059914 @ =gUnknown_20371F8
ldr r0, _08059914 @ =gPlttBufferUnfaded
adds r0, r4, r0
adds r1, r5, 0
bl TintPalette_SepiaTone
b _0805992C
.align 2, 0
_08059914: .4byte gUnknown_20371F8
_08059914: .4byte gPlttBufferUnfaded
_08059918:
adds r0, r4, 0
adds r1, r5, 0
bl sub_8111F38
lsls r4, 1
ldr r0, _08059940 @ =gUnknown_20371F8
ldr r0, _08059940 @ =gPlttBufferUnfaded
adds r0, r4, r0
adds r1, r5, 0
bl TintPalette_GrayScale
_0805992C:
ldr r0, _08059940 @ =gUnknown_20371F8
ldr r0, _08059940 @ =gPlttBufferUnfaded
adds r0, r4, r0
ldr r1, _08059944 @ =gUnknown_20375F8
ldr r1, _08059944 @ =gPlttBufferFaded
adds r1, r4, r1
adds r2, r5, 0
bl CpuSet
@@ -2162,8 +2162,8 @@ _0805993A:
pop {r0}
bx r0
.align 2, 0
_08059940: .4byte gUnknown_20371F8
_08059944: .4byte gUnknown_20375F8
_08059940: .4byte gPlttBufferUnfaded
_08059944: .4byte gPlttBufferFaded
thumb_func_end sub_80598CC
thumb_func_start sub_8059948
@@ -2188,36 +2188,36 @@ sub_8059948: @ 8059948
_08059968: .4byte gUnknown_2036E28
_0805996C:
lsls r4, 5
ldr r0, _0805997C @ =gUnknown_20371F8
ldr r0, _0805997C @ =gPlttBufferUnfaded
adds r0, r4, r0
lsls r1, r6, 4
bl TintPalette_GrayScale
b _080599AA
.align 2, 0
_0805997C: .4byte gUnknown_20371F8
_0805997C: .4byte gPlttBufferUnfaded
_08059980:
lsls r4, 5
ldr r0, _08059990 @ =gUnknown_20371F8
ldr r0, _08059990 @ =gPlttBufferUnfaded
adds r0, r4, r0
lsls r1, r6, 4
bl TintPalette_SepiaTone
b _080599AA
.align 2, 0
_08059990: .4byte gUnknown_20371F8
_08059990: .4byte gPlttBufferUnfaded
_08059994:
lsls r0, r4, 4
lsls r5, r6, 4
adds r1, r5, 0
bl sub_8111F38
lsls r4, 5
ldr r0, _080599C0 @ =gUnknown_20371F8
ldr r0, _080599C0 @ =gPlttBufferUnfaded
adds r0, r4, r0
adds r1, r5, 0
bl TintPalette_GrayScale
_080599AA:
ldr r0, _080599C0 @ =gUnknown_20371F8
ldr r0, _080599C0 @ =gPlttBufferUnfaded
adds r0, r4, r0
ldr r1, _080599C4 @ =gUnknown_20375F8
ldr r1, _080599C4 @ =gPlttBufferFaded
adds r1, r4, r1
lsls r2, r6, 3
bl CpuFastSet
@@ -2226,8 +2226,8 @@ _080599B8:
pop {r0}
bx r0
.align 2, 0
_080599C0: .4byte gUnknown_20371F8
_080599C4: .4byte gUnknown_20375F8
_080599C0: .4byte gPlttBufferUnfaded
_080599C4: .4byte gPlttBufferFaded
thumb_func_end sub_8059948
thumb_func_start apply_map_tileset_palette
asm/fldeff_cut.s
+6 -6
View File
@@ -146,14 +146,14 @@ sub_8097984: @ 8097984
movs r0, 0x1
bl FieldEffectStart
bl GetCursorSelectionMonId
ldr r1, _0809799C @ =gUnknown_20386E0
ldr r1, _0809799C @ =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r1]
pop {r0}
bx r0
.align 2, 0
_0809799C: .4byte gUnknown_20386E0
_0809799C: .4byte gFieldEffectArguments
thumb_func_end sub_8097984
thumb_func_start sub_80979A0
@@ -185,7 +185,7 @@ _080979CC: .4byte sub_8097A20
sub_80979D0: @ 80979D0
push {lr}
bl GetCursorSelectionMonId
ldr r1, _080979E8 @ =gUnknown_20386E0
ldr r1, _080979E8 @ =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r1]
@@ -194,7 +194,7 @@ sub_80979D0: @ 80979D0
pop {r0}
bx r0
.align 2, 0
_080979E8: .4byte gUnknown_20386E0
_080979E8: .4byte gFieldEffectArguments
_080979EC: .4byte gUnknown_81BDF6B
thumb_func_end sub_80979D0
@@ -319,7 +319,7 @@ _08097ABC:
movs r7, 0
ldr r5, _08097B44 @ =gSprites
_08097AE2:
ldr r0, _08097B48 @ =gUnknown_2037078
ldr r0, _08097B48 @ =gPlayerAvatar
ldrb r1, [r0, 0x4]
lsls r0, r1, 4
adds r0, r1
@@ -366,7 +366,7 @@ _08097B38: .4byte gUnknown_2039A04
_08097B3C: .4byte 0x0000ffff
_08097B40: .4byte gUnknown_2039870
_08097B44: .4byte gSprites
_08097B48: .4byte gUnknown_2037078
_08097B48: .4byte gPlayerAvatar
_08097B4C: .4byte gUnknown_83D414C
thumb_func_end sub_8097A48
asm/fldeff_flash.s
+2 -2
View File
@@ -47,7 +47,7 @@ sub_80C9B74: @ 80C9B74
lsls r4, 24
lsrs r4, 24
bl GetCursorSelectionMonId
ldr r1, _080C9BA4 @ =gUnknown_20386E0
ldr r1, _080C9BA4 @ =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r1]
@@ -64,7 +64,7 @@ sub_80C9B74: @ 80C9B74
pop {r0}
bx r0
.align 2, 0
_080C9BA4: .4byte gUnknown_20386E0
_080C9BA4: .4byte gFieldEffectArguments
_080C9BA8: .4byte gTasks
_080C9BAC: .4byte sub_80C9BB0
thumb_func_end sub_80C9B74
asm/fldeff_strength.s
+4 -4
View File
@@ -51,7 +51,7 @@ _080D083C: .4byte sub_80D0840
sub_80D0840: @ 80D0840
push {lr}
bl GetCursorSelectionMonId
ldr r1, _080D0858 @ =gUnknown_20386E0
ldr r1, _080D0858 @ =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r1]
@@ -60,7 +60,7 @@ sub_80D0840: @ 80D0840
pop {r0}
bx r0
.align 2, 0
_080D0858: .4byte gUnknown_20386E0
_080D0858: .4byte gFieldEffectArguments
_080D085C: .4byte gUnknown_81BE16E
thumb_func_end sub_80D0840
@@ -79,7 +79,7 @@ sub_80D0860: @ 80D0860
lsrs r0, r2, 16
strh r0, [r1, 0x18]
strh r2, [r1, 0x1A]
ldr r0, _080D089C @ =gUnknown_20386E0
ldr r0, _080D089C @ =gFieldEffectArguments
ldr r1, [r0]
movs r0, 0x64
muls r0, r1
@@ -93,7 +93,7 @@ sub_80D0860: @ 80D0860
.align 2, 0
_080D0894: .4byte gTasks
_080D0898: .4byte sub_80D08A8
_080D089C: .4byte gUnknown_20386E0
_080D089C: .4byte gFieldEffectArguments
_080D08A0: .4byte gPlayerParty
_080D08A4: .4byte gStringVar1
thumb_func_end sub_80D0860
asm/fldeff_sweetscent.s
+12 -12
View File
@@ -41,14 +41,14 @@ hm2_sweet_scent: @ 80DE0E8
movs r0, 0x33
bl FieldEffectStart
bl GetCursorSelectionMonId
ldr r1, _080DE100 @ =gUnknown_20386E0
ldr r1, _080DE100 @ =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r1]
pop {r0}
bx r0
.align 2, 0
_080DE100: .4byte gUnknown_20386E0
_080DE100: .4byte gFieldEffectArguments
thumb_func_end hm2_sweet_scent
thumb_func_start FldEff_SweetScent
@@ -87,13 +87,13 @@ sub_80DE134: @ 80DE134
bl Alloc
adds r1, r0, 0
str r1, [r4]
ldr r4, _080DE1BC @ =gUnknown_20371F8
ldr r4, _080DE1BC @ =gPlttBufferUnfaded
movs r5, 0x80
lsls r5, 1
adds r0, r4, 0
adds r2, r5, 0
bl CpuFastSet
ldr r0, _080DE1C0 @ =gUnknown_20375F8
ldr r0, _080DE1C0 @ =gPlttBufferFaded
adds r1, r4, 0
adds r2, r5, 0
bl CpuFastSet
@@ -137,8 +137,8 @@ sub_80DE134: @ 80DE134
bx r0
.align 2, 0
_080DE1B8: .4byte gUnknown_203AAB0
_080DE1BC: .4byte gUnknown_20371F8
_080DE1C0: .4byte gUnknown_20375F8
_080DE1BC: .4byte gPlttBufferUnfaded
_080DE1C0: .4byte gPlttBufferFaded
_080DE1C4: .4byte gSprites
_080DE1C8: .4byte sub_80DE1D0
_080DE1CC: .4byte gTasks
@@ -155,7 +155,7 @@ sub_80DE1D0: @ 80DE1D0
lsls r5, r0, 3
ldr r6, _080DE21C @ =gTasks+0x8
adds r2, r5, r6
ldr r0, _080DE220 @ =gUnknown_2037AB8
ldr r0, _080DE220 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -182,7 +182,7 @@ sub_80DE1D0: @ 80DE1D0
b _080DE26C
.align 2, 0
_080DE21C: .4byte gTasks+0x8
_080DE220: .4byte gUnknown_2037AB8
_080DE220: .4byte gPaletteFade
_080DE224: .4byte gUnknown_203AAB0
_080DE228:
adds r0, r6, 0
@@ -229,7 +229,7 @@ sub_80DE274: @ 80DE274
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r0, _080DE2B0 @ =gUnknown_2037AB8
ldr r0, _080DE2B0 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -237,7 +237,7 @@ sub_80DE274: @ 80DE274
bne _080DE2AA
ldr r4, _080DE2B4 @ =gUnknown_203AAB0
ldr r0, [r4]
ldr r1, _080DE2B8 @ =gUnknown_20371F8
ldr r1, _080DE2B8 @ =gPlttBufferUnfaded
movs r2, 0x80
lsls r2, 1
bl CpuFastSet
@@ -253,9 +253,9 @@ _080DE2AA:
pop {r0}
bx r0
.align 2, 0
_080DE2B0: .4byte gUnknown_2037AB8
_080DE2B0: .4byte gPaletteFade
_080DE2B4: .4byte gUnknown_203AAB0
_080DE2B8: .4byte gUnknown_20371F8
_080DE2B8: .4byte gPlttBufferUnfaded
_080DE2BC: .4byte gUnknown_81BE564
thumb_func_end sub_80DE274
asm/fldeff_teleport.s
+2 -2
View File
@@ -44,14 +44,14 @@ hm_teleport_run_dp02scr: @ 80F6730
movs r0, 0x3F
bl FieldEffectStart
bl GetCursorSelectionMonId
ldr r1, _080F674C @ =gUnknown_20386E0
ldr r1, _080F674C @ =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r1]
pop {r0}
bx r0
.align 2, 0
_080F674C: .4byte gUnknown_20386E0
_080F674C: .4byte gFieldEffectArguments
thumb_func_end hm_teleport_run_dp02scr
thumb_func_start FldEff_UseTeleport
asm/hall_of_fame.s
+12 -12
View File
@@ -130,7 +130,7 @@ _080F1EBC: .4byte sub_80F1DAC
_080F1EC0: .4byte gMain
_080F1EC4:
bl UpdatePaletteFade
ldr r0, _080F1EE8 @ =gUnknown_2037AB8
ldr r0, _080F1EE8 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -144,7 +144,7 @@ _080F1EC4:
movs r0, 0
b _080F1EF2
.align 2, 0
_080F1EE8: .4byte gUnknown_2037AB8
_080F1EE8: .4byte gPaletteFade
_080F1EEC: .4byte sub_80F1DC0
_080F1EF0:
movs r0, 0x1
@@ -1330,8 +1330,8 @@ Task_Hof_HandlePaletteOnExit: @ 80F283C
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, _080F287C @ =gUnknown_20375F8
ldr r1, _080F2880 @ =gUnknown_20371F8
ldr r0, _080F287C @ =gPlttBufferFaded
ldr r1, _080F2880 @ =gPlttBufferUnfaded
movs r2, 0x80
lsls r2, 2
bl CpuSet
@@ -1355,8 +1355,8 @@ Task_Hof_HandlePaletteOnExit: @ 80F283C
pop {r0}
bx r0
.align 2, 0
_080F287C: .4byte gUnknown_20375F8
_080F2880: .4byte gUnknown_20371F8
_080F287C: .4byte gPlttBufferFaded
_080F2880: .4byte gPlttBufferUnfaded
_080F2884: .4byte gTasks
_080F2888: .4byte Task_Hof_HandleExit
thumb_func_end Task_Hof_HandlePaletteOnExit
@@ -1366,7 +1366,7 @@ Task_Hof_HandleExit: @ 80F288C
push {r4-r7,lr}
lsls r0, 24
lsrs r6, r0, 24
ldr r0, _080F2924 @ =gUnknown_2037AB8
ldr r0, _080F2924 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1432,7 +1432,7 @@ _080F291E:
pop {r0}
bx r0
.align 2, 0
_080F2924: .4byte gUnknown_2037AB8
_080F2924: .4byte gPaletteFade
_080F2928: .4byte gTasks
_080F292C: .4byte gUnknown_203AB3C
_080F2930: .4byte gUnknown_203AB38
@@ -2256,8 +2256,8 @@ sub_80F2FEC: @ 80F2FEC
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, _080F3020 @ =gUnknown_20375F8
ldr r1, _080F3024 @ =gUnknown_20371F8
ldr r0, _080F3020 @ =gPlttBufferFaded
ldr r1, _080F3024 @ =gPlttBufferUnfaded
movs r2, 0x80
lsls r2, 2
bl CpuSet
@@ -2276,8 +2276,8 @@ sub_80F2FEC: @ 80F2FEC
pop {r0}
bx r0
.align 2, 0
_080F3020: .4byte gUnknown_20375F8
_080F3024: .4byte gUnknown_20371F8
_080F3020: .4byte gPlttBufferFaded
_080F3024: .4byte gPlttBufferUnfaded
_080F3028: .4byte gTasks
_080F302C: .4byte sub_80F3030
thumb_func_end sub_80F2FEC
asm/hof_pc.s
+4 -4
View File
@@ -10,7 +10,7 @@ sub_80CA53C: @ 80CA53C
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _080CA56C @ =gUnknown_2037AB8
ldr r0, _080CA56C @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -28,7 +28,7 @@ _080CA564:
pop {r0}
bx r0
.align 2, 0
_080CA56C: .4byte gUnknown_2037AB8
_080CA56C: .4byte gPaletteFade
_080CA570: .4byte sub_80F2978
thumb_func_end sub_80CA53C
@@ -100,7 +100,7 @@ sub_80CA5F8: @ 80CA5F8
push {lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r0, _080CA614 @ =gUnknown_2037AB8
ldr r0, _080CA614 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -112,7 +112,7 @@ _080CA610:
pop {r0}
bx r0
.align 2, 0
_080CA614: .4byte gUnknown_2037AB8
_080CA614: .4byte gPaletteFade
thumb_func_end sub_80CA5F8
.align 2, 0 @ Don't pad with nop.
asm/intro.s
+10 -10
View File
@@ -1222,7 +1222,7 @@ _080ECFA4:
_080ECFD0: .4byte sub_80ED0AC
_080ECFD4: .4byte 0x00007fff
_080ECFD8:
ldr r0, _080ECFF8 @ =gUnknown_2037AB8
ldr r0, _080ECFF8 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1239,7 +1239,7 @@ _080ECFF0:
strb r0, [r5, 0x4]
b _080ED094
.align 2, 0
_080ECFF8: .4byte gUnknown_2037AB8
_080ECFF8: .4byte gPaletteFade
_080ECFFC: .4byte 0x00000115
_080ED000:
ldrh r0, [r5, 0x12]
@@ -1282,7 +1282,7 @@ _080ED058: .4byte 0x00007fff
_080ED05C: .4byte sub_80ED0AC
_080ED060: .4byte sub_80ED188
_080ED064:
ldr r0, _080ED09C @ =gUnknown_2037AB8
ldr r0, _080ED09C @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1307,7 +1307,7 @@ _080ED094:
pop {r0}
bx r0
.align 2, 0
_080ED09C: .4byte gUnknown_2037AB8
_080ED09C: .4byte gPaletteFade
_080ED0A0: .4byte sub_80ED0AC
_080ED0A4: .4byte sub_80ED140
_080ED0A8: .4byte sub_80ED188
@@ -1618,13 +1618,13 @@ _080ED32C:
.align 2, 0
_080ED34C: .4byte 0x00007fff
_080ED350:
ldr r0, _080ED35C @ =gUnknown_2037AB8
ldr r0, _080ED35C @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
b _080ED3C0
.align 2, 0
_080ED35C: .4byte gUnknown_2037AB8
_080ED35C: .4byte gPaletteFade
_080ED360:
ldrh r0, [r7, 0x12]
adds r0, 0x1
@@ -2477,7 +2477,7 @@ _080EDA1C:
ldr r2, _080EDA50 @ =0x00007fff
adds r0, r2, 0
strh r0, [r1]
ldr r1, _080EDA54 @ =gUnknown_2037218
ldr r1, _080EDA54 @ =gPlttBufferUnfaded + 0x20
ldr r2, _080EDA58 @ =0x01000020
add r0, sp, 0x4
bl CpuSet
@@ -2492,10 +2492,10 @@ _080EDA1C:
b _080EDA6E
.align 2, 0
_080EDA50: .4byte 0x00007fff
_080EDA54: .4byte gUnknown_2037218
_080EDA54: .4byte gPlttBufferUnfaded + 0x20
_080EDA58: .4byte 0x01000020
_080EDA5C:
ldr r0, _080EDA78 @ =gUnknown_2037AB8
ldr r0, _080EDA78 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -2512,7 +2512,7 @@ _080EDA6E:
strb r0, [r4, 0x4]
b _080EDAC4
.align 2, 0
_080EDA78: .4byte gUnknown_2037AB8
_080EDA78: .4byte gPaletteFade
_080EDA7C:
ldrh r0, [r4, 0x12]
adds r0, 0x1
asm/item_menu.s
+25 -25
View File
@@ -264,13 +264,13 @@ _08107FC0:
b _08108104
_08107FC6:
bl ResetPaletteFade
ldr r2, _08107FD4 @ =gUnknown_2037AB8
ldr r2, _08107FD4 @ =gPaletteFade
ldrb r0, [r2, 0x8]
movs r1, 0x80
orrs r0, r1
b _08108102
.align 2, 0
_08107FD4: .4byte gUnknown_2037AB8
_08107FD4: .4byte gPaletteFade
_08107FD8:
bl ResetSpriteData
b _08108104
@@ -408,7 +408,7 @@ _081080F4:
movs r0, 0x9
bl sub_812B1F0
_081080FA:
ldr r2, _08108114 @ =gUnknown_2037AB8
ldr r2, _08108114 @ =gPaletteFade
ldrb r1, [r2, 0x8]
movs r0, 0x7F
ands r0, r1
@@ -424,7 +424,7 @@ _08108104:
strb r0, [r1]
b _08108134
.align 2, 0
_08108114: .4byte gUnknown_2037AB8
_08108114: .4byte gPaletteFade
_08108118: .4byte gMain
_0810811C:
ldr r0, _0810812C @ =sub_8107EFC
@@ -477,7 +477,7 @@ sub_8108178: @ 8108178
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _081081A4 @ =gUnknown_2037AB8
ldr r0, _081081A4 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -494,7 +494,7 @@ _0810819C:
pop {r0}
bx r0
.align 2, 0
_081081A4: .4byte gUnknown_2037AB8
_081081A4: .4byte gPaletteFade
_081081A8: .4byte gUnknown_203ACFC
thumb_func_end sub_8108178
@@ -1780,7 +1780,7 @@ sub_8108B8C: @ 8108B8C
lsls r0, 3
ldr r1, _08108BE0 @ =gTasks+0x8
adds r4, r0, r1
ldr r0, _08108BE4 @ =gUnknown_2037AB8
ldr r0, _08108BE4 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1812,7 +1812,7 @@ sub_8108B8C: @ 8108B8C
b _08108BFA
.align 2, 0
_08108BE0: .4byte gTasks+0x8
_08108BE4: .4byte gUnknown_2037AB8
_08108BE4: .4byte gPaletteFade
_08108BE8: .4byte sub_8108CFC
_08108BEC: .4byte gUnknown_203ACFC
_08108BF0: .4byte gUnknown_203AD10
@@ -2245,7 +2245,7 @@ sub_8108F0C: @ 8108F0C
lsls r0, 3
ldr r1, _08108F78 @ =gTasks+0x8
adds r7, r0, r1
ldr r0, _08108F7C @ =gUnknown_2037AB8
ldr r0, _08108F7C @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -2291,7 +2291,7 @@ _08108F4A:
b _08108FA0
.align 2, 0
_08108F78: .4byte gTasks+0x8
_08108F7C: .4byte gUnknown_2037AB8
_08108F7C: .4byte gPaletteFade
_08108F80: .4byte sub_8108CFC
_08108F84: .4byte gUnknown_203ACFC
_08108F88: .4byte gMain
@@ -5817,8 +5817,8 @@ _0810AD08: .4byte gUnknown_84163BB
_0810AD0C: .4byte sub_810A1D0
thumb_func_end sub_810AC40
thumb_func_start sub_810AD10
sub_810AD10: @ 810AD10
thumb_func_start UseRegisteredKeyItemOnField
UseRegisteredKeyItemOnField: @ 810AD10
push {r4-r6,lr}
bl InUnionRoom
cmp r0, 0x1
@@ -5887,7 +5887,7 @@ _0810ADA0:
bx r1
.align 2, 0
_0810ADA8: .4byte gUnknown_81A77A0
thumb_func_end sub_810AD10
thumb_func_end UseRegisteredKeyItemOnField
thumb_func_start sub_810ADAC
sub_810ADAC: @ 810ADAC
@@ -6144,7 +6144,7 @@ sub_810AF9C: @ 810AF9C
lsls r6, r0, 3
ldr r7, _0810AFCC @ =gTasks+0x8
adds r5, r6, r7
ldr r0, _0810AFD0 @ =gUnknown_2037AB8
ldr r0, _0810AFD0 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -6161,7 +6161,7 @@ sub_810AF9C: @ 810AF9C
b _0810B064
.align 2, 0
_0810AFCC: .4byte gTasks+0x8
_0810AFD0: .4byte gUnknown_2037AB8
_0810AFD0: .4byte gPaletteFade
_0810AFD4:
movs r0, 0x99
lsls r0, 1
@@ -6269,7 +6269,7 @@ sub_810B0AC: @ 810B0AC
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _0810B0DC @ =gUnknown_2037AB8
ldr r0, _0810B0DC @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -6289,7 +6289,7 @@ sub_810B0AC: @ 810B0AC
bl SetMainCallback2
b _0810B0F0
.align 2, 0
_0810B0DC: .4byte gUnknown_2037AB8
_0810B0DC: .4byte gPaletteFade
_0810B0E0: .4byte sub_8108CFC
_0810B0E4: .4byte gUnknown_203AD10
_0810B0E8:
@@ -6417,7 +6417,7 @@ sub_810B1D4: @ 810B1D4
lsls r5, r0, 3
ldr r6, _0810B220 @ =gTasks+0x8
adds r7, r5, r6
ldr r0, _0810B224 @ =gUnknown_2037AB8
ldr r0, _0810B224 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -6450,7 +6450,7 @@ _0810B202:
b _0810B36C
.align 2, 0
_0810B220: .4byte gTasks+0x8
_0810B224: .4byte gUnknown_2037AB8
_0810B224: .4byte gPaletteFade
_0810B228:
movs r0, 0x99
lsls r0, 1
@@ -6614,7 +6614,7 @@ sub_810B378: @ 810B378
lsls r6, r0, 3
ldr r7, _0810B3B0 @ =gTasks+0x8
adds r4, r6, r7
ldr r0, _0810B3B4 @ =gUnknown_2037AB8
ldr r0, _0810B3B4 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -6633,7 +6633,7 @@ _0810B396:
b _0810B4B6
.align 2, 0
_0810B3B0: .4byte gTasks+0x8
_0810B3B4: .4byte gUnknown_2037AB8
_0810B3B4: .4byte gPaletteFade
_0810B3B8:
movs r0, 0x10
ldrsh r1, [r4, r0]
@@ -6775,7 +6775,7 @@ sub_810B4BC: @ 810B4BC
mov r9, r0
mov r5, r8
add r5, r9
ldr r0, _0810B508 @ =gUnknown_2037AB8
ldr r0, _0810B508 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r7, 0x80
adds r0, r7, 0
@@ -6795,7 +6795,7 @@ sub_810B4BC: @ 810B4BC
b _0810B5C6
.align 2, 0
_0810B504: .4byte gTasks+0x8
_0810B508: .4byte gUnknown_2037AB8
_0810B508: .4byte gPaletteFade
_0810B50C:
movs r0, 0x10
ldrsh r1, [r5, r0]
@@ -6901,7 +6901,7 @@ sub_810B5D4: @ 810B5D4
mov r9, r0
mov r6, r8
add r6, r9
ldr r0, _0810B628 @ =gUnknown_2037AB8
ldr r0, _0810B628 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r7, 0x80
adds r0, r7, 0
@@ -6927,7 +6927,7 @@ sub_810B5D4: @ 810B5D4
b _0810B6E0
.align 2, 0
_0810B624: .4byte gTasks+0x8
_0810B628: .4byte gUnknown_2037AB8
_0810B628: .4byte gPaletteFade
_0810B62C:
movs r0, 0x99
lsls r0, 1
asm/item_pc.s
+8 -8
View File
@@ -365,7 +365,7 @@ sub_810D6E8: @ 810D6E8
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _0810D714 @ =gUnknown_2037AB8
ldr r0, _0810D714 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -382,7 +382,7 @@ _0810D70C:
pop {r0}
bx r0
.align 2, 0
_0810D714: .4byte gUnknown_2037AB8
_0810D714: .4byte gPaletteFade
_0810D718: .4byte gUnknown_203ADCC
thumb_func_end sub_810D6E8
@@ -709,12 +709,12 @@ _0810D968:
lsrs r0, 16
movs r1, 0xD
muls r1, r0
ldr r0, _0810D9C0 @ =gUnknown_8247094
ldr r0, _0810D9C0 @ =gMoveNames
adds r5, r1, r0
b _0810D9DA
.align 2, 0
_0810D9BC: .4byte gUnknown_203ADBC
_0810D9C0: .4byte gUnknown_8247094
_0810D9C0: .4byte gMoveNames
_0810D9C4:
adds r0, r4, 0
bl ItemId_GetDescription
@@ -1140,7 +1140,7 @@ sub_810DCE4: @ 810DCE4
lsls r0, 3
ldr r1, _0810DD28 @ =gTasks+0x8
adds r4, r0, r1
ldr r0, _0810DD2C @ =gUnknown_2037AB8
ldr r0, _0810DD2C @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1164,7 +1164,7 @@ sub_810DCE4: @ 810DCE4
b _0810DD40
.align 2, 0
_0810DD28: .4byte gTasks+0x8
_0810DD2C: .4byte gUnknown_2037AB8
_0810DD2C: .4byte gPaletteFade
_0810DD30: .4byte gUnknown_203ADD0
_0810DD34: .4byte gUnknown_203ADBC
_0810DD38:
@@ -1382,7 +1382,7 @@ sub_810DEA0: @ 810DEA0
lsls r0, 3
ldr r1, _0810DF10 @ =gTasks+0x8
adds r6, r0, r1
ldr r0, _0810DF14 @ =gUnknown_2037AB8
ldr r0, _0810DF14 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1426,7 +1426,7 @@ sub_810DEA0: @ 810DEA0
b _0810DF9E
.align 2, 0
_0810DF10: .4byte gTasks+0x8
_0810DF14: .4byte gUnknown_2037AB8
_0810DF14: .4byte gPaletteFade
_0810DF18: .4byte gMain
_0810DF1C: .4byte gUnknown_203ADBC
_0810DF20:
asm/item_use.s
+12 -12
View File
@@ -348,7 +348,7 @@ sub_80A122C: @ 80A122C
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0x83
@@ -506,7 +506,7 @@ sub_80A137C: @ 80A137C
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 16
lsrs r6, r0, 16
lsls r0, r6, 24
@@ -1060,7 +1060,7 @@ sub_80A17E8: @ 80A17E8
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _080A1818 @ =gUnknown_2037AB8
ldr r0, _080A1818 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1079,7 +1079,7 @@ _080A1812:
pop {r0}
bx r0
.align 2, 0
_080A1818: .4byte gUnknown_2037AB8
_080A1818: .4byte gPaletteFade
_080A181C: .4byte c2_exit_to_overworld_2_switch
thumb_func_end sub_80A17E8
@@ -1138,7 +1138,7 @@ sub_80A1880: @ 80A1880
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _080A18B0 @ =gUnknown_2037AB8
ldr r0, _080A18B0 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1157,7 +1157,7 @@ _080A18AA:
pop {r0}
bx r0
.align 2, 0
_080A18B0: .4byte gUnknown_2037AB8
_080A18B0: .4byte gPaletteFade
_080A18B4: .4byte c2_exit_to_overworld_2_switch
thumb_func_end sub_80A1880
@@ -1253,7 +1253,7 @@ sub_80A1960: @ 80A1960
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _080A1990 @ =gUnknown_2037AB8
ldr r0, _080A1990 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1271,7 +1271,7 @@ _080A1988:
pop {r0}
bx r0
.align 2, 0
_080A1990: .4byte gUnknown_2037AB8
_080A1990: .4byte gPaletteFade
_080A1994: .4byte c2_exit_to_overworld_2_switch
thumb_func_end sub_80A1960
@@ -1660,7 +1660,7 @@ sub_80A1CC0: @ 80A1CC0
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _080A1CF0 @ =gUnknown_2037AB8
ldr r0, _080A1CF0 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1678,7 +1678,7 @@ _080A1CE8:
pop {r0}
bx r0
.align 2, 0
_080A1CF0: .4byte gUnknown_2037AB8
_080A1CF0: .4byte gPaletteFade
_080A1CF4: .4byte c2_exit_to_overworld_2_switch
thumb_func_end sub_80A1CC0
@@ -1743,7 +1743,7 @@ sub_80A1D68: @ 80A1D68
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _080A1D94 @ =gUnknown_2037AB8
ldr r0, _080A1D94 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1760,7 +1760,7 @@ _080A1D8E:
pop {r0}
bx r0
.align 2, 0
_080A1D94: .4byte gUnknown_2037AB8
_080A1D94: .4byte gPaletteFade
_080A1D98: .4byte c2_exit_to_overworld_2_switch
thumb_func_end sub_80A1D68
asm/learn_move.s
+14 -14
View File
@@ -42,7 +42,7 @@ sub_80E4660: @ 80E4660
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _080E468C @ =gUnknown_2037AB8
ldr r0, _080E468C @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -60,7 +60,7 @@ _080E4684:
pop {r0}
bx r0
.align 2, 0
_080E468C: .4byte gUnknown_2037AB8
_080E468C: .4byte gPaletteFade
_080E4690: .4byte sub_80E478C
_080E4694: .4byte gUnknown_3005020
_080E4698: .4byte sub_807DD24
@@ -406,7 +406,7 @@ _080E49A8:
_080E49EC: .4byte gUnknown_203AAB4
_080E49F0: .4byte 0x0000025f
_080E49F4:
ldr r0, _080E4A08 @ =gUnknown_2037AB8
ldr r0, _080E4A08 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -418,7 +418,7 @@ _080E4A02:
movs r0, 0x4
b _080E4ED8
.align 2, 0
_080E4A08: .4byte gUnknown_2037AB8
_080E4A08: .4byte gPaletteFade
_080E4A0C:
ldr r1, [r7]
ldrb r0, [r1]
@@ -720,7 +720,7 @@ _080E4C5A:
bl BeginNormalPaletteFade
b _080E4EDA
_080E4C70:
ldr r0, _080E4CC8 @ =gUnknown_2037AB8
ldr r0, _080E4CC8 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -763,7 +763,7 @@ _080E4C7E:
movs r0, 0x1C
b _080E4ED8
.align 2, 0
_080E4CC8: .4byte gUnknown_2037AB8
_080E4CC8: .4byte gPaletteFade
_080E4CCC: .4byte 0x00000263
_080E4CD0: .4byte 0x00000a68
_080E4CD4: .4byte 0x00000a6a
@@ -798,7 +798,7 @@ _080E4CFA:
.align 2, 0
_080E4D14: .4byte gUnknown_203AAB4
_080E4D18:
ldr r0, _080E4D3C @ =gUnknown_2037AB8
ldr r0, _080E4D3C @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -814,7 +814,7 @@ _080E4D26:
bl SetMainCallback2
b _080E4EDA
.align 2, 0
_080E4D3C: .4byte gUnknown_2037AB8
_080E4D3C: .4byte gPaletteFade
_080E4D40: .4byte gUnknown_203AAB4
_080E4D44: .4byte c2_exit_to_overworld_2_switch
_080E4D48:
@@ -844,7 +844,7 @@ _080E4D48:
.align 2, 0
_080E4D88: .4byte gUnknown_203AAB4
_080E4D8C:
ldr r0, _080E4DAC @ =gUnknown_2037AB8
ldr r0, _080E4DAC @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -861,7 +861,7 @@ _080E4D9A:
movs r0, 0x18
b _080E4ED8
.align 2, 0
_080E4DAC: .4byte gUnknown_2037AB8
_080E4DAC: .4byte gPaletteFade
_080E4DB0: .4byte 0x00000261
_080E4DB4:
movs r4, 0x98
@@ -882,7 +882,7 @@ _080E4DB4:
mov r9, r1
mov r1, r9
muls r1, r0
ldr r3, _080E4E58 @ =gUnknown_8247094
ldr r3, _080E4E58 @ =gMoveNames
mov r8, r3
add r1, r8
adds r0, r2, 0
@@ -938,7 +938,7 @@ _080E4DB4:
.align 2, 0
_080E4E50: .4byte gPlayerParty
_080E4E54: .4byte gStringVar3
_080E4E58: .4byte gUnknown_8247094
_080E4E58: .4byte gMoveNames
_080E4E5C: .4byte 0x00000261
_080E4E60: .4byte 0x00000a67
_080E4E64: .4byte gStringVar2
@@ -1297,7 +1297,7 @@ _080E511A:
adds r1, r2
ldrh r1, [r1]
muls r1, r7
ldr r2, _080E51F0 @ =gUnknown_8247094
ldr r2, _080E51F0 @ =gMoveNames
adds r1, r2
bl StringCopy
adds r4, 0xD
@@ -1394,7 +1394,7 @@ _080E51AA:
.align 2, 0
_080E51E8: .4byte gUnknown_203AAB4
_080E51EC: .4byte gPlayerParty
_080E51F0: .4byte gUnknown_8247094
_080E51F0: .4byte gMoveNames
_080E51F4: .4byte gStringVar1
_080E51F8: .4byte gUnknown_84161C1
_080E51FC: .4byte gUnknown_3005E70
asm/link_rfu.s
+2 -2
View File
@@ -3372,7 +3372,7 @@ _080FED28:
strh r0, [r6]
b _080FED6E
_080FED38:
ldr r0, _080FED78 @ =gUnknown_2037AB8
ldr r0, _080FED78 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -3402,7 +3402,7 @@ _080FED6E:
pop {r0}
bx r0
.align 2, 0
_080FED78: .4byte gUnknown_2037AB8
_080FED78: .4byte gPaletteFade
_080FED7C: .4byte 0x0000082d
thumb_func_end sub_80FEC90
asm/link_rfu_2.s
+2 -2
View File
@@ -9954,7 +9954,7 @@ _080FD1C8:
subs r0, r4
lsls r0, 2
str r0, [sp, 0x1C]
ldr r2, _080FD24C @ =gUnknown_2022744
ldr r2, _080FD24C @ =gLinkPlayers + 8
mov r10, r2
ldr r6, _080FD250 @ =0x00003ba8
movs r4, 0
@@ -10007,7 +10007,7 @@ _080FD22C:
ldr r6, [sp, 0x14]
b _080FD2A4
.align 2, 0
_080FD24C: .4byte gUnknown_2022744
_080FD24C: .4byte gLinkPlayers + 8
_080FD250: .4byte 0x00003ba8
_080FD254: .4byte gSaveBlock1Ptr
_080FD258:
asm/link_rfu_3.s
+12 -12
View File
@@ -3849,7 +3849,7 @@ _08117944:
bl fade_screen
b _08117968
_08117958:
ldr r0, _08117970 @ =gUnknown_2037AB8
ldr r0, _08117970 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -3862,7 +3862,7 @@ _08117968:
strh r0, [r4]
b _08117988
.align 2, 0
_08117970: .4byte gUnknown_2037AB8
_08117970: .4byte gPaletteFade
_08117974:
bl sub_800A4BC
lsls r0, 24
@@ -6293,7 +6293,7 @@ _08118ED6:
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
ldr r4, _08118F24 @ =gUnknown_2022744
ldr r4, _08118F24 @ =gLinkPlayers + 8
adds r1, r4
adds r0, r5, 0
bl StringCopy
@@ -6312,7 +6312,7 @@ _08118ED6:
bl _081198DA
.align 2, 0
_08118F20: .4byte gStringVar1
_08118F24: .4byte gUnknown_2022744
_08118F24: .4byte gLinkPlayers + 8
_08118F28: .4byte gStringVar4
_08118F2C: .4byte gUnknown_8457C20
_08118F30:
@@ -6543,7 +6543,7 @@ _08119122:
movs r0, 0x21
strb r0, [r6, 0x14]
ldr r0, _08119154 @ =gStringVar1
ldr r4, _08119158 @ =gUnknown_2022760
ldr r4, _08119158 @ =gLinkPlayers + 0x24
adds r1, r4, 0
bl StringCopy
adds r0, r4, 0
@@ -6562,7 +6562,7 @@ _08119122:
.align 2, 0
_08119150: .4byte sub_8117280
_08119154: .4byte gStringVar1
_08119158: .4byte gUnknown_2022760
_08119158: .4byte gLinkPlayers + 0x24
_0811915C: .4byte gStringVar4
_08119160: .4byte gUnknown_8457BCC
_08119164:
@@ -6990,7 +6990,7 @@ _081194F0:
movs r0, 0x36
b _081198DA
_08119504:
ldr r0, _08119528 @ =gUnknown_2037AB8
ldr r0, _08119528 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -7009,7 +7009,7 @@ _08119512:
bl sub_81277F4
b _081198DC
.align 2, 0
_08119528: .4byte gUnknown_2037AB8
_08119528: .4byte gPaletteFade
_0811952C: .4byte gUnknown_203B06C
_08119530: .4byte gUnknown_3005020
_08119534: .4byte sub_807DCE4
@@ -9685,7 +9685,7 @@ sub_811A9B8: @ 811A9B8
ldrsh r0, [r4, r1]
cmp r0, 0x8
bne _0811A9F0
ldr r0, _0811A9EC @ =gUnknown_2037078
ldr r0, _0811A9EC @ =gPlayerAvatar
ldrb r0, [r0, 0x3]
cmp r0, 0x2
beq _0811A9E6
@@ -9695,7 +9695,7 @@ _0811A9E6:
movs r0, 0x1
b _0811A9F2
.align 2, 0
_0811A9EC: .4byte gUnknown_2037078
_0811A9EC: .4byte gPlayerAvatar
_0811A9F0:
movs r0, 0
_0811A9F2:
@@ -11147,7 +11147,7 @@ _0811B500: .4byte gUnknown_8459580
thumb_func_start is_walking_or_running
is_walking_or_running: @ 811B504
push {lr}
ldr r0, _0811B518 @ =gUnknown_2037078
ldr r0, _0811B518 @ =gPlayerAvatar
ldrb r0, [r0, 0x3]
cmp r0, 0x2
beq _0811B512
@@ -11157,7 +11157,7 @@ _0811B512:
movs r0, 0x1
b _0811B51E
.align 2, 0
_0811B518: .4byte gUnknown_2037078
_0811B518: .4byte gPlayerAvatar
_0811B51C:
movs r0, 0
_0811B51E:
asm/link_rfu_4.s
+6 -6
View File
@@ -1731,12 +1731,12 @@ _0814315C:
movs r0, 0xB
strb r0, [r5, 0x8]
ldr r0, _0814316C @ =gStringVar1
ldr r1, _08143170 @ =gUnknown_2022744
ldr r1, _08143170 @ =gLinkPlayers + 8
bl StringCopy
b _081435C6
.align 2, 0
_0814316C: .4byte gStringVar1
_08143170: .4byte gUnknown_2022744
_08143170: .4byte gLinkPlayers + 8
_08143174:
adds r4, r5, 0
adds r4, 0x9
@@ -1847,7 +1847,7 @@ _08143242:
cmp r0, 0x1
bne _08143250
ldr r0, _0814325C @ =gStringVar1
ldr r1, _08143260 @ =gUnknown_2022744
ldr r1, _08143260 @ =gLinkPlayers + 8
bl StringCopy
_08143250:
movs r0, 0xF
@@ -1856,7 +1856,7 @@ _08143250:
.align 2, 0
_08143258: .4byte gUnknown_841E7A3
_0814325C: .4byte gStringVar1
_08143260: .4byte gUnknown_2022744
_08143260: .4byte gLinkPlayers + 8
_08143264:
ldrb r1, [r5, 0xC]
ldrb r2, [r5, 0xD]
@@ -2229,14 +2229,14 @@ _08143514:
_08143528:
bl task_add_05_task_del_08FA224_when_no_RfuFunc
ldr r0, _0814353C @ =gStringVar1
ldr r1, _08143540 @ =gUnknown_2022760
ldr r1, _08143540 @ =gLinkPlayers + 0x24
bl StringCopy
movs r0, 0x22
strb r0, [r5, 0x8]
b _081435C6
.align 2, 0
_0814353C: .4byte gStringVar1
_08143540: .4byte gUnknown_2022760
_08143540: .4byte gLinkPlayers + 0x24
_08143544:
bl sub_80FA4F8
lsls r0, 24
asm/mail.s
+8 -8
View File
@@ -381,7 +381,7 @@ _080BEF28:
movs r1, 0xF0
movs r2, 0x20
bl LoadPalette
ldr r6, _080BEFD0 @ =gUnknown_20371F8
ldr r6, _080BEFD0 @ =gPlttBufferUnfaded
ldr r4, _080BEFD4 @ =gUnknown_83EE9C8
ldr r0, _080BEFD8 @ =gUnknown_20399C4
ldr r3, [r0]
@@ -396,7 +396,7 @@ _080BEF28:
lsls r2, 1
adds r0, r6, r2
strh r1, [r0]
ldr r5, _080BEFDC @ =gUnknown_20375F8
ldr r5, _080BEFDC @ =gPlttBufferFaded
ldrb r1, [r3]
lsls r0, r1, 2
adds r0, r1
@@ -458,10 +458,10 @@ _080BEF28:
strh r0, [r5, 0x16]
b _080BF0F4
.align 2, 0
_080BEFD0: .4byte gUnknown_20371F8
_080BEFD0: .4byte gPlttBufferUnfaded
_080BEFD4: .4byte gUnknown_83EE9C8
_080BEFD8: .4byte gUnknown_20399C4
_080BEFDC: .4byte gUnknown_20375F8
_080BEFDC: .4byte gPlttBufferFaded
_080BEFE0: .4byte gUnknown_83EE9C0
_080BEFE4: .4byte gSaveBlock2Ptr
_080BEFE8:
@@ -497,7 +497,7 @@ _080BF01C:
_080BF026:
ldr r0, _080BF038 @ =sub_80BF354
bl SetVBlankCallback
ldr r2, _080BF03C @ =gUnknown_2037AB8
ldr r2, _080BF03C @ =gPaletteFade
ldrb r0, [r2, 0x8]
movs r1, 0x80
orrs r0, r1
@@ -505,7 +505,7 @@ _080BF026:
b _080BF0F4
.align 2, 0
_080BF038: .4byte sub_80BF354
_080BF03C: .4byte gUnknown_2037AB8
_080BF03C: .4byte gPaletteFade
_080BF040:
ldr r5, _080BF064 @ =gUnknown_20399C4
ldr r0, [r5]
@@ -573,7 +573,7 @@ _080BF0A4:
movs r2, 0x10
movs r3, 0
bl BeginNormalPaletteFade
ldr r2, _080BF0E8 @ =gUnknown_2037AB8
ldr r2, _080BF0E8 @ =gPaletteFade
ldrb r1, [r2, 0x8]
movs r0, 0x7F
ands r0, r1
@@ -586,7 +586,7 @@ _080BF0A4:
movs r0, 0x1
b _080BF104
.align 2, 0
_080BF0E8: .4byte gUnknown_2037AB8
_080BF0E8: .4byte gPaletteFade
_080BF0EC: .4byte gUnknown_20399C4
_080BF0F0: .4byte sub_80BF394
_080BF0F4:
asm/main_menu.s
+20 -20
View File
@@ -223,7 +223,7 @@ sub_800C4D0: @ 800C4D0
push {r4-r6,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r0, _0800C538 @ =gUnknown_2037AB8
ldr r0, _0800C538 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -266,7 +266,7 @@ _0800C4E8:
beq _0800C54A
b _0800C5E8
.align 2, 0
_0800C538: .4byte gUnknown_2037AB8
_0800C538: .4byte gPaletteFade
_0800C53C: .4byte gSaveFileStatus
_0800C540:
cmp r4, 0x4
@@ -430,7 +430,7 @@ sub_800C688: @ 800C688
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _0800C6E0 @ =gUnknown_2037AB8
ldr r0, _0800C6E0 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -466,7 +466,7 @@ sub_800C688: @ 800C688
ldr r0, _0800C6F0 @ =sub_800C704
b _0800C6F6
.align 2, 0
_0800C6E0: .4byte gUnknown_2037AB8
_0800C6E0: .4byte gPaletteFade
_0800C6E4: .4byte gMain
_0800C6E8: .4byte gUnknown_8234638
_0800C6EC: .4byte gTasks
@@ -488,7 +488,7 @@ sub_800C704: @ 800C704
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _0800C764 @ =gUnknown_2037AB8
ldr r0, _0800C764 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -527,7 +527,7 @@ sub_800C704: @ 800C704
ldr r0, _0800C76C @ =sub_800CA94
b _0800C772
.align 2, 0
_0800C764: .4byte gUnknown_2037AB8
_0800C764: .4byte gPaletteFade
_0800C768: .4byte gTasks
_0800C76C: .4byte sub_800CA94
_0800C770:
@@ -547,7 +547,7 @@ sub_800C780: @ 800C780
push {lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r0, _0800C79C @ =gUnknown_2037AB8
ldr r0, _0800C79C @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -559,7 +559,7 @@ _0800C798:
pop {r0}
bx r0
.align 2, 0
_0800C79C: .4byte gUnknown_2037AB8
_0800C79C: .4byte gPaletteFade
thumb_func_end sub_800C780
thumb_func_start sub_800C7A0
@@ -867,7 +867,7 @@ sub_800CA54: @ 800CA54
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _0800CA88 @ =gUnknown_2037AB8
ldr r0, _0800CA88 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -890,7 +890,7 @@ _0800CA80:
pop {r0}
bx r0
.align 2, 0
_0800CA88: .4byte gUnknown_2037AB8
_0800CA88: .4byte gPaletteFade
_0800CA8C: .4byte gTasks
_0800CA90: .4byte sub_800CA28
thumb_func_end sub_800CA54
@@ -901,7 +901,7 @@ sub_800CA94: @ 800CA94
sub sp, 0x4
lsls r0, 24
lsrs r6, r0, 24
ldr r0, _0800CAC4 @ =gUnknown_2037AB8
ldr r0, _0800CAC4 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -922,7 +922,7 @@ sub_800CA94: @ 800CA94
beq _0800CADA
b _0800CAEE
.align 2, 0
_0800CAC4: .4byte gUnknown_2037AB8
_0800CAC4: .4byte gPaletteFade
_0800CAC8: .4byte gTasks
_0800CACC:
movs r1, 0xA
@@ -988,11 +988,11 @@ _0800CB2E:
.align 2, 0
_0800CB44: .4byte gUnknown_2031DE0
_0800CB48:
ldr r0, _0800CB64 @ =gUnknown_20371F8
ldr r0, _0800CB64 @ =gPlttBufferUnfaded
movs r2, 0
movs r1, 0
strh r1, [r0]
ldr r0, _0800CB68 @ =gUnknown_20375F8
ldr r0, _0800CB68 @ =gPlttBufferFaded
strh r1, [r0]
ldr r0, _0800CB6C @ =gUnknown_2031DE0
strb r2, [r0]
@@ -1001,8 +1001,8 @@ _0800CB48:
bl sub_8110F14
b _0800CB84
.align 2, 0
_0800CB64: .4byte gUnknown_20371F8
_0800CB68: .4byte gUnknown_20375F8
_0800CB64: .4byte gPlttBufferUnfaded
_0800CB68: .4byte gPlttBufferFaded
_0800CB6C: .4byte gUnknown_2031DE0
_0800CB70:
ldr r0, _0800CB8C @ =sub_81422AC
@@ -1084,13 +1084,13 @@ _0800CBF2:
_0800CC04: .4byte gUnknown_8415ACB
_0800CC08: .4byte gTasks
_0800CC0C:
ldr r0, _0800CC18 @ =gUnknown_2037AB8
ldr r0, _0800CC18 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
b _0800CC28
.align 2, 0
_0800CC18: .4byte gUnknown_2037AB8
_0800CC18: .4byte gPaletteFade
_0800CC1C:
bl RunTextPrinters
movs r0, 0x4
@@ -1135,7 +1135,7 @@ sub_800CC68: @ 800CC68
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _0800CC8C @ =gUnknown_2037AB8
ldr r0, _0800CC8C @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1150,7 +1150,7 @@ _0800CC86:
pop {r0}
bx r0
.align 2, 0
_0800CC8C: .4byte gUnknown_2037AB8
_0800CC8C: .4byte gPaletteFade
_0800CC90: .4byte sub_8078914
thumb_func_end sub_800CC68
asm/map_name_popup.s
+2 -2
View File
@@ -348,7 +348,7 @@ _080983B4: .4byte 0x00ffffff
_080983B8:
movs r0, 0x3
bl stdpal_get
ldr r1, _080983FC @ =gUnknown_2037398
ldr r1, _080983FC @ =gPlttBufferUnfaded + 0x1A0
movs r2, 0x10
bl CpuSet
_080983C6:
@@ -374,7 +374,7 @@ _080983C6:
pop {r1}
bx r1
.align 2, 0
_080983FC: .4byte gUnknown_2037398
_080983FC: .4byte gPlttBufferUnfaded + 0x1A0
thumb_func_end sub_8098340
thumb_func_start sub_8098400
asm/map_obj_80688E4.s
+8 -8
View File
@@ -96,7 +96,7 @@ _0806897A:
lsls r0, 31
cmp r0, 0
beq _08068998
ldr r0, _080689AC @ =gUnknown_2037078
ldr r0, _080689AC @ =gPlayerAvatar
ldrb r0, [r0, 0x5]
cmp r4, r0
beq _08068998
@@ -113,7 +113,7 @@ _08068998:
bx r0
.align 2, 0
_080689A8: .4byte gMapObjects
_080689AC: .4byte gUnknown_2037078
_080689AC: .4byte gPlayerAvatar
thumb_func_end player_bitmagic
thumb_func_start FreezeMapObjectsExceptOne
@@ -134,7 +134,7 @@ _080689BA:
lsls r0, 31
cmp r0, 0
beq _080689DC
ldr r0, _080689F0 @ =gUnknown_2037078
ldr r0, _080689F0 @ =gPlayerAvatar
ldrb r0, [r0, 0x5]
cmp r4, r0
beq _080689DC
@@ -151,7 +151,7 @@ _080689DC:
bx r0
.align 2, 0
_080689EC: .4byte gMapObjects
_080689F0: .4byte gUnknown_2037078
_080689F0: .4byte gPlayerAvatar
thumb_func_end FreezeMapObjectsExceptOne
thumb_func_start npc_sync_anim_pause_bits
@@ -1437,7 +1437,7 @@ oe_exec_and_other_stuff: @ 80692C8
adds r0, r1, 0
lsls r4, 24
lsrs r4, 24
ldr r1, _080692EC @ =gUnknown_20386E0
ldr r1, _080692EC @ =gFieldEffectArguments
adds r2, r1, 0x4
adds r3, r1, 0
adds r3, 0x8
@@ -1448,7 +1448,7 @@ oe_exec_and_other_stuff: @ 80692C8
pop {r1}
bx r1
.align 2, 0
_080692EC: .4byte gUnknown_20386E0
_080692EC: .4byte gFieldEffectArguments
thumb_func_end oe_exec_and_other_stuff
thumb_func_start DoShadowFieldEffect
@@ -1475,7 +1475,7 @@ DoRippleFieldEffect: @ 806930C
adds r4, r1, 0
ldrb r0, [r0, 0x5]
bl GetFieldObjectGraphicsInfo
ldr r2, _08069344 @ =gUnknown_20386E0
ldr r2, _08069344 @ =gFieldEffectArguments
movs r3, 0x20
ldrsh r1, [r4, r3]
str r1, [r2]
@@ -1497,7 +1497,7 @@ DoRippleFieldEffect: @ 806930C
pop {r0}
bx r0
.align 2, 0
_08069344: .4byte gUnknown_20386E0
_08069344: .4byte gFieldEffectArguments
thumb_func_end DoRippleFieldEffect
.align 2, 0 @ Don't pad with nop.
asm/map_obj_lock.s
+2 -2
View File
@@ -8,14 +8,14 @@
thumb_func_start walkrun_is_standing_still
walkrun_is_standing_still: @ 8069554
push {lr}
ldr r0, _08069564 @ =gUnknown_2037078
ldr r0, _08069564 @ =gPlayerAvatar
ldrb r0, [r0, 0x3]
cmp r0, 0x1
beq _08069568
movs r0, 0x1
b _0806956A
.align 2, 0
_08069564: .4byte gUnknown_2037078
_08069564: .4byte gPlayerAvatar
_08069568:
movs r0, 0
_0806956A:
asm/mevent_8145654.s
+8 -8
View File
@@ -246,7 +246,7 @@ _08145834:
lsrs r6, r0, 24
cmp r6, 0
bne _0814592E
ldr r2, _081458A0 @ =gUnknown_2037AB8
ldr r2, _081458A0 @ =gPaletteFade
ldrb r0, [r2, 0x8]
movs r1, 0x80
orrs r0, r1
@@ -291,7 +291,7 @@ _08145834:
bl CopyBgTilemapBufferToVram
b _0814591E
.align 2, 0
_081458A0: .4byte gUnknown_2037AB8
_081458A0: .4byte gPaletteFade
_081458A4: .4byte gUnknown_203F3C8
_081458A8: .4byte 0x0000045c
_081458AC:
@@ -315,7 +315,7 @@ _081458D2:
bl ShowBg
movs r0, 0x2
bl ShowBg
ldr r2, _08145904 @ =gUnknown_2037AB8
ldr r2, _08145904 @ =gPaletteFade
ldrb r1, [r2, 0x8]
movs r0, 0x7F
ands r0, r1
@@ -331,7 +331,7 @@ _081458D2:
bl UpdatePaletteFade
b _0814591E
.align 2, 0
_08145904: .4byte gUnknown_2037AB8
_08145904: .4byte gPaletteFade
_08145908:
bl UpdatePaletteFade
lsls r0, 24
@@ -1780,7 +1780,7 @@ _08146494:
beq _081464A2
b _081465EC
_081464A2:
ldr r2, _0814653C @ =gUnknown_2037AB8
ldr r2, _0814653C @ =gPaletteFade
ldrb r0, [r2, 0x8]
movs r1, 0x80
orrs r0, r1
@@ -1851,7 +1851,7 @@ _081464A2:
bl CopyBgTilemapBufferToVram
b _081465D2
.align 2, 0
_0814653C: .4byte gUnknown_2037AB8
_0814653C: .4byte gPaletteFade
_08146540: .4byte gUnknown_203F3CC
_08146544:
bl sub_8146980
@@ -1870,7 +1870,7 @@ _0814655C:
bl ShowBg
movs r0, 0x3
bl ShowBg
ldr r2, _081465AC @ =gUnknown_2037AB8
ldr r2, _081465AC @ =gPaletteFade
ldrb r1, [r2, 0x8]
movs r0, 0x7F
ands r0, r1
@@ -1898,7 +1898,7 @@ _0814655C:
bl UpdatePaletteFade
b _081465D2
.align 2, 0
_081465AC: .4byte gUnknown_2037AB8
_081465AC: .4byte gPaletteFade
_081465B0: .4byte gUnknown_203F3CC
_081465B4: .4byte 0x000001c1
_081465B8:
asm/naming_screen.s
+8 -8
View File
@@ -692,7 +692,7 @@ _0809DF24: .4byte 0x00001e10
thumb_func_start sub_809DF28
sub_809DF28: @ 809DF28
push {lr}
ldr r0, _0809DF58 @ =gUnknown_2037AB8
ldr r0, _0809DF58 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -714,7 +714,7 @@ _0809DF50:
pop {r1}
bx r1
.align 2, 0
_0809DF58: .4byte gUnknown_2037AB8
_0809DF58: .4byte gPaletteFade
_0809DF5C: .4byte gUnknown_203998C
_0809DF60: .4byte 0x00001e10
thumb_func_end sub_809DF28
@@ -837,7 +837,7 @@ _0809E044: .4byte 0x00001e10
thumb_func_start sub_809E048
sub_809E048: @ 809E048
push {r4,r5,lr}
ldr r0, _0809E0A0 @ =gUnknown_2037AB8
ldr r0, _0809E0A0 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -875,7 +875,7 @@ _0809E096:
pop {r1}
bx r1
.align 2, 0
_0809E0A0: .4byte gUnknown_2037AB8
_0809E0A0: .4byte gPaletteFade
_0809E0A4: .4byte gUnknown_203998C
_0809E0A8: .4byte 0x00001e2c
_0809E0AC: .4byte 0x00001e3c
@@ -1648,18 +1648,18 @@ sub_809E6B8: @ 809E6B8
lsrs r0, 24
bl sub_809E644
lsls r0, 16
ldr r2, _0809E6D8 @ =gUnknown_20375F8
ldr r2, _0809E6D8 @ =gPlttBufferFaded
lsrs r0, 15
adds r2, r0, r2
ldr r1, _0809E6DC @ =gUnknown_20371F8
ldr r1, _0809E6DC @ =gPlttBufferUnfaded
adds r0, r1
ldrh r0, [r0]
strh r0, [r2]
pop {r0}
bx r0
.align 2, 0
_0809E6D8: .4byte gUnknown_20375F8
_0809E6DC: .4byte gUnknown_20371F8
_0809E6D8: .4byte gPlttBufferFaded
_0809E6DC: .4byte gPlttBufferUnfaded
thumb_func_end sub_809E6B8
thumb_func_start sub_809E6E0
asm/oak_speech.s
+34 -34
View File
@@ -270,10 +270,10 @@ sub_812EB10: @ 812EB10
thumb_func_start sub_812EB2C
sub_812EB2C: @ 812EB2C
push {lr}
ldr r0, _0812EB48 @ =gUnknown_20371F8
ldr r0, _0812EB48 @ =gPlttBufferUnfaded
movs r1, 0
strh r1, [r0]
ldr r0, _0812EB4C @ =gUnknown_20375F8
ldr r0, _0812EB4C @ =gPlttBufferFaded
strh r1, [r0]
ldr r0, _0812EB50 @ =sub_812EB58
bl CreateTask
@@ -282,8 +282,8 @@ sub_812EB2C: @ 812EB2C
pop {r0}
bx r0
.align 2, 0
_0812EB48: .4byte gUnknown_20371F8
_0812EB4C: .4byte gUnknown_20375F8
_0812EB48: .4byte gPlttBufferUnfaded
_0812EB4C: .4byte gPlttBufferFaded
_0812EB50: .4byte sub_812EB58
_0812EB54: .4byte sub_812EB10
thumb_func_end sub_812EB2C
@@ -462,7 +462,7 @@ _0812ECF4: .4byte gUnknown_203B108
_0812ECF8: .4byte gSpriteCoordOffsetX
_0812ECFC: .4byte gSpriteCoordOffsetY
_0812ED00:
ldr r2, _0812ED34 @ =gUnknown_2037AB8
ldr r2, _0812ED34 @ =gPaletteFade
ldrb r0, [r2, 0x8]
movs r1, 0x80
orrs r0, r1
@@ -483,7 +483,7 @@ _0812ED00:
bl LoadPalette
b _0812EE94
.align 2, 0
_0812ED34: .4byte gUnknown_2037AB8
_0812ED34: .4byte gPaletteFade
_0812ED38: .4byte gUnknown_8460568
_0812ED3C:
bl sub_80F78A8
@@ -561,7 +561,7 @@ _0812ED9A:
movs r3, 0x13
bl FillBgTilemapBufferRect_Palette0
bl sub_812EEB0
ldr r2, _0812EE28 @ =gUnknown_2037AB8
ldr r2, _0812EE28 @ =gPaletteFade
ldrb r1, [r2, 0x8]
movs r0, 0x7F
ands r0, r1
@@ -590,7 +590,7 @@ _0812ED9A:
_0812EE1C: .4byte 0x0000d00f
_0812EE20: .4byte 0x0000d002
_0812EE24: .4byte 0x0000d00e
_0812EE28: .4byte gUnknown_2037AB8
_0812EE28: .4byte gPaletteFade
_0812EE2C: .4byte gTasks
_0812EE30:
movs r0, 0x1
@@ -890,7 +890,7 @@ sub_812F0B0: @ 812F0B0
sub sp, 0x4
lsls r0, 24
lsrs r5, r0, 24
ldr r0, _0812F10C @ =gUnknown_2037AB8
ldr r0, _0812F10C @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -931,7 +931,7 @@ sub_812F0B0: @ 812F0B0
bl BeginNormalPaletteFade
b _0812F150
.align 2, 0
_0812F10C: .4byte gUnknown_2037AB8
_0812F10C: .4byte gPaletteFade
_0812F110: .4byte gMain
_0812F114: .4byte gTasks
_0812F118: .4byte gUnknown_203B108
@@ -992,7 +992,7 @@ sub_812F180: @ 812F180
lsrs r7, r0, 24
movs r0, 0
mov r8, r0
ldr r0, _0812F1B0 @ =gUnknown_2037AB8
ldr r0, _0812F1B0 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1008,7 +1008,7 @@ sub_812F180: @ 812F180
mov r8, r1
b _0812F1C4
.align 2, 0
_0812F1B0: .4byte gUnknown_2037AB8
_0812F1B0: .4byte gPaletteFade
_0812F1B4: .4byte gUnknown_203B108
_0812F1B8:
cmp r0, 0
@@ -1115,7 +1115,7 @@ sub_812F274: @ 812F274
lsrs r0, 24
mov r8, r0
movs r6, 0
ldr r0, _0812F32C @ =gUnknown_2037AB8
ldr r0, _0812F32C @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1194,7 +1194,7 @@ _0812F320:
pop {r0}
bx r0
.align 2, 0
_0812F32C: .4byte gUnknown_2037AB8
_0812F32C: .4byte gPaletteFade
_0812F330: .4byte gUnknown_203B108
_0812F334: .4byte gTasks
_0812F338: .4byte sub_812F33C
@@ -1402,7 +1402,7 @@ _0812F4E4:
.4byte _0812F644
.4byte _0812F688
_0812F4F8:
ldr r0, _0812F534 @ =gUnknown_2037AB8
ldr r0, _0812F534 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1429,7 +1429,7 @@ _0812F506:
bl SetGpuRegBits
b _0812F676
.align 2, 0
_0812F534: .4byte gUnknown_2037AB8
_0812F534: .4byte gPaletteFade
_0812F538:
ldrh r1, [r4, 0x2E]
movs r0, 0x3
@@ -1681,7 +1681,7 @@ sub_812F72C: @ 812F72C
ldr r0, _0812F7B4 @ =gTasks+0x8
mov r8, r0
adds r4, r7, r0
ldr r0, _0812F7B8 @ =gUnknown_2037AB8
ldr r0, _0812F7B8 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1731,7 +1731,7 @@ _0812F7A6:
bx r0
.align 2, 0
_0812F7B4: .4byte gTasks+0x8
_0812F7B8: .4byte gUnknown_2037AB8
_0812F7B8: .4byte gPaletteFade
_0812F7BC: .4byte sub_812F7C0
thumb_func_end sub_812F72C
@@ -1834,7 +1834,7 @@ sub_812F880: @ 812F880
lsls r0, 3
ldr r1, _0812F8B0 @ =gTasks+0x8
adds r2, r0, r1
ldr r0, _0812F8B4 @ =gUnknown_2037AB8
ldr r0, _0812F8B4 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1850,7 +1850,7 @@ sub_812F880: @ 812F880
b _0812F92E
.align 2, 0
_0812F8B0: .4byte gTasks+0x8
_0812F8B4: .4byte gUnknown_2037AB8
_0812F8B4: .4byte gPaletteFade
_0812F8B8:
movs r0, 0
movs r1, 0
@@ -3215,7 +3215,7 @@ sub_81303B4: @ 81303B4
sub sp, 0x8
lsls r0, 24
lsrs r6, r0, 24
ldr r0, _081303F8 @ =gUnknown_2037AB8
ldr r0, _081303F8 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -3243,7 +3243,7 @@ sub_81303B4: @ 81303B4
bl DoNamingScreen
b _08130440
.align 2, 0
_081303F8: .4byte gUnknown_2037AB8
_081303F8: .4byte gPaletteFade
_081303FC: .4byte gUnknown_203B108
_08130400: .4byte gSaveBlock2Ptr
_08130404: .4byte sub_8130C64
@@ -3301,7 +3301,7 @@ sub_8130464: @ 8130464
lsls r6, r1, 3
ldr r7, _081304A0 @ =gTasks+0x8
adds r5, r6, r7
ldr r0, _081304A4 @ =gUnknown_2037AB8
ldr r0, _081304A4 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -3322,7 +3322,7 @@ sub_8130464: @ 8130464
b _081304BC
.align 2, 0
_081304A0: .4byte gTasks+0x8
_081304A4: .4byte gUnknown_2037AB8
_081304A4: .4byte gPaletteFade
_081304A8: .4byte gUnknown_203B108
_081304AC: .4byte gStringVar4
_081304B0: .4byte gUnknown_81C5E13
@@ -4072,7 +4072,7 @@ sub_8130A80: @ 8130A80
lsls r0, 3
ldr r1, _08130AB8 @ =gTasks+0x8
adds r2, r0, r1
ldr r0, _08130ABC @ =gUnknown_2037AB8
ldr r0, _08130ABC @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -4091,7 +4091,7 @@ sub_8130A80: @ 8130A80
b _08130AD4
.align 2, 0
_08130AB8: .4byte gTasks+0x8
_08130ABC: .4byte gUnknown_2037AB8
_08130ABC: .4byte gPaletteFade
_08130AC0:
adds r0, 0x1
strh r0, [r2, 0x2]
@@ -4188,9 +4188,9 @@ _08130B4A:
cmp r1, 0xE
ble _08130B96
movs r2, 0
ldr r6, _08130BA0 @ =gUnknown_20375F8
ldr r6, _08130BA0 @ =gPlttBufferFaded
adds r3, r7, 0
ldr r4, _08130BA4 @ =gUnknown_20371F8
ldr r4, _08130BA4 @ =gPlttBufferUnfaded
_08130B78:
adds r0, r2, 0
adds r0, 0x40
@@ -4212,8 +4212,8 @@ _08130B96:
bx r0
.align 2, 0
_08130B9C: .4byte 0x00007fff
_08130BA0: .4byte gUnknown_20375F8
_08130BA4: .4byte gUnknown_20371F8
_08130BA0: .4byte gPlttBufferFaded
_08130BA4: .4byte gPlttBufferUnfaded
thumb_func_end sub_8130B10
thumb_func_start sub_8130BA8
@@ -4260,7 +4260,7 @@ sub_8130BF0: @ 8130BF0
push {lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r0, _08130C14 @ =gUnknown_2037AB8
ldr r0, _08130C14 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -4277,7 +4277,7 @@ _08130C10:
pop {r0}
bx r0
.align 2, 0
_08130C14: .4byte gUnknown_2037AB8
_08130C14: .4byte gPaletteFade
_08130C18: .4byte gTasks
_08130C1C: .4byte sub_8130C20
thumb_func_end sub_8130BF0
@@ -5350,7 +5350,7 @@ sub_81314DC: @ 81314DC
mov r12, r1
cmp r0, 0x10
bne _08131530
ldr r0, _0813152C @ =gUnknown_2037AB8
ldr r0, _0813152C @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -5369,7 +5369,7 @@ sub_81314DC: @ 81314DC
b _081315BA
.align 2, 0
_08131528: .4byte gTasks
_0813152C: .4byte gUnknown_2037AB8
_0813152C: .4byte gPaletteFade
_08131530:
ldrh r1, [r2, 0x10]
movs r7, 0x10
asm/option_menu.s
+2 -2
View File
@@ -640,7 +640,7 @@ _08088878:
.align 2, 0
_08088890: .4byte gUnknown_2039620
_08088894:
ldr r0, _080888AC @ =gUnknown_2037AB8
ldr r0, _080888AC @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -653,7 +653,7 @@ _080888A2:
strb r0, [r1, 0x10]
b _080888B6
.align 2, 0
_080888AC: .4byte gUnknown_2037AB8
_080888AC: .4byte gPaletteFade
_080888B0:
adds r0, r2, 0
bl sub_8088B00
asm/overworld.s
+21 -21
View File
@@ -2190,7 +2190,7 @@ sub_8055C74: @ 8055C74
adds r1, 0x7
lsls r1, 16
asrs r1, 16
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 16
lsrs r0, 16
pop {r1}
@@ -2677,7 +2677,7 @@ sub_8055FE0: @ 8055FE0
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl MetatileBehavior_IsSurfable
@@ -3263,7 +3263,7 @@ sub_805644C: @ 805644C
mov r0, sp
adds r1, r5, 0
adds r2, r4, 0
bl sub_806C8BC
bl FieldGetPlayerInput
mov r0, sp
bl sub_806CD30
bl ScriptContext2_IsEnabled
@@ -3409,7 +3409,7 @@ sub_80565A8: @ 80565A8
thumb_func_start sub_80565B4
sub_80565B4: @ 80565B4
push {r4,lr}
ldr r0, _080565DC @ =gUnknown_2037AB8
ldr r0, _080565DC @ =gPaletteFade
ldrb r0, [r0, 0x7]
lsrs r0, 7
adds r4, r0, 0
@@ -3427,7 +3427,7 @@ _080565D4:
pop {r0}
bx r0
.align 2, 0
_080565DC: .4byte gUnknown_2037AB8
_080565DC: .4byte gPaletteFade
thumb_func_end sub_80565B4
thumb_func_start sub_80565E0
@@ -4735,7 +4735,7 @@ sub_8057100: @ 8057100
sub_8057114: @ 8057114
push {lr}
ldr r2, _08057138 @ =gMapObjects
ldr r3, _0805713C @ =gUnknown_2037078
ldr r3, _0805713C @ =gPlayerAvatar
ldrb r1, [r3, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -4751,7 +4751,7 @@ sub_8057114: @ 8057114
bx r0
.align 2, 0
_08057138: .4byte gMapObjects
_0805713C: .4byte gUnknown_2037078
_0805713C: .4byte gPlayerAvatar
thumb_func_end sub_8057114
thumb_func_start sub_8057140
@@ -5161,7 +5161,7 @@ _080574A0: .4byte sub_8056534
thumb_func_start sub_80574A4
sub_80574A4: @ 80574A4
push {r4,lr}
ldr r0, _080574E8 @ =gUnknown_2037AB8
ldr r0, _080574E8 @ =gPaletteFade
ldrb r0, [r0, 0x7]
lsrs r0, 7
adds r4, r0, 0
@@ -5186,13 +5186,13 @@ _080574E0:
pop {r0}
bx r0
.align 2, 0
_080574E8: .4byte gUnknown_2037AB8
_080574E8: .4byte gPaletteFade
thumb_func_end sub_80574A4
thumb_func_start sub_80574EC
sub_80574EC: @ 80574EC
push {lr}
ldr r0, _08057500 @ =gUnknown_2037AB8
ldr r0, _08057500 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -5201,7 +5201,7 @@ sub_80574EC: @ 80574EC
movs r0, 0
b _08057506
.align 2, 0
_08057500: .4byte gUnknown_2037AB8
_08057500: .4byte gPaletteFade
_08057504:
movs r0, 0x1
_08057506:
@@ -5305,7 +5305,7 @@ _08057560:
ldrh r0, [r0, 0x4]
strh r0, [r1]
bl warp_in
ldr r2, _08057610 @ =gUnknown_2037AB8
ldr r2, _08057610 @ =gPaletteFade
ldrb r0, [r2, 0x8]
movs r1, 0x80
orrs r0, r1
@@ -5333,7 +5333,7 @@ _08057600: .4byte 0xffff0000
_08057604: .4byte 0x0000ffff
_08057608: .4byte gUnknown_2031DBC
_0805760C: .4byte gUnknown_2031DE8
_08057610: .4byte gUnknown_2037AB8
_08057610: .4byte gPaletteFade
_08057614: .4byte gUnknown_3005024
_08057618: .4byte sub_80574EC
_0805761C: .4byte gMain
@@ -5443,7 +5443,7 @@ _0805770C:
b _0805772A
_08057712:
bl cur_mapheader_run_tileset_funcs_after_some_cpuset
ldr r2, _08057734 @ =gUnknown_2037AB8
ldr r2, _08057734 @ =gPaletteFade
ldrb r1, [r2, 0x8]
movs r0, 0x7F
ands r0, r1
@@ -5458,7 +5458,7 @@ _0805772A:
strb r0, [r4]
b _08057740
.align 2, 0
_08057734: .4byte gUnknown_2037AB8
_08057734: .4byte gPaletteFade
_08057738: .4byte 0x3fffffff
_0805773C:
movs r0, 0x1
@@ -5613,7 +5613,7 @@ sub_8057854: @ 8057854
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _0805787C @ =gUnknown_2037AB8
ldr r0, _0805787C @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -5629,7 +5629,7 @@ _08057876:
pop {r0}
bx r0
.align 2, 0
_0805787C: .4byte gUnknown_2037AB8
_0805787C: .4byte gPaletteFade
_08057880: .4byte sub_805671C
thumb_func_end sub_8057854
@@ -6640,7 +6640,7 @@ _08057F96:
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r5, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
strh r0, [r6, 0xC]
add sp, 0x4
pop {r4-r6}
@@ -6913,7 +6913,7 @@ sub_80581C8: @ 80581C8
push {lr}
movs r0, 0x6
bl PlaySE
bl sub_806F258
bl ShowStartMenu
bl ScriptContext2_Enable
pop {r0}
bx r0
@@ -7029,7 +7029,7 @@ sub_8058274: @ 8058274
strb r1, [r0]
cmp r2, 0x1
beq _080582C0
ldr r2, _080582D4 @ =gUnknown_2037AB8
ldr r2, _080582D4 @ =gPaletteFade
ldrb r1, [r2, 0x7]
movs r0, 0x80
ands r0, r1
@@ -7048,7 +7048,7 @@ _080582C4: .4byte gUnknown_3000E84
_080582C8: .4byte sub_8057DC8
_080582CC: .4byte sub_8057DA4
_080582D0: .4byte gUnknown_3000E88
_080582D4: .4byte gUnknown_2037AB8
_080582D4: .4byte gPaletteFade
_080582D8:
movs r0, 0
_080582DA:
asm/palette.s
+113 -113
View File
@@ -17,13 +17,13 @@ LoadCompressedPalette: @ 80703A8
adds r1, r6, 0
bl LZDecompressWram
lsls r4, 1
ldr r1, _080703E4 @ =gUnknown_20371F8
ldr r1, _080703E4 @ =gPlttBufferUnfaded
adds r1, r4, r1
lsrs r5, 17
adds r0, r6, 0
adds r2, r5, 0
bl CpuSet
ldr r0, _080703E8 @ =gUnknown_20375F8
ldr r0, _080703E8 @ =gPlttBufferFaded
adds r4, r0
adds r0, r6, 0
adds r1, r4, 0
@@ -34,8 +34,8 @@ LoadCompressedPalette: @ 80703A8
bx r0
.align 2, 0
_080703E0: .4byte gUnknown_2037ACC
_080703E4: .4byte gUnknown_20371F8
_080703E8: .4byte gUnknown_20375F8
_080703E4: .4byte gPlttBufferUnfaded
_080703E8: .4byte gPlttBufferFaded
thumb_func_end LoadCompressedPalette
thumb_func_start LoadPalette
@@ -47,12 +47,12 @@ LoadPalette: @ 80703EC
lsls r4, 16
lsls r5, 16
lsrs r4, 15
ldr r1, _0807041C @ =gUnknown_20371F8
ldr r1, _0807041C @ =gPlttBufferUnfaded
adds r1, r4, r1
lsrs r5, 17
adds r2, r5, 0
bl CpuSet
ldr r0, _08070420 @ =gUnknown_20375F8
ldr r0, _08070420 @ =gPlttBufferFaded
adds r4, r0
adds r0, r6, 0
adds r1, r4, 0
@@ -62,8 +62,8 @@ LoadPalette: @ 80703EC
pop {r0}
bx r0
.align 2, 0
_0807041C: .4byte gUnknown_20371F8
_08070420: .4byte gUnknown_20375F8
_0807041C: .4byte gPlttBufferUnfaded
_08070420: .4byte gPlttBufferFaded
thumb_func_end LoadPalette
thumb_func_start FillPalette
@@ -80,7 +80,7 @@ FillPalette: @ 8070424
mov r0, sp
strh r6, [r0]
lsrs r4, 15
ldr r1, _0807046C @ =gUnknown_20371F8
ldr r1, _0807046C @ =gPlttBufferUnfaded
adds r1, r4, r1
lsrs r5, 17
movs r0, 0x80
@@ -92,7 +92,7 @@ FillPalette: @ 8070424
mov r0, sp
adds r0, 0x2
strh r6, [r0]
ldr r1, _08070470 @ =gUnknown_20375F8
ldr r1, _08070470 @ =gPlttBufferFaded
adds r4, r1
adds r1, r4, 0
adds r2, r5, 0
@@ -102,14 +102,14 @@ FillPalette: @ 8070424
pop {r0}
bx r0
.align 2, 0
_0807046C: .4byte gUnknown_20371F8
_08070470: .4byte gUnknown_20375F8
_0807046C: .4byte gPlttBufferUnfaded
_08070470: .4byte gPlttBufferFaded
thumb_func_end FillPalette
thumb_func_start TransferPlttBuffer
TransferPlttBuffer: @ 8070474
push {r4,r5,lr}
ldr r4, _080704BC @ =gUnknown_2037AB8
ldr r4, _080704BC @ =gPaletteFade
ldrb r1, [r4, 0x8]
movs r5, 0x80
adds r0, r5, 0
@@ -118,7 +118,7 @@ TransferPlttBuffer: @ 8070474
lsrs r3, r0, 24
cmp r3, 0
bne _080704B6
ldr r1, _080704C0 @ =gUnknown_20375F8
ldr r1, _080704C0 @ =gPlttBufferFaded
movs r2, 0xA0
lsls r2, 19
ldr r0, _080704C4 @ =0x040000d4
@@ -145,8 +145,8 @@ _080704B6:
pop {r0}
bx r0
.align 2, 0
_080704BC: .4byte gUnknown_2037AB8
_080704C0: .4byte gUnknown_20375F8
_080704BC: .4byte gPaletteFade
_080704C0: .4byte gPlttBufferFaded
_080704C4: .4byte 0x040000d4
_080704C8: .4byte 0x80000200
_080704CC: .4byte gUnknown_2037AC8
@@ -164,7 +164,7 @@ UpdatePaletteFade: @ 80704D0
.align 2, 0
_080704E0: .4byte gUnknown_2037AC8
_080704E4:
ldr r0, _080704F8 @ =gUnknown_2037AB8
ldr r0, _080704F8 @ =gPaletteFade
ldrb r0, [r0, 0x9]
movs r1, 0x3
ands r1, r0
@@ -173,7 +173,7 @@ _080704E4:
bl UpdateNormalPaletteFade
b _0807050A
.align 2, 0
_080704F8: .4byte gUnknown_2037AB8
_080704F8: .4byte gPaletteFade
_080704FC:
cmp r1, 0x1
bne _08070506
@@ -185,7 +185,7 @@ _0807050A:
lsls r0, 24
lsrs r3, r0, 24
ldr r2, _08070520 @ =gUnknown_2037AC8
ldr r0, _08070524 @ =gUnknown_2037AB8
ldr r0, _08070524 @ =gPaletteFade
ldr r0, [r0]
movs r1, 0
orrs r0, r1
@@ -196,7 +196,7 @@ _0807051C:
bx r1
.align 2, 0
_08070520: .4byte gUnknown_2037AC8
_08070524: .4byte gUnknown_2037AB8
_08070524: .4byte gPaletteFade
thumb_func_end UpdatePaletteFade
thumb_func_start ResetPaletteFade
@@ -224,8 +224,8 @@ ReadPlttIntoBuffers: @ 8070548
lsls r0, 19
mov r12, r0
movs r4, 0
ldr r7, _0807057C @ =gUnknown_20371F8
ldr r6, _08070580 @ =gUnknown_20375F8
ldr r7, _0807057C @ =gPlttBufferUnfaded
ldr r6, _08070580 @ =gPlttBufferFaded
ldr r5, _08070584 @ =0x000001ff
_08070558:
lsls r1, r4, 1
@@ -246,8 +246,8 @@ _08070558:
pop {r0}
bx r0
.align 2, 0
_0807057C: .4byte gUnknown_20371F8
_08070580: .4byte gUnknown_20375F8
_0807057C: .4byte gPlttBufferUnfaded
_08070580: .4byte gPlttBufferFaded
_08070584: .4byte 0x000001ff
thumb_func_end ReadPlttIntoBuffers
@@ -268,7 +268,7 @@ BeginNormalPaletteFade: @ 8070588
lsls r0, 16
lsrs r0, 16
mov r8, r0
ldr r5, _080705B8 @ =gUnknown_2037AB8
ldr r5, _080705B8 @ =gPaletteFade
ldrb r1, [r5, 0x7]
movs r0, 0x80
ands r0, r1
@@ -277,7 +277,7 @@ BeginNormalPaletteFade: @ 8070588
movs r0, 0
b _080706B4
.align 2, 0
_080705B8: .4byte gUnknown_2037AB8
_080705B8: .4byte gPaletteFade
_080705BC:
ldrb r0, [r5, 0xA]
movs r3, 0x79
@@ -367,13 +367,13 @@ _08070664:
_08070668:
strb r3, [r5, 0x8]
bl UpdatePaletteFade
ldr r4, _080706C0 @ =gUnknown_2037AB8
ldr r4, _080706C0 @ =gPaletteFade
ldrb r1, [r4, 0x8]
lsrs r5, r1, 7
movs r0, 0x7F
ands r0, r1
strb r0, [r4, 0x8]
ldr r0, _080706C4 @ =gUnknown_20375F8
ldr r0, _080706C4 @ =gPlttBufferFaded
movs r1, 0xA0
lsls r1, 19
ldr r2, _080706C8 @ =0x04000100
@@ -393,7 +393,7 @@ _08070668:
beq _080706A4
bl UpdateBlendRegisters
_080706A4:
ldr r2, _080706C0 @ =gUnknown_2037AB8
ldr r2, _080706C0 @ =gPaletteFade
lsls r3, r5, 7
ldrb r1, [r2, 0x8]
movs r0, 0x7F
@@ -408,8 +408,8 @@ _080706B4:
pop {r1}
bx r1
.align 2, 0
_080706C0: .4byte gUnknown_2037AB8
_080706C4: .4byte gUnknown_20375F8
_080706C0: .4byte gPaletteFade
_080706C4: .4byte gPlttBufferFaded
_080706C8: .4byte 0x04000100
_080706CC: .4byte gUnknown_2037AC8
thumb_func_end BeginNormalPaletteFade
@@ -542,9 +542,9 @@ unused_sub_80A1CDC: @ 8070790
lsrs r0, r2, 27
cmp r6, r0
bcs _08070878
ldr r0, _0807081C @ =gUnknown_20371F8
ldr r0, _0807081C @ =gPlttBufferUnfaded
mov r12, r0
ldr r7, _08070820 @ =gUnknown_20375F8
ldr r7, _08070820 @ =gPlttBufferFaded
_080707C4:
ldr r0, [r4, 0x4]
lsls r0, 11
@@ -591,15 +591,15 @@ _080707C4:
bcc _080707C4
b _08070878
.align 2, 0
_0807081C: .4byte gUnknown_20371F8
_08070820: .4byte gUnknown_20375F8
_0807081C: .4byte gPlttBufferUnfaded
_08070820: .4byte gPlttBufferFaded
_08070824: .4byte 0x000003ff
_08070828: .4byte 0xffe007ff
_0807082C:
lsrs r0, r2, 27
cmp r6, r0
bcs _08070878
ldr r3, _080708E4 @ =gUnknown_20375F8
ldr r3, _080708E4 @ =gPlttBufferFaded
_08070834:
ldr r1, [r4, 0x4]
lsls r1, 11
@@ -693,7 +693,7 @@ _080708C8:
pop {r0}
bx r0
.align 2, 0
_080708E4: .4byte gUnknown_20375F8
_080708E4: .4byte gPlttBufferFaded
_080708E8: .4byte 0x000003ff
_080708EC: .4byte 0xffe007ff
_080708F0: .4byte 0xfffff01f
@@ -703,7 +703,7 @@ _080708F0: .4byte 0xfffff01f
unused_sub_80A1E40: @ 80708F4
push {r4-r6,lr}
adds r4, r0, 0
ldr r3, _0807094C @ =gUnknown_2037AB8
ldr r3, _0807094C @ =gPaletteFade
ldrb r1, [r3, 0x7]
movs r0, 0x80
ands r0, r1
@@ -745,7 +745,7 @@ unused_sub_80A1E40: @ 80708F4
bl BlendPalette
b _080709A8
.align 2, 0
_0807094C: .4byte gUnknown_2037AB8
_0807094C: .4byte gPaletteFade
_08070950:
ldrb r1, [r3, 0x4]
movs r0, 0x3F
@@ -768,7 +768,7 @@ _08070950:
adds r1, r2, 0
cmp r3, r1
bcs _080709A8
ldr r6, _080709B0 @ =gUnknown_20375F8
ldr r6, _080709B0 @ =gPlttBufferFaded
_0807097C:
ldrh r1, [r4, 0x4]
lsls r1, 21
@@ -797,7 +797,7 @@ _080709A8:
pop {r0}
bx r0
.align 2, 0
_080709B0: .4byte gUnknown_20375F8
_080709B0: .4byte gPlttBufferFaded
thumb_func_end unused_sub_80A1E40
thumb_func_start unused_sub_80A1F00
@@ -912,7 +912,7 @@ _08070A80: .4byte 0xfffff01f
thumb_func_start ResetPaletteFadeControl
ResetPaletteFadeControl: @ 8070A84
ldr r2, _08070AEC @ =gUnknown_2037AB8
ldr r2, _08070AEC @ =gPaletteFade
movs r0, 0
str r0, [r2]
subs r0, 0x40
@@ -965,7 +965,7 @@ ResetPaletteFadeControl: @ 8070A84
strb r3, [r2, 0xA]
bx lr
.align 2, 0
_08070AEC: .4byte gUnknown_2037AB8
_08070AEC: .4byte gPaletteFade
_08070AF0: .4byte 0xfffff83f
_08070AF4: .4byte 0xffff8000
_08070AF8: .4byte 0xfffe0fff
@@ -1059,7 +1059,7 @@ _08070B88:
thumb_func_start UpdateNormalPaletteFade
UpdateNormalPaletteFade: @ 8070B8C
push {r4-r7,lr}
ldr r4, _08070BA0 @ =gUnknown_2037AB8
ldr r4, _08070BA0 @ =gPaletteFade
ldrb r1, [r4, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1068,7 +1068,7 @@ UpdateNormalPaletteFade: @ 8070B8C
movs r0, 0
b _08070CC0
.align 2, 0
_08070BA0: .4byte gUnknown_2037AB8
_08070BA0: .4byte gPaletteFade
_08070BA4:
bl IsSoftwarePaletteFadeFinishing
lsls r0, 24
@@ -1106,7 +1106,7 @@ _08070BDE:
strb r0, [r4, 0x4]
_08070BE6:
movs r5, 0
ldr r2, _08070BFC @ =gUnknown_2037AB8
ldr r2, _08070BFC @ =gPaletteFade
ldrb r1, [r2, 0xA]
movs r0, 0x4
ands r0, r1
@@ -1116,7 +1116,7 @@ _08070BE6:
ldrh r4, [r7]
b _08070C06
.align 2, 0
_08070BFC: .4byte gUnknown_2037AB8
_08070BFC: .4byte gPaletteFade
_08070C00:
ldrh r4, [r7, 0x2]
movs r5, 0x80
@@ -1124,7 +1124,7 @@ _08070C00:
_08070C06:
cmp r4, 0
beq _08070C38
ldr r7, _08070C74 @ =gUnknown_2037AB8
ldr r7, _08070C74 @ =gPaletteFade
adds r6, r7, 0
_08070C0E:
movs r0, 0x1
@@ -1180,7 +1180,7 @@ _08070C38:
strb r4, [r7, 0xA]
b _08070CBC
.align 2, 0
_08070C74: .4byte gUnknown_2037AB8
_08070C74: .4byte gPaletteFade
_08070C78:
ldrb r1, [r7, 0x8]
movs r0, 0x40
@@ -1237,7 +1237,7 @@ InvertPlttBuffer: @ 8070CCC
movs r3, 0
cmp r1, 0
beq _08070D0A
ldr r7, _08070D10 @ =gUnknown_20375F8
ldr r7, _08070D10 @ =gPlttBufferFaded
_08070CD8:
movs r0, 0x1
ands r0, r1
@@ -1271,7 +1271,7 @@ _08070D0A:
pop {r0}
bx r0
.align 2, 0
_08070D10: .4byte gUnknown_20375F8
_08070D10: .4byte gPlttBufferFaded
thumb_func_end InvertPlttBuffer
thumb_func_start TintPlttBuffer
@@ -1308,7 +1308,7 @@ _08070D3E:
cmp r0, 0
beq _08070DC2
movs r4, 0
ldr r2, _08070DE0 @ =gUnknown_20375F8
ldr r2, _08070DE0 @ =gPlttBufferFaded
mov r8, r2
ldr r1, [sp]
lsls r0, r1, 24
@@ -1383,7 +1383,7 @@ _08070DD0:
pop {r0}
bx r0
.align 2, 0
_08070DE0: .4byte gUnknown_20375F8
_08070DE0: .4byte gPlttBufferFaded
_08070DE4: .4byte 0xfffffc1f
thumb_func_end TintPlttBuffer
@@ -1396,9 +1396,9 @@ UnfadePlttBuffer: @ 8070DE8
movs r3, 0
cmp r1, 0
beq _08070E32
ldr r0, _08070E3C @ =gUnknown_20375F8
ldr r0, _08070E3C @ =gPlttBufferFaded
mov r8, r0
ldr r0, _08070E40 @ =gUnknown_20371F8
ldr r0, _08070E40 @ =gPlttBufferUnfaded
mov r12, r0
_08070DFE:
movs r0, 0x1
@@ -1436,8 +1436,8 @@ _08070E32:
pop {r0}
bx r0
.align 2, 0
_08070E3C: .4byte gUnknown_20375F8
_08070E40: .4byte gUnknown_20371F8
_08070E3C: .4byte gPlttBufferFaded
_08070E40: .4byte gPlttBufferUnfaded
thumb_func_end UnfadePlttBuffer
thumb_func_start BeginFastPaletteFade
@@ -1445,7 +1445,7 @@ BeginFastPaletteFade: @ 8070E44
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r3, _08070E64 @ =gUnknown_2037AB8
ldr r3, _08070E64 @ =gPaletteFade
ldrb r2, [r3, 0xA]
movs r1, 0x79
negs r1, r1
@@ -1457,7 +1457,7 @@ BeginFastPaletteFade: @ 8070E44
pop {r0}
bx r0
.align 2, 0
_08070E64: .4byte gUnknown_2037AB8
_08070E64: .4byte gPaletteFade
thumb_func_end BeginFastPaletteFade
thumb_func_start BeginFastPaletteFadeInternal
@@ -1467,7 +1467,7 @@ BeginFastPaletteFadeInternal: @ 8070E68
lsls r0, 24
lsrs r0, 24
adds r4, r0, 0
ldr r2, _08070EDC @ =gUnknown_2037AB8
ldr r2, _08070EDC @ =gPaletteFade
ldrh r0, [r2, 0x4]
movs r3, 0xF8
lsls r3, 3
@@ -1498,7 +1498,7 @@ BeginFastPaletteFadeInternal: @ 8070E68
mov r1, sp
movs r0, 0
strh r0, [r1]
ldr r1, _08070EE0 @ =gUnknown_20375F8
ldr r1, _08070EE0 @ =gPlttBufferFaded
ldr r2, _08070EE4 @ =0x01000200
mov r0, sp
bl CpuSet
@@ -1510,7 +1510,7 @@ _08070EBA:
ldr r2, _08070EE8 @ =0x00007fff
adds r1, r2, 0
strh r1, [r0]
ldr r1, _08070EE0 @ =gUnknown_20375F8
ldr r1, _08070EE0 @ =gPlttBufferFaded
ldr r2, _08070EE4 @ =0x01000200
bl CpuSet
_08070ED0:
@@ -1520,8 +1520,8 @@ _08070ED0:
pop {r0}
bx r0
.align 2, 0
_08070EDC: .4byte gUnknown_2037AB8
_08070EE0: .4byte gUnknown_20375F8
_08070EDC: .4byte gPaletteFade
_08070EE0: .4byte gPlttBufferFaded
_08070EE4: .4byte 0x01000200
_08070EE8: .4byte 0x00007fff
thumb_func_end BeginFastPaletteFadeInternal
@@ -1534,7 +1534,7 @@ UpdateFastPaletteFade: @ 8070EEC
mov r5, r8
push {r5-r7}
sub sp, 0x8
ldr r4, _08070F08 @ =gUnknown_2037AB8
ldr r4, _08070F08 @ =gPaletteFade
ldrb r1, [r4, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1543,7 +1543,7 @@ UpdateFastPaletteFade: @ 8070EEC
movs r0, 0
b _08071246
.align 2, 0
_08070F08: .4byte gUnknown_2037AB8
_08070F08: .4byte gPaletteFade
_08070F0C:
bl IsSoftwarePaletteFadeFinishing
lsls r0, 24
@@ -1569,7 +1569,7 @@ _08070F30:
lsls r1, 1
mov r10, r1
_08070F38:
ldr r1, _08070F50 @ =gUnknown_2037AB8
ldr r1, _08070F50 @ =gPaletteFade
ldrb r0, [r1, 0x8]
lsls r0, 26
lsrs r0, 26
@@ -1581,7 +1581,7 @@ _08070F38:
beq _08070F62
b _08071148
.align 2, 0
_08070F50: .4byte gUnknown_2037AB8
_08070F50: .4byte gPaletteFade
_08070F54:
cmp r0, 0x2
bne _08070F5A
@@ -1599,7 +1599,7 @@ _08070F62:
b _08071148
_08070F6A:
lsls r2, r7, 1
ldr r0, _08070FF0 @ =gUnknown_20371F8
ldr r0, _08070FF0 @ =gPlttBufferUnfaded
adds r0, r2, r0
ldr r1, [r0]
lsls r3, r1, 27
@@ -1609,7 +1609,7 @@ _08070F6A:
lsls r1, 17
lsrs r1, 27
mov r8, r1
ldr r0, _08070FF4 @ =gUnknown_20375F8
ldr r0, _08070FF4 @ =gPlttBufferFaded
adds r2, r0
mov r9, r2
ldr r1, [r2]
@@ -1669,8 +1669,8 @@ _08070FD0:
bcc _08070F6A
b _08071148
.align 2, 0
_08070FF0: .4byte gUnknown_20371F8
_08070FF4: .4byte gUnknown_20375F8
_08070FF0: .4byte gPlttBufferUnfaded
_08070FF4: .4byte gPlttBufferFaded
_08070FF8:
adds r7, r2, 0
cmp r7, r10
@@ -1678,7 +1678,7 @@ _08070FF8:
b _08071148
_08071000:
lsls r1, r7, 1
ldr r0, _08071058 @ =gUnknown_20375F8
ldr r0, _08071058 @ =gPlttBufferFaded
adds r2, r1, r0
ldr r1, [r2]
lsls r0, r1, 27
@@ -1725,14 +1725,14 @@ _0807103A:
bcc _08071000
b _08071148
.align 2, 0
_08071058: .4byte gUnknown_20375F8
_08071058: .4byte gPlttBufferFaded
_0807105C:
adds r7, r2, 0
cmp r7, r10
bcs _08071148
_08071062:
lsls r2, r7, 1
ldr r0, _080710DC @ =gUnknown_20371F8
ldr r0, _080710DC @ =gPlttBufferUnfaded
adds r0, r2, r0
ldr r1, [r0]
lsls r3, r1, 27
@@ -1742,7 +1742,7 @@ _08071062:
lsls r1, 17
lsrs r1, 27
mov r8, r1
ldr r0, _080710E0 @ =gUnknown_20375F8
ldr r0, _080710E0 @ =gPlttBufferFaded
adds r2, r0
ldr r1, [r2]
lsls r0, r1, 27
@@ -1795,13 +1795,13 @@ _080710BC:
bcc _08071062
b _08071148
.align 2, 0
_080710DC: .4byte gUnknown_20371F8
_080710E0: .4byte gUnknown_20375F8
_080710DC: .4byte gPlttBufferUnfaded
_080710E0: .4byte gPlttBufferFaded
_080710E4:
adds r7, r2, 0
cmp r7, r10
bcs _08071148
ldr r4, _08071170 @ =gUnknown_20375F8
ldr r4, _08071170 @ =gPlttBufferFaded
mov r8, r4
_080710EE:
lsls r0, r7, 1
@@ -1853,7 +1853,7 @@ _0807112C:
cmp r7, r10
bcc _080710EE
_08071148:
ldr r0, _08071174 @ =gUnknown_2037AB8
ldr r0, _08071174 @ =gPaletteFade
ldrb r2, [r0, 0xA]
lsls r0, r2, 29
lsrs r0, 31
@@ -1864,7 +1864,7 @@ _08071148:
negs r3, r3
ands r3, r2
orrs r3, r1
ldr r1, _08071174 @ =gUnknown_2037AB8
ldr r1, _08071174 @ =gPaletteFade
strb r3, [r1, 0xA]
movs r0, 0x4
ands r0, r3
@@ -1873,10 +1873,10 @@ _08071148:
ldrb r0, [r1, 0x7]
b _08071244
.align 2, 0
_08071170: .4byte gUnknown_20375F8
_08071174: .4byte gUnknown_2037AB8
_08071170: .4byte gPlttBufferFaded
_08071174: .4byte gPaletteFade
_08071178:
ldr r2, _08071194 @ =gUnknown_2037AB8
ldr r2, _08071194 @ =gPaletteFade
ldrh r4, [r2, 0x4]
lsls r5, r4, 21
lsrs r0, r5, 27
@@ -1887,11 +1887,11 @@ _08071178:
bge _0807119C
ldr r0, _08071198 @ =0xfffff83f
ands r0, r4
ldr r3, _08071194 @ =gUnknown_2037AB8
ldr r3, _08071194 @ =gPaletteFade
strh r0, [r3, 0x4]
b _080711B2
.align 2, 0
_08071194: .4byte gUnknown_2037AB8
_08071194: .4byte gPaletteFade
_08071198: .4byte 0xfffff83f
_0807119C:
lsrs r1, r5, 27
@@ -1903,17 +1903,17 @@ _0807119C:
ldr r0, _080711D8 @ =0xfffff83f
ands r0, r4
orrs r0, r1
ldr r4, _080711DC @ =gUnknown_2037AB8
ldr r4, _080711DC @ =gPaletteFade
strh r0, [r4, 0x4]
_080711B2:
ldr r1, _080711DC @ =gUnknown_2037AB8
ldr r1, _080711DC @ =gPaletteFade
ldrh r0, [r1, 0x4]
movs r1, 0xF8
lsls r1, 3
ands r1, r0
cmp r1, 0
bne _08071240
ldr r2, _080711DC @ =gUnknown_2037AB8
ldr r2, _080711DC @ =gPaletteFade
ldrb r0, [r2, 0x8]
lsls r0, 26
lsrs r0, 26
@@ -1926,7 +1926,7 @@ _080711B2:
b _0807122C
.align 2, 0
_080711D8: .4byte 0xfffff83f
_080711DC: .4byte gUnknown_2037AB8
_080711DC: .4byte gPaletteFade
_080711E0:
cmp r0, 0x2
beq _080711EA
@@ -1934,35 +1934,35 @@ _080711E0:
beq _08071220
b _0807122C
_080711EA:
ldr r0, _080711F8 @ =gUnknown_20371F8
ldr r1, _080711FC @ =gUnknown_20375F8
ldr r0, _080711F8 @ =gPlttBufferUnfaded
ldr r1, _080711FC @ =gPlttBufferFaded
ldr r2, _08071200 @ =0x04000100
bl CpuSet
b _0807122C
.align 2, 0
_080711F8: .4byte gUnknown_20371F8
_080711FC: .4byte gUnknown_20375F8
_080711F8: .4byte gPlttBufferUnfaded
_080711FC: .4byte gPlttBufferFaded
_08071200: .4byte 0x04000100
_08071204:
movs r0, 0x1
negs r0, r0
str r0, [sp]
ldr r1, _08071218 @ =gUnknown_20375F8
ldr r1, _08071218 @ =gPlttBufferFaded
ldr r2, _0807121C @ =0x05000100
mov r0, sp
bl CpuSet
b _0807122C
.align 2, 0
_08071218: .4byte gUnknown_20375F8
_08071218: .4byte gPlttBufferFaded
_0807121C: .4byte 0x05000100
_08071220:
str r1, [sp, 0x4]
add r0, sp, 0x4
ldr r1, _08071258 @ =gUnknown_20375F8
ldr r1, _08071258 @ =gPlttBufferFaded
ldr r2, _0807125C @ =0x05000100
bl CpuSet
_0807122C:
ldr r2, _08071260 @ =gUnknown_2037AB8
ldr r2, _08071260 @ =gPaletteFade
ldrb r1, [r2, 0x9]
movs r0, 0x4
negs r0, r0
@@ -1973,7 +1973,7 @@ _0807122C:
orrs r0, r1
strb r0, [r2, 0xA]
_08071240:
ldr r3, _08071260 @ =gUnknown_2037AB8
ldr r3, _08071260 @ =gPaletteFade
ldrb r0, [r3, 0x7]
_08071244:
lsrs r0, 7
@@ -1987,9 +1987,9 @@ _08071246:
pop {r1}
bx r1
.align 2, 0
_08071258: .4byte gUnknown_20375F8
_08071258: .4byte gPlttBufferFaded
_0807125C: .4byte 0x05000100
_08071260: .4byte gUnknown_2037AB8
_08071260: .4byte gPaletteFade
thumb_func_end UpdateFastPaletteFade
thumb_func_start BeginHardwarePaletteFade
@@ -2006,7 +2006,7 @@ BeginHardwarePaletteFade: @ 8071264
lsrs r3, 24
lsls r5, 24
lsrs r5, 24
ldr r7, _080712EC @ =gUnknown_2037AB8
ldr r7, _080712EC @ =gPaletteFade
str r0, [r7]
movs r0, 0x3F
ands r1, r0
@@ -2062,7 +2062,7 @@ BeginHardwarePaletteFade: @ 8071264
ands r6, r0
b _080712F8
.align 2, 0
_080712EC: .4byte gUnknown_2037AB8
_080712EC: .4byte gPaletteFade
_080712F0: .4byte 0xfffff83f
_080712F4:
movs r0, 0x40
@@ -2077,7 +2077,7 @@ _080712F8:
thumb_func_start UpdateHardwarePaletteFade
UpdateHardwarePaletteFade: @ 8071300
push {r4-r7,lr}
ldr r2, _08071314 @ =gUnknown_2037AB8
ldr r2, _08071314 @ =gPaletteFade
ldrb r1, [r2, 0x7]
movs r0, 0x80
ands r0, r1
@@ -2087,7 +2087,7 @@ UpdateHardwarePaletteFade: @ 8071300
movs r0, 0
b _08071410
.align 2, 0
_08071314: .4byte gUnknown_2037AB8
_08071314: .4byte gPaletteFade
_08071318:
ldrb r2, [r4, 0x4]
lsls r1, r2, 26
@@ -2229,7 +2229,7 @@ _08071418: .4byte 0xfffff83f
thumb_func_start UpdateBlendRegisters
UpdateBlendRegisters: @ 807141C
push {r4,lr}
ldr r4, _08071468 @ =gUnknown_2037AB8
ldr r4, _08071468 @ =gPaletteFade
ldrh r1, [r4]
movs r0, 0x50
bl SetGpuReg
@@ -2265,14 +2265,14 @@ _08071460:
pop {r0}
bx r0
.align 2, 0
_08071468: .4byte gUnknown_2037AB8
_08071468: .4byte gPaletteFade
_0807146C: .4byte 0xfffff83f
thumb_func_end UpdateBlendRegisters
thumb_func_start IsSoftwarePaletteFadeFinishing
IsSoftwarePaletteFadeFinishing: @ 8071470
push {r4,lr}
ldr r3, _080714A8 @ =gUnknown_2037AB8
ldr r3, _080714A8 @ =gPaletteFade
ldrb r4, [r3, 0xA]
movs r0, 0x2
ands r0, r4
@@ -2300,7 +2300,7 @@ IsSoftwarePaletteFadeFinishing: @ 8071470
str r0, [r3, 0x8]
b _080714C4
.align 2, 0
_080714A8: .4byte gUnknown_2037AB8
_080714A8: .4byte gPaletteFade
_080714AC: .4byte 0xfffe0fff
_080714B0:
lsls r0, r2, 15
@@ -2371,8 +2371,8 @@ BlendPalettesUnfaded: @ 8071510
lsrs r4, 24
lsls r5, 16
lsrs r5, 16
ldr r0, _0807153C @ =gUnknown_20371F8
ldr r1, _08071540 @ =gUnknown_20375F8
ldr r0, _0807153C @ =gPlttBufferUnfaded
ldr r1, _08071540 @ =gPlttBufferFaded
movs r2, 0x80
lsls r2, 1
bl CpuFastSet
@@ -2384,8 +2384,8 @@ BlendPalettesUnfaded: @ 8071510
pop {r0}
bx r0
.align 2, 0
_0807153C: .4byte gUnknown_20371F8
_08071540: .4byte gUnknown_20375F8
_0807153C: .4byte gPlttBufferUnfaded
_08071540: .4byte gPlttBufferFaded
thumb_func_end BlendPalettesUnfaded
thumb_func_start TintPalette_GrayScale
asm/party_menu.s
+87 -87
View File
@@ -285,13 +285,13 @@ _0811EC8E:
b _0811EDFC
_0811EC94:
bl ResetPaletteFade
ldr r2, _0811ECA4 @ =gUnknown_2037AB8
ldr r2, _0811ECA4 @ =gPaletteFade
ldrb r0, [r2, 0x8]
movs r1, 0x80
orrs r0, r1
b _0811EDFA
.align 2, 0
_0811ECA4: .4byte gUnknown_2037AB8
_0811ECA4: .4byte gPaletteFade
_0811ECA8:
bl ResetSpriteData
b _0811EDFC
@@ -452,7 +452,7 @@ _0811EDDE:
movs r2, 0x10
movs r3, 0
bl BeginNormalPaletteFade
ldr r2, _0811EE0C @ =gUnknown_2037AB8
ldr r2, _0811EE0C @ =gPaletteFade
ldrb r1, [r2, 0x8]
movs r0, 0x7F
ands r0, r1
@@ -468,7 +468,7 @@ _0811EDFC:
strb r0, [r1]
b _0811EE2C
.align 2, 0
_0811EE0C: .4byte gUnknown_2037AB8
_0811EE0C: .4byte gPaletteFade
_0811EE10: .4byte gMain
_0811EE14:
ldr r0, _0811EE24 @ =sub_811EBBC
@@ -522,7 +522,7 @@ sub_811EE74: @ 811EE74
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _0811EEA0 @ =gUnknown_2037AB8
ldr r0, _0811EEA0 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -539,7 +539,7 @@ _0811EE98:
pop {r0}
bx r0
.align 2, 0
_0811EEA0: .4byte gUnknown_2037AB8
_0811EEA0: .4byte gPaletteFade
_0811EEA4: .4byte gUnknown_203B0A0
thumb_func_end sub_811EE74
@@ -681,7 +681,7 @@ _0811EFD4:
lsls r2, 1
movs r1, 0
bl LoadCompressedPalette
ldr r0, _0811EFF8 @ =gUnknown_20371F8
ldr r0, _0811EFF8 @ =gPlttBufferUnfaded
ldr r4, _0811EFFC @ =gUnknown_203B09C
ldr r1, [r4]
adds r1, 0x18
@@ -691,7 +691,7 @@ _0811EFD4:
b _0811F01A
.align 2, 0
_0811EFF4: .4byte gUnknown_8E829C8
_0811EFF8: .4byte gUnknown_20371F8
_0811EFF8: .4byte gPlttBufferUnfaded
_0811EFFC: .4byte gUnknown_203B09C
_0811F000:
movs r0, 0x4
@@ -739,7 +739,7 @@ sub_811F03C: @ 811F03C
push {r4,r5,lr}
adds r4, r0, 0
lsls r4, 28
ldr r5, _0811F068 @ =gUnknown_2037258
ldr r5, _0811F068 @ =gPlttBufferUnfaded + 0x60
lsrs r4, 23
adds r1, r5, 0
subs r1, 0x60
@@ -747,7 +747,7 @@ sub_811F03C: @ 811F03C
adds r0, r5, 0
movs r2, 0x10
bl CpuSet
ldr r0, _0811F06C @ =gUnknown_20375F8
ldr r0, _0811F06C @ =gPlttBufferFaded
adds r4, r0
adds r0, r5, 0
adds r1, r4, 0
@@ -757,8 +757,8 @@ sub_811F03C: @ 811F03C
pop {r0}
bx r0
.align 2, 0
_0811F068: .4byte gUnknown_2037258
_0811F06C: .4byte gUnknown_20375F8
_0811F068: .4byte gPlttBufferUnfaded + 0x60
_0811F06C: .4byte gPlttBufferFaded
thumb_func_end sub_811F03C
thumb_func_start sub_811F070
@@ -2092,7 +2092,7 @@ sub_811FAB4: @ 811FAB4
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r0, _0811FAE8 @ =gUnknown_2037AB8
ldr r0, _0811FAE8 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -2114,7 +2114,7 @@ _0811FAD6:
bl SetMainCallback2
b _0811FAFA
.align 2, 0
_0811FAE8: .4byte gUnknown_2037AB8
_0811FAE8: .4byte gPaletteFade
_0811FAEC: .4byte gUnknown_203B0A0
_0811FAF0: .4byte gUnknown_203B09C
_0811FAF4:
@@ -2156,7 +2156,7 @@ sub_811FB28: @ 811FB28
lsls r0, 24
lsrs r5, r0, 24
adds r6, r5, 0
ldr r0, _0811FB64 @ =gUnknown_2037AB8
ldr r0, _0811FB64 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -2180,7 +2180,7 @@ sub_811FB28: @ 811FB28
beq _0811FB6E
b _0811FB98
.align 2, 0
_0811FB64: .4byte gUnknown_2037AB8
_0811FB64: .4byte gPaletteFade
_0811FB68:
cmp r0, 0x8
beq _0811FB82
@@ -4413,7 +4413,7 @@ sub_8120C3C: @ 8120C3C
push {lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r0, _08120C60 @ =gUnknown_2037AB8
ldr r0, _08120C60 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -4430,7 +4430,7 @@ _08120C5C:
pop {r0}
bx r0
.align 2, 0
_08120C60: .4byte gUnknown_2037AB8
_08120C60: .4byte gPaletteFade
_08120C64: .4byte gTasks
_08120C68: .4byte sub_8120C6C
thumb_func_end sub_8120C3C
@@ -4471,7 +4471,7 @@ sub_8120CA8: @ 8120CA8
push {lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r0, _08120CCC @ =gUnknown_2037AB8
ldr r0, _08120CCC @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -4488,7 +4488,7 @@ _08120CC8:
pop {r0}
bx r0
.align 2, 0
_08120CCC: .4byte gUnknown_2037AB8
_08120CCC: .4byte gPaletteFade
_08120CD0: .4byte gTasks
_08120CD4: .4byte sub_8120CD8
thumb_func_end sub_8120CA8
@@ -4584,7 +4584,7 @@ sub_8120D7C: @ 8120D7C
push {lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r0, _08120DA0 @ =gUnknown_2037AB8
ldr r0, _08120DA0 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -4601,7 +4601,7 @@ _08120D9C:
pop {r0}
bx r0
.align 2, 0
_08120DA0: .4byte gUnknown_2037AB8
_08120DA0: .4byte gPaletteFade
_08120DA4: .4byte gTasks
_08120DA8: .4byte sub_8120DAC
thumb_func_end sub_8120D7C
@@ -4700,7 +4700,7 @@ sub_8120E58: @ 8120E58
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _08120E90 @ =gUnknown_2037AB8
ldr r0, _08120E90 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -4722,7 +4722,7 @@ sub_8120E58: @ 8120E58
bl sub_8121D0C
b _08120E9E
.align 2, 0
_08120E90: .4byte gUnknown_2037AB8
_08120E90: .4byte gPaletteFade
_08120E94: .4byte gUnknown_203B0A0
_08120E98:
movs r0, 0
@@ -4775,7 +4775,7 @@ sub_8120EE0: @ 8120EE0
lsls r0, 3
ldr r1, _08120F1C @ =gTasks+0x8
adds r6, r0, r1
ldr r0, _08120F20 @ =gUnknown_2037AB8
ldr r0, _08120F20 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -4798,7 +4798,7 @@ sub_8120EE0: @ 8120EE0
b _08120F62
.align 2, 0
_08120F1C: .4byte gTasks+0x8
_08120F20: .4byte gUnknown_2037AB8
_08120F20: .4byte gPaletteFade
_08120F24:
cmp r0, 0xF0
beq _08120F44
@@ -4919,7 +4919,7 @@ sub_8120FF0: @ 8120FF0
lsls r0, 3
ldr r1, _0812102C @ =gTasks+0x8
adds r4, r0, r1
ldr r0, _08121030 @ =gUnknown_2037AB8
ldr r0, _08121030 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -4941,7 +4941,7 @@ sub_8120FF0: @ 8120FF0
b _08121048
.align 2, 0
_0812102C: .4byte gTasks+0x8
_08121030: .4byte gUnknown_2037AB8
_08121030: .4byte gPaletteFade
_08121034:
ldr r0, _08121050 @ =gUnknown_203B09C
ldr r1, [r0]
@@ -8529,7 +8529,7 @@ sub_8122C5C: @ 8122C5C
push {r4-r7,lr}
lsls r0, 24
lsrs r6, r0, 24
ldr r0, _08122C94 @ =gUnknown_2037AB8
ldr r0, _08122C94 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -8553,7 +8553,7 @@ sub_8122C5C: @ 8122C5C
bl ProcessMenuInputNoWrapAround_other
b _08122CA4
.align 2, 0
_08122C94: .4byte gUnknown_2037AB8
_08122C94: .4byte gPaletteFade
_08122C98: .4byte gTasks+0x8
_08122C9C: .4byte gUnknown_203B09C
_08122CA0:
@@ -8697,7 +8697,7 @@ _08122DB8: .4byte sub_8122DBC
sub_8122DBC: @ 8122DBC
push {lr}
sub sp, 0xC
ldr r2, _08122DF4 @ =gUnknown_2037AB8
ldr r2, _08122DF4 @ =gPaletteFade
ldrb r0, [r2, 0x8]
movs r1, 0x80
orrs r0, r1
@@ -8722,7 +8722,7 @@ sub_8122DBC: @ 8122DBC
pop {r0}
bx r0
.align 2, 0
_08122DF4: .4byte gUnknown_2037AB8
_08122DF4: .4byte gPaletteFade
_08122DF8: .4byte gUnknown_203B0A0
_08122DFC: .4byte sub_8122C30
thumb_func_end sub_8122DBC
@@ -9986,7 +9986,7 @@ sub_8123824: @ 8123824
push {r7}
lsls r0, 24
lsrs r7, r0, 24
ldr r0, _0812388C @ =gUnknown_2037AB8
ldr r0, _0812388C @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -10031,7 +10031,7 @@ _08123880:
pop {r0}
bx r0
.align 2, 0
_0812388C: .4byte gUnknown_2037AB8
_0812388C: .4byte gPaletteFade
_08123890: .4byte gUnknown_203AD30
_08123894: .4byte gUnknown_203B0A0
_08123898: .4byte gPlayerParty
@@ -10044,7 +10044,7 @@ sub_81238A4: @ 81238A4
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _081238E4 @ =gUnknown_2037AB8
ldr r0, _081238E4 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -10073,7 +10073,7 @@ _081238DC:
pop {r0}
bx r0
.align 2, 0
_081238E4: .4byte gUnknown_2037AB8
_081238E4: .4byte gPaletteFade
_081238E8: .4byte gUnknown_203B0A0
_081238EC: .4byte gPlayerParty
_081238F0: .4byte gUnknown_203B0D8
@@ -10383,7 +10383,7 @@ sub_8123B78: @ 8123B78
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _08123BB0 @ =gUnknown_2037AB8
ldr r0, _08123BB0 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -10407,7 +10407,7 @@ sub_8123B78: @ 8123B78
bl sub_8120420
b _08123BD0
.align 2, 0
_08123BB0: .4byte gUnknown_2037AB8
_08123BB0: .4byte gPaletteFade
_08123BB4: .4byte gUnknown_203B0D8
_08123BB8: .4byte gUnknown_203B0A0
_08123BBC: .4byte gPlayerParty
@@ -10657,7 +10657,7 @@ _08123DC8: .4byte sub_8123DCC
sub_8123DCC: @ 8123DCC
push {lr}
sub sp, 0xC
ldr r2, _08123E00 @ =gUnknown_2037AB8
ldr r2, _08123E00 @ =gPaletteFade
ldrb r0, [r2, 0x8]
movs r1, 0x80
orrs r0, r1
@@ -10680,7 +10680,7 @@ sub_8123DCC: @ 8123DCC
pop {r0}
bx r0
.align 2, 0
_08123E00: .4byte gUnknown_2037AB8
_08123E00: .4byte gPaletteFade
_08123E04: .4byte gUnknown_203B0A0
_08123E08: .4byte sub_8122C30
thumb_func_end sub_8123DCC
@@ -11984,7 +11984,7 @@ task_launch_hm_phase_2: @ 81248C8
cmp r0, 0x1
bne _081248F4
bl brm_get_selected_species
ldr r1, _081248FC @ =gUnknown_20386E0
ldr r1, _081248FC @ =gFieldEffectArguments
lsls r0, 16
lsrs r0, 16
str r0, [r1]
@@ -11998,7 +11998,7 @@ _081248F4:
pop {r0}
bx r0
.align 2, 0
_081248FC: .4byte gUnknown_20386E0
_081248FC: .4byte gFieldEffectArguments
_08124900: .4byte gUnknown_203B0C4
thumb_func_end task_launch_hm_phase_2
@@ -12074,7 +12074,7 @@ _08124976:
hm_surf_run_dp02scr: @ 812497C
push {lr}
bl GetCursorSelectionMonId
ldr r1, _08124994 @ =gUnknown_20386E0
ldr r1, _08124994 @ =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r1]
@@ -12083,7 +12083,7 @@ hm_surf_run_dp02scr: @ 812497C
pop {r0}
bx r0
.align 2, 0
_08124994: .4byte gUnknown_20386E0
_08124994: .4byte gFieldEffectArguments
thumb_func_end hm_surf_run_dp02scr
thumb_func_start sub_8124998
@@ -12100,7 +12100,7 @@ sub_8124998: @ 8124998
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl MetatileBehavior_IsSemiDeepWater
@@ -12163,7 +12163,7 @@ _08124A24:
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl MetatileBehavior_IsSemiDeepWater
@@ -12250,7 +12250,7 @@ _08124AD8: .4byte sub_80568A8
hm2_waterfall: @ 8124ADC
push {lr}
bl GetCursorSelectionMonId
ldr r1, _08124AF4 @ =gUnknown_20386E0
ldr r1, _08124AF4 @ =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r1]
@@ -12259,7 +12259,7 @@ hm2_waterfall: @ 8124ADC
pop {r0}
bx r0
.align 2, 0
_08124AF4: .4byte gUnknown_20386E0
_08124AF4: .4byte gFieldEffectArguments
thumb_func_end hm2_waterfall
thumb_func_start hm_prepare_waterfall
@@ -12276,7 +12276,7 @@ hm_prepare_waterfall: @ 8124AF8
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r4, r2]
bl sub_8058F78
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl MetatileBehavior_IsWaterfall
@@ -12870,7 +12870,7 @@ sub_8124FC8: @ 8124FC8
push {lr}
lsls r0, 24
lsrs r3, r0, 24
ldr r0, _08125000 @ =gUnknown_2037AB8
ldr r0, _08125000 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -12896,7 +12896,7 @@ _08124FFA:
pop {r0}
bx r0
.align 2, 0
_08125000: .4byte gUnknown_2037AB8
_08125000: .4byte gPaletteFade
_08125004: .4byte gUnknown_203B0A0
_08125008: .4byte gUnknown_203B09C
_0812500C: .4byte sub_8128184
@@ -13647,7 +13647,7 @@ _08125620:
movs r0, 0xD
adds r2, r5, 0
muls r2, r0
ldr r0, _081256BC @ =gUnknown_8247094
ldr r0, _081256BC @ =gMoveNames
adds r2, r0
lsls r0, r6, 4
adds r0, 0x2
@@ -13697,7 +13697,7 @@ _08125680:
bx r0
.align 2, 0
_081256B8: .4byte gPlayerParty
_081256BC: .4byte gUnknown_8247094
_081256BC: .4byte gMoveNames
thumb_func_end sub_81255F0
thumb_func_start sub_81256C0
@@ -13974,7 +13974,7 @@ sub_8125898: @ 8125898
ldr r2, _08125944 @ =gStringVar1
movs r1, 0xD
muls r1, r0
ldr r0, _08125948 @ =gUnknown_8247094
ldr r0, _08125948 @ =gMoveNames
adds r1, r0
adds r0, r2, 0
bl StringCopy
@@ -14005,7 +14005,7 @@ _08125938: .4byte gUnknown_203AD30
_0812593C: .4byte gUnknown_203B0C0
_08125940: .4byte 0x0000ffff
_08125944: .4byte gStringVar1
_08125948: .4byte gUnknown_8247094
_08125948: .4byte gMoveNames
_0812594C: .4byte gStringVar4
_08125950: .4byte gTasks
_08125954: .4byte sub_81255BC
@@ -14076,7 +14076,7 @@ _081259A0:
ldr r0, _08125A28 @ =gStringVar1
movs r1, 0xD
muls r1, r4
ldr r2, _08125A2C @ =gUnknown_8247094
ldr r2, _08125A2C @ =gMoveNames
adds r1, r2
bl StringCopy
adds r0, r5, 0
@@ -14104,7 +14104,7 @@ _08125A1C: .4byte gUnknown_203B0C0
_08125A20: .4byte gPlayerParty
_08125A24: .4byte 0x0000ffff
_08125A28: .4byte gStringVar1
_08125A2C: .4byte gUnknown_8247094
_08125A2C: .4byte gMoveNames
_08125A30: .4byte gStringVar4
_08125A34: .4byte gTasks
_08125A38: .4byte sub_81255BC
@@ -14288,7 +14288,7 @@ sub_8125B40: @ 8125B40
ldrsh r2, [r7, r1]
movs r1, 0xD
muls r1, r2
ldr r2, _08125BE4 @ =gUnknown_8247094
ldr r2, _08125BE4 @ =gMoveNames
adds r1, r2
bl StringCopy
movs r0, 0
@@ -14328,7 +14328,7 @@ _08125BD4: .4byte gPlayerParty
_08125BD8: .4byte gUnknown_203AD30
_08125BDC: .4byte gStringVar1
_08125BE0: .4byte gStringVar2
_08125BE4: .4byte gUnknown_8247094
_08125BE4: .4byte gMoveNames
_08125BE8: .4byte 0x0000ffff
_08125BEC: .4byte gUnknown_3005E98
_08125BF0: .4byte sub_8125C38
@@ -14416,7 +14416,7 @@ _08125C84:
ldrsh r2, [r6, r1]
movs r1, 0xD
muls r1, r2
ldr r2, _08125CE0 @ =gUnknown_8247094
ldr r2, _08125CE0 @ =gMoveNames
adds r1, r2
bl StringCopy
ldr r4, _08125CE4 @ =gStringVar4
@@ -14444,7 +14444,7 @@ _08125CD0: .4byte gPlayerParty
_08125CD4: .4byte gUnknown_203AD30
_08125CD8: .4byte gStringVar1
_08125CDC: .4byte gStringVar2
_08125CE0: .4byte gUnknown_8247094
_08125CE0: .4byte gMoveNames
_08125CE4: .4byte gStringVar4
_08125CE8: .4byte gUnknown_8416DB3
_08125CEC: .4byte gTasks
@@ -14729,7 +14729,7 @@ sub_8125F14: @ 8125F14
lsls r0, 24
lsrs r4, r0, 24
adds r5, r4, 0
ldr r0, _08125F3C @ =gUnknown_2037AB8
ldr r0, _08125F3C @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -14744,7 +14744,7 @@ sub_8125F14: @ 8125F14
bl sub_8125FFC
b _08125F46
.align 2, 0
_08125F3C: .4byte gUnknown_2037AB8
_08125F3C: .4byte gPaletteFade
_08125F40:
adds r0, r5, 0
bl sub_81260D8
@@ -14806,7 +14806,7 @@ sub_8125F5C: @ 8125F5C
ldr r0, _08125FF4 @ =gStringVar2
movs r1, 0xD
muls r1, r4
ldr r2, _08125FF8 @ =gUnknown_8247094
ldr r2, _08125FF8 @ =gMoveNames
adds r1, r2
bl StringCopy
adds r0, r6, 0
@@ -14831,7 +14831,7 @@ _08125FE8: .4byte gPlayerParty
_08125FEC: .4byte gUnknown_203AD30
_08125FF0: .4byte gStringVar1
_08125FF4: .4byte gStringVar2
_08125FF8: .4byte gUnknown_8247094
_08125FF8: .4byte gMoveNames
thumb_func_end sub_8125F5C
thumb_func_start sub_8125FFC
@@ -14864,7 +14864,7 @@ sub_8125FFC: @ 8125FFC
ldr r0, _08126068 @ =gStringVar2
movs r1, 0xD
muls r1, r4
ldr r2, _0812606C @ =gUnknown_8247094
ldr r2, _0812606C @ =gMoveNames
adds r1, r2
bl StringCopy
ldr r0, _08126070 @ =gUnknown_8416EC6
@@ -14884,7 +14884,7 @@ _0812605C: .4byte gUnknown_203B0A0
_08126060: .4byte gPlayerParty
_08126064: .4byte gStringVar1
_08126068: .4byte gStringVar2
_0812606C: .4byte gUnknown_8247094
_0812606C: .4byte gMoveNames
_08126070: .4byte gUnknown_8416EC6
_08126074: .4byte gTasks
_08126078: .4byte sub_812607C
@@ -14945,7 +14945,7 @@ sub_81260D8: @ 81260D8
ldrsh r2, [r1, r3]
movs r1, 0xD
muls r1, r2
ldr r2, _08126128 @ =gUnknown_8247094
ldr r2, _08126128 @ =gMoveNames
adds r1, r2
bl StringCopy
ldr r4, _0812612C @ =gStringVar4
@@ -14970,7 +14970,7 @@ sub_81260D8: @ 81260D8
.align 2, 0
_08126120: .4byte gStringVar2
_08126124: .4byte gUnknown_203B0A0
_08126128: .4byte gUnknown_8247094
_08126128: .4byte gMoveNames
_0812612C: .4byte gStringVar4
_08126130: .4byte gUnknown_8416E6B
_08126134: .4byte gTasks
@@ -15044,7 +15044,7 @@ _081261AE:
ldrsh r2, [r7, r1]
movs r1, 0xD
muls r1, r2
ldr r2, _081261FC @ =gUnknown_8247094
ldr r2, _081261FC @ =gMoveNames
adds r1, r2
bl StringCopy
ldr r4, _08126200 @ =gStringVar4
@@ -15069,7 +15069,7 @@ _081261AE:
.align 2, 0
_081261F4: .4byte gStringVar1
_081261F8: .4byte gStringVar2
_081261FC: .4byte gUnknown_8247094
_081261FC: .4byte gMoveNames
_08126200: .4byte gStringVar4
_08126204: .4byte gUnknown_8416E84
_08126208: .4byte gTasks
@@ -15105,7 +15105,7 @@ _0812623A:
ldrsh r2, [r1, r3]
movs r1, 0xD
muls r1, r2
ldr r2, _0812627C @ =gUnknown_8247094
ldr r2, _0812627C @ =gMoveNames
adds r1, r2
bl StringCopy
ldr r0, _08126280 @ =gUnknown_8416DF7
@@ -15125,7 +15125,7 @@ _0812626A:
_08126270: .4byte gStringVar1
_08126274: .4byte gStringVar2
_08126278: .4byte gUnknown_203B0A0
_0812627C: .4byte gUnknown_8247094
_0812627C: .4byte gMoveNames
_08126280: .4byte gUnknown_8416DF7
_08126284: .4byte gTasks
_08126288: .4byte sub_8125D88
@@ -15754,7 +15754,7 @@ sub_8126770: @ 8126770
ldrh r2, [r6]
movs r1, 0xD
muls r1, r2
ldr r2, _081267F0 @ =gUnknown_8247094
ldr r2, _081267F0 @ =gMoveNames
adds r1, r2
bl StringCopy
ldr r4, _081267F4 @ =gStringVar4
@@ -15787,7 +15787,7 @@ _081267E0: .4byte gPlayerParty
_081267E4: .4byte gStringVar1
_081267E8: .4byte gStringVar2
_081267EC: .4byte gMoveToLearn
_081267F0: .4byte gUnknown_8247094
_081267F0: .4byte gMoveNames
_081267F4: .4byte gStringVar4
_081267F8: .4byte gUnknown_8416DF7
_081267FC: .4byte gTasks
@@ -15818,7 +15818,7 @@ sub_8126804: @ 8126804
ldr r0, _0812687C @ =gStringVar2
movs r1, 0xD
muls r1, r5
ldr r2, _08126880 @ =gUnknown_8247094
ldr r2, _08126880 @ =gMoveNames
adds r1, r2
bl StringCopy
ldr r4, _08126884 @ =gStringVar4
@@ -15849,7 +15849,7 @@ _08126870: .4byte gUnknown_203B0A0
_08126874: .4byte gPlayerParty
_08126878: .4byte gStringVar1
_0812687C: .4byte gStringVar2
_08126880: .4byte gUnknown_8247094
_08126880: .4byte gMoveNames
_08126884: .4byte gStringVar4
_08126888: .4byte gUnknown_8416DB3
_0812688C: .4byte gTasks
@@ -16528,7 +16528,7 @@ sub_8126DC8: @ 8126DC8
push {r7}
lsls r0, 24
lsrs r6, r0, 24
ldr r0, _08126E4C @ =gUnknown_2037AB8
ldr r0, _08126E4C @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -16556,7 +16556,7 @@ sub_8126DC8: @ 8126DC8
ldrsh r2, [r7, r1]
movs r1, 0xD
muls r1, r2
ldr r2, _08126E64 @ =gUnknown_8247094
ldr r2, _08126E64 @ =gMoveNames
adds r1, r2
bl StringCopy
movs r0, 0x2
@@ -16583,13 +16583,13 @@ sub_8126DC8: @ 8126DC8
bl sub_8125C48
b _08126E98
.align 2, 0
_08126E4C: .4byte gUnknown_2037AB8
_08126E4C: .4byte gPaletteFade
_08126E50: .4byte gUnknown_203B0A0
_08126E54: .4byte gPlayerParty
_08126E58: .4byte gStringVar1
_08126E5C: .4byte gSpecialVar_0x8005
_08126E60: .4byte gStringVar2
_08126E64: .4byte gUnknown_8247094
_08126E64: .4byte gMoveNames
_08126E68: .4byte 0xffff0000
_08126E6C:
ldr r1, _08126E70 @ =gUnknown_8416DC2
@@ -16813,7 +16813,7 @@ sub_812701C: @ 812701C
push {r7}
lsls r0, 24
lsrs r7, r0, 24
ldr r0, _08127084 @ =gUnknown_2037AB8
ldr r0, _08127084 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -16858,7 +16858,7 @@ _08127078:
pop {r0}
bx r0
.align 2, 0
_08127084: .4byte gUnknown_2037AB8
_08127084: .4byte gPaletteFade
_08127088: .4byte gUnknown_203B0A0
_0812708C: .4byte gPlayerParty
_08127090: .4byte gTasks
@@ -17010,7 +17010,7 @@ sub_81271C4: @ 81271C4
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _081271EC @ =gUnknown_2037AB8
ldr r0, _081271EC @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -17027,7 +17027,7 @@ sub_81271C4: @ 81271C4
bl sub_8120558
b _08127210
.align 2, 0
_081271EC: .4byte gUnknown_2037AB8
_081271EC: .4byte gPaletteFade
_081271F0: .4byte gUnknown_203B0D8
_081271F4: .4byte gUnknown_203B0A0
_081271F8:
@@ -19117,7 +19117,7 @@ sub_81281FC: @ 81281FC
lsls r0, 3
ldr r1, _08128270 @ =gTasks+0x8
adds r4, r0, r1
ldr r0, _08128274 @ =gUnknown_2037AB8
ldr r0, _08128274 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -19168,7 +19168,7 @@ _08128268:
bx r0
.align 2, 0
_08128270: .4byte gTasks+0x8
_08128274: .4byte gUnknown_2037AB8
_08128274: .4byte gPaletteFade
_08128278: .4byte gUnknown_2022B58
_0812827C: .4byte gUnknown_203B0B4
_08128280: .4byte gTasks
asm/pc_screen_effect.s
+6 -6
View File
@@ -226,7 +226,7 @@ _080A0BCC:
movs r1, 0
movs r2, 0
bl BlendPalettes
ldr r0, _080A0C0C @ =gUnknown_20375F8
ldr r0, _080A0C0C @ =gPlttBufferFaded
strh r5, [r0]
_080A0BF2:
ldrh r1, [r4, 0xE]
@@ -241,7 +241,7 @@ _080A0BF2:
ldrsh r0, [r4, r1]
b _080A0C54
.align 2, 0
_080A0C0C: .4byte gUnknown_20375F8
_080A0C0C: .4byte gPlttBufferFaded
_080A0C10:
ldrh r0, [r4, 0x12]
ldrh r1, [r4, 0xC]
@@ -326,11 +326,11 @@ _080A0CA0:
beq _080A0D54
b _080A0DA8
_080A0CAA:
ldr r0, _080A0CB0 @ =gUnknown_20375F8
ldr r0, _080A0CB0 @ =gPlttBufferFaded
strh r1, [r0]
b _080A0DCA
.align 2, 0
_080A0CB0: .4byte gUnknown_20375F8
_080A0CB0: .4byte gPlttBufferFaded
_080A0CB4:
movs r1, 0
strh r1, [r4, 0xE]
@@ -431,7 +431,7 @@ _080A0D72:
movs r1, 0x10
movs r2, 0
bl BlendPalettes
ldr r1, _080A0DA4 @ =gUnknown_20375F8
ldr r1, _080A0DA4 @ =gPlttBufferFaded
movs r0, 0
strh r0, [r1]
_080A0D88:
@@ -449,7 +449,7 @@ _080A0D88:
bne _080A0DD0
b _080A0DCA
.align 2, 0
_080A0DA4: .4byte gUnknown_20375F8
_080A0DA4: .4byte gPlttBufferFaded
_080A0DA8:
movs r1, 0x80
lsls r1, 6
asm/player_pc.s
+10 -10
View File
@@ -621,7 +621,7 @@ sub_80EBB70: @ 80EBB70
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _080EBBA4 @ =gUnknown_2037AB8
ldr r0, _080EBBA4 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -642,7 +642,7 @@ _080EBB9C:
pop {r0}
bx r0
.align 2, 0
_080EBBA4: .4byte gUnknown_2037AB8
_080EBBA4: .4byte gPaletteFade
_080EBBA8: .4byte c2_exit_to_overworld_2_switch
_080EBBAC: .4byte gUnknown_3005020
_080EBBB0: .4byte sub_80EBC0C
@@ -802,7 +802,7 @@ sub_80EBCD8: @ 80EBCD8
lsls r0, 3
ldr r1, _080EBD0C @ =gTasks+0x8
adds r5, r0, r1
ldr r0, _080EBD10 @ =gUnknown_2037AB8
ldr r0, _080EBD10 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -820,7 +820,7 @@ _080EBD06:
bx r0
.align 2, 0
_080EBD0C: .4byte gTasks+0x8
_080EBD10: .4byte gUnknown_2037AB8
_080EBD10: .4byte gPaletteFade
_080EBD14: .4byte c2_exit_to_overworld_2_switch
thumb_func_end sub_80EBCD8
@@ -1127,7 +1127,7 @@ sub_80EBF40: @ 80EBF40
mov r10, r0
mov r4, r9
add r4, r10
ldr r0, _080EBF98 @ =gUnknown_2037AB8
ldr r0, _080EBF98 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1153,7 +1153,7 @@ sub_80EBF40: @ 80EBF40
b _080EBFEA
.align 2, 0
_080EBF94: .4byte gTasks+0x8
_080EBF98: .4byte gUnknown_2037AB8
_080EBF98: .4byte gPaletteFade
_080EBF9C: .4byte gUnknown_203AAC6
_080EBFA0:
movs r0, 0x5
@@ -1431,7 +1431,7 @@ sub_80EC1D4: @ 80EC1D4
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _080EC21C @ =gUnknown_2037AB8
ldr r0, _080EC21C @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1462,7 +1462,7 @@ _080EC216:
pop {r0}
bx r0
.align 2, 0
_080EC21C: .4byte gUnknown_2037AB8
_080EC21C: .4byte gPaletteFade
_080EC220: .4byte gSaveBlock1Ptr
_080EC224: .4byte gUnknown_203AAC4
_080EC228: .4byte 0x00002cd0
@@ -1746,7 +1746,7 @@ sub_80EC444: @ 80EC444
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _080EC470 @ =gUnknown_2037AB8
ldr r0, _080EC470 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1762,7 +1762,7 @@ _080EC468:
pop {r0}
bx r0
.align 2, 0
_080EC470: .4byte gUnknown_2037AB8
_080EC470: .4byte gPaletteFade
thumb_func_end sub_80EC444
thumb_func_start sub_80EC474
asm/pokedex_screen.s
+14 -14
View File
@@ -18,7 +18,7 @@ sub_81024C0: @ 81024C0
thumb_func_start sub_81024D4
sub_81024D4: @ 81024D4
push {lr}
ldr r0, _08102500 @ =gUnknown_2037AB8
ldr r0, _08102500 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -35,7 +35,7 @@ _081024EC:
bl BuildOamBuffer
b _08102508
.align 2, 0
_08102500: .4byte gUnknown_2037AB8
_08102500: .4byte gPaletteFade
_08102504:
bl UpdatePaletteFade
_08102508:
@@ -194,7 +194,7 @@ _081025AE:
movs r1, 0
movs r2, 0
bl ChangeBgY
ldr r2, _081026BC @ =gUnknown_2037AB8
ldr r2, _081026BC @ =gPaletteFade
ldrb r0, [r2, 0x8]
movs r1, 0x80
orrs r0, r1
@@ -214,7 +214,7 @@ _081026AC: .4byte sub_81024C0
_081026B0: .4byte sub_810287C
_081026B4: .4byte gUnknown_203ACF0
_081026B8: .4byte gUnknown_8451EE4
_081026BC: .4byte gUnknown_2037AB8
_081026BC: .4byte gPaletteFade
_081026C0: .4byte gUnknown_84406E0
_081026C4:
ldr r0, _08102758 @ =gUnknown_84404C8
@@ -354,7 +354,7 @@ _081027D4:
movs r0, 0
b _0810284C
_081027D8:
ldr r0, _081027E8 @ =gUnknown_2037AB8
ldr r0, _081027E8 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -363,7 +363,7 @@ _081027D8:
movs r0, 0x2
b _081027D2
.align 2, 0
_081027E8: .4byte gUnknown_2037AB8
_081027E8: .4byte gPaletteFade
_081027EC:
bl UpdatePaletteFade
b _081027D4
@@ -549,7 +549,7 @@ _08102964:
bl ShowBg
movs r0, 0
bl ShowBg
ldr r2, _081029A4 @ =gUnknown_2037AB8
ldr r2, _081029A4 @ =gPaletteFade
ldrb r1, [r2, 0x8]
movs r0, 0x80
ands r0, r1
@@ -568,7 +568,7 @@ _08102964:
bl BeginNormalPaletteFade
b _081029BC
.align 2, 0
_081029A4: .4byte gUnknown_2037AB8
_081029A4: .4byte gPaletteFade
_081029A8: .4byte 0x0000ffff
_081029AC:
ldr r0, _081029C4 @ =0xffff7fff
@@ -5856,7 +5856,7 @@ _08105506:
.align 2, 0
_08105524: .4byte 0x00007fff
_08105528:
ldr r2, _08105554 @ =gUnknown_2037AB8
ldr r2, _08105554 @ =gPaletteFade
ldrb r0, [r2, 0x8]
movs r1, 0x80
orrs r0, r1
@@ -5875,10 +5875,10 @@ _08105528:
adds r0, 0x1
b _0810557A
.align 2, 0
_08105554: .4byte gUnknown_2037AB8
_08105554: .4byte gPaletteFade
_08105558: .4byte gUnknown_203ACF0
_0810555C:
ldr r2, _08105588 @ =gUnknown_2037AB8
ldr r2, _08105588 @ =gPaletteFade
ldrb r1, [r2, 0x8]
movs r0, 0x7F
ands r0, r1
@@ -5903,7 +5903,7 @@ _0810557E:
pop {r1}
bx r1
.align 2, 0
_08105588: .4byte gUnknown_2037AB8
_08105588: .4byte gPaletteFade
_0810558C: .4byte 0x00007fff
_08105590: .4byte gUnknown_203ACF0
thumb_func_end sub_81052D0
@@ -8765,7 +8765,7 @@ _08106C98:
.align 2, 0
_08106CD0: .4byte gUnknown_203ACF0
_08106CD4:
ldr r2, _08106D10 @ =gUnknown_2037AB8
ldr r2, _08106D10 @ =gPaletteFade
ldrb r1, [r2, 0x8]
movs r0, 0x7F
ands r0, r1
@@ -8791,7 +8791,7 @@ _08106CD4:
movs r0, 0x5
b _08106E68
.align 2, 0
_08106D10: .4byte gUnknown_2037AB8
_08106D10: .4byte gPaletteFade
_08106D14: .4byte 0x0000ffff
_08106D18: .4byte gUnknown_203ACF0
_08106D1C:
asm/pokemon_size_record.s
+4 -4
View File
@@ -327,7 +327,7 @@ _080A0914: .4byte 0x0000403d
sub_80A0918: @ 80A0918
push {lr}
ldr r0, _080A092C @ =0x0000403d
bl sub_806E454
bl GetVarPointer
adds r1, r0, 0
movs r0, 0xD6
bl sub_80A08CC
@@ -341,7 +341,7 @@ _080A092C: .4byte 0x0000403d
sub_80A0930: @ 80A0930
push {r4,lr}
ldr r0, _080A0950 @ =0x0000403d
bl sub_806E454
bl GetVarPointer
adds r1, r0, 0
ldr r4, _080A0954 @ =gUnknown_20370D0
movs r0, 0xD6
@@ -373,7 +373,7 @@ _080A0968: .4byte 0x00004040
sub_80A096C: @ 80A096C
push {lr}
ldr r0, _080A0980 @ =0x00004040
bl sub_806E454
bl GetVarPointer
adds r1, r0, 0
movs r0, 0x81
bl sub_80A08CC
@@ -387,7 +387,7 @@ _080A0980: .4byte 0x00004040
sub_80A0984: @ 80A0984
push {r4,lr}
ldr r0, _080A09A4 @ =0x00004040
bl sub_806E454
bl GetVarPointer
adds r1, r0, 0
ldr r4, _080A09A8 @ =gUnknown_20370D0
movs r0, 0x81
asm/pokemon_special_anim.s
+18 -18
View File
@@ -50,7 +50,7 @@ _0811C58C:
adds r0, 0x77
movs r1, 0xD
muls r1, r6
ldr r2, _0811C5A8 @ =gUnknown_8247094
ldr r2, _0811C5A8 @ =gMoveNames
adds r1, r2
bl StringCopy
adds r0, r4, 0
@@ -60,7 +60,7 @@ _0811C5A2:
pop {r0}
bx r0
.align 2, 0
_0811C5A8: .4byte gUnknown_8247094
_0811C5A8: .4byte gMoveNames
thumb_func_end sub_811C568
thumb_func_start sub_811C5AC
@@ -194,7 +194,7 @@ _0811C628:
adds r2, 0x84
movs r1, 0xD
muls r1, r0
ldr r0, _0811C6E4 @ =gUnknown_8247094
ldr r0, _0811C6E4 @ =gMoveNames
adds r1, r0
adds r0, r2, 0
bl StringCopy
@@ -209,7 +209,7 @@ _0811C6D2:
bx r1
.align 2, 0
_0811C6E0: .4byte gPlayerParty
_0811C6E4: .4byte gUnknown_8247094
_0811C6E4: .4byte gMoveNames
thumb_func_end sub_811C5D4
thumb_func_start sub_811C6E8
@@ -580,7 +580,7 @@ _0811C9E0:
strh r0, [r5]
b _0811CA16
_0811C9E8:
ldr r0, _0811C9FC @ =gUnknown_2037AB8
ldr r0, _0811C9FC @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -593,7 +593,7 @@ _0811C9F4:
strh r0, [r5]
b _0811CA16
.align 2, 0
_0811C9FC: .4byte gUnknown_2037AB8
_0811C9FC: .4byte gPaletteFade
_0811CA00:
ldr r0, [r4, 0x4]
bl SetMainCallback2
@@ -686,7 +686,7 @@ _0811CAAE:
.align 2, 0
_0811CAD0: .4byte sub_811C6E8
_0811CAD4:
ldr r0, _0811CAF0 @ =gUnknown_2037AB8
ldr r0, _0811CAF0 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -700,7 +700,7 @@ _0811CAD4:
subs r1, 0xC
b _0811CBC6
.align 2, 0
_0811CAF0: .4byte gUnknown_2037AB8
_0811CAF0: .4byte gPaletteFade
_0811CAF4:
adds r1, r5, 0
adds r1, 0x9E
@@ -908,7 +908,7 @@ _0811CC7C:
.align 2, 0
_0811CCA8: .4byte sub_811C6E8
_0811CCAC:
ldr r0, _0811CCBC @ =gUnknown_2037AB8
ldr r0, _0811CCBC @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -916,7 +916,7 @@ _0811CCAC:
bne _0811CD5A
b _0811CD2A
.align 2, 0
_0811CCBC: .4byte gUnknown_2037AB8
_0811CCBC: .4byte gPaletteFade
_0811CCC0:
adds r0, r5, 0
adds r0, 0x9C
@@ -977,7 +977,7 @@ _0811CD2A:
.align 2, 0
_0811CD34: .4byte gMain
_0811CD38:
ldr r0, _0811CD64 @ =gUnknown_2037AB8
ldr r0, _0811CD64 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -996,7 +996,7 @@ _0811CD5A:
pop {r0}
bx r0
.align 2, 0
_0811CD64: .4byte gUnknown_2037AB8
_0811CD64: .4byte gPaletteFade
thumb_func_end sub_811CBE4
thumb_func_start sub_811CD68
@@ -1073,7 +1073,7 @@ _0811CDD2:
.align 2, 0
_0811CDFC: .4byte sub_811C6E8
_0811CE00:
ldr r0, _0811CE20 @ =gUnknown_2037AB8
ldr r0, _0811CE20 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1090,7 +1090,7 @@ _0811CE16:
strh r0, [r4]
b _0811CE3E
.align 2, 0
_0811CE20: .4byte gUnknown_2037AB8
_0811CE20: .4byte gPaletteFade
_0811CE24:
adds r1, r5, 0
adds r1, 0x9E
@@ -1290,7 +1290,7 @@ _0811CFA8:
.align 2, 0
_0811CFC4: .4byte sub_811C6E8
_0811CFC8:
ldr r0, _0811D010 @ =gUnknown_2037AB8
ldr r0, _0811D010 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1323,7 +1323,7 @@ _0811D008:
pop {r0}
bx r0
.align 2, 0
_0811D010: .4byte gUnknown_2037AB8
_0811D010: .4byte gPaletteFade
_0811D014: .4byte gUnknown_203B090
thumb_func_end sub_811CF88
@@ -2020,7 +2020,7 @@ _0811D546:
strh r0, [r4]
b _0811D594
_0811D57E:
ldr r0, _0811D590 @ =gUnknown_2037AB8
ldr r0, _0811D590 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -2029,7 +2029,7 @@ _0811D57E:
movs r0, 0
b _0811D596
.align 2, 0
_0811D590: .4byte gUnknown_2037AB8
_0811D590: .4byte gPaletteFade
_0811D594:
movs r0, 0x1
_0811D596:
asm/pokemon_storage_system.s
+8 -8
View File
@@ -1731,7 +1731,7 @@ _0808C66E:
.align 2, 0
_0808C67C: .4byte gUnknown_83CDA20
_0808C680:
ldr r0, _0808C6A4 @ =gUnknown_2037AB8
ldr r0, _0808C6A4 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1748,7 +1748,7 @@ _0808C69C:
pop {r0}
bx r0
.align 2, 0
_0808C6A4: .4byte gUnknown_2037AB8
_0808C6A4: .4byte gPaletteFade
thumb_func_end c3_0808C39C
thumb_func_start sub_808C6A8
@@ -12030,7 +12030,7 @@ _08091924:
adds r1, r2
ldrb r1, [r1]
lsls r1, 6
ldr r2, _08091964 @ =gUnknown_2037278
ldr r2, _08091964 @ =gPlttBufferUnfaded + 0x80
adds r1, r2
movs r2, 0x20
bl CpuSet
@@ -12055,7 +12055,7 @@ _08091938:
bx r0
.align 2, 0
_08091960: .4byte 0x000002d2
_08091964: .4byte gUnknown_2037278
_08091964: .4byte gPlttBufferUnfaded + 0x80
_08091968: .4byte gUnknown_20397B0
thumb_func_end sub_8091850
@@ -12786,7 +12786,7 @@ sub_8091EF0: @ 8091EF0
adds r1, r2, r3
ldrh r1, [r1]
lsls r1, 1
ldr r2, _08091F34 @ =gUnknown_20371F8
ldr r2, _08091F34 @ =gPlttBufferUnfaded
adds r1, r2
movs r2, 0x2
bl CpuSet
@@ -12794,7 +12794,7 @@ sub_8091EF0: @ 8091EF0
.align 2, 0
_08091F2C: .4byte gUnknown_20397B0
_08091F30: .4byte gUnknown_83D29D0
_08091F34: .4byte gUnknown_20371F8
_08091F34: .4byte gPlttBufferUnfaded
_08091F38:
lsls r0, r1, 2
ldr r1, _08091F54 @ =gUnknown_83D29D0
@@ -12803,7 +12803,7 @@ _08091F38:
adds r1, r2, r3
ldrh r1, [r1]
lsls r1, 1
ldr r2, _08091F5C @ =gUnknown_20371F8
ldr r2, _08091F5C @ =gPlttBufferUnfaded
adds r1, r2
movs r2, 0x2
bl CpuSet
@@ -12813,7 +12813,7 @@ _08091F50:
.align 2, 0
_08091F54: .4byte gUnknown_83D29D0
_08091F58: .4byte 0x0000071e
_08091F5C: .4byte gUnknown_20371F8
_08091F5C: .4byte gPlttBufferUnfaded
thumb_func_end sub_8091EF0
thumb_func_start sub_8091F60
asm/pokemon_summary_screen.s
+10 -10
View File
@@ -463,7 +463,7 @@ _08134890:
.align 2, 0
_081348A8: .4byte gUnknown_203B140
_081348AC:
ldr r0, _081348C8 @ =gUnknown_2037AB8
ldr r0, _081348C8 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -476,7 +476,7 @@ _081348AC:
adds r0, r2
b _08134AF6
.align 2, 0
_081348C8: .4byte gUnknown_2037AB8
_081348C8: .4byte gPaletteFade
_081348CC: .4byte gUnknown_203B140
_081348D0: .4byte 0x00003270
_081348D4:
@@ -803,7 +803,7 @@ _08134B60:
_08134B80: .4byte gUnknown_203B140
_08134B84: .4byte 0x00003270
_08134B88:
ldr r0, _08134BA8 @ =gUnknown_2037AB8
ldr r0, _08134BA8 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -819,7 +819,7 @@ _08134B9A:
pop {r0}
bx r0
.align 2, 0
_08134BA8: .4byte gUnknown_2037AB8
_08134BA8: .4byte gPaletteFade
thumb_func_end sub_8134840
thumb_func_start sub_8134BAC
@@ -4241,7 +4241,7 @@ _081368B0:
adds r0, r1
ldrh r1, [r3]
muls r1, r2
ldr r2, _0813695C @ =gUnknown_8247094
ldr r2, _0813695C @ =gMoveNames
adds r1, r2
bl StringCopy
cmp r7, 0x3
@@ -4292,7 +4292,7 @@ _0813694C: .4byte 0x0000324e
_08136950: .4byte gBattleMoves
_08136954: .4byte 0x00003258
_08136958: .4byte 0x00003128
_0813695C: .4byte gUnknown_8247094
_0813695C: .4byte gMoveNames
_08136960: .4byte 0x00003208
_08136964: .4byte 0x000030b8
_08136968: .4byte 0x000030f0
@@ -9566,7 +9566,7 @@ _08139420:
_0813943C: .4byte gUnknown_203B140
_08139440: .4byte 0x00003288
_08139444:
ldr r0, _08139460 @ =gUnknown_2037AB8
ldr r0, _08139460 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -9581,7 +9581,7 @@ _08139452:
adds r1, r0
b _08139728
.align 2, 0
_08139460: .4byte gUnknown_2037AB8
_08139460: .4byte gPaletteFade
_08139464: .4byte gUnknown_203B140
_08139468: .4byte 0x00003288
_0813946C:
@@ -9926,7 +9926,7 @@ _08139738:
.align 2, 0
_08139744: .4byte gUnknown_203B16D
_08139748:
ldr r0, _08139764 @ =gUnknown_2037AB8
ldr r0, _08139764 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -9940,7 +9940,7 @@ _0813975A:
pop {r0}
bx r0
.align 2, 0
_08139764: .4byte gUnknown_2037AB8
_08139764: .4byte gPaletteFade
thumb_func_end sub_81393D4
thumb_func_start sub_8139768
asm/quest_log.s
-10369
View File
File diff suppressed because it is too large Load Diff
asm/quest_log_8150454.s
-482
View File
@@ -1,482 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_8150454
sub_8150454: @ 8150454
push {lr}
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x8
bhi _0815046A
ldr r0, _08150470 @ =gUnknown_8471EDC
lsls r1, 2
adds r1, r0
ldr r0, [r1]
bl _call_via_r0
_0815046A:
pop {r0}
bx r0
.align 2, 0
_08150470: .4byte gUnknown_8471EDC
thumb_func_end sub_8150454
thumb_func_start sub_8150474
sub_8150474: @ 8150474
push {lr}
lsls r0, 24
lsrs r1, r0, 24
ldr r0, _08150488 @ =gUnknown_3005E88
ldrb r0, [r0]
cmp r0, 0x2
beq _0815048C
movs r0, 0
b _08150494
.align 2, 0
_08150488: .4byte gUnknown_3005E88
_0815048C:
adds r0, r1, 0
bl sub_8112720
movs r0, 0x1
_08150494:
pop {r1}
bx r1
thumb_func_end sub_8150474
thumb_func_start sub_8150498
sub_8150498: @ 8150498
push {lr}
lsls r0, 24
lsrs r0, 24
bl sub_8150454
pop {r0}
bx r0
thumb_func_end sub_8150498
thumb_func_start sub_81504A8
sub_81504A8: @ 81504A8
push {r4,lr}
ldr r0, _081504E0 @ =gUnknown_2037078
ldrb r0, [r0, 0x5]
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _081504E4 @ =gMapObjects
adds r4, r0
movs r0, 0
bl sub_805C808
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_81507BC
ldrb r1, [r4, 0x18]
lsrs r1, 4
adds r0, r4, 0
bl FieldObjectTurn
movs r0, 0x1
bl SetPlayerAvatarStateMask
pop {r4}
pop {r0}
bx r0
.align 2, 0
_081504E0: .4byte gUnknown_2037078
_081504E4: .4byte gMapObjects
thumb_func_end sub_81504A8
thumb_func_start sub_81504E8
sub_81504E8: @ 81504E8
push {r4,lr}
ldr r0, _08150528 @ =gUnknown_2037078
ldrb r0, [r0, 0x5]
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _0815052C @ =gMapObjects
adds r4, r0
movs r0, 0x1
bl sub_805C808
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_81507BC
ldrb r1, [r4, 0x18]
lsrs r1, 4
adds r0, r4, 0
bl FieldObjectTurn
movs r0, 0x2
bl SetPlayerAvatarStateMask
movs r0, 0
movs r1, 0
bl sub_80BD620
pop {r4}
pop {r0}
bx r0
.align 2, 0
_08150528: .4byte gUnknown_2037078
_0815052C: .4byte gMapObjects
thumb_func_end sub_81504E8
thumb_func_start sub_8150530
sub_8150530: @ 8150530
push {r4-r6,lr}
ldr r6, _0815057C @ =gUnknown_2037078
ldrb r1, [r6, 0x5]
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08150580 @ =gMapObjects
adds r4, r0, r1
ldrb r1, [r4, 0x4]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, _08150584 @ =gSprites
adds r5, r0, r1
ldr r0, _08150588 @ =gUnknown_3005E88
ldrb r0, [r0]
cmp r0, 0x1
beq _08150558
cmp r0, 0x3
bne _08150594
_08150558:
bl ScriptContext2_Enable
movs r4, 0
movs r0, 0x1
strb r0, [r6, 0x6]
ldr r0, _0815058C @ =sub_81505C4
movs r1, 0xFF
bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08150590 @ =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r1, r2
strh r4, [r1, 0x8]
b _081505BC
.align 2, 0
_0815057C: .4byte gUnknown_2037078
_08150580: .4byte gMapObjects
_08150584: .4byte gSprites
_08150588: .4byte gUnknown_3005E88
_0815058C: .4byte sub_81505C4
_08150590: .4byte gTasks
_08150594:
movs r0, 0x4
bl sub_805C808
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_81507BC
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
bl sub_80634F0
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
bl StartSpriteAnim
_081505BC:
pop {r4-r6}
pop {r0}
bx r0
thumb_func_end sub_8150530
thumb_func_start sub_81505C4
sub_81505C4: @ 81505C4
push {r4-r7,lr}
mov r7, r9
mov r6, r8
push {r6,r7}
lsls r0, 24
lsrs r0, 24
mov r8, r0
ldr r0, _0815060C @ =gUnknown_2037078
mov r9, r0
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08150610 @ =gMapObjects
adds r5, r0, r1
ldrb r1, [r5, 0x4]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, _08150614 @ =gSprites
adds r7, r0, r1
ldr r1, _08150618 @ =gTasks
mov r2, r8
lsls r0, r2, 2
add r0, r8
lsls r0, 3
adds r4, r0, r1
movs r0, 0x8
ldrsh r6, [r4, r0]
cmp r6, 0x1
beq _08150666
cmp r6, 0x1
bgt _0815061C
cmp r6, 0
beq _08150626
b _081506FC
.align 2, 0
_0815060C: .4byte gUnknown_2037078
_08150610: .4byte gMapObjects
_08150614: .4byte gSprites
_08150618: .4byte gTasks
_0815061C:
cmp r6, 0x2
beq _0815067C
cmp r6, 0x3
beq _0815069C
b _081506FC
_08150626:
adds r0, r5, 0
bl FieldObjectClearAnimIfSpecialAnimActive
ldrb r0, [r5, 0x1]
movs r1, 0x8
orrs r0, r1
strb r0, [r5, 0x1]
movs r0, 0x4
bl sub_805C808
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
bl sub_81507BC
ldrb r0, [r5, 0x18]
lsls r0, 28
lsrs r0, 28
bl sub_80634F0
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r7, 0
bl StartSpriteAnim
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
strh r6, [r4, 0xA]
b _081506FC
_08150666:
adds r0, r7, 0
bl sub_805D9C4
ldrh r1, [r4, 0xA]
movs r2, 0xA
ldrsh r0, [r4, r2]
cmp r0, 0x3B
bgt _08150694
adds r0, r1, 0x1
strh r0, [r4, 0xA]
b _081506FC
_0815067C:
bl player_get_direction_lower_nybble
lsls r0, 24
lsrs r0, 24
bl sub_8063500
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r7, 0
bl StartSpriteAnim
_08150694:
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
b _081506FC
_0815069C:
adds r0, r7, 0
bl sub_805D9C4
adds r0, r7, 0
adds r0, 0x3F
ldrb r1, [r0]
movs r0, 0x10
ands r0, r1
cmp r0, 0
beq _081506FC
mov r0, r9
ldrb r1, [r0]
movs r0, 0x8
ands r0, r1
cmp r0, 0
bne _081506D0
movs r0, 0
bl sub_805C808
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
bl sub_81507BC
b _081506E2
_081506D0:
movs r0, 0x2
bl sub_805C808
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
bl sub_81507BC
_081506E2:
ldrb r1, [r5, 0x18]
lsrs r1, 4
adds r0, r5, 0
bl FieldObjectTurn
movs r0, 0
strh r0, [r7, 0x24]
strh r0, [r7, 0x26]
bl ScriptContext2_Disable
mov r0, r8
bl DestroyTask
_081506FC:
pop {r3,r4}
mov r8, r3
mov r9, r4
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_81505C4
thumb_func_start sub_8150708
sub_8150708: @ 8150708
push {r4,r5,lr}
ldr r5, _08150770 @ =gUnknown_2037078
ldrb r1, [r5, 0x5]
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08150774 @ =gMapObjects
adds r4, r0, r1
ldrb r1, [r5]
movs r0, 0x8
ands r0, r1
cmp r0, 0
bne _08150768
movs r0, 0x2
bl sub_805C808
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_81507BC
ldrb r1, [r4, 0x18]
lsrs r1, 4
adds r0, r4, 0
bl FieldObjectTurn
movs r0, 0x8
bl SetPlayerAvatarStateMask
ldr r1, _08150778 @ =gUnknown_20386E0
movs r2, 0x10
ldrsh r0, [r4, r2]
str r0, [r1]
movs r2, 0x12
ldrsh r0, [r4, r2]
str r0, [r1, 0x4]
ldrb r0, [r5, 0x5]
str r0, [r1, 0x8]
movs r0, 0x8
bl FieldEffectStart
lsls r0, 24
lsrs r0, 24
strb r0, [r4, 0x1A]
movs r1, 0x1
bl sub_80DC44C
_08150768:
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_08150770: .4byte gUnknown_2037078
_08150774: .4byte gMapObjects
_08150778: .4byte gUnknown_20386E0
thumb_func_end sub_8150708
thumb_func_start sub_815077C
sub_815077C: @ 815077C
push {lr}
movs r0, 0x41
bl FieldEffectStart
ldr r0, _08150790 @ =sub_8150794
movs r1, 0
bl CreateTask
pop {r0}
bx r0
.align 2, 0
_08150790: .4byte sub_8150794
thumb_func_end sub_815077C
thumb_func_start sub_8150794
sub_8150794: @ 8150794
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0x41
bl FieldEffectActiveListContains
lsls r0, 24
cmp r0, 0
bne _081507B4
bl UnfreezeMapObjects
bl ScriptContext2_Disable
adds r0, r4, 0
bl DestroyTask
_081507B4:
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_8150794
thumb_func_start sub_81507BC
sub_81507BC: @ 81507BC
push {lr}
lsls r1, 24
lsrs r1, 24
bl sub_805F060
pop {r0}
bx r0
thumb_func_end sub_81507BC
thumb_func_start sub_81507CC
sub_81507CC: @ 81507CC
push {lr}
movs r0, 0x1
bl sub_805D154
pop {r0}
bx r0
thumb_func_end sub_81507CC
thumb_func_start sub_81507D8
sub_81507D8: @ 81507D8
push {lr}
movs r0, 0x2
bl sub_805D154
pop {r0}
bx r0
thumb_func_end sub_81507D8
thumb_func_start sub_81507E4
sub_81507E4: @ 81507E4
push {lr}
movs r0, 0x3
bl sub_805D154
pop {r0}
bx r0
thumb_func_end sub_81507E4
thumb_func_start sub_81507F0
sub_81507F0: @ 81507F0
push {lr}
movs r0, 0x4
bl sub_805D154
pop {r0}
bx r0
thumb_func_end sub_81507F0
.align 2, 0 @ Don't pad with nop.
asm/quest_log_battle.s
-474
View File
@@ -1,474 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_812BFDC
sub_812BFDC: @ 812BFDC
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
ldr r4, _0812C03C @ =gBattleTypeFlags
ldr r0, [r4]
ldr r1, _0812C040 @ =0x00010202
ands r0, r1
cmp r0, 0
beq _0812BFF4
b _0812C212
_0812BFF4:
ldr r5, _0812C044 @ =gUnknown_2023E8A
ldrb r0, [r5]
cmp r0, 0x1
beq _0812C002
cmp r0, 0x7
beq _0812C002
b _0812C212
_0812C002:
movs r0, 0x8
bl Alloc
adds r7, r0, 0
movs r0, 0x8
bl Alloc
mov r9, r0
ldr r4, [r4]
movs r0, 0x8
ands r4, r0
cmp r4, 0
bne _0812C01E
b _0812C1CC
_0812C01E:
ldr r3, _0812C048 @ =gTrainers
ldr r2, _0812C04C @ =gTrainerBattleOpponent_A
ldrh r1, [r2]
lsls r0, r1, 2
adds r0, r1
lsls r0, 3
adds r0, r3
ldrb r1, [r0, 0x1]
cmp r1, 0x57
beq _0812C060
cmp r1, 0x57
bgt _0812C050
cmp r1, 0x54
beq _0812C056
b _0812C066
.align 2, 0
_0812C03C: .4byte gBattleTypeFlags
_0812C040: .4byte 0x00010202
_0812C044: .4byte gUnknown_2023E8A
_0812C048: .4byte gTrainers
_0812C04C: .4byte gTrainerBattleOpponent_A
_0812C050:
cmp r1, 0x5A
beq _0812C05C
b _0812C066
_0812C056:
movs r0, 0x1E
mov r10, r0
b _0812C06A
_0812C05C:
movs r1, 0x21
b _0812C068
_0812C060:
movs r0, 0x20
mov r10, r0
b _0812C06A
_0812C066:
movs r1, 0x22
_0812C068:
mov r10, r1
_0812C06A:
ldrh r0, [r2]
strh r0, [r7]
ldr r0, _0812C0AC @ =gBattleTypeFlags
ldr r0, [r0]
movs r1, 0x1
ands r0, r1
cmp r0, 0
beq _0812C150
ldr r0, _0812C0B0 @ =gBattleResults
ldrh r0, [r0, 0x20]
strh r0, [r7, 0x2]
ldr r4, _0812C0B4 @ =gBattleStruct
ldr r0, [r4]
movs r1, 0xC1
lsls r1, 1
adds r0, r1
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _0812C0BC
ldr r2, _0812C0B8 @ =gBattleMons
ldr r0, [r4]
movs r1, 0xC1
lsls r1, 1
adds r0, r1
ldrb r1, [r0]
movs r0, 0x58
muls r0, r1
adds r0, r2
b _0812C0EA
.align 2, 0
_0812C0AC: .4byte gBattleTypeFlags
_0812C0B0: .4byte gBattleResults
_0812C0B4: .4byte gBattleStruct
_0812C0B8: .4byte gBattleMons
_0812C0BC:
ldr r5, _0812C0D8 @ =gBattleMons
movs r0, 0
bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
movs r4, 0x58
muls r0, r4
adds r0, r5
ldrh r0, [r0, 0x28]
cmp r0, 0
beq _0812C0DC
movs r0, 0
b _0812C0DE
.align 2, 0
_0812C0D8: .4byte gBattleMons
_0812C0DC:
movs r0, 0x2
_0812C0DE:
bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
muls r0, r4
adds r0, r5
_0812C0EA:
ldrh r0, [r0]
strh r0, [r7, 0x4]
movs r0, 0
bl GetBattlerAtPosition
adds r4, r0, 0
movs r0, 0x2
bl GetBattlerAtPosition
ldr r6, _0812C14C @ =gBattleMons
lsls r4, 24
lsrs r4, 24
movs r5, 0x58
adds r1, r4, 0
muls r1, r5
adds r1, r6
lsls r0, 24
lsrs r0, 24
muls r0, r5
adds r0, r6
ldrh r0, [r0, 0x28]
ldrh r1, [r1, 0x28]
adds r0, r1
lsls r0, 16
lsrs r0, 16
mov r8, r0
movs r0, 0
bl GetBattlerAtPosition
adds r4, r0, 0
movs r0, 0x2
bl GetBattlerAtPosition
lsls r4, 24
lsrs r4, 24
adds r1, r4, 0
muls r1, r5
adds r1, r6
lsls r0, 24
lsrs r0, 24
muls r0, r5
adds r0, r6
ldrh r0, [r0, 0x2C]
ldrh r1, [r1, 0x2C]
adds r0, r1
lsls r0, 16
lsrs r4, r0, 16
b _0812C18E
.align 2, 0
_0812C14C: .4byte gBattleMons
_0812C150:
ldr r0, _0812C1C4 @ =gBattleResults
ldrh r0, [r0, 0x20]
strh r0, [r7, 0x2]
movs r0, 0
bl GetBattlerAtPosition
ldr r5, _0812C1C8 @ =gBattleMons
lsls r0, 24
lsrs r0, 24
movs r4, 0x58
muls r0, r4
adds r0, r5
ldrh r0, [r0]
strh r0, [r7, 0x4]
movs r0, 0
bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
muls r0, r4
adds r0, r5
ldrh r0, [r0, 0x28]
mov r8, r0
movs r0, 0
bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
muls r0, r4
adds r0, r5
ldrh r4, [r0, 0x2C]
_0812C18E:
bl sav1_map_get_name
movs r1, 0
strb r0, [r7, 0x7]
strb r1, [r7, 0x6]
adds r0, r4, 0
movs r1, 0x3
bl __udivsi3
lsls r0, 16
lsrs r1, r0, 16
lsls r0, r1, 1
cmp r8, r0
bge _0812C1AE
movs r0, 0x1
strb r0, [r7, 0x6]
_0812C1AE:
cmp r8, r1
bcs _0812C1B8
ldrb r0, [r7, 0x6]
adds r0, 0x1
strb r0, [r7, 0x6]
_0812C1B8:
mov r0, r10
adds r1, r7, 0
bl sub_8113550
b _0812C206
.align 2, 0
_0812C1C4: .4byte gBattleResults
_0812C1C8: .4byte gBattleMons
_0812C1CC:
ldrb r0, [r5]
cmp r0, 0x1
bne _0812C1E8
ldr r0, _0812C1E4 @ =gEnemyParty
movs r1, 0xB
bl GetMonData
mov r1, r9
strh r0, [r1]
strh r4, [r1, 0x2]
b _0812C1F8
.align 2, 0
_0812C1E4: .4byte gEnemyParty
_0812C1E8:
mov r0, r9
strh r4, [r0]
ldr r0, _0812C220 @ =gEnemyParty
movs r1, 0xB
bl GetMonData
mov r1, r9
strh r0, [r1, 0x2]
_0812C1F8:
bl sav1_map_get_name
mov r1, r9
strb r0, [r1, 0x4]
movs r0, 0x1F
bl sub_8113550
_0812C206:
adds r0, r7, 0
bl Free
mov r0, r9
bl Free
_0812C212:
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_0812C220: .4byte gEnemyParty
thumb_func_end sub_812BFDC
thumb_func_start sub_812C224
sub_812C224: @ 812C224
push {r4-r7,lr}
mov r7, r9
mov r6, r8
push {r6,r7}
sub sp, 0xC
ldr r4, _0812C2B8 @ =gBattleTypeFlags
ldr r0, [r4]
movs r1, 0x2
ands r0, r1
cmp r0, 0
beq _0812C31C
movs r0, 0x18
bl Alloc
adds r5, r0, 0
ldr r0, _0812C2BC @ =gUnknown_2023E8A
ldrb r0, [r0]
subs r0, 0x1
strb r0, [r5]
ldr r1, [r4]
movs r0, 0x40
ands r0, r1
cmp r0, 0
beq _0812C2C4
movs r0, 0xF
mov r8, r0
add r4, sp, 0x4
mov r0, sp
adds r1, r4, 0
bl sub_812C334
movs r3, 0
mov r9, r4
adds r1, r5, 0x1
mov r12, r1
adds r7, r5, 0
adds r7, 0x8
adds r6, r5, 0
adds r6, 0xF
ldr r4, _0812C2C0 @ =gUnknown_2022744
_0812C274:
mov r0, r12
adds r2, r0, r3
ldr r1, [sp]
lsls r0, r1, 3
subs r0, r1
lsls r0, 2
adds r0, r3, r0
adds r0, r4
ldrb r0, [r0]
strb r0, [r2]
adds r2, r7, r3
ldr r1, [sp, 0x4]
lsls r0, r1, 3
subs r0, r1
lsls r0, 2
adds r0, r3, r0
adds r0, r4
ldrb r0, [r0]
strb r0, [r2]
adds r2, r6, r3
mov r0, r9
ldr r1, [r0, 0x4]
lsls r0, r1, 3
subs r0, r1
lsls r0, 2
adds r0, r3, r0
adds r0, r4
ldrb r0, [r0]
strb r0, [r2]
adds r3, 0x1
cmp r3, 0x6
ble _0812C274
b _0812C30E
.align 2, 0
_0812C2B8: .4byte gBattleTypeFlags
_0812C2BC: .4byte gUnknown_2023E8A
_0812C2C0: .4byte gUnknown_2022744
_0812C2C4:
movs r0, 0x1
ands r1, r0
cmp r1, 0
beq _0812C2D2
movs r1, 0xE
mov r8, r1
b _0812C2E2
_0812C2D2:
bl InUnionRoom
movs r1, 0xD
mov r8, r1
cmp r0, 0x1
bne _0812C2E2
movs r0, 0x13
mov r8, r0
_0812C2E2:
movs r3, 0
adds r4, r5, 0x1
ldr r1, _0812C32C @ =gUnknown_2022744
mov r12, r1
ldr r7, _0812C330 @ =gBattleStruct
movs r6, 0x1
_0812C2EE:
adds r2, r4, r3
ldr r0, [r7]
adds r0, 0xB5
ldrb r0, [r0]
adds r1, r6, 0
eors r1, r0
lsls r0, r1, 3
subs r0, r1
lsls r0, 2
adds r0, r3, r0
add r0, r12
ldrb r0, [r0]
strb r0, [r2]
adds r3, 0x1
cmp r3, 0x6
ble _0812C2EE
_0812C30E:
mov r0, r8
adds r1, r5, 0
bl sub_8113550
adds r0, r5, 0
bl Free
_0812C31C:
add sp, 0xC
pop {r3,r4}
mov r8, r3
mov r9, r4
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_0812C32C: .4byte gUnknown_2022744
_0812C330: .4byte gBattleStruct
thumb_func_end sub_812C224
thumb_func_start sub_812C334
sub_812C334: @ 812C334
push {r4-r6,lr}
adds r6, r0, 0
ldr r3, _0812C35C @ =gLinkPlayers
ldr r4, _0812C360 @ =gBattleStruct
ldr r0, [r4]
adds r0, 0xB5
ldrb r2, [r0]
lsls r0, r2, 3
subs r0, r2
lsls r0, 2
adds r0, r3
ldrb r2, [r0, 0x18]
movs r0, 0x2
movs r5, 0
eors r2, r0
_0812C352:
ldrh r0, [r3, 0x18]
cmp r2, r0
bne _0812C364
str r5, [r6]
b _0812C370
.align 2, 0
_0812C35C: .4byte gLinkPlayers
_0812C360: .4byte gBattleStruct
_0812C364:
ldr r0, [r4]
adds r0, 0xB5
ldrb r0, [r0]
cmp r5, r0
beq _0812C370
stm r1!, {r5}
_0812C370:
adds r3, 0x1C
adds r5, 0x1
cmp r5, 0x3
ble _0812C352
pop {r4-r6}
pop {r0}
bx r0
thumb_func_end sub_812C334
.align 2, 0 @ Don't pad with nop.
asm/region_map.s
+10 -10
View File
@@ -932,7 +932,7 @@ _080C0584:
_080C05D8: .4byte gUnknown_8418EB5
_080C05DC: .4byte gUnknown_8418E8B
_080C05E0:
ldr r0, _080C0618 @ =gUnknown_2037AB8
ldr r0, _080C0618 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -958,7 +958,7 @@ _080C05FA:
adds r1, r2
b _080C07A0
.align 2, 0
_080C0618: .4byte gUnknown_2037AB8
_080C0618: .4byte gPaletteFade
_080C061C: .4byte gUnknown_20399D4
_080C0620: .4byte 0x000047a0
_080C0624:
@@ -1140,7 +1140,7 @@ _080C07A0:
_080C07A8: .4byte gUnknown_20399D4
_080C07AC: .4byte 0x000047a0
_080C07B0:
ldr r0, _080C07CC @ =gUnknown_2037AB8
ldr r0, _080C07CC @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1154,7 +1154,7 @@ _080C07C2:
pop {r0}
bx r0
.align 2, 0
_080C07CC: .4byte gUnknown_2037AB8
_080C07CC: .4byte gPaletteFade
thumb_func_end sub_80C04E4
thumb_func_start sub_80C07D0
@@ -5019,7 +5019,7 @@ _080C2768:
bl sub_80C2B48
b _080C2976
_080C2788:
ldr r0, _080C27AC @ =gUnknown_2037AB8
ldr r0, _080C27AC @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -5037,7 +5037,7 @@ _080C2796:
bl PlaySE
b _080C299A
.align 2, 0
_080C27AC: .4byte gUnknown_2037AB8
_080C27AC: .4byte gPaletteFade
_080C27B0: .4byte 0x00000ccc
_080C27B4:
bl sub_80C29A4
@@ -10006,7 +10006,7 @@ _080C4FEC:
.align 2, 0
_080C4FFC: .4byte gUnknown_8418EB0
_080C5000:
ldr r0, _080C5024 @ =gUnknown_2037AB8
ldr r0, _080C5024 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -10022,7 +10022,7 @@ _080C500E:
bl PutWindowTilemap
b _080C51A6
.align 2, 0
_080C5024: .4byte gUnknown_2037AB8
_080C5024: .4byte gPaletteFade
_080C5028:
bl sub_80C3400
lsls r0, 24
@@ -10207,7 +10207,7 @@ _080C51AA:
.align 2, 0
_080C51B4: .4byte gUnknown_20399FC
_080C51B8:
ldr r0, _080C51E4 @ =gUnknown_2037AB8
ldr r0, _080C51E4 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -10229,7 +10229,7 @@ _080C51DC:
pop {r0}
bx r0
.align 2, 0
_080C51E4: .4byte gUnknown_2037AB8
_080C51E4: .4byte gPaletteFade
thumb_func_end sub_80C4F08
thumb_func_start sub_80C51E8
asm/reshow_battle_screen.s
+4 -4
View File
@@ -13,7 +13,7 @@ nullsub_44: @ 8077760
thumb_func_start sub_8077764
sub_8077764: @ 8077764
push {lr}
ldr r2, _080777B0 @ =gUnknown_2037AB8
ldr r2, _080777B0 @ =gPaletteFade
ldrb r0, [r2, 0x8]
movs r1, 0x80
orrs r0, r1
@@ -48,7 +48,7 @@ sub_8077764: @ 8077764
bl sub_812B1F0
b _080777DA
.align 2, 0
_080777B0: .4byte gUnknown_2037AB8
_080777B0: .4byte gPaletteFade
_080777B4: .4byte gBattleScripting
_080777B8: .4byte gBattleTypeFlags
_080777BC:
@@ -355,7 +355,7 @@ _08077A5C:
movs r2, 0x10
movs r3, 0
bl BeginHardwarePaletteFade
ldr r2, _08077AA0 @ =gUnknown_2037AB8
ldr r2, _08077AA0 @ =gPaletteFade
ldrb r1, [r2, 0x8]
movs r0, 0x7F
ands r0, r1
@@ -375,7 +375,7 @@ _08077A8A:
bx r0
.align 2, 0
_08077A9C: .4byte sub_80116F4
_08077AA0: .4byte gUnknown_2037AB8
_08077AA0: .4byte gPaletteFade
_08077AA4: .4byte sub_8011100
_08077AA8: .4byte gBattleScripting
thumb_func_end sub_80777E8
asm/rom6.s
+14 -14
View File
@@ -73,7 +73,7 @@ task08_080C9820: @ 80C9820
lsrs r5, r0, 24
adds r6, r5, 0
bl ScriptContext2_Enable
ldr r1, _080C9874 @ =gUnknown_2037078
ldr r1, _080C9874 @ =gPlayerAvatar
movs r0, 0x1
strb r0, [r1, 0x6]
ldrb r1, [r1, 0x5]
@@ -107,7 +107,7 @@ _080C9856:
ldr r0, _080C9884 @ =sub_80C98FC
b _080C98A0
.align 2, 0
_080C9874: .4byte gUnknown_2037078
_080C9874: .4byte gPlayerAvatar
_080C9878: .4byte gMapObjects
_080C987C: .4byte gMapHeader
_080C9880: .4byte gTasks
@@ -139,7 +139,7 @@ sub_80C98B0: @ 80C98B0
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _080C98EC @ =gUnknown_2037078
ldr r0, _080C98EC @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -165,7 +165,7 @@ _080C98E4:
pop {r0}
bx r0
.align 2, 0
_080C98EC: .4byte gUnknown_2037078
_080C98EC: .4byte gPlayerAvatar
_080C98F0: .4byte gMapObjects
_080C98F4: .4byte gTasks
_080C98F8: .4byte sub_80C98FC
@@ -183,7 +183,7 @@ sub_80C98FC: @ 80C98FC
cmp r4, 0
bne _080C9980
bl player_get_direction_lower_nybble
ldr r6, _080C9988 @ =gUnknown_20386E0
ldr r6, _080C9988 @ =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r6, 0x4]
@@ -207,7 +207,7 @@ _080C9934:
movs r0, 0x3
str r0, [r6, 0x8]
_080C993C:
ldr r5, _080C998C @ =gUnknown_2037078
ldr r5, _080C998C @ =gPlayerAvatar
ldrb r0, [r5, 0x5]
lsls r4, r0, 3
adds r4, r0
@@ -242,8 +242,8 @@ _080C9980:
pop {r0}
bx r0
.align 2, 0
_080C9988: .4byte gUnknown_20386E0
_080C998C: .4byte gUnknown_2037078
_080C9988: .4byte gFieldEffectArguments
_080C998C: .4byte gPlayerAvatar
_080C9990: .4byte gMapObjects
_080C9994: .4byte gSprites
_080C9998: .4byte gTasks
@@ -266,7 +266,7 @@ sub_80C99A0: @ 80C99A0
ldrh r0, [r0, 0x1A]
orrs r1, r0
bl _call_via_r1
ldr r1, _080C99D4 @ =gUnknown_2037078
ldr r1, _080C99D4 @ =gPlayerAvatar
movs r0, 0
strb r0, [r1, 0x6]
adds r0, r4, 0
@@ -276,7 +276,7 @@ sub_80C99A0: @ 80C99A0
bx r0
.align 2, 0
_080C99D0: .4byte gTasks
_080C99D4: .4byte gUnknown_2037078
_080C99D4: .4byte gPlayerAvatar
thumb_func_end sub_80C99A0
thumb_func_start SetUpFieldMove_RockSmash
@@ -312,7 +312,7 @@ _080C9A0C: .4byte sub_80C9A10
sub_80C9A10: @ 80C9A10
push {lr}
bl GetCursorSelectionMonId
ldr r1, _080C9A28 @ =gUnknown_20386E0
ldr r1, _080C9A28 @ =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r1]
@@ -321,7 +321,7 @@ sub_80C9A10: @ 80C9A10
pop {r0}
bx r0
.align 2, 0
_080C9A28: .4byte gUnknown_20386E0
_080C9A28: .4byte gFieldEffectArguments
_080C9A2C: .4byte gUnknown_81BE064
thumb_func_end sub_80C9A10
@@ -397,14 +397,14 @@ hm2_dig: @ 80C9AAC
movs r0, 0x26
bl FieldEffectStart
bl GetCursorSelectionMonId
ldr r1, _080C9AC8 @ =gUnknown_20386E0
ldr r1, _080C9AC8 @ =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r1]
pop {r0}
bx r0
.align 2, 0
_080C9AC8: .4byte gUnknown_20386E0
_080C9AC8: .4byte gFieldEffectArguments
thumb_func_end hm2_dig
thumb_func_start sub_80C9ACC
asm/roulette_util.s
+28 -28
View File
@@ -151,9 +151,9 @@ _080D8CD8:
ldrh r0, [r5, 0x6]
add r0, r12
lsls r0, 1
ldr r1, _080D8CFC @ =gUnknown_20375F8
ldr r1, _080D8CFC @ =gPlttBufferFaded
adds r3, r0, r1
ldr r1, _080D8D00 @ =gUnknown_20371F8
ldr r1, _080D8D00 @ =gPlttBufferUnfaded
adds r6, r0, r1
ldrb r0, [r5]
lsls r0, 25
@@ -165,8 +165,8 @@ _080D8CD8:
b _080D8E4E
.align 2, 0
_080D8CF8: .4byte 0xfffffc1f
_080D8CFC: .4byte gUnknown_20375F8
_080D8D00: .4byte gUnknown_20371F8
_080D8CFC: .4byte gPlttBufferFaded
_080D8D00: .4byte gPlttBufferUnfaded
_080D8D04:
ldr r0, [r3]
lsls r2, r0, 27
@@ -422,7 +422,7 @@ _080D8ECE:
ldrb r0, [r3, 0x8]
cmp r2, r0
bcs _080D8EEE
ldr r4, _080D8EF8 @ =gUnknown_20375F8
ldr r4, _080D8EF8 @ =gPlttBufferFaded
_080D8ED6:
ldrh r0, [r3, 0x6]
adds r0, r2
@@ -443,13 +443,13 @@ _080D8EEE:
adds r1, 0x1
b _080D8F28
.align 2, 0
_080D8EF8: .4byte gUnknown_20375F8
_080D8EF8: .4byte gPlttBufferFaded
_080D8EFC:
ldrb r0, [r3, 0x8]
cmp r2, r0
bcs _080D8F20
ldr r5, _080D8F40 @ =gUnknown_20375F8
ldr r4, _080D8F44 @ =gUnknown_20371F8
ldr r5, _080D8F40 @ =gPlttBufferFaded
ldr r4, _080D8F44 @ =gPlttBufferUnfaded
_080D8F06:
ldrh r0, [r3, 0x6]
adds r0, r2
@@ -483,8 +483,8 @@ _080D8F36:
pop {r1}
bx r1
.align 2, 0
_080D8F40: .4byte gUnknown_20375F8
_080D8F44: .4byte gUnknown_20371F8
_080D8F40: .4byte gPlttBufferFaded
_080D8F44: .4byte gPlttBufferUnfaded
thumb_func_end sub_80D8EB8
thumb_func_start task_tutorial_controls_fadein
@@ -625,9 +625,9 @@ _080D9016:
beq _080D907E
ldrh r1, [r4, 0xA]
lsls r1, 1
ldr r0, _080D9074 @ =gUnknown_20375F8
ldr r0, _080D9074 @ =gPlttBufferFaded
adds r0, r1, r0
ldr r2, _080D9078 @ =gUnknown_20371F8
ldr r2, _080D9078 @ =gPlttBufferUnfaded
adds r1, r2
ldrb r2, [r4, 0xC]
lsls r2, 1
@@ -651,8 +651,8 @@ _080D9016:
strb r0, [r4, 0x7]
b _080D907E
.align 2, 0
_080D9074: .4byte gUnknown_20375F8
_080D9078: .4byte gUnknown_20371F8
_080D9074: .4byte gPlttBufferFaded
_080D9078: .4byte gPlttBufferUnfaded
_080D907C:
strb r3, [r4, 0x7]
_080D907E:
@@ -787,8 +787,8 @@ sub_80D9140: @ 80D9140
adds r0, r2, r0
cmp r2, r0
bge _080D9182
ldr r5, _080D91B4 @ =gUnknown_20375F8
ldr r3, _080D91B8 @ =gUnknown_20371F8
ldr r5, _080D91B4 @ =gPlttBufferFaded
ldr r3, _080D91B8 @ =gPlttBufferUnfaded
_080D9168:
lsls r0, r2, 1
adds r1, r0, r5
@@ -829,8 +829,8 @@ _080D9182:
pop {r0}
bx r0
.align 2, 0
_080D91B4: .4byte gUnknown_20375F8
_080D91B8: .4byte gUnknown_20371F8
_080D91B4: .4byte gPlttBufferFaded
_080D91B8: .4byte gPlttBufferUnfaded
thumb_func_end sub_80D9140
thumb_func_start sub_80D91BC
@@ -992,8 +992,8 @@ sub_80D9294: @ 80D9294
adds r0, r2, r0
cmp r2, r0
bge _080D92FA
ldr r5, _080D9314 @ =gUnknown_20375F8
ldr r4, _080D9318 @ =gUnknown_20371F8
ldr r5, _080D9314 @ =gPlttBufferFaded
ldr r4, _080D9318 @ =gPlttBufferUnfaded
_080D92E0:
lsls r0, r2, 1
adds r1, r0, r5
@@ -1022,8 +1022,8 @@ _080D92FA:
strh r0, [r2]
b _080D93A6
.align 2, 0
_080D9314: .4byte gUnknown_20375F8
_080D9318: .4byte gUnknown_20371F8
_080D9314: .4byte gPlttBufferFaded
_080D9318: .4byte gPlttBufferUnfaded
_080D931C:
movs r0, 0x1
mov r9, r0
@@ -1066,8 +1066,8 @@ _080D9350:
adds r0, r2, r0
cmp r2, r0
bge _080D9386
ldr r6, _080D93B4 @ =gUnknown_20375F8
ldr r4, _080D93B8 @ =gUnknown_20371F8
ldr r6, _080D93B4 @ =gPlttBufferFaded
ldr r4, _080D93B8 @ =gPlttBufferUnfaded
_080D936C:
lsls r0, r2, 1
adds r1, r0, r6
@@ -1109,8 +1109,8 @@ _080D93A6:
pop {r0}
bx r0
.align 2, 0
_080D93B4: .4byte gUnknown_20375F8
_080D93B8: .4byte gUnknown_20371F8
_080D93B4: .4byte gPlttBufferFaded
_080D93B8: .4byte gPlttBufferUnfaded
thumb_func_end sub_80D9294
thumb_func_start sub_80D93BC
@@ -1151,7 +1151,7 @@ _080D93E4:
beq _080D93FE
b _080D9552
_080D93FE:
ldr r0, _080D944C @ =gUnknown_2037AB8
ldr r0, _080D944C @ =gPaletteFade
ldrb r1, [r0, 0x7]
adds r0, r3, 0
ands r0, r1
@@ -1191,7 +1191,7 @@ _080D9424:
beq _080D9456
b _080D953C
.align 2, 0
_080D944C: .4byte gUnknown_2037AB8
_080D944C: .4byte gPaletteFade
_080D9450:
cmp r0, 0x2
beq _080D94FE
asm/scrcmd.s
+19 -19
View File
@@ -79,7 +79,7 @@ sub_8069F3C: @ 8069F3C
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E454
bl GetVarPointer
adds r5, r0, 0
adds r0, r4, 0
bl ScriptReadHalfword
@@ -692,7 +692,7 @@ ScrCmd_setvar: @ 806A390
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E454
bl GetVarPointer
adds r4, r0, 0
adds r0, r5, 0
bl ScriptReadHalfword
@@ -710,13 +710,13 @@ ScrCmd_copyvar: @ 806A3B4
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E454
bl GetVarPointer
adds r5, r0, 0
adds r0, r4, 0
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E454
bl GetVarPointer
ldrh r0, [r0]
strh r0, [r5]
movs r0, 0
@@ -732,7 +732,7 @@ ScrCmd_setorcopyvar: @ 806A3E0
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E454
bl GetVarPointer
adds r5, r0, 0
adds r0, r4, 0
bl ScriptReadHalfword
@@ -909,7 +909,7 @@ ScrCmd_compare_var_to_value: @ 806A520
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E454
bl GetVarPointer
ldrh r5, [r0]
adds r0, r4, 0
bl ScriptReadHalfword
@@ -932,13 +932,13 @@ ScrCmd_compare_var_to_var: @ 806A550
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E454
bl GetVarPointer
adds r5, r0, 0
adds r0, r4, 0
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E454
bl GetVarPointer
ldrh r2, [r5]
ldrh r1, [r0]
adds r0, r2, 0
@@ -957,7 +957,7 @@ ScrCmd_addvar: @ 806A584
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E454
bl GetVarPointer
adds r4, r0, 0
adds r0, r5, 0
bl ScriptReadHalfword
@@ -977,7 +977,7 @@ ScrCmd_subvar: @ 806A5AC
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E454
bl GetVarPointer
adds r5, r0, 0
adds r0, r4, 0
bl ScriptReadHalfword
@@ -1423,7 +1423,7 @@ ScrCmd_setflashradius: @ 806A8FC
thumb_func_start sub_806A918
sub_806A918: @ 806A918
push {lr}
ldr r0, _0806A92C @ =gUnknown_2037AB8
ldr r0, _0806A92C @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1432,7 +1432,7 @@ sub_806A918: @ 806A918
movs r0, 0
b _0806A932
.align 2, 0
_0806A92C: .4byte gUnknown_2037AB8
_0806A92C: .4byte gPaletteFade
_0806A930:
movs r0, 0x1
_0806A932:
@@ -2319,13 +2319,13 @@ ScrCmd_getplayerxy: @ 806B010
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E454
bl GetVarPointer
adds r5, r0, 0
adds r0, r4, 0
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E454
bl GetVarPointer
ldr r2, _0806B048 @ =gSaveBlock1Ptr
ldr r1, [r2]
ldrh r1, [r1]
@@ -4243,7 +4243,7 @@ ScrCmd_buffermovename: @ 806BE50
ldr r2, [r4]
movs r1, 0xD
muls r1, r0
ldr r0, _0806BE8C @ =gUnknown_8247094
ldr r0, _0806BE8C @ =gMoveNames
adds r1, r0
adds r0, r2, 0
bl StringCopy
@@ -4253,7 +4253,7 @@ ScrCmd_buffermovename: @ 806BE50
bx r1
.align 2, 0
_0806BE88: .4byte gUnknown_83A7294
_0806BE8C: .4byte gUnknown_8247094
_0806BE8C: .4byte gMoveNames
thumb_func_end ScrCmd_buffermovename
thumb_func_start ScrCmd_buffernumberstring
@@ -5060,7 +5060,7 @@ ScrCmd_setfieldeffectarg: @ 806C458
lsls r0, 16
lsrs r0, 16
bl VarGet
ldr r1, _0806C484 @ =gUnknown_20386E0
ldr r1, _0806C484 @ =gFieldEffectArguments
lsls r4, 2
adds r4, r1
lsls r0, 16
@@ -5071,7 +5071,7 @@ ScrCmd_setfieldeffectarg: @ 806C458
pop {r1}
bx r1
.align 2, 0
_0806C484: .4byte gUnknown_20386E0
_0806C484: .4byte gFieldEffectArguments
thumb_func_end ScrCmd_setfieldeffectarg
thumb_func_start WaitForFieldEffectFinish
@@ -5428,7 +5428,7 @@ ScrCmd_checkcoins: @ 806C72C
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E454
bl GetVarPointer
adds r4, r0, 0
bl GetCoins
strh r0, [r4]
asm/script_menu.s
+2 -2
View File
@@ -453,7 +453,7 @@ sub_809CC98: @ 809CC98
lsls r0, 3
ldr r1, _0809CCC4 @ =gTasks+0x8
adds r5, r0, r1
ldr r0, _0809CCC8 @ =gUnknown_2037AB8
ldr r0, _0809CCC8 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -468,7 +468,7 @@ sub_809CC98: @ 809CC98
b _0809CD3C
.align 2, 0
_0809CCC4: .4byte gTasks+0x8
_0809CCC8: .4byte gUnknown_2037AB8
_0809CCC8: .4byte gPaletteFade
_0809CCCC: .4byte gUnknown_2039988
_0809CCD0:
movs r1, 0xA
asm/script_pokemon_util_80BF8FC.s
+4 -4
View File
@@ -72,7 +72,7 @@ sub_80BF97C: @ 80BF97C
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r2, _080BF9B4 @ =gUnknown_2037AB8
ldr r2, _080BF9B4 @ =gPaletteFade
ldrb r1, [r2, 0x7]
movs r0, 0x80
ands r0, r1
@@ -96,7 +96,7 @@ _080BF9AC:
pop {r0}
bx r0
.align 2, 0
_080BF9B4: .4byte gUnknown_2037AB8
_080BF9B4: .4byte gPaletteFade
_080BF9B8: .4byte gTasks
thumb_func_end sub_80BF97C
@@ -196,7 +196,7 @@ ScrSpecial_GetPokemonNicknameAndMoveName: @ 80BFA50
ldr r0, _080BFAA0 @ =gStringVar2
movs r1, 0xD
muls r1, r4
ldr r2, _080BFAA4 @ =gUnknown_8247094
ldr r2, _080BFAA4 @ =gMoveNames
adds r1, r2
bl StringCopy
pop {r4,r5}
@@ -208,7 +208,7 @@ _080BFA94: .4byte gPlayerParty
_080BFA98: .4byte gSpecialVar_0x8005
_080BFA9C: .4byte gStringVar1
_080BFAA0: .4byte gStringVar2
_080BFAA4: .4byte gUnknown_8247094
_080BFAA4: .4byte gMoveNames
thumb_func_end ScrSpecial_GetPokemonNicknameAndMoveName
thumb_func_start sub_80BFAA8
asm/seagallop.s
+2 -2
View File
@@ -316,7 +316,7 @@ sub_8147108: @ 8147108
lsls r0, 24
cmp r0, 0
beq _08147136
ldr r0, _0814713C @ =gUnknown_2037AB8
ldr r0, _0814713C @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -331,7 +331,7 @@ _08147136:
pop {r0}
bx r0
.align 2, 0
_0814713C: .4byte gUnknown_2037AB8
_0814713C: .4byte gPaletteFade
thumb_func_end sub_8147108
thumb_func_start sub_8147140
asm/shop.s
+8 -8
View File
@@ -347,7 +347,7 @@ sub_809AD40: @ 809AD40
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _0809AD70 @ =gUnknown_2037AB8
ldr r0, _0809AD70 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -365,7 +365,7 @@ _0809AD68:
pop {r0}
bx r0
.align 2, 0
_0809AD70: .4byte gUnknown_2037AB8
_0809AD70: .4byte gPaletteFade
thumb_func_end sub_809AD40
thumb_func_start sub_809AD74
@@ -1259,7 +1259,7 @@ sub_809B494: @ 809B494
lsrs r0, 16
movs r1, 0xD
muls r1, r0
ldr r0, _0809B524 @ =gUnknown_8247094
ldr r0, _0809B524 @ =gMoveNames
adds r1, r0
adds r0, r5, 0
bl StringCopy
@@ -1280,7 +1280,7 @@ _0809B514: .4byte gStringVar1
_0809B518: .4byte 0xfffffee0
_0809B51C: .4byte gStringVar4
_0809B520: .4byte gUnknown_8416226
_0809B524: .4byte gUnknown_8247094
_0809B524: .4byte gMoveNames
_0809B528:
ldr r2, _0809B564 @ =gUnknown_8416213
movs r4, 0
@@ -2157,7 +2157,7 @@ sub_809BBC0: @ 809BBC0
lsls r0, 3
ldr r1, _0809BC00 @ =gTasks+0x8
adds r5, r0, r1
ldr r0, _0809BC04 @ =gUnknown_2037AB8
ldr r0, _0809BC04 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -2181,7 +2181,7 @@ sub_809BBC0: @ 809BBC0
b _0809BC8E
.align 2, 0
_0809BC00: .4byte gTasks+0x8
_0809BC04: .4byte gUnknown_2037AB8
_0809BC04: .4byte gPaletteFade
_0809BC08: .4byte gUnknown_2039942
_0809BC0C:
movs r0, 0x5
@@ -2682,7 +2682,7 @@ sub_809C04C: @ 809C04C
lsls r0, 3
ldr r1, _0809C088 @ =gTasks+0x8
adds r2, r0, r1
ldr r0, _0809C08C @ =gUnknown_2037AB8
ldr r0, _0809C08C @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -2703,7 +2703,7 @@ _0809C082:
bx r0
.align 2, 0
_0809C088: .4byte gTasks+0x8
_0809C08C: .4byte gUnknown_2037AB8
_0809C08C: .4byte gPaletteFade
_0809C090: .4byte c2_exit_to_overworld_2_switch
thumb_func_end sub_809C04C
asm/slot_machine.s
+8 -8
View File
@@ -3683,7 +3683,7 @@ _0814142E:
b _08141450
_08141436:
bl UpdatePaletteFade
ldr r0, _0814144C @ =gUnknown_2037AB8
ldr r0, _0814144C @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -3692,7 +3692,7 @@ _08141436:
movs r0, 0
b _08141452
.align 2, 0
_0814144C: .4byte gUnknown_2037AB8
_0814144C: .4byte gPaletteFade
_08141450:
movs r0, 0x1
_08141452:
@@ -3728,7 +3728,7 @@ _08141472:
strb r0, [r4]
b _081414A0
_0814148A:
ldr r0, _0814149C @ =gUnknown_2037AB8
ldr r0, _0814149C @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -3737,7 +3737,7 @@ _0814148A:
movs r0, 0
b _081414A2
.align 2, 0
_0814149C: .4byte gUnknown_2037AB8
_0814149C: .4byte gPaletteFade
_081414A0:
movs r0, 0x1
_081414A2:
@@ -4503,9 +4503,9 @@ _08141A00:
bl BlendPalettes
_08141A2C:
movs r4, 0
ldr r5, _08141A4C @ =gUnknown_20375F8
ldr r5, _08141A4C @ =gPlttBufferFaded
ldr r3, _08141A50 @ =gUnknown_8466C34
ldr r2, _08141A54 @ =gUnknown_20371F8
ldr r2, _08141A54 @ =gPlttBufferUnfaded
_08141A34:
adds r0, r4, r3
ldrb r0, [r0]
@@ -4520,9 +4520,9 @@ _08141A34:
bls _08141A34
b _08141AA8
.align 2, 0
_08141A4C: .4byte gUnknown_20375F8
_08141A4C: .4byte gPlttBufferFaded
_08141A50: .4byte gUnknown_8466C34
_08141A54: .4byte gUnknown_20371F8
_08141A54: .4byte gPlttBufferUnfaded
_08141A58:
movs r4, 0
_08141A5A:
asm/start_menu.s
+17 -17
View File
@@ -631,8 +631,8 @@ _0806F24E:
_0806F254: .4byte gUnknown_20370F0
thumb_func_end sub_806F1F0
thumb_func_start sub_806F258
sub_806F258: @ 806F258
thumb_func_start ShowStartMenu
ShowStartMenu: @ 806F258
push {lr}
bl sub_805642C
cmp r0, 0
@@ -648,7 +648,7 @@ _0806F26E:
bx r0
.align 2, 0
_0806F27C: .4byte sub_806F1F0
thumb_func_end sub_806F258
thumb_func_end ShowStartMenu
thumb_func_start sub_806F280
sub_806F280: @ 806F280
@@ -841,7 +841,7 @@ _0806F40A:
thumb_func_start sub_806F410
sub_806F410: @ 806F410
push {lr}
ldr r0, _0806F424 @ =gUnknown_2037AB8
ldr r0, _0806F424 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -850,7 +850,7 @@ sub_806F410: @ 806F410
movs r0, 0
b _0806F442
.align 2, 0
_0806F424: .4byte gUnknown_2037AB8
_0806F424: .4byte gPaletteFade
_0806F428:
movs r0, 0x29
bl IncrementGameStat
@@ -870,7 +870,7 @@ _0806F448: .4byte sub_810275C
thumb_func_start sub_806F44C
sub_806F44C: @ 806F44C
push {lr}
ldr r0, _0806F460 @ =gUnknown_2037AB8
ldr r0, _0806F460 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -879,7 +879,7 @@ sub_806F44C: @ 806F44C
movs r0, 0
b _0806F478
.align 2, 0
_0806F460: .4byte gUnknown_2037AB8
_0806F460: .4byte gPaletteFade
_0806F464:
bl play_some_sound
bl sub_806EF18
@@ -897,7 +897,7 @@ _0806F47C: .4byte CB2_PartyMenuFromStartMenu
thumb_func_start sub_806F480
sub_806F480: @ 806F480
push {lr}
ldr r0, _0806F494 @ =gUnknown_2037AB8
ldr r0, _0806F494 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -906,7 +906,7 @@ sub_806F480: @ 806F480
movs r0, 0
b _0806F4AC
.align 2, 0
_0806F494: .4byte gUnknown_2037AB8
_0806F494: .4byte gPaletteFade
_0806F498:
bl play_some_sound
bl sub_806EF18
@@ -924,7 +924,7 @@ _0806F4B0: .4byte sub_8107EB8
thumb_func_start sub_806F4B4
sub_806F4B4: @ 806F4B4
push {lr}
ldr r0, _0806F4C8 @ =gUnknown_2037AB8
ldr r0, _0806F4C8 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -933,7 +933,7 @@ sub_806F4B4: @ 806F4B4
movs r0, 0
b _0806F4E0
.align 2, 0
_0806F4C8: .4byte gUnknown_2037AB8
_0806F4C8: .4byte gPaletteFade
_0806F4CC:
bl play_some_sound
bl sub_806EF18
@@ -963,7 +963,7 @@ _0806F4F8: .4byte sub_806F5A4
thumb_func_start sub_806F4FC
sub_806F4FC: @ 806F4FC
push {lr}
ldr r0, _0806F510 @ =gUnknown_2037AB8
ldr r0, _0806F510 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -972,7 +972,7 @@ sub_806F4FC: @ 806F4FC
movs r0, 0
b _0806F52E
.align 2, 0
_0806F510: .4byte gUnknown_2037AB8
_0806F510: .4byte gPaletteFade
_0806F514:
bl play_some_sound
bl sub_806EF18
@@ -1018,7 +1018,7 @@ sub_806F554: @ 806F554
thumb_func_start sub_806F56C
sub_806F56C: @ 806F56C
push {lr}
ldr r0, _0806F580 @ =gUnknown_2037AB8
ldr r0, _0806F580 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1027,7 +1027,7 @@ sub_806F56C: @ 806F56C
movs r0, 0
b _0806F598
.align 2, 0
_0806F580: .4byte gUnknown_2037AB8
_0806F580: .4byte gPaletteFade
_0806F584:
bl play_some_sound
bl sub_80563F0
@@ -1860,7 +1860,7 @@ sub_806FBB8: @ 806FBB8
lsls r0, 3
ldr r1, _0806FBEC @ =gTasks+0x8
adds r5, r0, r1
ldr r0, _0806FBF0 @ =gUnknown_2037AB8
ldr r0, _0806FBF0 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1881,7 +1881,7 @@ _0806FBE2:
mov pc, r0
.align 2, 0
_0806FBEC: .4byte gTasks+0x8
_0806FBF0: .4byte gUnknown_2037AB8
_0806FBF0: .4byte gPaletteFade
_0806FBF4: .4byte _0806FBF8
.align 2, 0
_0806FBF8:
asm/teachy_tv.s
+6 -6
View File
@@ -849,7 +849,7 @@ sub_815B274: @ 815B274
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _0815B298 @ =gUnknown_2037AB8
ldr r0, _0815B298 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -863,7 +863,7 @@ sub_815B274: @ 815B274
bl SetMainCallback2
b _0815B2AC
.align 2, 0
_0815B298: .4byte gUnknown_2037AB8
_0815B298: .4byte gPaletteFade
_0815B29C: .4byte gUnknown_203F450
_0815B2A0:
bl sub_8055DC4
@@ -893,7 +893,7 @@ sub_815B2C0: @ 815B2C0
ldr r1, _0815B31C @ =gTasks+0x8
adds r6, r0, r1
bl sub_815B0CC
ldr r0, _0815B320 @ =gUnknown_2037AB8
ldr r0, _0815B320 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -929,7 +929,7 @@ _0815B30A:
b _0815B37A
.align 2, 0
_0815B31C: .4byte gTasks+0x8
_0815B320: .4byte gUnknown_2037AB8
_0815B320: .4byte gPaletteFade
_0815B324: .4byte gUnknown_203F44A
_0815B328: .4byte gMain
_0815B32C: .4byte sub_8107EB8
@@ -1864,7 +1864,7 @@ sub_815BA54: @ 815BA54
lsls r2, r1, 3
ldr r4, _0815BA8C @ =gTasks+0x8
adds r3, r2, r4
ldr r0, _0815BA90 @ =gUnknown_2037AB8
ldr r0, _0815BA90 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1887,7 +1887,7 @@ _0815BA86:
bx r0
.align 2, 0
_0815BA8C: .4byte gTasks+0x8
_0815BA90: .4byte gUnknown_2037AB8
_0815BA90: .4byte gPaletteFade
_0815BA94: .4byte gUnknown_8479390
_0815BA98: .4byte gUnknown_203F444
_0815BA9C: .4byte sub_815B4EC
asm/title_screen.s
+29 -29
View File
@@ -577,7 +577,7 @@ _08078DF2:
bgt _08078E02
b _08078FB6
_08078E02:
ldr r0, _08078E20 @ =gUnknown_2037398
ldr r0, _08078E20 @ =gPlttBufferUnfaded + 0x1A0
movs r1, 0x10
bl TintPalette_GrayScale2
movs r0, 0x80
@@ -590,9 +590,9 @@ _08078E02:
bl BeginNormalPaletteFade
b _08078F80
.align 2, 0
_08078E20: .4byte gUnknown_2037398
_08078E20: .4byte gPlttBufferUnfaded + 0x1A0
_08078E24:
ldr r0, _08078E3C @ =gUnknown_2037AB8
ldr r0, _08078E3C @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -605,7 +605,7 @@ _08078E36:
strh r0, [r6, 0x4]
b _08078F80
.align 2, 0
_08078E3C: .4byte gUnknown_2037AB8
_08078E3C: .4byte gPaletteFade
_08078E40:
ldrh r0, [r6, 0x4]
adds r0, 0x1
@@ -749,7 +749,7 @@ _08078F24:
movs r0, 0
bl ShowBg
ldr r0, _08078F90 @ =gUnknown_8EAD5E8
ldr r1, _08078F94 @ =gUnknown_2037398
ldr r1, _08078F94 @ =gPlttBufferUnfaded + 0x1A0
movs r2, 0x10
bl CpuSet
movs r0, 0x80
@@ -772,13 +772,13 @@ _08078F80:
_08078F88: .4byte 0x00001fff
_08078F8C: .4byte 0x00007fde
_08078F90: .4byte gUnknown_8EAD5E8
_08078F94: .4byte gUnknown_2037398
_08078F94: .4byte gPlttBufferUnfaded + 0x1A0
_08078F98:
movs r0, 0
bl sub_807185C
cmp r0, 0
bne _08078FB6
ldr r0, _08078FC0 @ =gUnknown_2037AB8
ldr r0, _08078FC0 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -793,7 +793,7 @@ _08078FB6:
pop {r0}
bx r0
.align 2, 0
_08078FC0: .4byte gUnknown_2037AB8
_08078FC0: .4byte gPaletteFade
thumb_func_end sub_8078DA4
thumb_func_start sub_8078FC4
@@ -943,7 +943,7 @@ _080790FC:
bl sub_8079A88
b _0807918C
_08079104:
ldr r0, _08079138 @ =gUnknown_2037AB8
ldr r0, _08079138 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -966,13 +966,13 @@ _08079104:
bl sub_8079528
b _0807918C
.align 2, 0
_08079138: .4byte gUnknown_2037AB8
_08079138: .4byte gPaletteFade
_0807913C:
bl IsNotWaitingForBGMStop
lsls r0, 24
cmp r0, 0
beq _080791B0
ldr r0, _08079168 @ =gUnknown_2037AB8
ldr r0, _08079168 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -988,7 +988,7 @@ _0807913C:
strh r5, [r4, 0x4]
b _0807918C
.align 2, 0
_08079168: .4byte gUnknown_2037AB8
_08079168: .4byte gPaletteFade
_0807916C: .4byte sub_807941C
_08079170:
ldrh r0, [r4, 0x4]
@@ -1048,7 +1048,7 @@ _080791D8:
beq _08079248
b _080792A6
_080791DE:
ldr r0, _08079200 @ =gUnknown_2037AB8
ldr r0, _08079200 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1064,7 +1064,7 @@ _080791DE:
strh r5, [r4, 0x4]
b _08079238
.align 2, 0
_08079200: .4byte gUnknown_2037AB8
_08079200: .4byte gPaletteFade
_08079204:
ldrh r1, [r4, 0x4]
movs r2, 0x4
@@ -1098,7 +1098,7 @@ _08079238:
_08079240: .4byte 0x0fffffff
_08079244: .4byte 0x00007fff
_08079248:
ldr r0, _080792B0 @ =gUnknown_2037AB8
ldr r0, _080792B0 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1142,7 +1142,7 @@ _080792A6:
pop {r0}
bx r0
.align 2, 0
_080792B0: .4byte gUnknown_2037AB8
_080792B0: .4byte gPaletteFade
_080792B4: .4byte gSaveFileStatus
_080792B8: .4byte gSaveBlock2Ptr
_080792BC: .4byte gHeap
@@ -1327,7 +1327,7 @@ sub_807941C: @ 807941C
ldrsh r0, [r5, r1]
cmp r0, 0
beq _08079444
ldr r0, _08079464 @ =gUnknown_2037AB8
ldr r0, _08079464 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1340,7 +1340,7 @@ _08079444:
ldrsh r0, [r5, r3]
cmp r0, 0
beq _08079468
ldr r0, _08079464 @ =gUnknown_2037AB8
ldr r0, _08079464 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1351,7 +1351,7 @@ _08079444:
b _08079510
.align 2, 0
_08079460: .4byte gTasks+0x8
_08079464: .4byte gUnknown_2037AB8
_08079464: .4byte gPaletteFade
_08079468:
movs r1, 0x2
ldrsh r0, [r5, r1]
@@ -1381,9 +1381,9 @@ _08079478:
lsls r0, 16
cmp r0, 0
beq _080794CC
ldr r2, _080794C0 @ =gUnknown_20371F8
ldr r2, _080794C0 @ =gPlttBufferUnfaded
ldr r4, _080794C4 @ =gUnknown_8EAE094
ldr r1, _080794C8 @ =gUnknown_20375F8
ldr r1, _080794C8 @ =gPlttBufferFaded
movs r0, 0xF1
lsls r0, 1
adds r1, r0
@@ -1401,14 +1401,14 @@ _080794AC:
bge _080794AC
b _080794F2
.align 2, 0
_080794C0: .4byte gUnknown_20371F8
_080794C0: .4byte gPlttBufferUnfaded
_080794C4: .4byte gUnknown_8EAE094
_080794C8: .4byte gUnknown_20375F8
_080794C8: .4byte gPlttBufferFaded
_080794CC:
movs r3, 0
ldr r2, _08079518 @ =gUnknown_20371F8
ldr r2, _08079518 @ =gPlttBufferUnfaded
ldr r0, _0807951C @ =gUnknown_8EAE094
ldr r1, _08079520 @ =gUnknown_20375F8
ldr r1, _08079520 @ =gPlttBufferFaded
adds r4, r0, 0x2
movs r0, 0xF1
lsls r0, 1
@@ -1432,7 +1432,7 @@ _080794F2:
beq _08079510
movs r0, 0x80
lsls r0, 8
ldr r2, _08079524 @ =gUnknown_2037AB8
ldr r2, _08079524 @ =gPaletteFade
ldrh r1, [r2, 0x4]
lsls r1, 21
lsrs r1, 27
@@ -1445,10 +1445,10 @@ _08079510:
pop {r0}
bx r0
.align 2, 0
_08079518: .4byte gUnknown_20371F8
_08079518: .4byte gPlttBufferUnfaded
_0807951C: .4byte gUnknown_8EAE094
_08079520: .4byte gUnknown_20375F8
_08079524: .4byte gUnknown_2037AB8
_08079520: .4byte gPlttBufferFaded
_08079524: .4byte gPaletteFade
thumb_func_end sub_807941C
thumb_func_start sub_8079528

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