Merge pull request #2 from pret/master

Taking files
This commit is contained in:
Swastik Baranwal 2018-12-27 16:00:22 +05:30 committed by GitHub
commit 95c3652551
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4367 changed files with 81763 additions and 28846 deletions

2
.gitignore vendored
View File

@ -17,6 +17,7 @@
sound/**/*.bin
src/*.s
tools/agbcc
tools/binutils
ld_script_ruby.txt
ld_script_sapphire.txt
*.map
@ -39,4 +40,3 @@ build/
.idea/
*.DS_Store
*.pl
tools/

View File

@ -1,18 +1,11 @@
Install [devkitARM](https://devkitpro.org/wiki/Getting_Started) (if you are on **Windows 10**, [do this instead](#windows-10)).
Run the following commands (first, see [this](#macos) if you are on **macOS** or [this](#old-windows) if you are on **old Windows**):
export DEVKITPRO=/opt/devkitpro
echo "export DEVKITPRO=$DEVKITPRO" >> ~/.bashrc
export DEVKITARM=$DEVKITPRO/devkitARM
echo "export DEVKITARM=$DEVKITARM" >> ~/.bashrc
git clone https://github.com/pret/pokefirered
git clone https://github.com/pret/agbcc
git clone https://github.com/pikalaxalt/agbcc -b new_layout_with_libs
cd agbcc
./build.sh
./install.sh ../pokefirered
make
make install prefix=../pokefirered
cd ../pokefirered
@ -49,4 +42,10 @@ 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.
Install the [Windows Subsystem for Linux](https://docs.microsoft.com/windows/wsl/install-win10), 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.

View File

@ -1,6 +1,7 @@
include $(DEVKITARM)/base_tools
export CPP := $(PREFIX)cpp
export LD := $(PREFIX)ld
AS := tools/binutils/bin/arm-none-eabi-as
CPP := $(CC) -E
LD := tools/binutils/bin/arm-none-eabi-ld
OBJCOPY := tools/binutils/bin/arm-none-eabi-objcopy
TITLE := POKEMON FIRE
GAME_CODE := BPRE
@ -84,10 +85,12 @@ clean: tidy
rm -f sound/direct_sound_samples/*.bin
rm -f $(SONG_OBJS)
find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.latfont' -o -iname '*.hwjpnfont' -o -iname '*.fwjpnfont' \) -exec rm {} +
@$(MAKE) -C berry_fix clean
tidy:
rm -f $(ROM) $(ELF) $(MAP)
rm -r build/*
@$(MAKE) -C berry_fix tidy
include graphics_file_rules.mk
@ -108,11 +111,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
@ -169,8 +167,11 @@ $(OBJ_DIR)/ld_script.ld: ld_script.txt $(OBJ_DIR)/sym_bss.ld $(OBJ_DIR)/sym_comm
cd $(OBJ_DIR) && sed -f ../../ld_script.sed ../../$< | sed "s#tools/#../../tools/#g" > ld_script.ld
$(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS)
cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(OBJS_REL) $(LIB)
cd $(OBJ_DIR) && ../../$(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(LIB)
$(ROM): $(ELF)
$(OBJCOPY) -O binary $< $@
$(FIX) $@ -p -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) --silent
berry_fix/berry_fix.gba:
@$(MAKE) -C berry_fix

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
@ -298,7 +298,7 @@ LoadBattleTextboxAndBackground: @ 800F420
movs r1, 0xC0
lsls r1, 19
bl LZDecompressVram
ldr r1, _0800F458 @ =gUnknown_8D0051C
ldr r1, _0800F458 @ =gFile_graphics_interface_menu_map_tilemap
movs r0, 0
movs r2, 0
movs r3, 0
@ -315,7 +315,7 @@ LoadBattleTextboxAndBackground: @ 800F420
bx r0
.align 2, 0
_0800F454: .4byte gUnknown_8D00000
_0800F458: .4byte gUnknown_8D0051C
_0800F458: .4byte gFile_graphics_interface_menu_map_tilemap
_0800F45C: .4byte gUnknown_8D004D8
thumb_func_end LoadBattleTextboxAndBackground
@ -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
@ -1152,13 +1152,13 @@ sub_800FAE0: @ 800FAE0
ands r0, r1
cmp r0, 0
beq _0800FB94
ldr r0, _0800FB68 @ =gUnknown_8E7737C
ldr r0, _0800FB68 @ =gFile_graphics_battle_transitions_vs_frame_sheet
ldr r1, _0800FB6C @ =0x06004000
bl LZDecompressVram
ldr r0, _0800FB70 @ =gUnknown_8E77598
ldr r0, _0800FB70 @ =gFile_graphics_battle_transitions_vs_sheet
ldr r1, _0800FB74 @ =0x06010000
bl LZDecompressVram
ldr r0, _0800FB78 @ =gUnknown_8E77570
ldr r0, _0800FB78 @ =gFile_graphics_battle_transitions_vs_frame_palette
movs r1, 0x60
movs r2, 0x20
bl LoadCompressedPalette
@ -1169,7 +1169,7 @@ sub_800FAE0: @ 800FAE0
ldr r1, _0800FB7C @ =0x00005c04
movs r0, 0xA
bl SetGpuReg
ldr r4, _0800FB80 @ =gUnknown_8E77464
ldr r4, _0800FB80 @ =gFile_graphics_battle_transitions_vs_frame_tilemap
movs r0, 0x1
adds r1, r4, 0
movs r2, 0
@ -1201,13 +1201,13 @@ sub_800FAE0: @ 800FAE0
b _0800FC26
.align 2, 0
_0800FB64: .4byte gBattleTypeFlags
_0800FB68: .4byte gUnknown_8E7737C
_0800FB68: .4byte gFile_graphics_battle_transitions_vs_frame_sheet
_0800FB6C: .4byte 0x06004000
_0800FB70: .4byte gUnknown_8E77598
_0800FB70: .4byte gFile_graphics_battle_transitions_vs_sheet
_0800FB74: .4byte 0x06010000
_0800FB78: .4byte gUnknown_8E77570
_0800FB78: .4byte gFile_graphics_battle_transitions_vs_frame_palette
_0800FB7C: .4byte 0x00005c04
_0800FB80: .4byte gUnknown_8E77464
_0800FB80: .4byte gFile_graphics_battle_transitions_vs_frame_tilemap
_0800FB84: .4byte gUnknown_202297A
_0800FB88: .4byte 0x0000ff5c
_0800FB8C: .4byte gUnknown_202297E
@ -1393,7 +1393,7 @@ _0800FCEC:
.align 2, 0
_0800FCF8: .4byte gUnknown_8D00000
_0800FCFC:
ldr r1, _0800FD10 @ =gUnknown_8D0051C
ldr r1, _0800FD10 @ =gFile_graphics_interface_menu_map_tilemap
movs r0, 0
movs r2, 0
movs r3, 0
@ -1402,7 +1402,7 @@ _0800FCFC:
bl CopyBgTilemapBufferToVram
b _0800FD94
.align 2, 0
_0800FD10: .4byte gUnknown_8D0051C
_0800FD10: .4byte gFile_graphics_interface_menu_map_tilemap
_0800FD14:
ldr r0, _0800FD20 @ =gUnknown_8D004D8
movs r1, 0

View File

@ -638,7 +638,7 @@ _080102C0:
mov r8, r4
_080102D8:
lsls r0, r5, 8
ldr r1, _08010348 @ =gUnknown_202211C
ldr r1, _08010348 @ =gBlockRecvBuffer + 4
adds r7, r0, r1
lsls r0, r5, 3
subs r0, r5
@ -694,14 +694,14 @@ _0801031C:
.align 2, 0
_08010340: .4byte gEnigmaBerries
_08010344: .4byte gLinkPlayers
_08010348: .4byte gUnknown_202211C
_08010348: .4byte gBlockRecvBuffer + 4
_0801034C:
movs r5, 0
ldr r4, _0801040C @ =gEnigmaBerries
mov r9, r4
_08010352:
lsls r0, r5, 8
ldr r1, _08010410 @ =gUnknown_202211C
ldr r1, _08010410 @ =gBlockRecvBuffer + 4
adds r7, r0, r1
movs r4, 0
adds r2, r5, 0x1
@ -797,7 +797,7 @@ _080103FC:
bx r0
.align 2, 0
_0801040C: .4byte gEnigmaBerries
_08010410: .4byte gUnknown_202211C
_08010410: .4byte gBlockRecvBuffer + 4
thumb_func_end sub_801017C
thumb_func_start sub_8010414
@ -810,7 +810,7 @@ sub_8010414: @ 8010414
lsls r1, 24
lsrs r3, r1, 24
movs r6, 0
ldr r0, _08010440 @ =gUnknown_2022118
ldr r0, _08010440 @ =gBlockRecvBuffer
ldrh r2, [r0]
movs r1, 0x80
lsls r1, 1
@ -824,7 +824,7 @@ sub_8010414: @ 8010414
movs r2, 0xC
b _0801044E
.align 2, 0
_08010440: .4byte gUnknown_2022118
_08010440: .4byte gBlockRecvBuffer
_08010444: .4byte gBattleTypeFlags
_08010448:
ldr r0, _0801048C @ =gBattleTypeFlags
@ -842,7 +842,7 @@ _08010458:
movs r2, 0
cmp r2, r4
bge _0801047C
ldr r1, _08010490 @ =gUnknown_2022118
ldr r1, _08010490 @ =gBlockRecvBuffer
mov r8, r1
movs r5, 0x80
lsls r5, 1
@ -867,7 +867,7 @@ _0801047C:
b _0801049A
.align 2, 0
_0801048C: .4byte gBattleTypeFlags
_08010490: .4byte gUnknown_2022118
_08010490: .4byte gBlockRecvBuffer
_08010494:
ldr r0, _080104EC @ =gBattleTypeFlags
ldr r1, [r0]
@ -1004,7 +1004,7 @@ _08010590:
movs r0, 0x1
strb r0, [r1]
_080105BC:
ldr r0, _080105D0 @ =gUnknown_3003F3C
ldr r0, _080105D0 @ =gWirelessCommType
ldrb r0, [r0]
cmp r0, 0
bne _080105C6
@ -1014,7 +1014,7 @@ _080105C6:
b _080108B8
.align 2, 0
_080105CC: .4byte gUnknown_2023E82
_080105D0: .4byte gUnknown_3003F3C
_080105D0: .4byte gWirelessCommType
_080105D4:
ldr r2, _08010640 @ =gBattleTypeFlags
ldr r1, [r2]
@ -1023,7 +1023,7 @@ _080105D4:
ands r0, r6
cmp r0, 0
beq _08010658
ldr r0, _08010644 @ =gUnknown_3003F64
ldr r0, _08010644 @ =gReceivedRemoteLinkPlayers
ldrb r0, [r0]
cmp r0, 0
bne _080105EC
@ -1056,7 +1056,7 @@ _080105EC:
ldr r0, _08010650 @ =gUnknown_2023E82
strb r6, [r0]
_0801062A:
ldr r0, _08010654 @ =gUnknown_3003F3C
ldr r0, _08010654 @ =gWirelessCommType
ldrb r0, [r0]
cmp r0, 0
bne _08010634
@ -1068,11 +1068,11 @@ _08010634:
b _080108B8
.align 2, 0
_08010640: .4byte gBattleTypeFlags
_08010644: .4byte gUnknown_3003F64
_08010644: .4byte gReceivedRemoteLinkPlayers
_08010648: .4byte gBattleStruct
_0801064C: .4byte 0x00000185
_08010650: .4byte gUnknown_2023E82
_08010654: .4byte gUnknown_3003F3C
_08010654: .4byte gWirelessCommType
_08010658:
movs r0, 0x4
orrs r1, r0
@ -1126,7 +1126,7 @@ _0801067E:
lsls r0, 8
orrs r1, r0
strh r1, [r2, 0xE]
ldr r0, _080106EC @ =gUnknown_2022118
ldr r0, _080106EC @ =gBlockRecvBuffer
lsls r1, r5, 8
adds r0, 0x2
adds r1, r0
@ -1139,7 +1139,7 @@ _0801067E:
_080106E0: .4byte sub_800F6FC
_080106E4: .4byte gTasks
_080106E8: .4byte gBattleStruct
_080106EC: .4byte gUnknown_2022118
_080106EC: .4byte gBlockRecvBuffer
_080106F0: .4byte gUnknown_2023E82
_080106F4:
bl sub_800A4BC
@ -1170,7 +1170,7 @@ _0801072A:
bl ResetBlockReceivedFlags
ldr r0, _08010740 @ =gEnemyParty
lsls r1, r5, 8
ldr r2, _08010744 @ =gUnknown_2022118
ldr r2, _08010744 @ =gBlockRecvBuffer
adds r1, r2
movs r2, 0xC8
bl memcpy
@ -1178,7 +1178,7 @@ _0801072A:
b _080108B2
.align 2, 0
_08010740: .4byte gEnemyParty
_08010744: .4byte gUnknown_2022118
_08010744: .4byte gBlockRecvBuffer
_08010748: .4byte gUnknown_2023E82
_0801074C:
bl sub_800A4BC
@ -1209,7 +1209,7 @@ _08010782:
bl ResetBlockReceivedFlags
ldr r0, _08010798 @ =gUnknown_20240F4
lsls r1, r5, 8
ldr r2, _0801079C @ =gUnknown_2022118
ldr r2, _0801079C @ =gBlockRecvBuffer
adds r1, r2
movs r2, 0xC8
bl memcpy
@ -1217,7 +1217,7 @@ _08010782:
b _080108B2
.align 2, 0
_08010798: .4byte gUnknown_20240F4
_0801079C: .4byte gUnknown_2022118
_0801079C: .4byte gBlockRecvBuffer
_080107A0: .4byte gUnknown_2023E82
_080107A4:
bl sub_800A4BC
@ -1246,7 +1246,7 @@ _080107CC:
bl ResetBlockReceivedFlags
ldr r4, _08010820 @ =gUnknown_20241BC
lsls r1, r5, 8
ldr r0, _08010824 @ =gUnknown_2022118
ldr r0, _08010824 @ =gBlockRecvBuffer
adds r1, r0
adds r0, r4, 0
movs r2, 0xC8
@ -1272,7 +1272,7 @@ _080107CC:
b _080108B2
.align 2, 0
_08010820: .4byte gUnknown_20241BC
_08010824: .4byte gUnknown_2022118
_08010824: .4byte gBlockRecvBuffer
_08010828: .4byte 0xfffffe70
_0801082C: .4byte 0xfffffed4
_08010830: .4byte gUnknown_2023E82
@ -1515,7 +1515,7 @@ _08010A14:
_08010A1E:
b _08010B82
_08010A20:
ldr r0, _08010A58 @ =gUnknown_3003F64
ldr r0, _08010A58 @ =gReceivedRemoteLinkPlayers
ldrb r0, [r0]
cmp r0, 0
bne _08010A2A
@ -1542,7 +1542,7 @@ _08010A36:
strb r0, [r5]
b _08010B82
.align 2, 0
_08010A58: .4byte gUnknown_3003F64
_08010A58: .4byte gReceivedRemoteLinkPlayers
_08010A5C:
bl GetBlockReceivedStatus
movs r1, 0xF
@ -1586,7 +1586,7 @@ _08010AA0:
beq _08010ABA
_08010AAC:
lsls r1, r4, 8
ldr r0, _08010AE4 @ =gUnknown_2022118
ldr r0, _08010AE4 @ =gBlockRecvBuffer
adds r1, r0
ldr r0, _08010AE8 @ =gUnknown_2022B58
movs r2, 0x60
@ -1613,14 +1613,14 @@ _08010ABA:
bl sub_8128198
b _08010B82
.align 2, 0
_08010AE4: .4byte gUnknown_2022118
_08010AE4: .4byte gBlockRecvBuffer
_08010AE8: .4byte gUnknown_2022B58
_08010AEC: .4byte gUnknown_2023E82
_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
@ -1628,20 +1628,20 @@ _08010AFC:
bne _08010B82
movs r0, 0x3
strb r0, [r5]
ldr r0, _08010B20 @ =gUnknown_3003F3C
ldr r0, _08010B20 @ =gWirelessCommType
ldrb r0, [r0]
cmp r0, 0
beq _08010B24
bl sub_800AB9C
b _08010B82
.align 2, 0
_08010B1C: .4byte gUnknown_2037AB8
_08010B20: .4byte gUnknown_3003F3C
_08010B1C: .4byte gPaletteFade
_08010B20: .4byte gWirelessCommType
_08010B24:
bl sub_800AAC0
b _08010B82
_08010B2A:
ldr r0, _08010B54 @ =gUnknown_3003F3C
ldr r0, _08010B54 @ =gWirelessCommType
ldrb r0, [r0]
cmp r0, 0
beq _08010B64
@ -1661,12 +1661,12 @@ _08010B2A:
bl SetMainCallback2
b _08010B82
.align 2, 0
_08010B54: .4byte gUnknown_3003F3C
_08010B54: .4byte gWirelessCommType
_08010B58: .4byte gBattleTypeFlags
_08010B5C: .4byte gMain
_08010B60: .4byte sub_800FE24
_08010B64:
ldr r0, _08010B90 @ =gUnknown_3003F64
ldr r0, _08010B90 @ =gReceivedRemoteLinkPlayers
ldrb r0, [r0]
cmp r0, 0
bne _08010B82
@ -1688,7 +1688,7 @@ _08010B82:
pop {r0}
bx r0
.align 2, 0
_08010B90: .4byte gUnknown_3003F64
_08010B90: .4byte gReceivedRemoteLinkPlayers
_08010B94: .4byte gBattleTypeFlags
_08010B98: .4byte gMain
_08010B9C: .4byte sub_800FE24
@ -1757,7 +1757,7 @@ _08010C18:
movs r0, 0x1
strb r0, [r1]
_08010C44:
ldr r0, _08010C58 @ =gUnknown_3003F3C
ldr r0, _08010C58 @ =gWirelessCommType
ldrb r0, [r0]
cmp r0, 0
bne _08010C4E
@ -1767,9 +1767,9 @@ _08010C4E:
b _080110F0
.align 2, 0
_08010C54: .4byte gUnknown_2023E82
_08010C58: .4byte gUnknown_3003F3C
_08010C58: .4byte gWirelessCommType
_08010C5C:
ldr r0, _08010CC0 @ =gUnknown_3003F64
ldr r0, _08010CC0 @ =gReceivedRemoteLinkPlayers
ldrb r0, [r0]
cmp r0, 0
bne _08010C66
@ -1805,7 +1805,7 @@ _08010C66:
adds r0, 0x1
strb r0, [r1]
_08010CAA:
ldr r0, _08010CD0 @ =gUnknown_3003F3C
ldr r0, _08010CD0 @ =gWirelessCommType
ldrb r0, [r0]
cmp r0, 0
bne _08010CB4
@ -1816,11 +1816,11 @@ _08010CB4:
bl sub_80FCD74
b _080110F0
.align 2, 0
_08010CC0: .4byte gUnknown_3003F64
_08010CC0: .4byte gReceivedRemoteLinkPlayers
_08010CC4: .4byte gBattleStruct
_08010CC8: .4byte 0x00000185
_08010CCC: .4byte gUnknown_2023E82
_08010CD0: .4byte gUnknown_3003F3C
_08010CD0: .4byte gWirelessCommType
_08010CD4:
bl GetBlockReceivedStatus
movs r1, 0xF
@ -1860,7 +1860,7 @@ _08010CE2:
strh r2, [r1, 0xE]
strh r2, [r1, 0x10]
adds r2, r1, 0
ldr r0, _08010D5C @ =gUnknown_2022118
ldr r0, _08010D5C @ =gBlockRecvBuffer
adds r3, r0, 0x2
ldr r5, _08010D60 @ =gLinkPlayers
movs r4, 0x3F
@ -1881,7 +1881,7 @@ _08010D4C: .4byte gDecompressionBuffer
_08010D50: .4byte gPlayerParty
_08010D54: .4byte sub_800F6FC
_08010D58: .4byte gTasks
_08010D5C: .4byte gUnknown_2022118
_08010D5C: .4byte gBlockRecvBuffer
_08010D60: .4byte gLinkPlayers
_08010D64:
cmp r0, 0x2
@ -1962,7 +1962,7 @@ _08010DEE:
subs r0, r7
lsls r0, 2
mov r8, r0
ldr r4, _08010E18 @ =gUnknown_2022118
ldr r4, _08010E18 @ =gBlockRecvBuffer
movs r5, 0
_08010E00:
cmp r6, r7
@ -1978,7 +1978,7 @@ _08010E00:
beq _08010E24
b _08010EBE
.align 2, 0
_08010E18: .4byte gUnknown_2022118
_08010E18: .4byte gBlockRecvBuffer
_08010E1C: .4byte gLinkPlayers
_08010E20:
cmp r0, 0x3
@ -2115,7 +2115,7 @@ _08010F0E:
subs r0, r7
lsls r0, 2
mov r8, r0
ldr r4, _08010F38 @ =gUnknown_2022118
ldr r4, _08010F38 @ =gBlockRecvBuffer
movs r5, 0
_08010F20:
cmp r6, r7
@ -2131,7 +2131,7 @@ _08010F20:
beq _08010F44
b _08010FDE
.align 2, 0
_08010F38: .4byte gUnknown_2022118
_08010F38: .4byte gBlockRecvBuffer
_08010F3C: .4byte gLinkPlayers
_08010F40:
cmp r0, 0x3
@ -2375,7 +2375,7 @@ sub_8011100: @ 8011100
ands r0, r1
cmp r0, 0
beq _08011158
ldr r2, _08011168 @ =gUnknown_20370D0
ldr r2, _08011168 @ =gSpecialVar_Result
ldr r1, _0801116C @ =gUnknown_2023E8A
movs r0, 0x3
strb r0, [r1]
@ -2398,7 +2398,7 @@ _08011158:
.align 2, 0
_08011160: .4byte gMain
_08011164: .4byte gBattleTypeFlags
_08011168: .4byte gUnknown_20370D0
_08011168: .4byte gSpecialVar_Result
_0801116C: .4byte gUnknown_2023E8A
_08011170: .4byte CB2_QuitRecordedBattle
thumb_func_end sub_8011100
@ -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
@ -11647,12 +11647,12 @@ _08015B74:
ands r0, r5
cmp r0, 0
beq _08015B86
ldr r0, _08015BE4 @ =gUnknown_3003F64
ldr r0, _08015BE4 @ =gReceivedRemoteLinkPlayers
ldrb r0, [r0]
cmp r0, 0
bne _08015BD4
_08015B86:
ldr r1, _08015BE8 @ =gUnknown_20370D0
ldr r1, _08015BE8 @ =gSpecialVar_Result
ldr r5, _08015BEC @ =gUnknown_2023E8A
ldrb r0, [r5]
strh r0, [r1]
@ -11696,8 +11696,8 @@ _08015BD4:
.align 2, 0
_08015BDC: .4byte gBattleTypeFlags
_08015BE0: .4byte gPlayerParty
_08015BE4: .4byte gUnknown_3003F64
_08015BE8: .4byte gUnknown_20370D0
_08015BE4: .4byte gReceivedRemoteLinkPlayers
_08015BE8: .4byte gSpecialVar_Result
_08015BEC: .4byte gUnknown_2023E8A
_08015BF0: .4byte gMain
_08015BF4: .4byte 0x00000439

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

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

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

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
@ -15161,7 +15161,7 @@ _080A96CC:
lsls r2, 1
adds r0, r2
str r1, [r0]
ldr r0, _080A975C @ =gUnknown_8D227E4
ldr r0, _080A975C @ =gFile_graphics_battle_anims_sprites_206_palette
bl LZDecompressWram
movs r4, 0
_080A9700:
@ -15206,7 +15206,7 @@ _080A9700:
_080A9750: .4byte 0x000027de
_080A9754: .4byte 0x00002710
_080A9758: .4byte gMonSpritesGfxPtr
_080A975C: .4byte gUnknown_8D227E4
_080A975C: .4byte gFile_graphics_battle_anims_sprites_206_palette
thumb_func_end sub_80A96B4
thumb_func_start sub_80A9760
@ -15955,15 +15955,15 @@ _080A9D2A:
bl sub_80752A0
mov r0, sp
ldrb r0, [r0, 0x9]
ldr r1, _080A9DAC @ =gUnknown_8D23F4C
ldr r1, _080A9DAC @ =gFile_graphics_battle_anims_backgrounds_attract_tilemap
bl sub_807543C
mov r0, sp
ldrb r0, [r0, 0x9]
ldr r1, _080A9DB0 @ =gUnknown_8D234B4
ldr r1, _080A9DB0 @ =gFile_graphics_battle_anims_backgrounds_attract_sheet
mov r2, sp
ldrh r2, [r2, 0xA]
bl sub_80753B4
ldr r0, _080A9DB4 @ =gUnknown_8D23F24
ldr r0, _080A9DB4 @ =gFile_graphics_battle_anims_backgrounds_attract_palette
mov r1, sp
ldrb r1, [r1, 0x8]
lsls r1, 4
@ -15995,9 +15995,9 @@ _080A9D88:
_080A9DA0: .4byte 0x00003f42
_080A9DA4: .4byte gUnknown_2022978
_080A9DA8: .4byte gUnknown_202297A
_080A9DAC: .4byte gUnknown_8D23F4C
_080A9DB0: .4byte gUnknown_8D234B4
_080A9DB4: .4byte gUnknown_8D23F24
_080A9DAC: .4byte gFile_graphics_battle_anims_backgrounds_attract_tilemap
_080A9DB0: .4byte gFile_graphics_battle_anims_backgrounds_attract_sheet
_080A9DB4: .4byte gFile_graphics_battle_anims_backgrounds_attract_palette
_080A9DB8: .4byte gTasks
_080A9DBC: .4byte sub_80A9DC0
thumb_func_end sub_80A9CE8
@ -16214,7 +16214,7 @@ _080A9F52:
lsls r0, 24
cmp r0, 0
beq _080A9F98
ldr r0, _080A9F94 @ =gUnknown_8E7F874
ldr r0, _080A9F94 @ =gFile_graphics_battle_anims_backgrounds_scary_face_contest_tilemap
ldr r1, [sp, 0x4]
bl LZDecompressVram
b _080A9FC6
@ -16222,7 +16222,7 @@ _080A9F52:
_080A9F88: .4byte 0x00003f42
_080A9F8C: .4byte gUnknown_2022978
_080A9F90: .4byte gUnknown_202297A
_080A9F94: .4byte gUnknown_8E7F874
_080A9F94: .4byte gFile_graphics_battle_anims_backgrounds_scary_face_contest_tilemap
_080A9F98:
ldr r0, _080A9FB4 @ =gUnknown_2037F1B
ldrb r0, [r0]
@ -16233,25 +16233,25 @@ _080A9F98:
bne _080A9FBC
mov r0, sp
ldrb r0, [r0, 0x9]
ldr r1, _080A9FB8 @ =gUnknown_8E7F4AC
ldr r1, _080A9FB8 @ =gFile_graphics_battle_anims_backgrounds_scary_face_player_tilemap
bl sub_807543C
b _080A9FC6
.align 2, 0
_080A9FB4: .4byte gUnknown_2037F1B
_080A9FB8: .4byte gUnknown_8E7F4AC
_080A9FB8: .4byte gFile_graphics_battle_anims_backgrounds_scary_face_player_tilemap
_080A9FBC:
mov r0, sp
ldrb r0, [r0, 0x9]
ldr r1, _080AA010 @ =gUnknown_8E7F690
ldr r1, _080AA010 @ =gFile_graphics_battle_anims_backgrounds_scary_face_opponent_tilemap
bl sub_807543C
_080A9FC6:
mov r0, sp
ldrb r0, [r0, 0x9]
ldr r1, _080AA014 @ =gUnknown_8D24BCC
ldr r1, _080AA014 @ =gFile_graphics_battle_anims_backgrounds_scary_face_sheet
mov r2, sp
ldrh r2, [r2, 0xA]
bl sub_80753B4
ldr r0, _080AA018 @ =gUnknown_8D24BA4
ldr r0, _080AA018 @ =gFile_graphics_battle_anims_backgrounds_scary_face_palette
mov r1, sp
ldrb r1, [r1, 0x8]
lsls r1, 4
@ -16280,9 +16280,9 @@ _080A9FFA:
pop {r0}
bx r0
.align 2, 0
_080AA010: .4byte gUnknown_8E7F690
_080AA014: .4byte gUnknown_8D24BCC
_080AA018: .4byte gUnknown_8D24BA4
_080AA010: .4byte gFile_graphics_battle_anims_backgrounds_scary_face_opponent_tilemap
_080AA014: .4byte gFile_graphics_battle_anims_backgrounds_scary_face_sheet
_080AA018: .4byte gFile_graphics_battle_anims_backgrounds_scary_face_palette
_080AA01C: .4byte gTasks
_080AA020: .4byte sub_80AA024
thumb_func_end sub_80A9F10
@ -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
@ -18865,23 +18865,23 @@ sub_80AB38C: @ 80AB38C
bne _080AB408
mov r0, sp
ldrb r0, [r0, 0x9]
ldr r1, _080AB404 @ =gUnknown_8E81D14
ldr r1, _080AB404 @ =gFile_graphics_unknown_unknown_E81D14_tilemap
bl sub_807543C
b _080AB42E
.align 2, 0
_080AB3FC: .4byte 0x00003f42
_080AB400: .4byte gUnknown_2037F1A
_080AB404: .4byte gUnknown_8E81D14
_080AB404: .4byte gFile_graphics_unknown_unknown_E81D14_tilemap
_080AB408:
mov r0, sp
ldrb r0, [r0, 0x9]
ldr r1, _080AB414 @ =gUnknown_8E81FE4
ldr r1, _080AB414 @ =gFile_graphics_unknown_unknown_E81FE4_tilemap
bl sub_807543C
b _080AB42E
.align 2, 0
_080AB414: .4byte gUnknown_8E81FE4
_080AB414: .4byte gFile_graphics_unknown_unknown_E81FE4_tilemap
_080AB418:
ldr r0, _080AB458 @ =gUnknown_8E822B8
ldr r0, _080AB458 @ =gFile_graphics_unknown_unknown_E822B8_tilemap
ldr r1, [sp, 0x4]
bl LZDecompressVram
mov r0, sp
@ -18893,7 +18893,7 @@ _080AB418:
_080AB42E:
mov r0, sp
ldrb r0, [r0, 0x9]
ldr r1, _080AB45C @ =gUnknown_8E809CC
ldr r1, _080AB45C @ =gFile_graphics_battle_anims_backgrounds_water_sheet
mov r2, sp
ldrh r2, [r2, 0xA]
bl sub_80753B4
@ -18902,7 +18902,7 @@ _080AB42E:
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080AB468
ldr r0, _080AB464 @ =gUnknown_8E81CEC
ldr r0, _080AB464 @ =gFile_graphics_battle_anims_backgrounds_water_palette
mov r1, sp
ldrb r1, [r1, 0x8]
lsls r1, 4
@ -18910,12 +18910,12 @@ _080AB42E:
bl LoadCompressedPalette
b _080AB476
.align 2, 0
_080AB458: .4byte gUnknown_8E822B8
_080AB45C: .4byte gUnknown_8E809CC
_080AB458: .4byte gFile_graphics_unknown_unknown_E822B8_tilemap
_080AB45C: .4byte gFile_graphics_battle_anims_backgrounds_water_sheet
_080AB460: .4byte gUnknown_2037F02
_080AB464: .4byte gUnknown_8E81CEC
_080AB464: .4byte gFile_graphics_battle_anims_backgrounds_water_palette
_080AB468:
ldr r0, _080AB4E0 @ =gUnknown_8E7BAB0
ldr r0, _080AB4E0 @ =gFile_graphics_battle_anims_backgrounds_water_muddy_palette
mov r1, sp
ldrb r1, [r1, 0x8]
lsls r1, 4
@ -18973,7 +18973,7 @@ _080AB476:
strh r0, [r7, 0xE]
b _080AB552
.align 2, 0
_080AB4E0: .4byte gUnknown_8E7BAB0
_080AB4E0: .4byte gFile_graphics_battle_anims_backgrounds_water_muddy_palette
_080AB4E4: .4byte sub_80AB79C
_080AB4E8: .4byte gTasks
_080AB4EC: .4byte 0x0000ffb0
@ -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
@ -28163,7 +28163,7 @@ _080AFB26:
bl LoadBgTiles
mov r0, sp
ldrb r0, [r0, 0x9]
ldr r1, _080AFBB0 @ =gUnknown_8E7F1F4
ldr r1, _080AFBB0 @ =gFile_graphics_battle_anims_backgrounds_fog_tilemap
bl sub_807543C
ldr r0, _080AFBB4 @ =gUnknown_83C2CE0
mov r1, sp
@ -28198,7 +28198,7 @@ _080AFBA0: .4byte 0x00003f42
_080AFBA4: .4byte gUnknown_2022978
_080AFBA8: .4byte gUnknown_202297A
_080AFBAC: .4byte gUnknown_83C3540
_080AFBB0: .4byte gUnknown_8E7F1F4
_080AFBB0: .4byte gFile_graphics_battle_anims_backgrounds_fog_tilemap
_080AFBB4: .4byte gUnknown_83C2CE0
_080AFBB8: .4byte gTasks
_080AFBBC: .4byte sub_80AFBC0
@ -28474,7 +28474,7 @@ _080AFDC2:
bl LoadBgTiles
mov r0, sp
ldrb r0, [r0, 0x9]
ldr r1, _080AFE50 @ =gUnknown_8E7F1F4
ldr r1, _080AFE50 @ =gFile_graphics_battle_anims_backgrounds_fog_tilemap
bl sub_807543C
ldr r0, _080AFE54 @ =gUnknown_83C2CE0
mov r1, sp
@ -28511,7 +28511,7 @@ _080AFE40: .4byte 0x00003f42
_080AFE44: .4byte gUnknown_2022978
_080AFE48: .4byte gUnknown_202297A
_080AFE4C: .4byte gUnknown_83C3540
_080AFE50: .4byte gUnknown_8E7F1F4
_080AFE50: .4byte gFile_graphics_battle_anims_backgrounds_fog_tilemap
_080AFE54: .4byte gUnknown_83C2CE0
_080AFE58: .4byte gTasks
_080AFE5C: .4byte 0x0000ffff
@ -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
@ -38100,15 +38100,15 @@ _080B4854:
bl sub_80752A0
mov r0, sp
ldrb r0, [r0, 0x9]
ldr r1, _080B48F0 @ =gUnknown_8E79354
ldr r1, _080B48F0 @ =gFile_graphics_battle_anims_backgrounds_sandstorm_brew_tilemap
bl sub_807543C
mov r0, sp
ldrb r0, [r0, 0x9]
ldr r1, _080B48F4 @ =gUnknown_8E794D0
ldr r1, _080B48F4 @ =gFile_graphics_battle_anims_backgrounds_sandstorm_brew_sheet
mov r2, sp
ldrh r2, [r2, 0xA]
bl sub_80753B4
ldr r0, _080B48F8 @ =gUnknown_8E799FC
ldr r0, _080B48F8 @ =gFile_graphics_battle_anims_sprites_261_palette
mov r1, sp
ldrb r1, [r1, 0x8]
lsls r1, 4
@ -38154,9 +38154,9 @@ _080B48CA:
_080B48E4: .4byte 0x00003f42
_080B48E8: .4byte gUnknown_2022978
_080B48EC: .4byte gUnknown_202297A
_080B48F0: .4byte gUnknown_8E79354
_080B48F4: .4byte gUnknown_8E794D0
_080B48F8: .4byte gUnknown_8E799FC
_080B48F0: .4byte gFile_graphics_battle_anims_backgrounds_sandstorm_brew_tilemap
_080B48F4: .4byte gFile_graphics_battle_anims_backgrounds_sandstorm_brew_sheet
_080B48F8: .4byte gFile_graphics_battle_anims_sprites_261_palette
_080B48FC: .4byte gUnknown_2037F02
_080B4900: .4byte gUnknown_2037F1A
_080B4904: .4byte gTasks
@ -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
@ -42800,11 +42800,11 @@ _080B6D28:
bl sub_80752C8
add r0, sp, 0xC
ldrb r0, [r0, 0x9]
ldr r1, _080B6D84 @ =gUnknown_8D24BCC
ldr r1, _080B6D84 @ =gFile_graphics_battle_anims_backgrounds_scary_face_sheet
add r2, sp, 0xC
ldrh r2, [r2, 0xA]
bl sub_80753B4
ldr r0, _080B6D88 @ =gUnknown_8D24BA4
ldr r0, _080B6D88 @ =gFile_graphics_battle_anims_backgrounds_scary_face_palette
add r1, sp, 0xC
ldrb r1, [r1, 0x8]
lsls r1, 4
@ -42814,8 +42814,8 @@ _080B6D28:
.align 2, 0
_080B6D7C: .4byte gUnknown_202297C
_080B6D80: .4byte gUnknown_202297E
_080B6D84: .4byte gUnknown_8D24BCC
_080B6D88: .4byte gUnknown_8D24BA4
_080B6D84: .4byte gFile_graphics_battle_anims_backgrounds_scary_face_sheet
_080B6D88: .4byte gFile_graphics_battle_anims_backgrounds_scary_face_palette
_080B6D8C:
add r0, sp, 0xC
movs r1, 0x2
@ -42830,7 +42830,7 @@ _080B6D8C:
lsls r4, 1
adds r0, r4
str r1, [r0]
ldr r0, _080B6E00 @ =gUnknown_8E7F4AC
ldr r0, _080B6E00 @ =gFile_graphics_battle_anims_backgrounds_scary_face_player_tilemap
bl LZDecompressWram
add r0, sp, 0xC
ldrb r0, [r0, 0x8]
@ -42867,7 +42867,7 @@ _080B6D8C:
b _080B6F1E
.align 2, 0
_080B6DFC: .4byte gMonSpritesGfxPtr
_080B6E00: .4byte gUnknown_8E7F4AC
_080B6E00: .4byte gFile_graphics_battle_anims_backgrounds_scary_face_player_tilemap
_080B6E04:
ldrh r0, [r6, 0xA]
adds r0, 0x1
@ -46190,15 +46190,15 @@ _080B8828:
bl sub_80752A0
mov r0, sp
ldrb r0, [r0, 0x9]
ldr r1, _080B88C4 @ =gUnknown_8D1D388
ldr r1, _080B88C4 @ =gFile_graphics_battle_anims_masks_metal_shine_tilemap
bl sub_807543C
mov r0, sp
ldrb r0, [r0, 0x9]
ldr r1, _080B88C8 @ =gUnknown_8D1D224
ldr r1, _080B88C8 @ =gFile_graphics_battle_anims_masks_metal_shine_sheet
mov r2, sp
ldrh r2, [r2, 0xA]
bl sub_80753B4
ldr r0, _080B88CC @ =gUnknown_8D1D360
ldr r0, _080B88CC @ =gFile_graphics_battle_anims_masks_metal_shine_palette
mov r1, sp
ldrb r1, [r1, 0x8]
lsls r1, 4
@ -46236,9 +46236,9 @@ _080B8828:
_080B88B8: .4byte gBattlerPartyIndexes
_080B88BC: .4byte gPlayerParty
_080B88C0: .4byte gUnknown_2037F1A
_080B88C4: .4byte gUnknown_8D1D388
_080B88C8: .4byte gUnknown_8D1D224
_080B88CC: .4byte gUnknown_8D1D360
_080B88C4: .4byte gFile_graphics_battle_anims_masks_metal_shine_tilemap
_080B88C8: .4byte gFile_graphics_battle_anims_masks_metal_shine_sheet
_080B88CC: .4byte gFile_graphics_battle_anims_masks_metal_shine_palette
_080B88D0: .4byte gUnknown_2022978
_080B88D4: .4byte gSprites
_080B88D8: .4byte gUnknown_202297A
@ -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
@ -51145,7 +51145,7 @@ _080BAE5C:
bl sub_80752A0
mov r0, sp
ldrb r0, [r0, 0x9]
ldr r1, _080BAF18 @ =gUnknown_8D20858
ldr r1, _080BAF18 @ =gFile_graphics_battle_anims_masks_curse_tilemap
bl sub_807543C
bl sub_8073788
lsls r0, 24
@ -51160,7 +51160,7 @@ _080BAE5C:
_080BAEAC:
mov r0, sp
ldrb r0, [r0, 0x9]
ldr r1, _080BAF1C @ =gUnknown_8D2083C
ldr r1, _080BAF1C @ =gFile_graphics_battle_anims_masks_curse_sheet
mov r2, sp
ldrh r2, [r2, 0xA]
bl sub_80753B4
@ -51207,8 +51207,8 @@ _080BAEAC:
_080BAF0C: .4byte gBattlerPartyIndexes
_080BAF10: .4byte gPlayerParty
_080BAF14: .4byte gUnknown_2037F1A
_080BAF18: .4byte gUnknown_8D20858
_080BAF1C: .4byte gUnknown_8D2083C
_080BAF18: .4byte gFile_graphics_battle_anims_masks_curse_tilemap
_080BAF1C: .4byte gFile_graphics_battle_anims_masks_curse_sheet
_080BAF20: .4byte gUnknown_83E7CC8
_080BAF24: .4byte gUnknown_2022978
_080BAF28: .4byte gSprites
@ -51659,17 +51659,17 @@ _080BB2E2:
bne _080BB30C
mov r0, sp
ldrb r0, [r0, 0x9]
ldr r1, _080BB308 @ =gUnknown_8D2DB04
ldr r1, _080BB308 @ =gFile_graphics_battle_anims_masks_stat_tilemap_1_tilemap
bl sub_807543C
b _080BB316
.align 2, 0
_080BB300: .4byte gUnknown_2023D44
_080BB304: .4byte gUnknown_20399B4
_080BB308: .4byte gUnknown_8D2DB04
_080BB308: .4byte gFile_graphics_battle_anims_masks_stat_tilemap_1_tilemap
_080BB30C:
mov r0, sp
ldrb r0, [r0, 0x9]
ldr r1, _080BB354 @ =gUnknown_8D2DC20
ldr r1, _080BB354 @ =gFile_graphics_battle_anims_masks_stat_tilemap_2_tilemap
bl sub_807543C
_080BB316:
bl sub_8073788
@ -51685,7 +51685,7 @@ _080BB316:
_080BB32E:
mov r0, sp
ldrb r0, [r0, 0x9]
ldr r1, _080BB358 @ =gUnknown_8D2D8F4
ldr r1, _080BB358 @ =gFile_graphics_battle_anims_masks_stat_sheet
mov r2, sp
ldrh r2, [r2, 0xA]
bl sub_80753B4
@ -51701,8 +51701,8 @@ _080BB32E:
ldr r0, [r0]
mov pc, r0
.align 2, 0
_080BB354: .4byte gUnknown_8D2DC20
_080BB358: .4byte gUnknown_8D2D8F4
_080BB354: .4byte gFile_graphics_battle_anims_masks_stat_tilemap_2_tilemap
_080BB358: .4byte gFile_graphics_battle_anims_masks_stat_sheet
_080BB35C: .4byte gUnknown_20399B4
_080BB360: .4byte _080BB364
.align 2, 0
@ -51715,37 +51715,37 @@ _080BB364:
.4byte _080BB3A8
.4byte _080BB3B0
_080BB380:
ldr r0, _080BB384 @ =gUnknown_8D2DD5C
ldr r0, _080BB384 @ =gFile_graphics_battle_anims_masks_stat2_palette
b _080BB3B2
.align 2, 0
_080BB384: .4byte gUnknown_8D2DD5C
_080BB384: .4byte gFile_graphics_battle_anims_masks_stat2_palette
_080BB388:
ldr r0, _080BB38C @ =gUnknown_8D2DD3C
ldr r0, _080BB38C @ =gFile_graphics_battle_anims_masks_stat1_palette
b _080BB3B2
.align 2, 0
_080BB38C: .4byte gUnknown_8D2DD3C
_080BB38C: .4byte gFile_graphics_battle_anims_masks_stat1_palette
_080BB390:
ldr r0, _080BB394 @ =gUnknown_8D2DD7C
ldr r0, _080BB394 @ =gFile_graphics_battle_anims_masks_stat3_palette
b _080BB3B2
.align 2, 0
_080BB394: .4byte gUnknown_8D2DD7C
_080BB394: .4byte gFile_graphics_battle_anims_masks_stat3_palette
_080BB398:
ldr r0, _080BB39C @ =gUnknown_8D2DD9C
ldr r0, _080BB39C @ =gFile_graphics_battle_anims_masks_stat4_palette
b _080BB3B2
.align 2, 0
_080BB39C: .4byte gUnknown_8D2DD9C
_080BB39C: .4byte gFile_graphics_battle_anims_masks_stat4_palette
_080BB3A0:
ldr r0, _080BB3A4 @ =gUnknown_8D2DDDC
ldr r0, _080BB3A4 @ =gFile_graphics_battle_anims_masks_stat6_palette
b _080BB3B2
.align 2, 0
_080BB3A4: .4byte gUnknown_8D2DDDC
_080BB3A4: .4byte gFile_graphics_battle_anims_masks_stat6_palette
_080BB3A8:
ldr r0, _080BB3AC @ =gUnknown_8D2DDFC
ldr r0, _080BB3AC @ =gFile_graphics_battle_anims_masks_stat7_palette
b _080BB3B2
.align 2, 0
_080BB3AC: .4byte gUnknown_8D2DDFC
_080BB3AC: .4byte gFile_graphics_battle_anims_masks_stat7_palette
_080BB3B0:
ldr r0, _080BB3C0 @ =gUnknown_8D2DE1C
ldr r0, _080BB3C0 @ =gFile_graphics_battle_anims_masks_stat8_palette
_080BB3B2:
mov r1, sp
ldrb r1, [r1, 0x8]
@ -51754,9 +51754,9 @@ _080BB3B2:
bl LoadCompressedPalette
b _080BB3D2
.align 2, 0
_080BB3C0: .4byte gUnknown_8D2DE1C
_080BB3C0: .4byte gFile_graphics_battle_anims_masks_stat8_palette
_080BB3C4:
ldr r0, _080BB3FC @ =gUnknown_8D2DDBC
ldr r0, _080BB3FC @ =gFile_graphics_battle_anims_masks_stat5_palette
mov r1, sp
ldrb r1, [r1, 0x8]
lsls r1, 4
@ -51785,7 +51785,7 @@ _080BB3D2:
ldr r1, _080BB410 @ =0x0000fffd
b _080BB420
.align 2, 0
_080BB3FC: .4byte gUnknown_8D2DDBC
_080BB3FC: .4byte gFile_graphics_battle_anims_masks_stat5_palette
_080BB400: .4byte gUnknown_2022978
_080BB404: .4byte gUnknown_202297A
_080BB408: .4byte gUnknown_20399B4
@ -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

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
@ -3410,15 +3410,15 @@ _080DFCCE:
bl sub_80752A0
mov r0, sp
ldrb r0, [r0, 0x9]
ldr r1, _080DFD1C @ =gUnknown_8D2A8C0
ldr r1, _080DFD1C @ =gFile_graphics_battle_anims_masks_morning_sun_tilemap
bl sub_807543C
mov r0, sp
ldrb r0, [r0, 0x9]
ldr r1, _080DFD20 @ =gUnknown_8D2A808
ldr r1, _080DFD20 @ =gFile_graphics_battle_anims_masks_morning_sun_sheet
mov r2, sp
ldrh r2, [r2, 0xA]
bl sub_80753B4
ldr r0, _080DFD24 @ =gUnknown_8D2A8A8
ldr r0, _080DFD24 @ =gFile_graphics_battle_anims_masks_morning_sun_palette
mov r1, sp
ldrb r1, [r1, 0x8]
lsls r1, 4
@ -3439,9 +3439,9 @@ _080DFCCE:
b _080DFD58
.align 2, 0
_080DFD18: .4byte 0x00003f42
_080DFD1C: .4byte gUnknown_8D2A8C0
_080DFD20: .4byte gUnknown_8D2A808
_080DFD24: .4byte gUnknown_8D2A8A8
_080DFD1C: .4byte gFile_graphics_battle_anims_masks_morning_sun_tilemap
_080DFD20: .4byte gFile_graphics_battle_anims_masks_morning_sun_sheet
_080DFD24: .4byte gFile_graphics_battle_anims_masks_morning_sun_palette
_080DFD28: .4byte gUnknown_2022978
_080DFD2C: .4byte 0x0000ffc8
_080DFD30:
@ -4052,15 +4052,15 @@ _080E01FC:
bl sub_80752A0
mov r0, sp
ldrb r0, [r0, 0x9]
ldr r1, _080E0250 @ =gUnknown_8D2A8C0
ldr r1, _080E0250 @ =gFile_graphics_battle_anims_masks_morning_sun_tilemap
bl sub_807543C
mov r0, sp
ldrb r0, [r0, 0x9]
ldr r1, _080E0254 @ =gUnknown_8D2A808
ldr r1, _080E0254 @ =gFile_graphics_battle_anims_masks_morning_sun_sheet
mov r2, sp
ldrh r2, [r2, 0xA]
bl sub_80753B4
ldr r0, _080E0258 @ =gUnknown_8D2A8A8
ldr r0, _080E0258 @ =gFile_graphics_battle_anims_masks_morning_sun_palette
mov r1, sp
ldrb r1, [r1, 0x8]
lsls r1, 4
@ -4083,9 +4083,9 @@ _080E01FC:
.align 2, 0
_080E0248: .4byte 0x00003f42
_080E024C: .4byte 0x00000d03
_080E0250: .4byte gUnknown_8D2A8C0
_080E0254: .4byte gUnknown_8D2A808
_080E0258: .4byte gUnknown_8D2A8A8
_080E0250: .4byte gFile_graphics_battle_anims_masks_morning_sun_tilemap
_080E0254: .4byte gFile_graphics_battle_anims_masks_morning_sun_sheet
_080E0258: .4byte gFile_graphics_battle_anims_masks_morning_sun_palette
_080E025C: .4byte gUnknown_2022978
_080E0260: .4byte 0x0000ffc8
_080E0264:
@ -7994,11 +7994,11 @@ sub_80E2084: @ 80E2084
str r1, [sp, 0x8]
movs r1, 0x1E
str r1, [sp, 0xC]
ldr r1, _080E20C8 @ =gUnknown_8D2DE3C
ldr r1, _080E20C8 @ =gFile_graphics_battle_anims_masks_cure_bubbles_sheet
str r1, [sp, 0x10]
ldr r1, _080E20CC @ =gUnknown_8D2DF98
ldr r1, _080E20CC @ =gFile_graphics_battle_anims_masks_cure_bubbles_tilemap
str r1, [sp, 0x14]
ldr r1, _080E20D0 @ =gUnknown_8D2DF78
ldr r1, _080E20D0 @ =gFile_graphics_battle_anims_masks_cure_bubbles_palette
str r1, [sp, 0x18]
movs r1, 0
bl sub_80BBA20
@ -8008,9 +8008,9 @@ sub_80E2084: @ 80E2084
.align 2, 0
_080E20C0: .4byte gUnknown_2037F1A
_080E20C4: .4byte gUnknown_2037F02
_080E20C8: .4byte gUnknown_8D2DE3C
_080E20CC: .4byte gUnknown_8D2DF98
_080E20D0: .4byte gUnknown_8D2DF78
_080E20C8: .4byte gFile_graphics_battle_anims_masks_cure_bubbles_sheet
_080E20CC: .4byte gFile_graphics_battle_anims_masks_cure_bubbles_tilemap
_080E20D0: .4byte gFile_graphics_battle_anims_masks_cure_bubbles_palette
thumb_func_end sub_80E2084
thumb_func_start sub_80E20D4

View File

@ -154,15 +154,15 @@ sub_80EEC0C: @ 80EEC0C
bl sub_80752A0
mov r0, sp
ldrb r0, [r0, 0x9]
ldr r1, _080EEDD8 @ =gUnknown_8D2EC70
ldr r1, _080EEDD8 @ =gFile_graphics_battle_anims_masks_unknown_D2EC24_tilemap
bl sub_807543C
mov r0, sp
ldrb r0, [r0, 0x9]
ldr r1, _080EEDDC @ =gUnknown_8D2EC24
ldr r1, _080EEDDC @ =gFile_graphics_battle_anims_masks_unknown_D2EC24_sheet
mov r2, sp
ldrh r2, [r2, 0xA]
bl sub_80753B4
ldr r0, _080EEDE0 @ =gUnknown_8D2DF78
ldr r0, _080EEDE0 @ =gFile_graphics_battle_anims_masks_cure_bubbles_palette
mov r1, sp
ldrb r1, [r1, 0x8]
lsls r1, 4
@ -212,9 +212,9 @@ _080EEDC8: .4byte 0x00003f42
_080EEDCC: .4byte gUnknown_3004FF0
_080EEDD0: .4byte gSprites
_080EEDD4: .4byte SpriteCallbackDummy
_080EEDD8: .4byte gUnknown_8D2EC70
_080EEDDC: .4byte gUnknown_8D2EC24
_080EEDE0: .4byte gUnknown_8D2DF78
_080EEDD8: .4byte gFile_graphics_battle_anims_masks_unknown_D2EC24_tilemap
_080EEDDC: .4byte gFile_graphics_battle_anims_masks_unknown_D2EC24_sheet
_080EEDE0: .4byte gFile_graphics_battle_anims_masks_cure_bubbles_palette
_080EEDE4: .4byte gUnknown_2022978
_080EEDE8: .4byte gUnknown_202297A
_080EEDEC: .4byte gTasks
@ -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

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
@ -677,7 +677,7 @@ sub_80E7AC4: @ 80E7AC4
lsls r0, 24
cmp r0, 0
bne _080E7B34
ldr r0, _080E7B20 @ =gUnknown_203AD30
ldr r0, _080E7B20 @ =gSpecialVar_ItemId
ldrh r0, [r0]
cmp r0, 0xD
bne _080E7B34
@ -700,14 +700,14 @@ sub_80E7AC4: @ 80E7AC4
.align 2, 0
_080E7B14: .4byte gMain
_080E7B18: .4byte sub_8011100
_080E7B1C: .4byte gUnknown_2037AB8
_080E7B20: .4byte gUnknown_203AD30
_080E7B1C: .4byte gPaletteFade
_080E7B20: .4byte gSpecialVar_ItemId
_080E7B24: .4byte gBattleTypeFlags
_080E7B28: .4byte gUnknown_3004FE0
_080E7B2C: .4byte gActiveBattler
_080E7B30: .4byte sub_80E8704
_080E7B34:
ldr r0, _080E7B48 @ =gUnknown_203AD30
ldr r0, _080E7B48 @ =gSpecialVar_ItemId
ldrh r1, [r0]
movs r0, 0x1
bl EmitOneReturnValue
@ -716,7 +716,7 @@ _080E7B42:
pop {r0}
bx r0
.align 2, 0
_080E7B48: .4byte gUnknown_203AD30
_080E7B48: .4byte gSpecialVar_ItemId
thumb_func_end sub_80E7AC4
thumb_func_start sub_80E7B4C
@ -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
@ -2341,7 +2341,7 @@ _080E8880:
cmp r4, 0
bne _080E88AA
bl sub_80EB524
ldr r0, _080E88B8 @ =gUnknown_203AD30
ldr r0, _080E88B8 @ =gSpecialVar_ItemId
ldrh r1, [r0]
movs r0, 0x1
bl EmitOneReturnValue
@ -2356,8 +2356,8 @@ _080E88AA:
pop {r0}
bx r0
.align 2, 0
_080E88B4: .4byte gUnknown_2037AB8
_080E88B8: .4byte gUnknown_203AD30
_080E88B4: .4byte gPaletteFade
_080E88B8: .4byte gSpecialVar_ItemId
_080E88BC: .4byte gBattleStruct
thumb_func_end sub_80E8704

View File

@ -2330,11 +2330,11 @@ _0802F600:
thumb_func_start sub_802F610
sub_802F610: @ 802F610
push {lr}
ldr r0, _0802F64C @ =gUnknown_3003F3C
ldr r0, _0802F64C @ =gWirelessCommType
ldrb r0, [r0]
cmp r0, 0
bne _0802F664
ldr r0, _0802F650 @ =gUnknown_3003F64
ldr r0, _0802F650 @ =gReceivedRemoteLinkPlayers
ldrb r0, [r0]
cmp r0, 0
bne _0802F694
@ -2356,8 +2356,8 @@ sub_802F610: @ 802F610
bl FreeAllWindowBuffers
b _0802F694
.align 2, 0
_0802F64C: .4byte gUnknown_3003F3C
_0802F650: .4byte gUnknown_3003F64
_0802F64C: .4byte gWirelessCommType
_0802F650: .4byte gReceivedRemoteLinkPlayers
_0802F654: .4byte gMain
_0802F658: .4byte 0x00000439
_0802F65C: .4byte gUnknown_3004F80
@ -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
@ -2408,16 +2408,16 @@ sub_802F6A8: @ 802F6A8
ands r0, r1
cmp r0, 0
beq _0802F6FC
ldr r0, _0802F6D8 @ =gUnknown_3003F3C
ldr r0, _0802F6D8 @ =gWirelessCommType
ldrb r0, [r0]
cmp r0, 0
bne _0802F6DC
bl sub_800AAC0
b _0802F6E0
.align 2, 0
_0802F6D0: .4byte gUnknown_2037AB8
_0802F6D0: .4byte gPaletteFade
_0802F6D4: .4byte gBattleTypeFlags
_0802F6D8: .4byte gUnknown_3003F3C
_0802F6D8: .4byte gWirelessCommType
_0802F6DC:
bl sub_800AB9C
_0802F6E0:
@ -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,13 +4429,13 @@ 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
cmp r0, 0
bne _08030762
ldr r0, _08030774 @ =gUnknown_203AD30
ldr r0, _08030774 @ =gSpecialVar_ItemId
ldrh r1, [r0]
movs r0, 0x1
bl EmitOneReturnValue
@ -4446,8 +4446,8 @@ _08030762:
.align 2, 0
_08030768: .4byte gMain
_0803076C: .4byte sub_8011100
_08030770: .4byte gUnknown_2037AB8
_08030774: .4byte gUnknown_203AD30
_08030770: .4byte gPaletteFade
_08030774: .4byte gSpecialVar_ItemId
thumb_func_end CompleteWhenChoseItem
thumb_func_start CompleteOnSpecialAnimDone
@ -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

View File

@ -22,7 +22,7 @@ sub_81560A4: @ 81560A4
ldr r2, _081560D4 @ =gBattleStruct
ldr r0, [r2]
adds r0, 0x96
ldr r1, _081560D8 @ =gUnknown_20370C0
ldr r1, _081560D8 @ =gSpecialVar_0x8004
ldrh r1, [r1]
strb r1, [r0]
ldr r0, [r2]
@ -35,7 +35,7 @@ _081560C8: .4byte gUnknown_3004FE0
_081560CC: .4byte gActiveBattler
_081560D0: .4byte sub_81560DC
_081560D4: .4byte gBattleStruct
_081560D8: .4byte gUnknown_20370C0
_081560D8: .4byte gSpecialVar_0x8004
thumb_func_end sub_81560A4
thumb_func_start sub_81560DC
@ -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
@ -642,7 +642,7 @@ sub_8156594: @ 8156594
str r1, [r0]
bl nullsub_44
bl FreeAllWindowBuffers
ldr r0, _081565D8 @ =gUnknown_20370C0
ldr r0, _081565D8 @ =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0x1
beq _081565C4
@ -652,11 +652,11 @@ _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
_081565D8: .4byte gUnknown_20370C0
_081565D8: .4byte gSpecialVar_0x8004
_081565DC:
movs r0, 0x8
_081565DE:
@ -674,13 +674,13 @@ 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
cmp r0, 0
bne _0815660E
ldr r0, _08156620 @ =gUnknown_203AD30
ldr r0, _08156620 @ =gSpecialVar_ItemId
ldrh r1, [r0]
movs r0, 0x1
bl EmitOneReturnValue
@ -691,8 +691,8 @@ _0815660E:
.align 2, 0
_08156614: .4byte gMain
_08156618: .4byte sub_8011100
_0815661C: .4byte gUnknown_2037AB8
_08156620: .4byte gUnknown_203AD30
_0815661C: .4byte gPaletteFade
_08156620: .4byte gSpecialVar_ItemId
thumb_func_end sub_81565E8
thumb_func_start sub_8156624
@ -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

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,13 +425,13 @@ 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
cmp r0, 0
bne _080DD882
ldr r0, _080DD894 @ =gUnknown_203AD30
ldr r0, _080DD894 @ =gSpecialVar_ItemId
ldrh r1, [r0]
movs r0, 0x1
bl EmitOneReturnValue
@ -442,8 +442,8 @@ _080DD882:
.align 2, 0
_080DD888: .4byte gMain
_080DD88C: .4byte sub_8011100
_080DD890: .4byte gUnknown_2037AB8
_080DD894: .4byte gUnknown_203AD30
_080DD890: .4byte gPaletteFade
_080DD894: .4byte gSpecialVar_ItemId
thumb_func_end CompleteWhenChosePokeblock
thumb_func_start CompleteOnFinishedBattleAnimation_3

View File

@ -14,13 +14,13 @@ sub_800D230: @ 800D230
ands r0, r1
cmp r0, 0
beq _0800D262
ldr r0, _0800D26C @ =gUnknown_3003F3C
ldr r0, _0800D26C @ =gWirelessCommType
ldrb r0, [r0]
cmp r0, 0
beq _0800D24A
bl sub_800B1F4
_0800D24A:
ldr r0, _0800D270 @ =gUnknown_3003F64
ldr r0, _0800D270 @ =gReceivedRemoteLinkPlayers
ldrb r0, [r0]
cmp r0, 0
bne _0800D256
@ -35,8 +35,8 @@ _0800D262:
bx r0
.align 2, 0
_0800D268: .4byte gBattleTypeFlags
_0800D26C: .4byte gUnknown_3003F3C
_0800D270: .4byte gUnknown_3003F64
_0800D26C: .4byte gWirelessCommType
_0800D270: .4byte gReceivedRemoteLinkPlayers
_0800D274: .4byte sub_8081A90
thumb_func_end sub_800D230
@ -1229,7 +1229,7 @@ _0800DBDE:
ldrh r0, [r1, 0x1E]
adds r0, 0x1
strh r0, [r1, 0x1E]
ldr r0, _0800DBF0 @ =gUnknown_3003F64
ldr r0, _0800DBF0 @ =gReceivedRemoteLinkPlayers
ldrb r0, [r0]
cmp r0, 0
bne _0800DBEE
@ -1237,7 +1237,7 @@ _0800DBDE:
_0800DBEE:
b _0800DD1C
.align 2, 0
_0800DBF0: .4byte gUnknown_3003F64
_0800DBF0: .4byte gReceivedRemoteLinkPlayers
_0800DBF4:
bl GetLinkPlayerCount_2
lsls r0, 24
@ -1403,7 +1403,7 @@ sub_800DD28: @ 800DD28
mov r6, r9
mov r5, r8
push {r5-r7}
ldr r0, _0800DD5C @ =gUnknown_3003F64
ldr r0, _0800DD5C @ =gReceivedRemoteLinkPlayers
ldrb r0, [r0]
cmp r0, 0
beq _0800DE28
@ -1420,15 +1420,15 @@ sub_800DD28: @ 800DD28
bne _0800DE28
bl sub_80FBB4C
movs r4, 0
ldr r0, _0800DD6C @ =gUnknown_2022118
ldr r0, _0800DD6C @ =gBlockRecvBuffer
mov r10, r0
b _0800DE1C
.align 2, 0
_0800DD5C: .4byte gUnknown_3003F64
_0800DD5C: .4byte gReceivedRemoteLinkPlayers
_0800DD60: .4byte gBattleTypeFlags
_0800DD64: .4byte gLinkPlayers
_0800DD68: .4byte 0x00002211
_0800DD6C: .4byte gUnknown_2022118
_0800DD6C: .4byte gBlockRecvBuffer
_0800DD70:
bl GetBlockReceivedStatus
lsls r0, 24
@ -1447,7 +1447,7 @@ _0800DD70:
lsls r0, r4, 8
mov r4, r10
adds r3, r0, r4
ldr r1, _0800DE3C @ =gUnknown_202211C
ldr r1, _0800DE3C @ =gBlockRecvBuffer + 4
adds r0, r1
ldrh r6, [r0]
ldr r7, _0800DE40 @ =gTasks
@ -1534,7 +1534,7 @@ _0800DE28:
bx r0
.align 2, 0
_0800DE38: .4byte gBitTable
_0800DE3C: .4byte gUnknown_202211C
_0800DE3C: .4byte gBlockRecvBuffer + 4
_0800DE40: .4byte gTasks
_0800DE44: .4byte gUnknown_202286D
_0800DE48: .4byte gUnknown_2023FF0

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
@ -1466,7 +1466,7 @@ _0803495A:
thumb_func_start LoadBattleBarGfx
LoadBattleBarGfx: @ 8034964
push {lr}
ldr r0, _0803497C @ =gUnknown_8D093D8
ldr r0, _0803497C @ =gFile_graphics_interface_hp_numbers
ldr r1, _08034980 @ =gMonSpritesGfxPtr
ldr r1, [r1]
movs r2, 0xBA
@ -1477,7 +1477,7 @@ LoadBattleBarGfx: @ 8034964
pop {r0}
bx r0
.align 2, 0
_0803497C: .4byte gUnknown_8D093D8
_0803497C: .4byte gFile_graphics_interface_hp_numbers
_08034980: .4byte gMonSpritesGfxPtr
thumb_func_end LoadBattleBarGfx
@ -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
@ -2351,7 +2351,7 @@ sub_80350BC: @ 80350BC
lsls r0, 24
cmp r0, 0
beq _080350FC
ldr r0, _080350F4 @ =gUnknown_8D2D0B4
ldr r0, _080350F4 @ =gFile_graphics_battle_anims_sprites_substitute_sheet
ldr r1, _080350F8 @ =gMonSpritesGfxPtr
ldr r1, [r1]
lsls r4, r5, 2
@ -2361,10 +2361,10 @@ sub_80350BC: @ 80350BC
bl LZDecompressVram
b _0803510E
.align 2, 0
_080350F4: .4byte gUnknown_8D2D0B4
_080350F4: .4byte gFile_graphics_battle_anims_sprites_substitute_sheet
_080350F8: .4byte gMonSpritesGfxPtr
_080350FC:
ldr r0, _08035144 @ =gUnknown_8D2D2F4
ldr r0, _08035144 @ =gFile_graphics_battle_anims_sprites_substitute_tilemap
ldr r1, _08035148 @ =gMonSpritesGfxPtr
ldr r1, [r1]
lsls r4, r5, 2
@ -2375,7 +2375,7 @@ _080350FC:
_0803510E:
movs r3, 0x1
lsls r6, 4
ldr r7, _0803514C @ =gUnknown_8D2D090
ldr r7, _0803514C @ =gFile_graphics_battle_anims_sprites_substitute_palette
ldr r0, _08035148 @ =gMonSpritesGfxPtr
ldr r0, [r0]
adds r0, 0x4
@ -2401,9 +2401,9 @@ _08035120:
bl LoadCompressedPalette
b _0803519A
.align 2, 0
_08035144: .4byte gUnknown_8D2D2F4
_08035144: .4byte gFile_graphics_battle_anims_sprites_substitute_tilemap
_08035148: .4byte gMonSpritesGfxPtr
_0803514C: .4byte gUnknown_8D2D090
_0803514C: .4byte gFile_graphics_battle_anims_sprites_substitute_palette
_08035150: .4byte 0x040000d4
_08035154: .4byte 0x84000200
_08035158:

View File

@ -3770,7 +3770,7 @@ sub_804981C: @ 804981C
lsls r0, 16
lsrs r0, 16
movs r1, 0x1
bl sub_8088E74
bl GetSetPokedexFlag
lsls r0, 24
cmp r0, 0
beq _0804991C
@ -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

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

View File

@ -129,7 +129,7 @@ _080CD338:
bl sub_80CD628
ldr r0, _080CD350 @ =sub_80CD38C
bl SetVBlankCallback
ldr r0, _080CD354 @ =gUnknown_20370C0
ldr r0, _080CD354 @ =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0
beq _080CD358
@ -137,7 +137,7 @@ _080CD338:
b _080CD35C
.align 2, 0
_080CD350: .4byte sub_80CD38C
_080CD354: .4byte gUnknown_20370C0
_080CD354: .4byte gSpecialVar_0x8004
_080CD358:
bl sub_80CDBE4
_080CD35C:
@ -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

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
@ -31945,7 +31945,7 @@ _0802D5D8:
lsls r0, 16
lsrs r0, 16
movs r1, 0x1
bl sub_8088E74
bl GetSetPokedexFlag
lsls r0, 24
movs r4, 0xA
cmp r0, 0
@ -32356,7 +32356,7 @@ sub_802D95C: @ 802D95C
lsls r0, 16
lsrs r0, 16
movs r1, 0x1
bl sub_8088E74
bl GetSetPokedexFlag
lsls r0, 24
cmp r0, 0
beq _0802D9B4
@ -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

View File

@ -721,13 +721,13 @@ _0807FC30:
ldrb r0, [r4]
cmp r0, 0x1
bne _0807FC40
ldr r0, _0807FC3C @ =gUnknown_20370D0
ldr r0, _0807FC3C @ =gSpecialVar_Result
strh r1, [r0]
b _0807FC46
.align 2, 0
_0807FC3C: .4byte gUnknown_20370D0
_0807FC3C: .4byte gSpecialVar_Result
_0807FC40:
ldr r1, _0807FC54 @ =gUnknown_20370D0
ldr r1, _0807FC54 @ =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
_0807FC46:
@ -739,7 +739,7 @@ _0807FC4C:
pop {r0}
bx r0
.align 2, 0
_0807FC54: .4byte gUnknown_20370D0
_0807FC54: .4byte gSpecialVar_Result
_0807FC58: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
thumb_func_end sub_807FBF0
@ -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
@ -1503,7 +1503,7 @@ battle_80801F0: @ 80801F0
ldrh r1, [r0]
cmp r1, 0
beq _08080212
ldr r0, _0808021C @ =gUnknown_20370D2
ldr r0, _0808021C @ =gSpecialVar_LastTalked
strh r1, [r0]
lsls r0, r1, 24
lsrs r0, 24
@ -1519,7 +1519,7 @@ _08080212:
bx r0
.align 2, 0
_08080218: .4byte gUnknown_20386B0
_0808021C: .4byte gUnknown_20370D2
_0808021C: .4byte gSpecialVar_LastTalked
_08080220: .4byte gSaveBlock1Ptr
_08080224: .4byte gUnknown_3005074
thumb_func_end battle_80801F0
@ -1649,7 +1649,7 @@ TrainerWantsBattle: @ 8080334
lsrs r0, 24
ldr r2, _08080368 @ =gUnknown_3005074
strb r0, [r2]
ldr r4, _0808036C @ =gUnknown_20370D2
ldr r4, _0808036C @ =gSpecialVar_LastTalked
ldr r3, _08080370 @ =gMapObjects
lsls r2, r0, 3
adds r2, r0
@ -1668,7 +1668,7 @@ TrainerWantsBattle: @ 8080334
bx r0
.align 2, 0
_08080368: .4byte gUnknown_3005074
_0808036C: .4byte gUnknown_20370D2
_0808036C: .4byte gSpecialVar_LastTalked
_08080370: .4byte gMapObjects
_08080374: .4byte gUnknown_81A4EB4
thumb_func_end TrainerWantsBattle
@ -1859,7 +1859,7 @@ sub_80804AC: @ 80804AC
adds r1, r0, 0
cmp r1, 0x1
bne _080804E8
ldr r0, _080804E0 @ =gUnknown_20370D0
ldr r0, _080804E0 @ =gSpecialVar_Result
strh r1, [r0]
ldr r0, _080804E4 @ =gUnknown_20386CC
ldrh r0, [r0]
@ -1871,10 +1871,10 @@ sub_80804AC: @ 80804AC
.align 2, 0
_080804D8: .4byte gUnknown_20386AC
_080804DC: .4byte gUnknown_2023E8A
_080804E0: .4byte gUnknown_20370D0
_080804E0: .4byte gSpecialVar_Result
_080804E4: .4byte gUnknown_20386CC
_080804E8:
ldr r0, _08080500 @ =gUnknown_20370D0
ldr r0, _08080500 @ =gSpecialVar_Result
movs r1, 0
strh r1, [r0]
_080804EE:
@ -1884,7 +1884,7 @@ _080804EE:
bl sub_81139BC
b _0808054E
.align 2, 0
_08080500: .4byte gUnknown_20370D0
_08080500: .4byte gSpecialVar_Result
_08080504: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
_08080508:
ldr r0, _0808051C @ =gTrainerBattleOpponent_A

View File

@ -143,8 +143,8 @@ sub_80E5A70: @ 80E5A70
add r4, sp, 0x28
movs r0, 0
strb r0, [r4]
bl sub_80E7490
ldr r0, _080E5AA4 @ =gUnknown_20370D0
bl ValidateEReaderTrainer
ldr r0, _080E5AA4 @ =gSpecialVar_Result
ldrh r0, [r0]
adds r7, r4, 0
cmp r0, 0
@ -160,7 +160,7 @@ _080E5A9E:
movs r0, 0
b _080E5B02
.align 2, 0
_080E5AA4: .4byte gUnknown_20370D0
_080E5AA4: .4byte gSpecialVar_Result
_080E5AA8: .4byte gSaveBlock2Ptr
_080E5AAC: .4byte 0x000004a2
_080E5AB0:
@ -1506,7 +1506,7 @@ sub_80E64C0: @ 80E64C0
lsls r0, 16
lsrs r0, 16
movs r1, 0x1
bl sub_8088E74
bl GetSetPokedexFlag
lsls r0, 24
cmp r0, 0
beq _080E6554
@ -1747,7 +1747,7 @@ _080E6662:
adds r2, r0, 0
lsls r2, 16
lsrs r2, 16
ldr r5, _080E6728 @ =gUnknown_20370D0
ldr r5, _080E6728 @ =gSpecialVar_Result
ldrb r3, [r5]
str r4, [sp]
add r0, sp, 0x10
@ -1769,7 +1769,7 @@ _080E6662:
ldr r1, _080E672C @ =gStringVar1
movs r0, 0xFF
strb r0, [r1]
ldr r1, _080E6730 @ =gUnknown_20370C0
ldr r1, _080E6730 @ =gSpecialVar_0x8004
movs r0, 0x1
strh r0, [r1]
movs r0, 0
@ -1810,9 +1810,9 @@ _080E6704:
b _080E6742
.align 2, 0
_080E6724: .4byte gPlayerParty
_080E6728: .4byte gUnknown_20370D0
_080E6728: .4byte gSpecialVar_Result
_080E672C: .4byte gStringVar1
_080E6730: .4byte gUnknown_20370C0
_080E6730: .4byte gSpecialVar_0x8004
_080E6734: .4byte gUnknown_84020C4
_080E6738: .4byte 0x0000ffff
_080E673C: .4byte gUnknown_83FE860
@ -1825,7 +1825,7 @@ _080E6742:
.align 2, 0
_080E674C: .4byte gUnknown_83FE864
_080E6750:
ldr r1, _080E6780 @ =gUnknown_20370C0
ldr r1, _080E6780 @ =gSpecialVar_0x8004
movs r0, 0
strh r0, [r1]
ldr r0, _080E6784 @ =gSaveBlock2Ptr
@ -1851,7 +1851,7 @@ _080E6770:
pop {r0}
bx r0
.align 2, 0
_080E6780: .4byte gUnknown_20370C0
_080E6780: .4byte gSpecialVar_0x8004
_080E6784: .4byte gSaveBlock2Ptr
_080E6788: .4byte 0x0000055c
thumb_func_end sub_80E6648
@ -2053,7 +2053,7 @@ sub_80E6900: @ 80E6900
push {r4-r6,lr}
sub sp, 0x4
ldr r0, _080E691C @ =gUnknown_203AAB8
ldr r1, _080E6920 @ =gUnknown_20370C0
ldr r1, _080E6920 @ =gSpecialVar_0x8004
ldrh r1, [r1]
strh r1, [r0]
ldrh r2, [r0]
@ -2066,7 +2066,7 @@ sub_80E6900: @ 80E6900
b _080E69E6
.align 2, 0
_080E691C: .4byte gUnknown_203AAB8
_080E6920: .4byte gUnknown_20370C0
_080E6920: .4byte gSpecialVar_0x8004
_080E6924:
cmp r2, 0x2
beq _080E6998
@ -2180,7 +2180,7 @@ sub_80E6A0C: @ 80E6A0C
ldrb r0, [r0]
lsls r0, 31
lsrs r5, r0, 31
ldr r0, _080E6A3C @ =gUnknown_20370C0
ldr r0, _080E6A3C @ =gSpecialVar_0x8004
ldrh r0, [r0]
adds r6, r1, 0
cmp r0, 0xE
@ -2195,7 +2195,7 @@ _080E6A28:
.align 2, 0
_080E6A34: .4byte gSaveBlock2Ptr
_080E6A38: .4byte 0x0000055c
_080E6A3C: .4byte gUnknown_20370C0
_080E6A3C: .4byte gSpecialVar_0x8004
_080E6A40: .4byte _080E6A44
.align 2, 0
_080E6A44:
@ -2339,7 +2339,7 @@ _080E6B66:
adds r0, 0x1
strh r0, [r1]
bl sub_80E6E48
ldr r1, _080E6B9C @ =gUnknown_20370D0
ldr r1, _080E6B9C @ =gSpecialVar_Result
ldr r0, [r6]
adds r0, r4
adds r0, r5
@ -2354,7 +2354,7 @@ _080E6B66:
.align 2, 0
_080E6B94: .4byte 0x0000056c
_080E6B98: .4byte 0x0000270e
_080E6B9C: .4byte gUnknown_20370D0
_080E6B9C: .4byte gSpecialVar_Result
_080E6BA0: .4byte gStringVar1
_080E6BA4:
ldr r0, [r6]
@ -2370,7 +2370,7 @@ _080E6BA4:
strh r0, [r2]
_080E6BBA:
bl sub_80E6E48
ldr r0, _080E6BD4 @ =gUnknown_20370D0
ldr r0, _080E6BD4 @ =gSpecialVar_Result
ldr r1, [r6]
adds r1, r4
adds r1, r5
@ -2381,7 +2381,7 @@ _080E6BC6:
.align 2, 0
_080E6BCC: .4byte 0x00000564
_080E6BD0: .4byte 0x00000595
_080E6BD4: .4byte gUnknown_20370D0
_080E6BD4: .4byte gSpecialVar_Result
_080E6BD8:
ldr r3, [r6]
ldr r0, _080E6BF8 @ =gSpecialVar_0x8005
@ -2481,7 +2481,7 @@ sub_80E6C8C: @ 80E6C8C
ldrb r0, [r0]
lsls r0, 31
lsrs r4, r0, 31
ldr r0, _080E6CBC @ =gUnknown_20370C0
ldr r0, _080E6CBC @ =gSpecialVar_0x8004
ldrh r0, [r0]
adds r3, r1, 0
cmp r0, 0xE
@ -2496,7 +2496,7 @@ _080E6CA8:
.align 2, 0
_080E6CB4: .4byte gSaveBlock2Ptr
_080E6CB8: .4byte 0x0000055c
_080E6CBC: .4byte gUnknown_20370C0
_080E6CBC: .4byte gSpecialVar_0x8004
_080E6CC0: .4byte _080E6CC4
.align 2, 0
_080E6CC4:
@ -2516,17 +2516,17 @@ _080E6CC4:
.4byte _080E6DD4
.4byte _080E6DF4
_080E6D00:
ldr r0, _080E6D0C @ =gUnknown_20370D0
ldr r0, _080E6D0C @ =gSpecialVar_Result
ldr r1, [r3]
ldr r3, _080E6D10 @ =0x0000055e
adds r1, r3
adds r1, r4
b _080E6D60
.align 2, 0
_080E6D0C: .4byte gUnknown_20370D0
_080E6D0C: .4byte gSpecialVar_Result
_080E6D10: .4byte 0x0000055e
_080E6D14:
ldr r0, _080E6D24 @ =gUnknown_20370D0
ldr r0, _080E6D24 @ =gSpecialVar_Result
ldr r1, [r3]
ldr r2, _080E6D28 @ =0x0000055c
adds r1, r2
@ -2534,19 +2534,19 @@ _080E6D14:
lsls r1, 31
b _080E6D7C
.align 2, 0
_080E6D24: .4byte gUnknown_20370D0
_080E6D24: .4byte gSpecialVar_Result
_080E6D28: .4byte 0x0000055c
_080E6D2C:
ldr r2, _080E6D38 @ =gUnknown_20370D0
ldr r2, _080E6D38 @ =gSpecialVar_Result
ldr r0, [r3]
lsls r1, r4, 1
movs r3, 0xAC
lsls r3, 3
b _080E6D44
.align 2, 0
_080E6D38: .4byte gUnknown_20370D0
_080E6D38: .4byte gSpecialVar_Result
_080E6D3C:
ldr r2, _080E6D50 @ =gUnknown_20370D0
ldr r2, _080E6D50 @ =gSpecialVar_Result
ldr r0, [r3]
lsls r1, r4, 1
ldr r3, _080E6D54 @ =0x00000564
@ -2557,10 +2557,10 @@ _080E6D44:
strh r0, [r2]
b _080E6E08
.align 2, 0
_080E6D50: .4byte gUnknown_20370D0
_080E6D50: .4byte gSpecialVar_Result
_080E6D54: .4byte 0x00000564
_080E6D58:
ldr r0, _080E6D68 @ =gUnknown_20370D0
ldr r0, _080E6D68 @ =gSpecialVar_Result
ldr r1, [r3]
ldr r2, _080E6D6C @ =0x0000056c
adds r1, r2
@ -2569,10 +2569,10 @@ _080E6D60:
strh r1, [r0]
b _080E6E08
.align 2, 0
_080E6D68: .4byte gUnknown_20370D0
_080E6D68: .4byte gSpecialVar_Result
_080E6D6C: .4byte 0x0000056c
_080E6D70:
ldr r0, _080E6D84 @ =gUnknown_20370D0
ldr r0, _080E6D84 @ =gSpecialVar_Result
ldr r1, [r3]
ldr r3, _080E6D88 @ =0x0000055c
adds r1, r3
@ -2583,16 +2583,16 @@ _080E6D7C:
strh r1, [r0]
b _080E6E08
.align 2, 0
_080E6D84: .4byte gUnknown_20370D0
_080E6D84: .4byte gSpecialVar_Result
_080E6D88: .4byte 0x0000055c
_080E6D8C:
adds r0, r4, 0
bl sub_80E7188
ldr r1, _080E6D98 @ =gUnknown_20370D0
ldr r1, _080E6D98 @ =gSpecialVar_Result
strh r0, [r1]
b _080E6E08
.align 2, 0
_080E6D98: .4byte gUnknown_20370D0
_080E6D98: .4byte gSpecialVar_Result
_080E6D9C:
ldr r0, [r3]
ldr r1, _080E6DAC @ =0x0000057a
@ -2868,7 +2868,7 @@ sub_80E6FB8: @ 80E6FB8
ldrb r0, [r0]
lsls r0, 31
lsrs r5, r0, 31
ldr r0, _080E7044 @ =gUnknown_20370C0
ldr r0, _080E7044 @ =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0x3
beq _080E6FD4
@ -2899,7 +2899,7 @@ _080E6FF2:
ldr r2, _080E7050 @ =0x0000055d
adds r0, r2
strb r1, [r0]
ldr r0, _080E7044 @ =gUnknown_20370C0
ldr r0, _080E7044 @ =gSpecialVar_0x8004
ldrh r1, [r0]
cmp r1, 0x3
beq _080E7016
@ -2928,7 +2928,7 @@ _080E7016:
.align 2, 0
_080E703C: .4byte gSaveBlock2Ptr
_080E7040: .4byte 0x0000055c
_080E7044: .4byte gUnknown_20370C0
_080E7044: .4byte gSpecialVar_0x8004
_080E7048: .4byte 0x00000564
_080E704C: .4byte gUnknown_2023E8A
_080E7050: .4byte 0x0000055d
@ -3230,16 +3230,16 @@ sub_80E724C: @ 80E724C
ldrh r0, [r0]
ldr r1, _080E7290 @ =gStringVar1
bl sub_8099E90
ldr r0, _080E7294 @ =gUnknown_20370D0
ldr r0, _080E7294 @ =gSpecialVar_Result
strh r4, [r0]
b _080E72AA
.align 2, 0
_080E7288: .4byte gSaveBlock2Ptr
_080E728C: .4byte 0x0000055c
_080E7290: .4byte gStringVar1
_080E7294: .4byte gUnknown_20370D0
_080E7294: .4byte gSpecialVar_Result
_080E7298:
ldr r1, _080E72B0 @ =gUnknown_20370D0
ldr r1, _080E72B0 @ =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
ldr r0, [r5]
@ -3253,7 +3253,7 @@ _080E72AA:
pop {r0}
bx r0
.align 2, 0
_080E72B0: .4byte gUnknown_20370D0
_080E72B0: .4byte gSpecialVar_Result
_080E72B4: .4byte 0x0000055e
thumb_func_end sub_80E724C
@ -3273,7 +3273,7 @@ sub_80E72B8: @ 80E72B8
beq _080E72D2
movs r7, 0x45
_080E72D2:
ldr r4, _080E733C @ =gUnknown_20370D0
ldr r4, _080E733C @ =gSpecialVar_Result
movs r0, 0
strh r0, [r4]
adds r0, r1, 0
@ -3312,7 +3312,7 @@ _080E731A:
cmp r5, 0x2
ble _080E72EA
_080E7320:
ldr r0, _080E733C @ =gUnknown_20370D0
ldr r0, _080E733C @ =gSpecialVar_Result
ldrh r0, [r0]
cmp r0, 0
beq _080E732E
@ -3325,7 +3325,7 @@ _080E732E:
.align 2, 0
_080E7334: .4byte gSaveBlock2Ptr
_080E7338: .4byte 0x0000055c
_080E733C: .4byte gUnknown_20370D0
_080E733C: .4byte gSpecialVar_Result
_080E7340: .4byte 0x0000056d
_080E7344: .4byte gPlayerParty
thumb_func_end sub_80E72B8
@ -3497,10 +3497,10 @@ _080E7488: .4byte gSaveBlock2Ptr
_080E748C: .4byte 0x000004a4
thumb_func_end sub_80E7460
thumb_func_start sub_80E7490
sub_80E7490: @ 80E7490
thumb_func_start ValidateEReaderTrainer
ValidateEReaderTrainer: @ 80E7490
push {r4-r6,lr}
ldr r2, _080E74C0 @ =gUnknown_20370D0
ldr r2, _080E74C0 @ =gSpecialVar_Result
movs r0, 0
strh r0, [r2]
ldr r1, _080E74C4 @ =gSaveBlock2Ptr
@ -3524,7 +3524,7 @@ _080E74AA:
strh r0, [r2]
b _080E74F6
.align 2, 0
_080E74C0: .4byte gUnknown_20370D0
_080E74C0: .4byte gSpecialVar_Result
_080E74C4: .4byte gSaveBlock2Ptr
_080E74C8:
movs r4, 0
@ -3547,7 +3547,7 @@ _080E74CE:
lsls r3, 3
adds r0, r1, r3
bl sub_80E7524
ldr r1, _080E74FC @ =gUnknown_20370D0
ldr r1, _080E74FC @ =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
_080E74F6:
@ -3555,8 +3555,8 @@ _080E74F6:
pop {r0}
bx r0
.align 2, 0
_080E74FC: .4byte gUnknown_20370D0
thumb_func_end sub_80E7490
_080E74FC: .4byte gSpecialVar_Result
thumb_func_end ValidateEReaderTrainer
thumb_func_start sub_80E7500
sub_80E7500: @ 80E7500

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

View File

@ -89,8 +89,8 @@ _0809C7BC: .4byte 0x000030ec
_0809C7C0: .4byte 0x0100001a
thumb_func_end sub_809C794
thumb_func_start sub_809C7C4
sub_809C7C4: @ 809C7C4
thumb_func_start SetEnigmaBerry
SetEnigmaBerry: @ 809C7C4
push {r4-r7,lr}
adds r4, r0, 0
bl sub_809C794
@ -144,7 +144,7 @@ _0809C828: .4byte 0x000030ec
_0809C82C: .4byte 0x00003108
_0809C830: .4byte 0x00000516
_0809C834: .4byte 0x00000529
thumb_func_end sub_809C7C4
thumb_func_end SetEnigmaBerry
thumb_func_start GetEnigmaBerryChecksum
GetEnigmaBerryChecksum: @ 809C838

View File

@ -52,7 +52,7 @@ _0813CD98:
strb r0, [r1, 0x6]
movs r2, 0
ldr r6, _0813CDF0 @ =gTextFlags
ldr r0, _0813CDF4 @ =gUnknown_203AD30
ldr r0, _0813CDF4 @ =gSpecialVar_ItemId
mov r12, r0
ldr r1, _0813CDF8 @ =sub_813CE30
mov r8, r1
@ -89,7 +89,7 @@ _0813CDE2:
.align 2, 0
_0813CDEC: .4byte gUnknown_203F370
_0813CDF0: .4byte gTextFlags
_0813CDF4: .4byte gUnknown_203AD30
_0813CDF4: .4byte gSpecialVar_ItemId
_0813CDF8: .4byte sub_813CE30
_0813CDFC: .4byte 0x0000080c
thumb_func_end sub_813CD50
@ -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
@ -948,7 +948,7 @@ sub_813D4D0: @ 813D4D0
bl CopyWindowToVram
b _0813D52A
_0813D514:
ldr r2, _0813D534 @ =gUnknown_841623B
ldr r2, _0813D534 @ =gFameCheckerText_ListMenuCursor
str r5, [sp]
movs r0, 0
str r0, [sp, 0x4]
@ -964,7 +964,7 @@ _0813D52A:
pop {r0}
bx r0
.align 2, 0
_0813D534: .4byte gUnknown_841623B
_0813D534: .4byte gFameCheckerText_ListMenuCursor
thumb_func_end sub_813D4D0
thumb_func_start sub_813D538
@ -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
@ -1708,16 +1708,16 @@ _0813DA9E:
bne _0813DAEC
movs r0, 0x5
bl PlaySE
ldr r0, _0813DAE8 @ =gUnknown_203AD30
ldr r0, _0813DAE8 @ =gSpecialVar_ItemId
mov r1, r8
strh r1, [r0]
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
_0813DAE8: .4byte gSpecialVar_ItemId
_0813DAEC:
movs r0, 0x2
negs r0, r0
@ -1749,11 +1749,11 @@ _0813DB10:
lsrs r1, 16
movs r0, 0x5
bl sub_809A798
ldr r1, _0813DB34 @ =gUnknown_203AD30
ldr r1, _0813DB34 @ =gSpecialVar_ItemId
b _0813DB46
.align 2, 0
_0813DB30: .4byte gUnknown_203F370
_0813DB34: .4byte gUnknown_203AD30
_0813DB34: .4byte gSpecialVar_ItemId
_0813DB38:
ldr r0, _0813DB50 @ =gUnknown_203F36C
ldr r0, [r0]
@ -1761,7 +1761,7 @@ _0813DB38:
cmp r5, r0
bne _0813DB58
_0813DB42:
ldr r1, _0813DB54 @ =gUnknown_203AD30
ldr r1, _0813DB54 @ =gSpecialVar_ItemId
movs r0, 0
_0813DB46:
strh r0, [r1]
@ -1771,7 +1771,7 @@ _0813DB48:
b _0813DB9E
.align 2, 0
_0813DB50: .4byte gUnknown_203F36C
_0813DB54: .4byte gUnknown_203AD30
_0813DB54: .4byte gSpecialVar_ItemId
_0813DB58:
bl sub_813D684
movs r0, 0x1
@ -1789,7 +1789,7 @@ _0813DB58:
movs r0, 0x5
adds r1, r4, 0
bl sub_809A798
ldr r1, _0813DBA8 @ =gUnknown_203AD30
ldr r1, _0813DBA8 @ =gSpecialVar_ItemId
strh r0, [r1]
ldr r0, _0813DBAC @ =gTasks
lsls r1, r6, 2
@ -1810,7 +1810,7 @@ _0813DB9E:
pop {r0}
bx r0
.align 2, 0
_0813DBA8: .4byte gUnknown_203AD30
_0813DBA8: .4byte gSpecialVar_ItemId
_0813DBAC: .4byte gTasks
_0813DBB0: .4byte gUnknown_8464358
thumb_func_end sub_813DA68
@ -1878,7 +1878,7 @@ _0813DC24:
cmp r0, 0x1
bne _0813DC7C
_0813DC38:
ldr r0, _0813DC54 @ =gUnknown_203AD30
ldr r0, _0813DC54 @ =gSpecialVar_ItemId
ldrh r0, [r0]
bl sub_80BF6A8
lsls r0, 24
@ -1891,7 +1891,7 @@ _0813DC38:
movs r0, 0x1
b _0813DC86
.align 2, 0
_0813DC54: .4byte gUnknown_203AD30
_0813DC54: .4byte gSpecialVar_ItemId
_0813DC58: .4byte gUnknown_203F384
_0813DC5C: .4byte gUnknown_84643AC
_0813DC60: .4byte gUnknown_203F388
@ -2118,7 +2118,7 @@ sub_813DE0C: @ 813DE0C
ldrb r0, [r0, 0x4]
cmp r0, 0x4
bne _0813DE78
ldr r4, _0813DE64 @ =gUnknown_203AD30
ldr r4, _0813DE64 @ =gSpecialVar_ItemId
ldrh r0, [r4]
bl ItemId_GetBattleFunc
cmp r0, 0
@ -2129,7 +2129,7 @@ sub_813DE0C: @ 813DE0C
.align 2, 0
_0813DE5C: .4byte gUnknown_203F388
_0813DE60: .4byte gUnknown_203F370
_0813DE64: .4byte gUnknown_203AD30
_0813DE64: .4byte gSpecialVar_ItemId
_0813DE68:
ldrh r0, [r4]
bl ItemId_GetBattleFunc
@ -2142,7 +2142,7 @@ _0813DE78:
lsls r0, 24
cmp r0, 0
bne _0813DEA0
ldr r0, _0813DE9C @ =gUnknown_203AD30
ldr r0, _0813DE9C @ =gSpecialVar_ItemId
ldrh r0, [r0]
bl ItemId_GetType
lsls r0, 24
@ -2153,9 +2153,9 @@ _0813DE78:
bl sub_813E274
b _0813DEB0
.align 2, 0
_0813DE9C: .4byte gUnknown_203AD30
_0813DE9C: .4byte gSpecialVar_ItemId
_0813DEA0:
ldr r0, _0813DEB8 @ =gUnknown_203AD30
ldr r0, _0813DEB8 @ =gSpecialVar_ItemId
ldrh r0, [r0]
bl ItemId_GetFieldFunc
adds r1, r0, 0
@ -2166,7 +2166,7 @@ _0813DEB0:
pop {r0}
bx r0
.align 2, 0
_0813DEB8: .4byte gUnknown_203AD30
_0813DEB8: .4byte gSpecialVar_ItemId
thumb_func_end sub_813DE0C
thumb_func_start sub_813DEBC
@ -2494,7 +2494,7 @@ sub_813E164: @ 813E164
_0813E18A:
movs r0, 0x5
bl PlaySE
ldr r0, _0813E1F4 @ =gUnknown_203AD30
ldr r0, _0813E1F4 @ =gSpecialVar_ItemId
ldrh r0, [r0]
ldrh r1, [r5, 0x10]
bl sub_809A1D8
@ -2532,7 +2532,7 @@ _0813E1E4:
.align 2, 0
_0813E1EC: .4byte gTasks+0x8
_0813E1F0: .4byte gMain
_0813E1F4: .4byte gUnknown_203AD30
_0813E1F4: .4byte gSpecialVar_ItemId
_0813E1F8: .4byte gUnknown_203F37A
_0813E1FC: .4byte gUnknown_3005E70
thumb_func_end sub_813E164
@ -2807,7 +2807,7 @@ sub_813E428: @ 813E428
lsls r0, 3
ldr r1, _0813E470 @ =gTasks+0x8
adds r4, r0, r1
ldr r6, _0813E474 @ =gUnknown_203AD30
ldr r6, _0813E474 @ =gSpecialVar_ItemId
ldrh r0, [r6]
bl itemid_get_market_price
lsls r0, 16
@ -2831,7 +2831,7 @@ sub_813E428: @ 813E428
b _0813E4CE
.align 2, 0
_0813E470: .4byte gTasks+0x8
_0813E474: .4byte gUnknown_203AD30
_0813E474: .4byte gSpecialVar_ItemId
_0813E478: .4byte gStringVar1
_0813E47C: .4byte gStringVar4
_0813E480: .4byte gUnknown_84168F1
@ -3185,7 +3185,7 @@ sub_813E768: @ 813E768
bl PutWindowTilemap
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
ldr r0, _0813E7D8 @ =gUnknown_203AD30
ldr r0, _0813E7D8 @ =gSpecialVar_ItemId
ldrh r0, [r0]
ldr r1, _0813E7DC @ =gStringVar1
bl sub_8099E90
@ -3219,7 +3219,7 @@ sub_813E768: @ 813E768
bx r0
.align 2, 0
_0813E7D4: .4byte gTasks+0x8
_0813E7D8: .4byte gUnknown_203AD30
_0813E7D8: .4byte gSpecialVar_ItemId
_0813E7DC: .4byte gStringVar1
_0813E7E0: .4byte gStringVar3
_0813E7E4: .4byte gStringVar4
@ -3246,7 +3246,7 @@ sub_813E7F0: @ 813E7F0
mov r8, r1
movs r0, 0xF8
bl PlaySE
ldr r5, _0813E8C0 @ =gUnknown_203AD30
ldr r5, _0813E8C0 @ =gSpecialVar_ItemId
ldrh r0, [r5]
mov r2, r8
ldrh r1, [r2, 0x10]
@ -3319,7 +3319,7 @@ sub_813E7F0: @ 813E7F0
bx r0
.align 2, 0
_0813E8BC: .4byte gTasks+0x8
_0813E8C0: .4byte gUnknown_203AD30
_0813E8C0: .4byte gSpecialVar_ItemId
_0813E8C4: .4byte gSaveBlock1Ptr
_0813E8C8: .4byte gUnknown_203F37A
_0813E8CC: .4byte gUnknown_3005E70

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.

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

View File

@ -243,7 +243,7 @@ sub_80808F0: @ 80808F0
lsrs r1, r0, 24
cmp r1, 0
bne _08080934
ldr r0, _08080928 @ =gUnknown_202271A
ldr r0, _08080928 @ =gLinkType
strh r1, [r0]
ldr r1, _0808092C @ =gTasks
lsls r0, r4, 2
@ -256,7 +256,7 @@ sub_80808F0: @ 80808F0
b _08080936
.align 2, 0
_08080924: .4byte gMain
_08080928: .4byte gUnknown_202271A
_08080928: .4byte gLinkType
_0808092C: .4byte gTasks
_08080930: .4byte sub_8080FB4
_08080934:
@ -290,7 +290,7 @@ _08080952:
.align 2, 0
_08080964: .4byte gMain
_08080968:
ldr r1, _08080984 @ =gUnknown_202271A
ldr r1, _08080984 @ =gLinkType
movs r0, 0
strh r0, [r1]
ldr r1, _08080988 @ =gTasks
@ -306,7 +306,7 @@ _0808097E:
pop {r1}
bx r1
.align 2, 0
_08080984: .4byte gUnknown_202271A
_08080984: .4byte gLinkType
_08080988: .4byte gTasks
_0808098C: .4byte sub_8080FB4
thumb_func_end sub_808093C
@ -696,7 +696,7 @@ sub_8080C6C: @ 8080C6C
_08080CB0: .4byte gTasks
_08080CB4: .4byte sub_8080FF0
_08080CB8:
ldr r4, _08080CD4 @ =gUnknown_20370D0
ldr r4, _08080CD4 @ =gSpecialVar_Result
adds r0, r7, 0
adds r1, r6, 0
bl sub_8080844
@ -712,7 +712,7 @@ _08080CCE:
pop {r0}
bx r0
.align 2, 0
_08080CD4: .4byte gUnknown_20370D0
_08080CD4: .4byte gSpecialVar_Result
_08080CD8: .4byte sub_8080DC0
thumb_func_end sub_8080C6C
@ -736,7 +736,7 @@ sub_8080CDC: @ 8080CDC
bl sub_80808BC
cmp r0, 0x1
beq _08080D74
ldr r4, _08080D34 @ =gUnknown_20370D0
ldr r4, _08080D34 @ =gSpecialVar_Result
adds r0, r7, 0
adds r1, r6, 0
bl sub_8080844
@ -757,7 +757,7 @@ sub_8080CDC: @ 8080CDC
b _08080D72
.align 2, 0
_08080D30: .4byte gTasks
_08080D34: .4byte gUnknown_20370D0
_08080D34: .4byte gSpecialVar_Result
_08080D38: .4byte sub_8080F78
_08080D3C:
cmp r2, 0x7
@ -780,7 +780,7 @@ _08080D54:
strb r0, [r1]
ldrb r0, [r4]
bl sub_800A900
ldr r0, _08080D84 @ =gUnknown_2022618
ldr r0, _08080D84 @ =gBlockSendBuffer
bl sub_80898E8
ldr r0, _08080D88 @ =sub_8080E6C
_08080D72:
@ -792,7 +792,7 @@ _08080D74:
.align 2, 0
_08080D7C: .4byte gUnknown_3005030
_08080D80: .4byte gUnknown_300502C
_08080D84: .4byte gUnknown_2022618
_08080D84: .4byte gBlockSendBuffer
_08080D88: .4byte sub_8080E6C
thumb_func_end sub_8080CDC
@ -838,7 +838,7 @@ sub_8080DC0: @ 8080DC0
bl sub_80808BC
cmp r0, 0x1
beq _08080E50
ldr r0, _08080DE8 @ =gUnknown_20370D0
ldr r0, _08080DE8 @ =gSpecialVar_Result
ldrh r0, [r0]
cmp r0, 0x4
bne _08080DEC
@ -848,7 +848,7 @@ sub_8080DC0: @ 8080DC0
bl sub_800AAC0
b _08080E02
.align 2, 0
_08080DE8: .4byte gUnknown_20370D0
_08080DE8: .4byte gSpecialVar_Result
_08080DEC:
cmp r0, 0x3
bne _08080DF6
@ -883,7 +883,7 @@ _08080E20:
strb r0, [r1]
ldrb r0, [r4]
bl sub_800A900
ldr r0, _08080E60 @ =gUnknown_2022618
ldr r0, _08080E60 @ =gBlockSendBuffer
bl sub_80898E8
ldr r1, _08080E64 @ =gTasks
lsls r0, r5, 2
@ -901,7 +901,7 @@ _08080E50:
.align 2, 0
_08080E58: .4byte gUnknown_3005030
_08080E5C: .4byte gUnknown_300502C
_08080E60: .4byte gUnknown_2022618
_08080E60: .4byte gBlockSendBuffer
_08080E64: .4byte gTasks
_08080E68: .4byte sub_8080E6C
thumb_func_end sub_8080DC0
@ -941,7 +941,7 @@ _08080E9A:
cmp r0, 0x1
bls _08080EDC
lsls r1, r5, 8
ldr r0, _08080ED4 @ =gUnknown_2022118
ldr r0, _08080ED4 @ =gBlockRecvBuffer
adds r1, r0
ldr r0, _08080ED8 @ =gUnknown_2039624
lsls r4, r5, 1
@ -957,11 +957,11 @@ _08080E9A:
b _08080EF2
.align 2, 0
_08080ED0: .4byte gLinkPlayers
_08080ED4: .4byte gUnknown_2022118
_08080ED4: .4byte gBlockRecvBuffer
_08080ED8: .4byte gUnknown_2039624
_08080EDC:
lsls r1, r5, 8
ldr r0, _08080F3C @ =gUnknown_2022118
ldr r0, _08080F3C @ =gBlockRecvBuffer
adds r1, r0
ldr r2, _08080F40 @ =gUnknown_2039624
lsls r0, r5, 1
@ -984,11 +984,11 @@ _08080EF8:
bl SetSuppressLinkErrorMessage
bl ResetBlockReceivedFlags
bl HideFieldMessageBox
ldr r0, _08080F44 @ =gUnknown_20370D0
ldr r0, _08080F44 @ =gSpecialVar_Result
ldrh r0, [r0]
cmp r0, 0x1
bne _08080F54
ldr r0, _08080F48 @ =gUnknown_202271A
ldr r0, _08080F48 @ =gLinkType
ldrh r1, [r0]
ldr r0, _08080F4C @ =0x00004411
ldr r0, _08080F50 @ =gTasks
@ -1003,10 +1003,10 @@ _08080EF8:
bl DestroyTask
b _08080F66
.align 2, 0
_08080F3C: .4byte gUnknown_2022118
_08080F3C: .4byte gBlockRecvBuffer
_08080F40: .4byte gUnknown_2039624
_08080F44: .4byte gUnknown_20370D0
_08080F48: .4byte gUnknown_202271A
_08080F44: .4byte gSpecialVar_Result
_08080F48: .4byte gLinkType
_08080F4C: .4byte 0x00004411
_08080F50: .4byte gTasks
_08080F54:
@ -1034,7 +1034,7 @@ sub_8080F78: @ 8080F78
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r0, _08080FAC @ =gUnknown_3003F64
ldr r0, _08080FAC @ =gReceivedRemoteLinkPlayers
ldrb r0, [r0]
cmp r0, 0
bne _08080FA6
@ -1055,7 +1055,7 @@ _08080FA6:
pop {r0}
bx r0
.align 2, 0
_08080FAC: .4byte gUnknown_3003F64
_08080FAC: .4byte gReceivedRemoteLinkPlayers
_08080FB0: .4byte gTasks
thumb_func_end sub_8080F78
@ -1065,7 +1065,7 @@ sub_8080FB4: @ 8080FB4
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r1, _08080FE8 @ =gUnknown_20370D0
ldr r1, _08080FE8 @ =gSpecialVar_Result
movs r0, 0x5
strh r0, [r1]
ldr r1, _08080FEC @ =gTasks
@ -1083,7 +1083,7 @@ sub_8080FB4: @ 8080FB4
pop {r0}
bx r0
.align 2, 0
_08080FE8: .4byte gUnknown_20370D0
_08080FE8: .4byte gSpecialVar_Result
_08080FEC: .4byte gTasks
thumb_func_end sub_8080FB4
@ -1093,7 +1093,7 @@ sub_8080FF0: @ 8080FF0
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r1, _08081024 @ =gUnknown_20370D0
ldr r1, _08081024 @ =gSpecialVar_Result
movs r0, 0x6
strh r0, [r1]
ldr r1, _08081028 @ =gTasks
@ -1111,7 +1111,7 @@ sub_8080FF0: @ 8080FF0
pop {r0}
bx r0
.align 2, 0
_08081024: .4byte gUnknown_20370D0
_08081024: .4byte gSpecialVar_Result
_08081028: .4byte gTasks
thumb_func_end sub_8080FF0
@ -1153,7 +1153,7 @@ sub_8081064: @ 8081064
push {r4,lr}
movs r3, 0x2
movs r2, 0x2
ldr r0, _0808107C @ =gUnknown_20370C0
ldr r0, _0808107C @ =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0x2
beq _08081098
@ -1163,31 +1163,31 @@ sub_8081064: @ 8081064
beq _08081086
b _080810B4
.align 2, 0
_0808107C: .4byte gUnknown_20370C0
_0808107C: .4byte gSpecialVar_0x8004
_08081080:
cmp r0, 0x5
beq _080810A8
b _080810B4
_08081086:
movs r3, 0x2
ldr r1, _08081090 @ =gUnknown_202271A
ldr r1, _08081090 @ =gLinkType
ldr r4, _08081094 @ =0x00002233
b _080810B0
.align 2, 0
_08081090: .4byte gUnknown_202271A
_08081090: .4byte gLinkType
_08081094: .4byte 0x00002233
_08081098:
movs r3, 0x2
ldr r1, _080810A0 @ =gUnknown_202271A
ldr r1, _080810A0 @ =gLinkType
ldr r4, _080810A4 @ =0x00002244
b _080810B0
.align 2, 0
_080810A0: .4byte gUnknown_202271A
_080810A0: .4byte gLinkType
_080810A4: .4byte 0x00002244
_080810A8:
movs r3, 0x4
movs r2, 0x4
ldr r1, _080810C4 @ =gUnknown_202271A
ldr r1, _080810C4 @ =gLinkType
ldr r4, _080810C8 @ =0x00002255
_080810B0:
adds r0, r4, 0
@ -1200,14 +1200,14 @@ _080810B4:
pop {r0}
bx r0
.align 2, 0
_080810C4: .4byte gUnknown_202271A
_080810C4: .4byte gLinkType
_080810C8: .4byte 0x00002255
thumb_func_end sub_8081064
thumb_func_start sub_80810CC
sub_80810CC: @ 80810CC
push {lr}
ldr r1, _080810E8 @ =gUnknown_202271A
ldr r1, _080810E8 @ =gLinkType
ldr r2, _080810EC @ =0x00001133
adds r0, r2, 0
strh r0, [r1]
@ -1220,7 +1220,7 @@ sub_80810CC: @ 80810CC
pop {r0}
bx r0
.align 2, 0
_080810E8: .4byte gUnknown_202271A
_080810E8: .4byte gLinkType
_080810EC: .4byte 0x00001133
_080810F0: .4byte gBattleTypeFlags
thumb_func_end sub_80810CC
@ -1228,10 +1228,10 @@ _080810F0: .4byte gBattleTypeFlags
thumb_func_start sub_80810F4
sub_80810F4: @ 80810F4
push {lr}
ldr r1, _08081118 @ =gUnknown_20370D0
ldr r1, _08081118 @ =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
ldr r1, _0808111C @ =gUnknown_202271A
ldr r1, _0808111C @ =gLinkType
ldr r2, _08081120 @ =0x00003311
adds r0, r2, 0
strh r0, [r1]
@ -1244,8 +1244,8 @@ sub_80810F4: @ 80810F4
pop {r0}
bx r0
.align 2, 0
_08081118: .4byte gUnknown_20370D0
_0808111C: .4byte gUnknown_202271A
_08081118: .4byte gSpecialVar_Result
_0808111C: .4byte gLinkType
_08081120: .4byte 0x00003311
_08081124: .4byte gBattleTypeFlags
thumb_func_end sub_80810F4
@ -1253,7 +1253,7 @@ _08081124: .4byte gBattleTypeFlags
thumb_func_start sub_8081128
sub_8081128: @ 8081128
push {lr}
ldr r1, _08081144 @ =gUnknown_202271A
ldr r1, _08081144 @ =gLinkType
ldr r2, _08081148 @ =0x00006601
adds r0, r2, 0
strh r0, [r1]
@ -1266,7 +1266,7 @@ sub_8081128: @ 8081128
pop {r0}
bx r0
.align 2, 0
_08081144: .4byte gUnknown_202271A
_08081144: .4byte gLinkType
_08081148: .4byte 0x00006601
_0808114C: .4byte gBattleTypeFlags
thumb_func_end sub_8081128
@ -1284,7 +1284,7 @@ sub_8081150: @ 8081150
.align 2, 0
_08081164: .4byte sub_80811FC
_08081168:
ldr r0, _0808117C @ =gUnknown_20370C0
ldr r0, _0808117C @ =gSpecialVar_0x8004
ldrh r0, [r0]
subs r0, 0x1
cmp r0, 0x4
@ -1295,7 +1295,7 @@ _08081168:
ldr r0, [r0]
mov pc, r0
.align 2, 0
_0808117C: .4byte gUnknown_20370C0
_0808117C: .4byte gSpecialVar_0x8004
_08081180: .4byte _08081184
.align 2, 0
_08081184:
@ -1305,35 +1305,35 @@ _08081184:
.4byte _080811D8
.4byte _080811B8
_08081198:
ldr r1, _080811A0 @ =gUnknown_202271A
ldr r1, _080811A0 @ =gLinkType
ldr r2, _080811A4 @ =0x00002233
b _080811DC
.align 2, 0
_080811A0: .4byte gUnknown_202271A
_080811A0: .4byte gLinkType
_080811A4: .4byte 0x00002233
_080811A8:
ldr r1, _080811B0 @ =gUnknown_202271A
ldr r1, _080811B0 @ =gLinkType
ldr r2, _080811B4 @ =0x00002244
b _080811DC
.align 2, 0
_080811B0: .4byte gUnknown_202271A
_080811B0: .4byte gLinkType
_080811B4: .4byte 0x00002244
_080811B8:
ldr r1, _080811C0 @ =gUnknown_202271A
ldr r1, _080811C0 @ =gLinkType
ldr r2, _080811C4 @ =0x00002255
b _080811DC
.align 2, 0
_080811C0: .4byte gUnknown_202271A
_080811C0: .4byte gLinkType
_080811C4: .4byte 0x00002255
_080811C8:
ldr r1, _080811D0 @ =gUnknown_202271A
ldr r1, _080811D0 @ =gLinkType
ldr r2, _080811D4 @ =0x00001111
b _080811DC
.align 2, 0
_080811D0: .4byte gUnknown_202271A
_080811D0: .4byte gLinkType
_080811D4: .4byte 0x00001111
_080811D8:
ldr r1, _080811F0 @ =gUnknown_202271A
ldr r1, _080811F0 @ =gLinkType
ldr r2, _080811F4 @ =0x00003322
_080811DC:
adds r0, r2, 0
@ -1348,7 +1348,7 @@ _080811EC:
pop {r1}
bx r1
.align 2, 0
_080811F0: .4byte gUnknown_202271A
_080811F0: .4byte gLinkType
_080811F4: .4byte 0x00003322
_080811F8: .4byte sub_80811FC
thumb_func_end sub_8081150
@ -1472,7 +1472,7 @@ sub_80812D8: @ 80812D8
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _08081308 @ =gUnknown_3003F64
ldr r0, _08081308 @ =gReceivedRemoteLinkPlayers
ldrb r0, [r0]
cmp r0, 0x1
bne _08081300
@ -1490,7 +1490,7 @@ _08081300:
pop {r0}
bx r0
.align 2, 0
_08081308: .4byte gUnknown_3003F64
_08081308: .4byte gReceivedRemoteLinkPlayers
thumb_func_end sub_80812D8
thumb_func_start sub_808130C
@ -1537,23 +1537,23 @@ _0808135C:
movs r0, 0x1
movs r1, 0
bl fade_screen
ldr r1, _08081374 @ =gUnknown_202271A
ldr r1, _08081374 @ =gLinkType
ldr r2, _08081378 @ =0x00002211
adds r0, r2, 0
strh r0, [r1]
bl sub_800A068
b _080813AA
.align 2, 0
_08081374: .4byte gUnknown_202271A
_08081374: .4byte gLinkType
_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
@ -1567,7 +1567,7 @@ _0808139C:
bl sub_800AAC0
b _080813AA
_080813A2:
ldr r0, _080813B4 @ =gUnknown_3003F64
ldr r0, _080813B4 @ =gReceivedRemoteLinkPlayers
ldrb r0, [r0]
_080813A6:
cmp r0, 0
@ -1578,7 +1578,7 @@ _080813AA:
strh r0, [r4, 0x8]
b _0808143A
.align 2, 0
_080813B4: .4byte gUnknown_3003F64
_080813B4: .4byte gReceivedRemoteLinkPlayers
_080813B8:
ldr r0, _080813CC @ =gLinkPlayers
ldr r0, [r0, 0x4]
@ -1597,7 +1597,7 @@ _080813D4:
lsls r0, 1
bl PlayMapChosenOrBattleBGM
_080813DC:
ldr r0, _080813F0 @ =gUnknown_20370C0
ldr r0, _080813F0 @ =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0x2
beq _08081404
@ -1607,7 +1607,7 @@ _080813DC:
beq _080813FA
b _0808141A
.align 2, 0
_080813F0: .4byte gUnknown_20370C0
_080813F0: .4byte gSpecialVar_0x8004
_080813F4:
cmp r0, 0x5
beq _08081410
@ -1694,7 +1694,7 @@ _080814A0:
movs r0, 0x1
movs r1, 0
bl fade_screen
ldr r0, _080814BC @ =gUnknown_202271A
ldr r0, _080814BC @ =gLinkType
ldr r2, _080814C0 @ =0x00002211
adds r1, r2, 0
strh r1, [r0]
@ -1703,10 +1703,10 @@ _080814A0:
strh r0, [r6]
b _0808160A
.align 2, 0
_080814BC: .4byte gUnknown_202271A
_080814BC: .4byte gLinkType
_080814C0: .4byte 0x00002211
_080814C4:
ldr r0, _080814D8 @ =gUnknown_2037AB8
ldr r0, _080814D8 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@ -1718,9 +1718,9 @@ _080814D2:
strh r0, [r6]
b _0808160A
.align 2, 0
_080814D8: .4byte gUnknown_2037AB8
_080814D8: .4byte gPaletteFade
_080814DC:
ldr r1, _080814EC @ =gUnknown_2022720
ldr r1, _080814EC @ =gLocalLinkPlayer
movs r0, 0
movs r2, 0x1C
bl SendBlock
@ -1728,7 +1728,7 @@ _080814DC:
strh r0, [r6]
b _0808160A
.align 2, 0
_080814EC: .4byte gUnknown_2022720
_080814EC: .4byte gLocalLinkPlayer
_080814F0:
bl GetBlockReceivedStatus
adds r4, r0, 0
@ -1746,7 +1746,7 @@ _08081504:
_0808150C: .4byte gLinkPlayers
_08081510:
lsls r1, r4, 8
ldr r2, _08081548 @ =gUnknown_2022118
ldr r2, _08081548 @ =gBlockRecvBuffer
adds r0, r5, 0
adds r1, r2
ldm r1!, {r2,r3,r7}
@ -1772,7 +1772,7 @@ _08081536:
strh r0, [r6]
b _0808160A
.align 2, 0
_08081548: .4byte gUnknown_2022118
_08081548: .4byte gBlockRecvBuffer
_0808154C:
ldrh r0, [r6, 0x2]
adds r0, 0x1
@ -1818,7 +1818,7 @@ _080815A0:
ldr r0, _080815B8 @ =gLinkPlayers
ldr r1, _080815BC @ =0x00002211
str r1, [r0, 0x14]
ldr r0, _080815C0 @ =gUnknown_20370C0
ldr r0, _080815C0 @ =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0x2
beq _080815D4
@ -1830,7 +1830,7 @@ _080815A0:
.align 2, 0
_080815B8: .4byte gLinkPlayers
_080815BC: .4byte 0x00002211
_080815C0: .4byte gUnknown_20370C0
_080815C0: .4byte gSpecialVar_0x8004
_080815C4:
cmp r0, 0x5
beq _080815E0
@ -1927,7 +1927,7 @@ sub_8081668: @ 8081668
bl LoadPlayerParty
bl SavePlayerBag
bl sub_81134B8
ldr r0, _080816B8 @ =gUnknown_20370C0
ldr r0, _080816B8 @ =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0x5
beq _0808170A
@ -1936,7 +1936,7 @@ sub_8081668: @ 8081668
movs r5, 0x1
eors r0, r5
bl sub_80CD98C
ldr r0, _080816C0 @ =gUnknown_3003F3C
ldr r0, _080816C0 @ =gWirelessCommType
ldrb r0, [r0]
cmp r0, 0
beq _0808170A
@ -1950,9 +1950,9 @@ sub_8081668: @ 8081668
.align 2, 0
_080816B0: .4byte gBattleTypeFlags
_080816B4: .4byte 0x0000ffdf
_080816B8: .4byte gUnknown_20370C0
_080816B8: .4byte gSpecialVar_0x8004
_080816BC: .4byte gUnknown_300502C
_080816C0: .4byte gUnknown_3003F3C
_080816C0: .4byte gWirelessCommType
_080816C4: .4byte gUnknown_2023E8A
_080816C8:
ldr r4, _080816E8 @ =gLinkPlayers
@ -2015,7 +2015,7 @@ _08081740: .4byte sub_806FB7C
thumb_func_start sub_8081744
sub_8081744: @ 8081744
push {lr}
ldr r0, _0808176C @ =gUnknown_20370C0
ldr r0, _0808176C @ =gSpecialVar_0x8004
ldrh r1, [r0]
subs r0, r1, 0x1
lsls r0, 16
@ -2033,7 +2033,7 @@ _08081760:
pop {r0}
bx r0
.align 2, 0
_0808176C: .4byte gUnknown_20370C0
_0808176C: .4byte gSpecialVar_0x8004
thumb_func_end sub_8081744
thumb_func_start sub_8081770
@ -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
@ -2207,7 +2207,7 @@ _080818B8:
.align 2, 0
_080818C0: .4byte gUnknown_2031DA4
_080818C4:
ldr r0, _080818E0 @ =gUnknown_3003F64
ldr r0, _080818E0 @ =gReceivedRemoteLinkPlayers
ldrb r0, [r0]
cmp r0, 0
bne _080818D8
@ -2220,7 +2220,7 @@ _080818D8:
pop {r0}
bx r0
.align 2, 0
_080818E0: .4byte gUnknown_3003F64
_080818E0: .4byte gReceivedRemoteLinkPlayers
_080818E4: .4byte sub_804C718
thumb_func_end sub_8081850
@ -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
@ -2299,7 +2299,7 @@ _08081970:
thumb_func_start sub_8081978
sub_8081978: @ 8081978
push {lr}
ldr r0, _0808198C @ =gUnknown_3003F3C
ldr r0, _0808198C @ =gWirelessCommType
ldrb r0, [r0]
cmp r0, 0
beq _08081994
@ -2307,7 +2307,7 @@ sub_8081978: @ 8081978
bl sub_8081828
b _0808199A
.align 2, 0
_0808198C: .4byte gUnknown_3003F3C
_0808198C: .4byte gWirelessCommType
_08081990: .4byte sub_80818E8
_08081994:
ldr r0, _080819A0 @ =sub_8081850
@ -2343,11 +2343,11 @@ sub_80819B8: @ 80819B8
thumb_func_start sub_80819C8
sub_80819C8: @ 80819C8
push {lr}
ldr r1, _080819E4 @ =gUnknown_202271A
ldr r1, _080819E4 @ =gLinkType
ldr r2, _080819E8 @ =0x00002211
adds r0, r2, 0
strh r0, [r1]
ldr r0, _080819EC @ =gUnknown_3003F3C
ldr r0, _080819EC @ =gWirelessCommType
ldrb r0, [r0]
cmp r0, 0
beq _080819F4
@ -2355,9 +2355,9 @@ sub_80819C8: @ 80819C8
bl sub_8081828
b _080819FA
.align 2, 0
_080819E4: .4byte gUnknown_202271A
_080819E4: .4byte gLinkType
_080819E8: .4byte 0x00002211
_080819EC: .4byte gUnknown_3003F3C
_080819EC: .4byte gWirelessCommType
_080819F0: .4byte sub_8081454
_080819F4:
ldr r0, _08081A00 @ =sub_8081318
@ -2385,14 +2385,14 @@ _08081A18: .4byte sub_808177C
thumb_func_start sp02A_crash_sound
sp02A_crash_sound: @ 8081A1C
push {lr}
ldr r0, _08081A2C @ =gUnknown_20370C4
ldr r0, _08081A2C @ =gSpecialVar_0x8006
ldrb r0, [r0]
ldr r1, _08081A30 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
bl sub_808B700
pop {r0}
bx r0
.align 2, 0
_08081A2C: .4byte gUnknown_20370C4
_08081A2C: .4byte gSpecialVar_0x8006
_08081A30: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
thumb_func_end sp02A_crash_sound
@ -2402,13 +2402,13 @@ sub_8081A34: @ 8081A34
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, _08081A74 @ =gUnknown_20370C4
ldr r0, _08081A74 @ =gSpecialVar_0x8006
strh r4, [r0]
ldr r0, _08081A78 @ =gStringVar1
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
@ -2427,9 +2427,9 @@ sub_8081A34: @ 8081A34
movs r0, 0x1
b _08081A8A
.align 2, 0
_08081A74: .4byte gUnknown_20370C4
_08081A74: .4byte gSpecialVar_0x8006
_08081A78: .4byte gStringVar1
_08081A7C: .4byte gUnknown_2022744
_08081A7C: .4byte gLinkPlayers + 8
_08081A80: .4byte gStringVar2
_08081A84: .4byte gUnknown_83C6AB8
_08081A88:
@ -2465,7 +2465,7 @@ sub_8081A90: @ 8081A90
adds r0, r4, 0
bl DestroyTask
_08081AC2:
ldr r0, _08081AE0 @ =gUnknown_3003F64
ldr r0, _08081AE0 @ =gReceivedRemoteLinkPlayers
ldrb r0, [r0]
cmp r0, 0
beq _08081AD0
@ -2478,7 +2478,7 @@ _08081AD0:
.align 2, 0
_08081AD8: .4byte gTasks
_08081ADC: .4byte c2_800ACD4
_08081AE0: .4byte gUnknown_3003F64
_08081AE0: .4byte gReceivedRemoteLinkPlayers
thumb_func_end sub_8081A90
thumb_func_start sub_8081AE4
@ -2486,7 +2486,7 @@ sub_8081AE4: @ 8081AE4
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _08081B04 @ =gUnknown_3003F64
ldr r0, _08081B04 @ =gReceivedRemoteLinkPlayers
ldrb r0, [r0]
cmp r0, 0
bne _08081AFC
@ -2498,7 +2498,7 @@ _08081AFC:
pop {r0}
bx r0
.align 2, 0
_08081B04: .4byte gUnknown_3003F64
_08081B04: .4byte gReceivedRemoteLinkPlayers
thumb_func_end sub_8081AE4
thumb_func_start sub_8081B08

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

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:

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,35 +74,36 @@ 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
.4byte 0x8254784
.4byte 0x824FC40
.4byte 0x824FB08
.4byte 0x83DB028
.4byte 0x8250C04
.4byte 0x826056C
.4byte 0x82605CC
.4byte 0x8254784 @ gBaseStats
.4byte 0x824FC40 @ gAbilityNames
.4byte 0x824FB08 @ gAbilityDescriptionPointers
.4byte 0x83DB028 @ gItems
.4byte 0x8250C04 @ gBattleMoves
.4byte 0x826056C @ gBallSpriteSheets
.4byte 0x82605CC @ gBallSpritePalettes
.4byte 0xA8
.4byte 0x82C
.4byte 0x83B
.4byte 0x3A0D1E2A
.4byte 0x1E2B
.4byte 0x298
.4byte 0x309C
.4byte 0x30EC
.4byte 0x34
.4byte 0x298 @ offsetof(struct SaveBlock1, pcItems) // maybe all items were in a struct together?
.4byte 0x309C @ offsetof(struct SaveBlock1, giftRibbons)
.4byte 0x30EC @ offsetof(struct SaveBlock1, enigmaBerry)
.4byte 0x34 @ size of SaveBlock1 map header reconstruction data?
.4byte 0
.4byte 0xFFFFFFFF

View File

@ -458,7 +458,7 @@ TakePokemonFromDaycare: @ 8045728
movs r1, 0xBE
lsls r1, 6
adds r0, r1
ldr r1, _08045748 @ =gUnknown_20370C0
ldr r1, _08045748 @ =gSpecialVar_0x8004
ldrb r1, [r1]
bl TakeSelectedPokemonMonFromDaycareShiftSlots
lsls r0, 16
@ -467,7 +467,7 @@ TakePokemonFromDaycare: @ 8045728
bx r1
.align 2, 0
_08045744: .4byte gSaveBlock1Ptr
_08045748: .4byte gUnknown_20370C0
_08045748: .4byte gSpecialVar_0x8004
thumb_func_end TakePokemonFromDaycare
thumb_func_start GetLevelAfterDaycareSteps
@ -598,7 +598,7 @@ GetDaycareCost: @ 8045838
movs r1, 0xBE
lsls r1, 6
adds r0, r1
ldr r1, _08045858 @ =gUnknown_20370C0
ldr r1, _08045858 @ =gSpecialVar_0x8004
ldrb r1, [r1]
bl GetDaycareCostForMon
ldr r1, _0804585C @ =gSpecialVar_0x8005
@ -607,7 +607,7 @@ GetDaycareCost: @ 8045838
bx r0
.align 2, 0
_08045854: .4byte gSaveBlock1Ptr
_08045858: .4byte gUnknown_20370C0
_08045858: .4byte gSpecialVar_0x8004
_0804585C: .4byte gSpecialVar_0x8005
thumb_func_end GetDaycareCost
@ -644,7 +644,7 @@ _08045894: .4byte 0x00003d20
GetNumLevelsGainedFromDaycare: @ 8045898
push {r4-r6,lr}
ldr r6, _080458C0 @ =gSaveBlock1Ptr
ldr r5, _080458C4 @ =gUnknown_20370C0
ldr r5, _080458C4 @ =gSpecialVar_0x8004
ldrh r0, [r5]
movs r4, 0x8C
adds r1, r0, 0
@ -662,7 +662,7 @@ GetNumLevelsGainedFromDaycare: @ 8045898
b _080458E0
.align 2, 0
_080458C0: .4byte gSaveBlock1Ptr
_080458C4: .4byte gUnknown_20370C0
_080458C4: .4byte gSpecialVar_0x8004
_080458C8:
ldrh r0, [r5]
adds r1, r0, 0
@ -2076,13 +2076,13 @@ _08046350:
str r0, [sp]
cmp r0, 0
bne _08046390
ldr r0, _0804638C @ =gUnknown_20370C0
ldr r0, _0804638C @ =gSpecialVar_0x8004
strh r5, [r0]
movs r0, 0x1
b _080463AA
.align 2, 0
_08046388: .4byte gPlayerParty
_0804638C: .4byte gUnknown_20370C0
_0804638C: .4byte gSpecialVar_0x8004
_08046390:
subs r0, 0x1
str r0, [sp]
@ -2990,13 +2990,13 @@ Task_HandleDaycareLevelMenuInput: @ 80469FC
_08046A2C: .4byte gTasks
_08046A30: .4byte gMain
_08046A34:
ldr r0, _08046A3C @ =gUnknown_20370D0
ldr r0, _08046A3C @ =gSpecialVar_Result
strh r1, [r0]
b _08046A46
.align 2, 0
_08046A3C: .4byte gUnknown_20370D0
_08046A3C: .4byte gSpecialVar_Result
_08046A40:
ldr r1, _08046A74 @ =gUnknown_20370D0
ldr r1, _08046A74 @ =gSpecialVar_Result
movs r0, 0x2
strh r0, [r1]
_08046A46:
@ -3019,7 +3019,7 @@ _08046A46:
bl EnableBothScriptContexts
b _08046AAC
.align 2, 0
_08046A74: .4byte gUnknown_20370D0
_08046A74: .4byte gSpecialVar_Result
_08046A78: .4byte gTasks
_08046A7C:
movs r1, 0x2
@ -3027,7 +3027,7 @@ _08046A7C:
ands r0, r2
cmp r0, 0
beq _08046AAC
ldr r0, _08046AB4 @ =gUnknown_20370D0
ldr r0, _08046AB4 @ =gSpecialVar_Result
strh r1, [r0]
ldrb r0, [r4, 0x8]
movs r1, 0
@ -3046,7 +3046,7 @@ _08046AAC:
pop {r0}
bx r0
.align 2, 0
_08046AB4: .4byte gUnknown_20370D0
_08046AB4: .4byte gSpecialVar_Result
thumb_func_end Task_HandleDaycareLevelMenuInput
thumb_func_start ShowDaycareLevelMenu

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

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
@ -495,7 +495,7 @@ _080BDA74:
thumb_func_start sub_80BDA7C
sub_80BDA7C: @ 80BDA7C
push {r4,r5,lr}
ldr r0, _080BDA90 @ =gUnknown_20370C0
ldr r0, _080BDA90 @ =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0x1
beq _080BDAB4
@ -505,7 +505,7 @@ sub_80BDA7C: @ 80BDA7C
beq _080BDA9E
b _080BDB08
.align 2, 0
_080BDA90: .4byte gUnknown_20370C0
_080BDA90: .4byte gSpecialVar_0x8004
_080BDA94:
cmp r0, 0x2
beq _080BDADC
@ -622,8 +622,8 @@ _080BDB68: .4byte gSaveBlock1Ptr
_080BDB6C: .4byte 0x00002f10
thumb_func_end sub_80BDB48
thumb_func_start sub_80BDB70
sub_80BDB70: @ 80BDB70
thumb_func_start EnableRareWord
EnableRareWord: @ 80BDB70
push {lr}
lsls r0, 24
lsrs r1, r0, 24
@ -648,7 +648,7 @@ _080BDB94:
.align 2, 0
_080BDB98: .4byte gSaveBlock1Ptr
_080BDB9C: .4byte 0x00002f10
thumb_func_end sub_80BDB70
thumb_func_end EnableRareWord
thumb_func_start sub_80BDBA0
sub_80BDBA0: @ 80BDBA0
@ -687,7 +687,7 @@ sub_80BDBCC: @ 80BDBCC
b _080BDC32
_080BDBDC:
adds r0, r5, 0
bl sub_80BDB70
bl EnableRareWord
ldr r0, _080BDBF4 @ =0x000001ff
ands r4, r0
movs r1, 0xA0
@ -841,7 +841,7 @@ _080BDCF6:
lsls r0, 16
lsrs r0, 16
movs r1, 0
bl sub_8088E74
bl GetSetPokedexFlag
lsls r0, 24
cmp r0, 0
beq _080BDD16
@ -1769,7 +1769,7 @@ _080BE3BC:
lsls r0, 16
lsrs r0, 16
movs r1, 0
bl sub_8088E74
bl GetSetPokedexFlag
lsls r0, 24
lsrs r0, 24
b _080BE40C
@ -1783,7 +1783,7 @@ _080BE3D6:
lsls r0, 16
lsrs r0, 16
movs r1, 0
bl sub_8088E74
bl GetSetPokedexFlag
lsls r0, 24
lsrs r0, 24
b _080BE40C

View File

@ -214,10 +214,10 @@ AddHatchedMonToParty: @ 8046D60
lsrs r4, 16
adds r0, r4, 0
movs r1, 0x2
bl sub_8088E74
bl GetSetPokedexFlag
adds r0, r4, 0
movs r1, 0x3
bl sub_8088E74
bl GetSetPokedexFlag
ldr r1, _08046E1C @ =gStringVar1
adds r0, r5, 0
bl GetMonNick
@ -258,13 +258,13 @@ _08046E1C: .4byte gStringVar1
thumb_func_start ScriptHatchMon
ScriptHatchMon: @ 8046E20
push {lr}
ldr r0, _08046E30 @ =gUnknown_20370C0
ldr r0, _08046E30 @ =gSpecialVar_0x8004
ldrb r0, [r0]
bl AddHatchedMonToParty
pop {r0}
bx r0
.align 2, 0
_08046E30: .4byte gUnknown_20370C0
_08046E30: .4byte gSpecialVar_0x8004
thumb_func_end ScriptHatchMon
thumb_func_start sub_8046E34
@ -332,7 +332,7 @@ sub_8046EAC: @ 8046EAC
movs r1, 0xBE
lsls r1, 6
adds r0, r1
ldr r1, _08046ECC @ =gUnknown_20370C0
ldr r1, _08046ECC @ =gSpecialVar_0x8004
ldrb r1, [r1]
bl sub_8046E34
lsls r0, 24
@ -341,7 +341,7 @@ sub_8046EAC: @ 8046EAC
bx r1
.align 2, 0
_08046EC8: .4byte gSaveBlock1Ptr
_08046ECC: .4byte gUnknown_20370C0
_08046ECC: .4byte gSpecialVar_0x8004
thumb_func_end sub_8046EAC
thumb_func_start sub_8046ED0
@ -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
@ -566,7 +566,7 @@ _08047090:
str r0, [r4]
bl AllocateMonSpritesGfx
ldr r2, [r4]
ldr r0, _0804714C @ =gUnknown_20370C0
ldr r0, _0804714C @ =gSpecialVar_0x8004
ldrh r0, [r0]
movs r1, 0
strb r0, [r2, 0x4]
@ -626,7 +626,7 @@ _08047090:
b _0804724A
.align 2, 0
_08047148: .4byte gUnknown_3000E74
_0804714C: .4byte gUnknown_20370C0
_0804714C: .4byte gSpecialVar_0x8004
_08047150: .4byte sub_8046FC0
_08047154: .4byte gSpecialVar_0x8005
_08047158: .4byte gUnknown_826019C
@ -648,7 +648,7 @@ _08047174:
movs r2, 0
movs r3, 0
bl sub_80F696C
ldr r1, _080471A0 @ =gUnknown_8D0051C
ldr r1, _080471A0 @ =gFile_graphics_interface_menu_map_tilemap
movs r0, 0
movs r2, 0
movs r3, 0
@ -660,7 +660,7 @@ _08047174:
b _0804724A
.align 2, 0
_0804719C: .4byte gUnknown_8D00000
_080471A0: .4byte gUnknown_8D0051C
_080471A0: .4byte gFile_graphics_interface_menu_map_tilemap
_080471A4: .4byte gUnknown_8D004D8
_080471A8:
ldr r0, _080471BC @ =gUnknown_826011C
@ -770,7 +770,7 @@ _0804729C: .4byte gUnknown_3000E74
thumb_func_start EggHatchSetMonNickname
EggHatchSetMonNickname: @ 80472A0
push {lr}
ldr r0, _080472D0 @ =gUnknown_20370C0
ldr r0, _080472D0 @ =gSpecialVar_0x8004
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
@ -789,7 +789,7 @@ EggHatchSetMonNickname: @ 80472A0
pop {r0}
bx r0
.align 2, 0
_080472D0: .4byte gUnknown_20370C0
_080472D0: .4byte gSpecialVar_0x8004
_080472D4: .4byte gPlayerParty
_080472D8: .4byte gStringVar3
_080472DC: .4byte gUnknown_3000E74
@ -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

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
@ -170,11 +170,11 @@ _0806E224: .4byte 0x0000404e
_0806E228: .4byte gSaveBlock2Ptr
thumb_func_end sub_806E204
thumb_func_start sub_806E22C
sub_806E22C: @ 806E22C
thumb_func_start EnableNationalPokedex
EnableNationalPokedex: @ 806E22C
push {lr}
ldr r0, _0806E250 @ =0x0000404e
bl sub_806E454
bl GetVarPointer
ldr r1, _0806E254 @ =gSaveBlock2Ptr
ldr r2, [r1]
movs r1, 0xB9
@ -191,7 +191,7 @@ sub_806E22C: @ 806E22C
_0806E250: .4byte 0x0000404e
_0806E254: .4byte gSaveBlock2Ptr
_0806E258: .4byte 0x00006258
thumb_func_end sub_806E22C
thumb_func_end EnableNationalPokedex
thumb_func_start sub_806E25C
sub_806E25C: @ 806E25C
@ -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
@ -509,7 +509,7 @@ _0806E500: .4byte gUnknown_300507C
_0806E504: .4byte gSaveBlock1Ptr
_0806E508: .4byte 0xffff9000
_0806E50C:
ldr r0, _0806E520 @ =gUnknown_815FD0C
ldr r0, _0806E520 @ =gSpecialVars
ldr r3, _0806E524 @ =0xffff8000
adds r1, r6, r3
lsls r1, 2
@ -520,9 +520,9 @@ _0806E518:
pop {r1}
bx r1
.align 2, 0
_0806E520: .4byte gUnknown_815FD0C
_0806E520: .4byte gSpecialVars
_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]
@ -796,38 +796,38 @@ _0806E6F6:
thumb_func_start sub_806E6FC
sub_806E6FC: @ 806E6FC
ldr r1, _0806E754 @ =gUnknown_20370B8
ldr r1, _0806E754 @ =gSpecialVar_0x8000
movs r0, 0
strh r0, [r1]
ldr r1, _0806E758 @ =gUnknown_20370BA
ldr r1, _0806E758 @ =gSpecialVar_0x8001
strh r0, [r1]
ldr r1, _0806E75C @ =gUnknown_20370BC
ldr r1, _0806E75C @ =gSpecialVar_0x8002
strh r0, [r1]
ldr r1, _0806E760 @ =gUnknown_20370BE
ldr r1, _0806E760 @ =gSpecialVar_0x8003
strh r0, [r1]
ldr r1, _0806E764 @ =gUnknown_20370C0
ldr r1, _0806E764 @ =gSpecialVar_0x8004
strh r0, [r1]
ldr r1, _0806E768 @ =gSpecialVar_0x8005
strh r0, [r1]
ldr r1, _0806E76C @ =gUnknown_20370C4
ldr r1, _0806E76C @ =gSpecialVar_0x8006
strh r0, [r1]
ldr r1, _0806E770 @ =gUnknown_20370C6
ldr r1, _0806E770 @ =gSpecialVar_0x8007
strh r0, [r1]
ldr r1, _0806E774 @ =gUnknown_20370C8
ldr r1, _0806E774 @ =gSpecialVar_0x8008
strh r0, [r1]
ldr r1, _0806E778 @ =gUnknown_20370CA
ldr r1, _0806E778 @ =gSpecialVar_0x8009
strh r0, [r1]
ldr r1, _0806E77C @ =gUnknown_20370CC
ldr r1, _0806E77C @ =gSpecialVar_0x800A
strh r0, [r1]
ldr r1, _0806E780 @ =gUnknown_20370CE
ldr r1, _0806E780 @ =gSpecialVar_0x800B
strh r0, [r1]
ldr r1, _0806E784 @ =gUnknown_20370D4
ldr r1, _0806E784 @ =gSpecialVar_Facing
strh r0, [r1]
ldr r1, _0806E788 @ =gUnknown_20370D0
ldr r1, _0806E788 @ =gSpecialVar_Result
strh r0, [r1]
ldr r1, _0806E78C @ =gUnknown_203AD30
ldr r1, _0806E78C @ =gSpecialVar_ItemId
strh r0, [r1]
ldr r1, _0806E790 @ =gUnknown_20370D2
ldr r1, _0806E790 @ =gSpecialVar_LastTalked
strh r0, [r1]
ldr r1, _0806E794 @ =gSpecialVar_MonBoxId
strh r0, [r1]
@ -841,22 +841,22 @@ sub_806E6FC: @ 806E6FC
strh r0, [r1]
bx lr
.align 2, 0
_0806E754: .4byte gUnknown_20370B8
_0806E758: .4byte gUnknown_20370BA
_0806E75C: .4byte gUnknown_20370BC
_0806E760: .4byte gUnknown_20370BE
_0806E764: .4byte gUnknown_20370C0
_0806E754: .4byte gSpecialVar_0x8000
_0806E758: .4byte gSpecialVar_0x8001
_0806E75C: .4byte gSpecialVar_0x8002
_0806E760: .4byte gSpecialVar_0x8003
_0806E764: .4byte gSpecialVar_0x8004
_0806E768: .4byte gSpecialVar_0x8005
_0806E76C: .4byte gUnknown_20370C4
_0806E770: .4byte gUnknown_20370C6
_0806E774: .4byte gUnknown_20370C8
_0806E778: .4byte gUnknown_20370CA
_0806E77C: .4byte gUnknown_20370CC
_0806E780: .4byte gUnknown_20370CE
_0806E784: .4byte gUnknown_20370D4
_0806E788: .4byte gUnknown_20370D0
_0806E78C: .4byte gUnknown_203AD30
_0806E790: .4byte gUnknown_20370D2
_0806E76C: .4byte gSpecialVar_0x8006
_0806E770: .4byte gSpecialVar_0x8007
_0806E774: .4byte gSpecialVar_0x8008
_0806E778: .4byte gSpecialVar_0x8009
_0806E77C: .4byte gSpecialVar_0x800A
_0806E780: .4byte gSpecialVar_0x800B
_0806E784: .4byte gSpecialVar_Facing
_0806E788: .4byte gSpecialVar_Result
_0806E78C: .4byte gSpecialVar_ItemId
_0806E790: .4byte gSpecialVar_LastTalked
_0806E794: .4byte gSpecialVar_MonBoxId
_0806E798: .4byte gSpecialVar_MonBoxPos
_0806E79C: .4byte gUnknown_20370DA

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

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
@ -839,7 +839,7 @@ _080CE4C0: .4byte gSprites
_080CE4C4: .4byte nullsub_10
_080CE4C8: .4byte gMain
_080CE4CC:
ldr r0, _080CE4FC @ =gUnknown_3003F3C
ldr r0, _080CE4FC @ =gWirelessCommType
ldrb r0, [r0]
cmp r0, 0
beq _080CE4E0
@ -864,7 +864,7 @@ _080CE4F4:
strb r0, [r1]
b _080CE534
.align 2, 0
_080CE4FC: .4byte gUnknown_3003F3C
_080CE4FC: .4byte gWirelessCommType
_080CE500: .4byte gMain
_080CE504:
movs r0, 0x1
@ -1252,13 +1252,13 @@ _080CE80C:
lsls r0, 16
lsrs r0, 16
movs r1, 0x2
bl sub_8088E74
bl GetSetPokedexFlag
ldrh r0, [r4, 0xC]
bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r0, 16
movs r1, 0x3
bl sub_8088E74
bl GetSetPokedexFlag
mov r0, r9
movs r1, 0xB
bl GetMonData
@ -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
@ -1829,13 +1829,13 @@ _080CED3A:
lsls r0, 16
lsrs r0, 16
movs r1, 0x2
bl sub_8088E74
bl GetSetPokedexFlag
ldrh r0, [r4, 0xC]
bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r0, 16
movs r1, 0x3
bl sub_8088E74
bl GetSetPokedexFlag
movs r0, 0xE
bl IncrementGameStat
b _080CF528
@ -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
@ -3136,13 +3136,13 @@ _080CF8A8:
lsls r0, 16
lsrs r0, 16
movs r1, 0x2
bl sub_8088E74
bl GetSetPokedexFlag
ldrh r0, [r4, 0xC]
bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r0, 16
movs r1, 0x3
bl sub_8088E74
bl GetSetPokedexFlag
movs r0, 0xE
bl IncrementGameStat
b _080D003A
@ -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
@ -3687,7 +3687,7 @@ _080CFDAC:
beq _080CFDBA
b _080D003A
_080CFDBA:
ldr r0, _080CFE18 @ =gUnknown_3003F3C
ldr r0, _080CFE18 @ =gWirelessCommType
ldrb r0, [r0]
cmp r0, 0
beq _080CFDC6
@ -3724,15 +3724,15 @@ _080CFDC6:
strh r0, [r5, 0x14]
b _080D003A
.align 2, 0
_080CFE14: .4byte gUnknown_2037AB8
_080CFE18: .4byte gUnknown_3003F3C
_080CFE14: .4byte gPaletteFade
_080CFE18: .4byte gWirelessCommType
_080CFE1C: .4byte gPlayerParty
_080CFE20: .4byte gTasks
_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

File diff suppressed because it is too large Load Diff

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

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
@ -938,13 +938,13 @@ _0806CFBC:
ble _0806CFB0
ldr r0, _0806CFE8 @ =gUnknown_3005074
strb r3, [r0]
ldr r1, _0806CFEC @ =gUnknown_20370D2
ldr r1, _0806CFEC @ =gSpecialVar_LastTalked
adds r0, r2, r3
lsls r0, 2
adds r0, r5
ldrb r0, [r0, 0x8]
strh r0, [r1]
ldr r0, _0806CFF0 @ =gUnknown_20370D4
ldr r0, _0806CFF0 @ =gSpecialVar_Facing
strh r6, [r0]
adds r0, r3, 0
bl GetFieldObjectScriptPointerByFieldObjectId
@ -955,8 +955,8 @@ _0806CFDE:
.align 2, 0
_0806CFE4: .4byte gUnknown_2031DEC
_0806CFE8: .4byte gUnknown_3005074
_0806CFEC: .4byte gUnknown_20370D2
_0806CFF0: .4byte gUnknown_20370D4
_0806CFEC: .4byte gSpecialVar_LastTalked
_0806CFF0: .4byte gSpecialVar_Facing
thumb_func_end sub_806CF38
thumb_func_start sub_806CFF4
@ -1046,14 +1046,14 @@ _0806D09C: .4byte gUnknown_826D2D8
_0806D0A0:
ldr r0, _0806D0D4 @ =gUnknown_3005074
strb r5, [r0]
ldr r4, _0806D0D8 @ =gUnknown_20370D2
ldr r4, _0806D0D8 @ =gSpecialVar_LastTalked
ldr r1, _0806D0DC @ =gMapObjects
adds r0, r6, r5
lsls r0, 2
adds r0, r1
ldrb r0, [r0, 0x8]
strh r0, [r4]
ldr r0, _0806D0E0 @ =gUnknown_20370D4
ldr r0, _0806D0E0 @ =gSpecialVar_Facing
mov r1, r8
strh r1, [r0]
adds r0, r5, 0
@ -1070,9 +1070,9 @@ _0806D0C8:
bx r1
.align 2, 0
_0806D0D4: .4byte gUnknown_3005074
_0806D0D8: .4byte gUnknown_20370D2
_0806D0D8: .4byte gSpecialVar_LastTalked
_0806D0DC: .4byte gMapObjects
_0806D0E0: .4byte gUnknown_20370D4
_0806D0E0: .4byte gSpecialVar_Facing
thumb_func_end sub_806CFF4
thumb_func_start sub_806D0E4
@ -1165,12 +1165,12 @@ _0806D17A:
ldr r0, [r5, 0x8]
movs r1, 0x1
bl sub_80CC44C
ldr r4, _0806D1C8 @ =gUnknown_20370C0
ldr r4, _0806D1C8 @ =gSpecialVar_0x8004
strh r0, [r4]
ldr r0, [r5, 0x8]
movs r1, 0x2
bl sub_80CC44C
ldr r1, _0806D1CC @ =gUnknown_20370C4
ldr r1, _0806D1CC @ =gSpecialVar_0x8006
strh r0, [r1]
ldrh r0, [r4]
bl FlagGet
@ -1178,22 +1178,22 @@ _0806D17A:
lsrs r0, 24
cmp r0, 0x1
beq _0806D164
ldr r0, _0806D1D0 @ =gUnknown_20370D4
ldr r0, _0806D1D0 @ =gSpecialVar_Facing
strh r6, [r0]
ldr r0, _0806D1D4 @ =gUnknown_81A6843
b _0806D1E6
.align 2, 0
_0806D1C4: .4byte gSpecialVar_0x8005
_0806D1C8: .4byte gUnknown_20370C0
_0806D1CC: .4byte gUnknown_20370C4
_0806D1D0: .4byte gUnknown_20370D4
_0806D1C8: .4byte gSpecialVar_0x8004
_0806D1CC: .4byte gSpecialVar_0x8006
_0806D1D0: .4byte gSpecialVar_Facing
_0806D1D4: .4byte gUnknown_81A6843
_0806D1D8:
cmp r2, 0xFF
beq _0806D1E0
bl sub_8069A20
_0806D1E0:
ldr r0, _0806D1EC @ =gUnknown_20370D4
ldr r0, _0806D1EC @ =gSpecialVar_Facing
strh r6, [r0]
ldr r0, [r5, 0x8]
_0806D1E6:
@ -1201,7 +1201,7 @@ _0806D1E6:
pop {r1}
bx r1
.align 2, 0
_0806D1EC: .4byte gUnknown_20370D4
_0806D1EC: .4byte gSpecialVar_Facing
thumb_func_end sub_806D0E4
thumb_func_start sub_806D1F0
@ -1211,7 +1211,7 @@ sub_806D1F0: @ 806D1F0
lsrs r4, r1, 24
lsls r2, 24
lsrs r5, r2, 24
ldr r0, _0806D210 @ =gUnknown_20370D4
ldr r0, _0806D210 @ =gSpecialVar_Facing
strh r5, [r0]
adds r0, r4, 0
bl MetatileBehavior_IsPC
@ -1222,7 +1222,7 @@ sub_806D1F0: @ 806D1F0
ldr r0, _0806D214 @ =gUnknown_81A6955
b _0806D53E
.align 2, 0
_0806D210: .4byte gUnknown_20370D4
_0806D210: .4byte gSpecialVar_Facing
_0806D214: .4byte gUnknown_81A6955
_0806D218:
adds r0, r4, 0
@ -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
@ -2114,7 +2114,7 @@ sub_806D908: @ 806D908
push {lr}
lsls r1, 24
lsrs r1, 24
ldr r2, _0806D924 @ =gUnknown_20370D4
ldr r2, _0806D924 @ =gSpecialVar_Facing
strh r1, [r2]
bl ScriptContext1_SetupScript
bl sub_80699E0
@ -2122,7 +2122,7 @@ sub_806D908: @ 806D908
pop {r0}
bx r0
.align 2, 0
_0806D924: .4byte gUnknown_20370D4
_0806D924: .4byte gSpecialVar_Facing
thumb_func_end sub_806D908
thumb_func_start sub_806D928
@ -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

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

File diff suppressed because it is too large Load Diff

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

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
@ -1490,7 +1490,7 @@ _0807E6D4:
strh r0, [r4]
b _0807E6F4
_0807E6DC:
ldr r0, _0807E6FC @ =gUnknown_3003F64
ldr r0, _0807E6FC @ =gReceivedRemoteLinkPlayers
ldrb r0, [r0]
cmp r0, 0
bne _0807E6F4
@ -1504,7 +1504,7 @@ _0807E6F4:
pop {r0}
bx r0
.align 2, 0
_0807E6FC: .4byte gUnknown_3003F64
_0807E6FC: .4byte gReceivedRemoteLinkPlayers
_0807E700: .4byte sub_805671C
thumb_func_end sub_807E678
@ -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]

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

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

File diff suppressed because it is too large Load Diff

View File

@ -196,12 +196,12 @@ _080A05B8:
adds r1, r0, 0
cmp r1, 0
beq _080A05E8
ldr r1, _080A05CC @ =gUnknown_20370D0
ldr r1, _080A05CC @ =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
b _080A05EC
.align 2, 0
_080A05CC: .4byte gUnknown_20370D0
_080A05CC: .4byte gSpecialVar_Result
_080A05D0:
ldrb r0, [r4, 0x2]
bl MonFaintFromPoisonOnField
@ -214,7 +214,7 @@ _080A05D0:
.align 2, 0
_080A05E4: .4byte gUnknown_81A5476
_080A05E8:
ldr r0, _080A05FC @ =gUnknown_20370D0
ldr r0, _080A05FC @ =gSpecialVar_Result
strh r1, [r0]
_080A05EC:
bl EnableBothScriptContexts
@ -225,7 +225,7 @@ _080A05F6:
pop {r0}
bx r0
.align 2, 0
_080A05FC: .4byte gUnknown_20370D0
_080A05FC: .4byte gSpecialVar_Result
thumb_func_end Task_WhiteOut
thumb_func_start ExecuteWhiteOut

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:

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
@ -86,7 +86,7 @@ _080CA698: .4byte gStringVar4
thumb_func_start sub_80CA69C
sub_80CA69C: @ 80CA69C
ldr r1, _080CA6B0 @ =gUnknown_20370C0
ldr r1, _080CA6B0 @ =gSpecialVar_0x8004
ldr r0, _080CA6B4 @ =gSaveBlock1Ptr
ldr r2, [r0]
ldrh r0, [r2]
@ -96,7 +96,7 @@ sub_80CA69C: @ 80CA69C
strh r0, [r1]
bx lr
.align 2, 0
_080CA6B0: .4byte gUnknown_20370C0
_080CA6B0: .4byte gSpecialVar_0x8004
_080CA6B4: .4byte gSaveBlock1Ptr
_080CA6B8: .4byte gSpecialVar_0x8005
thumb_func_end sub_80CA69C
@ -188,13 +188,13 @@ _080CA754: .4byte gUnknown_2023E8A
thumb_func_start sub_80CA758
sub_80CA758: @ 80CA758
push {lr}
ldr r0, _080CA768 @ =gUnknown_20370C0
ldr r0, _080CA768 @ =gSpecialVar_0x8004
ldrh r0, [r0]
bl FlagSet
pop {r0}
bx r0
.align 2, 0
_080CA768: .4byte gUnknown_20370C0
_080CA768: .4byte gSpecialVar_0x8004
thumb_func_end sub_80CA758
thumb_func_start sub_80CA76C
@ -441,14 +441,14 @@ _080CA92C:
_080CA92E:
cmp r6, 0
beq _080CA954
ldr r0, _080CA940 @ =gUnknown_20370C0
ldr r0, _080CA940 @ =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0
bne _080CA944
movs r4, 0x62
b _080CA96E
.align 2, 0
_080CA940: .4byte gUnknown_20370C0
_080CA940: .4byte gSpecialVar_0x8004
_080CA944:
cmp r0, 0x1
beq _080CA94C
@ -460,14 +460,14 @@ _080CA94C:
.align 2, 0
_080CA950: .4byte 0x0000028f
_080CA954:
ldr r0, _080CA960 @ =gUnknown_20370C0
ldr r0, _080CA960 @ =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0
bne _080CA964
movs r4, 0x63
b _080CA96E
.align 2, 0
_080CA960: .4byte gUnknown_20370C0
_080CA960: .4byte gSpecialVar_0x8004
_080CA964:
cmp r0, 0x1
beq _080CA96C
@ -536,14 +536,14 @@ _080CA9D6:
_080CA9D8:
movs r5, 0xFF
_080CA9DA:
ldr r0, _080CA9E8 @ =gUnknown_20370C0
ldr r0, _080CA9E8 @ =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0
bne _080CA9EC
movs r4, 0x62
b _080CA9F6
.align 2, 0
_080CA9E8: .4byte gUnknown_20370C0
_080CA9E8: .4byte gSpecialVar_0x8004
_080CA9EC:
cmp r0, 0x1
beq _080CA9F4
@ -867,13 +867,13 @@ sub_80CAC28: @ 80CAC28
movs r2, 0
strh r0, [r1, 0x8]
strh r2, [r1, 0xA]
ldr r0, _080CAC78 @ =gUnknown_20370C4
ldr r0, _080CAC78 @ =gSpecialVar_0x8006
ldrh r0, [r0]
strh r0, [r1, 0xC]
ldr r0, _080CAC7C @ =gUnknown_20370C6
ldr r0, _080CAC7C @ =gSpecialVar_0x8007
ldrh r0, [r0]
strh r0, [r1, 0xE]
ldr r0, _080CAC80 @ =gUnknown_20370C0
ldr r0, _080CAC80 @ =gSpecialVar_0x8004
ldrh r0, [r0]
strh r0, [r1, 0x10]
movs r0, 0
@ -886,9 +886,9 @@ sub_80CAC28: @ 80CAC28
_080CAC6C: .4byte sub_80CAC84
_080CAC70: .4byte gTasks
_080CAC74: .4byte gSpecialVar_0x8005
_080CAC78: .4byte gUnknown_20370C4
_080CAC7C: .4byte gUnknown_20370C6
_080CAC80: .4byte gUnknown_20370C0
_080CAC78: .4byte gSpecialVar_0x8006
_080CAC7C: .4byte gSpecialVar_0x8007
_080CAC80: .4byte gSpecialVar_0x8004
thumb_func_end sub_80CAC28
thumb_func_start sub_80CAC84
@ -1002,7 +1002,7 @@ _080CAD4C:
thumb_func_start sub_80CAD54
sub_80CAD54: @ 80CAD54
push {lr}
ldr r0, _080CAD74 @ =gUnknown_20370C0
ldr r0, _080CAD74 @ =gSpecialVar_0x8004
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
@ -1016,14 +1016,14 @@ sub_80CAD54: @ 80CAD54
pop {r1}
bx r1
.align 2, 0
_080CAD74: .4byte gUnknown_20370C0
_080CAD74: .4byte gSpecialVar_0x8004
_080CAD78: .4byte gPlayerParty
thumb_func_end sub_80CAD54
thumb_func_start sub_80CAD7C
sub_80CAD7C: @ 80CAD7C
push {r4,lr}
ldr r0, _080CADA8 @ =gUnknown_20370C0
ldr r0, _080CADA8 @ =gSpecialVar_0x8004
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
@ -1042,7 +1042,7 @@ sub_80CAD7C: @ 80CAD7C
movs r0, 0x1
b _080CADBA
.align 2, 0
_080CADA8: .4byte gUnknown_20370C0
_080CADA8: .4byte gSpecialVar_0x8004
_080CADAC: .4byte gPlayerParty
_080CADB0: .4byte gStringVar1
_080CADB4: .4byte gSaveBlock2Ptr
@ -1092,7 +1092,7 @@ sub_80CADEC: @ 80CADEC
adds r0, 0x1
lsls r0, 16
lsrs r2, r0, 16
ldr r1, _080CAE20 @ =gUnknown_20370C0
ldr r1, _080CAE20 @ =gSpecialVar_0x8004
strh r2, [r1]
ldr r0, _080CAE24 @ =gSpecialVar_0x8005
strh r2, [r0]
@ -1108,7 +1108,7 @@ _080CAE14:
ldr r0, [r0]
mov pc, r0
.align 2, 0
_080CAE20: .4byte gUnknown_20370C0
_080CAE20: .4byte gSpecialVar_0x8004
_080CAE24: .4byte gSpecialVar_0x8005
_080CAE28: .4byte _080CAE2C
.align 2, 0
@ -1353,7 +1353,7 @@ _080CB01C:
ldrh r0, [r5]
cmp r0, 0xF
bls _080CB04C
ldr r0, _080CB044 @ =gUnknown_20370C0
ldr r0, _080CB044 @ =gSpecialVar_0x8004
ldrh r4, [r0]
adds r0, r4, 0
movs r1, 0x5
@ -1368,7 +1368,7 @@ _080CB01C:
b _080CB04A
.align 2, 0
_080CB040: .4byte gSpecialVar_0x8005
_080CB044: .4byte gUnknown_20370C0
_080CB044: .4byte gSpecialVar_0x8004
_080CB048:
adds r0, r4, 0x1
_080CB04A:
@ -1491,7 +1491,7 @@ _080CB128:
lsls r0, 16
lsrs r0, 16
movs r1, 0
bl sub_8088E74
bl GetSetPokedexFlag
lsls r0, 24
asrs r0, 24
cmp r0, 0x1
@ -1521,7 +1521,7 @@ _080CB176:
lsls r0, 16
lsrs r0, 16
movs r1, 0
bl sub_8088E74
bl GetSetPokedexFlag
lsls r0, 24
asrs r0, 24
cmp r0, 0x1
@ -1569,9 +1569,9 @@ _080CB1D2:
thumb_func_start sub_80CB1D8
sub_80CB1D8: @ 80CB1D8
push {lr}
ldr r0, _080CB1F0 @ =gUnknown_20370D0
ldr r0, _080CB1F0 @ =gSpecialVar_Result
ldrh r1, [r0]
ldr r0, _080CB1F4 @ =gUnknown_20370C4
ldr r0, _080CB1F4 @ =gSpecialVar_0x8006
ldrh r0, [r0]
adds r1, r0
ldr r0, _080CB1F8 @ =0x0000270f
@ -1580,8 +1580,8 @@ sub_80CB1D8: @ 80CB1D8
movs r0, 0x1
b _080CB1FE
.align 2, 0
_080CB1F0: .4byte gUnknown_20370D0
_080CB1F4: .4byte gUnknown_20370C4
_080CB1F0: .4byte gSpecialVar_Result
_080CB1F4: .4byte gSpecialVar_0x8006
_080CB1F8: .4byte 0x0000270f
_080CB1FC:
movs r0, 0
@ -1956,7 +1956,7 @@ sub_80CB498: @ 80CB498
movs r6, 0x1
strh r6, [r4, 0x8]
ldr r0, _080CB4D8 @ =gSpecialVar_0x8005
ldr r1, _080CB4DC @ =gUnknown_20370C4
ldr r1, _080CB4DC @ =gSpecialVar_0x8006
ldrh r2, [r0]
ldrh r0, [r1]
cmp r2, r0
@ -1970,7 +1970,7 @@ sub_80CB498: @ 80CB498
_080CB4D0: .4byte sub_80CB514
_080CB4D4: .4byte gTasks+0x8
_080CB4D8: .4byte gSpecialVar_0x8005
_080CB4DC: .4byte gUnknown_20370C4
_080CB4DC: .4byte gSpecialVar_0x8006
_080CB4E0:
subs r0, r2
lsls r0, 16
@ -2357,7 +2357,7 @@ _080CB7D6:
lsls r0, 3
ldr r1, _080CB810 @ =gTasks
adds r3, r0, r1
ldr r0, _080CB814 @ =gUnknown_20370C0
ldr r0, _080CB814 @ =gSpecialVar_0x8004
ldrh r4, [r0]
cmp r4, 0x3
beq _080CB886
@ -2374,7 +2374,7 @@ _080CB7D6:
_080CB808: .4byte sub_809D6D4
_080CB80C: .4byte sub_80CB904
_080CB810: .4byte gTasks
_080CB814: .4byte gUnknown_20370C0
_080CB814: .4byte gSpecialVar_0x8004
_080CB818:
cmp r4, 0x5
beq _080CB8B4
@ -2490,7 +2490,7 @@ _080CB8E6:
strh r5, [r3, 0x26]
b _080CB8F8
_080CB8EC:
ldr r1, _080CB900 @ =gUnknown_20370D0
ldr r1, _080CB900 @ =gSpecialVar_Result
movs r0, 0x7F
strh r0, [r1]
adds r0, r5, 0
@ -2500,7 +2500,7 @@ _080CB8F8:
pop {r0}
bx r0
.align 2, 0
_080CB900: .4byte gUnknown_20370D0
_080CB900: .4byte gSpecialVar_Result
thumb_func_end sub_80CB7C4
thumb_func_start sub_80CB904
@ -2519,7 +2519,7 @@ sub_80CB904: @ 80CB904
ldr r1, _080CB934 @ =gTasks
adds r5, r0, r1
bl ScriptContext2_Enable
ldr r0, _080CB938 @ =gUnknown_20370C0
ldr r0, _080CB938 @ =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0x1
bne _080CB944
@ -2530,7 +2530,7 @@ sub_80CB904: @ 80CB904
b _080CB94A
.align 2, 0
_080CB934: .4byte gTasks
_080CB938: .4byte gUnknown_20370C0
_080CB938: .4byte gSpecialVar_0x8004
_080CB93C: .4byte gUnknown_2039A18
_080CB940: .4byte gUnknown_2039A0E
_080CB944:
@ -2563,7 +2563,7 @@ _080CB974:
lsls r3, r4, 3
adds r3, r0
lsls r2, r4, 2
ldr r0, _080CBA6C @ =gUnknown_20370C0
ldr r0, _080CBA6C @ =gSpecialVar_0x8004
ldrh r1, [r0]
lsls r0, r1, 1
adds r0, r1
@ -2676,7 +2676,7 @@ _080CB9D2:
_080CBA60: .4byte gUnknown_2039A18
_080CBA64: .4byte gUnknown_2039A14
_080CBA68: .4byte gUnknown_83F5BCC
_080CBA6C: .4byte gUnknown_20370C0
_080CBA6C: .4byte gSpecialVar_0x8004
_080CBA70: .4byte gUnknown_3005360
_080CBA74: .4byte gTasks
_080CBA78: .4byte sub_80CBB28
@ -2794,16 +2794,16 @@ sub_80CBB28: @ 80CBB28
.align 2, 0
_080CBB54: .4byte gTasks
_080CBB58:
ldr r1, _080CBB68 @ =gUnknown_20370D0
ldr r1, _080CBB68 @ =gSpecialVar_Result
movs r0, 0x7F
strh r0, [r1]
movs r0, 0x5
bl PlaySE
b _080CBB88
.align 2, 0
_080CBB68: .4byte gUnknown_20370D0
_080CBB68: .4byte gSpecialVar_Result
_080CBB6C:
ldr r0, _080CBB90 @ =gUnknown_20370D0
ldr r0, _080CBB90 @ =gSpecialVar_Result
strh r4, [r0]
movs r0, 0x5
bl PlaySE
@ -2821,7 +2821,7 @@ _080CBB88:
bl sub_80CBBAC
b _080CBBA2
.align 2, 0
_080CBB90: .4byte gUnknown_20370D0
_080CBB90: .4byte gSpecialVar_Result
_080CBB94:
adds r0, r5, 0
bl sub_80CBD50
@ -3123,17 +3123,17 @@ _080CBDC8: .4byte 0x00004031
thumb_func_start sub_80CBDCC
sub_80CBDCC: @ 80CBDCC
push {lr}
ldr r0, _080CBDE4 @ =gUnknown_20370C0
ldr r0, _080CBDE4 @ =gSpecialVar_0x8004
ldrh r0, [r0]
bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r0, 16
movs r1, 0x2
bl sub_8088E74
bl GetSetPokedexFlag
pop {r0}
bx r0
.align 2, 0
_080CBDE4: .4byte gUnknown_20370C0
_080CBDE4: .4byte gSpecialVar_0x8004
thumb_func_end sub_80CBDCC
thumb_func_start sub_80CBDE8
@ -3371,7 +3371,7 @@ _080CBF9A:
thumb_func_start sub_80CBFA0
sub_80CBFA0: @ 80CBFA0
push {r4,lr}
ldr r0, _080CBFC8 @ =gUnknown_20370C0
ldr r0, _080CBFC8 @ =gSpecialVar_0x8004
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
@ -3389,7 +3389,7 @@ sub_80CBFA0: @ 80CBFA0
movs r0, 0x1
b _080CBFDA
.align 2, 0
_080CBFC8: .4byte gUnknown_20370C0
_080CBFC8: .4byte gSpecialVar_0x8004
_080CBFCC: .4byte gPlayerParty
_080CBFD0: .4byte gStringVar1
_080CBFD4: .4byte gStringVar3
@ -3486,7 +3486,7 @@ ChangePokemonNickname: @ 80CC088
mov r4, r8
push {r4-r6}
sub sp, 0x8
ldr r0, _080CC130 @ =gUnknown_20370C0
ldr r0, _080CC130 @ =gSpecialVar_0x8004
mov r9, r0
ldrh r0, [r0]
movs r1, 0x64
@ -3558,7 +3558,7 @@ ChangePokemonNickname: @ 80CC088
pop {r0}
bx r0
.align 2, 0
_080CC130: .4byte gUnknown_20370C0
_080CC130: .4byte gSpecialVar_0x8004
_080CC134: .4byte gPlayerParty
_080CC138: .4byte gStringVar3
_080CC13C: .4byte gStringVar2
@ -3568,7 +3568,7 @@ _080CC140: .4byte ChangePokemonNickname_CB
thumb_func_start ChangePokemonNickname_CB
ChangePokemonNickname_CB: @ 80CC144
push {lr}
ldr r0, _080CC164 @ =gUnknown_20370C0
ldr r0, _080CC164 @ =gSpecialVar_0x8004
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
@ -3581,7 +3581,7 @@ ChangePokemonNickname_CB: @ 80CC144
pop {r0}
bx r0
.align 2, 0
_080CC164: .4byte gUnknown_20370C0
_080CC164: .4byte gSpecialVar_0x8004
_080CC168: .4byte gPlayerParty
_080CC16C: .4byte gStringVar2
thumb_func_end ChangePokemonNickname_CB
@ -3589,7 +3589,7 @@ _080CC16C: .4byte gStringVar2
thumb_func_start TV_CopyNicknameToStringVar1AndEnsureTerminated
TV_CopyNicknameToStringVar1AndEnsureTerminated: @ 80CC170
push {r4,lr}
ldr r0, _080CC194 @ =gUnknown_20370C0
ldr r0, _080CC194 @ =gSpecialVar_0x8004
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
@ -3605,7 +3605,7 @@ TV_CopyNicknameToStringVar1AndEnsureTerminated: @ 80CC170
pop {r0}
bx r0
.align 2, 0
_080CC194: .4byte gUnknown_20370C0
_080CC194: .4byte gSpecialVar_0x8004
_080CC198: .4byte gPlayerParty
_080CC19C: .4byte gStringVar1
thumb_func_end TV_CopyNicknameToStringVar1AndEnsureTerminated
@ -3615,7 +3615,7 @@ TV_CheckMonOTIDEqualsPlayerID: @ 80CC1A0
push {r4,lr}
bl sub_80CC1E4
adds r4, r0, 0
ldr r0, _080CC1C8 @ =gUnknown_20370C0
ldr r0, _080CC1C8 @ =gSpecialVar_0x8004
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
@ -3626,15 +3626,15 @@ TV_CheckMonOTIDEqualsPlayerID: @ 80CC1A0
bl GetMonData
cmp r4, r0
bne _080CC1D4
ldr r1, _080CC1D0 @ =gUnknown_20370D0
ldr r1, _080CC1D0 @ =gSpecialVar_Result
movs r0, 0
b _080CC1D8
.align 2, 0
_080CC1C8: .4byte gUnknown_20370C0
_080CC1C8: .4byte gSpecialVar_0x8004
_080CC1CC: .4byte gPlayerParty
_080CC1D0: .4byte gUnknown_20370D0
_080CC1D0: .4byte gSpecialVar_Result
_080CC1D4:
ldr r1, _080CC1E0 @ =gUnknown_20370D0
ldr r1, _080CC1E0 @ =gSpecialVar_Result
movs r0, 0x1
_080CC1D8:
strh r0, [r1]
@ -3642,7 +3642,7 @@ _080CC1D8:
pop {r0}
bx r0
.align 2, 0
_080CC1E0: .4byte gUnknown_20370D0
_080CC1E0: .4byte gSpecialVar_Result
thumb_func_end TV_CheckMonOTIDEqualsPlayerID
thumb_func_start sub_80CC1E4
@ -3863,7 +3863,7 @@ _080CC318:
adds r0, r4, 0
bl VarSet
ldr r0, _080CC3C4 @ =0x00004042
ldr r1, _080CC3C8 @ =gUnknown_20370C0
ldr r1, _080CC3C8 @ =gSpecialVar_0x8004
ldrh r1, [r1]
bl VarSet
add sp, 0x24
@ -3874,21 +3874,21 @@ _080CC318:
_080CC3BC: .4byte gPlayerParty
_080CC3C0: .4byte 0x00004043
_080CC3C4: .4byte 0x00004042
_080CC3C8: .4byte gUnknown_20370C0
_080CC3C8: .4byte gSpecialVar_0x8004
thumb_func_end sub_80CC2BC
thumb_func_start sub_80CC3CC
sub_80CC3CC: @ 80CC3CC
push {r4-r6,lr}
movs r5, 0
ldr r4, _080CC3F8 @ =gUnknown_20370C0
ldr r4, _080CC3F8 @ =gSpecialVar_0x8004
movs r0, 0xA
bl GetGameStat
strh r0, [r4]
movs r0, 0xD
bl GetGameStat
adds r6, r0, 0
ldr r4, _080CC3FC @ =gUnknown_20370C4
ldr r4, _080CC3FC @ =gSpecialVar_0x8006
movs r0, 0x17
bl GetGameStat
strh r0, [r4]
@ -3899,8 +3899,8 @@ sub_80CC3CC: @ 80CC3CC
strh r1, [r0]
b _080CC40C
.align 2, 0
_080CC3F8: .4byte gUnknown_20370C0
_080CC3FC: .4byte gUnknown_20370C4
_080CC3F8: .4byte gSpecialVar_0x8004
_080CC3FC: .4byte gSpecialVar_0x8006
_080CC400: .4byte 0x0000ffff
_080CC404: .4byte gSpecialVar_0x8005
_080CC408:
@ -3908,7 +3908,7 @@ _080CC408:
strh r6, [r0]
_080CC40C:
adds r1, r0, 0
ldr r0, _080CC444 @ =gUnknown_20370C0
ldr r0, _080CC444 @ =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0
beq _080CC41A
@ -3923,7 +3923,7 @@ _080CC41A:
lsls r0, r5, 16
lsrs r5, r0, 16
_080CC428:
ldr r0, _080CC448 @ =gUnknown_20370C4
ldr r0, _080CC448 @ =gSpecialVar_0x8006
ldrh r0, [r0]
cmp r0, 0
beq _080CC438
@ -3938,8 +3938,8 @@ _080CC438:
bx r1
.align 2, 0
_080CC440: .4byte gSpecialVar_0x8005
_080CC444: .4byte gUnknown_20370C0
_080CC448: .4byte gUnknown_20370C4
_080CC444: .4byte gSpecialVar_0x8004
_080CC448: .4byte gSpecialVar_0x8006
thumb_func_end sub_80CC3CC
thumb_func_start sub_80CC44C
@ -3999,7 +3999,7 @@ _080CC49C:
movs r1, 0x41
movs r2, 0
bl GetMonData
ldr r1, _080CC4BC @ =gUnknown_20370C0
ldr r1, _080CC4BC @ =gSpecialVar_0x8004
ldrh r1, [r1]
cmp r0, r1
bne _080CC4C0
@ -4007,7 +4007,7 @@ _080CC49C:
b _080CC4CC
.align 2, 0
_080CC4B8: .4byte gPlayerParty
_080CC4BC: .4byte gUnknown_20370C0
_080CC4BC: .4byte gSpecialVar_0x8004
_080CC4C0:
adds r0, r4, 0x1
lsls r0, 24
@ -4331,7 +4331,7 @@ _080CC72C: .4byte 0x0000404d
thumb_func_start sub_80CC730
sub_80CC730: @ 80CC730
push {lr}
ldr r0, _080CC744 @ =gUnknown_20370D0
ldr r0, _080CC744 @ =gSpecialVar_Result
ldrh r0, [r0]
cmp r0, 0x4
bhi _080CC77C
@ -4341,7 +4341,7 @@ sub_80CC730: @ 80CC730
ldr r0, [r0]
mov pc, r0
.align 2, 0
_080CC744: .4byte gUnknown_20370D0
_080CC744: .4byte gSpecialVar_Result
_080CC748: .4byte _080CC74C
.align 2, 0
_080CC74C:
@ -4548,7 +4548,7 @@ _080CC8C4:
thumb_func_start sub_80CC8CC
sub_80CC8CC: @ 80CC8CC
push {r4,lr}
ldr r1, _080CC8E4 @ =gUnknown_20370C0
ldr r1, _080CC8E4 @ =gSpecialVar_0x8004
ldr r2, _080CC8E8 @ =0xfffffedf
adds r0, r2, 0
ldrh r2, [r1]
@ -4560,7 +4560,7 @@ sub_80CC8CC: @ 80CC8CC
movs r0, 0
b _080CC908
.align 2, 0
_080CC8E4: .4byte gUnknown_20370C0
_080CC8E4: .4byte gSpecialVar_0x8004
_080CC8E8: .4byte 0xfffffedf
_080CC8EC:
ldr r4, _080CC910 @ =gStringVar1
@ -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
@ -4612,7 +4612,7 @@ _080CC944: .4byte 0x000001f3
thumb_func_start sub_80CC948
sub_80CC948: @ 80CC948
push {lr}
ldr r0, _080CC968 @ =gUnknown_20370C0
ldr r0, _080CC968 @ =gSpecialVar_0x8004
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
@ -4626,7 +4626,7 @@ sub_80CC948: @ 80CC948
pop {r0}
bx r0
.align 2, 0
_080CC968: .4byte gUnknown_20370C0
_080CC968: .4byte gSpecialVar_0x8004
_080CC96C: .4byte gPlayerParty
_080CC970: .4byte 0x00004025
thumb_func_end sub_80CC948
@ -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
@ -4904,7 +4904,7 @@ sub_80CCB94: @ 80CCB94
lsls r0, 24
lsrs r0, 24
mov r8, r0
ldr r0, _080CCBC0 @ =gUnknown_20370C6
ldr r0, _080CCBC0 @ =gSpecialVar_0x8007
mov r1, r8
strh r1, [r0]
movs r4, 0
@ -4915,7 +4915,7 @@ sub_80CCB94: @ 80CCB94
mov r9, r0
b _080CCBCE
.align 2, 0
_080CCBC0: .4byte gUnknown_20370C6
_080CCBC0: .4byte gSpecialVar_0x8007
_080CCBC4: .4byte gPlayerParty
_080CCBC8:
adds r0, r4, 0x1
@ -5045,7 +5045,7 @@ _080CCCCC:
lsls r0, 24
lsrs r6, r0, 24
_080CCCDE:
ldr r0, _080CCCF4 @ =gUnknown_20370C4
ldr r0, _080CCCF4 @ =gSpecialVar_0x8006
strh r6, [r0]
movs r0, 0x1
_080CCCE4:
@ -5057,7 +5057,7 @@ _080CCCE4:
bx r1
.align 2, 0
_080CCCF0: .4byte gPlayerParty
_080CCCF4: .4byte gUnknown_20370C4
_080CCCF4: .4byte gSpecialVar_0x8006
thumb_func_end sub_80CCB94
thumb_func_start sub_80CCCF8
@ -5216,12 +5216,12 @@ task_deoxys_sound: @ 80CCE10
lsrs r0, 24
cmp r0, 0x1
bne _080CCE38
ldr r1, _080CCE34 @ =gUnknown_20370D0
ldr r1, _080CCE34 @ =gSpecialVar_Result
movs r0, 0x3
b _080CCE9E
.align 2, 0
_080CCE30: .4byte 0x00000848
_080CCE34: .4byte gUnknown_20370D0
_080CCE34: .4byte gSpecialVar_Result
_080CCE38:
ldr r0, _080CCE80 @ =0x0000403e
mov r8, r0
@ -5249,7 +5249,7 @@ _080CCE38:
mov r0, r8
movs r1, 0
bl VarSet
ldr r1, _080CCE8C @ =gUnknown_20370D0
ldr r1, _080CCE8C @ =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
b _080CCEA4
@ -5257,13 +5257,13 @@ _080CCE38:
_080CCE80: .4byte 0x0000403e
_080CCE84: .4byte 0x00004026
_080CCE88: .4byte gUnknown_83F637C
_080CCE8C: .4byte gUnknown_20370D0
_080CCE8C: .4byte gSpecialVar_Result
_080CCE90:
cmp r5, 0xA
bne _080CCEB4
ldr r0, _080CCEAC @ =0x00000848
bl FlagSet
ldr r1, _080CCEB0 @ =gUnknown_20370D0
ldr r1, _080CCEB0 @ =gSpecialVar_Result
movs r0, 0x2
_080CCE9E:
strh r0, [r1]
@ -5274,7 +5274,7 @@ _080CCEA4:
b _080CCED6
.align 2, 0
_080CCEAC: .4byte 0x00000848
_080CCEB0: .4byte gUnknown_20370D0
_080CCEB0: .4byte gSpecialVar_Result
_080CCEB4:
adds r0, r5, 0x1
lsls r0, 16
@ -5285,7 +5285,7 @@ _080CCEB4:
ldr r0, _080CCEE0 @ =0x0000403e
adds r1, r5, 0
bl VarSet
ldr r1, _080CCEE4 @ =gUnknown_20370D0
ldr r1, _080CCEE4 @ =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
adds r0, r7, 0
@ -5298,7 +5298,7 @@ _080CCED6:
bx r0
.align 2, 0
_080CCEE0: .4byte 0x0000403e
_080CCEE4: .4byte gUnknown_20370D0
_080CCEE4: .4byte gSpecialVar_Result
thumb_func_end task_deoxys_sound
thumb_func_start sub_80CCEE8
@ -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
@ -5528,12 +5528,12 @@ sub_80CD098: @ 80CD098
ldrb r0, [r0]
cmp r0, 0x2
beq _080CD0E8
ldr r0, _080CD0D0 @ =gUnknown_20370C0
ldr r0, _080CD0D0 @ =gSpecialVar_0x8004
ldrh r0, [r0]
adds r0, 0x1B
lsls r0, 16
lsrs r1, r0, 16
ldr r0, _080CD0D4 @ =gUnknown_20370C4
ldr r0, _080CD0D4 @ =gSpecialVar_0x8006
ldrh r3, [r0]
cmp r3, 0
bne _080CD0E0
@ -5548,8 +5548,8 @@ sub_80CD098: @ 80CD098
b _080CD0E8
.align 2, 0
_080CD0CC: .4byte gUnknown_203ADFA
_080CD0D0: .4byte gUnknown_20370C0
_080CD0D4: .4byte gUnknown_20370C4
_080CD0D0: .4byte gSpecialVar_0x8004
_080CD0D4: .4byte gSpecialVar_0x8006
_080CD0D8: .4byte gSpecialVar_0x8005
_080CD0DC: .4byte gUnknown_2039A1B
_080CD0E0:
@ -5583,7 +5583,7 @@ _080CD104:
movs r1, 0x41
movs r2, 0
bl GetMonData
ldr r1, _080CD13C @ =gUnknown_20370C0
ldr r1, _080CD13C @ =gSpecialVar_0x8004
ldrh r1, [r1]
cmp r0, r1
bne _080CD140
@ -5599,7 +5599,7 @@ _080CD104:
b _080CD14C
.align 2, 0
_080CD138: .4byte gPlayerParty
_080CD13C: .4byte gUnknown_20370C0
_080CD13C: .4byte gSpecialVar_0x8004
_080CD140:
adds r0, r6, 0x1
lsls r0, 24
@ -5708,7 +5708,7 @@ sub_80CD1CC: @ 80CD1CC
_080CD200:
movs r0, 0
ldrsh r1, [r4, r0]
ldr r0, _080CD224 @ =gUnknown_20370C0
ldr r0, _080CD224 @ =gSpecialVar_0x8004
ldrh r0, [r0]
subs r0, 0x1
cmp r1, r0
@ -5722,7 +5722,7 @@ _080CD214:
.align 2, 0
_080CD21C: .4byte gTasks+0x8
_080CD220: .4byte gSpecialVar_0x8005
_080CD224: .4byte gUnknown_20370C0
_080CD224: .4byte gSpecialVar_0x8004
thumb_func_end sub_80CD1CC
.align 2, 0 @ Don't pad with nop.

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]

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

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

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

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

View File

@ -23,7 +23,7 @@ _080D0808:
movs r0, 0
b _080D0826
_080D080C:
ldr r4, _080D082C @ =gUnknown_20370D0
ldr r4, _080D082C @ =gSpecialVar_Result
bl GetCursorSelectionMonId
lsls r0, 24
lsrs r0, 24
@ -40,7 +40,7 @@ _080D0826:
pop {r1}
bx r1
.align 2, 0
_080D082C: .4byte gUnknown_20370D0
_080D082C: .4byte gSpecialVar_Result
_080D0830: .4byte gUnknown_3005024
_080D0834: .4byte hm_add_c3_launch_phase_2
_080D0838: .4byte gUnknown_203B0C4
@ -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

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

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

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

View File

@ -112,7 +112,7 @@ sub_80BFCD0: @ 80BFCD0
movs r1, 0
bl VarSet
_080BFD0A:
ldr r0, _080BFD34 @ =gUnknown_20370D2
ldr r0, _080BFD34 @ =gSpecialVar_LastTalked
strh r5, [r0]
movs r0, 0x4
strh r0, [r4, 0x4]
@ -130,7 +130,7 @@ _080BFD24: .4byte 0x00004082
_080BFD28: .4byte gSaveBlock1Ptr
_080BFD2C: .4byte 0x00003d34
_080BFD30: .4byte 0x00003d42
_080BFD34: .4byte gUnknown_20370D2
_080BFD34: .4byte gSpecialVar_LastTalked
_080BFD38:
ldr r0, _080BFD7C @ =gSaveBlock1Ptr
ldr r1, [r0]
@ -239,7 +239,7 @@ _080BFDFA:
thumb_func_start sub_80BFE00
sub_80BFE00: @ 80BFE00
ldr r2, _080BFE10 @ =gUnknown_20370D2
ldr r2, _080BFE10 @ =gSpecialVar_LastTalked
ldr r1, _080BFE14 @ =gUnknown_83EECE8
subs r0, 0x1
adds r0, r1
@ -247,7 +247,7 @@ sub_80BFE00: @ 80BFE00
strh r0, [r2]
bx lr
.align 2, 0
_080BFE10: .4byte gUnknown_20370D2
_080BFE10: .4byte gSpecialVar_LastTalked
_080BFE14: .4byte gUnknown_83EECE8
thumb_func_end sub_80BFE00

View File

@ -2040,14 +2040,14 @@ sub_813C828: @ 813C828
adds r2, r3
lsls r2, 24
lsrs r2, 24
ldr r0, _0813C85C @ =gUnknown_841623B
ldr r0, _0813C85C @ =gFameCheckerText_ListMenuCursor
bl sub_813C4CC
pop {r4}
pop {r0}
bx r0
.align 2, 0
_0813C858: .4byte gUnknown_203F190
_0813C85C: .4byte gUnknown_841623B
_0813C85C: .4byte gFameCheckerText_ListMenuCursor
thumb_func_end sub_813C828
thumb_func_start sub_813C860

View File

@ -49,13 +49,13 @@ _0812B21C: .4byte gUnknown_203B0EC
thumb_func_start sub_812B220
sub_812B220: @ 812B220
ldr r0, _0812B22C @ =gUnknown_203B0EC
ldr r1, _0812B230 @ =gUnknown_20370C0
ldr r1, _0812B230 @ =gSpecialVar_0x8004
ldrh r1, [r1]
strh r1, [r0]
bx lr
.align 2, 0
_0812B22C: .4byte gUnknown_203B0EC
_0812B230: .4byte gUnknown_20370C0
_0812B230: .4byte gSpecialVar_0x8004
thumb_func_end sub_812B220
thumb_func_start sub_812B234
@ -357,14 +357,14 @@ _0812B458: .4byte gUnknown_203B0EE
thumb_func_start sub_812B45C
sub_812B45C: @ 812B45C
push {lr}
ldr r0, _0812B46C @ =gUnknown_3003F64
ldr r0, _0812B46C @ =gReceivedRemoteLinkPlayers
ldrb r0, [r0]
cmp r0, 0x1
beq _0812B470
movs r0, 0x1
b _0812B472
.align 2, 0
_0812B46C: .4byte gUnknown_3003F64
_0812B46C: .4byte gReceivedRemoteLinkPlayers
_0812B470:
movs r0, 0
_0812B472:

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.

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

View File

@ -326,13 +326,13 @@ sub_8099FAC: @ 8099FAC
.align 2, 0
_08099FC0: .4byte 0x0000016d
_08099FC4:
ldr r1, _08099FD0 @ =gUnknown_20370D0
ldr r1, _08099FD0 @ =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
movs r0, 0x1
b _08099FF6
.align 2, 0
_08099FD0: .4byte gUnknown_20370D0
_08099FD0: .4byte gSpecialVar_Result
_08099FD4:
movs r4, 0x85
_08099FD6:
@ -349,7 +349,7 @@ _08099FD6:
cmp r4, 0xAF
bls _08099FD6
_08099FF0:
ldr r0, _08099FFC @ =gUnknown_20370D0
ldr r0, _08099FFC @ =gSpecialVar_Result
strh r1, [r0]
movs r0, 0
_08099FF6:
@ -357,7 +357,7 @@ _08099FF6:
pop {r1}
bx r1
.align 2, 0
_08099FFC: .4byte gUnknown_20370D0
_08099FFC: .4byte gSpecialVar_Result
thumb_func_end sub_8099FAC
thumb_func_start sub_809A000

View File

@ -94,7 +94,7 @@ _08107E5A:
strb r0, [r2, 0x5]
movs r1, 0
ldr r4, _08107EA4 @ =gTextFlags
ldr r5, _08107EA8 @ =gUnknown_203AD30
ldr r5, _08107EA8 @ =gSpecialVar_ItemId
ldr r6, _08107EAC @ =sub_8107F10
ldr r3, _08107EB0 @ =gUnknown_203AD10
movs r2, 0
@ -132,14 +132,14 @@ _08107E9A:
bx r0
.align 2, 0
_08107EA4: .4byte gTextFlags
_08107EA8: .4byte gUnknown_203AD30
_08107EA8: .4byte gSpecialVar_ItemId
_08107EAC: .4byte sub_8107F10
_08107EB0: .4byte gUnknown_203AD10
_08107EB4: .4byte gUnknown_203ACFC
thumb_func_end sub_8107DB4
thumb_func_start sub_8107EB8
sub_8107EB8: @ 8107EB8
thumb_func_start UseFameCheckerFromMenu
UseFameCheckerFromMenu: @ 8107EB8
push {lr}
ldr r2, _08107EC8 @ =sub_80568A8
movs r0, 0
@ -149,7 +149,7 @@ sub_8107EB8: @ 8107EB8
bx r0
.align 2, 0
_08107EC8: .4byte sub_80568A8
thumb_func_end sub_8107EB8
thumb_func_end UseFameCheckerFromMenu
thumb_func_start sub_8107ECC
sub_8107ECC: @ 8107ECC
@ -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
@ -871,7 +871,7 @@ _0810848C:
bl StringCopy
ldr r0, [r5]
adds r0, r4
ldr r1, _08108550 @ =gUnknown_84161C1
ldr r1, _08108550 @ =gFameCheckerText_Cancel
bl StringAppend
ldr r0, _08108548 @ =gUnknown_203AD18
ldr r2, [r0]
@ -951,7 +951,7 @@ _08108540: .4byte gUnknown_203AD10
_08108544: .4byte gUnknown_203AD1C
_08108548: .4byte gUnknown_203AD18
_0810854C: .4byte gUnknown_8452F60
_08108550: .4byte gUnknown_84161C1
_08108550: .4byte gFameCheckerText_Cancel
_08108554: .4byte gUnknown_3005E70
_08108558: .4byte sub_81085A4
_0810855C: .4byte sub_8108654
@ -1257,7 +1257,7 @@ bag_menu_print_cursor: @ 810878C
bl FillWindowPixelRect
b _081087DE
_081087C8:
ldr r2, _081087E8 @ =gUnknown_841623B
ldr r2, _081087E8 @ =gFameCheckerText_ListMenuCursor
str r5, [sp]
movs r0, 0
str r0, [sp, 0x4]
@ -1273,7 +1273,7 @@ _081087DE:
pop {r0}
bx r0
.align 2, 0
_081087E8: .4byte gUnknown_841623B
_081087E8: .4byte gFameCheckerText_ListMenuCursor
thumb_func_end bag_menu_print_cursor
thumb_func_start sub_81087EC
@ -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
@ -2367,7 +2367,7 @@ _08109014: .4byte gUnknown_203ACFC
_08109018:
movs r0, 0x5
bl PlaySE
ldr r1, _08109038 @ =gUnknown_203AD30
ldr r1, _08109038 @ =gSpecialVar_ItemId
movs r0, 0
strh r0, [r1]
bl sub_8108CB4
@ -2379,7 +2379,7 @@ _08109018:
ldr r1, _08109040 @ =sub_8108B50
b _081090C4
.align 2, 0
_08109038: .4byte gUnknown_203AD30
_08109038: .4byte gSpecialVar_ItemId
_0810903C: .4byte gTasks
_08109040: .4byte sub_8108B50
_08109044:
@ -2393,7 +2393,7 @@ _08109044:
ldrb r0, [r0]
cmp r4, r0
bne _08109084
ldr r1, _08109078 @ =gUnknown_203AD30
ldr r1, _08109078 @ =gSpecialVar_ItemId
movs r0, 0
strh r0, [r1]
bl sub_8108CB4
@ -2406,7 +2406,7 @@ _08109044:
b _081090C4
.align 2, 0
_08109074: .4byte gUnknown_203AD10
_08109078: .4byte gUnknown_203AD30
_08109078: .4byte gSpecialVar_ItemId
_0810907C: .4byte gTasks
_08109080: .4byte sub_8108B50
_08109084:
@ -2430,7 +2430,7 @@ _08109084:
lsrs r0, 24
adds r1, r4, 0
bl sub_809A798
ldr r1, _081090D0 @ =gUnknown_203AD30
ldr r1, _081090D0 @ =gSpecialVar_ItemId
strh r0, [r1]
ldr r1, _081090D4 @ =gTasks
lsls r0, r6, 2
@ -2446,7 +2446,7 @@ _081090C6:
pop {r0}
bx r0
.align 2, 0
_081090D0: .4byte gUnknown_203AD30
_081090D0: .4byte gSpecialVar_ItemId
_081090D4: .4byte gTasks
_081090D8: .4byte sub_81090DC
thumb_func_end sub_8108F0C
@ -3404,7 +3404,7 @@ _081098AC:
beq _08109924
b _0810993C
_081098B6:
ldr r2, _081098D4 @ =gUnknown_203AD30
ldr r2, _081098D4 @ =gSpecialVar_ItemId
ldrh r1, [r2]
ldr r0, _081098D8 @ =0x0000016d
cmp r1, r0
@ -3420,7 +3420,7 @@ _081098B6:
movs r0, 0x2
b _08109AD0
.align 2, 0
_081098D4: .4byte gUnknown_203AD30
_081098D4: .4byte gSpecialVar_ItemId
_081098D8: .4byte 0x0000016d
_081098DC: .4byte gUnknown_203AD20
_081098E0: .4byte gUnknown_203AD24
@ -3473,7 +3473,7 @@ _0810993C:
cmp r0, 0x1
bne _081099C4
_08109950:
ldr r1, _08109970 @ =gUnknown_203AD30
ldr r1, _08109970 @ =gSpecialVar_ItemId
ldr r2, _08109974 @ =0xfffffe94
adds r0, r2, 0
ldrh r1, [r1]
@ -3489,7 +3489,7 @@ _08109950:
movs r0, 0x2
b _08109AD0
.align 2, 0
_08109970: .4byte gUnknown_203AD30
_08109970: .4byte gSpecialVar_ItemId
_08109974: .4byte 0xfffffe94
_08109978: .4byte gUnknown_203AD24
_0810997C: .4byte gUnknown_8452F2E
@ -3549,7 +3549,7 @@ _081099EC:
ldr r4, _08109A0C @ =gUnknown_203AD28
movs r0, 0x4
strb r0, [r4]
ldr r0, _08109A10 @ =gUnknown_203AD30
ldr r0, _08109A10 @ =gSpecialVar_ItemId
ldrh r0, [r0]
bl itemid_is_mail
lsls r0, 24
@ -3563,7 +3563,7 @@ _081099EC:
b _08109AD4
.align 2, 0
_08109A0C: .4byte gUnknown_203AD28
_08109A10: .4byte gUnknown_203AD30
_08109A10: .4byte gSpecialVar_ItemId
_08109A14: .4byte gUnknown_203AD24
_08109A18: .4byte gUnknown_8452F24
_08109A1C:
@ -3591,7 +3591,7 @@ _08109A34:
ldr r0, [r0]
ldr r1, _08109A6C @ =0x00000296
adds r0, r1
ldr r1, _08109A70 @ =gUnknown_203AD30
ldr r1, _08109A70 @ =gSpecialVar_ItemId
ldrh r0, [r0]
adds r7, r3, 0
ldrh r3, [r1]
@ -3605,7 +3605,7 @@ _08109A60: .4byte gUnknown_203AD20
_08109A64: .4byte gUnknown_203AD28
_08109A68: .4byte gSaveBlock1Ptr
_08109A6C: .4byte 0x00000296
_08109A70: .4byte gUnknown_203AD30
_08109A70: .4byte gSpecialVar_ItemId
_08109A74:
movs r0, 0x2
_08109A76:
@ -3722,7 +3722,7 @@ _08109AD4:
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, _08109BA8 @ =gUnknown_203AD30
ldr r0, _08109BA8 @ =gSpecialVar_ItemId
ldrh r0, [r0]
ldr r1, _08109BAC @ =gStringVar1
bl sub_8099E90
@ -3751,7 +3751,7 @@ _08109B98: .4byte gUnknown_203AD24
_08109B9C: .4byte gUnknown_8452F18
_08109BA0: .4byte gUnknown_203AD28
_08109BA4: .4byte gUnknown_8452EB8
_08109BA8: .4byte gUnknown_203AD30
_08109BA8: .4byte gSpecialVar_ItemId
_08109BAC: .4byte gStringVar1
_08109BB0: .4byte gStringVar4
_08109BB4: .4byte gUnknown_84162FF
@ -3838,7 +3838,7 @@ sub_8109C50: @ 8109C50
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r5, _08109CA0 @ =gUnknown_203AD30
ldr r5, _08109CA0 @ =gSpecialVar_ItemId
ldrh r0, [r5]
bl ItemId_GetFieldFunc
cmp r0, 0
@ -3867,9 +3867,9 @@ sub_8109C50: @ 8109C50
bl sub_810A170
b _08109CB4
.align 2, 0
_08109CA0: .4byte gUnknown_203AD30
_08109CA0: .4byte gSpecialVar_ItemId
_08109CA4:
ldr r0, _08109CBC @ =gUnknown_203AD30
ldr r0, _08109CBC @ =gSpecialVar_ItemId
ldrh r0, [r0]
bl ItemId_GetFieldFunc
adds r1, r0, 0
@ -3880,7 +3880,7 @@ _08109CB4:
pop {r0}
bx r0
.align 2, 0
_08109CBC: .4byte gUnknown_203AD30
_08109CBC: .4byte gSpecialVar_ItemId
thumb_func_end sub_8109C50
thumb_func_start sub_8109CC0
@ -4197,7 +4197,7 @@ sub_8109F44: @ 8109F44
_08109F6E:
movs r0, 0x5
bl PlaySE
ldr r0, _08109FF4 @ =gUnknown_203AD30
ldr r0, _08109FF4 @ =gSpecialVar_ItemId
ldrh r0, [r0]
ldrh r1, [r7, 0x10]
bl sub_809A1D8
@ -4249,7 +4249,7 @@ _08109FE0:
.align 2, 0
_08109FEC: .4byte gTasks+0x8
_08109FF0: .4byte gMain
_08109FF4: .4byte gUnknown_203AD30
_08109FF4: .4byte gSpecialVar_ItemId
_08109FF8: .4byte gUnknown_203ACFC
_08109FFC: .4byte gUnknown_3005E70
thumb_func_end sub_8109F44
@ -4444,7 +4444,7 @@ sub_810A18C: @ 810A18C
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, _0810A1BC @ =gUnknown_203AD30
ldr r0, _0810A1BC @ =gSpecialVar_ItemId
ldrh r0, [r0]
ldr r1, _0810A1C0 @ =gStringVar1
bl sub_8099E90
@ -4461,7 +4461,7 @@ sub_810A18C: @ 810A18C
pop {r0}
bx r0
.align 2, 0
_0810A1BC: .4byte gUnknown_203AD30
_0810A1BC: .4byte gSpecialVar_ItemId
_0810A1C0: .4byte gStringVar1
_0810A1C4: .4byte gStringVar4
_0810A1C8: .4byte gUnknown_841635E
@ -4634,7 +4634,7 @@ sub_810A324: @ 810A324
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r5, _0810A36C @ =gUnknown_203AD30
ldr r5, _0810A36C @ =gSpecialVar_ItemId
ldrh r0, [r5]
bl ItemId_GetBattleFunc
cmp r0, 0
@ -4660,7 +4660,7 @@ _0810A364:
pop {r0}
bx r0
.align 2, 0
_0810A36C: .4byte gUnknown_203AD30
_0810A36C: .4byte gSpecialVar_ItemId
thumb_func_end sub_810A324
thumb_func_start sub_810A370
@ -4936,7 +4936,7 @@ sub_810A568: @ 810A568
lsls r0, 3
ldr r1, _0810A58C @ =gTasks+0x8
adds r4, r0, r1
ldr r6, _0810A590 @ =gUnknown_203AD30
ldr r6, _0810A590 @ =gSpecialVar_ItemId
ldrh r1, [r6]
movs r0, 0xB6
lsls r0, 1
@ -4946,7 +4946,7 @@ sub_810A568: @ 810A568
b _0810A5A0
.align 2, 0
_0810A58C: .4byte gTasks+0x8
_0810A590: .4byte gUnknown_203AD30
_0810A590: .4byte gSpecialVar_ItemId
_0810A594: .4byte sub_810A654
_0810A598:
ldr r0, _0810A5AC @ =0x0000016d
@ -5394,7 +5394,7 @@ sub_810A940: @ 810A940
bl PutWindowTilemap
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
ldr r0, _0810A9B8 @ =gUnknown_203AD30
ldr r0, _0810A9B8 @ =gSpecialVar_ItemId
ldrh r0, [r0]
ldr r1, _0810A9BC @ =gStringVar1
bl sub_8099E90
@ -5432,7 +5432,7 @@ sub_810A940: @ 810A940
bx r0
.align 2, 0
_0810A9B4: .4byte gTasks+0x8
_0810A9B8: .4byte gUnknown_203AD30
_0810A9B8: .4byte gSpecialVar_ItemId
_0810A9BC: .4byte gStringVar1
_0810A9C0: .4byte gStringVar3
_0810A9C4: .4byte gUnknown_203ACFC
@ -5460,7 +5460,7 @@ sub_810A9D4: @ 810A9D4
mov r8, r1
movs r0, 0xF8
bl PlaySE
ldr r5, _0810AADC @ =gUnknown_203AD30
ldr r5, _0810AADC @ =gSpecialVar_ItemId
ldrh r0, [r5]
mov r2, r8
ldrh r1, [r2, 0x10]
@ -5559,7 +5559,7 @@ sub_810A9D4: @ 810A9D4
bx r0
.align 2, 0
_0810AAD8: .4byte gTasks+0x8
_0810AADC: .4byte gUnknown_203AD30
_0810AADC: .4byte gSpecialVar_ItemId
_0810AAE0: .4byte gSaveBlock1Ptr
_0810AAE4: .4byte gUnknown_203ACFC
_0810AAE8: .4byte gUnknown_203AD10
@ -5741,7 +5741,7 @@ sub_810AC40: @ 810AC40
mov r9, r0
mov r7, r8
add r7, r9
ldr r5, _0810ACD0 @ =gUnknown_203AD30
ldr r5, _0810ACD0 @ =gSpecialVar_ItemId
ldrh r0, [r5]
ldrh r1, [r7, 0x10]
bl sub_809A3C8
@ -5791,7 +5791,7 @@ sub_810AC40: @ 810AC40
b _0810ACF8
.align 2, 0
_0810ACCC: .4byte gTasks+0x8
_0810ACD0: .4byte gUnknown_203AD30
_0810ACD0: .4byte gSpecialVar_ItemId
_0810ACD4: .4byte 0x0000ffff
_0810ACD8: .4byte gStringVar1
_0810ACDC: .4byte gStringVar2
@ -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
@ -5848,7 +5848,7 @@ _0810AD1E:
bl player_bitmagic
bl sub_805C270
bl sub_805C780
ldr r2, _0810AD88 @ =gUnknown_203AD30
ldr r2, _0810AD88 @ =gSpecialVar_ItemId
ldr r0, [r4]
adds r0, r5
ldrh r1, [r0]
@ -5869,7 +5869,7 @@ _0810AD1E:
.align 2, 0
_0810AD80: .4byte gSaveBlock1Ptr
_0810AD84: .4byte 0x00000296
_0810AD88: .4byte gUnknown_203AD30
_0810AD88: .4byte gSpecialVar_ItemId
_0810AD8C: .4byte gTasks
_0810AD90:
ldr r0, [r4]
@ -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
@ -6187,14 +6187,14 @@ _0810AFF6:
bl bag_menu_print_cursor_
movs r0, 0x1
bl sub_8109140
ldr r1, _0810B018 @ =gUnknown_203AD30
ldr r1, _0810B018 @ =gSpecialVar_ItemId
movs r0, 0x4
strh r0, [r1]
adds r0, r4, 0
bl sub_8109890
b _0810B064
.align 2, 0
_0810B018: .4byte gUnknown_203AD30
_0810B018: .4byte gSpecialVar_ItemId
_0810B01C:
movs r0, 0x5
bl PlaySE
@ -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
@ -6493,7 +6493,7 @@ _0810B266:
bl bag_menu_print_cursor_
movs r0, 0x1
bl sub_8109140
ldr r1, _0810B28C @ =gUnknown_203AD30
ldr r1, _0810B28C @ =gSpecialVar_ItemId
movs r2, 0xB7
lsls r2, 1
adds r0, r2, 0
@ -6502,7 +6502,7 @@ _0810B266:
bl sub_8109890
b _0810B36C
.align 2, 0
_0810B28C: .4byte gUnknown_203AD30
_0810B28C: .4byte gSpecialVar_ItemId
_0810B290:
movs r0, 0x5
bl PlaySE
@ -6514,7 +6514,7 @@ _0810B29E:
bl PlaySE
ldr r0, _0810B318 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _0810B31C @ =gUnknown_203AD30
ldr r1, _0810B31C @ =gSpecialVar_ItemId
ldrh r1, [r1]
ldr r2, _0810B320 @ =0x00000296
adds r0, r2
@ -6562,7 +6562,7 @@ _0810B29E:
b _0810B36C
.align 2, 0
_0810B318: .4byte gSaveBlock1Ptr
_0810B31C: .4byte gUnknown_203AD30
_0810B31C: .4byte gSpecialVar_ItemId
_0810B320: .4byte 0x00000296
_0810B324: .4byte gUnknown_203ACFC
_0810B328: .4byte gUnknown_3005E70
@ -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]
@ -6713,14 +6713,14 @@ _0810B440:
bl bag_menu_print_cursor_
movs r0, 0x1
bl sub_8109140
ldr r1, _0810B464 @ =gUnknown_203AD30
ldr r1, _0810B464 @ =gSpecialVar_ItemId
movs r0, 0x4
strh r0, [r1]
adds r0, r5, 0
bl sub_8109890
b _0810B4B0
.align 2, 0
_0810B464: .4byte gUnknown_203AD30
_0810B464: .4byte gSpecialVar_ItemId
_0810B468:
movs r0, 0x5
bl PlaySE
@ -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]
@ -6829,14 +6829,14 @@ _0810B53C:
bl bag_menu_print_cursor_
movs r0, 0x1
bl sub_8109140
ldr r1, _0810B560 @ =gUnknown_203AD30
ldr r1, _0810B560 @ =gSpecialVar_ItemId
movs r0, 0xE
strh r0, [r1]
adds r0, r4, 0
bl sub_8109890
b _0810B5C0
.align 2, 0
_0810B560: .4byte gUnknown_203AD30
_0810B560: .4byte gSpecialVar_ItemId
_0810B564:
movs r0, 0x5
bl PlaySE
@ -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
@ -6962,7 +6962,7 @@ _0810B660:
bl bag_menu_print_cursor_
movs r0, 0x1
bl sub_8109140
ldr r1, _0810B688 @ =gUnknown_203AD30
ldr r1, _0810B688 @ =gSpecialVar_ItemId
movs r2, 0xB6
lsls r2, 1
adds r0, r2, 0
@ -6971,7 +6971,7 @@ _0810B660:
bl sub_8109890
b _0810B6E0
.align 2, 0
_0810B688: .4byte gUnknown_203AD30
_0810B688: .4byte gSpecialVar_ItemId
_0810B68C:
movs r0, 0x5
bl PlaySE

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
@ -589,7 +589,7 @@ _0810D8A4:
ldr r3, [r0]
lsls r0, r4, 3
adds r0, r3
ldr r1, _0810D944 @ =gUnknown_84161C1
ldr r1, _0810D944 @ =gFameCheckerText_Cancel
str r1, [r0]
movs r1, 0x2
negs r1, r1
@ -657,7 +657,7 @@ _0810D8A4:
_0810D938: .4byte gSaveBlock1Ptr
_0810D93C: .4byte gUnknown_203ADC4
_0810D940: .4byte gUnknown_203ADBC
_0810D944: .4byte gUnknown_84161C1
_0810D944: .4byte gFameCheckerText_Cancel
_0810D948: .4byte gUnknown_3005E70
_0810D94C: .4byte sub_810D954
_0810D950: .4byte sub_810DA20
@ -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
@ -879,7 +879,7 @@ sub_810DAD4: @ 810DAD4
bl FillWindowPixelRect
b _0810DB26
_0810DB10:
ldr r2, _0810DB30 @ =gUnknown_841623B
ldr r2, _0810DB30 @ =gFameCheckerText_ListMenuCursor
str r5, [sp]
movs r0, 0
str r0, [sp, 0x4]
@ -895,7 +895,7 @@ _0810DB26:
pop {r0}
bx r0
.align 2, 0
_0810DB30: .4byte gUnknown_841623B
_0810DB30: .4byte gFameCheckerText_ListMenuCursor
thumb_func_end sub_810DAD4
thumb_func_start sub_810DB34
@ -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:

View File

@ -10,7 +10,7 @@ sub_80A0FBC: @ 80A0FBC
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r1, _080A0FD8 @ =gUnknown_203AD30
ldr r1, _080A0FD8 @ =gSpecialVar_ItemId
ldrh r0, [r1]
cmp r0, 0xAF
bne _080A0FE0
@ -22,7 +22,7 @@ sub_80A0FBC: @ 80A0FBC
ldrb r0, [r1, 0x10]
b _080A0FE6
.align 2, 0
_080A0FD8: .4byte gUnknown_203AD30
_080A0FD8: .4byte gSpecialVar_ItemId
_080A0FDC: .4byte gTasks
_080A0FE0:
ldrh r0, [r1]
@ -31,7 +31,7 @@ _080A0FE6:
subs r0, 0x1
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _080A1010 @ =gUnknown_203AD30
ldr r0, _080A1010 @ =gSpecialVar_ItemId
ldrh r0, [r0]
bl GetPocketByItemId
lsls r0, 24
@ -47,7 +47,7 @@ _080A0FE6:
bl sub_813D808
b _080A1032
.align 2, 0
_080A1010: .4byte gUnknown_203AD30
_080A1010: .4byte gSpecialVar_ItemId
_080A1014: .4byte gUnknown_83E2954
_080A1018:
ldr r0, _080A1038 @ =gUnknown_83E2954
@ -317,10 +317,10 @@ sub_80A1208: @ 80A1208
push {lr}
sub sp, 0x24
mov r1, sp
ldr r0, _080A1224 @ =gUnknown_203AD30
ldr r0, _080A1224 @ =gSpecialVar_ItemId
ldrh r0, [r0]
strh r0, [r1, 0x20]
ldr r1, _080A1228 @ =sub_8107EB8
ldr r1, _080A1228 @ =UseFameCheckerFromMenu
mov r0, sp
movs r2, 0
bl sub_80BEBEC
@ -328,8 +328,8 @@ sub_80A1208: @ 80A1208
pop {r0}
bx r0
.align 2, 0
_080A1224: .4byte gUnknown_203AD30
_080A1228: .4byte sub_8107EB8
_080A1224: .4byte gSpecialVar_ItemId
_080A1228: .4byte UseFameCheckerFromMenu
thumb_func_end sub_80A1208
thumb_func_start sub_80A122C
@ -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
@ -571,7 +571,7 @@ ItemUseOnFieldCB_Rod: @ 80A1410
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, _080A1434 @ =gUnknown_203AD30
ldr r0, _080A1434 @ =gSpecialVar_ItemId
ldrh r0, [r0]
bl ItemId_GetSecondaryId
lsls r0, 24
@ -583,7 +583,7 @@ ItemUseOnFieldCB_Rod: @ 80A1410
pop {r0}
bx r0
.align 2, 0
_080A1434: .4byte gUnknown_203AD30
_080A1434: .4byte gSpecialVar_ItemId
thumb_func_end ItemUseOnFieldCB_Rod
thumb_func_start ItemUseOutOfBattle_Itemfinder
@ -625,7 +625,7 @@ sub_80A1460: @ 80A1460
ldr r1, _080A14BC @ =gUnknown_8416537
adds r0, r4, 0
bl StringExpandPlaceholders
ldr r0, _080A14C0 @ =gUnknown_203AD30
ldr r0, _080A14C0 @ =gSpecialVar_ItemId
ldrh r2, [r0]
ldr r3, _080A14C4 @ =0x0000ffff
movs r0, 0x4
@ -650,7 +650,7 @@ sub_80A1460: @ 80A1460
_080A14B4: .4byte gStringVar1
_080A14B8: .4byte gStringVar4
_080A14BC: .4byte gUnknown_8416537
_080A14C0: .4byte gUnknown_203AD30
_080A14C0: .4byte gSpecialVar_ItemId
_080A14C4: .4byte 0x0000ffff
_080A14C8: .4byte gTasks
_080A14CC: .4byte sub_810A1F8
@ -684,7 +684,7 @@ sub_80A14E8: @ 80A14E8
ldr r1, _080A1540 @ =gUnknown_8416644
adds r0, r4, 0
bl StringExpandPlaceholders
ldr r0, _080A1544 @ =gUnknown_203AD30
ldr r0, _080A1544 @ =gSpecialVar_ItemId
ldrh r2, [r0]
ldr r3, _080A1548 @ =0x0000ffff
movs r0, 0x4
@ -709,7 +709,7 @@ sub_80A14E8: @ 80A14E8
_080A1538: .4byte gStringVar1
_080A153C: .4byte gStringVar4
_080A1540: .4byte gUnknown_8416644
_080A1544: .4byte gUnknown_203AD30
_080A1544: .4byte gSpecialVar_ItemId
_080A1548: .4byte 0x0000ffff
_080A154C: .4byte gTasks
_080A1550: .4byte sub_810A1F8
@ -760,7 +760,7 @@ _080A1598:
bcc _080A1578
cmp r6, 0
beq _080A1600
ldr r0, _080A15D4 @ =gUnknown_203AD30
ldr r0, _080A15D4 @ =gSpecialVar_ItemId
ldrh r2, [r0]
ldr r3, _080A15D8 @ =0x0000ffff
movs r0, 0x4
@ -780,7 +780,7 @@ _080A1598:
b _080A1616
.align 2, 0
_080A15D0: .4byte gPlayerParty
_080A15D4: .4byte gUnknown_203AD30
_080A15D4: .4byte gSpecialVar_ItemId
_080A15D8: .4byte 0x0000ffff
_080A15DC: .4byte gTasks
_080A15E0: .4byte gUnknown_8416690
@ -1045,14 +1045,14 @@ _080A17D0: .4byte sub_80A17E8
thumb_func_start sub_80A17D4
sub_80A17D4: @ 80A17D4
push {lr}
ldr r1, _080A17E4 @ =sub_8107EB8
ldr r1, _080A17E4 @ =UseFameCheckerFromMenu
movs r0, 0
movs r2, 0
bl sub_81317F8
pop {r0}
bx r0
.align 2, 0
_080A17E4: .4byte sub_8107EB8
_080A17E4: .4byte UseFameCheckerFromMenu
thumb_func_end sub_80A17D4
thumb_func_start sub_80A17E8
@ -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
@ -1123,14 +1123,14 @@ _080A1868: .4byte sub_80A1880
thumb_func_start sub_80A186C
sub_80A186C: @ 80A186C
push {lr}
ldr r1, _080A187C @ =sub_8107EB8
ldr r1, _080A187C @ =UseFameCheckerFromMenu
movs r0, 0
movs r2, 0
bl sub_813CD50
pop {r0}
bx r0
.align 2, 0
_080A187C: .4byte sub_8107EB8
_080A187C: .4byte UseFameCheckerFromMenu
thumb_func_end sub_80A186C
thumb_func_start sub_80A1880
@ -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
@ -1196,7 +1196,7 @@ sub_80A18EC: @ 80A18EC
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _080A1920 @ =gUnknown_203AD30
ldr r0, _080A1920 @ =gSpecialVar_ItemId
ldrh r2, [r0]
ldr r3, _080A1924 @ =0x0000ffff
movs r0, 0x4
@ -1217,7 +1217,7 @@ sub_80A18EC: @ 80A18EC
bl sub_8108B50
b _080A1940
.align 2, 0
_080A1920: .4byte gUnknown_203AD30
_080A1920: .4byte gSpecialVar_ItemId
_080A1924: .4byte 0x0000ffff
_080A1928: .4byte gTasks
_080A192C: .4byte sub_80A194C
@ -1239,13 +1239,13 @@ _080A1948: .4byte sub_80A1960
thumb_func_start sub_80A194C
sub_80A194C: @ 80A194C
push {lr}
ldr r1, _080A195C @ =sub_8107EB8
ldr r1, _080A195C @ =UseFameCheckerFromMenu
movs r0, 0
bl sub_815ABC4
pop {r0}
bx r0
.align 2, 0
_080A195C: .4byte sub_8107EB8
_080A195C: .4byte UseFameCheckerFromMenu
thumb_func_end sub_80A194C
thumb_func_start sub_80A1960
@ -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
@ -1323,7 +1323,7 @@ sub_80A19E8: @ 80A19E8
lsls r0, 24
cmp r0, 0
bne _080A1A2A
ldr r4, _080A1A30 @ =gUnknown_203AD30
ldr r4, _080A1A30 @ =gSpecialVar_ItemId
ldrh r2, [r4]
ldr r3, _080A1A34 @ =0x0000ffff
movs r0, 0x4
@ -1348,7 +1348,7 @@ _080A1A2A:
pop {r0}
bx r0
.align 2, 0
_080A1A30: .4byte gUnknown_203AD30
_080A1A30: .4byte gSpecialVar_ItemId
_080A1A34: .4byte 0x0000ffff
_080A1A38: .4byte 0x00004020
_080A1A3C: .4byte gStringVar4
@ -1358,7 +1358,7 @@ _080A1A40: .4byte sub_810A1F8
thumb_func_start sub_80A1A44
sub_80A1A44: @ 80A1A44
push {r4,lr}
ldr r4, _080A1A84 @ =gUnknown_203AD30
ldr r4, _080A1A84 @ =gSpecialVar_ItemId
ldrh r0, [r4]
movs r1, 0x1
bl sub_809A1D8
@ -1382,7 +1382,7 @@ sub_80A1A44: @ 80A1A44
pop {r0}
bx r0
.align 2, 0
_080A1A84: .4byte gUnknown_203AD30
_080A1A84: .4byte gSpecialVar_ItemId
_080A1A88: .4byte gStringVar2
_080A1A8C: .4byte gStringVar4
_080A1A90: .4byte gUnknown_841658C
@ -1394,7 +1394,7 @@ sub_80A1A94: @ 80A1A94
lsls r0, 24
lsrs r4, r0, 24
adds r6, r4, 0
ldr r5, _080A1AD4 @ =gUnknown_203AD30
ldr r5, _080A1AD4 @ =gSpecialVar_ItemId
ldrh r2, [r5]
ldr r3, _080A1AD8 @ =0x0000ffff
movs r0, 0x4
@ -1418,7 +1418,7 @@ sub_80A1A94: @ 80A1A94
adds r0, r4
b _080A1B1A
.align 2, 0
_080A1AD4: .4byte gUnknown_203AD30
_080A1AD4: .4byte gSpecialVar_ItemId
_080A1AD8: .4byte 0x0000ffff
_080A1ADC: .4byte 0x00000803
_080A1AE0: .4byte 0x00000804
@ -1527,7 +1527,7 @@ ItemUseOutOfBattle_EscapeRope: @ 80A1BAC
lsrs r0, 24
cmp r0, 0x1
bne _080A1BEC
ldr r0, _080A1BDC @ =gUnknown_203AD30
ldr r0, _080A1BDC @ =gSpecialVar_ItemId
ldrh r2, [r0]
ldr r0, _080A1BE0 @ =gMapHeader
ldrb r3, [r0, 0x14]
@ -1541,7 +1541,7 @@ ItemUseOutOfBattle_EscapeRope: @ 80A1BAC
bl sub_80A103C
b _080A1BFE
.align 2, 0
_080A1BDC: .4byte gUnknown_203AD30
_080A1BDC: .4byte gSpecialVar_ItemId
_080A1BE0: .4byte gMapHeader
_080A1BE4: .4byte gUnknown_2039998
_080A1BE8: .4byte sub_80A1C08
@ -1646,13 +1646,13 @@ _080A1CA8: .4byte sub_80A1CC0
thumb_func_start sub_80A1CAC
sub_80A1CAC: @ 80A1CAC
push {lr}
ldr r1, _080A1CBC @ =sub_8107EB8
ldr r1, _080A1CBC @ =UseFameCheckerFromMenu
movs r0, 0
bl sub_80BFF50
pop {r0}
bx r0
.align 2, 0
_080A1CBC: .4byte sub_8107EB8
_080A1CBC: .4byte UseFameCheckerFromMenu
thumb_func_end sub_80A1CAC
thumb_func_start sub_80A1CC0
@ -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
@ -1687,7 +1687,7 @@ sub_80A1CF8: @ 80A1CF8
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _080A1D2C @ =gUnknown_203AD30
ldr r0, _080A1D2C @ =gSpecialVar_ItemId
ldrh r2, [r0]
ldr r3, _080A1D30 @ =0x0000ffff
movs r0, 0x4
@ -1708,7 +1708,7 @@ sub_80A1CF8: @ 80A1CF8
bl sub_8108B50
b _080A1D4C
.align 2, 0
_080A1D2C: .4byte gUnknown_203AD30
_080A1D2C: .4byte gSpecialVar_ItemId
_080A1D30: .4byte 0x0000ffff
_080A1D34: .4byte gTasks
_080A1D38: .4byte sub_80A1D58
@ -1730,12 +1730,12 @@ _080A1D54: .4byte sub_80A1D68
thumb_func_start sub_80A1D58
sub_80A1D58: @ 80A1D58
push {lr}
ldr r0, _080A1D64 @ =sub_8107EB8
bl sub_812C3AC
ldr r0, _080A1D64 @ =UseFameCheckerFromMenu
bl UseFameChecker
pop {r0}
bx r0
.align 2, 0
_080A1D64: .4byte sub_8107EB8
_080A1D64: .4byte UseFameCheckerFromMenu
thumb_func_end sub_80A1D58
thumb_func_start sub_80A1D68
@ -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
@ -1752,7 +1752,7 @@ sub_80A1D68: @ 80A1D68
bl sub_80563F0
bl sub_80A1184
ldr r0, _080A1D98 @ =c2_exit_to_overworld_2_switch
bl sub_812C3AC
bl UseFameChecker
adds r0, r4, 0
bl DestroyTask
_080A1D8E:
@ -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
@ -1841,7 +1841,7 @@ sub_80A1E1C: @ 80A1E1C
lsls r0, 24
cmp r0, 0
bne _080A1E48
ldr r0, _080A1E44 @ =gUnknown_203AD30
ldr r0, _080A1E44 @ =gSpecialVar_ItemId
ldrh r0, [r0]
movs r1, 0x1
bl sub_809A1D8
@ -1850,7 +1850,7 @@ sub_80A1E1C: @ 80A1E1C
bl sub_8108B50
b _080A1E54
.align 2, 0
_080A1E44: .4byte gUnknown_203AD30
_080A1E44: .4byte gSpecialVar_ItemId
_080A1E48:
ldr r2, _080A1E5C @ =gUnknown_8416631
ldr r3, _080A1E60 @ =sub_810A1F8
@ -1895,7 +1895,7 @@ sub_80A1E7C: @ 80A1E7C
muls r0, r2
ldr r1, _080A1EC4 @ =gPlayerParty
adds r0, r1
ldr r1, _080A1EC8 @ =gUnknown_203AD30
ldr r1, _080A1EC8 @ =gSpecialVar_ItemId
ldrh r1, [r1]
lsls r2, 24
lsrs r2, 24
@ -1915,7 +1915,7 @@ sub_80A1E7C: @ 80A1E7C
_080A1EBC: .4byte gBattlerPartyIndexes
_080A1EC0: .4byte gBattlerInMenuId
_080A1EC4: .4byte gPlayerParty
_080A1EC8: .4byte gUnknown_203AD30
_080A1EC8: .4byte gSpecialVar_ItemId
_080A1ECC: .4byte gUnknown_84169DC
_080A1ED0: .4byte sub_810A1F8
_080A1ED4:
@ -1953,7 +1953,7 @@ sub_80A1EF4: @ 80A1EF4
asrs r0, 16
cmp r0, 0x7
ble _080A1F36
ldr r0, _080A1F40 @ =gUnknown_203AD30
ldr r0, _080A1F40 @ =gSpecialVar_ItemId
ldrh r4, [r0]
movs r0, 0x1
bl PlaySE
@ -1973,7 +1973,7 @@ _080A1F36:
bx r0
.align 2, 0
_080A1F3C: .4byte gTasks+0x8
_080A1F40: .4byte gUnknown_203AD30
_080A1F40: .4byte gSpecialVar_ItemId
_080A1F44: .4byte sub_80A1F48
thumb_func_end sub_80A1EF4
@ -2009,7 +2009,7 @@ sub_80A1F78: @ 80A1F78
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _080A1F9C @ =gUnknown_203AD30
ldr r0, _080A1F9C @ =gSpecialVar_ItemId
ldrh r0, [r0]
bl GetPocketByItemId
lsls r0, 24
@ -2022,7 +2022,7 @@ sub_80A1F78: @ 80A1F78
bl sub_813D808
b _080A1FB0
.align 2, 0
_080A1F9C: .4byte gUnknown_203AD30
_080A1F9C: .4byte gSpecialVar_ItemId
_080A1FA0: .4byte sub_81279E0
_080A1FA4:
ldr r0, _080A1FB8 @ =sub_81279E0
@ -2097,7 +2097,7 @@ sub_80A2010: @ 80A2010
cmp r0, 0
bne _080A2058
bl sub_80A1A44
ldr r0, _080A2048 @ =gUnknown_203AD30
ldr r0, _080A2048 @ =gSpecialVar_ItemId
ldrh r2, [r0]
ldr r3, _080A204C @ =0x0000ffff
movs r0, 0x4
@ -2111,7 +2111,7 @@ sub_80A2010: @ 80A2010
b _080A2060
.align 2, 0
_080A2044: .4byte gBattleTypeFlags
_080A2048: .4byte gUnknown_203AD30
_080A2048: .4byte gSpecialVar_ItemId
_080A204C: .4byte 0x0000ffff
_080A2050: .4byte gStringVar4
_080A2054: .4byte sub_8108B50
@ -2130,7 +2130,7 @@ ItemUseOutOfBattle_EnigmaBerry: @ 80A2068
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _080A208C @ =gUnknown_203AD30
ldr r0, _080A208C @ =gSpecialVar_ItemId
ldrh r0, [r0]
bl GetItemEffectType
lsls r0, 24
@ -2146,7 +2146,7 @@ _080A2082:
ldr r0, [r0]
mov pc, r0
.align 2, 0
_080A208C: .4byte gUnknown_203AD30
_080A208C: .4byte gSpecialVar_ItemId
_080A2090: .4byte _080A2094
.align 2, 0
_080A2094:
@ -2259,7 +2259,7 @@ ItemUseInBattle_EnigmaBerry: @ 80A2194
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _080A21B4 @ =gUnknown_203AD30
ldr r0, _080A21B4 @ =gSpecialVar_ItemId
ldrh r0, [r0]
bl GetItemEffectType
lsls r0, 24
@ -2272,7 +2272,7 @@ ItemUseInBattle_EnigmaBerry: @ 80A2194
ldr r0, [r0]
mov pc, r0
.align 2, 0
_080A21B4: .4byte gUnknown_203AD30
_080A21B4: .4byte gSpecialVar_ItemId
_080A21B8: .4byte _080A21BC
.align 2, 0
_080A21BC:
@ -2324,7 +2324,7 @@ sub_80A2238: @ 80A2238
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r0, _080A2268 @ =gUnknown_203AD30
ldr r0, _080A2268 @ =gSpecialVar_ItemId
ldrh r0, [r0]
bl GetPocketByItemId
lsls r0, 24
@ -2342,7 +2342,7 @@ sub_80A2238: @ 80A2238
bl sub_813EB20
b _080A228A
.align 2, 0
_080A2268: .4byte gUnknown_203AD30
_080A2268: .4byte gSpecialVar_ItemId
_080A226C: .4byte gStringVar4
_080A2270: .4byte gUnknown_8416425
_080A2274: .4byte sub_813E2B8

View File

@ -369,14 +369,14 @@ sub_813EF40: @ 813EF40
adds r0, r5, 0
movs r1, 0x1
bl sub_80CC44C
ldr r1, _0813EF90 @ =gUnknown_20370C0
ldr r1, _0813EF90 @ =gSpecialVar_0x8004
strh r0, [r1]
adds r0, r5, 0
movs r1, 0
bl sub_80CC44C
ldr r1, _0813EF94 @ =gSpecialVar_0x8005
strh r0, [r1]
ldr r0, _0813EF98 @ =gUnknown_20370C4
ldr r0, _0813EF98 @ =gSpecialVar_0x8006
movs r5, 0x1
strh r5, [r0]
ldrh r1, [r1]
@ -394,9 +394,9 @@ sub_813EF40: @ 813EF40
bx r0
.align 2, 0
_0813EF8C: .4byte gTasks+0x8
_0813EF90: .4byte gUnknown_20370C0
_0813EF90: .4byte gSpecialVar_0x8004
_0813EF94: .4byte gSpecialVar_0x8005
_0813EF98: .4byte gUnknown_20370C4
_0813EF98: .4byte gSpecialVar_0x8006
thumb_func_end sub_813EF40
thumb_func_start sub_813EF9C

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
@ -182,7 +182,7 @@ sub_80E478C: @ 80E478C
str r0, [r4]
bl sub_80E4F54
ldr r0, [r4]
ldr r1, _080E47F4 @ =gUnknown_20370C0
ldr r1, _080E47F4 @ =gSpecialVar_0x8004
ldrh r1, [r1]
movs r2, 0x98
lsls r2, 2
@ -205,7 +205,7 @@ sub_80E478C: @ 80E478C
.align 2, 0
_080E47EC: .4byte gUnknown_203AAB4
_080E47F0: .4byte 0x00000a6c
_080E47F4: .4byte gUnknown_20370C0
_080E47F4: .4byte gSpecialVar_0x8004
_080E47F8: .4byte sub_80E4620
_080E47FC: .4byte sub_80E4870
thumb_func_end sub_80E478C
@ -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]
@ -505,7 +505,7 @@ _080E4A88:
beq _080E4AE0
ldr r0, _080E4AD8 @ =gUnknown_841E405
bl sub_80E48C0
ldr r1, _080E4ADC @ =gUnknown_20370C0
ldr r1, _080E4ADC @ =gSpecialVar_0x8004
movs r0, 0x1
strh r0, [r1]
ldr r1, [r4]
@ -517,7 +517,7 @@ _080E4ACC: .4byte gPlayerParty
_080E4AD0: .4byte 0x00000a67
_080E4AD4: .4byte 0xffff0000
_080E4AD8: .4byte gUnknown_841E405
_080E4ADC: .4byte gUnknown_20370C0
_080E4ADC: .4byte gSpecialVar_0x8004
_080E4AE0:
ldr r1, [r4]
movs r0, 0x10
@ -567,11 +567,11 @@ _080E4B3A:
beq _080E4B4C
b _080E4EDA
_080E4B40:
ldr r0, _080E4B48 @ =gUnknown_20370C0
ldr r0, _080E4B48 @ =gSpecialVar_0x8004
strh r1, [r0]
b _080E4ED2
.align 2, 0
_080E4B48: .4byte gUnknown_20370C0
_080E4B48: .4byte gSpecialVar_0x8004
_080E4B4C:
ldr r0, _080E4B54 @ =gUnknown_203AAB4
ldr r1, [r0]
@ -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
@ -931,19 +931,19 @@ _080E4DB4:
ldr r1, [r7]
movs r0, 0x1E
strb r0, [r1]
ldr r1, _080E4E6C @ =gUnknown_20370C0
ldr r1, _080E4E6C @ =gSpecialVar_0x8004
movs r0, 0x1
strh r0, [r1]
b _080E4EDA
.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
_080E4E68: .4byte gUnknown_841E493
_080E4E6C: .4byte gUnknown_20370C0
_080E4E6C: .4byte gSpecialVar_0x8004
_080E4E70:
ldr r0, _080E4E88 @ =gUnknown_841E4C0
bl sub_80E48C0
@ -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
@ -1331,7 +1331,7 @@ _080E513C:
lsls r7, 1
adds r1, r7
adds r0, r1
ldr r1, _080E51F8 @ =gUnknown_84161C1
ldr r1, _080E51F8 @ =gFameCheckerText_Cancel
bl StringCopy
ldr r1, [r4]
ldrb r0, [r1, 0x1A]
@ -1367,7 +1367,7 @@ _080E51AA:
adds r0, r2, 0
adds r0, 0x20
adds r0, r3
ldr r1, _080E51F8 @ =gUnknown_84161C1
ldr r1, _080E51F8 @ =gFameCheckerText_Cancel
str r1, [r0]
adds r2, 0x24
adds r2, r3
@ -1394,9 +1394,9 @@ _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
_080E51F8: .4byte gFameCheckerText_Cancel
_080E51FC: .4byte gUnknown_3005E70
_080E5200: .4byte gUnknown_83FFA94
thumb_func_end sub_80E50CC

View File

@ -2769,11 +2769,11 @@ _081E0956:
thumb_func_start sub_81E095C
sub_81E095C: @ 81E095C
push {lr}
ldr r2, _081E0964 @ =gUnknown_86FC068
ldr r2, _081E0964 @ =_Str_RFU_MBOOT
ldr r3, _081E0968 @ =0x30000F0
b _081E0976
.align 2, 0
_081E0964: .4byte gUnknown_86FC068
_081E0964: .4byte _Str_RFU_MBOOT
_081E0968: .4byte 0x30000F0
_081E096C:
ldrb r0, [r3]
@ -5794,7 +5794,7 @@ _081E1FF0:
movs r2, 0
movs r0, 0x1
ands r0, r3
ldr r4, _081E2020 @ =gUnknown_86FC03C
ldr r4, _081E2020 @ =_Str_RfuHeader
cmp r0, 0
bne _081E2012
movs r1, 0x1
@ -5818,7 +5818,7 @@ _081E2012:
adds r1, 0xF
b _081E202E
.align 2, 0
_081E2020: .4byte gUnknown_86FC03C
_081E2020: .4byte _Str_RfuHeader
_081E2024:
cmp r0, 0
bne _081E2030
@ -6832,7 +6832,7 @@ rfu_STC_NI_constructLLSF: @ 81E2790
ldr r0, [r2]
ldrb r0, [r0]
lsls r0, 4
ldr r1, _081E2810 @ =gUnknown_86FC03C
ldr r1, _081E2810 @ =_Str_RfuHeader
adds r0, r1
mov r8, r0
ldrh r1, [r4]
@ -6883,7 +6883,7 @@ _081E27FA:
b _081E285C
.align 2, 0
_081E280C: .4byte gUnknown_3007460
_081E2810: .4byte gUnknown_86FC03C
_081E2810: .4byte _Str_RfuHeader
_081E2814: .4byte 0x00008022
_081E2818:
ldr r0, _081E2844 @ =0x00008022
@ -7083,7 +7083,7 @@ _081E297C:
ldr r2, [r0]
ldrb r0, [r2]
lsls r0, 4
ldr r1, _081E29F8 @ =gUnknown_86FC03C
ldr r1, _081E29F8 @ =_Str_RfuHeader
adds r5, r0, r1
ldrh r0, [r4]
movs r1, 0xF
@ -7142,7 +7142,7 @@ _081E29CE:
b _081E2A0C
.align 2, 0
_081E29F4: .4byte gUnknown_3007460
_081E29F8: .4byte gUnknown_86FC03C
_081E29F8: .4byte _Str_RfuHeader
_081E29FC: .4byte gUnknown_3007468
_081E2A00:
movs r0, 0x10
@ -7469,7 +7469,7 @@ rfu_STC_analyzeLLSF: @ 81E2C40
movs r1, 0x1
ands r0, r1
lsls r0, 4
ldr r1, _081E2C78 @ =gUnknown_86FC03C
ldr r1, _081E2C78 @ =_Str_RfuHeader
adds r6, r0, r1
ldrb r0, [r6]
cmp r3, r0
@ -7478,7 +7478,7 @@ rfu_STC_analyzeLLSF: @ 81E2C40
b _081E2E6E
.align 2, 0
_081E2C74: .4byte gUnknown_3007460
_081E2C78: .4byte gUnknown_86FC03C
_081E2C78: .4byte _Str_RfuHeader
_081E2C7C:
movs r5, 0
movs r4, 0
@ -8877,12 +8877,12 @@ _081E3726:
cmp r0, 0x3
bhi _081E373C
lsls r0, 1
ldr r1, _081E3738 @ =gUnknown_86FC074
ldr r1, _081E3738 @ =_Str_Sio32ID
adds r0, r1
ldrh r0, [r0]
b _081E373E
.align 2, 0
_081E3738: .4byte gUnknown_86FC074
_081E3738: .4byte _Str_Sio32ID
_081E373C:
ldr r0, _081E3794 @ =0x00008001
_081E373E:

View File

@ -232,7 +232,7 @@ sub_8009640: @ 8009640
ldr r0, _080096D4 @ =sub_800978C
bl SetVBlankCallback
bl ResetBlockSend
ldr r1, _080096D8 @ =gUnknown_202271A
ldr r1, _080096D8 @ =gLinkType
ldr r2, _080096DC @ =0x00001111
adds r0, r2, 0
strh r0, [r1]
@ -283,7 +283,7 @@ _08009670:
bx r0
.align 2, 0
_080096D4: .4byte sub_800978C
_080096D8: .4byte gUnknown_202271A
_080096D8: .4byte gLinkType
_080096DC: .4byte 0x00001111
_080096E0: .4byte gMain
_080096E4: .4byte gSaveBlock2Ptr
@ -297,17 +297,17 @@ _080096F4: .4byte c2_08009A8C
sub_80096F8: @ 80096F8
lsls r0, 24
lsrs r0, 24
ldr r1, _08009704 @ =gUnknown_2022720
ldr r1, _08009704 @ =gLocalLinkPlayer
strh r0, [r1, 0x18]
bx lr
.align 2, 0
_08009704: .4byte gUnknown_2022720
_08009704: .4byte gLocalLinkPlayer
thumb_func_end sub_80096F8
thumb_func_start sub_8009708
sub_8009708: @ 8009708
push {r4,r5,lr}
ldr r5, _08009774 @ =gUnknown_2022720
ldr r5, _08009774 @ =gLocalLinkPlayer
ldr r4, _08009778 @ =gSaveBlock2Ptr
ldr r1, [r4]
ldrb r2, [r1, 0xA]
@ -327,7 +327,7 @@ sub_8009708: @ 8009708
ldr r0, [r4]
ldrb r0, [r0, 0x8]
strb r0, [r5, 0x13]
ldr r0, _0800977C @ =gUnknown_202271A
ldr r0, _0800977C @ =gLinkType
ldrh r0, [r0]
str r0, [r5, 0x14]
ldr r0, _08009780 @ =gGameLanguage
@ -359,9 +359,9 @@ _0800976E:
pop {r0}
bx r0
.align 2, 0
_08009774: .4byte gUnknown_2022720
_08009774: .4byte gLocalLinkPlayer
_08009778: .4byte gSaveBlock2Ptr
_0800977C: .4byte gUnknown_202271A
_0800977C: .4byte gLinkType
_08009780: .4byte gGameLanguage
_08009784: .4byte gGameVersion
_08009788: .4byte 0x00000844
@ -380,7 +380,7 @@ sub_800978C: @ 800978C
thumb_func_start sub_80097A0
sub_80097A0: @ 80097A0
push {lr}
ldr r3, _080097C0 @ =gUnknown_2022718
ldr r3, _080097C0 @ =gLinkOpen
ldr r1, _080097C4 @ =gUnknown_3003F50
ldr r2, _080097C8 @ =0x0000efff
adds r0, r1, 0
@ -396,7 +396,7 @@ _080097AC:
pop {r0}
bx r0
.align 2, 0
_080097C0: .4byte gUnknown_2022718
_080097C0: .4byte gLinkOpen
_080097C4: .4byte gUnknown_3003F50
_080097C8: .4byte 0x0000efff
thumb_func_end sub_80097A0
@ -434,7 +434,7 @@ _08009800: .4byte gUnknown_3003F84
thumb_func_start sub_8009804
sub_8009804: @ 8009804
push {r4-r6,lr}
ldr r0, _0800984C @ =gUnknown_3003F3C
ldr r0, _0800984C @ =gWirelessCommType
ldrb r4, [r0]
cmp r4, 0
bne _08009878
@ -464,7 +464,7 @@ sub_8009804: @ 8009804
bl CreateTask
b _0800987C
.align 2, 0
_0800984C: .4byte gUnknown_3003F3C
_0800984C: .4byte gWirelessCommType
_08009850: .4byte gUnknown_3003F80
_08009854: .4byte sub_800A720
_08009858: .4byte gLinkVSyncDisabled
@ -478,7 +478,7 @@ _08009874: .4byte task02_080097CC
_08009878:
bl sub_80F86F4
_0800987C:
ldr r1, _080098A8 @ =gUnknown_3003F64
ldr r1, _080098A8 @ =gReceivedRemoteLinkPlayers
movs r0, 0
strb r0, [r1]
movs r1, 0
@ -501,7 +501,7 @@ _0800988E:
pop {r0}
bx r0
.align 2, 0
_080098A8: .4byte gUnknown_3003F64
_080098A8: .4byte gReceivedRemoteLinkPlayers
_080098AC: .4byte gUnknown_3003EB8
_080098B0: .4byte gUnknown_3003F30
_080098B4: .4byte gUnknown_3003F2C
@ -510,25 +510,25 @@ _080098B4: .4byte gUnknown_3003F2C
thumb_func_start sub_80098B8
sub_80098B8: @ 80098B8
push {r4,lr}
ldr r0, _080098DC @ =gUnknown_3003F64
ldr r0, _080098DC @ =gReceivedRemoteLinkPlayers
movs r4, 0
strb r4, [r0]
ldr r0, _080098E0 @ =gUnknown_3003F3C
ldr r0, _080098E0 @ =gWirelessCommType
ldrb r0, [r0]
cmp r0, 0
beq _080098CC
bl sub_80F8DC0
_080098CC:
ldr r0, _080098E4 @ =gUnknown_2022718
ldr r0, _080098E4 @ =gLinkOpen
strb r4, [r0]
bl sub_800B29C
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080098DC: .4byte gUnknown_3003F64
_080098E0: .4byte gUnknown_3003F3C
_080098E4: .4byte gUnknown_2022718
_080098DC: .4byte gReceivedRemoteLinkPlayers
_080098E0: .4byte gWirelessCommType
_080098E4: .4byte gLinkOpen
thumb_func_end sub_80098B8
thumb_func_start TestBlockTransfer
@ -597,7 +597,7 @@ _08009958:
cmp r0, 0
beq _08009994
lsls r0, r5, 8
ldr r1, _080099C0 @ =gUnknown_2022118
ldr r1, _080099C0 @ =gBlockRecvBuffer
adds r0, r1
lsls r4, r5, 1
adds r1, r4, r5
@ -614,7 +614,7 @@ _08009958:
ldrh r0, [r4]
cmp r0, r8
beq _08009994
ldr r0, _080099C8 @ =gUnknown_2022110
ldr r0, _080099C8 @ =gLinkTestDebugValuesEnabled
strb r6, [r0]
ldr r0, _080099CC @ =gUnknown_2022111
strb r6, [r0]
@ -637,9 +637,9 @@ _080099B0: .4byte gUnknown_3000E08
_080099B4: .4byte gUnknown_3000E18
_080099B8: .4byte gUnknown_3000E60
_080099BC: .4byte 0x00000342
_080099C0: .4byte gUnknown_2022118
_080099C0: .4byte gBlockRecvBuffer
_080099C4: .4byte gUnknown_3003F88
_080099C8: .4byte gUnknown_2022110
_080099C8: .4byte gLinkTestDebugValuesEnabled
_080099CC: .4byte gUnknown_2022111
thumb_func_end TestBlockTransfer
@ -705,7 +705,7 @@ _08009A38:
beq _08009A46
bl sub_800AAC0
_08009A46:
ldr r0, _08009A80 @ =gUnknown_2022110
ldr r0, _08009A80 @ =gLinkTestDebugValuesEnabled
ldrb r0, [r0]
cmp r0, 0
beq _08009A66
@ -731,7 +731,7 @@ _08009A70: .4byte gMain
_08009A74: .4byte gUnknown_3003F84
_08009A78: .4byte gHeap + 0x4000
_08009A7C: .4byte 0x00002004
_08009A80: .4byte gUnknown_2022110
_08009A80: .4byte gLinkTestDebugValuesEnabled
_08009A84: .4byte gLinkVSyncDisabled
_08009A88: .4byte gUnknown_3003F80
thumb_func_end LinkTestProcessKeyInput
@ -756,14 +756,14 @@ c2_08009A8C: @ 8009A8C
LinkMain2: @ 8009AB0
push {r4,r5,lr}
adds r4, r0, 0
ldr r0, _08009AC0 @ =gUnknown_2022718
ldr r0, _08009AC0 @ =gLinkOpen
ldrb r0, [r0]
cmp r0, 0
bne _08009AC4
movs r0, 0
b _08009B0C
.align 2, 0
_08009AC0: .4byte gUnknown_2022718
_08009AC0: .4byte gLinkOpen
_08009AC4:
movs r1, 0
ldr r5, _08009B14 @ =gUnknown_3003EC4
@ -840,7 +840,7 @@ _08009B48:
blt _08009B40
cmp r5, 0
bne _08009B64
ldr r1, _08009B6C @ =gUnknown_3003F64
ldr r1, _08009B6C @ =gReceivedRemoteLinkPlayers
ldrb r0, [r1]
cmp r0, 0
bne _08009B64
@ -851,7 +851,7 @@ _08009B64:
pop {r0}
bx r0
.align 2, 0
_08009B6C: .4byte gUnknown_3003F64
_08009B6C: .4byte gReceivedRemoteLinkPlayers
thumb_func_end HandleReceiveRemoteLinkPlayer
thumb_func_start sub_8009B70
@ -960,7 +960,7 @@ _08009C38:
ldr r0, _08009C7C @ =gUnknown_3003E70
adds r2, r0, 0
adds r2, 0x10
ldr r1, _08009C80 @ =gUnknown_2022720
ldr r1, _08009C80 @ =gLocalLinkPlayer
ldm r1!, {r3-r5}
stm r2!, {r3-r5}
ldm r1!, {r3,r6,r7}
@ -989,7 +989,7 @@ _08009C38:
b _08009E3E
.align 2, 0
_08009C7C: .4byte gUnknown_3003E70
_08009C80: .4byte gUnknown_2022720
_08009C80: .4byte gLocalLinkPlayer
_08009C84: .4byte gUnknown_82345C0
_08009C88:
ldr r1, _08009C90 @ =gUnknown_3003F28
@ -1062,7 +1062,7 @@ _08009D08: .4byte gDecompressionBuffer
_08009D0C: .4byte gUnknown_3003ED0
_08009D10:
movs r2, 0
ldr r1, _08009DC4 @ =gUnknown_2022118
ldr r1, _08009DC4 @ =gBlockRecvBuffer
mov r9, r1
adds r7, r3, 0
ldr r3, _08009DC8 @ =gUnknown_3003ED0
@ -1106,7 +1106,7 @@ _08009D40:
cmp r0, 0x1
bne _08009DE6
lsls r1, r6, 8
ldr r0, _08009DC4 @ =gUnknown_2022118
ldr r0, _08009DC4 @ =gBlockRecvBuffer
adds r1, r0
mov r8, r1
lsls r0, r6, 3
@ -1152,7 +1152,7 @@ _08009DBC:
bl SetMainCallback2
b _08009E3E
.align 2, 0
_08009DC4: .4byte gUnknown_2022118
_08009DC4: .4byte gBlockRecvBuffer
_08009DC8: .4byte gUnknown_3003ED0
_08009DCC: .4byte gUnknown_3003EB8
_08009DD0: .4byte gLinkPlayers
@ -1318,12 +1318,12 @@ _08009F04: .4byte 0x0000cccc
_08009F08:
ldr r0, _08009F14 @ =gUnknown_3003F50
strh r2, [r0]
ldr r1, _08009F18 @ =gUnknown_202271A
ldr r1, _08009F18 @ =gLinkType
ldrh r1, [r1]
b _08009FD4
.align 2, 0
_08009F14: .4byte gUnknown_3003F50
_08009F18: .4byte gUnknown_202271A
_08009F18: .4byte gLinkType
_08009F1C:
ldr r0, _08009F28 @ =gUnknown_3003F50
strh r2, [r0]
@ -1373,12 +1373,12 @@ _08009F74: .4byte gUnknown_3000E08
_08009F78:
ldr r0, _08009F84 @ =gUnknown_3003F50
strh r2, [r0]
ldr r1, _08009F88 @ =gUnknown_203AD30
ldr r1, _08009F88 @ =gSpecialVar_ItemId
ldrh r1, [r1]
b _08009FD4
.align 2, 0
_08009F84: .4byte gUnknown_3003F50
_08009F88: .4byte gUnknown_203AD30
_08009F88: .4byte gSpecialVar_ItemId
_08009F8C:
ldr r0, _08009F98 @ =gUnknown_3003F50
strh r2, [r0]
@ -1429,7 +1429,7 @@ _08009FE4: .4byte gUnknown_3003F50
thumb_func_start sub_8009FE8
sub_8009FE8: @ 8009FE8
push {lr}
ldr r0, _0800A000 @ =gUnknown_3003F3C
ldr r0, _0800A000 @ =gWirelessCommType
ldrb r0, [r0]
cmp r0, 0
beq _08009FF6
@ -1441,7 +1441,7 @@ _08009FF6:
pop {r0}
bx r0
.align 2, 0
_0800A000: .4byte gUnknown_3003F3C
_0800A000: .4byte gWirelessCommType
_0800A004: .4byte gUnknown_3003F80
_0800A008: .4byte sub_800A040
thumb_func_end sub_8009FE8
@ -1449,14 +1449,14 @@ _0800A008: .4byte sub_800A040
thumb_func_start sub_800A00C
sub_800A00C: @ 800A00C
push {lr}
ldr r0, _0800A01C @ =gUnknown_3003F3C
ldr r0, _0800A01C @ =gWirelessCommType
ldrb r0, [r0]
cmp r0, 0
beq _0800A020
bl sub_80F9808
b _0800A03A
.align 2, 0
_0800A01C: .4byte gUnknown_3003F3C
_0800A01C: .4byte gWirelessCommType
_0800A020:
ldr r0, _0800A030 @ =gUnknown_3003F80
ldr r1, [r0]
@ -1478,7 +1478,7 @@ _0800A03A:
thumb_func_start sub_800A040
sub_800A040: @ 800A040
push {lr}
ldr r0, _0800A054 @ =gUnknown_3003F64
ldr r0, _0800A054 @ =gReceivedRemoteLinkPlayers
ldrb r0, [r0]
cmp r0, 0x1
bne _0800A050
@ -1488,7 +1488,7 @@ _0800A050:
pop {r0}
bx r0
.align 2, 0
_0800A054: .4byte gUnknown_3003F64
_0800A054: .4byte gReceivedRemoteLinkPlayers
_0800A058: .4byte 0x0000cafe
thumb_func_end sub_800A040
@ -1505,14 +1505,14 @@ _0800A064: .4byte gUnknown_3003F80
thumb_func_start sub_800A068
sub_800A068: @ 800A068
push {lr}
ldr r0, _0800A078 @ =gUnknown_3003F3C
ldr r0, _0800A078 @ =gWirelessCommType
ldrb r1, [r0]
cmp r1, 0
beq _0800A07C
bl sub_80F985C
b _0800A080
.align 2, 0
_0800A078: .4byte gUnknown_3003F3C
_0800A078: .4byte gWirelessCommType
_0800A07C:
ldr r0, _0800A084 @ =gUnknown_3003F80
str r1, [r0]
@ -1526,7 +1526,7 @@ _0800A084: .4byte gUnknown_3003F80
thumb_func_start GetLinkPlayerCount
GetLinkPlayerCount: @ 800A088
push {lr}
ldr r0, _0800A0A0 @ =gUnknown_3003F3C
ldr r0, _0800A0A0 @ =gWirelessCommType
ldrb r0, [r0]
cmp r0, 0
bne _0800A0A8
@ -1537,7 +1537,7 @@ GetLinkPlayerCount: @ 800A088
lsrs r0, 2
b _0800A0B0
.align 2, 0
_0800A0A0: .4byte gUnknown_3003F3C
_0800A0A0: .4byte gWirelessCommType
_0800A0A4: .4byte gUnknown_3003F20
_0800A0A8:
bl sub_80FA4EC
@ -1554,14 +1554,14 @@ sub_800A0B4: @ 800A0B4
ldr r0, _0800A0C8 @ =gUnknown_3000E54
movs r1, 0
str r1, [r0]
ldr r0, _0800A0CC @ =gUnknown_202271C
ldr r0, _0800A0CC @ =gLinkTimeOutCounter
strh r1, [r0]
bl sub_8009804
pop {r0}
bx r0
.align 2, 0
_0800A0C8: .4byte gUnknown_3000E54
_0800A0CC: .4byte gUnknown_202271C
_0800A0CC: .4byte gLinkTimeOutCounter
thumb_func_end sub_800A0B4
thumb_func_start sub_800A0D0
@ -1570,7 +1570,7 @@ sub_800A0D0: @ 800A0D0
adds r5, r0, 0
adds r6, r1, 0
movs r7, 0
ldr r0, _0800A0F8 @ =gUnknown_3003F64
ldr r0, _0800A0F8 @ =gReceivedRemoteLinkPlayers
ldrb r4, [r0]
cmp r4, 0x1
bne _0800A1C8
@ -1587,7 +1587,7 @@ _0800A0F0:
str r0, [r1]
b _0800A1E2
.align 2, 0
_0800A0F8: .4byte gUnknown_3003F64
_0800A0F8: .4byte gReceivedRemoteLinkPlayers
_0800A0FC: .4byte gUnknown_3000E54
_0800A100:
bl GetLinkPlayerCount
@ -1687,7 +1687,7 @@ _0800A1BC:
.align 2, 0
_0800A1C4: .4byte gUnknown_3000E54
_0800A1C8:
ldr r0, _0800A1E8 @ =gUnknown_202271C
ldr r0, _0800A1E8 @ =gLinkTimeOutCounter
ldrh r1, [r0]
adds r1, 0x1
strh r1, [r0]
@ -1706,7 +1706,7 @@ _0800A1E2:
pop {r1}
bx r1
.align 2, 0
_0800A1E8: .4byte gUnknown_202271C
_0800A1E8: .4byte gLinkTimeOutCounter
_0800A1EC: .4byte gUnknown_3000E54
thumb_func_end sub_800A0D0
@ -1844,7 +1844,7 @@ _0800A2C0:
str r7, [r4, 0x4]
b _0800A2EA
_0800A2D8:
ldr r5, _0800A304 @ =gUnknown_2022618
ldr r5, _0800A304 @ =gBlockSendBuffer
cmp r7, r5
beq _0800A2E8
adds r0, r5, 0
@ -1868,7 +1868,7 @@ _0800A2FE:
pop {r1}
bx r1
.align 2, 0
_0800A304: .4byte gUnknown_2022618
_0800A304: .4byte gBlockSendBuffer
_0800A308: .4byte 0x0000bbbb
_0800A30C: .4byte gUnknown_3003F80
_0800A310: .4byte LinkCB_BlockSendBegin
@ -2012,7 +2012,7 @@ _0800A400: .4byte 0x0000aaaa
thumb_func_start GetMultiplayerId
GetMultiplayerId: @ 800A404
push {lr}
ldr r0, _0800A418 @ =gUnknown_3003F3C
ldr r0, _0800A418 @ =gWirelessCommType
ldrb r0, [r0]
cmp r0, 0x1
beq _0800A420
@ -2022,7 +2022,7 @@ GetMultiplayerId: @ 800A404
lsrs r0, 30
b _0800A428
.align 2, 0
_0800A418: .4byte gUnknown_3003F3C
_0800A418: .4byte gWirelessCommType
_0800A41C: .4byte 0x04000128
_0800A420:
bl rfu_get_multiplayer_id
@ -2056,7 +2056,7 @@ SendBlock: @ 800A448
adds r3, r1, 0
lsls r2, 16
lsrs r1, r2, 16
ldr r0, _0800A460 @ =gUnknown_3003F3C
ldr r0, _0800A460 @ =gWirelessCommType
ldrb r0, [r0]
cmp r0, 0x1
beq _0800A464
@ -2064,7 +2064,7 @@ SendBlock: @ 800A448
bl InitBlockSend
b _0800A46A
.align 2, 0
_0800A460: .4byte gUnknown_3003F3C
_0800A460: .4byte gWirelessCommType
_0800A464:
adds r0, r3, 0
bl sub_80F9E60
@ -2081,7 +2081,7 @@ sub_800A474: @ 800A474
lsls r0, 24
lsrs r1, r0, 24
adds r2, r1, 0
ldr r0, _0800A490 @ =gUnknown_3003F3C
ldr r0, _0800A490 @ =gWirelessCommType
ldrb r0, [r0]
cmp r0, 0x1
bne _0800A494
@ -2091,7 +2091,7 @@ sub_800A474: @ 800A474
lsrs r0, 24
b _0800A4B0
.align 2, 0
_0800A490: .4byte gUnknown_3003F3C
_0800A490: .4byte gWirelessCommType
_0800A494:
ldr r0, _0800A4A0 @ =gUnknown_3003F80
ldr r0, [r0]
@ -2118,7 +2118,7 @@ _0800A4B8: .4byte 0x0000cccc
thumb_func_start sub_800A4BC
sub_800A4BC: @ 800A4BC
push {lr}
ldr r0, _0800A4D0 @ =gUnknown_3003F3C
ldr r0, _0800A4D0 @ =gWirelessCommType
ldrb r0, [r0]
cmp r0, 0x1
bne _0800A4D4
@ -2127,7 +2127,7 @@ sub_800A4BC: @ 800A4BC
lsrs r0, 24
b _0800A4E2
.align 2, 0
_0800A4D0: .4byte gUnknown_3003F3C
_0800A4D0: .4byte gWirelessCommType
_0800A4D4:
movs r1, 0
ldr r0, _0800A4E8 @ =gUnknown_3003F80
@ -2147,7 +2147,7 @@ _0800A4E8: .4byte gUnknown_3003F80
thumb_func_start GetBlockReceivedStatus
GetBlockReceivedStatus: @ 800A4EC
push {lr}
ldr r0, _0800A510 @ =gUnknown_3003F3C
ldr r0, _0800A510 @ =gWirelessCommType
ldrb r0, [r0]
cmp r0, 0x1
beq _0800A518
@ -2164,7 +2164,7 @@ GetBlockReceivedStatus: @ 800A4EC
orrs r0, r1
b _0800A51C
.align 2, 0
_0800A510: .4byte gUnknown_3003F3C
_0800A510: .4byte gWirelessCommType
_0800A514: .4byte gUnknown_3003EBC
_0800A518:
bl sub_80F9CC8
@ -2180,7 +2180,7 @@ sub_800A524: @ 800A524
push {lr}
lsls r0, 24
lsrs r1, r0, 24
ldr r0, _0800A53C @ =gUnknown_3003F3C
ldr r0, _0800A53C @ =gWirelessCommType
ldrb r0, [r0]
cmp r0, 0x1
bne _0800A540
@ -2188,7 +2188,7 @@ sub_800A524: @ 800A524
bl sub_80F9720
b _0800A548
.align 2, 0
_0800A53C: .4byte gUnknown_3003F3C
_0800A53C: .4byte gWirelessCommType
_0800A540:
ldr r0, _0800A54C @ =gUnknown_3003EBC
adds r0, r1, r0
@ -2204,7 +2204,7 @@ _0800A54C: .4byte gUnknown_3003EBC
thumb_func_start ResetBlockReceivedFlags
ResetBlockReceivedFlags: @ 800A550
push {r4,lr}
ldr r0, _0800A56C @ =gUnknown_3003F3C
ldr r0, _0800A56C @ =gWirelessCommType
ldrb r0, [r0]
cmp r0, 0x1
bne _0800A570
@ -2218,7 +2218,7 @@ _0800A55C:
ble _0800A55C
b _0800A57E
.align 2, 0
_0800A56C: .4byte gUnknown_3003F3C
_0800A56C: .4byte gWirelessCommType
_0800A570:
ldr r1, _0800A584 @ =gUnknown_3003EBC
movs r2, 0
@ -2241,7 +2241,7 @@ ResetBlockReceivedFlag: @ 800A588
push {lr}
lsls r0, 24
lsrs r1, r0, 24
ldr r0, _0800A5A0 @ =gUnknown_3003F3C
ldr r0, _0800A5A0 @ =gWirelessCommType
ldrb r0, [r0]
cmp r0, 0x1
bne _0800A5A4
@ -2249,7 +2249,7 @@ ResetBlockReceivedFlag: @ 800A588
bl sub_80F974C
b _0800A5B2
.align 2, 0
_0800A5A0: .4byte gUnknown_3003F3C
_0800A5A0: .4byte gWirelessCommType
_0800A5A4:
ldr r0, _0800A5B8 @ =gUnknown_3003EBC
adds r1, r0
@ -2707,7 +2707,7 @@ sub_800A900: @ 800A900
ldr r1, _0800A938 @ =gUnknown_3003F60
strb r0, [r1]
ldr r4, _0800A93C @ =gLinkPlayers
ldr r3, _0800A940 @ =gUnknown_20227C8
ldr r3, _0800A940 @ =gSavedLinkPlayers
movs r2, 0x4
_0800A914:
adds r0, r3, 0
@ -2730,7 +2730,7 @@ _0800A914:
_0800A934: .4byte gUnknown_3003F40
_0800A938: .4byte gUnknown_3003F60
_0800A93C: .4byte gLinkPlayers
_0800A940: .4byte gUnknown_20227C8
_0800A940: .4byte gSavedLinkPlayers
thumb_func_end sub_800A900
thumb_func_start sub_800A944
@ -2761,7 +2761,7 @@ sub_800A95C: @ 800A95C
cmp r5, r2
bge _0800A986
ldr r1, _0800A994 @ =gLinkPlayers
ldr r0, _0800A998 @ =gUnknown_20227C8
ldr r0, _0800A998 @ =gSavedLinkPlayers
adds r4, r0, 0x4
adds r3, r1, 0x4
_0800A972:
@ -2785,7 +2785,7 @@ _0800A986:
.align 2, 0
_0800A990: .4byte gUnknown_3003F40
_0800A994: .4byte gLinkPlayers
_0800A998: .4byte gUnknown_20227C8
_0800A998: .4byte gSavedLinkPlayers
_0800A99C:
movs r0, 0x1
_0800A99E:
@ -2804,7 +2804,7 @@ sub_800A9A4: @ 800A9A4
ldrb r0, [r0]
cmp r4, r0
bcs _0800AA04
ldr r6, _0800AA14 @ =gUnknown_20227C8
ldr r6, _0800AA14 @ =gSavedLinkPlayers
ldr r5, _0800AA18 @ =gLinkPlayers
movs r0, 0x8
adds r0, r6
@ -2852,7 +2852,7 @@ _0800AA04:
bx r0
.align 2, 0
_0800AA10: .4byte gUnknown_3003F40
_0800AA14: .4byte gUnknown_20227C8
_0800AA14: .4byte gSavedLinkPlayers
_0800AA18: .4byte gLinkPlayers
_0800AA1C: .4byte gUnknown_3003EAC
_0800AA20: .4byte c2_800ACD4
@ -2886,7 +2886,7 @@ _0800AA44: .4byte gUnknown_3003F20
thumb_func_start sub_800AA48
sub_800AA48: @ 800AA48
push {lr}
ldr r0, _0800AA60 @ =gUnknown_3003F3C
ldr r0, _0800AA60 @ =gWirelessCommType
ldrb r0, [r0]
cmp r0, 0
bne _0800AA68
@ -2897,7 +2897,7 @@ sub_800AA48: @ 800AA48
ands r0, r1
b _0800AA70
.align 2, 0
_0800AA60: .4byte gUnknown_3003F3C
_0800AA60: .4byte gWirelessCommType
_0800AA64: .4byte gUnknown_3003F20
_0800AA68:
bl sub_80FBA2C
@ -2922,14 +2922,14 @@ sub_800AA80: @ 800AA80
push {lr}
lsls r0, 16
lsrs r3, r0, 16
ldr r0, _0800AA94 @ =gUnknown_3003F3C
ldr r0, _0800AA94 @ =gWirelessCommType
ldrb r0, [r0]
cmp r0, 0x1
bne _0800AA98
bl task_add_05_task_del_08FA224_when_no_RfuFunc
b _0800AAAC
.align 2, 0
_0800AA94: .4byte gUnknown_3003F3C
_0800AA94: .4byte gWirelessCommType
_0800AA98:
ldr r2, _0800AAB0 @ =gUnknown_3003F80
ldr r1, [r2]
@ -2954,14 +2954,14 @@ _0800AABC: .4byte gUnknown_3003F34
thumb_func_start sub_800AAC0
sub_800AAC0: @ 800AAC0
push {lr}
ldr r0, _0800AAD0 @ =gUnknown_3003F3C
ldr r0, _0800AAD0 @ =gWirelessCommType
ldrb r0, [r0]
cmp r0, 0x1
bne _0800AAD4
bl task_add_05_task_del_08FA224_when_no_RfuFunc
b _0800AAFC
.align 2, 0
_0800AAD0: .4byte gUnknown_3003F3C
_0800AAD0: .4byte gWirelessCommType
_0800AAD4:
ldr r2, _0800AAE8 @ =gUnknown_3003F80
ldr r1, [r2]
@ -3067,14 +3067,14 @@ _0800AB98: .4byte gUnknown_3003F24
thumb_func_start sub_800AB9C
sub_800AB9C: @ 800AB9C
push {lr}
ldr r0, _0800ABAC @ =gUnknown_3003F3C
ldr r0, _0800ABAC @ =gWirelessCommType
ldrb r0, [r0]
cmp r0, 0x1
bne _0800ABB0
bl sub_80FA42C
b _0800ABC2
.align 2, 0
_0800ABAC: .4byte gUnknown_3003F3C
_0800ABAC: .4byte gWirelessCommType
_0800ABB0:
ldr r1, _0800ABC8 @ =gUnknown_3003F80
ldr r0, [r1]
@ -3169,7 +3169,7 @@ _0800AC54: .4byte gUnknown_3003F80
thumb_func_start sub_800AC58
sub_800AC58: @ 800AC58
push {lr}
ldr r0, _0800AC9C @ =gUnknown_2022718
ldr r0, _0800AC9C @ =gLinkOpen
ldrb r0, [r0]
cmp r0, 0
beq _0800AC98
@ -3184,7 +3184,7 @@ sub_800AC58: @ 800AC58
ldrb r0, [r0]
cmp r0, 0
bne _0800AC8E
ldr r1, _0800ACA8 @ =gUnknown_2022854
ldr r1, _0800ACA8 @ =sLinkErrorBuffer
str r2, [r1]
ldr r0, _0800ACAC @ =gUnknown_3004F70
ldrb r0, [r0]
@ -3203,10 +3203,10 @@ _0800AC98:
pop {r0}
bx r0
.align 2, 0
_0800AC9C: .4byte gUnknown_2022718
_0800AC9C: .4byte gLinkOpen
_0800ACA0: .4byte gUnknown_3003F20
_0800ACA4: .4byte gUnknown_3003F38
_0800ACA8: .4byte gUnknown_2022854
_0800ACA8: .4byte sLinkErrorBuffer
_0800ACAC: .4byte gUnknown_3004F70
_0800ACB0: .4byte gUnknown_3003FA0
_0800ACB4: .4byte c2_800ACD4
@ -3216,7 +3216,7 @@ _0800ACB8: .4byte gUnknown_3003EAC
thumb_func_start sub_800ACBC
sub_800ACBC: @ 800ACBC
push {r4,lr}
ldr r4, _0800ACD0 @ =gUnknown_2022854
ldr r4, _0800ACD0 @ =sLinkErrorBuffer
str r0, [r4]
strb r1, [r4, 0x5]
strb r2, [r4, 0x4]
@ -3225,7 +3225,7 @@ sub_800ACBC: @ 800ACBC
pop {r0}
bx r0
.align 2, 0
_0800ACD0: .4byte gUnknown_2022854
_0800ACD0: .4byte sLinkErrorBuffer
thumb_func_end sub_800ACBC
thumb_func_start c2_800ACD4
@ -3253,11 +3253,11 @@ c2_800ACD4: @ 800ACD4
bl FillPalette
bl ResetTasks
bl remove_some_task
ldr r1, _0800ADF0 @ =gUnknown_3003F3C
ldr r1, _0800ADF0 @ =gWirelessCommType
ldrb r0, [r1]
cmp r0, 0
beq _0800AD30
ldr r0, _0800ADF4 @ =gUnknown_2022854
ldr r0, _0800ADF4 @ =sLinkErrorBuffer
ldrb r0, [r0, 0x6]
cmp r0, 0
bne _0800AD2C
@ -3337,8 +3337,8 @@ _0800ADE0: .4byte gMPlayInfo_SE1
_0800ADE4: .4byte gMPlayInfo_SE2
_0800ADE8: .4byte gMPlayInfo_SE3
_0800ADEC: .4byte gHeap
_0800ADF0: .4byte gUnknown_3003F3C
_0800ADF4: .4byte gUnknown_2022854
_0800ADF0: .4byte gWirelessCommType
_0800ADF4: .4byte sLinkErrorBuffer
_0800ADF8: .4byte sub_800978C
_0800ADFC: .4byte gUnknown_82345E8
_0800AE00: .4byte gUnknown_2022860
@ -3354,14 +3354,14 @@ _0800AE18: .4byte sub_800AF2C
sub_800AE1C: @ 800AE1C
push {r4,r5,lr}
sub sp, 0xC
ldr r1, _0800AEB8 @ =gUnknown_8231EE4
ldr r1, _0800AEB8 @ =gWirelessLinkDisplay4bpp
movs r5, 0
str r5, [sp]
movs r0, 0x1
movs r2, 0
movs r3, 0
bl sub_80F696C
ldr r1, _0800AEBC @ =gUnknown_823238C
ldr r1, _0800AEBC @ =gWirelessLinkDisplayBin
movs r0, 0x1
movs r2, 0
movs r3, 0
@ -3416,8 +3416,8 @@ sub_800AE1C: @ 800AE1C
pop {r0}
bx r0
.align 2, 0
_0800AEB8: .4byte gUnknown_8231EE4
_0800AEBC: .4byte gUnknown_823238C
_0800AEB8: .4byte gWirelessLinkDisplay4bpp
_0800AEBC: .4byte gWirelessLinkDisplayBin
_0800AEC0: .4byte gUnknown_8231EC4
_0800AEC4: .4byte gUnknown_8234610
_0800AEC8: .4byte gUnknown_841DEF0
@ -3492,14 +3492,14 @@ _0800AF50:
beq _0800AF7A
b _0800AFC4
_0800AF5A:
ldr r0, _0800AF68 @ =gUnknown_2022854
ldr r0, _0800AF68 @ =sLinkErrorBuffer
ldrb r0, [r0, 0x6]
cmp r0, 0
beq _0800AF6C
bl sub_800AE1C
b _0800AFC4
.align 2, 0
_0800AF68: .4byte gUnknown_2022854
_0800AF68: .4byte sLinkErrorBuffer
_0800AF6C:
bl sub_800AED0
b _0800AFC4
@ -3508,7 +3508,7 @@ _0800AF72:
bl PlaySE
b _0800AFC4
_0800AF7A:
ldr r0, _0800AF9C @ =gUnknown_3003F3C
ldr r0, _0800AF9C @ =gWirelessCommType
ldrb r0, [r0]
cmp r0, 0x2
bne _0800AFA8
@ -3525,7 +3525,7 @@ _0800AF7A:
bl box_print
b _0800AFC4
.align 2, 0
_0800AF9C: .4byte gUnknown_3003F3C
_0800AF9C: .4byte gWirelessCommType
_0800AFA0: .4byte gUnknown_8234610
_0800AFA4: .4byte gUnknown_841DF6B
_0800AFA8:
@ -3550,7 +3550,7 @@ _0800AFC4:
ldrb r1, [r1]
cmp r1, 0xA0
bne _0800B03C
ldr r4, _0800B008 @ =gUnknown_3003F3C
ldr r4, _0800B008 @ =gWirelessCommType
ldrb r2, [r4]
cmp r2, 0x1
bne _0800B010
@ -3563,7 +3563,7 @@ _0800AFC4:
bl PlaySE
movs r0, 0
strb r0, [r4]
ldr r1, _0800B00C @ =gUnknown_2022854
ldr r1, _0800B00C @ =sLinkErrorBuffer
movs r0, 0
strb r0, [r1, 0x6]
bl sub_8079B7C
@ -3572,8 +3572,8 @@ _0800AFC4:
_0800AFFC: .4byte gUnknown_8234610
_0800B000: .4byte gUnknown_841DF4C
_0800B004: .4byte gMain
_0800B008: .4byte gUnknown_3003F3C
_0800B00C: .4byte gUnknown_2022854
_0800B008: .4byte gWirelessCommType
_0800B00C: .4byte sLinkErrorBuffer
_0800B010:
cmp r2, 0x2
bne _0800B02E
@ -3683,7 +3683,7 @@ sub_800B0B4: @ 800B0B4
ldr r1, _0800B100 @ =gUnknown_3003E70
adds r2, r1, 0
adds r2, 0x10
ldr r0, _0800B104 @ =gUnknown_2022720
ldr r0, _0800B104 @ =gLocalLinkPlayer
ldm r0!, {r3-r5}
stm r2!, {r3-r5}
ldm r0!, {r3,r4,r6}
@ -3707,7 +3707,7 @@ sub_800B0B4: @ 800B0B4
strh r2, [r0]
ldrb r2, [r3, 0x2]
strb r2, [r0, 0x2]
ldr r0, _0800B10C @ =gUnknown_2022618
ldr r0, _0800B10C @ =gBlockSendBuffer
movs r2, 0x3C
bl memcpy
pop {r4-r6}
@ -3715,9 +3715,9 @@ sub_800B0B4: @ 800B0B4
bx r0
.align 2, 0
_0800B100: .4byte gUnknown_3003E70
_0800B104: .4byte gUnknown_2022720
_0800B104: .4byte gLocalLinkPlayer
_0800B108: .4byte gUnknown_82345C0
_0800B10C: .4byte gUnknown_2022618
_0800B10C: .4byte gBlockSendBuffer
thumb_func_end sub_800B0B4
thumb_func_start sub_800B110
@ -3726,7 +3726,7 @@ sub_800B110: @ 800B110
lsls r0, 24
lsrs r0, 24
lsls r2, r0, 8
ldr r1, _0800B168 @ =gUnknown_2022118
ldr r1, _0800B168 @ =gBlockRecvBuffer
adds r4, r2, r1
lsls r2, r0, 3
subs r2, r0
@ -3764,7 +3764,7 @@ _0800B160:
pop {r0}
bx r0
.align 2, 0
_0800B168: .4byte gUnknown_2022118
_0800B168: .4byte gBlockRecvBuffer
_0800B16C: .4byte gLinkPlayers
_0800B170: .4byte gUnknown_82345C0
_0800B174: .4byte c2_800ACD4
@ -3773,7 +3773,7 @@ _0800B174: .4byte c2_800ACD4
thumb_func_start HandleLinkConnection
HandleLinkConnection: @ 800B178
push {r4,r5,lr}
ldr r0, _0800B1B0 @ =gUnknown_3003F3C
ldr r0, _0800B1B0 @ =gWirelessCommType
ldrb r0, [r0]
cmp r0, 0
bne _0800B1C8
@ -3798,7 +3798,7 @@ _0800B1AA:
movs r0, 0x1
b _0800B1EE
.align 2, 0
_0800B1B0: .4byte gUnknown_3003F3C
_0800B1B0: .4byte gWirelessCommType
_0800B1B4: .4byte gUnknown_3003F84
_0800B1B8: .4byte gUnknown_3003F50
_0800B1BC: .4byte gUnknown_3003ED0
@ -3830,59 +3830,59 @@ _0800B1EE:
thumb_func_start sub_800B1F4
sub_800B1F4: @ 800B1F4
push {lr}
ldr r0, _0800B208 @ =gUnknown_3003F64
ldr r0, _0800B208 @ =gReceivedRemoteLinkPlayers
ldrb r0, [r0]
cmp r0, 0
bne _0800B204
ldr r1, _0800B20C @ =gUnknown_3003F3C
ldr r1, _0800B20C @ =gWirelessCommType
movs r0, 0x1
strb r0, [r1]
_0800B204:
pop {r0}
bx r0
.align 2, 0
_0800B208: .4byte gUnknown_3003F64
_0800B20C: .4byte gUnknown_3003F3C
_0800B208: .4byte gReceivedRemoteLinkPlayers
_0800B20C: .4byte gWirelessCommType
thumb_func_end sub_800B1F4
thumb_func_start sub_800B210
sub_800B210: @ 800B210
push {lr}
ldr r0, _0800B224 @ =gUnknown_3003F64
ldr r0, _0800B224 @ =gReceivedRemoteLinkPlayers
ldrb r1, [r0]
cmp r1, 0
bne _0800B21E
ldr r0, _0800B228 @ =gUnknown_3003F3C
ldr r0, _0800B228 @ =gWirelessCommType
strb r1, [r0]
_0800B21E:
pop {r0}
bx r0
.align 2, 0
_0800B224: .4byte gUnknown_3003F64
_0800B228: .4byte gUnknown_3003F3C
_0800B224: .4byte gReceivedRemoteLinkPlayers
_0800B228: .4byte gWirelessCommType
thumb_func_end sub_800B210
thumb_func_start sub_800B22C
sub_800B22C: @ 800B22C
push {lr}
ldr r0, _0800B240 @ =gUnknown_3003F64
ldr r0, _0800B240 @ =gReceivedRemoteLinkPlayers
ldrb r1, [r0]
cmp r1, 0
bne _0800B23A
ldr r0, _0800B244 @ =gUnknown_3003F3C
ldr r0, _0800B244 @ =gWirelessCommType
strb r1, [r0]
_0800B23A:
pop {r0}
bx r0
.align 2, 0
_0800B240: .4byte gUnknown_3003F64
_0800B244: .4byte gUnknown_3003F3C
_0800B240: .4byte gReceivedRemoteLinkPlayers
_0800B244: .4byte gWirelessCommType
thumb_func_end sub_800B22C
thumb_func_start sub_800B248
sub_800B248: @ 800B248
push {lr}
ldr r0, _0800B25C @ =gUnknown_3003F3C
ldr r0, _0800B25C @ =gWirelessCommType
ldrb r0, [r0]
cmp r0, 0
bne _0800B268
@ -3892,7 +3892,7 @@ sub_800B248: @ 800B248
ldrb r0, [r0]
b _0800B26C
.align 2, 0
_0800B25C: .4byte gUnknown_3003F3C
_0800B25C: .4byte gWirelessCommType
_0800B260: .4byte gUnknown_3003FB0
_0800B264: .4byte 0x00000fbd
_0800B268:

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
@ -3504,7 +3504,7 @@ sub_80FEE24: @ 80FEE24
thumb_func_start sub_80FEE44
sub_80FEE44: @ 80FEE44
push {lr}
ldr r0, _080FEE58 @ =gUnknown_20370C0
ldr r0, _080FEE58 @ =gSpecialVar_0x8004
ldrh r0, [r0]
cmp r0, 0xE
bhi _080FEF12
@ -3514,7 +3514,7 @@ sub_80FEE44: @ 80FEE44
ldr r0, [r0]
mov pc, r0
.align 2, 0
_080FEE58: .4byte gUnknown_20370C0
_080FEE58: .4byte gSpecialVar_0x8004
_080FEE5C: .4byte _080FEE60
.align 2, 0
_080FEE60:
@ -3585,7 +3585,7 @@ _080FEEF4:
ldr r1, [r2]
adds r1, r0
_080FEF08:
ldr r0, _080FEF24 @ =gUnknown_20370C0
ldr r0, _080FEF24 @ =gSpecialVar_0x8004
ldrb r0, [r0]
ldr r2, _080FEF28 @ =sub_80568C4
bl sub_80FEBAC
@ -3596,14 +3596,14 @@ _080FEF12:
_080FEF18: .4byte gSaveBlock1Ptr
_080FEF1C: .4byte gSpecialVar_0x8005
_080FEF20: .4byte 0x00002cd0
_080FEF24: .4byte gUnknown_20370C0
_080FEF24: .4byte gSpecialVar_0x8004
_080FEF28: .4byte sub_80568C4
thumb_func_end sub_80FEE44
thumb_func_start sub_80FEF2C
sub_80FEF2C: @ 80FEF2C
push {r4,lr}
ldr r4, _080FEF44 @ =gUnknown_20370C0
ldr r4, _080FEF44 @ =gSpecialVar_0x8004
ldr r0, _080FEF48 @ =gUnknown_843F29C
movs r1, 0x4
bl sub_80FFEDC
@ -3614,14 +3614,14 @@ sub_80FEF2C: @ 80FEF2C
pop {r0}
bx r0
.align 2, 0
_080FEF44: .4byte gUnknown_20370C0
_080FEF44: .4byte gSpecialVar_0x8004
_080FEF48: .4byte gUnknown_843F29C
thumb_func_end sub_80FEF2C
thumb_func_start sub_80FEF4C
sub_80FEF4C: @ 80FEF4C
push {r4,lr}
ldr r4, _080FEF64 @ =gUnknown_20370C0
ldr r4, _080FEF64 @ =gSpecialVar_0x8004
ldr r0, _080FEF68 @ =gUnknown_843F2A4
movs r1, 0x4
bl sub_80FFEDC
@ -3632,7 +3632,7 @@ sub_80FEF4C: @ 80FEF4C
pop {r0}
bx r0
.align 2, 0
_080FEF64: .4byte gUnknown_20370C0
_080FEF64: .4byte gSpecialVar_0x8004
_080FEF68: .4byte gUnknown_843F2A4
thumb_func_end sub_80FEF4C
@ -4384,12 +4384,12 @@ _080FF4C8:
.align 2, 0
_080FF4D8: .4byte gUnknown_203ACE8
_080FF4DC:
ldr r0, _080FF4E4 @ =gUnknown_20370D0
ldr r0, _080FF4E4 @ =gSpecialVar_Result
strh r1, [r0]
movs r0, 0x17
b _080FF4EA
.align 2, 0
_080FF4E4: .4byte gUnknown_20370D0
_080FF4E4: .4byte gSpecialVar_Result
_080FF4E8:
movs r0, 0
_080FF4EA:
@ -4425,7 +4425,7 @@ _080FF510:
.align 2, 0
_080FF520: .4byte gUnknown_203ACE8
_080FF524:
ldr r4, _080FF538 @ =gUnknown_20370D0
ldr r4, _080FF538 @ =gSpecialVar_Result
bl sub_80FF78C
lsls r0, 24
lsrs r0, 24
@ -4434,7 +4434,7 @@ _080FF524:
movs r0, 0x17
b _080FF53E
.align 2, 0
_080FF538: .4byte gUnknown_20370D0
_080FF538: .4byte gSpecialVar_Result
_080FF53C:
movs r0, 0
_080FF53E:

View File

@ -142,7 +142,7 @@ sub_80F86F4: @ 80F86F4
lsrs r1, r0, 16
cmp r1, 0
bne _080F8722
ldr r0, _080F8734 @ =gUnknown_202271A
ldr r0, _080F8734 @ =gLinkType
strh r1, [r0]
movs r0, 0
bl sub_80FB128
@ -158,7 +158,7 @@ _080F8722:
_080F8728: .4byte gUnknown_3001190
_080F872C: .4byte 0x00000e64
_080F8730: .4byte gIntrTable + 0x4
_080F8734: .4byte gUnknown_202271A
_080F8734: .4byte gLinkType
thumb_func_end sub_80F86F4
thumb_func_start sub_80F8738
@ -1470,12 +1470,12 @@ _080F91B0:
cmp r4, 0
bne _080F91CC
bl sub_80F8DC0
ldr r0, _080F91C8 @ =gUnknown_3003F64
ldr r0, _080F91C8 @ =gReceivedRemoteLinkPlayers
strb r4, [r0]
b _080F91F6
.align 2, 0
_080F91C4: .4byte gUnknown_3005E10
_080F91C8: .4byte gUnknown_3003F64
_080F91C8: .4byte gReceivedRemoteLinkPlayers
_080F91CC:
bl sub_80F8FD4
ldr r0, _080F91E4 @ =gUnknown_3005450
@ -1972,7 +1972,7 @@ _080F9538:
bl sub_80FB9E4
_080F95B0:
bl rfu_clearAllSlot
ldr r1, _080F9650 @ =gUnknown_3003F64
ldr r1, _080F9650 @ =gReceivedRemoteLinkPlayers
movs r0, 0
strb r0, [r1]
ldr r0, _080F9644 @ =gUnknown_3005450
@ -2043,7 +2043,7 @@ _080F9640: .4byte gUnknown_3005E10
_080F9644: .4byte gUnknown_3005450
_080F9648: .4byte 0x0000099c
_080F964C: .4byte gUnknown_3007460
_080F9650: .4byte gUnknown_3003F64
_080F9650: .4byte gReceivedRemoteLinkPlayers
_080F9654: .4byte 0x00000988
_080F9658: .4byte gUnknown_3003F50
thumb_func_end sub_80F9514
@ -2240,7 +2240,7 @@ _080F97B4: .4byte 0x000008f6
thumb_func_start rfu_func_080F97B8
rfu_func_080F97B8: @ 80F97B8
push {lr}
ldr r0, _080F97F0 @ =gUnknown_3003F64
ldr r0, _080F97F0 @ =gReceivedRemoteLinkPlayers
ldrb r0, [r0]
cmp r0, 0
beq _080F97EA
@ -2267,7 +2267,7 @@ _080F97EA:
pop {r0}
bx r0
.align 2, 0
_080F97F0: .4byte gUnknown_3003F64
_080F97F0: .4byte gReceivedRemoteLinkPlayers
_080F97F4: .4byte gUnknown_3005028
_080F97F8: .4byte gLinkTransferringData
_080F97FC: .4byte gUnknown_3001188
@ -2429,7 +2429,7 @@ _080F9902:
ldrb r0, [r4, 0xC]
cmp r0, 0
bne _080F9914
ldr r0, _080F9940 @ =gUnknown_3003F64
ldr r0, _080F9940 @ =gReceivedRemoteLinkPlayers
ldrb r0, [r0]
cmp r0, 0
beq _080F9914
@ -2457,7 +2457,7 @@ _080F9924:
b _080F9BF8
.align 2, 0
_080F993C: .4byte gUnknown_3005450
_080F9940: .4byte gUnknown_3003F64
_080F9940: .4byte gReceivedRemoteLinkPlayers
_080F9944: .4byte gUnknown_3007460
_080F9948: .4byte gUnknown_3003ED2
_080F994C: .4byte gUnknown_3003ED4
@ -2543,7 +2543,7 @@ _080F99DA:
orrs r0, r3
str r0, [r1]
movs r4, 0
ldr r0, _080F9A8C @ =gUnknown_2022118
ldr r0, _080F9A8C @ =gBlockRecvBuffer
mov r9, r0
mov r12, r2
mov r1, r8
@ -2606,7 +2606,7 @@ _080F9A4C:
beq _080F9A6E
b _080F9BF8
_080F9A6E:
ldr r0, _080F9A98 @ =gUnknown_3003F64
ldr r0, _080F9A98 @ =gReceivedRemoteLinkPlayers
ldrb r0, [r0]
cmp r0, 0
bne _080F9A78
@ -2617,15 +2617,15 @@ _080F9A78:
beq _080F9A80
b _080F9BF8
_080F9A80:
ldr r0, _080F9A8C @ =gUnknown_2022118
ldr r0, _080F9A8C @ =gBlockRecvBuffer
bl sub_80FAA58
b _080F9BF8
.align 2, 0
_080F9A88: .4byte gUnknown_3005450
_080F9A8C: .4byte gUnknown_2022118
_080F9A8C: .4byte gBlockRecvBuffer
_080F9A90: .4byte gUnknown_3003ED0
_080F9A94: .4byte gUnknown_843EBD4
_080F9A98: .4byte gUnknown_3003F64
_080F9A98: .4byte gReceivedRemoteLinkPlayers
_080F9A9C:
ldr r2, _080F9AB8 @ =gUnknown_843EC64
ldr r3, _080F9ABC @ =gUnknown_3003ED2
@ -2679,7 +2679,7 @@ _080F9B00:
ldrb r2, [r7, 0xC]
cmp r2, 0
bne _080F9B68
ldr r3, _080F9B50 @ =gUnknown_3003F64
ldr r3, _080F9B50 @ =gReceivedRemoteLinkPlayers
ldrb r0, [r3]
mov r6, r8
adds r6, 0x1
@ -2713,7 +2713,7 @@ _080F9B38:
b _080F9BF8
.align 2, 0
_080F9B4C: .4byte gUnknown_3005450
_080F9B50: .4byte gUnknown_3003F64
_080F9B50: .4byte gReceivedRemoteLinkPlayers
_080F9B54: .4byte gUnknown_3003ED2
_080F9B58: .4byte gUnknown_3007460
_080F9B5C: .4byte gUnknown_3003ED4
@ -3204,7 +3204,7 @@ _080F9EC0:
str r7, [r5, 0x70]
b _080F9F14
_080F9F02:
ldr r4, _080F9F38 @ =gUnknown_2022618
ldr r4, _080F9F38 @ =gBlockSendBuffer
cmp r7, r4
beq _080F9F12
adds r0, r4, 0
@ -3232,7 +3232,7 @@ _080F9F2A:
pop {r1}
bx r1
.align 2, 0
_080F9F38: .4byte gUnknown_2022618
_080F9F38: .4byte gBlockSendBuffer
_080F9F3C: .4byte gUnknown_3005450
_080F9F40: .4byte rfufunc_80F9F44
thumb_func_end sub_80F9E60
@ -3482,7 +3482,7 @@ sub_80FA114: @ 80FA114
push {lr}
bl rfu_clearAllSlot
bl sub_80FD52C
ldr r1, _080FA138 @ =gUnknown_3003F64
ldr r1, _080FA138 @ =gReceivedRemoteLinkPlayers
movs r0, 0
strb r0, [r1]
ldr r2, _080FA13C @ =gUnknown_3005450
@ -3495,7 +3495,7 @@ sub_80FA114: @ 80FA114
pop {r0}
bx r0
.align 2, 0
_080FA138: .4byte gUnknown_3003F64
_080FA138: .4byte gReceivedRemoteLinkPlayers
_080FA13C: .4byte gUnknown_3005450
thumb_func_end sub_80FA114
@ -4515,7 +4515,7 @@ _080FA8B4:
ldrb r0, [r5, 0xC]
cmp r0, 0x1
bne _080FA8F4
ldr r0, _080FA8CC @ =gUnknown_3003F64
ldr r0, _080FA8CC @ =gReceivedRemoteLinkPlayers
ldrb r0, [r0]
cmp r0, 0
beq _080FA8D0
@ -4524,7 +4524,7 @@ _080FA8B4:
bl sub_80F9D04
b _080FA8D8
.align 2, 0
_080FA8CC: .4byte gUnknown_3003F64
_080FA8CC: .4byte gReceivedRemoteLinkPlayers
_080FA8D0:
movs r0, 0xEE
lsls r0, 7
@ -4609,7 +4609,7 @@ _080FA968: .4byte gTasks
_080FA96C:
adds r0, r6, 0
bl DestroyTask
ldr r1, _080FA9C4 @ =gUnknown_3003F64
ldr r1, _080FA9C4 @ =gReceivedRemoteLinkPlayers
movs r0, 0x1
strb r0, [r1]
movs r0, 0x9A
@ -4652,7 +4652,7 @@ _080FA9BC:
pop {r0}
bx r0
.align 2, 0
_080FA9C4: .4byte gUnknown_3003F64
_080FA9C4: .4byte gReceivedRemoteLinkPlayers
_080FA9C8: .4byte 0x0000099e
_080FA9CC: .4byte 0x0000099d
thumb_func_end sub_80FA834
@ -4872,7 +4872,7 @@ _080FAB70:
adds r0, r4, 0
bl ResetBlockReceivedFlag
lsls r2, r4, 8
ldr r0, _080FAB9C @ =gUnknown_2022118
ldr r0, _080FAB9C @ =gBlockRecvBuffer
adds r2, r0
ldr r1, _080FABA0 @ =gLinkPlayers
lsls r0, r4, 3
@ -4890,10 +4890,10 @@ _080FAB70:
bl sub_800B284
b _080FAC2E
.align 2, 0
_080FAB9C: .4byte gUnknown_2022118
_080FAB9C: .4byte gBlockRecvBuffer
_080FABA0: .4byte gLinkPlayers
_080FABA4:
ldr r5, _080FAC40 @ =gUnknown_2022618
ldr r5, _080FAC40 @ =gBlockSendBuffer
adds r1, r5, 0
ldr r0, _080FAC44 @ =gUnknown_843EDE4 "PokemonSioInfo"
ldm r0!, {r2-r4}
@ -4931,7 +4931,7 @@ _080FABC6:
adds r0, 0x1
strh r0, [r1, 0x8]
_080FABEE:
ldr r5, _080FAC40 @ =gUnknown_2022618
ldr r5, _080FAC40 @ =gBlockSendBuffer
ldr r1, _080FAC48 @ =gUnknown_3005450
ldrb r0, [r1, 0xD]
strb r0, [r5, 0xF]
@ -4955,7 +4955,7 @@ _080FAC04:
mov r1, r12
movs r2, 0x8C
bl memcpy
ldr r1, _080FAC40 @ =gUnknown_2022618
ldr r1, _080FAC40 @ =gBlockSendBuffer
movs r0, 0
movs r2, 0xA0
bl SendBlock
@ -4973,7 +4973,7 @@ _080FAC36:
strh r0, [r1, 0x8]
b _080FACD6
.align 2, 0
_080FAC40: .4byte gUnknown_2022618
_080FAC40: .4byte gBlockSendBuffer
_080FAC44: .4byte gUnknown_843EDE4
_080FAC48: .4byte gUnknown_3005450
_080FAC4C: .4byte 0x00000996
@ -5008,7 +5008,7 @@ _080FAC78:
mov r0, sp
movs r4, 0
strh r4, [r0]
ldr r1, _080FACE0 @ =gUnknown_2022118
ldr r1, _080FACE0 @ =gBlockRecvBuffer
ldr r2, _080FACE4 @ =0x0100007e
bl CpuSet
movs r0, 0
@ -5046,7 +5046,7 @@ _080FACD6:
pop {r0}
bx r0
.align 2, 0
_080FACE0: .4byte gUnknown_2022118
_080FACE0: .4byte gBlockRecvBuffer
_080FACE4: .4byte 0x0100007e
_080FACE8: .4byte gUnknown_3005450
_080FACEC: .4byte 0x0000099e
@ -5095,13 +5095,13 @@ _080FAD3A:
cmp r0, 0
beq _080FAD8A
bl sub_800B0B4
ldr r1, _080FAD50 @ =gUnknown_2022618
ldr r1, _080FAD50 @ =gBlockSendBuffer
movs r0, 0
movs r2, 0x3C
bl SendBlock
b _080FAD5E
.align 2, 0
_080FAD50: .4byte gUnknown_2022618
_080FAD50: .4byte gBlockSendBuffer
_080FAD54:
bl sub_800A4BC
lsls r0, 24
@ -5119,11 +5119,11 @@ _080FAD66:
ands r1, r0
cmp r1, 0
beq _080FAD8A
ldr r0, _080FAD90 @ =gUnknown_2022118
ldr r0, _080FAD90 @ =gBlockRecvBuffer
bl sub_80FA9FC
movs r0, 0
bl ResetBlockReceivedFlag
ldr r0, _080FAD94 @ =gUnknown_3003F64
ldr r0, _080FAD94 @ =gReceivedRemoteLinkPlayers
strb r4, [r0]
adds r0, r5, 0
bl DestroyTask
@ -5132,8 +5132,8 @@ _080FAD8A:
pop {r0}
bx r0
.align 2, 0
_080FAD90: .4byte gUnknown_2022118
_080FAD94: .4byte gUnknown_3003F64
_080FAD90: .4byte gBlockRecvBuffer
_080FAD94: .4byte gReceivedRemoteLinkPlayers
thumb_func_end sub_80FACF0
thumb_func_start sub_80FAD98
@ -5155,7 +5155,7 @@ sub_80FAD98: @ 80FAD98
ldr r0, _080FAE1C @ =sub_814208C
cmp r1, r0
bne _080FADC0
ldr r1, _080FAE20 @ =gUnknown_3003F3C
ldr r1, _080FAE20 @ =gWirelessCommType
movs r0, 0x2
strb r0, [r1]
_080FADC0:
@ -5200,7 +5200,7 @@ _080FAE10: .4byte gUnknown_3005450
_080FAE14: .4byte gUnknown_3005E10
_080FAE18: .4byte gMain
_080FAE1C: .4byte sub_814208C
_080FAE20: .4byte gUnknown_3003F3C
_080FAE20: .4byte gWirelessCommType
_080FAE24: .4byte c2_800ACD4
_080FAE28: .4byte 0x0000069e
_080FAE2C: .4byte 0x000008d2
@ -5871,7 +5871,7 @@ _080FB2E4:
bics r3, r2
adds r2, r3, 0
strb r2, [r1]
ldr r0, _080FB320 @ =gUnknown_3003F64
ldr r0, _080FB320 @ =gReceivedRemoteLinkPlayers
ldrb r0, [r0]
cmp r0, 0x1
bne _080FB328
@ -5884,7 +5884,7 @@ _080FB2E4:
_080FB314: .4byte gUnknown_3005450
_080FB318: .4byte 0x0000099a
_080FB31C: .4byte gUnknown_3005E10
_080FB320: .4byte gUnknown_3003F64
_080FB320: .4byte gReceivedRemoteLinkPlayers
_080FB324:
bl sub_80FB174
_080FB328:
@ -6101,7 +6101,7 @@ _080FB4BC:
movs r1, 0x5
movs r2, 0x5
bl nullsub_87
ldr r0, _080FB4E4 @ =gUnknown_3003F64
ldr r0, _080FB4E4 @ =gReceivedRemoteLinkPlayers
ldrb r0, [r0]
cmp r0, 0x1
bne _080FB556
@ -6112,7 +6112,7 @@ _080FB4BC:
_080FB4D8: .4byte gUnknown_3005450
_080FB4DC: .4byte 0x0000093e
_080FB4E0: .4byte gUnknown_843EDF8
_080FB4E4: .4byte gUnknown_3003F64
_080FB4E4: .4byte gReceivedRemoteLinkPlayers
_080FB4E8:
ldr r0, _080FB4FC @ =gUnknown_3005450
adds r0, 0xF0
@ -6635,7 +6635,7 @@ _080FB8D8:
ldrb r0, [r2, 0xC]
cmp r0, 0x1
bne _080FB916
ldr r0, _080FB904 @ =gUnknown_3003F64
ldr r0, _080FB904 @ =gReceivedRemoteLinkPlayers
ldrb r0, [r0]
cmp r0, 0x1
bne _080FB934
@ -6653,7 +6653,7 @@ _080FB8D8:
b _080FB934
.align 2, 0
_080FB900: .4byte gUnknown_3005450
_080FB904: .4byte gUnknown_3003F64
_080FB904: .4byte gReceivedRemoteLinkPlayers
_080FB908: .4byte 0x0000099a
_080FB90C: .4byte gUnknown_3005E10
_080FB910:
@ -6665,7 +6665,7 @@ _080FB916:
ldrb r0, [r0]
cmp r0, 0x2
beq _080FB934
ldr r0, _080FB968 @ =gUnknown_3003F64
ldr r0, _080FB968 @ =gReceivedRemoteLinkPlayers
ldrb r0, [r0]
cmp r0, 0x1
bne _080FB934
@ -6699,7 +6699,7 @@ _080FB95A:
b _080FB9C2
.align 2, 0
_080FB964: .4byte 0x0000099c
_080FB968: .4byte gUnknown_3003F64
_080FB968: .4byte gReceivedRemoteLinkPlayers
_080FB96C: .4byte gUnknown_3007460
_080FB970: .4byte gUnknown_3005E10
_080FB974: .4byte sub_80F8B34
@ -6870,7 +6870,7 @@ sub_80FBA78: @ 80FBA78
lsls r0, 24
cmp r0, 0
beq _080FBAEC
ldr r1, _080FBAF8 @ =gUnknown_202271A
ldr r1, _080FBAF8 @ =gLinkType
ldr r2, _080FBAFC @ =0x00001111
adds r0, r2, 0
strh r0, [r1]
@ -6907,7 +6907,7 @@ _080FBAEC:
bx r0
.align 2, 0
_080FBAF4: .4byte sub_80FBA64
_080FBAF8: .4byte gUnknown_202271A
_080FBAF8: .4byte gLinkType
_080FBAFC: .4byte 0x00001111
_080FBB00: .4byte gMain
_080FBB04: .4byte gSaveBlock2Ptr
@ -9926,7 +9926,7 @@ sub_80FD1A0: @ 80FD1A0
mov r5, r8
push {r5-r7}
sub sp, 0x20
ldr r0, _080FD1C4 @ =gUnknown_3003F3C
ldr r0, _080FD1C4 @ =gWirelessCommType
ldrb r0, [r0]
cmp r0, 0
bne _080FD1B6
@ -9938,7 +9938,7 @@ _080FD1B6:
movs r4, 0
b _080FD22C
.align 2, 0
_080FD1C4: .4byte gUnknown_3003F3C
_080FD1C4: .4byte gWirelessCommType
_080FD1C8:
lsls r2, r4, 2
mov r0, sp
@ -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:

View File

@ -230,7 +230,7 @@ sub_8115A24: @ 8115A24
movs r0, 0
strb r0, [r1, 0xC]
strb r0, [r1, 0xD]
ldr r1, _08115A64 @ =gUnknown_20370D0
ldr r1, _08115A64 @ =gSpecialVar_Result
strh r0, [r1]
pop {r0}
bx r0
@ -239,7 +239,7 @@ _08115A54: .4byte sub_8115A68
_08115A58: .4byte gUnknown_203B05C
_08115A5C: .4byte gTasks+0x8
_08115A60: .4byte gUnknown_3002024
_08115A64: .4byte gUnknown_20370D0
_08115A64: .4byte gSpecialVar_Result
thumb_func_end sub_8115A24
thumb_func_start sub_8115A68
@ -299,7 +299,7 @@ _08115A90:
_08115B0C:
ldr r3, _08115B4C @ =gUnknown_203B058
ldr r2, _08115B50 @ =gUnknown_8456CD8
ldr r1, _08115B54 @ =gUnknown_20370C0
ldr r1, _08115B54 @ =gSpecialVar_0x8004
ldrh r0, [r1]
lsls r0, 2
adds r0, r2
@ -328,7 +328,7 @@ _08115B0C:
.align 2, 0
_08115B4C: .4byte gUnknown_203B058
_08115B50: .4byte gUnknown_8456CD8
_08115B54: .4byte gUnknown_20370C0
_08115B54: .4byte gSpecialVar_0x8004
_08115B58: .4byte gUnknown_203B059
_08115B5C:
movs r0, 0x70
@ -1083,22 +1083,22 @@ _0811617E:
bl EnableBothScriptContexts
adds r0, r4, 0
bl DestroyTask
ldr r1, _08116190 @ =gUnknown_20370D0
ldr r1, _08116190 @ =gSpecialVar_Result
movs r0, 0x5
strh r0, [r1]
b _081161D8
.align 2, 0
_08116190: .4byte gUnknown_20370D0
_08116190: .4byte gSpecialVar_Result
_08116194:
bl EnableBothScriptContexts
adds r0, r4, 0
bl DestroyTask
ldr r1, _081161A8 @ =gUnknown_20370D0
ldr r1, _081161A8 @ =gSpecialVar_Result
movs r0, 0x8
strh r0, [r1]
b _081161D8
.align 2, 0
_081161A8: .4byte gUnknown_20370D0
_081161A8: .4byte gSpecialVar_Result
_081161AC:
bl sub_80FBA00
cmp r0, 0
@ -1107,7 +1107,7 @@ _081161AC:
strb r0, [r5, 0xC]
b _081161D8
_081161BA:
ldr r0, _081161E0 @ =gUnknown_3003F64
ldr r0, _081161E0 @ =gReceivedRemoteLinkPlayers
ldrb r0, [r0]
cmp r0, 0
beq _081161D8
@ -1124,7 +1124,7 @@ _081161D8:
pop {r0}
bx r0
.align 2, 0
_081161E0: .4byte gUnknown_3003F64
_081161E0: .4byte gReceivedRemoteLinkPlayers
thumb_func_end sub_8115A68
thumb_func_start sub_81161E4
@ -1767,7 +1767,7 @@ BerryBlenderLinkJoinGroup: @ 81166F4
movs r0, 0
strb r0, [r1, 0x8]
strb r0, [r1, 0x9]
ldr r1, _08116734 @ =gUnknown_20370D0
ldr r1, _08116734 @ =gSpecialVar_Result
strh r0, [r1]
pop {r0}
bx r0
@ -1776,7 +1776,7 @@ _08116724: .4byte sub_8116738
_08116728: .4byte gUnknown_203B05C
_0811672C: .4byte gTasks+0x8
_08116730: .4byte gUnknown_3002028
_08116734: .4byte gUnknown_20370D0
_08116734: .4byte gSpecialVar_Result
thumb_func_end BerryBlenderLinkJoinGroup
thumb_func_start sub_8116738
@ -1828,7 +1828,7 @@ _08116760:
.4byte _08116CEC
_081167C0:
ldr r5, _08116800 @ =gUnknown_84570C8
ldr r4, _08116804 @ =gUnknown_20370C0
ldr r4, _08116804 @ =gSpecialVar_0x8004
ldrh r0, [r4]
adds r0, r5
ldrb r0, [r0]
@ -1855,13 +1855,13 @@ _081167C0:
b _08116D06
.align 2, 0
_08116800: .4byte gUnknown_84570C8
_08116804: .4byte gUnknown_20370C0
_08116804: .4byte gSpecialVar_0x8004
_08116808: .4byte gUnknown_203B058
_0811680C:
adds r0, r6, 0
adds r0, 0x9
ldr r2, _08116830 @ =gUnknown_84591B8
ldr r1, _08116834 @ =gUnknown_20370C0
ldr r1, _08116834 @ =gSpecialVar_0x8004
ldrh r1, [r1]
lsls r1, 2
adds r1, r2
@ -1877,7 +1877,7 @@ _08116828:
b _08116D06
.align 2, 0
_08116830: .4byte gUnknown_84591B8
_08116834: .4byte gUnknown_20370C0
_08116834: .4byte gSpecialVar_0x8004
_08116838:
ldr r0, [r6, 0x4]
movs r1, 0x4
@ -1886,7 +1886,7 @@ _08116838:
movs r1, 0x10
bl sub_811A5E4
ldr r0, [r6, 0x4]
ldr r1, _081168E8 @ =gUnknown_20370C0
ldr r1, _081168E8 @ =gSpecialVar_0x8004
ldrh r1, [r1]
bl sub_811A054
movs r4, 0
@ -1950,7 +1950,7 @@ _08116838:
strb r0, [r6, 0x8]
b _08116D06
.align 2, 0
_081168E8: .4byte gUnknown_20370C0
_081168E8: .4byte gSpecialVar_0x8004
_081168EC: .4byte gUnknown_8456CD0
_081168F0: .4byte gUnknown_8456D4C
_081168F4: .4byte gUnknown_8456D54
@ -2082,7 +2082,7 @@ _081169FC: .4byte gStringVar4
_08116A00: .4byte gUnknown_203B058
_08116A04: .4byte gStringVar1
_08116A08:
ldr r0, _08116A3C @ =gUnknown_3003F64
ldr r0, _08116A3C @ =gReceivedRemoteLinkPlayers
ldrb r0, [r0]
cmp r0, 0
beq _08116AA4
@ -2108,7 +2108,7 @@ _08116A08:
ldr r0, [r0]
mov pc, r0
.align 2, 0
_08116A3C: .4byte gUnknown_3003F64
_08116A3C: .4byte gReceivedRemoteLinkPlayers
_08116A40: .4byte gUnknown_203B058
_08116A44: .4byte _08116A48
.align 2, 0
@ -2361,19 +2361,19 @@ _08116C68:
lsls r0, 24
cmp r0, 0
beq _08116D06
ldr r0, _08116C94 @ =gUnknown_20370D0
ldr r0, _08116C94 @ =gSpecialVar_Result
movs r1, 0x6
b _08116CDC
.align 2, 0
_08116C90: .4byte gUnknown_8457754
_08116C94: .4byte gUnknown_20370D0
_08116C94: .4byte gSpecialVar_Result
_08116C98:
bl sub_80FCE44
ldr r0, _08116CA4 @ =gUnknown_20370D0
ldr r0, _08116CA4 @ =gSpecialVar_Result
movs r1, 0x5
b _08116CDC
.align 2, 0
_08116CA4: .4byte gUnknown_20370D0
_08116CA4: .4byte gSpecialVar_Result
_08116CA8:
bl sub_80FCE44
adds r5, r6, 0
@ -2397,7 +2397,7 @@ _08116CCE:
lsls r0, 24
cmp r0, 0
beq _08116D06
ldr r0, _08116CE8 @ =gUnknown_20370D0
ldr r0, _08116CE8 @ =gSpecialVar_Result
movs r1, 0x8
_08116CDC:
strh r1, [r0]
@ -2406,7 +2406,7 @@ _08116CDC:
b _08116D06
.align 2, 0
_08116CE4: .4byte gStringVar4
_08116CE8: .4byte gUnknown_20370D0
_08116CE8: .4byte gSpecialVar_Result
_08116CEC:
adds r0, r4, 0
bl DestroyTask
@ -2499,7 +2499,7 @@ sub_8116D60: @ 8116D60
adds r0, r5, 0
bl ConvertInternationalString
ldr r1, _08116DD8 @ =gUnknown_84570C8
ldr r0, _08116DDC @ =gUnknown_20370C0
ldr r0, _08116DDC @ =gSpecialVar_0x8004
ldrh r0, [r0]
adds r0, r1
ldrb r0, [r0]
@ -2525,7 +2525,7 @@ sub_8116D60: @ 8116D60
.align 2, 0
_08116DD4: .4byte gStringVar1
_08116DD8: .4byte gUnknown_84570C8
_08116DDC: .4byte gUnknown_20370C0
_08116DDC: .4byte gSpecialVar_0x8004
thumb_func_end sub_8116D60
thumb_func_start sub_8116DE0
@ -3028,7 +3028,7 @@ _0811719C:
eors r1, r2
lsls r1, 24
lsrs r1, 16
ldr r2, _081171D4 @ =gUnknown_2022118
ldr r2, _081171D4 @ =gBlockRecvBuffer
adds r1, r2
movs r2, 0x64
bl memcpy
@ -3038,9 +3038,9 @@ _0811719C:
b _081171FA
.align 2, 0
_081171D0: .4byte gEnemyParty
_081171D4: .4byte gUnknown_2022118
_081171D4: .4byte gBlockRecvBuffer
_081171D8:
ldr r4, _08117204 @ =gUnknown_2022618
ldr r4, _08117204 @ =gBlockSendBuffer
ldr r0, _08117208 @ =gSaveBlock1Ptr
ldr r1, [r0]
ldr r0, _0811720C @ =0x00002cd0
@ -3061,7 +3061,7 @@ _081171FA:
strh r0, [r5, 0x8]
b _0811725C
.align 2, 0
_08117204: .4byte gUnknown_2022618
_08117204: .4byte gBlockSendBuffer
_08117208: .4byte gSaveBlock1Ptr
_0811720C: .4byte 0x00002cd0
_08117210:
@ -3077,7 +3077,7 @@ _08117210:
eors r1, r0
lsls r1, 24
lsrs r1, 16
ldr r0, _0811726C @ =gUnknown_2022118
ldr r0, _0811726C @ =gBlockRecvBuffer
adds r1, r0
adds r0, r4, 0
movs r2, 0xD8
@ -3104,7 +3104,7 @@ _0811725C:
bx r0
.align 2, 0
_08117268: .4byte gUnknown_2031CCC
_0811726C: .4byte gUnknown_2022118
_0811726C: .4byte gBlockRecvBuffer
_08117270: .4byte gUnknown_2031DA4
_08117274: .4byte gMain
_08117278: .4byte c2_exit_to_overworld_2_switch
@ -3165,7 +3165,7 @@ _081172E0: .4byte gUnknown_2039624
_081172E4: .4byte gLinkPlayers
_081172E8:
lsls r0, r4, 8
ldr r1, _08117338 @ =gUnknown_2022118
ldr r1, _08117338 @ =gBlockRecvBuffer
adds r1, r0, r1
adds r0, r5, 0
movs r2, 0x60
@ -3192,7 +3192,7 @@ _08117302:
eors r0, r1
lsls r0, 24
lsrs r0, 16
ldr r1, _08117338 @ =gUnknown_2022118
ldr r1, _08117338 @ =gBlockRecvBuffer
adds r1, r0, r1
adds r0, r1, 0
adds r0, 0x60
@ -3200,7 +3200,7 @@ _08117302:
bl sub_81446D0
b _08117340
.align 2, 0
_08117338: .4byte gUnknown_2022118
_08117338: .4byte gBlockRecvBuffer
_0811733C:
bl sub_81446C4
_08117340:
@ -3396,7 +3396,7 @@ sub_81174B4: @ 81174B4
lsrs r5, 24
lsls r1, 16
lsrs r1, 16
ldr r0, _08117524 @ =gUnknown_20370C0
ldr r0, _08117524 @ =gSpecialVar_0x8004
strh r1, [r0]
ldr r0, _08117528 @ =0x0000406f
bl VarSet
@ -3432,7 +3432,7 @@ sub_81174B4: @ 81174B4
pop {r0}
bx r0
.align 2, 0
_08117524: .4byte gUnknown_20370C0
_08117524: .4byte gSpecialVar_0x8004
_08117528: .4byte 0x0000406f
_0811752C: .4byte gUnknown_3005030
_08117530: .4byte gUnknown_300502C
@ -3657,7 +3657,7 @@ _08117798: .4byte gMain
_0811779C: .4byte sub_811C1C8
_081177A0:
bl sub_80563F0
ldr r0, _081177C4 @ =gUnknown_2022618
ldr r0, _081177C4 @ =gBlockSendBuffer
movs r1, 0x1
bl sub_8117594
bl sp000_heal_pokemon
@ -3670,13 +3670,13 @@ _081177A0:
movs r2, 0x6
b _0811782E
.align 2, 0
_081177C4: .4byte gUnknown_2022618
_081177C4: .4byte gBlockSendBuffer
_081177C8:
bl sub_80563F0
bl sp000_heal_pokemon
bl SavePlayerParty
bl LoadPlayerBag
ldr r0, _081177EC @ =gUnknown_2022618
ldr r0, _081177EC @ =gBlockSendBuffer
movs r1, 0x1
bl sub_8117594
movs r0, 0x2
@ -3686,13 +3686,13 @@ _081177C8:
movs r2, 0x6
b _0811782E
.align 2, 0
_081177EC: .4byte gUnknown_2022618
_081177EC: .4byte gBlockSendBuffer
_081177F0:
bl sub_80563F0
bl sp000_heal_pokemon
bl SavePlayerParty
bl LoadPlayerBag
ldr r0, _08117814 @ =gUnknown_2022618
ldr r0, _08117814 @ =gBlockSendBuffer
movs r1, 0x1
bl sub_8117594
movs r0, 0x5
@ -3701,9 +3701,9 @@ _081177F0:
movs r1, 0x3
b _0811782C
.align 2, 0
_08117814: .4byte gUnknown_2022618
_08117814: .4byte gBlockSendBuffer
_08117818:
ldr r0, _0811783C @ =gUnknown_2022618
ldr r0, _0811783C @ =gBlockSendBuffer
movs r1, 0x1
bl sub_8117594
bl sub_80563F0
@ -3720,7 +3720,7 @@ _0811782E:
bl SetMainCallback2
b _081178E0
.align 2, 0
_0811783C: .4byte gUnknown_2022618
_0811783C: .4byte gBlockSendBuffer
_08117840: .4byte sub_8117534
_08117844:
ldr r0, _08117850 @ =sub_8117130
@ -3746,14 +3746,14 @@ _08117872:
bl sub_8128420
b _081178E0
_08117878:
ldr r0, _08117888 @ =gUnknown_2022618
ldr r0, _08117888 @ =gBlockSendBuffer
movs r1, 0
bl sub_8117594
ldr r0, _0811788C @ =sub_8117354
bl SetMainCallback2
b _081178E0
.align 2, 0
_08117888: .4byte gUnknown_2022618
_08117888: .4byte gBlockSendBuffer
_0811788C: .4byte sub_8117354
_08117890:
movs r0, 0x8
@ -3791,7 +3791,7 @@ _081178C8:
_081178E0:
adds r0, r4, 0
bl DestroyTask
ldr r1, _081178FC @ =gUnknown_20370D0
ldr r1, _081178FC @ =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
bl ScriptContext2_Disable
@ -3801,7 +3801,7 @@ _081178E0:
bx r0
.align 2, 0
_081178F8: .4byte sub_805671C
_081178FC: .4byte gUnknown_20370D0
_081178FC: .4byte gSpecialVar_Result
thumb_func_end sub_81175BC
thumb_func_start sub_8117900
@ -3832,13 +3832,13 @@ _08117928:
beq _08117974
b _08117988
_08117932:
ldr r1, _08117940 @ =gUnknown_20370D0
ldr r1, _08117940 @ =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
bl EnableBothScriptContexts
b _08117968
.align 2, 0
_08117940: .4byte gUnknown_20370D0
_08117940: .4byte gSpecialVar_Result
_08117944:
bl ScriptContext1_IsScriptSetUp
lsls r0, 24
@ -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
@ -3931,7 +3931,7 @@ sub_81179CC: @ 81179CC
strb r2, [r1, 0xC]
strb r2, [r1, 0xD]
strb r4, [r1, 0x18]
ldr r0, _08117A08 @ =gUnknown_20370D0
ldr r0, _08117A08 @ =gSpecialVar_Result
strh r2, [r0]
pop {r4}
pop {r0}
@ -3940,7 +3940,7 @@ sub_81179CC: @ 81179CC
_081179FC: .4byte sub_8117A0C
_08117A00: .4byte gUnknown_203B05C
_08117A04: .4byte gTasks+0x8
_08117A08: .4byte gUnknown_20370D0
_08117A08: .4byte gSpecialVar_Result
thumb_func_end sub_81179CC
thumb_func_start sub_8117A0C
@ -4421,13 +4421,13 @@ _08117E26:
beq _08117ECA
adds r0, r4, 0
bl DestroyTask
ldr r1, _08117E48 @ =gUnknown_20370D0
ldr r1, _08117E48 @ =gSpecialVar_Result
movs r0, 0x5
strh r0, [r1]
b _08117ECA
.align 2, 0
_08117E44: .4byte gUnknown_84571B8
_08117E48: .4byte gUnknown_20370D0
_08117E48: .4byte gSpecialVar_Result
_08117E4C:
bl sub_80FB9F4
lsls r0, 24
@ -4444,7 +4444,7 @@ _08117E64:
strb r0, [r5, 0xC]
b _08117ECA
_08117E6A:
ldr r0, _08117E7C @ =gUnknown_3003F64
ldr r0, _08117E7C @ =gReceivedRemoteLinkPlayers
ldrb r0, [r0]
cmp r0, 0
beq _08117ECA
@ -4452,7 +4452,7 @@ _08117E6A:
bl sub_80FAFE0
b _08117EB2
.align 2, 0
_08117E7C: .4byte gUnknown_3003F64
_08117E7C: .4byte gReceivedRemoteLinkPlayers
_08117E80:
ldrb r0, [r5, 0x12]
movs r1, 0
@ -4513,7 +4513,7 @@ sub_8117ED4: @ 8117ED4
strb r2, [r1, 0x9]
subs r4, 0x15
strb r4, [r1, 0x12]
ldr r0, _08117F1C @ =gUnknown_20370D0
ldr r0, _08117F1C @ =gSpecialVar_Result
strh r2, [r0]
pop {r4}
pop {r0}
@ -4523,7 +4523,7 @@ _08117F0C: .4byte sub_8117F20
_08117F10: .4byte gUnknown_203B05C
_08117F14: .4byte gTasks+0x8
_08117F18: .4byte gUnknown_3002028
_08117F1C: .4byte gUnknown_20370D0
_08117F1C: .4byte gSpecialVar_Result
thumb_func_end sub_8117ED4
thumb_func_start sub_8117F20
@ -4791,7 +4791,7 @@ _08118150:
_08118184: .4byte gUnknown_8459238
_08118188: .4byte gStringVar1
_0811818C:
ldr r0, _081181C4 @ =gUnknown_3003F64
ldr r0, _081181C4 @ =gReceivedRemoteLinkPlayers
ldrb r0, [r0]
cmp r0, 0
beq _081181AA
@ -4820,7 +4820,7 @@ _081181AA:
blt _08118288
b _081181D0
.align 2, 0
_081181C4: .4byte gUnknown_3003F64
_081181C4: .4byte gReceivedRemoteLinkPlayers
_081181C8: .4byte gUnknown_203B058
_081181CC:
cmp r0, 0x6
@ -4883,13 +4883,13 @@ _08118252:
adds r0, r6, 0
bl DestroyTask
bl sub_80F8DC0
ldr r1, _08118268 @ =gUnknown_20370D0
ldr r1, _08118268 @ =gSpecialVar_Result
movs r0, 0x5
strh r0, [r1]
b _08118288
.align 2, 0
_08118264: .4byte gUnknown_84571B8
_08118268: .4byte gUnknown_20370D0
_08118268: .4byte gSpecialVar_Result
_0811826C:
ldrb r0, [r5, 0x8]
adds r0, 0x1
@ -4933,7 +4933,7 @@ sub_8118290: @ 8118290
strb r2, [r1, 0x9]
subs r4, 0x15
strb r4, [r1, 0x12]
ldr r0, _081182D8 @ =gUnknown_20370D0
ldr r0, _081182D8 @ =gSpecialVar_Result
strh r2, [r0]
pop {r4}
pop {r0}
@ -4943,7 +4943,7 @@ _081182C8: .4byte sub_81182DC
_081182CC: .4byte gUnknown_203B05C
_081182D0: .4byte gTasks+0x8
_081182D4: .4byte gUnknown_3002028
_081182D8: .4byte gUnknown_20370D0
_081182D8: .4byte gSpecialVar_Result
thumb_func_end sub_8118290
thumb_func_start sub_81182DC
@ -5188,7 +5188,7 @@ _081184C8:
_081184FC: .4byte gUnknown_845928C
_08118500: .4byte gStringVar1
_08118504:
ldr r0, _0811853C @ =gUnknown_3003F64
ldr r0, _0811853C @ =gReceivedRemoteLinkPlayers
ldrb r0, [r0]
cmp r0, 0
beq _08118522
@ -5217,7 +5217,7 @@ _08118522:
blt _08118604
b _08118548
.align 2, 0
_0811853C: .4byte gUnknown_3003F64
_0811853C: .4byte gReceivedRemoteLinkPlayers
_08118540: .4byte gUnknown_203B058
_08118544:
cmp r0, 0x6
@ -5288,13 +5288,13 @@ _081185C2:
adds r0, r4, 0
bl DestroyTask
bl sub_80F8DC0
ldr r1, _081185E4 @ =gUnknown_20370D0
ldr r1, _081185E4 @ =gSpecialVar_Result
movs r0, 0x5
strh r0, [r1]
b _08118604
.align 2, 0
_081185E0: .4byte gUnknown_845933C
_081185E4: .4byte gUnknown_20370D0
_081185E4: .4byte gSpecialVar_Result
_081185E8:
ldrb r0, [r5, 0x8]
adds r0, 0x1
@ -5334,7 +5334,7 @@ UnionRoomSpecial: @ 811860C
strb r1, [r0, 0x16]
strh r1, [r0, 0x10]
strh r1, [r0, 0x12]
ldr r0, _08118654 @ =gUnknown_20370D0
ldr r0, _08118654 @ =gSpecialVar_Result
strh r1, [r0]
movs r0, 0xD0
movs r1, 0x1
@ -5346,7 +5346,7 @@ UnionRoomSpecial: @ 811860C
_08118648: .4byte sub_81186E0
_0811864C: .4byte gUnknown_203B05C
_08118650: .4byte gUnknown_300202C
_08118654: .4byte gUnknown_20370D0
_08118654: .4byte gSpecialVar_Result
thumb_func_end UnionRoomSpecial
thumb_func_start sub_8118658
@ -5593,14 +5593,14 @@ _0811887C:
ldr r0, [r6, 0xC]
movs r1, 0x4
bl sub_811A650
ldr r1, _081188C8 @ =gUnknown_20370D0
ldr r1, _081188C8 @ =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
movs r0, 0x3
bl _081198DA
.align 2, 0
_081188C4: .4byte gUnknown_203B06C
_081188C8: .4byte gUnknown_20370D0
_081188C8: .4byte gSpecialVar_Result
_081188CC:
bl sub_811FB18
lsls r0, 24
@ -5703,7 +5703,7 @@ _081189A4:
movs r0, 0x4
bl _081198DA
_081189AA:
ldr r4, _081189D8 @ =gUnknown_20370D0
ldr r4, _081189D8 @ =gSpecialVar_Result
ldrh r0, [r4]
cmp r0, 0
beq _08118A0E
@ -5723,7 +5723,7 @@ _081189AA:
movs r0, 0x2A
b _08118A06
.align 2, 0
_081189D8: .4byte gUnknown_20370D0
_081189D8: .4byte gSpecialVar_Result
_081189DC: .4byte gStringVar1
_081189E0: .4byte gSaveBlock2Ptr
_081189E4:
@ -5941,13 +5941,13 @@ _08118BBC:
movs r0, 0x40
strb r0, [r1]
_08118BC2:
ldr r0, _08118BEC @ =gUnknown_3003F64
ldr r0, _08118BEC @ =gReceivedRemoteLinkPlayers
ldrb r0, [r0]
cmp r0, 0
bne _08118BCE
bl _081198DC
_08118BCE:
ldr r0, _08118BF0 @ =gUnknown_2022618
ldr r0, _08118BF0 @ =gBlockSendBuffer
movs r1, 0x1
bl sub_8117594
ldr r0, _08118BF4 @ =sub_8117280
@ -5958,8 +5958,8 @@ _08118BCE:
.align 2, 0
_08118BE4: .4byte gUnknown_8457F90
_08118BE8: .4byte gUnknown_203B058
_08118BEC: .4byte gUnknown_3003F64
_08118BF0: .4byte gUnknown_2022618
_08118BEC: .4byte gReceivedRemoteLinkPlayers
_08118BF0: .4byte gBlockSendBuffer
_08118BF4: .4byte sub_8117280
_08118BF8:
ldr r0, _08118C1C @ =sub_8117280
@ -5985,7 +5985,7 @@ _08118C28:
movs r0, 0x5
bl _081198DA
_08118C2E:
ldr r0, _08118C54 @ =gUnknown_3003F64
ldr r0, _08118C54 @ =gReceivedRemoteLinkPlayers
ldrb r0, [r0]
cmp r0, 0
beq _08118C3A
@ -6002,7 +6002,7 @@ _08118C3A:
movs r0, 0x2
bl _081198DA
.align 2, 0
_08118C54: .4byte gUnknown_3003F64
_08118C54: .4byte gReceivedRemoteLinkPlayers
_08118C58:
adds r0, r6, 0
adds r0, 0x16
@ -6021,7 +6021,7 @@ _08118C58:
bne _08118C7C
bl _081198DC
_08118C7C:
ldr r0, _08118C94 @ =gUnknown_3003F64
ldr r0, _08118C94 @ =gReceivedRemoteLinkPlayers
ldrb r0, [r0]
cmp r0, 0
bne _08118C98
@ -6030,7 +6030,7 @@ _08118C7C:
.align 2, 0
_08118C8C: .4byte gUnknown_8456DF4
_08118C90: .4byte gUnknown_8456E1C
_08118C94: .4byte gUnknown_3003F64
_08118C94: .4byte gReceivedRemoteLinkPlayers
_08118C98:
adds r1, r6, 0
adds r1, 0x84
@ -6168,7 +6168,7 @@ _08118DAA:
.align 2, 0
_08118DD0: .4byte gUnknown_203B06C
_08118DD4:
ldr r0, _08118DEC @ =gUnknown_3003F64
ldr r0, _08118DEC @ =gReceivedRemoteLinkPlayers
ldrb r0, [r0]
cmp r0, 0
bne _08118DF8
@ -6178,7 +6178,7 @@ _08118DD4:
movs r0, 0x1C
bl _081198DA
.align 2, 0
_08118DEC: .4byte gUnknown_3003F64
_08118DEC: .4byte gReceivedRemoteLinkPlayers
_08118DF0: .4byte gStringVar4
_08118DF4: .4byte gUnknown_8458434
_08118DF8:
@ -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:
@ -6481,7 +6481,7 @@ _08119088:
movs r0, 0x1E
bl sub_8118664
_08119096:
ldr r0, _081190AC @ =gUnknown_3003F64
ldr r0, _081190AC @ =gReceivedRemoteLinkPlayers
ldrb r0, [r0]
cmp r0, 0
bne _081190A2
@ -6491,7 +6491,7 @@ _081190A2:
bl _081198DA
.align 2, 0
_081190A8: .4byte gUnknown_84585E8
_081190AC: .4byte gUnknown_3003F64
_081190AC: .4byte gReceivedRemoteLinkPlayers
_081190B0:
movs r0, 0x42
bl PlaySE
@ -6512,13 +6512,13 @@ _081190CA:
movs r0, 0x2
bl _081198DA
_081190DE:
ldr r0, _08119100 @ =gUnknown_3003F64
ldr r0, _08119100 @ =gReceivedRemoteLinkPlayers
ldrb r0, [r0]
cmp r0, 0
bne _081190EA
bl _081198DC
_081190EA:
ldr r0, _08119104 @ =gUnknown_2022618
ldr r0, _08119104 @ =gBlockSendBuffer
movs r1, 0x1
bl sub_8117594
ldr r0, _08119108 @ =sub_8117280
@ -6527,8 +6527,8 @@ _081190EA:
movs r0, 0x27
bl _081198DA
.align 2, 0
_08119100: .4byte gUnknown_3003F64
_08119104: .4byte gUnknown_2022618
_08119100: .4byte gReceivedRemoteLinkPlayers
_08119104: .4byte gBlockSendBuffer
_08119108: .4byte sub_8117280
_0811910C:
adds r0, r6, 0
@ -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:
@ -6743,7 +6743,7 @@ _081192E0:
movs r0, 0x24
b _081198DA
_081192E8:
ldr r0, _08119318 @ =gUnknown_3003F64
ldr r0, _08119318 @ =gReceivedRemoteLinkPlayers
ldrb r4, [r0]
cmp r4, 0
beq _081192F2
@ -6767,7 +6767,7 @@ _081192F2:
strh r4, [r0]
b _081198DC
.align 2, 0
_08119318: .4byte gUnknown_3003F64
_08119318: .4byte gReceivedRemoteLinkPlayers
_0811931C: .4byte gUnknown_203B058
_08119320: .4byte gStringVar4
_08119324:
@ -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
@ -7463,14 +7463,14 @@ var_800D_set_xB: @ 81198EC
bl InUnionRoom
cmp r0, 0x1
bne _081198FC
ldr r1, _08119900 @ =gUnknown_20370D0
ldr r1, _08119900 @ =gSpecialVar_Result
movs r0, 0xB
strh r0, [r1]
_081198FC:
pop {r0}
bx r0
.align 2, 0
_08119900: .4byte gUnknown_20370D0
_08119900: .4byte gSpecialVar_Result
thumb_func_end var_800D_set_xB
thumb_func_start sub_8119904
@ -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:
@ -13024,7 +13024,7 @@ _0811C3B0:
beq _0811C3BC
b _0811C516
_0811C3BC:
ldr r4, _0811C3D8 @ =gUnknown_2022618
ldr r4, _0811C3D8 @ =gBlockSendBuffer
adds r0, r4, 0
movs r1, 0
movs r2, 0x20
@ -13037,13 +13037,13 @@ _0811C3BC:
movs r0, 0x52
b _0811C3E2
.align 2, 0
_0811C3D8: .4byte gUnknown_2022618
_0811C3D8: .4byte gBlockSendBuffer
_0811C3DC: .4byte gUnknown_203B0D4
_0811C3E0:
movs r0, 0x51
_0811C3E2:
strb r0, [r4]
ldr r1, _0811C3F8 @ =gUnknown_2022618
ldr r1, _0811C3F8 @ =gBlockSendBuffer
movs r0, 0
movs r2, 0x20
bl SendBlock
@ -13053,7 +13053,7 @@ _0811C3E2:
adds r1, r2
b _0811C4F2
.align 2, 0
_0811C3F8: .4byte gUnknown_2022618
_0811C3F8: .4byte gBlockSendBuffer
_0811C3FC: .4byte gMain
_0811C400:
bl GetBlockReceivedStatus
@ -13063,7 +13063,7 @@ _0811C400:
beq _0811C40E
b _0811C516
_0811C40E:
ldr r1, _0811C440 @ =gUnknown_2022118
ldr r1, _0811C440 @ =gBlockRecvBuffer
ldrh r0, [r1]
cmp r0, 0x51
bne _0811C448
@ -13087,11 +13087,11 @@ _0811C40E:
movs r1, 0x32
b _0811C47E
.align 2, 0
_0811C440: .4byte gUnknown_2022118
_0811C440: .4byte gBlockRecvBuffer
_0811C444: .4byte gMain
_0811C448:
bl sub_800AAC0
ldr r4, _0811C46C @ =gUnknown_2022118
ldr r4, _0811C46C @ =gBlockRecvBuffer
bl GetMultiplayerId
lsls r0, 24
lsrs r0, 16
@ -13106,7 +13106,7 @@ _0811C448:
movs r1, 0x6
b _0811C47E
.align 2, 0
_0811C46C: .4byte gUnknown_2022118
_0811C46C: .4byte gBlockRecvBuffer
_0811C470: .4byte gMain
_0811C474:
ldr r0, _0811C488 @ =gMain
@ -13159,7 +13159,7 @@ _0811C4D8: .4byte gUnknown_203B08C
_0811C4DC: .4byte gUnknown_841E58D
_0811C4E0: .4byte c2_exit_to_overworld_2_switch
_0811C4E4:
ldr r0, _0811C4FC @ =gUnknown_3003F64
ldr r0, _0811C4FC @ =gReceivedRemoteLinkPlayers
ldrb r0, [r0]
cmp r0, 0
bne _0811C516
@ -13172,7 +13172,7 @@ _0811C4F2:
strb r0, [r1]
b _0811C516
.align 2, 0
_0811C4FC: .4byte gUnknown_3003F64
_0811C4FC: .4byte gReceivedRemoteLinkPlayers
_0811C500:
ldr r0, _0811C534 @ =gUnknown_203B08C
ldr r0, [r0]

View File

@ -1649,7 +1649,7 @@ _081430B2:
strb r0, [r5, 0x8]
b _081435C6
_081430B8:
ldr r0, _081430D0 @ =gUnknown_3003F64
ldr r0, _081430D0 @ =gReceivedRemoteLinkPlayers
ldrb r0, [r0]
cmp r0, 0
beq _081430D4
@ -1657,12 +1657,12 @@ _081430B8:
bl sub_81424B8
movs r0, 0x7
strb r0, [r5, 0x8]
bl sub_8144AEC
bl mevent_srv_ish_do_init
b _081435C6
.align 2, 0
_081430D0: .4byte gUnknown_3003F64
_081430D0: .4byte gReceivedRemoteLinkPlayers
_081430D4:
ldr r0, _081430E8 @ =gUnknown_20370D0
ldr r0, _081430E8 @ =gSpecialVar_Result
ldrh r0, [r0]
cmp r0, 0x5
beq _081430DE
@ -1672,7 +1672,7 @@ _081430DE:
bl sub_81424B8
b _08143464
.align 2, 0
_081430E8: .4byte gUnknown_20370D0
_081430E8: .4byte gSpecialVar_Result
_081430EC:
ldr r0, _081430F8 @ =gUnknown_841E794
bl sub_8142504
@ -1683,7 +1683,7 @@ _081430EC:
_081430F8: .4byte gUnknown_841E794
_081430FC:
adds r0, r5, 0
bl sub_8144B0C
bl mevent_srv_ish_do_exec
subs r0, 0x2
cmp r0, 0x4
bls _0814310A
@ -1712,12 +1712,12 @@ _0814312C:
b _081435C6
_0814313A:
ldr r4, [r5, 0x10]
bl sub_8144B58
bl mevent_srv_ish_get_buffer
adds r1, r0, 0
adds r0, r4, 0
movs r2, 0x40
bl memcpy
bl sub_8144B48
bl mevent_srv_ish_inc_flag
b _081435C6
_08143150:
movs r0, 0xA
@ -1731,16 +1731,16 @@ _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
bl sub_8144B58
bl mevent_srv_ish_get_buffer
adds r3, r0, 0
adds r0, r4, 0
adds r1, r5, 0
@ -1757,7 +1757,7 @@ _08143174:
_08143198:
adds r4, r5, 0
adds r4, 0x9
bl sub_8144B58
bl mevent_srv_ish_get_buffer
adds r1, r0, 0
adds r0, r4, 0
bl mevent_0814257C
@ -1817,9 +1817,9 @@ _08143208:
_0814320C:
movs r0, 0x1
_0814320E:
bl sub_8144B64
bl mevent_srv_ish_set_param
_08143212:
bl sub_8144B48
bl mevent_srv_ish_inc_flag
movs r0, 0x7
strb r0, [r5, 0x8]
b _081435C6
@ -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]
@ -2160,7 +2160,7 @@ _08143492:
strb r0, [r5, 0x8]
b _081435C6
_0814349C:
ldr r0, _081434B0 @ =gUnknown_3003F64
ldr r0, _081434B0 @ =gReceivedRemoteLinkPlayers
ldrb r0, [r0]
cmp r0, 0
beq _081434B4
@ -2170,9 +2170,9 @@ _0814349C:
strb r0, [r5, 0x8]
b _081435C6
.align 2, 0
_081434B0: .4byte gUnknown_3003F64
_081434B0: .4byte gReceivedRemoteLinkPlayers
_081434B4:
ldr r0, _081434CC @ =gUnknown_20370D0
ldr r0, _081434CC @ =gSpecialVar_Result
ldrh r0, [r0]
cmp r0, 0x5
beq _081434BE
@ -2185,7 +2185,7 @@ _081434C4:
strb r0, [r5, 0x8]
b _081435C6
.align 2, 0
_081434CC: .4byte gUnknown_20370D0
_081434CC: .4byte gSpecialVar_Result
_081434D0:
ldr r0, _081434F0 @ =gStringVar1
movs r1, 0xFF
@ -2199,7 +2199,7 @@ _081434D0:
bne _08143500
ldr r0, _081434FC @ =gUnknown_841EAE7
bl sub_8142504
bl sub_8144F40
bl mevent_srv_common_do_init_2
b _0814350A
.align 2, 0
_081434F0: .4byte gStringVar1
@ -2209,7 +2209,7 @@ _081434FC: .4byte gUnknown_841EAE7
_08143500:
ldr r0, _08143510 @ =gUnknown_841EB01
bl sub_8142504
bl sub_8144F1C
bl mevent_srv_common_do_init_1
_0814350A:
movs r0, 0x20
strb r0, [r5, 0x8]
@ -2218,7 +2218,7 @@ _0814350A:
_08143510: .4byte gUnknown_841EB01
_08143514:
adds r0, r5, 0
bl sub_8144F64
bl mevent_srv_init_do_exec
cmp r0, 0x3
bne _081435C6
ldrh r0, [r5]
@ -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

View File

@ -969,14 +969,14 @@ _081075DA:
beq _08107640
b _08107680
_081075E4:
ldr r1, _081075F4 @ =gUnknown_841623B
ldr r1, _081075F4 @ =gFameCheckerText_ListMenuCursor
adds r0, r6, 0
mov r2, r8
adds r3, r7, 0
bl ListMenuPrint
b _08107680
.align 2, 0
_081075F4: .4byte gUnknown_841623B
_081075F4: .4byte gFameCheckerText_ListMenuCursor
_081075F8:
ldrb r0, [r6, 0x1E]
cmp r0, 0xFF

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:

View File

@ -174,7 +174,7 @@ sub_810EC98: @ 810EC98
adds r6, r0, 0
movs r3, 0
ldr r7, _0810ED50 @ =gUnknown_203ADE0
ldr r0, _0810ED54 @ =gUnknown_84161C1
ldr r0, _0810ED54 @ =gFameCheckerText_Cancel
mov r12, r0
ldr r5, _0810ED58 @ =gUnknown_3005E70
ldr r1, _0810ED5C @ =gUnknown_203ADDC
@ -262,7 +262,7 @@ _0810ECCE:
bx r1
.align 2, 0
_0810ED50: .4byte gUnknown_203ADE0
_0810ED54: .4byte gUnknown_84161C1
_0810ED54: .4byte gFameCheckerText_Cancel
_0810ED58: .4byte gUnknown_3005E70
_0810ED5C: .4byte gUnknown_203ADDC
_0810ED60: .4byte gUnknown_8454003

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

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

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.

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:
@ -270,7 +270,7 @@ sub_8069740: @ 8069740
lsls r0, 2
ldr r1, _08069760 @ =gMapObjects
adds r0, r1
ldr r1, _08069764 @ =gUnknown_20370D4
ldr r1, _08069764 @ =gSpecialVar_Facing
ldrb r1, [r1]
bl FieldObjectFaceOppositeDirection
pop {r0}
@ -278,7 +278,7 @@ sub_8069740: @ 8069740
.align 2, 0
_0806975C: .4byte gUnknown_3005074
_08069760: .4byte gMapObjects
_08069764: .4byte gUnknown_20370D4
_08069764: .4byte gSpecialVar_Facing
thumb_func_end sub_8069740
thumb_func_start sub_8069768

View File

@ -1391,7 +1391,7 @@ RedrawMenuCursor: @ 810F874
bl FillWindowPixelRect
ldrb r0, [r5, 0x5]
ldrb r1, [r5, 0x6]
ldr r2, _0810F900 @ =gUnknown_841623B
ldr r2, _0810F900 @ =gFameCheckerText_ListMenuCursor
ldrb r3, [r5]
ldrb r4, [r5, 0x8]
mov r6, r8
@ -1415,7 +1415,7 @@ RedrawMenuCursor: @ 810F874
bx r0
.align 2, 0
_0810F8FC: .4byte gUnknown_203ADE4
_0810F900: .4byte gUnknown_841623B
_0810F900: .4byte gFameCheckerText_ListMenuCursor
thumb_func_end RedrawMenuCursor
thumb_func_start MoveMenuCursor
@ -2893,7 +2893,7 @@ sub_811037C: @ 811037C
lsrs r3, 24
ldrb r0, [r5, 0x5]
ldrb r1, [r5, 0x6]
ldr r2, _0811044C @ =gUnknown_841623B
ldr r2, _0811044C @ =gFameCheckerText_ListMenuCursor
str r3, [sp]
movs r3, 0
str r3, [sp, 0x4]
@ -2910,7 +2910,7 @@ sub_811037C: @ 811037C
bx r0
.align 2, 0
_08110448: .4byte gUnknown_203ADE4
_0811044C: .4byte gUnknown_841623B
_0811044C: .4byte gFameCheckerText_ListMenuCursor
thumb_func_end sub_811037C
thumb_func_start sub_8110450

View File

@ -363,7 +363,7 @@ sub_80BF708: @ 80BF708
bl sub_805642C
cmp r0, 0x1
beq _080BF71A
ldr r0, _080BF720 @ =gUnknown_3003F64
ldr r0, _080BF720 @ =gReceivedRemoteLinkPlayers
ldrb r0, [r0]
cmp r0, 0x1
bne _080BF724
@ -371,7 +371,7 @@ _080BF71A:
movs r0, 0x1
b _080BF726
.align 2, 0
_080BF720: .4byte gUnknown_3003F64
_080BF720: .4byte gReceivedRemoteLinkPlayers
_080BF724:
movs r0, 0
_080BF726:

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,722 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_80DA800
sub_80DA800: @ 80DA800
push {r4,lr}
lsls r0, 16
lsrs r0, 16
lsls r2, 16
lsrs r2, 16
movs r4, 0x1
ands r0, r4
cmp r0, 0
beq _080DA828
ands r1, r4
cmp r1, 0
beq _080DA828
ands r2, r4
cmp r2, 0
beq _080DA828
ands r3, r4
cmp r3, 0
beq _080DA828
movs r0, 0x1
b _080DA82A
_080DA828:
movs r0, 0
_080DA82A:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_80DA800
thumb_func_start SetIncompatible
SetIncompatible: @ 80DA830
push {lr}
ldr r0, _080DA844 @ =gStringVar4
ldr r1, _080DA848 @ =gUnknown_8488DFD
bl StringExpandPlaceholders
movs r0, 0x3
bl sub_80DA8E8
pop {r0}
bx r0
.align 2, 0
_080DA844: .4byte gStringVar4
_080DA848: .4byte gUnknown_8488DFD
thumb_func_end SetIncompatible
thumb_func_start InitMysteryEventScript
InitMysteryEventScript: @ 80DA84C
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
ldr r1, _080DA874 @ =gUnknown_81DBCF0
ldr r2, _080DA878 @ =0x081dbd34
bl InitScriptContext
adds r0, r4, 0
adds r1, r5, 0
bl SetupBytecodeScript
str r5, [r4, 0x64]
movs r0, 0
str r0, [r4, 0x68]
str r0, [r4, 0x6C]
str r0, [r4, 0x70]
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080DA874: .4byte gUnknown_81DBCF0
_080DA878: .4byte 0x081dbd34
thumb_func_end InitMysteryEventScript
thumb_func_start RunMysteryEventScriptCommand
RunMysteryEventScriptCommand: @ 80DA87C
push {r4,lr}
adds r4, r0, 0
bl RunScriptCommand
lsls r0, 24
cmp r0, 0
beq _080DA894
ldr r0, [r4, 0x70]
cmp r0, 0
beq _080DA894
movs r0, 0x1
b _080DA896
_080DA894:
movs r0, 0
_080DA896:
pop {r4}
pop {r1}
bx r1
thumb_func_end RunMysteryEventScriptCommand
thumb_func_start sub_80DA89C
sub_80DA89C: @ 80DA89C
push {lr}
adds r1, r0, 0
ldr r0, _080DA8AC @ =gUnknown_203AA3C
bl InitMysteryEventScript
pop {r0}
bx r0
.align 2, 0
_080DA8AC: .4byte gUnknown_203AA3C
thumb_func_end sub_80DA89C
thumb_func_start sub_80DA8B0
sub_80DA8B0: @ 80DA8B0
push {r4,r5,lr}
adds r5, r0, 0
ldr r4, _080DA8C8 @ =gUnknown_203AA3C
adds r0, r4, 0
bl RunMysteryEventScriptCommand
ldr r1, [r4, 0x6C]
str r1, [r5]
pop {r4,r5}
pop {r1}
bx r1
.align 2, 0
_080DA8C8: .4byte gUnknown_203AA3C
thumb_func_end sub_80DA8B0
thumb_func_start sub_80DA8CC
sub_80DA8CC: @ 80DA8CC
push {lr}
sub sp, 0x4
bl sub_80DA89C
_080DA8D4:
mov r0, sp
bl sub_80DA8B0
cmp r0, 0
bne _080DA8D4
ldr r0, [sp]
add sp, 0x4
pop {r1}
bx r1
thumb_func_end sub_80DA8CC
thumb_func_start sub_80DA8E8
sub_80DA8E8: @ 80DA8E8
ldr r1, _080DA8F0 @ =gUnknown_203AA3C
str r0, [r1, 0x6C]
bx lr
.align 2, 0
_080DA8F0: .4byte gUnknown_203AA3C
thumb_func_end sub_80DA8E8
thumb_func_start script_status_stop_and_ret_1
script_status_stop_and_ret_1: @ 80DA8F4
push {lr}
bl StopScript
movs r0, 0x1
pop {r1}
bx r1
thumb_func_end script_status_stop_and_ret_1
thumb_func_start MEScrCmd_checkcompat
MEScrCmd_checkcompat: @ 80DA900
push {r4-r7,lr}
adds r7, r0, 0
bl ScriptReadWord
str r0, [r7, 0x68]
adds r0, r7, 0
bl ScriptReadHalfword
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
adds r0, r7, 0
bl ScriptReadWord
adds r6, r0, 0
adds r0, r7, 0
bl ScriptReadHalfword
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r7, 0
bl ScriptReadWord
adds r3, r0, 0
adds r0, r5, 0
adds r1, r6, 0
adds r2, r4, 0
bl sub_80DA800
cmp r0, 0x1
bne _080DA944
str r0, [r7, 0x70]
b _080DA948
_080DA944:
bl SetIncompatible
_080DA948:
movs r0, 0x1
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end MEScrCmd_checkcompat
thumb_func_start sub_80DA950
sub_80DA950: @ 80DA950
movs r0, 0
bx lr
thumb_func_end sub_80DA950
thumb_func_start MEScrCmd_setstatus
MEScrCmd_setstatus: @ 80DA954
ldr r1, [r0, 0x8]
ldrb r2, [r1]
adds r1, 0x1
str r1, [r0, 0x8]
str r2, [r0, 0x6C]
movs r0, 0
bx lr
thumb_func_end MEScrCmd_setstatus
thumb_func_start MEScrCmd_setmsg
MEScrCmd_setmsg: @ 80DA964
push {r4,r5,lr}
adds r4, r0, 0
ldr r0, [r4, 0x8]
ldrb r5, [r0]
adds r0, 0x1
str r0, [r4, 0x8]
adds r0, r4, 0
bl ScriptReadWord
ldr r1, [r4, 0x68]
subs r0, r1
ldr r1, [r4, 0x64]
adds r1, r0, r1
cmp r5, 0xFF
beq _080DA988
ldr r0, [r4, 0x6C]
cmp r5, r0
bne _080DA98E
_080DA988:
ldr r0, _080DA998 @ =gStringVar4
bl StringExpandPlaceholders
_080DA98E:
movs r0, 0
pop {r4,r5}
pop {r1}
bx r1
.align 2, 0
_080DA998: .4byte gStringVar4
thumb_func_end MEScrCmd_setmsg
thumb_func_start MEScrCmd_runscript
MEScrCmd_runscript: @ 80DA99C
push {r4,lr}
adds r4, r0, 0
bl ScriptReadWord
ldr r1, [r4, 0x68]
subs r0, r1
ldr r1, [r4, 0x64]
adds r0, r1
bl ScriptContext2_RunNewScript
movs r0, 0
pop {r4}
pop {r1}
bx r1
thumb_func_end MEScrCmd_runscript
thumb_func_start MEScrCmd_setenigmaberry
MEScrCmd_setenigmaberry: @ 80DA9B8
push {r4-r7,lr}
mov r7, r9
mov r6, r8
push {r6,r7}
adds r7, r0, 0
bl IsEnigmaBerryValid
mov r8, r0
adds r0, r7, 0
bl ScriptReadWord
adds r4, r0, 0
ldr r0, [r7, 0x68]
subs r4, r0
ldr r0, [r7, 0x64]
adds r4, r0
ldr r0, _080DAA0C @ =gStringVar1
mov r9, r0
ldr r6, _080DAA10 @ =gSaveBlock1Ptr
ldr r1, [r6]
ldr r5, _080DAA14 @ =0x000030ec
adds r1, r5
movs r2, 0x7
bl StringCopyN
adds r0, r4, 0
bl sub_809C7C4
ldr r4, _080DAA18 @ =gStringVar2
ldr r1, [r6]
adds r1, r5
adds r0, r4, 0
movs r2, 0x7
bl StringCopyN
mov r0, r8
cmp r0, 0
bne _080DAA24
ldr r0, _080DAA1C @ =gStringVar4
ldr r1, _080DAA20 @ =gUnknown_8488C70
b _080DAA44
.align 2, 0
_080DAA0C: .4byte gStringVar1
_080DAA10: .4byte gSaveBlock1Ptr
_080DAA14: .4byte 0x000030ec
_080DAA18: .4byte gStringVar2
_080DAA1C: .4byte gStringVar4
_080DAA20: .4byte gUnknown_8488C70
_080DAA24:
mov r0, r9
adds r1, r4, 0
bl StringCompare
cmp r0, 0
beq _080DAA40
ldr r0, _080DAA38 @ =gStringVar4
ldr r1, _080DAA3C @ =gUnknown_8488CA2
b _080DAA44
.align 2, 0
_080DAA38: .4byte gStringVar4
_080DAA3C: .4byte gUnknown_8488CA2
_080DAA40:
ldr r0, _080DAA60 @ =gStringVar4
ldr r1, _080DAA64 @ =gUnknown_8488CCE
_080DAA44:
bl StringExpandPlaceholders
movs r0, 0x2
str r0, [r7, 0x6C]
bl IsEnigmaBerryValid
cmp r0, 0x1
bne _080DAA6C
ldr r0, _080DAA68 @ =0x00004033
movs r1, 0x1
bl VarSet
b _080DAA70
.align 2, 0
_080DAA60: .4byte gStringVar4
_080DAA64: .4byte gUnknown_8488CCE
_080DAA68: .4byte 0x00004033
_080DAA6C:
movs r0, 0x1
str r0, [r7, 0x6C]
_080DAA70:
movs r0, 0
pop {r3,r4}
mov r8, r3
mov r9, r4
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end MEScrCmd_setenigmaberry
thumb_func_start MEScrCmd_giveribbon
MEScrCmd_giveribbon: @ 80DAA80
push {r4,lr}
adds r4, r0, 0
ldr r2, [r4, 0x8]
ldrb r0, [r2]
adds r2, 0x1
str r2, [r4, 0x8]
ldrb r1, [r2]
adds r2, 0x1
str r2, [r4, 0x8]
bl GiveGiftRibbonToParty
ldr r0, _080DAAAC @ =gStringVar4
ldr r1, _080DAAB0 @ =gUnknown_8488CF6
bl StringExpandPlaceholders
movs r0, 0x2
str r0, [r4, 0x6C]
movs r0, 0
pop {r4}
pop {r1}
bx r1
.align 2, 0
_080DAAAC: .4byte gStringVar4
_080DAAB0: .4byte gUnknown_8488CF6
thumb_func_end MEScrCmd_giveribbon
thumb_func_start MEScrCmd_initramscript
MEScrCmd_initramscript: @ 80DAAB4
push {r4-r6,lr}
mov r6, r9
mov r5, r8
push {r5,r6}
sub sp, 0x4
adds r4, r0, 0
ldr r0, [r4, 0x8]
ldrb r1, [r0]
mov r9, r1
adds r0, 0x1
str r0, [r4, 0x8]
ldrb r1, [r0]
mov r8, r1
adds r1, r0, 0x1
str r1, [r4, 0x8]
ldrb r6, [r0, 0x1]
adds r1, 0x1
str r1, [r4, 0x8]
adds r0, r4, 0
bl ScriptReadWord
adds r5, r0, 0
ldr r0, [r4, 0x68]
subs r5, r0
ldr r0, [r4, 0x64]
adds r5, r0
adds r0, r4, 0
bl ScriptReadWord
adds r1, r0, 0
ldr r0, [r4, 0x68]
subs r1, r0
ldr r0, [r4, 0x64]
adds r1, r0
subs r1, r5
lsls r1, 16
lsrs r1, 16
str r6, [sp]
adds r0, r5, 0
mov r2, r9
mov r3, r8
bl InitRamScript
movs r0, 0
add sp, 0x4
pop {r3,r4}
mov r8, r3
mov r9, r4
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end MEScrCmd_initramscript
thumb_func_start sub_80DAB1C
sub_80DAB1C: @ 80DAB1C
push {r4,lr}
adds r4, r0, 0
bl sub_806E22C
ldr r0, _080DAB38 @ =gStringVar4
ldr r1, _080DAB3C @ =gUnknown_8488D2A
bl StringExpandPlaceholders
movs r0, 0x2
str r0, [r4, 0x6C]
movs r0, 0
pop {r4}
pop {r1}
bx r1
.align 2, 0
_080DAB38: .4byte gStringVar4
_080DAB3C: .4byte gUnknown_8488D2A
thumb_func_end sub_80DAB1C
thumb_func_start MEScrCmd_addrareword
MEScrCmd_addrareword: @ 80DAB40
push {r4,lr}
adds r4, r0, 0
ldr r1, [r4, 0x8]
ldrb r0, [r1]
adds r1, 0x1
str r1, [r4, 0x8]
bl sub_80BDB70
ldr r0, _080DAB64 @ =gStringVar4
ldr r1, _080DAB68 @ =gUnknown_8488D60
bl StringExpandPlaceholders
movs r0, 0x2
str r0, [r4, 0x6C]
movs r0, 0
pop {r4}
pop {r1}
bx r1
.align 2, 0
_080DAB64: .4byte gStringVar4
_080DAB68: .4byte gUnknown_8488D60
thumb_func_end MEScrCmd_addrareword
thumb_func_start sub_80DAB6C
sub_80DAB6C: @ 80DAB6C
push {r4,lr}
adds r4, r0, 0
bl SetIncompatible
movs r0, 0
str r0, [r4, 0x70]
movs r0, 0x1
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_80DAB6C
thumb_func_start sub_80DAB80
sub_80DAB80: @ 80DAB80
push {r4-r7,lr}
mov r7, r8
push {r7}
sub sp, 0x88
adds r6, r0, 0
bl ScriptReadWord
ldr r1, [r6, 0x68]
subs r0, r1
ldr r1, [r6, 0x64]
adds r5, r0, r1
movs r0, 0x64
adds r0, r5
mov r8, r0
add r4, sp, 0x24
adds r0, r4, 0
adds r1, r5, 0
movs r2, 0x64
bl memcpy
adds r0, r4, 0
movs r1, 0x41
bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
movs r0, 0xCE
lsls r0, 1
cmp r4, r0
bne _080DABD0
ldr r0, _080DABC8 @ =gStringVar1
ldr r1, _080DABCC @ =gText_EggNickname
movs r2, 0xB
bl StringCopyN
b _080DABDA
.align 2, 0
_080DABC8: .4byte gStringVar1
_080DABCC: .4byte gText_EggNickname
_080DABD0:
ldr r0, _080DABF0 @ =gStringVar1
ldr r1, _080DABF4 @ =gUnknown_8415A66
movs r2, 0xB
bl StringCopyN
_080DABDA:
ldr r0, _080DABF8 @ =gPlayerPartyCount
ldrb r0, [r0]
cmp r0, 0x6
bne _080DAC04
ldr r0, _080DABFC @ =gStringVar4
ldr r1, _080DAC00 @ =gUnknown_8488D8E
bl StringExpandPlaceholders
movs r0, 0x3
b _080DAC6E
.align 2, 0
_080DABF0: .4byte gStringVar1
_080DABF4: .4byte gUnknown_8415A66
_080DABF8: .4byte gPlayerPartyCount
_080DABFC: .4byte gStringVar4
_080DAC00: .4byte gUnknown_8488D8E
_080DAC04:
ldr r7, _080DAC80 @ =gUnknown_2024478
adds r0, r7, 0
adds r1, r5, 0
movs r2, 0x64
bl memcpy
mov r0, sp
mov r1, r8
movs r2, 0x24
bl memcpy
movs r0, 0xCE
lsls r0, 1
cmp r4, r0
beq _080DAC3E
adds r0, r4, 0
bl SpeciesToNationalPokedexNum
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r4, 0
movs r1, 0x2
bl sub_8088E74
adds r0, r4, 0
movs r1, 0x3
bl sub_8088E74
_080DAC3E:
adds r0, r7, 0
movs r1, 0xC
bl GetMonData
lsls r0, 16
lsrs r0, 16
bl itemid_is_mail
lsls r0, 24
cmp r0, 0
beq _080DAC5C
adds r0, r7, 0
mov r1, sp
bl GiveMailToMon2
_080DAC5C:
bl CompactPartySlots
bl CalculatePlayerPartyCount
ldr r0, _080DAC84 @ =gStringVar4
ldr r1, _080DAC88 @ =gUnknown_8488D7C
bl StringExpandPlaceholders
movs r0, 0x2
_080DAC6E:
str r0, [r6, 0x6C]
movs r0, 0
add sp, 0x88
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r1}
bx r1
.align 2, 0
_080DAC80: .4byte gUnknown_2024478
_080DAC84: .4byte gStringVar4
_080DAC88: .4byte gUnknown_8488D7C
thumb_func_end sub_80DAB80
thumb_func_start sub_80DAC8C
sub_80DAC8C: @ 80DAC8C
push {r4,lr}
adds r4, r0, 0
bl ScriptReadWord
adds r1, r0, 0
ldr r0, [r4, 0x68]
subs r1, r0
ldr r0, [r4, 0x64]
adds r1, r0
ldr r0, _080DACC8 @ =gSaveBlock2Ptr
ldr r0, [r0]
movs r2, 0x94
lsls r2, 3
adds r0, r2
movs r2, 0xBC
bl memcpy
bl sub_80E7490
ldr r0, _080DACCC @ =gStringVar4
ldr r1, _080DACD0 @ =gUnknown_8488DBD
bl StringExpandPlaceholders
movs r0, 0x2
str r0, [r4, 0x6C]
movs r0, 0
pop {r4}
pop {r1}
bx r1
.align 2, 0
_080DACC8: .4byte gSaveBlock2Ptr
_080DACCC: .4byte gStringVar4
_080DACD0: .4byte gUnknown_8488DBD
thumb_func_end sub_80DAC8C
thumb_func_start sub_80DACD4
sub_80DACD4: @ 80DACD4
push {r4,lr}
adds r4, r0, 0
bl SetIncompatible
movs r0, 0
str r0, [r4, 0x70]
movs r0, 0x1
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_80DACD4
thumb_func_start MEScrCmd_checksum
MEScrCmd_checksum: @ 80DACE8
push {r4-r6,lr}
adds r6, r0, 0
bl ScriptReadWord
adds r5, r0, 0
adds r0, r6, 0
bl ScriptReadWord
adds r4, r0, 0
ldr r0, [r6, 0x68]
subs r4, r0
ldr r0, [r6, 0x64]
adds r4, r0
adds r0, r6, 0
bl ScriptReadWord
adds r1, r0, 0
ldr r0, [r6, 0x68]
subs r1, r0
ldr r0, [r6, 0x64]
adds r1, r0
subs r1, r4
adds r0, r4, 0
bl CalcByteArraySum
cmp r5, r0
beq _080DAD26
movs r0, 0
str r0, [r6, 0x70]
movs r0, 0x1
str r0, [r6, 0x6C]
_080DAD26:
movs r0, 0x1
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end MEScrCmd_checksum
thumb_func_start MEScrCmd_crc
MEScrCmd_crc: @ 80DAD30
push {r4-r6,lr}
adds r6, r0, 0
bl ScriptReadWord
adds r5, r0, 0
adds r0, r6, 0
bl ScriptReadWord
adds r4, r0, 0
ldr r0, [r6, 0x68]
subs r4, r0
ldr r0, [r6, 0x64]
adds r4, r0
adds r0, r6, 0
bl ScriptReadWord
adds r1, r0, 0
ldr r0, [r6, 0x68]
subs r1, r0
ldr r0, [r6, 0x64]
adds r1, r0
subs r1, r4
adds r0, r4, 0
bl CalcCRC16
lsls r0, 16
lsrs r0, 16
cmp r5, r0
beq _080DAD72
movs r0, 0
str r0, [r6, 0x70]
movs r0, 0x1
str r0, [r6, 0x6C]
_080DAD72:
movs r0, 0x1
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end MEScrCmd_crc
.align 2, 0 @ Don't pad with nop.

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

View File

@ -241,7 +241,7 @@ sub_8054A60: @ 8054A60
bl PlayTimeCounter_Reset
bl sub_80549AC
bl sub_806E0D0
bl sub_812D304
bl ResetFameChecker
ldr r0, [r6]
movs r1, 0xA4
lsls r1, 2

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

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

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
@ -3727,7 +3727,7 @@ c2_8056854: @ 8056854
ldr r0, _08056878 @ =c1_link_related
bl sub_80565E0
bl sub_80578D8
ldr r0, _0805687C @ =gUnknown_3003F3C
ldr r0, _0805687C @ =gWirelessCommType
ldrb r0, [r0]
cmp r0, 0
beq _08056888
@ -3736,7 +3736,7 @@ c2_8056854: @ 8056854
b _0805688C
.align 2, 0
_08056878: .4byte c1_link_related
_0805687C: .4byte gUnknown_3003F3C
_0805687C: .4byte gWirelessCommType
_08056880: .4byte gUnknown_3005020
_08056884: .4byte sub_807DE58
_08056888:
@ -3892,7 +3892,7 @@ sub_80569BC: @ 80569BC
bne _080569CE
bl sub_80098B8
_080569CE:
ldr r0, _080569E4 @ =gUnknown_3003F3C
ldr r0, _080569E4 @ =gWirelessCommType
ldrb r0, [r0]
cmp r0, 0
beq _080569E8
@ -3902,7 +3902,7 @@ _080569CE:
bl DisableInterrupts
b _080569F4
.align 2, 0
_080569E4: .4byte gUnknown_3003F3C
_080569E4: .4byte gWirelessCommType
_080569E8:
movs r0, 0x2
bl DisableInterrupts
@ -4054,7 +4054,7 @@ _08056B36:
bl cur_mapheader_run_tileset_funcs_after_some_cpuset
b _08056B62
_08056B3C:
ldr r0, _08056B54 @ =gUnknown_3003F3C
ldr r0, _08056B54 @ =gWirelessCommType
ldrb r0, [r0]
cmp r0, 0
beq _08056B62
@ -4064,7 +4064,7 @@ _08056B3C:
bl sub_80FCD74
b _08056B62
.align 2, 0
_08056B54: .4byte gUnknown_3003F3C
_08056B54: .4byte gWirelessCommType
_08056B58:
bl map_post_load_hook_exec
lsls r0, 24
@ -4385,7 +4385,7 @@ _08056E12:
bl cur_mapheader_run_tileset_funcs_after_some_cpuset
b _08056E3E
_08056E18:
ldr r0, _08056E30 @ =gUnknown_3003F3C
ldr r0, _08056E30 @ =gWirelessCommType
ldrb r0, [r0]
cmp r0, 0
beq _08056E3E
@ -4395,7 +4395,7 @@ _08056E18:
bl sub_80FCD74
b _08056E3E
.align 2, 0
_08056E30: .4byte gUnknown_3003F3C
_08056E30: .4byte gWirelessCommType
_08056E34:
bl map_post_load_hook_exec
lsls r0, 24
@ -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,14 +5629,14 @@ _08057876:
pop {r0}
bx r0
.align 2, 0
_0805787C: .4byte gUnknown_2037AB8
_0805787C: .4byte gPaletteFade
_08057880: .4byte sub_805671C
thumb_func_end sub_8057854
thumb_func_start c1_link_related
c1_link_related: @ 8057884
push {r4,lr}
ldr r0, _080578C8 @ =gUnknown_3003F3C
ldr r0, _080578C8 @ =gWirelessCommType
ldrb r0, [r0]
cmp r0, 0
beq _0805789E
@ -5665,7 +5665,7 @@ _080578C0:
pop {r0}
bx r0
.align 2, 0
_080578C8: .4byte gUnknown_3003F3C
_080578C8: .4byte gWirelessCommType
_080578CC: .4byte gUnknown_300502C
_080578D0: .4byte gUnknown_3003E60
_080578D4: .4byte gUnknown_3000E84
@ -5710,7 +5710,7 @@ _0805790C: .4byte gUnknown_3000E84
thumb_func_start sub_8057910
sub_8057910: @ 8057910
push {lr}
ldr r0, _08057934 @ =gUnknown_3003F3C
ldr r0, _08057934 @ =gWirelessCommType
ldrb r0, [r0]
cmp r0, 0
beq _0805792E
@ -5727,7 +5727,7 @@ _0805792E:
pop {r0}
bx r0
.align 2, 0
_08057934: .4byte gUnknown_3003F3C
_08057934: .4byte gWirelessCommType
_08057938: .4byte gUnknown_3000E89
thumb_func_end sub_8057910
@ -6137,7 +6137,7 @@ _08057C6C:
movs r0, 0x11
strh r0, [r1]
_08057C72:
ldr r0, _08057CB4 @ =gUnknown_3003F3C
ldr r0, _08057CB4 @ =gWirelessCommType
ldrb r0, [r0]
cmp r0, 0
beq _08057CA8
@ -6168,7 +6168,7 @@ _08057CA8:
bx r0
.align 2, 0
_08057CB0: .4byte gUnknown_3005028
_08057CB4: .4byte gUnknown_3003F3C
_08057CB4: .4byte gWirelessCommType
thumb_func_end sub_8057C4C
thumb_func_start sub_8057CB8
@ -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:
@ -7089,7 +7089,7 @@ _08058312:
thumb_func_start sub_8058318
sub_8058318: @ 8058318
push {lr}
ldr r0, _08058330 @ =gUnknown_3003F3C
ldr r0, _08058330 @ =gWirelessCommType
ldrb r0, [r0]
cmp r0, 0
bne _08058334
@ -7099,7 +7099,7 @@ sub_8058318: @ 8058318
movs r0, 0x1
b _08058336
.align 2, 0
_08058330: .4byte gUnknown_3003F3C
_08058330: .4byte gWirelessCommType
_08058334:
movs r0, 0
_08058336:
@ -7110,7 +7110,7 @@ _08058336:
thumb_func_start sub_805833C
sub_805833C: @ 805833C
push {lr}
ldr r0, _08058350 @ =gUnknown_3003F3C
ldr r0, _08058350 @ =gWirelessCommType
ldrb r0, [r0]
cmp r0, 0
bne _0805835C
@ -7120,7 +7120,7 @@ sub_805833C: @ 805833C
ldrb r0, [r0]
b _08058364
.align 2, 0
_08058350: .4byte gUnknown_3003F3C
_08058350: .4byte gWirelessCommType
_08058354: .4byte gUnknown_3003FB0
_08058358: .4byte 0x00000339
_0805835C:

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

File diff suppressed because it is too large Load Diff

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

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

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