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

Merge branch 'master' into slot_machine

Browse Source
This commit is contained in:
PikalaxALT
2019-07-29 21:10:54 -04:00
parent ef4c86fbfd d4cc0e161b
commit e130a00cdf
2917 changed files with 162856 additions and 112104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitattributes
+4
View File
@@ -11,6 +11,10 @@ Makefile text eol=lf
*.sha1 text eol=lf
*.sed text eol=lf
*.sh text eol=lf
*.json text eol=lf
*.png binary
*.bin binary
*.h linguist-language=C
*.inc linguist-language=Assembly
.gitignore
+37 -30
View File
@@ -1,43 +1,50 @@
*.exe
*.o
*.i
*.elf
*.gba
*.1bpp
*.4bpp
*.8bpp
*.gbapal
*.lz
*.rl
*.pcm
*.latfont
*.hwjpnfont
*.fwjpnfont
*.DS_Store
*.bak
*.bat
sound/**/*.bin
src/*.s
tools/agbcc
tools/binutils
ld_script_ruby.txt
ld_script_sapphire.txt
*.map
*.diff
*.dump
*.elf
*.exe
*.fwjpnfont
*.gba
*.gbapal
*.hwjpnfont
*.i
*.id0
*.id1
*.id2
*.nam
*.til
*.latfont
*.ld
tags
types_*.taghl
*.swp
*.swo
*.lz
*.map
*.nam
*.o
*.pcm
*.pl
*.rl
*.s.old
*.s.old2
*.dump
*.sa*
*.swo
*.swp
*.til
.fuse*
.idea/
Thumbs.db
build/
.idea/
*.DS_Store
*.pl
*.bak
cmake-build-*
ld_script_ruby.txt
ld_script_sapphire.txt
sound/**/*.bin
src/*.s
src/data/items.h
tags
tools/agbcc
tools/binutils
tools/br_ips/br_ips
tools/br_ips/ips_patch
types_*.taghl
!.travis/calcrom/calcrom.pl
.travis.yml
+35
View File
@@ -0,0 +1,35 @@
language: generic
dist: trusty
sudo: false
addons:
apt:
packages:
- gcc-multilib
- linux-libc-dev
- zlib-dev
cache:
apt: true
install:
- pushd $HOME
- travis_retry git clone https://github.com/luckytyphlosion/agbcc.git -b new_layout_with_libs
- cd agbcc && make && make install prefix=$TRAVIS_BUILD_DIR
- popd
matrix:
include:
- os: linux
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-7
env: _="Build"
script:
- head -c 16777216 /dev/zero > tmp.bin
- make ips_patch -C tools/br_ips
- tools/br_ips/ips_patch tmp.bin baserom.ips baserom.gba
- rm tmp.bin
- make tools CXX=g++-7
- make -j2 compare
after_success:
- .travis/calcrom/webhook.sh pokefirered
.travis/calcrom/calcrom.pl
+120
View File
@@ -0,0 +1,120 @@
#!/usr/bin/perl
use IPC::Cmd qw[ run ];
(@ARGV == 1)
or die "ERROR: no map file specified.\n";
open(my $file, $ARGV[0])
or die "ERROR: could not open file '$ARGV[0]'.\n";
my $src = 0;
my $asm = 0;
while (my $line = <$file>)
{
if ($line =~ /^ \.(\w+)\s+0x[0-9a-f]+\s+(0x[0-9a-f]+) (\w+)\/.+\.o/)
{
my $section = $1;
my $size = hex($2);
my $dir = $3;
if ($section =~ /text/)
{
if ($dir eq 'src')
{
$src += $size;
}
elsif ($dir eq 'asm')
{
$asm += $size;
}
}
}
}
# Note that the grep filters out all branch labels. It also requires a minimum
# line length of 5, to filter out a ton of generated symbols (like AcCn). No
# settings to nm seem to remove these symbols. Finally, nm prints out a separate
# entry for whenever a name appears in a file, not just where it's defined. uniq
# removes all the duplicate entries.
#
#
# You'd expect this to take a while, because of uniq. It runs in under a second,
# though. Uniq is pretty fast!
my $base_cmd = "nm pokefirered.elf | awk '{print \$3}' | grep '^[^_].\\{4\\}' | uniq";
# This looks for Unknown_, Unknown_, or sub_, followed by just numbers. Note that
# it matches even if stuff precedes the unknown, like sUnknown/gUnknown.
my $undoc_cmd = "grep '[Uu]nknown_[0-9a-fA-F]*\\|sub_[0-9a-fA-F]*'";
# This looks for every symbol with an address at the end of it. Some things are
# given a name based on their type / location, but still have an unknown purpose.
# For example, FooMap_EventScript_FFFFFFF.
my $partial_doc_cmd = "grep '[0-9a-fA-F]\\{6,7\\}'";
my $count_cmd = "wc -l";
# It sucks that we have to run this three times, but I can't figure out how to get
# stdin working for subcommands in perl while still having a timeout. It's decently
# fast anyway.
my $total_syms_as_string;
(run (
command => "$base_cmd | $count_cmd",
buffer => \$total_syms_as_string,
timeout => 60
))
or die "ERROR: Error while getting all symbols: $?";
my $undocumented_as_string;
(run (
command => "$base_cmd | $undoc_cmd | $count_cmd",
buffer => \$undocumented_as_string,
timeout => 60
))
or die "ERROR: Error while filtering for undocumented symbols: $?";
my $partial_documented_as_string;
(run (
command => "$base_cmd | $partial_doc_cmd | $count_cmd",
buffer => \$partial_documented_as_string,
timeout => 60
))
or die "ERROR: Error while filtering for partial symbols: $?";
# Performing addition on a string converts it to a number. Any string that fails
# to convert to a number becomes 0. So if our converted number is 0, but our string
# is nonzero, then the conversion was an error.
my $undocumented = $undocumented_as_string + 0;
(($undocumented != 0) and ($undocumented_as_string ne "0"))
or die "ERROR: Cannot convert string to num: '$undocumented_as_string'";
my $partial_documented = $partial_documented_as_string + 0;
(($partial_documented != 0) and ($partial_documented_as_string ne "0"))
or die "ERROR: Cannot convert string to num: '$partial_documented_as_string'";
my $total_syms = $total_syms_as_string + 0;
(($total_syms != 0) and ($total_syms_as_string ne "0"))
or die "ERROR: Cannot convert string to num: '$total_syms_as_string'";
($total_syms != 0)
or die "ERROR: No symbols found.";
my $total = $src + $asm;
my $srcPct = sprintf("%.4f", 100 * $src / $total);
my $asmPct = sprintf("%.4f", 100 * $asm / $total);
# partial_documented is double-counting the unknown_* and sub_* symbols.
$partial_documented = $partial_documented - $undocumented;
my $documented = $total_syms - ($undocumented + $partial_documented);
my $docPct = sprintf("%.4f", 100 * $documented / $total_syms);
my $partialPct = sprintf("%.4f", 100 * $partial_documented / $total_syms);
my $undocPct = sprintf("%.4f", 100 * $undocumented / $total_syms);
print "$total total bytes of code\n";
print "$src bytes of code in src ($srcPct%)\n";
print "$asm bytes of code in asm ($asmPct%)\n";
print "\n";
print "$total_syms total symbols\n";
print "$documented symbols documented ($docPct%)\n";
print "$partial_documented symbols partially documented ($partialPct%)\n";
print "$undocumented symbols undocumented ($undocPct%)\n";
.travis/calcrom/webhook.sh
Executable
+16
View File
@@ -0,0 +1,16 @@
#!/bin/bash -ex
# Only run this script if it's the master branch build.
if [[ "$TRAVIS_BRANCH" != "master" || "$TRAVIS_PULL_REQUEST" != "false" ]]; then
exit 0
fi
build_name=$1
map_file=$build_name.map
if [ ! -f $map_file ]; then
echo "$map_file does not exist!"
exit 1
fi
output=$(perl $(dirname "$0")/calcrom.pl $build_name.map | sed -E ':a;N;$!ba;s/\r{0,1}\n/\\n/g')
curl -d "{\"username\": \"$CALCROM_DISCORD_WEBHOOK_USERNAME\", \"avatar_url\": \"$CALCROM_DISCORD_WEBHOOK_AVATAR_URL\", \"content\":\"\`\`\`$build_name progress:\\n$output\`\`\`\"}" -H "Content-Type: application/json" -X POST $CALCROM_DISCORD_WEBHOOK_URL
INSTALL.md
+21 -9
View File
@@ -1,16 +1,19 @@
## Prerequisites
Until further notice, this repository requires a **baserom.gba** file, which must be [a legitimate copy of English Pokémon FireRed v1.0](https://datomatic.no-intro.org/?page=show_record&s=23&n=1616). See [this article](https://www.howtogeek.com/67241/htg-explains-what-are-md5-sha-1-hashes-and-how-do-i-check-them/) for help on how to verify the checksum.
| Linux | macOS | Windows 10 (build 18917+) | Windows 10 (1709+) | Windows Vista, 7, 8, 8.1, and 10 (1507, 1511, 1607, 1703)
| ----- | ----- | ------------------------- | ------------------ | ---------------------------------------------------------
| none | [Xcode Command Line Tools package][xcode] | [Windows Subsystem for Linux 2][wsl2] | [Windows Subsystem for Linux][wsl] | [Cygwin][cygwin]
----
[xcode]: https://developer.apple.com/library/archive/technotes/tn2339/_index.html#//apple_ref/doc/uid/DTS40014588-CH1-DOWNLOADING_COMMAND_LINE_TOOLS_IS_NOT_AVAILABLE_IN_XCODE_FOR_MACOS_10_9__HOW_CAN_I_INSTALL_THEM_ON_MY_MACHINE_
[wsl2]: https://docs.microsoft.com/windows/wsl/wsl2-install
[wsl]: https://docs.microsoft.com/windows/wsl/install-win10
[cygwin]: https://cygwin.com/install.html
**Linux:** Proceed to [Installation](#installation).
The [prerelease version of the Linux subsystem](https://docs.microsoft.com/windows/wsl/install-legacy) available in the 1607 and 1703 releases of Windows 10 is obsolete so consider uninstalling it.
**macOS:** Get the [Xcode command-line tools](https://developer.apple.com/library/archive/technotes/tn2339/_index.html#//apple_ref/doc/uid/DTS40014588-CH1-DOWNLOADING_COMMAND_LINE_TOOLS_IS_NOT_AVAILABLE_IN_XCODE_FOR_MACOS_10_9__HOW_CAN_I_INSTALL_THEM_ON_MY_MACHINE_).
Make sure that the `build-essential`, `git`, and `libpng-dev` packages are installed. The `build-essential` package includes the `make`, `gcc-core`, and `g++` packages so they do not have to be obtained separately.
**Windows 10 (1709+):** Get the [Windows Subsystem for Linux](https://docs.microsoft.com/windows/wsl/install-win10).
**Windows Vista, 7, 8, 8.1, and 10 (1507, 1511, 1607, 1703):** Get [Cygwin](https://cygwin.com/install.html) and [include](https://cygwin.com/cygwin-ug-net/setup-net.html#setup-packages) the `make`, `git`, `gcc-core`, `gcc-g++`, and `libpng-devel` packages. If you're on Windows 10 1607 or 1703 and use [the prerelease version of the Linux subsystem](https://docs.microsoft.com/windows/wsl/install-legacy), consider uninstalling it.
In the case of Cygwin, [include](https://cygwin.com/cygwin-ug-net/setup-net.html#setup-packages) the `make`, `git`, `gcc-core`, `gcc-g++`, and `libpng-devel` packages.
## Installation
@@ -26,7 +29,6 @@ To set up the repository:
make install-sdk prefix=../pokefirered
cd ../pokefirered
./build_tools.sh
To build **pokefirered.gba**:
@@ -36,8 +38,18 @@ To confirm it matches the official ROM image while building, do this instead:
make compare -j$(nproc)
**Note:** If only `.c` or `.s` files were changed, turn off the dependency scanning temporarily. Changes to any other files will be ignored and the build will either fail or not reflect those changes.
If only `.c` or `.s` files were changed, turn off the dependency scanning temporarily. Changes to any other files will be ignored and the build will either fail or not reflect those changes.
make -j$(nproc) NODEP=1
**Note (until further notice):** If this is your first time building Pokemon FireRed, an unmodified copy of Pokemon FireRed is required in the project root under the name `baserom.gba`. To generate this, you should run the following commands:
make ips_patch -C tools/br_ips
head -c 16777216 /dev/zero > tmp.bin
tools/br_ips/ips_patch tmp.bin baserom.ips baserom.gba
make compare -j$(nproc)
cp pokefirered.gba baserom.gba
Alternatively, you can obtain an unmodified copy of Pokemon FireRed and use that as baserom.gba. Make sure the SHA1 checksum matches with what's provided in [the README](README.md).
**Note 2:** If the build command is not recognized on Linux, including the Linux environment used within Windows, run `nproc` and replace `$(nproc)` with the returned value (e.g.: `make -j4`). Because `nproc` is not available on macOS, the alternative is `sysctl -n hw.ncpu`.
Makefile
+53 -8
View File
@@ -3,15 +3,41 @@ CPP := $(CC) -E
LD := tools/binutils/bin/arm-none-eabi-ld
OBJCOPY := tools/binutils/bin/arm-none-eabi-objcopy
GAME_VERSION := FIRERED
REVISION := 0
GAME_LANGUAGE := ENGLISH
# So long as baserom.gba is required, we error out if the
# user tries to build any ROM other than FireRed.
ifneq ($(GAME_VERSION),FIRERED)
$(error We can only build English Pokemon FireRed v1.0 currently)
else ifneq ($(REVISION),0)
$(error We can only build English Pokemon FireRed v1.0 currently)
else ifneq ($(GAME_LANGUAGE),ENGLISH)
$(error We can only build English Pokemon FireRed v1.0 currently)
endif
ifeq ($(GAME_VERSION),FIRERED)
TITLE := POKEMON FIRE
GAME_CODE := BPRE
GAME_CODE := BPR
BUILD_NAME := firered
else
TITLE := POKEMON LEAF
GAME_CODE := BPL
BUILD_NAME := leafgreen
endif
ifeq ($(GAME_LANGUAGE),ENGLISH)
GAME_CODE := $(GAME_CODE)E
endif
ifneq ($(REVISION),0)
BUILD_NAME := $(BUILD_NAME)_rev$(REVISION)
endif
MAKER_CODE := 01
REVISION := 0
SHELL := /bin/bash -o pipefail
ROM := pokefirered.gba
OBJ_DIR := build/firered
ROM := poke$(BUILD_NAME).gba
OBJ_DIR := build/$(BUILD_NAME)
ELF = $(ROM:.gba=.elf)
MAP = $(ROM:.gba=.map)
@@ -26,12 +52,12 @@ ASM_BUILDDIR = $(OBJ_DIR)/$(ASM_SUBDIR)
DATA_ASM_BUILDDIR = $(OBJ_DIR)/$(DATA_ASM_SUBDIR)
SONG_BUILDDIR = $(OBJ_DIR)/$(SONG_SUBDIR)
ASFLAGS := -mcpu=arm7tdmi
ASFLAGS := -mcpu=arm7tdmi --defsym $(GAME_VERSION)=1 --defsym REVISION=$(REVISION) --defsym $(GAME_LANGUAGE)=1
CC1 := tools/agbcc/bin/agbcc
override CFLAGS += -mthumb-interwork -Wimplicit -Wparentheses -Werror -O2 -fhex-asm
CPPFLAGS := -I tools/agbcc -I tools/agbcc/include -iquote include -nostdinc -undef
CPPFLAGS := -I tools/agbcc -I tools/agbcc/include -iquote include -nostdinc -undef -D$(GAME_VERSION) -DREVISION=$(REVISION) -D$(GAME_LANGUAGE)
LDFLAGS = -Map ../../$(MAP)
@@ -46,6 +72,7 @@ PREPROC := tools/preproc/preproc
RAMSCRGEN := tools/ramscrgen/ramscrgen
FIX := tools/gbafix/gbafix
MAPJSON := tools/mapjson/mapjson
JSONPROC := tools/jsonproc/jsonproc
# Clear the default suffixes
.SUFFIXES:
@@ -61,6 +88,16 @@ MAPJSON := tools/mapjson/mapjson
$(shell mkdir -p $(C_BUILDDIR) $(ASM_BUILDDIR) $(DATA_ASM_BUILDDIR) $(SONG_BUILDDIR))
infoshell = $(foreach line, $(shell $1 | sed "s/ /__SPACE__/g"), $(info $(subst __SPACE__, ,$(line))))
# Build tools when building the rom
# Disable dependency scanning for clean/tidy/tools
ifeq (,$(filter-out all compare,$(MAKECMDGOALS)))
$(call infoshell, $(MAKE) tools)
else
NODEP := 1
endif
C_SRCS := $(wildcard $(C_SUBDIR)/*.c)
C_OBJS := $(patsubst $(C_SUBDIR)/%.c,$(C_BUILDDIR)/%.o,$(C_SRCS))
@@ -76,6 +113,10 @@ SONG_OBJS := $(patsubst $(SONG_SUBDIR)/%.s,$(SONG_BUILDDIR)/%.o,$(SONG_SRCS))
OBJS := $(C_OBJS) $(ASM_OBJS) $(DATA_ASM_OBJS) $(SONG_OBJS)
OBJS_REL := $(patsubst $(OBJ_DIR)/%,%,$(OBJS))
MAKEFLAGS += --no-print-directory
AUTO_GEN_TARGETS :=
all: rom
rom: $(ROM)
@@ -91,6 +132,7 @@ tools:
@$(MAKE) -C tools/mid2agb
@$(MAKE) -C tools/gbafix
@$(MAKE) -C tools/mapjson
@$(MAKE) -C tools/jsonproc
# For contributors to make sure a change didn't affect the contents of the ROM.
compare: rom
@@ -103,6 +145,7 @@ clean: tidy
rm -f $(DATA_ASM_SUBDIR)/layouts/layouts.inc $(DATA_ASM_SUBDIR)/layouts/layouts_table.inc
rm -f $(DATA_ASM_SUBDIR)/maps/connections.inc $(DATA_ASM_SUBDIR)/maps/events.inc $(DATA_ASM_SUBDIR)/maps/groups.inc $(DATA_ASM_SUBDIR)/maps/headers.inc
find $(DATA_ASM_SUBDIR)/maps \( -iname 'connections.inc' -o -iname 'events.inc' -o -iname 'header.inc' \) -exec rm {} +
rm -f $(AUTO_GEN_TARGETS)
@$(MAKE) clean -C berry_fix
@$(MAKE) clean -C tools/gbagfx
@$(MAKE) clean -C tools/scaninc
@@ -114,6 +157,7 @@ clean: tidy
@$(MAKE) clean -C tools/mid2agb
@$(MAKE) clean -C tools/gbafix
@$(MAKE) clean -C tools/mapjson
@$(MAKE) clean -C tools/jsonproc
tidy:
rm -f $(ROM) $(ELF) $(MAP)
@@ -123,6 +167,7 @@ tidy:
include graphics_file_rules.mk
include tileset_rules.mk
include map_data_rules.mk
include json_data_rules.mk
%.s: ;
%.png: ;
@@ -199,10 +244,10 @@ $(OBJ_DIR)/ld_script.ld: ld_script.txt $(OBJ_DIR)/sym_bss.ld $(OBJ_DIR)/sym_comm
$(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS)
cd $(OBJ_DIR) && ../../$(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(LIB)
$(FIX) $@ -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) --silent
$(ROM): $(ELF)
$(OBJCOPY) -O binary $< $@
$(FIX) $@ -p -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) --silent
$(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $< $@
berry_fix/berry_fix.gba:
@$(MAKE) -C berry_fix
asm/battle_1.s
+6 -6
View File
@@ -223,11 +223,11 @@ sub_800F380: @ 800F380
movs r0, 0x2
movs r1, 0x12
movs r2, 0x10
bl sub_815001C
bl TextWindow_SetUserSelectedFrame
movs r0, 0x2
movs r1, 0x22
movs r2, 0x10
bl sub_815001C
bl TextWindow_SetUserSelectedFrame
ldr r4, _0800F3F0 @ =gPlttBufferUnfaded
adds r0, r4, 0
adds r0, 0xB8
@@ -257,7 +257,7 @@ sub_800F380: @ 800F380
movs r0, 0
movs r1, 0x30
movs r2, 0x70
bl sub_814FEAC
bl TextWindow_LoadResourcesStdFrame0
adds r0, r4, 0
adds r0, 0xEC
movs r1, 0
@@ -517,7 +517,7 @@ _0800F5C8: .4byte 0x00006001
thumb_func_start sub_800F5CC
sub_800F5CC: @ 800F5CC
push {lr}
ldr r0, _0800F5E0 @ =gUnknown_2023E8A
ldr r0, _0800F5E0 @ =gBattleOutcome
ldrb r2, [r0]
cmp r2, 0x3
bne _0800F5E8
@@ -526,7 +526,7 @@ sub_800F5CC: @ 800F5CC
bl sub_80D87BC
b _0800F6F0
.align 2, 0
_0800F5E0: .4byte gUnknown_2023E8A
_0800F5E0: .4byte gBattleOutcome
_0800F5E4: .4byte gUnknown_83FE883
_0800F5E8:
ldr r0, _0800F61C @ =gBattleTypeFlags
@@ -1197,7 +1197,7 @@ sub_800FAE0: @ 800FAE0
ldr r0, _0800FB8C @ =gBattle_BG2_Y
strh r1, [r0]
ldr r0, _0800FB90 @ =gUnknown_8248318
bl sub_800F034
bl LoadCompressedSpriteSheetUsingHeap
b _0800FC26
.align 2, 0
_0800FB64: .4byte gBattleTypeFlags
asm/battle_2.s
+39 -39
View File
@@ -1132,7 +1132,7 @@ _0801067E:
adds r1, r0
ldrh r0, [r1]
strh r0, [r2, 0x10]
bl sub_8044708
bl SetDeoxysStats
ldr r1, _080106F0 @ =gUnknown_2023E82
b _080108B2
.align 2, 0
@@ -1834,7 +1834,7 @@ _08010CE2:
adds r1, r7, 0
bl sub_8010414
bl sub_801017C
bl sub_8044708
bl SetDeoxysStats
ldr r0, _08010D4C @ =gDecompressionBuffer
ldr r1, _08010D50 @ =gPlayerParty
movs r2, 0x96
@@ -2093,13 +2093,13 @@ _08010EE4:
bl bitmask_all_link_players_but_self
lsls r0, 24
lsrs r0, 24
ldr r1, _08010EF8 @ =gUnknown_201C0C8
ldr r1, _08010EF8 @ =gDecompressionBuffer + 0x0C8
movs r2, 0x64
bl SendBlock
ldr r1, _08010EFC @ =gUnknown_2023E82
b _080110EA
.align 2, 0
_08010EF8: .4byte gUnknown_201C0C8
_08010EF8: .4byte gDecompressionBuffer + 0x0C8
_08010EFC: .4byte gUnknown_2023E82
_08010F00:
bl GetBlockReceivedStatus
@@ -2376,7 +2376,7 @@ sub_8011100: @ 8011100
cmp r0, 0
beq _08011158
ldr r2, _08011168 @ =gSpecialVar_Result
ldr r1, _0801116C @ =gUnknown_2023E8A
ldr r1, _0801116C @ =gBattleOutcome
movs r0, 0x3
strb r0, [r1]
movs r0, 0x3
@@ -2399,7 +2399,7 @@ _08011158:
_08011160: .4byte gMain
_08011164: .4byte gBattleTypeFlags
_08011168: .4byte gSpecialVar_Result
_0801116C: .4byte gUnknown_2023E8A
_0801116C: .4byte gBattleOutcome
_08011170: .4byte CB2_QuitRecordedBattle
thumb_func_end sub_8011100
@@ -4511,7 +4511,7 @@ _080121D4: .4byte SpriteCB_HealthBoxBounce
_080121D8: .4byte gUnknown_3004FF0
_080121DC: .4byte gSprites
_080121E0:
ldr r0, _0801224C @ =gUnknown_2023D44
ldr r0, _0801224C @ =gBattlerSpriteIds
adds r0, r4, r0
ldrb r7, [r0]
ldr r2, _08012250 @ =gUnknown_2024018
@@ -4567,7 +4567,7 @@ _0801223C:
pop {r0}
bx r0
.align 2, 0
_0801224C: .4byte gUnknown_2023D44
_0801224C: .4byte gBattlerSpriteIds
_08012250: .4byte gUnknown_2024018
_08012254: .4byte gSprites
thumb_func_end dp11b_obj_instanciate
@@ -4966,7 +4966,7 @@ _08012522:
strb r0, [r2, 0x1D]
ldr r0, _08012724 @ =gUnknown_2023D72
strb r1, [r0]
ldr r2, _08012728 @ =gUnknown_2023E8A
ldr r2, _08012728 @ =gBattleOutcome
strb r1, [r2]
ldr r0, _0801272C @ =gUnknown_2023BC8
str r1, [r0]
@@ -5194,7 +5194,7 @@ _08012718: .4byte 0x00010002
_0801271C: .4byte gSaveBlock2Ptr
_08012720: .4byte gBattleScripting
_08012724: .4byte gUnknown_2023D72
_08012728: .4byte gUnknown_2023E8A
_08012728: .4byte gBattleOutcome
_0801272C: .4byte gUnknown_2023BC8
_08012730: .4byte gUnknown_2023E7E
_08012734: .4byte gUnknown_2023E82
@@ -6570,7 +6570,7 @@ _080131F6:
add r1, r10
ldr r2, [r1]
movs r1, 0x2
bl sub_8044898
bl HandleSetPokedexFlag
b _080132C2
.align 2, 0
_08013230: .4byte gBaseStats
@@ -6609,7 +6609,7 @@ _0801324C:
add r1, r10
ldr r2, [r1]
movs r1, 0x2
bl sub_8044898
bl HandleSetPokedexFlag
b _080132B4
_0801328E:
ldr r0, _08013324 @ =0x0001aa02
@@ -6628,7 +6628,7 @@ _0801328E:
add r1, r10
ldr r2, [r1]
movs r1, 0x2
bl sub_8044898
bl HandleSetPokedexFlag
_080132B4:
movs r0, 0
bl EmitLoadMonSprite
@@ -7097,7 +7097,7 @@ _0801364C:
adds r1, r7
ldr r2, [r1]
movs r1, 0x2
bl sub_8044898
bl HandleSetPokedexFlag
_08013684:
ldrb r0, [r4]
adds r0, 0x1
@@ -7783,7 +7783,7 @@ sub_8013BD4: @ 8013BD4
push {r5-r7}
movs r0, 0x1
bl TurnValuesCleanUp
ldr r0, _08013C78 @ =gUnknown_2023E8A
ldr r0, _08013C78 @ =gBattleOutcome
ldrb r0, [r0]
cmp r0, 0
bne _08013C04
@@ -7844,7 +7844,7 @@ _08013C58:
subs r0, 0x1
cmp r0, r1
bge _08013C58
ldr r0, _08013C78 @ =gUnknown_2023E8A
ldr r0, _08013C78 @ =gBattleOutcome
ldrb r0, [r0]
cmp r0, 0
beq _08013CB0
@@ -7856,7 +7856,7 @@ _08013C58:
str r0, [r1]
b _08013D20
.align 2, 0
_08013C78: .4byte gUnknown_2023E8A
_08013C78: .4byte gBattleOutcome
_08013C7C: .4byte gBattleStruct
_08013C80: .4byte gUnknown_2023DD0
_08013C84: .4byte 0xfffffdff
@@ -10971,7 +10971,7 @@ _080155C4: .4byte gBattleResources
thumb_func_start RunTurnActionsFunctions
RunTurnActionsFunctions: @ 80155C8
push {r4-r6,lr}
ldr r6, _0801561C @ =gUnknown_2023E8A
ldr r6, _0801561C @ =gBattleOutcome
ldrb r0, [r6]
ldr r2, _08015620 @ =gUnknown_2023BE3
cmp r0, 0
@@ -11012,7 +11012,7 @@ _080155D8:
str r0, [r3]
b _0801565C
.align 2, 0
_0801561C: .4byte gUnknown_2023E8A
_0801561C: .4byte gBattleOutcome
_08015620: .4byte gUnknown_2023BE3
_08015624: .4byte gBattleStruct
_08015628: .4byte gUnknown_2023BE2
@@ -11058,7 +11058,7 @@ sub_8015670: @ 8015670
cmp r0, 0
beq _080156C4
ldr r1, _080156B0 @ =gBattleTextBuff1
ldr r4, _080156B4 @ =gUnknown_2023E8A
ldr r4, _080156B4 @ =gBattleOutcome
ldrb r0, [r4]
strb r0, [r1]
movs r0, 0
@@ -11077,7 +11077,7 @@ sub_8015670: @ 8015670
_080156A8: .4byte gUnknown_2023BE3
_080156AC: .4byte gBattleTypeFlags
_080156B0: .4byte gBattleTextBuff1
_080156B4: .4byte gUnknown_2023E8A
_080156B4: .4byte gBattleOutcome
_080156B8: .4byte sBattler_AI
_080156BC: .4byte gUnknown_2023D74
_080156C0: .4byte gUnknown_81D88CC
@@ -11181,7 +11181,7 @@ sub_801578C: @ 801578C
cmp r0, 0
beq _080157E0
ldr r1, _080157CC @ =gBattleTextBuff1
ldr r4, _080157D0 @ =gUnknown_2023E8A
ldr r4, _080157D0 @ =gBattleOutcome
ldrb r0, [r4]
strb r0, [r1]
movs r0, 0
@@ -11200,7 +11200,7 @@ sub_801578C: @ 801578C
_080157C4: .4byte gUnknown_2023BE3
_080157C8: .4byte gBattleTypeFlags
_080157CC: .4byte gBattleTextBuff1
_080157D0: .4byte gUnknown_2023E8A
_080157D0: .4byte gBattleOutcome
_080157D4: .4byte sBattler_AI
_080157D8: .4byte gUnknown_2023D74
_080157DC: .4byte gUnknown_81D88CC
@@ -11496,7 +11496,7 @@ sub_8015A30: @ 8015A30
ldrb r0, [r0]
cmp r0, 0
beq _08015A52
ldr r0, _08015A60 @ =gUnknown_2023E8A
ldr r0, _08015A60 @ =gBattleOutcome
ldrb r0, [r0]
cmp r0, 0x1
beq _08015A6C
@@ -11507,7 +11507,7 @@ _08015A52:
.align 2, 0
_08015A58: .4byte gPaletteFade
_08015A5C: .4byte gUnknown_3004FD4
_08015A60: .4byte gUnknown_2023E8A
_08015A60: .4byte gBattleOutcome
_08015A64: .4byte gUnknown_3004F84
_08015A68: .4byte ReturnFromBattleToOverworld
_08015A6C:
@@ -11653,7 +11653,7 @@ _08015B74:
bne _08015BD4
_08015B86:
ldr r1, _08015BE8 @ =gSpecialVar_Result
ldr r5, _08015BEC @ =gUnknown_2023E8A
ldr r5, _08015BEC @ =gBattleOutcome
ldrb r0, [r5]
strh r0, [r1]
ldr r3, _08015BF0 @ =gMain
@@ -11698,7 +11698,7 @@ _08015BDC: .4byte gBattleTypeFlags
_08015BE0: .4byte gPlayerParty
_08015BE4: .4byte gReceivedRemoteLinkPlayers
_08015BE8: .4byte gSpecialVar_Result
_08015BEC: .4byte gUnknown_2023E8A
_08015BEC: .4byte gBattleOutcome
_08015BF0: .4byte gMain
_08015BF4: .4byte 0x00000439
_08015BF8: .4byte gUnknown_3004F80
@@ -13212,7 +13212,7 @@ _0801687A:
ldr r0, _0801689C @ =gBattlersCount
ldrb r0, [r0]
strb r0, [r1]
ldr r1, _080168A0 @ =gUnknown_2023E8A
ldr r1, _080168A0 @ =gBattleOutcome
movs r0, 0x4
strb r0, [r1]
_0801688C:
@@ -13224,7 +13224,7 @@ _0801688C:
_08016894: .4byte gBattleStruct
_08016898: .4byte gUnknown_2023BE2
_0801689C: .4byte gBattlersCount
_080168A0: .4byte gUnknown_2023E8A
_080168A0: .4byte gBattleOutcome
thumb_func_end sub_8016748
thumb_func_start sub_80168A4
@@ -13254,7 +13254,7 @@ sub_80168A4: @ 80168A4
beq _08016938
adds r4, r2, 0
ldr r6, _0801690C @ =gUnknown_2023D7C
ldr r5, _08016910 @ =gUnknown_2023E8A
ldr r5, _08016910 @ =gBattleOutcome
_080168D8:
ldrb r0, [r4]
bl GetBattlerSide
@@ -13277,7 +13277,7 @@ _08016900: .4byte gBattleTypeFlags
_08016904: .4byte gBattlersCount
_08016908: .4byte gActiveBattler
_0801690C: .4byte gUnknown_2023D7C
_08016910: .4byte gUnknown_2023E8A
_08016910: .4byte gBattleOutcome
_08016914:
ldrb r0, [r4]
adds r0, r6
@@ -13300,7 +13300,7 @@ _08016926:
cmp r0, r1
bcc _080168D8
_08016938:
ldr r0, _08016948 @ =gUnknown_2023E8A
ldr r0, _08016948 @ =gBattleOutcome
ldrb r1, [r0]
movs r2, 0x80
orrs r1, r2
@@ -13308,7 +13308,7 @@ _08016938:
b _080169D8
.align 2, 0
_08016944: .4byte gBattlersCount
_08016948: .4byte gUnknown_2023E8A
_08016948: .4byte gBattleOutcome
_0801694C:
ldrb r0, [r4]
bl GetBattlerSide
@@ -13368,7 +13368,7 @@ _080169CC:
ldr r0, _080169E0 @ =gBattlersCount
ldrb r0, [r0]
strb r0, [r5]
ldr r1, _080169E4 @ =gUnknown_2023E8A
ldr r1, _080169E4 @ =gBattleOutcome
movs r0, 0x6
_080169D6:
strb r0, [r1]
@@ -13378,7 +13378,7 @@ _080169D8:
bx r0
.align 2, 0
_080169E0: .4byte gBattlersCount
_080169E4: .4byte gUnknown_2023E8A
_080169E4: .4byte gBattleOutcome
thumb_func_end sub_80168A4
thumb_func_start sub_80169E8
@@ -13497,7 +13497,7 @@ sub_8016AC0: @ 8016AC0
strh r1, [r0]
ldr r0, _08016B08 @ =gBattle_BG0_Y
strh r1, [r0]
ldr r1, _08016B0C @ =gUnknown_2039994
ldr r1, _08016B0C @ =gNumSafariBalls
ldrb r0, [r1]
subs r0, 0x1
strb r0, [r1]
@@ -13518,7 +13518,7 @@ _08016AFC: .4byte gUnknown_2023BDE
_08016B00: .4byte gUnknown_2023BE2
_08016B04: .4byte gBattle_BG0_X
_08016B08: .4byte gBattle_BG0_Y
_08016B0C: .4byte gUnknown_2039994
_08016B0C: .4byte gNumSafariBalls
_08016B10: .4byte gUnknown_2023D68
_08016B14: .4byte gUnknown_2023D74
_08016B18: .4byte gUnknown_81D99B0
@@ -13690,7 +13690,7 @@ HandleAction_SafriZoneRun: @ 8016C60
ldr r0, _08016C94 @ =gBattlersCount
ldrb r0, [r0]
strb r0, [r4]
ldr r1, _08016C98 @ =gUnknown_2023E8A
ldr r1, _08016C98 @ =gBattleOutcome
movs r0, 0x4
strb r0, [r1]
pop {r4}
@@ -13701,7 +13701,7 @@ _08016C88: .4byte sBattler_AI
_08016C8C: .4byte gUnknown_2023BDE
_08016C90: .4byte gUnknown_2023BE2
_08016C94: .4byte gBattlersCount
_08016C98: .4byte gUnknown_2023E8A
_08016C98: .4byte gBattleOutcome
thumb_func_end HandleAction_SafriZoneRun
thumb_func_start HandleAction_Action9
asm/battle_anim.s
+99 -99
View File
@@ -20,7 +20,7 @@ ClearBattleAnimationVars: @ 80724C0
strb r1, [r0]
ldr r0, _08072560 @ =gUnknown_2037EE3
strb r1, [r0]
ldr r0, _08072564 @ =gUnknown_2037EE4
ldr r0, _08072564 @ =gAnimDisableStructPtr
movs r1, 0
str r1, [r0]
ldr r0, _08072568 @ =gUnknown_2037EE8
@@ -31,12 +31,12 @@ ClearBattleAnimationVars: @ 80724C0
ldr r0, _08072570 @ =gUnknown_2037EFE
strb r2, [r0]
ldr r4, _08072574 @ =gUnknown_2037F14
ldr r5, _08072578 @ =gUnknown_2037F16
ldr r5, _08072578 @ =gAnimMoveTurn
ldr r6, _0807257C @ =gUnknown_2037F17
ldr r7, _08072580 @ =gUnknown_2037F18
ldr r0, _08072584 @ =gUnknown_2037F1A
ldr r0, _08072584 @ =gBattleAnimAttacker
mov r12, r0
ldr r1, _08072588 @ =gUnknown_2037F1B
ldr r1, _08072588 @ =gBattleAnimTarget
mov r8, r1
ldr r0, _0807258C @ =gUnknown_2037F24
mov r9, r0
@@ -52,7 +52,7 @@ _0807250A:
subs r2, 0x1
cmp r2, 0
bge _0807250A
ldr r1, _08072598 @ =gUnknown_2037F02
ldr r1, _08072598 @ =gBattleAnimArgs
movs r2, 0
adds r0, r1, 0
adds r0, 0xE
@@ -88,20 +88,20 @@ _08072554: .4byte gUnknown_2037EE0
_08072558: .4byte gUnknown_2037EE1
_0807255C: .4byte gUnknown_2037EE2
_08072560: .4byte gUnknown_2037EE3
_08072564: .4byte gUnknown_2037EE4
_08072564: .4byte gAnimDisableStructPtr
_08072568: .4byte gUnknown_2037EE8
_0807256C: .4byte gUnknown_2037EEC
_08072570: .4byte gUnknown_2037EFE
_08072574: .4byte gUnknown_2037F14
_08072578: .4byte gUnknown_2037F16
_08072578: .4byte gAnimMoveTurn
_0807257C: .4byte gUnknown_2037F17
_08072580: .4byte gUnknown_2037F18
_08072584: .4byte gUnknown_2037F1A
_08072588: .4byte gUnknown_2037F1B
_08072584: .4byte gBattleAnimAttacker
_08072588: .4byte gBattleAnimTarget
_0807258C: .4byte gUnknown_2037F24
_08072590: .4byte 0x0000ffff
_08072594: .4byte gUnknown_2037EEE
_08072598: .4byte gUnknown_2037F02
_08072598: .4byte gBattleAnimArgs
thumb_func_end ClearBattleAnimationVars
thumb_func_start DoMoveAnim
@@ -110,11 +110,11 @@ DoMoveAnim: @ 807259C
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
ldr r2, _080725C0 @ =gUnknown_2037F1A
ldr r2, _080725C0 @ =gBattleAnimAttacker
ldr r0, _080725C4 @ =sBattler_AI
ldrb r0, [r0]
strb r0, [r2]
ldr r2, _080725C8 @ =gUnknown_2037F1B
ldr r2, _080725C8 @ =gBattleAnimTarget
ldr r0, _080725CC @ =gBattlerTarget
ldrb r0, [r0]
strb r0, [r2]
@@ -124,9 +124,9 @@ DoMoveAnim: @ 807259C
pop {r0}
bx r0
.align 2, 0
_080725C0: .4byte gUnknown_2037F1A
_080725C0: .4byte gBattleAnimAttacker
_080725C4: .4byte sBattler_AI
_080725C8: .4byte gUnknown_2037F1B
_080725C8: .4byte gBattleAnimTarget
_080725CC: .4byte gBattlerTarget
_080725D0: .4byte gUnknown_81C68F4
thumb_func_end DoMoveAnim
@@ -206,7 +206,7 @@ _08072658:
ldr r0, _080726D4 @ =gUnknown_2037EDC
mov r10, r0
ldr r7, _080726D8 @ =RunAnimScriptCommand
ldr r1, _080726DC @ =gUnknown_2037F02
ldr r1, _080726DC @ =gBattleAnimArgs
movs r2, 0
adds r0, r1, 0
adds r0, 0xE
@@ -257,7 +257,7 @@ _080726CC: .4byte gUnknown_2037EE1
_080726D0: .4byte gUnknown_2037EE0
_080726D4: .4byte gUnknown_2037EDC
_080726D8: .4byte RunAnimScriptCommand
_080726DC: .4byte gUnknown_2037F02
_080726DC: .4byte gBattleAnimArgs
_080726E0: .4byte 0x0000ffff
_080726E4: .4byte gUnknown_2037EEE
_080726E8: .4byte gUnknown_81C68EC
@@ -483,11 +483,11 @@ ScriptCmd_loadspritegfx: @ 8072868
lsls r5, r4, 3
ldr r0, _080728B8 @ =gUnknown_8399388
adds r0, r5, r0
bl sub_800F034
bl LoadCompressedSpriteSheetUsingHeap
ldr r0, _080728BC @ =gUnknown_8399C90
adds r5, r0
adds r0, r5, 0
bl sub_800F078
bl LoadCompressedSpritePaletteUsingHeap
ldr r0, [r6]
adds r0, 0x2
str r0, [r6]
@@ -581,7 +581,7 @@ ScriptCmd_createsprite: @ 807291C
cmp r0, 0
beq _0807296C
adds r6, r5, 0
ldr r5, _08072988 @ =gUnknown_2037F02
ldr r5, _08072988 @ =gBattleAnimArgs
adds r3, r0, 0
_08072954:
ldr r2, [r6]
@@ -610,16 +610,16 @@ _0807296C:
b _0807298E
.align 2, 0
_08072984: .4byte gUnknown_2037ED4
_08072988: .4byte gUnknown_2037F02
_08072988: .4byte gBattleAnimArgs
_0807298C:
negs r0, r4
_0807298E:
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _08072998 @ =gUnknown_2037F1B
ldr r0, _08072998 @ =gBattleAnimTarget
b _080729AE
.align 2, 0
_08072998: .4byte gUnknown_2037F1B
_08072998: .4byte gBattleAnimTarget
_0807299C:
cmp r4, 0x3F
bls _080729A6
@@ -631,7 +631,7 @@ _080729A6:
_080729A8:
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _08072A04 @ =gUnknown_2037F1A
ldr r0, _08072A04 @ =gBattleAnimAttacker
_080729AE:
ldrb r0, [r0]
bl sub_807685C
@@ -648,7 +648,7 @@ _080729AE:
bgt _080729CC
movs r6, 0x3
_080729CC:
ldr r5, _08072A08 @ =gUnknown_2037F1B
ldr r5, _08072A08 @ =gBattleAnimTarget
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074480
@@ -674,8 +674,8 @@ _080729CC:
pop {r0}
bx r0
.align 2, 0
_08072A04: .4byte gUnknown_2037F1A
_08072A08: .4byte gUnknown_2037F1B
_08072A04: .4byte gBattleAnimAttacker
_08072A08: .4byte gBattleAnimTarget
_08072A0C: .4byte gUnknown_2037EE2
thumb_func_end ScriptCmd_createsprite
@@ -707,7 +707,7 @@ ScriptCmd_createvisualtask: @ 8072A10
cmp r0, 0
beq _08072A60
adds r5, r4, 0
ldr r4, _08072A84 @ =gUnknown_2037F02
ldr r4, _08072A84 @ =gBattleAnimArgs
adds r3, r0, 0
_08072A48:
ldr r2, [r5]
@@ -738,7 +738,7 @@ _08072A60:
bx r0
.align 2, 0
_08072A80: .4byte gUnknown_2037ED4
_08072A84: .4byte gUnknown_2037F02
_08072A84: .4byte gBattleAnimArgs
_08072A88: .4byte gUnknown_2037EE2
thumb_func_end ScriptCmd_createvisualtask
@@ -980,12 +980,12 @@ _08072C52:
cmp r6, 0x2
bne _08072C60
_08072C56:
ldr r0, _08072C5C @ =gUnknown_2037F1A
ldr r0, _08072C5C @ =gBattleAnimAttacker
b _08072C62
.align 2, 0
_08072C5C: .4byte gUnknown_2037F1A
_08072C5C: .4byte gBattleAnimAttacker
_08072C60:
ldr r0, _08072CD8 @ =gUnknown_2037F1B
ldr r0, _08072CD8 @ =gBattleAnimTarget
_08072C62:
ldrb r5, [r0]
adds r0, r5, 0
@@ -1008,7 +1008,7 @@ _08072C88:
adds r0, r5, 0
adds r1, r7, 0
bl sub_8072E48
ldr r0, _08072CDC @ =gUnknown_2023D44
ldr r0, _08072CDC @ =gBattlerSpriteIds
adds r0, r5, r0
ldrb r4, [r0]
ldr r0, _08072CE0 @ =task_pA_ma0A_obj_to_bg_pal
@@ -1043,8 +1043,8 @@ _08072C88:
ldr r0, _08072CF0 @ =gBattle_BG1_Y
b _08072CFC
.align 2, 0
_08072CD8: .4byte gUnknown_2037F1B
_08072CDC: .4byte gUnknown_2023D44
_08072CD8: .4byte gBattleAnimTarget
_08072CDC: .4byte gBattlerSpriteIds
_08072CE0: .4byte task_pA_ma0A_obj_to_bg_pal
_08072CE4: .4byte gTasks
_08072CE8: .4byte gSprites
@@ -1092,7 +1092,7 @@ _08072D3E:
adds r0, r5, 0
adds r1, r7, 0
bl sub_8072E48
ldr r0, _08072D9C @ =gUnknown_2023D44
ldr r0, _08072D9C @ =gBattlerSpriteIds
adds r0, r5, r0
ldrb r4, [r0]
ldr r0, _08072DA0 @ =task_pA_ma0A_obj_to_bg_pal
@@ -1131,7 +1131,7 @@ _08072D8C: .4byte gBattle_BG2_X
_08072D90: .4byte gBattle_BG2_Y
_08072D94: .4byte gTasks
_08072D98: .4byte gUnknown_2037F14
_08072D9C: .4byte gUnknown_2023D44
_08072D9C: .4byte gBattlerSpriteIds
_08072DA0: .4byte task_pA_ma0A_obj_to_bg_pal
_08072DA4: .4byte gSprites
_08072DA8: .4byte gBattle_BG1_X
@@ -1190,7 +1190,7 @@ sub_8072DF0: @ 8072DF0
cmp r0, 0
beq _08072E30
ldr r2, _08072E38 @ =gSprites
ldr r0, _08072E3C @ =gUnknown_2023D44
ldr r0, _08072E3C @ =gBattlerSpriteIds
adds r0, r4, r0
ldrb r1, [r0]
lsls r0, r1, 4
@@ -1208,7 +1208,7 @@ _08072E30:
.align 2, 0
_08072E34: .4byte gUnknown_2024018
_08072E38: .4byte gSprites
_08072E3C: .4byte gUnknown_2023D44
_08072E3C: .4byte gBattlerSpriteIds
_08072E40:
movs r0, 0
_08072E42:
@@ -1268,7 +1268,7 @@ _08072E5E:
movs r1, 0x1
movs r2, 0
bl SetAnimBgAttribute
ldr r2, _08072F6C @ =gUnknown_2023D44
ldr r2, _08072F6C @ =gBattlerSpriteIds
adds r2, r7, r2
ldrb r0, [r2]
ldr r5, _08072F70 @ =gBattle_BG1_X
@@ -1349,7 +1349,7 @@ _08072F5C: .4byte 0x06004000
_08072F60: .4byte 0x0600e000
_08072F64: .4byte 0x01000800
_08072F68: .4byte 0x01000400
_08072F6C: .4byte gUnknown_2023D44
_08072F6C: .4byte gBattlerSpriteIds
_08072F70: .4byte gBattle_BG1_X
_08072F74: .4byte gSprites
_08072F78: .4byte gBattle_BG1_Y
@@ -1401,7 +1401,7 @@ _08072F84:
movs r1, 0x1
movs r2, 0
bl SetAnimBgAttribute
ldr r2, _080730A4 @ =gUnknown_2023D44
ldr r2, _080730A4 @ =gBattlerSpriteIds
adds r2, r7, r2
ldrb r0, [r2]
ldr r5, _080730A8 @ =gBattle_BG2_X
@@ -1483,7 +1483,7 @@ _08073094: .4byte 0x06006000
_08073098: .4byte 0x0600f000
_0807309C: .4byte 0x01000800
_080730A0: .4byte 0x01000400
_080730A4: .4byte gUnknown_2023D44
_080730A4: .4byte gBattlerSpriteIds
_080730A8: .4byte gBattle_BG2_X
_080730AC: .4byte gSprites
_080730B0: .4byte gBattle_BG2_Y
@@ -1715,12 +1715,12 @@ _0807326E:
cmp r4, 0x2
bne _0807327C
_08073272:
ldr r0, _08073278 @ =gUnknown_2037F1A
ldr r0, _08073278 @ =gBattleAnimAttacker
b _0807327E
.align 2, 0
_08073278: .4byte gUnknown_2037F1A
_08073278: .4byte gBattleAnimAttacker
_0807327C:
ldr r0, _080732D4 @ =gUnknown_2037F1B
ldr r0, _080732D4 @ =gBattleAnimTarget
_0807327E:
ldrb r5, [r0]
ldr r3, _080732D8 @ =gUnknown_2037F14
@@ -1728,7 +1728,7 @@ _0807327E:
cmp r0, 0xFF
beq _080732A4
ldr r2, _080732DC @ =gSprites
ldr r0, _080732E0 @ =gUnknown_2023D44
ldr r0, _080732E0 @ =gBattlerSpriteIds
adds r0, r5, r0
ldrb r1, [r0]
lsls r0, r1, 4
@@ -1748,7 +1748,7 @@ _080732A4:
cmp r0, 0xFF
beq _080732E4
ldr r3, _080732DC @ =gSprites
ldr r2, _080732E0 @ =gUnknown_2023D44
ldr r2, _080732E0 @ =gBattlerSpriteIds
movs r1, 0x2
adds r0, r5, 0
eors r0, r1
@@ -1766,10 +1766,10 @@ _080732A4:
strb r1, [r0]
b _080732E6
.align 2, 0
_080732D4: .4byte gUnknown_2037F1B
_080732D4: .4byte gBattleAnimTarget
_080732D8: .4byte gUnknown_2037F14
_080732DC: .4byte gSprites
_080732E0: .4byte gUnknown_2023D44
_080732E0: .4byte gBattlerSpriteIds
_080732E4:
movs r4, 0
_080732E6:
@@ -1888,12 +1888,12 @@ _080733BE:
cmp r5, 0x2
bne _080733CC
_080733C2:
ldr r0, _080733C8 @ =gUnknown_2037F1A
ldr r0, _080733C8 @ =gBattleAnimAttacker
b _080733CE
.align 2, 0
_080733C8: .4byte gUnknown_2037F1A
_080733C8: .4byte gBattleAnimAttacker
_080733CC:
ldr r0, _08073474 @ =gUnknown_2037F1B
ldr r0, _08073474 @ =gBattleAnimTarget
_080733CE:
ldrb r4, [r0]
adds r0, r4, 0
@@ -1916,7 +1916,7 @@ _080733F4:
adds r0, r4, 0
bl sub_8072E48
ldr r2, _08073478 @ =gSprites
ldr r0, _0807347C @ =gUnknown_2023D44
ldr r0, _0807347C @ =gBattlerSpriteIds
adds r0, r4, r0
ldrb r1, [r0]
lsls r0, r1, 4
@@ -1954,7 +1954,7 @@ _08073442:
adds r0, r4, 0
bl sub_8072E48
ldr r2, _08073478 @ =gSprites
ldr r0, _0807347C @ =gUnknown_2023D44
ldr r0, _0807347C @ =gBattlerSpriteIds
adds r0, r4, r0
ldrb r1, [r0]
lsls r0, r1, 4
@@ -1976,9 +1976,9 @@ _08073464:
pop {r0}
bx r0
.align 2, 0
_08073474: .4byte gUnknown_2037F1B
_08073474: .4byte gBattleAnimTarget
_08073478: .4byte gSprites
_0807347C: .4byte gUnknown_2023D44
_0807347C: .4byte gBattlerSpriteIds
_08073480: .4byte gUnknown_2037ED4
thumb_func_end sub_807339C
@@ -2007,12 +2007,12 @@ _080734A6:
cmp r5, 0x2
bne _080734B4
_080734AA:
ldr r0, _080734B0 @ =gUnknown_2037F1A
ldr r0, _080734B0 @ =gBattleAnimAttacker
b _080734B6
.align 2, 0
_080734B0: .4byte gUnknown_2037F1A
_080734B0: .4byte gBattleAnimAttacker
_080734B4:
ldr r0, _08073514 @ =gUnknown_2037F1B
ldr r0, _08073514 @ =gBattleAnimTarget
_080734B6:
ldrb r6, [r0]
adds r0, r6, 0
@@ -2021,7 +2021,7 @@ _080734B6:
cmp r0, 0
beq _080734E0
ldr r2, _08073518 @ =gSprites
ldr r0, _0807351C @ =gUnknown_2023D44
ldr r0, _0807351C @ =gBattlerSpriteIds
adds r0, r6, r0
ldrb r1, [r0]
lsls r0, r1, 4
@@ -2046,7 +2046,7 @@ _080734E0:
cmp r0, 0
beq _08073520
ldr r2, _08073518 @ =gSprites
ldr r0, _0807351C @ =gUnknown_2023D44
ldr r0, _0807351C @ =gBattlerSpriteIds
adds r0, r4, r0
ldrb r1, [r0]
lsls r0, r1, 4
@@ -2061,9 +2061,9 @@ _080734E0:
strb r1, [r0]
b _08073522
.align 2, 0
_08073514: .4byte gUnknown_2037F1B
_08073514: .4byte gBattleAnimTarget
_08073518: .4byte gSprites
_0807351C: .4byte gUnknown_2023D44
_0807351C: .4byte gBattlerSpriteIds
_08073520:
movs r5, 0
_08073522:
@@ -2290,7 +2290,7 @@ ScriptCmd_setarg: @ 80736AC
orrs r4, r0
adds r1, 0x4
str r1, [r5]
ldr r0, _080736DC @ =gUnknown_2037F02
ldr r0, _080736DC @ =gBattleAnimArgs
lsls r2, 1
adds r2, r0
strh r4, [r2]
@@ -2299,7 +2299,7 @@ ScriptCmd_setarg: @ 80736AC
bx r0
.align 2, 0
_080736D8: .4byte gUnknown_2037ED4
_080736DC: .4byte gUnknown_2037F02
_080736DC: .4byte gBattleAnimArgs
thumb_func_end ScriptCmd_setarg
thumb_func_start ScriptCmd_choosetwoturnanim
@@ -2309,7 +2309,7 @@ ScriptCmd_choosetwoturnanim: @ 80736E0
ldr r2, [r3]
adds r0, r2, 0x1
str r0, [r3]
ldr r0, _0807371C @ =gUnknown_2037F16
ldr r0, _0807371C @ =gAnimMoveTurn
ldrb r1, [r0]
movs r0, 0x1
ands r0, r1
@@ -2334,7 +2334,7 @@ _080736FA:
bx r0
.align 2, 0
_08073718: .4byte gUnknown_2037ED4
_0807371C: .4byte gUnknown_2037F16
_0807371C: .4byte gAnimMoveTurn
thumb_func_end ScriptCmd_choosetwoturnanim
thumb_func_start ScriptCmd_jumpifmoveturn
@@ -2347,7 +2347,7 @@ ScriptCmd_jumpifmoveturn: @ 8073720
ldrb r1, [r4, 0x1]
adds r3, r2, 0x1
str r3, [r5]
ldr r0, _08073754 @ =gUnknown_2037F16
ldr r0, _08073754 @ =gAnimMoveTurn
ldrb r0, [r0]
cmp r1, r0
bne _08073758
@@ -2365,7 +2365,7 @@ ScriptCmd_jumpifmoveturn: @ 8073720
b _0807375C
.align 2, 0
_08073750: .4byte gUnknown_2037ED4
_08073754: .4byte gUnknown_2037F16
_08073754: .4byte gAnimMoveTurn
_08073758:
adds r0, r4, 0x6
str r0, [r5]
@@ -2469,7 +2469,7 @@ sub_80737E4: @ 80737E4
bl CreateTask
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _08073828 @ =gUnknown_2037F1B
ldr r0, _08073828 @ =gBattleAnimTarget
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
@@ -2485,7 +2485,7 @@ sub_80737E4: @ 80737E4
.align 2, 0
_08073820: .4byte gUnknown_2037ED4
_08073824: .4byte sub_8073850
_08073828: .4byte gUnknown_2037F1B
_08073828: .4byte gBattleAnimTarget
_0807382C: .4byte gTasks
_08073830:
ldr r1, _08073848 @ =gTasks
@@ -2774,7 +2774,7 @@ sub_8073A44: @ 8073A44
lsrs r4, r0, 24
ldr r0, _08073A78 @ =gUnknown_2024018
ldr r1, [r0]
ldr r0, _08073A7C @ =gUnknown_2037F1A
ldr r0, _08073A7C @ =gBattleAnimAttacker
ldrb r2, [r0]
ldr r1, [r1, 0x4]
lsls r0, r2, 1
@@ -2796,14 +2796,14 @@ sub_8073A44: @ 8073A44
b _08073AE6
.align 2, 0
_08073A78: .4byte gUnknown_2024018
_08073A7C: .4byte gUnknown_2037F1A
_08073A7C: .4byte gBattleAnimAttacker
_08073A80:
adds r0, r2, 0
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08073ABA
ldr r0, _08073AA8 @ =gUnknown_2037F1B
ldr r0, _08073AA8 @ =gBattleAnimTarget
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
@@ -2816,7 +2816,7 @@ _08073A80:
movs r4, 0xC0
b _08073AE6
.align 2, 0
_08073AA8: .4byte gUnknown_2037F1B
_08073AA8: .4byte gBattleAnimTarget
_08073AAC:
movs r0, 0x40
negs r0, r0
@@ -2826,7 +2826,7 @@ _08073AAC:
lsls r0, 24
b _08073AE4
_08073ABA:
ldr r0, _08073ADC @ =gUnknown_2037F1B
ldr r0, _08073ADC @ =gBattleAnimTarget
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
@@ -2842,7 +2842,7 @@ _08073ABA:
movs r4, 0x3F
b _08073AE6
.align 2, 0
_08073ADC: .4byte gUnknown_2037F1B
_08073ADC: .4byte gBattleAnimTarget
_08073AE0:
lsls r0, r4, 24
negs r0, r0
@@ -2876,7 +2876,7 @@ sub_8073B08: @ 8073B08
lsrs r4, r0, 24
ldr r0, _08073B3C @ =gUnknown_2024018
ldr r1, [r0]
ldr r0, _08073B40 @ =gUnknown_2037F1A
ldr r0, _08073B40 @ =gBattleAnimAttacker
ldrb r2, [r0]
ldr r1, [r1, 0x4]
lsls r0, r2, 1
@@ -2898,7 +2898,7 @@ sub_8073B08: @ 8073B08
b _08073B56
.align 2, 0
_08073B3C: .4byte gUnknown_2024018
_08073B40: .4byte gUnknown_2037F1A
_08073B40: .4byte gBattleAnimAttacker
_08073B44:
adds r0, r2, 0
bl GetBattlerSide
@@ -3597,7 +3597,7 @@ ScriptCmd_createsoundtask: @ 807406C
cmp r0, 0
beq _080740B6
adds r5, r4, 0
ldr r4, _080740D8 @ =gUnknown_2037F02
ldr r4, _080740D8 @ =gBattleAnimArgs
adds r3, r0, 0
_0807409E:
ldr r2, [r5]
@@ -3628,7 +3628,7 @@ _080740B6:
bx r0
.align 2, 0
_080740D4: .4byte gUnknown_2037ED4
_080740D8: .4byte gUnknown_2037F02
_080740D8: .4byte gBattleAnimArgs
_080740DC: .4byte gUnknown_2037EE3
thumb_func_end ScriptCmd_createsoundtask
@@ -3707,7 +3707,7 @@ ScriptCmd_jumpargeq: @ 8074164
ldrb r0, [r3, 0x2]
lsls r0, 8
orrs r1, r0
ldr r0, _080741A8 @ =gUnknown_2037F02
ldr r0, _080741A8 @ =gBattleAnimArgs
lsls r2, 1
adds r2, r0
lsls r1, 16
@@ -3730,7 +3730,7 @@ ScriptCmd_jumpargeq: @ 8074164
b _080741B2
.align 2, 0
_080741A4: .4byte gUnknown_2037ED4
_080741A8: .4byte gUnknown_2037F02
_080741A8: .4byte gBattleAnimArgs
_080741AC:
adds r0, r4, 0
adds r0, 0x8
@@ -3762,13 +3762,13 @@ sub_80741C8: @ 80741C8
str r1, [r0]
cmp r2, 0
beq _080741E4
ldr r0, _080741E0 @ =gUnknown_2037F1B
ldr r0, _080741E0 @ =gBattleAnimTarget
b _080741E6
.align 2, 0
_080741DC: .4byte gUnknown_2037ED4
_080741E0: .4byte gUnknown_2037F1B
_080741E0: .4byte gBattleAnimTarget
_080741E4:
ldr r0, _08074210 @ =gUnknown_2037F1A
ldr r0, _08074210 @ =gBattleAnimAttacker
_080741E6:
ldrb r0, [r0]
bl GetBattlerPosition
@@ -3791,7 +3791,7 @@ _0807420C:
pop {r0}
bx r0
.align 2, 0
_08074210: .4byte gUnknown_2037F1A
_08074210: .4byte gBattleAnimAttacker
thumb_func_end sub_80741C8
thumb_func_start sub_8074214
@@ -3823,11 +3823,11 @@ sub_807423C: @ 807423C
ldrb r6, [r0, 0x1]
adds r0, 0x2
str r0, [r1]
ldr r7, _08074270 @ =gUnknown_2037F1A
ldr r7, _08074270 @ =gBattleAnimAttacker
ldrb r0, [r7]
bl GetBattlerSide
adds r4, r0, 0
ldr r5, _08074274 @ =gUnknown_2037F1B
ldr r5, _08074274 @ =gBattleAnimTarget
ldrb r0, [r5]
bl GetBattlerSide
lsls r4, 24
@@ -3840,8 +3840,8 @@ sub_807423C: @ 807423C
b _0807427A
.align 2, 0
_0807426C: .4byte gUnknown_2037ED4
_08074270: .4byte gUnknown_2037F1A
_08074274: .4byte gUnknown_2037F1B
_08074270: .4byte gBattleAnimAttacker
_08074274: .4byte gBattleAnimTarget
_08074278:
ldrb r0, [r7]
_0807427A:
@@ -3946,11 +3946,11 @@ sub_8074320: @ 8074320
lsls r0, 24
cmp r0, 0
beq _080743C2
ldr r6, _08074368 @ =gUnknown_2037F1A
ldr r6, _08074368 @ =gBattleAnimAttacker
ldrb r0, [r6]
bl GetBattlerSide
adds r4, r0, 0
ldr r5, _0807436C @ =gUnknown_2037F1B
ldr r5, _0807436C @ =gBattleAnimTarget
ldrb r0, [r5]
bl GetBattlerSide
lsls r4, 24
@@ -3967,8 +3967,8 @@ sub_8074320: @ 8074320
b _0807437C
.align 2, 0
_08074364: .4byte gUnknown_2037ED4
_08074368: .4byte gUnknown_2037F1A
_0807436C: .4byte gUnknown_2037F1B
_08074368: .4byte gBattleAnimAttacker
_0807436C: .4byte gBattleAnimTarget
_08074370:
ldrb r0, [r5]
bl sub_80768B0
@@ -4028,11 +4028,11 @@ sub_80743C8: @ 80743C8
lsls r0, 24
cmp r0, 0
beq _0807444C
ldr r6, _08074410 @ =gUnknown_2037F1A
ldr r6, _08074410 @ =gBattleAnimAttacker
ldrb r0, [r6]
bl GetBattlerSide
adds r4, r0, 0
ldr r5, _08074414 @ =gUnknown_2037F1B
ldr r5, _08074414 @ =gBattleAnimTarget
ldrb r0, [r5]
bl GetBattlerSide
lsls r4, 24
@@ -4049,8 +4049,8 @@ sub_80743C8: @ 80743C8
b _08074424
.align 2, 0
_0807440C: .4byte gUnknown_2037ED4
_08074410: .4byte gUnknown_2037F1A
_08074414: .4byte gUnknown_2037F1B
_08074410: .4byte gBattleAnimAttacker
_08074414: .4byte gBattleAnimTarget
_08074418:
ldrb r0, [r5]
bl sub_80768B0
asm/battle_anim_80989F8.s
-2588
View File
File diff suppressed because it is too large Load Diff
asm/battle_anim_80A22E8.s
-55436
View File
File diff suppressed because it is too large Load Diff
asm/battle_anim_effects_1.s
+9882
View File
File diff suppressed because it is too large Load Diff
asm/battle_anim_effects_2.s
+7946
View File
File diff suppressed because it is too large Load Diff
asm/battle_anim_80DE2C0.s → asm/battle_anim_effects_3.s
+322 -322
View File
File diff suppressed because it is too large Load Diff
asm/battle_anim_8074480.s → asm/battle_anim_mons.s
+119 -119
View File
@@ -711,37 +711,37 @@ GetAnimBankSpriteId: @ 80749D4
adds r1, r0, 0
cmp r0, 0
bne _080749FC
ldr r4, _080749F4 @ =gUnknown_2037F1A
ldr r4, _080749F4 @ =gBattleAnimAttacker
ldrb r0, [r4]
bl sub_8075224
lsls r0, 24
cmp r0, 0
beq _08074A4A
ldr r1, _080749F8 @ =gUnknown_2023D44
ldr r1, _080749F8 @ =gBattlerSpriteIds
ldrb r0, [r4]
b _08074A5A
.align 2, 0
_080749F4: .4byte gUnknown_2037F1A
_080749F8: .4byte gUnknown_2023D44
_080749F4: .4byte gBattleAnimAttacker
_080749F8: .4byte gBattlerSpriteIds
_080749FC:
cmp r0, 0x1
bne _08074A1C
ldr r4, _08074A14 @ =gUnknown_2037F1B
ldr r4, _08074A14 @ =gBattleAnimTarget
ldrb r0, [r4]
bl sub_8075224
lsls r0, 24
cmp r0, 0
beq _08074A4A
ldr r1, _08074A18 @ =gUnknown_2023D44
ldr r1, _08074A18 @ =gBattlerSpriteIds
ldrb r0, [r4]
b _08074A5A
.align 2, 0
_08074A14: .4byte gUnknown_2037F1B
_08074A18: .4byte gUnknown_2023D44
_08074A14: .4byte gBattleAnimTarget
_08074A18: .4byte gBattlerSpriteIds
_08074A1C:
cmp r1, 0x2
bne _08074A38
ldr r5, _08074A34 @ =gUnknown_2037F1A
ldr r5, _08074A34 @ =gBattleAnimAttacker
ldrb r0, [r5]
movs r4, 0x2
eors r0, r4
@@ -751,9 +751,9 @@ _08074A1C:
beq _08074A4A
b _08074A54
.align 2, 0
_08074A34: .4byte gUnknown_2037F1A
_08074A34: .4byte gBattleAnimAttacker
_08074A38:
ldr r5, _08074A50 @ =gUnknown_2037F1B
ldr r5, _08074A50 @ =gBattleAnimTarget
ldrb r0, [r5]
movs r4, 0x2
eors r0, r4
@@ -765,9 +765,9 @@ _08074A4A:
movs r0, 0xFF
b _08074A5E
.align 2, 0
_08074A50: .4byte gUnknown_2037F1B
_08074A50: .4byte gBattleAnimTarget
_08074A54:
ldr r1, _08074A64 @ =gUnknown_2023D44
ldr r1, _08074A64 @ =gBattlerSpriteIds
ldrb r0, [r5]
eors r0, r4
_08074A5A:
@@ -778,7 +778,7 @@ _08074A5E:
pop {r1}
bx r1
.align 2, 0
_08074A64: .4byte gUnknown_2023D44
_08074A64: .4byte gBattlerSpriteIds
thumb_func_end GetAnimBankSpriteId
thumb_func_start StoreSpriteCallbackInData6
@@ -1242,7 +1242,7 @@ sub_8074D80: @ 8074D80
ldrh r1, [r4, 0x22]
adds r0, r1
strh r0, [r4, 0x34]
ldr r5, _08074DBC @ =gUnknown_2037F1B
ldr r5, _08074DBC @ =gBattleAnimTarget
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074480
@@ -1261,7 +1261,7 @@ sub_8074D80: @ 8074D80
pop {r0}
bx r0
.align 2, 0
_08074DBC: .4byte gUnknown_2037F1B
_08074DBC: .4byte gBattleAnimTarget
_08074DC0: .4byte sub_8074C64
thumb_func_end sub_8074D80
@@ -1443,7 +1443,7 @@ sub_8074EF4: @ 8074EF4
ldrh r1, [r4, 0x22]
adds r0, r1
strh r0, [r4, 0x34]
ldr r5, _08074F30 @ =gUnknown_2037F1A
ldr r5, _08074F30 @ =gBattleAnimAttacker
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074480
@@ -1462,7 +1462,7 @@ sub_8074EF4: @ 8074EF4
pop {r0}
bx r0
.align 2, 0
_08074F30: .4byte gUnknown_2037F1A
_08074F30: .4byte gBattleAnimAttacker
_08074F34: .4byte sub_8074C64
thumb_func_end sub_8074EF4
@@ -1553,7 +1553,7 @@ sub_8074FA8: @ 8074FA8
sub_8074FCC: @ 8074FCC
push {r4,r5,lr}
adds r5, r0, 0
ldr r4, _08074FF4 @ =gUnknown_2037F1A
ldr r4, _08074FF4 @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
@@ -1570,7 +1570,7 @@ sub_8074FCC: @ 8074FCC
pop {r0}
bx r0
.align 2, 0
_08074FF4: .4byte gUnknown_2037F1A
_08074FF4: .4byte gBattleAnimAttacker
thumb_func_end sub_8074FCC
thumb_func_start sub_8074FF8
@@ -1582,13 +1582,13 @@ sub_8074FF8: @ 8074FF8
lsls r1, 16
lsrs r5, r1, 16
mov r8, r5
ldr r7, _08075030 @ =gUnknown_2037F1A
ldr r7, _08075030 @ =gBattleAnimAttacker
ldrb r0, [r7]
movs r1, 0
bl sub_8074480
lsls r0, 24
lsrs r6, r0, 24
ldr r0, _08075034 @ =gUnknown_2037F1B
ldr r0, _08075034 @ =gBattleAnimTarget
ldrb r0, [r0]
movs r1, 0
bl sub_8074480
@@ -1601,8 +1601,8 @@ sub_8074FF8: @ 8074FF8
lsls r0, r5, 16
b _08075054
.align 2, 0
_08075030: .4byte gUnknown_2037F1A
_08075034: .4byte gUnknown_2037F1B
_08075030: .4byte gBattleAnimAttacker
_08075034: .4byte gBattleAnimTarget
_08075038:
ldrb r0, [r7]
bl GetBattlerSide
@@ -1738,7 +1738,7 @@ sub_8075114: @ 8075114
lsls r1, 24
cmp r1, 0
bne _0807513C
ldr r4, _08075158 @ =gUnknown_2037F1B
ldr r4, _08075158 @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0
bl sub_8074844
@@ -1752,7 +1752,7 @@ sub_8075114: @ 8075114
lsrs r0, 24
strh r0, [r5, 0x22]
_0807513C:
ldr r4, _0807515C @ =gUnknown_2037F02
ldr r4, _0807515C @ =gBattleAnimArgs
movs r0, 0
ldrsh r1, [r4, r0]
adds r0, r5, 0
@@ -1765,8 +1765,8 @@ _0807513C:
pop {r0}
bx r0
.align 2, 0
_08075158: .4byte gUnknown_2037F1B
_0807515C: .4byte gUnknown_2037F02
_08075158: .4byte gBattleAnimTarget
_0807515C: .4byte gBattleAnimArgs
thumb_func_end sub_8075114
thumb_func_start sub_8075160
@@ -1776,7 +1776,7 @@ sub_8075160: @ 8075160
lsls r1, 24
cmp r1, 0
bne _08075184
ldr r4, _08075180 @ =gUnknown_2037F1A
ldr r4, _08075180 @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0
bl sub_8074844
@@ -1787,9 +1787,9 @@ sub_8075160: @ 8075160
movs r1, 0x1
b _08075198
.align 2, 0
_08075180: .4byte gUnknown_2037F1A
_08075180: .4byte gBattleAnimAttacker
_08075184:
ldr r4, _080751BC @ =gUnknown_2037F1A
ldr r4, _080751BC @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074844
@@ -1803,7 +1803,7 @@ _08075198:
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
ldr r4, _080751C0 @ =gUnknown_2037F02
ldr r4, _080751C0 @ =gBattleAnimArgs
movs r0, 0
ldrsh r1, [r4, r0]
adds r0, r5, 0
@@ -1816,8 +1816,8 @@ _08075198:
pop {r0}
bx r0
.align 2, 0
_080751BC: .4byte gUnknown_2037F1A
_080751C0: .4byte gUnknown_2037F02
_080751BC: .4byte gBattleAnimAttacker
_080751C0: .4byte gBattleAnimArgs
thumb_func_end sub_8075160
thumb_func_start GetBattlerSide
@@ -2011,7 +2011,7 @@ sub_8075300: @ 8075300
ldr r0, _08075338 @ =gUnknown_2022BBC
ldr r0, [r0]
str r0, [r4, 0x4]
ldr r0, _0807533C @ =gUnknown_2037F1A
ldr r0, _0807533C @ =gBattleAnimAttacker
ldrb r0, [r0]
bl sub_80768B0
lsls r0, 24
@@ -2030,7 +2030,7 @@ sub_8075300: @ 8075300
.align 2, 0
_08075334: .4byte gUnknown_2022BB8
_08075338: .4byte gUnknown_2022BBC
_0807533C: .4byte gUnknown_2037F1A
_0807533C: .4byte gBattleAnimAttacker
_08075340:
movs r1, 0
movs r0, 0x9
@@ -3252,7 +3252,7 @@ sub_8075BE8: @ 8075BE8
_08075C1C:
cmp r1, 0
beq _08075C2E
ldr r0, _08075CB0 @ =gUnknown_2037F1A
ldr r0, _08075CB0 @ =gBattleAnimAttacker
ldrb r0, [r0]
adds r1, r0, 0
adds r1, 0x10
@@ -3262,7 +3262,7 @@ _08075C1C:
_08075C2E:
cmp r2, 0
beq _08075C40
ldr r0, _08075CB4 @ =gUnknown_2037F1B
ldr r0, _08075CB4 @ =gBattleAnimTarget
ldrb r0, [r0]
adds r1, r0, 0
adds r1, 0x10
@@ -3272,7 +3272,7 @@ _08075C2E:
_08075C40:
cmp r3, 0
beq _08075C64
ldr r6, _08075CB0 @ =gUnknown_2037F1A
ldr r6, _08075CB0 @ =gBattleAnimAttacker
ldrb r0, [r6]
movs r5, 0x2
eors r0, r5
@@ -3290,7 +3290,7 @@ _08075C40:
_08075C64:
cmp r7, 0
beq _08075C88
ldr r6, _08075CB4 @ =gUnknown_2037F1B
ldr r6, _08075CB4 @ =gBattleAnimTarget
ldrb r0, [r6]
movs r5, 0x2
eors r0, r5
@@ -3328,8 +3328,8 @@ _08075CA0:
pop {r1}
bx r1
.align 2, 0
_08075CB0: .4byte gUnknown_2037F1A
_08075CB4: .4byte gUnknown_2037F1B
_08075CB0: .4byte gBattleAnimAttacker
_08075CB4: .4byte gBattleAnimTarget
thumb_func_end sub_8075BE8
thumb_func_start sub_8075CB8
@@ -3454,7 +3454,7 @@ sub_8075D9C: @ 8075D9C
ldrsh r0, [r4, r1]
cmp r0, 0
bne _08075DDA
ldr r2, _08075DC8 @ =gUnknown_2037F02
ldr r2, _08075DC8 @ =gBattleAnimArgs
movs r3, 0x6
ldrsh r0, [r2, r3]
movs r1, 0
@@ -3470,7 +3470,7 @@ _08075DB6:
bl sub_8075160
b _08075DD2
.align 2, 0
_08075DC8: .4byte gUnknown_2037F02
_08075DC8: .4byte gBattleAnimArgs
_08075DCC:
adds r0, r4, 0
bl sub_8075114
@@ -3499,7 +3499,7 @@ _08075DEE:
sub_8075DF4: @ 8075DF4
push {r4-r7,lr}
adds r5, r0, 0
ldr r6, _08075E6C @ =gUnknown_2037F02
ldr r6, _08075E6C @ =gBattleAnimArgs
movs r1, 0xA
ldrsh r0, [r6, r1]
movs r1, 0xFF
@@ -3518,7 +3518,7 @@ _08075E0C:
_08075E16:
adds r0, r5, 0
bl sub_8075160
ldr r0, _08075E70 @ =gUnknown_2037F1A
ldr r0, _08075E70 @ =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
@@ -3530,7 +3530,7 @@ _08075E16:
_08075E30:
ldrh r0, [r6, 0x8]
strh r0, [r5, 0x2E]
ldr r4, _08075E74 @ =gUnknown_2037F1B
ldr r4, _08075E74 @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
@@ -3556,9 +3556,9 @@ _08075E30:
pop {r0}
bx r0
.align 2, 0
_08075E6C: .4byte gUnknown_2037F02
_08075E70: .4byte gUnknown_2037F1A
_08075E74: .4byte gUnknown_2037F1B
_08075E6C: .4byte gBattleAnimArgs
_08075E70: .4byte gBattleAnimAttacker
_08075E74: .4byte gBattleAnimTarget
_08075E78: .4byte sub_8075590
_08075E7C: .4byte DestroyAnimSprite
thumb_func_end sub_8075DF4
@@ -3569,21 +3569,21 @@ sub_8075E80: @ 8075E80
adds r6, r0, 0
movs r1, 0x1
bl sub_8075160
ldr r0, _08075EE0 @ =gUnknown_2037F1A
ldr r0, _08075EE0 @ =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08075EA0
ldr r1, _08075EE4 @ =gUnknown_2037F02
ldr r1, _08075EE4 @ =gBattleAnimArgs
ldrh r0, [r1, 0x4]
negs r0, r0
strh r0, [r1, 0x4]
_08075EA0:
ldr r4, _08075EE4 @ =gUnknown_2037F02
ldr r4, _08075EE4 @ =gBattleAnimArgs
ldrh r0, [r4, 0x8]
strh r0, [r6, 0x2E]
ldr r5, _08075EE8 @ =gUnknown_2037F1B
ldr r5, _08075EE8 @ =gBattleAnimTarget
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074480
@@ -3610,9 +3610,9 @@ _08075EA0:
pop {r0}
bx r0
.align 2, 0
_08075EE0: .4byte gUnknown_2037F1A
_08075EE4: .4byte gUnknown_2037F02
_08075EE8: .4byte gUnknown_2037F1B
_08075EE0: .4byte gBattleAnimAttacker
_08075EE4: .4byte gBattleAnimArgs
_08075EE8: .4byte gBattleAnimTarget
_08075EEC: .4byte sub_8075EF0
thumb_func_end sub_8075E80
@@ -3636,7 +3636,7 @@ _08075F04:
sub_8075F0C: @ 8075F0C
push {r4-r7,lr}
adds r5, r0, 0
ldr r0, _08075F20 @ =gUnknown_2037F02
ldr r0, _08075F20 @ =gBattleAnimArgs
movs r2, 0xC
ldrsh r1, [r0, r2]
cmp r1, 0
@@ -3645,7 +3645,7 @@ sub_8075F0C: @ 8075F0C
movs r7, 0x3
b _08075F28
.align 2, 0
_08075F20: .4byte gUnknown_2037F02
_08075F20: .4byte gBattleAnimArgs
_08075F24:
movs r4, 0
movs r7, 0x1
@@ -3657,24 +3657,24 @@ _08075F28:
adds r0, r5, 0
adds r1, r4, 0
bl sub_8075160
ldr r0, _08075F3C @ =gUnknown_2037F1A
ldr r0, _08075F3C @ =gBattleAnimAttacker
b _08075F4A
.align 2, 0
_08075F3C: .4byte gUnknown_2037F1A
_08075F3C: .4byte gBattleAnimAttacker
_08075F40:
adds r0, r5, 0
adds r1, r4, 0
bl sub_8075114
ldr r0, _08075FA8 @ =gUnknown_2037F1B
ldr r0, _08075FA8 @ =gBattleAnimTarget
_08075F4A:
ldrb r6, [r0]
ldr r0, _08075FAC @ =gUnknown_2037F1A
ldr r0, _08075FAC @ =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08075F62
ldr r1, _08075FB0 @ =gUnknown_2037F02
ldr r1, _08075FB0 @ =gBattleAnimArgs
ldrh r0, [r1, 0x4]
negs r0, r0
strh r0, [r1, 0x4]
@@ -3682,7 +3682,7 @@ _08075F62:
adds r0, r5, 0
adds r1, r4, 0
bl sub_8075114
ldr r4, _08075FB0 @ =gUnknown_2037F02
ldr r4, _08075FB0 @ =gBattleAnimArgs
ldrh r0, [r4, 0x8]
strh r0, [r5, 0x2E]
adds r0, r6, 0
@@ -3710,9 +3710,9 @@ _08075F62:
pop {r0}
bx r0
.align 2, 0
_08075FA8: .4byte gUnknown_2037F1B
_08075FAC: .4byte gUnknown_2037F1A
_08075FB0: .4byte gUnknown_2037F02
_08075FA8: .4byte gBattleAnimTarget
_08075FAC: .4byte gBattleAnimAttacker
_08075FB0: .4byte gBattleAnimArgs
_08075FB4: .4byte sub_8075590
_08075FB8: .4byte DestroyAnimSprite
thumb_func_end sub_8075F0C
@@ -3801,7 +3801,7 @@ sub_8076048: @ 8076048
lsrs r5, r0, 24
movs r6, 0
movs r3, 0
ldr r2, _080760C0 @ =gUnknown_2037F02
ldr r2, _080760C0 @ =gBattleAnimArgs
movs r0, 0x4
ldrsh r1, [r2, r0]
movs r4, 0
@@ -3860,7 +3860,7 @@ _0807607C:
pop {r0}
bx r0
.align 2, 0
_080760C0: .4byte gUnknown_2037F02
_080760C0: .4byte gBattleAnimArgs
_080760C4: .4byte 0x0000ffff
_080760C8: .4byte gTasks
_080760CC: .4byte sub_80760D0
@@ -3952,7 +3952,7 @@ sub_807616C: @ 807616C
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _0807618C @ =gUnknown_2037F02
ldr r0, _0807618C @ =gBattleAnimArgs
ldrb r0, [r0]
bl GetAnimBankSpriteId
lsls r0, 24
@@ -3963,7 +3963,7 @@ sub_807616C: @ 807616C
bl DestroyAnimVisualTask
b _080761B6
.align 2, 0
_0807618C: .4byte gUnknown_2037F02
_0807618C: .4byte gBattleAnimArgs
_08076190:
ldr r1, _080761BC @ =gTasks
lsls r0, r4, 2
@@ -3995,7 +3995,7 @@ _080761C4: .4byte 0x00000101
thumb_func_start sub_80761C8
sub_80761C8: @ 80761C8
ldr r3, _080761E8 @ =gUnknown_2037F02
ldr r3, _080761E8 @ =gBattleAnimArgs
ldrh r1, [r3, 0x2]
movs r2, 0
strh r1, [r0, 0xA]
@@ -4012,7 +4012,7 @@ sub_80761C8: @ 80761C8
str r1, [r0]
bx lr
.align 2, 0
_080761E8: .4byte gUnknown_2037F02
_080761E8: .4byte gBattleAnimArgs
_080761EC: .4byte sub_80761F0
thumb_func_end sub_80761C8
@@ -4099,7 +4099,7 @@ sub_8076288: @ 8076288
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _080762A8 @ =gUnknown_2037F02
ldr r0, _080762A8 @ =gBattleAnimArgs
ldrh r0, [r0]
bl IndexOfSpritePaletteTag
lsls r0, 24
@@ -4110,7 +4110,7 @@ sub_8076288: @ 8076288
bl DestroyAnimVisualTask
b _080762C2
.align 2, 0
_080762A8: .4byte gUnknown_2037F02
_080762A8: .4byte gBattleAnimArgs
_080762AC:
ldr r1, _080762C8 @ =gTasks
lsls r0, r4, 2
@@ -4428,7 +4428,7 @@ sub_80764EC: @ 80764EC
lsls r0, 24
lsrs r5, r0, 24
movs r4, 0
ldr r1, _0807654C @ =gUnknown_2023D44
ldr r1, _0807654C @ =gBattlerSpriteIds
ldr r6, _08076550 @ =gBattlerPartyIndexes
_08076508:
adds r0, r4, r1
@@ -4463,7 +4463,7 @@ _08076508:
b _0807655E
.align 2, 0
_08076548: .4byte gSprites
_0807654C: .4byte gUnknown_2023D44
_0807654C: .4byte gBattlerSpriteIds
_08076550: .4byte gBattlerPartyIndexes
_08076554: .4byte gUnknown_2024018
_08076558: .4byte gPlayerParty
@@ -4680,7 +4680,7 @@ sub_80766B8: @ 80766B8
bhi _080766D6
movs r1, 0x2
_080766D6:
ldr r0, _080766E8 @ =gUnknown_2037F02
ldr r0, _080766E8 @ =gBattleAnimArgs
strh r1, [r0, 0xE]
adds r0, r2, 0
bl DestroyAnimVisualTask
@@ -4688,7 +4688,7 @@ _080766D6:
bx r0
.align 2, 0
_080766E4: .4byte gUnknown_2037EFE
_080766E8: .4byte gUnknown_2037F02
_080766E8: .4byte gBattleAnimArgs
thumb_func_end sub_80766B8
thumb_func_start sub_80766EC
@@ -4699,14 +4699,14 @@ sub_80766EC: @ 80766EC
lsls r0, 24
lsrs r4, r0, 24
adds r7, r4, 0
ldr r6, _080767E0 @ =gUnknown_2037F1B
ldr r6, _080767E0 @ =gBattleAnimTarget
ldrb r0, [r6]
bl sub_8072DF0
lsls r0, 24
cmp r0, 0
beq _0807672C
ldr r2, _080767E4 @ =gSprites
ldr r1, _080767E8 @ =gUnknown_2023D44
ldr r1, _080767E8 @ =gBattlerSpriteIds
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
@@ -4725,7 +4725,7 @@ sub_80766EC: @ 80766EC
orrs r0, r2
strb r0, [r1, 0x5]
_0807672C:
ldr r0, _080767EC @ =gUnknown_2037F1A
ldr r0, _080767EC @ =gBattleAnimAttacker
mov r8, r0
ldrb r0, [r0]
bl sub_8072DF0
@@ -4733,7 +4733,7 @@ _0807672C:
cmp r0, 0
beq _08076764
ldr r2, _080767E4 @ =gSprites
ldr r1, _080767E8 @ =gUnknown_2023D44
ldr r1, _080767E8 @ =gBattlerSpriteIds
mov r3, r8
ldrb r0, [r3]
adds r0, r1
@@ -4761,7 +4761,7 @@ _08076764:
cmp r0, 0
beq _0807679C
ldr r2, _080767E4 @ =gSprites
ldr r1, _080767E8 @ =gUnknown_2023D44
ldr r1, _080767E8 @ =gBattlerSpriteIds
ldrb r0, [r6]
eors r0, r5
adds r0, r1
@@ -4789,7 +4789,7 @@ _0807679C:
cmp r0, 0
beq _080767D4
ldr r2, _080767E4 @ =gSprites
ldr r1, _080767E8 @ =gUnknown_2023D44
ldr r1, _080767E8 @ =gBattlerSpriteIds
mov r3, r8
ldrb r0, [r3]
eors r0, r5
@@ -4815,10 +4815,10 @@ _080767D4:
pop {r0}
bx r0
.align 2, 0
_080767E0: .4byte gUnknown_2037F1B
_080767E0: .4byte gBattleAnimTarget
_080767E4: .4byte gSprites
_080767E8: .4byte gUnknown_2023D44
_080767EC: .4byte gUnknown_2037F1A
_080767E8: .4byte gBattlerSpriteIds
_080767EC: .4byte gBattleAnimAttacker
thumb_func_end sub_80766EC
thumb_func_start sub_80767F0
@@ -4840,7 +4840,7 @@ _080767FE:
beq _08076840
adds r0, r4, 0
bl sub_807685C
ldr r3, _08076858 @ =gUnknown_2023D44
ldr r3, _08076858 @ =gBattlerSpriteIds
adds r3, r5, r3
ldrb r2, [r3]
lsls r1, r2, 4
@@ -4875,7 +4875,7 @@ _0807684A:
.align 2, 0
_08076850: .4byte gBattlersCount
_08076854: .4byte gSprites
_08076858: .4byte gUnknown_2023D44
_08076858: .4byte gBattlerSpriteIds
thumb_func_end sub_80767F0
thumb_func_start sub_807685C
@@ -5719,13 +5719,13 @@ sub_8076ED8: @ 8076ED8
push {r4,lr}
adds r4, r0, 0
bl sub_8074FCC
ldr r0, _08076F10 @ =gUnknown_2037F1A
ldr r0, _08076F10 @ =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08076F18
ldr r2, _08076F14 @ =gUnknown_2037F02
ldr r2, _08076F14 @ =gBattleAnimArgs
ldrh r0, [r4, 0x20]
ldrh r1, [r2]
subs r0, r1
@@ -5742,10 +5742,10 @@ sub_8076ED8: @ 8076ED8
adds r1, r2, 0
b _08076F22
.align 2, 0
_08076F10: .4byte gUnknown_2037F1A
_08076F14: .4byte gUnknown_2037F02
_08076F10: .4byte gBattleAnimAttacker
_08076F14: .4byte gBattleAnimArgs
_08076F18:
ldr r1, _08076F4C @ =gUnknown_2037F02
ldr r1, _08076F4C @ =gBattleAnimArgs
ldrh r0, [r1]
ldrh r2, [r4, 0x20]
adds r0, r2
@@ -5772,7 +5772,7 @@ _08076F22:
pop {r0}
bx r0
.align 2, 0
_08076F4C: .4byte gUnknown_2037F02
_08076F4C: .4byte gBattleAnimArgs
_08076F50: .4byte move_anim_8074EE0
_08076F54: .4byte sub_8074E70
thumb_func_end sub_8076ED8
@@ -5781,13 +5781,13 @@ _08076F54: .4byte sub_8074E70
sub_8076F58: @ 8076F58
push {r4,lr}
adds r4, r0, 0
ldr r0, _08076F80 @ =gUnknown_2037F1A
ldr r0, _08076F80 @ =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08076F88
ldr r2, _08076F84 @ =gUnknown_2037F02
ldr r2, _08076F84 @ =gBattleAnimArgs
ldrh r0, [r4, 0x20]
ldrh r1, [r2]
subs r0, r1
@@ -5799,10 +5799,10 @@ sub_8076F58: @ 8076F58
adds r1, r2, 0
b _08076F92
.align 2, 0
_08076F80: .4byte gUnknown_2037F1A
_08076F84: .4byte gUnknown_2037F02
_08076F80: .4byte gBattleAnimAttacker
_08076F84: .4byte gBattleAnimArgs
_08076F88:
ldr r1, _08076FC4 @ =gUnknown_2037F02
ldr r1, _08076FC4 @ =gBattleAnimArgs
ldrh r0, [r1]
ldrh r2, [r4, 0x20]
adds r0, r2
@@ -5832,7 +5832,7 @@ _08076F92:
pop {r0}
bx r0
.align 2, 0
_08076FC4: .4byte gUnknown_2037F02
_08076FC4: .4byte gBattleAnimArgs
_08076FC8: .4byte move_anim_8074EE0
_08076FCC: .4byte sub_8074E70
thumb_func_end sub_8076F58
@@ -5842,23 +5842,23 @@ sub_8076FD0: @ 8076FD0
push {r4,lr}
adds r4, r0, 0
bl sub_8074FCC
ldr r0, _08076FF4 @ =gUnknown_2037F1A
ldr r0, _08076FF4 @ =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08076FFC
ldr r0, _08076FF8 @ =gUnknown_2037F02
ldr r0, _08076FF8 @ =gBattleAnimArgs
ldrh r1, [r4, 0x20]
ldrh r2, [r0]
subs r1, r2
strh r1, [r4, 0x20]
b _08077008
.align 2, 0
_08076FF4: .4byte gUnknown_2037F1A
_08076FF8: .4byte gUnknown_2037F02
_08076FF4: .4byte gBattleAnimAttacker
_08076FF8: .4byte gBattleAnimArgs
_08076FFC:
ldr r1, _08077024 @ =gUnknown_2037F02
ldr r1, _08077024 @ =gBattleAnimArgs
ldrh r0, [r1]
ldrh r2, [r4, 0x20]
adds r0, r2
@@ -5878,7 +5878,7 @@ _08077008:
pop {r0}
bx r0
.align 2, 0
_08077024: .4byte gUnknown_2037F02
_08077024: .4byte gBattleAnimArgs
_08077028: .4byte sub_8074F6C
_0807702C: .4byte DestroyAnimSprite
thumb_func_end sub_8076FD0
@@ -5899,7 +5899,7 @@ sub_8077030: @ 8077030
lsrs r0, 24
movs r6, 0
strh r0, [r5, 0x8]
ldr r7, _080770C8 @ =gUnknown_2037F1A
ldr r7, _080770C8 @ =gBattleAnimAttacker
ldrb r0, [r7]
bl GetBattlerSide
lsls r0, 24
@@ -5959,7 +5959,7 @@ _080770C0:
b _080770D6
.align 2, 0
_080770C4: .4byte gTasks
_080770C8: .4byte gUnknown_2037F1A
_080770C8: .4byte gBattleAnimAttacker
_080770CC: .4byte gSprites
_080770D0: .4byte 0x00002771
_080770D4:
@@ -5974,7 +5974,7 @@ _080770D6:
adds r1, r2
ldr r2, _0807710C @ =0x04000008
bl CpuSet
ldr r0, _08077110 @ =gUnknown_2037F02
ldr r0, _08077110 @ =gBattleAnimArgs
ldrb r2, [r0, 0x2]
ldrh r3, [r0]
adds r0, r6, 0
@@ -5989,7 +5989,7 @@ _080770D6:
_08077104: .4byte gPlttBufferUnfaded
_08077108: .4byte gPlttBufferFaded
_0807710C: .4byte 0x04000008
_08077110: .4byte gUnknown_2037F02
_08077110: .4byte gBattleAnimArgs
_08077114: .4byte sub_8077118
thumb_func_end sub_8077030
@@ -6198,7 +6198,7 @@ _08077298: .4byte gTasks
sub_807729C: @ 807729C
push {r4,r5,lr}
adds r5, r0, 0
ldr r4, _080772D0 @ =gUnknown_2037F1A
ldr r4, _080772D0 @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
@@ -6219,7 +6219,7 @@ sub_807729C: @ 807729C
movs r0, 0x5
b _080772D6
.align 2, 0
_080772D0: .4byte gUnknown_2037F1A
_080772D0: .4byte gBattleAnimAttacker
_080772D4:
ldr r0, _080772E8 @ =0x0000fff6
_080772D6:
@@ -6289,7 +6289,7 @@ _08077348:
sub_8077350: @ 8077350
push {r4,r5,lr}
adds r4, r0, 0
ldr r5, _08077388 @ =gUnknown_2037F02
ldr r5, _08077388 @ =gBattleAnimArgs
ldrh r0, [r5, 0x4]
strh r0, [r4, 0x2E]
ldrh r0, [r5, 0x8]
@@ -6300,7 +6300,7 @@ sub_8077350: @ 8077350
ldrh r1, [r4, 0x22]
adds r0, r1
strh r0, [r4, 0x36]
ldr r0, _0807738C @ =gUnknown_2037F1B
ldr r0, _0807738C @ =gBattleAnimTarget
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
@@ -6315,8 +6315,8 @@ sub_8077350: @ 8077350
subs r0, 0x14
b _0807739E
.align 2, 0
_08077388: .4byte gUnknown_2037F02
_0807738C: .4byte gUnknown_2037F1B
_08077388: .4byte gBattleAnimArgs
_0807738C: .4byte gBattleAnimTarget
_08077390:
ldrh r0, [r5, 0x8]
subs r0, 0x1E
asm/battle_anim_sound_tasks.s
+38 -38
View File
@@ -15,7 +15,7 @@ sub_80DCE10: @ 80DCE10
adds r6, r0
lsls r6, 3
adds r6, r1
ldr r1, _080DCE70 @ =gUnknown_2037F02
ldr r1, _080DCE70 @ =gBattleAnimArgs
ldrh r0, [r1]
strh r0, [r6, 0x8]
ldrh r0, [r1, 0x2]
@@ -51,7 +51,7 @@ sub_80DCE10: @ 80DCE10
bx r0
.align 2, 0
_080DCE6C: .4byte gTasks
_080DCE70: .4byte gUnknown_2037F02
_080DCE70: .4byte gBattleAnimArgs
_080DCE74: .4byte sub_80DCE78
thumb_func_end sub_80DCE10
@@ -168,7 +168,7 @@ mas_80DCF38: @ 80DCF38
lsls r0, 24
lsrs r0, 24
mov r8, r0
ldr r0, _080DCFDC @ =gUnknown_2037F02
ldr r0, _080DCFDC @ =gBattleAnimArgs
ldrh r1, [r0]
str r1, [sp]
ldrb r5, [r0, 0x4]
@@ -236,7 +236,7 @@ mas_80DCF38: @ 80DCF38
pop {r0}
bx r0
.align 2, 0
_080DCFDC: .4byte gUnknown_2037F02
_080DCFDC: .4byte gBattleAnimArgs
_080DCFE0: .4byte gTasks
_080DCFE4: .4byte sub_80DCFE8
thumb_func_end mas_80DCF38
@@ -320,41 +320,41 @@ sub_80DD06C: @ 80DD06C
bl sub_8073A44
lsls r0, 24
lsrs r6, r0, 24
ldr r0, _080DD090 @ =gUnknown_2037F02
ldr r0, _080DD090 @ =gBattleAnimArgs
movs r1, 0
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080DD098
ldr r0, _080DD094 @ =gUnknown_2037F1A
ldr r0, _080DD094 @ =gBattleAnimAttacker
ldrb r4, [r0]
b _080DD0BE
.align 2, 0
_080DD090: .4byte gUnknown_2037F02
_080DD094: .4byte gUnknown_2037F1A
_080DD090: .4byte gBattleAnimArgs
_080DD094: .4byte gBattleAnimAttacker
_080DD098:
cmp r0, 0x1
bne _080DD0A8
ldr r0, _080DD0A4 @ =gUnknown_2037F1B
ldr r0, _080DD0A4 @ =gBattleAnimTarget
ldrb r4, [r0]
b _080DD0BE
.align 2, 0
_080DD0A4: .4byte gUnknown_2037F1B
_080DD0A4: .4byte gBattleAnimTarget
_080DD0A8:
cmp r0, 0x2
bne _080DD0B4
ldr r0, _080DD0B0 @ =gUnknown_2037F1A
ldr r0, _080DD0B0 @ =gBattleAnimAttacker
b _080DD0B6
.align 2, 0
_080DD0B0: .4byte gUnknown_2037F1A
_080DD0B0: .4byte gBattleAnimAttacker
_080DD0B4:
ldr r0, _080DD0E0 @ =gUnknown_2037F1B
ldr r0, _080DD0E0 @ =gBattleAnimTarget
_080DD0B6:
ldrb r1, [r0]
movs r0, 0x2
adds r4, r0, 0
eors r4, r1
_080DD0BE:
ldr r0, _080DD0E4 @ =gUnknown_2037F02
ldr r0, _080DD0E4 @ =gBattleAnimArgs
movs r1, 0
ldrsh r0, [r0, r1]
cmp r0, 0x1
@@ -371,8 +371,8 @@ _080DD0CC:
bl DestroyAnimVisualTask
b _080DD13A
.align 2, 0
_080DD0E0: .4byte gUnknown_2037F1B
_080DD0E4: .4byte gUnknown_2037F02
_080DD0E0: .4byte gBattleAnimTarget
_080DD0E4: .4byte gBattleAnimArgs
_080DD0E8:
adds r0, r4, 0
bl GetBattlerSide
@@ -432,41 +432,41 @@ sub_80DD148: @ 80DD148
bl sub_8073A44
lsls r0, 24
lsrs r5, r0, 24
ldr r0, _080DD16C @ =gUnknown_2037F02
ldr r0, _080DD16C @ =gBattleAnimArgs
movs r1, 0
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080DD174
ldr r0, _080DD170 @ =gUnknown_2037F1A
ldr r0, _080DD170 @ =gBattleAnimAttacker
ldrb r4, [r0]
b _080DD19A
.align 2, 0
_080DD16C: .4byte gUnknown_2037F02
_080DD170: .4byte gUnknown_2037F1A
_080DD16C: .4byte gBattleAnimArgs
_080DD170: .4byte gBattleAnimAttacker
_080DD174:
cmp r0, 0x1
bne _080DD184
ldr r0, _080DD180 @ =gUnknown_2037F1B
ldr r0, _080DD180 @ =gBattleAnimTarget
ldrb r4, [r0]
b _080DD19A
.align 2, 0
_080DD180: .4byte gUnknown_2037F1B
_080DD180: .4byte gBattleAnimTarget
_080DD184:
cmp r0, 0x2
bne _080DD190
ldr r0, _080DD18C @ =gUnknown_2037F1A
ldr r0, _080DD18C @ =gBattleAnimAttacker
b _080DD192
.align 2, 0
_080DD18C: .4byte gUnknown_2037F1A
_080DD18C: .4byte gBattleAnimAttacker
_080DD190:
ldr r0, _080DD1BC @ =gUnknown_2037F1B
ldr r0, _080DD1BC @ =gBattleAnimTarget
_080DD192:
ldrb r1, [r0]
movs r0, 0x2
adds r4, r0, 0
eors r4, r1
_080DD19A:
ldr r0, _080DD1C0 @ =gUnknown_2037F02
ldr r0, _080DD1C0 @ =gBattleAnimArgs
movs r2, 0
ldrsh r0, [r0, r2]
cmp r0, 0x1
@@ -483,8 +483,8 @@ _080DD1A8:
bl DestroyAnimVisualTask
b _080DD26A
.align 2, 0
_080DD1BC: .4byte gUnknown_2037F1B
_080DD1C0: .4byte gUnknown_2037F02
_080DD1BC: .4byte gBattleAnimTarget
_080DD1C0: .4byte gBattleAnimArgs
_080DD1C4:
adds r0, r4, 0
bl GetBattlerSide
@@ -521,7 +521,7 @@ _080DD1F6:
adds r0, r2, r6
lsls r0, 3
adds r0, r1
ldr r4, _080DD240 @ =gUnknown_2037F02
ldr r4, _080DD240 @ =gBattleAnimArgs
ldrh r1, [r4, 0x2]
strh r1, [r0, 0x8]
strh r3, [r0, 0xA]
@@ -543,7 +543,7 @@ _080DD1F6:
_080DD234: .4byte gBattlerPartyIndexes
_080DD238: .4byte gPlayerParty
_080DD23C: .4byte gTasks
_080DD240: .4byte gUnknown_2037F02
_080DD240: .4byte gBattleAnimArgs
_080DD244:
adds r0, r3, 0
movs r2, 0x7
@@ -677,7 +677,7 @@ sub_80DD334: @ 80DD334
negs r0, r0
bl sub_8073A44
ldr r2, _080DD374 @ =gUnknown_2037F1C
ldr r1, _080DD378 @ =gUnknown_2037F1A
ldr r1, _080DD378 @ =gBattleAnimAttacker
ldrb r1, [r1]
lsls r1, 1
adds r1, r2
@@ -701,7 +701,7 @@ sub_80DD334: @ 80DD334
b _080DD38A
.align 2, 0
_080DD374: .4byte gUnknown_2037F1C
_080DD378: .4byte gUnknown_2037F1A
_080DD378: .4byte gBattleAnimAttacker
_080DD37C: .4byte gTasks
_080DD380: .4byte sub_80DD390
_080DD384:
@@ -758,7 +758,7 @@ sub_80DD3DC: @ 80DD3DC
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, _080DD40C @ =gUnknown_2037F02
ldr r0, _080DD40C @ =gBattleAnimArgs
ldrh r5, [r0]
ldrb r0, [r0, 0x2]
lsls r0, 24
@@ -775,7 +775,7 @@ sub_80DD3DC: @ 80DD3DC
pop {r0}
bx r0
.align 2, 0
_080DD40C: .4byte gUnknown_2037F02
_080DD40C: .4byte gBattleAnimArgs
thumb_func_end sub_80DD3DC
thumb_func_start sub_80DD410
@@ -784,7 +784,7 @@ sub_80DD410: @ 80DD410
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, _080DD440 @ =gUnknown_2037F02
ldr r0, _080DD440 @ =gBattleAnimArgs
ldrh r5, [r0]
ldrb r0, [r0, 0x2]
lsls r0, 24
@@ -801,7 +801,7 @@ sub_80DD410: @ 80DD410
pop {r0}
bx r0
.align 2, 0
_080DD440: .4byte gUnknown_2037F02
_080DD440: .4byte gBattleAnimArgs
thumb_func_end sub_80DD410
thumb_func_start sub_80DD444
@@ -814,7 +814,7 @@ sub_80DD444: @ 80DD444
lsls r0, 24
lsrs r0, 24
mov r8, r0
ldr r0, _080DD4C8 @ =gUnknown_2037F02
ldr r0, _080DD4C8 @ =gBattleAnimArgs
ldrb r5, [r0, 0x2]
ldrb r6, [r0, 0x4]
ldrh r1, [r0, 0x6]
@@ -868,7 +868,7 @@ sub_80DD444: @ 80DD444
pop {r0}
bx r0
.align 2, 0
_080DD4C8: .4byte gUnknown_2037F02
_080DD4C8: .4byte gBattleAnimArgs
_080DD4CC: .4byte gTasks
_080DD4D0: .4byte sub_80DD4D4
thumb_func_end sub_80DD444
asm/battle_anim_80EEC0C.s → asm/battle_anim_special.s
+131 -131
View File
@@ -16,7 +16,7 @@ sub_80EEC0C: @ 80EEC0C
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x10]
ldr r0, _080EEDB4 @ =gUnknown_2037F1A
ldr r0, _080EEDB4 @ =gBattleAnimAttacker
ldrb r4, [r0]
ldr r0, _080EEDB8 @ =gUnknown_2022984
movs r1, 0
@@ -203,7 +203,7 @@ sub_80EEC0C: @ 80EEC0C
pop {r0}
bx r0
.align 2, 0
_080EEDB4: .4byte gUnknown_2037F1A
_080EEDB4: .4byte gBattleAnimAttacker
_080EEDB8: .4byte gUnknown_2022984
_080EEDBC: .4byte gUnknown_2022986
_080EEDC0: .4byte 0x00003f3f
@@ -228,7 +228,7 @@ sub_80EEDF4: @ 80EEDF4
push {r7}
lsls r0, 24
lsrs r7, r0, 24
ldr r0, _080EEE3C @ =gUnknown_2037F1A
ldr r0, _080EEE3C @ =gBattleAnimAttacker
ldrb r0, [r0]
mov r8, r0
ldr r1, _080EEE40 @ =gTasks
@@ -260,7 +260,7 @@ sub_80EEDF4: @ 80EEDF4
beq _080EEE4E
b _080EEFA8
.align 2, 0
_080EEE3C: .4byte gUnknown_2037F1A
_080EEE3C: .4byte gBattleAnimAttacker
_080EEE40: .4byte gTasks
_080EEE44: .4byte gBattle_BG1_Y
_080EEE48:
@@ -569,7 +569,7 @@ sub_80EF0B4: @ 80EF0B4
lsrs r4, 24
mov r1, sp
adds r1, 0x1
ldr r0, _080EF0DC @ =gUnknown_2037F1A
ldr r0, _080EF0DC @ =gBattleAnimAttacker
ldrb r2, [r0]
mov r0, sp
bl sub_80EEFC8
@@ -580,7 +580,7 @@ sub_80EF0B4: @ 80EF0B4
pop {r0}
bx r0
.align 2, 0
_080EF0DC: .4byte gUnknown_2037F1A
_080EF0DC: .4byte gBattleAnimAttacker
thumb_func_end sub_80EF0B4
thumb_func_start sub_80EF0E0
@@ -664,7 +664,7 @@ sub_80EF180: @ 80EF180
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, _080EF19C @ =gUnknown_2037F1A
ldr r0, _080EF19C @ =gBattleAnimAttacker
ldrb r0, [r0]
bl sub_80EF0E0
adds r0, r4, 0
@@ -673,7 +673,7 @@ sub_80EF180: @ 80EF180
pop {r0}
bx r0
.align 2, 0
_080EF19C: .4byte gUnknown_2037F1A
_080EF19C: .4byte gBattleAnimAttacker
thumb_func_end sub_80EF180
thumb_func_start sub_80EF1A0
@@ -685,7 +685,7 @@ sub_80EF1A0: @ 80EF1A0
adds r1, r0
lsls r1, 3
adds r1, r2
ldr r2, _080EF1C4 @ =gUnknown_2037F02
ldr r2, _080EF1C4 @ =gBattleAnimArgs
ldrh r0, [r2]
strh r0, [r1, 0x1C]
ldrh r0, [r2, 0x2]
@@ -695,7 +695,7 @@ sub_80EF1A0: @ 80EF1A0
bx lr
.align 2, 0
_080EF1C0: .4byte gTasks
_080EF1C4: .4byte gUnknown_2037F02
_080EF1C4: .4byte gBattleAnimArgs
_080EF1C8: .4byte sub_80EF1CC
thumb_func_end sub_80EF1A0
@@ -809,8 +809,8 @@ sub_80EF298: @ 80EF298
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
ldr r1, _080EF2C4 @ =gUnknown_2023D44
ldr r0, _080EF2C8 @ =gUnknown_2037F1A
ldr r1, _080EF2C4 @ =gBattlerSpriteIds
ldr r0, _080EF2C8 @ =gBattleAnimAttacker
ldrb r0, [r0]
adds r0, r1
ldrb r5, [r0]
@@ -829,8 +829,8 @@ sub_80EF298: @ 80EF298
beq _080EF2D6
b _080EF338
.align 2, 0
_080EF2C4: .4byte gUnknown_2023D44
_080EF2C8: .4byte gUnknown_2037F1A
_080EF2C4: .4byte gBattlerSpriteIds
_080EF2C8: .4byte gBattleAnimAttacker
_080EF2CC: .4byte gTasks
_080EF2D0:
cmp r0, 0x2
@@ -900,8 +900,8 @@ sub_80EF344: @ 80EF344
sub sp, 0xC
lsls r0, 24
lsrs r5, r0, 24
ldr r1, _080EF37C @ =gUnknown_2023D44
ldr r4, _080EF380 @ =gUnknown_2037F1A
ldr r1, _080EF37C @ =gBattlerSpriteIds
ldr r4, _080EF380 @ =gBattleAnimAttacker
ldrb r0, [r4]
adds r1, r0, r1
ldrb r1, [r1]
@@ -920,8 +920,8 @@ sub_80EF344: @ 80EF344
ldr r1, _080EF388 @ =gPlayerParty
b _080EF39C
.align 2, 0
_080EF37C: .4byte gUnknown_2023D44
_080EF380: .4byte gUnknown_2037F1A
_080EF37C: .4byte gBattlerSpriteIds
_080EF380: .4byte gBattleAnimAttacker
_080EF384: .4byte gBattlerPartyIndexes
_080EF388: .4byte gPlayerParty
_080EF38C:
@@ -960,7 +960,7 @@ _080EF3CC: .4byte gBattlerPartyIndexes
_080EF3D0: .4byte gEnemyParty
_080EF3D4: .4byte gTasks
_080EF3D8:
ldr r5, _080EF450 @ =gUnknown_2037F1A
ldr r5, _080EF450 @ =gBattleAnimAttacker
ldrb r0, [r5]
movs r1, 0
bl sub_8074480
@@ -1015,7 +1015,7 @@ _080EF3D8:
strh r0, [r6, 0x8]
b _080EF482
.align 2, 0
_080EF450: .4byte gUnknown_2037F1A
_080EF450: .4byte gBattleAnimAttacker
_080EF454: .4byte gSprites
_080EF458:
movs r1, 0x1C
@@ -1103,21 +1103,21 @@ sub_80EF4E0: @ 80EF4E0
beq _080EF504
cmp r0, 0x6
beq _080EF514
ldr r1, _080EF500 @ =gUnknown_2037F02
ldr r1, _080EF500 @ =gBattleAnimArgs
movs r0, 0
b _080EF518
.align 2, 0
_080EF4FC: .4byte gUnknown_2024018
_080EF500: .4byte gUnknown_2037F02
_080EF500: .4byte gBattleAnimArgs
_080EF504:
ldr r1, _080EF50C @ =gUnknown_2037F02
ldr r1, _080EF50C @ =gBattleAnimArgs
ldr r0, _080EF510 @ =0x0000ffff
b _080EF518
.align 2, 0
_080EF50C: .4byte gUnknown_2037F02
_080EF50C: .4byte gBattleAnimArgs
_080EF510: .4byte 0x0000ffff
_080EF514:
ldr r1, _080EF524 @ =gUnknown_2037F02
ldr r1, _080EF524 @ =gBattleAnimArgs
ldr r0, _080EF528 @ =0x0000fffe
_080EF518:
strh r0, [r1, 0xE]
@@ -1126,7 +1126,7 @@ _080EF518:
pop {r0}
bx r0
.align 2, 0
_080EF524: .4byte gUnknown_2037F02
_080EF524: .4byte gBattleAnimArgs
_080EF528: .4byte 0x0000fffe
thumb_func_end sub_80EF4E0
@@ -1236,7 +1236,7 @@ sub_80EF5AC: @ 80EF5AC
adds r6, r4, r1
movs r0, 0x22
strh r0, [r6, 0x2E]
ldr r2, _080EF680 @ =gUnknown_2037F1B
ldr r2, _080EF680 @ =gBattleAnimTarget
mov r8, r2
ldrb r0, [r2]
movs r1, 0
@@ -1260,7 +1260,7 @@ sub_80EF5AC: @ 80EF5AC
ldr r0, _080EF688 @ =gUnknown_2024018
ldr r0, [r0]
ldr r3, [r0, 0x8]
ldr r1, _080EF68C @ =gUnknown_2023D44
ldr r1, _080EF68C @ =gBattlerSpriteIds
mov r2, r8
ldrb r0, [r2]
adds r0, r1
@@ -1300,10 +1300,10 @@ sub_80EF5AC: @ 80EF5AC
_080EF674: .4byte gUnknown_2023D68
_080EF678: .4byte gUnknown_82606F4
_080EF67C: .4byte gSprites
_080EF680: .4byte gUnknown_2037F1B
_080EF680: .4byte gBattleAnimTarget
_080EF684: .4byte sub_80EF8C0
_080EF688: .4byte gUnknown_2024018
_080EF68C: .4byte gUnknown_2023D44
_080EF68C: .4byte gBattlerSpriteIds
_080EF690: .4byte gTasks
_080EF694: .4byte sub_80EF698
thumb_func_end sub_80EF5AC
@@ -1407,7 +1407,7 @@ _080EF708:
adds r6, r4, r0
movs r0, 0x22
strh r0, [r6, 0x2E]
ldr r1, _080EF7D4 @ =gUnknown_2037F1B
ldr r1, _080EF7D4 @ =gBattleAnimTarget
mov r8, r1
ldrb r0, [r1]
movs r1, 0
@@ -1430,7 +1430,7 @@ _080EF708:
str r0, [r4]
movs r0, 0
bl GetBattlerAtPosition
ldr r1, _080EF7DC @ =gUnknown_2023D44
ldr r1, _080EF7DC @ =gBattlerSpriteIds
lsls r0, 24
lsrs r0, 24
adds r0, r1
@@ -1460,9 +1460,9 @@ _080EF7C4: .4byte gSaveBlock2Ptr
_080EF7C8: .4byte gUnknown_2023D68
_080EF7CC: .4byte gUnknown_82606F4
_080EF7D0: .4byte gSprites
_080EF7D4: .4byte gUnknown_2037F1B
_080EF7D4: .4byte gBattleAnimTarget
_080EF7D8: .4byte SpriteCallbackDummy
_080EF7DC: .4byte gUnknown_2023D44
_080EF7DC: .4byte gBattlerSpriteIds
_080EF7E0: .4byte sub_8012354
_080EF7E4: .4byte gTasks
_080EF7E8: .4byte sub_80EF7EC
@@ -1476,7 +1476,7 @@ sub_80EF7EC: @ 80EF7EC
ldr r6, _080EF84C @ =gSprites
movs r0, 0
bl GetBattlerAtPosition
ldr r1, _080EF850 @ =gUnknown_2023D44
ldr r1, _080EF850 @ =gBattlerSpriteIds
lsls r0, 24
lsrs r0, 24
adds r0, r1
@@ -1518,7 +1518,7 @@ _080EF846:
bx r0
.align 2, 0
_080EF84C: .4byte gSprites
_080EF850: .4byte gUnknown_2023D44
_080EF850: .4byte gBattlerSpriteIds
_080EF854: .4byte gTasks
_080EF858: .4byte sub_80EF8C0
_080EF85C: .4byte sub_80EF864
@@ -1533,7 +1533,7 @@ sub_80EF864: @ 80EF864
ldr r6, _080EF8B8 @ =gSprites
movs r0, 0
bl GetBattlerAtPosition
ldr r4, _080EF8BC @ =gUnknown_2023D44
ldr r4, _080EF8BC @ =gBattlerSpriteIds
lsls r0, 24
lsrs r0, 24
adds r0, r4
@@ -1567,7 +1567,7 @@ _080EF8B0:
bx r0
.align 2, 0
_080EF8B8: .4byte gSprites
_080EF8BC: .4byte gUnknown_2023D44
_080EF8BC: .4byte gBattlerSpriteIds
thumb_func_end sub_80EF864
thumb_func_start sub_80EF8C0
@@ -1674,7 +1674,7 @@ _080EF954:
movs r2, 0x1
movs r3, 0x1C
bl LaunchBallStarsTask
ldr r0, _080EF9B0 @ =gUnknown_2037F1B
ldr r0, _080EF9B0 @ =gBattleAnimTarget
ldrb r1, [r0]
movs r0, 0
movs r2, 0xE
@@ -1688,7 +1688,7 @@ _080EF99E:
.align 2, 0
_080EF9A8: .4byte sub_80EF9B4
_080EF9AC: .4byte gUnknown_2023D68
_080EF9B0: .4byte gUnknown_2037F1B
_080EF9B0: .4byte gBattleAnimTarget
thumb_func_end sub_80EF8F0
thumb_func_start sub_80EF9B4
@@ -1711,8 +1711,8 @@ sub_80EF9B4: @ 80EF9B4
ldr r0, _080EF9FC @ =sub_80EFA0C
str r0, [r4, 0x1C]
ldr r2, _080EFA00 @ =gSprites
ldr r1, _080EFA04 @ =gUnknown_2023D44
ldr r0, _080EFA08 @ =gUnknown_2037F1B
ldr r1, _080EFA04 @ =gBattlerSpriteIds
ldr r0, _080EFA08 @ =gBattleAnimTarget
ldrb r0, [r0]
adds r0, r1
ldrb r1, [r0]
@@ -1730,16 +1730,16 @@ _080EF9F0:
_080EF9F8: .4byte TaskDummy
_080EF9FC: .4byte sub_80EFA0C
_080EFA00: .4byte gSprites
_080EFA04: .4byte gUnknown_2023D44
_080EFA08: .4byte gUnknown_2037F1B
_080EFA04: .4byte gBattlerSpriteIds
_080EFA08: .4byte gBattleAnimTarget
thumb_func_end sub_80EF9B4
thumb_func_start sub_80EFA0C
sub_80EFA0C: @ 80EFA0C
push {r4-r7,lr}
adds r7, r0, 0
ldr r1, _080EFA50 @ =gUnknown_2023D44
ldr r0, _080EFA54 @ =gUnknown_2037F1B
ldr r1, _080EFA50 @ =gBattlerSpriteIds
ldr r0, _080EFA54 @ =gBattleAnimTarget
ldrb r0, [r0]
adds r0, r1
ldrb r4, [r0]
@@ -1771,8 +1771,8 @@ _080EFA3E:
beq _080EFA62
b _080EFB20
.align 2, 0
_080EFA50: .4byte gUnknown_2023D44
_080EFA54: .4byte gUnknown_2037F1B
_080EFA50: .4byte gBattlerSpriteIds
_080EFA54: .4byte gBattleAnimTarget
_080EFA58: .4byte gTasks
_080EFA5C:
cmp r0, 0x2
@@ -2495,7 +2495,7 @@ sub_80EFFC4: @ 80EFFC4
push {r7}
sub sp, 0x4
adds r6, r0, 0
ldr r7, _080F0004 @ =gUnknown_2037F1B
ldr r7, _080F0004 @ =gBattleAnimTarget
ldrh r0, [r6, 0x36]
adds r0, 0x1
movs r1, 0
@@ -2519,7 +2519,7 @@ sub_80EFFC4: @ 80EFFC4
bl sub_80F01B8
b _080F0088
.align 2, 0
_080F0004: .4byte gUnknown_2037F1B
_080F0004: .4byte gBattleAnimTarget
_080F0008:
cmp r1, 0x3C
bne _080F0026
@@ -2555,7 +2555,7 @@ _080F004C:
cmp r1, r0
bne _080F0088
ldr r5, _080F0098 @ =gSprites
ldr r4, _080F009C @ =gUnknown_2023D44
ldr r4, _080F009C @ =gBattlerSpriteIds
ldrb r0, [r7]
adds r0, r4
ldrb r1, [r0]
@@ -2589,7 +2589,7 @@ _080F0088:
.align 2, 0
_080F0094: .4byte 0x0000013b
_080F0098: .4byte gSprites
_080F009C: .4byte gUnknown_2023D44
_080F009C: .4byte gBattlerSpriteIds
_080F00A0: .4byte sub_80F00A4
thumb_func_end sub_80EFFC4
@@ -2893,7 +2893,7 @@ sub_80F02B0: @ 80F02B0
movs r2, 0x1
movs r3, 0x1C
bl LaunchBallStarsTask
ldr r0, _080F036C @ =gUnknown_2037F1B
ldr r0, _080F036C @ =gBattleAnimTarget
ldrb r1, [r0]
movs r0, 0x1
movs r2, 0xE
@@ -2901,8 +2901,8 @@ sub_80F02B0: @ 80F02B0
bl LaunchBallFadeMonTask
_080F0302:
ldr r6, _080F0370 @ =gSprites
ldr r5, _080F0374 @ =gUnknown_2023D44
ldr r4, _080F036C @ =gUnknown_2037F1B
ldr r5, _080F0374 @ =gBattlerSpriteIds
ldr r4, _080F036C @ =gBattleAnimTarget
ldrb r0, [r4]
adds r0, r5
ldrb r1, [r0]
@@ -2950,9 +2950,9 @@ _080F0302:
.align 2, 0
_080F0364: .4byte sub_80F0378
_080F0368: .4byte gUnknown_2023D68
_080F036C: .4byte gUnknown_2037F1B
_080F036C: .4byte gBattleAnimTarget
_080F0370: .4byte gSprites
_080F0374: .4byte gUnknown_2023D44
_080F0374: .4byte gBattlerSpriteIds
thumb_func_end sub_80F02B0
thumb_func_start sub_80F0378
@@ -2974,8 +2974,8 @@ sub_80F0378: @ 80F0378
strb r0, [r2]
_080F0396:
ldr r4, _080F03C4 @ =gSprites
ldr r3, _080F03C8 @ =gUnknown_2023D44
ldr r2, _080F03CC @ =gUnknown_2037F1B
ldr r3, _080F03C8 @ =gBattlerSpriteIds
ldr r2, _080F03CC @ =gBattleAnimTarget
ldrb r0, [r2]
adds r0, r3
ldrb r1, [r0]
@@ -2996,8 +2996,8 @@ _080F0396:
b _080F03F0
.align 2, 0
_080F03C4: .4byte gSprites
_080F03C8: .4byte gUnknown_2023D44
_080F03CC: .4byte gUnknown_2037F1B
_080F03C8: .4byte gBattlerSpriteIds
_080F03CC: .4byte gBattleAnimTarget
_080F03D0:
ldr r6, _080F045C @ =0xfffffee0
adds r0, r6, 0
@@ -3026,8 +3026,8 @@ _080F03F0:
cmp r5, 0
beq _080F0456
ldr r4, _080F0460 @ =gSprites
ldr r3, _080F0464 @ =gUnknown_2023D44
ldr r2, _080F0468 @ =gUnknown_2037F1B
ldr r3, _080F0464 @ =gBattlerSpriteIds
ldr r2, _080F0468 @ =gBattleAnimTarget
ldrb r0, [r2]
adds r0, r3
ldrb r1, [r0]
@@ -3073,8 +3073,8 @@ _080F0456:
.align 2, 0
_080F045C: .4byte 0xfffffee0
_080F0460: .4byte gSprites
_080F0464: .4byte gUnknown_2023D44
_080F0468: .4byte gUnknown_2037F1B
_080F0464: .4byte gBattlerSpriteIds
_080F0468: .4byte gBattleAnimTarget
_080F046C: .4byte gUnknown_2024018
_080F0470: .4byte sub_80F018C
_080F0474: .4byte gUnknown_2024005
@@ -3264,10 +3264,10 @@ sub_80F05B4: @ 80F05B4
cmp r0, r1
bne _080F05DA
adds r0, r4, 0
bl sub_800F034
bl LoadCompressedSpriteSheetUsingHeap
ldr r0, _080F05E8 @ =gUnknown_840BFA8
adds r0, r5, r0
bl sub_800F078
bl LoadCompressedSpritePaletteUsingHeap
_080F05DA:
pop {r4,r5}
pop {r0}
@@ -5082,8 +5082,8 @@ sub_80F1420: @ 80F1420
lsrs r7, r0, 24
movs r0, 0
mov r8, r0
ldr r0, _080F1454 @ =gUnknown_2023D44
ldr r3, _080F1458 @ =gUnknown_2037F1A
ldr r0, _080F1454 @ =gBattlerSpriteIds
ldr r3, _080F1458 @ =gBattleAnimAttacker
ldrb r2, [r3]
adds r0, r2, r0
ldrb r6, [r0]
@@ -5102,15 +5102,15 @@ sub_80F1420: @ 80F1420
beq _080F1466
b _080F15BA
.align 2, 0
_080F1454: .4byte gUnknown_2023D44
_080F1458: .4byte gUnknown_2037F1A
_080F1454: .4byte gBattlerSpriteIds
_080F1458: .4byte gBattleAnimAttacker
_080F145C: .4byte gTasks
_080F1460:
cmp r0, 0x2
beq _080F150A
b _080F15BA
_080F1466:
ldr r0, _080F14A0 @ =gUnknown_2037F02
ldr r0, _080F14A0 @ =gBattleAnimArgs
ldrh r0, [r0]
strh r0, [r5, 0x1E]
movs r2, 0xA0
@@ -5138,7 +5138,7 @@ _080F1466:
adds r4, r3, 0
b _080F14C0
.align 2, 0
_080F14A0: .4byte gUnknown_2037F02
_080F14A0: .4byte gBattleAnimArgs
_080F14A4: .4byte gSprites
_080F14A8:
ldr r3, _080F14F0 @ =gSprites
@@ -5238,7 +5238,7 @@ _080F1558:
adds r0, r1
ldrb r1, [r0, 0x8]
strh r1, [r0, 0x8]
ldr r0, _080F1594 @ =gUnknown_2037F1A
ldr r0, _080F1594 @ =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
@@ -5259,7 +5259,7 @@ _080F1558:
.align 2, 0
_080F158C: .4byte gSprites
_080F1590: .4byte gTasks
_080F1594: .4byte gUnknown_2037F1A
_080F1594: .4byte gBattleAnimAttacker
_080F1598:
ldr r0, _080F15C4 @ =gSprites
adds r1, r4, r6
@@ -5315,7 +5315,7 @@ _080F15F0:
beq _080F167E
b _080F16B4
_080F15F6:
ldr r0, _080F1610 @ =gUnknown_2037F1A
ldr r0, _080F1610 @ =gBattleAnimAttacker
ldrb r0, [r0]
bl sub_80768B0
lsls r0, 24
@@ -5327,7 +5327,7 @@ _080F15F6:
bl SetGpuReg
b _080F1620
.align 2, 0
_080F1610: .4byte gUnknown_2037F1A
_080F1610: .4byte gBattleAnimAttacker
_080F1614: .4byte 0x00003f42
_080F1618:
ldr r1, _080F163C @ =0x00003f44
@@ -5379,8 +5379,8 @@ _080F1644:
strh r0, [r4, 0x26]
b _080F16B4
_080F167E:
ldr r1, _080F16BC @ =gUnknown_2023D44
ldr r4, _080F16C0 @ =gUnknown_2037F1A
ldr r1, _080F16BC @ =gBattlerSpriteIds
ldr r4, _080F16C0 @ =gBattleAnimAttacker
ldrb r0, [r4]
adds r0, r1
ldrb r1, [r0]
@@ -5408,8 +5408,8 @@ _080F16B4:
pop {r0}
bx r0
.align 2, 0
_080F16BC: .4byte gUnknown_2023D44
_080F16C0: .4byte gUnknown_2037F1A
_080F16BC: .4byte gBattlerSpriteIds
_080F16C0: .4byte gBattleAnimAttacker
_080F16C4: .4byte gSprites
_080F16C8: .4byte 0x06010000
thumb_func_end sub_80F15C8
@@ -5419,10 +5419,10 @@ sub_80F16CC: @ 80F16CC
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r3, _080F16F4 @ =gUnknown_2037F02
ldr r3, _080F16F4 @ =gBattleAnimArgs
ldr r1, _080F16F8 @ =gUnknown_2024018
ldr r2, [r1]
ldr r1, _080F16FC @ =gUnknown_2037F1A
ldr r1, _080F16FC @ =gBattleAnimAttacker
ldrb r1, [r1]
ldr r2, [r2]
lsls r1, 2
@@ -5435,9 +5435,9 @@ sub_80F16CC: @ 80F16CC
pop {r0}
bx r0
.align 2, 0
_080F16F4: .4byte gUnknown_2037F02
_080F16F4: .4byte gBattleAnimArgs
_080F16F8: .4byte gUnknown_2024018
_080F16FC: .4byte gUnknown_2037F1A
_080F16FC: .4byte gBattleAnimAttacker
thumb_func_end sub_80F16CC
thumb_func_start sub_80F1700
@@ -5445,7 +5445,7 @@ sub_80F1700: @ 80F1700
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r2, _080F1718 @ =gUnknown_2037F1B
ldr r2, _080F1718 @ =gBattleAnimTarget
ldr r1, _080F171C @ =gUnknown_2023D6E
ldrb r1, [r1]
strb r1, [r2]
@@ -5453,7 +5453,7 @@ sub_80F1700: @ 80F1700
pop {r0}
bx r0
.align 2, 0
_080F1718: .4byte gUnknown_2037F1B
_080F1718: .4byte gBattleAnimTarget
_080F171C: .4byte gUnknown_2023D6E
thumb_func_end sub_80F1700
@@ -5514,9 +5514,9 @@ _080F177E:
cmp r0, r7
bne _080F179E
ldr r0, _080F17E8 @ =gUnknown_83AD350
bl sub_800F034
bl LoadCompressedSpriteSheetUsingHeap
ldr r0, _080F17EC @ =gUnknown_83ADC58
bl sub_800F078
bl LoadCompressedSpritePaletteUsingHeap
_080F179E:
ldr r5, _080F17F0 @ =sub_80F181C
adds r0, r5, 0
@@ -5941,9 +5941,9 @@ sub_80F1AE0: @ 80F1AE0
lsls r4, 24
lsrs r4, 24
ldr r0, _080F1B08 @ =gUnknown_83AD470
bl sub_800F034
bl LoadCompressedSpriteSheetUsingHeap
ldr r0, _080F1B0C @ =gUnknown_83ADD78
bl sub_800F078
bl LoadCompressedSpritePaletteUsingHeap
ldr r0, _080F1B10 @ =0x0000281d
bl IndexOfSpritePaletteTag
adds r0, r4, 0
@@ -5992,7 +5992,7 @@ sub_80F1B3C: @ 80F1B3C
movs r1, 0
bl sub_8074480
lsls r0, 24
ldr r5, _080F1BB0 @ =gUnknown_2037F02
ldr r5, _080F1BB0 @ =gBattleAnimArgs
lsrs r0, 24
ldrh r1, [r5, 0x4]
adds r0, r1
@@ -6013,8 +6013,8 @@ sub_80F1B3C: @ 80F1B3C
adds r0, r4, 0
bl sub_8075068
ldr r2, _080F1BB8 @ =gSprites
ldr r1, _080F1BBC @ =gUnknown_2023D44
ldr r0, _080F1BC0 @ =gUnknown_2037F1A
ldr r1, _080F1BBC @ =gBattlerSpriteIds
ldr r0, _080F1BC0 @ =gBattleAnimAttacker
ldrb r0, [r0]
adds r0, r1
ldrb r1, [r0]
@@ -6031,11 +6031,11 @@ sub_80F1B3C: @ 80F1B3C
pop {r0}
bx r0
.align 2, 0
_080F1BB0: .4byte gUnknown_2037F02
_080F1BB0: .4byte gBattleAnimArgs
_080F1BB4: .4byte 0x0000ffe0
_080F1BB8: .4byte gSprites
_080F1BBC: .4byte gUnknown_2023D44
_080F1BC0: .4byte gUnknown_2037F1A
_080F1BBC: .4byte gBattlerSpriteIds
_080F1BC0: .4byte gBattleAnimAttacker
_080F1BC4: .4byte sub_8012354
_080F1BC8: .4byte sub_80F1BCC
thumb_func_end sub_80F1B3C
@@ -6045,8 +6045,8 @@ sub_80F1BCC: @ 80F1BCC
push {lr}
adds r3, r0, 0
ldr r2, _080F1BF4 @ =gSprites
ldr r1, _080F1BF8 @ =gUnknown_2023D44
ldr r0, _080F1BFC @ =gUnknown_2037F1A
ldr r1, _080F1BF8 @ =gBattlerSpriteIds
ldr r0, _080F1BFC @ =gBattleAnimAttacker
ldrb r0, [r0]
adds r0, r1
ldrb r1, [r0]
@@ -6065,8 +6065,8 @@ _080F1BF0:
bx r0
.align 2, 0
_080F1BF4: .4byte gSprites
_080F1BF8: .4byte gUnknown_2023D44
_080F1BFC: .4byte gUnknown_2037F1A
_080F1BF8: .4byte gBattlerSpriteIds
_080F1BFC: .4byte gBattleAnimAttacker
_080F1C00: .4byte sub_80F1C04
thumb_func_end sub_80F1BCC
@@ -6101,8 +6101,8 @@ sub_80F1C30: @ 80F1C30
push {r4,r5,lr}
adds r4, r0, 0
ldr r5, _080F1C80 @ =gSprites
ldr r3, _080F1C84 @ =gUnknown_2023D44
ldr r2, _080F1C88 @ =gUnknown_2037F1A
ldr r3, _080F1C84 @ =gBattlerSpriteIds
ldr r2, _080F1C88 @ =gBattleAnimAttacker
ldrb r0, [r2]
adds r0, r3
ldrb r1, [r0]
@@ -6138,8 +6138,8 @@ _080F1C78:
bx r0
.align 2, 0
_080F1C80: .4byte gSprites
_080F1C84: .4byte gUnknown_2023D44
_080F1C88: .4byte gUnknown_2037F1A
_080F1C84: .4byte gBattlerSpriteIds
_080F1C88: .4byte gBattleAnimAttacker
thumb_func_end sub_80F1C30
thumb_func_start sub_80F1C8C
@@ -6147,7 +6147,7 @@ sub_80F1C8C: @ 80F1C8C
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _080F1CA4 @ =gUnknown_2037F02
ldr r0, _080F1CA4 @ =gBattleAnimArgs
movs r1, 0
ldrsh r0, [r0, r1]
cmp r0, 0
@@ -6156,25 +6156,25 @@ sub_80F1C8C: @ 80F1C8C
beq _080F1CBC
b _080F1CD0
.align 2, 0
_080F1CA4: .4byte gUnknown_2037F02
_080F1CA4: .4byte gBattleAnimArgs
_080F1CA8:
movs r0, 0
bl GetBattlerAtPosition
ldr r1, _080F1CB8 @ =gUnknown_2037F1A
ldr r1, _080F1CB8 @ =gBattleAnimAttacker
strb r0, [r1]
movs r0, 0x1
b _080F1CC8
.align 2, 0
_080F1CB8: .4byte gUnknown_2037F1A
_080F1CB8: .4byte gBattleAnimAttacker
_080F1CBC:
movs r0, 0x1
bl GetBattlerAtPosition
ldr r1, _080F1CDC @ =gUnknown_2037F1A
ldr r1, _080F1CDC @ =gBattleAnimAttacker
strb r0, [r1]
movs r0, 0
_080F1CC8:
bl GetBattlerAtPosition
ldr r1, _080F1CE0 @ =gUnknown_2037F1B
ldr r1, _080F1CE0 @ =gBattleAnimTarget
strb r0, [r1]
_080F1CD0:
adds r0, r4, 0
@@ -6183,8 +6183,8 @@ _080F1CD0:
pop {r0}
bx r0
.align 2, 0
_080F1CDC: .4byte gUnknown_2037F1A
_080F1CE0: .4byte gUnknown_2037F1B
_080F1CDC: .4byte gBattleAnimAttacker
_080F1CE0: .4byte gBattleAnimTarget
thumb_func_end sub_80F1C8C
thumb_func_start sub_80F1CE4
@@ -6196,14 +6196,14 @@ sub_80F1CE4: @ 80F1CE4
ldrb r0, [r2, 0x5]
cmp r0, 0x2
bls _080F1D00
ldr r1, _080F1CFC @ =gUnknown_2037F02
ldr r1, _080F1CFC @ =gBattleAnimArgs
movs r0, 0
b _080F1D04
.align 2, 0
_080F1CF8: .4byte gUnknown_2023E82
_080F1CFC: .4byte gUnknown_2037F02
_080F1CFC: .4byte gBattleAnimArgs
_080F1D00:
ldr r1, _080F1D10 @ =gUnknown_2037F02
ldr r1, _080F1D10 @ =gBattleAnimArgs
ldrb r0, [r2, 0x5]
_080F1D04:
strh r0, [r1, 0xE]
@@ -6212,7 +6212,7 @@ _080F1D04:
pop {r0}
bx r0
.align 2, 0
_080F1D10: .4byte gUnknown_2037F02
_080F1D10: .4byte gBattleAnimArgs
thumb_func_end sub_80F1CE4
thumb_func_start sub_80F1D14
@@ -6226,40 +6226,40 @@ sub_80F1D14: @ 80F1D14
ldrh r1, [r0]
cmp r1, 0x53
bne _080F1D34
ldr r1, _080F1D30 @ =gUnknown_2037F02
ldr r1, _080F1D30 @ =gBattleAnimArgs
movs r0, 0x1
b _080F1D6C
.align 2, 0
_080F1D2C: .4byte gUnknown_2024018
_080F1D30: .4byte gUnknown_2037F02
_080F1D30: .4byte gBattleAnimArgs
_080F1D34:
cmp r1, 0xFA
bne _080F1D44
ldr r1, _080F1D40 @ =gUnknown_2037F02
ldr r1, _080F1D40 @ =gBattleAnimArgs
movs r0, 0x2
b _080F1D6C
.align 2, 0
_080F1D40: .4byte gUnknown_2037F02
_080F1D40: .4byte gBattleAnimArgs
_080F1D44:
cmp r1, 0x80
bne _080F1D54
ldr r1, _080F1D50 @ =gUnknown_2037F02
ldr r1, _080F1D50 @ =gBattleAnimArgs
movs r0, 0x3
b _080F1D6C
.align 2, 0
_080F1D50: .4byte gUnknown_2037F02
_080F1D50: .4byte gBattleAnimArgs
_080F1D54:
movs r0, 0xA4
lsls r0, 1
cmp r1, r0
bne _080F1D68
ldr r1, _080F1D64 @ =gUnknown_2037F02
ldr r1, _080F1D64 @ =gBattleAnimArgs
movs r0, 0x4
b _080F1D6C
.align 2, 0
_080F1D64: .4byte gUnknown_2037F02
_080F1D64: .4byte gBattleAnimArgs
_080F1D68:
ldr r1, _080F1D78 @ =gUnknown_2037F02
ldr r1, _080F1D78 @ =gBattleAnimArgs
movs r0, 0
_080F1D6C:
strh r0, [r1]
@@ -6268,7 +6268,7 @@ _080F1D6C:
pop {r0}
bx r0
.align 2, 0
_080F1D78: .4byte gUnknown_2037F02
_080F1D78: .4byte gBattleAnimArgs
thumb_func_end sub_80F1D14
thumb_func_start sub_80F1D7C
@@ -6276,13 +6276,13 @@ sub_80F1D7C: @ 80F1D7C
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r3, _080F1DA0 @ =gUnknown_2037F1A
ldr r3, _080F1DA0 @ =gBattleAnimAttacker
ldr r1, _080F1DA4 @ =gUnknown_2024018
ldr r2, [r1]
ldr r1, [r2, 0x8]
ldrh r1, [r1]
strb r1, [r3]
ldr r3, _080F1DA8 @ =gUnknown_2037F1B
ldr r3, _080F1DA8 @ =gBattleAnimTarget
ldr r1, [r2, 0x8]
ldrh r1, [r1]
lsrs r1, 8
@@ -6291,9 +6291,9 @@ sub_80F1D7C: @ 80F1D7C
pop {r0}
bx r0
.align 2, 0
_080F1DA0: .4byte gUnknown_2037F1A
_080F1DA0: .4byte gBattleAnimAttacker
_080F1DA4: .4byte gUnknown_2024018
_080F1DA8: .4byte gUnknown_2037F1B
_080F1DA8: .4byte gBattleAnimTarget
thumb_func_end sub_80F1D7C
.align 2, 0 @ Don't pad with nop.
asm/battle_anim_8078178.s → asm/battle_anim_status_effects.s
+12 -12
View File
@@ -16,7 +16,7 @@ sub_8078178: @ 8078178
lsrs r4, 24
lsls r5, 24
lsrs r5, 24
ldr r0, _0807821C @ =gUnknown_2023D44
ldr r0, _0807821C @ =gBattlerSpriteIds
adds r0, r4, r0
ldrb r6, [r0]
ldr r0, _08078220 @ =sub_80782BC
@@ -26,9 +26,9 @@ sub_8078178: @ 8078178
lsrs r0, 24
mov r8, r0
ldr r0, _08078224 @ =gUnknown_83AD048
bl sub_800F034
bl LoadCompressedSpriteSheetUsingHeap
ldr r0, _08078228 @ =gUnknown_83AD950
bl sub_800F078
bl LoadCompressedSpritePaletteUsingHeap
ldr r1, _0807822C @ =gTasks
mov r2, r8
lsls r0, r2, 2
@@ -88,7 +88,7 @@ _08078210:
bls _080781CC
b _08078298
.align 2, 0
_0807821C: .4byte gUnknown_2023D44
_0807821C: .4byte gBattlerSpriteIds
_08078220: .4byte sub_80782BC
_08078224: .4byte gUnknown_83AD048
_08078228: .4byte gUnknown_83AD950
@@ -341,7 +341,7 @@ sub_80783FC: @ 80783FC
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
ldr r4, _080784AC @ =gUnknown_2037F1B
ldr r4, _080784AC @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
@@ -420,7 +420,7 @@ _08078484:
pop {r0}
bx r0
.align 2, 0
_080784AC: .4byte gUnknown_2037F1B
_080784AC: .4byte gBattleAnimTarget
_080784B0: .4byte 0xffe00000
_080784B4: .4byte 0xffdc0000
_080784B8: .4byte 0xfffa0000
@@ -867,7 +867,7 @@ _08078830:
bl DestroyAnimVisualTask
b _0807885A
_08078838:
ldr r0, _08078860 @ =gUnknown_2037F02
ldr r0, _08078860 @ =gBattleAnimArgs
movs r1, 0
strh r5, [r0]
strh r2, [r0, 0x2]
@@ -888,7 +888,7 @@ _0807885A:
pop {r0}
bx r0
.align 2, 0
_08078860: .4byte gUnknown_2037F02
_08078860: .4byte gBattleAnimArgs
_08078864: .4byte gTasks
_08078868: .4byte sub_80BB088
thumb_func_end sub_8078694
@@ -901,9 +901,9 @@ LaunchStatusAnimation: @ 807886C
lsrs r4, 24
lsls r1, 24
lsrs r1, 24
ldr r0, _080788A8 @ =gUnknown_2037F1A
ldr r0, _080788A8 @ =gBattleAnimAttacker
strb r4, [r0]
ldr r0, _080788AC @ =gUnknown_2037F1B
ldr r0, _080788AC @ =gBattleAnimTarget
strb r4, [r0]
ldr r0, _080788B0 @ =gUnknown_81C6E84
movs r2, 0
@@ -923,8 +923,8 @@ LaunchStatusAnimation: @ 807886C
pop {r0}
bx r0
.align 2, 0
_080788A8: .4byte gUnknown_2037F1A
_080788AC: .4byte gUnknown_2037F1B
_080788A8: .4byte gBattleAnimAttacker
_080788AC: .4byte gBattleAnimTarget
_080788B0: .4byte gUnknown_81C6E84
_080788B4: .4byte task0A_80788BC
_080788B8: .4byte gTasks
asm/battle_anim_utility_funcs.s
+5133
View File
File diff suppressed because it is too large Load Diff
asm/battle_controller_link_opponent.s
+40 -40
View File
@@ -70,7 +70,7 @@ _0803A6D0:
sub_803A6D4: @ 803A6D4
push {lr}
ldr r2, _0803A6FC @ =gSprites
ldr r1, _0803A700 @ =gUnknown_2023D44
ldr r1, _0803A700 @ =gBattlerSpriteIds
ldr r0, _0803A704 @ =gActiveBattler
ldrb r0, [r0]
adds r0, r1
@@ -90,7 +90,7 @@ _0803A6F8:
bx r0
.align 2, 0
_0803A6FC: .4byte gSprites
_0803A700: .4byte gUnknown_2023D44
_0803A700: .4byte gBattlerSpriteIds
_0803A704: .4byte gActiveBattler
_0803A708: .4byte SpriteCallbackDummy
thumb_func_end sub_803A6D4
@@ -99,7 +99,7 @@ _0803A708: .4byte SpriteCallbackDummy
sub_803A70C: @ 803A70C
push {r4-r6,lr}
ldr r4, _0803A784 @ =gSprites
ldr r6, _0803A788 @ =gUnknown_2023D44
ldr r6, _0803A788 @ =gBattlerSpriteIds
ldr r5, _0803A78C @ =gActiveBattler
ldrb r0, [r5]
adds r0, r6
@@ -155,7 +155,7 @@ _0803A77C:
bx r0
.align 2, 0
_0803A784: .4byte gSprites
_0803A788: .4byte gUnknown_2023D44
_0803A788: .4byte gBattlerSpriteIds
_0803A78C: .4byte gActiveBattler
_0803A790: .4byte SpriteCallbackDummy
_0803A794: .4byte 0x000003ff
@@ -714,7 +714,7 @@ _0803AC10: .4byte sub_803A7E4
sub_803AC14: @ 803AC14
push {r4-r7,lr}
ldr r2, _0803AC70 @ =gSprites
ldr r0, _0803AC74 @ =gUnknown_2023D44
ldr r0, _0803AC74 @ =gBattlerSpriteIds
ldr r7, _0803AC78 @ =gActiveBattler
ldrb r3, [r7]
adds r0, r3, r0
@@ -758,7 +758,7 @@ sub_803AC14: @ 803AC14
b _0803ACC0
.align 2, 0
_0803AC70: .4byte gSprites
_0803AC74: .4byte gUnknown_2023D44
_0803AC74: .4byte gBattlerSpriteIds
_0803AC78: .4byte gActiveBattler
_0803AC7C: .4byte gUnknown_2024018
_0803AC80: .4byte gBattlerPartyIndexes
@@ -842,7 +842,7 @@ _0803AD18:
sub_803AD20: @ 803AD20
push {lr}
ldr r2, _0803AD54 @ =gSprites
ldr r0, _0803AD58 @ =gUnknown_2023D44
ldr r0, _0803AD58 @ =gBattlerSpriteIds
ldr r1, _0803AD5C @ =gActiveBattler
ldrb r3, [r1]
adds r0, r3, r0
@@ -866,7 +866,7 @@ _0803AD4E:
bx r0
.align 2, 0
_0803AD54: .4byte gSprites
_0803AD58: .4byte gUnknown_2023D44
_0803AD58: .4byte gBattlerSpriteIds
_0803AD5C: .4byte gActiveBattler
_0803AD60: .4byte gUnknown_3004FF0
thumb_func_end sub_803AD20
@@ -888,7 +888,7 @@ sub_803AD64: @ 803AD64
ands r0, r1
cmp r0, 0
bne _0803ADBE
ldr r5, _0803ADCC @ =gUnknown_2023D44
ldr r5, _0803ADCC @ =gBattlerSpriteIds
adds r0, r2, r5
ldrb r1, [r0]
lsls r0, r1, 4
@@ -920,7 +920,7 @@ _0803ADBE:
.align 2, 0
_0803ADC4: .4byte gUnknown_2024018
_0803ADC8: .4byte gActiveBattler
_0803ADCC: .4byte gUnknown_2023D44
_0803ADCC: .4byte gBattlerSpriteIds
_0803ADD0: .4byte gSprites
_0803ADD4: .4byte gUnknown_3004FF0
thumb_func_end sub_803AD64
@@ -942,7 +942,7 @@ _0803ADEA:
thumb_func_start DoHitAnimBlinkSpriteEffect_4
DoHitAnimBlinkSpriteEffect_4: @ 803ADF0
push {r4,lr}
ldr r1, _0803AE2C @ =gUnknown_2023D44
ldr r1, _0803AE2C @ =gBattlerSpriteIds
ldr r0, _0803AE30 @ =gActiveBattler
ldrb r0, [r0]
adds r0, r1
@@ -970,7 +970,7 @@ DoHitAnimBlinkSpriteEffect_4: @ 803ADF0
bl RecordedOpponentBufferExecCompleted
b _0803AE66
.align 2, 0
_0803AE2C: .4byte gUnknown_2023D44
_0803AE2C: .4byte gBattlerSpriteIds
_0803AE30: .4byte gActiveBattler
_0803AE34: .4byte gSprites
_0803AE38: .4byte gUnknown_2024005
@@ -1132,7 +1132,7 @@ sub_803AF28: @ 803AF28
bl FreeSpriteTilesByTag
adds r0, r4, 0
bl FreeSpritePaletteByTag
ldr r1, _0803AFE0 @ =gUnknown_2023D44
ldr r1, _0803AFE0 @ =gBattlerSpriteIds
ldrb r0, [r5]
adds r0, r1
ldrb r1, [r0]
@@ -1179,7 +1179,7 @@ _0803AFCC:
_0803AFD4: .4byte gUnknown_2024018
_0803AFD8: .4byte gActiveBattler
_0803AFDC: .4byte 0x000027f9
_0803AFE0: .4byte gUnknown_2023D44
_0803AFE0: .4byte gBattlerSpriteIds
_0803AFE4: .4byte gSprites
_0803AFE8: .4byte gUnknown_3004FF0
_0803AFEC: .4byte gBattlerPartyIndexes
@@ -3599,7 +3599,7 @@ LinkOpponentHandleLoadPokeSprite: @ 803C3B4
adds r1, r5, 0
adds r2, r4, 0
bl CreateSprite
ldr r4, _0803C4EC @ =gUnknown_2023D44
ldr r4, _0803C4EC @ =gBattlerSpriteIds
ldrb r1, [r6]
adds r1, r4
strb r0, [r1]
@@ -3678,7 +3678,7 @@ _0803C4DC: .4byte gBattlerPartyIndexes
_0803C4E0: .4byte gActiveBattler
_0803C4E4: .4byte gEnemyParty
_0803C4E8: .4byte gMultiuseSpriteTemplate
_0803C4EC: .4byte gUnknown_2023D44
_0803C4EC: .4byte gBattlerSpriteIds
_0803C4F0: .4byte gSprites
_0803C4F4: .4byte 0x0000ff10
_0803C4F8: .4byte gBattleMonForms
@@ -3803,7 +3803,7 @@ sub_803C550: @ 803C550
adds r1, r5, 0
adds r2, r4, 0
bl CreateSprite
ldr r4, _0803C6C4 @ =gUnknown_2023D44
ldr r4, _0803C6C4 @ =gBattlerSpriteIds
adds r4, r6, r4
strb r0, [r4]
ldr r5, _0803C6C8 @ =gSprites
@@ -3893,7 +3893,7 @@ _0803C6B4: .4byte gEnemyParty
_0803C6B8: .4byte sub_8033E3C
_0803C6BC: .4byte gUnknown_3004FFC
_0803C6C0: .4byte gMultiuseSpriteTemplate
_0803C6C4: .4byte gUnknown_2023D44
_0803C6C4: .4byte gBattlerSpriteIds
_0803C6C8: .4byte gSprites
_0803C6CC: .4byte gBattleMonForms
_0803C6D0: .4byte SpriteCallbackDummy
@@ -3933,7 +3933,7 @@ _0803C710: .4byte gUnknown_2024018
_0803C714: .4byte gUnknown_3004FE0
_0803C718: .4byte sub_803C76C
_0803C71C:
ldr r5, _0803C760 @ =gUnknown_2023D44
ldr r5, _0803C760 @ =gBattlerSpriteIds
adds r0, r2, r5
ldrb r1, [r0]
lsls r0, r1, 4
@@ -3963,7 +3963,7 @@ _0803C758:
pop {r0}
bx r0
.align 2, 0
_0803C760: .4byte gUnknown_2023D44
_0803C760: .4byte gBattlerSpriteIds
_0803C764: .4byte gSprites
_0803C768: .4byte gUnknown_3004FF0
thumb_func_end LinkOpponentHandleReturnPokeToBall
@@ -4278,7 +4278,7 @@ _0803C992:
adds r1, r6, 0
adds r2, r4, 0
bl CreateSprite
ldr r5, _0803CAD8 @ =gUnknown_2023D44
ldr r5, _0803CAD8 @ =gBattlerSpriteIds
mov r2, r8
ldrb r1, [r2]
adds r1, r5
@@ -4392,7 +4392,7 @@ _0803CAC8: .4byte gFacilityClassToPicIndex
_0803CACC: .4byte gActiveBattler
_0803CAD0: .4byte gMultiuseSpriteTemplate
_0803CAD4: .4byte gUnknown_823932C
_0803CAD8: .4byte gUnknown_2023D44
_0803CAD8: .4byte gBattlerSpriteIds
_0803CADC: .4byte gSprites
_0803CAE0: .4byte 0x0000ff10
_0803CAE4: .4byte gTrainerFrontPicPaletteTable
@@ -4415,7 +4415,7 @@ sub_803CB00: @ 803CB00
thumb_func_start sub_803CB0C
sub_803CB0C: @ 803CB0C
push {r4-r6,lr}
ldr r6, _0803CB9C @ =gUnknown_2023D44
ldr r6, _0803CB9C @ =gBattlerSpriteIds
ldr r4, _0803CBA0 @ =gActiveBattler
ldrb r0, [r4]
adds r0, r6
@@ -4484,7 +4484,7 @@ sub_803CB0C: @ 803CB0C
pop {r0}
bx r0
.align 2, 0
_0803CB9C: .4byte gUnknown_2023D44
_0803CB9C: .4byte gBattlerSpriteIds
_0803CBA0: .4byte gActiveBattler
_0803CBA4: .4byte gSprites
_0803CBA8: .4byte sub_8075590
@@ -4548,7 +4548,7 @@ _0803CC0C:
movs r1, 0x3F
bl PlaySE12WithPanning
ldr r2, _0803CC50 @ =gSprites
ldr r1, _0803CC54 @ =gUnknown_2023D44
ldr r1, _0803CC54 @ =gBattlerSpriteIds
ldrb r0, [r5]
adds r0, r1
ldrb r1, [r0]
@@ -4571,7 +4571,7 @@ _0803CC48:
bx r0
.align 2, 0
_0803CC50: .4byte gSprites
_0803CC54: .4byte gUnknown_2023D44
_0803CC54: .4byte gBattlerSpriteIds
_0803CC58: .4byte sub_8011EA0
_0803CC5C: .4byte gUnknown_3004FE0
_0803CC60: .4byte sub_803AD20
@@ -4633,7 +4633,7 @@ _0803CCA6:
ldrb r1, [r1]
lsls r1, 8
orrs r0, r1
ldr r5, _0803CD80 @ =gUnknown_2037F16
ldr r5, _0803CD80 @ =gAnimMoveTurn
mov r1, r12
adds r1, 0x3
adds r2, r1
@@ -4701,7 +4701,7 @@ _0803CCA6:
lsls r1, 8
orrs r3, r1
strh r3, [r4]
ldr r3, _0803CD94 @ =gUnknown_2037EE4
ldr r3, _0803CD94 @ =gAnimDisableStructPtr
ldrb r2, [r6]
lsls r2, 9
mov r1, r12
@@ -4725,12 +4725,12 @@ _0803CCA6:
.align 2, 0
_0803CD78: .4byte gActiveBattler
_0803CD7C: .4byte gUnknown_2022BC4
_0803CD80: .4byte gUnknown_2037F16
_0803CD80: .4byte gAnimMoveTurn
_0803CD84: .4byte gUnknown_2037EEC
_0803CD88: .4byte gUnknown_2037EE8
_0803CD8C: .4byte gUnknown_2037EFE
_0803CD90: .4byte gUnknown_2037F00
_0803CD94: .4byte gUnknown_2037EE4
_0803CD94: .4byte gAnimDisableStructPtr
_0803CD98: .4byte gUnknown_2024008
_0803CD9C:
ldr r0, _0803CDC0 @ =gUnknown_2024018
@@ -5437,7 +5437,7 @@ _0803D2F0: .4byte gUnknown_2022870
RecordedOpponentHandleHitAnimation: @ 803D2F4
push {r4,lr}
ldr r3, _0803D31C @ =gSprites
ldr r2, _0803D320 @ =gUnknown_2023D44
ldr r2, _0803D320 @ =gBattlerSpriteIds
ldr r4, _0803D324 @ =gActiveBattler
ldrb r0, [r4]
adds r0, r2
@@ -5455,7 +5455,7 @@ RecordedOpponentHandleHitAnimation: @ 803D2F4
b _0803D352
.align 2, 0
_0803D31C: .4byte gSprites
_0803D320: .4byte gUnknown_2023D44
_0803D320: .4byte gBattlerSpriteIds
_0803D324: .4byte gActiveBattler
_0803D328:
ldr r1, _0803D358 @ =gUnknown_2024005
@@ -5612,7 +5612,7 @@ _0803D450: .4byte gUnknown_2023F4C
thumb_func_start sub_803D454
sub_803D454: @ 803D454
push {r4-r6,lr}
ldr r5, _0803D534 @ =gUnknown_2023D44
ldr r5, _0803D534 @ =gBattlerSpriteIds
ldr r6, _0803D538 @ =gActiveBattler
ldrb r0, [r6]
adds r0, r5
@@ -5722,7 +5722,7 @@ _0803D516:
pop {r0}
bx r0
.align 2, 0
_0803D534: .4byte gUnknown_2023D44
_0803D534: .4byte gBattlerSpriteIds
_0803D538: .4byte gActiveBattler
_0803D53C: .4byte gSprites
_0803D540: .4byte sub_8075590
@@ -6100,7 +6100,7 @@ RecordedOpponentHandleSpriteInvisibility: @ 803D834
cmp r0, 0
beq _0803D87A
ldr r3, _0803D888 @ =gSprites
ldr r0, _0803D88C @ =gUnknown_2023D44
ldr r0, _0803D88C @ =gBattlerSpriteIds
ldrb r1, [r4]
adds r0, r1, r0
ldrb r0, [r0]
@@ -6133,7 +6133,7 @@ _0803D87A:
.align 2, 0
_0803D884: .4byte gActiveBattler
_0803D888: .4byte gSprites
_0803D88C: .4byte gUnknown_2023D44
_0803D88C: .4byte gBattlerSpriteIds
_0803D890: .4byte gUnknown_2022BC4
thumb_func_end RecordedOpponentHandleSpriteInvisibility
@@ -6218,15 +6218,15 @@ RecordedOpponentHandleCmd55: @ 803D914
ldrb r2, [r0]
cmp r2, 0x3
bne _0803D93C
ldr r0, _0803D938 @ =gUnknown_2023E8A
ldr r0, _0803D938 @ =gBattleOutcome
strb r2, [r0]
b _0803D944
.align 2, 0
_0803D930: .4byte gUnknown_2022BC4
_0803D934: .4byte gActiveBattler
_0803D938: .4byte gUnknown_2023E8A
_0803D938: .4byte gBattleOutcome
_0803D93C:
ldr r0, _0803D968 @ =gUnknown_2023E8A
ldr r0, _0803D968 @ =gBattleOutcome
movs r1, 0x3
eors r1, r2
strb r1, [r0]
@@ -6246,7 +6246,7 @@ _0803D944:
pop {r0}
bx r0
.align 2, 0
_0803D968: .4byte gUnknown_2023E8A
_0803D968: .4byte gBattleOutcome
_0803D96C: .4byte gUnknown_3004FE0
_0803D970: .4byte gActiveBattler
_0803D974: .4byte sub_802F6A8
asm/battle_controller_link_partner.s
+40 -40
View File
@@ -70,7 +70,7 @@ _080D426C:
sub_80D4270: @ 80D4270
push {lr}
ldr r2, _080D4298 @ =gSprites
ldr r1, _080D429C @ =gUnknown_2023D44
ldr r1, _080D429C @ =gBattlerSpriteIds
ldr r0, _080D42A0 @ =gActiveBattler
ldrb r0, [r0]
adds r0, r1
@@ -90,7 +90,7 @@ _080D4294:
bx r0
.align 2, 0
_080D4298: .4byte gSprites
_080D429C: .4byte gUnknown_2023D44
_080D429C: .4byte gBattlerSpriteIds
_080D42A0: .4byte gActiveBattler
_080D42A4: .4byte SpriteCallbackDummy
thumb_func_end sub_80D4270
@@ -99,7 +99,7 @@ _080D42A4: .4byte SpriteCallbackDummy
sub_80D42A8: @ 80D42A8
push {r4-r6,lr}
ldr r6, _080D4300 @ =gSprites
ldr r5, _080D4304 @ =gUnknown_2023D44
ldr r5, _080D4304 @ =gBattlerSpriteIds
ldr r4, _080D4308 @ =gActiveBattler
ldrb r0, [r4]
adds r0, r5
@@ -139,7 +139,7 @@ _080D42F8:
bx r0
.align 2, 0
_080D4300: .4byte gSprites
_080D4304: .4byte gUnknown_2023D44
_080D4304: .4byte gBattlerSpriteIds
_080D4308: .4byte gActiveBattler
_080D430C: .4byte SpriteCallbackDummy
thumb_func_end sub_80D42A8
@@ -456,7 +456,7 @@ _080D458C: .4byte sub_80D4358
sub_80D4590: @ 80D4590
push {lr}
ldr r2, _080D45C4 @ =gSprites
ldr r1, _080D45C8 @ =gUnknown_2023D44
ldr r1, _080D45C8 @ =gBattlerSpriteIds
ldr r0, _080D45CC @ =gActiveBattler
ldrb r0, [r0]
adds r0, r1
@@ -481,7 +481,7 @@ _080D45BE:
bx r0
.align 2, 0
_080D45C4: .4byte gSprites
_080D45C8: .4byte gUnknown_2023D44
_080D45C8: .4byte gBattlerSpriteIds
_080D45CC: .4byte gActiveBattler
thumb_func_end sub_80D4590
@@ -543,7 +543,7 @@ _080D463C: .4byte gPlayerParty
sub_80D4640: @ 80D4640
push {r4-r6,lr}
ldr r6, _080D4698 @ =gSprites
ldr r5, _080D469C @ =gUnknown_2023D44
ldr r5, _080D469C @ =gBattlerSpriteIds
ldr r4, _080D46A0 @ =gActiveBattler
ldrb r0, [r4]
adds r0, r5
@@ -583,7 +583,7 @@ _080D4690:
bx r0
.align 2, 0
_080D4698: .4byte gSprites
_080D469C: .4byte gUnknown_2023D44
_080D469C: .4byte gBattlerSpriteIds
_080D46A0: .4byte gActiveBattler
_080D46A4: .4byte gUnknown_3004FF0
thumb_func_end sub_80D4640
@@ -605,7 +605,7 @@ sub_80D46A8: @ 80D46A8
ands r0, r1
cmp r0, 0
bne _080D46FC
ldr r5, _080D470C @ =gUnknown_2023D44
ldr r5, _080D470C @ =gBattlerSpriteIds
adds r0, r2, r5
ldrb r1, [r0]
lsls r0, r1, 4
@@ -635,7 +635,7 @@ _080D46FC:
.align 2, 0
_080D4704: .4byte gUnknown_2024018
_080D4708: .4byte gActiveBattler
_080D470C: .4byte gUnknown_2023D44
_080D470C: .4byte gBattlerSpriteIds
_080D4710: .4byte gSprites
_080D4714: .4byte gUnknown_3004FF0
thumb_func_end sub_80D46A8
@@ -657,7 +657,7 @@ _080D472A:
thumb_func_start sub_80D4730
sub_80D4730: @ 80D4730
push {r4,lr}
ldr r1, _080D476C @ =gUnknown_2023D44
ldr r1, _080D476C @ =gBattlerSpriteIds
ldr r0, _080D4770 @ =gActiveBattler
ldrb r0, [r0]
adds r0, r1
@@ -685,7 +685,7 @@ sub_80D4730: @ 80D4730
bl sub_80D49E8
b _080D47A6
.align 2, 0
_080D476C: .4byte gUnknown_2023D44
_080D476C: .4byte gBattlerSpriteIds
_080D4770: .4byte gActiveBattler
_080D4774: .4byte gSprites
_080D4778: .4byte gUnknown_2024005
@@ -852,7 +852,7 @@ sub_80D484C: @ 80D484C
ldr r5, _080D492C @ =gPlayerParty
adds r0, r5
bl HandleLowHpMusicChange
ldr r1, _080D4930 @ =gUnknown_2023D44
ldr r1, _080D4930 @ =gBattlerSpriteIds
ldrb r0, [r7]
adds r0, r1
ldrb r1, [r0]
@@ -901,7 +901,7 @@ _080D4920: .4byte 0x000027f9
_080D4924: .4byte c3_0802FDF4
_080D4928: .4byte gBattlerPartyIndexes
_080D492C: .4byte gPlayerParty
_080D4930: .4byte gUnknown_2023D44
_080D4930: .4byte gBattlerSpriteIds
_080D4934: .4byte gSprites
_080D4938: .4byte gUnknown_3004FF0
_080D493C: .4byte gUnknown_3004FE0
@@ -3393,7 +3393,7 @@ LinkPartnerHandleLoadPokeSprite: @ 80D5DB4
adds r1, r5, 0
adds r2, r4, 0
bl CreateSprite
ldr r4, _080D5EB8 @ =gUnknown_2023D44
ldr r4, _080D5EB8 @ =gBattlerSpriteIds
ldrb r1, [r6]
adds r1, r4
strb r0, [r1]
@@ -3455,7 +3455,7 @@ _080D5EA8: .4byte gBattlerPartyIndexes
_080D5EAC: .4byte gActiveBattler
_080D5EB0: .4byte gPlayerParty
_080D5EB4: .4byte gMultiuseSpriteTemplate
_080D5EB8: .4byte gUnknown_2023D44
_080D5EB8: .4byte gBattlerSpriteIds
_080D5EBC: .4byte gSprites
_080D5EC0: .4byte 0x0000ff10
_080D5EC4: .4byte gBattleMonForms
@@ -3585,7 +3585,7 @@ sub_80D5F40: @ 80D5F40
adds r1, r5, 0
adds r2, r4, 0
bl CreateSprite
ldr r4, _080D609C @ =gUnknown_2023D44
ldr r4, _080D609C @ =gBattlerSpriteIds
adds r4, r6, r4
strb r0, [r4]
ldr r5, _080D60A0 @ =gSprites
@@ -3675,7 +3675,7 @@ _080D608C: .4byte gPlayerParty
_080D6090: .4byte sub_8033E3C
_080D6094: .4byte gUnknown_3004FFC
_080D6098: .4byte gMultiuseSpriteTemplate
_080D609C: .4byte gUnknown_2023D44
_080D609C: .4byte gBattlerSpriteIds
_080D60A0: .4byte gSprites
_080D60A4: .4byte gBattleMonForms
_080D60A8: .4byte SpriteCallbackDummy
@@ -3715,7 +3715,7 @@ _080D60E8: .4byte gUnknown_2024018
_080D60EC: .4byte gUnknown_3004FE0
_080D60F0: .4byte sub_80D613C
_080D60F4:
ldr r5, _080D6130 @ =gUnknown_2023D44
ldr r5, _080D6130 @ =gBattlerSpriteIds
adds r0, r2, r5
ldrb r1, [r0]
lsls r0, r1, 4
@@ -3743,7 +3743,7 @@ _080D612A:
pop {r0}
bx r0
.align 2, 0
_080D6130: .4byte gUnknown_2023D44
_080D6130: .4byte gBattlerSpriteIds
_080D6134: .4byte gSprites
_080D6138: .4byte gUnknown_3004FF0
thumb_func_end LinkPartnerHandleReturnPokeToBall
@@ -3926,7 +3926,7 @@ _080D6258:
mov r1, r8
adds r2, r4, 0
bl CreateSprite
ldr r6, _080D6324 @ =gUnknown_2023D44
ldr r6, _080D6324 @ =gBattlerSpriteIds
ldrb r1, [r5]
adds r1, r6
strb r0, [r1]
@@ -3987,7 +3987,7 @@ _080D6258:
_080D6318: .4byte gActiveBattler
_080D631C: .4byte gMultiuseSpriteTemplate
_080D6320: .4byte gUnknown_8239F8C
_080D6324: .4byte gUnknown_2023D44
_080D6324: .4byte gBattlerSpriteIds
_080D6328: .4byte gSprites
_080D632C: .4byte 0x0000fffe
_080D6330: .4byte sub_8033EEC
@@ -4006,7 +4006,7 @@ sub_80D633C: @ 80D633C
thumb_func_start sub_80D6348
sub_80D6348: @ 80D6348
push {r4-r6,lr}
ldr r6, _080D63D4 @ =gUnknown_2023D44
ldr r6, _080D63D4 @ =gBattlerSpriteIds
ldr r4, _080D63D8 @ =gActiveBattler
ldrb r0, [r4]
adds r0, r6
@@ -4074,7 +4074,7 @@ sub_80D6348: @ 80D6348
pop {r0}
bx r0
.align 2, 0
_080D63D4: .4byte gUnknown_2023D44
_080D63D4: .4byte gBattlerSpriteIds
_080D63D8: .4byte gActiveBattler
_080D63DC: .4byte gSprites
_080D63E0: .4byte 0x0000ffd8
@@ -4150,7 +4150,7 @@ _080D6448:
movs r0, 0x10
bl PlaySE12WithPanning
ldr r2, _080D64CC @ =gSprites
ldr r3, _080D64D0 @ =gUnknown_2023D44
ldr r3, _080D64D0 @ =gBattlerSpriteIds
ldrb r0, [r5]
adds r0, r3
ldrb r1, [r0]
@@ -4192,7 +4192,7 @@ _080D64BE:
_080D64C4: .4byte gBattlerPartyIndexes
_080D64C8: .4byte gPlayerParty
_080D64CC: .4byte gSprites
_080D64D0: .4byte gUnknown_2023D44
_080D64D0: .4byte gBattlerSpriteIds
_080D64D4: .4byte sub_8012110
_080D64D8: .4byte gUnknown_3004FE0
_080D64DC: .4byte sub_80D4640
@@ -4254,7 +4254,7 @@ _080D6522:
ldrb r1, [r1]
lsls r1, 8
orrs r0, r1
ldr r5, _080D65FC @ =gUnknown_2037F16
ldr r5, _080D65FC @ =gAnimMoveTurn
mov r1, r12
adds r1, 0x3
adds r2, r1
@@ -4322,7 +4322,7 @@ _080D6522:
lsls r1, 8
orrs r3, r1
strh r3, [r4]
ldr r3, _080D6610 @ =gUnknown_2037EE4
ldr r3, _080D6610 @ =gAnimDisableStructPtr
ldrb r2, [r6]
lsls r2, 9
mov r1, r12
@@ -4346,12 +4346,12 @@ _080D6522:
.align 2, 0
_080D65F4: .4byte gActiveBattler
_080D65F8: .4byte gUnknown_2022BC4
_080D65FC: .4byte gUnknown_2037F16
_080D65FC: .4byte gAnimMoveTurn
_080D6600: .4byte gUnknown_2037EEC
_080D6604: .4byte gUnknown_2037EE8
_080D6608: .4byte gUnknown_2037EFE
_080D660C: .4byte gUnknown_2037F00
_080D6610: .4byte gUnknown_2037EE4
_080D6610: .4byte gAnimDisableStructPtr
_080D6614: .4byte gUnknown_2024008
_080D6618:
ldr r0, _080D663C @ =gUnknown_2024018
@@ -5058,7 +5058,7 @@ _080D6B6C: .4byte gUnknown_2022870
LinkPartnerHandleHitAnimation: @ 80D6B70
push {r4,lr}
ldr r3, _080D6B98 @ =gSprites
ldr r2, _080D6B9C @ =gUnknown_2023D44
ldr r2, _080D6B9C @ =gBattlerSpriteIds
ldr r4, _080D6BA0 @ =gActiveBattler
ldrb r0, [r4]
adds r0, r2
@@ -5076,7 +5076,7 @@ LinkPartnerHandleHitAnimation: @ 80D6B70
b _080D6BCE
.align 2, 0
_080D6B98: .4byte gSprites
_080D6B9C: .4byte gUnknown_2023D44
_080D6B9C: .4byte gBattlerSpriteIds
_080D6BA0: .4byte gActiveBattler
_080D6BA4:
ldr r1, _080D6BD4 @ =gUnknown_2024005
@@ -5234,7 +5234,7 @@ _080D6CD0: .4byte gUnknown_2023F4C
thumb_func_start sub_80D6CD4
sub_80D6CD4: @ 80D6CD4
push {r4-r7,lr}
ldr r5, _080D6DDC @ =gUnknown_2023D44
ldr r5, _080D6DDC @ =gBattlerSpriteIds
ldr r6, _080D6DE0 @ =gActiveBattler
ldrb r0, [r6]
adds r0, r5
@@ -5358,7 +5358,7 @@ _080D6DC2:
adds r0, 0x2
b _080D6E0C
.align 2, 0
_080D6DDC: .4byte gUnknown_2023D44
_080D6DDC: .4byte gBattlerSpriteIds
_080D6DE0: .4byte gActiveBattler
_080D6DE4: .4byte gSprites
_080D6DE8: .4byte 0x0000ffd8
@@ -5386,7 +5386,7 @@ _080D6E0C:
movs r2, 0x20
bl LoadCompressedPalette
ldr r2, _080D6EA8 @ =gSprites
ldr r1, _080D6EAC @ =gUnknown_2023D44
ldr r1, _080D6EAC @ =gBattlerSpriteIds
ldr r5, _080D6EB0 @ =gActiveBattler
ldrb r0, [r5]
adds r0, r1
@@ -5453,7 +5453,7 @@ _080D6E86:
.align 2, 0
_080D6EA4: .4byte gUnknown_8239FD4
_080D6EA8: .4byte gSprites
_080D6EAC: .4byte gUnknown_2023D44
_080D6EAC: .4byte gBattlerSpriteIds
_080D6EB0: .4byte gActiveBattler
_080D6EB4: .4byte sub_80D6ED0
_080D6EB8: .4byte gTasks
@@ -5781,7 +5781,7 @@ LinkPartnerHandleSpriteInvisibility: @ 80D7144
cmp r0, 0
beq _080D718A
ldr r3, _080D7198 @ =gSprites
ldr r0, _080D719C @ =gUnknown_2023D44
ldr r0, _080D719C @ =gBattlerSpriteIds
ldrb r1, [r4]
adds r0, r1, r0
ldrb r0, [r0]
@@ -5814,7 +5814,7 @@ _080D718A:
.align 2, 0
_080D7194: .4byte gActiveBattler
_080D7198: .4byte gSprites
_080D719C: .4byte gUnknown_2023D44
_080D719C: .4byte gBattlerSpriteIds
_080D71A0: .4byte gUnknown_2022BC4
thumb_func_end LinkPartnerHandleSpriteInvisibility
@@ -5890,7 +5890,7 @@ sub_80D7218: @ 80D7218
thumb_func_start LinkPartnerHandlecmd55
LinkPartnerHandlecmd55: @ 80D7224
push {r4,lr}
ldr r2, _080D725C @ =gUnknown_2023E8A
ldr r2, _080D725C @ =gBattleOutcome
ldr r1, _080D7260 @ =gUnknown_2022BC4
ldr r4, _080D7264 @ =gActiveBattler
ldrb r0, [r4]
@@ -5914,7 +5914,7 @@ LinkPartnerHandlecmd55: @ 80D7224
pop {r0}
bx r0
.align 2, 0
_080D725C: .4byte gUnknown_2023E8A
_080D725C: .4byte gBattleOutcome
_080D7260: .4byte gUnknown_2022BC4
_080D7264: .4byte gActiveBattler
_080D7268: .4byte gUnknown_3004FE0
asm/battle_controller_oak.s
+36 -36
View File
@@ -422,7 +422,7 @@ _080E78D8:
sub_80E78E0: @ 80E78E0
push {lr}
ldr r2, _080E7908 @ =gSprites
ldr r1, _080E790C @ =gUnknown_2023D44
ldr r1, _080E790C @ =gBattlerSpriteIds
ldr r0, _080E7910 @ =gActiveBattler
ldrb r0, [r0]
adds r0, r1
@@ -442,7 +442,7 @@ _080E7904:
bx r0
.align 2, 0
_080E7908: .4byte gSprites
_080E790C: .4byte gUnknown_2023D44
_080E790C: .4byte gBattlerSpriteIds
_080E7910: .4byte gActiveBattler
_080E7914: .4byte SpriteCallbackDummy
thumb_func_end sub_80E78E0
@@ -1653,7 +1653,7 @@ _080E82F0: .4byte sub_80E8930
sub_80E82F4: @ 80E82F4
push {r4-r6,lr}
ldr r6, _080E834C @ =gSprites
ldr r5, _080E8350 @ =gUnknown_2023D44
ldr r5, _080E8350 @ =gBattlerSpriteIds
ldr r4, _080E8354 @ =gActiveBattler
ldrb r0, [r4]
adds r0, r5
@@ -1693,7 +1693,7 @@ _080E8344:
bx r0
.align 2, 0
_080E834C: .4byte gSprites
_080E8350: .4byte gUnknown_2023D44
_080E8350: .4byte gBattlerSpriteIds
_080E8354: .4byte gActiveBattler
_080E8358: .4byte gUnknown_3004FF0
thumb_func_end sub_80E82F4
@@ -2432,7 +2432,7 @@ _080E8942:
thumb_func_start DoHitAnimBlinkSpriteEffect_3
DoHitAnimBlinkSpriteEffect_3: @ 80E8948
push {r4,lr}
ldr r1, _080E8984 @ =gUnknown_2023D44
ldr r1, _080E8984 @ =gBattlerSpriteIds
ldr r0, _080E8988 @ =gActiveBattler
ldrb r0, [r0]
adds r0, r1
@@ -2460,7 +2460,7 @@ DoHitAnimBlinkSpriteEffect_3: @ 80E8948
bl WallyBufferExecCompleted
b _080E89BE
.align 2, 0
_080E8984: .4byte gUnknown_2023D44
_080E8984: .4byte gBattlerSpriteIds
_080E8988: .4byte gActiveBattler
_080E898C: .4byte gSprites
_080E8990: .4byte gUnknown_2024005
@@ -2510,7 +2510,7 @@ sub_80E89C4: @ 80E89C4
ands r0, r1
cmp r0, 0
bne _080E8A18
ldr r5, _080E8A28 @ =gUnknown_2023D44
ldr r5, _080E8A28 @ =gBattlerSpriteIds
adds r0, r2, r5
ldrb r1, [r0]
lsls r0, r1, 4
@@ -2540,7 +2540,7 @@ _080E8A18:
.align 2, 0
_080E8A20: .4byte gUnknown_2024018
_080E8A24: .4byte gActiveBattler
_080E8A28: .4byte gUnknown_2023D44
_080E8A28: .4byte gBattlerSpriteIds
_080E8A2C: .4byte gSprites
_080E8A30: .4byte gUnknown_3004FF0
thumb_func_end sub_80E89C4
@@ -2549,7 +2549,7 @@ _080E8A30: .4byte gUnknown_3004FF0
sub_80E8A34: @ 80E8A34
push {lr}
ldr r2, _080E8A5C @ =gSprites
ldr r1, _080E8A60 @ =gUnknown_2023D44
ldr r1, _080E8A60 @ =gBattlerSpriteIds
ldr r0, _080E8A64 @ =gActiveBattler
ldrb r0, [r0]
adds r0, r1
@@ -2569,7 +2569,7 @@ _080E8A58:
bx r0
.align 2, 0
_080E8A5C: .4byte gSprites
_080E8A60: .4byte gUnknown_2023D44
_080E8A60: .4byte gBattlerSpriteIds
_080E8A64: .4byte gActiveBattler
_080E8A68: .4byte SpriteCallbackDummy
thumb_func_end sub_80E8A34
@@ -4919,7 +4919,7 @@ _080E9E18: .4byte gActiveBattler
_080E9E1C: .4byte gUnknown_3004FE0
_080E9E20: .4byte sub_80E89C4
_080E9E24:
ldr r5, _080E9E60 @ =gUnknown_2023D44
ldr r5, _080E9E60 @ =gBattlerSpriteIds
adds r0, r2, r5
ldrb r1, [r0]
lsls r0, r1, 4
@@ -4947,7 +4947,7 @@ _080E9E5A:
pop {r0}
bx r0
.align 2, 0
_080E9E60: .4byte gUnknown_2023D44
_080E9E60: .4byte gBattlerSpriteIds
_080E9E64: .4byte gSprites
_080E9E68: .4byte gUnknown_3004FF0
thumb_func_end WallyHandleReturnMonToBall
@@ -4993,7 +4993,7 @@ sub_80E9E6C: @ 80E9E6C
movs r1, 0x50
movs r3, 0x1E
bl CreateSprite
ldr r2, _080E9EDC @ =gUnknown_2023D44
ldr r2, _080E9EDC @ =gBattlerSpriteIds
ldrb r1, [r6]
b _080E9F1C
.align 2, 0
@@ -5002,7 +5002,7 @@ _080E9ECC: .4byte gSaveBlock2Ptr
_080E9ED0: .4byte gActiveBattler
_080E9ED4: .4byte gMultiuseSpriteTemplate
_080E9ED8: .4byte gUnknown_8239F8C
_080E9EDC: .4byte gUnknown_2023D44
_080E9EDC: .4byte gBattlerSpriteIds
_080E9EE0:
ldr r4, _080E9F8C @ =gActiveBattler
ldrb r1, [r4]
@@ -5028,13 +5028,13 @@ _080E9EE0:
movs r1, 0x50
movs r3, 0x1E
bl CreateSprite
ldr r2, _080E9F98 @ =gUnknown_2023D44
ldr r2, _080E9F98 @ =gBattlerSpriteIds
ldrb r1, [r4]
_080E9F1C:
adds r1, r2
strb r0, [r1]
ldr r4, _080E9F9C @ =gSprites
ldr r5, _080E9F98 @ =gUnknown_2023D44
ldr r5, _080E9F98 @ =gBattlerSpriteIds
ldr r6, _080E9F8C @ =gActiveBattler
ldrb r3, [r6]
adds r0, r3, r5
@@ -5090,7 +5090,7 @@ _080E9F1C:
_080E9F8C: .4byte gActiveBattler
_080E9F90: .4byte gMultiuseSpriteTemplate
_080E9F94: .4byte gUnknown_8239F8C
_080E9F98: .4byte gUnknown_2023D44
_080E9F98: .4byte gBattlerSpriteIds
_080E9F9C: .4byte gSprites
_080E9FA0: .4byte 0x0000fffe
_080E9FA4: .4byte sub_8033EEC
@@ -5139,7 +5139,7 @@ sub_80E9FB0: @ 80E9FB0
movs r1, 0x50
movs r3, 0x1E
bl CreateSprite
ldr r2, _080EA020 @ =gUnknown_2023D44
ldr r2, _080EA020 @ =gBattlerSpriteIds
ldrb r1, [r6]
b _080EA060
.align 2, 0
@@ -5148,7 +5148,7 @@ _080EA010: .4byte gSaveBlock2Ptr
_080EA014: .4byte gActiveBattler
_080EA018: .4byte gMultiuseSpriteTemplate
_080EA01C: .4byte gUnknown_8239F8C
_080EA020: .4byte gUnknown_2023D44
_080EA020: .4byte gBattlerSpriteIds
_080EA024:
ldr r4, _080EA0D0 @ =gActiveBattler
ldrb r1, [r4]
@@ -5174,13 +5174,13 @@ _080EA024:
movs r1, 0x50
movs r3, 0x1E
bl CreateSprite
ldr r2, _080EA0DC @ =gUnknown_2023D44
ldr r2, _080EA0DC @ =gBattlerSpriteIds
ldrb r1, [r4]
_080EA060:
adds r1, r2
strb r0, [r1]
ldr r4, _080EA0E0 @ =gSprites
ldr r5, _080EA0DC @ =gUnknown_2023D44
ldr r5, _080EA0DC @ =gBattlerSpriteIds
ldr r6, _080EA0D0 @ =gActiveBattler
ldrb r3, [r6]
adds r0, r3, r5
@@ -5236,7 +5236,7 @@ _080EA060:
_080EA0D0: .4byte gActiveBattler
_080EA0D4: .4byte gMultiuseSpriteTemplate
_080EA0D8: .4byte gUnknown_8239F8C
_080EA0DC: .4byte gUnknown_2023D44
_080EA0DC: .4byte gBattlerSpriteIds
_080EA0E0: .4byte gSprites
_080EA0E4: .4byte 0x0000ffa0
_080EA0E8: .4byte sub_8033EEC
@@ -5318,7 +5318,7 @@ _080EA154:
movs r0, 0x10
bl PlaySE12WithPanning
ldr r2, _080EA1D8 @ =gSprites
ldr r3, _080EA1DC @ =gUnknown_2023D44
ldr r3, _080EA1DC @ =gBattlerSpriteIds
ldrb r0, [r5]
adds r0, r3
ldrb r1, [r0]
@@ -5360,7 +5360,7 @@ _080EA1CA:
_080EA1D0: .4byte gBattlerPartyIndexes
_080EA1D4: .4byte gPlayerParty
_080EA1D8: .4byte gSprites
_080EA1DC: .4byte gUnknown_2023D44
_080EA1DC: .4byte gBattlerSpriteIds
_080EA1E0: .4byte sub_8012110
_080EA1E4: .4byte gUnknown_3004FE0
_080EA1E8: .4byte sub_80E82F4
@@ -5483,7 +5483,7 @@ sub_80EA2B8: @ 80EA2B8
ldrb r1, [r1]
lsls r1, 8
orrs r0, r1
ldr r5, _080EA394 @ =gUnknown_2037F16
ldr r5, _080EA394 @ =gAnimMoveTurn
mov r1, r12
adds r1, 0x3
adds r2, r1
@@ -5551,7 +5551,7 @@ sub_80EA2B8: @ 80EA2B8
lsls r1, 8
orrs r3, r1
strh r3, [r4]
ldr r3, _080EA3A8 @ =gUnknown_2037EE4
ldr r3, _080EA3A8 @ =gAnimDisableStructPtr
ldrb r2, [r6]
lsls r2, 9
mov r1, r12
@@ -5575,12 +5575,12 @@ sub_80EA2B8: @ 80EA2B8
.align 2, 0
_080EA38C: .4byte gUnknown_2022BC4
_080EA390: .4byte gActiveBattler
_080EA394: .4byte gUnknown_2037F16
_080EA394: .4byte gAnimMoveTurn
_080EA398: .4byte gUnknown_2037EEC
_080EA39C: .4byte gUnknown_2037EE8
_080EA3A0: .4byte gUnknown_2037EFE
_080EA3A4: .4byte gUnknown_2037F00
_080EA3A8: .4byte gUnknown_2037EE4
_080EA3A8: .4byte gAnimDisableStructPtr
_080EA3AC: .4byte gUnknown_2024008
_080EA3B0:
ldr r0, _080EA3D4 @ =gUnknown_2024018
@@ -6641,7 +6641,7 @@ sub_80EABFC: @ 80EABFC
sub_80EAC08: @ 80EAC08
push {r4,lr}
ldr r3, _080EAC30 @ =gSprites
ldr r2, _080EAC34 @ =gUnknown_2023D44
ldr r2, _080EAC34 @ =gBattlerSpriteIds
ldr r4, _080EAC38 @ =gActiveBattler
ldrb r0, [r4]
adds r0, r2
@@ -6659,7 +6659,7 @@ sub_80EAC08: @ 80EAC08
b _080EAC66
.align 2, 0
_080EAC30: .4byte gSprites
_080EAC34: .4byte gUnknown_2023D44
_080EAC34: .4byte gBattlerSpriteIds
_080EAC38: .4byte gActiveBattler
_080EAC3C:
ldr r1, _080EAC6C @ =gUnknown_2024005
@@ -6812,7 +6812,7 @@ sub_80EAD54: @ 80EAD54
bne _080EAD64
b _080EAEE4
_080EAD64:
ldr r6, _080EAEA4 @ =gUnknown_2023D44
ldr r6, _080EAEA4 @ =gBattlerSpriteIds
ldr r7, _080EAEA8 @ =gActiveBattler
ldrb r0, [r7]
adds r0, r6
@@ -6966,7 +6966,7 @@ _080EAE84:
b _080EAF18
.align 2, 0
_080EAEA0: .4byte gBattleTypeFlags
_080EAEA4: .4byte gUnknown_2023D44
_080EAEA4: .4byte gBattlerSpriteIds
_080EAEA8: .4byte gActiveBattler
_080EAEAC: .4byte gSprites
_080EAEB0: .4byte 0x0000ffd8
@@ -7094,7 +7094,7 @@ sub_80EAF34: @ 80EAF34
adds r1, r5, 0
adds r2, r4, 0
bl CreateSprite
ldr r4, _080EB098 @ =gUnknown_2023D44
ldr r4, _080EB098 @ =gBattlerSpriteIds
adds r4, r6, r4
strb r0, [r4]
ldr r5, _080EB09C @ =gSprites
@@ -7185,7 +7185,7 @@ _080EB088: .4byte gPlayerParty
_080EB08C: .4byte sub_8033E3C
_080EB090: .4byte gUnknown_3004FFC
_080EB094: .4byte gMultiuseSpriteTemplate
_080EB098: .4byte gUnknown_2023D44
_080EB098: .4byte gBattlerSpriteIds
_080EB09C: .4byte gSprites
_080EB0A0: .4byte gBattleMonForms
_080EB0A4: .4byte SpriteCallbackDummy
@@ -7435,7 +7435,7 @@ sub_80EB274: @ 80EB274
thumb_func_start sub_80EB280
sub_80EB280: @ 80EB280
push {r4,lr}
ldr r2, _080EB2C4 @ =gUnknown_2023E8A
ldr r2, _080EB2C4 @ =gBattleOutcome
ldr r1, _080EB2C8 @ =gUnknown_2022BC4
ldr r4, _080EB2CC @ =gActiveBattler
ldrb r0, [r4]
@@ -7466,7 +7466,7 @@ _080EB2BC:
pop {r0}
bx r0
.align 2, 0
_080EB2C4: .4byte gUnknown_2023E8A
_080EB2C4: .4byte gBattleOutcome
_080EB2C8: .4byte gUnknown_2022BC4
_080EB2CC: .4byte gActiveBattler
_080EB2D0: .4byte gBattleTypeFlags
asm/battle_controller_opponent.s
+40 -40
View File
@@ -70,7 +70,7 @@ _08035AE4:
sub_8035AE8: @ 8035AE8
push {lr}
ldr r2, _08035B10 @ =gSprites
ldr r1, _08035B14 @ =gUnknown_2023D44
ldr r1, _08035B14 @ =gBattlerSpriteIds
ldr r0, _08035B18 @ =gActiveBattler
ldrb r0, [r0]
adds r0, r1
@@ -90,7 +90,7 @@ _08035B0C:
bx r0
.align 2, 0
_08035B10: .4byte gSprites
_08035B14: .4byte gUnknown_2023D44
_08035B14: .4byte gBattlerSpriteIds
_08035B18: .4byte gActiveBattler
_08035B1C: .4byte SpriteCallbackDummy
thumb_func_end sub_8035AE8
@@ -99,7 +99,7 @@ _08035B1C: .4byte SpriteCallbackDummy
sub_8035B20: @ 8035B20
push {lr}
ldr r2, _08035B48 @ =gSprites
ldr r1, _08035B4C @ =gUnknown_2023D44
ldr r1, _08035B4C @ =gBattlerSpriteIds
ldr r0, _08035B50 @ =gActiveBattler
ldrb r0, [r0]
adds r0, r1
@@ -119,7 +119,7 @@ _08035B44:
bx r0
.align 2, 0
_08035B48: .4byte gSprites
_08035B4C: .4byte gUnknown_2023D44
_08035B4C: .4byte gBattlerSpriteIds
_08035B50: .4byte gActiveBattler
_08035B54: .4byte SpriteCallbackDummy
thumb_func_end sub_8035B20
@@ -128,7 +128,7 @@ _08035B54: .4byte SpriteCallbackDummy
sub_8035B58: @ 8035B58
push {r4-r6,lr}
ldr r4, _08035BD0 @ =gSprites
ldr r6, _08035BD4 @ =gUnknown_2023D44
ldr r6, _08035BD4 @ =gBattlerSpriteIds
ldr r5, _08035BD8 @ =gActiveBattler
ldrb r0, [r5]
adds r0, r6
@@ -184,7 +184,7 @@ _08035BC8:
bx r0
.align 2, 0
_08035BD0: .4byte gSprites
_08035BD4: .4byte gUnknown_2023D44
_08035BD4: .4byte gBattlerSpriteIds
_08035BD8: .4byte gActiveBattler
_08035BDC: .4byte SpriteCallbackDummy
_08035BE0: .4byte 0x000003ff
@@ -685,7 +685,7 @@ _08035FE4: .4byte sub_8035C30
sub_8035FE8: @ 8035FE8
push {r4-r7,lr}
ldr r2, _08036044 @ =gSprites
ldr r0, _08036048 @ =gUnknown_2023D44
ldr r0, _08036048 @ =gBattlerSpriteIds
ldr r7, _0803604C @ =gActiveBattler
ldrb r3, [r7]
adds r0, r3, r0
@@ -729,7 +729,7 @@ sub_8035FE8: @ 8035FE8
b _08036094
.align 2, 0
_08036044: .4byte gSprites
_08036048: .4byte gUnknown_2023D44
_08036048: .4byte gBattlerSpriteIds
_0803604C: .4byte gActiveBattler
_08036050: .4byte gUnknown_2024018
_08036054: .4byte gBattlerPartyIndexes
@@ -838,7 +838,7 @@ _08036124:
sub_803612C: @ 803612C
push {lr}
ldr r2, _08036160 @ =gSprites
ldr r0, _08036164 @ =gUnknown_2023D44
ldr r0, _08036164 @ =gBattlerSpriteIds
ldr r1, _08036168 @ =gActiveBattler
ldrb r3, [r1]
adds r0, r3, r0
@@ -862,7 +862,7 @@ _0803615A:
bx r0
.align 2, 0
_08036160: .4byte gSprites
_08036164: .4byte gUnknown_2023D44
_08036164: .4byte gBattlerSpriteIds
_08036168: .4byte gActiveBattler
_0803616C: .4byte gUnknown_3004FF0
thumb_func_end sub_803612C
@@ -884,7 +884,7 @@ sub_8036170: @ 8036170
ands r0, r1
cmp r0, 0
bne _080361CA
ldr r5, _080361D8 @ =gUnknown_2023D44
ldr r5, _080361D8 @ =gBattlerSpriteIds
adds r0, r2, r5
ldrb r1, [r0]
lsls r0, r1, 4
@@ -916,7 +916,7 @@ _080361CA:
.align 2, 0
_080361D0: .4byte gUnknown_2024018
_080361D4: .4byte gActiveBattler
_080361D8: .4byte gUnknown_2023D44
_080361D8: .4byte gBattlerSpriteIds
_080361DC: .4byte gSprites
_080361E0: .4byte gUnknown_3004FF0
thumb_func_end sub_8036170
@@ -938,7 +938,7 @@ _080361F6:
thumb_func_start sub_80361FC
sub_80361FC: @ 80361FC
push {r4,lr}
ldr r1, _08036238 @ =gUnknown_2023D44
ldr r1, _08036238 @ =gBattlerSpriteIds
ldr r0, _0803623C @ =gActiveBattler
ldrb r0, [r0]
adds r0, r1
@@ -966,7 +966,7 @@ sub_80361FC: @ 80361FC
bl OpponentBufferExecCompleted
b _08036272
.align 2, 0
_08036238: .4byte gUnknown_2023D44
_08036238: .4byte gBattlerSpriteIds
_0803623C: .4byte gActiveBattler
_08036240: .4byte gSprites
_08036244: .4byte gUnknown_2024005
@@ -1128,7 +1128,7 @@ sub_8036334: @ 8036334
bl FreeSpriteTilesByTag
adds r0, r4, 0
bl FreeSpritePaletteByTag
ldr r1, _080363EC @ =gUnknown_2023D44
ldr r1, _080363EC @ =gBattlerSpriteIds
ldrb r0, [r5]
adds r0, r1
ldrb r1, [r0]
@@ -1175,7 +1175,7 @@ _080363D8:
_080363E0: .4byte gUnknown_2024018
_080363E4: .4byte gActiveBattler
_080363E8: .4byte 0x000027f9
_080363EC: .4byte gUnknown_2023D44
_080363EC: .4byte gBattlerSpriteIds
_080363F0: .4byte gSprites
_080363F4: .4byte gUnknown_3004FF0
_080363F8: .4byte gBattlerPartyIndexes
@@ -3666,7 +3666,7 @@ _080378AA:
adds r1, r4, 0
adds r2, r5, 0
bl CreateSprite
ldr r4, _080379A4 @ =gUnknown_2023D44
ldr r4, _080379A4 @ =gBattlerSpriteIds
ldrb r1, [r7]
adds r1, r4
strb r0, [r1]
@@ -3759,7 +3759,7 @@ _08037986:
.align 2, 0
_0803799C: .4byte gActiveBattler
_080379A0: .4byte gMultiuseSpriteTemplate
_080379A4: .4byte gUnknown_2023D44
_080379A4: .4byte gBattlerSpriteIds
_080379A8: .4byte gSprites
_080379AC: .4byte 0x0000ff10
_080379B0: .4byte gBattleMonForms
@@ -3895,7 +3895,7 @@ sub_8037A28: @ 8037A28
adds r1, r5, 0
adds r2, r4, 0
bl CreateSprite
ldr r4, _08037B9C @ =gUnknown_2023D44
ldr r4, _08037B9C @ =gBattlerSpriteIds
adds r4, r6, r4
strb r0, [r4]
ldr r5, _08037BA0 @ =gSprites
@@ -3985,7 +3985,7 @@ _08037B8C: .4byte gEnemyParty
_08037B90: .4byte sub_8033E3C
_08037B94: .4byte gUnknown_3004FFC
_08037B98: .4byte gMultiuseSpriteTemplate
_08037B9C: .4byte gUnknown_2023D44
_08037B9C: .4byte gBattlerSpriteIds
_08037BA0: .4byte gSprites
_08037BA4: .4byte gBattleMonForms
_08037BA8: .4byte SpriteCallbackDummy
@@ -4025,7 +4025,7 @@ _08037BE8: .4byte gUnknown_2024018
_08037BEC: .4byte gUnknown_3004FE0
_08037BF0: .4byte sub_8037C44
_08037BF4:
ldr r5, _08037C38 @ =gUnknown_2023D44
ldr r5, _08037C38 @ =gBattlerSpriteIds
adds r0, r2, r5
ldrb r1, [r0]
lsls r0, r1, 4
@@ -4055,7 +4055,7 @@ _08037C30:
pop {r0}
bx r0
.align 2, 0
_08037C38: .4byte gUnknown_2023D44
_08037C38: .4byte gBattlerSpriteIds
_08037C3C: .4byte gSprites
_08037C40: .4byte gUnknown_3004FF0
thumb_func_end sub_8037BAC
@@ -4227,7 +4227,7 @@ _08037D3A:
movs r1, 0xB0
adds r2, r4, 0
bl CreateSprite
ldr r5, _08037E7C @ =gUnknown_2023D44
ldr r5, _08037E7C @ =gBattlerSpriteIds
mov r2, r8
ldrb r1, [r2]
adds r1, r5
@@ -4341,7 +4341,7 @@ _08037E6C: .4byte gTrainers
_08037E70: .4byte gActiveBattler
_08037E74: .4byte gMultiuseSpriteTemplate
_08037E78: .4byte gUnknown_823932C
_08037E7C: .4byte gUnknown_2023D44
_08037E7C: .4byte gBattlerSpriteIds
_08037E80: .4byte gSprites
_08037E84: .4byte 0x0000ff10
_08037E88: .4byte gTrainerFrontPicPaletteTable
@@ -4439,7 +4439,7 @@ _08037F0E:
movs r1, 0xB0
movs r3, 0x1E
bl CreateSprite
ldr r5, _08038050 @ =gUnknown_2023D44
ldr r5, _08038050 @ =gBattlerSpriteIds
mov r2, r8
ldrb r1, [r2]
adds r1, r5
@@ -4561,7 +4561,7 @@ _08038040: .4byte gTrainers
_08038044: .4byte gActiveBattler
_08038048: .4byte gMultiuseSpriteTemplate
_0803804C: .4byte gUnknown_823932C
_08038050: .4byte gUnknown_2023D44
_08038050: .4byte gBattlerSpriteIds
_08038054: .4byte gSprites
_08038058: .4byte 0x0000fffe
_0803805C: .4byte gTrainerFrontPicPaletteTable
@@ -4576,7 +4576,7 @@ _08038074: .4byte sub_8035B20
thumb_func_start sub_8038078
sub_8038078: @ 8038078
push {r4-r6,lr}
ldr r6, _08038108 @ =gUnknown_2023D44
ldr r6, _08038108 @ =gBattlerSpriteIds
ldr r4, _0803810C @ =gActiveBattler
ldrb r0, [r4]
adds r0, r6
@@ -4645,7 +4645,7 @@ sub_8038078: @ 8038078
pop {r0}
bx r0
.align 2, 0
_08038108: .4byte gUnknown_2023D44
_08038108: .4byte gBattlerSpriteIds
_0803810C: .4byte gActiveBattler
_08038110: .4byte gSprites
_08038114: .4byte sub_8075590
@@ -4709,7 +4709,7 @@ _08038178:
movs r1, 0x3F
bl PlaySE12WithPanning
ldr r2, _080381BC @ =gSprites
ldr r1, _080381C0 @ =gUnknown_2023D44
ldr r1, _080381C0 @ =gBattlerSpriteIds
ldrb r0, [r5]
adds r0, r1
ldrb r1, [r0]
@@ -4732,7 +4732,7 @@ _080381B4:
bx r0
.align 2, 0
_080381BC: .4byte gSprites
_080381C0: .4byte gUnknown_2023D44
_080381C0: .4byte gBattlerSpriteIds
_080381C4: .4byte sub_8011EA0
_080381C8: .4byte gUnknown_3004FE0
_080381CC: .4byte sub_803612C
@@ -4794,7 +4794,7 @@ _08038212:
ldrb r1, [r1]
lsls r1, 8
orrs r0, r1
ldr r5, _080382EC @ =gUnknown_2037F16
ldr r5, _080382EC @ =gAnimMoveTurn
mov r1, r12
adds r1, 0x3
adds r2, r1
@@ -4862,7 +4862,7 @@ _08038212:
lsls r1, 8
orrs r3, r1
strh r3, [r4]
ldr r3, _08038300 @ =gUnknown_2037EE4
ldr r3, _08038300 @ =gAnimDisableStructPtr
ldrb r2, [r6]
lsls r2, 9
mov r1, r12
@@ -4886,12 +4886,12 @@ _08038212:
.align 2, 0
_080382E4: .4byte gActiveBattler
_080382E8: .4byte gUnknown_2022BC4
_080382EC: .4byte gUnknown_2037F16
_080382EC: .4byte gAnimMoveTurn
_080382F0: .4byte gUnknown_2037EEC
_080382F4: .4byte gUnknown_2037EE8
_080382F8: .4byte gUnknown_2037EFE
_080382FC: .4byte gUnknown_2037F00
_08038300: .4byte gUnknown_2037EE4
_08038300: .4byte gAnimDisableStructPtr
_08038304: .4byte gUnknown_2024008
_08038308:
ldr r0, _0803832C @ =gUnknown_2024018
@@ -5926,7 +5926,7 @@ _08038B1C: .4byte gUnknown_2022870
OpponentHandleHitAnimation: @ 8038B20
push {r4,lr}
ldr r3, _08038B48 @ =gSprites
ldr r2, _08038B4C @ =gUnknown_2023D44
ldr r2, _08038B4C @ =gBattlerSpriteIds
ldr r4, _08038B50 @ =gActiveBattler
ldrb r0, [r4]
adds r0, r2
@@ -5944,7 +5944,7 @@ OpponentHandleHitAnimation: @ 8038B20
b _08038B7E
.align 2, 0
_08038B48: .4byte gSprites
_08038B4C: .4byte gUnknown_2023D44
_08038B4C: .4byte gBattlerSpriteIds
_08038B50: .4byte gActiveBattler
_08038B54:
ldr r1, _08038B84 @ =gUnknown_2024005
@@ -6101,7 +6101,7 @@ _08038C7C: .4byte gUnknown_2023F4C
thumb_func_start sub_8038C80
sub_8038C80: @ 8038C80
push {r4-r6,lr}
ldr r5, _08038D60 @ =gUnknown_2023D44
ldr r5, _08038D60 @ =gBattlerSpriteIds
ldr r6, _08038D64 @ =gActiveBattler
ldrb r0, [r6]
adds r0, r5
@@ -6211,7 +6211,7 @@ _08038D42:
pop {r0}
bx r0
.align 2, 0
_08038D60: .4byte gUnknown_2023D44
_08038D60: .4byte gBattlerSpriteIds
_08038D64: .4byte gActiveBattler
_08038D68: .4byte gSprites
_08038D6C: .4byte sub_8075590
@@ -6589,7 +6589,7 @@ sub_8039060: @ 8039060
cmp r0, 0
beq _080390A6
ldr r3, _080390B4 @ =gSprites
ldr r0, _080390B8 @ =gUnknown_2023D44
ldr r0, _080390B8 @ =gBattlerSpriteIds
ldrb r1, [r4]
adds r0, r1, r0
ldrb r0, [r0]
@@ -6622,7 +6622,7 @@ _080390A6:
.align 2, 0
_080390B0: .4byte gActiveBattler
_080390B4: .4byte gSprites
_080390B8: .4byte gUnknown_2023D44
_080390B8: .4byte gBattlerSpriteIds
_080390BC: .4byte gUnknown_2022BC4
thumb_func_end sub_8039060
asm/battle_controller_player.s
+57 -57
View File
@@ -131,7 +131,7 @@ _0802E400:
CompleteOnBankSpritePosX_0: @ 802E404
push {lr}
ldr r2, _0802E42C @ =gSprites
ldr r1, _0802E430 @ =gUnknown_2023D44
ldr r1, _0802E430 @ =gBattlerSpriteIds
ldr r0, _0802E434 @ =gActiveBattler
ldrb r0, [r0]
adds r0, r1
@@ -150,7 +150,7 @@ _0802E426:
bx r0
.align 2, 0
_0802E42C: .4byte gSprites
_0802E430: .4byte gUnknown_2023D44
_0802E430: .4byte gBattlerSpriteIds
_0802E434: .4byte gActiveBattler
thumb_func_end CompleteOnBankSpritePosX_0
@@ -480,7 +480,7 @@ _0802E6B6:
movs r0, 0x5
bl PlaySE
ldr r2, _0802E718 @ =gSprites
ldr r1, _0802E71C @ =gUnknown_2023D44
ldr r1, _0802E71C @ =gBattlerSpriteIds
ldr r4, _0802E70C @ =gUnknown_3004FF4
ldrb r0, [r4]
adds r0, r1
@@ -514,7 +514,7 @@ _0802E70C: .4byte gUnknown_3004FF4
_0802E710: .4byte gBattlersCount
_0802E714: .4byte gMain
_0802E718: .4byte gSprites
_0802E71C: .4byte gUnknown_2023D44
_0802E71C: .4byte gBattlerSpriteIds
_0802E720: .4byte sub_8012098
_0802E724: .4byte gUnknown_2023FFC
_0802E728: .4byte gActiveBattler
@@ -526,7 +526,7 @@ _0802E72C:
movs r0, 0x5
bl PlaySE
ldr r2, _0802E784 @ =gSprites
ldr r1, _0802E788 @ =gUnknown_2023D44
ldr r1, _0802E788 @ =gBattlerSpriteIds
ldr r5, _0802E78C @ =gUnknown_3004FF4
ldrb r0, [r5]
adds r0, r1
@@ -561,7 +561,7 @@ _0802E72C:
b _0802E9DC
.align 2, 0
_0802E784: .4byte gSprites
_0802E788: .4byte gUnknown_2023D44
_0802E788: .4byte gBattlerSpriteIds
_0802E78C: .4byte gUnknown_3004FF4
_0802E790: .4byte sub_8012098
_0802E794: .4byte gUnknown_3004FE0
@@ -577,7 +577,7 @@ _0802E7AA:
movs r0, 0x5
bl PlaySE
ldr r2, _0802E7DC @ =gSprites
ldr r1, _0802E7E0 @ =gUnknown_2023D44
ldr r1, _0802E7E0 @ =gBattlerSpriteIds
ldr r3, _0802E7E4 @ =gUnknown_3004FF4
ldrb r0, [r3]
adds r0, r1
@@ -600,7 +600,7 @@ _0802E7CC:
b _0802E7F6
.align 2, 0
_0802E7DC: .4byte gSprites
_0802E7E0: .4byte gUnknown_2023D44
_0802E7E0: .4byte gBattlerSpriteIds
_0802E7E4: .4byte gUnknown_3004FF4
_0802E7E8: .4byte sub_8012098
_0802E7EC:
@@ -718,7 +718,7 @@ _0802E8CE:
movs r0, 0x5
bl PlaySE
ldr r2, _0802E900 @ =gSprites
ldr r1, _0802E904 @ =gUnknown_2023D44
ldr r1, _0802E904 @ =gBattlerSpriteIds
ldr r3, _0802E908 @ =gUnknown_3004FF4
ldrb r0, [r3]
adds r0, r1
@@ -741,7 +741,7 @@ _0802E8F0:
b _0802E91A
.align 2, 0
_0802E900: .4byte gSprites
_0802E904: .4byte gUnknown_2023D44
_0802E904: .4byte gBattlerSpriteIds
_0802E908: .4byte gUnknown_3004FF4
_0802E90C: .4byte sub_8012098
_0802E910:
@@ -841,7 +841,7 @@ _0802E9C0:
beq _0802E8F0
_0802E9C4:
ldr r2, _0802EA04 @ =gSprites
ldr r1, _0802EA08 @ =gUnknown_2023D44
ldr r1, _0802EA08 @ =gBattlerSpriteIds
ldrb r0, [r0]
adds r0, r1
ldrb r1, [r0]
@@ -867,7 +867,7 @@ _0802E9F8: .4byte gAbsentBattlerFlags
_0802E9FC: .4byte gBitTable
_0802EA00: .4byte gUnknown_3004FF4
_0802EA04: .4byte gSprites
_0802EA08: .4byte gUnknown_2023D44
_0802EA08: .4byte gBattlerSpriteIds
_0802EA0C: .4byte sub_8012044
thumb_func_end sub_802E674
@@ -1005,7 +1005,7 @@ _0802EB04:
cmp r0, 0
bne _0802EB3A
movs r0, 0
bl CountAliveMons
bl CountAliveMonsInBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1095,7 +1095,7 @@ _0802EBDE:
_0802EBE4:
strb r0, [r1]
ldr r2, _0802EC04 @ =gSprites
ldr r1, _0802EC08 @ =gUnknown_2023D44
ldr r1, _0802EC08 @ =gBattlerSpriteIds
ldr r0, _0802EC00 @ =gUnknown_3004FF4
ldrb r0, [r0]
adds r0, r1
@@ -1110,7 +1110,7 @@ _0802EBE4:
.align 2, 0
_0802EC00: .4byte gUnknown_3004FF4
_0802EC04: .4byte gSprites
_0802EC08: .4byte gUnknown_2023D44
_0802EC08: .4byte gBattlerSpriteIds
_0802EC0C: .4byte sub_8012044
_0802EC10:
movs r7, 0x2
@@ -2462,7 +2462,7 @@ _0802F72C: .4byte gUnknown_3004F80
sub_802F730: @ 802F730
push {lr}
ldr r2, _0802F758 @ =gSprites
ldr r1, _0802F75C @ =gUnknown_2023D44
ldr r1, _0802F75C @ =gBattlerSpriteIds
ldr r0, _0802F760 @ =gActiveBattler
ldrb r0, [r0]
adds r0, r1
@@ -2482,7 +2482,7 @@ _0802F754:
bx r0
.align 2, 0
_0802F758: .4byte gSprites
_0802F75C: .4byte gUnknown_2023D44
_0802F75C: .4byte gBattlerSpriteIds
_0802F760: .4byte gActiveBattler
_0802F764: .4byte SpriteCallbackDummy
thumb_func_end sub_802F730
@@ -2491,7 +2491,7 @@ _0802F764: .4byte SpriteCallbackDummy
sub_802F768: @ 802F768
push {lr}
ldr r2, _0802F790 @ =gSprites
ldr r1, _0802F794 @ =gUnknown_2023D44
ldr r1, _0802F794 @ =gBattlerSpriteIds
ldr r0, _0802F798 @ =gActiveBattler
ldrb r0, [r0]
adds r0, r1
@@ -2511,7 +2511,7 @@ _0802F78C:
bx r0
.align 2, 0
_0802F790: .4byte gSprites
_0802F794: .4byte gUnknown_2023D44
_0802F794: .4byte gBattlerSpriteIds
_0802F798: .4byte gActiveBattler
_0802F79C: .4byte SpriteCallbackDummy
thumb_func_end sub_802F768
@@ -2520,7 +2520,7 @@ _0802F79C: .4byte SpriteCallbackDummy
sub_802F7A0: @ 802F7A0
push {r4-r6,lr}
ldr r6, _0802F7FC @ =gSprites
ldr r5, _0802F800 @ =gUnknown_2023D44
ldr r5, _0802F800 @ =gBattlerSpriteIds
ldr r4, _0802F804 @ =gActiveBattler
ldrb r0, [r4]
adds r0, r5
@@ -2562,7 +2562,7 @@ _0802F7F4:
bx r0
.align 2, 0
_0802F7FC: .4byte gSprites
_0802F800: .4byte gUnknown_2023D44
_0802F800: .4byte gBattlerSpriteIds
_0802F804: .4byte gActiveBattler
_0802F808: .4byte SpriteCallbackDummy
_0802F80C: .4byte gSaveBlock2Ptr
@@ -4010,7 +4010,7 @@ sub_80303A8: @ 80303A8
negs r1, r0
orrs r1, r0
lsrs r6, r1, 31
ldr r0, _08030400 @ =gUnknown_2023D44
ldr r0, _08030400 @ =gBattlerSpriteIds
adds r0, r7, r0
ldrb r1, [r0]
lsls r0, r1, 4
@@ -4031,7 +4031,7 @@ _080303F0:
mov pc, r0
.align 2, 0
_080303FC: .4byte gTasks+0x8
_08030400: .4byte gUnknown_2023D44
_08030400: .4byte gBattlerSpriteIds
_08030404: .4byte gSprites
_08030408: .4byte _0803040C
.align 2, 0
@@ -4179,7 +4179,7 @@ _08030534: .4byte sub_802FE94
sub_8030538: @ 8030538
push {r4-r6,lr}
ldr r6, _08030590 @ =gSprites
ldr r5, _08030594 @ =gUnknown_2023D44
ldr r5, _08030594 @ =gBattlerSpriteIds
ldr r4, _08030598 @ =gActiveBattler
ldrb r0, [r4]
adds r0, r5
@@ -4219,7 +4219,7 @@ _08030588:
bx r0
.align 2, 0
_08030590: .4byte gSprites
_08030594: .4byte gUnknown_2023D44
_08030594: .4byte gBattlerSpriteIds
_08030598: .4byte gActiveBattler
_0803059C: .4byte gUnknown_3004FF0
thumb_func_end sub_8030538
@@ -4241,7 +4241,7 @@ sub_80305A0: @ 80305A0
ands r0, r1
cmp r0, 0
bne _080305F4
ldr r5, _08030604 @ =gUnknown_2023D44
ldr r5, _08030604 @ =gBattlerSpriteIds
adds r0, r2, r5
ldrb r1, [r0]
lsls r0, r1, 4
@@ -4271,7 +4271,7 @@ _080305F4:
.align 2, 0
_080305FC: .4byte gUnknown_2024018
_08030600: .4byte gActiveBattler
_08030604: .4byte gUnknown_2023D44
_08030604: .4byte gBattlerSpriteIds
_08030608: .4byte gSprites
_0803060C: .4byte gUnknown_3004FF0
thumb_func_end sub_80305A0
@@ -4485,7 +4485,7 @@ _080307B0: .4byte gActiveBattler
thumb_func_start DoHitAnimBlinkSpriteEffect
DoHitAnimBlinkSpriteEffect: @ 80307B4
push {r4,lr}
ldr r1, _080307F0 @ =gUnknown_2023D44
ldr r1, _080307F0 @ =gBattlerSpriteIds
ldr r0, _080307F4 @ =gActiveBattler
ldrb r0, [r0]
adds r0, r1
@@ -4513,7 +4513,7 @@ DoHitAnimBlinkSpriteEffect: @ 80307B4
bl PlayerBufferExecCompleted
b _0803082A
.align 2, 0
_080307F0: .4byte gUnknown_2023D44
_080307F0: .4byte gBattlerSpriteIds
_080307F4: .4byte gActiveBattler
_080307F8: .4byte gSprites
_080307FC: .4byte gUnknown_2024005
@@ -7299,7 +7299,7 @@ PlayerHandleLoadMonSprite: @ 8031F00
adds r0, r2
bl sub_8034498
ldr r2, _08031F58 @ =gSprites
ldr r0, _08031F5C @ =gUnknown_2023D44
ldr r0, _08031F5C @ =gBattlerSpriteIds
ldrb r3, [r4]
adds r0, r3, r0
ldrb r0, [r0]
@@ -7327,7 +7327,7 @@ _08031F4C: .4byte gBattlerPartyIndexes
_08031F50: .4byte gActiveBattler
_08031F54: .4byte gPlayerParty
_08031F58: .4byte gSprites
_08031F5C: .4byte gUnknown_2023D44
_08031F5C: .4byte gBattlerSpriteIds
_08031F60: .4byte gUnknown_3004FE0
_08031F64: .4byte CompleteOnBankSpritePosX_0
thumb_func_end PlayerHandleLoadMonSprite
@@ -7465,7 +7465,7 @@ sub_8031FF4: @ 8031FF4
adds r1, r5, 0
adds r2, r4, 0
bl CreateSprite
ldr r4, _08032150 @ =gUnknown_2023D44
ldr r4, _08032150 @ =gBattlerSpriteIds
adds r4, r6, r4
strb r0, [r4]
ldr r5, _08032154 @ =gSprites
@@ -7555,7 +7555,7 @@ _08032140: .4byte gPlayerParty
_08032144: .4byte sub_8033E3C
_08032148: .4byte gUnknown_3004FFC
_0803214C: .4byte gMultiuseSpriteTemplate
_08032150: .4byte gUnknown_2023D44
_08032150: .4byte gBattlerSpriteIds
_08032154: .4byte gSprites
_08032158: .4byte gBattleMonForms
_0803215C: .4byte SpriteCallbackDummy
@@ -7595,7 +7595,7 @@ _0803219C: .4byte gUnknown_2024018
_080321A0: .4byte gUnknown_3004FE0
_080321A4: .4byte sub_80321F0
_080321A8:
ldr r5, _080321E4 @ =gUnknown_2023D44
ldr r5, _080321E4 @ =gBattlerSpriteIds
adds r0, r2, r5
ldrb r1, [r0]
lsls r0, r1, 4
@@ -7623,7 +7623,7 @@ _080321DE:
pop {r0}
bx r0
.align 2, 0
_080321E4: .4byte gUnknown_2023D44
_080321E4: .4byte gBattlerSpriteIds
_080321E8: .4byte gSprites
_080321EC: .4byte gUnknown_3004FF0
thumb_func_end PlayerHandleReturnPokeToBall
@@ -7833,7 +7833,7 @@ _08032342:
mov r1, r8
adds r2, r4, 0
bl CreateSprite
ldr r6, _08032410 @ =gUnknown_2023D44
ldr r6, _08032410 @ =gBattlerSpriteIds
ldrb r1, [r5]
adds r1, r6
strb r0, [r1]
@@ -7895,7 +7895,7 @@ _08032400: .4byte gSaveBlock2Ptr
_08032404: .4byte gActiveBattler
_08032408: .4byte gMultiuseSpriteTemplate
_0803240C: .4byte gUnknown_8239F8C
_08032410: .4byte gUnknown_2023D44
_08032410: .4byte gBattlerSpriteIds
_08032414: .4byte gSprites
_08032418: .4byte 0x0000fffe
_0803241C: .4byte sub_8033EEC
@@ -8003,7 +8003,7 @@ _080324BE:
movs r1, 0x50
movs r3, 0x1E
bl CreateSprite
ldr r6, _08032578 @ =gUnknown_2023D44
ldr r6, _08032578 @ =gBattlerSpriteIds
ldrb r1, [r5]
adds r1, r6
strb r0, [r1]
@@ -8063,7 +8063,7 @@ _08032568: .4byte gSaveBlock2Ptr
_0803256C: .4byte gActiveBattler
_08032570: .4byte gMultiuseSpriteTemplate
_08032574: .4byte gUnknown_8239F8C
_08032578: .4byte gUnknown_2023D44
_08032578: .4byte gBattlerSpriteIds
_0803257C: .4byte gSprites
_08032580: .4byte 0x0000ffa0
_08032584: .4byte sub_8033EEC
@@ -8074,7 +8074,7 @@ _0803258C: .4byte sub_802F768
thumb_func_start PlayerHandleTrainerSlideBack
PlayerHandleTrainerSlideBack: @ 8032590
push {r4-r6,lr}
ldr r5, _08032630 @ =gUnknown_2023D44
ldr r5, _08032630 @ =gBattlerSpriteIds
ldr r6, _08032634 @ =gActiveBattler
ldrb r0, [r6]
adds r0, r5
@@ -8151,7 +8151,7 @@ PlayerHandleTrainerSlideBack: @ 8032590
pop {r0}
bx r0
.align 2, 0
_08032630: .4byte gUnknown_2023D44
_08032630: .4byte gBattlerSpriteIds
_08032634: .4byte gActiveBattler
_08032638: .4byte gSprites
_0803263C: .4byte 0x0000ffd8
@@ -8227,7 +8227,7 @@ _080326A4:
movs r0, 0x10
bl PlaySE12WithPanning
ldr r2, _08032728 @ =gSprites
ldr r3, _0803272C @ =gUnknown_2023D44
ldr r3, _0803272C @ =gBattlerSpriteIds
ldrb r0, [r5]
adds r0, r3
ldrb r1, [r0]
@@ -8269,7 +8269,7 @@ _0803271A:
_08032720: .4byte gBattlerPartyIndexes
_08032724: .4byte gPlayerParty
_08032728: .4byte gSprites
_0803272C: .4byte gUnknown_2023D44
_0803272C: .4byte gBattlerSpriteIds
_08032730: .4byte sub_8012110
_08032734: .4byte gUnknown_3004FE0
_08032738: .4byte sub_8030538
@@ -8428,7 +8428,7 @@ _08032852:
ldrb r1, [r1]
lsls r1, 8
orrs r0, r1
ldr r5, _0803292C @ =gUnknown_2037F16
ldr r5, _0803292C @ =gAnimMoveTurn
mov r1, r12
adds r1, 0x3
adds r2, r1
@@ -8496,7 +8496,7 @@ _08032852:
lsls r1, 8
orrs r3, r1
strh r3, [r4]
ldr r3, _08032940 @ =gUnknown_2037EE4
ldr r3, _08032940 @ =gAnimDisableStructPtr
ldrb r2, [r6]
lsls r2, 9
mov r1, r12
@@ -8520,12 +8520,12 @@ _08032852:
.align 2, 0
_08032924: .4byte gActiveBattler
_08032928: .4byte gUnknown_2022BC4
_0803292C: .4byte gUnknown_2037F16
_0803292C: .4byte gAnimMoveTurn
_08032930: .4byte gUnknown_2037EEC
_08032934: .4byte gUnknown_2037EE8
_08032938: .4byte gUnknown_2037EFE
_0803293C: .4byte gUnknown_2037F00
_08032940: .4byte gUnknown_2037EE4
_08032940: .4byte gAnimDisableStructPtr
_08032944: .4byte gUnknown_2024008
_08032948:
ldr r0, _0803296C @ =gUnknown_2024018
@@ -9754,7 +9754,7 @@ _08033310: .4byte gUnknown_2022870
PlayerHandleHitAnimation: @ 8033314
push {r4,lr}
ldr r3, _0803333C @ =gSprites
ldr r2, _08033340 @ =gUnknown_2023D44
ldr r2, _08033340 @ =gBattlerSpriteIds
ldr r4, _08033344 @ =gActiveBattler
ldrb r0, [r4]
adds r0, r2
@@ -9772,7 +9772,7 @@ PlayerHandleHitAnimation: @ 8033314
b _08033372
.align 2, 0
_0803333C: .4byte gSprites
_08033340: .4byte gUnknown_2023D44
_08033340: .4byte gBattlerSpriteIds
_08033344: .4byte gActiveBattler
_08033348:
ldr r1, _08033378 @ =gUnknown_2024005
@@ -9930,7 +9930,7 @@ _08033474: .4byte gUnknown_2023F4C
thumb_func_start PlayerHandleIntroTrainerBallThrow
PlayerHandleIntroTrainerBallThrow: @ 8033478
push {r4-r7,lr}
ldr r6, _080335B8 @ =gUnknown_2023D44
ldr r6, _080335B8 @ =gBattlerSpriteIds
ldr r7, _080335BC @ =gActiveBattler
ldrb r0, [r7]
adds r0, r6
@@ -10085,7 +10085,7 @@ _0803359A:
pop {r0}
bx r0
.align 2, 0
_080335B8: .4byte gUnknown_2023D44
_080335B8: .4byte gBattlerSpriteIds
_080335BC: .4byte gActiveBattler
_080335C0: .4byte gSprites
_080335C4: .4byte 0x0000ffd8
@@ -10129,7 +10129,7 @@ sub_80335F8: @ 80335F8
adds r0, r1
adds r1, r4, 0
bl sub_8034498
ldr r0, _08033658 @ =gUnknown_2023D44
ldr r0, _08033658 @ =gBattlerSpriteIds
adds r4, r0
ldrb r1, [r4]
lsls r0, r1, 4
@@ -10145,7 +10145,7 @@ sub_80335F8: @ 80335F8
.align 2, 0
_08033650: .4byte gBattlerPartyIndexes
_08033654: .4byte gPlayerParty
_08033658: .4byte gUnknown_2023D44
_08033658: .4byte gBattlerSpriteIds
_0803365C: .4byte gSprites
thumb_func_end sub_80335F8
@@ -10476,7 +10476,7 @@ PlayerHandleSpriteInvisibility: @ 80338EC
cmp r0, 0
beq _08033932
ldr r3, _08033940 @ =gSprites
ldr r0, _08033944 @ =gUnknown_2023D44
ldr r0, _08033944 @ =gBattlerSpriteIds
ldrb r1, [r4]
adds r0, r1, r0
ldrb r0, [r0]
@@ -10509,7 +10509,7 @@ _08033932:
.align 2, 0
_0803393C: .4byte gActiveBattler
_08033940: .4byte gSprites
_08033944: .4byte gUnknown_2023D44
_08033944: .4byte gBattlerSpriteIds
_08033948: .4byte gUnknown_2022BC4
thumb_func_end PlayerHandleSpriteInvisibility
@@ -10671,7 +10671,7 @@ _08033A74: .4byte gUnknown_2023FFC
thumb_func_start PlayerHandlecmd55
PlayerHandlecmd55: @ 8033A78
push {r4,lr}
ldr r2, _08033AB0 @ =gUnknown_2023E8A
ldr r2, _08033AB0 @ =gBattleOutcome
ldr r1, _08033AB4 @ =gUnknown_2022BC4
ldr r4, _08033AB8 @ =gActiveBattler
ldrb r0, [r4]
@@ -10695,7 +10695,7 @@ PlayerHandlecmd55: @ 8033A78
pop {r0}
bx r0
.align 2, 0
_08033AB0: .4byte gUnknown_2023E8A
_08033AB0: .4byte gBattleOutcome
_08033AB4: .4byte gUnknown_2022BC4
_08033AB8: .4byte gActiveBattler
_08033ABC: .4byte gUnknown_3004FE0
asm/battle_controller_pokedude.s
+40 -40
View File
@@ -98,7 +98,7 @@ sub_8156140: @ 8156140
sub_815614C: @ 815614C
push {lr}
ldr r2, _08156174 @ =gSprites
ldr r1, _08156178 @ =gUnknown_2023D44
ldr r1, _08156178 @ =gBattlerSpriteIds
ldr r0, _0815617C @ =gActiveBattler
ldrb r0, [r0]
adds r0, r1
@@ -118,7 +118,7 @@ _08156170:
bx r0
.align 2, 0
_08156174: .4byte gSprites
_08156178: .4byte gUnknown_2023D44
_08156178: .4byte gBattlerSpriteIds
_0815617C: .4byte gActiveBattler
_08156180: .4byte SpriteCallbackDummy
thumb_func_end sub_815614C
@@ -127,7 +127,7 @@ _08156180: .4byte SpriteCallbackDummy
sub_8156184: @ 8156184
push {r4-r7,lr}
ldr r2, _081561E0 @ =gSprites
ldr r0, _081561E4 @ =gUnknown_2023D44
ldr r0, _081561E4 @ =gBattlerSpriteIds
ldr r7, _081561E8 @ =gActiveBattler
ldrb r3, [r7]
adds r0, r3, r0
@@ -171,7 +171,7 @@ sub_8156184: @ 8156184
b _08156230
.align 2, 0
_081561E0: .4byte gSprites
_081561E4: .4byte gUnknown_2023D44
_081561E4: .4byte gBattlerSpriteIds
_081561E8: .4byte gActiveBattler
_081561EC: .4byte gUnknown_2024018
_081561F0: .4byte gBattlerPartyIndexes
@@ -1635,7 +1635,7 @@ sub_8156DCC: @ 8156DCC
cmp r0, 0
bne _08156E3C
ldr r6, _08156E30 @ =gSprites
ldr r5, _08156E34 @ =gUnknown_2023D44
ldr r5, _08156E34 @ =gBattlerSpriteIds
ldrb r0, [r4]
adds r0, r5
ldrb r1, [r0]
@@ -1672,11 +1672,11 @@ sub_8156DCC: @ 8156DCC
.align 2, 0
_08156E2C: .4byte gActiveBattler
_08156E30: .4byte gSprites
_08156E34: .4byte gUnknown_2023D44
_08156E34: .4byte gBattlerSpriteIds
_08156E38: .4byte gUnknown_3004FF0
_08156E3C:
ldr r2, _08156E6C @ =gSprites
ldr r0, _08156E70 @ =gUnknown_2023D44
ldr r0, _08156E70 @ =gBattlerSpriteIds
ldrb r3, [r4]
adds r0, r3, r0
ldrb r1, [r0]
@@ -1700,7 +1700,7 @@ _08156E66:
bx r0
.align 2, 0
_08156E6C: .4byte gSprites
_08156E70: .4byte gUnknown_2023D44
_08156E70: .4byte gBattlerSpriteIds
_08156E74: .4byte gUnknown_3004FF0
thumb_func_end sub_8156DCC
@@ -1775,7 +1775,7 @@ _08156EFA:
thumb_func_start sub_8156F00
sub_8156F00: @ 8156F00
push {r4,lr}
ldr r1, _08156F3C @ =gUnknown_2023D44
ldr r1, _08156F3C @ =gBattlerSpriteIds
ldr r0, _08156F40 @ =gActiveBattler
ldrb r0, [r0]
adds r0, r1
@@ -1803,7 +1803,7 @@ sub_8156F00: @ 8156F00
bl PlayerPartnerBufferExecCompleted
b _08156F76
.align 2, 0
_08156F3C: .4byte gUnknown_2023D44
_08156F3C: .4byte gBattlerSpriteIds
_08156F40: .4byte gActiveBattler
_08156F44: .4byte gSprites
_08156F48: .4byte gUnknown_2024005
@@ -1853,7 +1853,7 @@ sub_8156F7C: @ 8156F7C
ands r0, r1
cmp r0, 0
bne _08156FD0
ldr r5, _08156FE0 @ =gUnknown_2023D44
ldr r5, _08156FE0 @ =gBattlerSpriteIds
adds r0, r2, r5
ldrb r1, [r0]
lsls r0, r1, 4
@@ -1883,7 +1883,7 @@ _08156FD0:
.align 2, 0
_08156FD8: .4byte gUnknown_2024018
_08156FDC: .4byte gActiveBattler
_08156FE0: .4byte gUnknown_2023D44
_08156FE0: .4byte gBattlerSpriteIds
_08156FE4: .4byte gSprites
_08156FE8: .4byte gUnknown_3004FF0
thumb_func_end sub_8156F7C
@@ -1892,7 +1892,7 @@ _08156FE8: .4byte gUnknown_3004FF0
sub_8156FEC: @ 8156FEC
push {lr}
ldr r2, _08157014 @ =gSprites
ldr r1, _08157018 @ =gUnknown_2023D44
ldr r1, _08157018 @ =gBattlerSpriteIds
ldr r0, _0815701C @ =gActiveBattler
ldrb r0, [r0]
adds r0, r1
@@ -1912,7 +1912,7 @@ _08157010:
bx r0
.align 2, 0
_08157014: .4byte gSprites
_08157018: .4byte gUnknown_2023D44
_08157018: .4byte gBattlerSpriteIds
_0815701C: .4byte gActiveBattler
_08157020: .4byte SpriteCallbackDummy
thumb_func_end sub_8156FEC
@@ -3950,7 +3950,7 @@ sub_81580E0: @ 81580E0
adds r1, r4, 0
adds r2, r5, 0
bl CreateSprite
ldr r4, _08158224 @ =gUnknown_2023D44
ldr r4, _08158224 @ =gBattlerSpriteIds
ldrb r1, [r6]
adds r1, r4
strb r0, [r1]
@@ -4038,7 +4038,7 @@ _08158214: .4byte gActiveBattler
_08158218: .4byte gBattlerPartyIndexes
_0815821C: .4byte gEnemyParty
_08158220: .4byte gMultiuseSpriteTemplate
_08158224: .4byte gUnknown_2023D44
_08158224: .4byte gBattlerSpriteIds
_08158228: .4byte gSprites
_0815822C: .4byte 0x0000ff10
_08158230: .4byte gBattleMonForms
@@ -4135,7 +4135,7 @@ _081582F0: .4byte gActiveBattler
_081582F4: .4byte gUnknown_3004FE0
_081582F8: .4byte sub_8156F7C
_081582FC:
ldr r5, _08158338 @ =gUnknown_2023D44
ldr r5, _08158338 @ =gBattlerSpriteIds
adds r0, r2, r5
ldrb r1, [r0]
lsls r0, r1, 4
@@ -4163,7 +4163,7 @@ _08158332:
pop {r0}
bx r0
.align 2, 0
_08158338: .4byte gUnknown_2023D44
_08158338: .4byte gBattlerSpriteIds
_0815833C: .4byte gSprites
_08158340: .4byte gUnknown_3004FF0
thumb_func_end sub_81582C0
@@ -4202,7 +4202,7 @@ sub_8158344: @ 8158344
movs r1, 0x50
movs r3, 0x1E
bl CreateSprite
ldr r5, _081583E4 @ =gUnknown_2023D44
ldr r5, _081583E4 @ =gBattlerSpriteIds
ldrb r1, [r7]
adds r1, r5
strb r0, [r1]
@@ -4243,7 +4243,7 @@ sub_8158344: @ 8158344
_081583D8: .4byte gActiveBattler
_081583DC: .4byte gMultiuseSpriteTemplate
_081583E0: .4byte gUnknown_8239F8C
_081583E4: .4byte gUnknown_2023D44
_081583E4: .4byte gBattlerSpriteIds
_081583E8: .4byte gSprites
_081583EC: .4byte 0x0000fffe
_081583F0:
@@ -4281,7 +4281,7 @@ _081583F0:
movs r1, 0xB0
adds r2, r4, 0
bl CreateSprite
ldr r5, _08158518 @ =gUnknown_2023D44
ldr r5, _08158518 @ =gBattlerSpriteIds
ldrb r1, [r7]
adds r1, r5
strb r0, [r1]
@@ -4387,7 +4387,7 @@ _081584E2:
.align 2, 0
_08158510: .4byte gMultiuseSpriteTemplate
_08158514: .4byte gUnknown_823932C
_08158518: .4byte gUnknown_2023D44
_08158518: .4byte gBattlerSpriteIds
_0815851C: .4byte gSprites
_08158520: .4byte 0x0000ff10
_08158524: .4byte gTrainerFrontPicPaletteTable
@@ -4427,7 +4427,7 @@ sub_8158544: @ 8158544
movs r1, 0x50
movs r3, 0x1E
bl CreateSprite
ldr r6, _081585F8 @ =gUnknown_2023D44
ldr r6, _081585F8 @ =gBattlerSpriteIds
ldrb r1, [r4]
adds r1, r6
strb r0, [r1]
@@ -4486,7 +4486,7 @@ sub_8158544: @ 8158544
_081585EC: .4byte gActiveBattler
_081585F0: .4byte gMultiuseSpriteTemplate
_081585F4: .4byte gUnknown_8239F8C
_081585F8: .4byte gUnknown_2023D44
_081585F8: .4byte gBattlerSpriteIds
_081585FC: .4byte gSprites
_08158600: .4byte 0x0000ffa0
_08158604: .4byte sub_8033EEC
@@ -4574,7 +4574,7 @@ _08158670:
movs r0, 0x10
bl PlaySE12WithPanning
ldr r2, _081586F0 @ =gSprites
ldr r3, _081586F4 @ =gUnknown_2023D44
ldr r3, _081586F4 @ =gBattlerSpriteIds
ldrb r0, [r5]
adds r0, r3
ldrb r1, [r0]
@@ -4606,14 +4606,14 @@ _08158670:
_081586E8: .4byte gBattlerPartyIndexes
_081586EC: .4byte gPlayerParty
_081586F0: .4byte gSprites
_081586F4: .4byte gUnknown_2023D44
_081586F4: .4byte gBattlerSpriteIds
_081586F8: .4byte sub_8012110
_081586FC:
movs r0, 0x10
movs r1, 0x3F
bl PlaySE12WithPanning
ldr r2, _08158730 @ =gSprites
ldr r1, _08158734 @ =gUnknown_2023D44
ldr r1, _08158734 @ =gBattlerSpriteIds
ldrb r0, [r5]
adds r0, r1
ldrb r1, [r0]
@@ -4638,7 +4638,7 @@ _0815872A:
bx r0
.align 2, 0
_08158730: .4byte gSprites
_08158734: .4byte gUnknown_2023D44
_08158734: .4byte gBattlerSpriteIds
_08158738: .4byte sub_8011EA0
_0815873C: .4byte gUnknown_3004FE0
_08158740: .4byte gActiveBattler
@@ -4762,7 +4762,7 @@ sub_8158814: @ 8158814
ldrb r1, [r1]
lsls r1, 8
orrs r0, r1
ldr r5, _081588F0 @ =gUnknown_2037F16
ldr r5, _081588F0 @ =gAnimMoveTurn
mov r1, r12
adds r1, 0x3
adds r2, r1
@@ -4830,7 +4830,7 @@ sub_8158814: @ 8158814
lsls r1, 8
orrs r3, r1
strh r3, [r4]
ldr r3, _08158904 @ =gUnknown_2037EE4
ldr r3, _08158904 @ =gAnimDisableStructPtr
ldrb r2, [r6]
lsls r2, 9
mov r1, r12
@@ -4854,12 +4854,12 @@ sub_8158814: @ 8158814
.align 2, 0
_081588E8: .4byte gUnknown_2022BC4
_081588EC: .4byte gActiveBattler
_081588F0: .4byte gUnknown_2037F16
_081588F0: .4byte gAnimMoveTurn
_081588F4: .4byte gUnknown_2037EEC
_081588F8: .4byte gUnknown_2037EE8
_081588FC: .4byte gUnknown_2037EFE
_08158900: .4byte gUnknown_2037F00
_08158904: .4byte gUnknown_2037EE4
_08158904: .4byte gAnimDisableStructPtr
_08158908: .4byte gUnknown_2024008
_0815890C:
ldr r0, _08158930 @ =gUnknown_2024018
@@ -5936,7 +5936,7 @@ sub_8159184: @ 8159184
sub_8159190: @ 8159190
push {r4,lr}
ldr r3, _081591B8 @ =gSprites
ldr r2, _081591BC @ =gUnknown_2023D44
ldr r2, _081591BC @ =gBattlerSpriteIds
ldr r4, _081591C0 @ =gActiveBattler
ldrb r0, [r4]
adds r0, r2
@@ -5954,7 +5954,7 @@ sub_8159190: @ 8159190
b _081591EE
.align 2, 0
_081591B8: .4byte gSprites
_081591BC: .4byte gUnknown_2023D44
_081591BC: .4byte gBattlerSpriteIds
_081591C0: .4byte gActiveBattler
_081591C4:
ldr r1, _081591F4 @ =gUnknown_2024005
@@ -6119,7 +6119,7 @@ _08159300: .4byte gUnknown_2023F4C
thumb_func_start sub_8159304
sub_8159304: @ 8159304
push {r4-r7,lr}
ldr r6, _0815943C @ =gUnknown_2023D44
ldr r6, _0815943C @ =gBattlerSpriteIds
ldr r7, _08159440 @ =gActiveBattler
ldrb r0, [r7]
adds r0, r6
@@ -6269,7 +6269,7 @@ _0815941C:
pop {r0}
bx r0
.align 2, 0
_0815943C: .4byte gUnknown_2023D44
_0815943C: .4byte gBattlerSpriteIds
_08159440: .4byte gActiveBattler
_08159444: .4byte gSprites
_08159448: .4byte 0x0000ffd8
@@ -6359,7 +6359,7 @@ sub_8159478: @ 8159478
adds r1, r5, 0
adds r2, r4, 0
bl CreateSprite
ldr r4, _081595DC @ =gUnknown_2023D44
ldr r4, _081595DC @ =gBattlerSpriteIds
adds r4, r6, r4
strb r0, [r4]
ldr r5, _081595E0 @ =gSprites
@@ -6450,7 +6450,7 @@ _081595CC: .4byte gPlayerParty
_081595D0: .4byte sub_8033E3C
_081595D4: .4byte gUnknown_3004FFC
_081595D8: .4byte gMultiuseSpriteTemplate
_081595DC: .4byte gUnknown_2023D44
_081595DC: .4byte gBattlerSpriteIds
_081595E0: .4byte gSprites
_081595E4: .4byte gBattleMonForms
_081595E8: .4byte SpriteCallbackDummy
@@ -6700,7 +6700,7 @@ sub_81597B8: @ 81597B8
thumb_func_start sub_81597C4
sub_81597C4: @ 81597C4
push {r4,lr}
ldr r2, _08159808 @ =gUnknown_2023E8A
ldr r2, _08159808 @ =gBattleOutcome
ldr r1, _0815980C @ =gUnknown_2022BC4
ldr r4, _08159810 @ =gActiveBattler
ldrb r0, [r4]
@@ -6731,7 +6731,7 @@ _08159800:
pop {r0}
bx r0
.align 2, 0
_08159808: .4byte gUnknown_2023E8A
_08159808: .4byte gBattleOutcome
_0815980C: .4byte gUnknown_2022BC4
_08159810: .4byte gActiveBattler
_08159814: .4byte gBattleTypeFlags
asm/battle_controller_safari.s
+6 -6
View File
@@ -259,7 +259,7 @@ _080DD724: .4byte gActiveBattler
sub_80DD728: @ 80DD728
push {lr}
ldr r2, _080DD750 @ =gSprites
ldr r1, _080DD754 @ =gUnknown_2023D44
ldr r1, _080DD754 @ =gBattlerSpriteIds
ldr r0, _080DD758 @ =gActiveBattler
ldrb r0, [r0]
adds r0, r1
@@ -279,7 +279,7 @@ _080DD74C:
bx r0
.align 2, 0
_080DD750: .4byte gSprites
_080DD754: .4byte gUnknown_2023D44
_080DD754: .4byte gBattlerSpriteIds
_080DD758: .4byte gActiveBattler
_080DD75C: .4byte SpriteCallbackDummy
thumb_func_end sub_80DD728
@@ -646,7 +646,7 @@ SafariHandleDrawTrainerPic: @ 80DD9C4
movs r1, 0x50
movs r3, 0x1E
bl CreateSprite
ldr r6, _080DDA8C @ =gUnknown_2023D44
ldr r6, _080DDA8C @ =gBattlerSpriteIds
ldrb r1, [r5]
adds r1, r6
strb r0, [r1]
@@ -706,7 +706,7 @@ _080DDA7C: .4byte gSaveBlock2Ptr
_080DDA80: .4byte gActiveBattler
_080DDA84: .4byte gMultiuseSpriteTemplate
_080DDA88: .4byte gUnknown_8239F8C
_080DDA8C: .4byte gUnknown_2023D44
_080DDA8C: .4byte gBattlerSpriteIds
_080DDA90: .4byte gSprites
_080DDA94: .4byte 0x0000fffe
_080DDA98: .4byte sub_8033EEC
@@ -1487,7 +1487,7 @@ sub_80DE048: @ 80DE048
thumb_func_start SafariHandleCmd55
SafariHandleCmd55: @ 80DE054
push {r4,lr}
ldr r2, _080DE098 @ =gUnknown_2023E8A
ldr r2, _080DE098 @ =gBattleOutcome
ldr r1, _080DE09C @ =gUnknown_2022BC4
ldr r4, _080DE0A0 @ =gActiveBattler
ldrb r0, [r4]
@@ -1518,7 +1518,7 @@ _080DE090:
pop {r0}
bx r0
.align 2, 0
_080DE098: .4byte gUnknown_2023E8A
_080DE098: .4byte gBattleOutcome
_080DE09C: .4byte gUnknown_2022BC4
_080DE0A0: .4byte gActiveBattler
_080DE0A4: .4byte gBattleTypeFlags
asm/battle_controllers.s
+2 -2
View File
@@ -2176,7 +2176,7 @@ EmitPrintString: @ 800E2D4
ldr r2, _0800E3B4 @ =gUnknown_2022874
movs r0, 0x10
strb r0, [r2]
ldr r0, _0800E3B8 @ =gUnknown_2023E8A
ldr r0, _0800E3B8 @ =gBattleOutcome
ldrb r0, [r0]
strb r0, [r2, 0x1]
strb r1, [r2, 0x2]
@@ -2277,7 +2277,7 @@ _0800E378:
bx r0
.align 2, 0
_0800E3B4: .4byte gUnknown_2022874
_0800E3B8: .4byte gUnknown_2023E8A
_0800E3B8: .4byte gBattleOutcome
_0800E3BC: .4byte gCurrentMove
_0800E3C0: .4byte gUnknown_2023D4C
_0800E3C4: .4byte gUnknown_2023D68
asm/battle_gfx_sfx_util.s
+42 -42
View File
@@ -394,7 +394,7 @@ _08034094:
cmp r5, 0x2
bne _080340E0
ldr r1, _080340D8 @ =gSprites
ldr r0, _080340DC @ =gUnknown_2023D44
ldr r0, _080340DC @ =gBattlerSpriteIds
adds r0, r6, r0
ldrb r2, [r0]
lsls r0, r2, 4
@@ -415,12 +415,12 @@ _08034094:
b _08034132
.align 2, 0
_080340D8: .4byte gSprites
_080340DC: .4byte gUnknown_2023D44
_080340DC: .4byte gBattlerSpriteIds
_080340E0:
ldr r0, _08034144 @ =gUnknown_2037F1A
ldr r0, _08034144 @ =gBattleAnimAttacker
mov r2, r10
strb r2, [r0]
ldr r0, _08034148 @ =gUnknown_2037F1B
ldr r0, _08034148 @ =gBattleAnimTarget
mov r1, sp
ldrb r1, [r1]
strb r1, [r0]
@@ -466,8 +466,8 @@ _08034132:
pop {r1}
bx r1
.align 2, 0
_08034144: .4byte gUnknown_2037F1A
_08034148: .4byte gUnknown_2037F1B
_08034144: .4byte gBattleAnimAttacker
_08034148: .4byte gBattleAnimTarget
_0803414C: .4byte gUnknown_2024018
_08034150: .4byte gUnknown_81C6EA8
_08034154: .4byte Task_ClearBitWhenBattleTableAnimDone
@@ -551,9 +551,9 @@ InitAndLaunchSpecialAnimation: @ 80341D8
lsrs r4, 24
lsls r3, 24
lsrs r3, 24
ldr r0, _08034230 @ =gUnknown_2037F1A
ldr r0, _08034230 @ =gBattleAnimAttacker
strb r1, [r0]
ldr r0, _08034234 @ =gUnknown_2037F1B
ldr r0, _08034234 @ =gBattleAnimTarget
strb r2, [r0]
ldr r0, _08034238 @ =gUnknown_81C6F18
adds r1, r3, 0
@@ -587,8 +587,8 @@ InitAndLaunchSpecialAnimation: @ 80341D8
pop {r0}
bx r0
.align 2, 0
_08034230: .4byte gUnknown_2037F1A
_08034234: .4byte gUnknown_2037F1B
_08034230: .4byte gBattleAnimAttacker
_08034234: .4byte gBattleAnimTarget
_08034238: .4byte gUnknown_81C6F18
_0803423C: .4byte Task_ClearBitWhenSpecialAnimDone
_08034240: .4byte gTasks
@@ -975,7 +975,7 @@ _08034548:
ldr r1, [r1]
adds r2, r5, 0
adds r3, r4, 0
bl sub_800ECC4
bl HandleLoadSpecialPokePic
_08034562:
mov r2, r8
lsls r1, r2, 4
@@ -1184,7 +1184,7 @@ sub_80346C4: @ 80346C4
ldr r0, _0803474C @ =gTrainerFrontPicPaletteTable
adds r5, r0
adds r0, r5, 0
bl sub_800F078
bl LoadCompressedSpritePaletteUsingHeap
add sp, 0x8
pop {r3}
mov r8, r3
@@ -1262,9 +1262,9 @@ sub_80347A8: @ 80347A8
cmp r0, 0
bne _080347E0
ldr r0, _080347D8 @ =gUnknown_8260208
bl sub_800F034
bl LoadCompressedSpriteSheetUsingHeap
ldr r0, _080347DC @ =gUnknown_8260210
bl sub_800F034
bl LoadCompressedSpriteSheetUsingHeap
movs r5, 0x2
b _08034802
.align 2, 0
@@ -1274,16 +1274,16 @@ _080347DC: .4byte gUnknown_8260210
_080347E0:
ldr r4, _08034828 @ =gUnknown_8260218
adds r0, r4, 0
bl sub_800F034
bl LoadCompressedSpriteSheetUsingHeap
adds r4, 0x8
adds r0, r4, 0
bl sub_800F034
bl LoadCompressedSpriteSheetUsingHeap
ldr r4, _0803482C @ =gUnknown_8260228
adds r0, r4, 0
bl sub_800F034
bl LoadCompressedSpriteSheetUsingHeap
adds r4, 0x8
adds r0, r4, 0
bl sub_800F034
bl LoadCompressedSpriteSheetUsingHeap
movs r5, 0x4
_08034802:
movs r4, 0
@@ -1296,7 +1296,7 @@ _0803480C:
ldrb r0, [r0]
lsls r0, 3
adds r0, r6
bl sub_800F034
bl LoadCompressedSpriteSheetUsingHeap
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -1349,14 +1349,14 @@ _08034864:
cmp r0, 0
beq _08034890
ldr r0, _0803488C @ =gUnknown_8260238
bl sub_800F034
bl LoadCompressedSpriteSheetUsingHeap
b _0803495A
.align 2, 0
_08034888: .4byte gBattleTypeFlags
_0803488C: .4byte gUnknown_8260238
_08034890:
ldr r0, _08034898 @ =gUnknown_8260208
bl sub_800F034
bl LoadCompressedSpriteSheetUsingHeap
b _0803495A
.align 2, 0
_08034898: .4byte gUnknown_8260208
@@ -1364,7 +1364,7 @@ _0803489C:
cmp r4, 0x3
bne _080348AC
ldr r0, _080348A8 @ =gUnknown_8260210
bl sub_800F034
bl LoadCompressedSpriteSheetUsingHeap
b _0803495A
.align 2, 0
_080348A8: .4byte gUnknown_8260210
@@ -1388,7 +1388,7 @@ _080348CC:
cmp r4, 0x2
bne _080348DC
ldr r0, _080348D8 @ =gUnknown_8260218
bl sub_800F034
bl LoadCompressedSpriteSheetUsingHeap
b _0803495A
.align 2, 0
_080348D8: .4byte gUnknown_8260218
@@ -1396,7 +1396,7 @@ _080348DC:
cmp r4, 0x3
bne _080348EC
ldr r0, _080348E8 @ =gUnknown_8260220
bl sub_800F034
bl LoadCompressedSpriteSheetUsingHeap
b _0803495A
.align 2, 0
_080348E8: .4byte gUnknown_8260220
@@ -1404,7 +1404,7 @@ _080348EC:
cmp r4, 0x4
bne _080348FC
ldr r0, _080348F8 @ =gUnknown_8260228
bl sub_800F034
bl LoadCompressedSpriteSheetUsingHeap
b _0803495A
.align 2, 0
_080348F8: .4byte gUnknown_8260228
@@ -1412,7 +1412,7 @@ _080348FC:
cmp r4, 0x5
bne _0803490C
ldr r0, _08034908 @ =gUnknown_8260230
bl sub_800F034
bl LoadCompressedSpriteSheetUsingHeap
b _0803495A
.align 2, 0
_08034908: .4byte gUnknown_8260230
@@ -1449,7 +1449,7 @@ _08034944:
lsls r0, 3
ldr r1, _08034954 @ =gUnknown_8260240
adds r0, r1
bl sub_800F034
bl LoadCompressedSpriteSheetUsingHeap
b _0803495A
.align 2, 0
_08034950: .4byte gUnknown_2023BD6
@@ -1718,7 +1718,7 @@ CopyAllBattleSpritesInvisibilities: @ 8034B40
negs r0, r0
mov r8, r0
ldr r7, _08034BAC @ =gUnknown_2024018
ldr r6, _08034BB0 @ =gUnknown_2023D44
ldr r6, _08034BB0 @ =gBattlerSpriteIds
_08034B64:
ldr r0, [r7]
ldr r0, [r0]
@@ -1756,7 +1756,7 @@ _08034B96:
_08034BA4: .4byte gBattlersCount
_08034BA8: .4byte gSprites
_08034BAC: .4byte gUnknown_2024018
_08034BB0: .4byte gUnknown_2023D44
_08034BB0: .4byte gBattlerSpriteIds
thumb_func_end CopyAllBattleSpritesInvisibilities
thumb_func_start CopyBattleSpriteInvisibility
@@ -1769,7 +1769,7 @@ CopyBattleSpriteInvisibility: @ 8034BB4
lsls r3, r0, 2
adds r3, r1
ldr r2, _08034BEC @ =gSprites
ldr r1, _08034BF0 @ =gUnknown_2023D44
ldr r1, _08034BF0 @ =gBattlerSpriteIds
adds r0, r1
ldrb r1, [r0]
lsls r0, r1, 4
@@ -1790,7 +1790,7 @@ CopyBattleSpriteInvisibility: @ 8034BB4
.align 2, 0
_08034BE8: .4byte gUnknown_2024018
_08034BEC: .4byte gSprites
_08034BF0: .4byte gUnknown_2023D44
_08034BF0: .4byte gBattlerSpriteIds
thumb_func_end CopyBattleSpriteInvisibility
thumb_func_start sub_8034BF4
@@ -1869,7 +1869,7 @@ _08034C16:
adds r0, r5
ldr r2, [r0]
ldr r5, _08034D68 @ =gSprites
ldr r4, _08034D6C @ =gUnknown_2023D44
ldr r4, _08034D6C @ =gBattlerSpriteIds
add r4, r9
ldrb r1, [r4]
lsls r0, r1, 4
@@ -1964,7 +1964,7 @@ _08034D5C: .4byte gEnemyParty
_08034D60: .4byte gMonFrontPicTable
_08034D64: .4byte gMonSpritesGfxPtr
_08034D68: .4byte gSprites
_08034D6C: .4byte gUnknown_2023D44
_08034D6C: .4byte gBattlerSpriteIds
_08034D70: .4byte 0x06010000
_08034D74: .4byte 0x040000d4
_08034D78: .4byte 0x84000200
@@ -1974,7 +1974,7 @@ _08034D84: .4byte gUnknown_3004FF0
_08034D88:
cmp r2, 0
beq _08034E4C
ldr r0, _08034E28 @ =gUnknown_2023D44
ldr r0, _08034E28 @ =gBattlerSpriteIds
mov r3, r9
adds r5, r3, r0
ldrb r1, [r5]
@@ -2048,7 +2048,7 @@ _08034E0E:
strh r0, [r1, 0x22]
b _08035062
.align 2, 0
_08034E28: .4byte gUnknown_2023D44
_08034E28: .4byte gBattlerSpriteIds
_08034E2C: .4byte gSprites
_08034E30: .4byte gUnknown_2024018
_08034E34: .4byte gBattleStruct
@@ -2189,7 +2189,7 @@ _08034F5E:
adds r0, 0x4
adds r0, r5
ldr r2, [r0]
ldr r0, _08035088 @ =gUnknown_2023D44
ldr r0, _08035088 @ =gBattlerSpriteIds
add r0, r9
str r0, [sp, 0x10]
ldrb r1, [r0]
@@ -2318,7 +2318,7 @@ _08035078: .4byte gEnemyParty
_0803507C: .4byte gMonFrontPicTable
_08035080: .4byte gMonSpritesGfxPtr
_08035084: .4byte gUnknown_2024008
_08035088: .4byte gUnknown_2023D44
_08035088: .4byte gBattlerSpriteIds
_0803508C: .4byte gSprites
_08035090: .4byte 0x06010000
_08035094: .4byte 0x040000d4
@@ -2820,7 +2820,7 @@ _0803547C:
cmp r0, 0
beq _08035514
ldr r4, _080354E4 @ =gSprites
ldr r0, _080354E8 @ =gUnknown_2023D44
ldr r0, _080354E8 @ =gBattlerSpriteIds
adds r3, r5, r0
ldrb r1, [r3]
lsls r0, r1, 4
@@ -2864,7 +2864,7 @@ _0803547C:
.align 2, 0
_080354E0: .4byte gBattlersCount
_080354E4: .4byte gSprites
_080354E8: .4byte gUnknown_2023D44
_080354E8: .4byte gBattlerSpriteIds
_080354EC: .4byte gUnknown_2024018
_080354F0:
ldrb r0, [r3]
@@ -2911,7 +2911,7 @@ LoadAndCreateEnemyShadowSprites: @ 8035538
mov r7, r8
push {r7}
ldr r0, _08035614 @ =gUnknown_8250A0C
bl sub_800F034
bl LoadCompressedSpriteSheetUsingHeap
movs r0, 0x1
bl GetBattlerAtPosition
adds r5, r0, 0
@@ -3026,7 +3026,7 @@ SpriteCB_EnemyShadow: @ 8035624
ldrh r0, [r5, 0x2E]
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _08035668 @ =gUnknown_2023D44
ldr r0, _08035668 @ =gBattlerSpriteIds
adds r0, r4, r0
ldrb r1, [r0]
lsls r0, r1, 4
@@ -3051,7 +3051,7 @@ _08035660:
str r0, [r5, 0x1C]
b _080356EA
.align 2, 0
_08035668: .4byte gUnknown_2023D44
_08035668: .4byte gBattlerSpriteIds
_0803566C: .4byte gSprites
_08035670: .4byte SpriteCB_SetInvisible
_08035674:
asm/battle_interface.s
+6 -6
View File
@@ -2381,7 +2381,7 @@ _08048DC4:
bge _08048DB0
mov r6, r10
adds r0, r4, r6
bl sub_800F034
bl LoadCompressedSpriteSheetUsingHeap
ldr r0, _08048E4C @ =gUnknown_826049C
adds r0, r4, r0
bl LoadSpriteSheet
@@ -3610,7 +3610,7 @@ _08049734:
lsls r1, 24
lsrs r1, 24
adds r0, r7, 0
bl sub_80448F8
bl CheckBattleTypeGhost
lsls r0, 24
cmp r0, 0
beq _08049754
@@ -3755,7 +3755,7 @@ sub_804981C: @ 804981C
ldr r6, _080498EC @ =gEnemyParty
adds r0, r6
adds r1, r4, 0
bl sub_80448F8
bl CheckBattleTypeGhost
lsls r0, 24
cmp r0, 0
bne _0804991C
@@ -4307,7 +4307,7 @@ UpdateLeftNoOfBallsTextOnHealthbox: @ 8049D10
ldr r1, _08049D84 @ =gUnknown_83FE81C
mov r0, sp
bl StringCopy
ldr r1, _08049D88 @ =gUnknown_2039994
ldr r1, _08049D88 @ =gNumSafariBalls
ldrb r1, [r1]
movs r2, 0
movs r3, 0x2
@@ -4351,7 +4351,7 @@ UpdateLeftNoOfBallsTextOnHealthbox: @ 8049D10
bx r0
.align 2, 0
_08049D84: .4byte gUnknown_83FE81C
_08049D88: .4byte gUnknown_2039994
_08049D88: .4byte gNumSafariBalls
_08049D8C: .4byte gSprites
_08049D90: .4byte 0x060102c0
_08049D94: .4byte 0x06010a00
@@ -5559,7 +5559,7 @@ AddTextPrinterAndCreateWindowOnHealthbox: @ 804A648
movs r1, 0
adds r2, r6, 0
mov r3, r8
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
mov r0, r10
str r4, [r0]
adds r0, r5, 0
asm/battle_message.s
+1 -1
View File
@@ -2683,7 +2683,7 @@ _080D87F2:
ands r0, r1
cmp r0, 0
beq _080D881C
bl sub_80CBE00
bl ContextNpcGetTextColor
lsls r0, 24
lsrs r0, 24
mov r2, sp
asm/battle_records.s
-1398
View File
File diff suppressed because it is too large Load Diff
asm/battle_script_commands.s
+17 -17
View File
@@ -12,7 +12,7 @@ atk00_attackcanceler: @ 801D760
mov r6, r8
push {r6,r7}
sub sp, 0x4
ldr r0, _0801D77C @ =gUnknown_2023E8A
ldr r0, _0801D77C @ =gBattleOutcome
ldrb r0, [r0]
cmp r0, 0
beq _0801D784
@@ -21,7 +21,7 @@ atk00_attackcanceler: @ 801D760
strb r0, [r1]
b _0801DAFC
.align 2, 0
_0801D77C: .4byte gUnknown_2023E8A
_0801D77C: .4byte gBattleOutcome
_0801D780: .4byte gUnknown_2023BE3
_0801D784:
ldr r2, _0801D7B4 @ =gBattleMons
@@ -9519,7 +9519,7 @@ _0802243C:
ble _0802240C
cmp r6, 0
bne _08022450
ldr r0, _0802253C @ =gUnknown_2023E8A
ldr r0, _0802253C @ =gBattleOutcome
ldrb r1, [r0]
movs r2, 0x2
orrs r1, r2
@@ -9553,7 +9553,7 @@ _08022484:
adds r5, 0x1
cmp r5, 0x5
ble _08022454
ldr r2, _0802253C @ =gUnknown_2023E8A
ldr r2, _0802253C @ =gBattleOutcome
cmp r6, 0
bne _08022498
ldrb r0, [r2]
@@ -9647,7 +9647,7 @@ _0802251E:
.align 2, 0
_08022534: .4byte gUnknown_2023BC8
_08022538: .4byte gPlayerParty
_0802253C: .4byte gUnknown_2023E8A
_0802253C: .4byte gBattleOutcome
_08022540: .4byte gEnemyParty
_08022544: .4byte gBattleTypeFlags
_08022548: .4byte gBattlersCount
@@ -13273,7 +13273,7 @@ sub_80240D4: @ 80240D4
adds r1, r4
ldr r2, [r1]
movs r1, 0x2
bl sub_8044898
bl HandleSetPokedexFlag
_0802412A:
ldr r2, _08024180 @ =gAbsentBattlerFlags
ldr r1, _08024184 @ =gBitTable
@@ -13398,7 +13398,7 @@ _08024228:
bl GetBankMultiplayerId
lsls r0, 24
lsrs r0, 24
bl sub_8043620
bl GetLinkTrainerFlankId
lsls r0, 16
lsrs r0, 16
cmp r0, 0x1
@@ -15311,7 +15311,7 @@ atk57: @ 80251C4
bl GetBattlerAtPosition
ldr r4, _080251F0 @ =gActiveBattler
strb r0, [r4]
ldr r0, _080251F4 @ =gUnknown_2023E8A
ldr r0, _080251F4 @ =gBattleOutcome
ldrb r1, [r0]
movs r0, 0
bl EmitCmd55
@@ -15326,7 +15326,7 @@ atk57: @ 80251C4
bx r0
.align 2, 0
_080251F0: .4byte gActiveBattler
_080251F4: .4byte gUnknown_2023E8A
_080251F4: .4byte gBattleOutcome
_080251F8: .4byte gUnknown_2023D74
thumb_func_end atk57
@@ -16141,7 +16141,7 @@ sub_80258AC: @ 80258AC
push {r7}
movs r6, 0
movs r5, 0
ldr r0, _080258F0 @ =gUnknown_2023E8A
ldr r0, _080258F0 @ =gBattleOutcome
ldrb r0, [r0]
cmp r0, 0x1
beq _080258C0
@@ -16171,7 +16171,7 @@ _080258C0:
mov r8, r0
b _080259E8
.align 2, 0
_080258F0: .4byte gUnknown_2023E8A
_080258F0: .4byte gBattleOutcome
_080258F4: .4byte gTrainerBattleOpponent_A
_080258F8: .4byte gBattleResources
_080258FC: .4byte gBattleStruct
@@ -17903,7 +17903,7 @@ PutMonIconOnLvlUpBox: @ 8026688
orrs r0, r1
str r0, [sp, 0x4]
adds r0, r4, 0
bl sub_80971CC
bl GetValidMonIconPalettePtr
str r0, [sp, 0x8]
add r4, sp, 0x8
ldr r0, [r4, 0x4]
@@ -19745,7 +19745,7 @@ _0802753C:
cmp r0, 0
beq _080275AC
movs r0, 0x1
bl CountAliveMons
bl CountAliveMonsInBattle
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x2
@@ -21520,7 +21520,7 @@ _08028336:
bl GetBankMultiplayerId
lsls r0, 24
lsrs r0, 24
bl sub_8043620
bl GetLinkTrainerFlankId
lsls r0, 16
lsrs r0, 16
cmp r0, 0x1
@@ -21665,7 +21665,7 @@ _08028458:
bl GetBankMultiplayerId
lsls r0, 24
lsrs r0, 24
bl sub_8043620
bl GetLinkTrainerFlankId
lsls r0, 16
lsrs r0, 16
cmp r0, 0x1
@@ -22207,7 +22207,7 @@ _0802887C:
cmp r0, 0
beq _080288EC
movs r0, 0x1
bl CountAliveMons
bl CountAliveMonsInBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
@@ -32384,7 +32384,7 @@ _0802D9B4:
lsrs r0, 16
movs r1, 0x3
adds r2, r4, 0
bl sub_8044898
bl HandleSetPokedexFlag
ldr r1, _0802D9D4 @ =gUnknown_2023D74
ldr r0, [r1]
adds r0, 0x5
asm/battle_setup.s
+33 -33
View File
@@ -25,7 +25,7 @@ sub_807F620: @ 807F620
.align 2, 0
_0807F640: .4byte gTasks+0x8
_0807F644:
bl c3_80A0DD8_is_running
bl FldEffPoison_IsActive
cmp r0, 0
bne _0807F686
bl sub_812B478
@@ -46,7 +46,7 @@ _0807F65E:
ldr r0, _0807F68C @ =sub_800FD9C
bl SetMainCallback2
bl sub_806D7E8
bl overworld_poison_timer_set
bl ClearPoisonStepCounter
adds r0, r5, 0
bl DestroyTask
_0807F686:
@@ -221,7 +221,7 @@ sub_807F7D8: @ 807F7D8
bl player_bitmagic
bl sub_805C780
ldr r1, _0807F804 @ =gMain
ldr r0, _0807F808 @ =sub_80A0F4C
ldr r0, _0807F808 @ =CB2_EndSafariBattle
str r0, [r1, 0x8]
ldr r1, _0807F80C @ =gBattleTypeFlags
movs r0, 0x80
@@ -235,7 +235,7 @@ sub_807F7D8: @ 807F7D8
bx r0
.align 2, 0
_0807F804: .4byte gMain
_0807F808: .4byte sub_80A0F4C
_0807F808: .4byte CB2_EndSafariBattle
_0807F80C: .4byte gBattleTypeFlags
thumb_func_end sub_807F7D8
@@ -300,7 +300,7 @@ sub_807F888: @ 807F888
bl CreateMaleMon
bl ScriptContext2_Enable
ldr r1, _0807F8B8 @ =gMain
ldr r0, _0807F8BC @ =c2_exit_to_overworld_1_continue_scripts_restart_music
ldr r0, _0807F8BC @ =CB2_ReturnToFieldContinueScriptPlayMapMusic
str r0, [r1, 0x8]
ldr r1, _0807F8C0 @ =gBattleTypeFlags
movs r0, 0x80
@@ -314,7 +314,7 @@ sub_807F888: @ 807F888
.align 2, 0
_0807F8B4: .4byte gEnemyParty
_0807F8B8: .4byte gMain
_0807F8BC: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
_0807F8BC: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
_0807F8C0: .4byte gBattleTypeFlags
thumb_func_end sub_807F888
@@ -623,7 +623,7 @@ sub_807FB40: @ 807FB40
movs r0, 0
movs r1, 0x80
bl ResetOamRange
ldr r0, _0807FB78 @ =gUnknown_2023E8A
ldr r0, _0807FB78 @ =gBattleOutcome
ldrb r0, [r0]
bl IsPlayerDefeated
cmp r0, 0x1
@@ -633,7 +633,7 @@ sub_807FB40: @ 807FB40
b _0807FB8C
.align 2, 0
_0807FB74: .4byte 0x01000100
_0807FB78: .4byte gUnknown_2023E8A
_0807FB78: .4byte gBattleOutcome
_0807FB7C: .4byte c2_whiteout
_0807FB80:
ldr r0, _0807FB94 @ =CB2_ReturnToField
@@ -666,7 +666,7 @@ sub_807FBA0: @ 807FBA0
movs r0, 0
movs r1, 0x80
bl ResetOamRange
ldr r0, _0807FBD8 @ =gUnknown_2023E8A
ldr r0, _0807FBD8 @ =gBattleOutcome
ldrb r0, [r0]
bl IsPlayerDefeated
cmp r0, 0x1
@@ -676,17 +676,17 @@ sub_807FBA0: @ 807FBA0
b _0807FBE6
.align 2, 0
_0807FBD4: .4byte 0x01000100
_0807FBD8: .4byte gUnknown_2023E8A
_0807FBD8: .4byte gBattleOutcome
_0807FBDC: .4byte c2_whiteout
_0807FBE0:
ldr r0, _0807FBEC @ =c2_exit_to_overworld_1_continue_scripts_restart_music
ldr r0, _0807FBEC @ =CB2_ReturnToFieldContinueScriptPlayMapMusic
bl SetMainCallback2
_0807FBE6:
add sp, 0x4
pop {r0}
bx r0
.align 2, 0
_0807FBEC: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
_0807FBEC: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
thumb_func_end sub_807FBA0
thumb_func_start sub_807FBF0
@@ -704,7 +704,7 @@ sub_807FBF0: @ 807FBF0
movs r0, 0
movs r1, 0x80
bl ResetOamRange
ldr r4, _0807FC28 @ =gUnknown_2023E8A
ldr r4, _0807FC28 @ =gBattleOutcome
ldrb r0, [r4]
bl IsPlayerDefeated
adds r1, r0, 0
@@ -715,7 +715,7 @@ sub_807FBF0: @ 807FBF0
b _0807FC4C
.align 2, 0
_0807FC24: .4byte 0x01000100
_0807FC28: .4byte gUnknown_2023E8A
_0807FC28: .4byte gBattleOutcome
_0807FC2C: .4byte c2_whiteout
_0807FC30:
ldrb r0, [r4]
@@ -731,7 +731,7 @@ _0807FC40:
movs r0, 0x1
strh r0, [r1]
_0807FC46:
ldr r0, _0807FC58 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
ldr r0, _0807FC58 @ =CB2_ReturnToFieldContinueScriptPlayMapMusic
bl SetMainCallback2
_0807FC4C:
add sp, 0x4
@@ -740,7 +740,7 @@ _0807FC4C:
bx r0
.align 2, 0
_0807FC54: .4byte gSpecialVar_Result
_0807FC58: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
_0807FC58: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
thumb_func_end sub_807FBF0
thumb_func_start sub_807FC5C
@@ -1853,7 +1853,7 @@ sub_80804AC: @ 80804AC
ldrh r0, [r0]
cmp r0, 0x9
bne _08080508
ldr r0, _080804DC @ =gUnknown_2023E8A
ldr r0, _080804DC @ =gBattleOutcome
ldrb r0, [r0]
bl IsPlayerDefeated
adds r1, r0, 0
@@ -1870,7 +1870,7 @@ sub_80804AC: @ 80804AC
b _080804EE
.align 2, 0
_080804D8: .4byte gUnknown_20386AC
_080804DC: .4byte gUnknown_2023E8A
_080804DC: .4byte gBattleOutcome
_080804E0: .4byte gSpecialVar_Result
_080804E4: .4byte gUnknown_20386CC
_080804E8:
@@ -1878,14 +1878,14 @@ _080804E8:
movs r1, 0
strh r1, [r0]
_080804EE:
ldr r0, _08080504 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
ldr r0, _08080504 @ =CB2_ReturnToFieldContinueScriptPlayMapMusic
bl SetMainCallback2
bl sub_80803FC
bl sub_81139BC
b _0808054E
.align 2, 0
_08080500: .4byte gSpecialVar_Result
_08080504: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
_08080504: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
_08080508:
ldr r0, _0808051C @ =gTrainerBattleOpponent_A
ldrh r1, [r0]
@@ -1893,14 +1893,14 @@ _08080508:
lsls r0, 3
cmp r1, r0
bne _08080524
ldr r0, _08080520 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
ldr r0, _08080520 @ =CB2_ReturnToFieldContinueScriptPlayMapMusic
bl SetMainCallback2
b _0808054E
.align 2, 0
_0808051C: .4byte gTrainerBattleOpponent_A
_08080520: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
_08080520: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
_08080524:
ldr r0, _08080538 @ =gUnknown_2023E8A
ldr r0, _08080538 @ =gBattleOutcome
ldrb r0, [r0]
bl IsPlayerDefeated
cmp r0, 0x1
@@ -1910,10 +1910,10 @@ _08080530:
bl SetMainCallback2
b _0808054E
.align 2, 0
_08080538: .4byte gUnknown_2023E8A
_08080538: .4byte gBattleOutcome
_0808053C: .4byte c2_whiteout
_08080540:
ldr r0, _08080554 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
ldr r0, _08080554 @ =CB2_ReturnToFieldContinueScriptPlayMapMusic
bl SetMainCallback2
bl sub_80803FC
bl sub_81139BC
@@ -1921,7 +1921,7 @@ _0808054E:
pop {r0}
bx r0
.align 2, 0
_08080554: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
_08080554: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
thumb_func_end sub_80804AC
thumb_func_start sub_8080558
@@ -1933,14 +1933,14 @@ sub_8080558: @ 8080558
lsls r0, 3
cmp r1, r0
bne _08080578
ldr r0, _08080574 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
ldr r0, _08080574 @ =CB2_ReturnToFieldContinueScriptPlayMapMusic
bl SetMainCallback2
b _080805A6
.align 2, 0
_08080570: .4byte gTrainerBattleOpponent_A
_08080574: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
_08080574: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
_08080578:
ldr r0, _0808058C @ =gUnknown_2023E8A
ldr r0, _0808058C @ =gBattleOutcome
ldrb r0, [r0]
bl IsPlayerDefeated
cmp r0, 0x1
@@ -1949,10 +1949,10 @@ _08080578:
bl SetMainCallback2
b _080805A6
.align 2, 0
_0808058C: .4byte gUnknown_2023E8A
_0808058C: .4byte gBattleOutcome
_08080590: .4byte c2_whiteout
_08080594:
ldr r0, _080805AC @ =c2_exit_to_overworld_1_continue_scripts_restart_music
ldr r0, _080805AC @ =CB2_ReturnToFieldContinueScriptPlayMapMusic
bl SetMainCallback2
bl sub_80803FC
bl sub_810CDE8
@@ -1961,7 +1961,7 @@ _080805A6:
pop {r0}
bx r0
.align 2, 0
_080805AC: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
_080805AC: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
thumb_func_end sub_8080558
thumb_func_start sub_80805B0
@@ -2051,7 +2051,7 @@ sub_8080628: @ 8080628
beq _080806BE
ldr r0, _08080668 @ =gTrainerBattleOpponent_A
ldrh r0, [r0]
bl sub_804367C
bl GetTrainerEncounterMusicId
lsls r0, 24
lsrs r0, 24
cmp r0, 0xD
asm/battle_tower.s
+13 -13
View File
@@ -1222,7 +1222,7 @@ _080E6286:
adds r2, r3
ldr r1, [r4]
adds r1, r2
bl sub_803E0A4
bl CreateBattleTowerMon
adds r6, 0x1
cmp r6, 0x2
ble _080E6286
@@ -1251,7 +1251,7 @@ _080E62B2:
muls r2, r6
adds r2, 0x1C
adds r1, r2
bl sub_803E0A4
bl CreateBattleTowerMon
adds r6, 0x1
cmp r6, 0x2
ble _080E62B2
@@ -2010,14 +2010,14 @@ _080E68A8: .4byte gPlayerParty
_080E68AC:
bl sub_80E7550
_080E68B0:
ldr r0, _080E68C0 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
ldr r0, _080E68C0 @ =CB2_ReturnToFieldContinueScriptPlayMapMusic
bl SetMainCallback2
add sp, 0x4
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_080E68C0: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
_080E68C0: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
thumb_func_end sub_80E6854
thumb_func_start sub_80E68C4
@@ -2136,7 +2136,7 @@ _080E69A0:
adds r2, r1
ldr r1, [r4]
adds r1, r2
bl sub_803E0A4
bl CreateBattleTowerMon
adds r5, 0x1
cmp r5, 0x2
ble _080E69A0
@@ -2407,7 +2407,7 @@ _080E6C00:
adds r0, r2
ldrh r1, [r0]
movs r0, 0x20
bl sub_8054F00
bl SetGameStat
b _080E6C80
.align 2, 0
_080E6C10: .4byte 0x0000057a
@@ -2599,7 +2599,7 @@ _080E6D9C:
adds r0, r1
ldrh r1, [r0]
movs r0, 0x20
bl sub_8054F00
bl SetGameStat
b _080E6E08
.align 2, 0
_080E6DAC: .4byte 0x0000057a
@@ -2717,7 +2717,7 @@ _080E6E76:
adds r5, r0, 0
movs r0, 0x20
adds r1, r5, 0
bl sub_8054F00
bl SetGameStat
ldr r1, _080E6EA4 @ =0x0000270f
cmp r5, r1
bhi _080E6EB8
@@ -2731,7 +2731,7 @@ _080E6EA8:
ldrh r5, [r1]
movs r0, 0x20
adds r1, r5, 0
bl sub_8054F00
bl SetGameStat
ldr r1, _080E6EC4 @ =0x0000270f
cmp r5, r1
bls _080E6ECC
@@ -2894,7 +2894,7 @@ _080E6FF2:
bl sub_80E712C
ldr r4, _080E703C @ =gSaveBlock2Ptr
ldr r0, [r4]
ldr r1, _080E704C @ =gUnknown_2023E8A
ldr r1, _080E704C @ =gBattleOutcome
ldrb r1, [r1]
ldr r2, _080E7050 @ =0x0000055d
adds r0, r2
@@ -2930,7 +2930,7 @@ _080E703C: .4byte gSaveBlock2Ptr
_080E7040: .4byte 0x0000055c
_080E7044: .4byte gSpecialVar_0x8004
_080E7048: .4byte 0x00000564
_080E704C: .4byte gUnknown_2023E8A
_080E704C: .4byte gBattleOutcome
_080E7050: .4byte 0x0000055d
_080E7054: .4byte 0x0000055e
thumb_func_end sub_80E6FB8
@@ -3612,7 +3612,7 @@ _080E754C: .4byte gSaveBlock2Ptr
thumb_func_start sub_80E7550
sub_80E7550: @ 80E7550
push {lr}
ldr r0, _080E7564 @ =gUnknown_2023E8A
ldr r0, _080E7564 @ =gBattleOutcome
ldrb r0, [r0]
cmp r0, 0x3
bne _080E756C
@@ -3621,7 +3621,7 @@ sub_80E7550: @ 80E7550
strb r0, [r1]
b _080E7590
.align 2, 0
_080E7564: .4byte gUnknown_2023E8A
_080E7564: .4byte gBattleOutcome
_080E7568: .4byte gStringVar4
_080E756C:
cmp r0, 0x1
asm/battle_transition.s
+1 -1
View File
@@ -137,7 +137,7 @@ _080D09AC: .4byte gTasks
Transition_Phase1: @ 80D09B0
push {r4,lr}
adds r4, r0, 0
bl sub_807B05C
bl SetWeatherScreenFadeOut
ldr r0, _080D09DC @ =gPlttBufferFaded
ldr r1, _080D09E0 @ =gPlttBufferUnfaded
ldr r2, _080D09E4 @ =0x04000100
asm/battle_util.s
+1 -1
View File
@@ -5775,7 +5775,7 @@ _08019C40:
mov r8, r0
_08019C66:
adds r0, r7, 0
bl sub_8043620
bl GetLinkTrainerFlankId
lsls r0, 24
lsrs r6, r0, 24
lsls r0, r6, 1
asm/berry_crush.s
+1 -1
View File
@@ -265,7 +265,7 @@ sub_814B8F0: @ 814B8F0
ldr r1, _0814B910 @ =sub_814B860
movs r0, 0x5
movs r2, 0
bl sub_813CD50
bl InitBerryPouch
pop {r0}
bx r0
.align 2, 0
asm/berry_crush_2.s
+8 -8
View File
@@ -229,7 +229,7 @@ _0814BCA2:
movs r0, 0
movs r1, 0x2
adds r2, r4, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized2
b _0814BD12
.align 2, 0
_0814BCE8: .4byte gStringVar4
@@ -250,7 +250,7 @@ _0814BCF0:
str r0, [sp, 0xC]
movs r0, 0
movs r1, 0x2
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized2
_0814BD12:
movs r0, 0
movs r1, 0x3
@@ -2758,7 +2758,7 @@ _0814D03C:
movs r3, 0x6
bl ConvertIntToDecimalStringN
ldr r4, _0814D080 @ =gStringVar2
bl sub_815EFA0
bl GetBerryPowder
adds r1, r0, 0
adds r0, r4, 0
movs r2, 0
@@ -2868,7 +2868,7 @@ _0814D106:
movs r0, 0
movs r1, 0x2
movs r3, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized2
movs r0, 0
movs r1, 0x3
bl CopyWindowToVram
@@ -2946,7 +2946,7 @@ _0814D1A6:
strb r0, [r5, 0xC]
b _0814D238
_0814D1CA:
bl sub_80F7858
bl DisplayYesNoMenuDefaultYes
b _0814D230
_0814D1D0:
bl Menu_ProcessInputNoWrapClearOnChoose
@@ -2963,7 +2963,7 @@ _0814D1D0:
bl memset
cmp r4, 0
bne _0814D202
bl sub_8099FAC
bl CheckHasAtLeastOneBerry
lsls r0, 24
cmp r0, 0
beq _0814D1FE
@@ -3232,7 +3232,7 @@ _0814D3C0:
str r1, [sp, 0xC]
movs r0, 0
movs r1, 0x2
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized2
b _0814D40C
.align 2, 0
_0814D3EC: .4byte gUnknown_846E328
@@ -3249,7 +3249,7 @@ _0814D3F0:
str r0, [sp, 0xC]
movs r0, 0
movs r1, 0x2
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized2
_0814D40C:
movs r0, 0
movs r1, 0x3
asm/berry_crush_3.s
+36 -36
View File
@@ -50,7 +50,7 @@ _0814D61C:
movs r1, 0
bl SetGpuReg
bl ScanlineEffect_Stop
bl reset_temp_tile_data_buffers
bl ResetTempTileDataBuffers
b _0814D878
_0814D63A:
add r0, sp, 0x8
@@ -175,12 +175,12 @@ _0814D73A:
movs r0, 0x1
movs r2, 0
movs r3, 0
bl decompress_and_copy_tile_data_to_vram
bl DecompressAndCopyTileDataToVram
b _0814D878
.align 2, 0
_0814D764: .4byte gUnknown_8EAFFC0
_0814D768:
bl free_temp_tile_data_buffers_if_possible
bl FreeTempTileDataBuffersIfPossible
lsls r0, 24
cmp r0, 0
beq _0814D774
@@ -1212,7 +1212,7 @@ sub_814DF44: @ 814DF44
movs r1, 0x2
adds r2, r4, 0
movs r3, 0
bl box_print
bl AddTextPrinterParameterized3
add sp, 0xC
pop {r3}
mov r8, r3
@@ -1265,7 +1265,7 @@ _0814DFE0:
adds r4, r2, r4
str r4, [sp, 0x2C]
_0814DFF0:
bl UnkTextUtil_Reset
bl DynamicPlaceholderTextUtil_Reset
ldr r0, [sp, 0x10]
cmp r0, 0x1
beq _0814E0E4
@@ -1355,7 +1355,7 @@ _0814E048:
movs r1, 0x2
adds r2, r7, 0
adds r3, r4, 0
bl box_print
bl AddTextPrinterParameterized3
ldr r1, [sp, 0x2C]
ldrb r0, [r1]
adds r2, r7, 0
@@ -1370,7 +1370,7 @@ _0814E048:
str r1, [sp, 0x8]
movs r1, 0x2
adds r3, r4, 0
bl box_print
bl AddTextPrinterParameterized3
mov r9, r6
_0814E0C8:
ldr r6, [sp, 0x20]
@@ -1509,7 +1509,7 @@ _0814E178:
ldr r1, _0814E1F8 @ =gStringVar4
str r1, [sp, 0x8]
movs r1, 0x2
bl box_print
bl AddTextPrinterParameterized3
b _0814E27E
.align 2, 0
_0814E1E4: .4byte gStringVar1
@@ -1573,7 +1573,7 @@ _0814E21A:
ldr r1, _0814E2A0 @ =gStringVar4
str r1, [sp, 0x8]
movs r1, 0x2
bl box_print
bl AddTextPrinterParameterized3
mov r9, r4
mov r6, r8
adds r6, 0xA2
@@ -1610,10 +1610,10 @@ _0814E2B8:
ldr r0, [sp, 0xC]
adds r1, r0, r1
movs r0, 0
bl UnkTextUtil_SetPtrI
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
ldr r0, _0814E324 @ =gStringVar4
adds r1, r4, 0
bl UnkTextUtil_StringExpandPlaceholders
bl DynamicPlaceholderTextUtil_ExpandPlaceholders
ldr r1, [sp, 0x2C]
ldrb r0, [r1]
mov r2, r9
@@ -1632,7 +1632,7 @@ _0814E2B8:
str r1, [sp, 0x8]
movs r1, 0x2
movs r2, 0x4
bl box_print
bl AddTextPrinterParameterized3
mov r2, r10
lsls r0, r2, 24
lsrs r0, 24
@@ -1702,7 +1702,7 @@ sub_814E32C: @ 814E32C
movs r1, 0x2
movs r2, 0x2
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
ldr r4, _0814E568 @ =gUnknown_841D088
movs r0, 0x2
adds r1, r4, 0
@@ -1722,7 +1722,7 @@ sub_814E32C: @ 814E32C
movs r1, 0x2
adds r2, r6, 0
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
adds r0, r6, 0
subs r0, 0x20
lsls r0, 24
@@ -1759,7 +1759,7 @@ sub_814E32C: @ 814E32C
movs r1, 0x2
adds r2, r6, 0
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
ldr r4, _0814E57C @ =gUnknown_841D078
movs r0, 0x2
adds r1, r4, 0
@@ -1779,7 +1779,7 @@ sub_814E32C: @ 814E32C
movs r1, 0x2
adds r2, r6, 0
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
adds r0, r6, 0
subs r0, 0x9
lsls r0, 24
@@ -1806,7 +1806,7 @@ sub_814E32C: @ 814E32C
movs r1, 0x2
adds r2, r6, 0
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
adds r0, r7, 0
adds r0, 0xE
lsls r0, 24
@@ -1821,7 +1821,7 @@ sub_814E32C: @ 814E32C
movs r1, 0x2
movs r2, 0x2
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
ldr r4, _0814E588 @ =gUnknown_841D098
movs r0, 0x2
adds r1, r4, 0
@@ -1842,7 +1842,7 @@ sub_814E32C: @ 814E32C
movs r1, 0x3
adds r2, r6, 0
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
mov r4, r8
ldrb r2, [r4, 0x16]
ldrh r0, [r4, 0x16]
@@ -1919,7 +1919,7 @@ _0814E4EA:
movs r1, 0x2
adds r2, r6, 0
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
b _0814E5B6
.align 2, 0
_0814E560: .4byte gUnknown_846E3DC
@@ -1949,7 +1949,7 @@ _0814E59C:
movs r1, 0x2
adds r2, r6, 0
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
_0814E5B6:
adds r0, r7, 0
adds r0, 0xE
@@ -1970,7 +1970,7 @@ _0814E5B6:
movs r1, 0x2
movs r2, 0x2
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
ldr r0, _0814E638 @ =gStringVar1
ldr r4, [sp, 0x10]
ldrh r1, [r4, 0x8]
@@ -1998,7 +1998,7 @@ _0814E5B6:
movs r1, 0x2
adds r2, r6, 0
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
add sp, 0x1C
pop {r3-r5}
mov r8, r3
@@ -2097,12 +2097,12 @@ _0814E6E0:
ldr r4, _0814E700 @ =0x0000021d
adds r1, r4, 0
movs r2, 0xD0
bl sub_814FF2C
bl TextWindow_SetStdFrame0_WithPal
ldrb r0, [r5]
movs r1, 0
adds r2, r4, 0
movs r3, 0xD
bl SetWindowBorderStyle
bl DrawStdFrameWithCustomTileAndPalette
b _0814E7F8
.align 2, 0
_0814E700: .4byte 0x0000021d
@@ -2246,7 +2246,7 @@ sub_814E80C: @ 814E80C
adds r5, r4, r0
ldrb r0, [r5]
movs r1, 0x1
bl sub_810F4D8
bl ClearStdWindowAndFrameToTransparent
ldrb r0, [r5]
bl RemoveWindow
adds r0, r4, 0
@@ -2309,12 +2309,12 @@ _0814E876:
ldr r4, _0814E8AC @ =0x0000021d
adds r1, r4, 0
movs r2, 0xD0
bl sub_814FF2C
bl TextWindow_SetStdFrame0_WithPal
ldrb r0, [r7, 0x2]
movs r1, 0
adds r2, r4, 0
movs r3, 0xD
bl SetWindowBorderStyle
bl DrawStdFrameWithCustomTileAndPalette
b _0814EA66
.align 2, 0
_0814E8A8: .4byte gUnknown_846E3F0
@@ -2341,7 +2341,7 @@ _0814E8B0:
str r5, [sp, 0x8]
movs r1, 0x2
movs r3, 0x2
bl box_print
bl AddTextPrinterParameterized3
ldr r5, _0814EA04 @ =gUnknown_841D124
movs r0, 0x2
adds r1, r5, 0
@@ -2358,7 +2358,7 @@ _0814E8B0:
str r5, [sp, 0x8]
movs r1, 0x2
movs r3, 0x12
bl box_print
bl AddTextPrinterParameterized3
movs r0, 0x2A
str r0, [sp, 0xC]
ldr r1, _0814EA08 @ =gStringVar4
@@ -2383,7 +2383,7 @@ _0814E90E:
movs r1, 0x2
movs r2, 0x4
ldr r3, [sp, 0xC]
bl box_print
bl AddTextPrinterParameterized3
movs r3, 0
mov r0, r9
lsls r4, r0, 1
@@ -2456,7 +2456,7 @@ _0814E96E:
str r1, [sp, 0x8]
movs r1, 0x3
ldr r3, [sp, 0xC]
bl box_print
bl AddTextPrinterParameterized3
ldr r1, [sp, 0x10]
lsls r0, r1, 24
lsrs r0, 24
@@ -2499,7 +2499,7 @@ _0814EA3C: .4byte gMain
_0814EA40:
ldrb r0, [r7, 0x2]
movs r1, 0x1
bl sub_810F4D8
bl ClearStdWindowAndFrameToTransparent
ldrb r0, [r7, 0x2]
bl ClearWindowTilemap
ldrb r0, [r7, 0x2]
@@ -2723,7 +2723,7 @@ _0814EBC6:
str r4, [sp, 0x10]
movs r1, 0x2
movs r3, 0x1
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
b _0814EC4C
.align 2, 0
_0814EC10: .4byte 0x000001bb
@@ -2752,7 +2752,7 @@ _0814EC18:
str r4, [sp, 0x10]
movs r1, 0x2
movs r3, 0x1
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
_0814EC4C:
ldr r1, _0814EC7C @ =0x000001bb
adds r0, r6, r1
@@ -2845,7 +2845,7 @@ sub_814ECE0: @ 814ECE0
_0814ECF6:
lsls r0, r5, 3
adds r0, r4
bl LoadCompressedObjectPic
bl LoadCompressedSpriteSheet
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
asm/berry_fix_program.s
-344
View File
@@ -1,344 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_815F6E0
sub_815F6E0: @ 815F6E0
push {r4-r6,lr}
movs r6, 0x80
lsls r6, 19
movs r2, 0
strh r2, [r6]
ldr r1, _0815F73C @ =0x04000010
strh r2, [r1]
adds r1, 0x2
strh r2, [r1]
adds r1, 0x3E
strh r2, [r1]
ldr r5, _0815F740 @ =gUnknown_847A890
lsls r4, r0, 1
adds r4, r0
lsls r4, 2
adds r0, r4, r5
ldr r0, [r0]
movs r1, 0xC0
lsls r1, 19
bl LZ77UnCompVram
adds r0, r5, 0x4
adds r0, r4, r0
ldr r0, [r0]
ldr r1, _0815F744 @ =0x0600f800
bl LZ77UnCompVram
adds r5, 0x8
adds r4, r5
ldr r0, [r4]
movs r1, 0xA0
lsls r1, 19
movs r4, 0x80
lsls r4, 1
adds r2, r4, 0
bl CpuSet
ldr r1, _0815F748 @ =0x04000008
movs r2, 0xF8
lsls r2, 5
adds r0, r2, 0
strh r0, [r1]
strh r4, [r6]
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_0815F73C: .4byte 0x04000010
_0815F740: .4byte gUnknown_847A890
_0815F744: .4byte 0x0600f800
_0815F748: .4byte 0x04000008
thumb_func_end sub_815F6E0
thumb_func_start sub_815F74C
sub_815F74C: @ 815F74C
push {r4,lr}
sub sp, 0x4
ldr r0, _0815F7C4 @ =0x0000ffff
bl DisableInterrupts
movs r0, 0x1
bl EnableInterrupts
bl m4aSoundVSyncOff
movs r0, 0
bl SetVBlankCallback
movs r4, 0
str r4, [sp]
ldr r0, _0815F7C8 @ =0x040000d4
mov r1, sp
str r1, [r0]
movs r1, 0xC0
lsls r1, 19
str r1, [r0, 0x4]
ldr r1, _0815F7CC @ =0x85006000
str r1, [r0, 0x8]
ldr r1, [r0, 0x8]
str r4, [sp]
mov r1, sp
str r1, [r0]
movs r1, 0xA0
lsls r1, 19
str r1, [r0, 0x4]
ldr r1, _0815F7D0 @ =0x85000100
str r1, [r0, 0x8]
ldr r0, [r0, 0x8]
bl ResetSpriteData
bl ResetTasks
bl ScanlineEffect_Stop
ldr r0, _0815F7D4 @ =gUnknown_3005ECC
strb r4, [r0]
ldr r0, _0815F7D8 @ =sub_815F7F0
movs r1, 0
bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0815F7DC @ =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r1, r2
strh r4, [r1, 0x8]
ldr r0, _0815F7E0 @ =sub_815F7E4
bl SetMainCallback2
add sp, 0x4
pop {r4}
pop {r0}
bx r0
.align 2, 0
_0815F7C4: .4byte 0x0000ffff
_0815F7C8: .4byte 0x040000d4
_0815F7CC: .4byte 0x85006000
_0815F7D0: .4byte 0x85000100
_0815F7D4: .4byte gUnknown_3005ECC
_0815F7D8: .4byte sub_815F7F0
_0815F7DC: .4byte gTasks
_0815F7E0: .4byte sub_815F7E4
thumb_func_end sub_815F74C
thumb_func_start sub_815F7E4
sub_815F7E4: @ 815F7E4
push {lr}
bl RunTasks
pop {r0}
bx r0
thumb_func_end sub_815F7E4
thumb_func_start sub_815F7F0
sub_815F7F0: @ 815F7F0
push {r4-r6,lr}
sub sp, 0x4
lsls r0, 24
lsrs r2, r0, 24
lsls r0, r2, 2
adds r0, r2
lsls r0, 3
ldr r1, _0815F818 @ =gTasks+0x8
adds r5, r0, r1
movs r1, 0
ldrsh r0, [r5, r1]
cmp r0, 0xA
bls _0815F80C
b _0815F9A6
_0815F80C:
lsls r0, 2
ldr r1, _0815F81C @ =_0815F820
adds r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_0815F818: .4byte gTasks+0x8
_0815F81C: .4byte _0815F820
.align 2, 0
_0815F820:
.4byte _0815F84C
.4byte _0815F856
.4byte _0815F874
.4byte _0815F9A6
.4byte _0815F890
.4byte _0815F8C8
.4byte _0815F934
.4byte _0815F96A
.4byte _0815F96E
.4byte _0815F98C
.4byte _0815F996
_0815F84C:
movs r0, 0x5
bl sub_815F6E0
movs r0, 0x1
b _0815F9A4
_0815F856:
ldr r0, _0815F870 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
cmp r0, 0
bne _0815F864
b _0815F9A6
_0815F864:
movs r0, 0
bl sub_815F6E0
movs r0, 0x2
b _0815F9A4
.align 2, 0
_0815F870: .4byte gMain
_0815F874:
ldr r0, _0815F88C @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
cmp r0, 0
bne _0815F882
b _0815F9A6
_0815F882:
movs r0, 0x1
bl sub_815F6E0
movs r0, 0x4
b _0815F9A4
.align 2, 0
_0815F88C: .4byte gMain
_0815F890:
ldr r0, _0815F8B4 @ =gUnknown_3005EF0
ldr r1, _0815F8B8 @ =gMultiBootProgram_BerryGlitchFix_Start
str r1, [r0]
ldr r2, _0815F8BC @ =gUnknown_3005EF8
ldr r0, _0815F8C0 @ =gMultiBootProgram_BerryGlitchFix_End
subs r0, r1
str r0, [r2]
ldr r0, _0815F8C4 @ =gUnknown_3005F00
str r1, [r0, 0x28]
adds r1, r0, 0
adds r1, 0x4B
movs r4, 0
strb r4, [r1]
bl MultiBootInit
strh r4, [r5, 0x2]
movs r0, 0x5
b _0815F9A4
.align 2, 0
_0815F8B4: .4byte gUnknown_3005EF0
_0815F8B8: .4byte gMultiBootProgram_BerryGlitchFix_Start
_0815F8BC: .4byte gUnknown_3005EF8
_0815F8C0: .4byte gMultiBootProgram_BerryGlitchFix_End
_0815F8C4: .4byte gUnknown_3005F00
_0815F8C8:
ldr r0, _0815F910 @ =gUnknown_3005F00
ldrb r6, [r0, 0x18]
adds r4, r0, 0
cmp r6, 0
bne _0815F920
ldr r0, [r4, 0x1C]
ldr r1, _0815F914 @ =0x00020200
ands r0, r1
cmp r0, r1
bne _0815F920
ldrh r0, [r5, 0x2]
adds r0, 0x1
strh r0, [r5, 0x2]
lsls r0, 16
asrs r0, 16
cmp r0, 0xB4
ble _0815F924
movs r0, 0x2
bl sub_815F6E0
ldr r0, _0815F918 @ =gUnknown_3005EF0
ldr r1, [r0]
adds r1, 0xC0
ldr r0, _0815F91C @ =gUnknown_3005EF8
ldr r2, [r0]
subs r2, 0xC0
movs r0, 0x1
str r0, [sp]
adds r0, r4, 0
movs r3, 0x4
bl MultiBootStartMaster
strh r6, [r5, 0x2]
movs r0, 0x6
b _0815F9A4
.align 2, 0
_0815F910: .4byte gUnknown_3005F00
_0815F914: .4byte 0x00020200
_0815F918: .4byte gUnknown_3005EF0
_0815F91C: .4byte gUnknown_3005EF8
_0815F920:
movs r0, 0
strh r0, [r5, 0x2]
_0815F924:
adds r0, r4, 0
bl MultiBootMain
ldr r1, _0815F930 @ =gUnknown_3005EF4
str r0, [r1]
b _0815F9A6
.align 2, 0
_0815F930: .4byte gUnknown_3005EF4
_0815F934:
ldr r4, _0815F954 @ =gUnknown_3005F00
adds r0, r4, 0
bl MultiBootMain
ldr r1, _0815F958 @ =gUnknown_3005EF4
str r0, [r1]
adds r0, r4, 0
bl MultiBootCheckComplete
cmp r0, 0
beq _0815F95C
movs r0, 0x3
bl sub_815F6E0
movs r0, 0x7
b _0815F9A4
.align 2, 0
_0815F954: .4byte gUnknown_3005F00
_0815F958: .4byte gUnknown_3005EF4
_0815F95C:
ldrb r1, [r4, 0x1E]
movs r0, 0x2
ands r0, r1
cmp r0, 0
bne _0815F9A6
movs r0, 0x9
b _0815F9A4
_0815F96A:
movs r0, 0x8
b _0815F9A4
_0815F96E:
ldr r0, _0815F988 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
cmp r0, 0
beq _0815F9A6
adds r0, r2, 0
bl DestroyTask
bl DoSoftReset
b _0815F9A6
.align 2, 0
_0815F988: .4byte gMain
_0815F98C:
movs r0, 0x4
bl sub_815F6E0
movs r0, 0xA
b _0815F9A4
_0815F996:
ldr r0, _0815F9B0 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
cmp r0, 0
beq _0815F9A6
movs r0, 0
_0815F9A4:
strh r0, [r5]
_0815F9A6:
add sp, 0x4
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_0815F9B0: .4byte gMain
thumb_func_end sub_815F7F0
.align 2, 0 @ Don't pad with nop.
asm/berry_pouch.s
+93 -93
View File
@@ -5,8 +5,8 @@
.text
thumb_func_start sub_813CD50
sub_813CD50: @ 813CD50
thumb_func_start InitBerryPouch
InitBerryPouch: @ 813CD50
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -92,7 +92,7 @@ _0813CDF0: .4byte gTextFlags
_0813CDF4: .4byte gSpecialVar_ItemId
_0813CDF8: .4byte sub_813CE30
_0813CDFC: .4byte 0x0000080c
thumb_func_end sub_813CD50
thumb_func_end InitBerryPouch
thumb_func_start sub_813CE00
sub_813CE00: @ 813CE00
@@ -100,7 +100,7 @@ sub_813CE00: @ 813CE00
bl RunTasks
bl AnimateSprites
bl BuildOamBuffer
bl do_scheduled_bg_tilemap_copies_to_vram
bl DoScheduledBgTilemapCopiesToVram
bl UpdatePaletteFade
pop {r0}
bx r0
@@ -130,7 +130,7 @@ _0813CE32:
lsrs r0, 24
cmp r0, 0x1
beq _0813CE56
bl sub_80BF708
bl MenuHelpers_LinkSomething
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -183,8 +183,8 @@ _0813CE84:
.4byte _0813CFB0
.4byte _0813CFBE
_0813CED0:
bl sub_80BF768
bl clear_scheduled_bg_copies_to_vram
bl SetVBlankHBlankCallbacksToNull
bl ClearScheduledBgCopiesToVram
b _0813CFD2
_0813CEDA:
bl ScanlineEffect_Stop
@@ -199,10 +199,10 @@ _0813CEEC:
bl ResetSpriteData
b _0813CFD2
_0813CEF2:
bl sub_80984D8
bl ResetItemMenuIconState
b _0813CFD2
_0813CEF8:
bl sub_80BF708
bl MenuHelpers_LinkSomething
lsls r0, 24
cmp r0, 0
bne _0813CFD2
@@ -386,7 +386,7 @@ _0813D078: .4byte gUnknown_203F370
thumb_func_start sub_813D07C
sub_813D07C: @ 813D07C
push {r4,lr}
bl sub_80BF7C8
bl ResetAllBgsCoordinatesAndBgCntRegs
ldr r4, _0813D0DC @ =gUnknown_203F36C
ldr r0, [r4]
adds r0, 0xC
@@ -405,7 +405,7 @@ sub_813D07C: @ 813D07C
movs r0, 0x1
bl SetBgTilemapBuffer
movs r0, 0x1
bl schedule_bg_copy_tilemap_to_vram
bl ScheduleBgCopyTilemapToVram
movs r0, 0x50
movs r1, 0
bl SetGpuReg
@@ -454,18 +454,18 @@ _0813D10C:
beq _0813D178
b _0813D190
_0813D116:
bl reset_temp_tile_data_buffers
bl ResetTempTileDataBuffers
ldr r1, _0813D12C @ =gUnknown_8E859D0
str r4, [sp]
movs r0, 0x1
movs r2, 0
movs r3, 0
bl decompress_and_copy_tile_data_to_vram
bl DecompressAndCopyTileDataToVram
b _0813D17E
.align 2, 0
_0813D12C: .4byte gUnknown_8E859D0
_0813D130:
bl free_temp_tile_data_buffers_if_possible
bl FreeTempTileDataBuffersIfPossible
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -498,7 +498,7 @@ _0813D170: .4byte gSaveBlock2Ptr
_0813D174: .4byte gUnknown_8E85BF4
_0813D178:
ldr r0, _0813D18C @ =gUnknown_84644A8
bl LoadCompressedObjectPic
bl LoadCompressedSpriteSheet
_0813D17E:
ldr r1, [r5]
adds r1, r6
@@ -510,7 +510,7 @@ _0813D17E:
_0813D18C: .4byte gUnknown_84644A8
_0813D190:
ldr r0, _0813D1A8 @ =gUnknown_84644B0
bl LoadCompressedObjectPalette
bl LoadCompressedSpritePalette
ldr r0, _0813D1AC @ =gUnknown_203F36C
ldr r0, [r0]
ldr r1, _0813D1B0 @ =0x0000080c
@@ -798,7 +798,7 @@ _0813D3D6:
ldrb r1, [r0, 0x9]
movs r0, 0x1
eors r0, r1
bl sub_8098940
bl DestroyItemMenuIcon
ldr r1, [r4]
ldrb r0, [r1, 0x7]
cmp r0, r5
@@ -1028,9 +1028,9 @@ sub_813D594: @ 813D594
movs r1, 0
movs r2, 0x10
movs r3, 0x1E
bl sub_80F6B08
bl SetBgRectPal
movs r0, 0x1
bl schedule_bg_copy_tilemap_to_vram
bl ScheduleBgCopyTilemapToVram
add sp, 0x8
pop {r0}
bx r0
@@ -1072,7 +1072,7 @@ _0813D5EA:
movs r1, 0xA0
movs r2, 0x8
movs r3, 0x78
bl AddScrollIndicatorArrowPairParametrized
bl AddScrollIndicatorArrowPairParameterized
ldr r1, [r4]
strb r0, [r1, 0x6]
add sp, 0x10
@@ -1102,7 +1102,7 @@ sub_813D614: @ 813D614
movs r1, 0xD4
movs r2, 0x78
movs r3, 0x98
bl AddScrollIndicatorArrowPairParametrized
bl AddScrollIndicatorArrowPairParameterized
ldr r1, [r4]
strb r0, [r1, 0x6]
add sp, 0x10
@@ -1132,7 +1132,7 @@ sub_813D64C: @ 813D64C
movs r1, 0x98
movs r2, 0x48
movs r3, 0x68
bl AddScrollIndicatorArrowPairParametrized
bl AddScrollIndicatorArrowPairParameterized
ldr r1, [r4]
strb r0, [r1, 0x6]
add sp, 0x10
@@ -1358,8 +1358,8 @@ _0813D800: .4byte gUnknown_203F37C
_0813D804: .4byte gUnknown_203F380
thumb_func_end sub_813D7CC
thumb_func_start sub_813D808
sub_813D808: @ 813D808
thumb_func_start BerryPouch_StartFadeToExitCallback
BerryPouch_StartFadeToExitCallback: @ 813D808
push {r4,lr}
sub sp, 0x4
adds r4, r0, 0
@@ -1387,7 +1387,7 @@ sub_813D808: @ 813D808
.align 2, 0
_0813D83C: .4byte gTasks
_0813D840: .4byte sub_813D844
thumb_func_end sub_813D808
thumb_func_end BerryPouch_StartFadeToExitCallback
thumb_func_start sub_813D844
sub_813D844: @ 813D844
@@ -1409,7 +1409,7 @@ sub_813D844: @ 813D844
ldr r4, _0813D884 @ =gUnknown_203F37A
subs r2, r4, 0x2
adds r1, r4, 0
bl DestroyListMenu
bl DestroyListMenuTask
ldr r0, _0813D888 @ =gUnknown_203F36C
ldr r0, [r0]
ldr r0, [r0]
@@ -1443,7 +1443,7 @@ sub_813D8AC: @ 813D8AC
push {r4,lr}
ldr r4, _0813D904 @ =gBagPockets + 0x20
adds r0, r4, 0
bl sub_809A720
bl SortAndCompactBagPocket
ldr r3, _0813D908 @ =gUnknown_203F36C
ldr r1, [r3]
movs r0, 0
@@ -1510,15 +1510,15 @@ _0813D92C:
bx r0
thumb_func_end sub_813D8AC
thumb_func_start sub_813D934
sub_813D934: @ 813D934
thumb_func_start BerryPouch_SetExitCallback
BerryPouch_SetExitCallback: @ 813D934
ldr r1, _0813D93C @ =gUnknown_203F36C
ldr r1, [r1]
str r0, [r1]
bx lr
.align 2, 0
_0813D93C: .4byte gUnknown_203F36C
thumb_func_end sub_813D934
thumb_func_end BerryPouch_SetExitCallback
thumb_func_start sub_813D940
sub_813D940: @ 813D940
@@ -1688,13 +1688,13 @@ _0813DA90:
b _0813DB9E
_0813DA9E:
ldrb r0, [r7]
bl ListMenuHandleInput
bl ListMenu_ProcessInput
adds r5, r0, 0
ldrb r0, [r7]
ldr r4, _0813DAE0 @ =gUnknown_203F37A
subs r2, r4, 0x2
adds r1, r4, 0
bl get_coro_args_x18_x1A
bl ListMenuGetScrollAndRow
ldr r0, _0813DAE4 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x4
@@ -1767,7 +1767,7 @@ _0813DB46:
strh r0, [r1]
_0813DB48:
adds r0, r6, 0
bl sub_813D808
bl BerryPouch_StartFadeToExitCallback
b _0813DB9E
.align 2, 0
_0813DB50: .4byte gUnknown_203F36C
@@ -1869,7 +1869,7 @@ _0813DC18: .4byte gUnknown_203F384
_0813DC1C: .4byte gUnknown_84643B0
_0813DC20: .4byte gUnknown_203F388
_0813DC24:
bl sub_80BF708
bl MenuHelpers_LinkSomething
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1974,7 +1974,7 @@ _0813DC86:
movs r1, 0x2
movs r2, 0
movs r3, 0x2
bl ProgramAndPlaceMenuCursorOnWindow
bl Menu_InitCursor
movs r0, 0x6
bl sub_813EA08
adds r4, r0, 0
@@ -1985,7 +1985,7 @@ _0813DC86:
ldr r1, _0813DD68 @ =gStringVar1
bl sub_813D39C
ldr r5, _0813DD6C @ =gStringVar4
ldr r1, _0813DD70 @ =gUnknown_84162FF
ldr r1, _0813DD70 @ =gOtherText_StrVar1
adds r0, r5, 0
bl StringExpandPlaceholders
movs r0, 0x2
@@ -2014,7 +2014,7 @@ _0813DD60: .4byte gUnknown_203F388
_0813DD64: .4byte gUnknown_846437C
_0813DD68: .4byte gStringVar1
_0813DD6C: .4byte gStringVar4
_0813DD70: .4byte gUnknown_84162FF
_0813DD70: .4byte gOtherText_StrVar1
thumb_func_end sub_813DBE4
thumb_func_start sub_813DD74
@@ -2051,7 +2051,7 @@ sub_813DDA0: @ 813DDA0
lsrs r0, 24
cmp r0, 0x1
beq _0813DDFE
bl ProcessMenuInputNoWrapAround
bl Menu_ProcessInputNoWrapAround
lsls r0, 24
asrs r4, r0, 24
movs r0, 0x2
@@ -2111,9 +2111,9 @@ sub_813DE0C: @ 813DE0C
movs r0, 0x1
bl PutWindowTilemap
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
bl ScheduleBgCopyTilemapToVram
movs r0, 0x2
bl schedule_bg_copy_tilemap_to_vram
bl ScheduleBgCopyTilemapToVram
ldr r0, _0813DE60 @ =gUnknown_203F370
ldrb r0, [r0, 0x4]
cmp r0, 0x4
@@ -2124,7 +2124,7 @@ sub_813DE0C: @ 813DE0C
cmp r0, 0
bne _0813DE68
adds r0, r5, 0
bl sub_80A2238
bl FieldUseFunc_OakStopsYou
b _0813DEB0
.align 2, 0
_0813DE5C: .4byte gUnknown_203F388
@@ -2309,9 +2309,9 @@ sub_813DFC8: @ 813DFC8
movs r0, 0
bl PutWindowTilemap
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
bl ScheduleBgCopyTilemapToVram
movs r0, 0x2
bl schedule_bg_copy_tilemap_to_vram
bl ScheduleBgCopyTilemapToVram
ldrb r0, [r4]
movs r1, 0x1
bl sub_813D4B0
@@ -2338,7 +2338,7 @@ sub_813E010: @ 813E010
adds r0, r4, 0
adds r0, 0x10
ldrh r1, [r4, 0x4]
bl sub_80BF848
bl AdjustQuantityAccordingToDPadInput
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2370,9 +2370,9 @@ _0813E048:
movs r0, 0
bl sub_813EA98
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
bl ScheduleBgCopyTilemapToVram
movs r0, 0x2
bl schedule_bg_copy_tilemap_to_vram
bl ScheduleBgCopyTilemapToVram
bl sub_813D684
adds r0, r5, 0
bl sub_813DF54
@@ -2395,9 +2395,9 @@ _0813E090:
movs r0, 0x1
bl PutWindowTilemap
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
bl ScheduleBgCopyTilemapToVram
movs r0, 0x2
bl schedule_bg_copy_tilemap_to_vram
bl ScheduleBgCopyTilemapToVram
ldrb r0, [r4]
movs r1, 0x1
bl sub_813D4B0
@@ -2504,7 +2504,7 @@ _0813E18A:
ldr r4, _0813E1F8 @ =gUnknown_203F37A
subs r2, r4, 0x2
adds r1, r4, 0
bl DestroyListMenu
bl DestroyListMenuTask
bl sub_813D8AC
bl sub_813D6F4
bl sub_813D204
@@ -2519,7 +2519,7 @@ _0813E18A:
movs r0, 0x1
bl PutWindowTilemap
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
bl ScheduleBgCopyTilemapToVram
ldrb r0, [r5]
movs r1, 0x1
bl sub_813D4B0
@@ -2555,9 +2555,9 @@ sub_813E200: @ 813E200
movs r0, 0x1
bl PutWindowTilemap
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
bl ScheduleBgCopyTilemapToVram
movs r0, 0x2
bl schedule_bg_copy_tilemap_to_vram
bl ScheduleBgCopyTilemapToVram
bl CalculatePlayerPartyCount
lsls r0, 24
cmp r0, 0
@@ -2577,7 +2577,7 @@ _0813E248:
adds r0, r4
lsls r0, 3
adds r0, r1
ldr r1, _0813E270 @ =sub_813D808
ldr r1, _0813E270 @ =BerryPouch_StartFadeToExitCallback
str r1, [r0]
_0813E25E:
pop {r4}
@@ -2587,7 +2587,7 @@ _0813E25E:
_0813E264: .4byte gUnknown_203F36C
_0813E268: .4byte sub_8126EDC
_0813E26C: .4byte gTasks
_0813E270: .4byte sub_813D808
_0813E270: .4byte BerryPouch_StartFadeToExitCallback
thumb_func_end sub_813E200
thumb_func_start sub_813E274
@@ -2598,7 +2598,7 @@ sub_813E274: @ 813E274
ldr r2, _0813E288 @ =gText_ThereIsNoPokemon
ldr r3, _0813E28C @ =sub_813E290
movs r1, 0x2
bl sub_813EB20
bl DisplayItemMessageInBerryPouch
pop {r0}
bx r0
.align 2, 0
@@ -2646,7 +2646,7 @@ sub_813E2B8: @ 813E2B8
ldr r4, _0813E318 @ =gUnknown_203F37A
subs r2, r4, 0x2
adds r1, r4, 0
bl DestroyListMenu
bl DestroyListMenuTask
bl sub_813D8AC
bl sub_813D6F4
bl sub_813D204
@@ -2659,7 +2659,7 @@ sub_813E2B8: @ 813E2B8
lsrs r0, 24
strh r0, [r5]
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
bl ScheduleBgCopyTilemapToVram
ldrb r0, [r5]
movs r1, 0x1
bl sub_813D4B0
@@ -2693,9 +2693,9 @@ sub_813E320: @ 813E320
movs r0, 0x1
bl PutWindowTilemap
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
bl ScheduleBgCopyTilemapToVram
movs r0, 0x2
bl schedule_bg_copy_tilemap_to_vram
bl ScheduleBgCopyTilemapToVram
ldr r1, _0813E378 @ =gTasks
lsls r0, r4, 2
adds r0, r4
@@ -2745,7 +2745,7 @@ sub_813E37C: @ 813E37C
adds r0, r5, 0
movs r1, 0x2
adds r2, r4, 0
bl sub_813EB20
bl DisplayItemMessageInBerryPouch
b _0813E3EA
.align 2, 0
_0813E3C4: .4byte gTasks+0x8
@@ -2761,7 +2761,7 @@ _0813E3D8:
adds r0, r7, 0
subs r0, 0x8
adds r0, r6, r0
ldr r1, _0813E3F8 @ =sub_813D808
ldr r1, _0813E3F8 @ =BerryPouch_StartFadeToExitCallback
str r1, [r0]
_0813E3EA:
pop {r4-r7}
@@ -2770,7 +2770,7 @@ _0813E3EA:
.align 2, 0
_0813E3F0: .4byte gUnknown_203F36C
_0813E3F4: .4byte c2_8123744
_0813E3F8: .4byte sub_813D808
_0813E3F8: .4byte BerryPouch_StartFadeToExitCallback
thumb_func_end sub_813E37C
thumb_func_start sub_813E3FC
@@ -2786,14 +2786,14 @@ sub_813E3FC: @ 813E3FC
adds r1, r0
lsls r1, 3
adds r1, r2
ldr r0, _0813E424 @ =sub_813D808
ldr r0, _0813E424 @ =BerryPouch_StartFadeToExitCallback
str r0, [r1]
bx lr
.align 2, 0
_0813E418: .4byte gUnknown_203F36C
_0813E41C: .4byte sub_808CE60
_0813E420: .4byte gTasks
_0813E424: .4byte sub_813D808
_0813E424: .4byte BerryPouch_StartFadeToExitCallback
thumb_func_end sub_813E3FC
thumb_func_start sub_813E428
@@ -2827,7 +2827,7 @@ sub_813E428: @ 813E428
ldr r3, _0813E484 @ =sub_813E2B8
adds r0, r5, 0
adds r2, r4, 0
bl sub_813EB20
bl DisplayItemMessageInBerryPouch
b _0813E4CE
.align 2, 0
_0813E470: .4byte gTasks+0x8
@@ -2867,7 +2867,7 @@ _0813E4A8:
ldr r3, _0813E4E0 @ =sub_813E5B8
adds r0, r7, 0
adds r2, r4, 0
bl sub_813EB20
bl DisplayItemMessageInBerryPouch
_0813E4CE:
pop {r4-r7}
pop {r0}
@@ -2917,7 +2917,7 @@ sub_813E4E4: @ 813E4E4
ldr r3, _0813E550 @ =sub_813E554
adds r0, r5, 0
adds r2, r4, 0
bl sub_813EB20
bl DisplayItemMessageInBerryPouch
pop {r4-r6}
pop {r0}
bx r0
@@ -2964,7 +2964,7 @@ sub_813E568: @ 813E568
movs r0, 0x1
bl PutWindowTilemap
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
bl ScheduleBgCopyTilemapToVram
ldrb r0, [r4]
movs r1, 0x1
bl sub_813D4B0
@@ -3091,7 +3091,7 @@ sub_813E690: @ 813E690
adds r0, r5, 0
adds r0, 0x10
ldrh r1, [r5, 0x4]
bl sub_80BF848
bl AdjustQuantityAccordingToDPadInput
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3130,7 +3130,7 @@ _0813E6E4:
movs r0, 0
bl PutWindowTilemap
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
bl ScheduleBgCopyTilemapToVram
bl sub_813D684
adds r0, r4, 0
bl sub_813E4E4
@@ -3157,7 +3157,7 @@ _0813E718:
movs r0, 0x1
bl PutWindowTilemap
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
bl ScheduleBgCopyTilemapToVram
bl sub_813D684
ldrb r0, [r5]
movs r1, 0x1
@@ -3184,7 +3184,7 @@ sub_813E768: @ 813E768
movs r0, 0
bl PutWindowTilemap
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
bl ScheduleBgCopyTilemapToVram
ldr r0, _0813E7D8 @ =gSpecialVar_ItemId
ldrh r0, [r0]
ldr r1, _0813E7DC @ =gStringVar1
@@ -3213,7 +3213,7 @@ sub_813E768: @ 813E768
adds r0, r5, 0
movs r1, 0x2
adds r2, r4, 0
bl sub_813EB20
bl DisplayItemMessageInBerryPouch
pop {r4-r6}
pop {r0}
bx r0
@@ -3277,7 +3277,7 @@ sub_813E7F0: @ 813E7F0
ldr r4, _0813E8C8 @ =gUnknown_203F37A
subs r2, r4, 0x2
adds r1, r4, 0
bl DestroyListMenu
bl DestroyListMenuTask
bl sub_813D8AC
bl sub_813D6F4
bl sub_813D204
@@ -3367,15 +3367,15 @@ sub_813E910: @ 813E910
movs r0, 0
movs r1, 0x1
movs r2, 0xE0
bl sub_815001C
bl TextWindow_SetUserSelectedFrame
movs r0, 0
movs r1, 0x13
movs r2, 0xD0
bl sub_814FEAC
bl TextWindow_LoadResourcesStdFrame0
movs r0, 0
movs r1, 0xA
movs r2, 0xC0
bl sub_814FF2C
bl TextWindow_SetStdFrame0_WithPal
ldr r0, _0813E998 @ =gTMCaseMainWindowPalette
movs r1, 0xF0
movs r2, 0x20
@@ -3397,9 +3397,9 @@ _0813E946:
movs r0, 0x2
bl PutWindowTilemap
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
bl ScheduleBgCopyTilemapToVram
movs r0, 0x2
bl schedule_bg_copy_tilemap_to_vram
bl ScheduleBgCopyTilemapToVram
movs r4, 0
ldr r3, _0813E99C @ =gUnknown_203F38C
movs r2, 0xFF
@@ -3465,7 +3465,7 @@ sub_813E9A0: @ 813E9A0
str r4, [sp, 0xC]
str r2, [sp, 0x10]
mov r2, r9
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
add sp, 0x14
pop {r3,r4}
mov r8, r3
@@ -3509,7 +3509,7 @@ _0813EA38:
movs r1, 0
movs r2, 0xA
movs r3, 0xC
bl SetWindowBorderStyle
bl DrawStdFrameWithCustomTileAndPalette
b _0813EA60
.align 2, 0
_0813EA4C: .4byte gUnknown_203F38C
@@ -3519,10 +3519,10 @@ _0813EA54:
movs r1, 0
movs r2, 0x1
movs r3, 0xE
bl SetWindowBorderStyle
bl DrawStdFrameWithCustomTileAndPalette
_0813EA60:
movs r0, 0x2
bl schedule_bg_copy_tilemap_to_vram
bl ScheduleBgCopyTilemapToVram
ldr r0, _0813EA74 @ =gUnknown_203F38C
adds r0, r4, r0
ldrb r0, [r0]
@@ -3545,7 +3545,7 @@ sub_813EA78: @ 813EA78
movs r1, 0
movs r2, 0x1
movs r3, 0xE
bl SetWindowBorderStyle
bl DrawStdFrameWithCustomTileAndPalette
pop {r0}
bx r0
.align 2, 0
@@ -3562,13 +3562,13 @@ sub_813EA98: @ 813EA98
adds r4, r0
ldrb r0, [r4]
movs r1, 0
bl sub_810F4D8
bl ClearStdWindowAndFrameToTransparent
ldrb r0, [r4]
bl ClearWindowTilemap
ldrb r0, [r4]
bl RemoveWindow
movs r0, 0x2
bl schedule_bg_copy_tilemap_to_vram
bl ScheduleBgCopyTilemapToVram
movs r0, 0xFF
strb r0, [r4]
pop {r4}
@@ -3589,7 +3589,7 @@ sub_813EACC: @ 813EACC
cmp r0, 0xFF
beq _0813EB04
movs r1, 0
bl sub_810F260
bl ClearDialogWindowAndFrameToTransparent
ldrb r0, [r4]
bl ClearWindowTilemap
ldrb r0, [r4]
@@ -3597,9 +3597,9 @@ sub_813EACC: @ 813EACC
movs r0, 0x1
bl PutWindowTilemap
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
bl ScheduleBgCopyTilemapToVram
movs r0, 0x2
bl schedule_bg_copy_tilemap_to_vram
bl ScheduleBgCopyTilemapToVram
movs r0, 0xFF
strb r0, [r4]
_0813EB04:
@@ -3622,8 +3622,8 @@ sub_813EB10: @ 813EB10
_0813EB1C: .4byte gUnknown_203F38C
thumb_func_end sub_813EB10
thumb_func_start sub_813EB20
sub_813EB20: @ 813EB20
thumb_func_start DisplayItemMessageInBerryPouch
DisplayItemMessageInBerryPouch: @ 813EB20
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -3656,7 +3656,7 @@ _0813EB44:
movs r3, 0xD
bl DisplayMessageAndContinueTask
movs r0, 0x2
bl schedule_bg_copy_tilemap_to_vram
bl ScheduleBgCopyTilemapToVram
add sp, 0x10
pop {r3}
mov r8, r3
@@ -3666,7 +3666,7 @@ _0813EB44:
.align 2, 0
_0813EB74: .4byte gUnknown_203F38C
_0813EB78: .4byte gUnknown_8464400
thumb_func_end sub_813EB20
thumb_func_end DisplayItemMessageInBerryPouch
thumb_func_start sub_813EB7C
sub_813EB7C: @ 813EB7C
asm/bike.s
+6 -6
View File
@@ -713,8 +713,8 @@ _080BD5C2:
bx r1
thumb_func_end player_should_look_direction_be_enforced_upon_movement
thumb_func_start sub_80BD5C8
sub_80BD5C8: @ 80BD5C8
thumb_func_start StartTransitionToFlipBikeState
StartTransitionToFlipBikeState: @ 80BD5C8
push {r4,lr}
lsls r0, 24
lsrs r2, r0, 24
@@ -730,7 +730,7 @@ sub_80BD5C8: @ 80BD5C8
movs r0, 0x1
bl SetPlayerAvatarTransitionFlags
bl sav1_reset_battle_music_maybe
bl sub_8055DC4
bl Overworld_PlaySpecialMapMusic
b _080BD618
.align 2, 0
_080BD5F0: .4byte gUnknown_2036E2C
@@ -738,8 +738,8 @@ _080BD5F4: .4byte gPlayerAvatar
_080BD5F8:
adds r0, r2, 0
bl SetPlayerAvatarTransitionFlags
movs r4, 0x8D
lsls r4, 1
movs r4, 0x8D @ BGM_FRLG_BICYCLE
lsls r4, 1 @ BGM_FRLG_BICYCLE
adds r0, r4, 0
bl sub_8056124
cmp r0, 0
@@ -752,7 +752,7 @@ _080BD618:
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_80BD5C8
thumb_func_end StartTransitionToFlipBikeState
thumb_func_start sub_80BD620
sub_80BD620: @ 80BD620
asm/braille_text.s
-8
View File
@@ -1,8 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
.align 2, 0 @ Don't pad with nop.
asm/bug.s
+829
View File
@@ -0,0 +1,829 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_80B3FAC
sub_80B3FAC: @ 80B3FAC
push {r4-r6,lr}
adds r6, r0, 0
bl sub_8073788
lsls r0, 24
cmp r0, 0
beq _080B3FD8
adds r0, r6, 0
movs r1, 0x2
bl StartSpriteAffineAnim
ldr r0, _080B3FD4 @ =gBattleAnimArgs
ldrh r1, [r0, 0x4]
negs r1, r1
strh r1, [r0, 0x4]
ldrh r1, [r0]
negs r1, r1
strh r1, [r0]
b _080B4008
.align 2, 0
_080B3FD4: .4byte gBattleAnimArgs
_080B3FD8:
ldr r0, _080B406C @ =gBattleAnimTarget
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _080B4008
adds r0, r6, 0
movs r1, 0x1
bl StartSpriteAffineAnim
ldr r1, _080B4070 @ =gBattleAnimArgs
ldrh r0, [r1, 0x2]
negs r0, r0
strh r0, [r1, 0x2]
ldrh r0, [r1, 0x4]
negs r0, r0
strh r0, [r1, 0x4]
ldrh r0, [r1, 0x6]
negs r0, r0
strh r0, [r1, 0x6]
ldrh r0, [r1]
negs r0, r0
strh r0, [r1]
_080B4008:
ldr r5, _080B406C @ =gBattleAnimTarget
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074844
lsls r0, 24
ldr r4, _080B4070 @ =gBattleAnimArgs
lsrs r0, 24
ldrh r1, [r4]
adds r0, r1
strh r0, [r6, 0x20]
ldrb r0, [r5]
movs r1, 0x3
bl sub_8074844
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x2]
adds r0, r1
strh r0, [r6, 0x22]
ldrh r0, [r4, 0x8]
strh r0, [r6, 0x2E]
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074480
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x4]
adds r0, r1
strh r0, [r6, 0x32]
ldrb r0, [r5]
movs r1, 0x3
bl sub_8074480
lsls r0, 24
lsrs r0, 24
ldrh r4, [r4, 0x6]
adds r0, r4
strh r0, [r6, 0x36]
ldr r0, _080B4074 @ =sub_8075590
str r0, [r6, 0x1C]
ldr r1, _080B4078 @ =DestroyAnimSprite
adds r0, r6, 0
bl StoreSpriteCallbackInData6
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_080B406C: .4byte gBattleAnimTarget
_080B4070: .4byte gBattleAnimArgs
_080B4074: .4byte sub_8075590
_080B4078: .4byte DestroyAnimSprite
thumb_func_end sub_80B3FAC
thumb_func_start sub_80B407C
sub_80B407C: @ 80B407C
push {r4-r6,lr}
adds r6, r0, 0
bl sub_8073788
lsls r0, 24
cmp r0, 0
beq _080B40A0
ldr r1, _080B409C @ =gBattleAnimArgs
ldrh r0, [r1]
negs r0, r0
strh r0, [r1]
adds r0, r6, 0
movs r1, 0x2
bl StartSpriteAffineAnim
b _080B40BC
.align 2, 0
_080B409C: .4byte gBattleAnimArgs
_080B40A0:
ldr r0, _080B4118 @ =gBattleAnimTarget
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _080B40BC
ldr r0, _080B411C @ =gBattleAnimArgs
ldrh r1, [r0, 0x2]
negs r1, r1
strh r1, [r0, 0x2]
ldrh r1, [r0]
negs r1, r1
strh r1, [r0]
_080B40BC:
ldr r5, _080B4118 @ =gBattleAnimTarget
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074844
lsls r0, 24
ldr r4, _080B411C @ =gBattleAnimArgs
lsrs r0, 24
ldrh r1, [r4]
adds r0, r1
strh r0, [r6, 0x20]
ldrb r0, [r5]
movs r1, 0x3
bl sub_8074844
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x2]
adds r0, r1
strh r0, [r6, 0x22]
ldrh r0, [r4, 0x4]
strh r0, [r6, 0x2E]
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074480
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x32]
ldrb r0, [r5]
movs r1, 0x3
bl sub_8074480
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x36]
ldr r0, _080B4120 @ =sub_8075590
str r0, [r6, 0x1C]
ldr r1, _080B4124 @ =DestroyAnimSprite
adds r0, r6, 0
bl StoreSpriteCallbackInData6
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_080B4118: .4byte gBattleAnimTarget
_080B411C: .4byte gBattleAnimArgs
_080B4120: .4byte sub_8075590
_080B4124: .4byte DestroyAnimSprite
thumb_func_end sub_80B407C
thumb_func_start sub_80B4128
sub_80B4128: @ 80B4128
push {r4,r5,lr}
adds r5, r0, 0
bl sub_8073788
lsls r0, 24
cmp r0, 0
beq _080B4144
ldr r0, _080B4184 @ =gBattleAnimArgs
movs r2, 0x4
ldrsh r1, [r0, r2]
lsrs r2, r1, 31
adds r1, r2
asrs r1, 1
strh r1, [r0, 0x4]
_080B4144:
adds r0, r5, 0
movs r1, 0x1
bl sub_8075160
ldr r1, _080B4184 @ =gBattleAnimArgs
ldrh r0, [r1, 0x4]
strh r0, [r5, 0x2E]
ldrh r0, [r5, 0x20]
strh r0, [r5, 0x30]
ldrh r0, [r5, 0x22]
strh r0, [r5, 0x34]
movs r2, 0x8
ldrsh r0, [r1, r2]
cmp r0, 0
bne _080B418C
ldr r4, _080B4188 @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
b _080B419E
.align 2, 0
_080B4184: .4byte gBattleAnimArgs
_080B4188: .4byte gBattleAnimTarget
_080B418C:
ldr r0, _080B41B4 @ =gBattleAnimTarget
ldrb r0, [r0]
adds r2, r5, 0
adds r2, 0x32
adds r3, r5, 0
adds r3, 0x36
movs r1, 0x1
bl sub_8076D9C
_080B419E:
adds r0, r5, 0
bl sub_8075678
ldr r0, _080B41B8 @ =gBattleAnimArgs
ldrh r0, [r0, 0x6]
strh r0, [r5, 0x38]
ldr r0, _080B41BC @ =sub_80B41C0
str r0, [r5, 0x1C]
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080B41B4: .4byte gBattleAnimTarget
_080B41B8: .4byte gBattleAnimArgs
_080B41BC: .4byte sub_80B41C0
thumb_func_end sub_80B4128
thumb_func_start sub_80B41C0
sub_80B41C0: @ 80B41C0
push {r4,lr}
adds r4, r0, 0
bl sub_80755E0
lsls r0, 24
cmp r0, 0
beq _080B41D6
adds r0, r4, 0
bl DestroyAnimSprite
b _080B41F2
_080B41D6:
movs r1, 0x3A
ldrsh r0, [r4, r1]
movs r2, 0x38
ldrsh r1, [r4, r2]
bl Sin
ldrh r1, [r4, 0x24]
adds r0, r1
strh r0, [r4, 0x24]
ldrh r0, [r4, 0x3A]
adds r0, 0xD
movs r1, 0xFF
ands r0, r1
strh r0, [r4, 0x3A]
_080B41F2:
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_80B41C0
thumb_func_start sub_80B41F8
sub_80B41F8: @ 80B41F8
push {r4,lr}
adds r4, r0, 0
ldr r0, _080B4228 @ =gBattleAnimTarget
ldrb r0, [r0]
adds r2, r4, 0
adds r2, 0x20
adds r3, r4, 0
adds r3, 0x22
movs r1, 0
bl sub_8076D9C
ldr r0, _080B422C @ =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080B4234
ldr r0, _080B4230 @ =gBattleAnimArgs
ldrh r1, [r4, 0x20]
ldrh r2, [r0]
subs r1, r2
strh r1, [r4, 0x20]
b _080B4240
.align 2, 0
_080B4228: .4byte gBattleAnimTarget
_080B422C: .4byte gBattleAnimAttacker
_080B4230: .4byte gBattleAnimArgs
_080B4234:
ldr r1, _080B4268 @ =gBattleAnimArgs
ldrh r0, [r1]
ldrh r2, [r4, 0x20]
adds r0, r2
strh r0, [r4, 0x20]
adds r0, r1, 0
_080B4240:
ldrh r0, [r0, 0x2]
ldrh r1, [r4, 0x22]
adds r0, r1
strh r0, [r4, 0x22]
ldr r0, _080B426C @ =gBattleAnimTarget
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _080B425C
ldrh r0, [r4, 0x22]
adds r0, 0x8
strh r0, [r4, 0x22]
_080B425C:
ldr r0, _080B4270 @ =sub_80B4274
str r0, [r4, 0x1C]
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080B4268: .4byte gBattleAnimArgs
_080B426C: .4byte gBattleAnimTarget
_080B4270: .4byte sub_80B4274
thumb_func_end sub_80B41F8
thumb_func_start sub_80B4274
sub_80B4274: @ 80B4274
push {lr}
adds r3, r0, 0
ldrh r0, [r3, 0x2E]
adds r0, 0x1
strh r0, [r3, 0x2E]
lsls r0, 16
asrs r0, 16
cmp r0, 0x3
bne _080B42A8
movs r0, 0
strh r0, [r3, 0x2E]
movs r0, 0x3E
adds r0, r3
mov r12, r0
ldrb r2, [r0]
lsls r0, r2, 29
lsrs r0, 31
movs r1, 0x1
eors r1, r0
lsls r1, 2
movs r0, 0x5
negs r0, r0
ands r0, r2
orrs r0, r1
mov r1, r12
strb r0, [r1]
_080B42A8:
ldrh r0, [r3, 0x30]
adds r0, 0x1
strh r0, [r3, 0x30]
lsls r0, 16
asrs r0, 16
cmp r0, 0x33
bne _080B42BC
adds r0, r3, 0
bl DestroyAnimSprite
_080B42BC:
pop {r0}
bx r0
thumb_func_end sub_80B4274
thumb_func_start sub_80B42C0
sub_80B42C0: @ 80B42C0
push {r4,lr}
adds r4, r0, 0
movs r1, 0xFD
lsls r1, 6
movs r0, 0x50
bl SetGpuReg
movs r0, 0x52
movs r1, 0x10
bl SetGpuReg
movs r0, 0x10
strh r0, [r4, 0x2E]
ldr r0, _080B42E4 @ =sub_80B42E8
str r0, [r4, 0x1C]
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080B42E4: .4byte sub_80B42E8
thumb_func_end sub_80B42C0
thumb_func_start sub_80B42E8
sub_80B42E8: @ 80B42E8
push {r4,lr}
adds r4, r0, 0
ldrh r1, [r4, 0x32]
movs r2, 0x32
ldrsh r0, [r4, r2]
cmp r0, 0x13
bgt _080B42FC
adds r0, r1, 0x1
strh r0, [r4, 0x32]
b _080B433A
_080B42FC:
ldrh r1, [r4, 0x30]
adds r0, r1, 0x1
strh r0, [r4, 0x30]
movs r0, 0x1
ands r0, r1
cmp r0, 0
beq _080B433A
ldrh r1, [r4, 0x2E]
subs r1, 0x1
strh r1, [r4, 0x2E]
movs r0, 0x10
subs r0, r1
lsls r0, 8
orrs r1, r0
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
bl SetGpuReg
movs r1, 0x2E
ldrsh r0, [r4, r1]
cmp r0, 0
bne _080B433A
adds r2, r4, 0
adds r2, 0x3E
ldrb r0, [r2]
movs r1, 0x4
orrs r0, r1
strb r0, [r2]
ldr r0, _080B4340 @ =sub_80B4344
str r0, [r4, 0x1C]
_080B433A:
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080B4340: .4byte sub_80B4344
thumb_func_end sub_80B42E8
thumb_func_start sub_80B4344
sub_80B4344: @ 80B4344
push {r4,lr}
adds r4, r0, 0
movs r0, 0x50
movs r1, 0
bl SetGpuReg
movs r0, 0x52
movs r1, 0
bl SetGpuReg
adds r0, r4, 0
bl DestroyAnimSprite
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_80B4344
thumb_func_start sub_80B4364
sub_80B4364: @ 80B4364
push {r4-r7,lr}
sub sp, 0x4
adds r7, r0, 0
bl sub_8073788
lsls r0, 24
cmp r0, 0
beq _080B4384
ldr r1, _080B4380 @ =gBattleAnimArgs
ldrh r0, [r1, 0x4]
negs r0, r0
strh r0, [r1, 0x4]
b _080B43A6
.align 2, 0
_080B4380: .4byte gBattleAnimArgs
_080B4384:
ldr r0, _080B4480 @ =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080B43A6
ldr r1, _080B4484 @ =gBattleAnimArgs
ldrh r0, [r1, 0x4]
negs r0, r0
strh r0, [r1, 0x4]
ldrh r0, [r1, 0x2]
negs r0, r0
strh r0, [r1, 0x2]
ldrh r0, [r1, 0x6]
negs r0, r0
strh r0, [r1, 0x6]
_080B43A6:
bl sub_8073788
lsls r0, 24
cmp r0, 0
bne _080B43F6
ldr r0, _080B4480 @ =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
adds r4, r0, 0
ldr r5, _080B4488 @ =gBattleAnimTarget
ldrb r0, [r5]
bl GetBattlerSide
lsls r4, 24
lsls r0, 24
cmp r4, r0
bne _080B43F6
ldrb r0, [r5]
bl GetBattlerPosition
lsls r0, 24
cmp r0, 0
beq _080B43E4
ldrb r0, [r5]
bl GetBattlerPosition
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _080B43F6
_080B43E4:
ldr r0, _080B4484 @ =gBattleAnimArgs
movs r2, 0x4
ldrsh r1, [r0, r2]
negs r1, r1
strh r1, [r0, 0x4]
movs r2, 0
ldrsh r1, [r0, r2]
negs r1, r1
strh r1, [r0]
_080B43F6:
adds r0, r7, 0
movs r1, 0x1
bl sub_8075160
ldr r5, _080B4488 @ =gBattleAnimTarget
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074480
adds r4, r0, 0
lsls r4, 24
ldr r6, _080B4484 @ =gBattleAnimArgs
lsrs r4, 24
ldrh r0, [r6, 0x4]
adds r4, r0
lsls r4, 16
lsrs r4, 16
ldrb r0, [r5]
movs r1, 0x3
bl sub_8074480
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
ldrh r2, [r6, 0x6]
adds r1, r2
lsls r1, 16
ldrh r2, [r7, 0x20]
lsls r0, r4, 16
asrs r0, 16
subs r0, r2
lsls r0, 16
asrs r0, 16
ldrh r2, [r7, 0x22]
lsrs r5, r1, 16
asrs r1, 16
subs r1, r2
lsls r1, 16
asrs r1, 16
bl sub_8075B30
lsls r0, 16
movs r1, 0xC0
lsls r1, 24
adds r0, r1
lsrs r0, 16
movs r3, 0x80
lsls r3, 1
str r0, [sp]
adds r0, r7, 0
movs r1, 0
adds r2, r3, 0
bl sub_8075A1C
ldrh r0, [r6, 0x8]
strh r0, [r7, 0x2E]
strh r4, [r7, 0x32]
strh r5, [r7, 0x36]
ldr r0, _080B448C @ =sub_8075590
str r0, [r7, 0x1C]
ldr r1, _080B4490 @ =DestroyAnimSprite
adds r0, r7, 0
bl StoreSpriteCallbackInData6
add sp, 0x4
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_080B4480: .4byte gBattleAnimAttacker
_080B4484: .4byte gBattleAnimArgs
_080B4488: .4byte gBattleAnimTarget
_080B448C: .4byte sub_8075590
_080B4490: .4byte DestroyAnimSprite
thumb_func_end sub_80B4364
thumb_func_start sub_80B4494
sub_80B4494: @ 80B4494
push {r4-r6,lr}
adds r6, r0, 0
movs r1, 0x1
bl sub_8075160
ldr r0, _080B4500 @ =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080B44B4
ldr r1, _080B4504 @ =gBattleAnimArgs
ldrh r0, [r1, 0x4]
negs r0, r0
strh r0, [r1, 0x4]
_080B44B4:
ldr r4, _080B4504 @ =gBattleAnimArgs
ldrh r0, [r4, 0x8]
strh r0, [r6, 0x2E]
ldr r5, _080B4508 @ =gBattleAnimTarget
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074480
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x4]
adds r0, r1
strh r0, [r6, 0x32]
ldrb r0, [r5]
movs r1, 0x3
bl sub_8074480
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x6]
adds r0, r1
strh r0, [r6, 0x36]
ldrh r0, [r4, 0xA]
strh r0, [r6, 0x38]
adds r0, r6, 0
bl sub_8075068
ldr r0, _080B450C @ =sub_80B4510
str r0, [r6, 0x1C]
adds r2, r6, 0
adds r2, 0x3E
ldrb r0, [r2]
movs r1, 0x4
orrs r0, r1
strb r0, [r2]
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_080B4500: .4byte gBattleAnimAttacker
_080B4504: .4byte gBattleAnimArgs
_080B4508: .4byte gBattleAnimTarget
_080B450C: .4byte sub_80B4510
thumb_func_end sub_80B4494
thumb_func_start sub_80B4510
sub_80B4510: @ 80B4510
push {r4-r7,lr}
mov r7, r8
push {r7}
sub sp, 0x14
adds r4, r0, 0
adds r2, r4, 0
adds r2, 0x3E
ldrb r0, [r2]
movs r1, 0x5
negs r1, r1
ands r1, r0
strb r1, [r2]
adds r0, r4, 0
bl AnimateBallThrow
lsls r0, 24
cmp r0, 0
beq _080B453C
adds r0, r4, 0
bl DestroyAnimSprite
b _080B45CC
_080B453C:
movs r0, 0x2E
adds r0, r4
mov r8, r0
ldrh r7, [r4, 0x20]
ldrh r5, [r4, 0x24]
ldrh r1, [r4, 0x22]
mov r12, r1
ldrh r6, [r4, 0x26]
mov r2, r8
add r1, sp, 0x4
movs r3, 0x7
_080B4552:
ldrh r0, [r2]
strh r0, [r1]
adds r2, 0x2
adds r1, 0x2
subs r3, 0x1
cmp r3, 0
bge _080B4552
adds r0, r7, r5
lsls r0, 16
lsrs r5, r0, 16
mov r2, r12
adds r0, r2, r6
lsls r0, 16
lsrs r6, r0, 16
adds r0, r4, 0
bl AnimateBallThrow
lsls r0, 24
cmp r0, 0
bne _080B45CC
ldrh r0, [r4, 0x24]
ldrh r1, [r4, 0x20]
adds r0, r1
lsls r1, r5, 16
asrs r1, 16
subs r0, r1
lsls r0, 16
asrs r0, 16
ldrh r1, [r4, 0x26]
ldrh r2, [r4, 0x22]
adds r1, r2
lsls r2, r6, 16
asrs r2, 16
subs r1, r2
lsls r1, 16
asrs r1, 16
bl sub_8075B30
lsls r0, 16
movs r1, 0xC0
lsls r1, 24
adds r0, r1
lsrs r0, 16
movs r3, 0x80
lsls r3, 1
str r0, [sp]
adds r0, r4, 0
movs r1, 0
adds r2, r3, 0
bl sub_8075A1C
add r2, sp, 0x4
mov r1, r8
movs r3, 0x7
_080B45BE:
ldrh r0, [r2]
strh r0, [r1]
adds r2, 0x2
adds r1, 0x2
subs r3, 0x1
cmp r3, 0
bge _080B45BE
_080B45CC:
add sp, 0x14
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_80B4510
thumb_func_start sub_80B45D8
sub_80B45D8: @ 80B45D8
push {r4,r5,lr}
adds r5, r0, 0
ldr r0, _080B45EC @ =gBattleAnimArgs
movs r1, 0
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080B45F4
ldr r4, _080B45F0 @ =gBattleAnimAttacker
b _080B45F6
.align 2, 0
_080B45EC: .4byte gBattleAnimArgs
_080B45F0: .4byte gBattleAnimAttacker
_080B45F4:
ldr r4, _080B4628 @ =gBattleAnimTarget
_080B45F6:
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
lsls r0, 24
lsrs r0, 24
adds r0, 0x12
strh r0, [r5, 0x22]
ldr r1, _080B462C @ =move_anim_8074EE0
adds r0, r5, 0
bl StoreSpriteCallbackInData6
ldr r0, _080B4630 @ =sub_8074F50
str r0, [r5, 0x1C]
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080B4628: .4byte gBattleAnimTarget
_080B462C: .4byte move_anim_8074EE0
_080B4630: .4byte sub_8074F50
thumb_func_end sub_80B45D8
.align 2, 0 @ Don't pad with nop.
asm/buy_menu_helpers.s
-220
View File
@@ -1,220 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_813F66C
sub_813F66C: @ 813F66C
push {r4,lr}
adds r4, r0, 0
cmp r4, 0x1
beq _0813F680
ldr r0, _0813F67C @ =gUnknown_8464804
bl InitWindows
b _0813F686
.align 2, 0
_0813F67C: .4byte gUnknown_8464804
_0813F680:
ldr r0, _0813F6CC @ =gUnknown_846483C
bl InitWindows
_0813F686:
bl DeactivateAllTextPrinters
movs r0, 0
movs r1, 0x1
movs r2, 0xD0
bl sub_815001C
movs r0, 0
movs r1, 0x13
movs r2, 0xE0
bl sub_814FEAC
movs r0, 0
movs r1, 0xA
movs r2, 0xF0
bl sub_814FF2C
movs r0, 0
bl PutWindowTilemap
movs r0, 0x4
bl PutWindowTilemap
movs r0, 0x5
bl PutWindowTilemap
cmp r4, 0x1
bne _0813F6C4
movs r0, 0x6
bl PutWindowTilemap
_0813F6C4:
pop {r4}
pop {r0}
bx r0
.align 2, 0
_0813F6CC: .4byte gUnknown_846483C
thumb_func_end sub_813F66C
thumb_func_start sub_813F6D0
sub_813F6D0: @ 813F6D0
push {lr}
ldr r0, _0813F6F0 @ =gSaveBlock1Ptr
ldr r0, [r0]
movs r1, 0xA4
lsls r1, 2
adds r0, r1
bl GetMoney
adds r3, r0, 0
movs r0, 0
movs r1, 0xA
movs r2, 0xF
bl PrintMoneyAmountInMoneyBoxWithBorder
pop {r0}
bx r0
.align 2, 0
_0813F6F0: .4byte gSaveBlock1Ptr
thumb_func_end sub_813F6D0
thumb_func_start sub_813F6F4
sub_813F6F4: @ 813F6F4
push {r4-r7,lr}
mov r7, r9
mov r6, r8
push {r6,r7}
sub sp, 0x14
mov r9, r3
ldr r3, [sp, 0x30]
ldr r4, [sp, 0x34]
ldr r6, [sp, 0x38]
ldr r5, [sp, 0x3C]
mov r8, r5
ldr r5, [sp, 0x40]
lsls r0, 24
lsrs r0, 24
lsls r1, 24
lsrs r1, 24
mov r7, r9
lsls r7, 24
lsrs r7, 24
mov r9, r7
lsls r3, 24
lsrs r3, 24
lsls r4, 24
lsrs r4, 24
lsls r6, 24
lsrs r6, 24
lsls r5, 24
lsrs r5, 24
str r4, [sp]
str r6, [sp, 0x4]
lsls r4, r5, 1
adds r4, r5
ldr r5, _0813F758 @ =gUnknown_8464884
adds r4, r5
str r4, [sp, 0x8]
mov r4, r8
lsls r4, 24
asrs r4, 24
str r4, [sp, 0xC]
str r2, [sp, 0x10]
mov r2, r9
bl AddTextPrinterParametrized2
add sp, 0x14
pop {r3,r4}
mov r8, r3
mov r9, r4
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_0813F758: .4byte gUnknown_8464884
thumb_func_end sub_813F6F4
thumb_func_start sub_813F75C
sub_813F75C: @ 813F75C
push {r4-r6,lr}
mov r6, r8
push {r6}
sub sp, 0x10
adds r5, r0, 0
adds r6, r1, 0
mov r8, r2
lsls r5, 24
lsrs r5, 24
bl sub_809B56C
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
bl GetTextSpeedSetting
lsls r0, 24
lsrs r0, 24
str r4, [sp]
str r0, [sp, 0x4]
str r6, [sp, 0x8]
mov r0, r8
str r0, [sp, 0xC]
adds r0, r5, 0
movs r1, 0x2
movs r2, 0x13
movs r3, 0xE
bl DisplayMessageAndContinueTask
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
add sp, 0x10
pop {r3}
mov r8, r3
pop {r4-r6}
pop {r0}
bx r0
thumb_func_end sub_813F75C
thumb_func_start sub_813F7A8
sub_813F7A8: @ 813F7A8
push {lr}
lsls r0, 24
lsrs r0, 24
lsls r1, 24
lsrs r1, 24
movs r2, 0x1
movs r3, 0xD
bl SetWindowBorderStyle
pop {r0}
bx r0
thumb_func_end sub_813F7A8
thumb_func_start sub_813F7C0
sub_813F7C0: @ 813F7C0
push {lr}
lsls r0, 24
lsrs r0, 24
lsls r1, 24
lsrs r1, 24
movs r2, 0xA
movs r3, 0xF
bl SetWindowBorderStyle
pop {r0}
bx r0
thumb_func_end sub_813F7C0
thumb_func_start sub_813F7D8
sub_813F7D8: @ 813F7D8
push {lr}
sub sp, 0x10
adds r3, r1, 0
lsls r0, 24
lsrs r0, 24
ldr r1, _0813F800 @ =gUnknown_846487C
movs r2, 0x2
str r2, [sp]
movs r2, 0x1
str r2, [sp, 0x4]
movs r2, 0xD
str r2, [sp, 0x8]
str r3, [sp, 0xC]
movs r2, 0x2
movs r3, 0
bl CreateYesNoMenuWithCallbacks
add sp, 0x10
pop {r0}
bx r0
.align 2, 0
_0813F800: .4byte gUnknown_846487C
thumb_func_end sub_813F7D8
.align 2, 0 @ Don't pad with nop.
asm/cable_car_util.s
-162
View File
@@ -1,162 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_80D9614
sub_80D9614: @ 80D9614
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x4
mov r10, r0
ldr r0, [sp, 0x24]
ldr r4, [sp, 0x28]
lsls r1, 16
lsrs r1, 16
mov r9, r1
lsls r2, 24
lsrs r2, 24
str r2, [sp]
lsls r3, 24
lsls r0, 24
lsrs r7, r0, 24
lsls r4, 24
lsrs r4, 24
mov r8, r4
movs r0, 0
lsrs r4, r3, 24
cmp r0, r8
bcs _080D968E
_080D9646:
ldr r2, [sp]
movs r3, 0
adds r6, r4, 0x1
adds r0, 0x1
mov r12, r0
cmp r3, r7
bcs _080D9678
lsls r5, r4, 6
_080D9656:
lsls r0, r2, 1
adds r0, r5
add r0, r10
mov r1, r9
strh r1, [r0]
adds r1, r2, 0x1
adds r0, r1, 0
asrs r0, 5
lsls r0, 5
subs r0, r1, r0
lsls r0, 24
lsrs r2, r0, 24
adds r0, r3, 0x1
lsls r0, 24
lsrs r3, r0, 24
cmp r3, r7
bcc _080D9656
_080D9678:
adds r0, r6, 0
asrs r0, 5
lsls r0, 5
subs r0, r6, r0
lsls r0, 24
lsrs r4, r0, 24
mov r1, r12
lsls r0, r1, 24
lsrs r0, 24
cmp r0, r8
bcc _080D9646
_080D968E:
add sp, 0x4
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_80D9614
thumb_func_start sub_80D96A0
sub_80D96A0: @ 80D96A0
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x4
mov r10, r0
ldr r0, [sp, 0x24]
ldr r4, [sp, 0x28]
lsls r2, 24
lsrs r2, 24
str r2, [sp]
lsls r3, 24
lsls r0, 24
lsrs r0, 24
mov r12, r0
lsls r4, 24
lsrs r4, 24
mov r9, r4
movs r0, 0
adds r5, r1, 0
lsrs r4, r3, 24
cmp r0, r9
bcs _080D971A
_080D96D0:
ldr r2, [sp]
movs r3, 0
adds r7, r4, 0x1
adds r0, 0x1
mov r8, r0
cmp r3, r12
bcs _080D9704
lsls r6, r4, 6
_080D96E0:
lsls r0, r2, 1
adds r0, r6
add r0, r10
ldrh r1, [r5]
strh r1, [r0]
adds r5, 0x2
adds r1, r2, 0x1
adds r0, r1, 0
asrs r0, 5
lsls r0, 5
subs r0, r1, r0
lsls r0, 24
lsrs r2, r0, 24
adds r0, r3, 0x1
lsls r0, 24
lsrs r3, r0, 24
cmp r3, r12
bcc _080D96E0
_080D9704:
adds r0, r7, 0
asrs r0, 5
lsls r0, 5
subs r0, r7, r0
lsls r0, 24
lsrs r4, r0, 24
mov r1, r8
lsls r0, r1, 24
lsrs r0, 24
cmp r0, r9
bcc _080D96D0
_080D971A:
add sp, 0x4
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_80D96A0
.align 2, 0 @ Don't pad with nop.
asm/cable_club.s
+10 -10
View File
@@ -55,7 +55,7 @@ sub_808078C: @ 808078C
lsrs r4, 24
adds r0, r4, 0
movs r1, 0
bl sub_80F7750
bl SetStdWindowBorderStyle
ldr r5, _080807E0 @ =gStringVar4
ldr r1, _080807E4 @ =gUnknown_841DF82
adds r0, r5, 0
@@ -943,7 +943,7 @@ _08080E9A:
lsls r1, r5, 8
ldr r0, _08080ED4 @ =gBlockRecvBuffer
adds r1, r0
ldr r0, _08080ED8 @ =gUnknown_2039624
ldr r0, _08080ED8 @ =gTrainerCards
lsls r4, r5, 1
adds r4, r5
lsls r4, 5
@@ -958,12 +958,12 @@ _08080E9A:
.align 2, 0
_08080ED0: .4byte gLinkPlayers
_08080ED4: .4byte gBlockRecvBuffer
_08080ED8: .4byte gUnknown_2039624
_08080ED8: .4byte gTrainerCards
_08080EDC:
lsls r1, r5, 8
ldr r0, _08080F3C @ =gBlockRecvBuffer
adds r1, r0
ldr r2, _08080F40 @ =gUnknown_2039624
ldr r2, _08080F40 @ =gTrainerCards
lsls r0, r5, 1
adds r0, r5
lsls r0, 5
@@ -1004,7 +1004,7 @@ _08080EF8:
b _08080F66
.align 2, 0
_08080F3C: .4byte gBlockRecvBuffer
_08080F40: .4byte gUnknown_2039624
_08080F40: .4byte gTrainerCards
_08080F44: .4byte gSpecialVar_Result
_08080F48: .4byte gLinkType
_08080F4C: .4byte 0x00004411
@@ -1935,12 +1935,12 @@ sub_8081668: @ 8081668
ldrb r0, [r0]
movs r5, 0x1
eors r0, r5
bl sub_80CD98C
bl TryRecordLinkBattleOutcome
ldr r0, _080816C0 @ =gWirelessCommType
ldrb r0, [r0]
cmp r0, 0
beq _0808170A
ldr r0, _080816C4 @ =gUnknown_2023E8A
ldr r0, _080816C4 @ =gBattleOutcome
ldrb r0, [r0]
cmp r0, 0x1
beq _080816C8
@@ -1953,7 +1953,7 @@ _080816B4: .4byte 0x0000ffdf
_080816B8: .4byte gSpecialVar_0x8004
_080816BC: .4byte gUnknown_300502C
_080816C0: .4byte gWirelessCommType
_080816C4: .4byte gUnknown_2023E8A
_080816C4: .4byte gBattleOutcome
_080816C8:
ldr r4, _080816E8 @ =gLinkPlayers
bl GetMultiplayerId
@@ -2387,13 +2387,13 @@ sp02A_crash_sound: @ 8081A1C
push {lr}
ldr r0, _08081A2C @ =gSpecialVar_0x8006
ldrb r0, [r0]
ldr r1, _08081A30 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
ldr r1, _08081A30 @ =CB2_ReturnToFieldContinueScriptPlayMapMusic
bl sub_808B700
pop {r0}
bx r0
.align 2, 0
_08081A2C: .4byte gSpecialVar_0x8006
_08081A30: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
_08081A30: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
thumb_func_end sp02A_crash_sound
thumb_func_start sub_8081A34
asm/cereader_tool.s
-196
View File
@@ -1,196 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_815D654
sub_815D654: @ 815D654
push {lr}
ldr r0, _0815D674 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _0815D678 @ =0x00003d41
adds r0, r1
ldrb r1, [r0]
adds r2, r1, 0x1
adds r0, r2, 0
asrs r0, 8
lsls r0, 8
subs r0, r2, r0
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
.align 2, 0
_0815D674: .4byte gSaveBlock1Ptr
_0815D678: .4byte 0x00003d41
thumb_func_end sub_815D654
thumb_func_start sub_815D67C
sub_815D67C: @ 815D67C
push {r4,r5,lr}
adds r5, r0, 0
ldrb r0, [r5, 0x1]
subs r0, 0x1
lsls r0, 24
lsrs r0, 24
cmp r0, 0x7
bhi _0815D6AA
ldrb r0, [r5, 0x2]
cmp r0, 0x2
bhi _0815D6AA
movs r4, 0xF7
lsls r4, 2
adds r0, r5, 0
adds r1, r4, 0
bl CalcByteArraySum
adds r4, r5, r4
ldr r1, [r4]
cmp r0, r1
bne _0815D6AA
movs r0, 0x1
b _0815D6AC
_0815D6AA:
movs r0, 0
_0815D6AC:
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end sub_815D67C
thumb_func_start sub_815D6B4
sub_815D6B4: @ 815D6B4
push {r4-r7,lr}
adds r7, r0, 0
ldrb r6, [r7]
subs r0, r6, 0x1
cmp r0, 0x7
bhi _0815D6F8
movs r5, 0
cmp r5, r6
bcs _0815D6E0
adds r4, r7, 0
adds r4, 0x8
_0815D6CA:
adds r0, r4, 0
bl sub_815D67C
cmp r0, 0
beq _0815D6F8
movs r0, 0xF8
lsls r0, 2
adds r4, r0
adds r5, 0x1
cmp r5, r6
bcc _0815D6CA
_0815D6E0:
adds r0, r7, 0
adds r0, 0x8
lsls r1, r6, 5
subs r1, r6
lsls r1, 5
bl CalcByteArraySum
ldr r1, [r7, 0x4]
cmp r0, r1
bne _0815D6F8
movs r0, 0x1
b _0815D6FA
_0815D6F8:
movs r0, 0
_0815D6FA:
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_815D6B4
thumb_func_start sub_815D700
sub_815D700: @ 815D700
push {r4-r6,lr}
adds r5, r0, 0
adds r4, r1, 0
ldrh r0, [r5, 0x2]
cmp r0, 0
beq _0815D718
ldr r0, _0815D77C @ =gUnknown_8479CD8 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/cereader_tool.c"
ldr r2, _0815D780 @ =gUnknown_8479D10 "ttdata->dummy == 0"
movs r1, 0xC6
movs r3, 0x1
bl AGBAssert
_0815D718:
ldrb r0, [r5, 0x1]
cmp r0, 0
beq _0815D72A
ldr r0, _0815D77C @ =gUnknown_8479CD8 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/cereader_tool.c"
ldr r2, _0815D784 @ =gUnknown_8479D24 "ttdata->id == 0"
movs r1, 0xC7
movs r3, 0x1
bl AGBAssert
_0815D72A:
movs r6, 0x80
lsls r6, 5
adds r0, r4, 0
movs r1, 0
adds r2, r6, 0
bl memset
ldr r2, _0815D788 @ =0x00000f88
adds r0, r4, 0
adds r1, r5, 0
bl memcpy
bl sub_815D654
strb r0, [r4, 0x1]
movs r0, 0x1E
adds r1, r4, 0
bl sub_80DA5E0
cmp r0, 0x1
bne _0815D78C
adds r0, r4, 0
movs r1, 0
adds r2, r6, 0
bl memset
ldr r0, _0815D788 @ =0x00000f88
adds r1, r5, r0
movs r2, 0xF8
lsls r2, 4
adds r0, r4, 0
bl memcpy
movs r0, 0x1F
adds r1, r4, 0
bl sub_80DA5E0
cmp r0, 0x1
bne _0815D78C
movs r0, 0x1
b _0815D78E
.align 2, 0
_0815D77C: .4byte gUnknown_8479CD8
_0815D780: .4byte gUnknown_8479D10
_0815D784: .4byte gUnknown_8479D24
_0815D788: .4byte 0x00000f88
_0815D78C:
movs r0, 0
_0815D78E:
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end sub_815D700
thumb_func_start sub_815D794
sub_815D794: @ 815D794
push {r4,r5,lr}
adds r4, r0, 0
movs r0, 0x80
lsls r0, 5
bl AllocZeroed
adds r5, r0, 0
adds r0, r4, 0
adds r1, r5, 0
bl sub_815D700
adds r4, r0, 0
adds r0, r5, 0
bl Free
adds r0, r4, 0
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end sub_815D794
.align 2, 0 @ Don't pad with nop.
asm/clear_save_data_screen.s
+6 -6
View File
@@ -109,18 +109,18 @@ _080F564A:
movs r0, 0
movs r1, 0x1
movs r2, 0xF0
bl sub_814FF2C
bl TextWindow_SetStdFrame0_WithPal
movs r0, 0x1
movs r1, 0x1
movs r2, 0xF0
bl sub_814FF2C
bl TextWindow_SetStdFrame0_WithPal
b _080F56E2
_080F5660:
movs r0, 0x1
movs r1, 0x1
movs r2, 0x1
movs r3, 0xF
bl SetWindowBorderStyle
bl DrawStdFrameWithCustomTileAndPalette
movs r0, 0x1
str r0, [sp]
str r0, [sp, 0x4]
@@ -134,7 +134,7 @@ _080F5660:
movs r1, 0x2
movs r2, 0
movs r3, 0x3
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
movs r0, 0x1
movs r1, 0x2
bl CopyWindowToVram
@@ -241,7 +241,7 @@ _080F5744:
movs r1, 0x2
movs r2, 0
movs r3, 0x3
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
movs r0, 0x1
movs r1, 0x3
bl CopyWindowToVram
@@ -304,7 +304,7 @@ _080F57D4:
lsrs r4, r0, 24
cmp r4, 0
bne _080F57FE
bl sub_81100E8
bl DestroyYesNoMenu
adds r0, r6, 0
bl DestroyTask
bl FreeAllWindowBuffers
asm/credits.s
+10 -10
View File
@@ -422,7 +422,7 @@ _080F3D0A:
movs r1, 0x1
movs r2, 0x8
movs r3, 0x29
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
ldr r1, [r7]
movs r0, 0x5
b _080F413C
@@ -649,7 +649,7 @@ _080F3EB4:
movs r1, 0x1
movs r2, 0x2
movs r3, 0x6
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
ldr r1, [r7]
movs r0, 0x8
b _080F3FB8
@@ -696,7 +696,7 @@ _080F3F24:
movs r1, 0x2
movs r2, 0x8
movs r3, 0x6
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
ldr r1, [r7]
movs r0, 0x9
b _080F3FB8
@@ -1987,7 +1987,7 @@ _080F49D8:
ands r1, r3
orrs r1, r2
str r1, [r0, 0x4]
bl LoadCompressedObjectPic
bl LoadCompressedSpriteSheet
ldr r0, _080F4A1C @ =gUnknown_8410E10
b _080F4A36
.align 2, 0
@@ -2005,7 +2005,7 @@ _080F4A20:
strh r1, [r0, 0x4]
ldrh r1, [r6, 0x2]
strh r1, [r0, 0x6]
bl LoadCompressedObjectPic
bl LoadCompressedSpriteSheet
ldr r0, _080F4A48 @ =gUnknown_8411BF8
_080F4A36:
movs r1, 0xF8
@@ -2025,7 +2025,7 @@ _080F4A4C:
strh r1, [r0, 0x4]
ldrh r1, [r6, 0x2]
strh r1, [r0, 0x6]
bl LoadCompressedObjectPic
bl LoadCompressedSpriteSheet
ldr r0, _080F4ADC @ =gUnknown_84129A0
movs r1, 0xF8
lsls r1, 1
@@ -2107,7 +2107,7 @@ _080F4AFE:
strh r1, [r0, 0x4]
ldrh r1, [r6, 0x8]
strh r1, [r0, 0x6]
bl LoadCompressedObjectPic
bl LoadCompressedSpriteSheet
ldr r0, _080F4B1C @ =gUnknown_8413318
b _080F4B8A
.align 2, 0
@@ -2122,7 +2122,7 @@ _080F4B20:
strh r1, [r0, 0x4]
ldrh r1, [r6, 0x8]
strh r1, [r0, 0x6]
bl LoadCompressedObjectPic
bl LoadCompressedSpriteSheet
ldr r0, _080F4B4C @ =gUnknown_8413318
movs r1, 0xF0
lsls r1, 1
@@ -2144,7 +2144,7 @@ _080F4B54:
strh r1, [r0, 0x4]
ldrh r1, [r6, 0x8]
strh r1, [r0, 0x6]
bl LoadCompressedObjectPic
bl LoadCompressedSpriteSheet
ldr r0, _080F4B70 @ =gUnknown_8413854
b _080F4B8A
.align 2, 0
@@ -2159,7 +2159,7 @@ _080F4B74:
strh r1, [r0, 0x4]
ldrh r1, [r6, 0x8]
strh r1, [r0, 0x6]
bl LoadCompressedObjectPic
bl LoadCompressedSpriteSheet
ldr r0, _080F4BF0 @ =gUnknown_8413D98
_080F4B8A:
movs r1, 0xF0
asm/dark.s
+2323
View File
File diff suppressed because it is too large Load Diff
asm/decompress.s
-887
View File
@@ -1,887 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start LZDecompressWram
LZDecompressWram: @ 800EBB4
push {lr}
bl LZ77UnCompWram
pop {r0}
bx r0
thumb_func_end LZDecompressWram
thumb_func_start LZDecompressVram
LZDecompressVram: @ 800EBC0
push {lr}
bl LZ77UnCompVram
pop {r0}
bx r0
thumb_func_end LZDecompressVram
thumb_func_start LoadCompressedObjectPic
LoadCompressedObjectPic: @ 800EBCC
push {r4,r5,lr}
sub sp, 0x8
adds r4, r0, 0
ldr r0, [r4]
ldr r5, _0800EBFC @ =gDecompressionBuffer
adds r1, r5, 0
bl LZ77UnCompWram
str r5, [sp]
ldrh r1, [r4, 0x6]
lsls r1, 16
ldrh r0, [r4, 0x4]
orrs r0, r1
str r0, [sp, 0x4]
mov r0, sp
bl LoadSpriteSheet
lsls r0, 16
lsrs r0, 16
add sp, 0x8
pop {r4,r5}
pop {r1}
bx r1
.align 2, 0
_0800EBFC: .4byte gDecompressionBuffer
thumb_func_end LoadCompressedObjectPic
thumb_func_start LoadCompressedObjectPicOverrideBuffer
LoadCompressedObjectPicOverrideBuffer: @ 800EC00
push {r4,r5,lr}
sub sp, 0x8
adds r4, r0, 0
adds r5, r1, 0
ldr r0, [r4]
bl LZ77UnCompWram
str r5, [sp]
ldrh r1, [r4, 0x6]
lsls r1, 16
ldrh r0, [r4, 0x4]
orrs r0, r1
str r0, [sp, 0x4]
mov r0, sp
bl LoadSpriteSheet
add sp, 0x8
pop {r4,r5}
pop {r0}
bx r0
thumb_func_end LoadCompressedObjectPicOverrideBuffer
thumb_func_start LoadCompressedObjectPalette
LoadCompressedObjectPalette: @ 800EC28
push {r4,r5,lr}
sub sp, 0x8
adds r5, r0, 0
ldr r0, [r5]
ldr r4, _0800EC54 @ =gDecompressionBuffer
adds r1, r4, 0
bl LZ77UnCompWram
str r4, [sp]
ldrh r2, [r5, 0x4]
ldr r1, _0800EC58 @ =0xffff0000
ldr r0, [sp, 0x4]
ands r0, r1
orrs r0, r2
str r0, [sp, 0x4]
mov r0, sp
bl LoadSpritePalette
add sp, 0x8
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_0800EC54: .4byte gDecompressionBuffer
_0800EC58: .4byte 0xffff0000
thumb_func_end LoadCompressedObjectPalette
thumb_func_start LoadCompressedObjectPaletteOverrideBuffer
LoadCompressedObjectPaletteOverrideBuffer: @ 800EC5C
push {r4,r5,lr}
sub sp, 0x8
adds r5, r0, 0
adds r4, r1, 0
ldr r0, [r5]
bl LZ77UnCompWram
str r4, [sp]
ldrh r2, [r5, 0x4]
ldr r1, _0800EC88 @ =0xffff0000
ldr r0, [sp, 0x4]
ands r0, r1
orrs r0, r2
str r0, [sp, 0x4]
mov r0, sp
bl LoadSpritePalette
add sp, 0x8
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_0800EC88: .4byte 0xffff0000
thumb_func_end LoadCompressedObjectPaletteOverrideBuffer
thumb_func_start DecompressPicFromTable
DecompressPicFromTable: @ 800EC8C
push {r4,r5,lr}
adds r3, r0, 0
adds r4, r1, 0
adds r5, r2, 0
movs r0, 0xCE
lsls r0, 1
cmp r5, r0
ble _0800ECAC
ldr r0, _0800ECA8 @ =gMonFrontPicTable
ldr r0, [r0]
bl LZ77UnCompWram
b _0800ECB4
.align 2, 0
_0800ECA8: .4byte gMonFrontPicTable
_0800ECAC:
ldr r0, [r3]
adds r1, r4, 0
bl LZ77UnCompWram
_0800ECB4:
adds r0, r4, 0
adds r1, r5, 0
bl sub_800EDAC
pop {r4,r5}
pop {r0}
bx r0
thumb_func_end DecompressPicFromTable
thumb_func_start sub_800ECC4
sub_800ECC4: @ 800ECC4
push {r4,r5,lr}
sub sp, 0x4
adds r4, r0, 0
adds r5, r1, 0
lsls r0, r2, 3
ldr r1, _0800ECEC @ =gMonFrontPicTable
adds r0, r1
movs r1, 0
cmp r4, r0
bne _0800ECDA
movs r1, 0x1
_0800ECDA:
str r1, [sp]
adds r0, r4, 0
adds r1, r5, 0
bl LoadSpecialPokePic
add sp, 0x4
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_0800ECEC: .4byte gMonFrontPicTable
thumb_func_end sub_800ECC4
thumb_func_start LoadSpecialPokePic
LoadSpecialPokePic: @ 800ECF0
push {r4-r7,lr}
mov r7, r8
push {r7}
adds r6, r0, 0
adds r4, r1, 0
adds r7, r2, 0
adds r5, r3, 0
ldr r0, [sp, 0x18]
lsls r0, 24
lsrs r0, 24
mov r8, r0
cmp r7, 0xC9
bne _0800ED6C
movs r0, 0xC0
lsls r0, 18
ands r0, r5
lsrs r0, 18
movs r1, 0xC0
lsls r1, 10
ands r1, r5
lsrs r1, 12
orrs r0, r1
movs r1, 0xC0
lsls r1, 2
ands r1, r5
lsrs r1, 6
orrs r0, r1
movs r1, 0x3
ands r1, r5
orrs r0, r1
movs r1, 0x1C
bl __umodsi3
lsls r0, 16
lsrs r1, r0, 16
cmp r1, 0
bne _0800ED3E
movs r1, 0xC9
b _0800ED48
_0800ED3E:
movs r2, 0xCE
lsls r2, 1
adds r0, r1, r2
lsls r0, 16
lsrs r1, r0, 16
_0800ED48:
mov r0, r8
cmp r0, 0
bne _0800ED5C
ldr r0, _0800ED58 @ =gMonBackPicTable
lsls r1, 3
adds r1, r0
ldr r0, [r1]
b _0800ED78
.align 2, 0
_0800ED58: .4byte gMonBackPicTable
_0800ED5C:
ldr r0, _0800ED68 @ =gMonFrontPicTable
lsls r1, 3
adds r1, r0
ldr r0, [r1]
b _0800ED78
.align 2, 0
_0800ED68: .4byte gMonFrontPicTable
_0800ED6C:
movs r0, 0xCE
lsls r0, 1
cmp r7, r0
ble _0800ED84
ldr r0, _0800ED80 @ =gMonFrontPicTable
ldr r0, [r0]
_0800ED78:
adds r1, r4, 0
bl LZ77UnCompWram
b _0800ED8C
.align 2, 0
_0800ED80: .4byte gMonFrontPicTable
_0800ED84:
ldr r0, [r6]
adds r1, r4, 0
bl LZ77UnCompWram
_0800ED8C:
adds r0, r4, 0
adds r1, r7, 0
bl sub_800EDAC
lsls r0, r7, 16
lsrs r0, 16
adds r1, r5, 0
adds r2, r4, 0
mov r3, r8
bl DrawSpindaSpots
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end LoadSpecialPokePic
thumb_func_start sub_800EDAC
sub_800EDAC: @ 800EDAC
push {lr}
adds r3, r0, 0
movs r0, 0xCD
lsls r0, 1
cmp r1, r0
bne _0800EDC6
movs r1, 0x80
lsls r1, 4
adds r0, r3, r1
ldr r2, _0800EDCC @ =0x04000200
adds r1, r3, 0
bl CpuSet
_0800EDC6:
pop {r0}
bx r0
.align 2, 0
_0800EDCC: .4byte 0x04000200
thumb_func_end sub_800EDAC
thumb_func_start sub_800EDD0
sub_800EDD0: @ 800EDD0
push {lr}
ldr r0, [r0]
bl LZ77UnCompWram
pop {r0}
bx r0
thumb_func_end sub_800EDD0
thumb_func_start sub_800EDDC
sub_800EDDC: @ 800EDDC
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x24
mov r9, r0
str r1, [sp]
str r2, [sp, 0x4]
adds r5, r3, 0
movs r0, 0x1
mov r1, r9
ands r0, r1
cmp r0, 0
bne _0800EDFC
b _0800EF94
_0800EDFC:
asrs r0, r1, 1
adds r0, 0x4
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x8]
movs r0, 0
ldr r2, [sp]
cmp r0, r2
blt _0800EE10
b _0800F024
_0800EE10:
movs r4, 0x8
subs r1, r4, r1
str r1, [sp, 0x10]
_0800EE16:
movs r7, 0
adds r0, 0x1
str r0, [sp, 0x14]
ldr r0, [sp, 0x10]
cmp r7, r0
bge _0800EE92
ldr r1, [sp, 0x8]
lsls r1, 8
str r1, [sp, 0x18]
movs r2, 0
mov r10, r2
mov r0, r9
movs r4, 0x8
subs r0, r4, r0
str r0, [sp, 0xC]
_0800EE34:
movs r3, 0
asrs r0, r7, 1
adds r1, r7, 0
movs r2, 0x1
ands r1, r2
str r1, [sp, 0x20]
lsls r0, 8
mov r8, r0
mov r12, r5
_0800EE46:
lsls r1, r3, 5
ldr r4, [sp, 0x18]
adds r0, r5, r4
adds r0, r1
mov r1, r8
adds r2, r0, r1
mov r1, r12
add r1, r8
movs r6, 0xF
_0800EE58:
ldr r4, [sp, 0x20]
cmp r4, 0
bne _0800EE68
strb r4, [r1]
add r4, sp, 0x20
ldrb r4, [r4]
strb r4, [r2, 0x10]
b _0800EE76
_0800EE68:
mov r0, r10
strb r0, [r1, 0x10]
movs r4, 0x80
lsls r4, 1
adds r4, r2, r4
str r4, [sp, 0x1C]
strb r0, [r4]
_0800EE76:
adds r2, 0x1
adds r1, 0x1
subs r6, 0x1
cmp r6, 0
bge _0800EE58
movs r0, 0x20
add r12, r0
adds r3, 0x1
cmp r3, 0x7
ble _0800EE46
adds r7, 0x1
ldr r1, [sp, 0xC]
cmp r7, r1
blt _0800EE34
_0800EE92:
movs r7, 0
movs r2, 0
_0800EE96:
movs r6, 0
adds r4, r7, 0x1
mov r8, r4
lsls r4, r7, 5
_0800EE9E:
adds r0, r6, 0x1
mov r10, r0
lsls r1, r6, 8
adds r0, r1, 0
adds r0, 0xC0
adds r0, r5, r0
adds r0, r4
adds r1, r5, r1
adds r1, r4
movs r3, 0x1F
_0800EEB2:
strb r2, [r1]
strb r2, [r0]
adds r0, 0x1
adds r1, 0x1
subs r3, 0x1
cmp r3, 0
bge _0800EEB2
mov r6, r10
cmp r6, 0x7
ble _0800EE9E
mov r7, r8
cmp r7, 0x1
ble _0800EE96
mov r1, r9
cmp r1, 0x5
bne _0800EED8
movs r2, 0x90
lsls r2, 1
adds r5, r2
_0800EED8:
movs r7, 0
cmp r7, r9
bge _0800EF6E
_0800EEDE:
movs r3, 0
adds r7, 0x1
mov r8, r7
cmp r3, r9
bge _0800EF4E
_0800EEE8:
adds r3, 0x1
mov r10, r3
ldr r4, [sp, 0x4]
adds r4, 0x20
adds r7, r5, 0
adds r7, 0x20
movs r0, 0x12
adds r0, r5
mov r12, r0
ldr r2, [sp, 0x4]
adds r3, r5, 0
movs r6, 0x3
_0800EF00:
ldrb r0, [r2]
mov r1, r12
strb r0, [r1]
ldrb r0, [r2, 0x1]
strb r0, [r1, 0x1]
ldrb r0, [r2, 0x2]
strb r0, [r1, 0x1E]
ldrb r0, [r2, 0x3]
strb r0, [r1, 0x1F]
movs r0, 0x81
lsls r0, 1
adds r1, r3, r0
ldrb r0, [r2, 0x10]
strb r0, [r1]
ldr r0, _0800EF58 @ =0x00000103
adds r1, r3, r0
ldrb r0, [r2, 0x11]
strb r0, [r1]
movs r0, 0x90
lsls r0, 1
adds r1, r3, r0
ldrb r0, [r2, 0x12]
strb r0, [r1]
ldr r0, _0800EF5C @ =0x00000121
adds r1, r3, r0
ldrb r0, [r2, 0x13]
strb r0, [r1]
movs r1, 0x4
add r12, r1
adds r2, 0x4
adds r3, 0x4
subs r6, 0x1
cmp r6, 0
bge _0800EF00
str r4, [sp, 0x4]
adds r5, r7, 0
mov r3, r10
cmp r3, r9
blt _0800EEE8
_0800EF4E:
mov r2, r9
cmp r2, 0x7
bne _0800EF60
adds r5, 0x20
b _0800EF68
.align 2, 0
_0800EF58: .4byte 0x00000103
_0800EF5C: .4byte 0x00000121
_0800EF60:
mov r4, r9
cmp r4, 0x5
bne _0800EF68
adds r5, 0x60
_0800EF68:
mov r7, r8
cmp r7, r9
blt _0800EEDE
_0800EF6E:
mov r0, r9
cmp r0, 0x7
bne _0800EF7C
movs r1, 0x80
lsls r1, 1
adds r5, r1
b _0800EF88
_0800EF7C:
mov r2, r9
cmp r2, 0x5
bne _0800EF88
movs r4, 0xF0
lsls r4, 1
adds r5, r4
_0800EF88:
ldr r0, [sp, 0x14]
ldr r1, [sp]
cmp r0, r1
bge _0800EF92
b _0800EE16
_0800EF92:
b _0800F024
_0800EF94:
movs r6, 0
ldr r2, [sp]
cmp r6, r2
bge _0800F024
_0800EF9C:
adds r6, 0x1
mov r10, r6
mov r4, r9
cmp r4, 0x6
bne _0800EFB4
movs r0, 0
movs r3, 0xFF
_0800EFAA:
strb r0, [r5]
adds r5, 0x1
subs r3, 0x1
cmp r3, 0
bge _0800EFAA
_0800EFB4:
movs r7, 0
cmp r7, r9
bge _0800F008
_0800EFBA:
adds r7, 0x1
mov r8, r7
mov r1, r9
lsls r0, r1, 5
cmp r1, 0x6
bne _0800EFD4
movs r1, 0
movs r3, 0x1F
_0800EFCA:
strb r1, [r5]
adds r5, 0x1
subs r3, 0x1
cmp r3, 0
bge _0800EFCA
_0800EFD4:
adds r1, r0, 0
cmp r1, 0
ble _0800EFEE
adds r3, r1, 0
_0800EFDC:
ldr r2, [sp, 0x4]
ldrb r0, [r2]
strb r0, [r5]
adds r2, 0x1
str r2, [sp, 0x4]
adds r5, 0x1
subs r3, 0x1
cmp r3, 0
bne _0800EFDC
_0800EFEE:
mov r4, r9
cmp r4, 0x6
bne _0800F002
movs r0, 0
movs r3, 0x1F
_0800EFF8:
strb r0, [r5]
adds r5, 0x1
subs r3, 0x1
cmp r3, 0
bge _0800EFF8
_0800F002:
mov r7, r8
cmp r7, r9
blt _0800EFBA
_0800F008:
mov r0, r9
cmp r0, 0x6
bne _0800F01C
movs r0, 0
movs r3, 0xFF
_0800F012:
strb r0, [r5]
adds r5, 0x1
subs r3, 0x1
cmp r3, 0
bge _0800F012
_0800F01C:
mov r6, r10
ldr r1, [sp]
cmp r6, r1
blt _0800EF9C
_0800F024:
add sp, 0x24
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_800EDDC
thumb_func_start sub_800F034
sub_800F034: @ 800F034
push {r4,r5,lr}
sub sp, 0x8
adds r4, r0, 0
ldr r0, [r4]
ldr r0, [r0]
lsrs r0, 8
bl AllocZeroed
adds r5, r0, 0
cmp r5, 0
beq _0800F06E
ldr r0, [r4]
adds r1, r5, 0
bl LZ77UnCompWram
str r5, [sp]
ldrh r1, [r4, 0x6]
lsls r1, 16
ldrh r0, [r4, 0x4]
orrs r0, r1
str r0, [sp, 0x4]
mov r0, sp
bl LoadSpriteSheet
adds r0, r5, 0
bl Free
movs r0, 0
b _0800F070
_0800F06E:
movs r0, 0x1
_0800F070:
add sp, 0x8
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end sub_800F034
thumb_func_start sub_800F078
sub_800F078: @ 800F078
push {r4,r5,lr}
sub sp, 0x8
adds r4, r0, 0
ldr r0, [r4]
ldr r0, [r0]
lsrs r0, 8
bl AllocZeroed
adds r5, r0, 0
cmp r5, 0
beq _0800F0B8
ldr r0, [r4]
adds r1, r5, 0
bl LZ77UnCompWram
str r5, [sp]
ldrh r2, [r4, 0x4]
ldr r1, _0800F0B4 @ =0xffff0000
ldr r0, [sp, 0x4]
ands r0, r1
orrs r0, r2
str r0, [sp, 0x4]
mov r0, sp
bl LoadSpritePalette
adds r0, r5, 0
bl Free
movs r0, 0
b _0800F0BA
.align 2, 0
_0800F0B4: .4byte 0xffff0000
_0800F0B8:
movs r0, 0x1
_0800F0BA:
add sp, 0x8
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end sub_800F078
thumb_func_start GetDecompressedDataSize
GetDecompressedDataSize: @ 800F0C4
sub sp, 0x4
mov r3, sp
ldrb r2, [r0, 0x1]
mov r1, sp
strb r2, [r1]
ldrb r1, [r0, 0x2]
strb r1, [r3, 0x1]
ldrb r0, [r0, 0x3]
strb r0, [r3, 0x2]
movs r0, 0
strb r0, [r3, 0x3]
ldr r0, [sp]
add sp, 0x4
bx lr
thumb_func_end GetDecompressedDataSize
thumb_func_start DecompressPicFromTable_DontHandleDeoxys
DecompressPicFromTable_DontHandleDeoxys: @ 800F0E0
push {lr}
adds r3, r0, 0
movs r0, 0xCE
lsls r0, 1
cmp r2, r0
ble _0800F0FC
ldr r0, _0800F0F8 @ =gMonFrontPicTable
ldr r0, [r0]
bl LZ77UnCompWram
b _0800F102
.align 2, 0
_0800F0F8: .4byte gMonFrontPicTable
_0800F0FC:
ldr r0, [r3]
bl LZ77UnCompWram
_0800F102:
pop {r0}
bx r0
thumb_func_end DecompressPicFromTable_DontHandleDeoxys
thumb_func_start HandleLoadSpecialPokePic_DontHandleDeoxys
HandleLoadSpecialPokePic_DontHandleDeoxys: @ 800F108
push {r4,r5,lr}
sub sp, 0x4
adds r4, r0, 0
adds r5, r1, 0
lsls r0, r2, 3
ldr r1, _0800F130 @ =gMonFrontPicTable
adds r0, r1
movs r1, 0
cmp r4, r0
bne _0800F11E
movs r1, 0x1
_0800F11E:
str r1, [sp]
adds r0, r4, 0
adds r1, r5, 0
bl LoadSpecialPokePic_DontHandleDeoxys
add sp, 0x4
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_0800F130: .4byte gMonFrontPicTable
thumb_func_end HandleLoadSpecialPokePic_DontHandleDeoxys
thumb_func_start LoadSpecialPokePic_DontHandleDeoxys
LoadSpecialPokePic_DontHandleDeoxys: @ 800F134
push {r4-r7,lr}
mov r7, r8
push {r7}
adds r6, r0, 0
adds r5, r1, 0
adds r7, r2, 0
adds r4, r3, 0
ldr r0, [sp, 0x18]
lsls r0, 24
lsrs r0, 24
mov r8, r0
cmp r7, 0xC9
bne _0800F1B0
movs r0, 0xC0
lsls r0, 18
ands r0, r4
lsrs r0, 18
movs r1, 0xC0
lsls r1, 10
ands r1, r4
lsrs r1, 12
orrs r0, r1
movs r1, 0xC0
lsls r1, 2
ands r1, r4
lsrs r1, 6
orrs r0, r1
movs r1, 0x3
ands r1, r4
orrs r0, r1
movs r1, 0x1C
bl __umodsi3
lsls r0, 16
lsrs r1, r0, 16
cmp r1, 0
bne _0800F182
movs r1, 0xC9
b _0800F18C
_0800F182:
movs r2, 0xCE
lsls r2, 1
adds r0, r1, r2
lsls r0, 16
lsrs r1, r0, 16
_0800F18C:
mov r0, r8
cmp r0, 0
bne _0800F1A0
ldr r0, _0800F19C @ =gMonBackPicTable
lsls r1, 3
adds r1, r0
ldr r0, [r1]
b _0800F1BC
.align 2, 0
_0800F19C: .4byte gMonBackPicTable
_0800F1A0:
ldr r0, _0800F1AC @ =gMonFrontPicTable
lsls r1, 3
adds r1, r0
ldr r0, [r1]
b _0800F1BC
.align 2, 0
_0800F1AC: .4byte gMonFrontPicTable
_0800F1B0:
movs r0, 0xCE
lsls r0, 1
cmp r7, r0
ble _0800F1C8
ldr r0, _0800F1C4 @ =gMonFrontPicTable
ldr r0, [r0]
_0800F1BC:
adds r1, r5, 0
bl LZ77UnCompWram
b _0800F1D0
.align 2, 0
_0800F1C4: .4byte gMonFrontPicTable
_0800F1C8:
ldr r0, [r6]
adds r1, r5, 0
bl LZ77UnCompWram
_0800F1D0:
lsls r0, r7, 16
lsrs r0, 16
adds r1, r4, 0
adds r2, r5, 0
mov r3, r8
bl DrawSpindaSpots
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end LoadSpecialPokePic_DontHandleDeoxys
.align 2, 0 @ Don't pad with nop.
asm/diploma.s
-607
View File
@@ -1,607 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_80F4BFC
sub_80F4BFC: @ 80F4BFC
push {lr}
bl LoadOam
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_80F4BFC
thumb_func_start sub_80F4C10
sub_80F4C10: @ 80F4C10
push {r4,lr}
ldr r4, _080F4C40 @ =gUnknown_203AB48
ldr r0, _080F4C44 @ =0x00001004
bl AllocZeroed
str r0, [r4]
movs r1, 0
strb r1, [r0]
ldr r0, [r4]
strb r1, [r0, 0x1]
ldr r0, [r4]
strb r1, [r0, 0x2]
bl sub_80F4E24
ldr r0, _080F4C48 @ =sub_80F4C68
movs r1, 0
bl CreateTask
ldr r0, _080F4C4C @ =sub_80F4C50
bl SetMainCallback2
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080F4C40: .4byte gUnknown_203AB48
_080F4C44: .4byte 0x00001004
_080F4C48: .4byte sub_80F4C68
_080F4C4C: .4byte sub_80F4C50
thumb_func_end sub_80F4C10
thumb_func_start sub_80F4C50
sub_80F4C50: @ 80F4C50
push {lr}
bl RunTasks
bl AnimateSprites
bl BuildOamBuffer
bl UpdatePaletteFade
pop {r0}
bx r0
thumb_func_end sub_80F4C50
thumb_func_start sub_80F4C68
sub_80F4C68: @ 80F4C68
push {r4,lr}
sub sp, 0x4
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _080F4C84 @ =gUnknown_203AB48
ldr r0, [r0]
ldrb r0, [r0, 0x2]
cmp r0, 0x8
bhi _080F4D30
lsls r0, 2
ldr r1, _080F4C88 @ =_080F4C8C
adds r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_080F4C84: .4byte gUnknown_203AB48
_080F4C88: .4byte _080F4C8C
.align 2, 0
_080F4C8C:
.4byte _080F4CB0
.4byte _080F4CB8
.4byte _080F4CBE
.4byte _080F4CCA
.4byte _080F4CDC
.4byte _080F4CFC
.4byte _080F4D02
.4byte _080F4D10
.4byte _080F4D22
_080F4CB0:
movs r0, 0
bl SetVBlankCallback
b _080F4D50
_080F4CB8:
bl sub_80F4E40
b _080F4D50
_080F4CBE:
bl sub_80F4F9C
lsls r0, 24
cmp r0, 0
beq _080F4D5A
b _080F4D50
_080F4CCA:
ldr r1, _080F4CD8 @ =gUnknown_84154E8
movs r0, 0x1
movs r2, 0
movs r3, 0
bl CopyToBgTilemapBuffer
b _080F4D50
.align 2, 0
_080F4CD8: .4byte gUnknown_84154E8
_080F4CDC:
bl sub_8088F84
lsls r0, 16
cmp r0, 0
beq _080F4CF2
movs r1, 0x80
lsls r1, 1
movs r0, 0x14
bl SetGpuReg
b _080F4D50
_080F4CF2:
movs r0, 0x14
movs r1, 0
bl SetGpuReg
b _080F4D50
_080F4CFC:
bl sub_80F5018
b _080F4D50
_080F4D02:
movs r0, 0
bl CopyBgTilemapBufferToVram
movs r0, 0x1
bl CopyBgTilemapBufferToVram
b _080F4D50
_080F4D10:
movs r0, 0x1
negs r0, r0
movs r1, 0
str r1, [sp]
movs r2, 0x10
movs r3, 0
bl BeginNormalPaletteFade
b _080F4D50
_080F4D22:
ldr r0, _080F4D2C @ =sub_80F4BFC
bl SetVBlankCallback
b _080F4D50
.align 2, 0
_080F4D2C: .4byte sub_80F4BFC
_080F4D30:
ldr r0, _080F4D64 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
cmp r0, 0
bne _080F4D50
movs r0, 0x5
bl PlayFanfareByFanfareNum
ldr r0, _080F4D68 @ =gTasks
lsls r1, r4, 2
adds r1, r4
lsls r1, 3
adds r1, r0
ldr r0, _080F4D6C @ =sub_80F4D74
str r0, [r1]
_080F4D50:
ldr r0, _080F4D70 @ =gUnknown_203AB48
ldr r1, [r0]
ldrb r0, [r1, 0x2]
adds r0, 0x1
strb r0, [r1, 0x2]
_080F4D5A:
add sp, 0x4
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080F4D64: .4byte gPaletteFade
_080F4D68: .4byte gTasks
_080F4D6C: .4byte sub_80F4D74
_080F4D70: .4byte gUnknown_203AB48
thumb_func_end sub_80F4C68
thumb_func_start sub_80F4D74
sub_80F4D74: @ 80F4D74
push {r4,lr}
sub sp, 0x4
lsls r0, 24
lsrs r2, r0, 24
ldr r4, _080F4D90 @ =gUnknown_203AB48
ldr r0, [r4]
ldrb r1, [r0]
cmp r1, 0x1
beq _080F4DA8
cmp r1, 0x1
bgt _080F4D94
cmp r1, 0
beq _080F4D9A
b _080F4DD6
.align 2, 0
_080F4D90: .4byte gUnknown_203AB48
_080F4D94:
cmp r1, 0x2
beq _080F4DD0
b _080F4DD6
_080F4D9A:
movs r0, 0
bl WaitFanfare
lsls r0, 24
cmp r0, 0
beq _080F4DD6
b _080F4DC2
_080F4DA8:
ldr r0, _080F4DCC @ =gMain
ldrh r0, [r0, 0x2E]
ands r1, r0
cmp r1, 0
beq _080F4DD6
movs r0, 0x1
negs r0, r0
movs r1, 0
str r1, [sp]
movs r2, 0
movs r3, 0x10
bl BeginNormalPaletteFade
_080F4DC2:
ldr r1, [r4]
ldrb r0, [r1]
adds r0, 0x1
strb r0, [r1]
b _080F4DD6
.align 2, 0
_080F4DCC: .4byte gMain
_080F4DD0:
adds r0, r2, 0
bl sub_80F4DE0
_080F4DD6:
add sp, 0x4
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_80F4D74
thumb_func_start sub_80F4DE0
sub_80F4DE0: @ 80F4DE0
push {r4,r5,lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r0, _080F4E18 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0
bne _080F4E10
adds r0, r2, 0
bl DestroyTask
bl FreeAllWindowBuffers
ldr r4, _080F4E1C @ =gUnknown_203AB48
ldr r0, [r4]
bl Free
str r5, [r4]
ldr r0, _080F4E20 @ =sub_80568FC
bl SetMainCallback2
_080F4E10:
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080F4E18: .4byte gPaletteFade
_080F4E1C: .4byte gUnknown_203AB48
_080F4E20: .4byte sub_80568FC
thumb_func_end sub_80F4DE0
thumb_func_start sub_80F4E24
sub_80F4E24: @ 80F4E24
push {lr}
bl ResetSpriteData
bl ResetPaletteFade
bl FreeAllSpritePalettes
bl ResetTasks
bl ScanlineEffect_Stop
pop {r0}
bx r0
thumb_func_end sub_80F4E24
thumb_func_start sub_80F4E40
sub_80F4E40: @ 80F4E40
push {r4-r7,lr}
mov r7, r8
push {r7}
sub sp, 0x10
movs r3, 0xC0
lsls r3, 19
movs r4, 0xC0
lsls r4, 9
add r0, sp, 0xC
mov r8, r0
add r2, sp, 0x8
movs r6, 0
ldr r1, _080F4F88 @ =0x040000d4
movs r5, 0x80
lsls r5, 5
ldr r7, _080F4F8C @ =0x81000800
movs r0, 0x81
lsls r0, 24
mov r12, r0
_080F4E66:
strh r6, [r2]
add r0, sp, 0x8
str r0, [r1]
str r3, [r1, 0x4]
str r7, [r1, 0x8]
ldr r0, [r1, 0x8]
adds r3, r5
subs r4, r5
cmp r4, r5
bhi _080F4E66
strh r6, [r2]
add r2, sp, 0x8
str r2, [r1]
str r3, [r1, 0x4]
lsrs r0, r4, 1
mov r2, r12
orrs r0, r2
str r0, [r1, 0x8]
ldr r0, [r1, 0x8]
movs r0, 0xE0
lsls r0, 19
movs r3, 0x80
lsls r3, 3
movs r4, 0
str r4, [sp, 0xC]
ldr r2, _080F4F88 @ =0x040000d4
mov r1, r8
str r1, [r2]
str r0, [r2, 0x4]
lsrs r0, r3, 2
movs r1, 0x85
lsls r1, 24
orrs r0, r1
str r0, [r2, 0x8]
ldr r0, [r2, 0x8]
movs r1, 0xA0
lsls r1, 19
add r0, sp, 0x8
strh r4, [r0]
str r0, [r2]
str r1, [r2, 0x4]
lsrs r3, 1
movs r0, 0x81
lsls r0, 24
orrs r3, r0
str r3, [r2, 0x8]
ldr r0, [r2, 0x8]
movs r0, 0
movs r1, 0
bl SetGpuReg
movs r0, 0
bl ResetBgsAndClearDma3BusyFlags
ldr r1, _080F4F90 @ =gUnknown_8415A08
movs r0, 0
movs r2, 0x2
bl InitBgsFromTemplates
movs r0, 0
movs r1, 0
movs r2, 0
bl ChangeBgX
movs r0, 0
movs r1, 0
movs r2, 0
bl ChangeBgY
movs r0, 0x1
movs r1, 0
movs r2, 0
bl ChangeBgX
movs r0, 0x1
movs r1, 0
movs r2, 0
bl ChangeBgY
movs r0, 0x2
movs r1, 0
movs r2, 0
bl ChangeBgX
movs r0, 0x2
movs r1, 0
movs r2, 0
bl ChangeBgY
movs r0, 0x3
movs r1, 0
movs r2, 0
bl ChangeBgX
movs r0, 0x3
movs r1, 0
movs r2, 0
bl ChangeBgY
ldr r0, _080F4F94 @ =gUnknown_8415A10
bl InitWindows
bl DeactivateAllTextPrinters
movs r1, 0x82
lsls r1, 5
movs r0, 0
bl SetGpuReg
ldr r0, _080F4F98 @ =gUnknown_203AB48
ldr r1, [r0]
adds r1, 0x4
movs r0, 0x1
bl SetBgTilemapBuffer
movs r0, 0
bl ShowBg
movs r0, 0x1
bl ShowBg
movs r5, 0x1E
str r5, [sp]
movs r4, 0x14
str r4, [sp, 0x4]
movs r0, 0
movs r1, 0
movs r2, 0
movs r3, 0
bl FillBgTilemapBufferRect_Palette0
str r5, [sp]
str r4, [sp, 0x4]
movs r0, 0x1
movs r1, 0
movs r2, 0
movs r3, 0
bl FillBgTilemapBufferRect_Palette0
add sp, 0x10
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_080F4F88: .4byte 0x040000d4
_080F4F8C: .4byte 0x81000800
_080F4F90: .4byte gUnknown_8415A08
_080F4F94: .4byte gUnknown_8415A10
_080F4F98: .4byte gUnknown_203AB48
thumb_func_end sub_80F4E40
thumb_func_start sub_80F4F9C
sub_80F4F9C: @ 80F4F9C
push {lr}
sub sp, 0x4
ldr r0, _080F4FB4 @ =gUnknown_203AB48
ldr r0, [r0]
ldrb r0, [r0, 0x1]
cmp r0, 0x1
beq _080F4FC8
cmp r0, 0x1
bgt _080F4FB8
cmp r0, 0
beq _080F4FC2
b _080F4FF8
.align 2, 0
_080F4FB4: .4byte gUnknown_203AB48
_080F4FB8:
cmp r0, 0x2
beq _080F4FE0
cmp r0, 0x3
beq _080F4FEE
b _080F4FF8
_080F4FC2:
bl reset_temp_tile_data_buffers
b _080F5000
_080F4FC8:
ldr r1, _080F4FDC @ =gUnknown_84147C0
movs r0, 0
str r0, [sp]
movs r0, 0x1
movs r2, 0
movs r3, 0
bl decompress_and_copy_tile_data_to_vram
b _080F5000
.align 2, 0
_080F4FDC: .4byte gUnknown_84147C0
_080F4FE0:
bl free_temp_tile_data_buffers_if_possible
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _080F5000
b _080F500A
_080F4FEE:
ldr r0, _080F4FFC @ =gUnknown_8415954
movs r1, 0
movs r2, 0x40
bl LoadPalette
_080F4FF8:
movs r0, 0x1
b _080F500C
.align 2, 0
_080F4FFC: .4byte gUnknown_8415954
_080F5000:
ldr r0, _080F5014 @ =gUnknown_203AB48
ldr r1, [r0]
ldrb r0, [r1, 0x1]
adds r0, 0x1
strb r0, [r1, 0x1]
_080F500A:
movs r0, 0
_080F500C:
add sp, 0x4
pop {r1}
bx r1
.align 2, 0
_080F5014: .4byte gUnknown_203AB48
thumb_func_end sub_80F4F9C
thumb_func_start sub_80F5018
sub_80F5018: @ 80F5018
push {r4-r6,lr}
sub sp, 0xAC
bl UnkTextUtil_Reset
ldr r0, _080F5040 @ =gSaveBlock2Ptr
ldr r1, [r0]
movs r0, 0
bl UnkTextUtil_SetPtrI
bl sub_8088F84
lsls r0, 16
cmp r0, 0
beq _080F5048
ldr r1, _080F5044 @ =gUnknown_841B68F
movs r0, 0x1
bl UnkTextUtil_SetPtrI
b _080F5050
.align 2, 0
_080F5040: .4byte gSaveBlock2Ptr
_080F5044: .4byte gUnknown_841B68F
_080F5048:
ldr r1, _080F50E0 @ =gUnknown_841B698
movs r0, 0x1
bl UnkTextUtil_SetPtrI
_080F5050:
movs r0, 0
movs r1, 0
bl FillWindowPixelBuffer
ldr r1, _080F50E4 @ =gUnknown_841B60E
add r0, sp, 0xC
bl UnkTextUtil_StringExpandPlaceholders
movs r5, 0x1
negs r5, r5
movs r0, 0x2
add r1, sp, 0xC
adds r2, r5, 0
bl GetStringWidth
lsrs r2, r0, 1
movs r4, 0x78
subs r2, r4, r2
lsls r2, 24
lsrs r2, 24
ldr r6, _080F50E8 @ =gUnknown_8415A04
str r6, [sp]
str r5, [sp, 0x4]
add r0, sp, 0xC
str r0, [sp, 0x8]
movs r0, 0
movs r1, 0x2
movs r3, 0x4
bl box_print
ldr r1, _080F50EC @ =gUnknown_841B619
add r0, sp, 0xC
bl UnkTextUtil_StringExpandPlaceholders
movs r0, 0x2
add r1, sp, 0xC
adds r2, r5, 0
bl GetStringWidth
lsrs r0, 1
subs r4, r0
lsls r4, 24
lsrs r4, 24
str r6, [sp]
str r5, [sp, 0x4]
add r0, sp, 0xC
str r0, [sp, 0x8]
movs r0, 0
movs r1, 0x2
adds r2, r4, 0
movs r3, 0x1E
bl box_print
str r6, [sp]
movs r0, 0
str r0, [sp, 0x4]
ldr r0, _080F50F0 @ =gUnknown_841B684
str r0, [sp, 0x8]
movs r0, 0
movs r1, 0x2
movs r2, 0x78
movs r3, 0x69
bl box_print
movs r0, 0
bl PutWindowTilemap
add sp, 0xAC
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_080F50E0: .4byte gUnknown_841B698
_080F50E4: .4byte gUnknown_841B60E
_080F50E8: .4byte gUnknown_8415A04
_080F50EC: .4byte gUnknown_841B619
_080F50F0: .4byte gUnknown_841B684
thumb_func_end sub_80F5018
.align 2, 0 @ Don't pad with nop.
asm/dodrio_berry_picking.s
+17 -17
View File
@@ -6474,7 +6474,7 @@ sub_81538D0: @ 81538D0
adds r0, r7, 0
adds r1, r4, 0
movs r2, 0xD0
bl sub_814FF2C
bl TextWindow_SetStdFrame0_WithPal
adds r0, r7, 0
adds r1, r4, 0
movs r2, 0xD
@@ -8351,7 +8351,7 @@ sub_8154720: @ 8154720
movs r0, 0
movs r1, 0xA
movs r2, 0xB0
bl sub_814FF2C
bl TextWindow_SetStdFrame0_WithPal
pop {r0}
bx r0
thumb_func_end sub_8154720
@@ -9014,7 +9014,7 @@ _08154C4E:
str r4, [sp, 0x8]
movs r1, 0
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
mov r2, r10
ldr r0, [r2]
add r0, r9
@@ -9319,7 +9319,7 @@ _08154EC8:
movs r1, 0
movs r2, 0x1C
adds r3, r6, 0
bl box_print
bl AddTextPrinterParameterized3
add r0, sp, 0xC
mov r1, r9
movs r2, 0x1
@@ -9563,7 +9563,7 @@ _081550EA:
str r6, [sp, 0x8]
movs r1, 0
movs r2, 0x2
bl box_print
bl AddTextPrinterParameterized3
movs r7, 0
mov r0, r9
adds r0, 0x1
@@ -9624,7 +9624,7 @@ _0815512E:
add r1, sp, 0xC
str r1, [sp, 0x8]
movs r1, 0
bl box_print
bl AddTextPrinterParameterized3
b _081551FA
.align 2, 0
_081551A8: .4byte gUnknown_203F440
@@ -9983,7 +9983,7 @@ _08155480:
movs r1, 0
adds r2, r5, 0
bl AddTextPrinterParameterized
bl UnkTextUtil_Reset
bl DynamicPlaceholderTextUtil_Reset
bl sub_8153390
lsls r0, 16
lsrs r0, 16
@@ -9992,10 +9992,10 @@ _08155480:
bl CopyItemName
movs r0, 0
adds r1, r5, 0
bl UnkTextUtil_SetPtrI
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
ldr r1, _0815556C @ =gUnknown_841CD7A
add r0, sp, 0xC
bl UnkTextUtil_StringExpandPlaceholders
bl DynamicPlaceholderTextUtil_ExpandPlaceholders
ldr r0, [r4]
add r0, r10
ldrb r0, [r0]
@@ -10016,7 +10016,7 @@ _08155480:
beq _0815559E
cmp r4, 0x3
beq _0815559E
bl UnkTextUtil_Reset
bl DynamicPlaceholderTextUtil_Reset
bl sub_8153390
lsls r0, 16
lsrs r0, 16
@@ -10024,12 +10024,12 @@ _08155480:
bl CopyItemName
movs r0, 0
adds r1, r5, 0
bl UnkTextUtil_SetPtrI
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
cmp r4, 0x2
bne _08155574
ldr r1, _08155570 @ =gUnknown_841CD9F
add r0, sp, 0xC
bl UnkTextUtil_StringExpandPlaceholders
bl DynamicPlaceholderTextUtil_ExpandPlaceholders
b _08155580
.align 2, 0
_08155558: .4byte 0x00000101
@@ -10044,7 +10044,7 @@ _08155574:
bne _08155580
ldr r1, _081555C4 @ =gUnknown_841CDBA
add r0, sp, 0xC
bl UnkTextUtil_StringExpandPlaceholders
bl DynamicPlaceholderTextUtil_ExpandPlaceholders
_08155580:
ldr r0, _081555C8 @ =gUnknown_203F440
ldr r0, [r0]
@@ -10669,7 +10669,7 @@ _08155AA6:
movs r0, 0
movs r1, 0x2
movs r3, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized2
b _08155B08
.align 2, 0
_08155ACC: .4byte gUnknown_8419F54
@@ -11348,7 +11348,7 @@ _08156020:
.align 2, 0
_0815602C: .4byte gUnknown_84758A8
_08156030:
bl reset_temp_tile_data_buffers
bl ResetTempTileDataBuffers
b _08156082
_08156036:
ldr r1, _08156040 @ =gUnknown_8475B3C
@@ -11366,12 +11366,12 @@ _08156044:
_0815604C:
movs r2, 0
movs r3, 0
bl decompress_and_copy_tile_data_to_vram
bl DecompressAndCopyTileDataToVram
b _08156082
.align 2, 0
_08156058: .4byte gUnknown_84763CC
_0815605C:
bl free_temp_tile_data_buffers_if_possible
bl FreeTempTileDataBuffersIfPossible
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
asm/dragon.s
+835
View File
@@ -0,0 +1,835 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_80B725C
sub_80B725C: @ 80B725C
push {r4,r5,lr}
adds r5, r0, 0
ldr r4, _080B72A4 @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
ldrb r0, [r4]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080B72AC
ldr r2, _080B72A8 @ =gBattleAnimArgs
ldrh r0, [r5, 0x20]
ldrh r1, [r2]
subs r0, r1
strh r0, [r5, 0x20]
ldrh r0, [r2, 0x6]
negs r0, r0
strh r0, [r2, 0x6]
ldrh r0, [r2, 0x8]
negs r0, r0
strh r0, [r2, 0x8]
adds r1, r2, 0
b _080B72B6
.align 2, 0
_080B72A4: .4byte gBattleAnimAttacker
_080B72A8: .4byte gBattleAnimArgs
_080B72AC:
ldr r1, _080B72EC @ =gBattleAnimArgs
ldrh r0, [r1]
ldrh r2, [r5, 0x20]
adds r0, r2
strh r0, [r5, 0x20]
_080B72B6:
ldrh r0, [r1, 0x2]
ldrh r2, [r5, 0x22]
adds r0, r2
strh r0, [r5, 0x22]
ldrh r0, [r1, 0x4]
strh r0, [r5, 0x2E]
ldrh r0, [r1, 0x6]
strh r0, [r5, 0x30]
ldrh r0, [r1, 0x8]
strh r0, [r5, 0x34]
ldrh r0, [r1, 0xA]
strh r0, [r5, 0x38]
adds r2, r5, 0
adds r2, 0x3E
ldrb r0, [r2]
movs r1, 0x4
orrs r0, r1
strb r0, [r2]
ldr r1, _080B72F0 @ =move_anim_8074EE0
adds r0, r5, 0
bl StoreSpriteCallbackInData6
ldr r0, _080B72F4 @ =sub_8074E70
str r0, [r5, 0x1C]
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080B72EC: .4byte gBattleAnimArgs
_080B72F0: .4byte move_anim_8074EE0
_080B72F4: .4byte sub_8074E70
thumb_func_end sub_80B725C
thumb_func_start sub_80B72F8
sub_80B72F8: @ 80B72F8
push {r4,r5,lr}
adds r5, r0, 0
bl sub_8074FCC
ldr r4, _080B7350 @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
ldr r0, _080B7354 @ =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080B735C
ldr r2, _080B7358 @ =gBattleAnimArgs
ldrh r0, [r5, 0x20]
ldrh r1, [r2, 0x2]
subs r0, r1
strh r0, [r5, 0x20]
ldrh r0, [r5, 0x22]
adds r1, r0
strh r1, [r5, 0x22]
ldrh r0, [r5, 0x32]
ldrh r1, [r2, 0x4]
subs r0, r1
strh r0, [r5, 0x32]
ldrh r0, [r2, 0x6]
ldrh r1, [r5, 0x36]
adds r0, r1
strh r0, [r5, 0x36]
b _080B7386
.align 2, 0
_080B7350: .4byte gBattleAnimTarget
_080B7354: .4byte gBattleAnimAttacker
_080B7358: .4byte gBattleAnimArgs
_080B735C:
ldr r1, _080B73A0 @ =gBattleAnimArgs
ldrh r0, [r1]
ldrh r2, [r5, 0x20]
adds r0, r2
strh r0, [r5, 0x20]
ldrh r0, [r1, 0x2]
ldrh r2, [r5, 0x22]
adds r0, r2
strh r0, [r5, 0x22]
ldrh r0, [r1, 0x4]
ldrh r2, [r5, 0x32]
adds r0, r2
strh r0, [r5, 0x32]
ldrh r0, [r1, 0x6]
ldrh r1, [r5, 0x36]
adds r0, r1
strh r0, [r5, 0x36]
adds r0, r5, 0
movs r1, 0x1
bl StartSpriteAnim
_080B7386:
ldr r0, _080B73A0 @ =gBattleAnimArgs
ldrh r0, [r0, 0x8]
strh r0, [r5, 0x2E]
ldr r0, _080B73A4 @ =sub_8075590
str r0, [r5, 0x1C]
ldr r1, _080B73A8 @ =move_anim_8074EE0
adds r0, r5, 0
bl StoreSpriteCallbackInData6
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080B73A0: .4byte gBattleAnimArgs
_080B73A4: .4byte sub_8075590
_080B73A8: .4byte move_anim_8074EE0
thumb_func_end sub_80B72F8
thumb_func_start sub_80B73AC
sub_80B73AC: @ 80B73AC
push {r4,r5,lr}
adds r5, r0, 0
ldr r0, _080B73C0 @ =gBattleAnimArgs
movs r1, 0
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080B73C8
ldr r4, _080B73C4 @ =gBattleAnimAttacker
b _080B73CA
.align 2, 0
_080B73C0: .4byte gBattleAnimArgs
_080B73C4: .4byte gBattleAnimAttacker
_080B73C8:
ldr r4, _080B740C @ =gBattleAnimTarget
_080B73CA:
ldrb r0, [r4]
movs r1, 0
bl sub_8074480
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x1
bl sub_8074480
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
ldr r4, _080B7410 @ =gBattleAnimArgs
movs r0, 0x2
ldrsh r1, [r4, r0]
adds r0, r5, 0
bl sub_8074FF8
ldrh r0, [r4, 0x4]
ldrh r1, [r5, 0x22]
adds r0, r1
strh r0, [r5, 0x22]
ldr r0, _080B7414 @ =sub_8074F6C
str r0, [r5, 0x1C]
ldr r1, _080B7418 @ =move_anim_8074EE0
adds r0, r5, 0
bl StoreSpriteCallbackInData6
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080B740C: .4byte gBattleAnimTarget
_080B7410: .4byte gBattleAnimArgs
_080B7414: .4byte sub_8074F6C
_080B7418: .4byte move_anim_8074EE0
thumb_func_end sub_80B73AC
thumb_func_start sub_80B741C
sub_80B741C: @ 80B741C
push {r4,lr}
adds r4, r0, 0
ldr r0, _080B7444 @ =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080B7436
adds r0, r4, 0
movs r1, 0x1
bl StartSpriteAffineAnim
_080B7436:
adds r0, r4, 0
bl sub_80B72F8
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080B7444: .4byte gBattleAnimAttacker
thumb_func_end sub_80B741C
thumb_func_start sub_80B7448
sub_80B7448: @ 80B7448
push {r4-r7,lr}
adds r6, r0, 0
ldr r4, _080B749C @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
lsls r0, 24
lsrs r0, 24
movs r5, 0
strh r0, [r6, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x22]
strh r5, [r6, 0x36]
movs r0, 0x1
strh r0, [r6, 0x38]
ldr r0, _080B74A0 @ =gBattleAnimArgs
ldrh r0, [r0]
strh r0, [r6, 0x3A]
ldr r4, _080B74A4 @ =sBattler_AI
ldrb r0, [r4]
movs r1, 0
bl sub_8076B2C
lsls r7, r0, 16
lsrs r5, r7, 16
ldrb r0, [r4]
movs r1, 0x1
bl sub_8076B2C
lsls r1, r0, 16
lsrs r0, r1, 16
cmp r5, r0
bls _080B74A8
lsrs r0, r7, 17
b _080B74AA
.align 2, 0
_080B749C: .4byte gBattleAnimAttacker
_080B74A0: .4byte gBattleAnimArgs
_080B74A4: .4byte sBattler_AI
_080B74A8:
lsrs r0, r1, 17
_080B74AA:
strh r0, [r6, 0x3C]
movs r1, 0x3A
ldrsh r0, [r6, r1]
movs r2, 0x3C
ldrsh r1, [r6, r2]
bl Cos
strh r0, [r6, 0x24]
movs r1, 0x3A
ldrsh r0, [r6, r1]
movs r2, 0x3C
ldrsh r1, [r6, r2]
bl Sin
strh r0, [r6, 0x26]
ldr r0, _080B74D4 @ =sub_80B74D8
str r0, [r6, 0x1C]
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_080B74D4: .4byte sub_80B74D8
thumb_func_end sub_80B7448
thumb_func_start sub_80B74D8
sub_80B74D8: @ 80B74D8
push {r4,r5,lr}
adds r4, r0, 0
movs r0, 0x2E
ldrsh r5, [r4, r0]
cmp r5, 0
beq _080B74EA
cmp r5, 0x1
beq _080B7556
b _080B75DA
_080B74EA:
ldrh r0, [r4, 0x3A]
ldrh r1, [r4, 0x38]
subs r0, r1
movs r1, 0xFF
ands r0, r1
strh r0, [r4, 0x3A]
movs r1, 0x3A
ldrsh r0, [r4, r1]
movs r2, 0x3C
ldrsh r1, [r4, r2]
bl Cos
strh r0, [r4, 0x24]
movs r1, 0x3A
ldrsh r0, [r4, r1]
movs r2, 0x3C
ldrsh r1, [r4, r2]
bl Sin
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x36]
adds r0, 0x1
strh r0, [r4, 0x36]
lsls r0, 16
asrs r0, 16
cmp r0, 0x5
ble _080B753C
strh r5, [r4, 0x36]
ldrh r1, [r4, 0x38]
movs r2, 0x38
ldrsh r0, [r4, r2]
cmp r0, 0xF
bgt _080B753C
adds r0, r1, 0x1
strh r0, [r4, 0x38]
lsls r0, 16
asrs r0, 16
cmp r0, 0xF
ble _080B753C
movs r0, 0x10
strh r0, [r4, 0x38]
_080B753C:
ldrh r0, [r4, 0x34]
adds r0, 0x1
strh r0, [r4, 0x34]
lsls r0, 16
asrs r0, 16
cmp r0, 0x3C
ble _080B75DA
movs r0, 0
strh r0, [r4, 0x34]
ldrh r0, [r4, 0x2E]
adds r0, 0x1
strh r0, [r4, 0x2E]
b _080B75DA
_080B7556:
ldrh r0, [r4, 0x3A]
ldrh r1, [r4, 0x38]
subs r0, r1
movs r1, 0xFF
ands r0, r1
strh r0, [r4, 0x3A]
ldrh r1, [r4, 0x3C]
movs r2, 0x3C
ldrsh r0, [r4, r2]
cmp r0, 0x95
bgt _080B757E
adds r0, r1, 0
adds r0, 0x8
strh r0, [r4, 0x3C]
lsls r0, 16
asrs r0, 16
cmp r0, 0x95
ble _080B757E
movs r0, 0x96
strh r0, [r4, 0x3C]
_080B757E:
movs r1, 0x3A
ldrsh r0, [r4, r1]
movs r2, 0x3C
ldrsh r1, [r4, r2]
bl Cos
strh r0, [r4, 0x24]
movs r1, 0x3A
ldrsh r0, [r4, r1]
movs r2, 0x3C
ldrsh r1, [r4, r2]
bl Sin
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x36]
adds r0, 0x1
strh r0, [r4, 0x36]
lsls r0, 16
asrs r0, 16
cmp r0, 0x5
ble _080B75C6
movs r0, 0
strh r0, [r4, 0x36]
ldrh r1, [r4, 0x38]
movs r2, 0x38
ldrsh r0, [r4, r2]
cmp r0, 0xF
bgt _080B75C6
adds r0, r1, 0x1
strh r0, [r4, 0x38]
lsls r0, 16
asrs r0, 16
cmp r0, 0xF
ble _080B75C6
movs r0, 0x10
strh r0, [r4, 0x38]
_080B75C6:
ldrh r0, [r4, 0x34]
adds r0, 0x1
strh r0, [r4, 0x34]
lsls r0, 16
asrs r0, 16
cmp r0, 0x14
ble _080B75DA
adds r0, r4, 0
bl DestroyAnimSprite
_080B75DA:
pop {r4,r5}
pop {r0}
bx r0
thumb_func_end sub_80B74D8
thumb_func_start sub_80B75E0
sub_80B75E0: @ 80B75E0
push {r4-r6,lr}
sub sp, 0xC
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
ldr r0, _080B760C @ =gTasks
adds r4, r1, r0
ldr r0, _080B7610 @ =gBattleAnimAttacker
ldrb r0, [r0]
bl sub_80768B0
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _080B761C
ldr r0, _080B7614 @ =0x04000014
str r0, [sp]
ldr r0, _080B7618 @ =gBattle_BG1_X
b _080B7622
.align 2, 0
_080B760C: .4byte gTasks
_080B7610: .4byte gBattleAnimAttacker
_080B7614: .4byte 0x04000014
_080B7618: .4byte gBattle_BG1_X
_080B761C:
ldr r0, _080B7698 @ =0x04000018
str r0, [sp]
ldr r0, _080B769C @ =gBattle_BG2_X
_080B7622:
ldrh r0, [r0]
strh r0, [r4, 0xC]
ldr r0, _080B76A0 @ =0xa2600001
str r0, [sp, 0x4]
mov r1, sp
movs r5, 0
movs r0, 0x1
strb r0, [r1, 0x8]
mov r0, sp
strb r5, [r0, 0x9]
ldr r0, _080B76A4 @ =gBattleAnimAttacker
ldrb r0, [r0]
bl sub_807492C
lsls r0, 24
lsrs r0, 24
adds r1, r0, 0
subs r1, 0x20
strh r1, [r4, 0xE]
adds r0, 0x20
strh r0, [r4, 0x10]
cmp r1, 0
bge _080B7652
strh r5, [r4, 0xE]
_080B7652:
ldrh r3, [r4, 0xE]
movs r1, 0x10
ldrsh r0, [r4, r1]
cmp r3, r0
bgt _080B7680
ldr r5, _080B76A8 @ =gScanlineEffectRegBuffers
movs r0, 0xF0
lsls r0, 3
adds r6, r5, r0
_080B7664:
lsls r1, r3, 1
adds r2, r1, r5
ldrh r0, [r4, 0xC]
strh r0, [r2]
adds r1, r6
ldrh r0, [r4, 0xC]
strh r0, [r1]
adds r0, r3, 0x1
lsls r0, 16
lsrs r3, r0, 16
movs r1, 0x10
ldrsh r0, [r4, r1]
cmp r3, r0
ble _080B7664
_080B7680:
ldr r0, [sp]
ldr r1, [sp, 0x4]
ldr r2, [sp, 0x8]
bl ScanlineEffect_SetParams
ldr r0, _080B76AC @ =sub_80B76B0
str r0, [r4]
add sp, 0xC
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_080B7698: .4byte 0x04000018
_080B769C: .4byte gBattle_BG2_X
_080B76A0: .4byte 0xa2600001
_080B76A4: .4byte gBattleAnimAttacker
_080B76A8: .4byte gScanlineEffectRegBuffers
_080B76AC: .4byte sub_80B76B0
thumb_func_end sub_80B75E0
thumb_func_start sub_80B76B0
sub_80B76B0: @ 80B76B0
push {lr}
lsls r0, 24
lsrs r3, r0, 24
lsls r0, r3, 2
adds r0, r3
lsls r0, 3
ldr r1, _080B76D4 @ =gTasks
adds r2, r0, r1
movs r1, 0x8
ldrsh r0, [r2, r1]
cmp r0, 0x4
bhi _080B7766
lsls r0, 2
ldr r1, _080B76D8 @ =_080B76DC
adds r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_080B76D4: .4byte gTasks
_080B76D8: .4byte _080B76DC
.align 2, 0
_080B76DC:
.4byte _080B76F0
.4byte _080B7712
.4byte _080B7722
.4byte _080B774E
.4byte _080B7760
_080B76F0:
ldrh r0, [r2, 0x16]
adds r0, 0x1
strh r0, [r2, 0x16]
lsls r0, 16
asrs r0, 16
cmp r0, 0x1
ble _080B7746
movs r0, 0
strh r0, [r2, 0x16]
ldrh r0, [r2, 0x14]
adds r0, 0x1
strh r0, [r2, 0x14]
lsls r0, 16
asrs r0, 16
cmp r0, 0x3
bne _080B7746
b _080B7740
_080B7712:
ldrh r0, [r2, 0xA]
adds r0, 0x1
strh r0, [r2, 0xA]
lsls r0, 16
asrs r0, 16
cmp r0, 0x3C
ble _080B7746
b _080B7740
_080B7722:
ldrh r0, [r2, 0x16]
adds r0, 0x1
strh r0, [r2, 0x16]
lsls r0, 16
asrs r0, 16
cmp r0, 0x1
ble _080B7746
movs r0, 0
strh r0, [r2, 0x16]
ldrh r0, [r2, 0x14]
subs r0, 0x1
strh r0, [r2, 0x14]
lsls r0, 16
cmp r0, 0
bne _080B7746
_080B7740:
ldrh r0, [r2, 0x8]
adds r0, 0x1
strh r0, [r2, 0x8]
_080B7746:
adds r0, r2, 0
bl sub_80B776C
b _080B7766
_080B774E:
ldr r1, _080B775C @ =gScanlineEffect
movs r0, 0x3
strb r0, [r1, 0x15]
ldrh r0, [r2, 0x8]
adds r0, 0x1
strh r0, [r2, 0x8]
b _080B7766
.align 2, 0
_080B775C: .4byte gScanlineEffect
_080B7760:
adds r0, r3, 0
bl DestroyAnimVisualTask
_080B7766:
pop {r0}
bx r0
thumb_func_end sub_80B76B0
thumb_func_start sub_80B776C
sub_80B776C: @ 80B776C
push {r4-r7,lr}
mov r7, r8
push {r7}
adds r5, r0, 0
ldrh r3, [r5, 0x12]
ldrh r4, [r5, 0xE]
movs r1, 0x10
ldrsh r0, [r5, r1]
cmp r4, r0
bgt _080B77C2
ldr r7, _080B77D8 @ =gScanlineEffectRegBuffers
mov r12, r7
ldr r0, _080B77DC @ =gSineTable
mov r8, r0
ldr r6, _080B77E0 @ =gScanlineEffect
_080B778A:
lsls r2, r4, 1
ldrb r1, [r6, 0x14]
lsls r0, r1, 4
subs r0, r1
lsls r0, 7
adds r2, r0
add r2, r12
lsls r0, r3, 1
add r0, r8
movs r7, 0
ldrsh r1, [r0, r7]
movs r7, 0x14
ldrsh r0, [r5, r7]
muls r0, r1
asrs r0, 7
ldrh r1, [r5, 0xC]
adds r0, r1
strh r0, [r2]
adds r3, 0x8
movs r0, 0xFF
ands r3, r0
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
movs r7, 0x10
ldrsh r0, [r5, r7]
cmp r4, r0
ble _080B778A
_080B77C2:
ldrh r0, [r5, 0x12]
adds r0, 0x9
movs r1, 0xFF
ands r0, r1
strh r0, [r5, 0x12]
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_080B77D8: .4byte gScanlineEffectRegBuffers
_080B77DC: .4byte gSineTable
_080B77E0: .4byte gScanlineEffect
thumb_func_end sub_80B776C
thumb_func_start sub_80B77E4
sub_80B77E4: @ 80B77E4
push {r4-r6,lr}
mov r6, r8
push {r6}
adds r4, r0, 0
ldr r5, _080B7884 @ =gBattleAnimArgs
movs r0, 0x4
ldrsh r1, [r5, r0]
lsls r0, r1, 1
adds r0, r1
movs r1, 0x5
bl __divsi3
adds r6, r0, 0
ldr r1, _080B7888 @ =gBattleAnimAttacker
mov r8, r1
ldrb r0, [r1]
movs r1, 0x2
bl sub_8074480
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x20]
mov r2, r8
ldrb r0, [r2]
movs r1, 0x3
bl sub_8074480
lsls r0, 24
lsrs r0, 24
ldrh r3, [r5, 0x8]
adds r0, r3
strh r0, [r4, 0x22]
movs r1, 0x2
ldrsh r0, [r5, r1]
movs r2, 0x4
ldrsh r1, [r5, r2]
bl Cos
strh r0, [r4, 0x30]
movs r3, 0x2
ldrsh r0, [r5, r3]
lsls r6, 16
asrs r6, 16
adds r1, r6, 0
bl Sin
strh r0, [r4, 0x32]
ldrh r1, [r4, 0x30]
ldrh r2, [r5]
adds r3, r2, 0
muls r3, r1
adds r1, r3, 0
ldrh r3, [r4, 0x20]
adds r1, r3
strh r1, [r4, 0x20]
adds r1, r2, 0
muls r1, r0
adds r0, r1, 0
ldrh r2, [r4, 0x22]
adds r0, r2
strh r0, [r4, 0x22]
ldrh r0, [r5, 0x6]
strh r0, [r4, 0x34]
ldr r0, _080B788C @ =sub_80B7894
str r0, [r4, 0x1C]
adds r4, 0x2E
ldr r2, _080B7890 @ =gUnknown_20399A4
movs r1, 0x6
_080B786C:
ldrh r0, [r4]
strh r0, [r2]
adds r4, 0x2
adds r2, 0x2
subs r1, 0x1
cmp r1, 0
bge _080B786C
pop {r3}
mov r8, r3
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_080B7884: .4byte gBattleAnimArgs
_080B7888: .4byte gBattleAnimAttacker
_080B788C: .4byte sub_80B7894
_080B7890: .4byte gUnknown_20399A4
thumb_func_end sub_80B77E4
thumb_func_start sub_80B7894
sub_80B7894: @ 80B7894
push {r4,lr}
adds r4, r0, 0
ldrh r0, [r4, 0x30]
ldrh r1, [r4, 0x36]
adds r0, r1
strh r0, [r4, 0x36]
ldrh r0, [r4, 0x32]
ldrh r2, [r4, 0x38]
adds r0, r2
strh r0, [r4, 0x38]
movs r1, 0x36
ldrsh r0, [r4, r1]
movs r1, 0xA
bl __divsi3
strh r0, [r4, 0x24]
movs r2, 0x38
ldrsh r0, [r4, r2]
movs r1, 0xA
bl __divsi3
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x2E]
adds r0, 0x1
strh r0, [r4, 0x2E]
lsls r0, 16
asrs r0, 16
movs r2, 0x34
ldrsh r1, [r4, r2]
cmp r0, r1
ble _080B78D8
adds r0, r4, 0
bl DestroyAnimSprite
_080B78D8:
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_80B7894
.align 2, 0 @ Don't pad with nop.
asm/egg_hatch.s
-8
View File
@@ -1,8 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
.align 2, 0 @ Don't pad with nop.
asm/electric.s
+2675
View File
File diff suppressed because it is too large Load Diff
asm/ereader_helpers.s
-920
View File
@@ -1,920 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_815C27C
sub_815C27C: @ 815C27C
push {r4-r7,lr}
sub sp, 0x4
adds r6, r0, 0
adds r5, r1, 0
bl sub_815C8C8
movs r7, 0x2
ldr r4, _0815C2BC @ =gUnknown_3003F84
_0815C28C:
bl sub_815C898
ldr r0, _0815C2C0 @ =gUnknown_3002062
ldrh r1, [r0]
movs r0, 0x2
ands r0, r1
cmp r0, 0
beq _0815C29E
strb r7, [r4]
_0815C29E:
movs r0, 0x1
adds r1, r6, 0
adds r2, r5, 0
movs r3, 0
bl sub_815C498
adds r1, r0, 0
ldr r0, _0815C2C4 @ =gUnknown_3002064
strh r1, [r0]
movs r0, 0x13
ands r0, r1
cmp r0, 0x10
bne _0815C2C8
movs r4, 0
b _0815C2EA
.align 2, 0
_0815C2BC: .4byte gUnknown_3003F84
_0815C2C0: .4byte gUnknown_3002062
_0815C2C4: .4byte gUnknown_3002064
_0815C2C8:
movs r0, 0x8
ands r0, r1
cmp r0, 0
beq _0815C2D4
movs r4, 0x1
b _0815C2EA
_0815C2D4:
movs r0, 0x4
ands r0, r1
lsls r0, 16
lsrs r0, 16
cmp r0, 0
bne _0815C2E8
strb r0, [r4]
bl VBlankIntrWait
b _0815C28C
_0815C2E8:
movs r4, 0x2
_0815C2EA:
movs r0, 0
str r0, [sp]
ldr r1, _0815C308 @ =gUnknown_3002048
ldr r2, _0815C30C @ =0x05000006
mov r0, sp
bl CpuSet
bl sub_815C91C
adds r0, r4, 0
add sp, 0x4
pop {r4-r7}
pop {r1}
bx r1
.align 2, 0
_0815C308: .4byte gUnknown_3002048
_0815C30C: .4byte 0x05000006
thumb_func_end sub_815C27C
thumb_func_start sub_815C310
sub_815C310: @ 815C310
push {r4-r6,lr}
sub sp, 0x4
adds r5, r0, 0
bl sub_815C8C8
movs r6, 0x2
ldr r4, _0815C350 @ =gUnknown_3003F84
_0815C31E:
bl sub_815C898
ldr r0, _0815C354 @ =gUnknown_3002062
ldrh r1, [r0]
movs r0, 0x2
ands r0, r1
cmp r0, 0
beq _0815C330
strb r6, [r4]
_0815C330:
movs r0, 0
movs r1, 0
movs r2, 0
adds r3, r5, 0
bl sub_815C498
adds r1, r0, 0
ldr r0, _0815C358 @ =gUnknown_3002064
strh r1, [r0]
movs r0, 0x13
ands r0, r1
cmp r0, 0x10
bne _0815C35C
movs r4, 0
b _0815C37E
.align 2, 0
_0815C350: .4byte gUnknown_3003F84
_0815C354: .4byte gUnknown_3002062
_0815C358: .4byte gUnknown_3002064
_0815C35C:
movs r0, 0x8
ands r0, r1
cmp r0, 0
beq _0815C368
movs r4, 0x1
b _0815C37E
_0815C368:
movs r0, 0x4
ands r0, r1
lsls r0, 16
lsrs r0, 16
cmp r0, 0
bne _0815C37C
strb r0, [r4]
bl VBlankIntrWait
b _0815C31E
_0815C37C:
movs r4, 0x2
_0815C37E:
movs r0, 0
str r0, [sp]
ldr r1, _0815C39C @ =gUnknown_3002048
ldr r2, _0815C3A0 @ =0x05000006
mov r0, sp
bl CpuSet
bl sub_815C91C
adds r0, r4, 0
add sp, 0x4
pop {r4-r6}
pop {r1}
bx r1
.align 2, 0
_0815C39C: .4byte gUnknown_3002048
_0815C3A0: .4byte 0x05000006
thumb_func_end sub_815C310
thumb_func_start sub_815C3A4
sub_815C3A4: @ 815C3A4
push {r4,lr}
ldr r4, _0815C3D0 @ =0x04000208
movs r3, 0
strh r3, [r4]
ldr r2, _0815C3D4 @ =0x04000200
ldrh r1, [r2]
ldr r0, _0815C3D8 @ =0x0000ff3f
ands r0, r1
strh r0, [r2]
movs r0, 0x1
strh r0, [r4]
ldr r0, _0815C3DC @ =0x04000128
strh r3, [r0]
subs r0, 0x1A
strh r3, [r0]
ldr r1, _0815C3E0 @ =0x04000202
movs r0, 0xC0
strh r0, [r1]
pop {r4}
pop {r0}
bx r0
.align 2, 0
_0815C3D0: .4byte 0x04000208
_0815C3D4: .4byte 0x04000200
_0815C3D8: .4byte 0x0000ff3f
_0815C3DC: .4byte 0x04000128
_0815C3E0: .4byte 0x04000202
thumb_func_end sub_815C3A4
thumb_func_start sub_815C3E4
sub_815C3E4: @ 815C3E4
push {r4-r7,lr}
sub sp, 0x4
ldr r5, _0815C43C @ =0x04000208
movs r4, 0
strh r4, [r5]
ldr r3, _0815C440 @ =0x04000200
ldrh r1, [r3]
ldr r0, _0815C444 @ =0x0000ff3f
ands r0, r1
strh r0, [r3]
movs r6, 0x1
strh r6, [r5]
ldr r0, _0815C448 @ =0x04000134
strh r4, [r0]
ldr r2, _0815C44C @ =0x04000128
movs r1, 0x80
lsls r1, 6
adds r0, r1, 0
strh r0, [r2]
ldrh r0, [r2]
ldr r7, _0815C450 @ =0x00004003
adds r1, r7, 0
orrs r0, r1
strh r0, [r2]
strh r4, [r5]
ldrh r0, [r3]
movs r1, 0x80
orrs r0, r1
strh r0, [r3]
strh r6, [r5]
ldr r1, _0815C454 @ =gUnknown_3002048
ldrb r0, [r1, 0x1]
cmp r0, 0
bne _0815C432
str r0, [sp]
ldr r2, _0815C458 @ =0x05000006
mov r0, sp
bl CpuSet
_0815C432:
add sp, 0x4
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_0815C43C: .4byte 0x04000208
_0815C440: .4byte 0x04000200
_0815C444: .4byte 0x0000ff3f
_0815C448: .4byte 0x04000134
_0815C44C: .4byte 0x04000128
_0815C450: .4byte 0x00004003
_0815C454: .4byte gUnknown_3002048
_0815C458: .4byte 0x05000006
thumb_func_end sub_815C3E4
thumb_func_start sub_815C45C
sub_815C45C: @ 815C45C
ldr r0, _0815C484 @ =0x04000134
movs r3, 0
strh r3, [r0]
ldr r2, _0815C488 @ =0x04000128
movs r1, 0xA0
lsls r1, 7
adds r0, r1, 0
strh r0, [r2]
ldrh r0, [r2]
movs r1, 0x8
orrs r0, r1
strh r0, [r2]
ldr r0, _0815C48C @ =gUnknown_3003F84
strb r3, [r0]
ldr r0, _0815C490 @ =gUnknown_3002066
strh r3, [r0]
ldr r1, _0815C494 @ =gUnknown_3002068
movs r0, 0
str r0, [r1]
bx lr
.align 2, 0
_0815C484: .4byte 0x04000134
_0815C488: .4byte 0x04000128
_0815C48C: .4byte gUnknown_3003F84
_0815C490: .4byte gUnknown_3002066
_0815C494: .4byte gUnknown_3002068
thumb_func_end sub_815C45C
thumb_func_start sub_815C498
sub_815C498: @ 815C498
push {r4-r6,lr}
adds r4, r1, 0
adds r5, r2, 0
adds r6, r3, 0
lsls r0, 24
lsrs r2, r0, 24
ldr r0, _0815C4B8 @ =gUnknown_3002048
ldrb r0, [r0, 0x1]
cmp r0, 0x6
bls _0815C4AE
b _0815C5F4
_0815C4AE:
lsls r0, 2
ldr r1, _0815C4BC @ =_0815C4C0
adds r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_0815C4B8: .4byte gUnknown_3002048
_0815C4BC: .4byte _0815C4C0
.align 2, 0
_0815C4C0:
.4byte _0815C4DC
.4byte _0815C4F0
.4byte _0815C510
.4byte _0815C524
.4byte _0815C59C
.4byte _0815C5AC
.4byte _0815C5E4
_0815C4DC:
bl sub_815C3E4
ldr r1, _0815C4EC @ =gUnknown_3002048
movs r0, 0x1
strb r0, [r1, 0x2]
strb r0, [r1, 0x1]
b _0815C5F4
.align 2, 0
_0815C4EC: .4byte gUnknown_3002048
_0815C4F0:
adds r0, r2, 0
bl sub_815C610
lsls r0, 16
cmp r0, 0
beq _0815C500
bl sub_815C864
_0815C500:
ldr r0, _0815C50C @ =gUnknown_3003F84
ldrb r0, [r0]
cmp r0, 0x2
beq _0815C50A
b _0815C5F4
_0815C50A:
b _0815C52C
.align 2, 0
_0815C50C: .4byte gUnknown_3003F84
_0815C510:
bl sub_815C45C
adds r0, r4, 0
adds r1, r5, 0
adds r2, r6, 0
bl sub_815C644
ldr r1, _0815C538 @ =gUnknown_3002048
movs r0, 0x3
strb r0, [r1, 0x1]
_0815C524:
ldr r0, _0815C53C @ =gUnknown_3003F84
ldrb r0, [r0]
cmp r0, 0x2
bne _0815C540
_0815C52C:
ldr r1, _0815C538 @ =gUnknown_3002048
strb r0, [r1, 0x4]
movs r0, 0x6
strb r0, [r1, 0x1]
b _0815C5F4
.align 2, 0
_0815C538: .4byte gUnknown_3002048
_0815C53C: .4byte gUnknown_3003F84
_0815C540:
ldr r2, _0815C580 @ =gUnknown_3002066
ldrh r0, [r2]
adds r0, 0x1
strh r0, [r2]
ldr r1, _0815C584 @ =gUnknown_3002068
ldr r0, [r1]
adds r3, r0, 0x1
str r3, [r1]
ldr r1, _0815C588 @ =gUnknown_3002048
ldrb r0, [r1]
cmp r0, 0
bne _0815C564
cmp r3, 0x3C
bls _0815C564
movs r0, 0x1
strb r0, [r1, 0x4]
movs r0, 0x6
strb r0, [r1, 0x1]
_0815C564:
ldr r4, _0815C588 @ =gUnknown_3002048
ldrb r0, [r4, 0x2]
cmp r0, 0x2
beq _0815C5F4
ldrb r0, [r4]
cmp r0, 0
beq _0815C58C
ldrh r0, [r2]
cmp r0, 0x2
bls _0815C58C
bl sub_815C864
movs r0, 0x2
b _0815C5F2
.align 2, 0
_0815C580: .4byte gUnknown_3002066
_0815C584: .4byte gUnknown_3002068
_0815C588: .4byte gUnknown_3002048
_0815C58C:
bl sub_815C864
ldr r1, _0815C598 @ =gUnknown_3002048
movs r0, 0x2
strb r0, [r1, 0x2]
b _0815C5F4
.align 2, 0
_0815C598: .4byte gUnknown_3002048
_0815C59C:
bl sub_815C3E4
ldr r1, _0815C5A8 @ =gUnknown_3002048
movs r0, 0x5
strb r0, [r1, 0x1]
b _0815C5F4
.align 2, 0
_0815C5A8: .4byte gUnknown_3002048
_0815C5AC:
ldr r0, _0815C5DC @ =gUnknown_3002048
ldrb r0, [r0]
cmp r0, 0x1
bne _0815C5C0
ldr r0, _0815C5E0 @ =gUnknown_3002066
ldrh r0, [r0]
cmp r0, 0x2
bls _0815C5C0
bl sub_815C864
_0815C5C0:
ldr r1, _0815C5E0 @ =gUnknown_3002066
ldrh r0, [r1]
adds r0, 0x1
strh r0, [r1]
lsls r0, 16
lsrs r0, 16
cmp r0, 0x3C
bls _0815C5F4
ldr r0, _0815C5DC @ =gUnknown_3002048
movs r1, 0x1
strb r1, [r0, 0x4]
movs r1, 0x6
strb r1, [r0, 0x1]
b _0815C5F4
.align 2, 0
_0815C5DC: .4byte gUnknown_3002048
_0815C5E0: .4byte gUnknown_3002066
_0815C5E4:
ldr r4, _0815C60C @ =gUnknown_3002048
ldrb r0, [r4, 0x2]
cmp r0, 0
beq _0815C5F4
bl sub_815C3A4
movs r0, 0
_0815C5F2:
strb r0, [r4, 0x2]
_0815C5F4:
ldr r2, _0815C60C @ =gUnknown_3002048
ldrb r0, [r2, 0x2]
ldrb r1, [r2, 0x4]
lsls r1, 2
orrs r0, r1
ldrb r1, [r2, 0x3]
lsls r1, 4
orrs r0, r1
pop {r4-r6}
pop {r1}
bx r1
.align 2, 0
_0815C60C: .4byte gUnknown_3002048
thumb_func_end sub_815C498
thumb_func_start sub_815C610
sub_815C610: @ 815C610
push {lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r0, _0815C62C @ =0x04000128
ldr r0, [r0]
movs r1, 0xC
ands r0, r1
cmp r0, 0x8
bne _0815C634
cmp r2, 0
beq _0815C634
ldr r1, _0815C630 @ =gUnknown_3002048
movs r0, 0x1
b _0815C638
.align 2, 0
_0815C62C: .4byte 0x04000128
_0815C630: .4byte gUnknown_3002048
_0815C634:
ldr r1, _0815C640 @ =gUnknown_3002048
movs r0, 0
_0815C638:
strb r0, [r1]
pop {r1}
bx r1
.align 2, 0
_0815C640: .4byte gUnknown_3002048
thumb_func_end sub_815C610
thumb_func_start sub_815C644
sub_815C644: @ 815C644
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
ldr r3, _0815C670 @ =gUnknown_3002048
ldrb r0, [r3]
cmp r0, 0
beq _0815C67C
ldr r2, _0815C674 @ =0x04000128
ldrh r0, [r2]
movs r1, 0x1
orrs r0, r1
strh r0, [r2]
str r5, [r3, 0x8]
ldr r0, _0815C678 @ =0x04000120
str r4, [r0]
lsrs r0, r4, 2
adds r0, 0x1
str r0, [r3, 0x10]
bl sub_815C690
b _0815C684
.align 2, 0
_0815C670: .4byte gUnknown_3002048
_0815C674: .4byte 0x04000128
_0815C678: .4byte 0x04000120
_0815C67C:
ldr r1, _0815C68C @ =0x04000128
ldrh r0, [r1]
strh r0, [r1]
str r2, [r3, 0x8]
_0815C684:
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_0815C68C: .4byte 0x04000128
thumb_func_end sub_815C644
thumb_func_start sub_815C690
sub_815C690: @ 815C690
ldr r1, _0815C6B4 @ =0x0400010c
ldr r2, _0815C6B8 @ =0x0000fda7
adds r0, r2, 0
strh r0, [r1]
ldr r0, _0815C6BC @ =0x0400010e
movs r2, 0x40
strh r2, [r0]
ldr r3, _0815C6C0 @ =0x04000208
movs r0, 0
strh r0, [r3]
adds r1, 0xF4
ldrh r0, [r1]
orrs r0, r2
strh r0, [r1]
movs r0, 0x1
strh r0, [r3]
bx lr
.align 2, 0
_0815C6B4: .4byte 0x0400010c
_0815C6B8: .4byte 0x0000fda7
_0815C6BC: .4byte 0x0400010e
_0815C6C0: .4byte 0x04000208
thumb_func_end sub_815C690
thumb_func_start sub_815C6C4
sub_815C6C4: @ 815C6C4
push {lr}
bl sub_815C874
bl sub_815C864
pop {r0}
bx r0
thumb_func_end sub_815C6C4
thumb_func_start sub_815C6D4
sub_815C6D4: @ 815C6D4
push {r4-r6,lr}
sub sp, 0x8
ldr r2, _0815C6EC @ =gUnknown_3002048
ldrb r0, [r2, 0x1]
adds r3, r2, 0
cmp r0, 0x3
beq _0815C75C
cmp r0, 0x3
bgt _0815C6F0
cmp r0, 0x1
beq _0815C6F8
b _0815C852
.align 2, 0
_0815C6EC: .4byte gUnknown_3002048
_0815C6F0:
cmp r0, 0x5
bne _0815C6F6
b _0815C824
_0815C6F6:
b _0815C852
_0815C6F8:
ldr r1, _0815C728 @ =0x0400012a
ldr r2, _0815C72C @ =0x0000ccd0
adds r0, r2, 0
strh r0, [r1]
ldr r0, _0815C730 @ =0x04000120
ldr r1, [r0, 0x4]
ldr r0, [r0]
str r0, [sp]
str r1, [sp, 0x4]
movs r1, 0
movs r2, 0
movs r4, 0
ldr r6, _0815C72C @ =0x0000ccd0
ldr r5, _0815C734 @ =0x0000ffff
_0815C714:
lsls r0, r1, 1
add r0, sp
ldrh r0, [r0]
cmp r0, r6
bne _0815C738
adds r0, r2, 0x1
lsls r0, 16
lsrs r2, r0, 16
b _0815C742
.align 2, 0
_0815C728: .4byte 0x0400012a
_0815C72C: .4byte 0x0000ccd0
_0815C730: .4byte 0x04000120
_0815C734: .4byte 0x0000ffff
_0815C738:
cmp r0, r5
beq _0815C742
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
_0815C742:
adds r0, r1, 0x1
lsls r0, 16
lsrs r1, r0, 16
cmp r1, 0x3
bls _0815C714
cmp r2, 0x2
beq _0815C752
b _0815C852
_0815C752:
cmp r4, 0
beq _0815C758
b _0815C852
_0815C758:
strb r2, [r3, 0x1]
b _0815C852
_0815C75C:
ldr r0, _0815C798 @ =0x04000120
ldr r4, [r0]
ldr r0, [r2, 0xC]
cmp r0, 0
bne _0815C772
ldrb r0, [r2]
cmp r0, 0
bne _0815C772
lsrs r0, r4, 2
adds r0, 0x1
str r0, [r2, 0x10]
_0815C772:
ldrb r0, [r3]
cmp r0, 0x1
bne _0815C7A8
ldr r1, [r3, 0xC]
ldr r0, [r3, 0x10]
cmp r1, r0
bge _0815C79C
ldr r2, _0815C798 @ =0x04000120
ldr r0, [r3, 0x8]
lsls r1, 2
adds r1, r0
ldr r0, [r1]
str r0, [r2]
ldr r0, [r3, 0x14]
ldr r1, [r1]
adds r0, r1
str r0, [r3, 0x14]
b _0815C7E2
.align 2, 0
_0815C798: .4byte 0x04000120
_0815C79C:
ldr r1, _0815C7A4 @ =0x04000120
ldr r0, [r3, 0x14]
b _0815C7E0
.align 2, 0
_0815C7A4: .4byte 0x04000120
_0815C7A8:
ldr r1, [r3, 0xC]
cmp r1, 0
ble _0815C7C8
ldr r0, [r3, 0x10]
adds r0, 0x1
cmp r1, r0
bge _0815C7C8
ldr r0, [r3, 0x8]
lsls r1, 2
adds r1, r0
subs r1, 0x4
str r4, [r1]
ldr r0, [r3, 0x14]
adds r0, r4
str r0, [r3, 0x14]
b _0815C7DC
_0815C7C8:
ldr r0, [r3, 0xC]
cmp r0, 0
beq _0815C7DC
ldr r0, [r3, 0x14]
cmp r0, r4
bne _0815C7D8
movs r0, 0x1
b _0815C7DA
_0815C7D8:
movs r0, 0x2
_0815C7DA:
strb r0, [r3, 0x3]
_0815C7DC:
ldr r1, _0815C804 @ =gUnknown_3002068
movs r0, 0
_0815C7E0:
str r0, [r1]
_0815C7E2:
ldr r1, [r3, 0xC]
adds r1, 0x1
str r1, [r3, 0xC]
ldr r0, [r3, 0x10]
adds r0, 0x2
cmp r1, r0
bge _0815C812
ldrb r0, [r3]
cmp r0, 0
beq _0815C80C
ldr r0, _0815C808 @ =0x0400010e
ldrh r1, [r0]
movs r2, 0x80
orrs r1, r2
strh r1, [r0]
b _0815C852
.align 2, 0
_0815C804: .4byte gUnknown_3002068
_0815C808: .4byte 0x0400010e
_0815C80C:
bl sub_815C864
b _0815C852
_0815C812:
movs r0, 0
movs r1, 0x4
strb r1, [r3, 0x1]
ldr r1, _0815C820 @ =gUnknown_3002066
strh r0, [r1]
b _0815C852
.align 2, 0
_0815C820: .4byte gUnknown_3002066
_0815C824:
ldrb r3, [r2]
cmp r3, 0
bne _0815C830
ldr r1, _0815C85C @ =0x0400012a
ldrb r0, [r2, 0x3]
strh r0, [r1]
_0815C830:
ldr r0, _0815C860 @ =0x04000120
ldr r1, [r0, 0x4]
ldr r0, [r0]
str r0, [sp]
str r1, [sp, 0x4]
mov r0, sp
ldrh r1, [r0, 0x2]
subs r0, r1, 0x1
lsls r0, 16
lsrs r0, 16
cmp r0, 0x1
bhi _0815C852
cmp r3, 0x1
bne _0815C84E
strb r1, [r2, 0x3]
_0815C84E:
movs r0, 0x6
strb r0, [r2, 0x1]
_0815C852:
add sp, 0x8
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_0815C85C: .4byte 0x0400012a
_0815C860: .4byte 0x04000120
thumb_func_end sub_815C6D4
thumb_func_start sub_815C864
sub_815C864: @ 815C864
ldr r0, _0815C870 @ =0x04000128
ldrh r1, [r0]
movs r2, 0x80
orrs r1, r2
strh r1, [r0]
bx lr
.align 2, 0
_0815C870: .4byte 0x04000128
thumb_func_end sub_815C864
thumb_func_start sub_815C874
sub_815C874: @ 815C874
ldr r2, _0815C888 @ =0x0400010e
ldrh r1, [r2]
ldr r0, _0815C88C @ =0x0000ff7f
ands r0, r1
strh r0, [r2]
ldr r1, _0815C890 @ =0x0400010c
ldr r2, _0815C894 @ =0x0000fda7
adds r0, r2, 0
strh r0, [r1]
bx lr
.align 2, 0
_0815C888: .4byte 0x0400010e
_0815C88C: .4byte 0x0000ff7f
_0815C890: .4byte 0x0400010c
_0815C894: .4byte 0x0000fda7
thumb_func_end sub_815C874
thumb_func_start sub_815C898
sub_815C898: @ 815C898
push {r4,lr}
ldr r0, _0815C8B8 @ =0x04000130
ldrh r0, [r0]
ldr r2, _0815C8BC @ =0x000003ff
adds r1, r2, 0
eors r1, r0
ldr r4, _0815C8C0 @ =gUnknown_3002062
ldr r3, _0815C8C4 @ =gUnknown_3002060
ldrh r2, [r3]
adds r0, r1, 0
bics r0, r2
strh r0, [r4]
strh r1, [r3]
pop {r4}
pop {r0}
bx r0
.align 2, 0
_0815C8B8: .4byte 0x04000130
_0815C8BC: .4byte 0x000003ff
_0815C8C0: .4byte gUnknown_3002062
_0815C8C4: .4byte gUnknown_3002060
thumb_func_end sub_815C898
thumb_func_start sub_815C8C8
sub_815C8C8: @ 815C8C8
ldr r1, _0815C8F4 @ =gUnknown_300206C
ldr r0, _0815C8F8 @ =0x04000208
ldrh r0, [r0]
strh r0, [r1]
ldr r1, _0815C8FC @ =gUnknown_300206E
ldr r0, _0815C900 @ =0x04000200
ldrh r0, [r0]
strh r0, [r1]
ldr r1, _0815C904 @ =gUnknown_3002070
ldr r0, _0815C908 @ =0x0400010e
ldrh r0, [r0]
strh r0, [r1]
ldr r1, _0815C90C @ =gUnknown_3002072
ldr r0, _0815C910 @ =0x04000128
ldrh r0, [r0]
strh r0, [r1]
ldr r1, _0815C914 @ =gUnknown_3002074
ldr r0, _0815C918 @ =0x04000134
ldrh r0, [r0]
strh r0, [r1]
bx lr
.align 2, 0
_0815C8F4: .4byte gUnknown_300206C
_0815C8F8: .4byte 0x04000208
_0815C8FC: .4byte gUnknown_300206E
_0815C900: .4byte 0x04000200
_0815C904: .4byte gUnknown_3002070
_0815C908: .4byte 0x0400010e
_0815C90C: .4byte gUnknown_3002072
_0815C910: .4byte 0x04000128
_0815C914: .4byte gUnknown_3002074
_0815C918: .4byte 0x04000134
thumb_func_end sub_815C8C8
thumb_func_start sub_815C91C
sub_815C91C: @ 815C91C
ldr r1, _0815C948 @ =0x04000208
ldr r0, _0815C94C @ =gUnknown_300206C
ldrh r0, [r0]
strh r0, [r1]
subs r1, 0x8
ldr r0, _0815C950 @ =gUnknown_300206E
ldrh r0, [r0]
strh r0, [r1]
subs r1, 0xF2
ldr r0, _0815C954 @ =gUnknown_3002070
ldrh r0, [r0]
strh r0, [r1]
adds r1, 0x1A
ldr r0, _0815C958 @ =gUnknown_3002072
ldrh r0, [r0]
strh r0, [r1]
adds r1, 0xC
ldr r0, _0815C95C @ =gUnknown_3002074
ldrh r0, [r0]
strh r0, [r1]
bx lr
.align 2, 0
_0815C948: .4byte 0x04000208
_0815C94C: .4byte gUnknown_300206C
_0815C950: .4byte gUnknown_300206E
_0815C954: .4byte gUnknown_3002070
_0815C958: .4byte gUnknown_3002072
_0815C95C: .4byte gUnknown_3002074
thumb_func_end sub_815C91C
thumb_func_start sub_815C960
sub_815C960: @ 815C960
push {lr}
sub sp, 0x4
movs r0, 0
str r0, [sp]
ldr r1, _0815C978 @ =gUnknown_3002048
ldr r2, _0815C97C @ =0x05000006
mov r0, sp
bl CpuSet
add sp, 0x4
pop {r0}
bx r0
.align 2, 0
_0815C978: .4byte gUnknown_3002048
_0815C97C: .4byte 0x05000006
thumb_func_end sub_815C960
.align 2, 0 @ Don't pad with nop.
asm/evolution_graphics.s
+1 -1
View File
@@ -573,7 +573,7 @@ _080F5D80: .4byte SpriteCB_PostEvoSparkleSet2
LoadEvoSparkleSpriteAndPal: @ 80F5D84
push {lr}
ldr r0, _080F5D98 @ =gUnknown_841EEC4
bl sub_800F034
bl LoadCompressedSpriteSheetUsingHeap
ldr r0, _080F5D9C @ =gUnknown_841EED4
bl LoadSpritePalettes
pop {r0}
asm/evolution_scene.s
+2 -2
View File
@@ -1870,7 +1870,7 @@ _080CEDC6:
cmp r4, 0
bne _080CEE40
bl StopMapMusic
bl sub_8055DC4
bl Overworld_PlaySpecialMapMusic
ldrh r1, [r5, 0xE]
movs r0, 0x80
orrs r0, r1
@@ -1944,7 +1944,7 @@ _080CEE74:
cmp r0, 0
bne _080CEE90
bl StopMapMusic
bl sub_8055DC4
bl Overworld_PlaySpecialMapMusic
_080CEE90:
movs r2, 0x1A
ldrsh r0, [r4, r2]
asm/field_camera.s
+3 -3
View File
@@ -710,11 +710,11 @@ _0805AAA2:
strh r0, [r3]
_0805AABE:
movs r0, 0x1
bl schedule_bg_copy_tilemap_to_vram
bl ScheduleBgCopyTilemapToVram
movs r0, 0x2
bl schedule_bg_copy_tilemap_to_vram
bl ScheduleBgCopyTilemapToVram
movs r0, 0x3
bl schedule_bg_copy_tilemap_to_vram
bl ScheduleBgCopyTilemapToVram
pop {r4}
pop {r0}
bx r0
asm/field_control_avatar.s
+12 -12
View File
@@ -320,7 +320,7 @@ sub_806CAC8: @ 806CAC8
sub sp, 0x8
adds r5, r0, 0
bl sub_8069A54
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r6, r0, 24
mov r4, sp
@@ -629,7 +629,7 @@ _0806CD54:
ldrb r0, [r4, 0x2]
cmp r0, 0
beq _0806CDC0
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
ldrb r1, [r4, 0x2]
@@ -1033,7 +1033,7 @@ _0806D078:
lsls r0, 2
ldr r1, _0806D098 @ =gMapObjects
adds r0, r1
bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
bl FieldObjectCheckHeldMovementStatus
lsls r0, 24
cmp r0, 0
bne _0806D0A0
@@ -1817,7 +1817,7 @@ _0806D6E0: .4byte gUnknown_203ADFA
_0806D6E4: .4byte gPlayerAvatar
_0806D6E8: .4byte gUnknown_81A8CED
_0806D6EC:
bl overworld_poison_step
bl DoPoisonFieldEffect_step
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1840,7 +1840,7 @@ _0806D704:
.align 2, 0
_0806D71C: .4byte gUnknown_81BF546
_0806D720:
bl sub_80A0F0C
bl SafariZoneTakeStep
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1901,8 +1901,8 @@ _0806D780: .4byte 0x00004021
_0806D784: .4byte gPlayerParty
thumb_func_end AdjustFriendship_step
thumb_func_start overworld_poison_timer_set
overworld_poison_timer_set: @ 806D788
thumb_func_start ClearPoisonStepCounter
ClearPoisonStepCounter: @ 806D788
push {lr}
ldr r0, _0806D798 @ =0x00004022
movs r1, 0
@@ -1911,10 +1911,10 @@ overworld_poison_timer_set: @ 806D788
bx r0
.align 2, 0
_0806D798: .4byte 0x00004022
thumb_func_end overworld_poison_timer_set
thumb_func_end ClearPoisonStepCounter
thumb_func_start overworld_poison_step
overworld_poison_step: @ 806D79C
thumb_func_start DoPoisonFieldEffect_step
DoPoisonFieldEffect_step: @ 806D79C
push {r4,lr}
ldr r0, _0806D7D8 @ =gMapHeader
ldrb r0, [r0, 0x17]
@@ -1933,7 +1933,7 @@ overworld_poison_step: @ 806D79C
lsls r0, 16
cmp r0, 0
bne _0806D7E0
bl overworld_poison
bl DoPoisonFieldEffect
cmp r0, 0x1
beq _0806D7E0
cmp r0, 0x1
@@ -1951,7 +1951,7 @@ _0806D7E2:
pop {r4}
pop {r1}
bx r1
thumb_func_end overworld_poison_step
thumb_func_end DoPoisonFieldEffect_step
thumb_func_start sub_806D7E8
sub_806D7E8: @ 806D7E8
asm/field_effect.s
+83 -83
View File
@@ -608,12 +608,12 @@ CreateTrainerSprite: @ 8083858
add r8, r4
mov r0, r8
adds r1, r7, 0
bl LoadCompressedObjectPaletteOverrideBuffer
bl LoadCompressedSpritePaletteOverrideBuffer
ldr r0, _080838E4 @ =gTrainerFrontPicTable
adds r4, r0
adds r0, r4, 0
adds r1, r7, 0
bl LoadCompressedObjectPicOverrideBuffer
bl LoadCompressedSpriteSheetOverrideBuffer
mov r1, sp
ldrh r0, [r4, 0x6]
movs r2, 0
@@ -2039,8 +2039,8 @@ _08084350:
cmp r0, 0
bne _08084376
bl sub_8054CA0
bl warp_in
ldr r0, _08084384 @ =sub_805671C
bl WarpIntoMap
ldr r0, _08084384 @ =CB2_LoadMap
bl SetMainCallback2
ldr r1, _08084388 @ =gFieldCallback
ldr r0, _0808438C @ =mapldr_08084390
@@ -2054,7 +2054,7 @@ _08084376:
.align 2, 0
_0808437C: .4byte gTasks
_08084380: .4byte gFieldEffectArguments
_08084384: .4byte sub_805671C
_08084384: .4byte CB2_LoadMap
_08084388: .4byte gFieldCallback
_0808438C: .4byte mapldr_08084390
thumb_func_end task00_8084310
@@ -2062,7 +2062,7 @@ _0808438C: .4byte mapldr_08084390
thumb_func_start mapldr_08084390
mapldr_08084390: @ 8084390
push {r4,lr}
bl sub_8055DC4
bl Overworld_PlaySpecialMapMusic
bl sub_807DC00
ldr r0, _080843E8 @ =c3_080843F8
movs r1, 0
@@ -2154,7 +2154,7 @@ _08084450: .4byte gPaletteFade
thumb_func_start sub_8084454
sub_8084454: @ 8084454
push {lr}
bl sub_8055DC4
bl Overworld_PlaySpecialMapMusic
bl pal_fill_for_maplights
bl sub_8111CF0
bl ScriptContext2_Enable
@@ -2235,7 +2235,7 @@ sub_80844BC: @ 80844BC
strb r1, [r0, 0x1]
movs r0, 0x1
strb r0, [r6, 0x6]
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
bl sub_8063EB8
@@ -2243,7 +2243,7 @@ sub_80844BC: @ 80844BC
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
bl sub_8063CA4
bl FieldObjectSetHeldMovement
adds r3, r4, 0
adds r3, 0x42
ldrb r0, [r3]
@@ -2653,17 +2653,17 @@ sub_8084820: @ 8084820
ldr r1, _0808488C @ =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
bl FieldObjectIsMovementOverridden
lsls r0, 24
cmp r0, 0
beq _0808484A
adds r0, r4, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
bl FieldObjectClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _0808487E
_0808484A:
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
bl sub_8063EB8
@@ -2671,7 +2671,7 @@ _0808484A:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_8063CA4
bl FieldObjectSetHeldMovement
ldrh r0, [r5, 0x8]
adds r0, 0x1
movs r1, 0
@@ -2860,11 +2860,11 @@ sub_80849A0: @ 80849A0
cmp r0, 0x1
bne _080849DC
bl sub_809C460
bl warp_in
bl WarpIntoMap
ldr r1, _080849E4 @ =gFieldCallback
ldr r0, _080849E8 @ =sub_80849F4
str r0, [r1]
ldr r0, _080849EC @ =sub_805671C
ldr r0, _080849EC @ =CB2_LoadMap
bl SetMainCallback2
ldr r0, _080849F0 @ =sub_80847C0
bl FindTaskIdByFunc
@@ -2878,14 +2878,14 @@ _080849DC:
_080849E0: .4byte gPaletteFade
_080849E4: .4byte gFieldCallback
_080849E8: .4byte sub_80849F4
_080849EC: .4byte sub_805671C
_080849EC: .4byte CB2_LoadMap
_080849F0: .4byte sub_80847C0
thumb_func_end sub_80849A0
thumb_func_start sub_80849F4
sub_80849F4: @ 80849F4
push {lr}
bl sub_8055DC4
bl Overworld_PlaySpecialMapMusic
bl pal_fill_for_maplights
bl sub_8111CF0
bl ScriptContext2_Enable
@@ -2952,7 +2952,7 @@ sub_8084A5C: @ 8084A5C
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_8063CA4
bl FieldObjectSetHeldMovement
mov r4, sp
adds r4, 0x2
mov r0, sp
@@ -3192,7 +3192,7 @@ sub_8084C3C: @ 8084C3C
ldr r1, _08084C98 @ =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
bl FieldObjectClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _08084C8A
@@ -3205,7 +3205,7 @@ sub_8084C3C: @ 8084C3C
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_8063CA4
bl FieldObjectSetHeldMovement
ldr r0, _08084C9C @ =sub_8084A24
bl FindTaskIdByFunc
lsls r0, 24
@@ -3317,12 +3317,12 @@ waterfall_1_do_anim_probably: @ 8084D44
adds r5, r1, 0
bl ScriptContext2_Enable
adds r0, r5, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
bl FieldObjectIsMovementOverridden
lsls r0, 24
cmp r0, 0
bne _08084D74
adds r0, r5, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
bl FieldObjectClearHeldMovementIfFinished
ldr r1, _08084D7C @ =gFieldEffectArguments
movs r2, 0xA
ldrsh r0, [r4, r2]
@@ -3374,7 +3374,7 @@ sub_8084DA4: @ 8084DA4
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_8063CA4
bl FieldObjectSetHeldMovement
ldrh r0, [r5, 0x8]
adds r0, 0x1
strh r0, [r5, 0x8]
@@ -3390,7 +3390,7 @@ sub_8084DCC: @ 8084DCC
adds r5, r0, 0
adds r4, r1, 0
adds r0, r4, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
bl FieldObjectClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
bne _08084DE2
@@ -3883,11 +3883,11 @@ sub_8085168: @ 8085168
lsrs r0, 24
cmp r0, 0x1
bne _080851A0
bl warp_in
bl WarpIntoMap
ldr r1, _080851AC @ =gFieldCallback
ldr r0, _080851B0 @ =mapldr_080851BC
str r0, [r1]
ldr r0, _080851B4 @ =sub_805671C
ldr r0, _080851B4 @ =CB2_LoadMap
bl SetMainCallback2
ldr r0, _080851B8 @ =sub_8084F44
bl FindTaskIdByFunc
@@ -3902,14 +3902,14 @@ _080851A0:
_080851A8: .4byte gPaletteFade
_080851AC: .4byte gFieldCallback
_080851B0: .4byte mapldr_080851BC
_080851B4: .4byte sub_805671C
_080851B4: .4byte CB2_LoadMap
_080851B8: .4byte sub_8084F44
thumb_func_end sub_8085168
thumb_func_start mapldr_080851BC
mapldr_080851BC: @ 80851BC
push {lr}
bl sub_8055DC4
bl Overworld_PlaySpecialMapMusic
bl pal_fill_for_maplights
bl sub_8111CF0
bl ScriptContext2_Enable
@@ -4070,7 +4070,7 @@ sub_80852C0: @ 80852C0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_8063CA4
bl FieldObjectSetHeldMovement
_08085308:
movs r0, 0
pop {r4}
@@ -4084,7 +4084,7 @@ _08085310: .4byte gSprites
sub_8085314: @ 8085314
push {lr}
adds r0, r1, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
bl FieldObjectClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _0808533E
@@ -4266,7 +4266,7 @@ sub_8085470: @ 8085470
adds r4, r1, 0
adds r6, r2, 0
adds r0, r4, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
bl FieldObjectClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _080854E4
@@ -4311,7 +4311,7 @@ _080854C4:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_8063CA4
bl FieldObjectSetHeldMovement
movs r0, 0x21
bl PlaySE
_080854E4:
@@ -4388,11 +4388,11 @@ sub_808554C: @ 808554C
lsrs r0, 24
cmp r0, 0x1
bne _08085584
bl warp_in
bl WarpIntoMap
ldr r1, _08085590 @ =gFieldCallback
ldr r0, _08085594 @ =sub_8084454
str r0, [r1]
ldr r0, _08085598 @ =sub_805671C
ldr r0, _08085598 @ =CB2_LoadMap
bl SetMainCallback2
ldr r0, _0808559C @ =sub_80853E4
bl FindTaskIdByFunc
@@ -4407,7 +4407,7 @@ _08085584:
_0808558C: .4byte gPaletteFade
_08085590: .4byte gFieldCallback
_08085594: .4byte sub_8084454
_08085598: .4byte sub_805671C
_08085598: .4byte CB2_LoadMap
_0808559C: .4byte sub_80853E4
thumb_func_end sub_808554C
@@ -4527,7 +4527,7 @@ sub_808566C: @ 808566C
strh r0, [r4, 0x8]
movs r0, 0x40
strh r0, [r4, 0x22]
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x24]
@@ -4612,11 +4612,11 @@ _08085702:
adds r0, r6, 0
bl FieldObjectSetDirection
bl sub_80555E0
bl warp_in
bl WarpIntoMap
ldr r1, _0808575C @ =gFieldCallback
ldr r0, _08085760 @ =sub_80859D4
str r0, [r1]
ldr r0, _08085764 @ =sub_805671C
ldr r0, _08085764 @ =CB2_LoadMap
bl SetMainCallback2
ldr r0, _08085768 @ =sub_808563C
bl FindTaskIdByFunc
@@ -4631,7 +4631,7 @@ _08085750:
_08085758: .4byte gPaletteFade
_0808575C: .4byte gFieldCallback
_08085760: .4byte sub_80859D4
_08085764: .4byte sub_805671C
_08085764: .4byte CB2_LoadMap
_08085768: .4byte sub_808563C
thumb_func_end sub_8085690
@@ -4641,12 +4641,12 @@ sub_808576C: @ 808576C
adds r4, r0, 0
adds r6, r1, 0
adds r5, r2, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
bl FieldObjectIsMovementOverridden
lsls r0, 24
cmp r0, 0
beq _0808578A
adds r0, r4, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
bl FieldObjectClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _080857E4
@@ -4673,7 +4673,7 @@ _0808579E:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_8063CA4
bl FieldObjectSetHeldMovement
ldrh r1, [r5]
movs r2, 0
ldrsh r0, [r5, r2]
@@ -4965,7 +4965,7 @@ _080859C4:
thumb_func_start sub_80859D4
sub_80859D4: @ 80859D4
push {lr}
bl sub_8055DC4
bl Overworld_PlaySpecialMapMusic
bl pal_fill_for_maplights
bl sub_8111CF0
bl ScriptContext2_Enable
@@ -5031,7 +5031,7 @@ sub_8085A54: @ 8085A54
beq _08085A78
movs r0, 0x28
bl PlaySE
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x26]
@@ -5125,7 +5125,7 @@ _08085B10:
cmp r1, r0
bne _08085B58
adds r0, r6, 0
bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
bl FieldObjectCheckHeldMovementStatus
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -5200,7 +5200,7 @@ sub_8085BA8: @ 8085BA8
bl ScriptContext2_Enable
bl player_bitmagic
bl CameraObjectReset2
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x26]
@@ -5406,8 +5406,8 @@ sub_8085D34: @ 8085D34
cmp r0, 0x1
bne _08085D70
bl copy_saved_warp3_bank_and_enter_x_to_warp1
bl warp_in
ldr r0, _08085D78 @ =sub_805671C
bl WarpIntoMap
ldr r0, _08085D78 @ =CB2_LoadMap
bl SetMainCallback2
ldr r1, _08085D7C @ =gFieldCallback
ldr r0, _08085D80 @ =mapldr_08085D88
@@ -5422,7 +5422,7 @@ _08085D70:
bx r0
.align 2, 0
_08085D74: .4byte gPaletteFade
_08085D78: .4byte sub_805671C
_08085D78: .4byte CB2_LoadMap
_08085D7C: .4byte gFieldCallback
_08085D80: .4byte mapldr_08085D88
_08085D84: .4byte sub_8085B78
@@ -5431,7 +5431,7 @@ _08085D84: .4byte sub_8085B78
thumb_func_start mapldr_08085D88
mapldr_08085D88: @ 8085D88
push {lr}
bl sub_8055DC4
bl Overworld_PlaySpecialMapMusic
bl pal_fill_for_maplights
bl sub_8111CF0
bl ScriptContext2_Enable
@@ -5540,7 +5540,7 @@ sub_8085E0C: @ 8085E0C
ldrb r0, [r2]
lsrs r0, 6
strh r0, [r6, 0x24]
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x26]
@@ -6185,7 +6185,7 @@ sub_8086358: @ 8086358
movs r1, 0
movs r2, 0
bl ChangeBgY
bl sub_80F77B8
bl Menu_LoadStdPal
movs r0, 0x26
ldrsh r1, [r4, r0]
lsls r0, r1, 4
@@ -6568,7 +6568,7 @@ sub_8086650: @ 8086650
movs r1, 0
movs r2, 0
bl ChangeBgY
bl sub_80F77B8
bl Menu_LoadStdPal
movs r0, 0x26
ldrsh r1, [r4, r0]
lsls r0, r1, 4
@@ -7050,12 +7050,12 @@ sub_8086A20: @ 8086A20
ldr r1, _08086A68 @ =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
bl FieldObjectIsMovementOverridden
lsls r0, 24
cmp r0, 0
beq _08086A4A
adds r0, r4, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
bl FieldObjectClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _08086A5C
@@ -7063,7 +7063,7 @@ _08086A4A:
bl sub_805CB70
adds r0, r4, 0
movs r1, 0x45
bl sub_8063CA4
bl FieldObjectSetHeldMovement
ldrh r0, [r5, 0x8]
adds r0, 0x1
strh r0, [r5, 0x8]
@@ -7087,7 +7087,7 @@ sub_8086A6C: @ 8086A6C
lsls r0, 2
ldr r1, _08086AAC @ =gMapObjects
adds r0, r1
bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
bl FieldObjectCheckHeldMovementStatus
lsls r0, 24
cmp r0, 0
beq _08086AA2
@@ -7135,9 +7135,9 @@ sub_8086AB4: @ 8086AB4
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_805F060
bl EventObjectSetGraphicsId
adds r0, r4, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
bl FieldObjectClearHeldMovementIfFinished
ldrb r0, [r4, 0x18]
lsrs r0, 4
bl sub_80641C0
@@ -7145,7 +7145,7 @@ sub_8086AB4: @ 8086AB4
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_8063CA4
bl FieldObjectSetHeldMovement
ldr r1, _08086B2C @ =gFieldEffectArguments
movs r2, 0xA
ldrsh r0, [r6, r2]
@@ -7182,7 +7182,7 @@ sub_8086B30: @ 8086B30
ldr r1, _08086BA0 @ =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
bl FieldObjectClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _08086B96
@@ -7199,7 +7199,7 @@ sub_8086B30: @ 8086B30
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_8063CA4
bl FieldObjectSetHeldMovement
ldrb r0, [r4, 0x1A]
movs r1, 0x1
bl sub_80DC44C
@@ -7302,12 +7302,12 @@ sub_8086C24: @ 8086C24
ldr r1, _08086C6C @ =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
bl FieldObjectIsMovementOverridden
lsls r0, 24
cmp r0, 0
beq _08086C4E
adds r0, r4, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
bl FieldObjectClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _08086C60
@@ -7315,7 +7315,7 @@ _08086C4E:
bl sub_805CBE8
adds r0, r4, 0
movs r1, 0x45
bl sub_8063CA4
bl FieldObjectSetHeldMovement
ldrh r0, [r5, 0x8]
adds r0, 0x1
strh r0, [r5, 0x8]
@@ -7340,7 +7340,7 @@ sub_8086C70: @ 8086C70
ldr r1, _08086CA0 @ =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
bl FieldObjectClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _08086CEE
@@ -7366,7 +7366,7 @@ _08086CAE:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_805F060
bl EventObjectSetGraphicsId
b _08086CD2
_08086CC0:
movs r0, 0
@@ -7375,7 +7375,7 @@ _08086CC0:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_805F060
bl EventObjectSetGraphicsId
_08086CD2:
ldrb r0, [r4, 0x18]
lsls r0, 28
@@ -7405,7 +7405,7 @@ sub_8086CF4: @ 8086CF4
lsls r0, 2
ldr r1, _08086D30 @ =gMapObjects
adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimFinished
bl FieldObjectClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _08086D26
@@ -7599,12 +7599,12 @@ sub_8086E70: @ 8086E70
ldr r1, _08086EC4 @ =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
bl FieldObjectIsMovementOverridden
lsls r0, 24
cmp r0, 0
beq _08086E9A
adds r0, r4, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
bl FieldObjectClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _08086EB8
@@ -7617,7 +7617,7 @@ _08086E9A:
bl sub_805CB70
adds r0, r4, 0
movs r1, 0x45
bl sub_8063CA4
bl FieldObjectSetHeldMovement
ldrh r0, [r5, 0x8]
adds r0, 0x1
strh r0, [r5, 0x8]
@@ -7641,7 +7641,7 @@ sub_8086EC8: @ 8086EC8
lsls r0, 2
ldr r1, _08086F04 @ =gMapObjects
adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimFinished
bl FieldObjectClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _08086EF8
@@ -7732,7 +7732,7 @@ sub_8086F64: @ 8086F64
ldr r1, _08086FA4 @ =gMapObjects
adds r0, r1
movs r1, 0x2
bl sub_8063CA4
bl FieldObjectSetHeldMovement
_08086F98:
pop {r4}
pop {r0}
@@ -7765,7 +7765,7 @@ sub_8086FA8: @ 8086FA8
bne _08086FEC
_08086FCE:
adds r0, r2, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
bl FieldObjectClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _08086FEC
@@ -7809,7 +7809,7 @@ sub_8086FFC: @ 8086FFC
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_805F060
bl EventObjectSetGraphicsId
ldrb r1, [r4, 0x4]
lsls r0, r1, 4
adds r0, r1
@@ -7824,7 +7824,7 @@ sub_8086FFC: @ 8086FFC
strb r0, [r4, 0x1]
adds r0, r4, 0
movs r1, 0x54
bl sub_8063CA4
bl FieldObjectSetHeldMovement
ldrh r0, [r5, 0x8]
adds r0, 0x1
strh r0, [r5, 0x8]
@@ -8433,12 +8433,12 @@ sub_80874C8: @ 80874C8
ldr r1, _080875B8 @ =gMapObjects
adds r5, r0, r1
adds r0, r5, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
bl FieldObjectIsMovementOverridden
lsls r0, 24
cmp r0, 0
beq _080874F2
adds r0, r5, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
bl FieldObjectClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _080875AE
@@ -8468,7 +8468,7 @@ _0808751A:
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
bl sub_805F060
bl EventObjectSetGraphicsId
bl CameraObjectReset2
adds r0, r5, 0
movs r1, 0x3
@@ -8688,7 +8688,7 @@ sub_8087698: @ 8087698
bl sub_805CB70
adds r0, r5, 0
movs r1, 0x45
bl sub_8063CA4
bl FieldObjectSetHeldMovement
ldrh r0, [r6, 0x8]
adds r0, 0x1
strh r0, [r6, 0x8]
@@ -8713,7 +8713,7 @@ sub_8087710: @ 8087710
lsls r0, 2
ldr r1, _08087744 @ =gMapObjects
adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimFinished
bl FieldObjectClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _08087738
@@ -8795,7 +8795,7 @@ _080877B4:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_805F060
bl EventObjectSetGraphicsId
adds r0, r4, 0
movs r1, 0x1
bl FieldObjectTurn
asm/field_fadetransition.s
+34 -34
View File
@@ -245,7 +245,7 @@ _0807DCDC:
sub_807DCE4: @ 807DCE4
push {lr}
bl ScriptContext2_Enable
bl sub_8055DC4
bl Overworld_PlaySpecialMapMusic
bl sub_807DC00
ldr r0, _0807DD00 @ =task0A_nop_for_a_while
movs r1, 0xA
@@ -277,7 +277,7 @@ _0807DD1C:
FieldCallback_ReturnToEventScript2: @ 807DD24
push {lr}
bl ScriptContext2_Enable
bl sub_8055DC4
bl Overworld_PlaySpecialMapMusic
bl sub_807DC00
ldr r0, _0807DD40 @ =task0A_asap_script_env_2_enable_and_set_ctx_running
movs r1, 0xA
@@ -366,7 +366,7 @@ _0807DDCA:
sub_807DDD0: @ 807DDD0
push {lr}
bl ScriptContext2_Enable
bl sub_8055DC4
bl Overworld_PlaySpecialMapMusic
bl palette_bg_faded_fill_black
ldr r0, _0807DDEC @ =task_mpl_807DD60
movs r1, 0xA
@@ -434,7 +434,7 @@ _0807DE50:
sub_807DE58: @ 807DE58
push {lr}
bl ScriptContext2_Enable
bl sub_8055DC4
bl Overworld_PlaySpecialMapMusic
bl palette_bg_faded_fill_black
ldr r0, _0807DE74 @ =sub_807DDF0
movs r1, 0xA
@@ -563,7 +563,7 @@ _0807DF5E:
thumb_func_start sub_807DF64
sub_807DF64: @ 807DF64
push {lr}
bl sub_8055DC4
bl Overworld_PlaySpecialMapMusic
bl sub_8111CF0
movs r0, 0
bl sub_807DE78
@@ -575,7 +575,7 @@ sub_807DF64: @ 807DF64
thumb_func_start sub_807DF7C
sub_807DF7C: @ 807DF7C
push {lr}
bl sub_8055DC4
bl Overworld_PlaySpecialMapMusic
bl sub_8111CF0
movs r0, 0x1
bl sub_807DE78
@@ -587,7 +587,7 @@ sub_807DF7C: @ 807DF7C
thumb_func_start sub_807DF94
sub_807DF94: @ 807DF94
push {lr}
bl sub_8055DC4
bl Overworld_PlaySpecialMapMusic
bl pal_fill_for_maplights
bl sub_8111CF0
movs r0, 0x28
@@ -730,7 +730,7 @@ _0807E0AE:
ldr r1, _0807E0E8 @ =gMapObjects
adds r0, r1
movs r1, 0x10
bl sub_8063CA4
bl FieldObjectSetHeldMovement
movs r0, 0x8
strh r0, [r4, 0x8]
b _0807E206
@@ -783,7 +783,7 @@ _0807E10E:
lsls r0, 2
ldr r1, _0807E15C @ =gMapObjects
adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimFinished
bl FieldObjectClearHeldMovementIfFinished
b _0807E1F2
.align 2, 0
_0807E158: .4byte sub_807F204
@@ -807,7 +807,7 @@ _0807E160:
ldr r1, _0807E194 @ =gMapObjects
adds r0, r1
movs r1, 0x10
bl sub_8063CA4
bl FieldObjectSetHeldMovement
movs r0, 0x2
strh r0, [r4, 0x8]
b _0807E206
@@ -838,7 +838,7 @@ _0807E198:
lsls r0, 2
ldr r1, _0807E1D8 @ =gMapObjects
adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimFinished
bl FieldObjectClearHeldMovementIfFinished
movs r0, 0x3
strh r0, [r4, 0x8]
b _0807E206
@@ -929,7 +929,7 @@ _0807E25E:
lsls r4, 2
ldr r0, _0807E2A4 @ =gMapObjects
adds r4, r0
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
bl sub_8063F84
@@ -937,7 +937,7 @@ _0807E25E:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_8063CA4
bl FieldObjectSetHeldMovement
movs r0, 0x2
strh r0, [r5, 0x8]
b _0807E2C6
@@ -1112,7 +1112,7 @@ _0807E3E4:
sub_807E3EC: @ 807E3EC
push {lr}
bl ScriptContext2_Enable
bl sub_8055DC4
bl Overworld_PlaySpecialMapMusic
bl sub_807DC00
ldr r0, _0807E408 @ =task_mpl_807E3C8
movs r1, 0xA
@@ -1411,7 +1411,7 @@ _0807E632:
strh r0, [r4, 0x8]
b _0807E64A
_0807E63A:
bl warp_in
bl WarpIntoMap
ldr r0, _0807E650 @ =sub_8056788
bl SetMainCallback2
adds r0, r5, 0
@@ -1494,8 +1494,8 @@ _0807E6DC:
ldrb r0, [r0]
cmp r0, 0
bne _0807E6F4
bl warp_in
ldr r0, _0807E700 @ =sub_805671C
bl WarpIntoMap
ldr r0, _0807E700 @ =CB2_LoadMap
bl SetMainCallback2
adds r0, r5, 0
bl DestroyTask
@@ -1505,7 +1505,7 @@ _0807E6F4:
bx r0
.align 2, 0
_0807E6FC: .4byte gReceivedRemoteLinkPlayers
_0807E700: .4byte sub_805671C
_0807E700: .4byte CB2_LoadMap
thumb_func_end sub_807E678
thumb_func_start sub_807E704
@@ -1563,8 +1563,8 @@ _0807E762:
strh r0, [r4, 0x8]
b _0807E77A
_0807E76A:
bl warp_in
ldr r0, _0807E780 @ =sub_805671C
bl WarpIntoMap
ldr r0, _0807E780 @ =CB2_LoadMap
bl SetMainCallback2
adds r0, r5, 0
bl DestroyTask
@@ -1573,7 +1573,7 @@ _0807E77A:
pop {r0}
bx r0
.align 2, 0
_0807E780: .4byte sub_805671C
_0807E780: .4byte CB2_LoadMap
thumb_func_end sub_807E718
thumb_func_start sub_807E784
@@ -1630,8 +1630,8 @@ _0807E7EA:
strh r0, [r4, 0x8]
b _0807E802
_0807E7F2:
bl warp_in
ldr r0, _0807E808 @ =sub_805671C
bl WarpIntoMap
ldr r0, _0807E808 @ =CB2_LoadMap
bl SetMainCallback2
adds r0, r5, 0
bl DestroyTask
@@ -1640,7 +1640,7 @@ _0807E802:
pop {r0}
bx r0
.align 2, 0
_0807E808: .4byte sub_805671C
_0807E808: .4byte CB2_LoadMap
thumb_func_end sub_807E784
thumb_func_start sub_807E80C
@@ -1744,7 +1744,7 @@ _0807E8AE:
lsls r0, 2
adds r0, r4
movs r1, 0x11
bl sub_8063CA4
bl FieldObjectSetHeldMovement
movs r0, 0x2
strh r0, [r5, 0x8]
b _0807E976
@@ -1776,7 +1776,7 @@ _0807E8F4:
lsls r0, 2
ldr r1, _0807E93C @ =gMapObjects
adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimFinished
bl FieldObjectClearHeldMovementIfFinished
movs r0, 0
bl sub_807DCB0
movs r0, 0x3
@@ -1871,12 +1871,12 @@ _0807E9DA:
b _0807EA92
_0807E9E8:
adds r0, r6, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
bl FieldObjectIsMovementOverridden
lsls r0, 24
cmp r0, 0
beq _0807EA00
adds r0, r6, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
bl FieldObjectClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _0807EAB0
@@ -1957,8 +1957,8 @@ _0807EA9A:
ldr r0, _0807EAB8 @ =gFieldCallback
ldr r1, _0807EABC @ =sub_807DF64
str r1, [r0]
bl warp_in
ldr r0, _0807EAC0 @ =sub_805671C
bl WarpIntoMap
ldr r0, _0807EAC0 @ =CB2_LoadMap
bl SetMainCallback2
adds r0, r4, 0
bl DestroyTask
@@ -1970,7 +1970,7 @@ _0807EAB0:
.align 2, 0
_0807EAB8: .4byte gFieldCallback
_0807EABC: .4byte sub_807DF64
_0807EAC0: .4byte sub_805671C
_0807EAC0: .4byte CB2_LoadMap
thumb_func_end sub_807E980
thumb_func_start sub_807EAC4
@@ -2033,7 +2033,7 @@ _0807EB08:
lsrs r0, 7
cmp r0, 0
beq _0807EB4C
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
bl GetStepInPlaceDelay16AnimId
@@ -2071,7 +2071,7 @@ sub_807EB64: @ 807EB64
lsls r4, 2
ldr r0, _0807EBB8 @ =gMapObjects
adds r4, r0
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
bl GetStepInPlaceDelay16AnimId
@@ -2188,7 +2188,7 @@ sub_807EC34: @ 807EC34
.align 2, 0
_0807EC6C: .4byte gTasks+0x8
_0807EC70:
bl sub_8055DC4
bl Overworld_PlaySpecialMapMusic
bl pal_fill_for_maplights
bl ScriptContext2_Enable
adds r0, r5, 0x2
asm/field_map_obj.s
+27 -27
View File
@@ -1373,8 +1373,8 @@ SpawnSpecialFieldObject: @ 805E7F4
_0805E82C: .4byte gSaveBlock1Ptr
thumb_func_end SpawnSpecialFieldObject
thumb_func_start SpawnSpecialFieldObjectParametrized
SpawnSpecialFieldObjectParametrized: @ 805E830
thumb_func_start SpawnSpecialFieldObjectParameterized
SpawnSpecialFieldObjectParameterized: @ 805E830
push {r4-r6,lr}
mov r6, r8
push {r6}
@@ -1425,7 +1425,7 @@ SpawnSpecialFieldObjectParametrized: @ 805E830
bx r1
.align 2, 0
_0805E894: .4byte 0xfff90000
thumb_func_end SpawnSpecialFieldObjectParametrized
thumb_func_end SpawnSpecialFieldObjectParameterized
thumb_func_start show_sprite
show_sprite: @ 805E898
@@ -1550,8 +1550,8 @@ MakeObjectTemplateFromFieldObjectTemplate: @ 805E960
bx r0
thumb_func_end MakeObjectTemplateFromFieldObjectTemplate
thumb_func_start AddPseudoFieldObject
AddPseudoFieldObject: @ 805E978
thumb_func_start AddPseudoEventObject
AddPseudoEventObject: @ 805E978
push {r4-r6,lr}
sub sp, 0x1C
ldr r4, [sp, 0x2C]
@@ -1612,7 +1612,7 @@ _0805E9E4:
.align 2, 0
_0805E9F0: .4byte 0x0000ffff
_0805E9F4: .4byte gSprites
thumb_func_end AddPseudoFieldObject
thumb_func_end AddPseudoEventObject
thumb_func_start sprite_new
sprite_new: @ 805E9F8
@@ -2440,8 +2440,8 @@ _0805F058: .4byte gPlayerAvatar
_0805F05C: .4byte gMapObjects
thumb_func_end SetPlayerAvatarFieldObjectIdAndObjectId
thumb_func_start sub_805F060
sub_805F060: @ 805F060
thumb_func_start EventObjectSetGraphicsId
EventObjectSetGraphicsId: @ 805F060
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -2625,7 +2625,7 @@ _0805F1BA:
_0805F1CC: .4byte gSprites
_0805F1D0: .4byte 0x000003ff
_0805F1D4: .4byte 0xfffffc00
thumb_func_end sub_805F060
thumb_func_end EventObjectSetGraphicsId
thumb_func_start FieldObjectSetGraphicsIdByLocalIdAndMap
FieldObjectSetGraphicsIdByLocalIdAndMap: @ 805F1D8
@@ -2652,7 +2652,7 @@ FieldObjectSetGraphicsIdByLocalIdAndMap: @ 805F1D8
ldr r1, _0805F214 @ =gMapObjects
adds r0, r1
adds r1, r4, 0
bl sub_805F060
bl EventObjectSetGraphicsId
_0805F20C:
add sp, 0x4
pop {r4}
@@ -10353,7 +10353,7 @@ mss_npc_reset_oampriv3_1_unk2_unk3: @ 80628C0
ldrb r0, [r4]
cmp r0, 0
bne _080628D8
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
strb r0, [r4]
_080628D8:
movs r0, 0x1
@@ -13097,8 +13097,8 @@ FieldObjectMoveDestCoords: @ 8063C50
bx r0
thumb_func_end FieldObjectMoveDestCoords
thumb_func_start FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive: @ 8063C70
thumb_func_start FieldObjectIsMovementOverridden
FieldObjectIsMovementOverridden: @ 8063C70
push {lr}
ldrb r1, [r0]
movs r0, 0x42
@@ -13112,7 +13112,7 @@ _08063C80:
_08063C82:
pop {r1}
bx r1
thumb_func_end FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
thumb_func_end FieldObjectIsMovementOverridden
thumb_func_start FieldObjectIsSpecialAnimActive
FieldObjectIsSpecialAnimActive: @ 8063C88
@@ -13134,8 +13134,8 @@ _08063CA0:
bx r1
thumb_func_end FieldObjectIsSpecialAnimActive
thumb_func_start sub_8063CA4
sub_8063CA4: @ 8063CA4
thumb_func_start FieldObjectSetHeldMovement
FieldObjectSetHeldMovement: @ 8063CA4
push {r4,r5,lr}
adds r4, r0, 0
lsls r1, 24
@@ -13146,7 +13146,7 @@ sub_8063CA4: @ 8063CA4
cmp r0, 0x1
beq _08063CC8
adds r0, r4, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
bl FieldObjectIsMovementOverridden
lsls r0, 24
cmp r0, 0
beq _08063CCE
@@ -13180,7 +13180,7 @@ _08063CF4:
bx r1
.align 2, 0
_08063CFC: .4byte gSprites
thumb_func_end sub_8063CA4
thumb_func_end FieldObjectSetHeldMovement
thumb_func_start FieldObjectForceSetSpecialAnim
FieldObjectForceSetSpecialAnim: @ 8063D00
@@ -13191,7 +13191,7 @@ FieldObjectForceSetSpecialAnim: @ 8063D00
bl FieldObjectClearAnimIfSpecialAnimActive
adds r0, r5, 0
adds r1, r4, 0
bl sub_8063CA4
bl FieldObjectSetHeldMovement
pop {r4,r5}
pop {r0}
bx r0
@@ -13242,8 +13242,8 @@ FieldObjectClearAnim: @ 8063D34
_08063D64: .4byte gSprites
thumb_func_end FieldObjectClearAnim
thumb_func_start FieldObjectCheckIfSpecialAnimFinishedOrInactive
FieldObjectCheckIfSpecialAnimFinishedOrInactive: @ 8063D68
thumb_func_start FieldObjectCheckHeldMovementStatus
FieldObjectCheckHeldMovementStatus: @ 8063D68
push {lr}
ldrb r1, [r0]
lsls r0, r1, 25
@@ -13256,13 +13256,13 @@ _08063D76:
_08063D78:
pop {r1}
bx r1
thumb_func_end FieldObjectCheckIfSpecialAnimFinishedOrInactive
thumb_func_end FieldObjectCheckHeldMovementStatus
thumb_func_start FieldObjectClearAnimIfSpecialAnimFinished
FieldObjectClearAnimIfSpecialAnimFinished: @ 8063D7C
thumb_func_start FieldObjectClearHeldMovementIfFinished
FieldObjectClearHeldMovementIfFinished: @ 8063D7C
push {r4,r5,lr}
adds r5, r0, 0
bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
bl FieldObjectCheckHeldMovementStatus
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0
@@ -13276,7 +13276,7 @@ _08063D96:
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end FieldObjectClearAnimIfSpecialAnimFinished
thumb_func_end FieldObjectClearHeldMovementIfFinished
thumb_func_start FieldObjectGetSpecialAnim
FieldObjectGetSpecialAnim: @ 8063DA0
@@ -14023,7 +14023,7 @@ FieldObjectFaceOppositeDirection: @ 80642C8
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_8063CA4
bl FieldObjectSetHeldMovement
lsls r0, 24
lsrs r0, 24
pop {r4}
asm/field_message_box.s
+5 -5
View File
@@ -65,13 +65,13 @@ _0806939E:
movs r1, 0x80
lsls r1, 2
movs r0, 0
bl sub_814FF98
bl TextWindow_LoadTilesStdFrame1
b _080693E2
.align 2, 0
_080693BC: .4byte gUnknown_203ADFA
_080693C0: .4byte gTextFlags
_080693C4:
bl sub_8069A38
bl IsMsgSignPost
lsls r0, 24
cmp r0, 0
bne _080693D4
@@ -90,7 +90,7 @@ _080693E2:
strh r0, [r5, 0x8]
b _08069402
_080693EA:
bl sub_80F6CBC
bl RunTextPrinters_CheckPrinter0Active
lsls r0, 16
lsrs r0, 16
cmp r0, 0x1
@@ -226,7 +226,7 @@ textbox_fdecode_auto_and_task_add: @ 80694C8
ldr r0, _080694E0 @ =gStringVar4
bl StringExpandPlaceholders
movs r0, 0x1
bl sub_80F6D5C
bl AddTextPrinterDiffStyle
bl task_add_textbox
pop {r0}
bx r0
@@ -238,7 +238,7 @@ _080694E0: .4byte gStringVar4
textbox_auto_and_task_add: @ 80694E4
push {lr}
movs r0, 0x1
bl sub_80F6D5C
bl AddTextPrinterDiffStyle
bl task_add_textbox
pop {r0}
bx r0
asm/field_player_avatar.s
+41 -41
View File
@@ -94,12 +94,12 @@ sub_805B45C: @ 805B45C
adds r4, r0, 0
lsls r1, 24
lsrs r5, r1, 24
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
bl FieldObjectIsMovementOverridden
lsls r0, 24
cmp r0, 0
beq _0805B4A6
adds r0, r4, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
bl FieldObjectClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
bne _0805B4A6
@@ -845,7 +845,7 @@ _0805B9AC: .4byte gPlayerAvatar
thumb_func_start PlayerNotOnBikeNotMoving
PlayerNotOnBikeNotMoving: @ 805B9B0
push {lr}
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
bl PlayerFaceDirection
@@ -1631,7 +1631,7 @@ PlayerIsAnimActive: @ 805BF7C
lsls r0, 2
ldr r1, _0805BF9C @ =gMapObjects
adds r0, r1
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
bl FieldObjectIsMovementOverridden
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -1651,7 +1651,7 @@ PlayerCheckIfAnimFinishedOrInactive: @ 805BFA0
lsls r0, 2
ldr r1, _0805BFC0 @ =gMapObjects
adds r0, r1
bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
bl FieldObjectCheckHeldMovementStatus
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -1737,7 +1737,7 @@ sub_805C024: @ 805C024
ldr r1, _0805C068 @ =gMapObjects
adds r0, r1
adds r1, r5, 0
bl sub_8063CA4
bl FieldObjectSetHeldMovement
lsls r0, 24
cmp r0, 0
bne _0805C05E
@@ -1765,7 +1765,7 @@ sub_805C06C: @ 805C06C
ldr r1, _0805C0A0 @ =gMapObjects
adds r0, r1
adds r1, r4, 0
bl sub_8063CA4
bl FieldObjectSetHeldMovement
lsls r0, 24
cmp r0, 0
bne _0805C094
@@ -1789,7 +1789,7 @@ sub_805C0A4: @ 805C0A4
lsls r1, 24
lsrs r5, r1, 24
adds r1, r5, 0
bl sub_8063CA4
bl FieldObjectSetHeldMovement
lsls r0, 24
cmp r0, 0
bne _0805C0CA
@@ -2404,7 +2404,7 @@ GetXYCoordsOneStepInFrontOfPlayer: @ 805C4F4
adds r0, r3
ldrh r0, [r0, 0x12]
strh r0, [r5]
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
adds r1, r4, 0
@@ -2582,8 +2582,8 @@ _0805C6BC:
bx r1
thumb_func_end plaer_get_pos_including_state_based_drift
thumb_func_start player_get_direction_lower_nybble
player_get_direction_lower_nybble: @ 805C6C4
thumb_func_start GetPlayerFacingDirection
GetPlayerFacingDirection: @ 805C6C4
ldr r2, _0805C6DC @ =gMapObjects
ldr r0, _0805C6E0 @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
@@ -2598,7 +2598,7 @@ player_get_direction_lower_nybble: @ 805C6C4
.align 2, 0
_0805C6DC: .4byte gMapObjects
_0805C6E0: .4byte gPlayerAvatar
thumb_func_end player_get_direction_lower_nybble
thumb_func_end GetPlayerFacingDirection
thumb_func_start player_get_direction_upper_nybble
player_get_direction_upper_nybble: @ 805C6E4
@@ -3257,7 +3257,7 @@ sub_805CB70: @ 805CB70
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_805F060
bl EventObjectSetGraphicsId
ldrb r1, [r5, 0x4]
lsls r0, r1, 4
adds r0, r1
@@ -3318,7 +3318,7 @@ sub_805CBE8: @ 805CBE8
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_805F060
bl EventObjectSetGraphicsId
ldrb r1, [r5, 0x4]
lsls r0, r1, 4
adds r0, r1
@@ -3532,19 +3532,19 @@ sub_805CD84: @ 805CD84
adds r5, r1, 0
adds r4, r2, 0
adds r0, r5, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
bl FieldObjectIsMovementOverridden
lsls r0, 24
cmp r0, 0
bne _0805CE0E
adds r0, r4, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
bl FieldObjectIsMovementOverridden
lsls r0, 24
cmp r0, 0
bne _0805CE0E
adds r0, r5, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
bl FieldObjectClearHeldMovementIfFinished
adds r0, r4, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
bl FieldObjectClearHeldMovementIfFinished
ldrb r0, [r6, 0xC]
bl GetStepInPlaceDelay16AnimId
adds r1, r0, 0
@@ -3602,19 +3602,19 @@ sub_805CE20: @ 805CE20
adds r5, r1, 0
adds r4, r2, 0
adds r0, r5, 0
bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
bl FieldObjectCheckHeldMovementStatus
lsls r0, 24
cmp r0, 0
beq _0805CE70
adds r0, r4, 0
bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
bl FieldObjectCheckHeldMovementStatus
lsls r0, 24
cmp r0, 0
beq _0805CE70
adds r0, r5, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
bl FieldObjectClearHeldMovementIfFinished
adds r0, r4, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
bl FieldObjectClearHeldMovementIfFinished
adds r0, r4, 0
bl sub_806DE28
ldrh r0, [r4, 0x10]
@@ -3704,7 +3704,7 @@ PlayerAvatar_DoSecretBaseMatJump: @ 805CEEC
movs r0, 0x1
strb r0, [r5, 0x6]
adds r0, r4, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
bl FieldObjectClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _0805CF48
@@ -3836,7 +3836,7 @@ sub_805CFEC: @ 805CFEC
movs r2, 0x4
bl memcpy
adds r0, r5, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
bl FieldObjectClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _0805D054
@@ -3896,7 +3896,7 @@ sub_805D064: @ 805D064
movs r2, 0x5
bl memcpy
adds r0, r4, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
bl FieldObjectClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _0805D094
@@ -3924,7 +3924,7 @@ sub_805D0A4: @ 805D0A4
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
bl FieldObjectClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _0805D0E8
@@ -4073,12 +4073,12 @@ taskFF_0805D1D4: @ 805D1D4
ldr r1, _0805D234 @ =gMapObjects
adds r5, r0, r1
adds r0, r5, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
bl FieldObjectIsMovementOverridden
lsls r0, 24
cmp r0, 0
beq _0805D200
adds r0, r5, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
bl FieldObjectClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _0805D228
@@ -4124,7 +4124,7 @@ sub_805D240: @ 805D240
ldr r1, _0805D2B8 @ =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
bl FieldObjectClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _0805D2AE
@@ -4134,7 +4134,7 @@ sub_805D240: @ 805D240
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_805F060
bl EventObjectSetGraphicsId
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
@@ -4503,7 +4503,7 @@ _0805D548:
adds r4, r0
lsls r4, 2
adds r4, r5
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
bl sub_8063510
@@ -4676,7 +4676,7 @@ sub_805D66C: @ 805D66C
movs r0, 0
movs r1, 0x2
movs r3, 0x1
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized2
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -4734,7 +4734,7 @@ _0805D6EA:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_805F060
bl EventObjectSetGraphicsId
ldrb r1, [r4, 0x18]
lsrs r1, 4
adds r0, r4, 0
@@ -4827,7 +4827,7 @@ sub_805D7C0: @ 805D7C0
adds r4, r0
lsls r4, 2
adds r4, r5
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
bl sub_8063500
@@ -4851,7 +4851,7 @@ sub_805D7C0: @ 805D7C0
movs r0, 0
movs r1, 0x2
movs r3, 0x1
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized2
movs r0, 0xD
strh r0, [r6, 0x8]
movs r0, 0x1
@@ -4883,7 +4883,7 @@ sub_805D838: @ 805D838
adds r4, r0
lsls r4, 2
adds r4, r5
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
bl sub_8063500
@@ -4904,7 +4904,7 @@ sub_805D838: @ 805D838
movs r0, 0
movs r1, 0x2
movs r3, 0x1
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized2
ldrh r0, [r6, 0x8]
adds r0, 0x1
strh r0, [r6, 0x8]
@@ -4978,7 +4978,7 @@ sub_805D8D8: @ 805D8D8
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_805F060
bl EventObjectSetGraphicsId
ldrb r1, [r4, 0x18]
lsrs r1, 4
adds r0, r4, 0
@@ -5131,7 +5131,7 @@ _0805DA2E:
bhi _0805DA60
movs r0, 0x8
strh r0, [r4, 0x24]
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
@@ -5280,7 +5280,7 @@ _0805DB58:
b _0805DBFA
_0805DB5E:
adds r0, r4, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
bl FieldObjectClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _0805DBFA
@@ -5608,7 +5608,7 @@ sub_805DDC8: @ 805DDC8
ble _0805DE20
_0805DDE4:
adds r0, r5, 0
bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
bl FieldObjectCheckHeldMovementStatus
lsls r0, 24
cmp r0, 0
beq _0805DE20
asm/field_poison.s
-316
View File
@@ -1,316 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start CheckMonIsValid
CheckMonIsValid: @ 80A0460
push {lr}
movs r1, 0x41
bl GetMonData
lsls r0, 16
lsrs r1, r0, 16
cmp r1, 0
beq _080A0478
movs r0, 0xCE
lsls r0, 1
cmp r1, r0
bne _080A047C
_080A0478:
movs r0, 0
b _080A047E
_080A047C:
movs r0, 0x1
_080A047E:
pop {r1}
bx r1
thumb_func_end CheckMonIsValid
thumb_func_start AllMonsFainted
AllMonsFainted: @ 80A0484
push {r4,r5,lr}
ldr r4, _080A04A4 @ =gPlayerParty
movs r5, 0
_080A048A:
adds r0, r4, 0
bl CheckMonIsValid
cmp r0, 0
beq _080A04A8
adds r0, r4, 0
movs r1, 0x39
bl GetMonData
cmp r0, 0
beq _080A04A8
movs r0, 0
b _080A04B2
.align 2, 0
_080A04A4: .4byte gPlayerParty
_080A04A8:
adds r5, 0x1
adds r4, 0x64
cmp r5, 0x5
ble _080A048A
movs r0, 0x1
_080A04B2:
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end AllMonsFainted
thumb_func_start MonFaintFromPoisonOnField
MonFaintFromPoisonOnField: @ 80A04B8
push {r4,r5,lr}
sub sp, 0x4
lsls r0, 24
lsrs r0, 24
movs r1, 0x64
adds r4, r0, 0
muls r4, r1
ldr r0, _080A04FC @ =gPlayerParty
adds r4, r0
movs r0, 0
str r0, [sp]
adds r0, r4, 0
movs r1, 0x8
bl AdjustFriendship
adds r0, r4, 0
movs r1, 0x37
mov r2, sp
bl SetMonData
ldr r5, _080A0500 @ =gStringVar1
adds r0, r4, 0
movs r1, 0x2
adds r2, r5, 0
bl GetMonData
adds r0, r5, 0
bl StringGetEnd10
add sp, 0x4
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080A04FC: .4byte gPlayerParty
_080A0500: .4byte gStringVar1
thumb_func_end MonFaintFromPoisonOnField
thumb_func_start CheckMonFaintedFromPoison
CheckMonFaintedFromPoison: @ 80A0504
push {r4,lr}
lsls r0, 24
lsrs r0, 24
movs r1, 0x64
muls r1, r0
ldr r0, _080A0540 @ =gPlayerParty
adds r4, r1, r0
adds r0, r4, 0
bl CheckMonIsValid
cmp r0, 0
beq _080A0544
adds r0, r4, 0
movs r1, 0x39
bl GetMonData
cmp r0, 0
bne _080A0544
adds r0, r4, 0
movs r1, 0x37
bl GetMonData
bl pokemon_ailments_get_primary
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _080A0544
movs r0, 0x1
b _080A0546
.align 2, 0
_080A0540: .4byte gPlayerParty
_080A0544:
movs r0, 0
_080A0546:
pop {r4}
pop {r1}
bx r1
thumb_func_end CheckMonFaintedFromPoison
thumb_func_start Task_WhiteOut
Task_WhiteOut: @ 80A054C
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
ldr r1, _080A0570 @ =gTasks+0x8
adds r4, r0, r1
movs r1, 0
ldrsh r0, [r4, r1]
cmp r0, 0x1
beq _080A05A6
cmp r0, 0x1
bgt _080A0574
cmp r0, 0
beq _080A057A
b _080A05F6
.align 2, 0
_080A0570: .4byte gTasks+0x8
_080A0574:
cmp r0, 0x2
beq _080A05B8
b _080A05F6
_080A057A:
ldrh r1, [r4, 0x2]
movs r2, 0x2
ldrsh r0, [r4, r2]
cmp r0, 0x5
bgt _080A05A0
_080A0584:
lsls r0, r1, 24
lsrs r0, 24
bl CheckMonFaintedFromPoison
cmp r0, 0
bne _080A05D0
ldrh r0, [r4, 0x2]
adds r0, 0x1
strh r0, [r4, 0x2]
adds r1, r0, 0
lsls r0, 16
asrs r0, 16
cmp r0, 0x5
ble _080A0584
_080A05A0:
movs r0, 0x2
strh r0, [r4]
b _080A05F6
_080A05A6:
bl IsFieldMessageBoxHidden
lsls r0, 24
cmp r0, 0
beq _080A05F6
ldrh r0, [r4]
subs r0, 0x1
strh r0, [r4]
b _080A05F6
_080A05B8:
bl AllMonsFainted
adds r1, r0, 0
cmp r1, 0
beq _080A05E8
ldr r1, _080A05CC @ =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
b _080A05EC
.align 2, 0
_080A05CC: .4byte gSpecialVar_Result
_080A05D0:
ldrb r0, [r4, 0x2]
bl MonFaintFromPoisonOnField
ldr r0, _080A05E4 @ =gUnknown_81A5476
bl ShowFieldMessage
ldrh r0, [r4]
adds r0, 0x1
strh r0, [r4]
b _080A05F6
.align 2, 0
_080A05E4: .4byte gUnknown_81A5476
_080A05E8:
ldr r0, _080A05FC @ =gSpecialVar_Result
strh r1, [r0]
_080A05EC:
bl EnableBothScriptContexts
adds r0, r5, 0
bl DestroyTask
_080A05F6:
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080A05FC: .4byte gSpecialVar_Result
thumb_func_end Task_WhiteOut
thumb_func_start ExecuteWhiteOut
ExecuteWhiteOut: @ 80A0600
push {lr}
ldr r0, _080A0614 @ =Task_WhiteOut
movs r1, 0x50
bl CreateTask
bl ScriptContext1_Stop
pop {r0}
bx r0
.align 2, 0
_080A0614: .4byte Task_WhiteOut
thumb_func_end ExecuteWhiteOut
thumb_func_start overworld_poison
overworld_poison: @ 80A0618
push {r4-r7,lr}
sub sp, 0x4
ldr r4, _080A0684 @ =gPlayerParty
movs r7, 0
movs r6, 0
movs r5, 0x5
_080A0624:
adds r0, r4, 0
movs r1, 0x5
bl GetMonData
cmp r0, 0
beq _080A0668
adds r0, r4, 0
movs r1, 0x37
bl GetMonData
bl pokemon_ailments_get_primary
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _080A0668
adds r0, r4, 0
movs r1, 0x39
bl GetMonData
str r0, [sp]
cmp r0, 0
beq _080A065A
subs r0, 0x1
str r0, [sp]
cmp r0, 0
bne _080A065C
_080A065A:
adds r6, 0x1
_080A065C:
adds r0, r4, 0
movs r1, 0x39
mov r2, sp
bl SetMonData
adds r7, 0x1
_080A0668:
adds r4, 0x64
subs r5, 0x1
cmp r5, 0
bge _080A0624
cmp r6, 0
bne _080A0678
cmp r7, 0
beq _080A067C
_080A0678:
bl overworld_poison_effect
_080A067C:
cmp r6, 0
beq _080A0688
movs r0, 0x2
b _080A0692
.align 2, 0
_080A0684: .4byte gPlayerParty
_080A0688:
cmp r7, 0
bne _080A0690
movs r0, 0
b _080A0692
_080A0690:
movs r0, 0x1
_080A0692:
add sp, 0x4
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end overworld_poison
.align 2, 0 @ Don't pad with nop.
asm/field_screen_effect.s
+1 -1
View File
@@ -785,7 +785,7 @@ _0807F3E0:
movs r1, 0x2
mov r2, r10
mov r3, r9
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
ldr r2, _0807F42C @ =gTextFlags
ldrb r1, [r2]
movs r0, 0x2
asm/field_special_scene.s
-39
View File
@@ -1,39 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_80A0E78
sub_80A0E78: @ 80A0E78
movs r0, 0
bx lr
thumb_func_end sub_80A0E78
thumb_func_start nullsub_57
nullsub_57: @ 80A0E7C
bx lr
thumb_func_end nullsub_57
thumb_func_start nullsub_58
nullsub_58: @ 80A0E80
bx lr
thumb_func_end nullsub_58
thumb_func_start nullsub_59
nullsub_59: @ 80A0E84
bx lr
thumb_func_end nullsub_59
thumb_func_start nullsub_60
nullsub_60: @ 80A0E88
bx lr
thumb_func_end nullsub_60
thumb_func_start nullsub_61
nullsub_61: @ 80A0E8C
bx lr
thumb_func_end nullsub_61
.align 2, 0 @ Don't pad with nop.
asm/field_specials.s
+24 -24
View File
@@ -9,13 +9,13 @@
sub_80CA618: @ 80CA618
push {lr}
bl sub_8112364
ldr r0, _080CA62C @ =sub_80F4C10
ldr r0, _080CA62C @ =CB2_ShowDiploma
bl SetMainCallback2
bl ScriptContext2_Enable
pop {r0}
bx r0
.align 2, 0
_080CA62C: .4byte sub_80F4C10
_080CA62C: .4byte CB2_ShowDiploma
thumb_func_end sub_80CA618
thumb_func_start sub_80CA630
@@ -178,11 +178,11 @@ _080CA748: .4byte gUnknown_8417FCC
thumb_func_start sub_80CA74C
sub_80CA74C: @ 80CA74C
ldr r0, _080CA754 @ =gUnknown_2023E8A
ldr r0, _080CA754 @ =gBattleOutcome
ldrb r0, [r0]
bx lr
.align 2, 0
_080CA754: .4byte gUnknown_2023E8A
_080CA754: .4byte gBattleOutcome
thumb_func_end sub_80CA74C
thumb_func_start sub_80CA758
@@ -268,13 +268,13 @@ _080CA7E6:
sub_80CA7EC: @ 80CA7EC
push {lr}
bl sub_8112364
ldr r1, _080CA800 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
ldr r1, _080CA800 @ =CB2_ReturnToFieldContinueScriptPlayMapMusic
movs r0, 0x1
bl sub_80BFF50
pop {r0}
bx r0
.align 2, 0
_080CA800: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
_080CA800: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
thumb_func_end sub_80CA7EC
thumb_func_start sub_80CA804
@@ -413,7 +413,7 @@ sub_80CA8F8: @ 80CA8F8
movs r4, 0
movs r7, 0
movs r5, 0
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
adds r1, r0, 0
@@ -510,7 +510,7 @@ sub_80CA9A8: @ 80CA9A8
movs r4, 0
movs r6, 0
movs r5, 0
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
adds r1, r0, 0
@@ -601,7 +601,7 @@ SpawnScriptFieldObject: @ 80CAA34
movs r0, 0x12
movs r1, 0x8
movs r2, 0x7F
bl SpawnSpecialFieldObjectParametrized
bl SpawnSpecialFieldObjectParameterized
lsls r0, 24
lsrs r0, 24
ldr r2, _080CAA84 @ =gMapObjects
@@ -2071,12 +2071,12 @@ sub_80CB580: @ 80CB580
ldr r5, _080CB62C @ =0x0000021d
adds r1, r5, 0
movs r2, 0xD0
bl sub_814FF2C
bl TextWindow_SetStdFrame0_WithPal
ldrb r0, [r4]
movs r1, 0
adds r2, r5, 0
movs r3, 0xD
bl SetWindowBorderStyle
bl DrawStdFrameWithCustomTileAndPalette
ldrb r0, [r4]
ldr r2, _080CB630 @ =gUnknown_8418075
movs r1, 0x2
@@ -2141,7 +2141,7 @@ sub_80CB63C: @ 80CB63C
ldr r4, _080CB654 @ =gUnknown_2039A0C
ldrb r0, [r4]
movs r1, 0x1
bl sub_810F4D8
bl ClearStdWindowAndFrameToTransparent
ldrb r0, [r4]
bl RemoveWindow
pop {r4}
@@ -2631,7 +2631,7 @@ _080CB9D2:
lsrs r0, 24
strh r0, [r5, 0x22]
movs r1, 0
bl sub_80F7750
bl SetStdWindowBorderStyle
ldr r4, _080CBA70 @ =gUnknown_3005360
ldrh r0, [r5, 0xA]
strh r0, [r4, 0xC]
@@ -2753,7 +2753,7 @@ sub_80CBADC: @ 80CBADC
ldr r4, _080CBB20 @ =gUnknown_3005378
adds r1, r4, 0
movs r2, 0
bl get_coro_args_x18_x1A
bl ListMenuGetScrollAndRow
ldr r1, _080CBB24 @ =gUnknown_2039A18
ldrh r0, [r4]
strh r0, [r1]
@@ -2781,7 +2781,7 @@ sub_80CBB28: @ 80CBB28
ldrh r0, [r6, 0x24]
lsls r0, 24
lsrs r0, 24
bl ListMenuHandleInput
bl ListMenu_ProcessInput
adds r4, r0, 0
movs r0, 0x2
negs r0, r0
@@ -2854,7 +2854,7 @@ sub_80CBBAC: @ 80CBBAC
lsrs r0, 24
movs r1, 0
movs r2, 0
bl DestroyListMenu
bl DestroyListMenuTask
ldr r0, _080CBC28 @ =gUnknown_2039A14
ldr r0, [r0]
bl Free
@@ -2862,7 +2862,7 @@ sub_80CBBAC: @ 80CBBAC
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
bl sub_810F4D8
bl ClearStdWindowAndFrameToTransparent
ldrh r0, [r4, 0x22]
lsls r0, 24
lsrs r0, 24
@@ -3150,8 +3150,8 @@ _080CBDF8: .4byte gSelectedEventObject
_080CBDFC: .4byte gUnknown_20370DA
thumb_func_end sub_80CBDE8
thumb_func_start sub_80CBE00
sub_80CBE00: @ 80CBE00
thumb_func_start ContextNpcGetTextColor
ContextNpcGetTextColor: @ 80CBE00
push {lr}
ldr r0, _080CBE18 @ =gUnknown_20370DA
ldrh r0, [r0]
@@ -3183,7 +3183,7 @@ _080CBE20:
lsls r0, 24
lsrs r0, 24
_080CBE40:
bl sub_813CD24
bl GetColorFromTextColorTable
_080CBE44:
lsls r0, 24
lsrs r0, 24
@@ -3192,7 +3192,7 @@ _080CBE48:
bx r1
.align 2, 0
_080CBE4C: .4byte gMapObjects
thumb_func_end sub_80CBE00
thumb_func_end ContextNpcGetTextColor
thumb_func_start sub_80CBE50
sub_80CBE50: @ 80CBE50
@@ -3469,7 +3469,7 @@ ChangeBoxPokemonNickname_CB: @ 80CC064
ldrb r1, [r1]
ldr r2, _080CC084 @ =gStringVar2
bl SetBoxMonNickFromAnyBox
bl c2_exit_to_overworld_1_continue_scripts_restart_music
bl CB2_ReturnToFieldContinueScriptPlayMapMusic
pop {r0}
bx r0
.align 2, 0
@@ -3577,7 +3577,7 @@ ChangePokemonNickname_CB: @ 80CC144
ldr r2, _080CC16C @ =gStringVar2
movs r1, 0x2
bl SetMonData
bl c2_exit_to_overworld_1_continue_scripts_restart_music
bl CB2_ReturnToFieldContinueScriptPlayMapMusic
pop {r0}
bx r0
.align 2, 0
@@ -5152,7 +5152,7 @@ sub_80CCD84: @ 80CCD84
ldr r0, _080CCDC4 @ =0x00190018
cmp r1, r0
bne _080CCDC8
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
asm/field_weather.s
+3 -3
View File
@@ -2672,8 +2672,8 @@ _0807B054: .4byte gUnknown_2037F34
_0807B058: .4byte 0x000006d3
thumb_func_end sub_807B048
thumb_func_start sub_807B05C
sub_807B05C: @ 807B05C
thumb_func_start SetWeatherScreenFadeOut
SetWeatherScreenFadeOut: @ 807B05C
ldr r0, _0807B068 @ =gUnknown_2037F34
ldr r1, _0807B06C @ =0x000006c6
adds r0, r1
@@ -2683,7 +2683,7 @@ sub_807B05C: @ 807B05C
.align 2, 0
_0807B068: .4byte gUnknown_2037F34
_0807B06C: .4byte 0x000006c6
thumb_func_end sub_807B05C
thumb_func_end SetWeatherScreenFadeOut
thumb_func_start sub_807B070
sub_807B070: @ 807B070
asm/fighting.s
+1746
View File
File diff suppressed because it is too large Load Diff
asm/fire.s
+2500
View File
File diff suppressed because it is too large Load Diff
asm/fldeff_cut.s
+5 -5
View File
@@ -39,7 +39,7 @@ sub_8097898: @ 8097898
cmp r0, 0x1
beq _080978E0
movs r0, 0x5F
bl npc_before_player_of_type
bl CheckObjectGraphicsInFrontOfPlayer
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -74,7 +74,7 @@ _080978F8: .4byte FieldCallback_PrepareFadeInFromMenu
_080978FC: .4byte gPostMenuFieldCallback
_08097900: .4byte sub_8097984
_08097904:
ldr r4, _0809797C @ =gUnknown_2039A04
ldr r4, _0809797C @ =gPlayerFacingPosition
adds r1, r4, 0x2
adds r0, r4, 0
bl PlayerGetDestCoords
@@ -136,7 +136,7 @@ _08097970:
pop {r1}
bx r1
.align 2, 0
_0809797C: .4byte gUnknown_2039A04
_0809797C: .4byte gPlayerFacingPosition
_08097980: .4byte 0x0000ffff
thumb_func_end sub_8097898
@@ -253,7 +253,7 @@ sub_8097A48: @ 8097A48
movs r7, 0
movs r0, 0x79
bl PlaySE
ldr r4, _08097B38 @ =gUnknown_2039A04
ldr r4, _08097B38 @ =gPlayerFacingPosition
adds r1, r4, 0x2
adds r0, r4, 0
bl PlayerGetDestCoords
@@ -362,7 +362,7 @@ _08097AE2:
pop {r1}
bx r1
.align 2, 0
_08097B38: .4byte gUnknown_2039A04
_08097B38: .4byte gPlayerFacingPosition
_08097B3C: .4byte 0x0000ffff
_08097B40: .4byte gUnknown_2039870
_08097B44: .4byte gSprites
asm/fldeff_poison.s
-98
View File
@@ -1,98 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start task50_overworld_poison_effect
task50_overworld_poison_effect: @ 80A0DD8
push {lr}
lsls r0, 24
lsrs r2, r0, 24
lsls r0, r2, 2
adds r0, r2
lsls r0, 3
ldr r1, _080A0DFC @ =gTasks+0x8
adds r1, r0, r1
movs r3, 0
ldrsh r0, [r1, r3]
cmp r0, 0x1
beq _080A0E16
cmp r0, 0x1
bgt _080A0E00
cmp r0, 0
beq _080A0E06
b _080A0E32
.align 2, 0
_080A0DFC: .4byte gTasks+0x8
_080A0E00:
cmp r0, 0x2
beq _080A0E2A
b _080A0E32
_080A0E06:
ldrh r0, [r1, 0x2]
adds r0, 0x1
strh r0, [r1, 0x2]
lsls r0, 16
asrs r0, 16
cmp r0, 0x4
ble _080A0E32
b _080A0E22
_080A0E16:
ldrh r0, [r1, 0x2]
subs r0, 0x1
strh r0, [r1, 0x2]
lsls r0, 16
cmp r0, 0
bne _080A0E32
_080A0E22:
ldrh r0, [r1]
adds r0, 0x1
strh r0, [r1]
b _080A0E32
_080A0E2A:
adds r0, r2, 0
bl DestroyTask
b _080A0E42
_080A0E32:
ldrb r1, [r1, 0x2]
lsls r0, r1, 4
orrs r0, r1
lsls r0, 24
lsrs r0, 24
movs r1, 0
bl Unused_AdjustBgMosaic
_080A0E42:
pop {r0}
bx r0
thumb_func_end task50_overworld_poison_effect
thumb_func_start overworld_poison_effect
overworld_poison_effect: @ 80A0E48
push {lr}
movs r0, 0x48
bl PlaySE
ldr r0, _080A0E5C @ =task50_overworld_poison_effect
movs r1, 0x50
bl CreateTask
pop {r0}
bx r0
.align 2, 0
_080A0E5C: .4byte task50_overworld_poison_effect
thumb_func_end overworld_poison_effect
thumb_func_start c3_80A0DD8_is_running
c3_80A0DD8_is_running: @ 80A0E60
push {lr}
ldr r0, _080A0E70 @ =task50_overworld_poison_effect
bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
.align 2, 0
_080A0E70: .4byte task50_overworld_poison_effect
thumb_func_end c3_80A0DD8_is_running
.align 2, 0 @ Don't pad with nop.
asm/fldeff_softboiled.s
-366
View File
@@ -1,366 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start hm_prepare_dive_probably
hm_prepare_dive_probably: @ 80E5684
push {r4-r6,lr}
bl GetCursorSelectionMonId
lsls r0, 24
lsrs r0, 24
movs r6, 0x64
muls r0, r6
ldr r4, _080E56D0 @ =gPlayerParty
adds r0, r4
movs r1, 0x3A
bl GetMonData
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
bl GetCursorSelectionMonId
lsls r0, 24
lsrs r0, 24
muls r0, r6
adds r0, r4
movs r1, 0x39
bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
movs r1, 0x5
bl __udivsi3
lsls r0, 16
lsrs r0, 16
cmp r4, r0
bhi _080E56D4
movs r0, 0
b _080E56D6
.align 2, 0
_080E56D0: .4byte gPlayerParty
_080E56D4:
movs r0, 0x1
_080E56D6:
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end hm_prepare_dive_probably
thumb_func_start sub_80E56DC
sub_80E56DC: @ 80E56DC
push {r4,lr}
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, _080E5718 @ =gUnknown_203B0A0
movs r1, 0xA
strb r1, [r0, 0xB]
ldrb r1, [r0, 0x9]
strb r1, [r0, 0xA]
bl GetCursorSelectionMonId
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
bl sub_811F818
movs r0, 0x5
bl sub_8121D0C
ldr r1, _080E571C @ =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
adds r0, r1
ldr r1, _080E5720 @ =sub_811FB28
str r1, [r0]
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080E5718: .4byte gUnknown_203B0A0
_080E571C: .4byte gTasks
_080E5720: .4byte sub_811FB28
thumb_func_end sub_80E56DC
thumb_func_start sub_80E5724
sub_80E5724: @ 80E5724
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x8
lsls r0, 24
lsrs r4, r0, 24
str r4, [sp, 0x4]
ldr r1, _080E575C @ =gUnknown_203B0A0
ldrb r7, [r1, 0x9]
mov r8, r7
ldrb r0, [r1, 0xA]
adds r5, r0, 0
cmp r5, 0x6
bls _080E5768
movs r0, 0
strb r0, [r1, 0xB]
bl sub_8121D0C
ldr r1, _080E5760 @ =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
adds r0, r1
ldr r1, _080E5764 @ =sub_811FB28
str r1, [r0]
b _080E57D4
.align 2, 0
_080E575C: .4byte gUnknown_203B0A0
_080E5760: .4byte gTasks
_080E5764: .4byte sub_811FB28
_080E5768:
movs r0, 0x64
mov r10, r0
mov r0, r10
muls r0, r5
ldr r1, _080E57A0 @ =gPlayerParty
mov r9, r1
adds r6, r0, r1
adds r0, r6, 0
movs r1, 0x39
bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
cmp r4, 0
beq _080E5796
cmp r7, r5
beq _080E5796
adds r0, r6, 0
movs r1, 0x3A
bl GetMonData
cmp r0, r4
bne _080E57A4
_080E5796:
ldr r0, [sp, 0x4]
bl sub_80E5934
b _080E57D4
.align 2, 0
_080E57A0: .4byte gPlayerParty
_080E57A4:
movs r0, 0x1
bl PlaySE
mov r1, r10
mov r0, r8
muls r0, r1
add r0, r9
movs r1, 0x3A
bl GetMonData
movs r1, 0x5
bl __udivsi3
adds r3, r0, 0
lsls r3, 16
asrs r3, 16
movs r2, 0x1
negs r2, r2
ldr r0, _080E57E4 @ =sub_80E57E8
str r0, [sp]
ldr r0, [sp, 0x4]
mov r1, r8
bl sub_8120760
_080E57D4:
add sp, 0x8
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_080E57E4: .4byte sub_80E57E8
thumb_func_end sub_80E5724
thumb_func_start sub_80E57E8
sub_80E57E8: @ 80E57E8
push {r4,r5,lr}
sub sp, 0x4
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
movs r0, 0x1
bl PlaySE
ldr r5, _080E5830 @ =gUnknown_203B0A0
movs r1, 0x9
ldrsb r1, [r5, r1]
movs r0, 0x64
muls r0, r1
ldr r1, _080E5834 @ =gPlayerParty
adds r0, r1
movs r1, 0x3A
bl GetMonData
movs r1, 0x5
bl __udivsi3
adds r3, r0, 0
lsls r3, 16
asrs r3, 16
ldrb r1, [r5, 0xA]
ldr r0, _080E5838 @ =sub_80E583C
str r0, [sp]
adds r0, r4, 0
movs r2, 0x1
bl sub_8120760
add sp, 0x4
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080E5830: .4byte gUnknown_203B0A0
_080E5834: .4byte gPlayerParty
_080E5838: .4byte sub_80E583C
thumb_func_end sub_80E57E8
thumb_func_start sub_80E583C
sub_80E583C: @ 80E583C
push {r4,r5,lr}
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
ldr r0, _080E5884 @ =gUnknown_203B0A0
movs r1, 0xA
ldrsb r1, [r0, r1]
movs r0, 0x64
muls r0, r1
ldr r1, _080E5888 @ =gPlayerParty
adds r0, r1
ldr r1, _080E588C @ =gStringVar1
bl GetMonNickname
ldr r4, _080E5890 @ =gStringVar4
ldr r1, _080E5894 @ =gUnknown_8416F27
adds r0, r4, 0
bl StringExpandPlaceholders
adds r0, r4, 0
movs r1, 0
bl sub_81202F8
movs r0, 0x2
bl schedule_bg_copy_tilemap_to_vram
ldr r1, _080E5898 @ =gTasks
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
adds r0, r1
ldr r1, _080E589C @ =sub_80E58A0
str r1, [r0]
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080E5884: .4byte gUnknown_203B0A0
_080E5888: .4byte gPlayerParty
_080E588C: .4byte gStringVar1
_080E5890: .4byte gStringVar4
_080E5894: .4byte gUnknown_8416F27
_080E5898: .4byte gTasks
_080E589C: .4byte sub_80E58A0
thumb_func_end sub_80E583C
thumb_func_start sub_80E58A0
sub_80E58A0: @ 80E58A0
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
bl sub_8120370
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _080E58EE
ldr r4, _080E58F4 @ =gUnknown_203B0A0
movs r0, 0
strb r0, [r4, 0xB]
ldrb r0, [r4, 0x9]
movs r1, 0
bl sub_811F818
ldrb r0, [r4, 0xA]
strb r0, [r4, 0x9]
ldrb r0, [r4, 0xA]
movs r1, 0x1
bl sub_811F818
movs r0, 0x6
movs r1, 0
bl sub_810F4D8
movs r0, 0x6
bl ClearWindowTilemap
movs r0, 0
bl sub_8121D0C
ldr r1, _080E58F8 @ =gTasks
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
adds r0, r1
ldr r1, _080E58FC @ =sub_811FB28
str r1, [r0]
_080E58EE:
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080E58F4: .4byte gUnknown_203B0A0
_080E58F8: .4byte gTasks
_080E58FC: .4byte sub_811FB28
thumb_func_end sub_80E58A0
thumb_func_start sub_80E5900
sub_80E5900: @ 80E5900
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl sub_8120370
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _080E5926
movs r0, 0x5
bl sub_8121D0C
ldr r0, _080E592C @ =gTasks
lsls r1, r4, 2
adds r1, r4
lsls r1, 3
adds r1, r0
ldr r0, _080E5930 @ =sub_811FB28
str r0, [r1]
_080E5926:
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080E592C: .4byte gTasks
_080E5930: .4byte sub_811FB28
thumb_func_end sub_80E5900
thumb_func_start sub_80E5934
sub_80E5934: @ 80E5934
push {r4,lr}
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
movs r0, 0x5
bl PlaySE
ldr r0, _080E5964 @ =gUnknown_84169F8
movs r1, 0
bl sub_81202F8
movs r0, 0x2
bl schedule_bg_copy_tilemap_to_vram
ldr r1, _080E5968 @ =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
adds r0, r1
ldr r1, _080E596C @ =sub_80E5900
str r1, [r0]
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080E5964: .4byte gUnknown_84169F8
_080E5968: .4byte gTasks
_080E596C: .4byte sub_80E5900
thumb_func_end sub_80E5934
.align 2, 0 @ Don't pad with nop.
asm/fldeff_strength.s
-111
View File
@@ -1,111 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_80D07EC
sub_80D07EC: @ 80D07EC
push {r4,lr}
movs r0, 0x8
bl TestPlayerAvatarFlags
lsls r0, 24
cmp r0, 0
bne _080D0808
movs r0, 0x61
bl npc_before_player_of_type
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _080D080C
_080D0808:
movs r0, 0
b _080D0826
_080D080C:
ldr r4, _080D082C @ =gSpecialVar_Result
bl GetCursorSelectionMonId
lsls r0, 24
lsrs r0, 24
strh r0, [r4]
ldr r1, _080D0830 @ =gFieldCallback2
ldr r0, _080D0834 @ =FieldCallback_PrepareFadeInFromMenu
str r0, [r1]
ldr r1, _080D0838 @ =gPostMenuFieldCallback
ldr r0, _080D083C @ =sub_80D0840
str r0, [r1]
movs r0, 0x1
_080D0826:
pop {r4}
pop {r1}
bx r1
.align 2, 0
_080D082C: .4byte gSpecialVar_Result
_080D0830: .4byte gFieldCallback2
_080D0834: .4byte FieldCallback_PrepareFadeInFromMenu
_080D0838: .4byte gPostMenuFieldCallback
_080D083C: .4byte sub_80D0840
thumb_func_end sub_80D07EC
thumb_func_start sub_80D0840
sub_80D0840: @ 80D0840
push {lr}
bl GetCursorSelectionMonId
ldr r1, _080D0858 @ =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r1]
ldr r0, _080D085C @ =gUnknown_81BE16E
bl ScriptContext1_SetupScript
pop {r0}
bx r0
.align 2, 0
_080D0858: .4byte gFieldEffectArguments
_080D085C: .4byte gUnknown_81BE16E
thumb_func_end sub_80D0840
thumb_func_start sub_80D0860
sub_80D0860: @ 80D0860
push {lr}
bl oei_task_add
lsls r0, 24
lsrs r0, 24
ldr r2, _080D0894 @ =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r1, r2
ldr r2, _080D0898 @ =sub_80D08A8
lsrs r0, r2, 16
strh r0, [r1, 0x18]
strh r2, [r1, 0x1A]
ldr r0, _080D089C @ =gFieldEffectArguments
ldr r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, _080D08A0 @ =gPlayerParty
adds r0, r1
ldr r1, _080D08A4 @ =gStringVar1
bl GetMonNickname
movs r0, 0
pop {r1}
bx r1
.align 2, 0
_080D0894: .4byte gTasks
_080D0898: .4byte sub_80D08A8
_080D089C: .4byte gFieldEffectArguments
_080D08A0: .4byte gPlayerParty
_080D08A4: .4byte gStringVar1
thumb_func_end sub_80D0860
thumb_func_start sub_80D08A8
sub_80D08A8: @ 80D08A8
push {lr}
movs r0, 0x28
bl FieldEffectActiveListRemove
bl EnableBothScriptContexts
pop {r0}
bx r0
thumb_func_end sub_80D08A8
.align 2, 0 @ Don't pad with nop.
asm/fldeff_sweetscent.s
-262
View File
@@ -1,262 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_80DE0B4
sub_80DE0B4: @ 80DE0B4
push {lr}
ldr r1, _080DE0C4 @ =gUnknown_203B0A0
movs r0, 0
strb r0, [r1, 0x9]
bl hm2_sweet_scent
pop {r0}
bx r0
.align 2, 0
_080DE0C4: .4byte gUnknown_203B0A0
thumb_func_end sub_80DE0B4
thumb_func_start sub_80DE0C8
sub_80DE0C8: @ 80DE0C8
ldr r1, _080DE0D8 @ =gFieldCallback2
ldr r0, _080DE0DC @ =FieldCallback_PrepareFadeInFromMenu
str r0, [r1]
ldr r1, _080DE0E0 @ =gPostMenuFieldCallback
ldr r0, _080DE0E4 @ =hm2_sweet_scent
str r0, [r1]
movs r0, 0x1
bx lr
.align 2, 0
_080DE0D8: .4byte gFieldCallback2
_080DE0DC: .4byte FieldCallback_PrepareFadeInFromMenu
_080DE0E0: .4byte gPostMenuFieldCallback
_080DE0E4: .4byte hm2_sweet_scent
thumb_func_end sub_80DE0C8
thumb_func_start hm2_sweet_scent
hm2_sweet_scent: @ 80DE0E8
push {lr}
movs r0, 0x33
bl FieldEffectStart
bl GetCursorSelectionMonId
ldr r1, _080DE100 @ =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r1]
pop {r0}
bx r0
.align 2, 0
_080DE100: .4byte gFieldEffectArguments
thumb_func_end hm2_sweet_scent
thumb_func_start FldEff_SweetScent
FldEff_SweetScent: @ 80DE104
push {lr}
bl sub_807B05C
bl oei_task_add
lsls r0, 24
lsrs r0, 24
ldr r2, _080DE12C @ =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r1, r2
ldr r2, _080DE130 @ =sub_80DE134
lsrs r0, r2, 16
strh r0, [r1, 0x18]
strh r2, [r1, 0x1A]
movs r0, 0
pop {r1}
bx r1
.align 2, 0
_080DE12C: .4byte gTasks
_080DE130: .4byte sub_80DE134
thumb_func_end FldEff_SweetScent
thumb_func_start sub_80DE134
sub_80DE134: @ 80DE134
push {r4,r5,lr}
sub sp, 0x4
movs r0, 0xE5
bl PlaySE
ldr r4, _080DE1B8 @ =gUnknown_203AAB0
movs r0, 0x80
lsls r0, 3
bl Alloc
adds r1, r0, 0
str r1, [r4]
ldr r4, _080DE1BC @ =gPlttBufferUnfaded
movs r5, 0x80
lsls r5, 1
adds r0, r4, 0
adds r2, r5, 0
bl CpuFastSet
ldr r0, _080DE1C0 @ =gPlttBufferFaded
adds r1, r4, 0
adds r2, r5, 0
bl CpuFastSet
bl GetPlayerAvatarObjectId
ldr r2, _080DE1C4 @ =gSprites
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
adds r1, r2
ldrb r1, [r1, 0x5]
lsrs r1, 4
adds r1, 0x10
movs r0, 0x1
lsls r0, r1
mvns r0, r0
movs r1, 0x1F
str r1, [sp]
movs r1, 0x4
movs r2, 0
movs r3, 0x8
bl BeginNormalPaletteFade
ldr r0, _080DE1C8 @ =sub_80DE1D0
movs r1, 0
bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080DE1CC @ =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r1, r2
movs r0, 0
strh r0, [r1, 0x8]
movs r0, 0x33
bl FieldEffectActiveListRemove
add sp, 0x4
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080DE1B8: .4byte gUnknown_203AAB0
_080DE1BC: .4byte gPlttBufferUnfaded
_080DE1C0: .4byte gPlttBufferFaded
_080DE1C4: .4byte gSprites
_080DE1C8: .4byte sub_80DE1D0
_080DE1CC: .4byte gTasks
thumb_func_end sub_80DE134
thumb_func_start sub_80DE1D0
sub_80DE1D0: @ 80DE1D0
push {r4-r7,lr}
sub sp, 0x4
lsls r0, 24
lsrs r4, r0, 24
lsls r0, r4, 2
adds r0, r4
lsls r5, r0, 3
ldr r6, _080DE21C @ =gTasks+0x8
adds r2, r5, r6
ldr r0, _080DE220 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
bne _080DE26C
ldrh r3, [r2]
movs r7, 0
ldrsh r0, [r2, r7]
cmp r0, 0x40
bne _080DE268
strh r1, [r2]
bl sub_8082EC0
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _080DE228
ldr r0, _080DE224 @ =gUnknown_203AAB0
ldr r0, [r0]
bl Free
adds r0, r4, 0
bl DestroyTask
b _080DE26C
.align 2, 0
_080DE21C: .4byte gTasks+0x8
_080DE220: .4byte gPaletteFade
_080DE224: .4byte gUnknown_203AAB0
_080DE228:
adds r0, r6, 0
subs r0, 0x8
adds r0, r5, r0
ldr r1, _080DE260 @ =sub_80DE274
str r1, [r0]
bl GetPlayerAvatarObjectId
ldr r2, _080DE264 @ =gSprites
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
adds r1, r2
ldrb r1, [r1, 0x5]
lsrs r1, 4
adds r1, 0x10
movs r0, 0x1
lsls r0, r1
mvns r0, r0
movs r1, 0x1F
str r1, [sp]
movs r1, 0x4
movs r2, 0x8
movs r3, 0
bl BeginNormalPaletteFade
b _080DE26C
.align 2, 0
_080DE260: .4byte sub_80DE274
_080DE264: .4byte gSprites
_080DE268:
adds r0, r3, 0x1
strh r0, [r2]
_080DE26C:
add sp, 0x4
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_80DE1D0
thumb_func_start sub_80DE274
sub_80DE274: @ 80DE274
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r0, _080DE2B0 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
cmp r0, 0
bne _080DE2AA
ldr r4, _080DE2B4 @ =gUnknown_203AAB0
ldr r0, [r4]
ldr r1, _080DE2B8 @ =gPlttBufferUnfaded
movs r2, 0x80
lsls r2, 1
bl CpuFastSet
bl sub_807B070
ldr r0, [r4]
bl Free
ldr r0, _080DE2BC @ =gUnknown_81BE564
bl ScriptContext1_SetupScript
adds r0, r5, 0
bl DestroyTask
_080DE2AA:
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080DE2B0: .4byte gPaletteFade
_080DE2B4: .4byte gUnknown_203AAB0
_080DE2B8: .4byte gPlttBufferUnfaded
_080DE2BC: .4byte gUnknown_81BE564
thumb_func_end sub_80DE274
.align 2, 0 @ Don't pad with nop.
asm/flying.s
+2945
View File
File diff suppressed because it is too large Load Diff
asm/ghost.s
+4054
View File
File diff suppressed because it is too large Load Diff
asm/ground.s
+1787
View File
File diff suppressed because it is too large Load Diff
asm/hall_of_fame.s
+28 -28
View File
@@ -521,7 +521,7 @@ _080F21B2:
movs r0, 0
movs r1, 0x2
movs r3, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized2
movs r0, 0
movs r1, 0x3
bl CopyWindowToVram
@@ -1194,7 +1194,7 @@ sub_80F26D4: @ 80F26D4
ldr r1, _080F2758 @ =0x0000021d
movs r0, 0x1
movs r2, 0xD0
bl sub_814FF2C
bl TextWindow_SetStdFrame0_WithPal
movs r0, 0x78
strh r0, [r4, 0xE]
ldr r0, _080F275C @ =Task_Hof_WaitAndPrintPlayerInfo
@@ -1277,7 +1277,7 @@ _080F27AC:
movs r0, 0
movs r1, 0x2
movs r3, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized2
movs r0, 0
movs r1, 0x3
bl CopyWindowToVram
@@ -1607,7 +1607,7 @@ sub_80F2AA4: @ 80F2AA4
movs r1, 0x1E
movs r2, 0
movs r3, 0xC
bl CreateWindow_SnapRight_StdPal
bl CreateTopBarWindowLoadPalette
movs r0, 0x3
bl Save_LoadGameData
lsls r0, 24
@@ -1894,7 +1894,7 @@ _080F2CB4:
adds r0, r5, 0
movs r2, 0
movs r3, 0
bl Menu_PrintHelpSystemUIHeader
bl TopBarWindowPrintTwoStrings
b _080F2D34
.align 2, 0
_080F2D08: .4byte 0xffff0000
@@ -1911,7 +1911,7 @@ _080F2D24:
adds r0, r5, 0
movs r2, 0
movs r3, 0
bl Menu_PrintHelpSystemUIHeader
bl TopBarWindowPrintTwoStrings
_080F2D34:
ldr r0, _080F2D58 @ =gTasks
ldr r1, [sp, 0x14]
@@ -2298,7 +2298,7 @@ sub_80F3030: @ 80F3030
bl HideBg
movs r0, 0x3
bl HideBg
bl sub_810F740
bl DestroyTopBarWindow
bl FreeAllWindowBuffers
movs r0, 0x1
bl UnsetBgTilemapBuffer
@@ -2322,7 +2322,7 @@ _080F3082:
bl Free
str r4, [r5]
_080F3090:
bl sub_80CA5A0
bl ReturnFromHallOfFamePC
_080F3094:
pop {r4,r5}
pop {r0}
@@ -2342,7 +2342,7 @@ sub_80F30A4: @ 80F30A4
ldr r0, _080F30FC @ =gText_ABUTTONExit
movs r1, 0x8
movs r2, 0x1
bl PrintTextOnRightSnappedWindow
bl TopBarWindowPrintString
movs r0, 0
movs r1, 0
bl DrawDialogueFrame
@@ -2358,7 +2358,7 @@ sub_80F30A4: @ 80F30A4
movs r0, 0
movs r1, 0x2
movs r3, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized2
movs r0, 0
movs r1, 0x3
bl CopyWindowToVram
@@ -2436,7 +2436,7 @@ HallOfFame_PrintWelcomeText: @ 80F313C
movs r1, 0x2
adds r2, r4, 0
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
movs r0, 0
movs r1, 0x3
bl CopyWindowToVram
@@ -2535,7 +2535,7 @@ _080F322E:
movs r1, 0x2
movs r2, 0x10
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
_080F3252:
movs r2, 0
ldrb r0, [r7, 0xA]
@@ -2606,7 +2606,7 @@ _080F32C4:
movs r0, 0
movs r1, 0x2
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
ldrh r2, [r7, 0x8]
ldr r4, _080F3320 @ =0x000001ff
adds r0, r4, 0
@@ -2676,7 +2676,7 @@ _080F3348:
movs r1, 0x2
movs r2, 0x80
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
ldr r1, _080F33D4 @ =gUnknown_84160F4
add r0, sp, 0xC
bl StringCopy
@@ -2694,7 +2694,7 @@ _080F3348:
movs r1, 0x2
movs r2, 0x20
movs r3, 0x11
bl box_print
bl AddTextPrinterParameterized3
ldr r1, _080F33D8 @ =gUnknown_8416104
add r0, sp, 0xC
bl StringCopy
@@ -2711,7 +2711,7 @@ _080F3348:
movs r1, 0x2
movs r2, 0x60
movs r3, 0x11
bl box_print
bl AddTextPrinterParameterized3
_080F33BA:
movs r0, 0
movs r1, 0x3
@@ -2750,7 +2750,7 @@ sub_80F33DC: @ 80F33DC
movs r0, 0x1
movs r1, 0
movs r3, 0xD
bl SetWindowBorderStyle
bl DrawStdFrameWithCustomTileAndPalette
movs r7, 0
str r7, [sp]
str r7, [sp, 0x4]
@@ -2764,7 +2764,7 @@ sub_80F33DC: @ 80F33DC
movs r1, 0x2
movs r2, 0x4
movs r3, 0x3
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
ldr r0, _080F35FC @ =gSaveBlock2Ptr
mov r10, r0
ldr r1, [r0]
@@ -2785,7 +2785,7 @@ sub_80F33DC: @ 80F33DC
movs r0, 0x1
movs r1, 0x2
movs r3, 0x3
bl box_print
bl AddTextPrinterParameterized3
mov r1, r10
ldr r0, [r1]
ldrb r4, [r0, 0xA]
@@ -2801,7 +2801,7 @@ sub_80F33DC: @ 80F33DC
movs r1, 0x2
movs r2, 0x4
movs r3, 0x12
bl box_print
bl AddTextPrinterParameterized3
add r1, sp, 0x14
mov r8, r1
ldr r1, _080F3604 @ =0x000186a0
@@ -2869,7 +2869,7 @@ sub_80F33DC: @ 80F33DC
movs r1, 0x2
adds r2, r6, 0
movs r3, 0x12
bl box_print
bl AddTextPrinterParameterized3
mov r1, r9
str r1, [sp]
str r7, [sp, 0x4]
@@ -2879,7 +2879,7 @@ sub_80F33DC: @ 80F33DC
movs r1, 0x2
movs r2, 0x4
movs r3, 0x20
bl box_print
bl AddTextPrinterParameterized3
add r5, sp, 0x14
mov r0, r10
ldr r4, [r0]
@@ -2957,7 +2957,7 @@ _080F3582:
movs r0, 0x1
movs r1, 0x2
movs r3, 0x20
bl box_print
bl AddTextPrinterParameterized3
movs r0, 0x1
movs r1, 0x3
bl CopyWindowToVram
@@ -3073,16 +3073,16 @@ sub_80F36BC: @ 80F36BC
bl ScanlineEffect_Stop
bl ResetTasks
bl ResetSpriteData
bl reset_temp_tile_data_buffers
bl ResetTempTileDataBuffers
bl ResetAllPicSprites
bl FreeAllSpritePalettes
ldr r1, _080F36EC @ =gReservedSpritePaletteCount
movs r0, 0x8
strb r0, [r1]
ldr r0, _080F36F0 @ =gUnknown_840C248
bl LoadCompressedObjectPic
bl LoadCompressedSpriteSheet
ldr r0, _080F36F4 @ =gUnknown_840C258
bl LoadCompressedObjectPalette
bl LoadCompressedSpritePalette
pop {r0}
bx r0
.align 2, 0
@@ -3174,12 +3174,12 @@ _080F37A4:
movs r0, 0x1
movs r2, 0
movs r3, 0
bl decompress_and_copy_tile_data_to_vram
bl DecompressAndCopyTileDataToVram
b _080F3854
.align 2, 0
_080F37B8: .4byte gUnknown_840C3BC
_080F37BC:
bl free_temp_tile_data_buffers_if_possible
bl FreeTempTileDataBuffersIfPossible
lsls r0, 24
cmp r0, 0
beq _080F3854
asm/help_system.s
-2254
View File
File diff suppressed because it is too large Load Diff
asm/help_system_812B1E0.s
-1761
View File
File diff suppressed because it is too large Load Diff
asm/hof_pc.s
-118
View File
@@ -1,118 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_80CA53C
sub_80CA53C: @ 80CA53C
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _080CA56C @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
cmp r0, 0
bne _080CA564
bl FreeAllWindowBuffers
movs r0, 0
bl ResetBgsAndClearDma3BusyFlags
adds r0, r4, 0
bl DestroyTask
ldr r0, _080CA570 @ =sub_80F2978
bl SetMainCallback2
_080CA564:
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080CA56C: .4byte gPaletteFade
_080CA570: .4byte sub_80F2978
thumb_func_end sub_80CA53C
thumb_func_start sub_80CA574
sub_80CA574: @ 80CA574
push {lr}
sub sp, 0x4
movs r0, 0x1
negs r0, r0
movs r1, 0
str r1, [sp]
movs r2, 0
movs r3, 0x10
bl BeginNormalPaletteFade
bl ScriptContext2_Enable
ldr r0, _080CA59C @ =sub_80CA53C
movs r1, 0
bl CreateTask
add sp, 0x4
pop {r0}
bx r0
.align 2, 0
_080CA59C: .4byte sub_80CA53C
thumb_func_end sub_80CA574
thumb_func_start sub_80CA5A0
sub_80CA5A0: @ 80CA5A0
push {lr}
ldr r0, _080CA5B4 @ =CB2_ReturnToField
bl SetMainCallback2
ldr r1, _080CA5B8 @ =gFieldCallback
ldr r0, _080CA5BC @ =sub_80CA5C0
str r0, [r1]
pop {r0}
bx r0
.align 2, 0
_080CA5B4: .4byte CB2_ReturnToField
_080CA5B8: .4byte gFieldCallback
_080CA5BC: .4byte sub_80CA5C0
thumb_func_end sub_80CA5A0
thumb_func_start sub_80CA5C0
sub_80CA5C0: @ 80CA5C0
push {lr}
sub sp, 0x4
bl ScriptContext2_Enable
bl sub_8055DC4
bl sp109_CreatePCMenu
bl sub_809D254
movs r0, 0x1
negs r0, r0
movs r1, 0
str r1, [sp]
movs r2, 0x10
movs r3, 0
bl BeginNormalPaletteFade
ldr r0, _080CA5F4 @ =sub_80CA5F8
movs r1, 0xA
bl CreateTask
add sp, 0x4
pop {r0}
bx r0
.align 2, 0
_080CA5F4: .4byte sub_80CA5F8
thumb_func_end sub_80CA5C0
thumb_func_start sub_80CA5F8
sub_80CA5F8: @ 80CA5F8
push {lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r0, _080CA614 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
cmp r0, 0
bne _080CA610
adds r0, r2, 0
bl DestroyTask
_080CA610:
pop {r0}
bx r0
.align 2, 0
_080CA614: .4byte gPaletteFade
thumb_func_end sub_80CA5F8
.align 2, 0 @ Don't pad with nop.
asm/ice.s
+3099
View File
File diff suppressed because it is too large Load Diff
asm/intro.s
-4841
View File
File diff suppressed because it is too large Load Diff
asm/item.s
-1853
View File
File diff suppressed because it is too large Load Diff
asm/item_menu.s
+140 -140
View File
File diff suppressed because it is too large Load Diff
asm/item_menu_icons.s
-680
View File
@@ -1,680 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_80984D8
sub_80984D8: @ 80984D8
push {r4,lr}
movs r2, 0
ldr r4, _080984F8 @ =gUnknown_2039878
movs r3, 0xFF
_080984E0:
adds r0, r2, r4
ldrb r1, [r0]
orrs r1, r3
strb r1, [r0]
adds r0, r2, 0x1
lsls r0, 16
lsrs r2, r0, 16
cmp r2, 0xB
bls _080984E0
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080984F8: .4byte gUnknown_2039878
thumb_func_end sub_80984D8
thumb_func_start sub_80984FC
sub_80984FC: @ 80984FC
push {r4,lr}
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, _08098520 @ =gUnknown_83D41FC
movs r1, 0x28
movs r2, 0x44
movs r3, 0
bl CreateSprite
ldr r1, _08098524 @ =gUnknown_2039878
strb r0, [r1]
adds r0, r4, 0
bl sub_8098528
pop {r4}
pop {r0}
bx r0
.align 2, 0
_08098520: .4byte gUnknown_83D41FC
_08098524: .4byte gUnknown_2039878
thumb_func_end sub_80984FC
thumb_func_start sub_8098528
sub_8098528: @ 8098528
push {lr}
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
ldr r0, _08098550 @ =gUnknown_2039878
ldrb r2, [r0]
lsls r0, r2, 4
adds r0, r2
lsls r0, 2
ldr r2, _08098554 @ =gSprites
adds r0, r2
ldr r2, _08098558 @ =0x0000fffb
strh r2, [r0, 0x26]
ldr r2, _0809855C @ =sub_8098560
str r2, [r0, 0x1C]
bl StartSpriteAnim
pop {r0}
bx r0
.align 2, 0
_08098550: .4byte gUnknown_2039878
_08098554: .4byte gSprites
_08098558: .4byte 0x0000fffb
_0809855C: .4byte sub_8098560
thumb_func_end sub_8098528
thumb_func_start sub_8098560
sub_8098560: @ 8098560
push {lr}
adds r1, r0, 0
ldrh r2, [r1, 0x26]
movs r3, 0x26
ldrsh r0, [r1, r3]
cmp r0, 0
beq _08098574
adds r0, r2, 0x1
strh r0, [r1, 0x26]
b _08098578
_08098574:
ldr r0, _0809857C @ =SpriteCallbackDummy
str r0, [r1, 0x1C]
_08098578:
pop {r0}
bx r0
.align 2, 0
_0809857C: .4byte SpriteCallbackDummy
thumb_func_end sub_8098560
thumb_func_start sub_8098580
sub_8098580: @ 8098580
push {r4,lr}
ldr r0, _080985B0 @ =gUnknown_2039878
ldrb r1, [r0]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, _080985B4 @ =gSprites
adds r4, r0, r1
adds r0, r4, 0
adds r0, 0x3F
ldrb r1, [r0]
movs r0, 0x20
ands r0, r1
cmp r0, 0
beq _080985AA
adds r0, r4, 0
movs r1, 0x1
bl StartSpriteAffineAnim
ldr r0, _080985B8 @ =sub_80985BC
str r0, [r4, 0x1C]
_080985AA:
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080985B0: .4byte gUnknown_2039878
_080985B4: .4byte gSprites
_080985B8: .4byte sub_80985BC
thumb_func_end sub_8098580
thumb_func_start sub_80985BC
sub_80985BC: @ 80985BC
push {r4,lr}
adds r4, r0, 0
adds r0, 0x3F
ldrb r1, [r0]
movs r0, 0x20
ands r0, r1
cmp r0, 0
beq _080985D8
adds r0, r4, 0
movs r1, 0
bl StartSpriteAffineAnim
ldr r0, _080985E0 @ =SpriteCallbackDummy
str r0, [r4, 0x1C]
_080985D8:
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080985E0: .4byte SpriteCallbackDummy
thumb_func_end sub_80985BC
thumb_func_start sub_80985E4
sub_80985E4: @ 80985E4
push {r4-r7,lr}
ldr r7, _08098620 @ =gUnknown_2039879
movs r5, 0
ldr r6, _08098624 @ =gSprites
_080985EC:
lsls r1, r5, 20
movs r0, 0xC0
lsls r0, 15
adds r1, r0
asrs r1, 16
ldr r0, _08098628 @ =gUnknown_83D4250
movs r2, 0x7
movs r3, 0
bl CreateSprite
adds r1, r7, r5
strb r0, [r1]
adds r4, r1, 0
cmp r5, 0
beq _0809863C
cmp r5, 0x8
bne _0809862C
ldrb r1, [r7, 0x8]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r6
movs r1, 0x2
bl StartSpriteAnim
b _0809863C
.align 2, 0
_08098620: .4byte gUnknown_2039879
_08098624: .4byte gSprites
_08098628: .4byte gUnknown_83D4250
_0809862C:
ldrb r1, [r4]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r6
movs r1, 0x1
bl StartSpriteAnim
_0809863C:
ldrb r1, [r4]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r6
adds r0, 0x3E
ldrb r1, [r0]
movs r2, 0x4
orrs r1, r2
strb r1, [r0]
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0x8
bls _080985EC
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_80985E4
thumb_func_start sub_8098660
sub_8098660: @ 8098660
push {r4-r7,lr}
lsls r0, 24
lsrs r0, 24
ldr r7, _080986A0 @ =gUnknown_2039879
movs r3, 0
ldr r6, _080986A4 @ =gSprites
movs r1, 0x1
ands r0, r1
lsls r4, r0, 2
movs r5, 0x5
negs r5, r5
_08098676:
adds r0, r7, r3
ldrb r0, [r0]
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
adds r1, r6
adds r1, 0x3E
ldrb r2, [r1]
adds r0, r5, 0
ands r0, r2
orrs r0, r4
strb r0, [r1]
adds r0, r3, 0x1
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0x8
bls _08098676
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_080986A0: .4byte gUnknown_2039879
_080986A4: .4byte gSprites
thumb_func_end sub_8098660
thumb_func_start sub_80986A8
sub_80986A8: @ 80986A8
push {r4-r7,lr}
lsls r0, 16
lsrs r6, r0, 16
lsls r1, 16
lsrs r1, 16
ldr r7, _080986E4 @ =gUnknown_2039879
movs r3, 0
ldr r4, _080986E8 @ =gSprites
adds r5, r1, 0x7
_080986BA:
adds r2, r7, r3
ldrb r1, [r2]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r4
strh r6, [r0, 0x24]
ldrb r1, [r2]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r4
strh r5, [r0, 0x22]
adds r0, r3, 0x1
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0x8
bls _080986BA
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_080986E4: .4byte gUnknown_2039879
_080986E8: .4byte gSprites
thumb_func_end sub_80986A8
thumb_func_start sub_80986EC
sub_80986EC: @ 80986EC
push {r4,r5,lr}
ldr r5, _08098714 @ =gUnknown_2039884
movs r0, 0x90
lsls r0, 1
bl Alloc
str r0, [r5]
cmp r0, 0
beq _08098722
ldr r4, _08098718 @ =gUnknown_2039888
movs r0, 0x80
lsls r0, 2
bl AllocZeroed
str r0, [r4]
cmp r0, 0
beq _0809871C
movs r0, 0x1
b _08098724
.align 2, 0
_08098714: .4byte gUnknown_2039884
_08098718: .4byte gUnknown_2039888
_0809871C:
ldr r0, [r5]
bl Free
_08098722:
movs r0, 0
_08098724:
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end sub_80986EC
thumb_func_start CopyItemIconPicTo4x4Buffer
CopyItemIconPicTo4x4Buffer: @ 809872C
push {r4-r6,lr}
adds r6, r0, 0
adds r5, r1, 0
movs r4, 0
_08098734:
lsls r0, r4, 1
adds r0, r4
lsls r0, 5
adds r0, r6, r0
lsls r1, r4, 7
adds r1, r5, r1
movs r2, 0x30
bl CpuSet
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x2
bls _08098734
pop {r4-r6}
pop {r0}
bx r0
thumb_func_end CopyItemIconPicTo4x4Buffer
thumb_func_start AddItemIconObject
AddItemIconObject: @ 8098758
push {r4-r7,lr}
sub sp, 0x28
lsls r0, 16
lsrs r6, r0, 16
lsls r1, 16
lsrs r5, r1, 16
lsls r2, 16
lsrs r7, r2, 16
bl sub_80986EC
lsls r0, 24
cmp r0, 0
beq _08098810
adds r0, r7, 0
movs r1, 0
bl sub_8098974
ldr r2, _080987FC @ =gUnknown_2039884
ldr r1, [r2]
bl LZDecompressWram
ldr r1, _080987FC @ =gUnknown_2039884
ldr r0, [r1]
ldr r2, _08098800 @ =gUnknown_2039888
ldr r1, [r2]
bl CopyItemIconPicTo4x4Buffer
ldr r1, _08098800 @ =gUnknown_2039888
ldr r0, [r1]
str r0, [sp, 0x18]
ldr r4, _08098804 @ =0xffff0000
add r0, sp, 0x18
ldr r1, [r0, 0x4]
ands r1, r4
movs r2, 0x80
lsls r2, 2
orrs r1, r2
lsls r3, r6, 16
ldr r2, _08098808 @ =0x0000ffff
ands r1, r2
orrs r1, r3
str r1, [r0, 0x4]
bl LoadSpriteSheet
adds r0, r7, 0
movs r1, 0x1
bl sub_8098974
str r0, [sp, 0x20]
add r0, sp, 0x20
ldr r1, [r0, 0x4]
ands r1, r4
orrs r1, r5
str r1, [r0, 0x4]
bl LoadCompressedObjectPalette
ldr r0, _0809880C @ =gUnknown_83D427C
mov r1, sp
movs r2, 0xC
bl CpuSet
mov r0, sp
strh r6, [r0]
strh r5, [r0, 0x2]
movs r1, 0
movs r2, 0
movs r3, 0
bl CreateSprite
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r2, _080987FC @ =gUnknown_2039884
ldr r0, [r2]
bl Free
ldr r1, _08098800 @ =gUnknown_2039888
ldr r0, [r1]
bl Free
adds r0, r4, 0
b _08098812
.align 2, 0
_080987FC: .4byte gUnknown_2039884
_08098800: .4byte gUnknown_2039888
_08098804: .4byte 0xffff0000
_08098808: .4byte 0x0000ffff
_0809880C: .4byte gUnknown_83D427C
_08098810:
movs r0, 0x40
_08098812:
add sp, 0x28
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end AddItemIconObject
thumb_func_start AddItemIconObjectWithCustomObjectTemplate
AddItemIconObjectWithCustomObjectTemplate: @ 809881C
push {r4-r7,lr}
mov r7, r8
push {r7}
sub sp, 0x28
mov r8, r0
lsls r1, 16
lsrs r6, r1, 16
lsls r2, 16
lsrs r5, r2, 16
lsls r3, 16
lsrs r7, r3, 16
bl sub_80986EC
lsls r0, 24
cmp r0, 0
beq _080988D8
adds r0, r7, 0
movs r1, 0
bl sub_8098974
ldr r2, _080988C8 @ =gUnknown_2039884
ldr r1, [r2]
bl LZDecompressWram
ldr r1, _080988C8 @ =gUnknown_2039884
ldr r0, [r1]
ldr r2, _080988CC @ =gUnknown_2039888
ldr r1, [r2]
bl CopyItemIconPicTo4x4Buffer
ldr r1, _080988CC @ =gUnknown_2039888
ldr r0, [r1]
str r0, [sp, 0x18]
ldr r4, _080988D0 @ =0xffff0000
add r0, sp, 0x18
ldr r1, [r0, 0x4]
ands r1, r4
movs r2, 0x80
lsls r2, 2
orrs r1, r2
lsls r3, r6, 16
ldr r2, _080988D4 @ =0x0000ffff
ands r1, r2
orrs r1, r3
str r1, [r0, 0x4]
bl LoadSpriteSheet
adds r0, r7, 0
movs r1, 0x1
bl sub_8098974
str r0, [sp, 0x20]
add r0, sp, 0x20
ldr r1, [r0, 0x4]
ands r1, r4
orrs r1, r5
str r1, [r0, 0x4]
bl LoadCompressedObjectPalette
mov r0, r8
mov r1, sp
movs r2, 0xC
bl CpuSet
mov r0, sp
strh r6, [r0]
strh r5, [r0, 0x2]
movs r1, 0
movs r2, 0
movs r3, 0
bl CreateSprite
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r2, _080988C8 @ =gUnknown_2039884
ldr r0, [r2]
bl Free
ldr r1, _080988CC @ =gUnknown_2039888
ldr r0, [r1]
bl Free
adds r0, r4, 0
b _080988DA
.align 2, 0
_080988C8: .4byte gUnknown_2039884
_080988CC: .4byte gUnknown_2039888
_080988D0: .4byte 0xffff0000
_080988D4: .4byte 0x0000ffff
_080988D8:
movs r0, 0x40
_080988DA:
add sp, 0x28
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end AddItemIconObjectWithCustomObjectTemplate
thumb_func_start sub_80988E8
sub_80988E8: @ 80988E8
push {r4-r6,lr}
lsls r0, 16
lsrs r6, r0, 16
lsls r1, 24
lsrs r1, 24
ldr r0, _08098938 @ =gUnknown_2039882
adds r5, r1, r0
ldrb r0, [r5]
cmp r0, 0xFF
bne _08098932
adds r4, r1, 0
adds r4, 0x66
adds r0, r4, 0
bl FreeSpriteTilesByTag
adds r0, r4, 0
bl FreeSpritePaletteByTag
adds r0, r4, 0
adds r1, r4, 0
adds r2, r6, 0
bl AddItemIconObject
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0x40
beq _08098932
strb r2, [r5]
ldr r1, _0809893C @ =gSprites
lsls r0, r2, 4
adds r0, r2
lsls r0, 2
adds r0, r1
movs r1, 0x18
strh r1, [r0, 0x24]
movs r1, 0x8C
strh r1, [r0, 0x26]
_08098932:
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_08098938: .4byte gUnknown_2039882
_0809893C: .4byte gSprites
thumb_func_end sub_80988E8
thumb_func_start sub_8098940
sub_8098940: @ 8098940
push {r4,lr}
lsls r0, 24
lsrs r0, 24
ldr r1, _0809896C @ =gUnknown_2039882
adds r4, r0, r1
ldrb r0, [r4]
cmp r0, 0xFF
beq _08098964
adds r1, r0, 0
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, _08098970 @ =gSprites
adds r0, r1
bl DestroySpriteAndFreeResources
movs r0, 0xFF
strb r0, [r4]
_08098964:
pop {r4}
pop {r0}
bx r0
.align 2, 0
_0809896C: .4byte gUnknown_2039882
_08098970: .4byte gSprites
thumb_func_end sub_8098940
thumb_func_start sub_8098974
sub_8098974: @ 8098974
push {lr}
lsls r0, 16
lsrs r3, r0, 16
lsls r1, 24
lsrs r1, 24
ldr r0, _08098998 @ =0x00000177
cmp r3, r0
bls _08098986
movs r3, 0
_08098986:
ldr r2, _0809899C @ =gUnknown_83D4294
lsls r0, r1, 2
lsls r1, r3, 3
adds r0, r1
adds r0, r2
ldr r0, [r0]
pop {r1}
bx r1
.align 2, 0
_08098998: .4byte 0x00000177
_0809899C: .4byte gUnknown_83D4294
thumb_func_end sub_8098974
thumb_func_start sub_80989A0
sub_80989A0: @ 80989A0
push {r4-r6,lr}
lsls r0, 16
lsrs r6, r0, 16
lsls r1, 24
lsrs r1, 24
ldr r0, _080989F0 @ =gUnknown_2039882
adds r5, r1, r0
ldrb r0, [r5]
cmp r0, 0xFF
bne _080989EA
adds r4, r1, 0
adds r4, 0x66
adds r0, r4, 0
bl FreeSpriteTilesByTag
adds r0, r4, 0
bl FreeSpritePaletteByTag
adds r0, r4, 0
adds r1, r4, 0
adds r2, r6, 0
bl AddItemIconObject
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0x40
beq _080989EA
strb r2, [r5]
ldr r1, _080989F4 @ =gSprites
lsls r0, r2, 4
adds r0, r2
lsls r0, 2
adds r0, r1
movs r1, 0x18
strh r1, [r0, 0x24]
movs r1, 0x93
strh r1, [r0, 0x26]
_080989EA:
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_080989F0: .4byte gUnknown_2039882
_080989F4: .4byte gSprites
thumb_func_end sub_80989A0
.align 2, 0 @ Don't pad with nop.
asm/item_pc.s
-2909
View File
File diff suppressed because it is too large Load Diff
asm/item_use.s
-2410
View File
File diff suppressed because it is too large Load Diff
asm/itemfinder.s
+1 -1
View File
@@ -1091,7 +1091,7 @@ _0813F470:
.4byte _0813F50C
.4byte _0813F52C
_0813F484:
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
asm/learn_move.s
+11 -11
View File
@@ -76,7 +76,7 @@ sub_80E469C: @ 80E469C
movs r0, 0
movs r2, 0x2
bl InitBgsFromTemplates
bl reset_temp_tile_data_buffers
bl ResetTempTileDataBuffers
ldr r0, _080E4778 @ =gUnknown_83FFA44
bl InitWindows
lsls r0, 16
@@ -119,7 +119,7 @@ _080E46C6:
movs r0, 0
movs r1, 0x1
movs r2, 0xE0
bl sub_815001C
bl TextWindow_SetUserSelectedFrame
movs r0, 0xD0
movs r1, 0x1
bl sub_8107D38
@@ -736,7 +736,7 @@ _080E4C7E:
adds r1, r2, r3
ldr r6, _080E4CD4 @ =0x00000a6a
adds r2, r6
bl get_coro_args_x18_x1A
bl ListMenuGetScrollAndRow
bl FreeAllWindowBuffers
ldr r0, _080E4CD8 @ =gPlayerParty
ldr r5, [r7]
@@ -1409,7 +1409,7 @@ sub_80E5204: @ 80E5204
ldr r1, _080E525C @ =0x00000263
adds r0, r1
ldrb r0, [r0]
bl ListMenuHandleInput
bl ListMenu_ProcessInput
ldr r0, _080E5260 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
@@ -1568,7 +1568,7 @@ sub_80E5340: @ 80E5340
movs r0, 0x2
movs r2, 0x1
movs r3, 0x4
bl blit_move_info_icon
bl BlitMoveInfoIcon
ldrb r0, [r4, 0x1]
cmp r0, 0x1
bhi _080E5388
@@ -1680,27 +1680,27 @@ sub_80E5444: @ 80E5444
movs r1, 0x13
movs r2, 0x1
movs r3, 0x4
bl blit_move_info_icon
bl BlitMoveInfoIcon
movs r0, 0x1
movs r1, 0x14
movs r2, 0
movs r3, 0x4
bl blit_move_info_icon
bl BlitMoveInfoIcon
movs r0, 0x1
movs r1, 0x15
movs r2, 0
movs r3, 0x13
bl blit_move_info_icon
bl BlitMoveInfoIcon
movs r0, 0
movs r1, 0x16
movs r2, 0x1
movs r3, 0x13
bl blit_move_info_icon
bl BlitMoveInfoIcon
movs r0, 0
movs r1, 0x17
movs r2, 0x1
movs r3, 0x22
bl blit_move_info_icon
bl BlitMoveInfoIcon
movs r0, 0
bl PutWindowTilemap
movs r0, 0x1
@@ -1936,7 +1936,7 @@ _080E563E:
movs r1, 0x3
adds r2, r7, 0
adds r3, r6, 0
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
add sp, 0x14
pop {r3-r5}
mov r8, r3
asm/link.s
+8 -8
View File
@@ -3288,7 +3288,7 @@ _0800AD30:
cmp r0, 0
beq _0800ADD8
bl DeactivateAllTextPrinters
bl reset_temp_tile_data_buffers
bl ResetTempTileDataBuffers
movs r0, 0x52
movs r1, 0
bl SetGpuReg
@@ -3387,7 +3387,7 @@ sub_800AE1C: @ 800AE1C
movs r1, 0x3
movs r2, 0x2
movs r3, 0x5
bl box_print
bl AddTextPrinterParameterized3
str r4, [sp]
str r5, [sp, 0x4]
ldr r0, _0800AECC @ =gUnknown_841DF05
@@ -3396,7 +3396,7 @@ sub_800AE1C: @ 800AE1C
movs r1, 0x3
movs r2, 0x2
movs r3, 0x2
bl box_print
bl AddTextPrinterParameterized3
movs r0, 0
bl PutWindowTilemap
movs r0, 0x2
@@ -3444,7 +3444,7 @@ sub_800AED0: @ 800AED0
movs r1, 0x3
movs r2, 0x2
movs r3, 0
bl box_print
bl AddTextPrinterParameterized3
movs r0, 0x1
bl PutWindowTilemap
movs r0, 0x2
@@ -3522,7 +3522,7 @@ _0800AF7A:
movs r1, 0x3
movs r2, 0x2
movs r3, 0x14
bl box_print
bl AddTextPrinterParameterized3
b _0800AFC4
.align 2, 0
_0800AF9C: .4byte gWirelessCommType
@@ -3541,7 +3541,7 @@ _0800AFA8:
movs r1, 0x3
movs r2, 0x2
movs r3, 0x14
bl box_print
bl AddTextPrinterParameterized3
_0800AFC4:
ldr r0, _0800B004 @ =gMain
movs r2, 0x87
@@ -4686,7 +4686,7 @@ _0800B85C:
_0800B860:
adds r0, r2, 0
strh r0, [r1]
ldr r2, _0800B8BC @ =gUnknown_3003FB4
ldr r2, _0800B8BC @ =gSioMlt_Recv
ldr r3, _0800B8C0 @ =0x04000120
ldr r0, [r3]
ldr r1, [r3, 0x4]
@@ -4731,7 +4731,7 @@ _0800B8A0:
.align 2, 0
_0800B8B4: .4byte 0x0400012a
_0800B8B8: .4byte 0x0000b9a0
_0800B8BC: .4byte gUnknown_3003FB4
_0800B8BC: .4byte gSioMlt_Recv
_0800B8C0: .4byte 0x04000120
_0800B8C4: .4byte gUnknown_3000E6B
_0800B8C8: .4byte 0x00008fff
asm/link_rfu.s
+4 -4
View File
@@ -3259,7 +3259,7 @@ sub_80FEC54: @ 80FEC54
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl is_c1_link_related_active
bl IsUpdateLinkStateCBActive
cmp r0, 0
bne _080FEC70
_080FEC62:
@@ -7823,7 +7823,7 @@ _08100E0A:
str r0, [sp, 0x8]
mov r0, r12
adds r2, r7, 0
bl box_print
bl AddTextPrinterParameterized3
add sp, 0x10
pop {r3,r4}
mov r8, r3
@@ -7851,7 +7851,7 @@ sub_8100E34: @ 8100E34
movs r0, 0x1
movs r1, 0x1
movs r2, 0xE0
bl sub_815001C
bl TextWindow_SetUserSelectedFrame
movs r0, 0x1
movs r1, 0x1
movs r2, 0xE
@@ -9465,7 +9465,7 @@ sub_8101A90: @ 8101A90
ldr r4, _08101AC0 @ =gUnknown_843F938
_08101AA2:
adds r0, r4, 0
bl LoadCompressedObjectPic
bl LoadCompressedSpriteSheet
adds r4, 0x8
adds r5, 0x1
cmp r5, 0x3
asm/link_rfu_2.s
+1 -1
View File
@@ -9525,7 +9525,7 @@ sub_80FCEA8: @ 80FCEA8
cmp r0, r1
bne _080FCEC0
adds r0, r4, 0
bl LoadCompressedObjectPic
bl LoadCompressedSpriteSheet
_080FCEC0:
ldr r0, _080FCEDC @ =gUnknown_843F27C
bl LoadSpritePalette
asm/link_rfu_3.s
+77 -77
View File
@@ -620,7 +620,7 @@ _08115DD4:
bl sub_81165E8
strb r0, [r5, 0x13]
ldrb r0, [r5, 0x12]
bl sub_8107180
bl RedrawListMenu
b _0811610C
.align 2, 0
_08115DE4: .4byte gUnknown_203B058
@@ -783,7 +783,7 @@ _08115EF4:
movs r0, 0
strb r0, [r1, 0x1B]
ldrb r0, [r5, 0x12]
bl sub_8107180
bl RedrawListMenu
ldrb r0, [r5, 0x13]
adds r0, 0x1
strb r0, [r5, 0x13]
@@ -870,7 +870,7 @@ _08115FB4:
ldr r0, [r5]
bl sub_81165E8
ldrb r0, [r5, 0x12]
bl sub_8107180
bl RedrawListMenu
_08115FF0:
movs r0, 0x4
strb r0, [r5, 0xC]
@@ -1139,7 +1139,7 @@ sub_81161E4: @ 81161E4
ldrb r0, [r4, 0x12]
movs r1, 0
movs r2, 0
bl DestroyListMenu
bl DestroyListMenuTask
ldrb r0, [r4, 0x10]
bl ClearWindowTilemap
ldrb r0, [r4, 0xF]
@@ -1400,7 +1400,7 @@ _08116460:
movs r0, 0x2
bl PlaySE
ldrb r0, [r5, 0x12]
bl sub_8107180
bl RedrawListMenu
ldr r4, _081164A0 @ =gStringVar2
ldrb r0, [r5, 0x13]
lsls r0, 5
@@ -1433,7 +1433,7 @@ _081164AC:
movs r1, 0
bl sub_80FB9E4
ldrb r0, [r5, 0x12]
bl sub_8107180
bl RedrawListMenu
strb r4, [r5, 0xC]
movs r0, 0x1
b _081164C2
@@ -1972,7 +1972,7 @@ _08116916:
b _08116BF6
_0811691E:
ldrb r0, [r6, 0xE]
bl ListMenuHandleInput
bl ListMenu_ProcessInput
adds r4, r0, 0
ldr r0, _0811696C @ =gMain
ldrh r1, [r0, 0x2E]
@@ -2301,7 +2301,7 @@ _08116BF4:
strb r0, [r6, 0x8]
_08116BF6:
ldrb r0, [r6, 0xE]
bl sub_8107180
bl RedrawListMenu
b _08116D06
_08116BFE:
bl sub_80FB9F4
@@ -2322,7 +2322,7 @@ _08116C10:
ldrb r0, [r6, 0xE]
movs r1, 0
movs r2, 0
bl DestroyListMenu
bl DestroyListMenuTask
ldrb r0, [r6, 0xC]
bl ClearWindowTilemap
ldrb r0, [r6, 0xB]
@@ -2480,7 +2480,7 @@ sub_8116D60: @ 8116D60
movs r1, 0
bl sub_80FCD74
ldrb r0, [r4, 0xE]
bl sub_8107180
bl RedrawListMenu
ldr r5, _08116DD4 @ =gStringVar1
ldrb r0, [r4, 0xF]
lsls r0, 5
@@ -3154,14 +3154,14 @@ _081172C0:
cmp r4, r0
bne _0811734A
movs r4, 0
ldr r0, _081172E0 @ =gUnknown_2039624
ldr r0, _081172E0 @ =gTrainerCards
adds r7, r0, 0
adds r7, 0x38
ldr r6, _081172E4 @ =gLinkPlayers
adds r5, r0, 0
b _08117302
.align 2, 0
_081172E0: .4byte gUnknown_2039624
_081172E0: .4byte gTrainerCards
_081172E4: .4byte gLinkPlayers
_081172E8:
lsls r0, r4, 8
@@ -3367,7 +3367,7 @@ sub_8117440: @ 8117440
movs r0, 0
mov r3, r8
bl SetDynamicWarpWithCoords
bl warp_in
bl WarpIntoMap
add sp, 0x8
pop {r3}
mov r8, r3
@@ -3424,7 +3424,7 @@ sub_81174B4: @ 81174B4
adds r1, r5, 0
mov r3, r8
bl Overworld_SetWarpDestination
bl warp_in
bl WarpIntoMap
add sp, 0x4
pop {r3}
mov r8, r3
@@ -3763,21 +3763,21 @@ _08117890:
bl GetCursorSelectionMonId
lsls r0, 24
lsrs r0, 24
ldr r1, _081178AC @ =sub_805671C
ldr r1, _081178AC @ =CB2_LoadMap
bl sub_8147AA8
b _081178E0
.align 2, 0
_081178AC: .4byte sub_805671C
_081178AC: .4byte CB2_LoadMap
_081178B0:
movs r0, 0x7
movs r1, 0x9
movs r2, 0x1
bl sub_8117440
ldr r0, _081178C4 @ =sub_805671C
ldr r0, _081178C4 @ =CB2_LoadMap
bl sub_814B754
b _081178E0
.align 2, 0
_081178C4: .4byte sub_805671C
_081178C4: .4byte CB2_LoadMap
_081178C8:
movs r0, 0x8
movs r1, 0x5
@@ -3786,7 +3786,7 @@ _081178C8:
bl GetCursorSelectionMonId
lsls r0, 24
lsrs r0, 24
ldr r1, _081178F8 @ =sub_805671C
ldr r1, _081178F8 @ =CB2_LoadMap
bl sub_81507FC
_081178E0:
adds r0, r4, 0
@@ -3800,7 +3800,7 @@ _081178E0:
pop {r0}
bx r0
.align 2, 0
_081178F8: .4byte sub_805671C
_081178F8: .4byte CB2_LoadMap
_081178FC: .4byte gSpecialVar_Result
thumb_func_end sub_81175BC
@@ -4151,7 +4151,7 @@ _08117BF4:
bl sub_81165E8
strb r0, [r5, 0x13]
ldrb r0, [r5, 0x12]
bl sub_8107180
bl RedrawListMenu
_08117C02:
movs r0, 0x2
strb r0, [r5, 0xC]
@@ -4198,7 +4198,7 @@ _08117C42:
adds r1, r0
strb r4, [r1, 0x1B]
ldrb r0, [r5, 0x12]
bl sub_8107180
bl RedrawListMenu
movs r0, 0x5
strb r0, [r5, 0x19]
ldrb r1, [r5, 0x13]
@@ -4268,7 +4268,7 @@ _08117CB2:
movs r0, 0
strb r0, [r1, 0x1B]
ldrb r0, [r5, 0x12]
bl sub_8107180
bl RedrawListMenu
ldrb r0, [r5, 0x13]
adds r0, 0x1
strb r0, [r5, 0x13]
@@ -4327,7 +4327,7 @@ _08117D3C:
ldr r0, [r5]
bl sub_81165E8
ldrb r0, [r5, 0x12]
bl sub_8107180
bl RedrawListMenu
movs r0, 0x2
strb r0, [r5, 0xC]
_08117D7C:
@@ -4398,7 +4398,7 @@ _08117DEE:
ldrb r0, [r5, 0x12]
movs r1, 0
movs r2, 0
bl DestroyListMenu
bl DestroyListMenuTask
movs r0, 0
bl CopyBgTilemapBufferToVram
ldrb r0, [r5, 0xF]
@@ -4457,7 +4457,7 @@ _08117E80:
ldrb r0, [r5, 0x12]
movs r1, 0
movs r2, 0
bl DestroyListMenu
bl DestroyListMenuTask
movs r0, 0
bl CopyBgTilemapBufferToVram
ldrb r0, [r5, 0xF]
@@ -4673,11 +4673,11 @@ _08118070:
bl PlaySE
_08118086:
ldrb r0, [r5, 0xE]
bl sub_8107180
bl RedrawListMenu
b _08118288
_0811808E:
ldrb r0, [r5, 0xE]
bl ListMenuHandleInput
bl ListMenu_ProcessInput
adds r2, r0, 0
ldr r0, _08118128 @ =gMain
ldrh r1, [r0, 0x2E]
@@ -4707,7 +4707,7 @@ _0811808E:
movs r1, 0
bl sub_80FCD74
ldrb r0, [r5, 0xE]
bl sub_8107180
bl RedrawListMenu
ldr r4, _0811812C @ =gStringVar1
ldrb r0, [r5, 0xF]
lsls r0, 5
@@ -4842,7 +4842,7 @@ _081181EC:
ldrb r0, [r5, 0xE]
movs r1, 0
movs r2, 0
bl DestroyListMenu
bl DestroyListMenuTask
movs r0, 0
bl CopyBgTilemapBufferToVram
ldrb r0, [r5, 0xD]
@@ -5085,14 +5085,14 @@ _0811841E:
b _08118604
_08118426:
ldrb r0, [r5, 0xE]
bl sub_8107180
bl RedrawListMenu
b _08118604
_0811842E:
ldrb r0, [r5, 0x13]
cmp r0, 0
beq _0811843A
ldrb r0, [r5, 0xE]
bl ListMenuHandleInput
bl ListMenu_ProcessInput
_0811843A:
ldrb r0, [r5, 0x14]
cmp r0, 0x78
@@ -5242,7 +5242,7 @@ _08118564:
ldrb r0, [r5, 0xE]
movs r1, 0
movs r2, 0
bl DestroyListMenu
bl DestroyListMenuTask
movs r0, 0
bl CopyBgTilemapBufferToVram
ldrb r0, [r5, 0xB]
@@ -5404,7 +5404,7 @@ _081186AC: .4byte gStringVar4
thumb_func_start sub_81186B0
sub_81186B0: @ 81186B0
push {lr}
ldr r3, _081186C4 @ =gUnknown_201FF00
ldr r3, _081186C4 @ =gDecompressionBuffer + 0x3F00
ldr r1, [r0]
movs r2, 0x80
lsls r2, 1
@@ -5413,21 +5413,21 @@ sub_81186B0: @ 81186B0
pop {r0}
bx r0
.align 2, 0
_081186C4: .4byte gUnknown_201FF00
_081186C4: .4byte gDecompressionBuffer + 0x3F00
thumb_func_end sub_81186B0
thumb_func_start sub_81186C8
sub_81186C8: @ 81186C8
push {lr}
ldr r0, [r0]
ldr r1, _081186DC @ =gUnknown_201FF00
ldr r1, _081186DC @ =gDecompressionBuffer + 0x3F00
movs r2, 0x80
lsls r2, 1
bl memcpy
pop {r0}
bx r0
.align 2, 0
_081186DC: .4byte gUnknown_201FF00
_081186DC: .4byte gDecompressionBuffer + 0x3F00
thumb_func_end sub_81186C8
thumb_func_start sub_81186E0
@@ -8491,7 +8491,7 @@ sub_811A0B4: @ 811A0B4
bl StringExpandPlaceholders
movs r0, 0
movs r1, 0x1
bl sub_80F6E54
bl AddTextPrinterWithCustomSpeedForMessage
movs r0, 0
pop {r4}
pop {r1}
@@ -8503,7 +8503,7 @@ _0811A0DC: .4byte gStringVar4
thumb_func_start sub_811A0E0
sub_811A0E0: @ 811A0E0
push {lr}
bl sub_80F6CBC
bl RunTextPrinters_CheckPrinter0Active
lsls r0, 16
cmp r0, 0
beq _0811A0F0
@@ -8536,7 +8536,7 @@ _0811A10A:
adds r1, r5, 0
bl StringExpandPlaceholders
movs r0, 0x1
bl sub_80F6E08
bl AddTextPrinterForMessage
ldrb r0, [r4]
adds r0, 0x1
strb r0, [r4]
@@ -8544,7 +8544,7 @@ _0811A10A:
.align 2, 0
_0811A12C: .4byte gStringVar4
_0811A130:
bl sub_80F6CBC
bl RunTextPrinters_CheckPrinter0Active
lsls r0, 16
lsrs r0, 16
cmp r0, 0
@@ -8578,7 +8578,7 @@ _0811A15E:
negs r0, r0
b _0811A1A4
_0811A168:
bl sub_80F7858
bl DisplayYesNoMenuDefaultYes
ldrb r0, [r4]
adds r0, 0x1
strb r0, [r4]
@@ -8586,7 +8586,7 @@ _0811A168:
_0811A174:
cmp r5, 0
beq _0811A186
bl sub_81100E8
bl DestroyYesNoMenu
movs r0, 0
strb r0, [r4]
movs r0, 0x3
@@ -8715,7 +8715,7 @@ _0811A270: .4byte gMultiuseListMenuTemplate
_0811A274:
mov r3, r9
ldrb r0, [r3]
bl ListMenuHandleInput
bl ListMenu_ProcessInput
mov r8, r0
ldr r0, _0811A2AC @ =gMain
ldrh r1, [r0, 0x2E]
@@ -8726,7 +8726,7 @@ _0811A274:
ldrb r0, [r4]
movs r1, 0
movs r2, 0
bl DestroyListMenu
bl DestroyListMenuTask
ldrb r0, [r5]
movs r1, 0x1
bl ClearStdWindowAndFrame
@@ -8747,7 +8747,7 @@ _0811A2B0:
ldrb r0, [r6]
movs r1, 0
movs r2, 0
bl DestroyListMenu
bl DestroyListMenuTask
ldrb r0, [r5]
movs r1, 0x1
bl ClearStdWindowAndFrame
@@ -8821,7 +8821,7 @@ _0811A350: .4byte gUnknown_8456F1C
_0811A354: .4byte gMultiuseListMenuTemplate
_0811A358:
ldrb r0, [r5]
bl ListMenuHandleInput
bl ListMenu_ProcessInput
adds r1, r0, 0
ldr r0, _0811A3A8 @ =gMain
ldrh r2, [r0, 0x2E]
@@ -8842,7 +8842,7 @@ _0811A37E:
ldrb r0, [r5]
movs r1, 0
movs r2, 0
bl DestroyListMenu
bl DestroyListMenuTask
ldrb r0, [r4]
movs r1, 0x1
bl ClearStdWindowAndFrame
@@ -8867,7 +8867,7 @@ _0811A3AC:
ldrb r0, [r5]
movs r1, 0
movs r2, 0
bl DestroyListMenu
bl DestroyListMenuTask
ldrb r0, [r4]
movs r1, 0x1
bl ClearStdWindowAndFrame
@@ -9999,7 +9999,7 @@ _0811AC3C:
adds r0, r6, 0
movs r2, 0x44
adds r3, r5, 0
bl blit_move_info_icon
bl BlitMoveInfoIcon
movs r0, 0xB
mov r2, r8
muls r2, r0
@@ -10537,14 +10537,14 @@ _0811B056:
lsls r0, r4, 24
lsrs r0, 24
adds r1, r5, 0
bl UnkTextUtil_SetPtrI
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
adds r5, 0xB
adds r4, 0x1
cmp r4, 0x3
ble _0811B056
ldr r1, _0811B074 @ =gUnknown_8457D44
adds r0, r7, 0
bl UnkTextUtil_StringExpandPlaceholders
bl DynamicPlaceholderTextUtil_ExpandPlaceholders
b _0811B080
.align 2, 0
_0811B074: .4byte gUnknown_8457D44
@@ -10949,10 +10949,10 @@ sub_811B31C: @ 811B31C
lsls r1, r0, 1
adds r1, r0
lsls r1, 5
ldr r0, _0811B4B0 @ =gUnknown_2039624
ldr r0, _0811B4B0 @ =gTrainerCards
adds r1, r0
mov r8, r1
bl UnkTextUtil_Reset
bl DynamicPlaceholderTextUtil_Reset
mov r6, r9
adds r6, 0xAC
bl sub_80447F0
@@ -10966,11 +10966,11 @@ sub_811B31C: @ 811B31C
bl StringCopy
movs r0, 0
adds r1, r6, 0
bl UnkTextUtil_SetPtrI
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
mov r1, r8
adds r1, 0x30
movs r0, 0x1
bl UnkTextUtil_SetPtrI
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
movs r4, 0xB0
lsls r4, 1
add r4, r9
@@ -10984,7 +10984,7 @@ sub_811B31C: @ 811B31C
bl StringCopy
movs r0, 0x2
adds r1, r4, 0
bl UnkTextUtil_SetPtrI
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
mov r5, r9
adds r5, 0xCA
mov r0, r8
@@ -10995,7 +10995,7 @@ sub_811B31C: @ 811B31C
bl ConvertIntToDecimalStringN
movs r0, 0x3
adds r1, r5, 0
bl UnkTextUtil_SetPtrI
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
movs r2, 0xD9
add r2, r9
mov r10, r2
@@ -11015,16 +11015,16 @@ sub_811B31C: @ 811B31C
bl ConvertIntToDecimalStringN
movs r0, 0x4
mov r1, r10
bl UnkTextUtil_SetPtrI
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
movs r0, 0x5
adds r1, r4, 0
bl UnkTextUtil_SetPtrI
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
movs r4, 0xC8
lsls r4, 1
add r4, r9
ldr r1, _0811B4BC @ =gUnknown_84594C4
adds r0, r4, 0
bl UnkTextUtil_StringExpandPlaceholders
bl DynamicPlaceholderTextUtil_ExpandPlaceholders
ldr r0, _0811B4C0 @ =gStringVar4
adds r1, r4, 0
bl StringCopy
@@ -11041,7 +11041,7 @@ _0811B40A:
bl ConvertIntToDecimalStringN
movs r0, 0
adds r1, r6, 0
bl UnkTextUtil_SetPtrI
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
mov r2, r8
ldrh r1, [r2, 0x16]
cmp r1, r4
@@ -11056,7 +11056,7 @@ _0811B426:
bl ConvertIntToDecimalStringN
movs r0, 0x2
adds r1, r4, 0
bl UnkTextUtil_SetPtrI
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
mov r0, r8
ldrh r1, [r0, 0x20]
adds r0, r5, 0
@@ -11065,7 +11065,7 @@ _0811B426:
bl ConvertIntToDecimalStringN
movs r0, 0x3
adds r1, r5, 0
bl UnkTextUtil_SetPtrI
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
movs r7, 0
movs r6, 0x80
lsls r6, 19
@@ -11078,7 +11078,7 @@ _0811B45E:
bl CopyEasyChatWord
lsrs r0, r6, 24
adds r1, r4, 0
bl UnkTextUtil_SetPtrI
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
movs r2, 0x80
lsls r2, 17
adds r6, r2
@@ -11092,7 +11092,7 @@ _0811B45E:
add r4, r9
ldr r1, _0811B4C8 @ =gUnknown_8459504
adds r0, r4, 0
bl UnkTextUtil_StringExpandPlaceholders
bl DynamicPlaceholderTextUtil_ExpandPlaceholders
ldr r5, _0811B4C0 @ =gStringVar4
adds r0, r5, 0
adds r1, r4, 0
@@ -11102,13 +11102,13 @@ _0811B45E:
bne _0811B4D0
ldr r1, _0811B4CC @ =gUnknown_8459588
adds r0, r4, 0
bl UnkTextUtil_StringExpandPlaceholders
bl DynamicPlaceholderTextUtil_ExpandPlaceholders
adds r0, r5, 0
adds r1, r4, 0
bl StringAppend
b _0811B4F0
.align 2, 0
_0811B4B0: .4byte gUnknown_2039624
_0811B4B0: .4byte gTrainerCards
_0811B4B4: .4byte gTrainerClassNames
_0811B4B8: .4byte gUnknown_84594B0
_0811B4BC: .4byte gUnknown_84594C4
@@ -11127,7 +11127,7 @@ _0811B4D0:
adds r1, r0
ldr r1, [r1]
adds r0, r4, 0
bl UnkTextUtil_StringExpandPlaceholders
bl DynamicPlaceholderTextUtil_ExpandPlaceholders
adds r0, r5, 0
adds r1, r4, 0
bl StringAppend
@@ -11381,13 +11381,13 @@ sub_811B66C: @ 811B66C
ldr r1, _0811B6C0 @ =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
bl FieldObjectIsMovementOverridden
lsls r0, 24
cmp r0, 0
bne _0811B6D0
ldrb r1, [r5]
adds r0, r4, 0
bl sub_8063CA4
bl FieldObjectSetHeldMovement
lsls r0, 24
cmp r0, 0
bne _0811B6C4
@@ -11440,7 +11440,7 @@ sub_811B6E8: @ 811B6E8
ldr r1, _0811B72C @ =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
bl FieldObjectClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
bne _0811B730
@@ -12496,7 +12496,7 @@ sub_811BF00: @ 811BF00
b _0811BFEE
_0811BF1C:
ldr r4, _0811BF44 @ =gUnknown_8457116
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
adds r0, r4
@@ -12766,7 +12766,7 @@ sub_811C0E0: @ 811C0E0
movs r1, 0x3
adds r2, r6, 0
ldr r3, [sp, 0x14]
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
add sp, 0x18
pop {r3-r5}
mov r8, r3
@@ -12935,7 +12935,7 @@ _0811C2C0:
movs r0, 0
movs r2, 0x1
bl InitBgsFromTemplates
bl reset_temp_tile_data_buffers
bl ResetTempTileDataBuffers
ldr r0, _0811C358 @ =gUnknown_8457198
bl InitWindows
lsls r0, 16
@@ -12966,8 +12966,8 @@ _0811C300:
movs r0, 0
movs r1, 0x1
movs r2, 0xD0
bl sub_814FF2C
bl sub_80F77B8
bl TextWindow_SetStdFrame0_WithPal
bl Menu_LoadStdPal
ldr r0, _0811C35C @ =sub_811C1B4
bl SetVBlankCallback
ldr r1, _0811C360 @ =gMain

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