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

Merge pull request #5 from pret/master

Browse Source 
Take files
This commit is contained in:
Swastik Baranwal
2019-06-23 18:47:35 +05:30
committed by GitHub
parent 6d190f861e 9ee0c34758
commit 99703c6ab8
6577 changed files with 281684 additions and 135628 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
+2
View File
@@ -26,6 +26,7 @@ ld_script_sapphire.txt
*.id2
*.nam
*.til
.fuse*
*.ld
tags
types_*.taghl
@@ -40,3 +41,4 @@ build/
.idea/
*.DS_Store
*.pl
*.bak
INSTALL.md
+27 -36
View File
@@ -1,11 +1,29 @@
Run the following commands (first, see [this](#macos) if you are on **macOS** or [this](#old-windows) if you are on **old Windows**):
## 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:** Proceed to [Installation](#installation).
**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_).
**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.
## Installation
To set up the repository:
git clone https://github.com/pret/pokefirered
git clone https://github.com/pikalaxalt/agbcc -b new_layout_with_libs
git clone https://github.com/luckytyphlosion/agbcc -b new_layout_with_libs
cd agbcc
cd ./agbcc
make
make install prefix=../pokefirered
make install-sdk prefix=../pokefirered
cd ../pokefirered
@@ -13,39 +31,12 @@ To build **pokefirered.gba**:
make -j$(nproc)
If you have only changed `.c` or `.s` files, you can 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.
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.
make -j$(nproc) NODEP=1
## macOS
Run `xcode-select --install` in Terminal, then proceed by executing the commands.
## Old Windows
*For Windows 8.1 and earlier*
Download and run the [Cygwin](https://www.cygwin.com/install.html) setup, leaving the default settings intact. At "Select Packages", set the view to "Full" and choose to install the following:
- `make`
- `git`
- `gcc-core`
- `gcc-g++`
- `libpng-devel`
In the Cygwin command prompt, enter the commands.
If the command for building pokefirered.gba does not work, run `nproc` and use that value instead of `$(nproc)` for `make`.
## Windows 10
Install the [Windows Subsystem for Linux](https://docs.microsoft.com/windows/wsl/install-win10), and run the commands.
## Important note for all users
Until further notice, this repository is dependent on `baserom.gba`, which is a copy of Pokémon FireRed (U)(1.0) bearing the SHA1 sum `41cb23d8dccc8ebd7c649cd8fbb58eeace6e2fdc`. If you attempt to build and get the following error or similar, it's because `baserom.gba` is missing.
No rule to make target 'build/firered/data/librfu_rodata.o', needed by 'pokefirered.elf'. Stop.
**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
+56 -8
View File
@@ -45,6 +45,8 @@ SCANINC := tools/scaninc/scaninc
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:
@@ -56,10 +58,20 @@ FIX := tools/gbafix/gbafix
# Secondary expansion is required for dependency variables in object rules.
.SECONDEXPANSION:
.PHONY: rom clean compare tidy
.PHONY: rom tools clean compare tidy
$(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))
@@ -75,17 +87,51 @@ 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)
tools:
@$(MAKE) -C tools/gbagfx
@$(MAKE) -C tools/scaninc
@$(MAKE) -C tools/preproc
@$(MAKE) -C tools/bin2c
@$(MAKE) -C tools/rsfont
@$(MAKE) -C tools/aif2pcm
@$(MAKE) -C tools/ramscrgen
@$(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)
compare: rom
@$(SHA1) rom.sha1
clean: tidy
rm -f sound/direct_sound_samples/*.bin
rm -f $(SONG_OBJS)
find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.latfont' -o -iname '*.hwjpnfont' -o -iname '*.fwjpnfont' \) -exec rm {} +
@$(MAKE) -C berry_fix clean
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
@$(MAKE) clean -C tools/preproc
@$(MAKE) clean -C tools/bin2c
@$(MAKE) clean -C tools/rsfont
@$(MAKE) clean -C tools/aif2pcm
@$(MAKE) clean -C tools/ramscrgen
@$(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)
@@ -93,6 +139,9 @@ tidy:
@$(MAKE) -C berry_fix tidy
include graphics_file_rules.mk
include tileset_rules.mk
include map_data_rules.mk
include json_data_rules.mk
%.s: ;
%.png: ;
@@ -115,8 +164,7 @@ $(C_BUILDDIR)/agb_flash.o: CFLAGS := -O -mthumb-interwork
$(C_BUILDDIR)/agb_flash_1m.o: CFLAGS := -O -mthumb-interwork
$(C_BUILDDIR)/agb_flash_mx.o: CFLAGS := -O -mthumb-interwork
$(C_BUILDDIR)/m4a_2.o: CC1 := tools/agbcc/bin/old_agbcc
$(C_BUILDDIR)/m4a_4.o: CC1 := tools/agbcc/bin/old_agbcc
$(C_BUILDDIR)/m4a.o: CC1 := tools/agbcc/bin/old_agbcc
$(C_BUILDDIR)/isagbprn.o: CC1 := tools/agbcc/bin/old_agbcc
$(C_BUILDDIR)/isagbprn.o: CFLAGS := -mthumb-interwork
@@ -138,7 +186,7 @@ $(C_BUILDDIR)/%.o : $(C_SUBDIR)/%.c $$(c_dep)
ifeq ($(NODEP),1)
$(ASM_BUILDDIR)/%.o: asm_dep :=
else
$(ASM_BUILDDIR)/%.o: asm_dep = $(shell $(SCANINC) $(ASM_SUBDIR)/$*.s)
$(ASM_BUILDDIR)/%.o: asm_dep = $(shell $(SCANINC) -I . $(ASM_SUBDIR)/$*.s)
endif
$(ASM_BUILDDIR)/%.o: $(ASM_SUBDIR)/%.s $$(asm_dep)
@@ -147,11 +195,11 @@ $(ASM_BUILDDIR)/%.o: $(ASM_SUBDIR)/%.s $$(asm_dep)
ifeq ($(NODEP),1)
$(DATA_ASM_BUILDDIR)/%.o: data_dep :=
else
$(DATA_ASM_BUILDDIR)/%.o: data_dep = $(shell $(SCANINC) $(DATA_ASM_SUBDIR)/$*.s)
$(DATA_ASM_BUILDDIR)/%.o: data_dep = $(shell $(SCANINC) -I . $(DATA_ASM_SUBDIR)/$*.s)
endif
$(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s $$(data_dep)
$(PREPROC) $< charmap.txt | $(CPP) -I include -nostdinc -undef - | $(AS) $(ASFLAGS) -o $@
$(PREPROC) $< charmap.txt | $(CPP) -I include -nostdinc -undef -Wno-unicode - | $(AS) $(ASFLAGS) -o $@
$(SONG_BUILDDIR)/%.o: $(SONG_SUBDIR)/%.s
$(AS) $(ASFLAGS) -I sound -o $@ $<
README.md
+19 -22
View File
@@ -4,31 +4,28 @@ This is a disassembly of Pokémon FireRed and LeafGreen.
It builds the following ROM:
* pokefirered.gba `sha1: 41cb23d8dccc8ebd7c649cd8fbb58eeace6e2fdc`
* [**pokefirered.gba**](https://datomatic.no-intro.org/?page=show_record&s=23&n=1616) `sha1: 41cb23d8dccc8ebd7c649cd8fbb58eeace6e2fdc`
To set up the repository, see [**INSTALL.md**](INSTALL.md).
To set up the repository, see [INSTALL.md](INSTALL.md).
## See also
* Disassembly of [**Pokémon Red and Blue**][pokered]
* Disassembly of [**Pokémon Yellow**][pokeyellow]
* Disassembly of [**Pokémon Gold and Silver**][pokegold]
* Disassembly of [**Pokémon Crystal**][pokecrystal]
* Disassembly of [**Pokémon Pinball**][pokepinball]
* Disassembly of [**Pokémon TCG**][poketcg]
* Disassembly of [**Pokémon Ruby and Sapphire**][pokeruby]
* Disassembly of [**Pokémon Emerald**][pokeemerald]
* Discord: [**pret**][Discord]
* irc: **irc.freenode.net** [**#pret**][irc]
Other disassembly and/or decompilation projects:
* [**Pokémon Red and Blue**](https://github.com/pret/pokered)
* [**Pokémon Gold and Silver (Space World '97 demo)**](https://github.com/pret/pokegold-spaceworld)
* [**Pokémon Yellow**](https://github.com/pret/pokeyellow)
* [**Pokémon Trading Card Game**](https://github.com/pret/poketcg)
* [**Pokémon Pinball**](https://github.com/pret/pokepinball)
* [**Pokémon Stadium**](https://github.com/pret/pokestadium)
* [**Pokémon Gold and Silver**](https://github.com/pret/pokegold)
* [**Pokémon Crystal**](https://github.com/pret/pokecrystal)
* [**Pokémon Ruby and Sapphire**](https://github.com/pret/pokeruby)
* [**Pokémon Pinball: Ruby & Sapphire**](https://github.com/pret/pokepinballrs)
* [**Pokémon Emerald**](https://github.com/pret/pokeemerald)
* [**Pokémon Mystery Dungeon: Red Rescue Team**](https://github.com/pret/pmd-red)
[pokered]: https://github.com/pret/pokered
[pokeyellow]: https://github.com/pret/pokeyellow
[pokegold]: https://github.com/pret/pokegold
[pokecrystal]: https://github.com/pret/pokecrystal
[pokepinball]: https://github.com/pret/pokepinball
[poketcg]: https://github.com/pret/poketcg
[pokeruby]: https://github.com/pret/pokeruby
[pokeemerald]: https://github.com/pret/pokeemerald
[Discord]: https://discord.gg/6EuWgX9
[irc]: https://kiwiirc.com/client/irc.freenode.net/?#pret
## Contacts
You can find us on [Discord](https://discord.gg/6EuWgX9) and [IRC](https://kiwiirc.com/client/irc.freenode.net/?#pret).
asm/bag.s
-431
View File
@@ -1,431 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_810B858
sub_810B858: @ 810B858
push {r4,lr}
ldr r0, _0810B86C @ =gUnknown_203ACFC
ldrb r0, [r0, 0x4]
cmp r0, 0x3
beq _0810B874
ldr r0, _0810B870 @ =gUnknown_84530C4
bl InitWindows
b _0810B87A
.align 2, 0
_0810B86C: .4byte gUnknown_203ACFC
_0810B870: .4byte gUnknown_84530C4
_0810B874:
ldr r0, _0810B8E4 @ =gUnknown_84530E4
bl InitWindows
_0810B87A:
bl DeactivateAllTextPrinters
movs r0, 0
movs r1, 0x64
movs r2, 0xE0
bl sub_815001C
movs r0, 0
movs r1, 0x6D
movs r2, 0xD0
bl sub_814FEAC
movs r0, 0
movs r1, 0x81
movs r2, 0xC0
bl sub_814FF2C
ldr r0, _0810B8E8 @ =gUnknown_8453098
movs r1, 0xF0
movs r2, 0x20
bl LoadPalette
movs r4, 0
_0810B8A8:
adds r0, r4, 0
movs r1, 0
bl FillWindowPixelBuffer
adds r0, r4, 0
bl PutWindowTilemap
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x2
bls _0810B8A8
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
movs r4, 0
ldr r3, _0810B8EC @ =gUnknown_203AD34
movs r2, 0xFF
_0810B8CC:
adds r0, r4, r3
ldrb r1, [r0]
orrs r1, r2
strb r1, [r0]
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0xA
bls _0810B8CC
pop {r4}
pop {r0}
bx r0
.align 2, 0
_0810B8E4: .4byte gUnknown_84530E4
_0810B8E8: .4byte gUnknown_8453098
_0810B8EC: .4byte gUnknown_203AD34
thumb_func_end sub_810B858
thumb_func_start sub_810B8F0
sub_810B8F0: @ 810B8F0
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, _0810B954 @ =gUnknown_84530B8
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
_0810B954: .4byte gUnknown_84530B8
thumb_func_end sub_810B8F0
thumb_func_start sub_810B958
sub_810B958: @ 810B958
push {r4,lr}
sub sp, 0xC
adds r4, r0, 0
movs r0, 0x1
adds r1, r4, 0
movs r2, 0
bl GetStringWidth
movs r2, 0x48
subs r2, r0
lsrs r2, 1
lsls r2, 24
lsrs r2, 24
ldr r0, _0810B990 @ =gUnknown_84530B8
str r0, [sp]
movs r0, 0
str r0, [sp, 0x4]
str r4, [sp, 0x8]
movs r0, 0x2
movs r1, 0x1
movs r3, 0x1
bl box_print
add sp, 0xC
pop {r4}
pop {r0}
bx r0
.align 2, 0
_0810B990: .4byte gUnknown_84530B8
thumb_func_end sub_810B958
thumb_func_start sub_810B994
sub_810B994: @ 810B994
push {r4,lr}
sub sp, 0xC
movs r0, 0x2
movs r1, 0
movs r2, 0x81
movs r3, 0xC
bl SetWindowBorderStyle
ldr r4, _0810B9D8 @ =gUnknown_84162E8
movs r0, 0
adds r1, r4, 0
movs r2, 0
bl GetStringWidth
movs r3, 0x40
subs r3, r0
lsrs r3, 1
lsls r3, 24
lsrs r3, 24
movs r0, 0x1
str r0, [sp]
movs r0, 0
str r0, [sp, 0x4]
str r0, [sp, 0x8]
movs r0, 0x2
movs r1, 0
adds r2, r4, 0
bl AddTextPrinterParameterized
add sp, 0xC
pop {r4}
pop {r0}
bx r0
.align 2, 0
_0810B9D8: .4byte gUnknown_84162E8
thumb_func_end sub_810B994
thumb_func_start sub_810B9DC
sub_810B9DC: @ 810B9DC
push {r4-r6,lr}
lsls r0, 24
lsrs r5, r0, 24
lsls r1, 24
lsrs r1, 24
ldr r6, _0810BA10 @ =gUnknown_203AD34
adds r4, r5, r6
ldrb r0, [r4]
cmp r0, 0xFF
bne _0810BA2A
adds r0, r5, r1
lsls r0, 3
ldr r1, _0810BA14 @ =gUnknown_8453104
adds r0, r1
bl AddWindow
strb r0, [r4]
cmp r5, 0x6
beq _0810BA18
ldrb r0, [r4]
movs r1, 0
movs r2, 0x64
movs r3, 0xE
bl SetWindowBorderStyle
b _0810BA24
.align 2, 0
_0810BA10: .4byte gUnknown_203AD34
_0810BA14: .4byte gUnknown_8453104
_0810BA18:
ldrb r0, [r6, 0x6]
movs r1, 0
movs r2, 0x81
movs r3, 0xC
bl SetWindowBorderStyle
_0810BA24:
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
_0810BA2A:
ldr r0, _0810BA38 @ =gUnknown_203AD34
adds r0, r5, r0
ldrb r0, [r0]
pop {r4-r6}
pop {r1}
bx r1
.align 2, 0
_0810BA38: .4byte gUnknown_203AD34
thumb_func_end sub_810B9DC
thumb_func_start sub_810BA3C
sub_810BA3C: @ 810BA3C
push {r4,lr}
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, _0810BA6C @ =gUnknown_203AD34
adds r4, r0
ldrb r0, [r4]
movs r1, 0
bl sub_810F4D8
ldrb r0, [r4]
bl ClearWindowTilemap
ldrb r0, [r4]
bl RemoveWindow
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
movs r0, 0xFF
strb r0, [r4]
pop {r4}
pop {r0}
bx r0
.align 2, 0
_0810BA6C: .4byte gUnknown_203AD34
thumb_func_end sub_810BA3C
thumb_func_start sub_810BA70
sub_810BA70: @ 810BA70
push {r4,lr}
lsls r0, 24
lsrs r1, r0, 24
ldr r0, _0810BA94 @ =gUnknown_203AD34
adds r4, r1, r0
ldrb r0, [r4]
cmp r0, 0xFF
bne _0810BA8C
lsls r0, r1, 3
ldr r1, _0810BA98 @ =gUnknown_8453104
adds r0, r1
bl AddWindow
strb r0, [r4]
_0810BA8C:
ldrb r0, [r4]
pop {r4}
pop {r1}
bx r1
.align 2, 0
_0810BA94: .4byte gUnknown_203AD34
_0810BA98: .4byte gUnknown_8453104
thumb_func_end sub_810BA70
thumb_func_start sub_810BA9C
sub_810BA9C: @ 810BA9C
push {r4,lr}
lsls r0, 24
lsrs r0, 24
ldr r1, _0810BAD4 @ =gUnknown_203AD34
adds r4, r0, r1
ldrb r0, [r4]
cmp r0, 0xFF
beq _0810BACE
movs r1, 0
bl sub_810F260
ldrb r0, [r4]
bl ClearWindowTilemap
ldrb r0, [r4]
bl RemoveWindow
movs r0, 0x1
bl PutWindowTilemap
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
movs r0, 0xFF
strb r0, [r4]
_0810BACE:
pop {r4}
pop {r0}
bx r0
.align 2, 0
_0810BAD4: .4byte gUnknown_203AD34
thumb_func_end sub_810BA9C
thumb_func_start sub_810BAD8
sub_810BAD8: @ 810BAD8
lsls r0, 24
lsrs r0, 24
ldr r1, _0810BAE4 @ =gUnknown_203AD34
adds r0, r1
ldrb r0, [r0]
bx lr
.align 2, 0
_0810BAE4: .4byte gUnknown_203AD34
thumb_func_end sub_810BAD8
thumb_func_start sub_810BAE8
sub_810BAE8: @ 810BAE8
push {lr}
sub sp, 0x10
adds r3, r1, 0
lsls r0, 24
lsrs r0, 24
ldr r1, _0810BB10 @ =gUnknown_845311C
movs r2, 0x2
str r2, [sp]
movs r2, 0x64
str r2, [sp, 0x4]
movs r2, 0xE
str r2, [sp, 0x8]
str r3, [sp, 0xC]
movs r2, 0x2
movs r3, 0
bl sub_80BF5D0
add sp, 0x10
pop {r0}
bx r0
.align 2, 0
_0810BB10: .4byte gUnknown_845311C
thumb_func_end sub_810BAE8
thumb_func_start sub_810BB14
sub_810BB14: @ 810BB14
push {lr}
sub sp, 0x10
adds r3, r1, 0
lsls r0, 24
lsrs r0, 24
ldr r1, _0810BB3C @ =gUnknown_8453124
movs r2, 0x2
str r2, [sp]
movs r2, 0x64
str r2, [sp, 0x4]
movs r2, 0xE
str r2, [sp, 0x8]
str r3, [sp, 0xC]
movs r2, 0x2
movs r3, 0
bl sub_80BF5D0
add sp, 0x10
pop {r0}
bx r0
.align 2, 0
_0810BB3C: .4byte gUnknown_8453124
thumb_func_end sub_810BB14
thumb_func_start sub_810BB40
sub_810BB40: @ 810BB40
push {r4,lr}
movs r0, 0x2
movs r1, 0
bl sub_810B9DC
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, _0810BB70 @ =gSaveBlock1Ptr
ldr r0, [r0]
movs r1, 0xA4
lsls r1, 2
adds r0, r1
bl GetMoney
adds r3, r0, 0
adds r0, r4, 0
movs r1, 0x81
movs r2, 0xC
bl PrintMoneyAmountInMoneyBoxWithBorder
pop {r4}
pop {r0}
bx r0
.align 2, 0
_0810BB70: .4byte gSaveBlock1Ptr
thumb_func_end sub_810BB40
thumb_func_start sub_810BB74
sub_810BB74: @ 810BB74
push {lr}
lsls r0, 24
lsrs r0, 24
movs r1, 0x64
movs r2, 0xE
bl sub_8150048
pop {r0}
bx r0
thumb_func_end sub_810BB74
.align 2, 0 @ Don't pad with nop.
asm/battle_1.s
+34 -34
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
@@ -253,11 +253,11 @@ sub_800F380: @ 800F380
cmp r0, 0
beq _0800F3EA
movs r0, 0x70
bl sub_80F77CC
bl Menu_LoadStdPalAt
movs r0, 0
movs r1, 0x30
movs r2, 0x70
bl sub_814FEAC
bl TextWindow_SetBubbleFrame_841F1C8
adds r0, r4, 0
adds r0, 0xEC
movs r1, 0
@@ -294,7 +294,7 @@ sub_800F40C: @ 800F40C
thumb_func_start LoadBattleTextboxAndBackground
LoadBattleTextboxAndBackground: @ 800F420
push {lr}
ldr r0, _0800F454 @ =gUnknown_8D00000
ldr r0, _0800F454 @ =gBattleTextboxTiles
movs r1, 0xC0
lsls r1, 19
bl LZDecompressVram
@@ -305,7 +305,7 @@ LoadBattleTextboxAndBackground: @ 800F420
bl CopyToBgTilemapBuffer
movs r0, 0
bl CopyBgTilemapBufferToVram
ldr r0, _0800F45C @ =gUnknown_8D004D8
ldr r0, _0800F45C @ =gBattleTextboxPalette
movs r1, 0
movs r2, 0x40
bl LoadCompressedPalette
@@ -314,9 +314,9 @@ LoadBattleTextboxAndBackground: @ 800F420
pop {r0}
bx r0
.align 2, 0
_0800F454: .4byte gUnknown_8D00000
_0800F454: .4byte gBattleTextboxTiles
_0800F458: .4byte gFile_graphics_interface_menu_map_tilemap
_0800F45C: .4byte gUnknown_8D004D8
_0800F45C: .4byte gBattleTextboxPalette
thumb_func_end LoadBattleTextboxAndBackground
thumb_func_start sub_800F460
@@ -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
@@ -908,7 +908,7 @@ _0800F8F0:
ldrsh r0, [r5, r1]
cmp r0, 0
beq _0800F958
ldr r4, _0800F944 @ =gUnknown_2022978
ldr r4, _0800F944 @ =gBattle_BG1_X
ldrh r0, [r5, 0xA]
bl Sin2
lsls r0, 16
@@ -923,7 +923,7 @@ _0800F90A:
adds r0, r2, 0
subs r0, r1
strh r0, [r4]
ldr r4, _0800F948 @ =gUnknown_202297C
ldr r4, _0800F948 @ =gBattle_BG2_X
ldrh r0, [r5, 0xC]
bl Sin2
lsls r0, 16
@@ -938,21 +938,21 @@ _0800F928:
adds r0, r3, 0
subs r0, r1
strh r0, [r4]
ldr r0, _0800F94C @ =gUnknown_202297A
ldr r0, _0800F94C @ =gBattle_BG1_Y
ldr r2, _0800F950 @ =0x0000ffdc
adds r1, r2, 0
strh r1, [r0]
ldr r0, _0800F954 @ =gUnknown_202297E
ldr r0, _0800F954 @ =gBattle_BG2_Y
strh r1, [r0]
b _0800F9C4
.align 2, 0
_0800F944: .4byte gUnknown_2022978
_0800F948: .4byte gUnknown_202297C
_0800F94C: .4byte gUnknown_202297A
_0800F944: .4byte gBattle_BG1_X
_0800F948: .4byte gBattle_BG2_X
_0800F94C: .4byte gBattle_BG1_Y
_0800F950: .4byte 0x0000ffdc
_0800F954: .4byte gUnknown_202297E
_0800F954: .4byte gBattle_BG2_Y
_0800F958:
ldr r4, _0800F9E8 @ =gUnknown_2022978
ldr r4, _0800F9E8 @ =gBattle_BG1_X
ldrh r0, [r5, 0xA]
bl Sin2
lsls r0, 16
@@ -967,7 +967,7 @@ _0800F96A:
adds r0, r3, 0
subs r0, r1
strh r0, [r4]
ldr r4, _0800F9EC @ =gUnknown_202297A
ldr r4, _0800F9EC @ =gBattle_BG1_Y
ldrh r0, [r5, 0xA]
bl Cos2
lsls r0, 16
@@ -979,7 +979,7 @@ _0800F988:
asrs r0, 5
subs r0, 0xA4
strh r0, [r4]
ldr r4, _0800F9F0 @ =gUnknown_202297C
ldr r4, _0800F9F0 @ =gBattle_BG2_X
ldrh r0, [r5, 0xC]
bl Sin2
lsls r0, 16
@@ -994,7 +994,7 @@ _0800F9A0:
adds r0, r2, 0
subs r0, r1
strh r0, [r4]
ldr r4, _0800F9F4 @ =gUnknown_202297E
ldr r4, _0800F9F4 @ =gBattle_BG2_Y
ldrh r0, [r5, 0xC]
bl Cos2
lsls r0, 16
@@ -1025,10 +1025,10 @@ _0800F9C4:
strh r0, [r1, 0xA]
b _0800FAC4
.align 2, 0
_0800F9E8: .4byte gUnknown_2022978
_0800F9EC: .4byte gUnknown_202297A
_0800F9F0: .4byte gUnknown_202297C
_0800F9F4: .4byte gUnknown_202297E
_0800F9E8: .4byte gBattle_BG1_X
_0800F9EC: .4byte gBattle_BG1_Y
_0800F9F0: .4byte gBattle_BG2_X
_0800F9F4: .4byte gBattle_BG2_Y
_0800F9F8: .4byte gTasks
_0800F9FC:
movs r3, 0x12
@@ -1190,11 +1190,11 @@ sub_800FAE0: @ 800FAE0
movs r0, 0x4A
movs r1, 0x36
bl SetGpuReg
ldr r0, _0800FB84 @ =gUnknown_202297A
ldr r0, _0800FB84 @ =gBattle_BG1_Y
ldr r2, _0800FB88 @ =0x0000ff5c
adds r1, r2, 0
strh r1, [r0]
ldr r0, _0800FB8C @ =gUnknown_202297E
ldr r0, _0800FB8C @ =gBattle_BG2_Y
strh r1, [r0]
ldr r0, _0800FB90 @ =gUnknown_8248318
bl sub_800F034
@@ -1208,9 +1208,9 @@ _0800FB74: .4byte 0x06010000
_0800FB78: .4byte gFile_graphics_battle_transitions_vs_frame_palette
_0800FB7C: .4byte 0x00005c04
_0800FB80: .4byte gFile_graphics_battle_transitions_vs_frame_tilemap
_0800FB84: .4byte gUnknown_202297A
_0800FB84: .4byte gBattle_BG1_Y
_0800FB88: .4byte 0x0000ff5c
_0800FB8C: .4byte gUnknown_202297E
_0800FB8C: .4byte gBattle_BG2_Y
_0800FB90: .4byte gUnknown_8248318
_0800FB94:
movs r0, 0x80
@@ -1385,13 +1385,13 @@ _0800FCD0:
.4byte _0800FD68
.4byte _0800FD8C
_0800FCEC:
ldr r0, _0800FCF8 @ =gUnknown_8D00000
ldr r0, _0800FCF8 @ =gBattleTextboxTiles
movs r1, 0xC0
lsls r1, 19
bl LZDecompressVram
b _0800FD94
.align 2, 0
_0800FCF8: .4byte gUnknown_8D00000
_0800FCF8: .4byte gBattleTextboxTiles
_0800FCFC:
ldr r1, _0800FD10 @ =gFile_graphics_interface_menu_map_tilemap
movs r0, 0
@@ -1404,13 +1404,13 @@ _0800FCFC:
.align 2, 0
_0800FD10: .4byte gFile_graphics_interface_menu_map_tilemap
_0800FD14:
ldr r0, _0800FD20 @ =gUnknown_8D004D8
ldr r0, _0800FD20 @ =gBattleTextboxPalette
movs r1, 0
movs r2, 0x40
bl LoadCompressedPalette
b _0800FD94
.align 2, 0
_0800FD20: .4byte gUnknown_8D004D8
_0800FD20: .4byte gBattleTextboxPalette
_0800FD24:
bl sub_800FC2C
lsls r0, 24
asm/battle_2.s
+126 -126
View File
@@ -45,11 +45,11 @@ _0800FDD8:
cmp r1, 0
beq _0800FDFE
movs r0, 0x19
bl sub_812B1F0
bl HelpSystem_SetSomeVariable2
b _0800FE1C
_0800FDFE:
movs r0, 0x18
bl sub_812B1F0
bl HelpSystem_SetSomeVariable2
b _0800FE1C
_0800FE06:
movs r0, 0x80
@@ -57,11 +57,11 @@ _0800FE06:
cmp r1, 0
beq _0800FE16
movs r0, 0x1A
bl sub_812B1F0
bl HelpSystem_SetSomeVariable2
b _0800FE1C
_0800FE16:
movs r0, 0x17
bl sub_812B1F0
bl HelpSystem_SetSomeVariable2
_0800FE1C:
pop {r4}
pop {r0}
@@ -104,8 +104,8 @@ sub_800FE24: @ 800FE24
strh r0, [r1]
ldr r0, _0800FF34 @ =gUnknown_2022986
strh r4, [r0]
bl dp12_8087EA4
ldr r0, _0800FF38 @ =gUnknown_2038700
bl ScanlineEffect_Clear
ldr r0, _0800FF38 @ =gScanlineEffectRegBuffers
movs r3, 0xF0
movs r1, 0xF0
lsls r1, 3
@@ -121,7 +121,7 @@ _0800FE88:
bge _0800FE88
movs r1, 0x50
ldr r4, _0800FF3C @ =gUnknown_824EFE4
ldr r0, _0800FF38 @ =gUnknown_2038700
ldr r0, _0800FF38 @ =gScanlineEffectRegBuffers
ldr r3, _0800FF40 @ =0x0000ff10
movs r5, 0x82
lsls r5, 4
@@ -138,24 +138,24 @@ _0800FEA6:
ldr r0, [r4]
ldr r1, [r4, 0x4]
ldr r2, [r4, 0x8]
bl sub_8087EE4
bl ScanlineEffect_SetParams
bl ResetPaletteFade
ldr r0, _0800FF44 @ =gUnknown_2022974
ldr r0, _0800FF44 @ =gBattle_BG0_X
movs r1, 0
strh r1, [r0]
ldr r0, _0800FF48 @ =gUnknown_2022976
ldr r0, _0800FF48 @ =gBattle_BG0_Y
strh r1, [r0]
ldr r0, _0800FF4C @ =gUnknown_2022978
ldr r0, _0800FF4C @ =gBattle_BG1_X
strh r1, [r0]
ldr r0, _0800FF50 @ =gUnknown_202297A
ldr r0, _0800FF50 @ =gBattle_BG1_Y
strh r1, [r0]
ldr r0, _0800FF54 @ =gUnknown_202297C
ldr r0, _0800FF54 @ =gBattle_BG2_X
strh r1, [r0]
ldr r0, _0800FF58 @ =gUnknown_202297E
ldr r0, _0800FF58 @ =gBattle_BG2_Y
strh r1, [r0]
ldr r0, _0800FF5C @ =gUnknown_2022980
ldr r0, _0800FF5C @ =gBattle_BG3_X
strh r1, [r0]
ldr r0, _0800FF60 @ =gUnknown_2022982
ldr r0, _0800FF60 @ =gBattle_BG3_Y
strh r1, [r0]
bl sub_807FC5C
ldr r1, _0800FF64 @ =gUnknown_2022B50
@@ -186,17 +186,17 @@ _0800FF28: .4byte 0x05006000
_0800FF2C: .4byte 0x00005051
_0800FF30: .4byte gUnknown_2022984
_0800FF34: .4byte gUnknown_2022986
_0800FF38: .4byte gUnknown_2038700
_0800FF38: .4byte gScanlineEffectRegBuffers
_0800FF3C: .4byte gUnknown_824EFE4
_0800FF40: .4byte 0x0000ff10
_0800FF44: .4byte gUnknown_2022974
_0800FF48: .4byte gUnknown_2022976
_0800FF4C: .4byte gUnknown_2022978
_0800FF50: .4byte gUnknown_202297A
_0800FF54: .4byte gUnknown_202297C
_0800FF58: .4byte gUnknown_202297E
_0800FF5C: .4byte gUnknown_2022980
_0800FF60: .4byte gUnknown_2022982
_0800FF44: .4byte gBattle_BG0_X
_0800FF48: .4byte gBattle_BG0_Y
_0800FF4C: .4byte gBattle_BG1_X
_0800FF50: .4byte gBattle_BG1_Y
_0800FF54: .4byte gBattle_BG2_X
_0800FF58: .4byte gBattle_BG2_Y
_0800FF5C: .4byte gBattle_BG3_X
_0800FF60: .4byte gBattle_BG3_Y
_0800FF64: .4byte gUnknown_2022B50
_0800FF68: .4byte gReservedSpritePaletteCount
_0800FF6C: .4byte sub_80116F4
@@ -1645,7 +1645,7 @@ _08010B2A:
ldrb r0, [r0]
cmp r0, 0
beq _08010B64
bl sub_80FA4F8
bl IsNoOneConnected
lsls r0, 24
cmp r0, 0
beq _08010B82
@@ -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
@@ -2410,7 +2410,7 @@ FreeRestoreBattleData: @ 8011174
ldr r0, _080111B0 @ =gUnknown_3004F80
ldr r0, [r0]
str r0, [r1]
ldr r2, _080111B4 @ =gUnknown_2039600
ldr r2, _080111B4 @ =gScanlineEffect
movs r0, 0x3
strb r0, [r2, 0x15]
ldr r0, _080111B8 @ =0x00000439
@@ -2431,7 +2431,7 @@ FreeRestoreBattleData: @ 8011174
.align 2, 0
_080111AC: .4byte gMain
_080111B0: .4byte gUnknown_3004F80
_080111B4: .4byte gUnknown_2039600
_080111B4: .4byte gScanlineEffect
_080111B8: .4byte 0x00000439
thumb_func_end FreeRestoreBattleData
@@ -3125,35 +3125,35 @@ _080116F0: .4byte 0x04000008
sub_80116F4: @ 80116F4
push {lr}
bl Random
ldr r0, _08011788 @ =gUnknown_2022974
ldr r0, _08011788 @ =gBattle_BG0_X
ldrh r1, [r0]
movs r0, 0x10
bl SetGpuReg
ldr r0, _0801178C @ =gUnknown_2022976
ldr r0, _0801178C @ =gBattle_BG0_Y
ldrh r1, [r0]
movs r0, 0x12
bl SetGpuReg
ldr r0, _08011790 @ =gUnknown_2022978
ldr r0, _08011790 @ =gBattle_BG1_X
ldrh r1, [r0]
movs r0, 0x14
bl SetGpuReg
ldr r0, _08011794 @ =gUnknown_202297A
ldr r0, _08011794 @ =gBattle_BG1_Y
ldrh r1, [r0]
movs r0, 0x16
bl SetGpuReg
ldr r0, _08011798 @ =gUnknown_202297C
ldr r0, _08011798 @ =gBattle_BG2_X
ldrh r1, [r0]
movs r0, 0x18
bl SetGpuReg
ldr r0, _0801179C @ =gUnknown_202297E
ldr r0, _0801179C @ =gBattle_BG2_Y
ldrh r1, [r0]
movs r0, 0x1A
bl SetGpuReg
ldr r0, _080117A0 @ =gUnknown_2022980
ldr r0, _080117A0 @ =gBattle_BG3_X
ldrh r1, [r0]
movs r0, 0x1C
bl SetGpuReg
ldr r0, _080117A4 @ =gUnknown_2022982
ldr r0, _080117A4 @ =gBattle_BG3_Y
ldrh r1, [r0]
movs r0, 0x1E
bl SetGpuReg
@@ -3176,18 +3176,18 @@ sub_80116F4: @ 80116F4
bl LoadOam
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
bl sub_8087F54
bl ScanlineEffect_InitHBlankDmaTransfer
pop {r0}
bx r0
.align 2, 0
_08011788: .4byte gUnknown_2022974
_0801178C: .4byte gUnknown_2022976
_08011790: .4byte gUnknown_2022978
_08011794: .4byte gUnknown_202297A
_08011798: .4byte gUnknown_202297C
_0801179C: .4byte gUnknown_202297E
_080117A0: .4byte gUnknown_2022980
_080117A4: .4byte gUnknown_2022982
_08011788: .4byte gBattle_BG0_X
_0801178C: .4byte gBattle_BG0_Y
_08011790: .4byte gBattle_BG1_X
_08011794: .4byte gBattle_BG1_Y
_08011798: .4byte gBattle_BG2_X
_0801179C: .4byte gBattle_BG2_Y
_080117A0: .4byte gBattle_BG3_X
_080117A4: .4byte gBattle_BG3_Y
_080117A8: .4byte gUnknown_2022984
_080117AC: .4byte gUnknown_2022986
_080117B0: .4byte gUnknown_2022988
@@ -3548,8 +3548,8 @@ sub_8011A1C: @ 8011A1C
strh r0, [r1]
ldr r0, _08011B4C @ =gUnknown_2022986
strh r4, [r0]
bl dp12_8087EA4
ldr r0, _08011B50 @ =gUnknown_2038700
bl ScanlineEffect_Clear
ldr r0, _08011B50 @ =gScanlineEffectRegBuffers
movs r3, 0xF0
movs r1, 0xF0
lsls r1, 3
@@ -3564,7 +3564,7 @@ _08011A80:
cmp r1, 0
bge _08011A80
movs r1, 0x50
ldr r0, _08011B50 @ =gUnknown_2038700
ldr r0, _08011B50 @ =gScanlineEffectRegBuffers
ldr r3, _08011B54 @ =0x0000ff10
movs r4, 0x82
lsls r4, 4
@@ -3579,25 +3579,25 @@ _08011A9C:
cmp r1, 0x9F
ble _08011A9C
bl ResetPaletteFade
ldr r0, _08011B58 @ =gUnknown_2022974
ldr r0, _08011B58 @ =gBattle_BG0_X
movs r4, 0
strh r4, [r0]
ldr r0, _08011B5C @ =gUnknown_2022976
ldr r0, _08011B5C @ =gBattle_BG0_Y
strh r4, [r0]
ldr r0, _08011B60 @ =gUnknown_2022978
ldr r0, _08011B60 @ =gBattle_BG1_X
strh r4, [r0]
ldr r0, _08011B64 @ =gUnknown_202297A
ldr r0, _08011B64 @ =gBattle_BG1_Y
strh r4, [r0]
ldr r0, _08011B68 @ =gUnknown_202297C
ldr r0, _08011B68 @ =gBattle_BG2_X
strh r4, [r0]
ldr r0, _08011B6C @ =gUnknown_202297E
ldr r0, _08011B6C @ =gBattle_BG2_Y
strh r4, [r0]
ldr r0, _08011B70 @ =gUnknown_2022980
ldr r0, _08011B70 @ =gBattle_BG3_X
strh r4, [r0]
ldr r0, _08011B74 @ =gUnknown_2022982
ldr r0, _08011B74 @ =gBattle_BG3_Y
strh r4, [r0]
bl sub_800F34C
ldr r0, _08011B78 @ =gUnknown_8D004D8
ldr r0, _08011B78 @ =gBattleTextboxPalette
movs r1, 0
movs r2, 0x40
bl LoadCompressedPalette
@@ -3645,17 +3645,17 @@ _08011B40: .4byte 0x05006000
_08011B44: .4byte 0x00005051
_08011B48: .4byte gUnknown_2022984
_08011B4C: .4byte gUnknown_2022986
_08011B50: .4byte gUnknown_2038700
_08011B50: .4byte gScanlineEffectRegBuffers
_08011B54: .4byte 0x0000ff10
_08011B58: .4byte gUnknown_2022974
_08011B5C: .4byte gUnknown_2022976
_08011B60: .4byte gUnknown_2022978
_08011B64: .4byte gUnknown_202297A
_08011B68: .4byte gUnknown_202297C
_08011B6C: .4byte gUnknown_202297E
_08011B70: .4byte gUnknown_2022980
_08011B74: .4byte gUnknown_2022982
_08011B78: .4byte gUnknown_8D004D8
_08011B58: .4byte gBattle_BG0_X
_08011B5C: .4byte gBattle_BG0_Y
_08011B60: .4byte gBattle_BG1_X
_08011B64: .4byte gBattle_BG1_Y
_08011B68: .4byte gBattle_BG2_X
_08011B6C: .4byte gBattle_BG2_Y
_08011B70: .4byte gBattle_BG3_X
_08011B74: .4byte gBattle_BG3_Y
_08011B78: .4byte gBattleTextboxPalette
_08011B7C: .4byte gReservedSpritePaletteCount
_08011B80: .4byte sub_80116F4
_08011B84: .4byte sub_800F6FC
@@ -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
@@ -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
@@ -12610,10 +12610,10 @@ sub_8016374: @ 8016374
adds r0, r1
ldrb r0, [r0]
strb r0, [r3]
ldr r0, _080163EC @ =gUnknown_2022974
ldr r0, _080163EC @ =gBattle_BG0_X
movs r2, 0
strh r2, [r0]
ldr r0, _080163F0 @ =gUnknown_2022976
ldr r0, _080163F0 @ =gBattle_BG0_Y
strh r2, [r0]
ldr r1, _080163F4 @ =gUnknown_2023FF8
ldrb r0, [r3]
@@ -12661,8 +12661,8 @@ _080163DA:
_080163E0: .4byte sBattler_AI
_080163E4: .4byte gUnknown_2023BDE
_080163E8: .4byte gUnknown_2023BE2
_080163EC: .4byte gUnknown_2022974
_080163F0: .4byte gUnknown_2022976
_080163EC: .4byte gBattle_BG0_X
_080163F0: .4byte gBattle_BG0_Y
_080163F4: .4byte gUnknown_2023FF8
_080163F8: .4byte gUnknown_2023FFC
_080163FC: .4byte gBattleTextBuff1
@@ -12690,10 +12690,10 @@ sub_8016418: @ 8016418
ldrb r0, [r0]
strb r0, [r2]
strb r0, [r4]
ldr r0, _08016484 @ =gUnknown_2022974
ldr r0, _08016484 @ =gBattle_BG0_X
movs r1, 0
strh r1, [r0]
ldr r0, _08016488 @ =gUnknown_2022976
ldr r0, _08016488 @ =gBattle_BG0_Y
strh r1, [r0]
ldrb r0, [r4]
bl ClearFuryCutterDestinyBondGrudge
@@ -12726,8 +12726,8 @@ _08016474: .4byte sBattler_AI
_08016478: .4byte gBattlerTarget
_0801647C: .4byte gUnknown_2023BDE
_08016480: .4byte gUnknown_2023BE2
_08016484: .4byte gUnknown_2022974
_08016488: .4byte gUnknown_2022976
_08016484: .4byte gBattle_BG0_X
_08016488: .4byte gBattle_BG0_Y
_0801648C: .4byte gUnknown_2023D68
_08016490: .4byte gUnknown_20233C4
_08016494: .4byte gUnknown_2023D74
@@ -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
@@ -13391,10 +13391,10 @@ sub_80169E8: @ 80169E8
adds r0, r1
ldrb r0, [r0]
strb r0, [r2]
ldr r0, _08016A50 @ =gUnknown_2022974
ldr r0, _08016A50 @ =gBattle_BG0_X
movs r5, 0
strh r5, [r0]
ldr r0, _08016A54 @ =gUnknown_2022976
ldr r0, _08016A54 @ =gBattle_BG0_Y
strh r5, [r0]
ldr r4, _08016A58 @ =gBattleStruct
ldr r1, [r4]
@@ -13431,8 +13431,8 @@ sub_80169E8: @ 80169E8
_08016A44: .4byte sBattler_AI
_08016A48: .4byte gUnknown_2023BDE
_08016A4C: .4byte gUnknown_2023BE2
_08016A50: .4byte gUnknown_2022974
_08016A54: .4byte gUnknown_2022976
_08016A50: .4byte gBattle_BG0_X
_08016A54: .4byte gBattle_BG0_Y
_08016A58: .4byte gBattleStruct
_08016A5C: .4byte gEnemyParty
_08016A60: .4byte gBaseStats
@@ -13492,10 +13492,10 @@ sub_8016AC0: @ 8016AC0
adds r0, r1
ldrb r0, [r0]
strb r0, [r2]
ldr r0, _08016B04 @ =gUnknown_2022974
ldr r0, _08016B04 @ =gBattle_BG0_X
movs r1, 0
strh r1, [r0]
ldr r0, _08016B08 @ =gUnknown_2022976
ldr r0, _08016B08 @ =gBattle_BG0_Y
strh r1, [r0]
ldr r1, _08016B0C @ =gUnknown_2039994
ldrb r0, [r1]
@@ -13516,8 +13516,8 @@ sub_8016AC0: @ 8016AC0
_08016AF8: .4byte sBattler_AI
_08016AFC: .4byte gUnknown_2023BDE
_08016B00: .4byte gUnknown_2023BE2
_08016B04: .4byte gUnknown_2022974
_08016B08: .4byte gUnknown_2022976
_08016B04: .4byte gBattle_BG0_X
_08016B08: .4byte gBattle_BG0_Y
_08016B0C: .4byte gUnknown_2039994
_08016B10: .4byte gUnknown_2023D68
_08016B14: .4byte gUnknown_2023D74
@@ -13535,10 +13535,10 @@ sub_8016B20: @ 8016B20
adds r0, r1
ldrb r0, [r0]
strb r0, [r2]
ldr r0, _08016BA8 @ =gUnknown_2022974
ldr r0, _08016BA8 @ =gBattle_BG0_X
movs r7, 0
strh r7, [r0]
ldr r0, _08016BAC @ =gUnknown_2022976
ldr r0, _08016BAC @ =gBattle_BG0_Y
strh r7, [r0]
bl Random
ldr r6, _08016BB0 @ =gBattleStruct
@@ -13592,8 +13592,8 @@ _08016B86:
_08016B9C: .4byte sBattler_AI
_08016BA0: .4byte gUnknown_2023BDE
_08016BA4: .4byte gUnknown_2023BE2
_08016BA8: .4byte gUnknown_2022974
_08016BAC: .4byte gUnknown_2022976
_08016BA8: .4byte gBattle_BG0_X
_08016BAC: .4byte gBattle_BG0_Y
_08016BB0: .4byte gBattleStruct
_08016BB4: .4byte gUnknown_2023D74
_08016BB8: .4byte gUnknown_81D9A04
@@ -13610,10 +13610,10 @@ sub_8016BC0: @ 8016BC0
adds r0, r1
ldrb r0, [r0]
strb r0, [r2]
ldr r0, _08016C48 @ =gUnknown_2022974
ldr r0, _08016C48 @ =gBattle_BG0_X
movs r7, 0
strh r7, [r0]
ldr r0, _08016C4C @ =gUnknown_2022976
ldr r0, _08016C4C @ =gBattle_BG0_Y
strh r7, [r0]
bl Random
ldr r6, _08016C50 @ =gBattleStruct
@@ -13667,8 +13667,8 @@ _08016C26:
_08016C3C: .4byte sBattler_AI
_08016C40: .4byte gUnknown_2023BDE
_08016C44: .4byte gUnknown_2023BE2
_08016C48: .4byte gUnknown_2022974
_08016C4C: .4byte gUnknown_2022976
_08016C48: .4byte gBattle_BG0_X
_08016C4C: .4byte gBattle_BG0_Y
_08016C50: .4byte gBattleStruct
_08016C54: .4byte gUnknown_2023D74
_08016C58: .4byte gUnknown_81D9A04
@@ -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
@@ -13713,10 +13713,10 @@ HandleAction_Action9: @ 8016C9C
adds r0, r1
ldrb r2, [r0]
strb r2, [r3]
ldr r0, _08016CF4 @ =gUnknown_2022974
ldr r0, _08016CF4 @ =gBattle_BG0_X
movs r1, 0
strh r1, [r0]
ldr r0, _08016CF8 @ =gUnknown_2022976
ldr r0, _08016CF8 @ =gBattle_BG0_Y
strh r1, [r0]
ldr r1, _08016CFC @ =gBattleTextBuff1
movs r0, 0xFD
@@ -13747,8 +13747,8 @@ HandleAction_Action9: @ 8016C9C
_08016CE8: .4byte sBattler_AI
_08016CEC: .4byte gUnknown_2023BDE
_08016CF0: .4byte gUnknown_2023BE2
_08016CF4: .4byte gUnknown_2022974
_08016CF8: .4byte gUnknown_2022976
_08016CF4: .4byte gBattle_BG0_X
_08016CF8: .4byte gBattle_BG0_Y
_08016CFC: .4byte gBattleTextBuff1
_08016D00: .4byte gBattlerPartyIndexes
_08016D04: .4byte gUnknown_2023D74
asm/battle_anim.s
+137 -137
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
@@ -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
@@ -1037,24 +1037,24 @@ _08072C88:
strh r1, [r2, 0xC]
cmp r7, 0
bne _08072CF4
ldr r0, _08072CEC @ =gUnknown_2022978
ldr r0, _08072CEC @ =gBattle_BG1_X
ldrh r0, [r0]
strh r0, [r2, 0xE]
ldr r0, _08072CF0 @ =gUnknown_202297A
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
_08072CEC: .4byte gUnknown_2022978
_08072CF0: .4byte gUnknown_202297A
_08072CEC: .4byte gBattle_BG1_X
_08072CF0: .4byte gBattle_BG1_Y
_08072CF4:
ldr r0, _08072D8C @ =gUnknown_202297C
ldr r0, _08072D8C @ =gBattle_BG2_X
ldrh r0, [r0]
strh r0, [r2, 0xE]
ldr r0, _08072D90 @ =gUnknown_202297E
ldr r0, _08072D90 @ =gBattle_BG2_Y
_08072CFC:
ldrh r0, [r0]
strh r0, [r2, 0x10]
@@ -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
@@ -1121,26 +1121,26 @@ _08072D3E:
strh r1, [r2, 0xC]
cmp r7, 0
bne _08072DB0
ldr r0, _08072DA8 @ =gUnknown_2022978
ldr r0, _08072DA8 @ =gBattle_BG1_X
ldrh r0, [r0]
strh r0, [r2, 0xE]
ldr r0, _08072DAC @ =gUnknown_202297A
ldr r0, _08072DAC @ =gBattle_BG1_Y
b _08072DB8
.align 2, 0
_08072D8C: .4byte gUnknown_202297C
_08072D90: .4byte gUnknown_202297E
_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 gUnknown_2022978
_08072DAC: .4byte gUnknown_202297A
_08072DA8: .4byte gBattle_BG1_X
_08072DAC: .4byte gBattle_BG1_Y
_08072DB0:
ldr r0, _08072DDC @ =gUnknown_202297C
ldr r0, _08072DDC @ =gBattle_BG2_X
ldrh r0, [r0]
strh r0, [r2, 0xE]
ldr r0, _08072DE0 @ =gUnknown_202297E
ldr r0, _08072DE0 @ =gBattle_BG2_Y
_08072DB8:
ldrh r0, [r0]
strh r0, [r2, 0x10]
@@ -1162,8 +1162,8 @@ _08072DCE:
pop {r0}
bx r0
.align 2, 0
_08072DDC: .4byte gUnknown_202297C
_08072DE0: .4byte gUnknown_202297E
_08072DDC: .4byte gBattle_BG2_X
_08072DE0: .4byte gBattle_BG2_Y
_08072DE4: .4byte gTasks
_08072DE8: .4byte gUnknown_2037F14
_08072DEC: .4byte gUnknown_2037ED4
@@ -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,10 +1268,10 @@ _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 @ =gUnknown_2022978
ldr r5, _08072F70 @ =gBattle_BG1_X
ldr r3, _08072F74 @ =gSprites
lsls r1, r0, 4
adds r1, r0
@@ -1283,7 +1283,7 @@ _08072E5E:
negs r0, r0
adds r0, 0x20
strh r0, [r5]
ldr r4, _08072F78 @ =gUnknown_202297A
ldr r4, _08072F78 @ =gBattle_BG1_Y
ldrh r0, [r1, 0x26]
ldrh r1, [r1, 0x22]
adds r0, r1
@@ -1349,10 +1349,10 @@ _08072F5C: .4byte 0x06004000
_08072F60: .4byte 0x0600e000
_08072F64: .4byte 0x01000800
_08072F68: .4byte 0x01000400
_08072F6C: .4byte gUnknown_2023D44
_08072F70: .4byte gUnknown_2022978
_08072F6C: .4byte gBattlerSpriteIds
_08072F70: .4byte gBattle_BG1_X
_08072F74: .4byte gSprites
_08072F78: .4byte gUnknown_202297A
_08072F78: .4byte gBattle_BG1_Y
_08072F7C: .4byte gPlttBufferUnfaded + 0x200
_08072F80: .4byte 0x04000008
_08072F84:
@@ -1401,10 +1401,10 @@ _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 @ =gUnknown_202297C
ldr r5, _080730A8 @ =gBattle_BG2_X
ldr r3, _080730AC @ =gSprites
lsls r1, r0, 4
adds r1, r0
@@ -1416,7 +1416,7 @@ _08072F84:
negs r0, r0
adds r0, 0x20
strh r0, [r5]
ldr r4, _080730B0 @ =gUnknown_202297E
ldr r4, _080730B0 @ =gBattle_BG2_Y
ldrh r0, [r1, 0x26]
ldrh r1, [r1, 0x22]
adds r0, r1
@@ -1483,10 +1483,10 @@ _08073094: .4byte 0x06006000
_08073098: .4byte 0x0600f000
_0807309C: .4byte 0x01000800
_080730A0: .4byte 0x01000400
_080730A4: .4byte gUnknown_2023D44
_080730A8: .4byte gUnknown_202297C
_080730A4: .4byte gBattlerSpriteIds
_080730A8: .4byte gBattle_BG2_X
_080730AC: .4byte gSprites
_080730B0: .4byte gUnknown_202297E
_080730B0: .4byte gBattle_BG2_Y
_080730B4: .4byte gPlttBufferUnfaded + 0x200
_080730B8: .4byte 0x05000120
_080730BC: .4byte 0x04000008
@@ -1563,21 +1563,21 @@ sub_8073128: @ 8073128
bne _08073154
movs r0, 0x1
bl sub_8075358
ldr r0, _0807314C @ =gUnknown_2022978
ldr r0, _0807314C @ =gBattle_BG1_X
strh r4, [r0]
ldr r0, _08073150 @ =gUnknown_202297A
ldr r0, _08073150 @ =gBattle_BG1_Y
strh r4, [r0]
b _08073164
.align 2, 0
_0807314C: .4byte gUnknown_2022978
_08073150: .4byte gUnknown_202297A
_0807314C: .4byte gBattle_BG1_X
_08073150: .4byte gBattle_BG1_Y
_08073154:
movs r0, 0x2
bl sub_8075358
ldr r0, _0807316C @ =gUnknown_202297C
ldr r0, _0807316C @ =gBattle_BG2_X
movs r1, 0
strh r1, [r0]
ldr r0, _08073170 @ =gUnknown_202297E
ldr r0, _08073170 @ =gBattle_BG2_Y
strh r1, [r0]
_08073164:
add sp, 0x10
@@ -1585,8 +1585,8 @@ _08073164:
pop {r0}
bx r0
.align 2, 0
_0807316C: .4byte gUnknown_202297C
_08073170: .4byte gUnknown_202297E
_0807316C: .4byte gBattle_BG2_X
_08073170: .4byte gBattle_BG2_Y
thumb_func_end sub_8073128
thumb_func_start task_pA_ma0A_obj_to_bg_pal
@@ -1627,13 +1627,13 @@ task_pA_ma0A_obj_to_bg_pal: @ 8073174
ldrsh r0, [r5, r1]
cmp r0, 0
bne _0807320C
ldr r1, _080731F8 @ =gUnknown_2022978
ldr r1, _080731F8 @ =gBattle_BG1_X
lsls r0, r3, 16
asrs r0, 16
ldrh r3, [r5, 0xE]
adds r0, r3
strh r0, [r1]
ldr r1, _080731FC @ =gUnknown_202297A
ldr r1, _080731FC @ =gBattle_BG1_Y
lsls r0, r2, 16
asrs r0, 16
ldrh r5, [r5, 0x10]
@@ -1654,19 +1654,19 @@ task_pA_ma0A_obj_to_bg_pal: @ 8073174
.align 2, 0
_080731F0: .4byte gTasks
_080731F4: .4byte gSprites
_080731F8: .4byte gUnknown_2022978
_080731FC: .4byte gUnknown_202297A
_080731F8: .4byte gBattle_BG1_X
_080731FC: .4byte gBattle_BG1_Y
_08073200: .4byte gPlttBufferFaded + 0x200
_08073204: .4byte 0xfffffe00
_08073208: .4byte 0x04000008
_0807320C:
ldr r1, _0807323C @ =gUnknown_202297C
ldr r1, _0807323C @ =gBattle_BG2_X
lsls r0, r3, 16
asrs r0, 16
ldrh r3, [r5, 0xE]
adds r0, r3
strh r0, [r1]
ldr r1, _08073240 @ =gUnknown_202297E
ldr r1, _08073240 @ =gBattle_BG2_Y
lsls r0, r2, 16
asrs r0, 16
ldrh r5, [r5, 0x10]
@@ -1684,8 +1684,8 @@ _08073232:
pop {r0}
bx r0
.align 2, 0
_0807323C: .4byte gUnknown_202297C
_08073240: .4byte gUnknown_202297E
_0807323C: .4byte gBattle_BG2_X
_08073240: .4byte gBattle_BG2_Y
_08073244: .4byte gPlttBufferFaded + 0x200
_08073248: .4byte 0x04000008
thumb_func_end task_pA_ma0A_obj_to_bg_pal
@@ -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
+415 -415
View File
File diff suppressed because it is too large Load Diff
asm/battle_anim_8074480.s → asm/battle_anim_mons.s
+129 -129
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
@@ -5050,7 +5050,7 @@ _0807694E:
beq _080769C4
_0807699A:
lsls r0, r6, 3
ldr r1, _080769C0 @ =gUnknown_82350AC
ldr r1, _080769C0 @ =gMonFrontPicTable
adds r0, r1
ldr r1, _080769B8 @ =gMonSpritesGfxPtr
ldr r1, [r1]
@@ -5065,10 +5065,10 @@ _080769B0: .4byte gUnknown_83AE084
_080769B4: .4byte gUnknown_83AE054
_080769B8: .4byte gMonSpritesGfxPtr
_080769BC: .4byte gUnknown_2024018
_080769C0: .4byte gUnknown_82350AC
_080769C0: .4byte gMonFrontPicTable
_080769C4:
lsls r0, r6, 3
ldr r1, _080769E4 @ =gUnknown_82350AC
ldr r1, _080769E4 @ =gMonFrontPicTable
adds r0, r1
ldr r1, _080769E8 @ =gMonSpritesGfxPtr
ldr r1, [r1]
@@ -5080,10 +5080,10 @@ _080769C4:
str r2, [sp]
adds r2, r6, 0
mov r3, r8
bl sub_800ECF0
bl LoadSpecialPokePic
b _08076A7C
.align 2, 0
_080769E4: .4byte gUnknown_82350AC
_080769E4: .4byte gMonFrontPicTable
_080769E8: .4byte gMonSpritesGfxPtr
_080769EC:
adds r0, r6, 0
@@ -5120,7 +5120,7 @@ _080769EC:
beq _08076A60
_08076A32:
lsls r0, r6, 3
ldr r1, _08076A58 @ =gUnknown_823654C
ldr r1, _08076A58 @ =gMonBackPicTable
adds r0, r1
ldr r1, _08076A5C @ =gMonSpritesGfxPtr
ldr r1, [r1]
@@ -5137,11 +5137,11 @@ _08076A46:
b _08076A7C
.align 2, 0
_08076A54: .4byte gUnknown_2024018
_08076A58: .4byte gUnknown_823654C
_08076A58: .4byte gMonBackPicTable
_08076A5C: .4byte gMonSpritesGfxPtr
_08076A60:
lsls r0, r6, 3
ldr r1, _08076AC8 @ =gUnknown_823654C
ldr r1, _08076AC8 @ =gMonBackPicTable
adds r0, r1
ldr r1, _08076ACC @ =gMonSpritesGfxPtr
ldr r1, [r1]
@@ -5152,7 +5152,7 @@ _08076A60:
str r2, [sp]
adds r2, r6, 0
mov r3, r8
bl sub_800ECF0
bl LoadSpecialPokePic
_08076A7C:
ldr r5, _08076ACC @ =gMonSpritesGfxPtr
ldr r0, [r5]
@@ -5190,7 +5190,7 @@ _08076A7C:
ldr r3, _08076AD8 @ =gUnknown_82349CC
b _08076AEE
.align 2, 0
_08076AC8: .4byte gUnknown_823654C
_08076AC8: .4byte gMonBackPicTable
_08076ACC: .4byte gMonSpritesGfxPtr
_08076AD0: .4byte 0x06010000
_08076AD4: .4byte gUnknown_83AE054
@@ -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
@@ -168,12 +168,12 @@ sub_80EEC0C: @ 80EEC0C
lsls r1, 4
movs r2, 0x20
bl LoadCompressedPalette
ldr r1, _080EEDE4 @ =gUnknown_2022978
ldr r1, _080EEDE4 @ =gBattle_BG1_X
ldrh r0, [r7, 0x20]
negs r0, r0
adds r0, 0x20
strh r0, [r1]
ldr r1, _080EEDE8 @ =gUnknown_202297A
ldr r1, _080EEDE8 @ =gBattle_BG1_Y
ldrh r0, [r7, 0x22]
negs r0, r0
subs r0, 0x20
@@ -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
@@ -215,8 +215,8 @@ _080EEDD4: .4byte SpriteCallbackDummy
_080EEDD8: .4byte gFile_graphics_battle_anims_masks_unknown_D2EC24_tilemap
_080EEDDC: .4byte gFile_graphics_battle_anims_masks_unknown_D2EC24_sheet
_080EEDE0: .4byte gFile_graphics_battle_anims_masks_cure_bubbles_palette
_080EEDE4: .4byte gUnknown_2022978
_080EEDE8: .4byte gUnknown_202297A
_080EEDE4: .4byte gBattle_BG1_X
_080EEDE8: .4byte gBattle_BG1_Y
_080EEDEC: .4byte gTasks
_080EEDF0: .4byte sub_80EEDF4
thumb_func_end sub_80EEC0C
@@ -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
@@ -241,7 +241,7 @@ sub_80EEDF4: @ 80EEDF4
adds r1, r0
movs r3, 0
strh r1, [r5, 0x22]
ldr r2, _080EEE44 @ =gUnknown_202297A
ldr r2, _080EEE44 @ =gBattle_BG1_Y
lsls r0, r1, 16
lsrs r0, 24
ldrh r4, [r2]
@@ -260,9 +260,9 @@ sub_80EEDF4: @ 80EEDF4
beq _080EEE4E
b _080EEFA8
.align 2, 0
_080EEE3C: .4byte gUnknown_2037F1A
_080EEE3C: .4byte gBattleAnimAttacker
_080EEE40: .4byte gTasks
_080EEE44: .4byte gUnknown_202297A
_080EEE44: .4byte gBattle_BG1_Y
_080EEE48:
cmp r0, 0x2
beq _080EEE9C
@@ -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
@@ -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
@@ -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
+10 -10
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
@@ -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
+50 -50
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
@@ -3576,7 +3576,7 @@ LinkOpponentHandleLoadPokeSprite: @ 803C3B4
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_803F7D4
bl SetMultiuseSpriteTemplateToPokemon
ldr r0, _0803C4E8 @ =gMultiuseSpriteTemplate
mov r8, r0
ldrb r0, [r6]
@@ -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
@@ -3780,7 +3780,7 @@ sub_803C550: @ 803C550
lsls r1, 24
lsrs r1, 24
mov r0, r8
bl sub_803F7D4
bl SetMultiuseSpriteTemplateToPokemon
ldr r0, _0803C6C0 @ =gMultiuseSpriteTemplate
mov r9, r0
adds r0, r6, 0
@@ -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
@@ -4302,7 +4302,7 @@ _0803C992:
adds r0, r4
movs r1, 0x2
strh r1, [r0, 0x2E]
ldr r0, _0803CAE4 @ =gUnknown_8239A1C
ldr r0, _0803CAE4 @ =gTrainerFrontPicPaletteTable
mov r1, r9
lsls r6, r1, 3
adds r0, r6, r0
@@ -4334,7 +4334,7 @@ _0803C992:
lsls r0, 22
lsrs r0, 22
strh r0, [r1, 0x38]
ldr r0, _0803CAE8 @ =gUnknown_823957C
ldr r0, _0803CAE8 @ =gTrainerFrontPicTable
adds r6, r0
ldrh r0, [r6, 0x6]
bl GetSpriteTileStartByTag
@@ -4392,11 +4392,11 @@ _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 gUnknown_8239A1C
_0803CAE8: .4byte gUnknown_823957C
_0803CAE4: .4byte gTrainerFrontPicPaletteTable
_0803CAE8: .4byte gTrainerFrontPicTable
_0803CAEC: .4byte 0x000003ff
_0803CAF0: .4byte 0xfffffc00
_0803CAF4: .4byte sub_8033EEC
@@ -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
@@ -4952,10 +4952,10 @@ _0803CF40:
thumb_func_start sub_803CF50
sub_803CF50: @ 803CF50
push {r4,lr}
ldr r0, _0803CF84 @ =gUnknown_2022974
ldr r0, _0803CF84 @ =gBattle_BG0_X
movs r1, 0
strh r1, [r0]
ldr r0, _0803CF88 @ =gUnknown_2022976
ldr r0, _0803CF88 @ =gBattle_BG0_Y
strh r1, [r0]
ldr r0, _0803CF8C @ =gActiveBattler
ldrb r4, [r0]
@@ -4974,8 +4974,8 @@ sub_803CF50: @ 803CF50
bl sub_80D87BC
b _0803CFA0
.align 2, 0
_0803CF84: .4byte gUnknown_2022974
_0803CF88: .4byte gUnknown_2022976
_0803CF84: .4byte gBattle_BG0_X
_0803CF88: .4byte gBattle_BG0_Y
_0803CF8C: .4byte gActiveBattler
_0803CF90: .4byte gUnknown_2022BC6
_0803CF94: .4byte gDisplayedStringBattle
@@ -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
+46 -46
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
@@ -3370,7 +3370,7 @@ LinkPartnerHandleLoadPokeSprite: @ 80D5DB4
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_803F7D4
bl SetMultiuseSpriteTemplateToPokemon
ldr r0, _080D5EB4 @ =gMultiuseSpriteTemplate
mov r8, r0
ldrb r0, [r6]
@@ -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
@@ -3562,7 +3562,7 @@ sub_80D5F40: @ 80D5F40
lsls r1, 24
lsrs r1, 24
mov r0, r8
bl sub_803F7D4
bl SetMultiuseSpriteTemplateToPokemon
ldr r0, _080D6098 @ =gMultiuseSpriteTemplate
mov r10, r0
adds r0, r6, 0
@@ -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
@@ -4573,10 +4573,10 @@ _080D67BC:
thumb_func_start sub_80D67CC
sub_80D67CC: @ 80D67CC
push {r4,lr}
ldr r0, _080D6800 @ =gUnknown_2022974
ldr r0, _080D6800 @ =gBattle_BG0_X
movs r1, 0
strh r1, [r0]
ldr r0, _080D6804 @ =gUnknown_2022976
ldr r0, _080D6804 @ =gBattle_BG0_Y
strh r1, [r0]
ldr r0, _080D6808 @ =gActiveBattler
ldrb r4, [r0]
@@ -4595,8 +4595,8 @@ sub_80D67CC: @ 80D67CC
bl sub_80D87BC
b _080D681C
.align 2, 0
_080D6800: .4byte gUnknown_2022974
_080D6804: .4byte gUnknown_2022976
_080D6800: .4byte gBattle_BG0_X
_080D6804: .4byte gBattle_BG0_Y
_080D6808: .4byte gActiveBattler
_080D680C: .4byte gUnknown_2022BC6
_080D6810: .4byte gDisplayedStringBattle
@@ -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
+50 -50
View File
@@ -308,7 +308,7 @@ _080E77AC:
bhi _080E7838
adds r0, r5, 0
movs r1, 0x1
bl sub_809A084
bl AddBagItem
_080E780A:
movs r0, 0x5
bl PlaySE
@@ -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
@@ -5776,10 +5776,10 @@ _080EA520:
thumb_func_start sub_80EA52C
sub_80EA52C: @ 80EA52C
push {r4,lr}
ldr r0, _080EA55C @ =gUnknown_2022974
ldr r0, _080EA55C @ =gBattle_BG0_X
movs r1, 0
strh r1, [r0]
ldr r0, _080EA560 @ =gUnknown_2022976
ldr r0, _080EA560 @ =gBattle_BG0_Y
strh r1, [r0]
ldr r0, _080EA564 @ =gActiveBattler
ldrb r0, [r0]
@@ -5799,8 +5799,8 @@ sub_80EA52C: @ 80EA52C
bl WallyBufferExecCompleted
b _080EA65A
.align 2, 0
_080EA55C: .4byte gUnknown_2022974
_080EA560: .4byte gUnknown_2022976
_080EA55C: .4byte gBattle_BG0_X
_080EA560: .4byte gBattle_BG0_Y
_080EA564: .4byte gActiveBattler
_080EA568: .4byte gUnknown_2022BC6
_080EA56C: .4byte gBattleTypeFlags
@@ -5951,9 +5951,9 @@ sub_80EA690: @ 80EA690
lsrs r1, r0, 24
cmp r1, 0
bne _080EA6EA
ldr r0, _080EA6C4 @ =gUnknown_2022974
ldr r0, _080EA6C4 @ =gBattle_BG0_X
strh r1, [r0]
ldr r1, _080EA6C8 @ =gUnknown_2022976
ldr r1, _080EA6C8 @ =gBattle_BG0_Y
movs r0, 0xA0
strh r0, [r1]
ldr r0, _080EA6CC @ =gBattleTypeFlags
@@ -5970,8 +5970,8 @@ sub_80EA690: @ 80EA690
ldr r1, _080EA6D8 @ =sub_80E763C
b _080EA6E8
.align 2, 0
_080EA6C4: .4byte gUnknown_2022974
_080EA6C8: .4byte gUnknown_2022976
_080EA6C4: .4byte gBattle_BG0_X
_080EA6C8: .4byte gBattle_BG0_Y
_080EA6CC: .4byte gBattleTypeFlags
_080EA6D0: .4byte gUnknown_3004FE0
_080EA6D4: .4byte gActiveBattler
@@ -6074,9 +6074,9 @@ sub_80EA798: @ 80EA798
lsrs r1, r0, 24
cmp r1, 0
bne _080EA7C2
ldr r0, _080EA7C8 @ =gUnknown_2022974
ldr r0, _080EA7C8 @ =gBattle_BG0_X
strh r1, [r0]
ldr r1, _080EA7CC @ =gUnknown_2022976
ldr r1, _080EA7CC @ =gBattle_BG0_Y
movs r2, 0xA0
lsls r2, 1
adds r0, r2, 0
@@ -6092,8 +6092,8 @@ _080EA7C2:
pop {r0}
bx r0
.align 2, 0
_080EA7C8: .4byte gUnknown_2022974
_080EA7CC: .4byte gUnknown_2022976
_080EA7C8: .4byte gBattle_BG0_X
_080EA7CC: .4byte gBattle_BG0_Y
_080EA7D0: .4byte gUnknown_3004FE0
_080EA7D4: .4byte gActiveBattler
_080EA7D8: .4byte sub_80E7988
@@ -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
@@ -7071,7 +7071,7 @@ sub_80EAF34: @ 80EAF34
lsls r1, 24
lsrs r1, 24
mov r0, r8
bl sub_803F7D4
bl SetMultiuseSpriteTemplateToPokemon
ldr r0, _080EB094 @ =gMultiuseSpriteTemplate
mov r10, r0
adds r0, r6, 0
@@ -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
+54 -54
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
@@ -3649,7 +3649,7 @@ _080378AA:
lsls r1, 24
lsrs r1, 24
mov r0, r8
bl sub_803F7D4
bl SetMultiuseSpriteTemplateToPokemon
ldr r6, _080379A0 @ =gMultiuseSpriteTemplate
ldrb r0, [r7]
movs r1, 0x2
@@ -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
@@ -3872,7 +3872,7 @@ sub_8037A28: @ 8037A28
lsls r1, 24
lsrs r1, 24
mov r0, r8
bl sub_803F7D4
bl SetMultiuseSpriteTemplateToPokemon
ldr r0, _08037B98 @ =gMultiuseSpriteTemplate
mov r9, r0
adds r0, r6, 0
@@ -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
@@ -4251,7 +4251,7 @@ _08037D3A:
adds r0, r4
movs r1, 0x2
strh r1, [r0, 0x2E]
ldr r0, _08037E88 @ =gUnknown_8239A1C
ldr r0, _08037E88 @ =gTrainerFrontPicPaletteTable
mov r1, r9
lsls r6, r1, 3
adds r0, r6, r0
@@ -4283,7 +4283,7 @@ _08037D3A:
lsls r0, 22
lsrs r0, 22
strh r0, [r1, 0x38]
ldr r0, _08037E8C @ =gUnknown_823957C
ldr r0, _08037E8C @ =gTrainerFrontPicTable
adds r6, r0
ldrh r0, [r6, 0x6]
bl GetSpriteTileStartByTag
@@ -4341,11 +4341,11 @@ _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 gUnknown_8239A1C
_08037E8C: .4byte gUnknown_823957C
_08037E88: .4byte gTrainerFrontPicPaletteTable
_08037E8C: .4byte gTrainerFrontPicTable
_08037E90: .4byte 0x000003ff
_08037E94: .4byte 0xfffffc00
_08037E98: .4byte sub_8033EEC
@@ -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
@@ -4473,7 +4473,7 @@ _08037F0E:
adds r0, r4
ldr r1, _08038058 @ =0x0000fffe
strh r1, [r0, 0x2E]
ldr r0, _0803805C @ =gUnknown_8239A1C
ldr r0, _0803805C @ =gTrainerFrontPicPaletteTable
mov r3, r9
lsls r6, r3, 3
adds r0, r6, r0
@@ -4505,7 +4505,7 @@ _08037F0E:
lsls r0, 22
lsrs r0, 22
strh r0, [r1, 0x38]
ldr r0, _08038060 @ =gUnknown_823957C
ldr r0, _08038060 @ =gTrainerFrontPicTable
adds r6, r0
ldrh r0, [r6, 0x6]
bl GetSpriteTileStartByTag
@@ -4561,11 +4561,11 @@ _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 gUnknown_8239A1C
_08038060: .4byte gUnknown_823957C
_0803805C: .4byte gTrainerFrontPicPaletteTable
_08038060: .4byte gTrainerFrontPicTable
_08038064: .4byte 0x000003ff
_08038068: .4byte 0xfffffc00
_0803806C: .4byte sub_8033EEC
@@ -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
@@ -5113,10 +5113,10 @@ _080384AC:
thumb_func_start sub_80384BC
sub_80384BC: @ 80384BC
push {r4,lr}
ldr r0, _080384F0 @ =gUnknown_2022974
ldr r0, _080384F0 @ =gBattle_BG0_X
movs r1, 0
strh r1, [r0]
ldr r0, _080384F4 @ =gUnknown_2022976
ldr r0, _080384F4 @ =gBattle_BG0_Y
strh r1, [r0]
ldr r0, _080384F8 @ =gActiveBattler
ldrb r0, [r0]
@@ -5135,8 +5135,8 @@ sub_80384BC: @ 80384BC
bl sub_80D87BC
b _0803850C
.align 2, 0
_080384F0: .4byte gUnknown_2022974
_080384F4: .4byte gUnknown_2022976
_080384F0: .4byte gBattle_BG0_X
_080384F4: .4byte gBattle_BG0_Y
_080384F8: .4byte gActiveBattler
_080384FC: .4byte gUnknown_2022BC6
_08038500: .4byte gDisplayedStringBattle
@@ -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
+94 -94
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
@@ -381,7 +381,7 @@ _0802E5A8:
bhi _0802E634
adds r0, r5, 0
movs r1, 0x1
bl sub_809A084
bl AddBagItem
_0802E606:
movs r0, 0x5
bl PlaySE
@@ -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
@@ -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
@@ -1354,10 +1354,10 @@ _0802EDF6:
beq _0802EE18
movs r0, 0x5
bl PlaySE
ldr r1, _0802EF44 @ =gUnknown_2022974
ldr r1, _0802EF44 @ =gBattle_BG0_X
movs r0, 0
strh r0, [r1]
ldr r1, _0802EF48 @ =gUnknown_2022976
ldr r1, _0802EF48 @ =gBattle_BG0_Y
movs r2, 0xA0
lsls r2, 1
adds r0, r2, 0
@@ -1505,8 +1505,8 @@ _0802EF36:
bx r1
.align 2, 0
_0802EF40: .4byte gMain
_0802EF44: .4byte gUnknown_2022974
_0802EF48: .4byte gUnknown_2022976
_0802EF44: .4byte gBattle_BG0_X
_0802EF48: .4byte gBattle_BG0_Y
_0802EF4C: .4byte gUnknown_2023FFC
_0802EF50: .4byte gActiveBattler
_0802EF54: .4byte gUnknown_3004FF8
@@ -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
@@ -4051,19 +4051,19 @@ _08030428:
bne _0803051C
cmp r6, 0
bne _0803044C
ldr r1, _08030444 @ =gUnknown_2022978
ldr r1, _08030444 @ =gBattle_BG1_X
ldrh r0, [r1]
strh r0, [r5, 0x1C]
ldr r2, _08030448 @ =gUnknown_202297A
ldr r2, _08030448 @ =gBattle_BG1_Y
b _08030454
.align 2, 0
_08030444: .4byte gUnknown_2022978
_08030448: .4byte gUnknown_202297A
_08030444: .4byte gBattle_BG1_X
_08030448: .4byte gBattle_BG1_Y
_0803044C:
ldr r1, _08030474 @ =gUnknown_202297C
ldr r1, _08030474 @ =gBattle_BG2_X
ldrh r0, [r1]
strh r0, [r5, 0x1C]
ldr r2, _08030478 @ =gUnknown_202297E
ldr r2, _08030478 @ =gBattle_BG2_Y
_08030454:
ldrh r0, [r2]
strh r0, [r5, 0x1A]
@@ -4081,8 +4081,8 @@ _08030454:
strh r0, [r2]
b _080304E0
.align 2, 0
_08030474: .4byte gUnknown_202297C
_08030478: .4byte gUnknown_202297E
_08030474: .4byte gBattle_BG2_X
_08030478: .4byte gBattle_BG2_Y
_0803047C:
adds r0, r7, 0
adds r1, r6, 0
@@ -4138,19 +4138,19 @@ _080304E0:
_080304E8:
cmp r6, 0
bne _08030500
ldr r1, _080304F8 @ =gUnknown_2022978
ldr r1, _080304F8 @ =gBattle_BG1_X
ldrh r0, [r5, 0x1C]
strh r0, [r1]
ldr r1, _080304FC @ =gUnknown_202297A
ldr r1, _080304FC @ =gBattle_BG1_Y
b _08030508
.align 2, 0
_080304F8: .4byte gUnknown_2022978
_080304FC: .4byte gUnknown_202297A
_080304F8: .4byte gBattle_BG1_X
_080304FC: .4byte gBattle_BG1_Y
_08030500:
ldr r1, _08030528 @ =gUnknown_202297C
ldr r1, _08030528 @ =gBattle_BG2_X
ldrh r0, [r5, 0x1C]
strh r0, [r1]
ldr r1, _0803052C @ =gUnknown_202297E
ldr r1, _0803052C @ =gBattle_BG2_Y
_08030508:
ldrh r0, [r5, 0x1A]
strh r0, [r1]
@@ -4169,8 +4169,8 @@ _0803051C:
pop {r0}
bx r0
.align 2, 0
_08030528: .4byte gUnknown_202297C
_0803052C: .4byte gUnknown_202297E
_08030528: .4byte gBattle_BG2_X
_0803052C: .4byte gBattle_BG2_Y
_08030530: .4byte gUnknown_3004FE0
_08030534: .4byte sub_802FE94
thumb_func_end sub_80303A8
@@ -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
@@ -4964,10 +4964,10 @@ PrintLinkStandbyMsg: @ 8030B5C
ands r0, r1
cmp r0, 0
beq _08030B7C
ldr r0, _08030B84 @ =gUnknown_2022974
ldr r0, _08030B84 @ =gBattle_BG0_X
movs r1, 0
strh r1, [r0]
ldr r0, _08030B88 @ =gUnknown_2022976
ldr r0, _08030B88 @ =gBattle_BG0_Y
strh r1, [r0]
ldr r0, _08030B8C @ =gUnknown_83FE714
movs r1, 0
@@ -4977,8 +4977,8 @@ _08030B7C:
bx r0
.align 2, 0
_08030B80: .4byte gBattleTypeFlags
_08030B84: .4byte gUnknown_2022974
_08030B88: .4byte gUnknown_2022976
_08030B84: .4byte gBattle_BG0_X
_08030B88: .4byte gBattle_BG0_Y
_08030B8C: .4byte gUnknown_83FE714
thumb_func_end PrintLinkStandbyMsg
@@ -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
@@ -7442,7 +7442,7 @@ sub_8031FF4: @ 8031FF4
lsls r1, 24
lsrs r1, 24
mov r0, r8
bl sub_803F7D4
bl SetMultiuseSpriteTemplateToPokemon
ldr r0, _0803214C @ =gMultiuseSpriteTemplate
mov r10, r0
adds r0, r6, 0
@@ -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
@@ -8747,10 +8747,10 @@ _08032AEC:
thumb_func_start sub_8032AFC
sub_8032AFC: @ 8032AFC
push {r4,lr}
ldr r0, _08032B30 @ =gUnknown_2022974
ldr r0, _08032B30 @ =gBattle_BG0_X
movs r1, 0
strh r1, [r0]
ldr r0, _08032B34 @ =gUnknown_2022976
ldr r0, _08032B34 @ =gBattle_BG0_Y
strh r1, [r0]
ldr r0, _08032B38 @ =gActiveBattler
ldrb r4, [r0]
@@ -8769,8 +8769,8 @@ sub_8032AFC: @ 8032AFC
bl sub_80D87BC
b _08032B4C
.align 2, 0
_08032B30: .4byte gUnknown_2022974
_08032B34: .4byte gUnknown_2022976
_08032B30: .4byte gBattle_BG0_X
_08032B34: .4byte gBattle_BG0_Y
_08032B38: .4byte gActiveBattler
_08032B3C: .4byte gUnknown_2022BC6
_08032B40: .4byte gDisplayedStringBattle
@@ -8824,9 +8824,9 @@ sub_8032B94: @ 8032B94
lsrs r1, r0, 24
cmp r1, 0
bne _08032BBA
ldr r0, _08032BC0 @ =gUnknown_2022974
ldr r0, _08032BC0 @ =gBattle_BG0_X
strh r1, [r0]
ldr r1, _08032BC4 @ =gUnknown_2022976
ldr r1, _08032BC4 @ =gBattle_BG0_Y
movs r0, 0xA0
strh r0, [r1]
ldr r1, _08032BC8 @ =gUnknown_3004FE0
@@ -8840,8 +8840,8 @@ _08032BBA:
pop {r0}
bx r0
.align 2, 0
_08032BC0: .4byte gUnknown_2022974
_08032BC4: .4byte gUnknown_2022976
_08032BC0: .4byte gBattle_BG0_X
_08032BC4: .4byte gBattle_BG0_Y
_08032BC8: .4byte gUnknown_3004FE0
_08032BCC: .4byte gActiveBattler
_08032BD0: .4byte sub_802E438
@@ -8910,9 +8910,9 @@ sub_8032C4C: @ 8032C4C
lsrs r1, r0, 24
cmp r1, 0
bne _08032C76
ldr r0, _08032C7C @ =gUnknown_2022974
ldr r0, _08032C7C @ =gBattle_BG0_X
strh r1, [r0]
ldr r1, _08032C80 @ =gUnknown_2022976
ldr r1, _08032C80 @ =gBattle_BG0_Y
movs r2, 0xA0
lsls r2, 1
adds r0, r2, 0
@@ -8928,8 +8928,8 @@ _08032C76:
pop {r0}
bx r0
.align 2, 0
_08032C7C: .4byte gUnknown_2022974
_08032C80: .4byte gUnknown_2022976
_08032C7C: .4byte gBattle_BG0_X
_08032C80: .4byte gBattle_BG0_Y
_08032C84: .4byte gUnknown_3004FE0
_08032C88: .4byte gActiveBattler
_08032C8C: .4byte sub_802EA10
@@ -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
+64 -64
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
@@ -3932,7 +3932,7 @@ sub_81580E0: @ 81580E0
lsls r1, 24
lsrs r1, 24
mov r0, r8
bl sub_803F7D4
bl SetMultiuseSpriteTemplateToPokemon
ldr r0, _08158220 @ =gMultiuseSpriteTemplate
mov r9, r0
ldrb r0, [r6]
@@ -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]
@@ -4304,7 +4304,7 @@ _081583F0:
adds r0, r4
movs r1, 0x2
strh r1, [r0, 0x2E]
ldr r0, _08158524 @ =gUnknown_8239A1C
ldr r0, _08158524 @ =gTrainerFrontPicPaletteTable
mov r1, r8
lsls r6, r1, 3
adds r0, r6
@@ -4334,7 +4334,7 @@ _081583F0:
lsls r0, 22
lsrs r0, 22
strh r0, [r1, 0x38]
ldr r0, _08158528 @ =gUnknown_823957C
ldr r0, _08158528 @ =gTrainerFrontPicTable
adds r0, r6
ldrh r0, [r0, 0x6]
bl GetSpriteTileStartByTag
@@ -4387,11 +4387,11 @@ _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 gUnknown_8239A1C
_08158528: .4byte gUnknown_823957C
_08158524: .4byte gTrainerFrontPicPaletteTable
_08158528: .4byte gTrainerFrontPicTable
_0815852C: .4byte 0x000003ff
_08158530: .4byte 0xfffffc00
_08158534: .4byte sub_8033EEC
@@ -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
@@ -5055,10 +5055,10 @@ _08158A7C:
thumb_func_start sub_8158A88
sub_8158A88: @ 8158A88
push {r4,lr}
ldr r0, _08158ABC @ =gUnknown_2022974
ldr r0, _08158ABC @ =gBattle_BG0_X
movs r1, 0
strh r1, [r0]
ldr r0, _08158AC0 @ =gUnknown_2022976
ldr r0, _08158AC0 @ =gBattle_BG0_Y
strh r1, [r0]
ldr r0, _08158AC4 @ =gActiveBattler
ldrb r4, [r0]
@@ -5077,8 +5077,8 @@ sub_8158A88: @ 8158A88
bl sub_80D87BC
b _08158AD8
.align 2, 0
_08158ABC: .4byte gUnknown_2022974
_08158AC0: .4byte gUnknown_2022976
_08158ABC: .4byte gBattle_BG0_X
_08158AC0: .4byte gBattle_BG0_Y
_08158AC4: .4byte gActiveBattler
_08158AC8: .4byte gUnknown_2022BC6
_08158ACC: .4byte gDisplayedStringBattle
@@ -5132,9 +5132,9 @@ sub_8158B20: @ 8158B20
lsrs r1, r0, 24
cmp r1, 0
bne _08158B46
ldr r0, _08158B4C @ =gUnknown_2022974
ldr r0, _08158B4C @ =gBattle_BG0_X
strh r1, [r0]
ldr r1, _08158B50 @ =gUnknown_2022976
ldr r1, _08158B50 @ =gBattle_BG0_Y
movs r0, 0xA0
strh r0, [r1]
ldr r1, _08158B54 @ =gUnknown_3004FE0
@@ -5148,8 +5148,8 @@ _08158B46:
pop {r0}
bx r0
.align 2, 0
_08158B4C: .4byte gUnknown_2022974
_08158B50: .4byte gUnknown_2022976
_08158B4C: .4byte gBattle_BG0_X
_08158B50: .4byte gBattle_BG0_Y
_08158B54: .4byte gUnknown_3004FE0
_08158B58: .4byte gActiveBattler
_08158B5C: .4byte sub_8156140
@@ -5238,9 +5238,9 @@ sub_8158C04: @ 8158C04
lsrs r1, r0, 24
cmp r1, 0
bne _08158C2E
ldr r0, _08158C34 @ =gUnknown_2022974
ldr r0, _08158C34 @ =gBattle_BG0_X
strh r1, [r0]
ldr r1, _08158C38 @ =gUnknown_2022976
ldr r1, _08158C38 @ =gBattle_BG0_Y
movs r2, 0xA0
lsls r2, 1
adds r0, r2, 0
@@ -5256,8 +5256,8 @@ _08158C2E:
pop {r0}
bx r0
.align 2, 0
_08158C34: .4byte gUnknown_2022974
_08158C38: .4byte gUnknown_2022976
_08158C34: .4byte gBattle_BG0_X
_08158C38: .4byte gBattle_BG0_Y
_08158C3C: .4byte gUnknown_3004FE0
_08158C40: .4byte gActiveBattler
_08158C44: .4byte sub_81564E4
@@ -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
@@ -6336,7 +6336,7 @@ sub_8159478: @ 8159478
lsls r1, 24
lsrs r1, 24
mov r0, r8
bl sub_803F7D4
bl SetMultiuseSpriteTemplateToPokemon
ldr r0, _081595D8 @ =gMultiuseSpriteTemplate
mov r10, r0
adds r0, r6, 0
@@ -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
@@ -7250,7 +7250,7 @@ _08159C14:
lsls r0, 2
adds r0, r5
ldr r1, [r0]
ldr r0, _08159C40 @ =gUnknown_2022976
ldr r0, _08159C40 @ =gBattle_BG0_Y
ldrh r0, [r0]
strb r0, [r1, 0x4]
bl sub_80EB30C
@@ -7260,9 +7260,9 @@ _08159C14:
b _08159C9E
.align 2, 0
_08159C3C: .4byte gPaletteFade
_08159C40: .4byte gUnknown_2022976
_08159C40: .4byte gBattle_BG0_Y
_08159C44:
ldr r1, _08159C5C @ =gUnknown_2022976
ldr r1, _08159C5C @ =gBattle_BG0_Y
movs r0, 0
strh r0, [r1]
bl sub_8159EF0
@@ -7272,7 +7272,7 @@ _08159C44:
bl sub_80D87BC
b _08159C94
.align 2, 0
_08159C5C: .4byte gUnknown_2022976
_08159C5C: .4byte gBattle_BG0_Y
_08159C60: .4byte gDisplayedStringBattle
_08159C64:
movs r0, 0x18
@@ -7331,7 +7331,7 @@ _08159CB4:
ldr r0, _08159CFC @ =0x00000137
bl PlayBGM
_08159CD8:
ldr r1, _08159D00 @ =gUnknown_2022976
ldr r1, _08159D00 @ =gBattle_BG0_Y
ldrb r0, [r4]
lsls r0, 2
adds r0, r5
@@ -7348,7 +7348,7 @@ _08159CEE:
.align 2, 0
_08159CF8: .4byte gPaletteFade
_08159CFC: .4byte 0x00000137
_08159D00: .4byte gUnknown_2022976
_08159D00: .4byte gBattle_BG0_Y
thumb_func_end sub_8159BA8
thumb_func_start sub_8159D04
asm/battle_controller_safari.s
+14 -14
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
@@ -849,10 +849,10 @@ sub_80DDB94: @ 80DDB94
thumb_func_start sub_80DDBA0
sub_80DDBA0: @ 80DDBA0
push {r4,lr}
ldr r0, _080DDBD4 @ =gUnknown_2022974
ldr r0, _080DDBD4 @ =gBattle_BG0_X
movs r1, 0
strh r1, [r0]
ldr r0, _080DDBD8 @ =gUnknown_2022976
ldr r0, _080DDBD8 @ =gBattle_BG0_Y
strh r1, [r0]
ldr r0, _080DDBDC @ =gActiveBattler
ldrb r4, [r0]
@@ -871,8 +871,8 @@ sub_80DDBA0: @ 80DDBA0
bl sub_80D87BC
b _080DDBF0
.align 2, 0
_080DDBD4: .4byte gUnknown_2022974
_080DDBD8: .4byte gUnknown_2022976
_080DDBD4: .4byte gBattle_BG0_X
_080DDBD8: .4byte gBattle_BG0_Y
_080DDBDC: .4byte gActiveBattler
_080DDBE0: .4byte gUnknown_2022BC6
_080DDBE4: .4byte gDisplayedStringBattle
@@ -926,9 +926,9 @@ sub_80DDC38: @ 80DDC38
lsrs r1, r0, 24
cmp r1, 0
bne _080DDC5E
ldr r0, _080DDC64 @ =gUnknown_2022974
ldr r0, _080DDC64 @ =gBattle_BG0_X
strh r1, [r0]
ldr r1, _080DDC68 @ =gUnknown_2022976
ldr r1, _080DDC68 @ =gBattle_BG0_Y
movs r0, 0xA0
strh r0, [r1]
ldr r1, _080DDC6C @ =gUnknown_3004FE0
@@ -942,8 +942,8 @@ _080DDC5E:
pop {r0}
bx r0
.align 2, 0
_080DDC64: .4byte gUnknown_2022974
_080DDC68: .4byte gUnknown_2022976
_080DDC64: .4byte gBattle_BG0_X
_080DDC68: .4byte gBattle_BG0_Y
_080DDC6C: .4byte gUnknown_3004FE0
_080DDC70: .4byte gActiveBattler
_080DDC74: .4byte HandleInputChooseAction_0
@@ -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_dome_cards.s
-1102
View File
File diff suppressed because it is too large Load Diff
asm/battle_gfx_sfx_util.s
+44 -44
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
@@ -756,7 +756,7 @@ _0803436C:
bl GetBattlerPosition
lsls r0, 24
lsls r2, r5, 3
ldr r1, _080343C4 @ =gUnknown_82350AC
ldr r1, _080343C4 @ =gMonFrontPicTable
adds r2, r1
ldr r1, _080343C8 @ =gMonSpritesGfxPtr
ldr r1, [r1]
@@ -788,7 +788,7 @@ _0803436C:
b _080343DA
.align 2, 0
_080343C0: .4byte gUnknown_2024008
_080343C4: .4byte gUnknown_82350AC
_080343C4: .4byte gMonFrontPicTable
_080343C8: .4byte gMonSpritesGfxPtr
_080343CC: .4byte gUnknown_2024018
_080343D0:
@@ -946,7 +946,7 @@ _080344E4:
beq _08034548
_0803451C:
lsls r0, r5, 3
ldr r1, _08034540 @ =gUnknown_823654C
ldr r1, _08034540 @ =gMonBackPicTable
adds r0, r1
ldr r1, _08034544 @ =gMonSpritesGfxPtr
ldr r1, [r1]
@@ -961,11 +961,11 @@ _0803451C:
.align 2, 0
_08034538: .4byte gUnknown_2024008
_0803453C: .4byte gUnknown_2024018
_08034540: .4byte gUnknown_823654C
_08034540: .4byte gMonBackPicTable
_08034544: .4byte gMonSpritesGfxPtr
_08034548:
lsls r0, r5, 3
ldr r1, _08034584 @ =gUnknown_823654C
ldr r1, _08034584 @ =gMonBackPicTable
adds r0, r1
ldr r1, _08034588 @ =gMonSpritesGfxPtr
ldr r1, [r1]
@@ -994,7 +994,7 @@ _08034562:
bl GetMonFrontSpritePal
b _0803459A
.align 2, 0
_08034584: .4byte gUnknown_823654C
_08034584: .4byte gMonBackPicTable
_08034588: .4byte gMonSpritesGfxPtr
_0803458C: .4byte gUnknown_2024018
_08034590:
@@ -1149,7 +1149,7 @@ sub_80346C4: @ 80346C4
adds r4, r0, 0
lsls r4, 24
lsls r5, 3
ldr r6, _0803473C @ =gUnknown_823957C
ldr r6, _0803473C @ =gTrainerFrontPicTable
adds r6, r5, r6
ldr r0, _08034740 @ =gMonSpritesGfxPtr
mov r8, r0
@@ -1181,7 +1181,7 @@ sub_80346C4: @ 80346C4
str r0, [sp, 0x4]
mov r0, sp
bl LoadSpriteSheet
ldr r0, _0803474C @ =gUnknown_8239A1C
ldr r0, _0803474C @ =gTrainerFrontPicPaletteTable
adds r5, r0
adds r0, r5, 0
bl sub_800F078
@@ -1192,11 +1192,11 @@ sub_80346C4: @ 80346C4
pop {r0}
bx r0
.align 2, 0
_0803473C: .4byte gUnknown_823957C
_0803473C: .4byte gTrainerFrontPicTable
_08034740: .4byte gMonSpritesGfxPtr
_08034744: .4byte 0xffff0000
_08034748: .4byte 0x0000ffff
_0803474C: .4byte gUnknown_8239A1C
_0803474C: .4byte gTrainerFrontPicPaletteTable
thumb_func_end sub_80346C4
thumb_func_start sub_8034750
@@ -1231,12 +1231,12 @@ sub_803477C: @ 803477C
push {r4,lr}
adds r4, r0, 0
lsls r4, 16
ldr r0, _080347A0 @ =gUnknown_8239A1C
ldr r0, _080347A0 @ =gTrainerFrontPicPaletteTable
lsrs r4, 13
adds r0, r4, r0
ldrh r0, [r0, 0x4]
bl FreeSpritePaletteByTag
ldr r0, _080347A4 @ =gUnknown_823957C
ldr r0, _080347A4 @ =gTrainerFrontPicTable
adds r4, r0
ldrh r0, [r4, 0x6]
bl FreeSpriteTilesByTag
@@ -1244,8 +1244,8 @@ sub_803477C: @ 803477C
pop {r0}
bx r0
.align 2, 0
_080347A0: .4byte gUnknown_8239A1C
_080347A4: .4byte gUnknown_823957C
_080347A0: .4byte gTrainerFrontPicPaletteTable
_080347A4: .4byte gTrainerFrontPicTable
thumb_func_end sub_803477C
thumb_func_start sub_80347A8
@@ -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
@@ -1852,7 +1852,7 @@ _08034C16:
adds r7, r0, 0
mov r1, r8
lsls r0, r1, 3
ldr r1, _08034D60 @ =gUnknown_82350AC
ldr r1, _08034D60 @ =gMonFrontPicTable
adds r0, r1
ldr r4, _08034D64 @ =gMonSpritesGfxPtr
ldr r1, [r4]
@@ -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
@@ -1961,10 +1961,10 @@ _08034C16:
.align 2, 0
_08034D58: .4byte gBattlerPartyIndexes
_08034D5C: .4byte gEnemyParty
_08034D60: .4byte gUnknown_82350AC
_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
@@ -2122,7 +2122,7 @@ _08034E90:
adds r7, r0, 0
mov r2, r8
lsls r0, r2, 3
ldr r1, _08034F04 @ =gUnknown_823654C
ldr r1, _08034F04 @ =gMonBackPicTable
adds r0, r1
ldr r1, _08034F08 @ =gMonSpritesGfxPtr
ldr r1, [r1]
@@ -2142,7 +2142,7 @@ _08034E90:
.align 2, 0
_08034EFC: .4byte gBattlerPartyIndexes
_08034F00: .4byte gPlayerParty
_08034F04: .4byte gUnknown_823654C
_08034F04: .4byte gMonBackPicTable
_08034F08: .4byte gMonSpritesGfxPtr
_08034F0C: .4byte gUnknown_2024008
_08034F10:
@@ -2166,7 +2166,7 @@ _08034F10:
adds r7, r0, 0
mov r2, r8
lsls r0, r2, 3
ldr r1, _0803507C @ =gUnknown_82350AC
ldr r1, _0803507C @ =gMonFrontPicTable
adds r0, r1
ldr r1, _08035080 @ =gMonSpritesGfxPtr
ldr r1, [r1]
@@ -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]
@@ -2315,10 +2315,10 @@ _08035062:
.align 2, 0
_08035074: .4byte gBattlerPartyIndexes
_08035078: .4byte gEnemyParty
_0803507C: .4byte gUnknown_82350AC
_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]
@@ -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
+1 -1
View File
@@ -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
+4 -4
View File
@@ -1604,7 +1604,7 @@ _080D7F9C:
ldrh r0, [r0]
_080D7FA0:
mov r1, sp
bl sub_8099E90
bl CopyItemName
mov r4, sp
b _080D8382
.align 2, 0
@@ -2495,12 +2495,12 @@ _080D8698: .4byte gUnknown_83FD8A2
_080D869C:
adds r0, r2, 0
adds r1, r6, 0
bl sub_8099E90
bl CopyItemName
b _080D86AE
_080D86A6:
adds r0, r2, 0
adds r1, r6, 0
bl sub_8099E90
bl CopyItemName
_080D86AE:
adds r5, 0x3
_080D86B0:
@@ -2863,7 +2863,7 @@ _080D894A:
movs r3, 0x1
b _080D8960
_080D8958:
bl sub_80F78A8
bl GetTextSpeedSetting
lsls r0, 24
lsrs r3, r0, 24
_080D8960:
asm/battle_records.s
+12 -12
View File
@@ -471,10 +471,10 @@ _080CD604: .4byte 0x81000800
thumb_func_start sub_80CD608
sub_80CD608: @ 80CD608
push {lr}
bl remove_some_task
bl ScanlineEffect_Stop
bl ResetTasks
bl ResetSpriteData
bl dp13_810BB8C
bl ResetAllPicSprites
bl ResetPaletteFade
bl FreeAllSpritePalettes
pop {r0}
@@ -925,7 +925,7 @@ _080CD94C: .4byte 0x0000270f
sub_80CD950: @ 80CD950
push {r4,lr}
adds r4, r0, 0
ldr r0, _080CD964 @ =gUnknown_2023E8A
ldr r0, _080CD964 @ =gBattleOutcome
ldrb r0, [r0]
cmp r0, 0x1
beq _080CD968
@@ -933,7 +933,7 @@ sub_80CD950: @ 80CD950
beq _080CD976
b _080CD984
.align 2, 0
_080CD964: .4byte gUnknown_2023E8A
_080CD964: .4byte gBattleOutcome
_080CD968:
eors r0, r4
bl sub_80CD8F8
@@ -978,7 +978,7 @@ sub_80CD98C: @ 80CD98C
subs r3, 0x30
adds r2, r3
ldrh r2, [r2, 0xE]
ldr r3, _080CD9EC @ =gUnknown_2023E8A
ldr r3, _080CD9EC @ =gBattleOutcome
ldrb r3, [r3]
ldr r5, _080CD9F0 @ =gLinkPlayers
lsls r4, r6, 3
@@ -998,7 +998,7 @@ _080CD9DC: .4byte gSaveBlock1Ptr
_080CD9E0: .4byte gSaveBlock2Ptr
_080CD9E4: .4byte 0x00000a98
_080CD9E8: .4byte gUnknown_2039654
_080CD9EC: .4byte gUnknown_2023E8A
_080CD9EC: .4byte gBattleOutcome
_080CD9F0: .4byte gLinkPlayers
thumb_func_end sub_80CD98C
@@ -1092,7 +1092,7 @@ _080CDA72:
movs r1, 0x2
movs r2, 0xC
movs r3, 0x18
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
add sp, 0x14
pop {r4-r7}
pop {r0}
@@ -1138,7 +1138,7 @@ sub_80CDAD0: @ 80CDAD0
movs r1, 0x2
movs r2, 0
mov r3, r8
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
movs r6, 0
_080CDB0E:
movs r4, 0x54
@@ -1161,7 +1161,7 @@ _080CDB1C:
movs r0, 0
movs r1, 0x2
mov r3, r8
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
@@ -1230,7 +1230,7 @@ _080CDBA6:
movs r0, 0
movs r1, 0x2
mov r3, r8
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
@@ -1291,7 +1291,7 @@ sub_80CDBE4: @ 80CDBE4
movs r0, 0
movs r1, 0x2
movs r3, 0x4
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
ldr r5, _080CDCA8 @ =gSaveBlock2Ptr
ldr r0, [r5]
ldr r1, _080CDCAC @ =0x00000a98
@@ -1309,7 +1309,7 @@ sub_80CDBE4: @ 80CDBE4
movs r1, 0x2
movs r2, 0x54
movs r3, 0x30
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
adds r7, r5, 0
movs r5, 0xF4
lsls r5, 22
asm/battle_script_commands.s
+32 -32
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
@@ -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
@@ -17358,7 +17358,7 @@ _08026244:
.4byte _08026380
.4byte _080263C4
_0802626C:
ldr r1, _08026290 @ =gUnknown_202297E
ldr r1, _08026290 @ =gBattle_BG2_Y
movs r0, 0x60
strh r0, [r1]
movs r0, 0x2
@@ -17373,7 +17373,7 @@ _0802626C:
strb r0, [r1, 0x1E]
b _080263F6
.align 2, 0
_08026290: .4byte gUnknown_202297E
_08026290: .4byte gBattle_BG2_Y
_08026294: .4byte gBattleScripting
_08026298:
bl sub_80264D0
@@ -17389,10 +17389,10 @@ _080262A4:
.align 2, 0
_080262AC: .4byte gBattleScripting
_080262B0:
ldr r1, _080262F8 @ =gUnknown_2022978
ldr r1, _080262F8 @ =gBattle_BG1_X
movs r0, 0
strh r0, [r1]
ldr r1, _080262FC @ =gUnknown_202297A
ldr r1, _080262FC @ =gBattle_BG1_Y
movs r2, 0x80
lsls r2, 1
adds r0, r2, 0
@@ -17421,8 +17421,8 @@ _080262B0:
strb r0, [r1, 0x1E]
b _080263F6
.align 2, 0
_080262F8: .4byte gUnknown_2022978
_080262FC: .4byte gUnknown_202297A
_080262F8: .4byte gBattle_BG1_X
_080262FC: .4byte gBattle_BG1_Y
_08026300: .4byte gBattleScripting
_08026304:
bl sub_8026404
@@ -17438,11 +17438,11 @@ _08026318:
lsrs r1, r0, 24
cmp r1, 0
bne _080263F6
ldr r0, _0802632C @ =gUnknown_202297A
ldr r0, _0802632C @ =gBattle_BG1_Y
strh r1, [r0]
b _0802636E
.align 2, 0
_0802632C: .4byte gUnknown_202297A
_0802632C: .4byte gBattle_BG1_Y
_08026330:
ldr r0, _0802634C @ =gMain
ldrh r0, [r0, 0x2E]
@@ -17601,10 +17601,10 @@ _0802647C: .4byte gPlayerParty
thumb_func_start sub_8026480
sub_8026480: @ 8026480
push {lr}
ldr r1, _080264C0 @ =gUnknown_202297E
ldr r1, _080264C0 @ =gBattle_BG2_Y
movs r0, 0
strh r0, [r1]
ldr r1, _080264C4 @ =gUnknown_202297C
ldr r1, _080264C4 @ =gBattle_BG2_X
movs r2, 0xD0
lsls r2, 1
adds r0, r2, 0
@@ -17627,8 +17627,8 @@ sub_8026480: @ 8026480
pop {r0}
bx r0
.align 2, 0
_080264C0: .4byte gUnknown_202297E
_080264C4: .4byte gUnknown_202297C
_080264C0: .4byte gBattle_BG2_Y
_080264C4: .4byte gBattle_BG2_X
_080264C8: .4byte gUnknown_82506D0
_080264CC: .4byte gUnknown_82506F0
thumb_func_end sub_8026480
@@ -17643,7 +17643,7 @@ sub_80264D0: @ 80264D0
movs r0, 0x1
b _0802651A
_080264E0:
ldr r4, _080264F0 @ =gUnknown_202297C
ldr r4, _080264F0 @ =gBattle_BG2_X
ldrh r1, [r4]
movs r5, 0x80
lsls r5, 2
@@ -17652,7 +17652,7 @@ _080264E0:
movs r0, 0
b _0802651A
.align 2, 0
_080264F0: .4byte gUnknown_202297C
_080264F0: .4byte gBattle_BG2_X
_080264F4:
movs r0, 0xD0
lsls r0, 1
@@ -17823,7 +17823,7 @@ _08026624:
thumb_func_start sub_8026648
sub_8026648: @ 8026648
push {lr}
ldr r0, _0802665C @ =gUnknown_202297C
ldr r0, _0802665C @ =gBattle_BG2_X
ldrh r1, [r0]
movs r3, 0xD0
lsls r3, 1
@@ -17833,7 +17833,7 @@ sub_8026648: @ 8026648
movs r0, 0
b _08026684
.align 2, 0
_0802665C: .4byte gUnknown_202297C
_0802665C: .4byte gBattle_BG2_X
_08026660:
ldrh r0, [r2]
adds r1, r0, 0
@@ -17930,7 +17930,7 @@ PutMonIconOnLvlUpBox: @ 8026688
adds r1, r2
movs r0, 0
strh r0, [r1, 0x2E]
ldr r0, _08026750 @ =gUnknown_202297C
ldr r0, _08026750 @ =gBattle_BG2_X
ldrh r0, [r0]
strh r0, [r1, 0x30]
add sp, 0x10
@@ -17948,14 +17948,14 @@ _08026740: .4byte 0xd75a0000
_08026744: .4byte 0x0000d75a
_08026748: .4byte gUnknown_82507C8
_0802674C: .4byte gSprites
_08026750: .4byte gUnknown_202297C
_08026750: .4byte gBattle_BG2_X
thumb_func_end PutMonIconOnLvlUpBox
thumb_func_start SpriteCB_MonIconOnLvlUpBox
SpriteCB_MonIconOnLvlUpBox: @ 8026754
push {r4,lr}
adds r2, r0, 0
ldr r0, _08026770 @ =gUnknown_202297C
ldr r0, _08026770 @ =gBattle_BG2_X
ldrh r1, [r2, 0x30]
ldrh r0, [r0]
subs r1, r0
@@ -17967,7 +17967,7 @@ SpriteCB_MonIconOnLvlUpBox: @ 8026754
strh r0, [r2, 0x2E]
b _08026790
.align 2, 0
_08026770: .4byte gUnknown_202297C
_08026770: .4byte gBattle_BG2_X
_08026774:
movs r1, 0x2E
ldrsh r0, [r2, r1]
@@ -32507,14 +32507,14 @@ _0802DAC4: .4byte sub_80116F4
_0802DAC8:
bl sub_800F34C
bl LoadBattleTextboxAndBackground
ldr r1, _0802DADC @ =gUnknown_2022980
ldr r1, _0802DADC @ =gBattle_BG3_X
movs r2, 0x80
lsls r2, 1
adds r0, r2, 0
strh r0, [r1]
b _0802DB34
.align 2, 0
_0802DADC: .4byte gUnknown_2022980
_0802DADC: .4byte gBattle_BG3_X
_0802DAE0:
bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
@@ -32536,7 +32536,7 @@ _0802DAE0:
str r0, [sp, 0xC]
adds r0, r5, 0
movs r3, 0x1
bl sub_810C1CC
bl CreateMonPicSprite_HandleDeoxys
str r4, [sp, 0x14]
add r0, sp, 0x14
ldr r1, _0802DB48 @ =gPlttBufferFaded
asm/battle_setup.s
+47 -47
View File
@@ -42,7 +42,7 @@ _0807F65E:
cmp r0, 0x1
bne _0807F686
bl sub_812B484
bl sub_80563F0
bl CleanupOverworldWindowsAndTilemaps
ldr r0, _0807F68C @ =sub_800FD9C
bl SetMainCallback2
bl sub_806D7E8
@@ -104,7 +104,7 @@ sub_807F6CC: @ 807F6CC
bhi _0807F6FC
ldr r0, _0807F6F8 @ =0x00000167
movs r1, 0x1
bl sub_8099F40
bl CheckBagHasItem
lsls r0, 24
cmp r0, 0
bne _0807F6FC
@@ -318,8 +318,8 @@ _0807F8BC: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
_0807F8C0: .4byte gBattleTypeFlags
thumb_func_end sub_807F888
thumb_func_start sub_807F8C4
sub_807F8C4: @ 807F8C4
thumb_func_start BattleSetup_StartScriptedWildBattle
BattleSetup_StartScriptedWildBattle: @ 807F8C4
push {lr}
bl ScriptContext2_Enable
ldr r1, _0807F8F8 @ =gMain
@@ -344,7 +344,7 @@ sub_807F8C4: @ 807F8C4
_0807F8F8: .4byte gMain
_0807F8FC: .4byte sub_807FBA0
_0807F900: .4byte gBattleTypeFlags
thumb_func_end sub_807F8C4
thumb_func_end BattleSetup_StartScriptedWildBattle
thumb_func_start sub_807F904
sub_807F904: @ 807F904
@@ -356,7 +356,7 @@ sub_807F904: @ 807F904
str r0, [r1, 0x8]
ldr r0, _0807F94C @ =0x00000167
movs r1, 0x1
bl sub_8099F40
bl CheckBagHasItem
lsls r0, 24
cmp r0, 0
beq _0807F958
@@ -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,12 +633,12 @@ 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 @ =c2_exit_to_overworld_2_switch
ldr r0, _0807FB94 @ =CB2_ReturnToField
bl SetMainCallback2
ldr r1, _0807FB98 @ =gUnknown_3005020
ldr r1, _0807FB98 @ =gFieldCallback
ldr r0, _0807FB9C @ =sub_807E3EC
str r0, [r1]
_0807FB8C:
@@ -646,8 +646,8 @@ _0807FB8C:
pop {r0}
bx r0
.align 2, 0
_0807FB94: .4byte c2_exit_to_overworld_2_switch
_0807FB98: .4byte gUnknown_3005020
_0807FB94: .4byte CB2_ReturnToField
_0807FB98: .4byte gFieldCallback
_0807FB9C: .4byte sub_807E3EC
thumb_func_end sub_807FB40
@@ -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,7 +676,7 @@ 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
@@ -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]
@@ -1512,7 +1512,7 @@ battle_80801F0: @ 80801F0
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
bl GetFieldObjectIdByLocalIdAndMap
ldr r1, _08080224 @ =gUnknown_3005074
ldr r1, _08080224 @ =gSelectedEventObject
strb r0, [r1]
_08080212:
pop {r0}
@@ -1521,11 +1521,11 @@ _08080212:
_08080218: .4byte gUnknown_20386B0
_0808021C: .4byte gSpecialVar_LastTalked
_08080220: .4byte gSaveBlock1Ptr
_08080224: .4byte gUnknown_3005074
_08080224: .4byte gSelectedEventObject
thumb_func_end battle_80801F0
thumb_func_start sub_8080228
sub_8080228: @ 8080228
thumb_func_start BattleSetup_ConfigureTrainerBattle
BattleSetup_ConfigureTrainerBattle: @ 8080228
push {r4,r5,lr}
adds r5, r0, 0
bl sub_8080110
@@ -1640,14 +1640,14 @@ _08080326:
.align 2, 0
_0808032C: .4byte gUnknown_83C6900
_08080330: .4byte gUnknown_81A4EC1
thumb_func_end sub_8080228
thumb_func_end BattleSetup_ConfigureTrainerBattle
thumb_func_start TrainerWantsBattle
TrainerWantsBattle: @ 8080334
push {r4,lr}
lsls r0, 24
lsrs r0, 24
ldr r2, _08080368 @ =gUnknown_3005074
ldr r2, _08080368 @ =gSelectedEventObject
strb r0, [r2]
ldr r4, _0808036C @ =gSpecialVar_LastTalked
ldr r3, _08080370 @ =gMapObjects
@@ -1659,7 +1659,7 @@ TrainerWantsBattle: @ 8080334
strh r0, [r4]
adds r1, 0x1
adds r0, r1, 0
bl sub_8080228
bl BattleSetup_ConfigureTrainerBattle
ldr r0, _08080374 @ =gUnknown_81A4EB4
bl ScriptContext1_SetupScript
bl ScriptContext2_Enable
@@ -1667,7 +1667,7 @@ TrainerWantsBattle: @ 8080334
pop {r0}
bx r0
.align 2, 0
_08080368: .4byte gUnknown_3005074
_08080368: .4byte gSelectedEventObject
_0808036C: .4byte gSpecialVar_LastTalked
_08080370: .4byte gMapObjects
_08080374: .4byte gUnknown_81A4EB4
@@ -1693,7 +1693,7 @@ GetTrainerFlagFromScriptPointer: @ 8080378
thumb_func_start sub_8080398
sub_8080398: @ 8080398
push {r4,lr}
ldr r0, _080803C4 @ =gUnknown_3005074
ldr r0, _080803C4 @ =gSelectedEventObject
ldrb r0, [r0]
lsls r4, r0, 3
adds r4, r0
@@ -1713,7 +1713,7 @@ sub_8080398: @ 8080398
pop {r0}
bx r0
.align 2, 0
_080803C4: .4byte gUnknown_3005074
_080803C4: .4byte gSelectedEventObject
_080803C8: .4byte gMapObjects
thumb_func_end sub_8080398
@@ -1785,8 +1785,8 @@ HasTrainerAlreadyBeenFought: @ 8080424
bx r1
thumb_func_end HasTrainerAlreadyBeenFought
thumb_func_start trainer_flag_set
trainer_flag_set: @ 808043C
thumb_func_start SetTrainerFlag
SetTrainerFlag: @ 808043C
push {lr}
lsls r0, 16
movs r1, 0xA0
@@ -1796,10 +1796,10 @@ trainer_flag_set: @ 808043C
bl FlagSet
pop {r0}
bx r0
thumb_func_end trainer_flag_set
thumb_func_end SetTrainerFlag
thumb_func_start trainer_flag_clear
trainer_flag_clear: @ 8080450
thumb_func_start ClearTrainerFlag
ClearTrainerFlag: @ 8080450
push {lr}
lsls r0, 16
movs r1, 0xA0
@@ -1809,10 +1809,10 @@ trainer_flag_clear: @ 8080450
bl FlagClear
pop {r0}
bx r0
thumb_func_end trainer_flag_clear
thumb_func_end ClearTrainerFlag
thumb_func_start sub_8080464
sub_8080464: @ 8080464
thumb_func_start BattleSetup_StartTrainerBattle
BattleSetup_StartTrainerBattle: @ 8080464
push {r4,lr}
ldr r4, _080804A0 @ =gBattleTypeFlags
movs r0, 0x8
@@ -1844,7 +1844,7 @@ _0808048C:
_080804A0: .4byte gBattleTypeFlags
_080804A4: .4byte gMain
_080804A8: .4byte sub_80804AC
thumb_func_end sub_8080464
thumb_func_end BattleSetup_StartTrainerBattle
thumb_func_start sub_80804AC
sub_80804AC: @ 80804AC
@@ -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:
@@ -1900,7 +1900,7 @@ _08080508:
_0808051C: .4byte gTrainerBattleOpponent_A
_08080520: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
_08080524:
ldr r0, _08080538 @ =gUnknown_2023E8A
ldr r0, _08080538 @ =gBattleOutcome
ldrb r0, [r0]
bl IsPlayerDefeated
cmp r0, 0x1
@@ -1910,7 +1910,7 @@ _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
@@ -1940,7 +1940,7 @@ sub_8080558: @ 8080558
_08080570: .4byte gTrainerBattleOpponent_A
_08080574: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
_08080578:
ldr r0, _0808058C @ =gUnknown_2023E8A
ldr r0, _0808058C @ =gBattleOutcome
ldrb r0, [r0]
bl IsPlayerDefeated
cmp r0, 0x1
@@ -1949,7 +1949,7 @@ _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
@@ -1992,8 +1992,8 @@ sub_80805D8: @ 80805D8
bx r0
thumb_func_end sub_80805D8
thumb_func_start sub_80805E8
sub_80805E8: @ 80805E8
thumb_func_start BattleSetup_GetScriptAddrAfterBattle
BattleSetup_GetScriptAddrAfterBattle: @ 80805E8
push {lr}
ldr r0, _080805F8 @ =gUnknown_20386C4
ldr r0, [r0]
@@ -2006,10 +2006,10 @@ _080805F4:
.align 2, 0
_080805F8: .4byte gUnknown_20386C4
_080805FC: .4byte gUnknown_81C555B
thumb_func_end sub_80805E8
thumb_func_end BattleSetup_GetScriptAddrAfterBattle
thumb_func_start sub_8080600
sub_8080600: @ 8080600
thumb_func_start BattleSetup_GetTrainerPostBattleScript
BattleSetup_GetTrainerPostBattleScript: @ 8080600
push {lr}
ldr r0, _08080610 @ =gUnknown_20386C8
ldr r0, [r0]
@@ -2022,7 +2022,7 @@ _0808060C:
.align 2, 0
_08080610: .4byte gUnknown_20386C8
_08080614: .4byte gUnknown_81C555B
thumb_func_end sub_8080600
thumb_func_end BattleSetup_GetTrainerPostBattleScript
thumb_func_start sub_8080618
sub_8080618: @ 8080618
asm/battle_tower.s
+7 -7
View File
@@ -2033,7 +2033,7 @@ sub_80E68C4: @ 80E68C4
ldr r0, _080E68F4 @ =gMain
ldr r1, _080E68F8 @ =sub_80E6854
str r1, [r0, 0x8]
bl sub_80563F0
bl CleanupOverworldWindowsAndTilemaps
ldr r0, _080E68FC @ =sub_800FD9C
bl SetMainCallback2
adds r0, r4, 0
@@ -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
@@ -3218,7 +3218,7 @@ sub_80E724C: @ 80E724C
adds r1, r0
ldrh r0, [r1]
movs r1, 0x1
bl sub_809A084
bl AddBagItem
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x1
@@ -3229,7 +3229,7 @@ sub_80E724C: @ 80E724C
adds r0, r1
ldrh r0, [r0]
ldr r1, _080E7290 @ =gStringVar1
bl sub_8099E90
bl CopyItemName
ldr r0, _080E7294 @ =gSpecialVar_Result
strh r4, [r0]
b _080E72AA
@@ -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
+157 -157
View File
File diff suppressed because it is too large Load Diff
asm/berry.s
-311
View File
@@ -1,311 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_809C718
sub_809C718: @ 809C718
push {r4,r5,lr}
ldr r2, _0809C778 @ =gSaveBlock1Ptr
ldr r1, [r2]
ldr r0, _0809C77C @ =gUnknown_83DF7E8
ldr r3, _0809C780 @ =0x000030ec
adds r1, r3
movs r4, 0x93
lsls r4, 3
adds r0, r4
ldm r0!, {r3-r5}
stm r1!, {r3-r5}
ldm r0!, {r3-r5}
stm r1!, {r3-r5}
ldr r0, [r0]
str r0, [r1]
movs r1, 0
adds r4, r2, 0
adds r5, r4, 0
ldr r3, _0809C784 @ =0x00003108
movs r2, 0
_0809C740:
ldr r0, [r5]
adds r0, r3
adds r0, r1
strb r2, [r0]
adds r1, 0x1
cmp r1, 0x11
ble _0809C740
ldr r0, [r4]
ldr r5, _0809C788 @ =0x0000311a
adds r0, r5
movs r1, 0
strb r1, [r0]
ldr r0, [r4]
ldr r2, _0809C78C @ =0x0000311b
adds r0, r2
strb r1, [r0]
ldr r0, [r4]
ldr r3, _0809C780 @ =0x000030ec
adds r0, r3
bl GetEnigmaBerryChecksum
ldr r1, [r4]
ldr r4, _0809C790 @ =0x0000311c
adds r1, r4
str r0, [r1]
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_0809C778: .4byte gSaveBlock1Ptr
_0809C77C: .4byte gUnknown_83DF7E8
_0809C780: .4byte 0x000030ec
_0809C784: .4byte 0x00003108
_0809C788: .4byte 0x0000311a
_0809C78C: .4byte 0x0000311b
_0809C790: .4byte 0x0000311c
thumb_func_end sub_809C718
thumb_func_start sub_809C794
sub_809C794: @ 809C794
push {lr}
sub sp, 0x4
mov r1, sp
movs r0, 0
strh r0, [r1]
ldr r0, _0809C7B8 @ =gSaveBlock1Ptr
ldr r1, [r0]
ldr r0, _0809C7BC @ =0x000030ec
adds r1, r0
ldr r2, _0809C7C0 @ =0x0100001a
mov r0, sp
bl CpuSet
bl sub_809C718
add sp, 0x4
pop {r0}
bx r0
.align 2, 0
_0809C7B8: .4byte gSaveBlock1Ptr
_0809C7BC: .4byte 0x000030ec
_0809C7C0: .4byte 0x0100001a
thumb_func_end sub_809C794
thumb_func_start SetEnigmaBerry
SetEnigmaBerry: @ 809C7C4
push {r4-r7,lr}
adds r4, r0, 0
bl sub_809C794
adds r5, r4, 0
ldr r0, _0809C824 @ =gSaveBlock1Ptr
ldr r2, [r0]
ldr r0, _0809C828 @ =0x000030ec
adds r4, r2, r0
adds r1, r4, 0
adds r0, r5, 0
ldm r0!, {r3,r6,r7}
stm r1!, {r3,r6,r7}
ldm r0!, {r3,r6,r7}
stm r1!, {r3,r6,r7}
ldr r0, [r0]
str r0, [r1]
movs r3, 0
ldr r0, _0809C82C @ =0x00003108
adds r6, r2, r0
ldr r1, _0809C830 @ =0x00000516
adds r2, r5, r1
_0809C7F0:
adds r0, r6, r3
adds r1, r2, r3
ldrb r1, [r1]
strb r1, [r0]
adds r3, 0x1
cmp r3, 0x11
ble _0809C7F0
movs r3, 0xA5
lsls r3, 3
adds r0, r5, r3
ldrb r0, [r0]
adds r1, r4, 0
adds r1, 0x2E
strb r0, [r1]
ldr r6, _0809C834 @ =0x00000529
adds r0, r5, r6
ldrb r0, [r0]
adds r1, 0x1
strb r0, [r1]
adds r0, r4, 0
bl GetEnigmaBerryChecksum
str r0, [r4, 0x30]
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_0809C824: .4byte gSaveBlock1Ptr
_0809C828: .4byte 0x000030ec
_0809C82C: .4byte 0x00003108
_0809C830: .4byte 0x00000516
_0809C834: .4byte 0x00000529
thumb_func_end SetEnigmaBerry
thumb_func_start GetEnigmaBerryChecksum
GetEnigmaBerryChecksum: @ 809C838
push {lr}
adds r3, r0, 0
movs r2, 0
movs r1, 0
_0809C840:
adds r0, r3, r1
ldrb r0, [r0]
adds r2, r0
adds r1, 0x1
cmp r1, 0x2F
bls _0809C840
adds r0, r2, 0
pop {r1}
bx r1
thumb_func_end GetEnigmaBerryChecksum
thumb_func_start IsEnigmaBerryValid
IsEnigmaBerryValid: @ 809C854
push {r4,lr}
ldr r4, _0809C888 @ =gSaveBlock1Ptr
ldr r1, [r4]
movs r2, 0xC4
lsls r2, 6
adds r0, r1, r2
ldrb r0, [r0]
cmp r0, 0
beq _0809C898
ldr r2, _0809C88C @ =0x000030f6
adds r0, r1, r2
ldrb r0, [r0]
cmp r0, 0
beq _0809C898
ldr r2, _0809C890 @ =0x000030ec
adds r0, r1, r2
bl GetEnigmaBerryChecksum
ldr r1, [r4]
ldr r2, _0809C894 @ =0x0000311c
adds r1, r2
ldr r1, [r1]
cmp r0, r1
bne _0809C898
movs r0, 0x1
b _0809C89A
.align 2, 0
_0809C888: .4byte gSaveBlock1Ptr
_0809C88C: .4byte 0x000030f6
_0809C890: .4byte 0x000030ec
_0809C894: .4byte 0x0000311c
_0809C898:
movs r0, 0
_0809C89A:
pop {r4}
pop {r1}
bx r1
thumb_func_end IsEnigmaBerryValid
thumb_func_start sub_809C8A0
sub_809C8A0: @ 809C8A0
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x2B
bne _0809C8C4
bl IsEnigmaBerryValid
cmp r0, 0
beq _0809C8C4
ldr r0, _0809C8BC @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _0809C8C0 @ =0x000030ec
b _0809C8D8
.align 2, 0
_0809C8BC: .4byte gSaveBlock1Ptr
_0809C8C0: .4byte 0x000030ec
_0809C8C4:
subs r0, r4, 0x1
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2A
bls _0809C8D0
movs r4, 0x1
_0809C8D0:
lsls r0, r4, 3
subs r0, r4
lsls r0, 2
ldr r1, _0809C8E0 @ =gUnknown_83DF7CC
_0809C8D8:
adds r0, r1
pop {r4}
pop {r1}
bx r1
.align 2, 0
_0809C8E0: .4byte gUnknown_83DF7CC
thumb_func_end sub_809C8A0
thumb_func_start ItemIdToBerryType
ItemIdToBerryType: @ 809C8E4
push {lr}
lsls r0, 16
lsrs r1, r0, 16
ldr r2, _0809C900 @ =0xff7b0000
adds r0, r2
lsrs r0, 16
cmp r0, 0x2A
bhi _0809C904
adds r0, r1, 0
adds r0, 0x7C
lsls r0, 24
lsrs r0, 24
b _0809C906
.align 2, 0
_0809C900: .4byte 0xff7b0000
_0809C904:
movs r0, 0x1
_0809C906:
pop {r1}
bx r1
thumb_func_end ItemIdToBerryType
thumb_func_start BerryTypeToItemId
BerryTypeToItemId: @ 809C90C
push {lr}
lsls r0, 16
lsrs r1, r0, 16
ldr r2, _0809C928 @ =0xffff0000
adds r0, r2
lsrs r0, 16
cmp r0, 0x2A
bhi _0809C92C
adds r0, r1, 0
adds r0, 0x84
lsls r0, 16
lsrs r0, 16
b _0809C92E
.align 2, 0
_0809C928: .4byte 0xffff0000
_0809C92C:
movs r0, 0x85
_0809C92E:
pop {r1}
bx r1
thumb_func_end BerryTypeToItemId
thumb_func_start GetBerryNameByBerryType
GetBerryNameByBerryType: @ 809C934
push {r4,lr}
adds r4, r1, 0
lsls r0, 24
lsrs r0, 24
bl sub_809C8A0
adds r1, r0, 0
adds r0, r4, 0
movs r2, 0x6
bl memcpy
movs r0, 0xFF
strb r0, [r4, 0x6]
pop {r4}
pop {r0}
bx r0
thumb_func_end GetBerryNameByBerryType
.align 2, 0 @ Don't pad with nop.
asm/unk_814B6F0.s → asm/berry_crush.s
+4 -4
View File
@@ -39,7 +39,7 @@ _0814B716:
str r0, [r5]
adds r0, r4, 0
bl SetMainCallback2
ldr r0, _0814B748 @ =c2_exit_to_overworld_2_switch
ldr r0, _0814B748 @ =CB2_ReturnToField
cmp r4, r0
bne _0814B73E
ldr r0, _0814B74C @ =0x0000012f
@@ -53,7 +53,7 @@ _0814B740:
pop {r1}
bx r1
.align 2, 0
_0814B748: .4byte c2_exit_to_overworld_2_switch
_0814B748: .4byte CB2_ReturnToField
_0814B74C: .4byte 0x0000012f
_0814B750: .4byte sub_8056534
thumb_func_end sub_814B6FC
@@ -204,7 +204,7 @@ _0814B878: .4byte gSpecialVar_ItemId
_0814B87C:
ldrh r0, [r1]
movs r1, 0x1
bl sub_809A1D8
bl RemoveBagItem
_0814B884:
ldr r4, _0814B8E0 @ =gUnknown_203F3DC
ldr r2, [r4]
@@ -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/unk_814BB4C.s → asm/berry_crush_2.s
+19 -19
View File
@@ -201,7 +201,7 @@ _0814BC98:
_0814BCA2:
movs r0, 0
movs r1, 0
bl sub_80F6EE4
bl DrawDialogueFrame
ldrb r1, [r5, 0x1]
movs r0, 0x2
mov r8, r0
@@ -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
@@ -287,7 +287,7 @@ _0814BD48:
beq _0814BD5A
movs r0, 0
movs r1, 0x1
bl sub_80F6F54
bl ClearDialogWindowAndFrame
_0814BD5A:
ldrb r0, [r7, 0xE]
movs r1, 0x1
@@ -597,7 +597,7 @@ _0814BFA0: .4byte gUnknown_83DFC9C
_0814BFA4:
movs r0, 0
movs r1, 0x1
bl sub_80F6F54
bl ClearDialogWindowAndFrame
movs r0, 0xA
movs r1, 0x1
movs r2, 0
@@ -1046,7 +1046,7 @@ sub_814C2FC: @ 814C2FC
mov r10, r3
_0814C320:
lsls r0, r7, 4
ldr r1, _0814C3C4 @ =gUnknown_3003ED0
ldr r1, _0814C3C4 @ =gRecvCmds
adds r2, r0, r1
ldrh r1, [r2]
movs r0, 0xFF
@@ -1127,7 +1127,7 @@ _0814C320:
b _0814C3D6
.align 2, 0
_0814C3C0: .4byte gUnknown_846E2E0
_0814C3C4: .4byte gUnknown_3003ED0
_0814C3C4: .4byte gRecvCmds
_0814C3C8:
adds r0, r4, r6
adds r2, r0, 0
@@ -1671,7 +1671,7 @@ sub_814C7BC: @ 814C7BC
push {r4,r5,lr}
adds r5, r0, 0
movs r4, 0
ldr r3, _0814C808 @ =gUnknown_3003ED0
ldr r3, _0814C808 @ =gRecvCmds
ldrb r0, [r5, 0x9]
cmp r4, r0
bcs _0814C7E0
@@ -1710,7 +1710,7 @@ _0814C7F8:
strb r0, [r2]
b _0814C84A
.align 2, 0
_0814C808: .4byte gUnknown_3003ED0
_0814C808: .4byte gRecvCmds
_0814C80C:
adds r4, r5, 0
adds r4, 0x4E
@@ -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
@@ -2855,7 +2855,7 @@ _0814D106:
beq _0814D17E
movs r0, 0
movs r1, 0
bl sub_80F6EE4
bl DrawDialogueFrame
ldr r2, _0814D148 @ =gUnknown_8419F54
movs r0, 0
str r0, [sp]
@@ -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
@@ -2949,7 +2949,7 @@ _0814D1CA:
bl sub_80F7858
b _0814D230
_0814D1D0:
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r4, r0, 24
movs r0, 0x2
@@ -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
@@ -2979,7 +2979,7 @@ _0814D204:
_0814D206:
movs r0, 0
movs r1, 0x1
bl sub_80F6F54
bl ClearDialogWindowAndFrame
movs r4, 0
str r4, [sp]
adds r0, r6, 0
@@ -3159,7 +3159,7 @@ _0814D34A:
_0814D356:
movs r0, 0
movs r1, 0x1
bl sub_80F6F54
bl ClearDialogWindowAndFrame
adds r0, r5, 0
bl sub_814DA04
movs r0, 0x1
@@ -3217,7 +3217,7 @@ _0814D3BA:
_0814D3C0:
movs r0, 0
movs r1, 0
bl sub_80F6EE4
bl DrawDialogueFrame
ldrh r1, [r5, 0x14]
cmp r1, 0x3
bne _0814D3F0
@@ -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/unk_814D5C8.s → asm/berry_crush_3.s
+33 -33
View File
@@ -49,7 +49,7 @@ _0814D61C:
movs r0, 0
movs r1, 0
bl SetGpuReg
bl remove_some_task
bl ScanlineEffect_Stop
bl reset_temp_tile_data_buffers
b _0814D878
_0814D63A:
@@ -186,8 +186,8 @@ _0814D768:
beq _0814D774
b _0814D87E
_0814D774:
bl sub_80F6C6C
bl sub_80F6C98
bl InitStandardTextBoxWindows
bl ResetBg0
adds r0, r5, 0
bl sub_814EB38
adds r0, r5, 0
@@ -424,7 +424,7 @@ _0814D962:
bl ClearGpuRegBits
b _0814D9BA
_0814D9A2:
bl sub_80FCE44
bl DestroyWirelessStatusIndicatorSprite
adds r0, r5, 0
bl sub_814EF10
bl sub_815C9F4
@@ -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
@@ -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
@@ -1537,7 +1537,7 @@ _0814E21A:
lsls r1, r2, 3
subs r1, r2
lsls r1, 2
ldr r0, _0814E294 @ =gUnknown_83DF7E8
ldr r0, _0814E294 @ =sBerries
adds r1, r0
ldr r0, _0814E298 @ =gStringVar1
bl StringCopy
@@ -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
@@ -1591,7 +1591,7 @@ _0814E27E:
bl StringCopy
b _0814E2B8
.align 2, 0
_0814E294: .4byte gUnknown_83DF7E8
_0814E294: .4byte sBerries
_0814E298: .4byte gStringVar1
_0814E29C: .4byte gUnknown_846F4B8
_0814E2A0: .4byte gStringVar4
@@ -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,7 +2097,7 @@ _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
@@ -2246,7 +2246,7 @@ sub_814E80C: @ 814E80C
adds r5, r4, r0
ldrb r0, [r5]
movs r1, 0x1
bl sub_810F4D8
bl ClearMenuWindow
ldrb r0, [r5]
bl RemoveWindow
adds r0, r4, 0
@@ -2309,7 +2309,7 @@ _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
@@ -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 ClearMenuWindow
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
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 remove_some_task
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
+117 -117
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
@@ -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,11 +183,11 @@ _0813CE84:
.4byte _0813CFB0
.4byte _0813CFBE
_0813CED0:
bl sub_80BF768
bl VblankHblankHandlerSetZero
bl clear_scheduled_bg_copies_to_vram
b _0813CFD2
_0813CEDA:
bl remove_some_task
bl ScanlineEffect_Stop
b _0813CFD2
_0813CEE0:
bl FreeAllSpritePalettes
@@ -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
@@ -255,7 +255,7 @@ _0813CF62:
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, _0813CF98 @ =gUnknown_3005E70
ldr r0, _0813CF98 @ =gMultiuseListMenuTemplate
ldr r2, _0813CF9C @ =gUnknown_203F370
ldrh r1, [r2, 0xA]
ldrh r2, [r2, 0x8]
@@ -273,7 +273,7 @@ _0813CF62:
b _0813CFD2
.align 2, 0
_0813CF94: .4byte sub_813DA68
_0813CF98: .4byte gUnknown_3005E70
_0813CF98: .4byte gMultiuseListMenuTemplate
_0813CF9C: .4byte gUnknown_203F370
_0813CFA0: .4byte gTasks
_0813CFA4:
@@ -386,7 +386,7 @@ _0813D078: .4byte gUnknown_203F370
thumb_func_start sub_813D07C
sub_813D07C: @ 813D07C
push {r4,lr}
bl sub_80BF7C8
bl InitBgReg
ldr r4, _0813D0DC @ =gUnknown_203F36C
ldr r0, [r4]
adds r0, 0xC
@@ -573,7 +573,7 @@ sub_813D204: @ 813D204
push {r4-r7,lr}
mov r7, r8
push {r7}
ldr r0, _0813D280 @ =gUnknown_20398AC
ldr r0, _0813D280 @ =gBagPockets + 0x20
mov r8, r0
movs r6, 0
ldr r0, _0813D284 @ =gUnknown_203F36C
@@ -615,10 +615,10 @@ _0813D254:
ldr r2, [r0]
lsls r0, r6, 3
adds r0, r2
ldr r1, _0813D290 @ =gUnknown_84166DB
ldr r1, _0813D290 @ =gText_Close
str r1, [r0]
str r6, [r0, 0x4]
ldr r1, _0813D294 @ =gUnknown_3005E70
ldr r1, _0813D294 @ =gMultiuseListMenuTemplate
str r2, [r1]
ldr r0, _0813D298 @ =gUnknown_203F370
ldrb r0, [r0, 0x4]
@@ -633,12 +633,12 @@ _0813D254:
adds r2, r1, 0
b _0813D2A6
.align 2, 0
_0813D280: .4byte gUnknown_20398AC
_0813D280: .4byte gBagPockets + 0x20
_0813D284: .4byte gUnknown_203F36C
_0813D288: .4byte gUnknown_203F380
_0813D28C: .4byte gUnknown_203F37C
_0813D290: .4byte gUnknown_84166DB
_0813D294: .4byte gUnknown_3005E70
_0813D290: .4byte gText_Close
_0813D294: .4byte gMultiuseListMenuTemplate
_0813D298: .4byte gUnknown_203F370
_0813D29C:
ldr r0, _0813D310 @ =gUnknown_203F36C
@@ -715,10 +715,10 @@ sub_813D31C: @ 813D31C
lsls r5, r1, 16
lsrs r5, 16
ldr r4, _0813D384 @ =gStringVar4
ldr r1, _0813D388 @ =gUnknown_84166FF
ldr r1, _0813D388 @ =gText_FontSize0
adds r0, r4, 0
bl StringCopy
ldr r1, _0813D38C @ =gUnknown_8416226
ldr r1, _0813D38C @ =gOtherText_UnkF9_08_Clear_01
adds r0, r4, 0
bl StringAppend
ldr r6, _0813D390 @ =gStringVar1
@@ -733,11 +733,11 @@ sub_813D31C: @ 813D31C
bl StringAppend
adds r0, r5, 0
adds r1, r6, 0
bl sub_8099E90
bl CopyItemName
ldr r1, _0813D394 @ =gUnknown_84643B4
adds r0, r4, 0
bl StringAppend
ldr r1, _0813D398 @ =gUnknown_8416703
ldr r1, _0813D398 @ =gText_FontSize2
adds r0, r4, 0
bl StringAppend
adds r0, r4, 0
@@ -753,11 +753,11 @@ sub_813D31C: @ 813D31C
bx r0
.align 2, 0
_0813D384: .4byte gStringVar4
_0813D388: .4byte gUnknown_84166FF
_0813D38C: .4byte gUnknown_8416226
_0813D388: .4byte gText_FontSize0
_0813D38C: .4byte gOtherText_UnkF9_08_Clear_01
_0813D390: .4byte gStringVar1
_0813D394: .4byte gUnknown_84643B4
_0813D398: .4byte gUnknown_8416703
_0813D398: .4byte gText_FontSize2
thumb_func_end sub_813D31C
thumb_func_start sub_813D39C
@@ -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
@@ -806,7 +806,7 @@ _0813D3D6:
lsls r1, r5, 16
lsrs r1, 16
movs r0, 0x5
bl sub_809A798
bl BagGetItemIdByPocketPosition
lsls r0, 16
lsrs r0, 16
ldr r1, [r4]
@@ -857,10 +857,10 @@ sub_813D430: @ 813D430
lsrs r4, 16
movs r0, 0x5
adds r1, r4, 0
bl sub_809A798
bl BagGetItemIdByPocketPosition
movs r0, 0x5
adds r1, r4, 0
bl sub_809A7B4
bl BagGetQuantityByPocketPosition
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
@@ -869,7 +869,7 @@ sub_813D430: @ 813D430
movs r3, 0x3
bl ConvertIntToDecimalStringN
ldr r4, _0813D4A8 @ =gStringVar4
ldr r1, _0813D4AC @ =gUnknown_84162B9
ldr r1, _0813D4AC @ =gText_TimesStrVar1
adds r0, r4, 0
bl StringExpandPlaceholders
str r5, [sp]
@@ -894,7 +894,7 @@ _0813D498:
_0813D4A0: .4byte gUnknown_203F36C
_0813D4A4: .4byte gStringVar1
_0813D4A8: .4byte gStringVar4
_0813D4AC: .4byte gUnknown_84162B9
_0813D4AC: .4byte gText_TimesStrVar1
thumb_func_end sub_813D430
thumb_func_start sub_813D4B0
@@ -980,7 +980,7 @@ sub_813D538: @ 813D538
lsls r1, 16
lsrs r1, 16
movs r0, 0x5
bl sub_809A798
bl BagGetItemIdByPocketPosition
lsls r0, 16
lsrs r0, 16
bl ItemId_GetDescription
@@ -1028,7 +1028,7 @@ 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
add sp, 0x8
@@ -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 sub_810713C
bl DestroyListMenu
ldr r0, _0813D888 @ =gUnknown_203F36C
ldr r0, [r0]
ldr r0, [r0]
@@ -1441,9 +1441,9 @@ _0813D8A4:
thumb_func_start sub_813D8AC
sub_813D8AC: @ 813D8AC
push {r4,lr}
ldr r4, _0813D904 @ =gUnknown_20398AC
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
@@ -1485,7 +1485,7 @@ _0813D8EE:
adds r1, r0, 0
b _0813D916
.align 2, 0
_0813D904: .4byte gUnknown_20398AC
_0813D904: .4byte gBagPockets + 0x20
_0813D908: .4byte gUnknown_203F36C
_0813D90C: .4byte gUnknown_203F370
_0813D910:
@@ -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
@@ -1574,7 +1574,7 @@ sub_813D940: @ 813D940
movs r2, 0x2
movs r3, 0x3
bl ConvertIntToDecimalStringN
ldr r1, _0813D9F4 @ =gUnknown_84162B9
ldr r1, _0813D9F4 @ =gText_TimesStrVar1
mov r0, r9
bl StringExpandPlaceholders
movs r0, 0xA
@@ -1601,7 +1601,7 @@ sub_813D940: @ 813D940
_0813D9E8: .4byte gTasks+0x8
_0813D9EC: .4byte gStringVar1
_0813D9F0: .4byte gStringVar4
_0813D9F4: .4byte gUnknown_84162B9
_0813D9F4: .4byte gText_TimesStrVar1
thumb_func_end sub_813D940
thumb_func_start sub_813D9F8
@@ -1631,7 +1631,7 @@ sub_813D9F8: @ 813D9F8
adds r3, r5, 0
bl ConvertIntToDecimalStringN
ldr r4, _0813DA60 @ =gStringVar4
ldr r1, _0813DA64 @ =gUnknown_84162B9
ldr r1, _0813DA64 @ =gText_TimesStrVar1
adds r0, r4, 0
bl StringExpandPlaceholders
movs r0, 0xA
@@ -1654,7 +1654,7 @@ sub_813D9F8: @ 813D9F8
.align 2, 0
_0813DA5C: .4byte gStringVar1
_0813DA60: .4byte gStringVar4
_0813DA64: .4byte gUnknown_84162B9
_0813DA64: .4byte gText_TimesStrVar1
thumb_func_end sub_813D9F8
thumb_func_start sub_813DA68
@@ -1694,7 +1694,7 @@ _0813DA9E:
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
@@ -1748,7 +1748,7 @@ _0813DB10:
lsls r1, r5, 16
lsrs r1, 16
movs r0, 0x5
bl sub_809A798
bl BagGetItemIdByPocketPosition
ldr r1, _0813DB34 @ =gSpecialVar_ItemId
b _0813DB46
.align 2, 0
@@ -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
@@ -1784,11 +1784,11 @@ _0813DB58:
lsrs r4, 16
movs r0, 0x5
adds r1, r4, 0
bl sub_809A7B4
bl BagGetQuantityByPocketPosition
strh r0, [r7, 0x4]
movs r0, 0x5
adds r1, r4, 0
bl sub_809A798
bl BagGetItemIdByPocketPosition
ldr r1, _0813DBA8 @ =gSpecialVar_ItemId
strh r0, [r1]
ldr r0, _0813DBAC @ =gTasks
@@ -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 sub_810F7D8
bl ProgramAndPlaceMenuCursorOnWindow
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
@@ -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
@@ -2497,18 +2497,18 @@ _0813E18A:
ldr r0, _0813E1F4 @ =gSpecialVar_ItemId
ldrh r0, [r0]
ldrh r1, [r5, 0x10]
bl sub_809A1D8
bl RemoveBagItem
movs r0, 0x9
bl sub_813EA98
ldrb r0, [r5]
ldr r4, _0813E1F8 @ =gUnknown_203F37A
subs r2, r4, 0x2
adds r1, r4, 0
bl sub_810713C
bl DestroyListMenu
bl sub_813D8AC
bl sub_813D6F4
bl sub_813D204
ldr r0, _0813E1FC @ =gUnknown_3005E70
ldr r0, _0813E1FC @ =gMultiuseListMenuTemplate
subs r4, 0xA
ldrh r1, [r4, 0xA]
ldrh r2, [r4, 0x8]
@@ -2534,7 +2534,7 @@ _0813E1EC: .4byte gTasks+0x8
_0813E1F0: .4byte gMain
_0813E1F4: .4byte gSpecialVar_ItemId
_0813E1F8: .4byte gUnknown_203F37A
_0813E1FC: .4byte gUnknown_3005E70
_0813E1FC: .4byte gMultiuseListMenuTemplate
thumb_func_end sub_813E164
thumb_func_start sub_813E200
@@ -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
@@ -2595,14 +2595,14 @@ sub_813E274: @ 813E274
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r2, _0813E288 @ =gUnknown_841632A
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
_0813E288: .4byte gUnknown_841632A
_0813E288: .4byte gText_ThereIsNoPokemon
_0813E28C: .4byte sub_813E290
thumb_func_end sub_813E274
@@ -2646,11 +2646,11 @@ sub_813E2B8: @ 813E2B8
ldr r4, _0813E318 @ =gUnknown_203F37A
subs r2, r4, 0x2
adds r1, r4, 0
bl sub_810713C
bl DestroyListMenu
bl sub_813D8AC
bl sub_813D6F4
bl sub_813D204
ldr r0, _0813E31C @ =gUnknown_3005E70
ldr r0, _0813E31C @ =gMultiuseListMenuTemplate
subs r4, 0xA
ldrh r1, [r4, 0xA]
ldrh r2, [r4, 0x8]
@@ -2671,7 +2671,7 @@ sub_813E2B8: @ 813E2B8
.align 2, 0
_0813E314: .4byte gTasks+0x8
_0813E318: .4byte gUnknown_203F37A
_0813E31C: .4byte gUnknown_3005E70
_0813E31C: .4byte gMultiuseListMenuTemplate
thumb_func_end sub_813E2B8
thumb_func_start sub_813E320
@@ -2726,7 +2726,7 @@ sub_813E37C: @ 813E37C
adds r0, r6, r7
ldrh r1, [r0, 0x2]
movs r0, 0x5
bl sub_809A798
bl BagGetItemIdByPocketPosition
lsls r0, 16
lsrs r4, r0, 16
adds r0, r4, 0
@@ -2736,7 +2736,7 @@ sub_813E37C: @ 813E37C
bne _0813E3D8
ldr r1, _0813E3C8 @ =gStringVar1
adds r0, r4, 0
bl sub_8099E90
bl CopyItemName
ldr r4, _0813E3CC @ =gStringVar4
ldr r1, _0813E3D0 @ =gUnknown_8416374
adds r0, r4, 0
@@ -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
@@ -2815,9 +2815,9 @@ sub_813E428: @ 813E428
bne _0813E488
ldrh r0, [r6]
ldr r1, _0813E478 @ =gStringVar1
bl sub_8099E90
bl CopyItemName
ldr r4, _0813E47C @ =gStringVar4
ldr r1, _0813E480 @ =gUnknown_84168F1
ldr r1, _0813E480 @ =gText_OhNoICantBuyThat
adds r0, r4, 0
bl StringExpandPlaceholders
bl sub_80BF8E4
@@ -2827,14 +2827,14 @@ 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
_0813E474: .4byte gSpecialVar_ItemId
_0813E478: .4byte gStringVar1
_0813E47C: .4byte gStringVar4
_0813E480: .4byte gUnknown_84168F1
_0813E480: .4byte gText_OhNoICantBuyThat
_0813E484: .4byte sub_813E2B8
_0813E488:
movs r0, 0x1
@@ -2855,9 +2855,9 @@ _0813E4A0:
_0813E4A8:
ldrh r0, [r6]
ldr r1, _0813E4D4 @ =gStringVar1
bl sub_8099E90
bl CopyItemName
ldr r4, _0813E4D8 @ =gStringVar4
ldr r1, _0813E4DC @ =gUnknown_8416911
ldr r1, _0813E4DC @ =gText_HowManyWouldYouLikeToSell
adds r0, r4, 0
bl StringExpandPlaceholders
bl sub_80BF8E4
@@ -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}
@@ -2875,7 +2875,7 @@ _0813E4CE:
.align 2, 0
_0813E4D4: .4byte gStringVar1
_0813E4D8: .4byte gStringVar4
_0813E4DC: .4byte gUnknown_8416911
_0813E4DC: .4byte gText_HowManyWouldYouLikeToSell
_0813E4E0: .4byte sub_813E5B8
thumb_func_end sub_813E428
@@ -2893,7 +2893,7 @@ sub_813E4E4: @ 813E4E4
ldr r6, _0813E544 @ =gStringVar3
ldrh r1, [r4, 0x2]
movs r0, 0x5
bl sub_809A798
bl BagGetItemIdByPocketPosition
lsls r0, 16
lsrs r0, 16
bl itemid_get_market_price
@@ -2907,7 +2907,7 @@ sub_813E4E4: @ 813E4E4
movs r3, 0x6
bl ConvertIntToDecimalStringN
ldr r4, _0813E548 @ =gStringVar4
ldr r1, _0813E54C @ =gUnknown_8416936
ldr r1, _0813E54C @ =gText_ICanPayThisMuch_WouldThatBeOkay
adds r0, r4, 0
bl StringExpandPlaceholders
bl sub_80BF8E4
@@ -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
@@ -2925,7 +2925,7 @@ sub_813E4E4: @ 813E4E4
_0813E540: .4byte gTasks+0x8
_0813E544: .4byte gStringVar3
_0813E548: .4byte gStringVar4
_0813E54C: .4byte gUnknown_8416936
_0813E54C: .4byte gText_ICanPayThisMuch_WouldThatBeOkay
_0813E550: .4byte sub_813E554
thumb_func_end sub_813E4E4
@@ -3004,7 +3004,7 @@ sub_813E5B8: @ 813E5B8
bl ConvertIntToDecimalStringN
ldr r2, _0813E65C @ =gStringVar4
mov r8, r2
ldr r1, _0813E660 @ =gUnknown_84162B9
ldr r1, _0813E660 @ =gText_TimesStrVar1
mov r0, r8
bl StringExpandPlaceholders
movs r0, 0xA
@@ -3024,7 +3024,7 @@ sub_813E5B8: @ 813E5B8
mov r3, r9
ldrh r1, [r3, 0x2]
movs r0, 0x5
bl sub_809A798
bl BagGetItemIdByPocketPosition
lsls r0, 16
lsrs r0, 16
bl itemid_get_market_price
@@ -3052,7 +3052,7 @@ sub_813E5B8: @ 813E5B8
_0813E654: .4byte gTasks+0x8
_0813E658: .4byte gStringVar1
_0813E65C: .4byte gStringVar4
_0813E660: .4byte gUnknown_84162B9
_0813E660: .4byte gText_TimesStrVar1
_0813E664: .4byte sub_813E690
thumb_func_end sub_813E5B8
@@ -3103,7 +3103,7 @@ sub_813E690: @ 813E690
bl sub_813D9F8
ldrh r1, [r5, 0x2]
movs r0, 0x5
bl sub_809A798
bl BagGetItemIdByPocketPosition
lsls r0, 16
lsrs r0, 16
bl itemid_get_market_price
@@ -3188,11 +3188,11 @@ sub_813E768: @ 813E768
ldr r0, _0813E7D8 @ =gSpecialVar_ItemId
ldrh r0, [r0]
ldr r1, _0813E7DC @ =gStringVar1
bl sub_8099E90
bl CopyItemName
ldr r6, _0813E7E0 @ =gStringVar3
ldrh r1, [r4, 0x2]
movs r0, 0x5
bl sub_809A798
bl BagGetItemIdByPocketPosition
lsls r0, 16
lsrs r0, 16
bl itemid_get_market_price
@@ -3206,14 +3206,14 @@ sub_813E768: @ 813E768
movs r3, 0x6
bl ConvertIntToDecimalStringN
ldr r4, _0813E7E4 @ =gStringVar4
ldr r1, _0813E7E8 @ =gUnknown_8416959
ldr r1, _0813E7E8 @ =gText_TurnedOverItemsWorthYen
adds r0, r4, 0
bl StringExpandPlaceholders
ldr r3, _0813E7EC @ =sub_813E7F0
adds r0, r5, 0
movs r1, 0x2
adds r2, r4, 0
bl sub_813EB20
bl DisplayItemMessageInBerryPouch
pop {r4-r6}
pop {r0}
bx r0
@@ -3223,7 +3223,7 @@ _0813E7D8: .4byte gSpecialVar_ItemId
_0813E7DC: .4byte gStringVar1
_0813E7E0: .4byte gStringVar3
_0813E7E4: .4byte gStringVar4
_0813E7E8: .4byte gUnknown_8416959
_0813E7E8: .4byte gText_TurnedOverItemsWorthYen
_0813E7EC: .4byte sub_813E7F0
thumb_func_end sub_813E768
@@ -3250,7 +3250,7 @@ sub_813E7F0: @ 813E7F0
ldrh r0, [r5]
mov r2, r8
ldrh r1, [r2, 0x10]
bl sub_809A1D8
bl RemoveBagItem
ldr r7, _0813E8C4 @ =gSaveBlock1Ptr
ldr r4, [r7]
movs r3, 0xA4
@@ -3277,11 +3277,11 @@ sub_813E7F0: @ 813E7F0
ldr r4, _0813E8C8 @ =gUnknown_203F37A
subs r2, r4, 0x2
adds r1, r4, 0
bl sub_810713C
bl DestroyListMenu
bl sub_813D8AC
bl sub_813D6F4
bl sub_813D204
ldr r0, _0813E8CC @ =gUnknown_3005E70
ldr r0, _0813E8CC @ =gMultiuseListMenuTemplate
subs r4, 0xA
ldrh r1, [r4, 0xA]
ldrh r2, [r4, 0x8]
@@ -3322,7 +3322,7 @@ _0813E8BC: .4byte gTasks+0x8
_0813E8C0: .4byte gSpecialVar_ItemId
_0813E8C4: .4byte gSaveBlock1Ptr
_0813E8C8: .4byte gUnknown_203F37A
_0813E8CC: .4byte gUnknown_3005E70
_0813E8CC: .4byte gMultiuseListMenuTemplate
_0813E8D0: .4byte sub_813E8D4
thumb_func_end sub_813E7F0
@@ -3367,16 +3367,16 @@ 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_SetBubbleFrame_841F1C8
movs r0, 0
movs r1, 0xA
movs r2, 0xC0
bl sub_814FF2C
ldr r0, _0813E998 @ =gUnknown_841F408
bl TextWindow_SetStdFrame0_WithPal
ldr r0, _0813E998 @ =gTMCaseMainWindowPalette
movs r1, 0xF0
movs r2, 0x20
bl LoadPalette
@@ -3418,7 +3418,7 @@ _0813E97C:
bx r0
.align 2, 0
_0813E994: .4byte gUnknown_84643B8
_0813E998: .4byte gUnknown_841F408
_0813E998: .4byte gTMCaseMainWindowPalette
_0813E99C: .4byte gUnknown_203F38C
thumb_func_end sub_813E910
@@ -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
@@ -3562,7 +3562,7 @@ sub_813EA98: @ 813EA98
adds r4, r0
ldrb r0, [r4]
movs r1, 0
bl sub_810F4D8
bl ClearMenuWindow
ldrb r0, [r4]
bl ClearWindowTilemap
ldrb r0, [r4]
@@ -3589,7 +3589,7 @@ sub_813EACC: @ 813EACC
cmp r0, 0xFF
beq _0813EB04
movs r1, 0
bl sub_810F260
bl ClearMenuWindow_BorderThickness2
ldrb r0, [r4]
bl ClearWindowTilemap
ldrb r0, [r4]
@@ -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}
@@ -3642,7 +3642,7 @@ sub_813EB20: @ 813EB20
bl AddWindow
strb r0, [r4, 0x5]
_0813EB44:
bl sub_80F78A8
bl GetTextSpeedSetting
lsls r0, 24
lsrs r0, 24
ldrb r1, [r4, 0x5]
@@ -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
@@ -3685,7 +3685,7 @@ sub_813EB7C: @ 813EB7C
str r3, [sp, 0xC]
movs r2, 0x2
movs r3, 0
bl sub_80BF5D0
bl CreateYesNoMenuWithCallbacks
add sp, 0x10
pop {r0}
bx r0
@@ -3710,7 +3710,7 @@ sub_813EBA8: @ 813EBA8
str r3, [sp, 0xC]
movs r2, 0x2
movs r3, 0
bl sub_80BF5D0
bl CreateYesNoMenuWithCallbacks
add sp, 0x10
pop {r0}
bx r0
asm/bike.s
+7 -7
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
@@ -738,21 +738,21 @@ _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
beq _080BD618
adds r0, r4, 0
bl sub_8055E78
bl Overworld_SetSavedMusic
adds r0, r4, 0
bl sub_8055F48
bl Overworld_ChangeMusicTo
_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/blend_palette.s
-186
View File
@@ -1,186 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start BlendPalette
BlendPalette: @ 8045274
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x4
lsls r0, 16
lsrs r0, 16
mov r8, r0
lsls r1, 16
lsrs r1, 16
mov r12, r1
lsls r2, 24
lsrs r7, r2, 24
mov r0, sp
strh r3, [r0]
movs r6, 0
cmp r6, r12
bcs _080452FA
ldr r0, _0804530C @ =gPlttBufferUnfaded
mov r10, r0
ldr r1, _08045310 @ =gPlttBufferFaded
mov r9, r1
_080452A2:
mov r0, r8
adds r5, r6, r0
lsls r5, 16
lsrs r5, 15
mov r1, r10
adds r0, r5, r1
ldr r3, [r0]
lsls r4, r3, 27
lsls r2, r3, 22
lsls r3, 17
add r5, r9
lsrs r4, 27
ldr r1, [sp]
lsls r0, r1, 27
lsrs r0, 27
subs r0, r4
muls r0, r7
asrs r0, 4
adds r4, r0
lsrs r2, 27
lsls r0, r1, 22
lsrs r0, 27
subs r0, r2
muls r0, r7
asrs r0, 4
adds r2, r0
lsls r2, 5
orrs r4, r2
lsrs r3, 27
lsls r1, 17
lsrs r1, 27
subs r1, r3
adds r0, r1, 0
muls r0, r7
asrs r0, 4
adds r3, r0
lsls r3, 10
orrs r4, r3
strh r4, [r5]
adds r0, r6, 0x1
lsls r0, 16
lsrs r6, r0, 16
cmp r6, r12
bcc _080452A2
_080452FA:
add sp, 0x4
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_0804530C: .4byte gPlttBufferUnfaded
_08045310: .4byte gPlttBufferFaded
thumb_func_end BlendPalette
thumb_func_start sub_8045314
sub_8045314: @ 8045314
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
adds r5, r0, 0
adds r6, r2, 0
adds r4, r3, 0
lsls r1, 16
lsrs r2, r1, 16
cmp r6, 0x10
bne _08045342
subs r4, 0x1
movs r0, 0x1
negs r0, r0
cmp r4, r0
beq _080453B2
_08045336:
strh r2, [r5]
adds r5, 0x2
subs r4, 0x1
cmp r4, r0
bne _08045336
b _080453B2
_08045342:
movs r0, 0x1F
movs r3, 0x1F
mov r9, r3
mov r7, r9
ands r7, r2
mov r9, r7
lsrs r2, r1, 21
ands r2, r0
mov r12, r2
lsrs r1, 26
mov r10, r1
mov r3, r10
ands r3, r0
mov r10, r3
subs r4, 0x1
movs r0, 0x1
negs r0, r0
cmp r4, r0
beq _080453B2
movs r7, 0x1F
mov r8, r7
_0804536C:
ldrh r2, [r5]
movs r3, 0x1F
ands r3, r2
lsls r2, 16
lsrs r1, r2, 21
mov r0, r8
ands r1, r0
lsrs r2, 26
ands r2, r0
mov r7, r9
subs r0, r7, r3
muls r0, r6
lsrs r0, 4
adds r3, r0
mov r7, r12
subs r0, r7, r1
muls r0, r6
lsrs r0, 4
adds r1, r0
lsls r1, 5
orrs r3, r1
mov r1, r10
subs r0, r1, r2
muls r0, r6
lsrs r0, 4
adds r2, r0
lsls r2, 10
orrs r3, r2
strh r3, [r5]
adds r5, 0x2
subs r4, 0x1
movs r0, 0x1
negs r0, r0
cmp r4, r0
bne _0804536C
_080453B2:
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_8045314
.align 2, 0 @ Don't pad with nop.
asm/blit.s
-813
View File
@@ -1,813 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start BlitBitmapRect4BitWithoutColorKey
BlitBitmapRect4BitWithoutColorKey: @ 8004A60
push {r4-r7,lr}
mov r7, r8
push {r7}
sub sp, 0x14
ldr r4, [sp, 0x2C]
ldr r5, [sp, 0x30]
ldr r6, [sp, 0x34]
ldr r7, [sp, 0x38]
lsls r2, 16
lsrs r2, 16
lsls r3, 16
lsrs r3, 16
lsls r4, 16
lsrs r4, 16
lsls r5, 16
lsrs r5, 16
lsls r6, 16
lsrs r6, 16
lsls r7, 16
lsrs r7, 16
str r4, [sp]
str r5, [sp, 0x4]
str r6, [sp, 0x8]
str r7, [sp, 0xC]
movs r4, 0xFF
str r4, [sp, 0x10]
bl BlitBitmapRect4Bit
add sp, 0x14
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end BlitBitmapRect4BitWithoutColorKey
thumb_func_start BlitBitmapRect4Bit
BlitBitmapRect4Bit: @ 8004AA4
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x2C
str r0, [sp]
str r1, [sp, 0x4]
ldr r0, [sp, 0x4C]
ldr r1, [sp, 0x50]
ldr r4, [sp, 0x54]
ldr r5, [sp, 0x58]
ldr r6, [sp, 0x5C]
lsls r2, 16
lsrs r2, 16
str r2, [sp, 0x8]
lsls r3, 16
lsrs r7, r3, 16
lsls r0, 16
lsrs r0, 16
str r0, [sp, 0xC]
lsls r1, 16
lsrs r1, 16
mov r9, r1
lsls r4, 16
lsrs r4, 16
lsls r5, 16
lsrs r5, 16
lsls r6, 24
lsrs r6, 24
str r6, [sp, 0x10]
ldr r0, [sp, 0x4]
ldrh r3, [r0, 0x4]
ldr r1, [sp, 0xC]
subs r0, r3, r1
adds r2, r4
mov r8, r2
cmp r0, r4
bge _08004AF8
ldr r2, [sp, 0x8]
adds r0, r2
mov r8, r0
_08004AF8:
ldr r4, [sp, 0x4]
ldrh r0, [r4, 0x6]
mov r1, r9
subs r0, r1
adds r2, r5, r7
str r2, [sp, 0x14]
cmp r0, r5
bge _08004B0C
adds r0, r7
str r0, [sp, 0x14]
_08004B0C:
ldr r4, [sp]
ldrh r1, [r4, 0x4]
movs r2, 0x7
adds r0, r1, 0
ands r0, r2
adds r1, r0
asrs r1, 3
str r1, [sp, 0x18]
adds r0, r3, 0
ands r0, r2
adds r0, r3, r0
asrs r0, 3
str r0, [sp, 0x1C]
ldr r0, [sp, 0x10]
cmp r0, 0xFF
bne _08004BCA
adds r3, r7, 0
mov r1, r9
ldr r2, [sp, 0x14]
cmp r3, r2
blt _08004B38
b _08004C72
_08004B38:
ldr r5, [sp, 0x8]
ldr r6, [sp, 0xC]
adds r4, r3, 0x1
str r4, [sp, 0x24]
adds r0, r1, 0x1
str r0, [sp, 0x28]
cmp r5, r8
bge _08004BBE
movs r7, 0x3
asrs r0, r3, 3
ldr r2, [sp, 0x18]
muls r0, r2
lsls r0, 5
mov r10, r0
lsls r0, r3, 29
lsrs r0, 27
mov r9, r0
asrs r0, r1, 3
ldr r4, [sp, 0x1C]
muls r0, r4
lsls r0, 5
mov r12, r0
lsls r0, r1, 29
lsrs r3, r0, 27
_08004B68:
asrs r0, r5, 1
ands r0, r7
ldr r2, [sp]
ldr r1, [r2]
adds r1, r0
asrs r0, r5, 3
lsls r0, 5
adds r1, r0
add r1, r10
mov r4, r9
adds r2, r1, r4
asrs r0, r6, 1
ands r0, r7
ldr r4, [sp, 0x4]
ldr r1, [r4]
adds r1, r0
asrs r0, r6, 3
lsls r0, 5
adds r1, r0
add r1, r12
adds r4, r1, r3
ldrb r2, [r2]
adds r0, r5, 0
movs r1, 0x1
ands r0, r1
lsls r0, 2
asrs r2, r0
movs r0, 0xF
ands r2, r0
adds r0, r6, 0
ands r0, r1
lsls r1, r0, 2
lsls r2, r1
movs r0, 0xF0
asrs r0, r1
ldrb r1, [r4]
ands r0, r1
orrs r2, r0
strb r2, [r4]
adds r5, 0x1
adds r6, 0x1
cmp r5, r8
blt _08004B68
_08004BBE:
ldr r3, [sp, 0x24]
ldr r1, [sp, 0x28]
ldr r2, [sp, 0x14]
cmp r3, r2
blt _08004B38
b _08004C72
_08004BCA:
adds r3, r7, 0
mov r1, r9
ldr r4, [sp, 0x14]
cmp r3, r4
bge _08004C72
_08004BD4:
ldr r5, [sp, 0x8]
ldr r6, [sp, 0xC]
adds r0, r3, 0x1
str r0, [sp, 0x24]
adds r2, r1, 0x1
str r2, [sp, 0x28]
cmp r5, r8
bge _08004C68
movs r4, 0x3
mov r9, r4
asrs r0, r3, 3
ldr r2, [sp, 0x18]
muls r0, r2
lsls r0, 5
str r0, [sp, 0x20]
lsls r0, r3, 29
lsrs r0, 27
mov r10, r0
movs r3, 0x1
asrs r0, r1, 3
ldr r4, [sp, 0x1C]
muls r0, r4
lsls r0, 5
mov r12, r0
lsls r0, r1, 29
lsrs r7, r0, 27
_08004C08:
asrs r0, r5, 1
mov r1, r9
ands r0, r1
ldr r2, [sp]
ldr r1, [r2]
adds r1, r0
asrs r0, r5, 3
lsls r0, 5
adds r1, r0
ldr r4, [sp, 0x20]
adds r1, r4
mov r0, r10
adds r2, r1, r0
asrs r0, r6, 1
mov r1, r9
ands r0, r1
ldr r4, [sp, 0x4]
ldr r1, [r4]
adds r1, r0
asrs r0, r6, 3
lsls r0, 5
adds r1, r0
add r1, r12
adds r4, r1, r7
ldrb r2, [r2]
adds r0, r5, 0
ands r0, r3
lsls r0, 2
asrs r2, r0
movs r0, 0xF
ands r2, r0
ldr r0, [sp, 0x10]
cmp r2, r0
beq _08004C60
adds r0, r6, 0
ands r0, r3
lsls r1, r0, 2
lsls r2, r1
movs r0, 0xF0
asrs r0, r1
ldrb r1, [r4]
ands r0, r1
orrs r2, r0
strb r2, [r4]
_08004C60:
adds r5, 0x1
adds r6, 0x1
cmp r5, r8
blt _08004C08
_08004C68:
ldr r3, [sp, 0x24]
ldr r1, [sp, 0x28]
ldr r2, [sp, 0x14]
cmp r3, r2
blt _08004BD4
_08004C72:
add sp, 0x2C
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end BlitBitmapRect4Bit
thumb_func_start FillBitmapRect4Bit
FillBitmapRect4Bit: @ 8004C84
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x4
mov r9, r0
ldr r0, [sp, 0x24]
ldr r4, [sp, 0x28]
lsls r1, 16
lsrs r1, 16
mov r10, r1
lsls r2, 16
lsrs r2, 16
adds r5, r2, 0
lsls r3, 16
lsrs r3, 16
lsls r0, 16
lsrs r0, 16
lsls r4, 24
lsrs r7, r4, 24
adds r4, r1, r3
mov r3, r9
ldrh r1, [r3, 0x4]
cmp r4, r1
ble _08004CBA
adds r4, r1, 0
_08004CBA:
adds r2, r0
mov r12, r2
mov r2, r9
ldrh r0, [r2, 0x6]
cmp r12, r0
ble _08004CC8
mov r12, r0
_08004CC8:
movs r0, 0x7
ands r0, r1
adds r0, r1, r0
asrs r0, 3
str r0, [sp]
adds r1, r5, 0
cmp r1, r12
bge _08004D30
_08004CD8:
mov r3, r10
adds r0, r1, 0x1
mov r8, r0
cmp r3, r4
bge _08004D2A
asrs r0, r1, 3
ldr r2, [sp]
muls r0, r2
lsls r6, r0, 5
lsls r0, r1, 29
lsrs r5, r0, 27
_08004CEE:
asrs r2, r3, 1
movs r0, 0x3
ands r2, r0
mov r0, r9
ldr r1, [r0]
adds r1, r2
asrs r0, r3, 3
lsls r0, 5
adds r1, r0
adds r1, r6
adds r2, r1, r5
movs r0, 0x1
ands r0, r3
cmp r0, 0
beq _08004D1A
ldrb r0, [r2]
movs r1, 0xF
ands r1, r0
lsls r0, r7, 4
orrs r1, r0
strb r1, [r2]
b _08004D24
_08004D1A:
ldrb r1, [r2]
movs r0, 0xF0
ands r0, r1
orrs r0, r7
strb r0, [r2]
_08004D24:
adds r3, 0x1
cmp r3, r4
blt _08004CEE
_08004D2A:
mov r1, r8
cmp r1, r12
blt _08004CD8
_08004D30:
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 FillBitmapRect4Bit
thumb_func_start BlitBitmapRect4BitTo8Bit
BlitBitmapRect4BitTo8Bit: @ 8004D40
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x3C
str r0, [sp]
str r1, [sp, 0x4]
ldr r0, [sp, 0x5C]
ldr r1, [sp, 0x60]
ldr r5, [sp, 0x64]
ldr r4, [sp, 0x68]
ldr r6, [sp, 0x6C]
ldr r7, [sp, 0x70]
mov r8, r7
lsls r2, 16
lsrs r2, 16
str r2, [sp, 0x8]
lsls r3, 16
lsrs r3, 16
lsls r0, 16
lsrs r0, 16
str r0, [sp, 0xC]
lsls r1, 16
lsrs r7, r1, 16
lsls r5, 16
lsrs r5, 16
lsls r4, 16
lsrs r4, 16
lsls r6, 24
lsrs r6, 24
str r6, [sp, 0x10]
mov r0, r8
lsls r0, 28
lsrs r0, 24
str r0, [sp, 0x14]
lsls r0, r6, 28
lsrs r0, 24
str r0, [sp, 0x28]
ldr r1, [sp, 0x4]
ldrh r0, [r1, 0x4]
ldr r2, [sp, 0xC]
subs r0, r2
ldr r1, [sp, 0x8]
adds r1, r5, r1
str r1, [sp, 0x18]
cmp r0, r5
bge _08004DA6
ldr r2, [sp, 0x8]
adds r0, r2
str r0, [sp, 0x18]
_08004DA6:
ldr r5, [sp, 0x4]
ldrh r1, [r5, 0x6]
subs r0, r1, r7
cmp r0, r4
bge _08004DB8
adds r0, r3, r1
subs r0, r7
str r0, [sp, 0x1C]
b _08004DBC
_08004DB8:
adds r4, r3, r4
str r4, [sp, 0x1C]
_08004DBC:
ldr r0, [sp]
ldrh r1, [r0, 0x4]
movs r2, 0x7
adds r0, r1, 0
ands r0, r2
adds r1, r0
asrs r1, 3
str r1, [sp, 0x20]
ldr r5, [sp, 0x4]
ldrh r1, [r5, 0x4]
adds r0, r1, 0
ands r0, r2
adds r1, r0
asrs r1, 3
str r1, [sp, 0x24]
ldr r0, [sp, 0x10]
cmp r0, 0xFF
bne _08004E9C
adds r2, r3, 0
adds r5, r7, 0
ldr r1, [sp, 0x1C]
cmp r2, r1
blt _08004DEC
b _08004F7E
_08004DEC:
ldr r3, [sp, 0x8]
lsrs r3, 1
str r3, [sp, 0x2C]
movs r0, 0x3
ands r3, r0
str r3, [sp, 0x2C]
ldr r7, [sp, 0x8]
lsrs r0, r7, 3
lsls r0, 5
str r0, [sp, 0x30]
_08004E00:
ldr r0, [sp]
ldr r1, [r0]
ldr r3, [sp, 0x2C]
adds r1, r3
ldr r7, [sp, 0x30]
adds r1, r7
asrs r0, r2, 3
ldr r3, [sp, 0x20]
muls r0, r3
lsls r0, 5
mov r8, r0
add r1, r8
lsls r0, r2, 29
lsrs r7, r0, 27
adds r6, r1, r7
ldr r3, [sp, 0x8]
ldr r4, [sp, 0xC]
adds r2, 0x1
mov r10, r2
adds r0, r5, 0x1
str r0, [sp, 0x38]
ldr r1, [sp, 0x18]
cmp r3, r1
bge _08004E90
asrs r0, r5, 3
ldr r2, [sp, 0x24]
muls r0, r2
lsls r0, 6
mov r12, r0
lsls r0, r5, 29
lsrs r0, 26
mov r9, r0
_08004E40:
movs r0, 0x7
ands r0, r4
ldr r5, [sp, 0x4]
ldr r1, [r5]
adds r1, r0
asrs r0, r4, 3
lsls r0, 6
adds r1, r0
add r1, r12
mov r0, r9
adds r5, r1, r0
movs r0, 0x1
ands r0, r3
cmp r0, 0
beq _08004E64
ldrb r0, [r6]
lsrs r0, 4
b _08004E80
_08004E64:
asrs r2, r3, 1
movs r0, 0x3
ands r2, r0
ldr r0, [sp]
ldr r1, [r0]
adds r1, r2
asrs r0, r3, 3
lsls r0, 5
adds r1, r0
add r1, r8
adds r6, r1, r7
ldrb r1, [r6]
movs r0, 0xF
ands r0, r1
_08004E80:
ldr r1, [sp, 0x14]
adds r0, r1, r0
strb r0, [r5]
adds r3, 0x1
adds r4, 0x1
ldr r2, [sp, 0x18]
cmp r3, r2
blt _08004E40
_08004E90:
mov r2, r10
ldr r5, [sp, 0x38]
ldr r3, [sp, 0x1C]
cmp r2, r3
blt _08004E00
b _08004F7E
_08004E9C:
adds r2, r3, 0
adds r5, r7, 0
ldr r7, [sp, 0x1C]
cmp r2, r7
bge _08004F7E
ldr r0, [sp, 0x8]
lsrs r0, 1
str r0, [sp, 0x34]
movs r0, 0x3
ldr r1, [sp, 0x34]
ands r1, r0
str r1, [sp, 0x34]
_08004EB4:
ldr r3, [sp]
ldr r1, [r3]
ldr r7, [sp, 0x34]
adds r1, r7
ldr r3, [sp, 0x8]
lsrs r0, r3, 3
lsls r0, 5
adds r1, r0
asrs r0, r2, 3
ldr r7, [sp, 0x20]
muls r0, r7
lsls r0, 5
mov r8, r0
add r1, r8
lsls r0, r2, 29
lsrs r7, r0, 27
adds r6, r1, r7
ldr r4, [sp, 0xC]
adds r2, 0x1
mov r10, r2
adds r0, r5, 0x1
str r0, [sp, 0x38]
ldr r1, [sp, 0x18]
cmp r3, r1
bge _08004F74
asrs r0, r5, 3
ldr r2, [sp, 0x24]
muls r0, r2
lsls r0, 6
mov r9, r0
lsls r0, r5, 29
lsrs r0, 26
mov r12, r0
_08004EF6:
movs r0, 0x1
ands r0, r3
cmp r0, 0
beq _08004F2A
ldrb r2, [r6]
movs r0, 0xF0
ands r0, r2
ldr r5, [sp, 0x28]
cmp r0, r5
beq _08004F6A
adds r0, r4, 0
movs r1, 0x7
ands r0, r1
ldr r5, [sp, 0x4]
ldr r1, [r5]
adds r1, r0
asrs r0, r4, 3
lsls r0, 6
adds r1, r0
add r1, r9
mov r0, r12
adds r5, r1, r0
lsrs r0, r2, 4
ldr r1, [sp, 0x14]
adds r0, r1, r0
b _08004F68
_08004F2A:
asrs r2, r3, 1
movs r0, 0x3
ands r2, r0
ldr r5, [sp]
ldr r1, [r5]
adds r1, r2
asrs r0, r3, 3
lsls r0, 5
adds r1, r0
add r1, r8
adds r6, r1, r7
ldrb r0, [r6]
movs r2, 0xF
ands r2, r0
ldr r0, [sp, 0x10]
cmp r2, r0
beq _08004F6A
adds r0, r4, 0
movs r1, 0x7
ands r0, r1
ldr r5, [sp, 0x4]
ldr r1, [r5]
adds r1, r0
asrs r0, r4, 3
lsls r0, 6
adds r1, r0
add r1, r9
mov r0, r12
adds r5, r1, r0
ldr r1, [sp, 0x14]
adds r0, r1, r2
_08004F68:
strb r0, [r5]
_08004F6A:
adds r3, 0x1
adds r4, 0x1
ldr r2, [sp, 0x18]
cmp r3, r2
blt _08004EF6
_08004F74:
mov r2, r10
ldr r5, [sp, 0x38]
ldr r3, [sp, 0x1C]
cmp r2, r3
blt _08004EB4
_08004F7E:
add sp, 0x3C
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end BlitBitmapRect4BitTo8Bit
thumb_func_start FillBitmapRect8Bit
FillBitmapRect8Bit: @ 8004F90
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x8
mov r8, r0
ldr r0, [sp, 0x28]
ldr r4, [sp, 0x2C]
lsls r1, 16
lsrs r1, 16
mov r10, r1
lsls r2, 16
lsrs r2, 16
adds r6, r2, 0
lsls r3, 16
lsrs r3, 16
lsls r0, 16
lsrs r0, 16
lsls r4, 24
lsrs r4, 24
mov r9, r4
adds r5, r1, r3
mov r3, r8
ldrh r1, [r3, 0x4]
cmp r5, r1
ble _08004FC8
adds r5, r1, 0
_08004FC8:
adds r7, r2, r0
mov r2, r8
ldrh r0, [r2, 0x6]
cmp r7, r0
ble _08004FD4
adds r7, r0, 0
_08004FD4:
movs r0, 0x7
ands r0, r1
adds r0, r1, r0
asrs r0, 3
str r0, [sp]
adds r1, r6, 0
cmp r1, r7
bge _08005024
_08004FE4:
mov r3, r10
adds r6, r1, 0x1
str r6, [sp, 0x4]
cmp r3, r5
bge _0800501E
movs r0, 0x7
mov r12, r0
asrs r0, r1, 3
ldr r2, [sp]
muls r0, r2
lsls r4, r0, 6
lsls r0, r1, 29
lsrs r2, r0, 26
_08004FFE:
adds r0, r3, 0
mov r6, r12
ands r0, r6
mov r6, r8
ldr r1, [r6]
adds r1, r0
asrs r0, r3, 3
lsls r0, 6
adds r1, r0
adds r1, r4
adds r1, r2
mov r0, r9
strb r0, [r1]
adds r3, 0x1
cmp r3, r5
blt _08004FFE
_0800501E:
ldr r1, [sp, 0x4]
cmp r1, r7
blt _08004FE4
_08005024:
add sp, 0x8
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end FillBitmapRect8Bit
.align 2, 0 @ Don't pad with nop.
asm/braille_text.s
-587
View File
@@ -5,591 +5,4 @@
.text
thumb_func_start Font6Func
Font6Func: @ 814F884
push {r4-r6,lr}
adds r6, r0, 0
adds r4, r6, 0
adds r4, 0x14
ldrb r0, [r6, 0x1C]
cmp r0, 0x6
bls _0814F894
b _0814FC94
_0814F894:
lsls r0, 2
ldr r1, _0814F8A0 @ =_0814F8A4
adds r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_0814F8A0: .4byte _0814F8A4
.align 2, 0
_0814F8A4:
.4byte _0814F8C0
.4byte _0814FB88
.4byte _0814FB9A
.4byte _0814FBC4
.4byte _0814FBFC
.4byte _0814FC70
.4byte _0814FC82
_0814F8C0:
ldr r2, _0814F914 @ =gMain
ldrh r1, [r2, 0x2C]
movs r0, 0x3
ands r0, r1
cmp r0, 0
beq _0814F8DA
ldrb r1, [r4]
movs r0, 0x10
ands r0, r1
cmp r0, 0
beq _0814F8DA
movs r0, 0
strb r0, [r6, 0x1E]
_0814F8DA:
ldrb r1, [r6, 0x1E]
cmp r1, 0
beq _0814F91C
ldrb r0, [r6, 0x1D]
cmp r0, 0
beq _0814F91C
subs r0, r1, 0x1
strb r0, [r6, 0x1E]
ldr r0, _0814F918 @ =gTextFlags
ldrb r1, [r0]
movs r0, 0x1
ands r0, r1
cmp r0, 0
bne _0814F8F8
b _0814FB42
_0814F8F8:
ldrh r1, [r2, 0x2E]
movs r0, 0x3
ands r0, r1
cmp r0, 0
bne _0814F904
b _0814FB42
_0814F904:
ldrb r0, [r4]
movs r1, 0x10
orrs r0, r1
strb r0, [r4]
movs r0, 0
strb r0, [r6, 0x1E]
b _0814FB42
.align 2, 0
_0814F914: .4byte gMain
_0814F918: .4byte gTextFlags
_0814F91C:
ldr r2, _0814F92C @ =gTextFlags
ldrb r1, [r2]
movs r0, 0x4
ands r0, r1
cmp r0, 0
beq _0814F930
movs r0, 0x1
b _0814F932
.align 2, 0
_0814F92C: .4byte gTextFlags
_0814F930:
ldrb r0, [r6, 0x1D]
_0814F932:
strb r0, [r6, 0x1E]
ldr r0, [r6]
ldrb r3, [r0]
adds r0, 0x1
str r0, [r6]
adds r0, r3, 0
subs r0, 0xF8
cmp r0, 0x7
bls _0814F946
b _0814FB62
_0814F946:
lsls r0, 2
ldr r1, _0814F950 @ =_0814F954
adds r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_0814F950: .4byte _0814F954
.align 2, 0
_0814F954:
.4byte _0814FB58
.4byte _0814FB46
.4byte _0814FB38
.4byte _0814FB34
.4byte _0814F9A2
.4byte _0814F99C
.4byte _0814F974
.4byte _0814FC94
_0814F974:
ldrb r0, [r6, 0x6]
strb r0, [r6, 0x8]
ldrb r1, [r6, 0x5]
ldr r0, _0814F998 @ =gFonts
ldr r2, [r0]
lsls r0, r1, 1
adds r0, r1
lsls r0, 2
adds r0, r2
ldrb r1, [r6, 0xB]
ldrb r0, [r0, 0x5]
adds r1, r0
ldrb r0, [r6, 0x9]
adds r0, r1
strb r0, [r6, 0x9]
_0814F992:
movs r0, 0x2
b _0814FC96
.align 2, 0
_0814F998: .4byte gFonts
_0814F99C:
ldr r0, [r6]
adds r0, 0x1
b _0814FAF8
_0814F9A2:
ldr r0, [r6]
ldrb r3, [r0]
adds r0, 0x1
str r0, [r6]
subs r0, r3, 0x1
cmp r0, 0xF
bls _0814F9B2
b _0814FB62
_0814F9B2:
lsls r0, 2
ldr r1, _0814F9BC @ =_0814F9C0
adds r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_0814F9BC: .4byte _0814F9C0
.align 2, 0
_0814F9C0:
.4byte _0814FA00
.4byte _0814FA22
.4byte _0814FA46
.4byte _0814FA60
.4byte _0814FAAC
.4byte _0814FAB2
.4byte _0814F992
.4byte _0814FACC
.4byte _0814FADC
.4byte _0814FAF0
.4byte _0814FAF4
.4byte _0814FAFC
.4byte _0814FB06
.4byte _0814FB12
.4byte _0814FB22
.4byte _0814FAF4
_0814FA00:
ldr r2, [r6]
ldrb r1, [r2]
lsls r1, 4
ldrb r3, [r6, 0xC]
movs r0, 0xF
ands r0, r3
orrs r0, r1
strb r0, [r6, 0xC]
adds r2, 0x1
str r2, [r6]
lsls r0, 24
lsrs r0, 28
ldrb r2, [r6, 0xD]
lsls r1, r2, 28
lsrs r1, 28
lsrs r2, 4
b _0814FAA6
_0814FA22:
ldr r1, [r6]
ldrb r2, [r1]
movs r0, 0xF
ands r0, r2
ldrb r3, [r6, 0xD]
movs r2, 0x10
negs r2, r2
ands r2, r3
orrs r2, r0
strb r2, [r6, 0xD]
adds r1, 0x1
str r1, [r6]
ldrb r0, [r6, 0xC]
lsrs r0, 4
lsls r1, r2, 28
lsrs r1, 28
lsrs r2, 4
b _0814FAA6
_0814FA46:
ldr r1, [r6]
ldrb r0, [r1]
lsls r0, 4
ldrb r3, [r6, 0xD]
movs r2, 0xF
ands r2, r3
orrs r2, r0
strb r2, [r6, 0xD]
adds r1, 0x1
str r1, [r6]
ldrb r0, [r6, 0xC]
lsrs r0, 4
b _0814FA9E
_0814FA60:
ldr r3, [r6]
ldrb r1, [r3]
lsls r1, 4
ldrb r4, [r6, 0xC]
movs r2, 0xF
adds r0, r2, 0
ands r0, r4
orrs r0, r1
strb r0, [r6, 0xC]
adds r5, r3, 0x1
str r5, [r6]
ldrb r3, [r3, 0x1]
adds r1, r2, 0
ands r1, r3
ldrb r4, [r6, 0xD]
movs r3, 0x10
negs r3, r3
ands r3, r4
orrs r3, r1
strb r3, [r6, 0xD]
adds r4, r5, 0x1
str r4, [r6]
ldrb r1, [r5, 0x1]
lsls r1, 4
ands r2, r3
orrs r2, r1
strb r2, [r6, 0xD]
adds r4, 0x1
str r4, [r6]
lsls r0, 24
lsrs r0, 28
_0814FA9E:
lsls r1, r2, 28
lsrs r1, 28
lsls r2, 24
lsrs r2, 28
_0814FAA6:
bl GenerateFontHalfRowLookupTable
b _0814F992
_0814FAAC:
ldr r0, [r6]
adds r0, 0x1
b _0814FAF8
_0814FAB2:
ldr r0, [r6]
ldrb r0, [r0]
movs r1, 0xF
ands r1, r0
ldrb r2, [r4]
movs r0, 0x10
negs r0, r0
ands r0, r2
orrs r0, r1
strb r0, [r4]
ldr r0, [r6]
adds r0, 0x1
b _0814FAF8
_0814FACC:
ldr r0, [r6]
ldrb r1, [r0]
strb r1, [r6, 0x1E]
adds r0, 0x1
str r0, [r6]
movs r0, 0x6
strb r0, [r6, 0x1C]
b _0814F992
_0814FADC:
movs r0, 0x1
strb r0, [r6, 0x1C]
ldrb r1, [r2]
movs r0, 0x4
ands r0, r1
cmp r0, 0
beq _0814FB42
movs r0, 0
strb r0, [r4, 0x2]
b _0814FB42
_0814FAF0:
movs r0, 0x5
b _0814FC7E
_0814FAF4:
ldr r0, [r6]
adds r0, 0x2
_0814FAF8:
str r0, [r6]
b _0814F992
_0814FAFC:
ldr r1, [r6]
adds r0, r1, 0x1
str r0, [r6]
ldrb r3, [r1, 0x1]
b _0814FB62
_0814FB06:
ldr r1, [r6]
ldrb r0, [r1]
ldrb r2, [r6, 0x6]
adds r0, r2
strb r0, [r6, 0x8]
b _0814FB1C
_0814FB12:
ldr r1, [r6]
ldrb r0, [r1]
ldrb r2, [r6, 0x7]
adds r0, r2
strb r0, [r6, 0x9]
_0814FB1C:
adds r1, 0x1
str r1, [r6]
b _0814F992
_0814FB22:
ldrb r0, [r6, 0x4]
ldrb r2, [r6, 0xD]
lsls r2, 28
lsrs r1, r2, 4
orrs r1, r2
lsrs r1, 24
bl FillWindowPixelBuffer
b _0814F992
_0814FB34:
movs r0, 0x2
b _0814FB3A
_0814FB38:
movs r0, 0x3
_0814FB3A:
strb r0, [r6, 0x1C]
adds r0, r6, 0
bl TextPrinterInitDownArrowCounters
_0814FB42:
movs r0, 0x3
b _0814FC96
_0814FB46:
ldr r0, [r6]
ldrb r3, [r0]
movs r2, 0x80
lsls r2, 1
adds r1, r2, 0
orrs r3, r1
adds r0, 0x1
str r0, [r6]
b _0814FB62
_0814FB58:
ldr r0, [r6]
adds r0, 0x1
str r0, [r6]
movs r0, 0
b _0814FC96
_0814FB62:
adds r0, r3, 0
bl DecompressGlyphFont6
adds r0, r6, 0
bl CopyGlyphToWindow
ldr r0, _0814FB84 @ =gGlyphInfo
adds r0, 0x80
ldrb r1, [r6, 0xA]
ldrb r0, [r0]
adds r1, r0
ldrb r0, [r6, 0x8]
adds r0, r1
strb r0, [r6, 0x8]
movs r0, 0
b _0814FC96
.align 2, 0
_0814FB84: .4byte gGlyphInfo
_0814FB88:
adds r0, r6, 0
bl TextPrinterWait
lsls r0, 16
cmp r0, 0
beq _0814FB42
movs r0, 0
strb r0, [r6, 0x1C]
b _0814FB42
_0814FB9A:
adds r0, r6, 0
bl TextPrinterWaitWithDownArrow
lsls r0, 16
cmp r0, 0
beq _0814FB42
ldrb r0, [r6, 0x4]
ldrb r2, [r6, 0xD]
lsls r2, 28
lsrs r1, r2, 4
orrs r1, r2
lsrs r1, 24
bl FillWindowPixelBuffer
ldrb r0, [r6, 0x6]
movs r1, 0
strb r0, [r6, 0x8]
ldrb r0, [r6, 0x7]
strb r0, [r6, 0x9]
strb r1, [r6, 0x1C]
b _0814FB42
_0814FBC4:
adds r0, r6, 0
bl TextPrinterWaitWithDownArrow
lsls r0, 16
cmp r0, 0
beq _0814FB42
adds r0, r6, 0
bl TextPrinterClearDownArrow
ldrb r1, [r6, 0x5]
ldr r0, _0814FBF8 @ =gFonts
ldr r2, [r0]
lsls r0, r1, 1
adds r0, r1
lsls r0, 2
adds r0, r2
ldrb r1, [r6, 0xB]
ldrb r0, [r0, 0x5]
adds r1, r0
strb r1, [r6, 0x1F]
ldrb r0, [r6, 0x6]
strb r0, [r6, 0x8]
movs r0, 0x4
strb r0, [r6, 0x1C]
b _0814FB42
.align 2, 0
_0814FBF8: .4byte gFonts
_0814FBFC:
ldrb r2, [r6, 0x1F]
cmp r2, 0
beq _0814FC6C
ldr r4, _0814FC30 @ =gUnknown_846FB08
ldr r5, _0814FC34 @ =gSaveBlock2Ptr
ldr r0, [r5]
ldrb r0, [r0, 0x14]
lsls r1, r0, 29
lsrs r0, r1, 29
adds r0, r4
ldrb r0, [r0]
cmp r2, r0
bcs _0814FC38
ldrb r0, [r6, 0x4]
ldrb r1, [r6, 0xD]
lsls r1, 28
lsrs r3, r1, 4
orrs r3, r1
lsrs r3, 24
movs r1, 0
bl ScrollWindow
movs r0, 0
strb r0, [r6, 0x1F]
b _0814FC62
.align 2, 0
_0814FC30: .4byte gUnknown_846FB08
_0814FC34: .4byte gSaveBlock2Ptr
_0814FC38:
ldrb r0, [r6, 0x4]
lsrs r1, 29
adds r1, r4
ldrb r2, [r1]
ldrb r1, [r6, 0xD]
lsls r1, 28
lsrs r3, r1, 4
orrs r3, r1
lsrs r3, 24
movs r1, 0
bl ScrollWindow
ldr r0, [r5]
ldrb r0, [r0, 0x14]
lsls r0, 29
lsrs r0, 29
adds r0, r4
ldrb r1, [r6, 0x1F]
ldrb r0, [r0]
subs r1, r0
strb r1, [r6, 0x1F]
_0814FC62:
ldrb r0, [r6, 0x4]
movs r1, 0x2
bl CopyWindowToVram
b _0814FB42
_0814FC6C:
strb r2, [r6, 0x1C]
b _0814FB42
_0814FC70:
bl IsSEPlaying
lsls r0, 24
lsrs r0, 24
cmp r0, 0
beq _0814FC7E
b _0814FB42
_0814FC7E:
strb r0, [r6, 0x1C]
b _0814FB42
_0814FC82:
ldrb r0, [r6, 0x1E]
adds r1, r0, 0
cmp r1, 0
beq _0814FC90
subs r0, 0x1
strb r0, [r6, 0x1E]
b _0814FB42
_0814FC90:
strb r1, [r6, 0x1C]
b _0814FB42
_0814FC94:
movs r0, 0x1
_0814FC96:
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end Font6Func
thumb_func_start DecompressGlyphFont6
DecompressGlyphFont6: @ 814FC9C
push {r4,r5,lr}
lsls r0, 16
lsrs r2, r0, 19
lsls r2, 9
movs r1, 0xE0
lsls r1, 11
ands r1, r0
lsrs r1, 11
ldr r0, _0814FCF8 @ =gUnknown_846FB0C
adds r1, r0
adds r5, r2, r1
ldr r4, _0814FCFC @ =gGlyphInfo
adds r0, r5, 0
adds r1, r4, 0
bl DecompressGlyphTile
adds r0, r5, 0
adds r0, 0x10
adds r1, r4, 0
adds r1, 0x20
bl DecompressGlyphTile
movs r1, 0x80
lsls r1, 1
adds r0, r5, r1
adds r1, r4, 0
adds r1, 0x40
bl DecompressGlyphTile
movs r1, 0x88
lsls r1, 1
adds r0, r5, r1
adds r1, r4, 0
adds r1, 0x60
bl DecompressGlyphTile
adds r0, r4, 0
adds r0, 0x80
movs r1, 0x10
strb r1, [r0]
adds r0, 0x1
strb r1, [r0]
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_0814FCF8: .4byte gUnknown_846FB0C
_0814FCFC: .4byte gGlyphInfo
thumb_func_end DecompressGlyphFont6
thumb_func_start GetGlyphWidthFont6
GetGlyphWidthFont6: @ 814FD00
movs r0, 0x10
bx lr
thumb_func_end GetGlyphWidthFont6
.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
+6 -6
View File
@@ -24,15 +24,15 @@ _0813F686:
movs r0, 0
movs r1, 0x1
movs r2, 0xD0
bl sub_815001C
bl TextWindow_SetUserSelectedFrame
movs r0, 0
movs r1, 0x13
movs r2, 0xE0
bl sub_814FEAC
bl TextWindow_SetBubbleFrame_841F1C8
movs r0, 0
movs r1, 0xA
movs r2, 0xF0
bl sub_814FF2C
bl TextWindow_SetStdFrame0_WithPal
movs r0, 0
bl PutWindowTilemap
movs r0, 0x4
@@ -114,7 +114,7 @@ sub_813F6F4: @ 813F6F4
str r4, [sp, 0xC]
str r2, [sp, 0x10]
mov r2, r9
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
add sp, 0x14
pop {r3,r4}
mov r8, r3
@@ -141,7 +141,7 @@ sub_813F75C: @ 813F75C
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
bl sub_80F78A8
bl GetTextSpeedSetting
lsls r0, 24
lsrs r0, 24
str r4, [sp]
@@ -209,7 +209,7 @@ sub_813F7D8: @ 813F7D8
str r3, [sp, 0xC]
movs r2, 0x2
movs r3, 0
bl sub_80BF5D0
bl CreateYesNoMenuWithCallbacks
add sp, 0x10
pop {r0}
bx r0
asm/cable_club.s
+10 -10
View File
@@ -91,7 +91,7 @@ sub_80807E8: @ 80807E8
lsrs r4, 24
adds r0, r4, 0
movs r1, 0
bl sub_80F6F9C
bl ClearStdWindowAndFrame
adds r0, r4, 0
movs r1, 0x3
bl CopyWindowToVram
@@ -765,7 +765,7 @@ _08080D3C:
cmp r2, 0x9
bne _08080D54
_08080D44:
bl sub_80098B8
bl CloseLink
bl HideFieldMessageBox
ldr r0, _08080D50 @ =sub_8080F78
b _08080D72
@@ -860,7 +860,7 @@ _08080DF6:
cmp r0, 0x9
bne _08080E20
_08080DFE:
bl sub_80098B8
bl CloseLink
_08080E02:
bl HideFieldMessageBox
ldr r0, _08080E18 @ =gTasks
@@ -1631,7 +1631,7 @@ _08081410:
_08081418:
str r0, [r1]
_0808141A:
bl sub_80563F0
bl CleanupOverworldWindowsAndTilemaps
ldr r1, _08081444 @ =gTrainerBattleOpponent_A
movs r2, 0x80
lsls r2, 4
@@ -1854,7 +1854,7 @@ _080815E0:
_080815E8:
str r0, [r1]
_080815EA:
bl sub_80563F0
bl CleanupOverworldWindowsAndTilemaps
ldr r1, _08081614 @ =gTrainerBattleOpponent_A
movs r3, 0x80
lsls r3, 4
@@ -1905,14 +1905,14 @@ _0808164C:
lsls r0, 24
cmp r0, 0
beq _0808165C
ldr r0, _08081664 @ =c2_exit_to_overworld_2_switch
ldr r0, _08081664 @ =CB2_ReturnToField
bl SetMainCallback2
_0808165C:
pop {r4}
pop {r0}
bx r0
.align 2, 0
_08081664: .4byte c2_exit_to_overworld_2_switch
_08081664: .4byte CB2_ReturnToField
thumb_func_end sub_8081624
thumb_func_start sub_8081668
@@ -1940,7 +1940,7 @@ sub_8081668: @ 8081668
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
@@ -2459,7 +2459,7 @@ sub_8081A90: @ 8081A90
lsls r0, 17
cmp r1, r0
ble _08081AC2
bl sub_80098B8
bl CloseLink
ldr r0, _08081ADC @ =c2_800ACD4
bl SetMainCallback2
adds r0, r4, 0
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,11 +109,11 @@ _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
@@ -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
@@ -152,7 +152,7 @@ _080F569C:
movs r1, 0x2
movs r2, 0
movs r3, 0x2
bl sub_810FF60
bl CreateYesNoMenu
movs r0, 0
bl CopyBgTilemapBufferToVram
b _080F56E2
@@ -204,7 +204,7 @@ sub_80F5708: @ 80F5708
ldrb r0, [r0]
cmp r0, 0
bne _080F578C
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r4, r0, 24
movs r0, 0x1
@@ -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
asm/coord_event_weather.s
-105
View File
@@ -1,105 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start nullsub_27
nullsub_27: @ 806E7A8
bx lr
thumb_func_end nullsub_27
thumb_func_start nullsub_28
nullsub_28: @ 806E7AC
bx lr
thumb_func_end nullsub_28
thumb_func_start nullsub_29
nullsub_29: @ 806E7B0
bx lr
thumb_func_end nullsub_29
thumb_func_start nullsub_30
nullsub_30: @ 806E7B4
bx lr
thumb_func_end nullsub_30
thumb_func_start nullsub_31
nullsub_31: @ 806E7B8
bx lr
thumb_func_end nullsub_31
thumb_func_start nullsub_32
nullsub_32: @ 806E7BC
bx lr
thumb_func_end nullsub_32
thumb_func_start nullsub_33
nullsub_33: @ 806E7C0
bx lr
thumb_func_end nullsub_33
thumb_func_start nullsub_34
nullsub_34: @ 806E7C4
bx lr
thumb_func_end nullsub_34
thumb_func_start nullsub_35
nullsub_35: @ 806E7C8
bx lr
thumb_func_end nullsub_35
thumb_func_start nullsub_36
nullsub_36: @ 806E7CC
bx lr
thumb_func_end nullsub_36
thumb_func_start nullsub_37
nullsub_37: @ 806E7D0
bx lr
thumb_func_end nullsub_37
thumb_func_start nullsub_38
nullsub_38: @ 806E7D4
bx lr
thumb_func_end nullsub_38
thumb_func_start nullsub_39
nullsub_39: @ 806E7D8
bx lr
thumb_func_end nullsub_39
thumb_func_start trigger_activate_weather
trigger_activate_weather: @ 806E7DC
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
movs r2, 0
ldr r3, _0806E7FC @ =gUnknown_83A72A8
_0806E7E6:
lsls r1, r2, 3
adds r0, r1, r3
ldrb r0, [r0]
cmp r0, r4
bne _0806E800
adds r0, r3, 0x4
adds r0, r1, r0
ldr r0, [r0]
bl _call_via_r0
b _0806E80A
.align 2, 0
_0806E7FC: .4byte gUnknown_83A72A8
_0806E800:
adds r0, r2, 0x1
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xC
bls _0806E7E6
_0806E80A:
pop {r4}
pop {r0}
bx r0
thumb_func_end trigger_activate_weather
.align 2, 0 @ Don't pad with nop.
asm/credits.s
+12 -12
View File
@@ -177,7 +177,7 @@ sub_80F3B04: @ 80F3B04
beq _080F3B20
ldrb r0, [r1, 0xA]
bl RemoveWindow
bl sub_80563F0
bl CleanupOverworldWindowsAndTilemaps
ldr r1, [r4]
movs r0, 0
strb r0, [r1, 0xB]
@@ -241,7 +241,7 @@ _080F3B5E:
bl sub_80F3A74
bl sub_80F3AA4
movs r0, 0xF0
bl sub_80F77CC
bl Menu_LoadStdPalAt
ldr r0, _080F3BC8 @ =gPlttBufferUnfaded
movs r2, 0xFF
lsls r2, 1
@@ -325,7 +325,7 @@ _080F3C64:
bl sub_80F3AA4
bl sub_80F3AC4
movs r0, 0xF0
bl sub_80F77CC
bl Menu_LoadStdPalAt
ldr r0, _080F3C8C @ =gPlttBufferUnfaded
movs r2, 0xFF
lsls r2, 1
@@ -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
@@ -1279,13 +1279,13 @@ _080F4374:
movs r0, 0x1
adds r2, r5, 0
movs r3, 0
bl sub_80F696C
bl DecompressAndLoadBgGfxUsingHeap
ldr r1, _080F44B4 @ =gUnknown_840C650
str r4, [sp]
movs r0, 0x2
adds r2, r5, 0
movs r3, 0
bl sub_80F696C
bl DecompressAndLoadBgGfxUsingHeap
ldr r1, _080F44B8 @ =gUnknown_8EAB30C
movs r2, 0xA0
lsls r2, 3
@@ -1293,14 +1293,14 @@ _080F4374:
str r4, [sp]
movs r0, 0x1
movs r3, 0
bl sub_80F696C
bl DecompressAndLoadBgGfxUsingHeap
ldr r1, _080F44BC @ =gUnknown_840CA54
movs r2, 0x80
lsls r2, 3
str r4, [sp]
movs r0, 0x2
movs r3, 0
bl sub_80F696C
bl DecompressAndLoadBgGfxUsingHeap
ldr r0, [r6]
ldrb r0, [r0, 0x9]
lsls r0, 5
@@ -1620,7 +1620,7 @@ _080F46A0:
str r5, [sp]
movs r0, 0
movs r3, 0
bl sub_80F696C
bl DecompressAndLoadBgGfxUsingHeap
ldr r0, [r6]
ldrb r1, [r0, 0x9]
lsls r0, r1, 1
@@ -1635,7 +1635,7 @@ _080F46A0:
str r0, [sp]
movs r0, 0
movs r3, 0
bl sub_80F696C
bl DecompressAndLoadBgGfxUsingHeap
ldr r0, [r6]
ldrb r1, [r0, 0x9]
lsls r0, r1, 1
asm/dark.s
+2323
View File
File diff suppressed because it is too large Load Diff
asm/daycare.s
-3216
View File
File diff suppressed because it is too large Load Diff
asm/decompress.s
+27 -27
View File
@@ -132,12 +132,12 @@ DecompressPicFromTable: @ 800EC8C
lsls r0, 1
cmp r5, r0
ble _0800ECAC
ldr r0, _0800ECA8 @ =gUnknown_82350AC
ldr r0, _0800ECA8 @ =gMonFrontPicTable
ldr r0, [r0]
bl LZ77UnCompWram
b _0800ECB4
.align 2, 0
_0800ECA8: .4byte gUnknown_82350AC
_0800ECA8: .4byte gMonFrontPicTable
_0800ECAC:
ldr r0, [r3]
adds r1, r4, 0
@@ -158,7 +158,7 @@ sub_800ECC4: @ 800ECC4
adds r4, r0, 0
adds r5, r1, 0
lsls r0, r2, 3
ldr r1, _0800ECEC @ =gUnknown_82350AC
ldr r1, _0800ECEC @ =gMonFrontPicTable
adds r0, r1
movs r1, 0
cmp r4, r0
@@ -168,17 +168,17 @@ _0800ECDA:
str r1, [sp]
adds r0, r4, 0
adds r1, r5, 0
bl sub_800ECF0
bl LoadSpecialPokePic
add sp, 0x4
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_0800ECEC: .4byte gUnknown_82350AC
_0800ECEC: .4byte gMonFrontPicTable
thumb_func_end sub_800ECC4
thumb_func_start sub_800ECF0
sub_800ECF0: @ 800ECF0
thumb_func_start LoadSpecialPokePic
LoadSpecialPokePic: @ 800ECF0
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -227,34 +227,34 @@ _0800ED48:
mov r0, r8
cmp r0, 0
bne _0800ED5C
ldr r0, _0800ED58 @ =gUnknown_823654C
ldr r0, _0800ED58 @ =gMonBackPicTable
lsls r1, 3
adds r1, r0
ldr r0, [r1]
b _0800ED78
.align 2, 0
_0800ED58: .4byte gUnknown_823654C
_0800ED58: .4byte gMonBackPicTable
_0800ED5C:
ldr r0, _0800ED68 @ =gUnknown_82350AC
ldr r0, _0800ED68 @ =gMonFrontPicTable
lsls r1, 3
adds r1, r0
ldr r0, [r1]
b _0800ED78
.align 2, 0
_0800ED68: .4byte gUnknown_82350AC
_0800ED68: .4byte gMonFrontPicTable
_0800ED6C:
movs r0, 0xCE
lsls r0, 1
cmp r7, r0
ble _0800ED84
ldr r0, _0800ED80 @ =gUnknown_82350AC
ldr r0, _0800ED80 @ =gMonFrontPicTable
ldr r0, [r0]
_0800ED78:
adds r1, r4, 0
bl LZ77UnCompWram
b _0800ED8C
.align 2, 0
_0800ED80: .4byte gUnknown_82350AC
_0800ED80: .4byte gMonFrontPicTable
_0800ED84:
ldr r0, [r6]
adds r1, r4, 0
@@ -274,7 +274,7 @@ _0800ED8C:
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_800ECF0
thumb_func_end LoadSpecialPokePic
thumb_func_start sub_800EDAC
sub_800EDAC: @ 800EDAC
@@ -722,8 +722,8 @@ _0800F0BA:
bx r1
thumb_func_end sub_800F078
thumb_func_start sub_800F0C4
sub_800F0C4: @ 800F0C4
thumb_func_start GetDecompressedDataSize
GetDecompressedDataSize: @ 800F0C4
sub sp, 0x4
mov r3, sp
ldrb r2, [r0, 0x1]
@@ -738,7 +738,7 @@ sub_800F0C4: @ 800F0C4
ldr r0, [sp]
add sp, 0x4
bx lr
thumb_func_end sub_800F0C4
thumb_func_end GetDecompressedDataSize
thumb_func_start DecompressPicFromTable_DontHandleDeoxys
DecompressPicFromTable_DontHandleDeoxys: @ 800F0E0
@@ -748,12 +748,12 @@ DecompressPicFromTable_DontHandleDeoxys: @ 800F0E0
lsls r0, 1
cmp r2, r0
ble _0800F0FC
ldr r0, _0800F0F8 @ =gUnknown_82350AC
ldr r0, _0800F0F8 @ =gMonFrontPicTable
ldr r0, [r0]
bl LZ77UnCompWram
b _0800F102
.align 2, 0
_0800F0F8: .4byte gUnknown_82350AC
_0800F0F8: .4byte gMonFrontPicTable
_0800F0FC:
ldr r0, [r3]
bl LZ77UnCompWram
@@ -769,7 +769,7 @@ HandleLoadSpecialPokePic_DontHandleDeoxys: @ 800F108
adds r4, r0, 0
adds r5, r1, 0
lsls r0, r2, 3
ldr r1, _0800F130 @ =gUnknown_82350AC
ldr r1, _0800F130 @ =gMonFrontPicTable
adds r0, r1
movs r1, 0
cmp r4, r0
@@ -785,7 +785,7 @@ _0800F11E:
pop {r0}
bx r0
.align 2, 0
_0800F130: .4byte gUnknown_82350AC
_0800F130: .4byte gMonFrontPicTable
thumb_func_end HandleLoadSpecialPokePic_DontHandleDeoxys
thumb_func_start LoadSpecialPokePic_DontHandleDeoxys
@@ -838,34 +838,34 @@ _0800F18C:
mov r0, r8
cmp r0, 0
bne _0800F1A0
ldr r0, _0800F19C @ =gUnknown_823654C
ldr r0, _0800F19C @ =gMonBackPicTable
lsls r1, 3
adds r1, r0
ldr r0, [r1]
b _0800F1BC
.align 2, 0
_0800F19C: .4byte gUnknown_823654C
_0800F19C: .4byte gMonBackPicTable
_0800F1A0:
ldr r0, _0800F1AC @ =gUnknown_82350AC
ldr r0, _0800F1AC @ =gMonFrontPicTable
lsls r1, 3
adds r1, r0
ldr r0, [r1]
b _0800F1BC
.align 2, 0
_0800F1AC: .4byte gUnknown_82350AC
_0800F1AC: .4byte gMonFrontPicTable
_0800F1B0:
movs r0, 0xCE
lsls r0, 1
cmp r7, r0
ble _0800F1C8
ldr r0, _0800F1C4 @ =gUnknown_82350AC
ldr r0, _0800F1C4 @ =gMonFrontPicTable
ldr r0, [r0]
_0800F1BC:
adds r1, r5, 0
bl LZ77UnCompWram
b _0800F1D0
.align 2, 0
_0800F1C4: .4byte gUnknown_82350AC
_0800F1C4: .4byte gMonFrontPicTable
_0800F1C8:
ldr r0, [r6]
adds r1, r5, 0
asm/diploma.s
+4 -4
View File
@@ -279,7 +279,7 @@ sub_80F4E24: @ 80F4E24
bl ResetPaletteFade
bl FreeAllSpritePalettes
bl ResetTasks
bl remove_some_task
bl ScanlineEffect_Stop
pop {r0}
bx r0
thumb_func_end sub_80F4E24
@@ -559,7 +559,7 @@ _080F5050:
movs r0, 0
movs r1, 0x2
movs r3, 0x4
bl box_print
bl AddTextPrinterParameterized3
ldr r1, _080F50EC @ =gUnknown_841B619
add r0, sp, 0xC
bl UnkTextUtil_StringExpandPlaceholders
@@ -579,7 +579,7 @@ _080F5050:
movs r1, 0x2
adds r2, r4, 0
movs r3, 0x1E
bl box_print
bl AddTextPrinterParameterized3
str r6, [sp]
movs r0, 0
str r0, [sp, 0x4]
@@ -589,7 +589,7 @@ _080F5050:
movs r1, 0x2
movs r2, 0x78
movs r3, 0x69
bl box_print
bl AddTextPrinterParameterized3
movs r0, 0
bl PutWindowTilemap
add sp, 0xAC
asm/unk_81507FC.s → asm/dodrio_berry_picking.s
+16 -16
View File
@@ -6240,7 +6240,7 @@ _08153754: .4byte gUnknown_203F3E0
_08153758:
adds r0, r5, 0
movs r1, 0x1
bl sub_809A000
bl CheckBagHasSpace
lsls r0, 24
cmp r0, 0
bne _0815376A
@@ -6249,10 +6249,10 @@ _08153758:
_0815376A:
adds r0, r6, 0
movs r1, 0x1
bl sub_809A084
bl AddBagItem
adds r0, r6, 0
movs r1, 0x1
bl sub_809A000
bl CheckBagHasSpace
lsls r0, 24
cmp r0, 0
beq _08153784
@@ -6474,11 +6474,11 @@ 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
bl sub_8150048
bl DrawTextBorderOuter
adds r0, r7, 0
movs r1, 0x11
bl FillWindowPixelBuffer
@@ -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
@@ -9989,7 +9989,7 @@ _08155480:
lsrs r0, 16
add r5, sp, 0x70
adds r1, r5, 0
bl sub_8099E90
bl CopyItemName
movs r0, 0
adds r1, r5, 0
bl UnkTextUtil_SetPtrI
@@ -10021,7 +10021,7 @@ _08155480:
lsls r0, 16
lsrs r0, 16
adds r1, r5, 0
bl sub_8099E90
bl CopyItemName
movs r0, 0
adds r1, r5, 0
bl UnkTextUtil_SetPtrI
@@ -10657,7 +10657,7 @@ _08155A9C:
_08155AA6:
movs r0, 0
movs r1, 0
bl sub_80F6EE4
bl DrawDialogueFrame
ldr r2, _08155ACC @ =gUnknown_8419F54
str r4, [sp]
movs r0, 0x2
@@ -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
@@ -11276,8 +11276,8 @@ _08155EC6:
movs r1, 0
movs r2, 0
bl ChangeBgY
bl sub_80F6C6C
bl sub_80F6C98
bl InitStandardTextBoxWindows
bl ResetBg0
movs r1, 0x82
lsls r1, 5
movs r0, 0
asm/dodrio_berry_picking_2.s
+734
View File
@@ -0,0 +1,734 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_815A61C
sub_815A61C: @ 815A61C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x20
ldr r4, [sp, 0x48]
lsls r4, 24
str r4, [sp, 0x1C]
movs r4, 0x14
adds r4, r0
mov r9, r4
mov r5, sp
movs r4, 0x2
strb r4, [r5]
mov r10, sp
mov r5, r9
ldrb r4, [r5, 0xB]
movs r7, 0xF
adds r5, r7, 0
ands r5, r4
mov r6, r10
ldrb r6, [r6, 0x1]
mov r8, r6
movs r4, 0x10
negs r4, r4
mov r6, r8
ands r4, r6
orrs r4, r5
mov r5, r10
strb r4, [r5, 0x1]
mov r8, sp
mov r6, r9
ldrb r5, [r6, 0xC]
lsls r5, 4
ands r4, r7
orrs r4, r5
mov r5, r8
strb r4, [r5, 0x1]
ldrb r5, [r6, 0xD]
movs r6, 0xF
ands r5, r6
mov r4, r10
ldrb r4, [r4, 0x2]
mov r8, r4
movs r4, 0x10
negs r4, r4
mov r6, r8
ands r4, r6
orrs r4, r5
mov r5, r10
strb r4, [r5, 0x2]
mov r8, sp
mov r6, r9
ldrb r5, [r6, 0xE]
lsls r5, 4
ands r4, r7
orrs r4, r5
mov r5, r8
strb r4, [r5, 0x2]
ldrb r5, [r6, 0xF]
movs r6, 0xF
ands r5, r6
mov r4, r10
ldrb r4, [r4, 0x3]
mov r8, r4
movs r4, 0x10
negs r4, r4
mov r6, r8
ands r4, r6
orrs r4, r5
mov r5, r10
strb r4, [r5, 0x3]
mov r8, sp
mov r6, r9
ldrb r5, [r6, 0x10]
lsls r5, 4
ands r4, r7
orrs r4, r5
mov r5, r8
strb r4, [r5, 0x3]
ldrb r5, [r6, 0x11]
movs r6, 0xF
ands r5, r6
mov r4, r10
ldrb r4, [r4, 0x4]
mov r8, r4
movs r4, 0x10
negs r4, r4
mov r6, r8
ands r4, r6
orrs r4, r5
mov r5, r10
strb r4, [r5, 0x4]
mov r8, sp
mov r6, r9
ldrb r5, [r6, 0x12]
lsls r5, 4
ands r4, r7
orrs r4, r5
mov r5, r8
strb r4, [r5, 0x4]
ldrb r4, [r6, 0x13]
movs r6, 0xF
ands r4, r6
mov r6, r8
ldrb r5, [r6, 0x5]
movs r6, 0x10
negs r6, r6
ands r6, r5
orrs r6, r4
str r6, [sp, 0xC]
mov r4, r8
strb r6, [r4, 0x5]
mov r5, sp
mov r6, r9
ldrb r4, [r6, 0x14]
lsls r4, 4
ldr r6, [sp, 0xC]
ands r6, r7
orrs r6, r4
strb r6, [r5, 0x5]
mov r7, sp
movs r4, 0x3
mov r8, r4
ldrb r0, [r0, 0x14]
mov r5, r8
ands r0, r5
ldrb r5, [r7, 0x6]
movs r6, 0x4
negs r6, r6
mov r10, r6
mov r4, r10
ands r4, r5
orrs r4, r0
strb r4, [r7, 0x6]
mov r5, r9
ldrb r0, [r5, 0x1]
mov r6, r8
ands r0, r6
lsls r0, 2
movs r5, 0xD
negs r5, r5
ands r5, r4
orrs r5, r0
strb r5, [r7, 0x6]
mov r0, r9
ldrb r4, [r0, 0x2]
ands r4, r6
lsls r4, 4
movs r0, 0x31
negs r0, r0
ands r0, r5
orrs r0, r4
strb r0, [r7, 0x6]
mov r5, sp
mov r6, r9
ldrb r4, [r6, 0x3]
lsls r4, 6
movs r6, 0x3F
ands r0, r6
orrs r0, r4
strb r0, [r5, 0x6]
mov r4, r9
ldrb r0, [r4, 0x4]
mov r5, r8
ands r0, r5
ldrb r5, [r7, 0x7]
mov r4, r10
ands r4, r5
orrs r4, r0
strb r4, [r7, 0x7]
mov r6, r9
ldrb r0, [r6, 0x5]
mov r5, r8
ands r0, r5
lsls r0, 2
movs r5, 0xD
negs r5, r5
ands r5, r4
orrs r5, r0
strb r5, [r7, 0x7]
ldrb r4, [r6, 0x6]
mov r6, r8
ands r4, r6
lsls r4, 4
movs r0, 0x31
negs r0, r0
ands r0, r5
orrs r0, r4
strb r0, [r7, 0x7]
mov r5, sp
mov r6, r9
ldrb r4, [r6, 0x7]
lsls r4, 6
movs r6, 0x3F
ands r0, r6
orrs r0, r4
strb r0, [r5, 0x7]
mov r8, sp
mov r0, r9
ldrb r4, [r0, 0x8]
movs r7, 0x3
adds r0, r7, 0
ands r0, r4
mov r4, r8
ldrb r5, [r4, 0x8]
mov r4, r10
ands r4, r5
orrs r4, r0
mov r5, r8
strb r4, [r5, 0x8]
mov r6, r9
ldrb r5, [r6, 0x9]
adds r0, r7, 0
ands r0, r5
lsls r0, 2
movs r5, 0xD
negs r5, r5
ands r5, r4
orrs r5, r0
mov r0, r8
strb r5, [r0, 0x8]
ldrb r0, [r1]
adds r4, r7, 0
ands r4, r0
lsls r4, 4
movs r0, 0x31
negs r0, r0
ands r0, r5
orrs r0, r4
mov r4, r8
strb r0, [r4, 0x8]
mov r5, sp
ldrb r4, [r2]
lsls r4, 6
movs r6, 0x3F
ands r0, r6
orrs r0, r4
strb r0, [r5, 0x8]
ldrb r4, [r3]
adds r0, r7, 0
ands r0, r4
ldrb r4, [r5, 0x9]
mov r6, r10
ands r6, r4
orrs r6, r0
mov r10, r6
strb r6, [r5, 0x9]
ldr r0, [sp, 0x40]
ldrb r4, [r0]
adds r0, r7, 0
ands r0, r4
lsls r0, 2
movs r4, 0xD
negs r4, r4
ands r6, r4
orrs r6, r0
str r6, [sp, 0x10]
strb r6, [r5, 0x9]
mov r4, sp
ldr r5, [sp, 0x44]
ldrb r0, [r5]
adds r6, r7, 0
ands r6, r0
lsls r0, r6, 4
subs r7, 0x34
ldr r5, [sp, 0x10]
ands r7, r5
orrs r7, r0
strb r7, [r4, 0x9]
mov r5, sp
ldrb r0, [r1, 0x4]
movs r6, 0x1
mov r12, r6
mov r4, r12
ands r4, r0
lsls r4, 6
movs r0, 0x41
negs r0, r0
mov r10, r0
ands r0, r7
orrs r0, r4
strb r0, [r5, 0x9]
ldrb r4, [r2, 0x4]
lsls r4, 7
movs r5, 0x7F
ands r0, r5
orrs r0, r4
mov r4, r8
strb r0, [r4, 0x9]
ldrb r4, [r3, 0x4]
mov r0, r12
ands r0, r4
mov r5, r8
ldrb r4, [r5, 0xA]
movs r7, 0x2
negs r7, r7
adds r5, r7, 0
ands r5, r4
orrs r5, r0
mov r6, r8
strb r5, [r6, 0xA]
mov r9, sp
ldr r4, [sp, 0x40]
ldrb r0, [r4, 0x4]
mov r4, r12
ands r4, r0
lsls r4, 1
movs r6, 0x3
negs r6, r6
mov r8, r6
mov r0, r8
ands r0, r5
orrs r0, r4
mov r4, r9
strb r0, [r4, 0xA]
ldr r6, [sp, 0x44]
ldrb r5, [r6, 0x4]
mov r4, r12
ands r4, r5
lsls r4, 2
movs r5, 0x5
negs r5, r5
ands r0, r5
orrs r0, r4
mov r4, r9
strb r0, [r4, 0xA]
mov r4, sp
ldrb r1, [r1, 0x8]
mov r0, r12
ands r0, r1
lsls r0, 2
ldrb r1, [r4, 0xB]
ands r5, r1
orrs r5, r0
strb r5, [r4, 0xB]
ldrb r1, [r2, 0x8]
mov r0, r12
ands r0, r1
lsls r0, 3
movs r1, 0x9
negs r1, r1
ands r1, r5
orrs r1, r0
strb r1, [r4, 0xB]
ldrb r2, [r3, 0x8]
mov r0, r12
ands r0, r2
lsls r0, 4
movs r2, 0x11
negs r2, r2
ands r2, r1
orrs r2, r0
strb r2, [r4, 0xB]
mov r3, sp
ldr r5, [sp, 0x40]
ldrb r0, [r5, 0x8]
mov r1, r12
ands r1, r0
lsls r1, 5
movs r0, 0x21
negs r0, r0
ands r0, r2
orrs r0, r1
strb r0, [r3, 0xB]
mov r2, sp
ldrb r1, [r6, 0x8]
mov r6, r12
ands r6, r1
lsls r1, r6, 6
mov r3, r10
ands r0, r3
orrs r0, r1
strb r0, [r2, 0xB]
ldr r4, [sp, 0x1C]
lsrs r3, r4, 21
ldrb r1, [r2, 0xA]
movs r0, 0x7
ands r0, r1
orrs r0, r3
strb r0, [r2, 0xA]
mov r1, sp
ldr r5, [sp, 0x4C]
movs r6, 0x1
ands r5, r6
lsls r2, r5, 1
ldrb r0, [r1, 0xB]
mov r3, r8
ands r3, r0
orrs r3, r2
mov r8, r3
strb r3, [r1, 0xB]
mov r0, sp
ldr r4, [sp, 0x50]
ands r4, r6
mov r5, r8
ands r5, r7
orrs r5, r4
strb r5, [r0, 0xB]
bl sub_80F9E2C
add sp, 0x20
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_815A61C
thumb_func_start sub_815A950
sub_815A950: @ 815A950
push {r4-r7,lr}
mov r7, r9
mov r6, r8
push {r6,r7}
adds r7, r1, 0
adds r5, r2, 0
adds r6, r3, 0
ldr r0, [sp, 0x1C]
mov r12, r0
ldr r1, [sp, 0x20]
mov r8, r1
ldr r0, [sp, 0x24]
mov r9, r0
adds r2, r7, 0
adds r2, 0x14
ldr r4, _0815A98C @ =gRecvCmds
ldrh r0, [r4]
movs r1, 0xFF
lsls r1, 8
ands r1, r0
movs r0, 0xBC
lsls r0, 6
cmp r1, r0
bne _0815A988
adds r3, r4, 0x2
ldrb r0, [r4, 0x2]
cmp r0, 0x2
beq _0815A990
_0815A988:
movs r0, 0
b _0815AACA
.align 2, 0
_0815A98C: .4byte gRecvCmds
_0815A990:
ldrb r0, [r3, 0x1]
lsls r0, 28
lsrs r0, 28
strb r0, [r2, 0xB]
ldrb r0, [r3, 0x1]
lsrs r0, 4
strb r0, [r2, 0xC]
ldrb r0, [r3, 0x2]
lsls r0, 28
lsrs r0, 28
strb r0, [r2, 0xD]
ldrb r0, [r3, 0x2]
lsrs r0, 4
strb r0, [r2, 0xE]
ldrb r0, [r3, 0x3]
lsls r0, 28
lsrs r0, 28
strb r0, [r2, 0xF]
ldrb r0, [r3, 0x3]
lsrs r0, 4
strb r0, [r2, 0x10]
ldrb r0, [r3, 0x4]
lsls r0, 28
lsrs r0, 28
strb r0, [r2, 0x11]
ldrb r0, [r3, 0x4]
lsrs r0, 4
strb r0, [r2, 0x12]
ldrb r0, [r3, 0x5]
lsls r0, 28
lsrs r0, 28
strb r0, [r2, 0x13]
ldrb r0, [r3, 0x5]
lsrs r0, 4
strb r0, [r2, 0x14]
ldrb r0, [r3, 0x1]
lsls r0, 28
lsrs r0, 28
strb r0, [r2, 0x15]
ldrb r0, [r3, 0x6]
lsls r0, 30
lsrs r0, 30
strb r0, [r7, 0x14]
ldrb r0, [r3, 0x6]
lsls r0, 28
lsrs r0, 30
strb r0, [r2, 0x1]
ldrb r0, [r3, 0x6]
lsls r0, 26
lsrs r0, 30
strb r0, [r2, 0x2]
ldrb r0, [r3, 0x6]
lsrs r0, 6
strb r0, [r2, 0x3]
ldrb r0, [r3, 0x7]
lsls r0, 30
lsrs r0, 30
strb r0, [r2, 0x4]
ldrb r0, [r3, 0x7]
lsls r0, 28
lsrs r0, 30
strb r0, [r2, 0x5]
ldrb r0, [r3, 0x7]
lsls r0, 26
lsrs r0, 30
strb r0, [r2, 0x6]
ldrb r0, [r3, 0x7]
lsrs r0, 6
strb r0, [r2, 0x7]
ldrb r0, [r3, 0x8]
lsls r0, 30
lsrs r0, 30
strb r0, [r2, 0x8]
ldrb r0, [r3, 0x8]
lsls r0, 28
lsrs r0, 30
strb r0, [r2, 0x9]
ldrb r0, [r3, 0x6]
lsls r0, 30
lsrs r0, 30
strb r0, [r2, 0xA]
ldrb r0, [r3, 0x8]
lsls r0, 26
lsrs r0, 30
strb r0, [r5]
ldrb r0, [r3, 0x9]
lsls r0, 25
lsrs r0, 31
strb r0, [r5, 0x4]
ldrb r0, [r3, 0xB]
lsls r0, 29
lsrs r0, 31
strb r0, [r5, 0x8]
ldrb r0, [r3, 0x8]
lsrs r0, 6
strb r0, [r6]
ldrb r0, [r3, 0x9]
lsrs r0, 7
strb r0, [r6, 0x4]
ldrb r0, [r3, 0xB]
lsls r0, 28
lsrs r0, 31
strb r0, [r6, 0x8]
ldrb r0, [r3, 0x9]
lsls r0, 30
lsrs r0, 30
mov r1, r12
strb r0, [r1]
ldrb r0, [r3, 0xA]
lsls r0, 31
lsrs r0, 31
strb r0, [r1, 0x4]
ldrb r0, [r3, 0xB]
lsls r0, 27
lsrs r0, 31
strb r0, [r1, 0x8]
ldrb r0, [r3, 0x9]
lsls r0, 28
lsrs r0, 30
mov r1, r8
strb r0, [r1]
ldrb r0, [r3, 0xA]
lsls r0, 30
lsrs r0, 31
strb r0, [r1, 0x4]
ldrb r0, [r3, 0xB]
lsls r0, 26
lsrs r0, 31
strb r0, [r1, 0x8]
ldrb r0, [r3, 0x9]
lsls r0, 26
lsrs r0, 30
mov r1, r9
strb r0, [r1]
ldrb r0, [r3, 0xA]
lsls r0, 29
lsrs r0, 31
strb r0, [r1, 0x4]
ldrb r0, [r3, 0xB]
lsls r0, 25
lsrs r0, 31
strb r0, [r1, 0x8]
ldrb r0, [r3, 0xA]
lsrs r0, 3
ldr r1, [sp, 0x28]
strb r0, [r1]
ldrb r0, [r3, 0xB]
lsls r0, 30
lsrs r0, 31
ldr r1, [sp, 0x2C]
str r0, [r1]
ldrb r0, [r3, 0xB]
lsls r0, 31
lsrs r0, 31
ldr r1, [sp, 0x30]
str r0, [r1]
movs r0, 0x1
_0815AACA:
pop {r3,r4}
mov r8, r3
mov r9, r4
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_815A950
thumb_func_start sub_815AAD8
sub_815AAD8: @ 815AAD8
push {lr}
sub sp, 0x8
lsls r0, 24
lsrs r0, 24
ldr r3, _0815AB00 @ =0xffffff00
ldr r1, [sp]
ands r1, r3
movs r2, 0x3
orrs r1, r2
str r1, [sp]
ldr r1, [sp, 0x4]
ands r1, r3
orrs r1, r0
str r1, [sp, 0x4]
mov r0, sp
bl sub_80F9E2C
add sp, 0x8
pop {r0}
bx r0
.align 2, 0
_0815AB00: .4byte 0xffffff00
thumb_func_end sub_815AAD8
thumb_func_start sub_815AB04
sub_815AB04: @ 815AB04
push {r4,lr}
adds r2, r0, 0
adds r4, r1, 0
ldr r3, _0815AB2C @ =gRecvCmds
ldrh r0, [r3]
movs r1, 0xFF
lsls r1, 8
ands r1, r0
movs r0, 0xBC
lsls r0, 6
cmp r1, r0
bne _0815AB28
lsls r0, r2, 4
adds r1, r3, 0x2
adds r1, r0, r1
ldrb r0, [r1]
cmp r0, 0x3
beq _0815AB30
_0815AB28:
movs r0, 0
b _0815AB36
.align 2, 0
_0815AB2C: .4byte gRecvCmds
_0815AB30:
ldrb r0, [r1, 0x4]
strb r0, [r4]
movs r0, 0x1
_0815AB36:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_815AB04
thumb_func_start sub_815AB3C
sub_815AB3C: @ 815AB3C
push {lr}
sub sp, 0x8
ldr r2, _0815AB5C @ =0xffffff00
ldr r1, [sp]
ands r1, r2
movs r2, 0x4
orrs r1, r2
str r1, [sp]
str r0, [sp, 0x4]
mov r0, sp
bl sub_80F9E2C
add sp, 0x8
pop {r0}
bx r0
.align 2, 0
_0815AB5C: .4byte 0xffffff00
thumb_func_end sub_815AB3C
thumb_func_start sub_815AB60
sub_815AB60: @ 815AB60
push {lr}
adds r2, r0, 0
ldr r3, _0815AB88 @ =gRecvCmds
ldrh r0, [r3]
movs r1, 0xFF
lsls r1, 8
ands r1, r0
movs r0, 0xBC
lsls r0, 6
cmp r1, r0
bne _0815AB82
lsls r0, r2, 4
adds r1, r3, 0x2
adds r1, r0, r1
ldrb r0, [r1]
cmp r0, 0x4
beq _0815AB8C
_0815AB82:
movs r0, 0
b _0815AB8E
.align 2, 0
_0815AB88: .4byte gRecvCmds
_0815AB8C:
ldr r0, [r1, 0x4]
_0815AB8E:
pop {r1}
bx r1
thumb_func_end sub_815AB60
.align 2, 0 @ Don't pad with nop.
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
-1812
View File
File diff suppressed because it is too large Load Diff
asm/electric.s
+2675
View File
File diff suppressed because it is too large Load Diff
asm/evolution_scene.s
+136 -136
View File
@@ -171,25 +171,25 @@ EvolutionScene: @ 80CDDF4
movs r1, 0
bl SetGpuReg
bl ResetPaletteFade
ldr r0, _080CE080 @ =gUnknown_2022974
ldr r0, _080CE080 @ =gBattle_BG0_X
movs r2, 0
strh r2, [r0]
ldr r0, _080CE084 @ =gUnknown_2022976
ldr r0, _080CE084 @ =gBattle_BG0_Y
strh r2, [r0]
ldr r0, _080CE088 @ =gUnknown_2022978
ldr r0, _080CE088 @ =gBattle_BG1_X
strh r2, [r0]
ldr r0, _080CE08C @ =gUnknown_202297A
ldr r0, _080CE08C @ =gBattle_BG1_Y
strh r2, [r0]
ldr r0, _080CE090 @ =gUnknown_202297C
ldr r0, _080CE090 @ =gBattle_BG2_X
strh r2, [r0]
ldr r0, _080CE094 @ =gUnknown_202297E
ldr r0, _080CE094 @ =gBattle_BG2_Y
strh r2, [r0]
ldr r1, _080CE098 @ =gUnknown_2022980
ldr r1, _080CE098 @ =gBattle_BG3_X
movs r2, 0x80
lsls r2, 1
adds r0, r2, 0
strh r0, [r1]
ldr r0, _080CE09C @ =gUnknown_2022982
ldr r0, _080CE09C @ =gBattle_BG3_Y
movs r1, 0
strh r1, [r0]
ldr r1, _080CE0A0 @ =gUnknown_2022B50
@@ -198,7 +198,7 @@ EvolutionScene: @ 80CDDF4
bl sub_800F34C
bl LoadBattleTextboxAndBackground
bl ResetSpriteData
bl remove_some_task
bl ScanlineEffect_Stop
bl ResetTasks
bl FreeAllSpritePalettes
ldr r0, _080CE0A4 @ =gReservedSpritePaletteCount
@@ -239,7 +239,7 @@ EvolutionScene: @ 80CDDF4
bl GetMonData
mov r9, r0
lsls r0, r5, 3
ldr r1, _080CE0B8 @ =gUnknown_82350AC
ldr r1, _080CE0B8 @ =gMonFrontPicTable
adds r0, r1
ldr r2, _080CE0BC @ =gMonSpritesGfxPtr
ldr r1, [r2]
@@ -257,7 +257,7 @@ EvolutionScene: @ 80CDDF4
bl LoadCompressedPalette
adds r0, r5, 0
movs r1, 0x1
bl sub_803F7D4
bl SetMultiuseSpriteTemplateToPokemon
ldr r0, _080CE0C0 @ =gMultiuseSpriteTemplate
mov r8, r0
ldr r1, _080CE0C4 @ =gDummySpriteAffineAnimTable
@@ -295,7 +295,7 @@ EvolutionScene: @ 80CDDF4
strb r0, [r1]
mov r1, r10
lsls r0, r1, 3
ldr r2, _080CE0B8 @ =gUnknown_82350AC
ldr r2, _080CE0B8 @ =gMonFrontPicTable
adds r0, r2
ldr r2, _080CE0BC @ =gMonSpritesGfxPtr
ldr r1, [r2]
@@ -313,7 +313,7 @@ EvolutionScene: @ 80CDDF4
bl LoadCompressedPalette
mov r0, r10
movs r1, 0x3
bl sub_803F7D4
bl SetMultiuseSpriteTemplateToPokemon
ldr r0, _080CE0C4 @ =gDummySpriteAffineAnimTable
mov r1, r8
str r0, [r1, 0x10]
@@ -401,21 +401,21 @@ EvolutionScene: @ 80CDDF4
bx r0
.align 2, 0
_080CE07C: .4byte 0x05006000
_080CE080: .4byte gUnknown_2022974
_080CE084: .4byte gUnknown_2022976
_080CE088: .4byte gUnknown_2022978
_080CE08C: .4byte gUnknown_202297A
_080CE090: .4byte gUnknown_202297C
_080CE094: .4byte gUnknown_202297E
_080CE098: .4byte gUnknown_2022980
_080CE09C: .4byte gUnknown_2022982
_080CE080: .4byte gBattle_BG0_X
_080CE084: .4byte gBattle_BG0_Y
_080CE088: .4byte gBattle_BG1_X
_080CE08C: .4byte gBattle_BG1_Y
_080CE090: .4byte gBattle_BG2_X
_080CE094: .4byte gBattle_BG2_Y
_080CE098: .4byte gBattle_BG3_X
_080CE09C: .4byte gBattle_BG3_Y
_080CE0A0: .4byte gUnknown_2022B50
_080CE0A4: .4byte gReservedSpritePaletteCount
_080CE0A8: .4byte gUnknown_2039A20
_080CE0AC: .4byte gStringVar1
_080CE0B0: .4byte gStringVar2
_080CE0B4: .4byte gSpeciesNames
_080CE0B8: .4byte gUnknown_82350AC
_080CE0B8: .4byte gMonFrontPicTable
_080CE0BC: .4byte gMonSpritesGfxPtr
_080CE0C0: .4byte gMultiuseSpriteTemplate
_080CE0C4: .4byte gDummySpriteAffineAnimTable
@@ -494,24 +494,24 @@ CB2_EvolutionSceneLoadGraphics: @ 80CE0E8
movs r1, 0
bl SetGpuReg
bl ResetPaletteFade
ldr r0, _080CE290 @ =gUnknown_2022974
ldr r0, _080CE290 @ =gBattle_BG0_X
strh r4, [r0]
ldr r0, _080CE294 @ =gUnknown_2022976
ldr r0, _080CE294 @ =gBattle_BG0_Y
strh r4, [r0]
ldr r0, _080CE298 @ =gUnknown_2022978
ldr r0, _080CE298 @ =gBattle_BG1_X
strh r4, [r0]
ldr r0, _080CE29C @ =gUnknown_202297A
ldr r0, _080CE29C @ =gBattle_BG1_Y
strh r4, [r0]
ldr r0, _080CE2A0 @ =gUnknown_202297C
ldr r0, _080CE2A0 @ =gBattle_BG2_X
strh r4, [r0]
ldr r0, _080CE2A4 @ =gUnknown_202297E
ldr r0, _080CE2A4 @ =gBattle_BG2_Y
strh r4, [r0]
ldr r1, _080CE2A8 @ =gUnknown_2022980
ldr r1, _080CE2A8 @ =gBattle_BG3_X
movs r2, 0x80
lsls r2, 1
adds r0, r2, 0
strh r0, [r1]
ldr r0, _080CE2AC @ =gUnknown_2022982
ldr r0, _080CE2AC @ =gBattle_BG3_Y
strh r4, [r0]
ldr r1, _080CE2B0 @ =gUnknown_2022B50
movs r0, 0x9
@@ -524,7 +524,7 @@ CB2_EvolutionSceneLoadGraphics: @ 80CE0E8
movs r0, 0x4
strb r0, [r1]
lsls r0, r5, 3
ldr r1, _080CE2B8 @ =gUnknown_82350AC
ldr r1, _080CE2B8 @ =gMonFrontPicTable
adds r0, r1
ldr r1, _080CE2BC @ =gMonSpritesGfxPtr
ldr r1, [r1]
@@ -542,7 +542,7 @@ CB2_EvolutionSceneLoadGraphics: @ 80CE0E8
bl LoadCompressedPalette
adds r0, r5, 0
movs r1, 0x3
bl sub_803F7D4
bl SetMultiuseSpriteTemplateToPokemon
ldr r0, _080CE2C0 @ =gMultiuseSpriteTemplate
ldr r1, _080CE2C4 @ =gDummySpriteAffineAnimTable
str r1, [r0, 0x10]
@@ -608,17 +608,17 @@ _080CE280: .4byte gTasks
_080CE284: .4byte gUnknown_2039A20
_080CE288: .4byte gPlayerParty
_080CE28C: .4byte 0x05006000
_080CE290: .4byte gUnknown_2022974
_080CE294: .4byte gUnknown_2022976
_080CE298: .4byte gUnknown_2022978
_080CE29C: .4byte gUnknown_202297A
_080CE2A0: .4byte gUnknown_202297C
_080CE2A4: .4byte gUnknown_202297E
_080CE2A8: .4byte gUnknown_2022980
_080CE2AC: .4byte gUnknown_2022982
_080CE290: .4byte gBattle_BG0_X
_080CE294: .4byte gBattle_BG0_Y
_080CE298: .4byte gBattle_BG1_X
_080CE29C: .4byte gBattle_BG1_Y
_080CE2A0: .4byte gBattle_BG2_X
_080CE2A4: .4byte gBattle_BG2_Y
_080CE2A8: .4byte gBattle_BG3_X
_080CE2AC: .4byte gBattle_BG3_Y
_080CE2B0: .4byte gUnknown_2022B50
_080CE2B4: .4byte gReservedSpritePaletteCount
_080CE2B8: .4byte gUnknown_82350AC
_080CE2B8: .4byte gMonFrontPicTable
_080CE2BC: .4byte gMonSpritesGfxPtr
_080CE2C0: .4byte gMultiuseSpriteTemplate
_080CE2C4: .4byte gDummySpriteAffineAnimTable
@@ -691,37 +691,37 @@ _080CE34C:
ldr r1, _080CE398 @ =gReservedSpritePaletteCount
movs r0, 0x4
strb r0, [r1]
ldr r0, _080CE39C @ =gUnknown_2022974
ldr r0, _080CE39C @ =gBattle_BG0_X
movs r1, 0
strh r1, [r0]
ldr r0, _080CE3A0 @ =gUnknown_2022976
ldr r0, _080CE3A0 @ =gBattle_BG0_Y
strh r1, [r0]
ldr r0, _080CE3A4 @ =gUnknown_2022978
ldr r0, _080CE3A4 @ =gBattle_BG1_X
strh r1, [r0]
ldr r0, _080CE3A8 @ =gUnknown_202297A
ldr r0, _080CE3A8 @ =gBattle_BG1_Y
strh r1, [r0]
ldr r0, _080CE3AC @ =gUnknown_202297C
ldr r0, _080CE3AC @ =gBattle_BG2_X
strh r1, [r0]
ldr r0, _080CE3B0 @ =gUnknown_202297E
ldr r0, _080CE3B0 @ =gBattle_BG2_Y
strh r1, [r0]
ldr r2, _080CE3B4 @ =gUnknown_2022980
ldr r2, _080CE3B4 @ =gBattle_BG3_X
movs r3, 0x80
lsls r3, 1
adds r0, r3, 0
strh r0, [r2]
ldr r0, _080CE3B8 @ =gUnknown_2022982
ldr r0, _080CE3B8 @ =gBattle_BG3_Y
strh r1, [r0]
b _080CE4EC
.align 2, 0
_080CE398: .4byte gReservedSpritePaletteCount
_080CE39C: .4byte gUnknown_2022974
_080CE3A0: .4byte gUnknown_2022976
_080CE3A4: .4byte gUnknown_2022978
_080CE3A8: .4byte gUnknown_202297A
_080CE3AC: .4byte gUnknown_202297C
_080CE3B0: .4byte gUnknown_202297E
_080CE3B4: .4byte gUnknown_2022980
_080CE3B8: .4byte gUnknown_2022982
_080CE39C: .4byte gBattle_BG0_X
_080CE3A0: .4byte gBattle_BG0_Y
_080CE3A4: .4byte gBattle_BG1_X
_080CE3A8: .4byte gBattle_BG1_Y
_080CE3AC: .4byte gBattle_BG2_X
_080CE3B0: .4byte gBattle_BG2_Y
_080CE3B4: .4byte gBattle_BG3_X
_080CE3B8: .4byte gBattle_BG3_Y
_080CE3BC:
bl ResetPaletteFade
ldr r0, _080CE3D8 @ =nullsub_76
@@ -770,7 +770,7 @@ _080CE414:
bl GetMonData
adds r4, r0, 0
lsls r0, r6, 3
ldr r1, _080CE454 @ =gUnknown_82350AC
ldr r1, _080CE454 @ =gMonFrontPicTable
adds r0, r1
ldr r1, _080CE458 @ =gMonSpritesGfxPtr
ldr r1, [r1]
@@ -788,12 +788,12 @@ _080CE414:
bl LoadCompressedPalette
b _080CE4EC
.align 2, 0
_080CE454: .4byte gUnknown_82350AC
_080CE454: .4byte gMonFrontPicTable
_080CE458: .4byte gMonSpritesGfxPtr
_080CE45C:
adds r0, r6, 0
movs r1, 0x1
bl sub_803F7D4
bl SetMultiuseSpriteTemplateToPokemon
ldr r0, _080CE4B4 @ =gMultiuseSpriteTemplate
ldr r1, _080CE4B8 @ =gDummySpriteAffineAnimTable
str r1, [r0, 0x10]
@@ -951,7 +951,7 @@ TradeEvolutionScene: @ 80CE540
movs r4, 0
strb r6, [r0]
lsls r0, r5, 3
ldr r1, _080CE6C4 @ =gUnknown_82350AC
ldr r1, _080CE6C4 @ =gMonFrontPicTable
adds r0, r1
ldr r1, _080CE6C8 @ =gMonSpritesGfxPtr
ldr r1, [r1]
@@ -969,7 +969,7 @@ TradeEvolutionScene: @ 80CE540
bl LoadCompressedPalette
adds r0, r5, 0
movs r1, 0x1
bl sub_803F7D4
bl SetMultiuseSpriteTemplateToPokemon
ldr r0, _080CE6CC @ =gMultiuseSpriteTemplate
ldr r1, _080CE6D0 @ =gDummySpriteAffineAnimTable
str r1, [r0, 0x10]
@@ -1027,24 +1027,24 @@ TradeEvolutionScene: @ 80CE540
mov r1, sp
ldrh r1, [r1, 0x14]
strh r1, [r0, 0x1C]
ldr r0, _080CE6E4 @ =gUnknown_2022974
ldr r0, _080CE6E4 @ =gBattle_BG0_X
strh r4, [r0]
ldr r0, _080CE6E8 @ =gUnknown_2022976
ldr r0, _080CE6E8 @ =gBattle_BG0_Y
strh r4, [r0]
ldr r0, _080CE6EC @ =gUnknown_2022978
ldr r0, _080CE6EC @ =gBattle_BG1_X
strh r4, [r0]
ldr r0, _080CE6F0 @ =gUnknown_202297A
ldr r0, _080CE6F0 @ =gBattle_BG1_Y
strh r4, [r0]
ldr r0, _080CE6F4 @ =gUnknown_202297C
ldr r0, _080CE6F4 @ =gBattle_BG2_X
strh r4, [r0]
ldr r0, _080CE6F8 @ =gUnknown_202297E
ldr r0, _080CE6F8 @ =gBattle_BG2_Y
strh r4, [r0]
ldr r1, _080CE6FC @ =gUnknown_2022980
ldr r1, _080CE6FC @ =gBattle_BG3_X
movs r2, 0x80
lsls r2, 1
adds r0, r2, 0
strh r0, [r1]
ldr r0, _080CE700 @ =gUnknown_2022982
ldr r0, _080CE700 @ =gBattle_BG3_Y
strh r4, [r0]
ldr r2, _080CE704 @ =gTextFlags
ldrb r0, [r2]
@@ -1069,7 +1069,7 @@ _080CE6B4: .4byte gStringVar2
_080CE6B8: .4byte gSpeciesNames
_080CE6BC: .4byte gAffineAnimsDisabled
_080CE6C0: .4byte gUnknown_2039A20
_080CE6C4: .4byte gUnknown_82350AC
_080CE6C4: .4byte gMonFrontPicTable
_080CE6C8: .4byte gMonSpritesGfxPtr
_080CE6CC: .4byte gMultiuseSpriteTemplate
_080CE6D0: .4byte gDummySpriteAffineAnimTable
@@ -1077,14 +1077,14 @@ _080CE6D4: .4byte gSprites
_080CE6D8: .4byte nullsub_10
_080CE6DC: .4byte sub_80CF53C
_080CE6E0: .4byte gTasks
_080CE6E4: .4byte gUnknown_2022974
_080CE6E8: .4byte gUnknown_2022976
_080CE6EC: .4byte gUnknown_2022978
_080CE6F0: .4byte gUnknown_202297A
_080CE6F4: .4byte gUnknown_202297C
_080CE6F8: .4byte gUnknown_202297E
_080CE6FC: .4byte gUnknown_2022980
_080CE700: .4byte gUnknown_2022982
_080CE6E4: .4byte gBattle_BG0_X
_080CE6E8: .4byte gBattle_BG0_Y
_080CE6EC: .4byte gBattle_BG1_X
_080CE6F0: .4byte gBattle_BG1_Y
_080CE6F4: .4byte gBattle_BG2_X
_080CE6F8: .4byte gBattle_BG2_Y
_080CE6FC: .4byte gBattle_BG3_X
_080CE700: .4byte gBattle_BG3_Y
_080CE704: .4byte gTextFlags
_080CE708: .4byte sub_80D00D8
_080CE70C: .4byte sub_80CE72C
@@ -3567,7 +3567,7 @@ _080CFCAE:
movs r0, 0
movs r1, 0xA8
movs r2, 0xE0
bl sub_814FE40
bl LoadUserWindowBorderGfx
ldr r0, _080CFCF4 @ =gUnknown_826D1CC
movs r1, 0xA8
str r1, [sp]
@@ -3577,7 +3577,7 @@ _080CFCAE:
movs r1, 0x3
movs r2, 0
movs r3, 0x2
bl sub_810FF60
bl CreateYesNoMenu
ldr r3, _080CFCF8 @ =gUnknown_2023E82
strb r4, [r3, 0x1]
ldr r0, _080CFCF0 @ =gTasks
@@ -3597,7 +3597,7 @@ _080CFCF0: .4byte gTasks
_080CFCF4: .4byte gUnknown_826D1CC
_080CFCF8: .4byte gUnknown_2023E82
_080CFCFC:
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r4, r0, 24
cmp r4, 0
@@ -3691,7 +3691,7 @@ _080CFDBA:
ldrb r0, [r0]
cmp r0, 0
beq _080CFDC6
bl sub_80FCE44
bl DestroyWirelessStatusIndicatorSprite
_080CFDC6:
movs r0, 0x3
bl GetBgTilemapBuffer
@@ -3981,105 +3981,105 @@ nullsub_76: @ 80D004C
thumb_func_start sub_80D0050
sub_80D0050: @ 80D0050
push {lr}
ldr r0, _080D00B8 @ =gUnknown_2022974
ldr r0, _080D00B8 @ =gBattle_BG0_X
ldrh r1, [r0]
movs r0, 0x10
bl SetGpuReg
ldr r0, _080D00BC @ =gUnknown_2022976
ldr r0, _080D00BC @ =gBattle_BG0_Y
ldrh r1, [r0]
movs r0, 0x12
bl SetGpuReg
ldr r0, _080D00C0 @ =gUnknown_2022978
ldr r0, _080D00C0 @ =gBattle_BG1_X
ldrh r1, [r0]
movs r0, 0x14
bl SetGpuReg
ldr r0, _080D00C4 @ =gUnknown_202297A
ldr r0, _080D00C4 @ =gBattle_BG1_Y
ldrh r1, [r0]
movs r0, 0x16
bl SetGpuReg
ldr r0, _080D00C8 @ =gUnknown_202297C
ldr r0, _080D00C8 @ =gBattle_BG2_X
ldrh r1, [r0]
movs r0, 0x18
bl SetGpuReg
ldr r0, _080D00CC @ =gUnknown_202297E
ldr r0, _080D00CC @ =gBattle_BG2_Y
ldrh r1, [r0]
movs r0, 0x1A
bl SetGpuReg
ldr r0, _080D00D0 @ =gUnknown_2022980
ldr r0, _080D00D0 @ =gBattle_BG3_X
ldrh r1, [r0]
movs r0, 0x1C
bl SetGpuReg
ldr r0, _080D00D4 @ =gUnknown_2022982
ldr r0, _080D00D4 @ =gBattle_BG3_Y
ldrh r1, [r0]
movs r0, 0x1E
bl SetGpuReg
bl LoadOam
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
bl sub_8087F54
bl ScanlineEffect_InitHBlankDmaTransfer
pop {r0}
bx r0
.align 2, 0
_080D00B8: .4byte gUnknown_2022974
_080D00BC: .4byte gUnknown_2022976
_080D00C0: .4byte gUnknown_2022978
_080D00C4: .4byte gUnknown_202297A
_080D00C8: .4byte gUnknown_202297C
_080D00CC: .4byte gUnknown_202297E
_080D00D0: .4byte gUnknown_2022980
_080D00D4: .4byte gUnknown_2022982
_080D00B8: .4byte gBattle_BG0_X
_080D00BC: .4byte gBattle_BG0_Y
_080D00C0: .4byte gBattle_BG1_X
_080D00C4: .4byte gBattle_BG1_Y
_080D00C8: .4byte gBattle_BG2_X
_080D00CC: .4byte gBattle_BG2_Y
_080D00D0: .4byte gBattle_BG3_X
_080D00D4: .4byte gBattle_BG3_Y
thumb_func_end sub_80D0050
thumb_func_start sub_80D00D8
sub_80D00D8: @ 80D00D8
push {lr}
ldr r0, _080D0140 @ =gUnknown_2022974
ldr r0, _080D0140 @ =gBattle_BG0_X
ldrh r1, [r0]
movs r0, 0x10
bl SetGpuReg
ldr r0, _080D0144 @ =gUnknown_2022976
ldr r0, _080D0144 @ =gBattle_BG0_Y
ldrh r1, [r0]
movs r0, 0x12
bl SetGpuReg
ldr r0, _080D0148 @ =gUnknown_2022978
ldr r0, _080D0148 @ =gBattle_BG1_X
ldrh r1, [r0]
movs r0, 0x14
bl SetGpuReg
ldr r0, _080D014C @ =gUnknown_202297A
ldr r0, _080D014C @ =gBattle_BG1_Y
ldrh r1, [r0]
movs r0, 0x16
bl SetGpuReg
ldr r0, _080D0150 @ =gUnknown_202297C
ldr r0, _080D0150 @ =gBattle_BG2_X
ldrh r1, [r0]
movs r0, 0x18
bl SetGpuReg
ldr r0, _080D0154 @ =gUnknown_202297E
ldr r0, _080D0154 @ =gBattle_BG2_Y
ldrh r1, [r0]
movs r0, 0x1A
bl SetGpuReg
ldr r0, _080D0158 @ =gUnknown_2022980
ldr r0, _080D0158 @ =gBattle_BG3_X
ldrh r1, [r0]
movs r0, 0x1C
bl SetGpuReg
ldr r0, _080D015C @ =gUnknown_2022982
ldr r0, _080D015C @ =gBattle_BG3_Y
ldrh r1, [r0]
movs r0, 0x1E
bl SetGpuReg
bl LoadOam
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
bl sub_8087F54
bl ScanlineEffect_InitHBlankDmaTransfer
pop {r0}
bx r0
.align 2, 0
_080D0140: .4byte gUnknown_2022974
_080D0144: .4byte gUnknown_2022976
_080D0148: .4byte gUnknown_2022978
_080D014C: .4byte gUnknown_202297A
_080D0150: .4byte gUnknown_202297C
_080D0154: .4byte gUnknown_202297E
_080D0158: .4byte gUnknown_2022980
_080D015C: .4byte gUnknown_2022982
_080D0140: .4byte gBattle_BG0_X
_080D0144: .4byte gBattle_BG0_Y
_080D0148: .4byte gBattle_BG1_X
_080D014C: .4byte gBattle_BG1_Y
_080D0150: .4byte gBattle_BG2_X
_080D0154: .4byte gBattle_BG2_Y
_080D0158: .4byte gBattle_BG3_X
_080D015C: .4byte gBattle_BG3_Y
thumb_func_end sub_80D00D8
thumb_func_start sub_80D0160
@@ -4225,9 +4225,9 @@ sub_80D025C: @ 80D025C
push {r6,r7}
lsls r0, 24
lsrs r5, r0, 24
ldr r0, _080D0288 @ =gUnknown_2022978
ldr r0, _080D0288 @ =gBattle_BG1_X
mov r8, r0
ldr r1, _080D028C @ =gUnknown_202297A
ldr r1, _080D028C @ =gBattle_BG1_Y
mov r9, r1
ldr r1, _080D0290 @ =gTasks
lsls r0, r5, 2
@@ -4238,18 +4238,18 @@ sub_80D025C: @ 80D025C
ldrsh r0, [r0, r2]
cmp r0, 0
bne _080D029C
ldr r7, _080D0294 @ =gUnknown_202297C
ldr r6, _080D0298 @ =gUnknown_202297E
ldr r7, _080D0294 @ =gBattle_BG2_X
ldr r6, _080D0298 @ =gBattle_BG2_Y
b _080D02A0
.align 2, 0
_080D0288: .4byte gUnknown_2022978
_080D028C: .4byte gUnknown_202297A
_080D0288: .4byte gBattle_BG1_X
_080D028C: .4byte gBattle_BG1_Y
_080D0290: .4byte gTasks
_080D0294: .4byte gUnknown_202297C
_080D0298: .4byte gUnknown_202297E
_080D0294: .4byte gBattle_BG2_X
_080D0298: .4byte gBattle_BG2_Y
_080D029C:
ldr r7, _080D0328 @ =gUnknown_2022980
ldr r6, _080D032C @ =gUnknown_2022982
ldr r7, _080D0328 @ =gBattle_BG3_X
ldr r6, _080D032C @ =gBattle_BG3_Y
_080D02A0:
lsls r4, r5, 2
adds r4, r5
@@ -4314,8 +4314,8 @@ _080D031A:
pop {r0}
bx r0
.align 2, 0
_080D0328: .4byte gUnknown_2022980
_080D032C: .4byte gUnknown_2022982
_080D0328: .4byte gBattle_BG3_X
_080D032C: .4byte gBattle_BG3_Y
_080D0330: .4byte sub_80D0160
thumb_func_end sub_80D025C
@@ -4388,7 +4388,7 @@ _080D03A0:
movs r0, 0x1
movs r2, 0
movs r3, 0
bl sub_80F696C
bl DecompressAndLoadBgGfxUsingHeap
ldr r1, _080D0428 @ =gUnknown_83F73A8
movs r0, 0x1
movs r2, 0
@@ -4527,12 +4527,12 @@ sub_80D04E8: @ 80D04E8
movs r0, 0x50
movs r1, 0
bl SetGpuReg
ldr r0, _080D0544 @ =gUnknown_2022978
ldr r0, _080D0544 @ =gBattle_BG1_X
movs r1, 0
strh r1, [r0]
ldr r0, _080D0548 @ =gUnknown_202297A
ldr r0, _080D0548 @ =gBattle_BG1_Y
strh r1, [r0]
ldr r0, _080D054C @ =gUnknown_202297C
ldr r0, _080D054C @ =gBattle_BG2_X
strh r1, [r0]
movs r0, 0x1
movs r1, 0x5
@@ -4562,9 +4562,9 @@ sub_80D04E8: @ 80D04E8
pop {r0}
bx r0
.align 2, 0
_080D0544: .4byte gUnknown_2022978
_080D0548: .4byte gUnknown_202297A
_080D054C: .4byte gUnknown_202297C
_080D0544: .4byte gBattle_BG1_X
_080D0548: .4byte gBattle_BG1_Y
_080D054C: .4byte gBattle_BG2_X
_080D0550: .4byte gUnknown_2039A24
thumb_func_end sub_80D04E8
asm/field_camera.s
+2 -2
View File
@@ -528,7 +528,7 @@ sub_805A948: @ 805A948
mov r8, r1
adds r0, r6, 0
adds r1, r7, 0
bl sub_8058E48
bl MapGridGetMetatileIdAt
lsls r0, 16
lsrs r4, r0, 16
movs r0, 0x80
@@ -557,7 +557,7 @@ _0805A98C:
asrs r0, 16
lsls r1, r7, 16
asrs r1, 16
bl sub_8058F8C
bl MapGridGetMetatileLayerTypeAt
lsls r0, 24
lsrs r0, 24
lsls r1, r4, 4
asm/field_control_avatar.s
+14 -14
View File
@@ -884,7 +884,7 @@ sub_806CF38: @ 806CF38
ldrh r1, [r4, 0x2]
b _0806CF7E
_0806CF60:
ldr r1, _0806CFA4 @ =gUnknown_826D2D8
ldr r1, _0806CFA4 @ =gDirectionToVectors
lsls r2, r6, 3
adds r0, r2, r1
ldr r3, [r0]
@@ -919,7 +919,7 @@ _0806CF9E:
movs r0, 0
b _0806CFDE
.align 2, 0
_0806CFA4: .4byte gUnknown_826D2D8
_0806CFA4: .4byte gDirectionToVectors
_0806CFA8: .4byte gMapObjects
_0806CFAC:
movs r4, 0
@@ -936,7 +936,7 @@ _0806CFBC:
adds r4, 0x1
cmp r4, 0x3
ble _0806CFB0
ldr r0, _0806CFE8 @ =gUnknown_3005074
ldr r0, _0806CFE8 @ =gSelectedEventObject
strb r3, [r0]
ldr r1, _0806CFEC @ =gSpecialVar_LastTalked
adds r0, r2, r3
@@ -954,7 +954,7 @@ _0806CFDE:
bx r1
.align 2, 0
_0806CFE4: .4byte gUnknown_2031DEC
_0806CFE8: .4byte gUnknown_3005074
_0806CFE8: .4byte gSelectedEventObject
_0806CFEC: .4byte gSpecialVar_LastTalked
_0806CFF0: .4byte gSpecialVar_Facing
thumb_func_end sub_806CF38
@@ -994,7 +994,7 @@ _0806D02A:
lsrs r0, 24
cmp r0, 0x1
bne _0806D092
ldr r1, _0806D09C @ =gUnknown_826D2D8
ldr r1, _0806D09C @ =gDirectionToVectors
mov r0, r8
lsls r2, r0, 3
adds r0, r2, r1
@@ -1042,9 +1042,9 @@ _0806D092:
b _0806D0C8
.align 2, 0
_0806D098: .4byte gMapObjects
_0806D09C: .4byte gUnknown_826D2D8
_0806D09C: .4byte gDirectionToVectors
_0806D0A0:
ldr r0, _0806D0D4 @ =gUnknown_3005074
ldr r0, _0806D0D4 @ =gSelectedEventObject
strb r5, [r0]
ldr r4, _0806D0D8 @ =gSpecialVar_LastTalked
ldr r1, _0806D0DC @ =gMapObjects
@@ -1069,7 +1069,7 @@ _0806D0C8:
pop {r1}
bx r1
.align 2, 0
_0806D0D4: .4byte gUnknown_3005074
_0806D0D4: .4byte gSelectedEventObject
_0806D0D8: .4byte gSpecialVar_LastTalked
_0806D0DC: .4byte gMapObjects
_0806D0E0: .4byte gSpecialVar_Facing
@@ -1828,7 +1828,7 @@ _0806D6EC:
.align 2, 0
_0806D700: .4byte gUnknown_81A8DFD
_0806D704:
bl sub_80463B8
bl ShouldEggHatch
lsls r0, 24
cmp r0, 0
beq _0806D720
@@ -2195,7 +2195,7 @@ mapheader_run_first_tag2_script_list_match_conditionally: @ 806D964
adds r1, r5, 0
adds r2, r7, 0
bl sub_806DC54
bl sub_807E438
bl DoWarp
movs r0, 0x1
b _0806DA02
.align 2, 0
@@ -2331,7 +2331,7 @@ _0806DAC4:
lsrs r0, 24
cmp r0, 0x1
bne _0806DAE4
bl sub_80559E4
bl ResetInitialPlayerAvatarState
ldr r0, _0806DAE0 @ =gUnknown_81C1361
bl ScriptContext1_SetupScript
movs r0, 0x1
@@ -2339,7 +2339,7 @@ _0806DAC4:
.align 2, 0
_0806DAE0: .4byte gUnknown_81C1361
_0806DAE4:
bl sub_807E438
bl DoWarp
movs r0, 0x1
b _0806DAEE
_0806DAEC:
@@ -2638,7 +2638,7 @@ map_warp_consider_2_to_inside: @ 806DCD0
adds r1, r4, 0
adds r2, r6, 0
bl sub_806DC54
bl sub_807E4DC
bl DoDoorWarp
movs r0, 0x1
b _0806DD32
.align 2, 0
@@ -2990,7 +2990,7 @@ _0806DF98:
cmp r0, 0
beq _0806DFB0
bl sub_8055A08
bl sp13E_warp_to_last_warp
bl DoDiveWarp
movs r0, 0xE2
bl PlaySE
movs r0, 0x1
asm/field_door.s
+22 -22
View File
@@ -337,7 +337,7 @@ sub_805B158: @ 805B158
adds r6, r2, 0
adds r0, r5, 0
adds r1, r6, 0
bl sub_8058E48
bl MapGridGetMetatileIdAt
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
@@ -392,7 +392,7 @@ sub_805B1B8: @ 805B1B8
adds r6, r2, 0
adds r0, r5, 0
adds r1, r6, 0
bl sub_8058E48
bl MapGridGetMetatileIdAt
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
@@ -439,7 +439,7 @@ sub_805B210: @ 805B210
adds r6, r2, 0
adds r0, r5, 0
adds r1, r6, 0
bl sub_8058E48
bl MapGridGetMetatileIdAt
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
@@ -478,8 +478,8 @@ _0805B25C:
_0805B264: .4byte gUnknown_835B4B0
thumb_func_end sub_805B210
thumb_func_start sub_805B268
sub_805B268: @ 805B268
thumb_func_start FieldSetDoorOpened
FieldSetDoorOpened: @ 805B268
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -504,10 +504,10 @@ _0805B292:
bx r0
.align 2, 0
_0805B298: .4byte gUnknown_835B5D8
thumb_func_end sub_805B268
thumb_func_end FieldSetDoorOpened
thumb_func_start sub_805B29C
sub_805B29C: @ 805B29C
thumb_func_start FieldSetDoorClosed
FieldSetDoorClosed: @ 805B29C
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -532,10 +532,10 @@ _0805B2C6:
bx r0
.align 2, 0
_0805B2CC: .4byte gUnknown_835B5D8
thumb_func_end sub_805B29C
thumb_func_end FieldSetDoorClosed
thumb_func_start sub_805B2D0
sub_805B2D0: @ 805B2D0
thumb_func_start FieldAnimateDoorClose
FieldAnimateDoorClose: @ 805B2D0
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -566,10 +566,10 @@ _0805B308:
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end sub_805B2D0
thumb_func_end FieldAnimateDoorClose
thumb_func_start sub_805B310
sub_805B310: @ 805B310
thumb_func_start FieldAnimateDoorOpen
FieldAnimateDoorOpen: @ 805B310
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -600,10 +600,10 @@ _0805B348:
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end sub_805B310
thumb_func_end FieldAnimateDoorOpen
thumb_func_start sub_805B350
sub_805B350: @ 805B350
thumb_func_start FieldIsDoorAnimationRunning
FieldIsDoorAnimationRunning: @ 805B350
push {lr}
ldr r0, _0805B360 @ =sub_805B028
bl FuncIsActiveTask
@@ -613,10 +613,10 @@ sub_805B350: @ 805B350
bx r1
.align 2, 0
_0805B360: .4byte sub_805B028
thumb_func_end sub_805B350
thumb_func_end FieldIsDoorAnimationRunning
thumb_func_start sub_805B364
sub_805B364: @ 805B364
thumb_func_start GetDoorSoundEffect
GetDoorSoundEffect: @ 805B364
push {lr}
adds r3, r0, 0
adds r2, r1, 0
@@ -635,7 +635,7 @@ _0805B380:
_0805B382:
pop {r1}
bx r1
thumb_func_end sub_805B364
thumb_func_end GetDoorSoundEffect
thumb_func_start sub_805B388
sub_805B388: @ 805B388
@@ -643,7 +643,7 @@ sub_805B388: @ 805B388
adds r4, r0, 0
adds r0, r1, 0
adds r1, r2, 0
bl sub_8058E48
bl MapGridGetMetatileIdAt
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
asm/field_effect.s
+47 -47
View File
@@ -603,13 +603,13 @@ CreateTrainerSprite: @ 8083858
lsrs r0, 24
mov r9, r0
lsrs r4, 21
ldr r3, _080838E0 @ =gUnknown_8239A1C
ldr r3, _080838E0 @ =gTrainerFrontPicPaletteTable
mov r8, r3
add r8, r4
mov r0, r8
adds r1, r7, 0
bl LoadCompressedObjectPaletteOverrideBuffer
ldr r0, _080838E4 @ =gUnknown_823957C
ldr r0, _080838E4 @ =gTrainerFrontPicTable
adds r4, r0
adds r0, r4, 0
adds r1, r7, 0
@@ -649,8 +649,8 @@ CreateTrainerSprite: @ 8083858
pop {r1}
bx r1
.align 2, 0
_080838E0: .4byte gUnknown_8239A1C
_080838E4: .4byte gUnknown_823957C
_080838E0: .4byte gTrainerFrontPicPaletteTable
_080838E4: .4byte gTrainerFrontPicTable
_080838E8: .4byte gUnknown_83CBE50
_080838EC: .4byte gDummySpriteAnimTable
_080838F0: .4byte gDummySpriteAffineAnimTable
@@ -666,12 +666,12 @@ LoadTrainerGfx_TrainerCard: @ 80838F8
lsls r4, 24
lsls r5, 16
lsrs r5, 16
ldr r0, _08083928 @ =gUnknown_823957C
ldr r0, _08083928 @ =gTrainerFrontPicTable
lsrs r4, 21
adds r0, r4, r0
ldr r0, [r0]
bl LZDecompressVram
ldr r0, _0808392C @ =gUnknown_8239A1C
ldr r0, _0808392C @ =gTrainerFrontPicPaletteTable
adds r4, r0
ldr r0, [r4]
adds r1, r5, 0
@@ -681,8 +681,8 @@ LoadTrainerGfx_TrainerCard: @ 80838F8
pop {r0}
bx r0
.align 2, 0
_08083928: .4byte gUnknown_823957C
_0808392C: .4byte gUnknown_8239A1C
_08083928: .4byte gTrainerFrontPicTable
_0808392C: .4byte gTrainerFrontPicPaletteTable
thumb_func_end LoadTrainerGfx_TrainerCard
thumb_func_start AddNewGameBirchObject
@@ -742,7 +742,7 @@ sub_8083970: @ 8083970
movs r1, 0
adds r2, r3, 0
movs r3, 0x1
bl sub_810C1CC
bl CreateMonPicSprite_HandleDeoxys
lsls r0, 16
lsrs r5, r0, 16
ldrh r0, [r4, 0x4]
@@ -806,7 +806,7 @@ sub_80839D4: @ 80839D4
mov r1, r9
mov r2, r10
movs r3, 0x1
bl sub_810C1CC
bl CreateMonPicSprite_HandleDeoxys
lsls r0, 16
lsrs r4, r0, 16
mov r1, r8
@@ -854,7 +854,7 @@ sub_8083A5C: @ 8083A5C
bl FreeOamMatrix
_08083A7A:
adds r0, r5, 0
bl sub_810C214
bl FreeAndDestroyMonPicSprite
pop {r4,r5}
pop {r0}
bx r0
@@ -1968,16 +1968,16 @@ _080842C2:
thumb_func_start sub_80842C8
sub_80842C8: @ 80842C8
push {lr}
ldr r0, _080842DC @ =c2_exit_to_overworld_2_switch
ldr r0, _080842DC @ =CB2_ReturnToField
bl SetMainCallback2
ldr r1, _080842E0 @ =gUnknown_3005020
ldr r1, _080842E0 @ =gFieldCallback
ldr r0, _080842E4 @ =mapldr_080842E8
str r0, [r1]
pop {r0}
bx r0
.align 2, 0
_080842DC: .4byte c2_exit_to_overworld_2_switch
_080842E0: .4byte gUnknown_3005020
_080842DC: .4byte CB2_ReturnToField
_080842E0: .4byte gFieldCallback
_080842E4: .4byte mapldr_080842E8
thumb_func_end sub_80842C8
@@ -1990,14 +1990,14 @@ mapldr_080842E8: @ 80842E8
bl CreateTask
bl ScriptContext2_Enable
bl player_bitmagic
ldr r1, _0808430C @ =gUnknown_3005020
ldr r1, _0808430C @ =gFieldCallback
movs r0, 0
str r0, [r1]
pop {r0}
bx r0
.align 2, 0
_08084308: .4byte task00_8084310
_0808430C: .4byte gUnknown_3005020
_0808430C: .4byte gFieldCallback
thumb_func_end mapldr_080842E8
thumb_func_start task00_8084310
@@ -2042,7 +2042,7 @@ _08084350:
bl warp_in
ldr r0, _08084384 @ =sub_805671C
bl SetMainCallback2
ldr r1, _08084388 @ =gUnknown_3005020
ldr r1, _08084388 @ =gFieldCallback
ldr r0, _0808438C @ =mapldr_08084390
str r0, [r1]
adds r0, r5, 0
@@ -2055,7 +2055,7 @@ _08084376:
_0808437C: .4byte gTasks
_08084380: .4byte gFieldEffectArguments
_08084384: .4byte sub_805671C
_08084388: .4byte gUnknown_3005020
_08084388: .4byte gFieldCallback
_0808438C: .4byte mapldr_08084390
thumb_func_end task00_8084310
@@ -2093,7 +2093,7 @@ mapldr_08084390: @ 8084390
_080843D2:
bl ScriptContext2_Enable
bl player_bitmagic
ldr r1, _080843F4 @ =gUnknown_3005020
ldr r1, _080843F4 @ =gFieldCallback
movs r0, 0
str r0, [r1]
pop {r4}
@@ -2103,7 +2103,7 @@ _080843D2:
_080843E8: .4byte c3_080843F8
_080843EC: .4byte gMapObjects
_080843F0: .4byte gPlayerAvatar
_080843F4: .4byte gUnknown_3005020
_080843F4: .4byte gFieldCallback
thumb_func_end mapldr_08084390
thumb_func_start c3_080843F8
@@ -2162,14 +2162,14 @@ sub_8084454: @ 8084454
ldr r0, _0808447C @ =sub_8084484
movs r1, 0
bl CreateTask
ldr r1, _08084480 @ =gUnknown_3005020
ldr r1, _08084480 @ =gFieldCallback
movs r0, 0
str r0, [r1]
pop {r0}
bx r0
.align 2, 0
_0808447C: .4byte sub_8084484
_08084480: .4byte gUnknown_3005020
_08084480: .4byte gFieldCallback
thumb_func_end sub_8084454
thumb_func_start sub_8084484
@@ -2542,7 +2542,7 @@ sub_8084708: @ 8084708
movs r0, 0x8
bl SetPlayerAvatarTransitionFlags
movs r0, 0x16
bl sub_812B1F0
bl HelpSystem_SetSomeVariable2
_08084760:
ldr r0, _08084780 @ =sub_8084484
bl FindTaskIdByFunc
@@ -2861,7 +2861,7 @@ sub_80849A0: @ 80849A0
bne _080849DC
bl sub_809C460
bl warp_in
ldr r1, _080849E4 @ =gUnknown_3005020
ldr r1, _080849E4 @ =gFieldCallback
ldr r0, _080849E8 @ =sub_80849F4
str r0, [r1]
ldr r0, _080849EC @ =sub_805671C
@@ -2876,7 +2876,7 @@ _080849DC:
bx r0
.align 2, 0
_080849E0: .4byte gPaletteFade
_080849E4: .4byte gUnknown_3005020
_080849E4: .4byte gFieldCallback
_080849E8: .4byte sub_80849F4
_080849EC: .4byte sub_805671C
_080849F0: .4byte sub_80847C0
@@ -2893,14 +2893,14 @@ sub_80849F4: @ 80849F4
ldr r0, _08084A1C @ =sub_8084A24
movs r1, 0
bl CreateTask
ldr r1, _08084A20 @ =gUnknown_3005020
ldr r1, _08084A20 @ =gFieldCallback
movs r0, 0
str r0, [r1]
pop {r0}
bx r0
.align 2, 0
_08084A1C: .4byte sub_8084A24
_08084A20: .4byte gUnknown_3005020
_08084A20: .4byte gFieldCallback
thumb_func_end sub_80849F4
thumb_func_start sub_8084A24
@@ -3884,7 +3884,7 @@ sub_8085168: @ 8085168
cmp r0, 0x1
bne _080851A0
bl warp_in
ldr r1, _080851AC @ =gUnknown_3005020
ldr r1, _080851AC @ =gFieldCallback
ldr r0, _080851B0 @ =mapldr_080851BC
str r0, [r1]
ldr r0, _080851B4 @ =sub_805671C
@@ -3900,7 +3900,7 @@ _080851A0:
bx r1
.align 2, 0
_080851A8: .4byte gPaletteFade
_080851AC: .4byte gUnknown_3005020
_080851AC: .4byte gFieldCallback
_080851B0: .4byte mapldr_080851BC
_080851B4: .4byte sub_805671C
_080851B8: .4byte sub_8084F44
@@ -3913,7 +3913,7 @@ mapldr_080851BC: @ 80851BC
bl pal_fill_for_maplights
bl sub_8111CF0
bl ScriptContext2_Enable
ldr r0, _080851E0 @ =gUnknown_3005020
ldr r0, _080851E0 @ =gFieldCallback
movs r1, 0
str r1, [r0]
ldr r0, _080851E4 @ =sub_80851E8
@@ -3921,7 +3921,7 @@ mapldr_080851BC: @ 80851BC
pop {r0}
bx r0
.align 2, 0
_080851E0: .4byte gUnknown_3005020
_080851E0: .4byte gFieldCallback
_080851E4: .4byte sub_80851E8
thumb_func_end mapldr_080851BC
@@ -4389,7 +4389,7 @@ sub_808554C: @ 808554C
cmp r0, 0x1
bne _08085584
bl warp_in
ldr r1, _08085590 @ =gUnknown_3005020
ldr r1, _08085590 @ =gFieldCallback
ldr r0, _08085594 @ =sub_8084454
str r0, [r1]
ldr r0, _08085598 @ =sub_805671C
@@ -4405,7 +4405,7 @@ _08085584:
bx r1
.align 2, 0
_0808558C: .4byte gPaletteFade
_08085590: .4byte gUnknown_3005020
_08085590: .4byte gFieldCallback
_08085594: .4byte sub_8084454
_08085598: .4byte sub_805671C
_0808559C: .4byte sub_80853E4
@@ -4613,7 +4613,7 @@ _08085702:
bl FieldObjectSetDirection
bl sub_80555E0
bl warp_in
ldr r1, _0808575C @ =gUnknown_3005020
ldr r1, _0808575C @ =gFieldCallback
ldr r0, _08085760 @ =sub_80859D4
str r0, [r1]
ldr r0, _08085764 @ =sub_805671C
@@ -4629,7 +4629,7 @@ _08085750:
bx r0
.align 2, 0
_08085758: .4byte gPaletteFade
_0808575C: .4byte gUnknown_3005020
_0808575C: .4byte gFieldCallback
_08085760: .4byte sub_80859D4
_08085764: .4byte sub_805671C
_08085768: .4byte sub_808563C
@@ -4970,7 +4970,7 @@ sub_80859D4: @ 80859D4
bl sub_8111CF0
bl ScriptContext2_Enable
bl player_bitmagic
ldr r1, _08085A14 @ =gUnknown_3005020
ldr r1, _08085A14 @ =gFieldCallback
movs r0, 0
str r0, [r1]
ldr r2, _08085A18 @ =gMapObjects
@@ -4990,7 +4990,7 @@ sub_80859D4: @ 80859D4
pop {r0}
bx r0
.align 2, 0
_08085A14: .4byte gUnknown_3005020
_08085A14: .4byte gFieldCallback
_08085A18: .4byte gMapObjects
_08085A1C: .4byte gPlayerAvatar
_08085A20: .4byte sub_8085A24
@@ -5156,8 +5156,8 @@ _08085B58:
_08085B60: .4byte sub_8085A24
thumb_func_end sub_8085A80
thumb_func_start sub_8085B64
sub_8085B64: @ 8085B64
thumb_func_start CreateTeleportFieldEffectTask
CreateTeleportFieldEffectTask: @ 8085B64
push {lr}
ldr r0, _08085B74 @ =sub_8085B78
movs r1, 0
@@ -5166,7 +5166,7 @@ sub_8085B64: @ 8085B64
bx r0
.align 2, 0
_08085B74: .4byte sub_8085B78
thumb_func_end sub_8085B64
thumb_func_end CreateTeleportFieldEffectTask
thumb_func_start sub_8085B78
sub_8085B78: @ 8085B78
@@ -5409,7 +5409,7 @@ sub_8085D34: @ 8085D34
bl warp_in
ldr r0, _08085D78 @ =sub_805671C
bl SetMainCallback2
ldr r1, _08085D7C @ =gUnknown_3005020
ldr r1, _08085D7C @ =gFieldCallback
ldr r0, _08085D80 @ =mapldr_08085D88
str r0, [r1]
ldr r0, _08085D84 @ =sub_8085B78
@@ -5423,7 +5423,7 @@ _08085D70:
.align 2, 0
_08085D74: .4byte gPaletteFade
_08085D78: .4byte sub_805671C
_08085D7C: .4byte gUnknown_3005020
_08085D7C: .4byte gFieldCallback
_08085D80: .4byte mapldr_08085D88
_08085D84: .4byte sub_8085B78
thumb_func_end sub_8085D34
@@ -5436,7 +5436,7 @@ mapldr_08085D88: @ 8085D88
bl sub_8111CF0
bl ScriptContext2_Enable
bl player_bitmagic
ldr r1, _08085DCC @ =gUnknown_3005020
ldr r1, _08085DCC @ =gFieldCallback
movs r0, 0
str r0, [r1]
ldr r2, _08085DD0 @ =gMapObjects
@@ -5457,7 +5457,7 @@ mapldr_08085D88: @ 8085D88
pop {r0}
bx r0
.align 2, 0
_08085DCC: .4byte gUnknown_3005020
_08085DCC: .4byte gFieldCallback
_08085DD0: .4byte gMapObjects
_08085DD4: .4byte gPlayerAvatar
_08085DD8: .4byte sub_8085DDC
@@ -6955,7 +6955,7 @@ sub_8086944: @ 8086944
cmp r0, 0
beq _08086978
adds r0, r4, 0
bl sub_8055F48
bl Overworld_ChangeMusicTo
_08086978:
movs r0, 0
pop {r4}
@@ -7213,7 +7213,7 @@ sub_8086B30: @ 8086B30
lsrs r0, 24
bl DestroyTask
movs r0, 0x16
bl sub_812B1F0
bl HelpSystem_SetSomeVariable2
_08086B96:
pop {r4,r5}
pop {r0}
asm/field_effect_helpers.s
+4 -4
View File
@@ -845,7 +845,7 @@ unc_grass_normal: @ 80DB3EC
lsrs r4, r0, 8
lsls r0, 24
lsrs r7, r0, 24
ldr r3, _080DB498 @ =gUnknown_2036E18
ldr r3, _080DB498 @ =gCamera
ldrb r1, [r3]
movs r0, 0x1
ands r0, r1
@@ -921,7 +921,7 @@ _080DB48C:
bl FieldEffectStop
b _080DB4E4
.align 2, 0
_080DB498: .4byte gUnknown_2036E18
_080DB498: .4byte gCamera
_080DB49C: .4byte gSaveBlock1Ptr
_080DB4A0:
mov r0, sp
@@ -1196,7 +1196,7 @@ unc_grass_tall: @ 80DB69C
lsrs r7, r0, 8
lsls r0, 24
lsrs r6, r0, 24
ldr r3, _080DB748 @ =gUnknown_2036E18
ldr r3, _080DB748 @ =gCamera
ldrb r1, [r3]
movs r0, 0x1
ands r0, r1
@@ -1272,7 +1272,7 @@ _080DB73C:
bl FieldEffectStop
b _080DB786
.align 2, 0
_080DB748: .4byte gUnknown_2036E18
_080DB748: .4byte gCamera
_080DB74C: .4byte gSaveBlock1Ptr
_080DB750:
mov r0, sp
asm/field_fadetransition.s
+48 -48
View File
@@ -273,8 +273,8 @@ _0807DD1C:
bx r0
thumb_func_end task0A_asap_script_env_2_enable_and_set_ctx_running
thumb_func_start sub_807DD24
sub_807DD24: @ 807DD24
thumb_func_start FieldCallback_ReturnToEventScript2
FieldCallback_ReturnToEventScript2: @ 807DD24
push {lr}
bl ScriptContext2_Enable
bl sub_8055DC4
@@ -286,7 +286,7 @@ sub_807DD24: @ 807DD24
bx r0
.align 2, 0
_0807DD40: .4byte task0A_asap_script_env_2_enable_and_set_ctx_running
thumb_func_end sub_807DD24
thumb_func_end FieldCallback_ReturnToEventScript2
thumb_func_start sub_807DD44
sub_807DD44: @ 807DD44
@@ -661,7 +661,7 @@ _0807E028:
ldrsh r0, [r6, r2]
movs r2, 0
ldrsh r1, [r7, r2]
bl sub_805B268
bl FieldSetDoorOpened
movs r0, 0x1
strh r0, [r4, 0x8]
b _0807E206
@@ -691,7 +691,7 @@ _0807E074:
ldrsh r0, [r6, r1]
movs r2, 0
ldrsh r1, [r7, r2]
bl sub_805B364
bl GetDoorSoundEffect
lsls r0, 16
lsrs r0, 16
bl PlaySE
@@ -699,12 +699,12 @@ _0807E074:
ldrsh r0, [r6, r1]
movs r2, 0
ldrsh r1, [r7, r2]
bl sub_805B310
bl FieldAnimateDoorOpen
movs r0, 0x7
strh r0, [r4, 0x8]
b _0807E206
_0807E0A2:
bl sub_805B350
bl FieldIsDoorAnimationRunning
lsls r0, 24
cmp r0, 0
beq _0807E0AE
@@ -750,7 +750,7 @@ _0807E0FC:
ldrsh r0, [r4, r1]
movs r2, 0x22
ldrsh r1, [r4, r2]
bl sub_805B2D0
bl FieldAnimateDoorClose
movs r0, 0x9
strh r0, [r4, 0x8]
b _0807E206
@@ -762,7 +762,7 @@ _0807E10E:
lsls r0, 24
cmp r0, 0
beq _0807E206
bl sub_805B350
bl FieldIsDoorAnimationRunning
lsls r0, 24
cmp r0, 0
bne _0807E206
@@ -822,7 +822,7 @@ _0807E198:
ldrsh r0, [r6, r1]
movs r2, 0
ldrsh r1, [r7, r2]
bl sub_805B2D0
bl FieldAnimateDoorClose
lsls r0, 24
asrs r0, 24
strh r0, [r4, 0xA]
@@ -1153,16 +1153,16 @@ _0807E434:
bx r1
thumb_func_end sub_807E418
thumb_func_start sub_807E438
sub_807E438: @ 807E438
thumb_func_start DoWarp
DoWarp: @ 807E438
push {lr}
bl ScriptContext2_Enable
bl sub_8055F88
bl sub_807DC18
bl play_some_sound
bl PlayRainStoppingSoundEffect
movs r0, 0x9
bl PlaySE
ldr r0, _0807E464 @ =gUnknown_3005020
ldr r0, _0807E464 @ =gFieldCallback
ldr r1, _0807E468 @ =sub_807DF64
str r1, [r0]
ldr r0, _0807E46C @ =sub_807E718
@@ -1171,19 +1171,19 @@ sub_807E438: @ 807E438
pop {r0}
bx r0
.align 2, 0
_0807E464: .4byte gUnknown_3005020
_0807E464: .4byte gFieldCallback
_0807E468: .4byte sub_807DF64
_0807E46C: .4byte sub_807E718
thumb_func_end sub_807E438
thumb_func_end DoWarp
thumb_func_start sp13E_warp_to_last_warp
sp13E_warp_to_last_warp: @ 807E470
thumb_func_start DoDiveWarp
DoDiveWarp: @ 807E470
push {lr}
bl ScriptContext2_Enable
bl sub_8055F88
bl sub_807DC18
bl play_some_sound
ldr r0, _0807E494 @ =gUnknown_3005020
bl PlayRainStoppingSoundEffect
ldr r0, _0807E494 @ =gFieldCallback
ldr r1, _0807E498 @ =sub_807DF64
str r1, [r0]
ldr r0, _0807E49C @ =sub_807E718
@@ -1192,10 +1192,10 @@ sp13E_warp_to_last_warp: @ 807E470
pop {r0}
bx r0
.align 2, 0
_0807E494: .4byte gUnknown_3005020
_0807E494: .4byte gFieldCallback
_0807E498: .4byte sub_807DF64
_0807E49C: .4byte sub_807E718
thumb_func_end sp13E_warp_to_last_warp
thumb_func_end DoDiveWarp
thumb_func_start sub_807E4A0
sub_807E4A0: @ 807E4A0
@@ -1228,11 +1228,11 @@ _0807E4D4: .4byte sub_807E980
_0807E4D8: .4byte gTasks
thumb_func_end sub_807E4A0
thumb_func_start sub_807E4DC
sub_807E4DC: @ 807E4DC
thumb_func_start DoDoorWarp
DoDoorWarp: @ 807E4DC
push {lr}
bl ScriptContext2_Enable
ldr r0, _0807E4F4 @ =gUnknown_3005020
ldr r0, _0807E4F4 @ =gFieldCallback
ldr r1, _0807E4F8 @ =sub_807DF64
str r1, [r0]
ldr r0, _0807E4FC @ =sub_807E80C
@@ -1241,10 +1241,10 @@ sub_807E4DC: @ 807E4DC
pop {r0}
bx r0
.align 2, 0
_0807E4F4: .4byte gUnknown_3005020
_0807E4F4: .4byte gFieldCallback
_0807E4F8: .4byte sub_807DF64
_0807E4FC: .4byte sub_807E80C
thumb_func_end sub_807E4DC
thumb_func_end DoDoorWarp
thumb_func_start sub_807E500
sub_807E500: @ 807E500
@@ -1253,14 +1253,14 @@ sub_807E500: @ 807E500
ldr r0, _0807E518 @ =sub_807E718
movs r1, 0xA
bl CreateTask
ldr r1, _0807E51C @ =gUnknown_3005020
ldr r1, _0807E51C @ =gFieldCallback
ldr r0, _0807E520 @ =sub_807DF94
str r0, [r1]
pop {r0}
bx r0
.align 2, 0
_0807E518: .4byte sub_807E718
_0807E51C: .4byte gUnknown_3005020
_0807E51C: .4byte gFieldCallback
_0807E520: .4byte sub_807DF94
thumb_func_end sub_807E500
@@ -1268,7 +1268,7 @@ _0807E520: .4byte sub_807DF94
sub_807E524: @ 807E524
push {lr}
bl ScriptContext2_Enable
ldr r0, _0807E53C @ =gUnknown_3005020
ldr r0, _0807E53C @ =gFieldCallback
ldr r1, _0807E540 @ =sub_807DF64
str r1, [r0]
ldr r0, _0807E544 @ =sub_807E784
@@ -1277,24 +1277,24 @@ sub_807E524: @ 807E524
pop {r0}
bx r0
.align 2, 0
_0807E53C: .4byte gUnknown_3005020
_0807E53C: .4byte gFieldCallback
_0807E540: .4byte sub_807DF64
_0807E544: .4byte sub_807E784
thumb_func_end sub_807E524
thumb_func_start sp13F_fall_to_last_warp
sp13F_fall_to_last_warp: @ 807E548
thumb_func_start DoFallWarp
DoFallWarp: @ 807E548
push {lr}
bl sp13E_warp_to_last_warp
ldr r1, _0807E558 @ =gUnknown_3005020
bl DoDiveWarp
ldr r1, _0807E558 @ =gFieldCallback
ldr r0, _0807E55C @ =sub_8084454
str r0, [r1]
pop {r0}
bx r0
.align 2, 0
_0807E558: .4byte gUnknown_3005020
_0807E558: .4byte gFieldCallback
_0807E55C: .4byte sub_8084454
thumb_func_end sp13F_fall_to_last_warp
thumb_func_end DoFallWarp
thumb_func_start sub_807E560
sub_807E560: @ 807E560
@@ -1339,14 +1339,14 @@ sub_807E59C: @ 807E59C
ldr r0, _0807E5B8 @ =sub_807E784
movs r1, 0xA
bl CreateTask
ldr r1, _0807E5BC @ =gUnknown_3005020
ldr r1, _0807E5BC @ =gFieldCallback
ldr r0, _0807E5C0 @ =sub_807DF94
str r0, [r1]
pop {r0}
bx r0
.align 2, 0
_0807E5B8: .4byte sub_807E784
_0807E5BC: .4byte gUnknown_3005020
_0807E5BC: .4byte gFieldCallback
_0807E5C0: .4byte sub_807DF94
thumb_func_end sub_807E59C
@@ -1358,14 +1358,14 @@ sub_807E5C4: @ 807E5C4
ldr r0, _0807E5E0 @ =sub_807E718
movs r1, 0xA
bl CreateTask
ldr r1, _0807E5E4 @ =gUnknown_3005020
ldr r1, _0807E5E4 @ =gFieldCallback
ldr r0, _0807E5E8 @ =nullsub_60
str r0, [r1]
pop {r0}
bx r0
.align 2, 0
_0807E5E0: .4byte sub_807E718
_0807E5E4: .4byte gUnknown_3005020
_0807E5E4: .4byte gFieldCallback
_0807E5E8: .4byte nullsub_60
thumb_func_end sub_807E5C4
@@ -1690,7 +1690,7 @@ _0807E85C:
movs r2, 0
ldrsh r1, [r6, r2]
subs r1, 0x1
bl sub_805B364
bl GetDoorSoundEffect
lsls r0, 16
lsrs r0, 16
bl PlaySE
@@ -1699,7 +1699,7 @@ _0807E85C:
movs r2, 0
ldrsh r1, [r6, r2]
subs r1, 0x1
bl sub_805B310
bl FieldAnimateDoorOpen
lsls r0, 24
asrs r0, 24
strh r0, [r5, 0xA]
@@ -1760,7 +1760,7 @@ _0807E8F4:
movs r2, 0
ldrsh r1, [r6, r2]
subs r1, 0x1
bl sub_805B2D0
bl FieldAnimateDoorClose
lsls r0, 24
asrs r0, 24
strh r0, [r5, 0xA]
@@ -1807,7 +1807,7 @@ _0807E95C:
_0807E966:
bl sub_8055F88
_0807E96A:
bl play_some_sound
bl PlayRainStoppingSoundEffect
movs r0, 0
strh r0, [r5, 0x8]
ldr r0, _0807E97C @ =sub_807E718
@@ -1891,7 +1891,7 @@ _0807EA00:
b _0807EAB0
_0807EA10:
bl sub_8055F88
bl play_some_sound
bl PlayRainStoppingSoundEffect
ldrb r1, [r7, 0x5]
movs r0, 0xD
negs r0, r0
@@ -1954,7 +1954,7 @@ _0807EA92:
strh r0, [r5]
b _0807EAB0
_0807EA9A:
ldr r0, _0807EAB8 @ =gUnknown_3005020
ldr r0, _0807EAB8 @ =gFieldCallback
ldr r1, _0807EABC @ =sub_807DF64
str r1, [r0]
bl warp_in
@@ -1968,7 +1968,7 @@ _0807EAB0:
pop {r0}
bx r0
.align 2, 0
_0807EAB8: .4byte gUnknown_3005020
_0807EAB8: .4byte gFieldCallback
_0807EABC: .4byte sub_807DF64
_0807EAC0: .4byte sub_805671C
thumb_func_end sub_807E980
asm/field_map_obj.s
+21 -21
View File
@@ -673,7 +673,7 @@ sub_805E2E8: @ 805E2E8
lsls r0, 24
cmp r0, 0
beq _0805E37C
ldr r1, _0805E374 @ =gUnknown_3005040
ldr r1, _0805E374 @ =VMap
ldr r0, [r1]
adds r3, r0, 0
subs r3, 0x10
@@ -736,7 +736,7 @@ _0805E36A:
movs r0, 0
b _0805E37E
.align 2, 0
_0805E374: .4byte gUnknown_3005040
_0805E374: .4byte VMap
_0805E378: .4byte gSaveBlock1Ptr
_0805E37C:
movs r0, 0x1
@@ -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,10 +1612,10 @@ _0805E9E4:
.align 2, 0
_0805E9F0: .4byte 0x0000ffff
_0805E9F4: .4byte gSprites
thumb_func_end AddPseudoFieldObject
thumb_func_end AddPseudoEventObject
thumb_func_start sub_805E9F8
sub_805E9F8: @ 805E9F8
thumb_func_start sprite_new
sprite_new: @ 805E9F8
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -1772,7 +1772,7 @@ _0805EB24:
_0805EB38: .4byte sub_8068FA8
_0805EB3C: .4byte 0x0000ffff
_0805EB40: .4byte gSprites
thumb_func_end sub_805E9F8
thumb_func_end sprite_new
thumb_func_start sub_805EB44
sub_805EB44: @ 805EB44
@@ -3516,7 +3516,7 @@ npc_coords_shift_still: @ 805F818
thumb_func_start UpdateFieldObjectCoordsForCameraUpdate
UpdateFieldObjectCoordsForCameraUpdate: @ 805F82C
push {r4,r5,lr}
ldr r2, _0805F88C @ =gUnknown_2036E18
ldr r2, _0805F88C @ =gCamera
ldrb r1, [r2]
movs r0, 0x1
ands r0, r1
@@ -3566,7 +3566,7 @@ _0805F884:
pop {r0}
bx r0
.align 2, 0
_0805F88C: .4byte gUnknown_2036E18
_0805F88C: .4byte gCamera
_0805F890: .4byte gMapObjects
thumb_func_end UpdateFieldObjectCoordsForCameraUpdate
@@ -12332,13 +12332,13 @@ npc_block_way: @ 80636AC
_080636E2:
adds r0, r5, 0
adds r1, r4, 0
bl sub_8058DC4
bl MapGridIsImpassableAt
lsls r0, 24
cmp r0, 0
bne _08063724
adds r0, r5, 0
adds r1, r4, 0
bl sub_8059334
bl GetMapBorderIdAt
movs r1, 0x1
negs r1, r1
cmp r0, r1
@@ -12432,13 +12432,13 @@ sub_8063770: @ 8063770
lsrs r4, r1, 31
adds r0, r6, 0
adds r1, r5, 0
bl sub_8058DC4
bl MapGridIsImpassableAt
lsls r0, 24
cmp r0, 0
bne _080637E8
adds r0, r6, 0
adds r1, r5, 0
bl sub_8059334
bl GetMapBorderIdAt
movs r1, 0x1
negs r1, r1
cmp r0, r1
@@ -21605,7 +21605,7 @@ _080677EA:
ands r0, r1
strb r0, [r5, 0x1]
_08067822:
ldr r1, _08067850 @ =gUnknown_825E074
ldr r1, _08067850 @ =gSineTable
movs r2, 0x3A
ldrsh r0, [r4, r2]
lsls r0, 1
@@ -21629,7 +21629,7 @@ _08067822:
strb r0, [r5]
b _080678B6
.align 2, 0
_08067850: .4byte gUnknown_825E074
_08067850: .4byte gSineTable
_08067854:
ldrh r0, [r4, 0x36]
adds r0, 0x1
@@ -21697,7 +21697,7 @@ sub_80678C0: @ 80678C0
movs r0, 0xFF
ands r2, r0
strh r2, [r1, 0x3C]
ldr r3, _080678EC @ =gUnknown_825E074
ldr r3, _080678EC @ =gSineTable
movs r4, 0x3C
ldrsh r0, [r1, r4]
lsls r0, 1
@@ -21715,7 +21715,7 @@ _080678E6:
pop {r1}
bx r1
.align 2, 0
_080678EC: .4byte gUnknown_825E074
_080678EC: .4byte gSineTable
thumb_func_end sub_80678C0
thumb_func_start sub_80678F0
asm/field_message_box.s
+3 -3
View File
@@ -83,7 +83,7 @@ _080693D4:
_080693DA:
movs r0, 0
movs r1, 0x1
bl sub_80F6EE4
bl DrawDialogueFrame
_080693E2:
ldrh r0, [r5, 0x8]
adds r0, 0x1
@@ -250,7 +250,7 @@ HideFieldMessageBox: @ 80694F4
bl task_del_textbox
movs r0, 0
movs r1, 0x1
bl sub_80F6F54
bl ClearDialogWindowAndFrame
ldr r1, _0806950C @ =gUnknown_203709C
movs r0, 0
strb r0, [r1]
@@ -293,7 +293,7 @@ sub_8069538: @ 8069538
bl task_del_textbox
movs r0, 0
movs r1, 0x1
bl sub_80F6F1C
bl DrawStdWindowFrame
ldr r1, _08069550 @ =gUnknown_203709C
movs r0, 0
strb r0, [r1]
asm/field_player_avatar.s
+6 -6
View File
@@ -2818,7 +2818,7 @@ PartyHasMonWithSurf: @ 805C83C
_0805C84E:
adds r0, r4, 0
movs r1, 0x39
bl pokemon_has_move
bl MonKnowsMove
lsls r0, 24
cmp r0, 0
beq _0805C860
@@ -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]
@@ -4769,7 +4769,7 @@ _0805D748:
strh r6, [r0, 0x26]
movs r0, 0
movs r1, 0x1
bl sub_80F6F54
bl ClearDialogWindowAndFrame
ldrh r0, [r5, 0xA]
adds r0, 0x1
strh r0, [r5, 0xA]
@@ -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
@@ -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]
@@ -5043,7 +5043,7 @@ sub_805D980: @ 805D980
bl UnfreezeMapObjects
movs r0, 0
movs r1, 0x1
bl sub_80F6F54
bl ClearDialogWindowAndFrame
ldr r0, _0805D9C0 @ =sub_805D304
bl FindTaskIdByFunc
lsls r0, 24
asm/field_screen_effect.s
+14 -14
View File
@@ -135,12 +135,12 @@ _0807EEE0:
beq _0807EF6C
b _0807EF76
_0807EEE6:
ldr r0, _0807EF0C @ =gUnknown_2039600
ldr r0, _0807EF0C @ =gScanlineEffect
ldrb r1, [r0, 0x14]
lsls r0, r1, 4
subs r0, r1
lsls r0, 7
ldr r1, _0807EF10 @ =gUnknown_2038700
ldr r1, _0807EF10 @ =gScanlineEffectRegBuffers
adds r0, r1
movs r2, 0x2
ldrsh r1, [r4, r2]
@@ -153,15 +153,15 @@ _0807EEE6:
strh r0, [r4]
b _0807EF76
.align 2, 0
_0807EF0C: .4byte gUnknown_2039600
_0807EF10: .4byte gUnknown_2038700
_0807EF0C: .4byte gScanlineEffect
_0807EF10: .4byte gScanlineEffectRegBuffers
_0807EF14:
ldr r0, _0807EF5C @ =gUnknown_2039600
ldr r0, _0807EF5C @ =gScanlineEffect
ldrb r1, [r0, 0x14]
lsls r0, r1, 4
subs r0, r1
lsls r0, 7
ldr r1, _0807EF60 @ =gUnknown_2038700
ldr r1, _0807EF60 @ =gScanlineEffectRegBuffers
adds r0, r1
movs r6, 0x2
ldrsh r1, [r4, r6]
@@ -186,19 +186,19 @@ _0807EF14:
ldrsh r0, [r4, r3]
cmp r0, 0x1
bne _0807EF64
bl remove_some_task
bl ScanlineEffect_Stop
movs r0, 0x2
strh r0, [r4]
b _0807EF76
.align 2, 0
_0807EF5C: .4byte gUnknown_2039600
_0807EF60: .4byte gUnknown_2038700
_0807EF5C: .4byte gScanlineEffect
_0807EF60: .4byte gScanlineEffectRegBuffers
_0807EF64:
adds r0, r5, 0
bl DestroyTask
b _0807EF76
_0807EF6C:
bl dp12_8087EA4
bl ScanlineEffect_Clear
adds r0, r5, 0
bl DestroyTask
_0807EF76:
@@ -344,7 +344,7 @@ sub_807F074: @ 807F074
lsrs r0, 24
cmp r0, 0
beq _0807F0A2
ldr r4, _0807F0A8 @ =gUnknown_2038700
ldr r4, _0807F0A8 @ =gScanlineEffectRegBuffers
ldr r1, _0807F0AC @ =gUnknown_83C68D4
lsls r0, 1
adds r0, r1
@@ -365,7 +365,7 @@ _0807F0A2:
pop {r0}
bx r0
.align 2, 0
_0807F0A8: .4byte gUnknown_2038700
_0807F0A8: .4byte gScanlineEffectRegBuffers
_0807F0AC: .4byte gUnknown_83C68D4
thumb_func_end sub_807F074
@@ -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
@@ -869,7 +869,7 @@ _0807F4A8:
adds r7, r0, r1
strh r5, [r7, 0xA]
movs r0, 0xF0
bl sub_80F77CC
bl Menu_LoadStdPalAt
adds r0, r5, 0
movs r1, 0
bl FillWindowPixelBuffer
asm/field_specials.s
+30 -30
View File
@@ -33,9 +33,9 @@ _080CA644:
movs r4, 0x8D
lsls r4, 1
adds r0, r4, 0
bl sub_8055E78
bl Overworld_SetSavedMusic
adds r0, r4, 0
bl sub_8055F48
bl Overworld_ChangeMusicTo
pop {r4}
pop {r0}
bx r0
@@ -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
@@ -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
@@ -756,7 +756,7 @@ sub_80CAB78: @ 80CAB78
bl VarGet
lsls r0, 16
lsrs r0, 16
bl sub_80CBD94
bl GetStarterPokemon
lsls r0, 16
lsrs r6, r0, 16
bl CalculatePlayerPartyCount
@@ -2071,7 +2071,7 @@ 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
@@ -2141,7 +2141,7 @@ sub_80CB63C: @ 80CB63C
ldr r4, _080CB654 @ =gUnknown_2039A0C
ldrb r0, [r4]
movs r1, 0x1
bl sub_810F4D8
bl ClearMenuWindow
ldrb r0, [r4]
bl RemoveWindow
pop {r4}
@@ -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]
@@ -2854,7 +2854,7 @@ sub_80CBBAC: @ 80CBBAC
lsrs r0, 24
movs r1, 0
movs r2, 0
bl sub_810713C
bl DestroyListMenu
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 ClearMenuWindow
ldrh r0, [r4, 0x22]
lsls r0, 24
lsrs r0, 24
@@ -3078,15 +3078,15 @@ _080CBD7C: .4byte gTasks
sub_80CBD80: @ 80CBD80
push {lr}
movs r0, 0x16
bl sub_812B1F0
bl HelpSystem_SetSomeVariable2
movs r0, 0x8
bl SetPlayerAvatarTransitionFlags
pop {r0}
bx r0
thumb_func_end sub_80CBD80
thumb_func_start sub_80CBD94
sub_80CBD94: @ 80CBD94
thumb_func_start GetStarterPokemon
GetStarterPokemon: @ 80CBD94
push {lr}
lsls r0, 16
lsrs r1, r0, 16
@@ -3094,31 +3094,31 @@ sub_80CBD94: @ 80CBD94
bls _080CBDA0
movs r1, 0
_080CBDA0:
ldr r0, _080CBDAC @ =gUnknown_83F5D2C
ldr r0, _080CBDAC @ =sStarterMon
lsls r1, 1
adds r1, r0
ldrh r0, [r1]
pop {r1}
bx r1
.align 2, 0
_080CBDAC: .4byte gUnknown_83F5D2C
thumb_func_end sub_80CBD94
_080CBDAC: .4byte sStarterMon
thumb_func_end GetStarterPokemon
thumb_func_start sub_80CBDB0
sub_80CBDB0: @ 80CBDB0
thumb_func_start ScrSpecial_GetStarter
ScrSpecial_GetStarter: @ 80CBDB0
push {lr}
ldr r0, _080CBDC8 @ =0x00004031
bl VarGet
lsls r0, 16
lsrs r0, 16
bl sub_80CBD94
bl GetStarterPokemon
lsls r0, 16
lsrs r0, 16
pop {r1}
bx r1
.align 2, 0
_080CBDC8: .4byte 0x00004031
thumb_func_end sub_80CBDB0
thumb_func_end ScrSpecial_GetStarter
thumb_func_start sub_80CBDCC
sub_80CBDCC: @ 80CBDCC
@@ -3138,7 +3138,7 @@ _080CBDE4: .4byte gSpecialVar_0x8004
thumb_func_start sub_80CBDE8
sub_80CBDE8: @ 80CBDE8
ldr r1, _080CBDF8 @ =gUnknown_3005074
ldr r1, _080CBDF8 @ =gSelectedEventObject
movs r0, 0
strb r0, [r1]
ldr r1, _080CBDFC @ =gUnknown_20370DA
@@ -3146,7 +3146,7 @@ sub_80CBDE8: @ 80CBDE8
strh r0, [r1]
bx lr
.align 2, 0
_080CBDF8: .4byte gUnknown_3005074
_080CBDF8: .4byte gSelectedEventObject
_080CBDFC: .4byte gUnknown_20370DA
thumb_func_end sub_80CBDE8
@@ -3157,7 +3157,7 @@ sub_80CBE00: @ 80CBE00
ldrh r0, [r0]
cmp r0, 0xFF
bne _080CBE44
ldr r1, _080CBE1C @ =gUnknown_3005074
ldr r1, _080CBE1C @ =gSelectedEventObject
ldrb r0, [r1]
cmp r0, 0
bne _080CBE20
@@ -3165,7 +3165,7 @@ sub_80CBE00: @ 80CBE00
b _080CBE48
.align 2, 0
_080CBE18: .4byte gUnknown_20370DA
_080CBE1C: .4byte gUnknown_3005074
_080CBE1C: .4byte gSelectedEventObject
_080CBE20:
ldr r2, _080CBE4C @ =gMapObjects
ldrb r1, [r1]
@@ -3267,7 +3267,7 @@ TV_PrintIntToStringVar: @ 80CBED4
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
bl sub_80CBF04
bl CountDigits
adds r3, r0, 0
ldr r0, _080CBF00 @ =gUnknown_83F5AF8
lsls r4, 2
@@ -3285,8 +3285,8 @@ TV_PrintIntToStringVar: @ 80CBED4
_080CBF00: .4byte gUnknown_83F5AF8
thumb_func_end TV_PrintIntToStringVar
thumb_func_start sub_80CBF04
sub_80CBF04: @ 80CBF04
thumb_func_start CountDigits
CountDigits: @ 80CBF04
push {r4,lr}
adds r4, r0, 0
movs r1, 0xA
@@ -3366,7 +3366,7 @@ _080CBF9A:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_80CBF04
thumb_func_end CountDigits
thumb_func_start sub_80CBFA0
sub_80CBFA0: @ 80CBFA0
@@ -5542,7 +5542,7 @@ sub_80CD098: @ 80CD098
str r3, [sp]
movs r0, 0
movs r3, 0
bl sub_8006300
bl CreateTextCursorSpriteForOakSpeech
ldr r1, _080CD0DC @ =gUnknown_2039A1B
strb r0, [r1]
b _080CD0E8
asm/field_tasks.s
+2 -2
View File
@@ -490,7 +490,7 @@ _0806EB8E:
ldrsh r0, [r0, r3]
movs r2, 0
ldrsh r1, [r4, r2]
bl sub_8058E48
bl MapGridGetMetatileIdAt
ldr r1, _0806EBDC @ =0x0000020a
cmp r0, r1
bne _0806EBE4
@@ -534,7 +534,7 @@ sub_806EC04: @ 806EC04
asrs r4, r1, 16
adds r0, r5, 0
adds r1, r4, 0
bl sub_8058E48
bl MapGridGetMetatileIdAt
ldr r1, _0806EC38 @ =0x0000022f
ldr r2, _0806EC3C @ =0x00000237
cmp r0, r1
asm/field_weather.s
+11 -11
View File
@@ -122,7 +122,7 @@ weather_set: @ 8079CF4
beq _08079D0A
cmp r4, 0xD
beq _08079D0A
bl play_some_sound
bl PlayRainStoppingSoundEffect
_08079D0A:
ldr r1, _08079D4C @ =gUnknown_2037F34
ldr r2, _08079D50 @ =0x000006d1
@@ -170,7 +170,7 @@ sub_8079D60: @ 8079D60
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
bl play_some_sound
bl PlayRainStoppingSoundEffect
ldr r0, _08079D84 @ =gUnknown_2037F34
movs r2, 0xDA
lsls r2, 3
@@ -193,7 +193,7 @@ sub_8079D8C: @ 8079D8C
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
bl play_some_sound
bl PlayRainStoppingSoundEffect
ldr r1, _08079DB8 @ =gUnknown_2037F34
movs r2, 0xDA
lsls r2, 3
@@ -2250,7 +2250,7 @@ _0807AD14:
movs r1, 0x7F
ands r0, r1
strh r0, [r2]
ldr r1, _0807AD5C @ =gUnknown_825E074
ldr r1, _0807AD5C @ =gSineTable
movs r3, 0
ldrsh r0, [r2, r3]
lsls r0, 1
@@ -2278,7 +2278,7 @@ _0807AD54:
strh r0, [r4]
b _0807ADA0
.align 2, 0
_0807AD5C: .4byte gUnknown_825E074
_0807AD5C: .4byte gSineTable
_0807AD60: .4byte 0x0000073c
_0807AD64: .4byte 0x0000073e
_0807AD68:
@@ -2625,8 +2625,8 @@ _0807AFFA:
_0807B000: .4byte 0x000006dd
thumb_func_end SetRainStrengthFromSoundEffect
thumb_func_start play_some_sound
play_some_sound: @ 807B004
thumb_func_start PlayRainStoppingSoundEffect
PlayRainStoppingSoundEffect: @ 807B004
push {lr}
bl IsSpecialSEPlaying
lsls r0, 24
@@ -2658,7 +2658,7 @@ _0807B03C:
_0807B042:
pop {r0}
bx r0
thumb_func_end play_some_sound
thumb_func_end PlayRainStoppingSoundEffect
thumb_func_start sub_807B048
sub_807B048: @ 807B048
@@ -2804,8 +2804,8 @@ sav1_get_weather_probably: @ 807B130
_0807B13C: .4byte gSaveBlock1Ptr
thumb_func_end sav1_get_weather_probably
thumb_func_start sub_807B140
sub_807B140: @ 807B140
thumb_func_start SetSav1WeatherFromCurrMapHeader
SetSav1WeatherFromCurrMapHeader: @ 807B140
push {r4,r5,lr}
ldr r4, _0807B16C @ =gSaveBlock1Ptr
ldr r0, [r4]
@@ -2828,7 +2828,7 @@ sub_807B140: @ 807B140
.align 2, 0
_0807B16C: .4byte gSaveBlock1Ptr
_0807B170: .4byte gMapHeader
thumb_func_end sub_807B140
thumb_func_end SetSav1WeatherFromCurrMapHeader
thumb_func_start SetWeather
SetWeather: @ 807B174
asm/field_weather_effects.s
+6 -6
View File
@@ -1972,7 +1972,7 @@ sub_807C1AC: @ 807C1AC
movs r1, 0xFF
ands r0, r1
strh r0, [r4, 0x34]
ldr r1, _0807C224 @ =gUnknown_825E074
ldr r1, _0807C224 @ =gSineTable
movs r3, 0x34
ldrsh r0, [r4, r3]
lsls r0, 1
@@ -2020,7 +2020,7 @@ _0807C210:
subs r0, r1
b _0807C23C
.align 2, 0
_0807C224: .4byte gUnknown_825E074
_0807C224: .4byte gSineTable
_0807C228: .4byte gSpriteCoordOffsetX
_0807C22C: .4byte 0x000001ff
_0807C230: .4byte 0xffffff00
@@ -4417,7 +4417,7 @@ sub_807D4C4: @ 807D4C4
ldr r2, [r0]
ldr r0, _0807D52C @ =0x00000704
adds r4, r2, r0
ldr r6, _0807D530 @ =gUnknown_825E074
ldr r6, _0807D530 @ =gSineTable
ldr r1, _0807D534 @ =0x00000712
adds r5, r2, r1
ldrh r0, [r5]
@@ -4465,7 +4465,7 @@ sub_807D4C4: @ 807D4C4
.align 2, 0
_0807D528: .4byte gUnknown_83C2BBC
_0807D52C: .4byte 0x00000704
_0807D530: .4byte gUnknown_825E074
_0807D530: .4byte gSineTable
_0807D534: .4byte 0x00000712
_0807D538: .4byte gSpriteCoordOffsetX
_0807D53C: .4byte 0x0000070e
@@ -4856,7 +4856,7 @@ SandstormSpriteCallback3: @ 807D81C
_0807D83A:
movs r0, 0x2E
ldrsh r4, [r5, r0]
ldr r3, _0807D88C @ =gUnknown_825E074
ldr r3, _0807D88C @ =gSineTable
movs r2, 0x30
ldrsh r1, [r5, r2]
lsls r0, r1, 1
@@ -4897,7 +4897,7 @@ _0807D886:
pop {r0}
bx r0
.align 2, 0
_0807D88C: .4byte gUnknown_825E074
_0807D88C: .4byte gSineTable
thumb_func_end SandstormSpriteCallback3
thumb_func_start Weather11_InitVars
asm/fieldmap.s
-2400
View File
File diff suppressed because it is too large Load Diff
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_berrytree.s
-13
View File
@@ -1,13 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start nullsub_56
nullsub_56: @ 80A0E74
bx lr
thumb_func_end nullsub_56
.align 2, 0 @ Don't pad with nop.
asm/fldeff_cut.s
+13 -13
View File
@@ -44,34 +44,34 @@ sub_8097898: @ 8097898
lsrs r0, 24
cmp r0, 0x1
bne _08097904
ldr r1, _080978D0 @ =gUnknown_3005024
ldr r0, _080978D4 @ =hm_add_c3_launch_phase_2
ldr r1, _080978D0 @ =gFieldCallback2
ldr r0, _080978D4 @ =FieldCallback_PrepareFadeInFromMenu
str r0, [r1]
ldr r1, _080978D8 @ =gUnknown_203B0C4
ldr r1, _080978D8 @ =gPostMenuFieldCallback
ldr r0, _080978DC @ =sub_80979D0
b _080978EC
.align 2, 0
_080978CC: .4byte gUnknown_2039874
_080978D0: .4byte gUnknown_3005024
_080978D4: .4byte hm_add_c3_launch_phase_2
_080978D8: .4byte gUnknown_203B0C4
_080978D0: .4byte gFieldCallback2
_080978D4: .4byte FieldCallback_PrepareFadeInFromMenu
_080978D8: .4byte gPostMenuFieldCallback
_080978DC: .4byte sub_80979D0
_080978E0:
strb r0, [r4]
_080978E2:
ldr r1, _080978F4 @ =gUnknown_3005024
ldr r0, _080978F8 @ =hm_add_c3_launch_phase_2
ldr r1, _080978F4 @ =gFieldCallback2
ldr r0, _080978F8 @ =FieldCallback_PrepareFadeInFromMenu
str r0, [r1]
ldr r1, _080978FC @ =gUnknown_203B0C4
ldr r1, _080978FC @ =gPostMenuFieldCallback
ldr r0, _08097900 @ =sub_8097984
_080978EC:
str r0, [r1]
movs r0, 0x1
b _08097970
.align 2, 0
_080978F4: .4byte gUnknown_3005024
_080978F8: .4byte hm_add_c3_launch_phase_2
_080978FC: .4byte gUnknown_203B0C4
_080978F4: .4byte gFieldCallback2
_080978F8: .4byte FieldCallback_PrepareFadeInFromMenu
_080978FC: .4byte gPostMenuFieldCallback
_08097900: .4byte sub_8097984
_08097904:
ldr r4, _0809797C @ =gUnknown_2039A04
@@ -380,7 +380,7 @@ sub_8097B50: @ 8097B50
asrs r0, 16
lsrs r7, r1, 16
asrs r1, 16
bl sub_8058E48
bl MapGridGetMetatileIdAt
lsls r0, 16
lsrs r2, r0, 16
ldr r1, _08097B84 @ =gUnknown_83D4100
asm/fldeff_flash.s
+6 -6
View File
@@ -17,10 +17,10 @@ sub_80C9B2C: @ 80C9B2C
lsls r0, 24
cmp r0, 0
bne _080C9B6C
ldr r1, _080C9B5C @ =gUnknown_3005024
ldr r0, _080C9B60 @ =hm_add_c3_launch_phase_2
ldr r1, _080C9B5C @ =gFieldCallback2
ldr r0, _080C9B60 @ =FieldCallback_PrepareFadeInFromMenu
str r0, [r1]
ldr r1, _080C9B64 @ =gUnknown_203B0C4
ldr r1, _080C9B64 @ =gPostMenuFieldCallback
ldr r0, _080C9B68 @ =sub_80C9B74
str r0, [r1]
movs r0, 0x1
@@ -28,9 +28,9 @@ sub_80C9B2C: @ 80C9B2C
.align 2, 0
_080C9B54: .4byte gMapHeader
_080C9B58: .4byte 0x00000806
_080C9B5C: .4byte gUnknown_3005024
_080C9B60: .4byte hm_add_c3_launch_phase_2
_080C9B64: .4byte gUnknown_203B0C4
_080C9B5C: .4byte gFieldCallback2
_080C9B60: .4byte FieldCallback_PrepareFadeInFromMenu
_080C9B64: .4byte gPostMenuFieldCallback
_080C9B68: .4byte sub_80C9B74
_080C9B6C:
movs r0, 0
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
+6 -6
View File
@@ -28,10 +28,10 @@ _080D080C:
lsls r0, 24
lsrs r0, 24
strh r0, [r4]
ldr r1, _080D0830 @ =gUnknown_3005024
ldr r0, _080D0834 @ =hm_add_c3_launch_phase_2
ldr r1, _080D0830 @ =gFieldCallback2
ldr r0, _080D0834 @ =FieldCallback_PrepareFadeInFromMenu
str r0, [r1]
ldr r1, _080D0838 @ =gUnknown_203B0C4
ldr r1, _080D0838 @ =gPostMenuFieldCallback
ldr r0, _080D083C @ =sub_80D0840
str r0, [r1]
movs r0, 0x1
@@ -41,9 +41,9 @@ _080D0826:
bx r1
.align 2, 0
_080D082C: .4byte gSpecialVar_Result
_080D0830: .4byte gUnknown_3005024
_080D0834: .4byte hm_add_c3_launch_phase_2
_080D0838: .4byte gUnknown_203B0C4
_080D0830: .4byte gFieldCallback2
_080D0834: .4byte FieldCallback_PrepareFadeInFromMenu
_080D0838: .4byte gPostMenuFieldCallback
_080D083C: .4byte sub_80D0840
thumb_func_end sub_80D07EC
asm/fldeff_sweetscent.s
+6 -6
View File
@@ -20,18 +20,18 @@ _080DE0C4: .4byte gUnknown_203B0A0
thumb_func_start sub_80DE0C8
sub_80DE0C8: @ 80DE0C8
ldr r1, _080DE0D8 @ =gUnknown_3005024
ldr r0, _080DE0DC @ =hm_add_c3_launch_phase_2
ldr r1, _080DE0D8 @ =gFieldCallback2
ldr r0, _080DE0DC @ =FieldCallback_PrepareFadeInFromMenu
str r0, [r1]
ldr r1, _080DE0E0 @ =gUnknown_203B0C4
ldr r1, _080DE0E0 @ =gPostMenuFieldCallback
ldr r0, _080DE0E4 @ =hm2_sweet_scent
str r0, [r1]
movs r0, 0x1
bx lr
.align 2, 0
_080DE0D8: .4byte gUnknown_3005024
_080DE0DC: .4byte hm_add_c3_launch_phase_2
_080DE0E0: .4byte gUnknown_203B0C4
_080DE0D8: .4byte gFieldCallback2
_080DE0DC: .4byte FieldCallback_PrepareFadeInFromMenu
_080DE0E0: .4byte gPostMenuFieldCallback
_080DE0E4: .4byte hm2_sweet_scent
thumb_func_end sub_80DE0C8
asm/fldeff_teleport.s
-92
View File
@@ -1,92 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start SetUpFieldMove_Teleport
SetUpFieldMove_Teleport: @ 80F66F0
push {lr}
ldr r0, _080F6708 @ =gMapHeader
ldrb r0, [r0, 0x17]
bl is_light_level_1_2_3_or_6
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _080F670C
movs r0, 0
b _080F671A
.align 2, 0
_080F6708: .4byte gMapHeader
_080F670C:
ldr r1, _080F6720 @ =gUnknown_3005024
ldr r0, _080F6724 @ =hm_add_c3_launch_phase_2
str r0, [r1]
ldr r1, _080F6728 @ =gUnknown_203B0C4
ldr r0, _080F672C @ =hm_teleport_run_dp02scr
str r0, [r1]
movs r0, 0x1
_080F671A:
pop {r1}
bx r1
.align 2, 0
_080F6720: .4byte gUnknown_3005024
_080F6724: .4byte hm_add_c3_launch_phase_2
_080F6728: .4byte gUnknown_203B0C4
_080F672C: .4byte hm_teleport_run_dp02scr
thumb_func_end SetUpFieldMove_Teleport
thumb_func_start hm_teleport_run_dp02scr
hm_teleport_run_dp02scr: @ 80F6730
push {lr}
bl sub_8054D08
movs r0, 0x3F
bl FieldEffectStart
bl GetCursorSelectionMonId
ldr r1, _080F674C @ =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r1]
pop {r0}
bx r0
.align 2, 0
_080F674C: .4byte gFieldEffectArguments
thumb_func_end hm_teleport_run_dp02scr
thumb_func_start FldEff_UseTeleport
FldEff_UseTeleport: @ 80F6750
push {lr}
bl oei_task_add
lsls r0, 24
lsrs r0, 24
ldr r2, _080F6778 @ =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r1, r2
ldr r2, _080F677C @ =sub_80F6780
lsrs r0, r2, 16
strh r0, [r1, 0x18]
strh r2, [r1, 0x1A]
movs r0, 0x1
bl SetPlayerAvatarTransitionFlags
movs r0, 0
pop {r1}
bx r1
.align 2, 0
_080F6778: .4byte gTasks
_080F677C: .4byte sub_80F6780
thumb_func_end FldEff_UseTeleport
thumb_func_start sub_80F6780
sub_80F6780: @ 80F6780
push {lr}
movs r0, 0x3F
bl FieldEffectActiveListRemove
bl sub_8085B64
pop {r0}
bx r0
thumb_func_end sub_80F6780
.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
+4055
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
+45 -45
View File
@@ -508,7 +508,7 @@ _080F21B2:
bl memcpy
movs r0, 0
movs r1, 0
bl sub_80F6EE4
bl DrawDialogueFrame
ldr r2, _080F2214 @ =gUnknown_8419F54
movs r0, 0
str r0, [sp]
@@ -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
@@ -692,7 +692,7 @@ _080F22F2:
ldr r3, _080F238C @ =0x0000ffff
str r3, [sp, 0xC]
movs r3, 0x1
bl sub_810C1CC
bl CreateMonPicSprite_HandleDeoxys
lsls r0, 24
lsrs r0, 24
ldr r3, _080F2390 @ =gSprites
@@ -723,7 +723,7 @@ _080F22F2:
strh r0, [r1]
movs r0, 0
movs r1, 0x1
bl sub_80F6F54
bl ClearDialogWindowAndFrame
adds r4, r5
ldr r0, _080F239C @ =sub_80F23A0
str r0, [r4]
@@ -1172,7 +1172,7 @@ sub_80F26D4: @ 80F26D4
ldr r0, [r0]
ldrb r0, [r0, 0x8]
movs r1, 0x1
bl sub_810C374
bl PlayerGenderToFrontTrainerPicId_Debug
lsls r0, 16
lsrs r0, 16
movs r1, 0x6
@@ -1182,7 +1182,7 @@ sub_80F26D4: @ 80F26D4
movs r1, 0x1
movs r2, 0x78
movs r3, 0x48
bl sub_810C2A4
bl CreateTrainerPicSprite
ldr r1, _080F2750 @ =gTasks
lsls r4, r5, 2
adds r4, r5
@@ -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
@@ -1265,7 +1265,7 @@ _080F27AC:
bl sub_80F33DC
movs r0, 0
movs r1, 0
bl sub_80F6EE4
bl DrawDialogueFrame
ldr r2, _080F27FC @ =gUnknown_84160C8
str r5, [sp]
movs r0, 0x2
@@ -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
@@ -1383,7 +1383,7 @@ _080F28AC:
ldrb r0, [r4]
cmp r0, 0xFF
beq _080F28B6
bl sub_810C214
bl FreeAndDestroyMonPicSprite
_080F28B6:
adds r4, 0x2
subs r5, 0x1
@@ -1394,7 +1394,7 @@ _080F28B6:
lsls r1, 3
adds r1, r0
ldrh r0, [r1, 0x10]
bl sub_810C2E8
bl FreeAndDestroyTrainerPicSprite
movs r0, 0
bl HideBg
movs r0, 0x1
@@ -1459,8 +1459,8 @@ sub_80F2934: @ 80F2934
movs r1, 0x9
movs r3, 0xB
bl Overworld_SetWarpDestination
bl sub_807E438
bl sub_80559E4
bl DoWarp
bl ResetInitialPlayerAvatarState
add sp, 0x4
pop {r0}
bx r0
@@ -1607,7 +1607,7 @@ sub_80F2AA4: @ 80F2AA4
movs r1, 0x1E
movs r2, 0
movs r3, 0xC
bl sub_810F558
bl CreateWindow_SnapRight_StdPal
movs r0, 0x3
bl Save_LoadGameData
lsls r0, 24
@@ -1825,7 +1825,7 @@ _080F2C4C:
ldr r3, _080F2CA0 @ =0x0000ffff
str r3, [sp, 0xC]
movs r3, 0x1
bl sub_810C1CC
bl CreateMonPicSprite_HandleDeoxys
lsls r0, 16
lsrs r0, 16
ldr r2, _080F2CA4 @ =gSprites
@@ -1888,13 +1888,13 @@ _080F2CB4:
ldrsh r0, [r4, r1]
cmp r0, 0
bgt _080F2D24
ldr r1, _080F2D20 @ =gUnknown_8415D78
ldr r1, _080F2D20 @ =gText_UPDOWNPick_ABUTTONBBUTTONCancel
movs r0, 0x1
str r0, [sp]
adds r0, r5, 0
movs r2, 0
movs r3, 0
bl sub_810F650
bl Menu_PrintHelpSystemUIHeader
b _080F2D34
.align 2, 0
_080F2D08: .4byte 0xffff0000
@@ -1903,15 +1903,15 @@ _080F2D10: .4byte gStringVar1
_080F2D14: .4byte gTasks
_080F2D18: .4byte gStringVar4
_080F2D1C: .4byte gUnknown_84160B4
_080F2D20: .4byte gUnknown_8415D78
_080F2D20: .4byte gText_UPDOWNPick_ABUTTONBBUTTONCancel
_080F2D24:
ldr r1, _080F2D54 @ =gUnknown_8415D60
ldr r1, _080F2D54 @ =gText_UPDOWNPick_ABUTTONNext_BBUTTONBack
movs r0, 0x1
str r0, [sp]
adds r0, r5, 0
movs r2, 0
movs r3, 0
bl sub_810F650
bl Menu_PrintHelpSystemUIHeader
_080F2D34:
ldr r0, _080F2D58 @ =gTasks
ldr r1, [sp, 0x14]
@@ -1929,7 +1929,7 @@ _080F2D34:
pop {r0}
bx r0
.align 2, 0
_080F2D54: .4byte gUnknown_8415D60
_080F2D54: .4byte gText_UPDOWNPick_ABUTTONNext_BBUTTONBack
_080F2D58: .4byte gTasks
_080F2D5C: .4byte Task_HofPC_PrintMonInfo
thumb_func_end sub_80F2B6C
@@ -2118,7 +2118,7 @@ _080F2EC4:
ldrb r0, [r0]
cmp r0, 0xFF
beq _080F2ED6
bl sub_810C214
bl FreeAndDestroyMonPicSprite
_080F2ED6:
adds r0, r4, 0x1
lsls r0, 16
@@ -2339,13 +2339,13 @@ sub_80F30A4: @ 80F30A4
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, _080F30FC @ =gUnknown_8415D8C
ldr r0, _080F30FC @ =gText_ABUTTONExit
movs r1, 0x8
movs r2, 0x1
bl sub_810F5E8
bl PrintTextOnRightSnappedWindow
movs r0, 0
movs r1, 0
bl sub_80F6EE4
bl DrawDialogueFrame
ldr r2, _080F3100 @ =gUnknown_8416090
movs r0, 0
str r0, [sp]
@@ -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
@@ -2374,7 +2374,7 @@ sub_80F30A4: @ 80F30A4
pop {r0}
bx r0
.align 2, 0
_080F30FC: .4byte gUnknown_8415D8C
_080F30FC: .4byte gText_ABUTTONExit
_080F3100: .4byte gUnknown_8416090
_080F3104: .4byte gTasks
_080F3108: .4byte Task_HofPC_ExitOnButtonPress
@@ -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
@@ -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
@@ -3070,11 +3070,11 @@ _080F36B8: .4byte gUnknown_840C39C
thumb_func_start sub_80F36BC
sub_80F36BC: @ 80F36BC
push {lr}
bl remove_some_task
bl ScanlineEffect_Stop
bl ResetTasks
bl ResetSpriteData
bl reset_temp_tile_data_buffers
bl dp13_810BB8C
bl ResetAllPicSprites
bl FreeAllSpritePalettes
ldr r1, _080F36EC @ =gReservedSpritePaletteCount
movs r0, 0x8
@@ -3223,8 +3223,8 @@ _080F37C8:
bl CopyBgTilemapBufferToVram
b _080F3854
_080F381E:
bl sub_80F6C6C
bl sub_80F6C98
bl InitStandardTextBoxWindows
bl ResetBg0
b _080F3854
_080F3828:
movs r1, 0x82
@@ -3353,7 +3353,7 @@ _080F38EE:
movs r1, 0x3
ands r0, r1
adds r0, 0x8
ldr r1, _080F392C @ =gUnknown_825E074
ldr r1, _080F392C @ =gSineTable
lsls r4, 1
adds r4, r1
movs r2, 0
@@ -3373,7 +3373,7 @@ _080F3926:
pop {r0}
bx r0
.align 2, 0
_080F392C: .4byte gUnknown_825E074
_080F392C: .4byte gSineTable
thumb_func_end sub_80F38D8
thumb_func_start sub_80F3930
asm/heal_location.s
-254
View File
@@ -1,254 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start GetHealLocationIndexFromMapGroupAndNum
GetHealLocationIndexFromMapGroupAndNum: @ 80BFC50
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
lsls r1, 16
lsrs r1, 16
movs r3, 0
ldr r2, _080BFC74 @ =gUnknown_83EEBF8
_080BFC5E:
movs r0, 0
ldrsb r0, [r2, r0]
cmp r0, r4
bne _080BFC78
movs r0, 0x1
ldrsb r0, [r2, r0]
cmp r0, r1
bne _080BFC78
adds r0, r3, 0x1
b _080BFC82
.align 2, 0
_080BFC74: .4byte gUnknown_83EEBF8
_080BFC78:
adds r2, 0x8
adds r3, 0x1
cmp r3, 0x13
bls _080BFC5E
movs r0, 0
_080BFC82:
pop {r4}
pop {r1}
bx r1
thumb_func_end GetHealLocationIndexFromMapGroupAndNum
thumb_func_start GetHealLocationPointerFromMapGroupAndNum
GetHealLocationPointerFromMapGroupAndNum: @ 80BFC88
push {lr}
lsls r0, 16
lsrs r0, 16
lsls r1, 16
lsrs r1, 16
bl GetHealLocationIndexFromMapGroupAndNum
cmp r0, 0
beq _080BFCA8
lsls r0, 3
ldr r1, _080BFCA4 @ =gUnknown_83EEBF0
adds r0, r1
b _080BFCAA
.align 2, 0
_080BFCA4: .4byte gUnknown_83EEBF0
_080BFCA8:
movs r0, 0
_080BFCAA:
pop {r1}
bx r1
thumb_func_end GetHealLocationPointerFromMapGroupAndNum
thumb_func_start GetHealLocationPointer
GetHealLocationPointer: @ 80BFCB0
push {lr}
cmp r0, 0
beq _080BFCC8
cmp r0, 0x14
bhi _080BFCC8
lsls r0, 3
ldr r1, _080BFCC4 @ =gUnknown_83EEBF0
adds r0, r1
b _080BFCCA
.align 2, 0
_080BFCC4: .4byte gUnknown_83EEBF0
_080BFCC8:
movs r0, 0
_080BFCCA:
pop {r1}
bx r1
thumb_func_end GetHealLocationPointer
thumb_func_start sub_80BFCD0
sub_80BFCD0: @ 80BFCD0
push {r4-r6,lr}
adds r4, r0, 0
ldr r6, _080BFD24 @ =0x00004082
adds r0, r6, 0
bl VarGet
lsls r0, 16
lsrs r5, r0, 16
cmp r5, 0x1
bne _080BFD38
ldr r0, _080BFD28 @ =gSaveBlock1Ptr
ldr r1, [r0]
ldr r2, _080BFD2C @ =0x00003d34
adds r0, r1, r2
ldr r2, [r0]
lsls r0, r2, 1
adds r0, r2
lsls r0, 2
adds r1, r0
ldr r0, _080BFD30 @ =0x00003d42
adds r1, r0
ldrb r0, [r1]
lsls r0, 29
cmp r0, 0
blt _080BFD0A
adds r0, r6, 0
movs r1, 0
bl VarSet
_080BFD0A:
ldr r0, _080BFD34 @ =gSpecialVar_LastTalked
strh r5, [r0]
movs r0, 0x4
strh r0, [r4, 0x4]
movs r0, 0xB
strh r0, [r4, 0x6]
movs r0, 0x2
strb r0, [r4]
movs r0, 0xA
strb r0, [r4, 0x1]
movs r0, 0xFF
strb r0, [r4, 0x2]
b _080BFDFA
.align 2, 0
_080BFD24: .4byte 0x00004082
_080BFD28: .4byte gSaveBlock1Ptr
_080BFD2C: .4byte 0x00003d34
_080BFD30: .4byte 0x00003d42
_080BFD34: .4byte gSpecialVar_LastTalked
_080BFD38:
ldr r0, _080BFD7C @ =gSaveBlock1Ptr
ldr r1, [r0]
movs r0, 0x1C
ldrsb r0, [r1, r0]
lsls r0, 16
lsrs r0, 16
ldrb r1, [r1, 0x1D]
lsls r1, 24
asrs r1, 24
lsls r1, 16
lsrs r1, 16
bl GetHealLocationIndexFromMapGroupAndNum
adds r6, r0, 0
ldr r2, _080BFD80 @ =gUnknown_83EEC98
subs r0, r6, 0x1
lsls r0, 2
adds r1, r0, r2
ldrh r1, [r1]
strb r1, [r4]
adds r2, 0x2
adds r0, r2
ldrh r2, [r0]
strb r2, [r4, 0x1]
movs r0, 0xFF
strb r0, [r4, 0x2]
cmp r1, 0x4
bne _080BFD84
cmp r2, 0
bne _080BFD84
movs r0, 0x8
strh r0, [r4, 0x4]
movs r0, 0x5
b _080BFDF2
.align 2, 0
_080BFD7C: .4byte gSaveBlock1Ptr
_080BFD80: .4byte gUnknown_83EEC98
_080BFD84:
ldr r0, _080BFDA4 @ =gUnknown_83EEC98
subs r2, r6, 0x1
lsls r3, r2, 2
adds r1, r3, r0
ldrh r1, [r1]
adds r5, r0, 0
cmp r1, 0xD
bne _080BFDA8
adds r0, r5, 0x2
adds r0, r3, r0
ldrh r0, [r0]
cmp r0, 0
bne _080BFDA8
strh r1, [r4, 0x4]
movs r0, 0xC
b _080BFDF2
.align 2, 0
_080BFDA4: .4byte gUnknown_83EEC98
_080BFDA8:
lsls r1, r2, 2
adds r0, r1, r5
ldrh r0, [r0]
cmp r0, 0x20
bne _080BFDC0
adds r0, r5, 0x2
adds r0, r1, r0
ldrh r0, [r0]
cmp r0, 0
bne _080BFDC0
movs r0, 0x5
b _080BFDEE
_080BFDC0:
lsls r2, 2
adds r0, r2, r5
ldrh r0, [r0]
cmp r0, 0x2
bne _080BFDEC
adds r0, r5, 0x2
adds r0, r2, r0
ldrh r0, [r0]
cmp r0, 0xA
bne _080BFDEC
movs r0, 0x4
strh r0, [r4, 0x4]
movs r0, 0xB
strh r0, [r4, 0x6]
ldr r0, _080BFDE8 @ =0x00004082
movs r1, 0
bl VarSet
b _080BFDF4
.align 2, 0
_080BFDE8: .4byte 0x00004082
_080BFDEC:
movs r0, 0x7
_080BFDEE:
strh r0, [r4, 0x4]
movs r0, 0x4
_080BFDF2:
strh r0, [r4, 0x6]
_080BFDF4:
adds r0, r6, 0
bl sub_80BFE00
_080BFDFA:
pop {r4-r6}
pop {r0}
bx r0
thumb_func_end sub_80BFCD0
thumb_func_start sub_80BFE00
sub_80BFE00: @ 80BFE00
ldr r2, _080BFE10 @ =gSpecialVar_LastTalked
ldr r1, _080BFE14 @ =gUnknown_83EECE8
subs r0, 0x1
adds r0, r1
ldrb r0, [r0]
strh r0, [r2]
bx lr
.align 2, 0
_080BFE10: .4byte gSpecialVar_LastTalked
_080BFE14: .4byte gUnknown_83EECE8
thumb_func_end sub_80BFE00
.align 2, 0 @ Don't pad with nop.
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
+4 -4
View File
@@ -57,16 +57,16 @@ _080CA59C: .4byte sub_80CA53C
thumb_func_start sub_80CA5A0
sub_80CA5A0: @ 80CA5A0
push {lr}
ldr r0, _080CA5B4 @ =c2_exit_to_overworld_2_switch
ldr r0, _080CA5B4 @ =CB2_ReturnToField
bl SetMainCallback2
ldr r1, _080CA5B8 @ =gUnknown_3005020
ldr r1, _080CA5B8 @ =gFieldCallback
ldr r0, _080CA5BC @ =sub_80CA5C0
str r0, [r1]
pop {r0}
bx r0
.align 2, 0
_080CA5B4: .4byte c2_exit_to_overworld_2_switch
_080CA5B8: .4byte gUnknown_3005020
_080CA5B4: .4byte CB2_ReturnToField
_080CA5B8: .4byte gFieldCallback
_080CA5BC: .4byte sub_80CA5C0
thumb_func_end sub_80CA5A0
asm/ice.s
+3099
View File
File diff suppressed because it is too large Load Diff
asm/intro.s
+19 -19
View File
@@ -166,7 +166,7 @@ _080EC65E:
movs r0, 0
movs r2, 0
bl load_copyright_graphics
bl remove_some_task
bl ScanlineEffect_Stop
bl ResetTasks
bl ResetSpriteData
bl FreeAllSpritePalettes
@@ -898,7 +898,7 @@ _080ECCF6:
movs r1, 0x10
movs r2, 0x10
movs r3, 0
bl sub_812E944
bl StartBlendTask
b _080ECD36
.align 2, 0
_080ECD14: .4byte 0x00003f44
@@ -907,7 +907,7 @@ _080ECD18:
bl ShowBg
b _080ECD36
_080ECD20:
bl sub_812E9E4
bl IsBlendTaskActive
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0
@@ -980,7 +980,7 @@ _080ECD9C:
movs r1, 0x10
movs r2, 0x10
movs r3, 0
bl sub_812E944
bl StartBlendTask
strh r4, [r6, 0x8]
strh r5, [r6, 0xA]
strh r4, [r6, 0x12]
@@ -992,7 +992,7 @@ _080ECDC4:
str r0, [r6, 0x14]
b _080ECE70
_080ECDCC:
bl sub_812E9E4
bl IsBlendTaskActive
lsls r0, 24
cmp r0, 0
bne _080ECE96
@@ -1051,10 +1051,10 @@ _080ECE26:
movs r1, 0
movs r2, 0
movs r3, 0x10
bl sub_812E944
bl StartBlendTask
b _080ECE70
_080ECE52:
bl sub_812E9E4
bl IsBlendTaskActive
lsls r0, 24
cmp r0, 0
bne _080ECE96
@@ -2742,14 +2742,14 @@ _080EDC0C:
bl DisableInterrupts
movs r0, 0
bl SetHBlankCallback
ldr r0, _080EDC3C @ =sub_8078914
ldr r0, _080EDC3C @ =CB2_InitTitleScreen
bl SetMainCallback2
_080EDC34:
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080EDC3C: .4byte sub_8078914
_080EDC3C: .4byte CB2_InitTitleScreen
thumb_func_end sub_80EDBE8
thumb_func_start sub_80EDC40
@@ -3369,7 +3369,7 @@ _080EE114:
_080EE11C:
movs r4, 0x6
ldrsh r3, [r5, r4]
ldr r4, _080EE15C @ =gUnknown_825E074
ldr r4, _080EE15C @ =gSineTable
adds r0, r3, 0
adds r0, 0x40
lsls r0, 1
@@ -3400,7 +3400,7 @@ _080EE156:
pop {r0}
bx r0
.align 2, 0
_080EE15C: .4byte gUnknown_825E074
_080EE15C: .4byte gSineTable
thumb_func_end sub_80EE024
thumb_func_start sub_80EE160
@@ -3587,7 +3587,7 @@ sub_80EE29C: @ 80EE29C
lsls r1, 16
asrs r1, 20
strh r1, [r5, 0x22]
ldr r1, _080EE340 @ =gUnknown_825E074
ldr r1, _080EE340 @ =gSineTable
lsls r0, 16
asrs r0, 20
adds r0, 0x40
@@ -3646,7 +3646,7 @@ _080EE336:
pop {r0}
bx r0
.align 2, 0
_080EE340: .4byte gUnknown_825E074
_080EE340: .4byte gSineTable
_080EE344: .4byte gUnknown_203AB16
_080EE348: .4byte 0x41c64e6d
_080EE34C: .4byte 0x00006073
@@ -4208,7 +4208,7 @@ _080EE740:
lsls r1, 16
asrs r1, 20
strh r1, [r4, 0x24]
ldr r1, _080EE7B0 @ =gUnknown_825E074
ldr r1, _080EE7B0 @ =gSineTable
movs r3, 0x34
ldrsh r0, [r4, r3]
lsls r0, 1
@@ -4253,7 +4253,7 @@ _080EE78C:
strh r0, [r4, 0x3C]
b _080EE818
.align 2, 0
_080EE7B0: .4byte gUnknown_825E074
_080EE7B0: .4byte gSineTable
_080EE7B4: .4byte gUnknown_203AB04
_080EE7B8: .4byte gUnknown_203AB08
_080EE7BC: .4byte gUnknown_203AB06
@@ -4585,7 +4585,7 @@ _080EEA08:
lsls r1, 16
asrs r1, 20
strh r1, [r4, 0x24]
ldr r1, _080EEA48 @ =gUnknown_825E074
ldr r1, _080EEA48 @ =gSineTable
lsls r0, 16
asrs r0, 20
lsls r0, 1
@@ -4599,7 +4599,7 @@ _080EEA08:
strh r0, [r4, 0x26]
b _080EEA88
.align 2, 0
_080EEA48: .4byte gUnknown_825E074
_080EEA48: .4byte gSineTable
_080EEA4C:
ldrh r0, [r4, 0x32]
lsrs r0, 4
@@ -4775,7 +4775,7 @@ _080EEB84:
asrs r0, 20
negs r1, r0
strh r1, [r4, 0x24]
ldr r1, _080EEBD4 @ =gUnknown_825E074
ldr r1, _080EEBD4 @ =gSineTable
lsls r0, 1
adds r0, r1
movs r3, 0
@@ -4810,7 +4810,7 @@ _080EEBCE:
pop {r0}
bx r0
.align 2, 0
_080EEBD4: .4byte gUnknown_825E074
_080EEBD4: .4byte gSineTable
_080EEBD8: .4byte gUnknown_203AB04
_080EEBDC: .4byte gUnknown_203AB08
_080EEBE0: .4byte SpriteCallbackDummy
asm/item.s
-1853
View File
File diff suppressed because it is too large Load Diff
asm/item_menu.s
+197 -197
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.

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