mirror of
https://github.com/pret/pokefirered.git
synced 2026-05-06 05:35:23 -05:00
Merge branch 'master' of https://github.com/pret/pokefirered
This commit is contained in:
SatoMew
commit
2c254082de
60
Makefile
60
Makefile
|
|
@ -1,3 +1,5 @@
|
|||
COMPARE ?= 0
|
||||
|
||||
AS := tools/binutils/bin/arm-none-eabi-as
|
||||
CPP := $(CC) -E
|
||||
LD := tools/binutils/bin/arm-none-eabi-ld
|
||||
|
|
@ -84,8 +86,6 @@ JSONPROC := tools/jsonproc/jsonproc
|
|||
# Secondary expansion is required for dependency variables in object rules.
|
||||
.SECONDEXPANSION:
|
||||
|
||||
.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))))
|
||||
|
|
@ -113,32 +113,33 @@ 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))
|
||||
|
||||
TOOLDIRS := $(filter-out tools/agbcc tools/binutils,$(wildcard tools/*))
|
||||
TOOLBASE = $(TOOLDIRS:tools/%=%)
|
||||
TOOLS = $(foreach tool,$(TOOLBASE),tools/$(tool)/$(tool)$(EXE))
|
||||
|
||||
.PHONY: all rom tools clean-tools mostlyclean clean compare tidy berry_fix $(TOOLDIRS)
|
||||
|
||||
MAKEFLAGS += --no-print-directory
|
||||
|
||||
AUTO_GEN_TARGETS :=
|
||||
|
||||
all: rom
|
||||
all: tools rom
|
||||
|
||||
rom: $(ROM)
|
||||
ifeq ($(COMPARE),1)
|
||||
@$(SHA1) rom.sha1
|
||||
endif
|
||||
|
||||
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
|
||||
tools: $(TOOLDIRS)
|
||||
|
||||
$(TOOLDIRS):
|
||||
@$(MAKE) -C $@
|
||||
|
||||
# For contributors to make sure a change didn't affect the contents of the ROM.
|
||||
compare: rom
|
||||
@$(SHA1) rom.sha1
|
||||
compare:
|
||||
@$(MAKE) COMPARE=1
|
||||
|
||||
clean: tidy
|
||||
mostlyclean: 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 {} +
|
||||
|
|
@ -147,17 +148,11 @@ clean: tidy
|
|||
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
|
||||
|
||||
clean-tools:
|
||||
@$(foreach tooldir,$(TOOLDIRS),$(MAKE) clean -C $(tooldir);)
|
||||
|
||||
clean: mostlyclean clean-tools
|
||||
|
||||
tidy:
|
||||
rm -f $(ROM) $(ELF) $(MAP)
|
||||
|
|
@ -224,6 +219,11 @@ else
|
|||
$(DATA_ASM_BUILDDIR)/%.o: data_dep = $(shell $(SCANINC) -I . $(DATA_ASM_SUBDIR)/$*.s)
|
||||
endif
|
||||
|
||||
berry_fix:
|
||||
@$(MAKE) -C berry_fix COMPARE=$(COMPARE)
|
||||
|
||||
berry_fix/berry_fix.gba: berry_fix
|
||||
|
||||
$(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s $$(data_dep)
|
||||
$(PREPROC) $< charmap.txt | $(CPP) -I include -nostdinc -undef -Wno-unicode - | $(AS) $(ASFLAGS) -o $@
|
||||
|
||||
|
|
@ -249,5 +249,3 @@ $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS)
|
|||
$(ROM): $(ELF)
|
||||
$(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $< $@
|
||||
|
||||
berry_fix/berry_fix.gba:
|
||||
@$(MAKE) -C berry_fix
|
||||
|
|
|
|||
|
|
@ -523,7 +523,7 @@ sub_800F5CC: @ 800F5CC
|
|||
bne _0800F5E8
|
||||
ldr r0, _0800F5E4 @ =gUnknown_83FE883
|
||||
movs r1, 0x15
|
||||
bl sub_80D87BC
|
||||
bl BattlePutTextOnWindow
|
||||
b _0800F6F0
|
||||
.align 2, 0
|
||||
_0800F5E0: .4byte gBattleOutcome
|
||||
|
|
@ -609,10 +609,10 @@ _0800F666:
|
|||
_0800F682:
|
||||
ldr r0, _0800F69C @ =gUnknown_83FE874
|
||||
movs r1, 0x17
|
||||
bl sub_80D87BC
|
||||
bl BattlePutTextOnWindow
|
||||
ldr r0, _0800F6A0 @ =gUnknown_83FE87B
|
||||
movs r1, 0x16
|
||||
bl sub_80D87BC
|
||||
bl BattlePutTextOnWindow
|
||||
b _0800F6F0
|
||||
.align 2, 0
|
||||
_0800F694: .4byte gLinkPlayers
|
||||
|
|
@ -635,10 +635,10 @@ _0800F6A4:
|
|||
_0800F6BC:
|
||||
ldr r0, _0800F6D8 @ =gUnknown_83FE874
|
||||
movs r1, 0x16
|
||||
bl sub_80D87BC
|
||||
bl BattlePutTextOnWindow
|
||||
ldr r0, _0800F6DC @ =gUnknown_83FE87B
|
||||
movs r1, 0x17
|
||||
bl sub_80D87BC
|
||||
bl BattlePutTextOnWindow
|
||||
b _0800F6F0
|
||||
.align 2, 0
|
||||
_0800F6D0: .4byte gLinkPlayers
|
||||
|
|
@ -648,10 +648,10 @@ _0800F6DC: .4byte gUnknown_83FE87B
|
|||
_0800F6E0:
|
||||
ldr r0, _0800F6F4 @ =gUnknown_83FE874
|
||||
movs r1, 0x17
|
||||
bl sub_80D87BC
|
||||
bl BattlePutTextOnWindow
|
||||
ldr r0, _0800F6F8 @ =gUnknown_83FE87B
|
||||
movs r1, 0x16
|
||||
bl sub_80D87BC
|
||||
bl BattlePutTextOnWindow
|
||||
_0800F6F0:
|
||||
pop {r0}
|
||||
bx r0
|
||||
|
|
@ -727,14 +727,14 @@ _0800F764:
|
|||
_0800F76E:
|
||||
adds r0, r1, 0
|
||||
movs r1, 0x11
|
||||
bl sub_80D87BC
|
||||
bl BattlePutTextOnWindow
|
||||
ldrb r1, [r4, 0x18]
|
||||
movs r0, 0x4
|
||||
b _0800F79C
|
||||
_0800F77C:
|
||||
adds r0, r1, 0
|
||||
movs r1, 0x12
|
||||
bl sub_80D87BC
|
||||
bl BattlePutTextOnWindow
|
||||
ldrb r1, [r4, 0x18]
|
||||
movs r0, 0x4
|
||||
str r0, [sp]
|
||||
|
|
@ -744,7 +744,7 @@ _0800F77C:
|
|||
_0800F790:
|
||||
adds r0, r1, 0
|
||||
movs r1, 0x13
|
||||
bl sub_80D87BC
|
||||
bl BattlePutTextOnWindow
|
||||
ldrb r1, [r4, 0x18]
|
||||
movs r0, 0x8
|
||||
_0800F79C:
|
||||
|
|
@ -758,7 +758,7 @@ _0800F7A2:
|
|||
_0800F7AA:
|
||||
adds r0, r1, 0
|
||||
movs r1, 0x14
|
||||
bl sub_80D87BC
|
||||
bl BattlePutTextOnWindow
|
||||
ldrb r1, [r4, 0x18]
|
||||
movs r0, 0x8
|
||||
str r0, [sp]
|
||||
|
|
@ -799,14 +799,14 @@ _0800F7F0:
|
|||
adds r1, r0, r4
|
||||
adds r0, r1, 0
|
||||
movs r1, 0xF
|
||||
bl sub_80D87BC
|
||||
bl BattlePutTextOnWindow
|
||||
lsls r0, r6, 3
|
||||
subs r0, r6
|
||||
lsls r0, 2
|
||||
adds r1, r0, r4
|
||||
adds r0, r1, 0
|
||||
movs r1, 0x10
|
||||
bl sub_80D87BC
|
||||
bl BattlePutTextOnWindow
|
||||
movs r4, 0x7
|
||||
str r4, [sp]
|
||||
adds r0, r7, 0
|
||||
|
|
@ -1274,12 +1274,12 @@ _0800FC08:
|
|||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0800FC20
|
||||
ldr r0, _0800FC1C @ =gUnknown_2022B50
|
||||
ldr r0, _0800FC1C @ =gBattleTerrain
|
||||
ldrb r0, [r0]
|
||||
bl sub_800F2AC
|
||||
b _0800FC26
|
||||
.align 2, 0
|
||||
_0800FC1C: .4byte gUnknown_2022B50
|
||||
_0800FC1C: .4byte gBattleTerrain
|
||||
_0800FC20:
|
||||
movs r0, 0x8
|
||||
bl sub_800F2AC
|
||||
|
|
@ -1309,12 +1309,12 @@ _0800FC48:
|
|||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _0800FC60
|
||||
ldr r0, _0800FC5C @ =gUnknown_2022B50
|
||||
ldr r0, _0800FC5C @ =gBattleTerrain
|
||||
strb r2, [r0]
|
||||
movs r0, 0
|
||||
b _0800FCAA
|
||||
.align 2, 0
|
||||
_0800FC5C: .4byte gUnknown_2022B50
|
||||
_0800FC5C: .4byte gBattleTerrain
|
||||
_0800FC60:
|
||||
movs r0, 0x8
|
||||
ands r1, r0
|
||||
|
|
@ -1351,13 +1351,13 @@ _0800FC90:
|
|||
lsrs r0, 24
|
||||
b _0800FCAA
|
||||
_0800FCA6:
|
||||
ldr r0, _0800FCB0 @ =gUnknown_2022B50
|
||||
ldr r0, _0800FCB0 @ =gBattleTerrain
|
||||
ldrb r0, [r0]
|
||||
_0800FCAA:
|
||||
pop {r1}
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_0800FCB0: .4byte gUnknown_2022B50
|
||||
_0800FCB0: .4byte gBattleTerrain
|
||||
thumb_func_end sub_800FC2C
|
||||
|
||||
thumb_func_start sub_800FCB4
|
||||
|
|
|
|||
1906
asm/battle_2.s
1906
asm/battle_2.s
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -14,7 +14,7 @@ ClearBattleAnimationVars: @ 80724C0
|
|||
ldr r0, _08072554 @ =gUnknown_2037EE0
|
||||
movs r1, 0
|
||||
strb r1, [r0]
|
||||
ldr r0, _08072558 @ =gUnknown_2037EE1
|
||||
ldr r0, _08072558 @ =gAnimScriptActive
|
||||
strb r1, [r0]
|
||||
ldr r0, _0807255C @ =gUnknown_2037EE2
|
||||
strb r1, [r0]
|
||||
|
|
@ -23,12 +23,12 @@ ClearBattleAnimationVars: @ 80724C0
|
|||
ldr r0, _08072564 @ =gAnimDisableStructPtr
|
||||
movs r1, 0
|
||||
str r1, [r0]
|
||||
ldr r0, _08072568 @ =gUnknown_2037EE8
|
||||
ldr r0, _08072568 @ =gAnimMoveDmg
|
||||
str r1, [r0]
|
||||
ldr r0, _0807256C @ =gUnknown_2037EEC
|
||||
ldr r0, _0807256C @ =gAnimMovePower
|
||||
movs r2, 0
|
||||
strh r1, [r0]
|
||||
ldr r0, _08072570 @ =gUnknown_2037EFE
|
||||
ldr r0, _08072570 @ =gAnimFriendship
|
||||
strb r2, [r0]
|
||||
ldr r4, _08072574 @ =gUnknown_2037F14
|
||||
ldr r5, _08072578 @ =gAnimMoveTurn
|
||||
|
|
@ -85,13 +85,13 @@ _08072520:
|
|||
bx r0
|
||||
.align 2, 0
|
||||
_08072554: .4byte gUnknown_2037EE0
|
||||
_08072558: .4byte gUnknown_2037EE1
|
||||
_08072558: .4byte gAnimScriptActive
|
||||
_0807255C: .4byte gUnknown_2037EE2
|
||||
_08072560: .4byte gUnknown_2037EE3
|
||||
_08072564: .4byte gAnimDisableStructPtr
|
||||
_08072568: .4byte gUnknown_2037EE8
|
||||
_0807256C: .4byte gUnknown_2037EEC
|
||||
_08072570: .4byte gUnknown_2037EFE
|
||||
_08072568: .4byte gAnimMoveDmg
|
||||
_0807256C: .4byte gAnimMovePower
|
||||
_08072570: .4byte gAnimFriendship
|
||||
_08072574: .4byte gUnknown_2037F14
|
||||
_08072578: .4byte gAnimMoveTurn
|
||||
_0807257C: .4byte gUnknown_2037F17
|
||||
|
|
@ -111,7 +111,7 @@ DoMoveAnim: @ 807259C
|
|||
lsls r1, 16
|
||||
lsrs r1, 16
|
||||
ldr r2, _080725C0 @ =gBattleAnimAttacker
|
||||
ldr r0, _080725C4 @ =sBattler_AI
|
||||
ldr r0, _080725C4 @ =gBattlerAttacker
|
||||
ldrb r0, [r0]
|
||||
strb r0, [r2]
|
||||
ldr r2, _080725C8 @ =gBattleAnimTarget
|
||||
|
|
@ -120,19 +120,19 @@ DoMoveAnim: @ 807259C
|
|||
strb r0, [r2]
|
||||
ldr r0, _080725D0 @ =gUnknown_81C68F4
|
||||
movs r2, 0x1
|
||||
bl sub_80725D4
|
||||
bl LaunchBattleAnimation
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080725C0: .4byte gBattleAnimAttacker
|
||||
_080725C4: .4byte sBattler_AI
|
||||
_080725C4: .4byte gBattlerAttacker
|
||||
_080725C8: .4byte gBattleAnimTarget
|
||||
_080725CC: .4byte gBattlerTarget
|
||||
_080725D0: .4byte gUnknown_81C68F4
|
||||
thumb_func_end DoMoveAnim
|
||||
|
||||
thumb_func_start sub_80725D4
|
||||
sub_80725D4: @ 80725D4
|
||||
thumb_func_start LaunchBattleAnimation
|
||||
LaunchBattleAnimation: @ 80725D4
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
|
|
@ -200,10 +200,10 @@ _08072658:
|
|||
ldr r5, _080726C8 @ =gUnknown_2037ED4
|
||||
mov r0, r8
|
||||
lsls r3, r0, 2
|
||||
ldr r6, _080726CC @ =gUnknown_2037EE1
|
||||
ldr r6, _080726CC @ =gAnimScriptActive
|
||||
ldr r1, _080726D0 @ =gUnknown_2037EE0
|
||||
mov r12, r1
|
||||
ldr r0, _080726D4 @ =gUnknown_2037EDC
|
||||
ldr r0, _080726D4 @ =gAnimScriptCallback
|
||||
mov r10, r0
|
||||
ldr r7, _080726D8 @ =RunAnimScriptCommand
|
||||
ldr r1, _080726DC @ =gBattleAnimArgs
|
||||
|
|
@ -253,9 +253,9 @@ _080726A6:
|
|||
_080726C0: .4byte gUnknown_2037F18
|
||||
_080726C4: .4byte gUnknown_2037F14
|
||||
_080726C8: .4byte gUnknown_2037ED4
|
||||
_080726CC: .4byte gUnknown_2037EE1
|
||||
_080726CC: .4byte gAnimScriptActive
|
||||
_080726D0: .4byte gUnknown_2037EE0
|
||||
_080726D4: .4byte gUnknown_2037EDC
|
||||
_080726D4: .4byte gAnimScriptCallback
|
||||
_080726D8: .4byte RunAnimScriptCommand
|
||||
_080726DC: .4byte gBattleAnimArgs
|
||||
_080726E0: .4byte 0x0000ffff
|
||||
|
|
@ -300,7 +300,7 @@ _08072730: .4byte gUnknown_2022984
|
|||
_08072734: .4byte gUnknown_2022986
|
||||
_08072738: .4byte gUnknown_2022988
|
||||
_0807273C: .4byte gUnknown_202298A
|
||||
thumb_func_end sub_80725D4
|
||||
thumb_func_end LaunchBattleAnimation
|
||||
|
||||
thumb_func_start DestroyAnimSprite
|
||||
DestroyAnimSprite: @ 8072740
|
||||
|
|
@ -419,14 +419,14 @@ WaitAnimFrameCount: @ 80727FC
|
|||
ldrsb r0, [r2, r0]
|
||||
cmp r0, 0
|
||||
bgt _08072820
|
||||
ldr r0, _08072818 @ =gUnknown_2037EDC
|
||||
ldr r0, _08072818 @ =gAnimScriptCallback
|
||||
ldr r1, _0807281C @ =RunAnimScriptCommand
|
||||
str r1, [r0]
|
||||
movs r0, 0
|
||||
b _08072822
|
||||
.align 2, 0
|
||||
_08072814: .4byte gUnknown_2037EE0
|
||||
_08072818: .4byte gUnknown_2037EDC
|
||||
_08072818: .4byte gAnimScriptCallback
|
||||
_0807281C: .4byte RunAnimScriptCommand
|
||||
_08072820:
|
||||
subs r0, r1, 0x1
|
||||
|
|
@ -454,7 +454,7 @@ _0807282C:
|
|||
asrs r0, 24
|
||||
cmp r0, 0
|
||||
bne _08072850
|
||||
ldr r0, _08072864 @ =gUnknown_2037EE1
|
||||
ldr r0, _08072864 @ =gAnimScriptActive
|
||||
ldrb r0, [r0]
|
||||
cmp r0, 0
|
||||
bne _0807282C
|
||||
|
|
@ -466,7 +466,7 @@ _08072850:
|
|||
_08072858: .4byte gUnknown_83ADF5C
|
||||
_0807285C: .4byte gUnknown_2037ED4
|
||||
_08072860: .4byte gUnknown_2037EE0
|
||||
_08072864: .4byte gUnknown_2037EE1
|
||||
_08072864: .4byte gAnimScriptActive
|
||||
thumb_func_end RunAnimScriptCommand
|
||||
|
||||
thumb_func_start ScriptCmd_loadspritegfx
|
||||
|
|
@ -500,7 +500,7 @@ ScriptCmd_loadspritegfx: @ 8072868
|
|||
ldr r1, _080728C4 @ =gUnknown_2037EE0
|
||||
movs r0, 0x1
|
||||
strb r0, [r1]
|
||||
ldr r1, _080728C8 @ =gUnknown_2037EDC
|
||||
ldr r1, _080728C8 @ =gAnimScriptCallback
|
||||
ldr r0, _080728CC @ =WaitAnimFrameCount
|
||||
str r0, [r1]
|
||||
pop {r4-r6}
|
||||
|
|
@ -512,7 +512,7 @@ _080728B8: .4byte gUnknown_8399388
|
|||
_080728BC: .4byte gUnknown_8399C90
|
||||
_080728C0: .4byte 0xffffd8f0
|
||||
_080728C4: .4byte gUnknown_2037EE0
|
||||
_080728C8: .4byte gUnknown_2037EDC
|
||||
_080728C8: .4byte gAnimScriptCallback
|
||||
_080728CC: .4byte WaitAnimFrameCount
|
||||
thumb_func_end ScriptCmd_loadspritegfx
|
||||
|
||||
|
|
@ -634,7 +634,7 @@ _080729A8:
|
|||
ldr r0, _08072A04 @ =gBattleAnimAttacker
|
||||
_080729AE:
|
||||
ldrb r0, [r0]
|
||||
bl sub_807685C
|
||||
bl GetBattlerSpriteSubpriority
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
lsls r1, r4, 24
|
||||
|
|
@ -651,13 +651,13 @@ _080729CC:
|
|||
ldr r5, _08072A08 @ =gBattleAnimTarget
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
adds r2, r0, 0
|
||||
lsls r2, 24
|
||||
lsrs r2, 24
|
||||
|
|
@ -762,7 +762,7 @@ ScriptCmd_delay: @ 8072A8C
|
|||
_08072AAA:
|
||||
adds r0, r2, 0x1
|
||||
str r0, [r1]
|
||||
ldr r1, _08072AC4 @ =gUnknown_2037EDC
|
||||
ldr r1, _08072AC4 @ =gAnimScriptCallback
|
||||
ldr r0, _08072AC8 @ =WaitAnimFrameCount
|
||||
str r0, [r1]
|
||||
pop {r4}
|
||||
|
|
@ -771,7 +771,7 @@ _08072AAA:
|
|||
.align 2, 0
|
||||
_08072ABC: .4byte gUnknown_2037ED4
|
||||
_08072AC0: .4byte gUnknown_2037EE0
|
||||
_08072AC4: .4byte gUnknown_2037EDC
|
||||
_08072AC4: .4byte gAnimScriptCallback
|
||||
_08072AC8: .4byte WaitAnimFrameCount
|
||||
thumb_func_end ScriptCmd_delay
|
||||
|
||||
|
|
@ -913,7 +913,7 @@ _08072BB2:
|
|||
bl sub_80767F0
|
||||
movs r0, 0x1
|
||||
bl UpdateOamPriorityInAllHealthboxes
|
||||
ldr r0, _08072C04 @ =gUnknown_2037EE1
|
||||
ldr r0, _08072C04 @ =gAnimScriptActive
|
||||
mov r1, r8
|
||||
strb r1, [r0]
|
||||
_08072BDC:
|
||||
|
|
@ -930,7 +930,7 @@ _08072BF4: .4byte 0x0000ffff
|
|||
_08072BF8: .4byte gUnknown_83ACC08
|
||||
_08072BFC: .4byte gUnknown_2037EEE
|
||||
_08072C00: .4byte gMPlayInfo_BGM
|
||||
_08072C04: .4byte gUnknown_2037EE1
|
||||
_08072C04: .4byte gAnimScriptActive
|
||||
thumb_func_end sub_8072B08
|
||||
|
||||
thumb_func_start sub_8072C08
|
||||
|
|
@ -989,7 +989,7 @@ _08072C60:
|
|||
_08072C62:
|
||||
ldrb r5, [r0]
|
||||
adds r0, r5, 0
|
||||
bl sub_8072DF0
|
||||
bl IsBattlerSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08072D12
|
||||
|
|
@ -1073,7 +1073,7 @@ _08072D12:
|
|||
cmp r6, 0x1
|
||||
bls _08072DCE
|
||||
adds r0, r5, 0
|
||||
bl sub_8072DF0
|
||||
bl IsBattlerSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08072DCE
|
||||
|
|
@ -1169,17 +1169,17 @@ _08072DE8: .4byte gUnknown_2037F14
|
|||
_08072DEC: .4byte gUnknown_2037ED4
|
||||
thumb_func_end sub_8072C30
|
||||
|
||||
thumb_func_start sub_8072DF0
|
||||
sub_8072DF0: @ 8072DF0
|
||||
thumb_func_start IsBattlerSpriteVisible
|
||||
IsBattlerSpriteVisible: @ 8072DF0
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
adds r0, r4, 0
|
||||
bl sub_8075224
|
||||
bl IsBattlerSpritePresent
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08072E40
|
||||
ldr r0, _08072E34 @ =gUnknown_2024018
|
||||
ldr r0, _08072E34 @ =gBattleSpritesDataPtr
|
||||
ldr r0, [r0]
|
||||
ldr r1, [r0]
|
||||
lsls r0, r4, 2
|
||||
|
|
@ -1206,7 +1206,7 @@ _08072E30:
|
|||
movs r0, 0x1
|
||||
b _08072E42
|
||||
.align 2, 0
|
||||
_08072E34: .4byte gUnknown_2024018
|
||||
_08072E34: .4byte gBattleSpritesDataPtr
|
||||
_08072E38: .4byte gSprites
|
||||
_08072E3C: .4byte gBattlerSpriteIds
|
||||
_08072E40:
|
||||
|
|
@ -1215,7 +1215,7 @@ _08072E42:
|
|||
pop {r4}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_8072DF0
|
||||
thumb_func_end IsBattlerSpriteVisible
|
||||
|
||||
thumb_func_start sub_8072E48
|
||||
sub_8072E48: @ 8072E48
|
||||
|
|
@ -1897,7 +1897,7 @@ _080733CC:
|
|||
_080733CE:
|
||||
ldrb r4, [r0]
|
||||
adds r0, r4, 0
|
||||
bl sub_8072DF0
|
||||
bl IsBattlerSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08073416
|
||||
|
|
@ -1935,7 +1935,7 @@ _08073416:
|
|||
cmp r5, 0x1
|
||||
bls _08073464
|
||||
adds r0, r4, 0
|
||||
bl sub_8072DF0
|
||||
bl IsBattlerSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08073464
|
||||
|
|
@ -2016,7 +2016,7 @@ _080734B4:
|
|||
_080734B6:
|
||||
ldrb r6, [r0]
|
||||
adds r0, r6, 0
|
||||
bl sub_8072DF0
|
||||
bl IsBattlerSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080734E0
|
||||
|
|
@ -2041,7 +2041,7 @@ _080734E0:
|
|||
adds r4, r6, 0
|
||||
eors r4, r0
|
||||
adds r0, r4, 0
|
||||
bl sub_8072DF0
|
||||
bl IsBattlerSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08073520
|
||||
|
|
@ -2127,7 +2127,7 @@ sub_8073558: @ 8073558
|
|||
movs r7, 0
|
||||
_08073598:
|
||||
adds r0, r4, 0
|
||||
bl sub_8072DF0
|
||||
bl IsBattlerSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080735AA
|
||||
|
|
@ -2141,7 +2141,7 @@ _080735AA:
|
|||
movs r0, 0x2
|
||||
eors r6, r0
|
||||
adds r0, r6, 0
|
||||
bl sub_8072DF0
|
||||
bl IsBattlerSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080735CC
|
||||
|
|
@ -2397,11 +2397,11 @@ ScriptCmd_jump: @ 8073764
|
|||
_08073784: .4byte gUnknown_2037ED4
|
||||
thumb_func_end ScriptCmd_jump
|
||||
|
||||
thumb_func_start sub_8073788
|
||||
sub_8073788: @ 8073788
|
||||
thumb_func_start IsContest
|
||||
IsContest: @ 8073788
|
||||
movs r0, 0
|
||||
bx lr
|
||||
thumb_func_end sub_8073788
|
||||
thumb_func_end IsContest
|
||||
|
||||
thumb_func_start sub_807378C
|
||||
sub_807378C: @ 807378C
|
||||
|
|
@ -2772,7 +2772,7 @@ sub_8073A44: @ 8073A44
|
|||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
ldr r0, _08073A78 @ =gUnknown_2024018
|
||||
ldr r0, _08073A78 @ =gBattleSpritesDataPtr
|
||||
ldr r1, [r0]
|
||||
ldr r0, _08073A7C @ =gBattleAnimAttacker
|
||||
ldrb r2, [r0]
|
||||
|
|
@ -2795,7 +2795,7 @@ sub_8073A44: @ 8073A44
|
|||
movs r4, 0x3F
|
||||
b _08073AE6
|
||||
.align 2, 0
|
||||
_08073A78: .4byte gUnknown_2024018
|
||||
_08073A78: .4byte gBattleSpritesDataPtr
|
||||
_08073A7C: .4byte gBattleAnimAttacker
|
||||
_08073A80:
|
||||
adds r0, r2, 0
|
||||
|
|
@ -2874,7 +2874,7 @@ sub_8073B08: @ 8073B08
|
|||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
ldr r0, _08073B3C @ =gUnknown_2024018
|
||||
ldr r0, _08073B3C @ =gBattleSpritesDataPtr
|
||||
ldr r1, [r0]
|
||||
ldr r0, _08073B40 @ =gBattleAnimAttacker
|
||||
ldrb r2, [r0]
|
||||
|
|
@ -2897,7 +2897,7 @@ sub_8073B08: @ 8073B08
|
|||
movs r4, 0x3F
|
||||
b _08073B56
|
||||
.align 2, 0
|
||||
_08073B3C: .4byte gUnknown_2024018
|
||||
_08073B3C: .4byte gBattleSpritesDataPtr
|
||||
_08073B40: .4byte gBattleAnimAttacker
|
||||
_08073B44:
|
||||
adds r0, r2, 0
|
||||
|
|
@ -3942,7 +3942,7 @@ sub_8074320: @ 8074320
|
|||
ldrb r7, [r0, 0x1]
|
||||
adds r0, 0x2
|
||||
str r0, [r1]
|
||||
bl sub_8075290
|
||||
bl IsDoubleBattle
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080743C2
|
||||
|
|
@ -4024,7 +4024,7 @@ sub_80743C8: @ 80743C8
|
|||
ldrb r7, [r0, 0x1]
|
||||
adds r0, 0x2
|
||||
str r0, [r1]
|
||||
bl sub_8075290
|
||||
bl IsDoubleBattle
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0807444C
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -185,13 +185,13 @@ sub_80A6F8C: @ 80A6F8C
|
|||
ldr r4, _080A6FD4 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x20]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x22]
|
||||
|
|
@ -286,14 +286,14 @@ sub_80A7058: @ 80A7058
|
|||
ldrh r1, [r0, 0x22]
|
||||
adds r1, 0xF
|
||||
strh r1, [r0, 0x36]
|
||||
ldr r1, _080A7078 @ =sub_8075590
|
||||
ldr r1, _080A7078 @ =StartAnimLinearTranslation
|
||||
str r1, [r0, 0x1C]
|
||||
ldr r1, _080A707C @ =sub_80A7080
|
||||
bl StoreSpriteCallbackInData6
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080A7078: .4byte sub_8075590
|
||||
_080A7078: .4byte StartAnimLinearTranslation
|
||||
_080A707C: .4byte sub_80A7080
|
||||
thumb_func_end sub_80A7058
|
||||
|
||||
|
|
@ -329,7 +329,7 @@ sub_80A70A0: @ 80A70A0
|
|||
adds r0, r1
|
||||
ldrb r0, [r0]
|
||||
movs r1, 0
|
||||
bl sub_80758E0
|
||||
bl PrepareBattlerSpriteForRotScale
|
||||
ldr r1, _080A70D4 @ =gTasks
|
||||
lsls r0, r4, 2
|
||||
adds r0, r4
|
||||
|
|
@ -389,7 +389,7 @@ _080A7126:
|
|||
lsls r2, 1
|
||||
adds r0, r4, 0
|
||||
adds r1, r2, 0
|
||||
bl obj_id_set_rotscale
|
||||
bl SetSpriteRotScale
|
||||
ldr r1, _080A7158 @ =gTasks
|
||||
adds r0, r6, r5
|
||||
lsls r0, 3
|
||||
|
|
@ -458,7 +458,7 @@ _080A71AA:
|
|||
cmp r0, 0x2
|
||||
bne _080A71CC
|
||||
adds r0, r4, 0
|
||||
bl sub_8075980
|
||||
bl ResetSpriteRotScale
|
||||
adds r0, r5, 0
|
||||
bl DestroyAnimVisualTask
|
||||
b _080A71D0
|
||||
|
|
@ -586,14 +586,14 @@ sub_80A72A0: @ 80A72A0
|
|||
ldrh r1, [r0, 0x22]
|
||||
subs r1, 0x20
|
||||
strh r1, [r0, 0x36]
|
||||
ldr r1, _080A72C0 @ =sub_8075590
|
||||
ldr r1, _080A72C0 @ =StartAnimLinearTranslation
|
||||
str r1, [r0, 0x1C]
|
||||
ldr r1, _080A72C4 @ =DestroyAnimSprite
|
||||
bl StoreSpriteCallbackInData6
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080A72C0: .4byte sub_8075590
|
||||
_080A72C0: .4byte StartAnimLinearTranslation
|
||||
_080A72C4: .4byte DestroyAnimSprite
|
||||
thumb_func_end sub_80A72A0
|
||||
|
||||
|
|
@ -604,7 +604,7 @@ sub_80A72C8: @ 80A72C8
|
|||
push {r7}
|
||||
sub sp, 0x4
|
||||
adds r5, r0, 0
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A72EC
|
||||
|
|
@ -639,7 +639,7 @@ _080A730E:
|
|||
ldr r4, _080A73BC @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
ldr r6, _080A73B8 @ =gBattleAnimArgs
|
||||
lsrs r0, 24
|
||||
|
|
@ -650,7 +650,7 @@ _080A730E:
|
|||
mov r8, r0
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r2, [r6, 0x6]
|
||||
|
|
@ -677,7 +677,7 @@ _080A730E:
|
|||
lsls r1, 24
|
||||
adds r0, r1
|
||||
lsrs r4, r0, 16
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A7380
|
||||
|
|
@ -698,7 +698,7 @@ _080A7380:
|
|||
mov r0, r8
|
||||
strh r0, [r5, 0x32]
|
||||
strh r7, [r5, 0x36]
|
||||
ldr r0, _080A73C4 @ =sub_8075590
|
||||
ldr r0, _080A73C4 @ =StartAnimLinearTranslation
|
||||
str r0, [r5, 0x1C]
|
||||
ldr r1, _080A73C8 @ =DestroyAnimSprite
|
||||
adds r0, r5, 0
|
||||
|
|
@ -714,7 +714,7 @@ _080A73B4: .4byte gBattleAnimAttacker
|
|||
_080A73B8: .4byte gBattleAnimArgs
|
||||
_080A73BC: .4byte gBattleAnimTarget
|
||||
_080A73C0: .4byte 0xffffa000
|
||||
_080A73C4: .4byte sub_8075590
|
||||
_080A73C4: .4byte StartAnimLinearTranslation
|
||||
_080A73C8: .4byte DestroyAnimSprite
|
||||
thumb_func_end sub_80A72C8
|
||||
|
||||
|
|
@ -1158,7 +1158,7 @@ sub_80A76F0: @ 80A76F0
|
|||
mov r4, sp
|
||||
adds r4, 0x2
|
||||
strh r1, [r4]
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
mov r10, r4
|
||||
cmp r0, 0
|
||||
|
|
@ -1194,7 +1194,7 @@ _080A7754:
|
|||
strh r0, [r3, 0x4]
|
||||
b _080A77B6
|
||||
_080A775C:
|
||||
ldr r1, _080A77A0 @ =gUnknown_2023BD6
|
||||
ldr r1, _080A77A0 @ =gBattlerPositions
|
||||
ldr r0, _080A77A4 @ =gBattleAnimTarget
|
||||
ldrb r0, [r0]
|
||||
adds r0, r1
|
||||
|
|
@ -1228,7 +1228,7 @@ _080A775C:
|
|||
ands r0, r1
|
||||
b _080A77B4
|
||||
.align 2, 0
|
||||
_080A77A0: .4byte gUnknown_2023BD6
|
||||
_080A77A0: .4byte gBattlerPositions
|
||||
_080A77A4: .4byte gBattleAnimTarget
|
||||
_080A77A8: .4byte gTasks
|
||||
_080A77AC: .4byte gBattleAnimArgs
|
||||
|
|
@ -1241,7 +1241,7 @@ _080A77B6:
|
|||
ldr r5, _080A7810 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
ldr r1, _080A7814 @ =gTasks
|
||||
mov r3, r8
|
||||
adds r4, r3, r7
|
||||
|
|
@ -1253,7 +1253,7 @@ _080A77B6:
|
|||
adds r6, r0, 0
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x1
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x1C]
|
||||
|
|
@ -1268,7 +1268,7 @@ _080A77B6:
|
|||
ldrb r1, [r4]
|
||||
movs r0, 0x2
|
||||
eors r0, r1
|
||||
bl sub_8072DF0
|
||||
bl IsBattlerSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A7820
|
||||
|
|
@ -1288,13 +1288,13 @@ _080A7820:
|
|||
ldr r4, _080A787C @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x1
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
mov r1, r10
|
||||
|
|
@ -1430,7 +1430,7 @@ _080A7928:
|
|||
ble _080A79A0
|
||||
ldr r0, _080A7970 @ =gBattleAnimTarget
|
||||
ldrb r0, [r0]
|
||||
bl sub_807685C
|
||||
bl GetBattlerSpriteSubpriority
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r2, _080A7974 @ =0x0000ffc0
|
||||
|
|
@ -1451,7 +1451,7 @@ _080A7978:
|
|||
ble _080A79A0
|
||||
ldr r0, _080A7998 @ =gBattleAnimTarget
|
||||
ldrb r0, [r0]
|
||||
bl sub_807685C
|
||||
bl GetBattlerSpriteSubpriority
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r3, _080A799C @ =0x0000ffc0
|
||||
|
|
@ -1466,7 +1466,7 @@ _080A799C: .4byte 0x0000ffc0
|
|||
_080A79A0:
|
||||
ldr r0, _080A79DC @ =gBattleAnimTarget
|
||||
ldrb r0, [r0]
|
||||
bl sub_807685C
|
||||
bl GetBattlerSpriteSubpriority
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r1, [r4, 0x8]
|
||||
|
|
@ -1596,12 +1596,12 @@ sub_80A7A88: @ 80A7A88
|
|||
ldr r4, _080A7B28 @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
ldr r4, _080A7B2C @ =gBattleAnimArgs
|
||||
lsrs r0, 24
|
||||
|
|
@ -1754,17 +1754,17 @@ sub_80A7BC4: @ 80A7BC4
|
|||
ldr r5, _080A7C10 @ =gBattleAnimTarget
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x32]
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x36]
|
||||
ldr r0, _080A7C14 @ =sub_8075590
|
||||
ldr r0, _080A7C14 @ =StartAnimLinearTranslation
|
||||
str r0, [r4, 0x1C]
|
||||
adds r2, r4, 0
|
||||
adds r2, 0x2C
|
||||
|
|
@ -1780,7 +1780,7 @@ sub_80A7BC4: @ 80A7BC4
|
|||
bx r0
|
||||
.align 2, 0
|
||||
_080A7C10: .4byte gBattleAnimTarget
|
||||
_080A7C14: .4byte sub_8075590
|
||||
_080A7C14: .4byte StartAnimLinearTranslation
|
||||
_080A7C18: .4byte sub_80A7C1C
|
||||
thumb_func_end sub_80A7BC4
|
||||
|
||||
|
|
@ -1986,19 +1986,19 @@ _080A7D90:
|
|||
ldr r4, _080A7DEC @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
add r0, r8
|
||||
strh r0, [r5, 0x32]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
adds r0, r6
|
||||
strh r0, [r5, 0x36]
|
||||
ldr r0, _080A7DF0 @ =sub_8075590
|
||||
ldr r0, _080A7DF0 @ =StartAnimLinearTranslation
|
||||
str r0, [r5, 0x1C]
|
||||
ldr r1, _080A7DF4 @ =sub_80A7DF8
|
||||
adds r0, r5, 0
|
||||
|
|
@ -2013,7 +2013,7 @@ _080A7DE0: .4byte 0x0000ffe0
|
|||
_080A7DE4: .4byte 0x0000fff0
|
||||
_080A7DE8: .4byte gBattleAnimArgs
|
||||
_080A7DEC: .4byte gBattleAnimTarget
|
||||
_080A7DF0: .4byte sub_8075590
|
||||
_080A7DF0: .4byte StartAnimLinearTranslation
|
||||
_080A7DF4: .4byte sub_80A7DF8
|
||||
thumb_func_end sub_80A7D64
|
||||
|
||||
|
|
@ -2079,7 +2079,7 @@ _080A7E48:
|
|||
ldr r4, _080A7EB4 @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
add r0, r9
|
||||
|
|
@ -2088,7 +2088,7 @@ _080A7E48:
|
|||
strh r0, [r5, 0x34]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
adds r0, r6
|
||||
|
|
@ -2258,12 +2258,12 @@ sub_80A7FB0: @ 80A7FB0
|
|||
lsrs r4, 24
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x1
|
||||
bl sub_80758E0
|
||||
bl PrepareBattlerSpriteForRotScale
|
||||
adds r0, r4, 0
|
||||
movs r1, 0xD0
|
||||
movs r2, 0xD0
|
||||
movs r3, 0
|
||||
bl obj_id_set_rotscale
|
||||
bl SetSpriteRotScale
|
||||
ldr r1, _080A8008 @ =gSprites
|
||||
lsls r0, r4, 4
|
||||
adds r0, r4
|
||||
|
|
@ -2317,7 +2317,7 @@ sub_80A8014: @ 80A8014
|
|||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
adds r0, r4, 0
|
||||
bl sub_8075980
|
||||
bl ResetSpriteRotScale
|
||||
ldr r1, _080A8070 @ =gSprites
|
||||
lsls r0, r4, 4
|
||||
adds r0, r4
|
||||
|
|
@ -2356,7 +2356,7 @@ sub_80A8074: @ 80A8074
|
|||
movs r5, 0
|
||||
strh r0, [r4, 0x8]
|
||||
movs r1, 0
|
||||
bl sub_80758E0
|
||||
bl PrepareBattlerSpriteForRotScale
|
||||
strh r5, [r4, 0xA]
|
||||
strh r5, [r4, 0xC]
|
||||
strh r5, [r4, 0xE]
|
||||
|
|
@ -2367,7 +2367,7 @@ sub_80A8074: @ 80A8074
|
|||
strh r5, [r4, 0x14]
|
||||
ldr r0, _080A80C4 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r0]
|
||||
bl sub_807685C
|
||||
bl GetBattlerSpriteSubpriority
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x16]
|
||||
|
|
@ -2439,7 +2439,7 @@ _080A8128:
|
|||
ldrsh r2, [r4, r1]
|
||||
adds r1, r2, 0
|
||||
movs r3, 0
|
||||
bl obj_id_set_rotscale
|
||||
bl SetSpriteRotScale
|
||||
ldrb r0, [r4, 0x8]
|
||||
bl sub_8076440
|
||||
movs r2, 0xC
|
||||
|
|
@ -2471,7 +2471,7 @@ _080A816E:
|
|||
ldrb r0, [r4, 0x8]
|
||||
adds r1, r2, 0
|
||||
movs r3, 0
|
||||
bl obj_id_set_rotscale
|
||||
bl SetSpriteRotScale
|
||||
ldrb r0, [r4, 0x8]
|
||||
bl sub_8076440
|
||||
movs r0, 0x2
|
||||
|
|
@ -2502,7 +2502,7 @@ _080A81A4:
|
|||
ldrsh r2, [r4, r1]
|
||||
adds r1, r2, 0
|
||||
movs r3, 0
|
||||
bl obj_id_set_rotscale
|
||||
bl SetSpriteRotScale
|
||||
ldrb r0, [r4, 0x8]
|
||||
bl sub_8076440
|
||||
movs r2, 0xC
|
||||
|
|
@ -2519,7 +2519,7 @@ _080A81D0:
|
|||
b _080A81F6
|
||||
_080A81D8:
|
||||
ldrb r0, [r4, 0x8]
|
||||
bl sub_8075980
|
||||
bl ResetSpriteRotScale
|
||||
ldr r2, _080A81FC @ =gSprites
|
||||
movs r0, 0x26
|
||||
ldrsh r1, [r4, r0]
|
||||
|
|
@ -2631,7 +2631,7 @@ _080A8244:
|
|||
ldrsh r2, [r7, r1]
|
||||
adds r1, r2, 0
|
||||
movs r3, 0
|
||||
bl obj_id_set_rotscale
|
||||
bl SetSpriteRotScale
|
||||
ldrb r0, [r4, 0x1]
|
||||
movs r3, 0x4
|
||||
negs r3, r3
|
||||
|
|
@ -2959,7 +2959,7 @@ sub_80A851C: @ 80A851C
|
|||
bl StartSpriteAnim
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
adds r0, 0x20
|
||||
|
|
@ -2974,7 +2974,7 @@ _080A8550:
|
|||
bl StartSpriteAnim
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
subs r0, 0x20
|
||||
|
|
@ -2985,7 +2985,7 @@ _080A856A:
|
|||
ldr r0, _080A85A0 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r0]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
movs r1, 0
|
||||
|
|
@ -3042,7 +3042,7 @@ _080A85CA:
|
|||
_080A85E4:
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
ldr r4, _080A862C @ =gBattleAnimArgs
|
||||
lsrs r0, 24
|
||||
|
|
@ -3051,7 +3051,7 @@ _080A85E4:
|
|||
strh r0, [r6, 0x20]
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r4, [r4, 0x4]
|
||||
|
|
@ -3602,7 +3602,7 @@ sub_80A8A1C: @ 80A8A1C
|
|||
ldr r6, _080A8A70 @ =gBattleAnimTarget
|
||||
ldrb r0, [r6]
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
subs r0, 0x10
|
||||
|
|
@ -3849,14 +3849,14 @@ _080A8BF2:
|
|||
movs r0, 0x1
|
||||
adds r4, r0, 0
|
||||
eors r4, r1
|
||||
bl sub_8075290
|
||||
bl IsDoubleBattle
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A8C6A
|
||||
movs r1, 0x2
|
||||
adds r0, r5, 0
|
||||
eors r0, r1
|
||||
bl sub_8072DF0
|
||||
bl IsBattlerSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A8C6A
|
||||
|
|
@ -3876,7 +3876,7 @@ _080A8C30:
|
|||
adds r0, r5, 0
|
||||
movs r1, 0x2
|
||||
_080A8C34:
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
adds r0, r5, 0
|
||||
|
|
@ -3995,7 +3995,7 @@ _080A8D10:
|
|||
beq _080A8D6C
|
||||
adds r0, r7, 0
|
||||
mov r1, r10
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
ldr r1, _080A8D50 @ =gBattleAnimArgs
|
||||
lsrs r0, 24
|
||||
|
|
@ -4008,7 +4008,7 @@ _080A8D10:
|
|||
mov r4, r8
|
||||
eors r4, r0
|
||||
adds r0, r4, 0
|
||||
bl sub_8072DF0
|
||||
bl IsBattlerSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A8D5C
|
||||
|
|
@ -4031,7 +4031,7 @@ _080A8D68: .4byte gBattlerSpriteIds
|
|||
_080A8D6C:
|
||||
adds r0, r7, 0
|
||||
mov r1, r10
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r1, _080A8DD4 @ =gBattleAnimArgs
|
||||
|
|
@ -4040,7 +4040,7 @@ _080A8D6C:
|
|||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
mov r9, r0
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080A8DE4
|
||||
|
|
@ -4048,7 +4048,7 @@ _080A8D6C:
|
|||
adds r4, r7, 0
|
||||
eors r4, r0
|
||||
adds r0, r4, 0
|
||||
bl sub_8072DF0
|
||||
bl IsBattlerSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A8DE4
|
||||
|
|
@ -4104,7 +4104,7 @@ _080A8DFA:
|
|||
strb r0, [r1]
|
||||
adds r0, r7, 0
|
||||
ldr r1, [sp, 0x4]
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
ldr r4, _080A8E48 @ =gBattleAnimArgs
|
||||
lsrs r0, 24
|
||||
|
|
@ -4112,14 +4112,14 @@ _080A8DFA:
|
|||
adds r0, r1
|
||||
lsls r0, 16
|
||||
lsrs r6, r0, 16
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080A8E4C
|
||||
movs r1, 0x2
|
||||
mov r0, r8
|
||||
eors r0, r1
|
||||
bl sub_8072DF0
|
||||
bl IsBattlerSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A8E4C
|
||||
|
|
@ -4138,13 +4138,13 @@ _080A8E4C:
|
|||
mov r4, sp
|
||||
mov r0, r8
|
||||
mov r1, r10
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4]
|
||||
mov r0, r8
|
||||
ldr r1, [sp, 0x4]
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
mov r2, sp
|
||||
|
|
@ -5007,13 +5007,13 @@ sub_80A94AC: @ 80A94AC
|
|||
ldr r5, _080A9500 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x24]
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x1
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x26]
|
||||
|
|
@ -5428,7 +5428,7 @@ _080A9808:
|
|||
strh r0, [r5, 0x2E]
|
||||
ldrb r0, [r6]
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r1, [r4, 0x4]
|
||||
|
|
@ -5436,13 +5436,13 @@ _080A9808:
|
|||
strh r0, [r5, 0x32]
|
||||
ldrb r0, [r6]
|
||||
movs r1, 0x1
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r1, [r4, 0x6]
|
||||
adds r0, r1
|
||||
strh r0, [r5, 0x36]
|
||||
ldr r0, _080A9858 @ =sub_8075590
|
||||
ldr r0, _080A9858 @ =StartAnimLinearTranslation
|
||||
str r0, [r5, 0x1C]
|
||||
ldr r1, _080A985C @ =DestroyAnimSprite
|
||||
adds r0, r5, 0
|
||||
|
|
@ -5457,7 +5457,7 @@ _080A9808:
|
|||
.align 2, 0
|
||||
_080A9850: .4byte gBattleAnimAttacker
|
||||
_080A9854: .4byte gBattleAnimArgs
|
||||
_080A9858: .4byte sub_8075590
|
||||
_080A9858: .4byte StartAnimLinearTranslation
|
||||
_080A985C: .4byte DestroyAnimSprite
|
||||
thumb_func_end sub_80A97E8
|
||||
|
||||
|
|
@ -5509,7 +5509,7 @@ sub_80A98B0: @ 80A98B0
|
|||
push {r4-r7,lr}
|
||||
lsls r0, 24
|
||||
lsrs r7, r0, 24
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
movs r6, 0xF0
|
||||
cmp r0, 0
|
||||
|
|
@ -5830,7 +5830,7 @@ sub_80A9B40: @ 80A9B40
|
|||
ldr r5, _080A9B84 @ =gBattleAnimTarget
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x32]
|
||||
|
|
@ -5838,7 +5838,7 @@ sub_80A9B40: @ 80A9B40
|
|||
strh r0, [r4, 0x34]
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x36]
|
||||
|
|
@ -6057,7 +6057,7 @@ sub_80A9CE8: @ 80A9CE8
|
|||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl SetAnimBgAttribute
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080A9D2A
|
||||
|
|
@ -6095,7 +6095,7 @@ _080A9D2A:
|
|||
lsls r1, 4
|
||||
movs r2, 0x20
|
||||
bl LoadCompressedPalette
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A9D88
|
||||
|
|
@ -6265,7 +6265,7 @@ _080A9EAE:
|
|||
.align 2, 0
|
||||
_080A9ED0: .4byte gTasks
|
||||
_080A9ED4:
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080A9EE8
|
||||
|
|
@ -6314,7 +6314,7 @@ sub_80A9F10: @ 80A9F10
|
|||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl SetAnimBgAttribute
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080A9F52
|
||||
|
|
@ -6336,7 +6336,7 @@ _080A9F52:
|
|||
bl SetGpuReg
|
||||
mov r0, sp
|
||||
bl sub_80752A0
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A9F98
|
||||
|
|
@ -6383,7 +6383,7 @@ _080A9FC6:
|
|||
lsls r1, 4
|
||||
movs r2, 0x20
|
||||
bl LoadCompressedPalette
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A9FFA
|
||||
|
|
@ -6548,7 +6548,7 @@ _080AA112:
|
|||
adds r0, 0x1
|
||||
strh r0, [r1, 0x20]
|
||||
_080AA134:
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080AA148
|
||||
|
|
@ -6585,13 +6585,13 @@ sub_80AA174: @ 80AA174
|
|||
ldr r5, _080AA1C8 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x20]
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x22]
|
||||
|
|
@ -6607,7 +6607,7 @@ sub_80AA174: @ 80AA174
|
|||
ldrh r0, [r1, 0x2]
|
||||
strh r0, [r4, 0x30]
|
||||
ldrb r0, [r5]
|
||||
bl sub_807685C
|
||||
bl GetBattlerSpriteSubpriority
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x3C]
|
||||
|
|
@ -6743,13 +6743,13 @@ sub_80AA2B0: @ 80AA2B0
|
|||
ldr r4, _080AA2F8 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x20]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x22]
|
||||
|
|
@ -6851,13 +6851,13 @@ sub_80AA37C: @ 80AA37C
|
|||
ldr r4, _080AA3C8 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x20]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x22]
|
||||
|
|
@ -7142,7 +7142,7 @@ sub_80AA58C: @ 80AA58C
|
|||
bl StartSpriteAnim
|
||||
ldr r0, _080AA68C @ =gBattleAnimTarget
|
||||
ldrb r0, [r0]
|
||||
bl sub_807685C
|
||||
bl GetBattlerSpriteSubpriority
|
||||
subs r0, 0x1
|
||||
adds r1, r4, 0
|
||||
adds r1, 0x43
|
||||
|
|
@ -7345,13 +7345,13 @@ _080AA734:
|
|||
_080AA736:
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x20]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x22]
|
||||
|
|
@ -7508,7 +7508,7 @@ _080AA856:
|
|||
_080AA870:
|
||||
adds r0, r6, 0
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
ldr r7, _080AA8F0 @ =gBattleAnimArgs
|
||||
lsrs r0, 24
|
||||
|
|
@ -7518,7 +7518,7 @@ _080AA870:
|
|||
strh r0, [r5, 0x20]
|
||||
adds r0, r6, 0
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r1, [r7, 0x4]
|
||||
|
|
@ -7733,7 +7733,7 @@ _080AA9C6:
|
|||
str r0, [r6, 0x1C]
|
||||
strh r5, [r6, 0x2E]
|
||||
adds r0, r6, 0
|
||||
bl oamt_add_pos2_onto_pos1
|
||||
bl SetSpritePrimaryCoordsFromSecondaryCoords
|
||||
movs r0, 0x5
|
||||
strh r0, [r6, 0x32]
|
||||
strh r5, [r6, 0x36]
|
||||
|
|
@ -7847,7 +7847,7 @@ sub_80AAAE4: @ 80AAAE4
|
|||
ldrb r1, [r4]
|
||||
movs r0, 0x2
|
||||
eors r0, r1
|
||||
bl sub_8072DF0
|
||||
bl IsBattlerSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080AAB30
|
||||
|
|
@ -7872,13 +7872,13 @@ _080AAB30:
|
|||
ldr r4, _080AAB70 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x20]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x1
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
adds r0, 0x28
|
||||
|
|
@ -7891,7 +7891,7 @@ _080AAB50:
|
|||
ldrh r0, [r5, 0x22]
|
||||
subs r0, 0x48
|
||||
strh r0, [r5, 0x36]
|
||||
ldr r0, _080AAB74 @ =sub_8075590
|
||||
ldr r0, _080AAB74 @ =StartAnimLinearTranslation
|
||||
str r0, [r5, 0x1C]
|
||||
ldr r1, _080AAB78 @ =DestroyAnimSprite
|
||||
adds r0, r5, 0
|
||||
|
|
@ -7901,7 +7901,7 @@ _080AAB50:
|
|||
bx r0
|
||||
.align 2, 0
|
||||
_080AAB70: .4byte gBattleAnimAttacker
|
||||
_080AAB74: .4byte sub_8075590
|
||||
_080AAB74: .4byte StartAnimLinearTranslation
|
||||
_080AAB78: .4byte DestroyAnimSprite
|
||||
thumb_func_end sub_80AAAE4
|
||||
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@ sub_80DE34C: @ 80DE34C
|
|||
ldr r6, _080DE398 @ =gBattleAnimTarget
|
||||
ldrb r0, [r6]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 8
|
||||
|
|
@ -102,7 +102,7 @@ sub_80DE34C: @ 80DE34C
|
|||
asrs r4, 16
|
||||
ldrb r0, [r6]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
adds r1, r0, 0
|
||||
lsls r1, 24
|
||||
lsrs r1, 8
|
||||
|
|
@ -216,13 +216,13 @@ sub_80DE440: @ 80DE440
|
|||
ldr r4, _080DE4CC @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
adds r7, r0, 0
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
adds r6, r0, 0
|
||||
|
|
@ -243,7 +243,7 @@ sub_80DE440: @ 80DE440
|
|||
lsls r1, 23
|
||||
adds r0, r1
|
||||
lsrs r4, r0, 16
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080DE49E
|
||||
|
|
@ -265,7 +265,7 @@ _080DE49E:
|
|||
strh r0, [r5, 0x2E]
|
||||
strh r7, [r5, 0x32]
|
||||
strh r6, [r5, 0x36]
|
||||
ldr r0, _080DE4D4 @ =sub_8075590
|
||||
ldr r0, _080DE4D4 @ =StartAnimLinearTranslation
|
||||
str r0, [r5, 0x1C]
|
||||
ldr r1, _080DE4D8 @ =DestroyAnimSprite
|
||||
adds r0, r5, 0
|
||||
|
|
@ -277,7 +277,7 @@ _080DE49E:
|
|||
.align 2, 0
|
||||
_080DE4CC: .4byte gBattleAnimTarget
|
||||
_080DE4D0: .4byte gBattleAnimArgs
|
||||
_080DE4D4: .4byte sub_8075590
|
||||
_080DE4D4: .4byte StartAnimLinearTranslation
|
||||
_080DE4D8: .4byte DestroyAnimSprite
|
||||
thumb_func_end sub_80DE440
|
||||
|
||||
|
|
@ -957,7 +957,7 @@ sub_80DE9D8: @ 80DE9D8
|
|||
ldrsh r1, [r5, r2]
|
||||
adds r0, r4, 0
|
||||
bl sub_8074FF8
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080DEA2C
|
||||
|
|
@ -1093,7 +1093,7 @@ sub_80DEAF0: @ 80DEAF0
|
|||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r2, r0, 24
|
||||
ldr r0, _080DEB04 @ =gUnknown_2037EE8
|
||||
ldr r0, _080DEB04 @ =gAnimMoveDmg
|
||||
ldr r0, [r0]
|
||||
cmp r0, 0
|
||||
ble _080DEB0C
|
||||
|
|
@ -1101,7 +1101,7 @@ sub_80DEAF0: @ 80DEAF0
|
|||
movs r0, 0
|
||||
b _080DEB10
|
||||
.align 2, 0
|
||||
_080DEB04: .4byte gUnknown_2037EE8
|
||||
_080DEB04: .4byte gAnimMoveDmg
|
||||
_080DEB08: .4byte gBattleAnimArgs
|
||||
_080DEB0C:
|
||||
ldr r1, _080DEB1C @ =gBattleAnimArgs
|
||||
|
|
@ -1311,13 +1311,13 @@ sub_80DEC90: @ 80DEC90
|
|||
ldr r4, _080DED08 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x20]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x1
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x22]
|
||||
|
|
@ -1474,7 +1474,7 @@ sub_80DEDD8: @ 80DEDD8
|
|||
push {r4,r5,lr}
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080DEE2C
|
||||
|
|
@ -1551,7 +1551,7 @@ sub_80DEE78: @ 80DEE78
|
|||
strh r1, [r0]
|
||||
ldr r0, _080DEEB8 @ =gUnknown_202298A
|
||||
strh r1, [r0]
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080DEEA4
|
||||
|
|
@ -1590,7 +1590,7 @@ _080DEED8:
|
|||
_080DEEDA:
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r6, [r6, 0x2]
|
||||
|
|
@ -1598,7 +1598,7 @@ _080DEEDA:
|
|||
strh r0, [r5, 0x20]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x1
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x22]
|
||||
|
|
@ -2005,13 +2005,13 @@ sub_80DF1DC: @ 80DF1DC
|
|||
ldr r6, _080DF234 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r6]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0xC]
|
||||
ldrb r0, [r6]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0xE]
|
||||
|
|
@ -2394,17 +2394,17 @@ _080DF4C4:
|
|||
ldr r4, _080DF51C @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x32]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x36]
|
||||
ldr r0, _080DF520 @ =sub_8075590
|
||||
ldr r0, _080DF520 @ =StartAnimLinearTranslation
|
||||
str r0, [r5, 0x1C]
|
||||
_080DF510:
|
||||
pop {r4,r5}
|
||||
|
|
@ -2413,7 +2413,7 @@ _080DF510:
|
|||
.align 2, 0
|
||||
_080DF518: .4byte DestroyAnimSprite
|
||||
_080DF51C: .4byte gBattleAnimTarget
|
||||
_080DF520: .4byte sub_8075590
|
||||
_080DF520: .4byte StartAnimLinearTranslation
|
||||
thumb_func_end sub_80DF468
|
||||
|
||||
thumb_func_start sub_80DF524
|
||||
|
|
@ -2491,19 +2491,19 @@ _080DF5AA:
|
|||
ldr r4, _080DF5DC @ =gBattleAnimAttacker
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x20]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x22]
|
||||
adds r0, r6, 0
|
||||
movs r1, 0
|
||||
bl sub_80758E0
|
||||
bl PrepareBattlerSpriteForRotScale
|
||||
movs r0, 0x80
|
||||
lsls r0, 1
|
||||
strh r0, [r5, 0x30]
|
||||
|
|
@ -2524,7 +2524,7 @@ _080DF5E0:
|
|||
ldrsh r2, [r5, r0]
|
||||
adds r0, r6, 0
|
||||
movs r3, 0
|
||||
bl obj_id_set_rotscale
|
||||
bl SetSpriteRotScale
|
||||
ldrh r0, [r5, 0x34]
|
||||
adds r0, 0x1
|
||||
strh r0, [r5, 0x34]
|
||||
|
|
@ -2548,7 +2548,7 @@ _080DF610:
|
|||
ldrsh r2, [r5, r0]
|
||||
adds r0, r6, 0
|
||||
movs r3, 0
|
||||
bl obj_id_set_rotscale
|
||||
bl SetSpriteRotScale
|
||||
ldrh r0, [r5, 0x34]
|
||||
adds r0, 0x1
|
||||
strh r0, [r5, 0x34]
|
||||
|
|
@ -2569,7 +2569,7 @@ _080DF610:
|
|||
orrs r1, r2
|
||||
strb r1, [r0]
|
||||
adds r0, r6, 0
|
||||
bl sub_8075980
|
||||
bl ResetSpriteRotScale
|
||||
_080DF658:
|
||||
ldrh r0, [r5, 0x2E]
|
||||
adds r0, 0x1
|
||||
|
|
@ -2950,7 +2950,7 @@ _080DF90A:
|
|||
ldr r0, _080DF930 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r0]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x32]
|
||||
|
|
@ -3140,11 +3140,11 @@ _080DFA86:
|
|||
lsls r2, 3
|
||||
adds r2, r3
|
||||
ldrb r2, [r2, 0x1C]
|
||||
bl sub_8034BF4
|
||||
bl HandleSpeciesGfxDataChange
|
||||
ldrb r1, [r6]
|
||||
mov r0, sp
|
||||
bl sub_8075300
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080DFABC
|
||||
|
|
@ -3252,7 +3252,7 @@ _080DFB80:
|
|||
movs r2, 0
|
||||
bl SetAnimBgAttribute
|
||||
_080DFB8A:
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080DFBC8
|
||||
|
|
@ -3273,13 +3273,13 @@ _080DFB8A:
|
|||
cmp r0, 0
|
||||
bne _080DFBC8
|
||||
ldrb r0, [r4]
|
||||
ldr r1, _080DFBE0 @ =gUnknown_2024018
|
||||
ldr r1, _080DFBE0 @ =gBattleSpritesDataPtr
|
||||
ldr r1, [r1]
|
||||
ldr r2, [r1]
|
||||
lsls r1, r0, 2
|
||||
adds r1, r2
|
||||
ldrh r1, [r1, 0x2]
|
||||
bl SetBankEnemyShadowSpriteCallback
|
||||
bl SetBattlerShadowSpriteCallback
|
||||
_080DFBC8:
|
||||
adds r0, r5, 0
|
||||
bl DestroyAnimVisualTask
|
||||
|
|
@ -3291,7 +3291,7 @@ _080DFBCE:
|
|||
.align 2, 0
|
||||
_080DFBD8: .4byte gBattleAnimAttacker
|
||||
_080DFBDC: .4byte gTasks
|
||||
_080DFBE0: .4byte gUnknown_2024018
|
||||
_080DFBE0: .4byte gBattleSpritesDataPtr
|
||||
thumb_func_end sub_80DF9BC
|
||||
|
||||
thumb_func_start c3_80DFBE4
|
||||
|
|
@ -3337,7 +3337,7 @@ sub_80DFC24: @ 80DFC24
|
|||
ldr r1, _080DFC4C @ =gBattleAnimTarget
|
||||
ldrb r1, [r1]
|
||||
movs r2, 0x1
|
||||
bl sub_8034BF4
|
||||
bl HandleSpeciesGfxDataChange
|
||||
adds r0, r4, 0
|
||||
bl DestroyAnimVisualTask
|
||||
pop {r4}
|
||||
|
|
@ -3397,7 +3397,7 @@ _080DFC94:
|
|||
movs r1, 0x4
|
||||
movs r2, 0x1
|
||||
bl SetAnimBgAttribute
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080DFCCE
|
||||
|
|
@ -3424,7 +3424,7 @@ _080DFCCE:
|
|||
lsls r1, 4
|
||||
movs r2, 0x20
|
||||
bl LoadCompressedPalette
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080DFD30
|
||||
|
|
@ -3616,7 +3616,7 @@ _080DFE7E:
|
|||
mov r0, sp
|
||||
ldrb r0, [r0, 0x9]
|
||||
bl sub_8075358
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080DFEA0
|
||||
|
|
@ -3678,14 +3678,14 @@ _080DFF06:
|
|||
ldr r4, _080E0000 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
adds r0, r5
|
||||
strh r0, [r7, 0x20]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x1
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
adds r0, 0x20
|
||||
|
|
@ -4039,7 +4039,7 @@ _080E01C4:
|
|||
movs r1, 0x4
|
||||
movs r2, 0x1
|
||||
bl SetAnimBgAttribute
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080E01FC
|
||||
|
|
@ -4066,7 +4066,7 @@ _080E01FC:
|
|||
lsls r1, 4
|
||||
movs r2, 0x20
|
||||
bl LoadCompressedPalette
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080E0264
|
||||
|
|
@ -4094,7 +4094,7 @@ _080E0264:
|
|||
bl GetBattlerPosition
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
bl sub_8075290
|
||||
bl IsDoubleBattle
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
|
|
@ -4319,7 +4319,7 @@ _080E042A:
|
|||
mov r0, sp
|
||||
ldrb r0, [r0, 0x9]
|
||||
bl sub_8075358
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080E044C
|
||||
|
|
@ -4557,7 +4557,7 @@ _080E0608:
|
|||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
movs r1, 0
|
||||
bl sub_80758E0
|
||||
bl PrepareBattlerSpriteForRotScale
|
||||
ldr r0, _080E0624 @ =sub_80E0628
|
||||
str r0, [r4]
|
||||
_080E0618:
|
||||
|
|
@ -4621,7 +4621,7 @@ _080E065C:
|
|||
lsls r2, 1
|
||||
ldrh r3, [r4, 0xC]
|
||||
adds r1, r2, 0
|
||||
bl obj_id_set_rotscale
|
||||
bl SetSpriteRotScale
|
||||
ldrh r0, [r4, 0x26]
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
|
|
@ -4662,7 +4662,7 @@ _080E06B0:
|
|||
lsls r2, 1
|
||||
ldrh r3, [r4, 0xC]
|
||||
adds r1, r2, 0
|
||||
bl obj_id_set_rotscale
|
||||
bl SetSpriteRotScale
|
||||
ldrh r0, [r4, 0x26]
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
|
|
@ -4706,7 +4706,7 @@ _080E0708:
|
|||
lsls r2, 1
|
||||
ldrh r3, [r4, 0xC]
|
||||
adds r1, r2, 0
|
||||
bl obj_id_set_rotscale
|
||||
bl SetSpriteRotScale
|
||||
ldrh r0, [r4, 0x26]
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
|
|
@ -4741,7 +4741,7 @@ _080E0778:
|
|||
ldrh r0, [r4, 0x26]
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl sub_8075980
|
||||
bl ResetSpriteRotScale
|
||||
adds r0, r5, 0
|
||||
bl DestroyAnimVisualTask
|
||||
_080E0788:
|
||||
|
|
@ -4879,7 +4879,7 @@ sub_80E0850: @ 80E0850
|
|||
lsrs r0, 24
|
||||
strh r0, [r4, 0x26]
|
||||
movs r1, 0
|
||||
bl sub_80758E0
|
||||
bl PrepareBattlerSpriteForRotScale
|
||||
ldr r0, _080E08A0 @ =sub_80E08A4
|
||||
str r0, [r4]
|
||||
pop {r4}
|
||||
|
|
@ -5028,7 +5028,7 @@ _080E09A8:
|
|||
ldrh r0, [r7, 0x26]
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl sub_8075980
|
||||
bl ResetSpriteRotScale
|
||||
adds r0, r4, 0
|
||||
bl DestroyAnimVisualTask
|
||||
b _080E0A30
|
||||
|
|
@ -5040,7 +5040,7 @@ _080E09BA:
|
|||
lsls r2, 1
|
||||
ldrh r3, [r7, 0xC]
|
||||
adds r1, r2, 0
|
||||
bl obj_id_set_rotscale
|
||||
bl SetSpriteRotScale
|
||||
ldrh r0, [r7, 0x26]
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
|
|
@ -5116,13 +5116,13 @@ sub_80E0A3C: @ 80E0A3C
|
|||
ldr r4, _080E0A98 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x20]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x22]
|
||||
|
|
@ -5248,7 +5248,7 @@ _080E0B3E:
|
|||
strh r5, [r6, 0x1C]
|
||||
adds r0, r5, 0
|
||||
movs r1, 0
|
||||
bl sub_80758E0
|
||||
bl PrepareBattlerSpriteForRotScale
|
||||
mov r2, r8
|
||||
movs r3, 0x2
|
||||
ldrsh r0, [r2, r3]
|
||||
|
|
@ -5274,7 +5274,7 @@ _080E0B88:
|
|||
adds r0, r5, 0
|
||||
movs r1, 0xE0
|
||||
movs r3, 0
|
||||
bl obj_id_set_rotscale
|
||||
bl SetSpriteRotScale
|
||||
adds r0, r5, 0
|
||||
bl sub_8076440
|
||||
lsls r2, r5, 4
|
||||
|
|
@ -5293,10 +5293,10 @@ _080E0BAA:
|
|||
_080E0BB2:
|
||||
adds r0, r5, 0
|
||||
movs r1, 0xD0
|
||||
bl obj_id_set_rotscale
|
||||
bl SetSpriteRotScale
|
||||
adds r0, r5, 0
|
||||
bl sub_8076440
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080E0BD8
|
||||
|
|
@ -5361,7 +5361,7 @@ _080E0C30:
|
|||
cmp r0, 0xD
|
||||
bne _080E0C58
|
||||
adds r0, r5, 0
|
||||
bl sub_8075980
|
||||
bl ResetSpriteRotScale
|
||||
ldr r1, _080E0C64 @ =gSprites
|
||||
lsls r0, r5, 4
|
||||
adds r0, r5
|
||||
|
|
@ -5675,13 +5675,13 @@ sub_80E0E94: @ 80E0E94
|
|||
ldr r5, _080E0ED0 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x20]
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x22]
|
||||
|
|
@ -5735,7 +5735,7 @@ sub_80E0EDC: @ 80E0EDC
|
|||
_080E0F16:
|
||||
ldr r0, _080E0F24 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r0]
|
||||
bl sub_807685C
|
||||
bl GetBattlerSpriteSubpriority
|
||||
subs r0, 0x1
|
||||
b _080E0F32
|
||||
.align 2, 0
|
||||
|
|
@ -5743,7 +5743,7 @@ _080E0F24: .4byte gBattleAnimAttacker
|
|||
_080E0F28:
|
||||
ldr r0, _080E0F74 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r0]
|
||||
bl sub_807685C
|
||||
bl GetBattlerSpriteSubpriority
|
||||
adds r0, 0x1
|
||||
_080E0F32:
|
||||
adds r1, r4, 0
|
||||
|
|
@ -5856,7 +5856,7 @@ sub_80E0FB8: @ 80E0FB8
|
|||
movs r1, 0x1
|
||||
bl GetMonData
|
||||
mov r9, r0
|
||||
ldr r0, _080E1050 @ =gUnknown_2024018
|
||||
ldr r0, _080E1050 @ =gBattleSpritesDataPtr
|
||||
ldr r0, [r0]
|
||||
ldrb r2, [r4]
|
||||
ldr r1, [r0]
|
||||
|
|
@ -5882,7 +5882,7 @@ _080E1040: .4byte gBattleAnimAttacker
|
|||
_080E1044: .4byte gBattlerPartyIndexes
|
||||
_080E1048: .4byte gBattleAnimTarget
|
||||
_080E104C: .4byte gPlayerParty
|
||||
_080E1050: .4byte gUnknown_2024018
|
||||
_080E1050: .4byte gBattleSpritesDataPtr
|
||||
_080E1054:
|
||||
ldrb r0, [r4]
|
||||
lsls r0, 1
|
||||
|
|
@ -5930,7 +5930,7 @@ _080E107C:
|
|||
movs r1, 0x1
|
||||
bl GetMonData
|
||||
mov r9, r0
|
||||
ldr r0, _080E10EC @ =gUnknown_2024018
|
||||
ldr r0, _080E10EC @ =gBattleSpritesDataPtr
|
||||
ldr r0, [r0]
|
||||
ldrb r2, [r4]
|
||||
ldr r1, [r0]
|
||||
|
|
@ -5956,7 +5956,7 @@ _080E107C:
|
|||
_080E10E0: .4byte gBattlerPartyIndexes
|
||||
_080E10E4: .4byte gBattleAnimTarget
|
||||
_080E10E8: .4byte gEnemyParty
|
||||
_080E10EC: .4byte gUnknown_2024018
|
||||
_080E10EC: .4byte gBattleSpritesDataPtr
|
||||
_080E10F0: .4byte gPlayerParty
|
||||
_080E10F4:
|
||||
ldrb r0, [r4]
|
||||
|
|
@ -5985,13 +5985,13 @@ _080E1112:
|
|||
ldr r5, _080E1200 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x1
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
mov r2, r8
|
||||
lsls r1, r2, 16
|
||||
|
|
@ -7031,7 +7031,7 @@ _080E194E:
|
|||
ldr r4, _080E1988 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r1, [r6, 0x2]
|
||||
|
|
@ -7039,7 +7039,7 @@ _080E194E:
|
|||
strh r0, [r5, 0x20]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r6, [r6, 0x4]
|
||||
|
|
@ -7602,18 +7602,18 @@ _080E1DA2:
|
|||
ldrb r4, [r0]
|
||||
adds r0, r4, 0
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x10]
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x1
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x12]
|
||||
adds r0, r4, 0
|
||||
bl sub_807685C
|
||||
bl GetBattlerSpriteSubpriority
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x14]
|
||||
|
|
@ -8031,7 +8031,7 @@ sub_80E20D4: @ 80E20D4
|
|||
_080E20F0:
|
||||
ldrb r0, [r6]
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
ldr r4, _080E2130 @ =gBattleAnimArgs
|
||||
lsrs r0, 24
|
||||
|
|
@ -8040,7 +8040,7 @@ _080E20F0:
|
|||
strh r0, [r5, 0x20]
|
||||
ldrb r0, [r6]
|
||||
movs r1, 0x1
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r1, [r4, 0x2]
|
||||
|
|
@ -8164,7 +8164,7 @@ sub_80E21CC: @ 80E21CC
|
|||
bne _080E2224
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
adds r4, r0, 0
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0
|
||||
|
|
@ -8186,7 +8186,7 @@ _080E2220: .4byte gBattleAnimAttacker
|
|||
_080E2224:
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
adds r4, r0, 0
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0
|
||||
|
|
@ -8206,7 +8206,7 @@ _080E2248:
|
|||
ldr r5, _080E229C @ =gBattleAnimAttacker
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
adds r4, r0, 0
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0
|
||||
|
|
@ -8225,13 +8225,13 @@ _080E226C:
|
|||
ldr r4, _080E22A0 @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r6, 0x22]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r6, 0x24]
|
||||
|
|
@ -8595,14 +8595,14 @@ sub_80E2518: @ 80E2518
|
|||
mov r10, r0
|
||||
ldrb r0, [r0]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r7, 0x1E]
|
||||
mov r1, r10
|
||||
ldrb r0, [r1]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r7, 0x20]
|
||||
|
|
@ -8610,14 +8610,14 @@ sub_80E2518: @ 80E2518
|
|||
mov r8, r0
|
||||
ldrb r0, [r0]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r7, 0x22]
|
||||
mov r1, r8
|
||||
ldrb r0, [r1]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
adds r4, r0, 0
|
||||
mov r1, r8
|
||||
ldrb r0, [r1]
|
||||
|
|
@ -8641,7 +8641,7 @@ _080E258A:
|
|||
ldrsh r6, [r7, r1]
|
||||
mov r1, r8
|
||||
ldrb r0, [r1]
|
||||
bl sub_807685C
|
||||
bl GetBattlerSpriteSubpriority
|
||||
adds r3, r0, 0
|
||||
subs r3, 0x5
|
||||
lsls r3, 24
|
||||
|
|
@ -8918,7 +8918,7 @@ _080E27C0:
|
|||
strh r1, [r4, 0x3C]
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x22]
|
||||
|
|
@ -9225,7 +9225,7 @@ _080E2A0C:
|
|||
_080E2A0E:
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x20]
|
||||
|
|
@ -9617,7 +9617,7 @@ sub_80E2CE4: @ 80E2CE4
|
|||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r6, 0x26]
|
||||
bl sub_8075290
|
||||
bl IsDoubleBattle
|
||||
lsls r0, 24
|
||||
lsrs r7, r0, 24
|
||||
cmp r7, 0x1
|
||||
|
|
@ -9625,7 +9625,7 @@ sub_80E2CE4: @ 80E2CE4
|
|||
ldr r5, _080E2D38 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
|
|
@ -9633,7 +9633,7 @@ sub_80E2CE4: @ 80E2CE4
|
|||
movs r0, 0x2
|
||||
eors r0, r1
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r4, r0
|
||||
|
|
@ -10074,14 +10074,14 @@ _080E307C:
|
|||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
ldrh r0, [r4, 0x3C]
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r1, r0, 24
|
||||
_080E309C:
|
||||
|
|
@ -10298,10 +10298,10 @@ sub_80E321C: @ 80E321C
|
|||
ldr r4, _080E3250 @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
ldrb r0, [r4]
|
||||
bl GetBattlerSide
|
||||
lsls r0, 24
|
||||
|
|
@ -10378,7 +10378,7 @@ sub_80E3294: @ 80E3294
|
|||
bne _080E32DC
|
||||
adds r0, r5, 0
|
||||
movs r1, 0
|
||||
bl sub_80758E0
|
||||
bl PrepareBattlerSpriteForRotScale
|
||||
movs r0, 0x80
|
||||
lsls r0, 1
|
||||
strh r0, [r4, 0xA]
|
||||
|
|
@ -10401,7 +10401,7 @@ _080E32DC:
|
|||
ldrsh r2, [r4, r0]
|
||||
adds r0, r5, 0
|
||||
movs r3, 0
|
||||
bl obj_id_set_rotscale
|
||||
bl SetSpriteRotScale
|
||||
ldrh r0, [r4, 0xE]
|
||||
adds r0, 0x1
|
||||
strh r0, [r4, 0xE]
|
||||
|
|
@ -10412,7 +10412,7 @@ _080E32DC:
|
|||
movs r0, 0
|
||||
strh r0, [r4, 0xE]
|
||||
adds r0, r5, 0
|
||||
bl sub_8075980
|
||||
bl ResetSpriteRotScale
|
||||
ldr r1, _080E3330 @ =gSprites
|
||||
lsls r0, r5, 4
|
||||
adds r0, r5
|
||||
|
|
@ -10654,7 +10654,7 @@ sub_80E34D0: @ 80E34D0
|
|||
cmp r0, 0
|
||||
bne _080E34FC
|
||||
ldrb r0, [r4]
|
||||
bl sub_807685C
|
||||
bl GetBattlerSpriteSubpriority
|
||||
subs r0, 0x2
|
||||
adds r1, r5, 0
|
||||
adds r1, 0x43
|
||||
|
|
@ -10666,7 +10666,7 @@ _080E34F4: .4byte gBattleAnimTarget
|
|||
_080E34F8: .4byte 0x0000ff70
|
||||
_080E34FC:
|
||||
ldrb r0, [r4]
|
||||
bl sub_807685C
|
||||
bl GetBattlerSpriteSubpriority
|
||||
adds r0, 0x2
|
||||
adds r1, r5, 0
|
||||
adds r1, 0x43
|
||||
|
|
@ -10676,7 +10676,7 @@ _080E350C:
|
|||
ldr r0, _080E352C @ =gBattleAnimTarget
|
||||
ldrb r0, [r0]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x22]
|
||||
|
|
@ -10927,7 +10927,7 @@ _080E36B4:
|
|||
adds r0, r2
|
||||
movs r1, 0x2
|
||||
strh r1, [r0, 0x8]
|
||||
ldr r0, _080E3750 @ =gUnknown_2024018
|
||||
ldr r0, _080E3750 @ =gBattleSpritesDataPtr
|
||||
ldr r1, [r0]
|
||||
ldr r0, _080E3754 @ =gBattleAnimTarget
|
||||
ldrb r0, [r0]
|
||||
|
|
@ -10960,7 +10960,7 @@ _080E36B4:
|
|||
_080E3744: .4byte gSprites
|
||||
_080E3748: .4byte 0x0000fff0
|
||||
_080E374C: .4byte gTasks
|
||||
_080E3750: .4byte gUnknown_2024018
|
||||
_080E3750: .4byte gBattleSpritesDataPtr
|
||||
_080E3754: .4byte gBattleAnimTarget
|
||||
_080E3758:
|
||||
adds r1, r5, 0
|
||||
|
|
@ -11063,7 +11063,7 @@ sub_80E37FC: @ 80E37FC
|
|||
ble _080E3846
|
||||
movs r0, 0
|
||||
strh r0, [r4, 0x30]
|
||||
ldr r0, _080E3870 @ =gUnknown_2024018
|
||||
ldr r0, _080E3870 @ =gBattleSpritesDataPtr
|
||||
ldr r1, [r0]
|
||||
ldr r0, _080E3874 @ =gBattleAnimTarget
|
||||
ldrb r0, [r0]
|
||||
|
|
@ -11111,7 +11111,7 @@ _080E3846:
|
|||
beq _080E3890
|
||||
b _080E38CE
|
||||
.align 2, 0
|
||||
_080E3870: .4byte gUnknown_2024018
|
||||
_080E3870: .4byte gBattleSpritesDataPtr
|
||||
_080E3874: .4byte gBattleAnimTarget
|
||||
_080E3878:
|
||||
ldrh r0, [r4, 0x32]
|
||||
|
|
@ -11173,7 +11173,7 @@ sub_80E38D8: @ 80E38D8
|
|||
ldr r3, _080E3924 @ =gBattleAnimArgs
|
||||
movs r2, 0
|
||||
strh r2, [r3, 0xE]
|
||||
ldr r1, _080E3928 @ =gUnknown_2037EFE
|
||||
ldr r1, _080E3928 @ =gAnimFriendship
|
||||
ldrb r0, [r1]
|
||||
ldrb r1, [r1]
|
||||
adds r0, r1, 0
|
||||
|
|
@ -11209,7 +11209,7 @@ _080E3918:
|
|||
bx r0
|
||||
.align 2, 0
|
||||
_080E3924: .4byte gBattleAnimArgs
|
||||
_080E3928: .4byte gUnknown_2037EFE
|
||||
_080E3928: .4byte gAnimFriendship
|
||||
thumb_func_end sub_80E38D8
|
||||
|
||||
thumb_func_start sub_80E392C
|
||||
|
|
@ -11364,7 +11364,7 @@ _080E3A2C:
|
|||
movs r1, 0x1
|
||||
bl GetMonData
|
||||
mov r9, r0
|
||||
ldr r0, _080E3A9C @ =gUnknown_2024018
|
||||
ldr r0, _080E3A9C @ =gBattleSpritesDataPtr
|
||||
ldr r0, [r0]
|
||||
ldrb r2, [r4]
|
||||
ldr r1, [r0]
|
||||
|
|
@ -11387,7 +11387,7 @@ _080E3A2C:
|
|||
_080E3A90: .4byte gBattleAnimAttacker
|
||||
_080E3A94: .4byte gBattlerPartyIndexes
|
||||
_080E3A98: .4byte gPlayerParty
|
||||
_080E3A9C: .4byte gUnknown_2024018
|
||||
_080E3A9C: .4byte gBattleSpritesDataPtr
|
||||
_080E3AA0:
|
||||
ldrh r5, [r1, 0x2]
|
||||
_080E3AA2:
|
||||
|
|
@ -11433,7 +11433,7 @@ _080E3ACC:
|
|||
movs r1, 0x1
|
||||
bl GetMonData
|
||||
mov r9, r0
|
||||
ldr r0, _080E3B2C @ =gUnknown_2024018
|
||||
ldr r0, _080E3B2C @ =gBattleSpritesDataPtr
|
||||
ldr r0, [r0]
|
||||
ldrb r2, [r4]
|
||||
ldr r1, [r0]
|
||||
|
|
@ -11455,7 +11455,7 @@ _080E3ACC:
|
|||
.align 2, 0
|
||||
_080E3B24: .4byte gBattlerPartyIndexes
|
||||
_080E3B28: .4byte gEnemyParty
|
||||
_080E3B2C: .4byte gUnknown_2024018
|
||||
_080E3B2C: .4byte gBattleSpritesDataPtr
|
||||
_080E3B30:
|
||||
ldrh r5, [r1, 0x2]
|
||||
_080E3B32:
|
||||
|
|
@ -11479,7 +11479,7 @@ _080E3B54:
|
|||
ldr r0, _080E3BD8 @ =gBattleAnimTarget
|
||||
ldrb r0, [r0]
|
||||
movs r1, 0x1
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
lsls r3, r6, 16
|
||||
|
|
@ -11501,7 +11501,7 @@ _080E3B54:
|
|||
bl sub_80768D0
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
ldr r0, _080E3BE0 @ =gUnknown_2024018
|
||||
ldr r0, _080E3BE0 @ =gBattleSpritesDataPtr
|
||||
ldr r1, [r0]
|
||||
ldrb r0, [r4]
|
||||
ldr r1, [r1]
|
||||
|
|
@ -11540,7 +11540,7 @@ _080E3BD0: .4byte gSprites
|
|||
_080E3BD4: .4byte 0x0000ffe0
|
||||
_080E3BD8: .4byte gBattleAnimTarget
|
||||
_080E3BDC: .4byte gBattleAnimAttacker
|
||||
_080E3BE0: .4byte gUnknown_2024018
|
||||
_080E3BE0: .4byte gBattleSpritesDataPtr
|
||||
_080E3BE4: .4byte 0x00007fff
|
||||
_080E3BE8: .4byte gTasks
|
||||
_080E3BEC:
|
||||
|
|
@ -11627,7 +11627,7 @@ _080E3C5A:
|
|||
ldr r0, _080E3CB4 @ =gBattleAnimTarget
|
||||
ldrb r0, [r0]
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r4, r0
|
||||
|
|
@ -11644,7 +11644,7 @@ _080E3CB8:
|
|||
ldr r0, _080E3CFC @ =gBattleAnimTarget
|
||||
ldrb r0, [r0]
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r4, r0
|
||||
|
|
@ -11790,7 +11790,7 @@ _080E3D90:
|
|||
mov r1, r10
|
||||
ldrb r0, [r1]
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
adds r3, r5, 0
|
||||
|
|
@ -11823,7 +11823,7 @@ _080E3E10:
|
|||
mov r2, r10
|
||||
ldrb r0, [r2]
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
adds r3, r5, 0
|
||||
|
|
@ -11892,7 +11892,7 @@ _080E3E96:
|
|||
ldr r0, _080E3F18 @ =gBattleAnimTarget
|
||||
ldrb r0, [r0]
|
||||
movs r1, 0x1
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
adds r0, 0x10
|
||||
|
|
@ -12054,14 +12054,14 @@ _080E4004:
|
|||
ldr r0, _080E4048 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r0]
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
adds r5, r0, 0
|
||||
ldr r0, _080E404C @ =gBattleAnimTarget
|
||||
ldrb r0, [r0]
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
adds r2, r0, 0
|
||||
|
|
@ -12526,7 +12526,7 @@ sub_80E43A4: @ 80E43A4
|
|||
ldr r4, _080E43E8 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x20]
|
||||
|
|
@ -12703,7 +12703,7 @@ sub_80E44EC: @ 80E44EC
|
|||
ldr r2, _080E4508 @ =gBattleAnimArgs
|
||||
movs r0, 0
|
||||
strh r0, [r2, 0xE]
|
||||
ldr r0, _080E450C @ =gUnknown_2037F00
|
||||
ldr r0, _080E450C @ =gWeatherMoveAnim
|
||||
ldrh r1, [r0]
|
||||
movs r0, 0x60
|
||||
ands r0, r1
|
||||
|
|
@ -12713,7 +12713,7 @@ sub_80E44EC: @ 80E44EC
|
|||
b _080E4532
|
||||
.align 2, 0
|
||||
_080E4508: .4byte gBattleAnimArgs
|
||||
_080E450C: .4byte gUnknown_2037F00
|
||||
_080E450C: .4byte gWeatherMoveAnim
|
||||
_080E4510:
|
||||
movs r0, 0x7
|
||||
ands r0, r1
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -363,7 +363,7 @@ _080DD0BE:
|
|||
bne _080DD0E8
|
||||
_080DD0CC:
|
||||
adds r0, r4, 0
|
||||
bl sub_8072DF0
|
||||
bl IsBattlerSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080DD0E8
|
||||
|
|
@ -475,7 +475,7 @@ _080DD19A:
|
|||
bne _080DD1C4
|
||||
_080DD1A8:
|
||||
adds r0, r4, 0
|
||||
bl sub_8072DF0
|
||||
bl IsBattlerSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080DD1C4
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ sub_80EEC0C: @ 80EEC0C
|
|||
movs r1, 0x3
|
||||
movs r2, 0x1
|
||||
bl SetAnimBgAttribute
|
||||
ldr r0, _080EEDCC @ =gUnknown_3004FF0
|
||||
ldr r0, _080EEDCC @ =gHealthboxSpriteIds
|
||||
adds r4, r0
|
||||
ldrb r0, [r4]
|
||||
ldr r1, _080EEDD0 @ =gSprites
|
||||
|
|
@ -209,7 +209,7 @@ _080EEDBC: .4byte gUnknown_2022986
|
|||
_080EEDC0: .4byte 0x00003f3f
|
||||
_080EEDC4: .4byte 0x00003f3d
|
||||
_080EEDC8: .4byte 0x00003f42
|
||||
_080EEDCC: .4byte gUnknown_3004FF0
|
||||
_080EEDCC: .4byte gHealthboxSpriteIds
|
||||
_080EEDD0: .4byte gSprites
|
||||
_080EEDD4: .4byte SpriteCallbackDummy
|
||||
_080EEDD8: .4byte gFile_graphics_battle_anims_masks_unknown_D2EC24_tilemap
|
||||
|
|
@ -347,7 +347,7 @@ _080EEE9C:
|
|||
movs r0, 0x4A
|
||||
adds r1, r4, 0
|
||||
bl SetGpuReg
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080EEF00
|
||||
|
|
@ -392,7 +392,7 @@ _080EEF00:
|
|||
movs r1, 0x1
|
||||
movs r2, 0
|
||||
bl SetAnimBgAttribute
|
||||
ldr r0, _080EEFC4 @ =gUnknown_3004FF0
|
||||
ldr r0, _080EEFC4 @ =gHealthboxSpriteIds
|
||||
add r0, r8
|
||||
ldrb r0, [r0]
|
||||
lsls r1, r0, 4
|
||||
|
|
@ -443,7 +443,7 @@ _080EEFB4: .4byte gUnknown_2022984
|
|||
_080EEFB8: .4byte gUnknown_2022986
|
||||
_080EEFBC: .4byte 0x00003f3f
|
||||
_080EEFC0: .4byte gSprites
|
||||
_080EEFC4: .4byte gUnknown_3004FF0
|
||||
_080EEFC4: .4byte gHealthboxSpriteIds
|
||||
thumb_func_end sub_80EEDF4
|
||||
|
||||
thumb_func_start sub_80EEFC8
|
||||
|
|
@ -458,7 +458,7 @@ sub_80EEFC8: @ 80EEFC8
|
|||
adds r7, r1, 0
|
||||
lsls r2, 24
|
||||
lsrs r2, 24
|
||||
ldr r0, _080EF0A0 @ =gUnknown_3004FF0
|
||||
ldr r0, _080EF0A0 @ =gHealthboxSpriteIds
|
||||
adds r2, r0
|
||||
ldrb r0, [r2]
|
||||
lsls r5, r0, 4
|
||||
|
|
@ -553,7 +553,7 @@ sub_80EEFC8: @ 80EEFC8
|
|||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080EF0A0: .4byte gUnknown_3004FF0
|
||||
_080EF0A0: .4byte gHealthboxSpriteIds
|
||||
_080EF0A4: .4byte gSprites
|
||||
_080EF0A8: .4byte 0x0000d709
|
||||
_080EF0AC: .4byte 0x0000d70a
|
||||
|
|
@ -591,7 +591,7 @@ sub_80EF0E0: @ 80EF0E0
|
|||
push {r5,r6}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r1, _080EF168 @ =gUnknown_3004FF0
|
||||
ldr r1, _080EF168 @ =gHealthboxSpriteIds
|
||||
adds r0, r1
|
||||
ldrb r0, [r0]
|
||||
ldr r1, _080EF16C @ =gSprites
|
||||
|
|
@ -650,7 +650,7 @@ sub_80EF0E0: @ 80EF0E0
|
|||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080EF168: .4byte gUnknown_3004FF0
|
||||
_080EF168: .4byte gHealthboxSpriteIds
|
||||
_080EF16C: .4byte gSprites
|
||||
_080EF170: .4byte 0x0000d709
|
||||
_080EF174: .4byte 0x0000d70a
|
||||
|
|
@ -839,7 +839,7 @@ _080EF2D0:
|
|||
_080EF2D6:
|
||||
adds r0, r5, 0
|
||||
movs r1, 0
|
||||
bl sub_80758E0
|
||||
bl PrepareBattlerSpriteForRotScale
|
||||
movs r0, 0x80
|
||||
lsls r0, 1
|
||||
strh r0, [r4, 0x1C]
|
||||
|
|
@ -853,7 +853,7 @@ _080EF2E6:
|
|||
adds r0, r5, 0
|
||||
adds r1, r2, 0
|
||||
movs r3, 0
|
||||
bl obj_id_set_rotscale
|
||||
bl SetSpriteRotScale
|
||||
adds r0, r5, 0
|
||||
bl sub_8076440
|
||||
movs r0, 0x1C
|
||||
|
|
@ -870,7 +870,7 @@ _080EF30A:
|
|||
_080EF314: .4byte 0x000002cf
|
||||
_080EF318:
|
||||
adds r0, r5, 0
|
||||
bl sub_8075980
|
||||
bl ResetSpriteRotScale
|
||||
ldr r1, _080EF340 @ =gSprites
|
||||
lsls r0, r5, 4
|
||||
adds r0, r5
|
||||
|
|
@ -963,13 +963,13 @@ _080EF3D8:
|
|||
ldr r5, _080EF450 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x1
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
adds r1, r0, 0
|
||||
lsls r1, 24
|
||||
ldr r2, _080EF454 @ =gSprites
|
||||
|
|
@ -1054,7 +1054,7 @@ sub_80EF490: @ 80EF490
|
|||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
ldr r0, _080EF4B4 @ =gUnknown_2023D68
|
||||
ldr r0, _080EF4B4 @ =gLastUsedItem
|
||||
ldrh r0, [r0]
|
||||
bl ItemIdToBallId
|
||||
lsls r0, 24
|
||||
|
|
@ -1066,7 +1066,7 @@ sub_80EF490: @ 80EF490
|
|||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080EF4B4: .4byte gUnknown_2023D68
|
||||
_080EF4B4: .4byte gLastUsedItem
|
||||
thumb_func_end sub_80EF490
|
||||
|
||||
thumb_func_start sub_80EF4B8
|
||||
|
|
@ -1075,7 +1075,7 @@ sub_80EF4B8: @ 80EF4B8
|
|||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
ldr r0, _080EF4DC @ =gUnknown_2023D68
|
||||
ldr r0, _080EF4DC @ =gLastUsedItem
|
||||
ldrh r0, [r0]
|
||||
bl ItemIdToBallId
|
||||
lsls r0, 24
|
||||
|
|
@ -1087,7 +1087,7 @@ sub_80EF4B8: @ 80EF4B8
|
|||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080EF4DC: .4byte gUnknown_2023D68
|
||||
_080EF4DC: .4byte gLastUsedItem
|
||||
thumb_func_end sub_80EF4B8
|
||||
|
||||
thumb_func_start sub_80EF4E0
|
||||
|
|
@ -1095,7 +1095,7 @@ sub_80EF4E0: @ 80EF4E0
|
|||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r2, r0, 24
|
||||
ldr r0, _080EF4FC @ =gUnknown_2024018
|
||||
ldr r0, _080EF4FC @ =gBattleSpritesDataPtr
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x8]
|
||||
ldrb r0, [r0, 0x8]
|
||||
|
|
@ -1107,7 +1107,7 @@ sub_80EF4E0: @ 80EF4E0
|
|||
movs r0, 0
|
||||
b _080EF518
|
||||
.align 2, 0
|
||||
_080EF4FC: .4byte gUnknown_2024018
|
||||
_080EF4FC: .4byte gBattleSpritesDataPtr
|
||||
_080EF500: .4byte gBattleAnimArgs
|
||||
_080EF504:
|
||||
ldr r1, _080EF50C @ =gBattleAnimArgs
|
||||
|
|
@ -1210,7 +1210,7 @@ sub_80EF5AC: @ 80EF5AC
|
|||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
mov r10, r0
|
||||
ldr r0, _080EF674 @ =gUnknown_2023D68
|
||||
ldr r0, _080EF674 @ =gLastUsedItem
|
||||
ldrh r0, [r0]
|
||||
bl ItemIdToBallId
|
||||
adds r1, r0, 0
|
||||
|
|
@ -1240,14 +1240,14 @@ sub_80EF5AC: @ 80EF5AC
|
|||
mov r8, r2
|
||||
ldrb r0, [r2]
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r6, 0x30]
|
||||
mov r1, r8
|
||||
ldrb r0, [r1]
|
||||
movs r1, 0x1
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
subs r0, 0x10
|
||||
|
|
@ -1257,7 +1257,7 @@ sub_80EF5AC: @ 80EF5AC
|
|||
adds r4, r0
|
||||
ldr r0, _080EF684 @ =sub_80EF8C0
|
||||
str r0, [r4]
|
||||
ldr r0, _080EF688 @ =gUnknown_2024018
|
||||
ldr r0, _080EF688 @ =gBattleSpritesDataPtr
|
||||
ldr r0, [r0]
|
||||
ldr r3, [r0, 0x8]
|
||||
ldr r1, _080EF68C @ =gBattlerSpriteIds
|
||||
|
|
@ -1297,12 +1297,12 @@ sub_80EF5AC: @ 80EF5AC
|
|||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080EF674: .4byte gUnknown_2023D68
|
||||
_080EF674: .4byte gLastUsedItem
|
||||
_080EF678: .4byte gUnknown_82606F4
|
||||
_080EF67C: .4byte gSprites
|
||||
_080EF680: .4byte gBattleAnimTarget
|
||||
_080EF684: .4byte sub_80EF8C0
|
||||
_080EF688: .4byte gUnknown_2024018
|
||||
_080EF688: .4byte gBattleSpritesDataPtr
|
||||
_080EF68C: .4byte gBattlerSpriteIds
|
||||
_080EF690: .4byte gTasks
|
||||
_080EF694: .4byte sub_80EF698
|
||||
|
|
@ -1369,7 +1369,7 @@ _080EF6F8:
|
|||
bne _080EF708
|
||||
movs r6, 0xD
|
||||
_080EF708:
|
||||
ldr r0, _080EF7C8 @ =gUnknown_2023D68
|
||||
ldr r0, _080EF7C8 @ =gLastUsedItem
|
||||
ldrh r0, [r0]
|
||||
bl ItemIdToBallId
|
||||
adds r4, r0, 0
|
||||
|
|
@ -1379,7 +1379,7 @@ _080EF708:
|
|||
bl GetBattlerAtPosition
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl sub_807685C
|
||||
bl GetBattlerSpriteSubpriority
|
||||
adds r3, r0, 0
|
||||
adds r3, 0x1
|
||||
lsls r3, 24
|
||||
|
|
@ -1411,14 +1411,14 @@ _080EF708:
|
|||
mov r8, r1
|
||||
ldrb r0, [r1]
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r6, 0x30]
|
||||
mov r1, r8
|
||||
ldrb r0, [r1]
|
||||
movs r1, 0x1
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
subs r0, 0x10
|
||||
|
|
@ -1457,7 +1457,7 @@ _080EF708:
|
|||
bx r0
|
||||
.align 2, 0
|
||||
_080EF7C4: .4byte gSaveBlock2Ptr
|
||||
_080EF7C8: .4byte gUnknown_2023D68
|
||||
_080EF7C8: .4byte gLastUsedItem
|
||||
_080EF7CC: .4byte gUnknown_82606F4
|
||||
_080EF7D0: .4byte gSprites
|
||||
_080EF7D4: .4byte gBattleAnimTarget
|
||||
|
|
@ -1605,7 +1605,7 @@ sub_80EF8F0: @ 80EF8F0
|
|||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080EF99E
|
||||
ldr r0, _080EF914 @ =gUnknown_2024018
|
||||
ldr r0, _080EF914 @ =gBattleSpritesDataPtr
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x8]
|
||||
ldrb r0, [r0, 0x8]
|
||||
|
|
@ -1615,7 +1615,7 @@ sub_80EF8F0: @ 80EF8F0
|
|||
str r0, [r4, 0x1C]
|
||||
b _080EF99E
|
||||
.align 2, 0
|
||||
_080EF914: .4byte gUnknown_2024018
|
||||
_080EF914: .4byte gBattleSpritesDataPtr
|
||||
_080EF918: .4byte sub_80F0478
|
||||
_080EF91C:
|
||||
cmp r0, 0x6
|
||||
|
|
@ -1654,7 +1654,7 @@ _080EF954:
|
|||
strh r0, [r4, 0x38]
|
||||
ldr r0, _080EF9A8 @ =sub_80EF9B4
|
||||
str r0, [r4, 0x1C]
|
||||
ldr r0, _080EF9AC @ =gUnknown_2023D68
|
||||
ldr r0, _080EF9AC @ =gLastUsedItem
|
||||
ldrh r0, [r0]
|
||||
bl ItemIdToBallId
|
||||
lsls r0, 24
|
||||
|
|
@ -1687,7 +1687,7 @@ _080EF99E:
|
|||
bx r0
|
||||
.align 2, 0
|
||||
_080EF9A8: .4byte sub_80EF9B4
|
||||
_080EF9AC: .4byte gUnknown_2023D68
|
||||
_080EF9AC: .4byte gLastUsedItem
|
||||
_080EF9B0: .4byte gBattleAnimTarget
|
||||
thumb_func_end sub_80EF8F0
|
||||
|
||||
|
|
@ -1781,7 +1781,7 @@ _080EFA5C:
|
|||
_080EFA62:
|
||||
adds r0, r4, 0
|
||||
movs r1, 0
|
||||
bl sub_80758E0
|
||||
bl PrepareBattlerSpriteForRotScale
|
||||
movs r0, 0x80
|
||||
lsls r0, 1
|
||||
strh r0, [r5, 0x1C]
|
||||
|
|
@ -1824,7 +1824,7 @@ _080EFAB4:
|
|||
adds r0, r4, 0
|
||||
adds r1, r2, 0
|
||||
movs r3, 0
|
||||
bl obj_id_set_rotscale
|
||||
bl SetSpriteRotScale
|
||||
ldrh r0, [r5, 0xC]
|
||||
ldrh r1, [r5, 0xE]
|
||||
adds r0, r1
|
||||
|
|
@ -1850,7 +1850,7 @@ _080EFAF0: .4byte gSprites
|
|||
_080EFAF4: .4byte 0x0000047f
|
||||
_080EFAF8:
|
||||
adds r0, r4, 0
|
||||
bl sub_8075980
|
||||
bl ResetSpriteRotScale
|
||||
ldr r1, _080EFB1C @ =gSprites
|
||||
lsls r0, r4, 4
|
||||
adds r0, r4
|
||||
|
|
@ -2040,7 +2040,7 @@ _080EFC52:
|
|||
adds r0, r1
|
||||
strh r0, [r4, 0x22]
|
||||
strh r5, [r4, 0x26]
|
||||
ldr r0, _080EFC84 @ =gUnknown_2024018
|
||||
ldr r0, _080EFC84 @ =gBattleSpritesDataPtr
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x8]
|
||||
ldrb r0, [r0, 0x8]
|
||||
|
|
@ -2052,7 +2052,7 @@ _080EFC52:
|
|||
b _080EFC96
|
||||
.align 2, 0
|
||||
_080EFC80: .4byte 0xffffff00
|
||||
_080EFC84: .4byte gUnknown_2024018
|
||||
_080EFC84: .4byte gBattleSpritesDataPtr
|
||||
_080EFC88: .4byte sub_80EFF80
|
||||
_080EFC8C:
|
||||
ldr r0, _080EFC9C @ =sub_80EFCA0
|
||||
|
|
@ -2090,7 +2090,7 @@ sub_80EFCA0: @ 80EFCA0
|
|||
adds r0, r4, 0
|
||||
movs r1, 0x1
|
||||
bl StartSpriteAffineAnim
|
||||
ldr r0, _080EFCE4 @ =gUnknown_2024018
|
||||
ldr r0, _080EFCE4 @ =gBattleSpritesDataPtr
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x8]
|
||||
strh r5, [r0, 0xC]
|
||||
|
|
@ -2103,7 +2103,7 @@ _080EFCDC:
|
|||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080EFCE4: .4byte gUnknown_2024018
|
||||
_080EFCE4: .4byte gBattleSpritesDataPtr
|
||||
_080EFCE8: .4byte sub_80EFCEC
|
||||
thumb_func_end sub_80EFCA0
|
||||
|
||||
|
|
@ -2135,7 +2135,7 @@ _080EFD0C:
|
|||
.4byte _080EFED4
|
||||
.4byte _080EFF34
|
||||
_080EFD28:
|
||||
ldr r1, _080EFD4C @ =gUnknown_2024018
|
||||
ldr r1, _080EFD4C @ =gBattleSpritesDataPtr
|
||||
ldr r5, [r1]
|
||||
ldr r2, [r5, 0x8]
|
||||
ldrh r3, [r2, 0xC]
|
||||
|
|
@ -2153,7 +2153,7 @@ _080EFD28:
|
|||
strh r0, [r1, 0xC]
|
||||
b _080EFD56
|
||||
.align 2, 0
|
||||
_080EFD4C: .4byte gUnknown_2024018
|
||||
_080EFD4C: .4byte gBattleSpritesDataPtr
|
||||
_080EFD50:
|
||||
adds r0, r3, 0
|
||||
adds r0, 0xB0
|
||||
|
|
@ -2214,7 +2214,7 @@ _080EFDB6:
|
|||
bl ChangeSpriteAffineAnim
|
||||
b _080EFF7A
|
||||
_080EFDC0:
|
||||
ldr r1, _080EFDE4 @ =gUnknown_2024018
|
||||
ldr r1, _080EFDE4 @ =gBattleSpritesDataPtr
|
||||
ldr r5, [r1]
|
||||
ldr r2, [r5, 0x8]
|
||||
ldrh r3, [r2, 0xC]
|
||||
|
|
@ -2232,7 +2232,7 @@ _080EFDC0:
|
|||
strh r0, [r1, 0xC]
|
||||
b _080EFDEE
|
||||
.align 2, 0
|
||||
_080EFDE4: .4byte gUnknown_2024018
|
||||
_080EFDE4: .4byte gBattleSpritesDataPtr
|
||||
_080EFDE8:
|
||||
adds r0, r3, 0
|
||||
adds r0, 0xB0
|
||||
|
|
@ -2307,7 +2307,7 @@ _080EFE68:
|
|||
movs r1, 0x1
|
||||
bl ChangeSpriteAffineAnim
|
||||
_080EFE70:
|
||||
ldr r1, _080EFE94 @ =gUnknown_2024018
|
||||
ldr r1, _080EFE94 @ =gBattleSpritesDataPtr
|
||||
ldr r5, [r1]
|
||||
ldr r2, [r5, 0x8]
|
||||
ldrh r3, [r2, 0xC]
|
||||
|
|
@ -2325,7 +2325,7 @@ _080EFE70:
|
|||
strh r0, [r1, 0xC]
|
||||
b _080EFE9E
|
||||
.align 2, 0
|
||||
_080EFE94: .4byte gUnknown_2024018
|
||||
_080EFE94: .4byte gBattleSpritesDataPtr
|
||||
_080EFE98:
|
||||
adds r0, r3, 0
|
||||
adds r0, 0xB0
|
||||
|
|
@ -2367,7 +2367,7 @@ _080EFED4:
|
|||
strh r0, [r4, 0x34]
|
||||
lsls r0, 16
|
||||
asrs r1, r0, 24
|
||||
ldr r0, _080EFF04 @ =gUnknown_2024018
|
||||
ldr r0, _080EFF04 @ =gBattleSpritesDataPtr
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x8]
|
||||
ldrb r0, [r0, 0x8]
|
||||
|
|
@ -2383,7 +2383,7 @@ _080EFED4:
|
|||
str r0, [r4, 0x1C]
|
||||
b _080EFF7A
|
||||
.align 2, 0
|
||||
_080EFF04: .4byte gUnknown_2024018
|
||||
_080EFF04: .4byte gBattleSpritesDataPtr
|
||||
_080EFF08: .4byte sub_80EFF80
|
||||
_080EFF0C:
|
||||
cmp r0, 0x4
|
||||
|
|
@ -2538,7 +2538,7 @@ _080F0008:
|
|||
_080F0026:
|
||||
cmp r1, 0x5F
|
||||
bne _080F004C
|
||||
ldr r0, _080F0044 @ =gUnknown_2024005
|
||||
ldr r0, _080F0044 @ =gDoingBattleAnim
|
||||
movs r1, 0
|
||||
strb r1, [r0]
|
||||
movs r0, 0x1
|
||||
|
|
@ -2548,7 +2548,7 @@ _080F0026:
|
|||
bl PlaySE
|
||||
b _080F0088
|
||||
.align 2, 0
|
||||
_080F0044: .4byte gUnknown_2024005
|
||||
_080F0044: .4byte gDoingBattleAnim
|
||||
_080F0048: .4byte 0x0000013f
|
||||
_080F004C:
|
||||
ldr r0, _080F0094 @ =0x0000013b
|
||||
|
|
@ -2873,7 +2873,7 @@ sub_80F02B0: @ 80F02B0
|
|||
bl StartSpriteAffineAnim
|
||||
ldr r0, _080F0364 @ =sub_80F0378
|
||||
str r0, [r4, 0x1C]
|
||||
ldr r0, _080F0368 @ =gUnknown_2023D68
|
||||
ldr r0, _080F0368 @ =gLastUsedItem
|
||||
ldrh r0, [r0]
|
||||
bl ItemIdToBallId
|
||||
lsls r0, 24
|
||||
|
|
@ -2949,7 +2949,7 @@ _080F0302:
|
|||
bx r0
|
||||
.align 2, 0
|
||||
_080F0364: .4byte sub_80F0378
|
||||
_080F0368: .4byte gUnknown_2023D68
|
||||
_080F0368: .4byte gLastUsedItem
|
||||
_080F036C: .4byte gBattleAnimTarget
|
||||
_080F0370: .4byte gSprites
|
||||
_080F0374: .4byte gBattlerSpriteIds
|
||||
|
|
@ -3045,7 +3045,7 @@ _080F03F0:
|
|||
adds r2, r0
|
||||
lsls r2, 2
|
||||
adds r2, r4
|
||||
ldr r0, _080F046C @ =gUnknown_2024018
|
||||
ldr r0, _080F046C @ =gBattleSpritesDataPtr
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x8]
|
||||
ldrb r1, [r0, 0x9]
|
||||
|
|
@ -3062,7 +3062,7 @@ _080F03F0:
|
|||
strh r5, [r7, 0x2E]
|
||||
ldr r0, _080F0470 @ =sub_80F018C
|
||||
str r0, [r7, 0x1C]
|
||||
ldr r0, _080F0474 @ =gUnknown_2024005
|
||||
ldr r0, _080F0474 @ =gDoingBattleAnim
|
||||
strb r6, [r0]
|
||||
movs r0, 0x1
|
||||
bl UpdateOamPriorityInAllHealthboxes
|
||||
|
|
@ -3075,9 +3075,9 @@ _080F045C: .4byte 0xfffffee0
|
|||
_080F0460: .4byte gSprites
|
||||
_080F0464: .4byte gBattlerSpriteIds
|
||||
_080F0468: .4byte gBattleAnimTarget
|
||||
_080F046C: .4byte gUnknown_2024018
|
||||
_080F046C: .4byte gBattleSpritesDataPtr
|
||||
_080F0470: .4byte sub_80F018C
|
||||
_080F0474: .4byte gUnknown_2024005
|
||||
_080F0474: .4byte gDoingBattleAnim
|
||||
thumb_func_end sub_80F0378
|
||||
|
||||
thumb_func_start sub_80F0478
|
||||
|
|
@ -3164,7 +3164,7 @@ _080F050A:
|
|||
strh r0, [r4, 0x2E]
|
||||
ldr r0, _080F0524 @ =sub_80F018C
|
||||
str r0, [r4, 0x1C]
|
||||
ldr r1, _080F0528 @ =gUnknown_2024005
|
||||
ldr r1, _080F0528 @ =gDoingBattleAnim
|
||||
movs r0, 0
|
||||
strb r0, [r1]
|
||||
movs r0, 0x1
|
||||
|
|
@ -3175,7 +3175,7 @@ _080F051E:
|
|||
bx r0
|
||||
.align 2, 0
|
||||
_080F0524: .4byte sub_80F018C
|
||||
_080F0528: .4byte gUnknown_2024005
|
||||
_080F0528: .4byte gDoingBattleAnim
|
||||
thumb_func_end sub_80F04B4
|
||||
|
||||
thumb_func_start sub_80F052C
|
||||
|
|
@ -3237,7 +3237,7 @@ _080F0590:
|
|||
strh r0, [r4, 0x2E]
|
||||
ldr r0, _080F05AC @ =sub_80F018C
|
||||
str r0, [r4, 0x1C]
|
||||
ldr r0, _080F05B0 @ =gUnknown_2024005
|
||||
ldr r0, _080F05B0 @ =gDoingBattleAnim
|
||||
strb r1, [r0]
|
||||
movs r0, 0x1
|
||||
bl UpdateOamPriorityInAllHealthboxes
|
||||
|
|
@ -3247,7 +3247,7 @@ _080F05A4:
|
|||
bx r0
|
||||
.align 2, 0
|
||||
_080F05AC: .4byte sub_80F018C
|
||||
_080F05B0: .4byte gUnknown_2024005
|
||||
_080F05B0: .4byte gDoingBattleAnim
|
||||
thumb_func_end sub_80F0574
|
||||
|
||||
thumb_func_start sub_80F05B4
|
||||
|
|
@ -3356,7 +3356,7 @@ sub_80F0674: @ 80F0674
|
|||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _080F0692
|
||||
ldr r0, _080F06A0 @ =gUnknown_2024018
|
||||
ldr r0, _080F06A0 @ =gBattleSpritesDataPtr
|
||||
ldr r0, [r0]
|
||||
ldr r1, [r0, 0x8]
|
||||
ldrb r0, [r1, 0xA]
|
||||
|
|
@ -3368,7 +3368,7 @@ _080F0692:
|
|||
.align 2, 0
|
||||
_080F0698: .4byte gMain
|
||||
_080F069C: .4byte 0x00000439
|
||||
_080F06A0: .4byte gUnknown_2024018
|
||||
_080F06A0: .4byte gBattleSpritesDataPtr
|
||||
thumb_func_end sub_80F0674
|
||||
|
||||
thumb_func_start sub_80F06A4
|
||||
|
|
@ -4771,7 +4771,7 @@ sub_80F1198: @ 80F1198
|
|||
_080F11BC: .4byte gMain
|
||||
_080F11C0: .4byte 0x00000439
|
||||
_080F11C4:
|
||||
ldr r2, _080F1200 @ =gUnknown_2024018
|
||||
ldr r2, _080F1200 @ =gBattleSpritesDataPtr
|
||||
ldr r0, [r2]
|
||||
ldr r1, [r0, 0x8]
|
||||
ldrb r0, [r1, 0xA]
|
||||
|
|
@ -4800,7 +4800,7 @@ _080F11F6:
|
|||
bl DestroySprite
|
||||
b _080F1212
|
||||
.align 2, 0
|
||||
_080F1200: .4byte gUnknown_2024018
|
||||
_080F1200: .4byte gBattleSpritesDataPtr
|
||||
_080F1204: .4byte gUnknown_840BF48
|
||||
_080F1208: .4byte gUnknown_840BFA8
|
||||
_080F120C:
|
||||
|
|
@ -5420,7 +5420,7 @@ sub_80F16CC: @ 80F16CC
|
|||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r3, _080F16F4 @ =gBattleAnimArgs
|
||||
ldr r1, _080F16F8 @ =gUnknown_2024018
|
||||
ldr r1, _080F16F8 @ =gBattleSpritesDataPtr
|
||||
ldr r2, [r1]
|
||||
ldr r1, _080F16FC @ =gBattleAnimAttacker
|
||||
ldrb r1, [r1]
|
||||
|
|
@ -5436,7 +5436,7 @@ sub_80F16CC: @ 80F16CC
|
|||
bx r0
|
||||
.align 2, 0
|
||||
_080F16F4: .4byte gBattleAnimArgs
|
||||
_080F16F8: .4byte gUnknown_2024018
|
||||
_080F16F8: .4byte gBattleSpritesDataPtr
|
||||
_080F16FC: .4byte gBattleAnimAttacker
|
||||
thumb_func_end sub_80F16CC
|
||||
|
||||
|
|
@ -5446,7 +5446,7 @@ sub_80F1700: @ 80F1700
|
|||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r2, _080F1718 @ =gBattleAnimTarget
|
||||
ldr r1, _080F171C @ =gUnknown_2023D6E
|
||||
ldr r1, _080F171C @ =gEffectBattler
|
||||
ldrb r1, [r1]
|
||||
strb r1, [r2]
|
||||
bl DestroyAnimVisualTask
|
||||
|
|
@ -5454,7 +5454,7 @@ sub_80F1700: @ 80F1700
|
|||
bx r0
|
||||
.align 2, 0
|
||||
_080F1718: .4byte gBattleAnimTarget
|
||||
_080F171C: .4byte gUnknown_2023D6E
|
||||
_080F171C: .4byte gEffectBattler
|
||||
thumb_func_end sub_80F1700
|
||||
|
||||
thumb_func_start sub_80F1720
|
||||
|
|
@ -5467,7 +5467,7 @@ sub_80F1720: @ 80F1720
|
|||
lsrs r6, r0, 24
|
||||
movs r0, 0
|
||||
mov r8, r0
|
||||
ldr r0, _080F17DC @ =gUnknown_2024018
|
||||
ldr r0, _080F17DC @ =gBattleSpritesDataPtr
|
||||
ldr r0, [r0]
|
||||
ldr r1, [r0, 0x4]
|
||||
lsls r0, r6, 1
|
||||
|
|
@ -5487,7 +5487,7 @@ sub_80F1720: @ 80F1720
|
|||
bl GetMonData
|
||||
adds r4, r0, 0
|
||||
adds r0, r6, 0
|
||||
bl sub_8072DF0
|
||||
bl IsBattlerSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080F17F8
|
||||
|
|
@ -5547,7 +5547,7 @@ _080F179E:
|
|||
strh r0, [r1, 0xA]
|
||||
b _080F180E
|
||||
.align 2, 0
|
||||
_080F17DC: .4byte gUnknown_2024018
|
||||
_080F17DC: .4byte gBattleSpritesDataPtr
|
||||
_080F17E0: .4byte 0x0000ffff
|
||||
_080F17E4: .4byte 0x000027f9
|
||||
_080F17E8: .4byte gUnknown_83AD350
|
||||
|
|
@ -5555,7 +5555,7 @@ _080F17EC: .4byte gUnknown_83ADC58
|
|||
_080F17F0: .4byte sub_80F181C
|
||||
_080F17F4: .4byte gTasks
|
||||
_080F17F8:
|
||||
ldr r0, _080F1818 @ =gUnknown_2024018
|
||||
ldr r0, _080F1818 @ =gBattleSpritesDataPtr
|
||||
ldr r0, [r0]
|
||||
ldr r1, [r0, 0x4]
|
||||
lsls r0, r6, 1
|
||||
|
|
@ -5573,7 +5573,7 @@ _080F180E:
|
|||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080F1818: .4byte gUnknown_2024018
|
||||
_080F1818: .4byte gBattleSpritesDataPtr
|
||||
thumb_func_end sub_80F1720
|
||||
|
||||
thumb_func_start sub_80F181C
|
||||
|
|
@ -5600,7 +5600,7 @@ sub_80F181C: @ 80F181C
|
|||
.align 2, 0
|
||||
_080F1844: .4byte gTasks
|
||||
_080F1848:
|
||||
ldr r0, _080F189C @ =gUnknown_2024018
|
||||
ldr r0, _080F189C @ =gBattleSpritesDataPtr
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x8]
|
||||
ldrb r0, [r0, 0xA]
|
||||
|
|
@ -5622,12 +5622,12 @@ _080F186A:
|
|||
ldrb r0, [r4, 0x8]
|
||||
mov r8, r0
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
mov r0, r8
|
||||
movs r1, 0x1
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r2, r0, 24
|
||||
movs r1, 0x1E
|
||||
|
|
@ -5642,7 +5642,7 @@ _080F186A:
|
|||
lsrs r5, r0, 24
|
||||
b _080F1906
|
||||
.align 2, 0
|
||||
_080F189C: .4byte gUnknown_2024018
|
||||
_080F189C: .4byte gBattleSpritesDataPtr
|
||||
_080F18A0: .4byte gUnknown_83FF168
|
||||
_080F18A4:
|
||||
cmp r0, 0
|
||||
|
|
@ -5817,7 +5817,7 @@ sub_80F19E0: @ 80F19E0
|
|||
cmp r0, 0x1
|
||||
bne _080F1A1A
|
||||
ldrb r1, [r1, 0x8]
|
||||
ldr r0, _080F1A28 @ =gUnknown_2024018
|
||||
ldr r0, _080F1A28 @ =gBattleSpritesDataPtr
|
||||
ldr r0, [r0]
|
||||
ldr r2, [r0, 0x4]
|
||||
lsls r0, r1, 1
|
||||
|
|
@ -5836,7 +5836,7 @@ _080F1A20:
|
|||
bx r0
|
||||
.align 2, 0
|
||||
_080F1A24: .4byte gTasks
|
||||
_080F1A28: .4byte gUnknown_2024018
|
||||
_080F1A28: .4byte gBattleSpritesDataPtr
|
||||
thumb_func_end sub_80F19E0
|
||||
|
||||
thumb_func_start sub_80F1A2C
|
||||
|
|
@ -5990,7 +5990,7 @@ sub_80F1B3C: @ 80F1B3C
|
|||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
ldr r5, _080F1BB0 @ =gBattleAnimArgs
|
||||
lsrs r0, 24
|
||||
|
|
@ -6002,7 +6002,7 @@ sub_80F1B3C: @ 80F1B3C
|
|||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
movs r1, 0x1
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r5, [r5, 0x6]
|
||||
|
|
@ -6192,7 +6192,7 @@ sub_80F1CE4: @ 80F1CE4
|
|||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r3, r0, 24
|
||||
ldr r2, _080F1CF8 @ =gUnknown_2023E82
|
||||
ldr r2, _080F1CF8 @ =gBattleCommunication
|
||||
ldrb r0, [r2, 0x5]
|
||||
cmp r0, 0x2
|
||||
bls _080F1D00
|
||||
|
|
@ -6200,7 +6200,7 @@ sub_80F1CE4: @ 80F1CE4
|
|||
movs r0, 0
|
||||
b _080F1D04
|
||||
.align 2, 0
|
||||
_080F1CF8: .4byte gUnknown_2023E82
|
||||
_080F1CF8: .4byte gBattleCommunication
|
||||
_080F1CFC: .4byte gBattleAnimArgs
|
||||
_080F1D00:
|
||||
ldr r1, _080F1D10 @ =gBattleAnimArgs
|
||||
|
|
@ -6220,7 +6220,7 @@ sub_80F1D14: @ 80F1D14
|
|||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r2, r0, 24
|
||||
ldr r0, _080F1D2C @ =gUnknown_2024018
|
||||
ldr r0, _080F1D2C @ =gBattleSpritesDataPtr
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x8]
|
||||
ldrh r1, [r0]
|
||||
|
|
@ -6230,7 +6230,7 @@ sub_80F1D14: @ 80F1D14
|
|||
movs r0, 0x1
|
||||
b _080F1D6C
|
||||
.align 2, 0
|
||||
_080F1D2C: .4byte gUnknown_2024018
|
||||
_080F1D2C: .4byte gBattleSpritesDataPtr
|
||||
_080F1D30: .4byte gBattleAnimArgs
|
||||
_080F1D34:
|
||||
cmp r1, 0xFA
|
||||
|
|
@ -6277,7 +6277,7 @@ sub_80F1D7C: @ 80F1D7C
|
|||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r3, _080F1DA0 @ =gBattleAnimAttacker
|
||||
ldr r1, _080F1DA4 @ =gUnknown_2024018
|
||||
ldr r1, _080F1DA4 @ =gBattleSpritesDataPtr
|
||||
ldr r2, [r1]
|
||||
ldr r1, [r2, 0x8]
|
||||
ldrh r1, [r1]
|
||||
|
|
@ -6292,7 +6292,7 @@ sub_80F1D7C: @ 80F1D7C
|
|||
bx r0
|
||||
.align 2, 0
|
||||
_080F1DA0: .4byte gBattleAnimAttacker
|
||||
_080F1DA4: .4byte gUnknown_2024018
|
||||
_080F1DA4: .4byte gBattleSpritesDataPtr
|
||||
_080F1DA8: .4byte gBattleAnimTarget
|
||||
thumb_func_end sub_80F1D7C
|
||||
|
||||
|
|
|
|||
|
|
@ -344,7 +344,7 @@ sub_80783FC: @ 80783FC
|
|||
ldr r4, _080784AC @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 8
|
||||
ldr r1, _080784B0 @ =0xffe00000
|
||||
|
|
@ -352,13 +352,13 @@ sub_80783FC: @ 80783FC
|
|||
lsrs r5, r0, 16
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 8
|
||||
ldr r1, _080784B4 @ =0xffdc0000
|
||||
adds r0, r1
|
||||
lsrs r4, r0, 16
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0807843A
|
||||
|
|
@ -662,7 +662,7 @@ sub_8078694: @ 8078694
|
|||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
movs r3, 0
|
||||
ldr r0, _080786B8 @ =gUnknown_2024018
|
||||
ldr r0, _080786B8 @ =gBattleSpritesDataPtr
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x8]
|
||||
ldrh r0, [r0]
|
||||
|
|
@ -677,7 +677,7 @@ _080786AC:
|
|||
ldr r0, [r0]
|
||||
mov pc, r0
|
||||
.align 2, 0
|
||||
_080786B8: .4byte gUnknown_2024018
|
||||
_080786B8: .4byte gBattleSpritesDataPtr
|
||||
_080786BC: .4byte _080786C0
|
||||
.align 2, 0
|
||||
_080786C0:
|
||||
|
|
@ -907,7 +907,7 @@ LaunchStatusAnimation: @ 807886C
|
|||
strb r4, [r0]
|
||||
ldr r0, _080788B0 @ =gUnknown_81C6E84
|
||||
movs r2, 0
|
||||
bl sub_80725D4
|
||||
bl LaunchBattleAnimation
|
||||
ldr r0, _080788B4 @ =task0A_80788BC
|
||||
movs r1, 0xA
|
||||
bl CreateTask
|
||||
|
|
@ -935,14 +935,14 @@ task0A_80788BC: @ 80788BC
|
|||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
ldr r0, _08078904 @ =gUnknown_2037EDC
|
||||
ldr r0, _08078904 @ =gAnimScriptCallback
|
||||
ldr r0, [r0]
|
||||
bl _call_via_r0
|
||||
ldr r0, _08078908 @ =gUnknown_2037EE1
|
||||
ldr r0, _08078908 @ =gAnimScriptActive
|
||||
ldrb r0, [r0]
|
||||
cmp r0, 0
|
||||
bne _080788FE
|
||||
ldr r0, _0807890C @ =gUnknown_2024018
|
||||
ldr r0, _0807890C @ =gBattleSpritesDataPtr
|
||||
ldr r2, [r0]
|
||||
ldr r1, _08078910 @ =gTasks
|
||||
lsls r0, r4, 2
|
||||
|
|
@ -968,9 +968,9 @@ _080788FE:
|
|||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08078904: .4byte gUnknown_2037EDC
|
||||
_08078908: .4byte gUnknown_2037EE1
|
||||
_0807890C: .4byte gUnknown_2024018
|
||||
_08078904: .4byte gAnimScriptCallback
|
||||
_08078908: .4byte gAnimScriptActive
|
||||
_0807890C: .4byte gBattleSpritesDataPtr
|
||||
_08078910: .4byte gTasks
|
||||
thumb_func_end task0A_80788BC
|
||||
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ _080BA8EA:
|
|||
cmp r4, r0
|
||||
beq _080BA914
|
||||
adds r0, r4, 0
|
||||
bl sub_8072DF0
|
||||
bl IsBattlerSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080BA914
|
||||
|
|
@ -176,7 +176,7 @@ sub_80BA934: @ 80BA934
|
|||
ldrsh r0, [r0, r1]
|
||||
bl sub_80B9A14
|
||||
adds r2, r0, 0
|
||||
ldr r0, _080BA95C @ =gUnknown_2022B50
|
||||
ldr r0, _080BA95C @ =gBattleTerrain
|
||||
ldrb r0, [r0]
|
||||
cmp r0, 0x9
|
||||
bhi _080BAA0A
|
||||
|
|
@ -187,7 +187,7 @@ sub_80BA934: @ 80BA934
|
|||
mov pc, r0
|
||||
.align 2, 0
|
||||
_080BA958: .4byte gBattleAnimArgs
|
||||
_080BA95C: .4byte gUnknown_2022B50
|
||||
_080BA95C: .4byte gBattleTerrain
|
||||
_080BA960: .4byte _080BA964
|
||||
.align 2, 0
|
||||
_080BA964:
|
||||
|
|
@ -707,7 +707,7 @@ sub_80BACEC: @ 80BACEC
|
|||
ldrh r1, [r4]
|
||||
movs r0, 0xA
|
||||
bl SetGpuReg
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080BAD7A
|
||||
|
|
@ -722,11 +722,11 @@ sub_80BACEC: @ 80BACEC
|
|||
movs r0, 0xA
|
||||
bl SetGpuReg
|
||||
_080BAD7A:
|
||||
bl sub_8075290
|
||||
bl IsDoubleBattle
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080BADFE
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080BADFE
|
||||
|
|
@ -746,7 +746,7 @@ _080BADAA:
|
|||
ldrb r0, [r5]
|
||||
movs r6, 0x2
|
||||
eors r0, r6
|
||||
bl sub_8072DF0
|
||||
bl IsBattlerSpriteVisible
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
|
|
@ -844,7 +844,7 @@ _080BAE5C:
|
|||
ldrb r0, [r0, 0x9]
|
||||
ldr r1, _080BAF18 @ =gFile_graphics_battle_anims_masks_curse_tilemap
|
||||
bl sub_807543C
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080BAEAC
|
||||
|
|
@ -967,7 +967,7 @@ sub_80BAF38: @ 80BAF38
|
|||
movs r0, 0x4A
|
||||
adds r1, r4, 0
|
||||
bl SetGpuReg
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080BAFCA
|
||||
|
|
@ -1134,7 +1134,7 @@ _080BB0FA:
|
|||
movs r1, 0x2
|
||||
eors r0, r1
|
||||
strb r0, [r2, 0x1]
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080BB12A
|
||||
|
|
@ -1144,7 +1144,7 @@ _080BB0FA:
|
|||
cmp r0, 0
|
||||
beq _080BB130
|
||||
ldrb r0, [r1, 0x1]
|
||||
bl sub_8072DF0
|
||||
bl IsBattlerSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080BB130
|
||||
|
|
@ -1183,7 +1183,7 @@ _080BB130:
|
|||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl SetAnimBgAttribute
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080BB18E
|
||||
|
|
@ -1192,7 +1192,7 @@ _080BB130:
|
|||
movs r2, 0x1
|
||||
bl SetAnimBgAttribute
|
||||
_080BB18E:
|
||||
bl sub_8075290
|
||||
bl IsDoubleBattle
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080BB20A
|
||||
|
|
@ -1217,7 +1217,7 @@ _080BB18E:
|
|||
_080BB1C0:
|
||||
ldr r0, [r4]
|
||||
ldrb r0, [r0, 0x1]
|
||||
bl sub_8072DF0
|
||||
bl IsBattlerSpriteVisible
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
cmp r5, 0x1
|
||||
|
|
@ -1369,7 +1369,7 @@ _080BB30C:
|
|||
ldr r1, _080BB354 @ =gFile_graphics_battle_anims_masks_stat_tilemap_2_tilemap
|
||||
bl sub_807543C
|
||||
_080BB316:
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080BB32E
|
||||
|
|
@ -1692,7 +1692,7 @@ _080BB582:
|
|||
movs r0, 0x4A
|
||||
adds r1, r4, 0
|
||||
bl SetGpuReg
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080BB5B2
|
||||
|
|
@ -2234,7 +2234,7 @@ _080BB9BA:
|
|||
beq _080BB9F8
|
||||
lsls r0, r4, 24
|
||||
lsrs r0, 24
|
||||
bl sub_8072DF0
|
||||
bl IsBattlerSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080BB9F8
|
||||
|
|
@ -2313,7 +2313,7 @@ sub_80BBA20: @ 80BBA20
|
|||
movs r0, 0x2
|
||||
adds r6, r7, 0
|
||||
eors r6, r0
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080BBA82
|
||||
|
|
@ -2321,7 +2321,7 @@ sub_80BBA20: @ 80BBA20
|
|||
cmp r1, 0
|
||||
beq _080BBA86
|
||||
adds r0, r6, 0
|
||||
bl sub_8072DF0
|
||||
bl IsBattlerSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080BBA86
|
||||
|
|
@ -2370,7 +2370,7 @@ _080BBA86:
|
|||
movs r1, 0x20
|
||||
orrs r0, r1
|
||||
strb r0, [r2]
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080BBAFC
|
||||
|
|
@ -2446,7 +2446,7 @@ _080BBB80:
|
|||
ldrb r0, [r0, 0x9]
|
||||
ldr r1, [sp, 0x58]
|
||||
bl sub_807543C
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080BBBA8
|
||||
|
|
@ -2669,7 +2669,7 @@ _080BBD00:
|
|||
movs r0, 0x4A
|
||||
adds r1, r4, 0
|
||||
bl SetGpuReg
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080BBD7E
|
||||
|
|
@ -2745,7 +2745,7 @@ sub_80BBDF0: @ 80BBDF0
|
|||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r2, _080BBE08 @ =gBattleAnimArgs
|
||||
ldr r1, _080BBE0C @ =gUnknown_2022B50
|
||||
ldr r1, _080BBE0C @ =gBattleTerrain
|
||||
ldrb r1, [r1]
|
||||
strh r1, [r2]
|
||||
bl DestroyAnimVisualTask
|
||||
|
|
@ -2753,7 +2753,7 @@ sub_80BBDF0: @ 80BBDF0
|
|||
bx r0
|
||||
.align 2, 0
|
||||
_080BBE08: .4byte gBattleAnimArgs
|
||||
_080BBE0C: .4byte gUnknown_2022B50
|
||||
_080BBE0C: .4byte gBattleTerrain
|
||||
thumb_func_end sub_80BBDF0
|
||||
|
||||
thumb_func_start sub_80BBE10
|
||||
|
|
@ -3044,7 +3044,7 @@ sub_80BC02C: @ 80BC02C
|
|||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
lsrs r1, r0, 24
|
||||
cmp r1, 0
|
||||
|
|
@ -3078,7 +3078,7 @@ sub_80BC060: @ 80BC060
|
|||
ldrb r1, [r1]
|
||||
strb r1, [r2]
|
||||
ldr r2, _080BC088 @ =gBattleAnimTarget
|
||||
ldr r1, _080BC08C @ =gUnknown_2023D6E
|
||||
ldr r1, _080BC08C @ =gEffectBattler
|
||||
ldrb r1, [r1]
|
||||
strb r1, [r2]
|
||||
bl DestroyAnimVisualTask
|
||||
|
|
@ -3088,7 +3088,7 @@ sub_80BC060: @ 80BC060
|
|||
_080BC080: .4byte gBattleAnimAttacker
|
||||
_080BC084: .4byte gBattlerTarget
|
||||
_080BC088: .4byte gBattleAnimTarget
|
||||
_080BC08C: .4byte gUnknown_2023D6E
|
||||
_080BC08C: .4byte gEffectBattler
|
||||
thumb_func_end sub_80BC060
|
||||
|
||||
thumb_func_start sub_80BC090
|
||||
|
|
@ -3151,11 +3151,11 @@ sub_80BC0FC: @ 80BC0FC
|
|||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r2, _080BC11C @ =gBattleAnimAttacker
|
||||
ldr r1, _080BC120 @ =sBattler_AI
|
||||
ldr r1, _080BC120 @ =gBattlerAttacker
|
||||
ldrb r1, [r1]
|
||||
strb r1, [r2]
|
||||
ldr r2, _080BC124 @ =gBattleAnimTarget
|
||||
ldr r1, _080BC128 @ =gUnknown_2023D6E
|
||||
ldr r1, _080BC128 @ =gEffectBattler
|
||||
ldrb r1, [r1]
|
||||
strb r1, [r2]
|
||||
bl DestroyAnimVisualTask
|
||||
|
|
@ -3163,9 +3163,9 @@ sub_80BC0FC: @ 80BC0FC
|
|||
bx r0
|
||||
.align 2, 0
|
||||
_080BC11C: .4byte gBattleAnimAttacker
|
||||
_080BC120: .4byte sBattler_AI
|
||||
_080BC120: .4byte gBattlerAttacker
|
||||
_080BC124: .4byte gBattleAnimTarget
|
||||
_080BC128: .4byte gUnknown_2023D6E
|
||||
_080BC128: .4byte gEffectBattler
|
||||
thumb_func_end sub_80BC0FC
|
||||
|
||||
thumb_func_start sub_80BC12C
|
||||
|
|
@ -3173,7 +3173,7 @@ sub_80BC12C: @ 80BC12C
|
|||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080BC144
|
||||
|
|
@ -3186,7 +3186,7 @@ _080BC144:
|
|||
adds r3, r4
|
||||
lsls r3, 3
|
||||
adds r3, r0
|
||||
ldr r0, _080BC18C @ =gUnknown_2024018
|
||||
ldr r0, _080BC18C @ =gBattleSpritesDataPtr
|
||||
ldr r4, [r0]
|
||||
ldr r2, _080BC190 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r2]
|
||||
|
|
@ -3217,7 +3217,7 @@ _080BC180:
|
|||
bx r0
|
||||
.align 2, 0
|
||||
_080BC188: .4byte gTasks
|
||||
_080BC18C: .4byte gUnknown_2024018
|
||||
_080BC18C: .4byte gBattleSpritesDataPtr
|
||||
_080BC190: .4byte gBattleAnimAttacker
|
||||
_080BC194: .4byte sub_80BC19C
|
||||
_080BC198: .4byte gUnknown_2037EE2
|
||||
|
|
@ -3235,7 +3235,7 @@ sub_80BC19C: @ 80BC19C
|
|||
lsls r0, 5
|
||||
cmp r1, r0
|
||||
bne _080BC1E0
|
||||
ldr r0, _080BC1EC @ =gUnknown_2024018
|
||||
ldr r0, _080BC1EC @ =gBattleSpritesDataPtr
|
||||
ldr r1, [r0]
|
||||
ldr r0, _080BC1F0 @ =gBattleAnimAttacker
|
||||
ldrb r3, [r0]
|
||||
|
|
@ -3264,7 +3264,7 @@ _080BC1E0:
|
|||
bx r0
|
||||
.align 2, 0
|
||||
_080BC1E8: .4byte gBattleAnimArgs
|
||||
_080BC1EC: .4byte gUnknown_2024018
|
||||
_080BC1EC: .4byte gBattleSpritesDataPtr
|
||||
_080BC1F0: .4byte gBattleAnimAttacker
|
||||
_080BC1F4: .4byte gTasks
|
||||
thumb_func_end sub_80BC19C
|
||||
|
|
@ -3488,8 +3488,8 @@ _080BC396:
|
|||
bx r1
|
||||
thumb_func_end sub_80BC30C
|
||||
|
||||
thumb_func_start sub_80BC3A0
|
||||
sub_80BC3A0: @ 80BC3A0
|
||||
thumb_func_start HandleIntroSlide
|
||||
HandleIntroSlide: @ 80BC3A0
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
|
|
@ -3549,7 +3549,7 @@ _080BC3E8:
|
|||
.align 2, 0
|
||||
_080BC414: .4byte gUnknown_83E7CD4
|
||||
_080BC418: .4byte gTasks
|
||||
thumb_func_end sub_80BC3A0
|
||||
thumb_func_end HandleIntroSlide
|
||||
|
||||
thumb_func_start sub_80BC41C
|
||||
sub_80BC41C: @ 80BC41C
|
||||
|
|
@ -3707,7 +3707,7 @@ _080BC544:
|
|||
strh r0, [r1, 0xC]
|
||||
movs r0, 0x20
|
||||
strh r0, [r1, 0xE]
|
||||
ldr r2, _080BC56C @ =gUnknown_2023F4C
|
||||
ldr r2, _080BC56C @ =gIntroSlideFlags
|
||||
ldrh r1, [r2]
|
||||
ldr r0, _080BC570 @ =0x0000fffe
|
||||
ands r0, r1
|
||||
|
|
@ -3715,7 +3715,7 @@ _080BC544:
|
|||
b _080BC6BA
|
||||
.align 2, 0
|
||||
_080BC568: .4byte gUnknown_2022986
|
||||
_080BC56C: .4byte gUnknown_2023F4C
|
||||
_080BC56C: .4byte gIntroSlideFlags
|
||||
_080BC570: .4byte 0x0000fffe
|
||||
_080BC574:
|
||||
lsls r0, r4, 2
|
||||
|
|
@ -4075,7 +4075,7 @@ _080BC820:
|
|||
strh r0, [r1, 0xE]
|
||||
movs r0, 0x1
|
||||
strh r0, [r1, 0x12]
|
||||
ldr r2, _080BC850 @ =gUnknown_2023F4C
|
||||
ldr r2, _080BC850 @ =gIntroSlideFlags
|
||||
ldrh r1, [r2]
|
||||
ldr r0, _080BC854 @ =0x0000fffe
|
||||
ands r0, r1
|
||||
|
|
@ -4084,7 +4084,7 @@ _080BC820:
|
|||
.align 2, 0
|
||||
_080BC848: .4byte gUnknown_2022986
|
||||
_080BC84C: .4byte gTasks
|
||||
_080BC850: .4byte gUnknown_2023F4C
|
||||
_080BC850: .4byte gIntroSlideFlags
|
||||
_080BC854: .4byte 0x0000fffe
|
||||
_080BC858:
|
||||
ldr r0, _080BC890 @ =gTasks
|
||||
|
|
@ -4398,7 +4398,7 @@ _080BCAC0:
|
|||
strh r0, [r1, 0xE]
|
||||
movs r0, 0x1
|
||||
strh r0, [r1, 0x12]
|
||||
ldr r2, _080BCAF0 @ =gUnknown_2023F4C
|
||||
ldr r2, _080BCAF0 @ =gIntroSlideFlags
|
||||
ldrh r1, [r2]
|
||||
ldr r0, _080BCAF4 @ =0x0000fffe
|
||||
ands r0, r1
|
||||
|
|
@ -4407,7 +4407,7 @@ _080BCAC0:
|
|||
.align 2, 0
|
||||
_080BCAE8: .4byte gUnknown_2022986
|
||||
_080BCAEC: .4byte gTasks
|
||||
_080BCAF0: .4byte gUnknown_2023F4C
|
||||
_080BCAF0: .4byte gIntroSlideFlags
|
||||
_080BCAF4: .4byte 0x0000fffe
|
||||
_080BCAF8:
|
||||
lsls r0, r5, 2
|
||||
|
|
@ -4782,7 +4782,7 @@ _080BCDDC:
|
|||
strh r0, [r1, 0xC]
|
||||
movs r0, 0x20
|
||||
strh r0, [r1, 0xE]
|
||||
ldr r2, _080BCE00 @ =gUnknown_2023F4C
|
||||
ldr r2, _080BCE00 @ =gIntroSlideFlags
|
||||
ldrh r1, [r2]
|
||||
ldr r0, _080BCE04 @ =0x0000fffe
|
||||
ands r0, r1
|
||||
|
|
@ -4790,7 +4790,7 @@ _080BCDDC:
|
|||
b _080BCEE6
|
||||
.align 2, 0
|
||||
_080BCDFC: .4byte gUnknown_2022986
|
||||
_080BCE00: .4byte gUnknown_2023F4C
|
||||
_080BCE00: .4byte gIntroSlideFlags
|
||||
_080BCE04: .4byte 0x0000fffe
|
||||
_080BCE08:
|
||||
ldr r2, _080BCECC @ =gUnknown_2022986
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -255,8 +255,8 @@ sub_8047CAC: @ 8047CAC
|
|||
bx r0
|
||||
thumb_func_end sub_8047CAC
|
||||
|
||||
thumb_func_start CreateBankHealthboxSprites
|
||||
CreateBankHealthboxSprites: @ 8047CE0
|
||||
thumb_func_start CreateBattlerHealthboxSprites
|
||||
CreateBattlerHealthboxSprites: @ 8047CE0
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
|
|
@ -268,7 +268,7 @@ CreateBankHealthboxSprites: @ 8047CE0
|
|||
mov r10, r0
|
||||
movs r0, 0
|
||||
str r0, [sp]
|
||||
bl sub_8075290
|
||||
bl IsDoubleBattle
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08047DF4
|
||||
|
|
@ -522,7 +522,7 @@ _08047E98:
|
|||
_08047F1A:
|
||||
str r0, [sp]
|
||||
_08047F1C:
|
||||
ldr r0, _08047FF4 @ =gUnknown_2023BD6
|
||||
ldr r0, _08047FF4 @ =gBattlerPositions
|
||||
add r0, r10
|
||||
ldrb r1, [r0]
|
||||
lsls r0, r1, 1
|
||||
|
|
@ -621,12 +621,12 @@ _08047FE4: .4byte gSprites
|
|||
_08047FE8: .4byte 0x000003ff
|
||||
_08047FEC: .4byte 0xfffffc00
|
||||
_08047FF0: .4byte sub_8048128
|
||||
_08047FF4: .4byte gUnknown_2023BD6
|
||||
_08047FF4: .4byte gBattlerPositions
|
||||
_08047FF8: .4byte gUnknown_82602F8
|
||||
_08047FFC: .4byte gUnknown_82603C4
|
||||
_08048000: .4byte 0x06010000
|
||||
_08048004: .4byte 0x04000010
|
||||
thumb_func_end CreateBankHealthboxSprites
|
||||
thumb_func_end CreateBattlerHealthboxSprites
|
||||
|
||||
thumb_func_start CreateSafariPlayerHealthboxSprites
|
||||
CreateSafariPlayerHealthboxSprites: @ 8048008
|
||||
|
|
@ -808,7 +808,7 @@ SetBattleBarStruct: @ 8048150
|
|||
ldr r7, [sp, 0x14]
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r6, _08048180 @ =gUnknown_2024018
|
||||
ldr r6, _08048180 @ =gBattleSpritesDataPtr
|
||||
ldr r4, [r6]
|
||||
ldr r5, [r4, 0xC]
|
||||
lsls r4, r0, 2
|
||||
|
|
@ -828,7 +828,7 @@ SetBattleBarStruct: @ 8048150
|
|||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08048180: .4byte gUnknown_2024018
|
||||
_08048180: .4byte gBattleSpritesDataPtr
|
||||
_08048184: .4byte 0xffff8000
|
||||
thumb_func_end SetBattleBarStruct
|
||||
|
||||
|
|
@ -970,10 +970,10 @@ DestoryHealthboxSprite: @ 8048248
|
|||
_08048284: .4byte gSprites
|
||||
thumb_func_end DestoryHealthboxSprite
|
||||
|
||||
thumb_func_start nullsub_21
|
||||
nullsub_21: @ 8048288
|
||||
thumb_func_start DummyBattleInterfaceFunc
|
||||
DummyBattleInterfaceFunc: @ 8048288
|
||||
bx lr
|
||||
thumb_func_end nullsub_21
|
||||
thumb_func_end DummyBattleInterfaceFunc
|
||||
|
||||
thumb_func_start UpdateOamPriorityInAllHealthboxes
|
||||
UpdateOamPriorityInAllHealthboxes: @ 804828C
|
||||
|
|
@ -996,7 +996,7 @@ UpdateOamPriorityInAllHealthboxes: @ 804828C
|
|||
lsls r5, r0, 2
|
||||
movs r7, 0xD
|
||||
negs r7, r7
|
||||
ldr r2, _08048318 @ =gUnknown_3004FF0
|
||||
ldr r2, _08048318 @ =gHealthboxSpriteIds
|
||||
mov r9, r2
|
||||
_080482B6:
|
||||
mov r1, r9
|
||||
|
|
@ -1048,17 +1048,17 @@ _08048304:
|
|||
.align 2, 0
|
||||
_08048310: .4byte gBattlersCount
|
||||
_08048314: .4byte gSprites
|
||||
_08048318: .4byte gUnknown_3004FF0
|
||||
_08048318: .4byte gHealthboxSpriteIds
|
||||
thumb_func_end UpdateOamPriorityInAllHealthboxes
|
||||
|
||||
thumb_func_start SetBankHealthboxSpritePos
|
||||
SetBankHealthboxSpritePos: @ 804831C
|
||||
thumb_func_start InitBattlerHealthboxCoords
|
||||
InitBattlerHealthboxCoords: @ 804831C
|
||||
push {r4-r6,lr}
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
movs r5, 0
|
||||
movs r4, 0
|
||||
bl sub_8075290
|
||||
bl IsDoubleBattle
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08048348
|
||||
|
|
@ -1108,7 +1108,7 @@ _0804837C:
|
|||
movs r5, 0x20
|
||||
movs r4, 0x2C
|
||||
_08048380:
|
||||
ldr r0, _08048394 @ =gUnknown_3004FF0
|
||||
ldr r0, _08048394 @ =gHealthboxSpriteIds
|
||||
adds r0, r6, r0
|
||||
ldrb r0, [r0]
|
||||
adds r1, r5, 0
|
||||
|
|
@ -1118,8 +1118,8 @@ _08048380:
|
|||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08048394: .4byte gUnknown_3004FF0
|
||||
thumb_func_end SetBankHealthboxSpritePos
|
||||
_08048394: .4byte gHealthboxSpriteIds
|
||||
thumb_func_end InitBattlerHealthboxCoords
|
||||
|
||||
thumb_func_start UpdateLvlInHealthbox
|
||||
UpdateLvlInHealthbox: @ 8048398
|
||||
|
|
@ -1169,7 +1169,7 @@ UpdateLvlInHealthbox: @ 8048398
|
|||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08048420
|
||||
bl sub_8075290
|
||||
bl IsDoubleBattle
|
||||
lsls r0, 24
|
||||
ldr r2, _08048418 @ =0x06010420
|
||||
adds r1, r4, r2
|
||||
|
|
@ -1201,8 +1201,8 @@ _08048424:
|
|||
_0804843C: .4byte 0x06010400
|
||||
thumb_func_end UpdateLvlInHealthbox
|
||||
|
||||
thumb_func_start sub_8048440
|
||||
sub_8048440: @ 8048440
|
||||
thumb_func_start UpdateHpTextInHealthbox
|
||||
UpdateHpTextInHealthbox: @ 8048440
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
|
|
@ -1230,7 +1230,7 @@ sub_8048440: @ 8048440
|
|||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08048514
|
||||
bl sub_8075290
|
||||
bl IsDoubleBattle
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08048514
|
||||
|
|
@ -1315,7 +1315,7 @@ _08048514:
|
|||
ldrh r0, [r7, 0x3A]
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
bl sub_8075290
|
||||
bl IsDoubleBattle
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
|
|
@ -1425,7 +1425,7 @@ _08048608: .4byte gMonSpritesGfxPtr
|
|||
_0804860C: .4byte gSprites
|
||||
_08048610: .4byte 0x06010000
|
||||
_08048614: .4byte 0x04000008
|
||||
thumb_func_end sub_8048440
|
||||
thumb_func_end UpdateHpTextInHealthbox
|
||||
|
||||
thumb_func_start sub_8048618
|
||||
sub_8048618: @ 8048618
|
||||
|
|
@ -1457,7 +1457,7 @@ sub_8048618: @ 8048618
|
|||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
mov r10, r0
|
||||
ldr r0, _08048700 @ =gUnknown_2024018
|
||||
ldr r0, _08048700 @ =gBattleSpritesDataPtr
|
||||
ldr r0, [r0]
|
||||
ldr r1, [r0]
|
||||
mov r3, r10
|
||||
|
|
@ -1541,7 +1541,7 @@ _080486C6:
|
|||
.align 2, 0
|
||||
_080486F8: .4byte gUnknown_8260542
|
||||
_080486FC: .4byte gSprites
|
||||
_08048700: .4byte gUnknown_2024018
|
||||
_08048700: .4byte gBattleSpritesDataPtr
|
||||
_08048704: .4byte gUnknown_8260540
|
||||
_08048708: .4byte gMonSpritesGfxPtr
|
||||
_0804870C: .4byte 0x06010000
|
||||
|
|
@ -1945,8 +1945,8 @@ _08048A44: .4byte 0x060100c0
|
|||
_08048A48: .4byte 0x04000008
|
||||
thumb_func_end sub_80487F8
|
||||
|
||||
thumb_func_start sub_8048A4C
|
||||
sub_8048A4C: @ 8048A4C
|
||||
thumb_func_start SwapHpBarsWithHpText
|
||||
SwapHpBarsWithHpText: @ 8048A4C
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
|
|
@ -1966,7 +1966,7 @@ _08048A66:
|
|||
ldr r2, _08048B80 @ =gBattlerPartyIndexes
|
||||
mov r8, r2
|
||||
_08048A6E:
|
||||
ldr r0, _08048B84 @ =gUnknown_3004FF0
|
||||
ldr r0, _08048B84 @ =gHealthboxSpriteIds
|
||||
mov r1, r9
|
||||
adds r6, r1, r0
|
||||
ldrb r1, [r6]
|
||||
|
|
@ -1993,7 +1993,7 @@ _08048A8C:
|
|||
bne _08048AA2
|
||||
b _08048CE0
|
||||
_08048AA2:
|
||||
bl sub_8075290
|
||||
bl IsDoubleBattle
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08048ABA
|
||||
|
|
@ -2004,7 +2004,7 @@ _08048AA2:
|
|||
bne _08048ABA
|
||||
b _08048CE0
|
||||
_08048ABA:
|
||||
ldr r5, _08048B8C @ =gUnknown_2024018
|
||||
ldr r5, _08048B8C @ =gBattleSpritesDataPtr
|
||||
ldr r0, [r5]
|
||||
ldr r3, [r0]
|
||||
mov r0, r9
|
||||
|
|
@ -2036,7 +2036,7 @@ _08048ABA:
|
|||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08048BE8
|
||||
bl sub_8075290
|
||||
bl IsDoubleBattle
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08048B08
|
||||
|
|
@ -2099,9 +2099,9 @@ _08048B16:
|
|||
_08048B78: .4byte gBattlersCount
|
||||
_08048B7C: .4byte gSprites
|
||||
_08048B80: .4byte gBattlerPartyIndexes
|
||||
_08048B84: .4byte gUnknown_3004FF0
|
||||
_08048B84: .4byte gHealthboxSpriteIds
|
||||
_08048B88: .4byte SpriteCallbackDummy
|
||||
_08048B8C: .4byte gUnknown_2024018
|
||||
_08048B8C: .4byte gBattleSpritesDataPtr
|
||||
_08048B90: .4byte gBattleTypeFlags
|
||||
_08048B94: .4byte 0x06010000
|
||||
_08048B98: .4byte 0x05000040
|
||||
|
|
@ -2242,7 +2242,7 @@ _08048C94:
|
|||
movs r2, 0x4
|
||||
bl UpdateHealthboxAttribute
|
||||
_08048CCA:
|
||||
ldr r0, _08048D0C @ =gUnknown_3004FF0
|
||||
ldr r0, _08048D0C @ =gHealthboxSpriteIds
|
||||
add r0, r9
|
||||
ldrb r1, [r0]
|
||||
lsls r0, r1, 4
|
||||
|
|
@ -2275,12 +2275,12 @@ _08048CF2:
|
|||
.align 2, 0
|
||||
_08048D04: .4byte gEnemyParty
|
||||
_08048D08: .4byte gBattleTypeFlags
|
||||
_08048D0C: .4byte gUnknown_3004FF0
|
||||
_08048D0C: .4byte gHealthboxSpriteIds
|
||||
_08048D10: .4byte gBattlersCount
|
||||
thumb_func_end sub_8048A4C
|
||||
thumb_func_end SwapHpBarsWithHpText
|
||||
|
||||
thumb_func_start sub_8048D14
|
||||
sub_8048D14: @ 8048D14
|
||||
thumb_func_start CreatePartyStatusSummarySprites
|
||||
CreatePartyStatusSummarySprites: @ 8048D14
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
|
|
@ -2323,7 +2323,7 @@ _08048D64:
|
|||
movs r7, 0x1
|
||||
cmp r4, 0
|
||||
beq _08048D74
|
||||
bl sub_8075290
|
||||
bl IsDoubleBattle
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08048D7A
|
||||
|
|
@ -2866,10 +2866,10 @@ _08049172:
|
|||
.align 2, 0
|
||||
_080491A8: .4byte TaskDummy
|
||||
_080491AC: .4byte gTasks
|
||||
thumb_func_end sub_8048D14
|
||||
thumb_func_end CreatePartyStatusSummarySprites
|
||||
|
||||
thumb_func_start sub_80491B0
|
||||
sub_80491B0: @ 80491B0
|
||||
thumb_func_start Task_HidePartyStatusSummary
|
||||
Task_HidePartyStatusSummary: @ 80491B0
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
|
|
@ -3099,7 +3099,7 @@ _0804936E:
|
|||
.align 2, 0
|
||||
_08049380: .4byte gTasks
|
||||
_08049384: .4byte sub_804948C
|
||||
thumb_func_end sub_80491B0
|
||||
thumb_func_end Task_HidePartyStatusSummary
|
||||
|
||||
thumb_func_start sub_8049388
|
||||
sub_8049388: @ 8049388
|
||||
|
|
@ -3668,7 +3668,7 @@ _08049782:
|
|||
adds r1, r6, 0
|
||||
movs r2, 0x6
|
||||
bl sub_804A6E8
|
||||
bl sub_8075290
|
||||
bl IsDoubleBattle
|
||||
lsls r0, 24
|
||||
ldr r2, _080497F0 @ =0x06010400
|
||||
adds r5, r4, r2
|
||||
|
|
@ -3877,7 +3877,7 @@ UpdateStatusIconInHealthbox: @ 8049934
|
|||
movs r1, 0x37
|
||||
bl GetMonData
|
||||
adds r4, r0, 0
|
||||
bl sub_8075290
|
||||
bl IsDoubleBattle
|
||||
lsls r0, 24
|
||||
movs r3, 0x12
|
||||
mov r8, r3
|
||||
|
|
@ -4009,7 +4009,7 @@ _08049A7E:
|
|||
adds r4, 0x1
|
||||
cmp r4, 0x2
|
||||
ble _08049A7E
|
||||
ldr r0, _08049AEC @ =gUnknown_2024018
|
||||
ldr r0, _08049AEC @ =gBattleSpritesDataPtr
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0]
|
||||
adds r0, r7, r0
|
||||
|
|
@ -4042,7 +4042,7 @@ _08049AD4:
|
|||
_08049AE0: .4byte gSprites
|
||||
_08049AE4: .4byte 0x06010000
|
||||
_08049AE8: .4byte 0x04000008
|
||||
_08049AEC: .4byte gUnknown_2024018
|
||||
_08049AEC: .4byte gBattleSpritesDataPtr
|
||||
_08049AF0: .4byte 0x04000010
|
||||
_08049AF4:
|
||||
mov r1, r9
|
||||
|
|
@ -4084,7 +4084,7 @@ _08049AF4:
|
|||
ldr r2, _08049BD8 @ =0x04000018
|
||||
adds r0, r6, 0
|
||||
bl CpuSet
|
||||
bl sub_8075290
|
||||
bl IsDoubleBattle
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
|
|
@ -4096,7 +4096,7 @@ _08049AF4:
|
|||
cmp r0, 0x1
|
||||
bne _08049BAE
|
||||
_08049B62:
|
||||
ldr r0, _08049BDC @ =gUnknown_2024018
|
||||
ldr r0, _08049BDC @ =gBattleSpritesDataPtr
|
||||
ldr r0, [r0]
|
||||
ldr r1, [r0]
|
||||
lsls r0, r7, 2
|
||||
|
|
@ -4149,7 +4149,7 @@ _08049BCC: .4byte gPlttBufferUnfaded + 0x200
|
|||
_08049BD0: .4byte 0x05000200
|
||||
_08049BD4: .4byte 0x06010000
|
||||
_08049BD8: .4byte 0x04000018
|
||||
_08049BDC: .4byte gUnknown_2024018
|
||||
_08049BDC: .4byte gBattleSpritesDataPtr
|
||||
_08049BE0: .4byte 0x04000008
|
||||
thumb_func_end UpdateStatusIconInHealthbox
|
||||
|
||||
|
|
@ -4381,7 +4381,7 @@ UpdateHealthboxAttribute: @ 8049D98
|
|||
mov r9, r0
|
||||
cmp r7, 0
|
||||
bne _08049DD4
|
||||
bl sub_8075290
|
||||
bl IsDoubleBattle
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08049DD4
|
||||
|
|
@ -4426,7 +4426,7 @@ _08049E0C:
|
|||
asrs r1, 16
|
||||
adds r0, r6, 0
|
||||
movs r2, 0
|
||||
bl sub_8048440
|
||||
bl UpdateHpTextInHealthbox
|
||||
_08049E26:
|
||||
cmp r7, 0x2
|
||||
beq _08049E2E
|
||||
|
|
@ -4441,7 +4441,7 @@ _08049E2E:
|
|||
asrs r1, 16
|
||||
adds r0, r6, 0
|
||||
movs r2, 0x1
|
||||
bl sub_8048440
|
||||
bl UpdateHpTextInHealthbox
|
||||
_08049E44:
|
||||
cmp r7, 0x5
|
||||
beq _08049E4C
|
||||
|
|
@ -4468,9 +4468,9 @@ _08049E4C:
|
|||
adds r1, r6, 0
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl sub_8049FD8
|
||||
bl MoveBattleBar
|
||||
_08049E80:
|
||||
bl sub_8075290
|
||||
bl IsDoubleBattle
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
mov r10, r0
|
||||
|
|
@ -4530,7 +4530,7 @@ _08049E96:
|
|||
adds r1, r6, 0
|
||||
movs r2, 0x1
|
||||
movs r3, 0
|
||||
bl sub_8049FD8
|
||||
bl MoveBattleBar
|
||||
_08049F06:
|
||||
cmp r7, 0x4
|
||||
beq _08049F0E
|
||||
|
|
@ -4607,7 +4607,7 @@ _08049F74:
|
|||
adds r1, r6, 0
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl sub_8049FD8
|
||||
bl MoveBattleBar
|
||||
_08049FA8:
|
||||
cmp r7, 0x4
|
||||
beq _08049FB0
|
||||
|
|
@ -4636,8 +4636,8 @@ _08049FC6:
|
|||
bx r0
|
||||
thumb_func_end UpdateHealthboxAttribute
|
||||
|
||||
thumb_func_start sub_8049FD8
|
||||
sub_8049FD8: @ 8049FD8
|
||||
thumb_func_start MoveBattleBar
|
||||
MoveBattleBar: @ 8049FD8
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
|
|
@ -4652,7 +4652,7 @@ sub_8049FD8: @ 8049FD8
|
|||
mov r9, r2
|
||||
cmp r2, 0
|
||||
bne _0804A024
|
||||
ldr r0, _0804A020 @ =gUnknown_2024018
|
||||
ldr r0, _0804A020 @ =gBattleSpritesDataPtr
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0xC]
|
||||
mov r1, r8
|
||||
|
|
@ -4673,9 +4673,9 @@ sub_8049FD8: @ 8049FD8
|
|||
adds r7, r5, 0
|
||||
b _0804A080
|
||||
.align 2, 0
|
||||
_0804A020: .4byte gUnknown_2024018
|
||||
_0804A020: .4byte gBattleSpritesDataPtr
|
||||
_0804A024:
|
||||
ldr r2, _0804A0D0 @ =gUnknown_2024018
|
||||
ldr r2, _0804A0D0 @ =gBattleSpritesDataPtr
|
||||
mov r10, r2
|
||||
ldr r0, [r2]
|
||||
ldr r2, [r0, 0xC]
|
||||
|
|
@ -4726,7 +4726,7 @@ _0804A080:
|
|||
beq _0804A09C
|
||||
cmp r2, 0
|
||||
bne _0804A0A4
|
||||
ldr r0, _0804A0D0 @ =gUnknown_2024018
|
||||
ldr r0, _0804A0D0 @ =gBattleSpritesDataPtr
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0]
|
||||
adds r0, r7, r0
|
||||
|
|
@ -4744,7 +4744,7 @@ _0804A0A4:
|
|||
negs r0, r0
|
||||
cmp r4, r0
|
||||
bne _0804A0BE
|
||||
ldr r0, _0804A0D0 @ =gUnknown_2024018
|
||||
ldr r0, _0804A0D0 @ =gBattleSpritesDataPtr
|
||||
ldr r0, [r0]
|
||||
ldr r1, [r0, 0xC]
|
||||
mov r2, r8
|
||||
|
|
@ -4764,8 +4764,8 @@ _0804A0BE:
|
|||
pop {r1}
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_0804A0D0: .4byte gUnknown_2024018
|
||||
thumb_func_end sub_8049FD8
|
||||
_0804A0D0: .4byte gBattleSpritesDataPtr
|
||||
thumb_func_end MoveBattleBar
|
||||
|
||||
thumb_func_start sub_804A0D4
|
||||
sub_804A0D4: @ 804A0D4
|
||||
|
|
@ -4784,7 +4784,7 @@ sub_804A0D4: @ 804A0D4
|
|||
beq _0804A1D8
|
||||
b _0804A2D6
|
||||
_0804A0F0:
|
||||
ldr r0, _0804A184 @ =gUnknown_2024018
|
||||
ldr r0, _0804A184 @ =gBattleSpritesDataPtr
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0xC]
|
||||
lsls r5, r6, 2
|
||||
|
|
@ -4818,7 +4818,7 @@ _0804A12C:
|
|||
ldr r0, _0804A188 @ =gSprites
|
||||
mov r8, r0
|
||||
_0804A132:
|
||||
ldr r0, _0804A184 @ =gUnknown_2024018
|
||||
ldr r0, _0804A184 @ =gBattleSpritesDataPtr
|
||||
ldr r0, [r0]
|
||||
ldr r1, [r0, 0xC]
|
||||
adds r0, r7, r6
|
||||
|
|
@ -4858,7 +4858,7 @@ _0804A132:
|
|||
bl CpuSet
|
||||
b _0804A1C2
|
||||
.align 2, 0
|
||||
_0804A184: .4byte gUnknown_2024018
|
||||
_0804A184: .4byte gBattleSpritesDataPtr
|
||||
_0804A188: .4byte gSprites
|
||||
_0804A18C: .4byte 0x06010000
|
||||
_0804A190: .4byte 0x04000008
|
||||
|
|
@ -4895,7 +4895,7 @@ _0804A1C2:
|
|||
_0804A1D0: .4byte 0x06010040
|
||||
_0804A1D4: .4byte 0x04000008
|
||||
_0804A1D8:
|
||||
ldr r0, _0804A27C @ =gUnknown_2024018
|
||||
ldr r0, _0804A27C @ =gBattleSpritesDataPtr
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0xC]
|
||||
lsls r5, r6, 2
|
||||
|
|
@ -4955,7 +4955,7 @@ _0804A23A:
|
|||
ldrb r1, [r1]
|
||||
lsls r1, 5
|
||||
adds r0, r1
|
||||
ldr r1, _0804A27C @ =gUnknown_2024018
|
||||
ldr r1, _0804A27C @ =gBattleSpritesDataPtr
|
||||
ldr r1, [r1]
|
||||
ldr r1, [r1, 0xC]
|
||||
adds r1, r4, r1
|
||||
|
|
@ -4977,7 +4977,7 @@ _0804A23A:
|
|||
bl CpuSet
|
||||
b _0804A2CC
|
||||
.align 2, 0
|
||||
_0804A27C: .4byte gUnknown_2024018
|
||||
_0804A27C: .4byte gBattleSpritesDataPtr
|
||||
_0804A280: .4byte gBattlerPartyIndexes
|
||||
_0804A284: .4byte gPlayerParty
|
||||
_0804A288: .4byte gSprites
|
||||
|
|
@ -4992,7 +4992,7 @@ _0804A294:
|
|||
ldrb r1, [r1]
|
||||
lsls r1, 5
|
||||
adds r0, r1
|
||||
ldr r1, _0804A2E4 @ =gUnknown_2024018
|
||||
ldr r1, _0804A2E4 @ =gBattleSpritesDataPtr
|
||||
ldr r1, [r1]
|
||||
ldr r1, [r1, 0xC]
|
||||
adds r1, r4, r1
|
||||
|
|
@ -5025,7 +5025,7 @@ _0804A2D6:
|
|||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0804A2E4: .4byte gUnknown_2024018
|
||||
_0804A2E4: .4byte gBattleSpritesDataPtr
|
||||
_0804A2E8: .4byte 0x06010b80
|
||||
_0804A2EC: .4byte 0x04000008
|
||||
thumb_func_end sub_804A0D4
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_80D7274
|
||||
sub_80D7274: @ 80D7274
|
||||
thumb_func_start BufferStringBattle
|
||||
BufferStringBattle: @ 80D7274
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
|
|
@ -23,7 +23,7 @@ sub_80D7274: @ 80D7274
|
|||
ldr r0, _080D7338 @ =gUnknown_2022BC8
|
||||
adds r1, r0
|
||||
str r1, [r4]
|
||||
ldr r2, _080D733C @ =gUnknown_2023D68
|
||||
ldr r2, _080D733C @ =gLastUsedItem
|
||||
ldrh r0, [r1, 0x4]
|
||||
strh r0, [r2]
|
||||
ldr r2, _080D7340 @ =gLastUsedAbility
|
||||
|
|
@ -71,7 +71,7 @@ _080D72D6:
|
|||
mov r8, r0
|
||||
ldr r3, _080D7330 @ =gUnknown_2039A34
|
||||
ldr r5, _080D7358 @ =gBattleTextBuff2
|
||||
ldr r4, _080D735C @ =gUnknown_2022AD8
|
||||
ldr r4, _080D735C @ =gBattleTextBuff3
|
||||
_080D72F4:
|
||||
mov r0, r8
|
||||
adds r1, r2, r0
|
||||
|
|
@ -108,7 +108,7 @@ _080D7326:
|
|||
_080D7330: .4byte gUnknown_2039A34
|
||||
_080D7334: .4byte gActiveBattler
|
||||
_080D7338: .4byte gUnknown_2022BC8
|
||||
_080D733C: .4byte gUnknown_2023D68
|
||||
_080D733C: .4byte gLastUsedItem
|
||||
_080D7340: .4byte gLastUsedAbility
|
||||
_080D7344: .4byte gBattleScripting
|
||||
_080D7348: .4byte gBattleStruct
|
||||
|
|
@ -116,7 +116,7 @@ _080D734C: .4byte gPotentialItemEffectBattler
|
|||
_080D7350: .4byte gBattleTextBuff1
|
||||
_080D7354: .4byte gUnknown_2039A30
|
||||
_080D7358: .4byte gBattleTextBuff2
|
||||
_080D735C: .4byte gUnknown_2022AD8
|
||||
_080D735C: .4byte gBattleTextBuff3
|
||||
_080D7360: .4byte _080D7364
|
||||
.align 2, 0
|
||||
_080D7364:
|
||||
|
|
@ -701,7 +701,7 @@ _080D77E2:
|
|||
bx r0
|
||||
.align 2, 0
|
||||
_080D77F0: .4byte gUnknown_83FDF3C
|
||||
thumb_func_end sub_80D7274
|
||||
thumb_func_end BufferStringBattle
|
||||
|
||||
thumb_func_start BattleStringExpandPlaceholdersToDisplayedString
|
||||
BattleStringExpandPlaceholdersToDisplayedString: @ 80D77F4
|
||||
|
|
@ -890,7 +890,7 @@ _080D79A2:
|
|||
_080D79B0: .4byte gBattleTextBuff2
|
||||
_080D79B4: .4byte gStringVar2
|
||||
_080D79B8:
|
||||
ldr r1, _080D79D0 @ =gUnknown_2022AD8
|
||||
ldr r1, _080D79D0 @ =gBattleTextBuff3
|
||||
ldrb r0, [r1]
|
||||
cmp r0, 0xFD
|
||||
bne _080D79D8
|
||||
|
|
@ -902,7 +902,7 @@ _080D79C4:
|
|||
bl ExpandBattleTextBuffPlaceholders
|
||||
bl _080D8382
|
||||
.align 2, 0
|
||||
_080D79D0: .4byte gUnknown_2022AD8
|
||||
_080D79D0: .4byte gBattleTextBuff3
|
||||
_080D79D4: .4byte gStringVar3
|
||||
_080D79D8:
|
||||
adds r4, r1, 0
|
||||
|
|
@ -1073,7 +1073,7 @@ _080D7B40: .4byte gBattlerPartyIndexes
|
|||
_080D7B44: .4byte gLinkPlayers
|
||||
_080D7B48: .4byte gEnemyParty
|
||||
_080D7B4C:
|
||||
ldr r4, _080D7B70 @ =sBattler_AI
|
||||
ldr r4, _080D7B70 @ =gBattlerAttacker
|
||||
ldrb r0, [r4]
|
||||
bl GetBattlerSide
|
||||
lsls r0, 24
|
||||
|
|
@ -1090,7 +1090,7 @@ _080D7B4C:
|
|||
ldr r4, _080D7B7C @ =gUnknown_83FD55B
|
||||
b _080D7B8A
|
||||
.align 2, 0
|
||||
_080D7B70: .4byte sBattler_AI
|
||||
_080D7B70: .4byte gBattlerAttacker
|
||||
_080D7B74: .4byte gBattleTypeFlags
|
||||
_080D7B78: .4byte gUnknown_83FD555
|
||||
_080D7B7C: .4byte gUnknown_83FD55B
|
||||
|
|
@ -1140,7 +1140,7 @@ _080D7BC0:
|
|||
.align 2, 0
|
||||
_080D7BDC: .4byte gBattlerPartyIndexes
|
||||
_080D7BE0:
|
||||
ldr r4, _080D7C14 @ =sBattler_AI
|
||||
ldr r4, _080D7C14 @ =gBattlerAttacker
|
||||
ldrb r0, [r4]
|
||||
bl GetBattlerSide
|
||||
lsls r0, 24
|
||||
|
|
@ -1164,7 +1164,7 @@ _080D7BE0:
|
|||
adds r0, r1
|
||||
b _080D82AA
|
||||
.align 2, 0
|
||||
_080D7C14: .4byte sBattler_AI
|
||||
_080D7C14: .4byte gBattlerAttacker
|
||||
_080D7C18: .4byte gBattlerPartyIndexes
|
||||
_080D7C1C: .4byte gPlayerParty
|
||||
_080D7C20:
|
||||
|
|
@ -1188,7 +1188,7 @@ _080D7C20:
|
|||
_080D7C44: .4byte gBattlerPartyIndexes
|
||||
_080D7C48: .4byte gEnemyParty
|
||||
_080D7C4C:
|
||||
ldr r5, _080D7C98 @ =sBattler_AI
|
||||
ldr r5, _080D7C98 @ =gBattlerAttacker
|
||||
ldrb r0, [r5]
|
||||
bl GetBattlerSide
|
||||
lsls r0, 24
|
||||
|
|
@ -1228,7 +1228,7 @@ _080D7C8C:
|
|||
ldrh r1, [r0]
|
||||
b _080D82A4
|
||||
.align 2, 0
|
||||
_080D7C98: .4byte sBattler_AI
|
||||
_080D7C98: .4byte gBattlerAttacker
|
||||
_080D7C9C: .4byte gBattleTypeFlags
|
||||
_080D7CA0: .4byte gUnknown_83FD555
|
||||
_080D7CA4: .4byte gUnknown_83FD55B
|
||||
|
|
@ -1300,7 +1300,7 @@ _080D7D24:
|
|||
.align 2, 0
|
||||
_080D7D30: .4byte gBattlerPartyIndexes
|
||||
_080D7D34:
|
||||
ldr r5, _080D7D80 @ =gUnknown_2023D6E
|
||||
ldr r5, _080D7D80 @ =gEffectBattler
|
||||
ldrb r0, [r5]
|
||||
bl GetBattlerSide
|
||||
lsls r0, 24
|
||||
|
|
@ -1340,7 +1340,7 @@ _080D7D74:
|
|||
ldrh r1, [r0]
|
||||
b _080D82A4
|
||||
.align 2, 0
|
||||
_080D7D80: .4byte gUnknown_2023D6E
|
||||
_080D7D80: .4byte gEffectBattler
|
||||
_080D7D84: .4byte gBattleTypeFlags
|
||||
_080D7D88: .4byte gUnknown_83FD555
|
||||
_080D7D8C: .4byte gUnknown_83FD55B
|
||||
|
|
@ -1517,7 +1517,7 @@ _080D7EE4:
|
|||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _080D7F9C
|
||||
ldr r2, _080D7F20 @ =gUnknown_2023D68
|
||||
ldr r2, _080D7F20 @ =gLastUsedItem
|
||||
ldrh r0, [r2]
|
||||
cmp r0, 0xAF
|
||||
bne _080D7F98
|
||||
|
|
@ -1540,7 +1540,7 @@ _080D7EE4:
|
|||
b _080D7F90
|
||||
.align 2, 0
|
||||
_080D7F1C: .4byte gBattleTypeFlags
|
||||
_080D7F20: .4byte gUnknown_2023D68
|
||||
_080D7F20: .4byte gLastUsedItem
|
||||
_080D7F24: .4byte gBattleStruct
|
||||
_080D7F28: .4byte gPotentialItemEffectBattler
|
||||
_080D7F2C:
|
||||
|
|
@ -1600,7 +1600,7 @@ _080D7F98:
|
|||
ldrh r0, [r2]
|
||||
b _080D7FA0
|
||||
_080D7F9C:
|
||||
ldr r0, _080D7FAC @ =gUnknown_2023D68
|
||||
ldr r0, _080D7FAC @ =gLastUsedItem
|
||||
ldrh r0, [r0]
|
||||
_080D7FA0:
|
||||
mov r1, sp
|
||||
|
|
@ -1608,7 +1608,7 @@ _080D7FA0:
|
|||
mov r4, sp
|
||||
b _080D8382
|
||||
.align 2, 0
|
||||
_080D7FAC: .4byte gUnknown_2023D68
|
||||
_080D7FAC: .4byte gLastUsedItem
|
||||
_080D7FB0:
|
||||
ldr r0, _080D7FB4 @ =gLastUsedAbility
|
||||
b _080D7FF0
|
||||
|
|
@ -1616,11 +1616,11 @@ _080D7FB0:
|
|||
_080D7FB4: .4byte gLastUsedAbility
|
||||
_080D7FB8:
|
||||
ldr r1, _080D7FC0 @ =gUnknown_2039A30
|
||||
ldr r0, _080D7FC4 @ =sBattler_AI
|
||||
ldr r0, _080D7FC4 @ =gBattlerAttacker
|
||||
b _080D7FEC
|
||||
.align 2, 0
|
||||
_080D7FC0: .4byte gUnknown_2039A30
|
||||
_080D7FC4: .4byte sBattler_AI
|
||||
_080D7FC4: .4byte gBattlerAttacker
|
||||
_080D7FC8:
|
||||
ldr r1, _080D7FD0 @ =gUnknown_2039A30
|
||||
ldr r0, _080D7FD4 @ =gBattlerTarget
|
||||
|
|
@ -1638,7 +1638,7 @@ _080D7FE0: .4byte gUnknown_2039A30
|
|||
_080D7FE4: .4byte gBattleScripting
|
||||
_080D7FE8:
|
||||
ldr r1, _080D7FFC @ =gUnknown_2039A30
|
||||
ldr r0, _080D8000 @ =gUnknown_2023D6E
|
||||
ldr r0, _080D8000 @ =gEffectBattler
|
||||
_080D7FEC:
|
||||
ldrb r0, [r0]
|
||||
_080D7FEE:
|
||||
|
|
@ -1652,7 +1652,7 @@ _080D7FF0:
|
|||
b _080D8382
|
||||
.align 2, 0
|
||||
_080D7FFC: .4byte gUnknown_2039A30
|
||||
_080D8000: .4byte gUnknown_2023D6E
|
||||
_080D8000: .4byte gEffectBattler
|
||||
_080D8004: .4byte gUnknown_824FC40
|
||||
_080D8008:
|
||||
ldr r3, _080D8020 @ =gTrainerBattleOpponent_A
|
||||
|
|
@ -1871,7 +1871,7 @@ _080D819C:
|
|||
movs r0, 0x3
|
||||
_080D81AA:
|
||||
eors r0, r1
|
||||
bl GetBankMultiplayerId
|
||||
bl GetBattlerMultiplayerId
|
||||
lsls r1, r0, 3
|
||||
subs r1, r0
|
||||
lsls r1, 2
|
||||
|
|
@ -1883,7 +1883,7 @@ _080D81BC: .4byte gLinkPlayers
|
|||
_080D81C0:
|
||||
ldr r0, _080D81D4 @ =gBattleScripting
|
||||
ldrb r0, [r0, 0x17]
|
||||
bl GetBankMultiplayerId
|
||||
bl GetBattlerMultiplayerId
|
||||
_080D81C8:
|
||||
lsls r1, r0, 3
|
||||
subs r1, r0
|
||||
|
|
@ -2045,10 +2045,10 @@ _080D830C: .4byte 0x00000834
|
|||
_080D8310: .4byte gUnknown_83FD81A
|
||||
_080D8314: .4byte gUnknown_83FD824
|
||||
_080D8318:
|
||||
ldr r0, _080D831C @ =sBattler_AI
|
||||
ldr r0, _080D831C @ =gBattlerAttacker
|
||||
b _080D8322
|
||||
.align 2, 0
|
||||
_080D831C: .4byte sBattler_AI
|
||||
_080D831C: .4byte gBattlerAttacker
|
||||
_080D8320:
|
||||
ldr r0, _080D8334 @ =gBattlerTarget
|
||||
_080D8322:
|
||||
|
|
@ -2065,10 +2065,10 @@ _080D8334: .4byte gBattlerTarget
|
|||
_080D8338: .4byte gUnknown_83FD569
|
||||
_080D833C: .4byte gUnknown_83FD56D
|
||||
_080D8340:
|
||||
ldr r0, _080D8344 @ =sBattler_AI
|
||||
ldr r0, _080D8344 @ =gBattlerAttacker
|
||||
b _080D834A
|
||||
.align 2, 0
|
||||
_080D8344: .4byte sBattler_AI
|
||||
_080D8344: .4byte gBattlerAttacker
|
||||
_080D8348:
|
||||
ldr r0, _080D835C @ =gBattlerTarget
|
||||
_080D834A:
|
||||
|
|
@ -2085,10 +2085,10 @@ _080D835C: .4byte gBattlerTarget
|
|||
_080D8360: .4byte gUnknown_83FD560
|
||||
_080D8364: .4byte gUnknown_83FD564
|
||||
_080D8368:
|
||||
ldr r0, _080D836C @ =sBattler_AI
|
||||
ldr r0, _080D836C @ =gBattlerAttacker
|
||||
b _080D8372
|
||||
.align 2, 0
|
||||
_080D836C: .4byte sBattler_AI
|
||||
_080D836C: .4byte gBattlerAttacker
|
||||
_080D8370:
|
||||
ldr r0, _080D83D4 @ =gBattlerTarget
|
||||
_080D8372:
|
||||
|
|
@ -2304,10 +2304,10 @@ _080D8504:
|
|||
ldrb r0, [r0, 0x1]
|
||||
lsls r1, r0, 3
|
||||
subs r1, r0
|
||||
ldr r0, _080D8510 @ =gUnknown_824F1A0
|
||||
ldr r0, _080D8510 @ =gTypeNames
|
||||
b _080D8616
|
||||
.align 2, 0
|
||||
_080D8510: .4byte gUnknown_824F1A0
|
||||
_080D8510: .4byte gTypeNames
|
||||
_080D8514:
|
||||
ldrb r0, [r4, 0x1]
|
||||
bl GetBattlerSide
|
||||
|
|
@ -2649,8 +2649,8 @@ _080D87B0:
|
|||
_080D87B8: .4byte gUnknown_83FD58E
|
||||
thumb_func_end sub_80D8720
|
||||
|
||||
thumb_func_start sub_80D87BC
|
||||
sub_80D87BC: @ 80D87BC
|
||||
thumb_func_start BattlePutTextOnWindow
|
||||
BattlePutTextOnWindow: @ 80D87BC
|
||||
push {r4-r7,lr}
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
|
|
@ -2907,7 +2907,7 @@ _080D89A4:
|
|||
pop {r4-r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80D87BC
|
||||
thumb_func_end BattlePutTextOnWindow
|
||||
|
||||
thumb_func_start sub_80D89B0
|
||||
sub_80D89B0: @ 80D89B0
|
||||
|
|
@ -2946,7 +2946,7 @@ SetPpNumbersPaletteInMoveSelection: @ 80D89DC
|
|||
ldr r0, _080D8A3C @ =gUnknown_2022BC8
|
||||
adds r1, r0
|
||||
ldr r4, _080D8A40 @ =gUnknown_8D2FBB4
|
||||
ldr r0, _080D8A44 @ =gUnknown_2023FFC
|
||||
ldr r0, _080D8A44 @ =gMoveSelectionCursor
|
||||
adds r2, r0
|
||||
ldrb r2, [r2]
|
||||
adds r0, r1, 0
|
||||
|
|
@ -2985,7 +2985,7 @@ SetPpNumbersPaletteInMoveSelection: @ 80D89DC
|
|||
_080D8A38: .4byte gActiveBattler
|
||||
_080D8A3C: .4byte gUnknown_2022BC8
|
||||
_080D8A40: .4byte gUnknown_8D2FBB4
|
||||
_080D8A44: .4byte gUnknown_2023FFC
|
||||
_080D8A44: .4byte gMoveSelectionCursor
|
||||
_080D8A48: .4byte gPlttBufferUnfaded
|
||||
_080D8A4C: .4byte gPlttBufferFaded + 0xB8
|
||||
thumb_func_end SetPpNumbersPaletteInMoveSelection
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -2107,12 +2107,12 @@ sub_80806C8: @ 80806C8
|
|||
push {lr}
|
||||
cmp r0, 0
|
||||
bne _080806D0
|
||||
ldr r0, _080806D4 @ =gUnknown_84161CD
|
||||
ldr r0, _080806D4 @ =gString_Dummy
|
||||
_080806D0:
|
||||
pop {r1}
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_080806D4: .4byte gUnknown_84161CD
|
||||
_080806D4: .4byte gString_Dummy
|
||||
thumb_func_end sub_80806C8
|
||||
|
||||
thumb_func_start sub_80806D8
|
||||
|
|
|
|||
|
|
@ -929,8 +929,8 @@ _080E6062:
|
|||
_080E6074: .4byte gSaveBlock2Ptr
|
||||
thumb_func_end sub_80E5E7C
|
||||
|
||||
thumb_func_start sub_80E6078
|
||||
sub_80E6078: @ 80E6078
|
||||
thumb_func_start GetBattleTowerTrainerFrontSpriteId
|
||||
GetBattleTowerTrainerFrontSpriteId: @ 80E6078
|
||||
push {lr}
|
||||
ldr r0, _080E6094 @ =gSaveBlock2Ptr
|
||||
ldr r3, [r0]
|
||||
|
|
@ -983,7 +983,7 @@ _080E60D6:
|
|||
.align 2, 0
|
||||
_080E60DC: .4byte gFacilityClassToPicIndex
|
||||
_080E60E0: .4byte gUnknown_83FFAC4
|
||||
thumb_func_end sub_80E6078
|
||||
thumb_func_end GetBattleTowerTrainerFrontSpriteId
|
||||
|
||||
thumb_func_start sub_80E60E4
|
||||
sub_80E60E4: @ 80E60E4
|
||||
|
|
@ -2799,7 +2799,7 @@ _080E6F0E:
|
|||
ldr r4, _080E6FA4 @ =gSaveBlock2Ptr
|
||||
ldr r1, [r4]
|
||||
adds r1, 0xA
|
||||
bl CopyUnalignedWord
|
||||
bl CopyTrainerId
|
||||
adds r0, r5, 0x4
|
||||
ldr r1, [r4]
|
||||
bl StringCopy7
|
||||
|
|
@ -3369,7 +3369,7 @@ _080E7372:
|
|||
adds r0, 0xC
|
||||
ldr r1, [r5]
|
||||
adds r1, 0xA
|
||||
bl CopyUnalignedWord
|
||||
bl CopyTrainerId
|
||||
adds r0, r7, 0x4
|
||||
ldr r1, [r5]
|
||||
bl StringCopy7
|
||||
|
|
|
|||
12796
asm/battle_util.s
12796
asm/battle_util.s
File diff suppressed because it is too large
Load Diff
|
|
@ -1,333 +0,0 @@
|
|||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.syntax unified
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_802E03C
|
||||
sub_802E03C: @ 802E03C
|
||||
push {r4,r5,lr}
|
||||
ldr r4, _0802E118 @ =gBattleTypeFlags
|
||||
ldr r0, [r4]
|
||||
movs r1, 0x80
|
||||
lsls r1, 12
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _0802E050
|
||||
bl sub_815DA54
|
||||
_0802E050:
|
||||
ldr r0, [r4]
|
||||
movs r1, 0x80
|
||||
lsls r1, 9
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _0802E06E
|
||||
ldr r5, _0802E11C @ =gUnknown_3005EE0
|
||||
movs r4, 0x3
|
||||
_0802E060:
|
||||
movs r0, 0x8
|
||||
bl AllocZeroed
|
||||
stm r5!, {r0}
|
||||
subs r4, 0x1
|
||||
cmp r4, 0
|
||||
bge _0802E060
|
||||
_0802E06E:
|
||||
ldr r4, _0802E120 @ =gBattleStruct
|
||||
movs r0, 0x80
|
||||
lsls r0, 2
|
||||
bl AllocZeroed
|
||||
str r0, [r4]
|
||||
ldr r4, _0802E124 @ =gBattleResources
|
||||
movs r0, 0x20
|
||||
bl AllocZeroed
|
||||
str r0, [r4]
|
||||
movs r0, 0xA0
|
||||
bl AllocZeroed
|
||||
ldr r1, [r4]
|
||||
str r0, [r1]
|
||||
movs r0, 0x10
|
||||
bl AllocZeroed
|
||||
ldr r1, [r4]
|
||||
str r0, [r1, 0x4]
|
||||
movs r0, 0x24
|
||||
bl AllocZeroed
|
||||
ldr r1, [r4]
|
||||
str r0, [r1, 0x8]
|
||||
movs r0, 0x24
|
||||
bl AllocZeroed
|
||||
ldr r1, [r4]
|
||||
str r0, [r1, 0xC]
|
||||
movs r0, 0xC
|
||||
bl AllocZeroed
|
||||
ldr r1, [r4]
|
||||
str r0, [r1, 0x10]
|
||||
movs r0, 0x1C
|
||||
bl AllocZeroed
|
||||
ldr r1, [r4]
|
||||
str r0, [r1, 0x14]
|
||||
movs r0, 0x30
|
||||
bl AllocZeroed
|
||||
ldr r1, [r4]
|
||||
str r0, [r1, 0x18]
|
||||
movs r0, 0x24
|
||||
bl AllocZeroed
|
||||
ldr r1, [r4]
|
||||
str r0, [r1, 0x1C]
|
||||
ldr r4, _0802E128 @ =gUnknown_2023FEC
|
||||
movs r5, 0x80
|
||||
lsls r5, 5
|
||||
adds r0, r5, 0
|
||||
bl AllocZeroed
|
||||
str r0, [r4]
|
||||
ldr r4, _0802E12C @ =gUnknown_2023FF0
|
||||
adds r0, r5, 0
|
||||
bl AllocZeroed
|
||||
str r0, [r4]
|
||||
ldr r4, _0802E130 @ =gUnknown_2022BB8
|
||||
movs r0, 0x80
|
||||
lsls r0, 6
|
||||
bl AllocZeroed
|
||||
str r0, [r4]
|
||||
ldr r4, _0802E134 @ =gUnknown_2022BBC
|
||||
adds r0, r5, 0
|
||||
bl AllocZeroed
|
||||
adds r1, r0, 0
|
||||
str r1, [r4]
|
||||
movs r0, 0x1
|
||||
bl SetBgTilemapBuffer
|
||||
ldr r1, [r4]
|
||||
movs r0, 0x2
|
||||
bl SetBgTilemapBuffer
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0802E118: .4byte gBattleTypeFlags
|
||||
_0802E11C: .4byte gUnknown_3005EE0
|
||||
_0802E120: .4byte gBattleStruct
|
||||
_0802E124: .4byte gBattleResources
|
||||
_0802E128: .4byte gUnknown_2023FEC
|
||||
_0802E12C: .4byte gUnknown_2023FF0
|
||||
_0802E130: .4byte gUnknown_2022BB8
|
||||
_0802E134: .4byte gUnknown_2022BBC
|
||||
thumb_func_end sub_802E03C
|
||||
|
||||
thumb_func_start sub_802E138
|
||||
sub_802E138: @ 802E138
|
||||
push {r4-r6,lr}
|
||||
ldr r4, _0802E208 @ =gBattleTypeFlags
|
||||
ldr r0, [r4]
|
||||
movs r1, 0x80
|
||||
lsls r1, 12
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _0802E14C
|
||||
bl sub_815DBDC
|
||||
_0802E14C:
|
||||
ldr r0, [r4]
|
||||
movs r1, 0x80
|
||||
lsls r1, 9
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _0802E16C
|
||||
ldr r5, _0802E20C @ =gUnknown_3005EE0
|
||||
movs r6, 0
|
||||
movs r4, 0x3
|
||||
_0802E15E:
|
||||
ldr r0, [r5]
|
||||
bl Free
|
||||
stm r5!, {r6}
|
||||
subs r4, 0x1
|
||||
cmp r4, 0
|
||||
bge _0802E15E
|
||||
_0802E16C:
|
||||
ldr r6, _0802E210 @ =gBattleResources
|
||||
ldr r0, [r6]
|
||||
cmp r0, 0
|
||||
beq _0802E200
|
||||
ldr r4, _0802E214 @ =gBattleStruct
|
||||
ldr r0, [r4]
|
||||
bl Free
|
||||
movs r5, 0
|
||||
str r5, [r4]
|
||||
ldr r0, [r6]
|
||||
ldr r0, [r0]
|
||||
bl Free
|
||||
ldr r0, [r6]
|
||||
str r5, [r0]
|
||||
ldr r0, [r0, 0x4]
|
||||
bl Free
|
||||
ldr r0, [r6]
|
||||
str r5, [r0, 0x4]
|
||||
ldr r0, [r0, 0x8]
|
||||
bl Free
|
||||
ldr r0, [r6]
|
||||
str r5, [r0, 0x8]
|
||||
ldr r0, [r0, 0xC]
|
||||
bl Free
|
||||
ldr r0, [r6]
|
||||
str r5, [r0, 0xC]
|
||||
ldr r0, [r0, 0x10]
|
||||
bl Free
|
||||
ldr r0, [r6]
|
||||
str r5, [r0, 0x10]
|
||||
ldr r0, [r0, 0x14]
|
||||
bl Free
|
||||
ldr r0, [r6]
|
||||
str r5, [r0, 0x14]
|
||||
ldr r0, [r0, 0x18]
|
||||
bl Free
|
||||
ldr r0, [r6]
|
||||
str r5, [r0, 0x18]
|
||||
ldr r0, [r0, 0x1C]
|
||||
bl Free
|
||||
ldr r0, [r6]
|
||||
str r5, [r0, 0x1C]
|
||||
bl Free
|
||||
str r5, [r6]
|
||||
ldr r4, _0802E218 @ =gUnknown_2023FEC
|
||||
ldr r0, [r4]
|
||||
bl Free
|
||||
str r5, [r4]
|
||||
ldr r4, _0802E21C @ =gUnknown_2023FF0
|
||||
ldr r0, [r4]
|
||||
bl Free
|
||||
str r5, [r4]
|
||||
ldr r4, _0802E220 @ =gUnknown_2022BB8
|
||||
ldr r0, [r4]
|
||||
bl Free
|
||||
str r5, [r4]
|
||||
ldr r4, _0802E224 @ =gUnknown_2022BBC
|
||||
ldr r0, [r4]
|
||||
bl Free
|
||||
str r5, [r4]
|
||||
_0802E200:
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0802E208: .4byte gBattleTypeFlags
|
||||
_0802E20C: .4byte gUnknown_3005EE0
|
||||
_0802E210: .4byte gBattleResources
|
||||
_0802E214: .4byte gBattleStruct
|
||||
_0802E218: .4byte gUnknown_2023FEC
|
||||
_0802E21C: .4byte gUnknown_2023FF0
|
||||
_0802E220: .4byte gUnknown_2022BB8
|
||||
_0802E224: .4byte gUnknown_2022BBC
|
||||
thumb_func_end sub_802E138
|
||||
|
||||
thumb_func_start sub_802E228
|
||||
sub_802E228: @ 802E228
|
||||
push {r4,r5,lr}
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
ldr r0, _0802E26C @ =gBattleTypeFlags
|
||||
ldr r0, [r0]
|
||||
movs r1, 0x1
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _0802E274
|
||||
movs r0, 0x1
|
||||
bl GetBattlerAtPosition
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
movs r0, 0x3
|
||||
bl GetBattlerAtPosition
|
||||
lsls r0, 24
|
||||
lsrs r3, r0, 24
|
||||
ldr r2, _0802E270 @ =gBattleMons
|
||||
movs r0, 0x58
|
||||
adds r1, r3, 0
|
||||
muls r1, r0
|
||||
adds r1, r2
|
||||
adds r1, 0x2A
|
||||
muls r0, r4
|
||||
adds r0, r2
|
||||
adds r0, 0x2A
|
||||
ldrb r1, [r1]
|
||||
ldrb r0, [r0]
|
||||
cmp r1, r0
|
||||
bls _0802E27E
|
||||
adds r4, r3, 0
|
||||
b _0802E27E
|
||||
.align 2, 0
|
||||
_0802E26C: .4byte gBattleTypeFlags
|
||||
_0802E270: .4byte gBattleMons
|
||||
_0802E274:
|
||||
movs r0, 0x1
|
||||
bl GetBattlerAtPosition
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
_0802E27E:
|
||||
ldr r2, _0802E2C0 @ =gBattleMons
|
||||
movs r1, 0x58
|
||||
adds r0, r4, 0
|
||||
muls r0, r1
|
||||
adds r0, r2
|
||||
adds r3, r0, 0
|
||||
adds r3, 0x2A
|
||||
adds r0, r5, 0
|
||||
muls r0, r1
|
||||
adds r0, r2
|
||||
adds r1, r0, 0
|
||||
adds r1, 0x2A
|
||||
ldrb r0, [r3]
|
||||
ldrb r2, [r1]
|
||||
cmp r0, r2
|
||||
bls _0802E2EC
|
||||
ldrb r1, [r1]
|
||||
subs r0, r1
|
||||
cmp r0, 0x1D
|
||||
ble _0802E2CC
|
||||
ldr r1, _0802E2C4 @ =gBattlerPartyIndexes
|
||||
lsls r0, r5, 1
|
||||
adds r0, r1
|
||||
ldrh r1, [r0]
|
||||
movs r0, 0x64
|
||||
muls r0, r1
|
||||
ldr r1, _0802E2C8 @ =gPlayerParty
|
||||
adds r0, r1
|
||||
movs r1, 0x9
|
||||
bl AdjustFriendship
|
||||
b _0802E302
|
||||
.align 2, 0
|
||||
_0802E2C0: .4byte gBattleMons
|
||||
_0802E2C4: .4byte gBattlerPartyIndexes
|
||||
_0802E2C8: .4byte gPlayerParty
|
||||
_0802E2CC:
|
||||
ldr r1, _0802E2E4 @ =gBattlerPartyIndexes
|
||||
lsls r0, r5, 1
|
||||
adds r0, r1
|
||||
ldrh r1, [r0]
|
||||
movs r0, 0x64
|
||||
muls r0, r1
|
||||
ldr r1, _0802E2E8 @ =gPlayerParty
|
||||
adds r0, r1
|
||||
movs r1, 0x7
|
||||
bl AdjustFriendship
|
||||
b _0802E302
|
||||
.align 2, 0
|
||||
_0802E2E4: .4byte gBattlerPartyIndexes
|
||||
_0802E2E8: .4byte gPlayerParty
|
||||
_0802E2EC:
|
||||
ldr r1, _0802E308 @ =gBattlerPartyIndexes
|
||||
lsls r0, r5, 1
|
||||
adds r0, r1
|
||||
ldrh r1, [r0]
|
||||
movs r0, 0x64
|
||||
muls r0, r1
|
||||
ldr r1, _0802E30C @ =gPlayerParty
|
||||
adds r0, r1
|
||||
movs r1, 0x7
|
||||
bl AdjustFriendship
|
||||
_0802E302:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0802E308: .4byte gBattlerPartyIndexes
|
||||
_0802E30C: .4byte gPlayerParty
|
||||
thumb_func_end sub_802E228
|
||||
|
||||
.align 2, 0 @ Don't pad with nop.
|
||||
|
|
@ -146,7 +146,7 @@ _0814BC44:
|
|||
bl sub_80FA42C
|
||||
b _0814BC66
|
||||
_0814BC4A:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0814BC66
|
||||
|
|
@ -362,7 +362,7 @@ _0814BDCC:
|
|||
bl sub_80FA42C
|
||||
b _0814BDFC
|
||||
_0814BDD2:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0814BE02
|
||||
|
|
@ -497,7 +497,7 @@ _0814BED4:
|
|||
bl sub_80FA42C
|
||||
b _0814BFC0
|
||||
_0814BEDA:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0814BFC6
|
||||
|
|
@ -519,7 +519,7 @@ _0814BEDA:
|
|||
bl SendBlock
|
||||
b _0814BFC0
|
||||
_0814BF0A:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0814BFC6
|
||||
|
|
@ -653,7 +653,7 @@ _0814C008:
|
|||
bl sub_80FA42C
|
||||
b _0814C108
|
||||
_0814C01A:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0814C10E
|
||||
|
|
@ -725,7 +725,7 @@ _0814C080:
|
|||
.align 2, 0
|
||||
_0814C0AC: .4byte sub_814DB84
|
||||
_0814C0B0:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0814C10E
|
||||
|
|
@ -751,7 +751,7 @@ _0814C0D2:
|
|||
bl sub_80FA42C
|
||||
b _0814C108
|
||||
_0814C0E4:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0814C10E
|
||||
|
|
@ -907,7 +907,7 @@ _0814C1FC:
|
|||
bl sub_80FA42C
|
||||
b _0814C23C
|
||||
_0814C21E:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0814C242
|
||||
|
|
@ -951,7 +951,7 @@ _0814C262:
|
|||
beq _0814C298
|
||||
b _0814C2EC
|
||||
_0814C26C:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0814C2F2
|
||||
|
|
@ -972,7 +972,7 @@ _0814C292:
|
|||
bl sub_80FA42C
|
||||
b _0814C2EC
|
||||
_0814C298:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0814C2F2
|
||||
|
|
@ -2070,7 +2070,7 @@ _0814CADA:
|
|||
strh r0, [r4, 0x10]
|
||||
b _0814CB12
|
||||
_0814CAF4:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0814CB18
|
||||
|
|
@ -2172,7 +2172,7 @@ _0814CB8A:
|
|||
bl SetGpuReg
|
||||
b _0814CBFC
|
||||
_0814CBBC:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0814CC02
|
||||
|
|
@ -2273,7 +2273,7 @@ _0814CC72:
|
|||
bl SendBlock
|
||||
b _0814CF8E
|
||||
_0814CC8A:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0814CC96
|
||||
|
|
@ -2618,7 +2618,7 @@ _0814CF24:
|
|||
bl SendBlock
|
||||
b _0814CF8E
|
||||
_0814CF30:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0814CF94
|
||||
|
|
@ -2849,7 +2849,7 @@ _0814D100:
|
|||
bl sub_80FA42C
|
||||
b _0814D178
|
||||
_0814D106:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0814D17E
|
||||
|
|
@ -3031,7 +3031,7 @@ _0814D260:
|
|||
bl sub_80FA42C
|
||||
b _0814D30C
|
||||
_0814D266:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0814D312
|
||||
|
|
@ -3047,7 +3047,7 @@ _0814D266:
|
|||
bl SendBlock
|
||||
b _0814D30C
|
||||
_0814D288:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0814D312
|
||||
|
|
@ -3319,7 +3319,7 @@ _0814D482:
|
|||
bl sub_80FA42C
|
||||
b _0814D4B8
|
||||
_0814D488:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0814D4BE
|
||||
|
|
|
|||
|
|
@ -236,10 +236,10 @@ _0814D7E8: .4byte gUnknown_846ED90
|
|||
_0814D7EC: .4byte gUnknown_846EEC0
|
||||
_0814D7F0: .4byte gUnknown_846F058
|
||||
_0814D7F4:
|
||||
bl sub_80FCEA8
|
||||
bl LoadWirelessStatusIndicatorSpriteGfx
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_80FCD74
|
||||
bl CreateWirelessStatusIndicatorSprite
|
||||
adds r0, r5, 0
|
||||
bl sub_814ECE0
|
||||
ldr r0, _0814D82C @ =gSpriteCoordOffsetY
|
||||
|
|
@ -341,7 +341,7 @@ _0814D8D4:
|
|||
bl sub_80FA42C
|
||||
b _0814D9BA
|
||||
_0814D8DA:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0814D9C0
|
||||
|
|
|
|||
3819
asm/berry_pouch.s
3819
asm/berry_pouch.s
File diff suppressed because it is too large
Load Diff
46
asm/bug.s
46
asm/bug.s
|
|
@ -9,7 +9,7 @@
|
|||
sub_80B3FAC: @ 80B3FAC
|
||||
push {r4-r6,lr}
|
||||
adds r6, r0, 0
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B3FD8
|
||||
|
|
@ -72,7 +72,7 @@ _080B4008:
|
|||
strh r0, [r6, 0x2E]
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r1, [r4, 0x4]
|
||||
|
|
@ -80,13 +80,13 @@ _080B4008:
|
|||
strh r0, [r6, 0x32]
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r4, [r4, 0x6]
|
||||
adds r0, r4
|
||||
strh r0, [r6, 0x36]
|
||||
ldr r0, _080B4074 @ =sub_8075590
|
||||
ldr r0, _080B4074 @ =StartAnimLinearTranslation
|
||||
str r0, [r6, 0x1C]
|
||||
ldr r1, _080B4078 @ =DestroyAnimSprite
|
||||
adds r0, r6, 0
|
||||
|
|
@ -97,7 +97,7 @@ _080B4008:
|
|||
.align 2, 0
|
||||
_080B406C: .4byte gBattleAnimTarget
|
||||
_080B4070: .4byte gBattleAnimArgs
|
||||
_080B4074: .4byte sub_8075590
|
||||
_080B4074: .4byte StartAnimLinearTranslation
|
||||
_080B4078: .4byte DestroyAnimSprite
|
||||
thumb_func_end sub_80B3FAC
|
||||
|
||||
|
|
@ -105,7 +105,7 @@ _080B4078: .4byte DestroyAnimSprite
|
|||
sub_80B407C: @ 80B407C
|
||||
push {r4-r6,lr}
|
||||
adds r6, r0, 0
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B40A0
|
||||
|
|
@ -156,17 +156,17 @@ _080B40BC:
|
|||
strh r0, [r6, 0x2E]
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r6, 0x32]
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r6, 0x36]
|
||||
ldr r0, _080B4120 @ =sub_8075590
|
||||
ldr r0, _080B4120 @ =StartAnimLinearTranslation
|
||||
str r0, [r6, 0x1C]
|
||||
ldr r1, _080B4124 @ =DestroyAnimSprite
|
||||
adds r0, r6, 0
|
||||
|
|
@ -177,7 +177,7 @@ _080B40BC:
|
|||
.align 2, 0
|
||||
_080B4118: .4byte gBattleAnimTarget
|
||||
_080B411C: .4byte gBattleAnimArgs
|
||||
_080B4120: .4byte sub_8075590
|
||||
_080B4120: .4byte StartAnimLinearTranslation
|
||||
_080B4124: .4byte DestroyAnimSprite
|
||||
thumb_func_end sub_80B407C
|
||||
|
||||
|
|
@ -185,7 +185,7 @@ _080B4124: .4byte DestroyAnimSprite
|
|||
sub_80B4128: @ 80B4128
|
||||
push {r4,r5,lr}
|
||||
adds r5, r0, 0
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B4144
|
||||
|
|
@ -214,13 +214,13 @@ _080B4144:
|
|||
ldr r4, _080B4188 @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x32]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x36]
|
||||
|
|
@ -484,7 +484,7 @@ sub_80B4364: @ 80B4364
|
|||
push {r4-r7,lr}
|
||||
sub sp, 0x4
|
||||
adds r7, r0, 0
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B4384
|
||||
|
|
@ -513,7 +513,7 @@ _080B4384:
|
|||
negs r0, r0
|
||||
strh r0, [r1, 0x6]
|
||||
_080B43A6:
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080B43F6
|
||||
|
|
@ -556,7 +556,7 @@ _080B43F6:
|
|||
ldr r5, _080B4488 @ =gBattleAnimTarget
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
ldr r6, _080B4484 @ =gBattleAnimArgs
|
||||
|
|
@ -567,7 +567,7 @@ _080B43F6:
|
|||
lsrs r4, 16
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
adds r1, r0, 0
|
||||
lsls r1, 24
|
||||
lsrs r1, 24
|
||||
|
|
@ -603,7 +603,7 @@ _080B43F6:
|
|||
strh r0, [r7, 0x2E]
|
||||
strh r4, [r7, 0x32]
|
||||
strh r5, [r7, 0x36]
|
||||
ldr r0, _080B448C @ =sub_8075590
|
||||
ldr r0, _080B448C @ =StartAnimLinearTranslation
|
||||
str r0, [r7, 0x1C]
|
||||
ldr r1, _080B4490 @ =DestroyAnimSprite
|
||||
adds r0, r7, 0
|
||||
|
|
@ -616,7 +616,7 @@ _080B43F6:
|
|||
_080B4480: .4byte gBattleAnimAttacker
|
||||
_080B4484: .4byte gBattleAnimArgs
|
||||
_080B4488: .4byte gBattleAnimTarget
|
||||
_080B448C: .4byte sub_8075590
|
||||
_080B448C: .4byte StartAnimLinearTranslation
|
||||
_080B4490: .4byte DestroyAnimSprite
|
||||
thumb_func_end sub_80B4364
|
||||
|
||||
|
|
@ -643,7 +643,7 @@ _080B44B4:
|
|||
ldr r5, _080B4508 @ =gBattleAnimTarget
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r1, [r4, 0x4]
|
||||
|
|
@ -651,7 +651,7 @@ _080B44B4:
|
|||
strh r0, [r6, 0x32]
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r1, [r4, 0x6]
|
||||
|
|
@ -801,13 +801,13 @@ _080B45F4:
|
|||
_080B45F6:
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x20]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
adds r0, 0x12
|
||||
|
|
|
|||
|
|
@ -142,7 +142,7 @@ sub_8080844: @ 8080844
|
|||
lsrs r0, 24
|
||||
lsls r1, 24
|
||||
lsrs r1, 24
|
||||
bl sub_800A0D0
|
||||
bl GetLinkPlayerDataExchangeStatusTimed
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
subs r0, 0x1
|
||||
|
|
@ -384,9 +384,9 @@ sub_80809F8: @ 80809F8
|
|||
ldrsh r2, [r4, r3]
|
||||
cmp r2, 0
|
||||
bne _08080A30
|
||||
bl sub_800A0B4
|
||||
bl OpenLinkTimed
|
||||
bl sub_800AA24
|
||||
bl sub_800A270
|
||||
bl ResetLinkPlayers
|
||||
ldr r0, _08080A2C @ =gUnknown_83C6AB0
|
||||
bl AddWindow
|
||||
strh r0, [r4, 0xA]
|
||||
|
|
@ -439,7 +439,7 @@ sub_8080A4C: @ 8080A4C
|
|||
adds r4, r0, r1
|
||||
movs r0, 0
|
||||
strh r0, [r4, 0xE]
|
||||
bl sub_800AA48
|
||||
bl IsLinkMaster
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
|
|
@ -608,7 +608,7 @@ sub_8080BC8: @ 8080BC8
|
|||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08080C5C
|
||||
bl sub_800A944
|
||||
bl GetSavedPlayerCount
|
||||
adds r4, r0, 0
|
||||
bl GetLinkPlayerCount_2
|
||||
lsls r4, 24
|
||||
|
|
@ -644,7 +644,7 @@ _08080C3C:
|
|||
beq _08080C5C
|
||||
movs r0, 0x5
|
||||
bl PlaySE
|
||||
bl sub_800A5BC
|
||||
bl CheckShouldAdvanceLinkState
|
||||
ldr r0, _08080C64 @ =gTasks
|
||||
lsls r1, r6, 2
|
||||
adds r1, r6
|
||||
|
|
@ -685,7 +685,7 @@ sub_8080C6C: @ 8080C6C
|
|||
beq _08080CCE
|
||||
bl GetLinkPlayerCount_2
|
||||
adds r4, r0, 0
|
||||
bl sub_800A944
|
||||
bl GetSavedPlayerCount
|
||||
lsls r4, 24
|
||||
lsls r0, 24
|
||||
cmp r4, r0
|
||||
|
|
@ -1367,8 +1367,8 @@ sub_80811FC: @ 80811FC
|
|||
ldrsh r2, [r4, r3]
|
||||
cmp r2, 0
|
||||
bne _08081230
|
||||
bl sub_8009804
|
||||
bl sub_800A270
|
||||
bl OpenLink
|
||||
bl ResetLinkPlayers
|
||||
ldr r0, _0808122C @ =sub_8081A90
|
||||
movs r1, 0x50
|
||||
bl CreateTask
|
||||
|
|
@ -1405,7 +1405,7 @@ sub_808124C: @ 808124C
|
|||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
bls _08081292
|
||||
bl sub_800AA48
|
||||
bl IsLinkMaster
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
|
|
@ -1443,14 +1443,14 @@ sub_80812A0: @ 80812A0
|
|||
push {r4,r5,lr}
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
bl sub_800A944
|
||||
bl GetSavedPlayerCount
|
||||
adds r4, r0, 0
|
||||
bl GetLinkPlayerCount_2
|
||||
lsls r4, 24
|
||||
lsls r0, 24
|
||||
cmp r4, r0
|
||||
bne _080812CA
|
||||
bl sub_800A5BC
|
||||
bl CheckShouldAdvanceLinkState
|
||||
ldr r0, _080812D0 @ =gTasks
|
||||
lsls r1, r5, 2
|
||||
adds r1, r5
|
||||
|
|
@ -1541,7 +1541,7 @@ _0808135C:
|
|||
ldr r2, _08081378 @ =0x00002211
|
||||
adds r0, r2, 0
|
||||
strh r0, [r1]
|
||||
bl sub_800A068
|
||||
bl ClearLinkCallback_2
|
||||
b _080813AA
|
||||
.align 2, 0
|
||||
_08081374: .4byte gLinkType
|
||||
|
|
@ -1698,7 +1698,7 @@ _080814A0:
|
|||
ldr r2, _080814C0 @ =0x00002211
|
||||
adds r1, r2, 0
|
||||
strh r1, [r0]
|
||||
bl sub_800A068
|
||||
bl ClearLinkCallback_2
|
||||
movs r0, 0x1
|
||||
strh r0, [r6]
|
||||
b _0808160A
|
||||
|
|
@ -1790,7 +1790,7 @@ _08081560:
|
|||
strh r0, [r6]
|
||||
b _0808160A
|
||||
_0808156A:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0808160A
|
||||
|
|
@ -1901,7 +1901,7 @@ _08081640:
|
|||
strb r0, [r4]
|
||||
b _0808165C
|
||||
_0808164C:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0808165C
|
||||
|
|
@ -2087,7 +2087,7 @@ _080817C0:
|
|||
bl sub_8057F34
|
||||
ldr r0, _080817DC @ =gSpecialVar_0x8005
|
||||
ldrb r0, [r0]
|
||||
bl sub_80096F8
|
||||
bl SetLocalLinkPlayerId
|
||||
movs r0, 0x2
|
||||
strh r0, [r5, 0x8]
|
||||
b _08081820
|
||||
|
|
@ -2180,7 +2180,7 @@ _08081882:
|
|||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
bl fade_screen
|
||||
bl sub_800A068
|
||||
bl ClearLinkCallback_2
|
||||
b _080818B8
|
||||
_08081894:
|
||||
ldr r0, _080818A4 @ =gPaletteFade
|
||||
|
|
@ -2256,7 +2256,7 @@ _0808191A:
|
|||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
bl fade_screen
|
||||
bl sub_80F985C
|
||||
bl Rfu_set_zero
|
||||
b _08081950
|
||||
_0808192C:
|
||||
ldr r0, _0808193C @ =gPaletteFade
|
||||
|
|
@ -2283,7 +2283,7 @@ _08081950:
|
|||
.align 2, 0
|
||||
_08081958: .4byte gUnknown_2031DA4
|
||||
_0808195C:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08081970
|
||||
|
|
@ -2460,7 +2460,7 @@ sub_8081A90: @ 8081A90
|
|||
cmp r1, r0
|
||||
ble _08081AC2
|
||||
bl CloseLink
|
||||
ldr r0, _08081ADC @ =c2_800ACD4
|
||||
ldr r0, _08081ADC @ =CB2_LinkError
|
||||
bl SetMainCallback2
|
||||
adds r0, r4, 0
|
||||
bl DestroyTask
|
||||
|
|
@ -2477,7 +2477,7 @@ _08081AD0:
|
|||
bx r0
|
||||
.align 2, 0
|
||||
_08081AD8: .4byte gTasks
|
||||
_08081ADC: .4byte c2_800ACD4
|
||||
_08081ADC: .4byte CB2_LinkError
|
||||
_08081AE0: .4byte gReceivedRemoteLinkPlayers
|
||||
thumb_func_end sub_8081A90
|
||||
|
||||
|
|
|
|||
2222
asm/credits.s
2222
asm/credits.s
File diff suppressed because it is too large
Load Diff
40
asm/dark.s
40
asm/dark.s
|
|
@ -256,33 +256,33 @@ sub_80B7ACC: @ 80B7ACC
|
|||
ldr r6, _080B7B38 @ =gBattleAnimTarget
|
||||
ldrb r0, [r6]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x30]
|
||||
ldr r5, _080B7B3C @ =gBattleAnimAttacker
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x32]
|
||||
ldrb r0, [r6]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x34]
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x36]
|
||||
movs r0, 0x7E
|
||||
strh r0, [r4, 0x2E]
|
||||
adds r0, r4, 0
|
||||
bl sub_80754B8
|
||||
bl InitSpriteDataForLinearTranslation
|
||||
ldrh r0, [r4, 0x30]
|
||||
negs r0, r0
|
||||
strh r0, [r4, 0x34]
|
||||
|
|
@ -634,7 +634,7 @@ sub_80B7DA4: @ 80B7DA4
|
|||
ldr r4, _080B7E0C @ =gBattleAnimAttacker
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x1
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
adds r0, 0x1F
|
||||
|
|
@ -653,7 +653,7 @@ sub_80B7DA4: @ 80B7DA4
|
|||
strh r1, [r5, 0x22]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
adds r1, r0, 0
|
||||
|
|
@ -701,7 +701,7 @@ _080B7E16:
|
|||
ldr r0, _080B7E70 @ =0x04000016
|
||||
str r0, [sp]
|
||||
movs r7, 0x2
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080B7EA8
|
||||
|
|
@ -728,7 +728,7 @@ _080B7E78:
|
|||
ldr r0, _080B7F38 @ =0x0400001a
|
||||
str r0, [sp]
|
||||
movs r7, 0x4
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080B7EA8
|
||||
|
|
@ -995,7 +995,7 @@ _080B80A0:
|
|||
.4byte _080B81E8
|
||||
.4byte _080B8250
|
||||
_080B80B4:
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
|
|
@ -1087,7 +1087,7 @@ _080B817C:
|
|||
ldr r4, _080B81C8 @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x1
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
adds r0, 0x1F
|
||||
|
|
@ -1104,7 +1104,7 @@ _080B817C:
|
|||
strh r1, [r5, 0x22]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
subs r1, r0, 0x4
|
||||
|
|
@ -1685,7 +1685,7 @@ sub_80B85B8: @ 80B85B8
|
|||
ldrb r0, [r6]
|
||||
movs r5, 0x2
|
||||
eors r0, r5
|
||||
bl sub_8072DF0
|
||||
bl IsBattlerSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B8642
|
||||
|
|
@ -1744,7 +1744,7 @@ sub_80B8664: @ 80B8664
|
|||
ldrb r1, [r4]
|
||||
movs r0, 0x2
|
||||
eors r0, r1
|
||||
bl sub_8072DF0
|
||||
bl IsBattlerSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B86A0
|
||||
|
|
@ -1827,7 +1827,7 @@ sub_80B86EC: @ 80B86EC
|
|||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl SetAnimBgAttribute
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080B8750
|
||||
|
|
@ -1836,11 +1836,11 @@ sub_80B86EC: @ 80B86EC
|
|||
movs r2, 0x1
|
||||
bl SetAnimBgAttribute
|
||||
_080B8750:
|
||||
bl sub_8075290
|
||||
bl IsDoubleBattle
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B87CA
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080B87CA
|
||||
|
|
@ -1860,7 +1860,7 @@ _080B8780:
|
|||
ldrb r0, [r4]
|
||||
movs r5, 0x2
|
||||
eors r0, r5
|
||||
bl sub_8072DF0
|
||||
bl IsBattlerSpriteVisible
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
|
|
@ -2155,7 +2155,7 @@ _080B89FC:
|
|||
movs r0, 0x4A
|
||||
adds r1, r4, 0
|
||||
bl SetGpuReg
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080B8A2E
|
||||
|
|
@ -2254,7 +2254,7 @@ _080B8AE0:
|
|||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
adds r0, r4, 0
|
||||
bl sub_8072DF0
|
||||
bl IsBattlerSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B8B04
|
||||
|
|
|
|||
|
|
@ -385,7 +385,7 @@ _08150B08:
|
|||
bl sub_80FA42C
|
||||
b _08150BDC
|
||||
_08150B16:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08150BFC
|
||||
|
|
@ -393,10 +393,10 @@ _08150B16:
|
|||
ldrb r0, [r0]
|
||||
cmp r0, 0
|
||||
beq _08150BDC
|
||||
bl sub_80FCEA8
|
||||
bl LoadWirelessStatusIndicatorSpriteGfx
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_80FCD74
|
||||
bl CreateWirelessStatusIndicatorSprite
|
||||
b _08150BDC
|
||||
.align 2, 0
|
||||
_08150B38: .4byte gReceivedRemoteLinkPlayers
|
||||
|
|
@ -652,7 +652,7 @@ _08150D28:
|
|||
bl sub_815F138
|
||||
b _08150D52
|
||||
_08150D3A:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08150D74
|
||||
|
|
@ -673,7 +673,7 @@ _08150D52:
|
|||
.align 2, 0
|
||||
_08150D60: .4byte gUnknown_203F3E0
|
||||
_08150D64:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08150D74
|
||||
|
|
@ -1025,7 +1025,7 @@ _08150FFE:
|
|||
ldr r1, [r6]
|
||||
b _0815106A
|
||||
_08151010:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08151092
|
||||
|
|
@ -1131,7 +1131,7 @@ _081510BE:
|
|||
ldr r1, [r6]
|
||||
b _08151140
|
||||
_081510DA:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0815118A
|
||||
|
|
@ -1276,7 +1276,7 @@ _081511DC:
|
|||
ldr r1, [r6]
|
||||
b _0815128A
|
||||
_08151202:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _081512AA
|
||||
|
|
@ -1463,7 +1463,7 @@ _0815136A:
|
|||
.align 2, 0
|
||||
_08151388: .4byte gUnknown_203F3E0
|
||||
_0815138C:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08151480
|
||||
|
|
@ -1984,7 +1984,7 @@ _0815177E:
|
|||
_081517A0: .4byte gUnknown_203F3E0
|
||||
_081517A4: .4byte 0x0000318c
|
||||
_081517A8:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08151836
|
||||
|
|
|
|||
28
asm/dragon.s
28
asm/dragon.s
|
|
@ -12,13 +12,13 @@ sub_80B725C: @ 80B725C
|
|||
ldr r4, _080B72A4 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x20]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x22]
|
||||
|
|
@ -90,13 +90,13 @@ sub_80B72F8: @ 80B72F8
|
|||
ldr r4, _080B7350 @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x32]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x36]
|
||||
|
|
@ -152,7 +152,7 @@ _080B7386:
|
|||
ldr r0, _080B73A0 @ =gBattleAnimArgs
|
||||
ldrh r0, [r0, 0x8]
|
||||
strh r0, [r5, 0x2E]
|
||||
ldr r0, _080B73A4 @ =sub_8075590
|
||||
ldr r0, _080B73A4 @ =StartAnimLinearTranslation
|
||||
str r0, [r5, 0x1C]
|
||||
ldr r1, _080B73A8 @ =move_anim_8074EE0
|
||||
adds r0, r5, 0
|
||||
|
|
@ -162,7 +162,7 @@ _080B7386:
|
|||
bx r0
|
||||
.align 2, 0
|
||||
_080B73A0: .4byte gBattleAnimArgs
|
||||
_080B73A4: .4byte sub_8075590
|
||||
_080B73A4: .4byte StartAnimLinearTranslation
|
||||
_080B73A8: .4byte move_anim_8074EE0
|
||||
thumb_func_end sub_80B72F8
|
||||
|
||||
|
|
@ -185,13 +185,13 @@ _080B73C8:
|
|||
_080B73CA:
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x20]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x1
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x22]
|
||||
|
|
@ -249,14 +249,14 @@ sub_80B7448: @ 80B7448
|
|||
ldr r4, _080B749C @ =gBattleAnimAttacker
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
movs r5, 0
|
||||
strh r0, [r6, 0x20]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r6, 0x22]
|
||||
|
|
@ -266,7 +266,7 @@ sub_80B7448: @ 80B7448
|
|||
ldr r0, _080B74A0 @ =gBattleAnimArgs
|
||||
ldrh r0, [r0]
|
||||
strh r0, [r6, 0x3A]
|
||||
ldr r4, _080B74A4 @ =sBattler_AI
|
||||
ldr r4, _080B74A4 @ =gBattlerAttacker
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0
|
||||
bl sub_8076B2C
|
||||
|
|
@ -284,7 +284,7 @@ sub_80B7448: @ 80B7448
|
|||
.align 2, 0
|
||||
_080B749C: .4byte gBattleAnimAttacker
|
||||
_080B74A0: .4byte gBattleAnimArgs
|
||||
_080B74A4: .4byte sBattler_AI
|
||||
_080B74A4: .4byte gBattlerAttacker
|
||||
_080B74A8:
|
||||
lsrs r0, r1, 17
|
||||
_080B74AA:
|
||||
|
|
@ -726,14 +726,14 @@ sub_80B77E4: @ 80B77E4
|
|||
mov r8, r1
|
||||
ldrb r0, [r1]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x20]
|
||||
mov r2, r8
|
||||
ldrb r0, [r2]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r3, [r5, 0x8]
|
||||
|
|
|
|||
|
|
@ -797,7 +797,7 @@ _080BDCA4: .4byte 0x0000ffff
|
|||
thumb_func_start sub_80BDCA8
|
||||
sub_80BDCA8: @ 80BDCA8
|
||||
push {lr}
|
||||
bl sub_806E25C
|
||||
bl IsNationalPokedexEnabled
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
pop {r1}
|
||||
|
|
@ -868,8 +868,8 @@ _080BDD2C: .4byte gUnknown_83ECED4
|
|||
_080BDD30: .4byte 0x0000ffff
|
||||
thumb_func_end sub_80BDCB8
|
||||
|
||||
thumb_func_start sub_80BDD34
|
||||
sub_80BDD34: @ 80BDD34
|
||||
thumb_func_start InitEasyChatPhrases
|
||||
InitEasyChatPhrases: @ 80BDD34
|
||||
push {r4-r7,lr}
|
||||
movs r4, 0
|
||||
ldr r5, _080BDE00 @ =gSaveBlock1Ptr
|
||||
|
|
@ -988,7 +988,7 @@ _080BDE18: .4byte 0x0000ffff
|
|||
_080BDE1C: .4byte 0x00002cc4
|
||||
_080BDE20: .4byte 0x00002cd0
|
||||
_080BDE24: .4byte 0x00002f10
|
||||
thumb_func_end sub_80BDD34
|
||||
thumb_func_end InitEasyChatPhrases
|
||||
|
||||
thumb_func_start sub_80BDE28
|
||||
sub_80BDE28: @ 80BDE28
|
||||
|
|
@ -1116,7 +1116,7 @@ _080BDEB2:
|
|||
movs r0, 0x13
|
||||
strh r0, [r3]
|
||||
_080BDF0C:
|
||||
bl sub_806E25C
|
||||
bl IsNationalPokedexEnabled
|
||||
cmp r0, 0
|
||||
beq _080BDF2A
|
||||
ldr r0, _080BDF30 @ =gUnknown_20399BC
|
||||
|
|
|
|||
|
|
@ -123,13 +123,13 @@ sub_80ADCB8: @ 80ADCB8
|
|||
ldr r4, _080ADCFC @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x20]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x22]
|
||||
|
|
@ -219,7 +219,7 @@ _080ADD7C:
|
|||
ldrb r0, [r4]
|
||||
movs r6, 0x2
|
||||
eors r0, r6
|
||||
bl sub_8072DF0
|
||||
bl IsBattlerSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080ADD98
|
||||
|
|
@ -237,7 +237,7 @@ _080ADDA0:
|
|||
ldrb r0, [r0]
|
||||
movs r4, 0x2
|
||||
eors r0, r4
|
||||
bl sub_8072DF0
|
||||
bl IsBattlerSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080ADDC4
|
||||
|
|
@ -260,7 +260,7 @@ _080ADDC8:
|
|||
bne _080ADDF0
|
||||
adds r0, r4, 0
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x20]
|
||||
|
|
@ -273,14 +273,14 @@ _080ADDEC: .4byte gBattleAnimArgs
|
|||
_080ADDF0:
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x20]
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x3
|
||||
_080ADE02:
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x22]
|
||||
|
|
@ -379,7 +379,7 @@ sub_80ADEB0: @ 80ADEB0
|
|||
ldr r6, _080ADF28 @ =gBattleAnimTarget
|
||||
ldrb r0, [r6]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x32]
|
||||
|
|
@ -387,7 +387,7 @@ sub_80ADEB0: @ 80ADEB0
|
|||
strh r0, [r4, 0x34]
|
||||
ldrb r0, [r6]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x36]
|
||||
|
|
@ -536,7 +536,7 @@ _080ADFFA:
|
|||
sub_80AE000: @ 80AE000
|
||||
push {r4-r6,lr}
|
||||
adds r6, r0, 0
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080AE01C
|
||||
|
|
@ -555,7 +555,7 @@ _080AE024:
|
|||
ldr r5, _080AE060 @ =gBattleAnimTarget
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
ldr r4, _080AE064 @ =gBattleAnimArgs
|
||||
lsrs r0, 24
|
||||
|
|
@ -564,7 +564,7 @@ _080AE024:
|
|||
strh r0, [r6, 0x20]
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r1, [r4, 0x4]
|
||||
|
|
@ -609,7 +609,7 @@ _080AE090:
|
|||
ldr r0, _080AE118 @ =gBattleAnimAttacker
|
||||
_080AE092:
|
||||
ldrb r6, [r0]
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080AE0AA
|
||||
|
|
@ -626,7 +626,7 @@ _080AE0AA:
|
|||
_080AE0B2:
|
||||
adds r0, r6, 0
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
ldr r4, _080AE11C @ =gBattleAnimArgs
|
||||
lsrs r0, 24
|
||||
|
|
@ -635,7 +635,7 @@ _080AE0B2:
|
|||
strh r0, [r5, 0x20]
|
||||
adds r0, r6, 0
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r1, [r4, 0x2]
|
||||
|
|
@ -811,7 +811,7 @@ sub_80AE220: @ 80AE220
|
|||
ldr r6, _080AE268 @ =gBattleAnimTarget
|
||||
ldrb r0, [r6]
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
ldr r1, _080AE26C @ =gTasks
|
||||
lsls r4, r5, 2
|
||||
adds r4, r5
|
||||
|
|
@ -825,7 +825,7 @@ sub_80AE220: @ 80AE220
|
|||
strh r0, [r4, 0x8]
|
||||
ldrb r0, [r6]
|
||||
movs r1, 0x1
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r1, [r5, 0x2]
|
||||
|
|
@ -1233,13 +1233,13 @@ _080AE56C:
|
|||
_080AE56E:
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x24]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x26]
|
||||
|
|
@ -1466,13 +1466,13 @@ _080AE738:
|
|||
_080AE73A:
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x20]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x22]
|
||||
|
|
@ -1509,13 +1509,13 @@ _080AE790:
|
|||
_080AE792:
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x20]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x22]
|
||||
|
|
@ -1548,13 +1548,13 @@ sub_80AE7DC: @ 80AE7DC
|
|||
ldr r4, _080AE834 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x20]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x22]
|
||||
|
|
@ -1680,7 +1680,7 @@ _080AE8D4:
|
|||
ldr r4, _080AE908 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x24]
|
||||
|
|
@ -1897,13 +1897,13 @@ _080AEA88: .4byte 0x0000fff0
|
|||
_080AEA8C:
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0xE]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x12]
|
||||
|
|
@ -1923,13 +1923,13 @@ _080AEAB4:
|
|||
ldr r4, _080AEAE8 @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x12]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
movs r2, 0xA
|
||||
|
|
@ -2175,13 +2175,13 @@ _080AEC92:
|
|||
ldr r4, _080AECC0 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x20]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x22]
|
||||
|
|
@ -2245,13 +2245,13 @@ _080AED20:
|
|||
ldr r4, _080AEDA4 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x14]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x16]
|
||||
|
|
@ -2260,7 +2260,7 @@ _080AED20:
|
|||
ldr r0, _080AEDA8 @ =gBattleAnimTarget
|
||||
ldrb r0, [r0]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x1C]
|
||||
|
|
@ -2603,7 +2603,7 @@ _080AEFCE:
|
|||
ldr r0, _080AF018 @ =gBattleAnimTarget
|
||||
ldrb r0, [r0]
|
||||
movs r1, 0x1
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
adds r0, 0x20
|
||||
|
|
@ -2625,12 +2625,12 @@ _080AEFF8:
|
|||
ldr r4, _080AF018 @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x22]
|
||||
ldrb r0, [r4]
|
||||
bl sub_807685C
|
||||
bl GetBattlerSpriteSubpriority
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
subs r0, 0x2
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_806E0D0
|
||||
sub_806E0D0: @ 806E0D0
|
||||
thumb_func_start InitEventData
|
||||
InitEventData: @ 806E0D0
|
||||
push {r4,lr}
|
||||
ldr r4, _0806E108 @ =gSaveBlock1Ptr
|
||||
ldr r0, [r4]
|
||||
|
|
@ -35,7 +35,7 @@ sub_806E0D0: @ 806E0D0
|
|||
.align 2, 0
|
||||
_0806E108: .4byte gSaveBlock1Ptr
|
||||
_0806E10C: .4byte gUnknown_20370E0
|
||||
thumb_func_end sub_806E0D0
|
||||
thumb_func_end InitEventData
|
||||
|
||||
thumb_func_start sub_806E110
|
||||
sub_806E110: @ 806E110
|
||||
|
|
@ -193,8 +193,8 @@ _0806E254: .4byte gSaveBlock2Ptr
|
|||
_0806E258: .4byte 0x00006258
|
||||
thumb_func_end EnableNationalPokedex
|
||||
|
||||
thumb_func_start sub_806E25C
|
||||
sub_806E25C: @ 806E25C
|
||||
thumb_func_start IsNationalPokedexEnabled
|
||||
IsNationalPokedexEnabled: @ 806E25C
|
||||
push {lr}
|
||||
ldr r0, _0806E288 @ =gSaveBlock2Ptr
|
||||
ldr r0, [r0]
|
||||
|
|
@ -224,7 +224,7 @@ _0806E294:
|
|||
_0806E296:
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_806E25C
|
||||
thumb_func_end IsNationalPokedexEnabled
|
||||
|
||||
thumb_func_start sub_806E29C
|
||||
sub_806E29C: @ 806E29C
|
||||
|
|
|
|||
|
|
@ -192,7 +192,7 @@ EvolutionScene: @ 80CDDF4
|
|||
ldr r0, _080CE09C @ =gBattle_BG3_Y
|
||||
movs r1, 0
|
||||
strh r1, [r0]
|
||||
ldr r1, _080CE0A0 @ =gUnknown_2022B50
|
||||
ldr r1, _080CE0A0 @ =gBattleTerrain
|
||||
movs r0, 0x9
|
||||
strb r0, [r1]
|
||||
bl sub_800F34C
|
||||
|
|
@ -409,7 +409,7 @@ _080CE090: .4byte gBattle_BG2_X
|
|||
_080CE094: .4byte gBattle_BG2_Y
|
||||
_080CE098: .4byte gBattle_BG3_X
|
||||
_080CE09C: .4byte gBattle_BG3_Y
|
||||
_080CE0A0: .4byte gUnknown_2022B50
|
||||
_080CE0A0: .4byte gBattleTerrain
|
||||
_080CE0A4: .4byte gReservedSpritePaletteCount
|
||||
_080CE0A8: .4byte gUnknown_2039A20
|
||||
_080CE0AC: .4byte gStringVar1
|
||||
|
|
@ -513,7 +513,7 @@ CB2_EvolutionSceneLoadGraphics: @ 80CE0E8
|
|||
strh r0, [r1]
|
||||
ldr r0, _080CE2AC @ =gBattle_BG3_Y
|
||||
strh r4, [r0]
|
||||
ldr r1, _080CE2B0 @ =gUnknown_2022B50
|
||||
ldr r1, _080CE2B0 @ =gBattleTerrain
|
||||
movs r0, 0x9
|
||||
strb r0, [r1]
|
||||
bl sub_800F34C
|
||||
|
|
@ -616,7 +616,7 @@ _080CE2A0: .4byte gBattle_BG2_X
|
|||
_080CE2A4: .4byte gBattle_BG2_Y
|
||||
_080CE2A8: .4byte gBattle_BG3_X
|
||||
_080CE2AC: .4byte gBattle_BG3_Y
|
||||
_080CE2B0: .4byte gUnknown_2022B50
|
||||
_080CE2B0: .4byte gBattleTerrain
|
||||
_080CE2B4: .4byte gReservedSpritePaletteCount
|
||||
_080CE2B8: .4byte gMonFrontPicTable
|
||||
_080CE2BC: .4byte gMonSpritesGfxPtr
|
||||
|
|
@ -843,10 +843,10 @@ _080CE4CC:
|
|||
ldrb r0, [r0]
|
||||
cmp r0, 0
|
||||
beq _080CE4E0
|
||||
bl sub_80FCEA8
|
||||
bl LoadWirelessStatusIndicatorSpriteGfx
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_80FCD74
|
||||
bl CreateWirelessStatusIndicatorSprite
|
||||
_080CE4E0:
|
||||
movs r0, 0x1
|
||||
negs r0, r0
|
||||
|
|
@ -1321,7 +1321,7 @@ sub_80CE8DC: @ 80CE8DC
|
|||
ldr r0, _080CE940 @ =gPlayerParty
|
||||
adds r1, r0
|
||||
mov r9, r1
|
||||
bl sub_806E25C
|
||||
bl IsNationalPokedexEnabled
|
||||
mov r10, r4
|
||||
cmp r0, 0
|
||||
bne _080CE948
|
||||
|
|
@ -1337,7 +1337,7 @@ sub_80CE8DC: @ 80CE8DC
|
|||
strh r0, [r5, 0x8]
|
||||
movs r2, 0x1
|
||||
strh r2, [r5, 0x1A]
|
||||
ldr r0, _080CE944 @ =gUnknown_2023E82
|
||||
ldr r0, _080CE944 @ =gBattleCommunication
|
||||
ldrb r1, [r0, 0x2]
|
||||
lsls r0, r1, 2
|
||||
adds r0, r1
|
||||
|
|
@ -1349,7 +1349,7 @@ sub_80CE8DC: @ 80CE8DC
|
|||
.align 2, 0
|
||||
_080CE93C: .4byte gTasks
|
||||
_080CE940: .4byte gPlayerParty
|
||||
_080CE944: .4byte gUnknown_2023E82
|
||||
_080CE944: .4byte gBattleCommunication
|
||||
_080CE948:
|
||||
ldr r0, _080CE9A0 @ =gMain
|
||||
ldrh r1, [r0, 0x2C]
|
||||
|
|
@ -1367,7 +1367,7 @@ _080CE948:
|
|||
ldrsh r0, [r2, r3]
|
||||
cmp r0, 0x8
|
||||
bne _080CE9AC
|
||||
ldr r4, _080CE9A8 @ =gUnknown_2023E82
|
||||
ldr r4, _080CE9A8 @ =gBattleCommunication
|
||||
ldrb r0, [r4, 0x2]
|
||||
lsls r1, r0, 2
|
||||
adds r1, r0
|
||||
|
|
@ -1395,7 +1395,7 @@ _080CE948:
|
|||
.align 2, 0
|
||||
_080CE9A0: .4byte gMain
|
||||
_080CE9A4: .4byte gTasks
|
||||
_080CE9A8: .4byte gUnknown_2023E82
|
||||
_080CE9A8: .4byte gBattleCommunication
|
||||
_080CE9AC:
|
||||
mov r1, r8
|
||||
adds r0, r1, r7
|
||||
|
|
@ -1497,7 +1497,7 @@ _080CEAA0:
|
|||
bl StringExpandPlaceholders
|
||||
adds r0, r4, 0
|
||||
movs r1, 0
|
||||
bl sub_80D87BC
|
||||
bl BattlePutTextOnWindow
|
||||
ldr r0, _080CEACC @ =gTasks
|
||||
mov r2, r8
|
||||
adds r1, r2, r7
|
||||
|
|
@ -1584,7 +1584,7 @@ _080CEB68:
|
|||
bl InitMovingBackgroundTask
|
||||
movs r0, 0x11
|
||||
bl LaunchTask_PreEvoSparklesSet1
|
||||
ldr r1, _080CEB88 @ =gUnknown_2023E82
|
||||
ldr r1, _080CEB88 @ =gBattleCommunication
|
||||
strb r0, [r1, 0x2]
|
||||
ldr r0, _080CEB8C @ =gTasks
|
||||
mov r2, r8
|
||||
|
|
@ -1594,10 +1594,10 @@ _080CEB68:
|
|||
b _080CEFDE
|
||||
.align 2, 0
|
||||
_080CEB84: .4byte gPaletteFade
|
||||
_080CEB88: .4byte gUnknown_2023E82
|
||||
_080CEB88: .4byte gBattleCommunication
|
||||
_080CEB8C: .4byte gTasks
|
||||
_080CEB90:
|
||||
ldr r4, _080CEBC8 @ =gUnknown_2023E82
|
||||
ldr r4, _080CEBC8 @ =gBattleCommunication
|
||||
ldrb r0, [r4, 0x2]
|
||||
lsls r1, r0, 2
|
||||
adds r1, r0
|
||||
|
|
@ -1623,10 +1623,10 @@ _080CEBA6:
|
|||
strb r0, [r4, 0x2]
|
||||
bl _080CF528
|
||||
.align 2, 0
|
||||
_080CEBC8: .4byte gUnknown_2023E82
|
||||
_080CEBC8: .4byte gBattleCommunication
|
||||
_080CEBCC: .4byte gUnknown_2039A20
|
||||
_080CEBD0:
|
||||
ldr r4, _080CEC00 @ =gUnknown_2023E82
|
||||
ldr r4, _080CEC00 @ =gBattleCommunication
|
||||
ldrb r0, [r4, 0x2]
|
||||
lsls r1, r0, 2
|
||||
adds r1, r0
|
||||
|
|
@ -1649,7 +1649,7 @@ _080CEBE6:
|
|||
add r1, r10
|
||||
b _080CEFDE
|
||||
.align 2, 0
|
||||
_080CEC00: .4byte gUnknown_2023E82
|
||||
_080CEC00: .4byte gBattleCommunication
|
||||
_080CEC04: .4byte gUnknown_2039A20
|
||||
_080CEC08:
|
||||
ldr r2, _080CEC44 @ =gUnknown_2039A20
|
||||
|
|
@ -1665,7 +1665,7 @@ _080CEC1C:
|
|||
ldr r1, [r2]
|
||||
movs r0, 0x3
|
||||
strb r0, [r1, 0x3]
|
||||
ldr r0, _080CEC48 @ =gUnknown_2023E82
|
||||
ldr r0, _080CEC48 @ =gBattleCommunication
|
||||
ldrb r1, [r0, 0x2]
|
||||
lsls r0, r1, 2
|
||||
adds r0, r1
|
||||
|
|
@ -1683,10 +1683,10 @@ _080CEC38:
|
|||
b _080CEFDE
|
||||
.align 2, 0
|
||||
_080CEC44: .4byte gUnknown_2039A20
|
||||
_080CEC48: .4byte gUnknown_2023E82
|
||||
_080CEC48: .4byte gBattleCommunication
|
||||
_080CEC4C:
|
||||
bl sub_80F5F74
|
||||
ldr r1, _080CEC60 @ =gUnknown_2023E82
|
||||
ldr r1, _080CEC60 @ =gBattleCommunication
|
||||
strb r0, [r1, 0x2]
|
||||
ldr r0, _080CEC64 @ =gTasks
|
||||
mov r3, r8
|
||||
|
|
@ -1695,10 +1695,10 @@ _080CEC4C:
|
|||
adds r1, r0
|
||||
b _080CEFDE
|
||||
.align 2, 0
|
||||
_080CEC60: .4byte gUnknown_2023E82
|
||||
_080CEC60: .4byte gBattleCommunication
|
||||
_080CEC64: .4byte gTasks
|
||||
_080CEC68:
|
||||
ldr r6, _080CEC90 @ =gUnknown_2023E82
|
||||
ldr r6, _080CEC90 @ =gBattleCommunication
|
||||
ldrb r0, [r6, 0x2]
|
||||
lsls r1, r0, 2
|
||||
adds r1, r0
|
||||
|
|
@ -1718,9 +1718,9 @@ _080CEC7E:
|
|||
strb r0, [r6, 0x2]
|
||||
b _080CEF2E
|
||||
.align 2, 0
|
||||
_080CEC90: .4byte gUnknown_2023E82
|
||||
_080CEC90: .4byte gBattleCommunication
|
||||
_080CEC94:
|
||||
ldr r0, _080CECBC @ =gUnknown_2023E82
|
||||
ldr r0, _080CECBC @ =gBattleCommunication
|
||||
ldrb r1, [r0, 0x2]
|
||||
lsls r0, r1, 2
|
||||
adds r0, r1
|
||||
|
|
@ -1739,7 +1739,7 @@ _080CECAA:
|
|||
add r1, r10
|
||||
b _080CEFDE
|
||||
.align 2, 0
|
||||
_080CECBC: .4byte gUnknown_2023E82
|
||||
_080CECBC: .4byte gBattleCommunication
|
||||
_080CECC0:
|
||||
bl IsSEPlaying
|
||||
lsls r0, 24
|
||||
|
|
@ -1802,7 +1802,7 @@ _080CED3A:
|
|||
bl StringExpandPlaceholders
|
||||
adds r0, r4, 0
|
||||
movs r1, 0
|
||||
bl sub_80D87BC
|
||||
bl BattlePutTextOnWindow
|
||||
ldr r0, _080CEDB0 @ =0x00000103
|
||||
bl PlayBGM
|
||||
ldr r2, _080CEDB4 @ =gTasks
|
||||
|
|
@ -1971,7 +1971,7 @@ _080CEEC4: .4byte gPaletteFade
|
|||
_080CEEC8: .4byte gUnknown_2039A20
|
||||
_080CEECC: .4byte gUnknown_300537C
|
||||
_080CEED0:
|
||||
ldr r0, _080CEF04 @ =gUnknown_2023E82
|
||||
ldr r0, _080CEF04 @ =gBattleCommunication
|
||||
ldrb r1, [r0, 0x2]
|
||||
lsls r0, r1, 2
|
||||
adds r0, r1
|
||||
|
|
@ -1996,7 +1996,7 @@ _080CEEE4:
|
|||
add r1, r10
|
||||
b _080CEFDE
|
||||
.align 2, 0
|
||||
_080CEF04: .4byte gUnknown_2023E82
|
||||
_080CEF04: .4byte gBattleCommunication
|
||||
_080CEF08: .4byte 0x0006001c
|
||||
_080CEF0C: .4byte 0x00007fff
|
||||
_080CEF10:
|
||||
|
|
@ -2055,7 +2055,7 @@ _080CEF70:
|
|||
_080CEF78:
|
||||
ldr r0, _080CEF90 @ =gStringVar4
|
||||
movs r1, 0
|
||||
bl sub_80D87BC
|
||||
bl BattlePutTextOnWindow
|
||||
ldr r1, _080CEF98 @ =gTasks
|
||||
mov r2, r8
|
||||
adds r0, r2, r7
|
||||
|
|
@ -2090,7 +2090,7 @@ _080CEFB6:
|
|||
bl BattleStringExpandPlaceholdersToDisplayedString
|
||||
ldr r0, _080CEFF0 @ =gDisplayedStringBattle
|
||||
movs r1, 0
|
||||
bl sub_80D87BC
|
||||
bl BattlePutTextOnWindow
|
||||
ldr r0, _080CEFF4 @ =gTasks
|
||||
mov r3, r8
|
||||
adds r1, r3, r7
|
||||
|
|
@ -2193,7 +2193,7 @@ _080CF0A2:
|
|||
bl BattleStringExpandPlaceholdersToDisplayedString
|
||||
ldr r0, _080CF0CC @ =gDisplayedStringBattle
|
||||
movs r1, 0
|
||||
bl sub_80D87BC
|
||||
bl BattlePutTextOnWindow
|
||||
ldr r0, _080CF0D0 @ =gTasks
|
||||
mov r2, r8
|
||||
adds r1, r2, r7
|
||||
|
|
@ -2225,7 +2225,7 @@ _080CF0EE:
|
|||
bl BattleStringExpandPlaceholdersToDisplayedString
|
||||
ldr r0, _080CF114 @ =gDisplayedStringBattle
|
||||
movs r1, 0
|
||||
bl sub_80D87BC
|
||||
bl BattlePutTextOnWindow
|
||||
ldr r0, _080CF118 @ =gTasks
|
||||
mov r3, r8
|
||||
adds r1, r3, r7
|
||||
|
|
@ -2253,7 +2253,7 @@ _080CF11C:
|
|||
bl BattleStringExpandPlaceholdersToDisplayedString
|
||||
ldr r0, _080CF1AC @ =gDisplayedStringBattle
|
||||
movs r1, 0
|
||||
bl sub_80D87BC
|
||||
bl BattlePutTextOnWindow
|
||||
ldr r0, _080CF1B0 @ =gTasks
|
||||
mov r2, r8
|
||||
adds r1, r2, r7
|
||||
|
|
@ -2286,10 +2286,10 @@ _080CF176:
|
|||
movs r1, 0x8
|
||||
movs r2, 0x1D
|
||||
movs r3, 0xD
|
||||
bl sub_802DB7C
|
||||
ldr r0, _080CF1B4 @ =gUnknown_83FE791
|
||||
bl HandleBattleWindow
|
||||
ldr r0, _080CF1B4 @ =gText_BattleYesNoChoice
|
||||
movs r1, 0xE
|
||||
bl sub_80D87BC
|
||||
bl BattlePutTextOnWindow
|
||||
ldr r0, _080CF1B0 @ =gTasks
|
||||
mov r3, r8
|
||||
adds r1, r3, r7
|
||||
|
|
@ -2299,16 +2299,16 @@ _080CF176:
|
|||
adds r0, 0x1
|
||||
movs r2, 0
|
||||
strh r0, [r1, 0x14]
|
||||
ldr r0, _080CF1B8 @ =gUnknown_2023E82
|
||||
ldr r0, _080CF1B8 @ =gBattleCommunication
|
||||
strb r2, [r0, 0x1]
|
||||
bl sub_802DCB8
|
||||
bl BattleCreateYesNoCursorAt
|
||||
b _080CF528
|
||||
.align 2, 0
|
||||
_080CF1A8: .4byte gUnknown_83FDF3C
|
||||
_080CF1AC: .4byte gDisplayedStringBattle
|
||||
_080CF1B0: .4byte gTasks
|
||||
_080CF1B4: .4byte gUnknown_83FE791
|
||||
_080CF1B8: .4byte gUnknown_2023E82
|
||||
_080CF1B4: .4byte gText_BattleYesNoChoice
|
||||
_080CF1B8: .4byte gBattleCommunication
|
||||
_080CF1BC:
|
||||
ldr r0, _080CF244 @ =gMain
|
||||
ldrh r1, [r0, 0x2E]
|
||||
|
|
@ -2316,16 +2316,16 @@ _080CF1BC:
|
|||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _080CF1E2
|
||||
ldr r4, _080CF248 @ =gUnknown_2023E82
|
||||
ldr r4, _080CF248 @ =gBattleCommunication
|
||||
ldrb r0, [r4, 0x1]
|
||||
cmp r0, 0
|
||||
beq _080CF1E2
|
||||
movs r0, 0x5
|
||||
bl PlaySE
|
||||
bl sub_802DCF8
|
||||
bl BattleDestroyYesNoCursorAt
|
||||
movs r0, 0
|
||||
strb r0, [r4, 0x1]
|
||||
bl sub_802DCB8
|
||||
bl BattleCreateYesNoCursorAt
|
||||
_080CF1E2:
|
||||
ldr r0, _080CF244 @ =gMain
|
||||
ldrh r1, [r0, 0x2E]
|
||||
|
|
@ -2333,16 +2333,16 @@ _080CF1E2:
|
|||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _080CF208
|
||||
ldr r4, _080CF248 @ =gUnknown_2023E82
|
||||
ldr r4, _080CF248 @ =gBattleCommunication
|
||||
ldrb r0, [r4, 0x1]
|
||||
cmp r0, 0
|
||||
bne _080CF208
|
||||
movs r0, 0x5
|
||||
bl PlaySE
|
||||
bl sub_802DCF8
|
||||
bl BattleDestroyYesNoCursorAt
|
||||
movs r0, 0x1
|
||||
strb r0, [r4, 0x1]
|
||||
bl sub_802DCB8
|
||||
bl BattleCreateYesNoCursorAt
|
||||
_080CF208:
|
||||
ldr r0, _080CF244 @ =gMain
|
||||
ldrh r1, [r0, 0x2E]
|
||||
|
|
@ -2356,10 +2356,10 @@ _080CF208:
|
|||
movs r1, 0x8
|
||||
movs r2, 0x1D
|
||||
movs r3, 0xD
|
||||
bl sub_802DB7C
|
||||
bl HandleBattleWindow
|
||||
movs r0, 0x5
|
||||
bl PlaySE
|
||||
ldr r0, _080CF248 @ =gUnknown_2023E82
|
||||
ldr r0, _080CF248 @ =gBattleCommunication
|
||||
ldrb r2, [r0, 0x1]
|
||||
cmp r2, 0
|
||||
beq _080CF250
|
||||
|
|
@ -2373,7 +2373,7 @@ _080CF208:
|
|||
b _080CF276
|
||||
.align 2, 0
|
||||
_080CF244: .4byte gMain
|
||||
_080CF248: .4byte gUnknown_2023E82
|
||||
_080CF248: .4byte gBattleCommunication
|
||||
_080CF24C: .4byte gTasks
|
||||
_080CF250:
|
||||
ldr r0, _080CF2AC @ =gTasks
|
||||
|
|
@ -2409,7 +2409,7 @@ _080CF284:
|
|||
movs r1, 0x8
|
||||
movs r2, 0x1D
|
||||
movs r3, 0xD
|
||||
bl sub_802DB7C
|
||||
bl HandleBattleWindow
|
||||
movs r0, 0x5
|
||||
bl PlaySE
|
||||
ldr r1, _080CF2AC @ =gTasks
|
||||
|
|
@ -2449,7 +2449,7 @@ _080CF2C2:
|
|||
ldr r4, _080CF308 @ =gMoveToLearn
|
||||
ldrh r4, [r4]
|
||||
str r4, [sp]
|
||||
bl sub_8134738
|
||||
bl ShowSelectMovePokemonSummaryScreen
|
||||
ldrh r0, [r5, 0x14]
|
||||
adds r0, 0x1
|
||||
strh r0, [r5, 0x14]
|
||||
|
|
@ -2510,7 +2510,7 @@ _080CF34C:
|
|||
bl BattleStringExpandPlaceholdersToDisplayedString
|
||||
ldr r0, _080CF390 @ =gDisplayedStringBattle
|
||||
movs r1, 0
|
||||
bl sub_80D87BC
|
||||
bl BattlePutTextOnWindow
|
||||
ldr r1, _080CF394 @ =gTasks
|
||||
mov r2, r8
|
||||
adds r0, r2, r7
|
||||
|
|
@ -2566,7 +2566,7 @@ _080CF3E0:
|
|||
bl BattleStringExpandPlaceholdersToDisplayedString
|
||||
ldr r0, _080CF40C @ =gDisplayedStringBattle
|
||||
movs r1, 0
|
||||
bl sub_80D87BC
|
||||
bl BattlePutTextOnWindow
|
||||
ldr r0, _080CF410 @ =gTasks
|
||||
mov r2, r8
|
||||
adds r1, r2, r7
|
||||
|
|
@ -2598,7 +2598,7 @@ _080CF42E:
|
|||
bl BattleStringExpandPlaceholdersToDisplayedString
|
||||
ldr r0, _080CF454 @ =gDisplayedStringBattle
|
||||
movs r1, 0
|
||||
bl sub_80D87BC
|
||||
bl BattlePutTextOnWindow
|
||||
ldr r0, _080CF458 @ =gTasks
|
||||
mov r3, r8
|
||||
adds r1, r3, r7
|
||||
|
|
@ -2629,7 +2629,7 @@ _080CF45C:
|
|||
bl BattleStringExpandPlaceholdersToDisplayedString
|
||||
ldr r0, _080CF49C @ =gDisplayedStringBattle
|
||||
movs r1, 0
|
||||
bl sub_80D87BC
|
||||
bl BattlePutTextOnWindow
|
||||
ldr r1, _080CF4A0 @ =gTasks
|
||||
mov r2, r8
|
||||
adds r0, r2, r7
|
||||
|
|
@ -2648,7 +2648,7 @@ _080CF4A4:
|
|||
bl BattleStringExpandPlaceholdersToDisplayedString
|
||||
ldr r0, _080CF4D0 @ =gDisplayedStringBattle
|
||||
movs r1, 0
|
||||
bl sub_80D87BC
|
||||
bl BattlePutTextOnWindow
|
||||
ldr r1, _080CF4D4 @ =gTasks
|
||||
mov r3, r8
|
||||
adds r0, r3, r7
|
||||
|
|
@ -2671,7 +2671,7 @@ _080CF4D8:
|
|||
bl BattleStringExpandPlaceholdersToDisplayedString
|
||||
ldr r0, _080CF4FC @ =gDisplayedStringBattle
|
||||
movs r1, 0
|
||||
bl sub_80D87BC
|
||||
bl BattlePutTextOnWindow
|
||||
ldr r1, _080CF500 @ =gTasks
|
||||
mov r2, r8
|
||||
adds r0, r2, r7
|
||||
|
|
@ -2736,7 +2736,7 @@ sub_80CF53C: @ 80CF53C
|
|||
ldr r0, _080CF5C0 @ =gPlayerParty
|
||||
adds r1, r0
|
||||
mov r8, r1
|
||||
bl sub_806E25C
|
||||
bl IsNationalPokedexEnabled
|
||||
cmp r0, 0
|
||||
bne _080CF598
|
||||
movs r1, 0x8
|
||||
|
|
@ -2751,7 +2751,7 @@ sub_80CF53C: @ 80CF53C
|
|||
strh r0, [r4, 0x8]
|
||||
movs r2, 0x1
|
||||
strh r2, [r4, 0x1A]
|
||||
ldr r0, _080CF5C4 @ =gUnknown_2023E82
|
||||
ldr r0, _080CF5C4 @ =gBattleCommunication
|
||||
ldrb r1, [r0, 0x2]
|
||||
lsls r0, r1, 2
|
||||
adds r0, r1
|
||||
|
|
@ -2784,7 +2784,7 @@ _080CF5B2:
|
|||
.align 2, 0
|
||||
_080CF5BC: .4byte gTasks
|
||||
_080CF5C0: .4byte gPlayerParty
|
||||
_080CF5C4: .4byte gUnknown_2023E82
|
||||
_080CF5C4: .4byte gBattleCommunication
|
||||
_080CF5C8: .4byte _080CF5CC
|
||||
.align 2, 0
|
||||
_080CF5CC:
|
||||
|
|
@ -2911,7 +2911,7 @@ _080CF6E0:
|
|||
adds r5, 0x10
|
||||
adds r0, r5, 0
|
||||
bl LaunchTask_PreEvoSparklesSet1
|
||||
ldr r1, _080CF730 @ =gUnknown_2023E82
|
||||
ldr r1, _080CF730 @ =gBattleCommunication
|
||||
strb r0, [r1, 0x2]
|
||||
ldr r0, _080CF734 @ =gTasks
|
||||
adds r1, r7, r6
|
||||
|
|
@ -2928,11 +2928,11 @@ _080CF6E0:
|
|||
_080CF724: .4byte gPaletteFade
|
||||
_080CF728: .4byte gSprites
|
||||
_080CF72C: .4byte gUnknown_2039A20
|
||||
_080CF730: .4byte gUnknown_2023E82
|
||||
_080CF730: .4byte gBattleCommunication
|
||||
_080CF734: .4byte gTasks
|
||||
_080CF738: .4byte 0x00000603
|
||||
_080CF73C:
|
||||
ldr r4, _080CF770 @ =gUnknown_2023E82
|
||||
ldr r4, _080CF770 @ =gBattleCommunication
|
||||
ldrb r0, [r4, 0x2]
|
||||
lsls r1, r0, 2
|
||||
adds r1, r0
|
||||
|
|
@ -2957,10 +2957,10 @@ _080CF752:
|
|||
strb r0, [r4, 0x2]
|
||||
bl _080D003A
|
||||
.align 2, 0
|
||||
_080CF770: .4byte gUnknown_2023E82
|
||||
_080CF770: .4byte gBattleCommunication
|
||||
_080CF774: .4byte gUnknown_2039A20
|
||||
_080CF778:
|
||||
ldr r4, _080CF7A4 @ =gUnknown_2023E82
|
||||
ldr r4, _080CF7A4 @ =gBattleCommunication
|
||||
ldrb r0, [r4, 0x2]
|
||||
lsls r1, r0, 2
|
||||
adds r1, r0
|
||||
|
|
@ -2982,7 +2982,7 @@ _080CF78E:
|
|||
adds r1, r5
|
||||
b _080CFB1A
|
||||
.align 2, 0
|
||||
_080CF7A4: .4byte gUnknown_2023E82
|
||||
_080CF7A4: .4byte gBattleCommunication
|
||||
_080CF7A8: .4byte gUnknown_2039A20
|
||||
_080CF7AC:
|
||||
ldr r2, _080CF7E4 @ =gUnknown_2039A20
|
||||
|
|
@ -2998,7 +2998,7 @@ _080CF7C0:
|
|||
ldr r1, [r2]
|
||||
movs r0, 0x3
|
||||
strb r0, [r1, 0x3]
|
||||
ldr r0, _080CF7E8 @ =gUnknown_2023E82
|
||||
ldr r0, _080CF7E8 @ =gBattleCommunication
|
||||
ldrb r1, [r0, 0x2]
|
||||
lsls r0, r1, 2
|
||||
adds r0, r1
|
||||
|
|
@ -3015,10 +3015,10 @@ _080CF7DC:
|
|||
b _080CFB1A
|
||||
.align 2, 0
|
||||
_080CF7E4: .4byte gUnknown_2039A20
|
||||
_080CF7E8: .4byte gUnknown_2023E82
|
||||
_080CF7E8: .4byte gBattleCommunication
|
||||
_080CF7EC:
|
||||
bl sub_80F5F74
|
||||
ldr r1, _080CF800 @ =gUnknown_2023E82
|
||||
ldr r1, _080CF800 @ =gBattleCommunication
|
||||
strb r0, [r1, 0x2]
|
||||
ldr r0, _080CF804 @ =gTasks
|
||||
adds r1, r7, r6
|
||||
|
|
@ -3026,10 +3026,10 @@ _080CF7EC:
|
|||
adds r1, r0
|
||||
b _080CFB1A
|
||||
.align 2, 0
|
||||
_080CF800: .4byte gUnknown_2023E82
|
||||
_080CF800: .4byte gBattleCommunication
|
||||
_080CF804: .4byte gTasks
|
||||
_080CF808:
|
||||
ldr r0, _080CF834 @ =gUnknown_2023E82
|
||||
ldr r0, _080CF834 @ =gBattleCommunication
|
||||
mov r8, r0
|
||||
ldrb r0, [r0, 0x2]
|
||||
lsls r1, r0, 2
|
||||
|
|
@ -3050,9 +3050,9 @@ _080CF820:
|
|||
strb r0, [r1, 0x2]
|
||||
b _080CFA90
|
||||
.align 2, 0
|
||||
_080CF834: .4byte gUnknown_2023E82
|
||||
_080CF834: .4byte gBattleCommunication
|
||||
_080CF838:
|
||||
ldr r0, _080CF85C @ =gUnknown_2023E82
|
||||
ldr r0, _080CF85C @ =gBattleCommunication
|
||||
ldrb r1, [r0, 0x2]
|
||||
lsls r0, r1, 2
|
||||
adds r0, r1
|
||||
|
|
@ -3070,7 +3070,7 @@ _080CF84E:
|
|||
adds r1, r5
|
||||
b _080CFB1A
|
||||
.align 2, 0
|
||||
_080CF85C: .4byte gUnknown_2023E82
|
||||
_080CF85C: .4byte gBattleCommunication
|
||||
_080CF860:
|
||||
bl IsSEPlaying
|
||||
lsls r0, 24
|
||||
|
|
@ -3261,7 +3261,7 @@ _080CFA08: .4byte gUnknown_2039A20
|
|||
_080CFA0C: .4byte gTextFlags
|
||||
_080CFA10: .4byte gUnknown_300537C
|
||||
_080CFA14:
|
||||
ldr r0, _080CFA60 @ =gUnknown_2023E82
|
||||
ldr r0, _080CFA60 @ =gBattleCommunication
|
||||
ldrb r1, [r0, 0x2]
|
||||
lsls r0, r1, 2
|
||||
adds r0, r1
|
||||
|
|
@ -3299,7 +3299,7 @@ _080CFA28:
|
|||
adds r1, r5
|
||||
b _080CFB1A
|
||||
.align 2, 0
|
||||
_080CFA60: .4byte gUnknown_2023E82
|
||||
_080CFA60: .4byte gBattleCommunication
|
||||
_080CFA64: .4byte gSprites
|
||||
_080CFA68: .4byte gUnknown_2039A20
|
||||
_080CFA6C: .4byte 0x0004001c
|
||||
|
|
@ -3578,7 +3578,7 @@ _080CFCAE:
|
|||
movs r2, 0
|
||||
movs r3, 0x2
|
||||
bl CreateYesNoMenu
|
||||
ldr r3, _080CFCF8 @ =gUnknown_2023E82
|
||||
ldr r3, _080CFCF8 @ =gBattleCommunication
|
||||
strb r4, [r3, 0x1]
|
||||
ldr r0, _080CFCF0 @ =gTasks
|
||||
adds r1, r7, r6
|
||||
|
|
@ -3595,7 +3595,7 @@ _080CFCE8: .4byte gUnknown_83FDF3C
|
|||
_080CFCEC: .4byte gDisplayedStringBattle
|
||||
_080CFCF0: .4byte gTasks
|
||||
_080CFCF4: .4byte gUnknown_826D1CC
|
||||
_080CFCF8: .4byte gUnknown_2023E82
|
||||
_080CFCF8: .4byte gBattleCommunication
|
||||
_080CFCFC:
|
||||
bl Menu_ProcessInputNoWrapClearOnChoose
|
||||
lsls r0, 24
|
||||
|
|
@ -3614,7 +3614,7 @@ _080CFD16:
|
|||
beq _080CFD70
|
||||
b _080D003A
|
||||
_080CFD1C:
|
||||
ldr r0, _080CFD60 @ =gUnknown_2023E82
|
||||
ldr r0, _080CFD60 @ =gBattleCommunication
|
||||
strb r4, [r0, 0x1]
|
||||
ldr r0, _080CFD64 @ =gUnknown_83FDF3C
|
||||
movs r3, 0x92
|
||||
|
|
@ -3648,12 +3648,12 @@ _080CFD56:
|
|||
bl BeginNormalPaletteFade
|
||||
b _080D003A
|
||||
.align 2, 0
|
||||
_080CFD60: .4byte gUnknown_2023E82
|
||||
_080CFD60: .4byte gBattleCommunication
|
||||
_080CFD64: .4byte gUnknown_83FDF3C
|
||||
_080CFD68: .4byte gDisplayedStringBattle
|
||||
_080CFD6C: .4byte gTasks
|
||||
_080CFD70:
|
||||
ldr r1, _080CFD9C @ =gUnknown_2023E82
|
||||
ldr r1, _080CFD9C @ =gBattleCommunication
|
||||
movs r0, 0x1
|
||||
strb r0, [r1, 0x1]
|
||||
ldr r0, _080CFDA0 @ =gUnknown_83FDF3C
|
||||
|
|
@ -3674,7 +3674,7 @@ _080CFD70:
|
|||
strh r1, [r0, 0x14]
|
||||
b _080D003A
|
||||
.align 2, 0
|
||||
_080CFD9C: .4byte gUnknown_2023E82
|
||||
_080CFD9C: .4byte gBattleCommunication
|
||||
_080CFDA0: .4byte gUnknown_83FDF3C
|
||||
_080CFDA4: .4byte gDisplayedStringBattle
|
||||
_080CFDA8: .4byte gTasks
|
||||
|
|
@ -3718,7 +3718,7 @@ _080CFDC6:
|
|||
ldr r4, _080CFE2C @ =gMoveToLearn
|
||||
ldrh r4, [r4]
|
||||
str r4, [sp]
|
||||
bl sub_8134738
|
||||
bl ShowSelectMovePokemonSummaryScreen
|
||||
ldrh r0, [r5, 0x14]
|
||||
adds r0, 0x1
|
||||
strh r0, [r5, 0x14]
|
||||
|
|
|
|||
|
|
@ -1152,24 +1152,24 @@ _0806D174:
|
|||
_0806D17A:
|
||||
ldr r0, [r5, 0x8]
|
||||
movs r1, 0x3
|
||||
bl sub_80CC44C
|
||||
bl GetHiddenItemAttr
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
cmp r0, 0x1
|
||||
beq _0806D164
|
||||
ldr r0, [r5, 0x8]
|
||||
movs r1, 0
|
||||
bl sub_80CC44C
|
||||
bl GetHiddenItemAttr
|
||||
ldr r1, _0806D1C4 @ =gSpecialVar_0x8005
|
||||
strh r0, [r1]
|
||||
ldr r0, [r5, 0x8]
|
||||
movs r1, 0x1
|
||||
bl sub_80CC44C
|
||||
bl GetHiddenItemAttr
|
||||
ldr r4, _0806D1C8 @ =gSpecialVar_0x8004
|
||||
strh r0, [r4]
|
||||
ldr r0, [r5, 0x8]
|
||||
movs r1, 0x2
|
||||
bl sub_80CC44C
|
||||
bl GetHiddenItemAttr
|
||||
ldr r1, _0806D1CC @ =gSpecialVar_0x8006
|
||||
strh r0, [r1]
|
||||
ldrh r0, [r4]
|
||||
|
|
@ -1180,14 +1180,14 @@ _0806D17A:
|
|||
beq _0806D164
|
||||
ldr r0, _0806D1D0 @ =gSpecialVar_Facing
|
||||
strh r6, [r0]
|
||||
ldr r0, _0806D1D4 @ =gUnknown_81A6843
|
||||
ldr r0, _0806D1D4 @ =EventScript_PickUpHiddenItem
|
||||
b _0806D1E6
|
||||
.align 2, 0
|
||||
_0806D1C4: .4byte gSpecialVar_0x8005
|
||||
_0806D1C8: .4byte gSpecialVar_0x8004
|
||||
_0806D1CC: .4byte gSpecialVar_0x8006
|
||||
_0806D1D0: .4byte gSpecialVar_Facing
|
||||
_0806D1D4: .4byte gUnknown_81A6843
|
||||
_0806D1D4: .4byte EventScript_PickUpHiddenItem
|
||||
_0806D1D8:
|
||||
cmp r2, 0xFF
|
||||
beq _0806D1E0
|
||||
|
|
|
|||
|
|
@ -5758,7 +5758,7 @@ _08086024: .4byte sub_8085DDC
|
|||
thumb_func_start FldEff_FieldMoveShowMon
|
||||
FldEff_FieldMoveShowMon: @ 8086028
|
||||
push {r4,lr}
|
||||
bl sav1_map_get_light_level
|
||||
bl GetCurrentMapType
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl is_light_level_1_2_3_5_or_6
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -666,7 +666,7 @@ _0805E2E0:
|
|||
sub_805E2E8: @ 805E2E8
|
||||
push {r4,r5,lr}
|
||||
adds r4, r0, 0
|
||||
bl sav1_map_get_light_level
|
||||
bl GetCurrentMapType
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl is_light_level_1_2_3_5_or_6
|
||||
|
|
|
|||
|
|
@ -185,8 +185,8 @@ sub_80CA74C: @ 80CA74C
|
|||
_080CA754: .4byte gBattleOutcome
|
||||
thumb_func_end sub_80CA74C
|
||||
|
||||
thumb_func_start sub_80CA758
|
||||
sub_80CA758: @ 80CA758
|
||||
thumb_func_start Special_SetHiddenItemFlag
|
||||
Special_SetHiddenItemFlag: @ 80CA758
|
||||
push {lr}
|
||||
ldr r0, _080CA768 @ =gSpecialVar_0x8004
|
||||
ldrh r0, [r0]
|
||||
|
|
@ -195,7 +195,7 @@ sub_80CA758: @ 80CA758
|
|||
bx r0
|
||||
.align 2, 0
|
||||
_080CA768: .4byte gSpecialVar_0x8004
|
||||
thumb_func_end sub_80CA758
|
||||
thumb_func_end Special_SetHiddenItemFlag
|
||||
|
||||
thumb_func_start sub_80CA76C
|
||||
sub_80CA76C: @ 80CA76C
|
||||
|
|
@ -1566,8 +1566,9 @@ _080CB1D2:
|
|||
bx r1
|
||||
thumb_func_end sub_80CB198
|
||||
|
||||
thumb_func_start sub_80CB1D8
|
||||
sub_80CB1D8: @ 80CB1D8
|
||||
thumb_func_start Special_CheckAddCoins
|
||||
Special_CheckAddCoins: @ 80CB1D8
|
||||
@ addcoins but it's a dry run
|
||||
push {lr}
|
||||
ldr r0, _080CB1F0 @ =gSpecialVar_Result
|
||||
ldrh r1, [r0]
|
||||
|
|
@ -1588,7 +1589,7 @@ _080CB1FC:
|
|||
_080CB1FE:
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_80CB1D8
|
||||
thumb_func_end Special_CheckAddCoins
|
||||
|
||||
thumb_func_start sub_80CB204
|
||||
sub_80CB204: @ 80CB204
|
||||
|
|
@ -3664,8 +3665,8 @@ sub_80CC1E4: @ 80CC1E4
|
|||
_080CC200: .4byte gSaveBlock2Ptr
|
||||
thumb_func_end sub_80CC1E4
|
||||
|
||||
thumb_func_start sub_80CC204
|
||||
sub_80CC204: @ 80CC204
|
||||
thumb_func_start GetUnlockedSeviiAreas
|
||||
GetUnlockedSeviiAreas: @ 80CC204
|
||||
push {r4,lr}
|
||||
movs r4, 0
|
||||
ldr r0, _080CC2A4 @ =0x0000089b
|
||||
|
|
@ -3752,7 +3753,7 @@ _080CC2AC: .4byte 0x0000089d
|
|||
_080CC2B0: .4byte 0x0000089e
|
||||
_080CC2B4: .4byte 0x0000089f
|
||||
_080CC2B8: .4byte 0x000008a1
|
||||
thumb_func_end sub_80CC204
|
||||
thumb_func_end GetUnlockedSeviiAreas
|
||||
|
||||
thumb_func_start sub_80CC2BC
|
||||
sub_80CC2BC: @ 80CC2BC
|
||||
|
|
@ -3942,8 +3943,8 @@ _080CC444: .4byte gSpecialVar_0x8004
|
|||
_080CC448: .4byte gSpecialVar_0x8006
|
||||
thumb_func_end sub_80CC3CC
|
||||
|
||||
thumb_func_start sub_80CC44C
|
||||
sub_80CC44C: @ 80CC44C
|
||||
thumb_func_start GetHiddenItemAttr
|
||||
GetHiddenItemAttr: @ 80CC44C
|
||||
push {lr}
|
||||
lsls r1, 24
|
||||
lsrs r1, 24
|
||||
|
|
@ -3980,7 +3981,7 @@ _080CC484:
|
|||
_080CC486:
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_80CC44C
|
||||
thumb_func_end GetHiddenItemAttr
|
||||
|
||||
thumb_func_start sub_80CC48C
|
||||
sub_80CC48C: @ 80CC48C
|
||||
|
|
|
|||
|
|
@ -1737,8 +1737,8 @@ _0807A93C: .4byte 0x000006ca
|
|||
_0807A940: .4byte 0x000006cb
|
||||
thumb_func_end fade_screen
|
||||
|
||||
thumb_func_start sub_807A944
|
||||
sub_807A944: @ 807A944
|
||||
thumb_func_start FieldWeather_StartFadingOutCreditsMap
|
||||
FieldWeather_StartFadingOutCreditsMap: @ 807A944
|
||||
push {r4-r6,lr}
|
||||
sub sp, 0x4
|
||||
adds r6, r2, 0
|
||||
|
|
@ -1887,7 +1887,7 @@ _0807AA60: .4byte gUnknown_2037F34
|
|||
_0807AA64: .4byte 0x000006c6
|
||||
_0807AA68: .4byte 0x000006ca
|
||||
_0807AA6C: .4byte 0x000006cb
|
||||
thumb_func_end sub_807A944
|
||||
thumb_func_end FieldWeather_StartFadingOutCreditsMap
|
||||
|
||||
thumb_func_start sub_807AA70
|
||||
sub_807AA70: @ 807AA70
|
||||
|
|
@ -2561,8 +2561,8 @@ _0807AF92:
|
|||
bx r0
|
||||
thumb_func_end sub_807AF00
|
||||
|
||||
thumb_func_start weather_get_current
|
||||
weather_get_current: @ 807AF98
|
||||
thumb_func_start GetCurrentWeather
|
||||
GetCurrentWeather: @ 807AF98
|
||||
ldr r0, _0807AFA4 @ =gUnknown_2037F34
|
||||
movs r1, 0xDA
|
||||
lsls r1, 3
|
||||
|
|
@ -2571,7 +2571,7 @@ weather_get_current: @ 807AF98
|
|||
bx lr
|
||||
.align 2, 0
|
||||
_0807AFA4: .4byte gUnknown_2037F34
|
||||
thumb_func_end weather_get_current
|
||||
thumb_func_end GetCurrentWeather
|
||||
|
||||
thumb_func_start SetRainStrengthFromSoundEffect
|
||||
SetRainStrengthFromSoundEffect: @ 807AFA8
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ _080B0924: .4byte gBattleAnimAttacker
|
|||
sub_80B0928: @ 80B0928
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B0944
|
||||
|
|
@ -176,13 +176,13 @@ _080B09E8:
|
|||
bl StartSpriteAnim
|
||||
mov r0, r8
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x20]
|
||||
mov r0, r8
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x22]
|
||||
|
|
@ -242,7 +242,7 @@ _080B0A74:
|
|||
negs r0, r0
|
||||
lsrs r4, r0, 16
|
||||
_080B0A86:
|
||||
ldr r0, _080B0B14 @ =gUnknown_2023BD6
|
||||
ldr r0, _080B0B14 @ =gBattlerPositions
|
||||
add r0, r8
|
||||
ldrb r1, [r0]
|
||||
adds r0, r7, 0
|
||||
|
|
@ -313,7 +313,7 @@ _080B0B00:
|
|||
bx r0
|
||||
.align 2, 0
|
||||
_080B0B10: .4byte gBattleAnimTarget
|
||||
_080B0B14: .4byte gUnknown_2023BD6
|
||||
_080B0B14: .4byte gBattlerPositions
|
||||
_080B0B18: .4byte 0xfff00000
|
||||
_080B0B1C: .4byte gUnknown_83E7C08
|
||||
_080B0B20: .4byte gSprites
|
||||
|
|
@ -399,7 +399,7 @@ _080B0BB6:
|
|||
ldrh r0, [r4, 0x22]
|
||||
subs r0, 0x14
|
||||
strh r0, [r4, 0x36]
|
||||
ldr r0, _080B0BD0 @ =sub_8075590
|
||||
ldr r0, _080B0BD0 @ =StartAnimLinearTranslation
|
||||
str r0, [r4, 0x1C]
|
||||
ldr r1, _080B0BD4 @ =sub_80B0BD8
|
||||
adds r0, r4, 0
|
||||
|
|
@ -408,7 +408,7 @@ _080B0BB6:
|
|||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080B0BD0: .4byte sub_8075590
|
||||
_080B0BD0: .4byte StartAnimLinearTranslation
|
||||
_080B0BD4: .4byte sub_80B0BD8
|
||||
thumb_func_end sub_80B0B80
|
||||
|
||||
|
|
@ -440,7 +440,7 @@ sub_80B0BD8: @ 80B0BD8
|
|||
strh r1, [r5, 0x22]
|
||||
strh r6, [r5, 0x26]
|
||||
strh r6, [r5, 0x24]
|
||||
ldr r0, _080B0C20 @ =sub_8075590
|
||||
ldr r0, _080B0C20 @ =StartAnimLinearTranslation
|
||||
str r0, [r5, 0x1C]
|
||||
ldr r1, _080B0C24 @ =DestroyAnimSprite
|
||||
adds r0, r5, 0
|
||||
|
|
@ -450,7 +450,7 @@ _080B0C18:
|
|||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080B0C20: .4byte sub_8075590
|
||||
_080B0C20: .4byte StartAnimLinearTranslation
|
||||
_080B0C24: .4byte DestroyAnimSprite
|
||||
thumb_func_end sub_80B0BD8
|
||||
|
||||
|
|
@ -644,17 +644,17 @@ sub_80B0D7C: @ 80B0D7C
|
|||
ldr r4, _080B0DC8 @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x32]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x36]
|
||||
ldr r0, _080B0DCC @ =sub_8075590
|
||||
ldr r0, _080B0DCC @ =StartAnimLinearTranslation
|
||||
str r0, [r5, 0x1C]
|
||||
ldr r1, _080B0DD0 @ =sub_80B0DD4
|
||||
adds r0, r5, 0
|
||||
|
|
@ -665,7 +665,7 @@ _080B0DC0:
|
|||
bx r0
|
||||
.align 2, 0
|
||||
_080B0DC8: .4byte gBattleAnimTarget
|
||||
_080B0DCC: .4byte sub_8075590
|
||||
_080B0DCC: .4byte StartAnimLinearTranslation
|
||||
_080B0DD0: .4byte sub_80B0DD4
|
||||
thumb_func_end sub_80B0D7C
|
||||
|
||||
|
|
@ -778,13 +778,13 @@ _080B0E9C:
|
|||
_080B0E9E:
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x20]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x1
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x22]
|
||||
|
|
@ -896,7 +896,7 @@ sub_80B0F68: @ 80B0F68
|
|||
ldr r4, _080B0F90 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r2, [r6, 0x4]
|
||||
|
|
@ -909,7 +909,7 @@ _080B0F94:
|
|||
ldr r4, _080B0FF0 @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r1, [r6, 0x4]
|
||||
|
|
@ -918,7 +918,7 @@ _080B0FA6:
|
|||
strh r0, [r5, 0x20]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x1
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r6, [r6, 0x6]
|
||||
|
|
@ -1037,16 +1037,16 @@ sub_80B107C: @ 80B107C
|
|||
ldrsh r0, [r0, r1]
|
||||
cmp r0, 0
|
||||
bne _080B10D8
|
||||
ldr r4, _080B10CC @ =sBattler_AI
|
||||
ldr r4, _080B10CC @ =gBattlerAttacker
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x20]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x22]
|
||||
|
|
@ -1066,7 +1066,7 @@ sub_80B107C: @ 80B107C
|
|||
b _080B10F4
|
||||
.align 2, 0
|
||||
_080B10C8: .4byte gBattleAnimArgs
|
||||
_080B10CC: .4byte sBattler_AI
|
||||
_080B10CC: .4byte gBattlerAttacker
|
||||
_080B10D0: .4byte gBattleAnimAttacker
|
||||
_080B10D4: .4byte gBattleAnimTarget
|
||||
_080B10D8:
|
||||
|
|
@ -1125,7 +1125,7 @@ sub_80B111C: @ 80B111C
|
|||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x32]
|
||||
|
|
@ -1135,7 +1135,7 @@ sub_80B111C: @ 80B111C
|
|||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x36]
|
||||
|
|
@ -1245,13 +1245,13 @@ _080B1236:
|
|||
ldr r4, _080B1298 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
adds r6, r0, 0
|
||||
lsls r6, 24
|
||||
lsrs r6, 24
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
adds r5, r0, 0
|
||||
lsls r5, 24
|
||||
lsrs r5, 24
|
||||
|
|
@ -1259,14 +1259,14 @@ _080B1236:
|
|||
mov r8, r2
|
||||
ldrb r0, [r2]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
mov r1, r8
|
||||
ldrb r0, [r1]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
subs r4, r6
|
||||
strh r4, [r7, 0x2E]
|
||||
|
|
@ -1341,16 +1341,16 @@ sub_80B12E8: @ 80B12E8
|
|||
ldrsh r0, [r0, r1]
|
||||
cmp r0, 0
|
||||
bne _080B132C
|
||||
ldr r4, _080B1320 @ =sBattler_AI
|
||||
ldr r4, _080B1320 @ =gBattlerAttacker
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x20]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x22]
|
||||
|
|
@ -1360,7 +1360,7 @@ sub_80B12E8: @ 80B12E8
|
|||
b _080B1332
|
||||
.align 2, 0
|
||||
_080B131C: .4byte gBattleAnimArgs
|
||||
_080B1320: .4byte sBattler_AI
|
||||
_080B1320: .4byte gBattlerAttacker
|
||||
_080B1324: .4byte gBattleAnimTarget
|
||||
_080B1328: .4byte gBattleAnimAttacker
|
||||
_080B132C:
|
||||
|
|
@ -1379,7 +1379,7 @@ _080B1332:
|
|||
ands r0, r2
|
||||
orrs r0, r1
|
||||
strb r0, [r5, 0x5]
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B136C
|
||||
|
|
@ -1418,7 +1418,7 @@ _080B138C:
|
|||
strh r0, [r5, 0x30]
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x32]
|
||||
|
|
@ -1426,7 +1426,7 @@ _080B138C:
|
|||
strh r0, [r5, 0x34]
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x36]
|
||||
|
|
@ -1473,13 +1473,13 @@ sub_80B13F8: @ 80B13F8
|
|||
ldr r4, _080B1474 @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x20]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x22]
|
||||
|
|
@ -1555,7 +1555,7 @@ _080B14A0:
|
|||
movs r1, 0
|
||||
bl sub_8075114
|
||||
_080B14A8:
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B14BC
|
||||
|
|
|
|||
24
asm/fire.s
24
asm/fire.s
|
|
@ -367,14 +367,14 @@ sub_80ACBB0: @ 80ACBB0
|
|||
strh r1, [r0, 0x32]
|
||||
movs r1, 0x50
|
||||
strh r1, [r0, 0x36]
|
||||
ldr r1, _080ACBD4 @ =sub_8075590
|
||||
ldr r1, _080ACBD4 @ =StartAnimLinearTranslation
|
||||
str r1, [r0, 0x1C]
|
||||
ldr r1, _080ACBD8 @ =DestroyAnimSprite
|
||||
bl StoreSpriteCallbackInData6
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080ACBD4: .4byte sub_8075590
|
||||
_080ACBD4: .4byte StartAnimLinearTranslation
|
||||
_080ACBD8: .4byte DestroyAnimSprite
|
||||
thumb_func_end sub_80ACBB0
|
||||
|
||||
|
|
@ -484,7 +484,7 @@ sub_80ACC88: @ 80ACC88
|
|||
ldr r4, _080ACCD8 @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x32]
|
||||
|
|
@ -492,7 +492,7 @@ sub_80ACC88: @ 80ACC88
|
|||
strh r0, [r5, 0x34]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x36]
|
||||
|
|
@ -522,13 +522,13 @@ sub_80ACCE0: @ 80ACCE0
|
|||
ldr r5, _080ACD20 @ =gBattleAnimTarget
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r6, 0x20]
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r6, 0x22]
|
||||
|
|
@ -782,7 +782,7 @@ sub_80ACEA4: @ 80ACEA4
|
|||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
movs r1, 0
|
||||
bl sub_80758E0
|
||||
bl PrepareBattlerSpriteForRotScale
|
||||
ldr r0, _080ACF10 @ =sub_80ACF14
|
||||
str r0, [r4]
|
||||
pop {r4,r5}
|
||||
|
|
@ -1147,7 +1147,7 @@ _080AD1A8:
|
|||
ldrh r0, [r4, 0x26]
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl sub_8075980
|
||||
bl ResetSpriteRotScale
|
||||
strh r5, [r4, 0xC]
|
||||
_080AD1D4:
|
||||
ldrh r0, [r4, 0x8]
|
||||
|
|
@ -1758,7 +1758,7 @@ _080AD612:
|
|||
ldr r4, _080AD688 @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x32]
|
||||
|
|
@ -1766,7 +1766,7 @@ _080AD612:
|
|||
strh r0, [r5, 0x34]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x36]
|
||||
|
|
@ -1877,7 +1877,7 @@ _080AD70C:
|
|||
movs r1, 0xFF
|
||||
ands r0, r1
|
||||
strh r0, [r4, 0x30]
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080AD7A8
|
||||
|
|
@ -1999,7 +1999,7 @@ _080AD826:
|
|||
ldrb r1, [r0]
|
||||
movs r0, 0x2
|
||||
eors r0, r1
|
||||
bl sub_8072DF0
|
||||
bl IsBattlerSpriteVisible
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
adds r0, 0x1
|
||||
|
|
|
|||
|
|
@ -209,7 +209,7 @@ sub_80C9CE8: @ 80C9CE8
|
|||
bl get_map_light_from_warp0
|
||||
lsls r0, 24
|
||||
lsrs r7, r0, 24
|
||||
bl sav1_map_get_light_level
|
||||
bl GetCurrentMapType
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
movs r4, 0
|
||||
|
|
|
|||
70
asm/flying.s
70
asm/flying.s
|
|
@ -228,7 +228,7 @@ _080B1A3C:
|
|||
ldr r5, _080B1A90 @ =gBattleAnimTarget
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r1, [r4, 0x4]
|
||||
|
|
@ -238,7 +238,7 @@ _080B1A3C:
|
|||
strh r0, [r6, 0x34]
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r4, [r4, 0x6]
|
||||
|
|
@ -302,7 +302,7 @@ sub_80B1AB8: @ 80B1AB8
|
|||
negs r0, r0
|
||||
strh r0, [r1, 0x6]
|
||||
_080B1AE4:
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B1AFC
|
||||
|
|
@ -316,13 +316,13 @@ _080B1AE4:
|
|||
_080B1AFC:
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x20]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
ldr r2, _080B1B58 @ =gBattleAnimArgs
|
||||
ldrh r1, [r2]
|
||||
|
|
@ -342,13 +342,13 @@ _080B1AFC:
|
|||
ldr r4, _080B1B5C @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x32]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x36]
|
||||
|
|
@ -376,7 +376,7 @@ _080B1B72:
|
|||
ldrh r3, [r5, 0x36]
|
||||
adds r0, r3
|
||||
strh r0, [r5, 0x36]
|
||||
ldr r0, _080B1BA8 @ =sub_8075590
|
||||
ldr r0, _080B1BA8 @ =StartAnimLinearTranslation
|
||||
str r0, [r5, 0x1C]
|
||||
ldr r1, _080B1BAC @ =DestroyAnimSprite
|
||||
adds r0, r5, 0
|
||||
|
|
@ -390,7 +390,7 @@ _080B1B72:
|
|||
.align 2, 0
|
||||
_080B1BA0: .4byte gBattleAnimTarget
|
||||
_080B1BA4: .4byte gBattleAnimArgs
|
||||
_080B1BA8: .4byte sub_8075590
|
||||
_080B1BA8: .4byte StartAnimLinearTranslation
|
||||
_080B1BAC: .4byte DestroyAnimSprite
|
||||
thumb_func_end sub_80B1AB8
|
||||
|
||||
|
|
@ -504,7 +504,7 @@ _080B1C72:
|
|||
ldr r4, _080B1CB8 @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x32]
|
||||
|
|
@ -512,7 +512,7 @@ _080B1C72:
|
|||
strh r0, [r5, 0x34]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x36]
|
||||
|
|
@ -672,7 +672,7 @@ _080B1DB2:
|
|||
_080B1DC8:
|
||||
adds r0, r6, 0
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
ldr r4, _080B1E60 @ =gBattleAnimArgs
|
||||
lsrs r0, 24
|
||||
|
|
@ -681,7 +681,7 @@ _080B1DC8:
|
|||
strh r0, [r7, 0x20]
|
||||
adds r0, r6, 0
|
||||
movs r1, 0x1
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
ldrh r1, [r4, 0x2]
|
||||
lsrs r0, 24
|
||||
|
|
@ -720,7 +720,7 @@ _080B1DC8:
|
|||
lsrs r1, 16
|
||||
cmp r1, 0x7F
|
||||
bhi _080B1EBE
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080B1E64
|
||||
|
|
@ -1017,7 +1017,7 @@ _080B2028:
|
|||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _080B20E6
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080B20B6
|
||||
|
|
@ -1149,7 +1149,7 @@ _080B211C:
|
|||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _080B21DA
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080B21AA
|
||||
|
|
@ -1281,7 +1281,7 @@ _080B2210:
|
|||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _080B22CE
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080B229E
|
||||
|
|
@ -1422,7 +1422,7 @@ _080B2318:
|
|||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _080B23D6
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080B23A6
|
||||
|
|
@ -1627,13 +1627,13 @@ sub_80B24C0: @ 80B24C0
|
|||
ldr r5, _080B250C @ =gBattleAnimAttacker
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x20]
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x22]
|
||||
|
|
@ -1659,11 +1659,11 @@ sub_80B2514: @ 80B2514
|
|||
strh r0, [r4, 0x32]
|
||||
ldrh r0, [r5, 0x4]
|
||||
strh r0, [r4, 0x34]
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080B25C4
|
||||
ldr r0, _080B2558 @ =gUnknown_2023BD6
|
||||
ldr r0, _080B2558 @ =gBattlerPositions
|
||||
ldr r1, _080B255C @ =gBattleAnimTarget
|
||||
ldrb r2, [r1]
|
||||
adds r0, r2, r0
|
||||
|
|
@ -1674,7 +1674,7 @@ sub_80B2514: @ 80B2514
|
|||
beq _080B2560
|
||||
adds r0, r2, 0
|
||||
movs r1, 0x1
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r5, [r5, 0x6]
|
||||
|
|
@ -1682,12 +1682,12 @@ sub_80B2514: @ 80B2514
|
|||
b _080B256E
|
||||
.align 2, 0
|
||||
_080B2554: .4byte gBattleAnimArgs
|
||||
_080B2558: .4byte gUnknown_2023BD6
|
||||
_080B2558: .4byte gBattlerPositions
|
||||
_080B255C: .4byte gBattleAnimTarget
|
||||
_080B2560:
|
||||
adds r0, r2, 0
|
||||
movs r1, 0x1
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
adds r0, 0x28
|
||||
|
|
@ -1737,7 +1737,7 @@ _080B25C4:
|
|||
ldr r0, _080B267C @ =gBattleAnimTarget
|
||||
ldrb r0, [r0]
|
||||
movs r1, 0x1
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r5, [r5, 0x6]
|
||||
|
|
@ -2127,13 +2127,13 @@ sub_80B2868: @ 80B2868
|
|||
ldr r5, _080B2910 @ =gBattleAnimTarget
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
adds r2, r0, 0
|
||||
lsls r2, 24
|
||||
lsrs r2, 24
|
||||
|
|
@ -2237,7 +2237,7 @@ _080B2990:
|
|||
ldr r0, _080B29A8 @ =gBattleAnimTarget
|
||||
ldrb r0, [r0]
|
||||
movs r1, 0x1
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x22]
|
||||
|
|
@ -2454,13 +2454,13 @@ _080B2B20:
|
|||
_080B2B22:
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x20]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x1
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x22]
|
||||
|
|
@ -2614,13 +2614,13 @@ _080B2C54:
|
|||
_080B2C56:
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x20]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x1
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
adds r0, 0x20
|
||||
|
|
@ -2773,14 +2773,14 @@ sub_80B2D64: @ 80B2D64
|
|||
ldr r6, _080B2E18 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r6]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
mov r1, r8
|
||||
strh r0, [r1, 0x20]
|
||||
ldrb r0, [r6]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
adds r6, r0, 0
|
||||
lsls r6, 24
|
||||
lsrs r6, 24
|
||||
|
|
|
|||
54
asm/ghost.s
54
asm/ghost.s
|
|
@ -19,7 +19,7 @@ sub_80B5268: @ 80B5268
|
|||
ldr r5, _080B52C8 @ =gBattleAnimTarget
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x32]
|
||||
|
|
@ -27,7 +27,7 @@ sub_80B5268: @ 80B5268
|
|||
strh r0, [r4, 0x34]
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x36]
|
||||
|
|
@ -358,12 +358,12 @@ sub_80B54E8: @ 80B54E8
|
|||
lsrs r4, 24
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x1
|
||||
bl sub_80758E0
|
||||
bl PrepareBattlerSpriteForRotScale
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x80
|
||||
movs r2, 0x80
|
||||
movs r3, 0
|
||||
bl obj_id_set_rotscale
|
||||
bl SetSpriteRotScale
|
||||
ldr r1, _080B5560 @ =gSprites
|
||||
lsls r0, r4, 4
|
||||
adds r0, r4
|
||||
|
|
@ -485,11 +485,11 @@ _080B55F0:
|
|||
adds r0, r1, 0
|
||||
adds r1, r2, 0
|
||||
movs r3, 0
|
||||
bl obj_id_set_rotscale
|
||||
bl SetSpriteRotScale
|
||||
b _080B5634
|
||||
_080B5618:
|
||||
adds r0, r1, 0
|
||||
bl sub_8075980
|
||||
bl ResetSpriteRotScale
|
||||
adds r0, r5, 0
|
||||
bl DestroyAnimVisualTask
|
||||
movs r0, 0x50
|
||||
|
|
@ -518,7 +518,7 @@ sub_80B563C: @ 80B563C
|
|||
mov r8, r0
|
||||
ldrb r0, [r0]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
movs r1, 0
|
||||
|
|
@ -527,7 +527,7 @@ sub_80B563C: @ 80B563C
|
|||
mov r1, r8
|
||||
ldrb r0, [r1]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x22]
|
||||
|
|
@ -637,13 +637,13 @@ _080B572E:
|
|||
ldr r4, _080B5794 @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x30]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x32]
|
||||
|
|
@ -700,13 +700,13 @@ _080B5798:
|
|||
ldr r4, _080B57E8 @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x20]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x22]
|
||||
|
|
@ -1214,7 +1214,7 @@ _080B5B68:
|
|||
adds r2, r0
|
||||
lsls r2, 2
|
||||
adds r2, r4
|
||||
ldr r0, _080B5C18 @ =gUnknown_2024018
|
||||
ldr r0, _080B5C18 @ =gBattleSpritesDataPtr
|
||||
ldr r1, [r0]
|
||||
ldr r0, _080B5C1C @ =gBattleAnimTarget
|
||||
ldrb r0, [r0]
|
||||
|
|
@ -1260,7 +1260,7 @@ _080B5B68:
|
|||
b _080B5C24
|
||||
.align 2, 0
|
||||
_080B5C14: .4byte gSprites
|
||||
_080B5C18: .4byte gUnknown_2024018
|
||||
_080B5C18: .4byte gBattleSpritesDataPtr
|
||||
_080B5C1C: .4byte gBattleAnimTarget
|
||||
_080B5C20:
|
||||
movs r1, 0x80
|
||||
|
|
@ -1614,12 +1614,12 @@ sub_80B5EC0: @ 80B5EC0
|
|||
ldr r4, _080B5F00 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x1
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 8
|
||||
movs r2, 0xE0
|
||||
|
|
@ -1636,12 +1636,12 @@ _080B5F08:
|
|||
ldr r4, _080B5FD0 @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x1
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 8
|
||||
movs r2, 0xE0
|
||||
|
|
@ -1652,13 +1652,13 @@ _080B5F08:
|
|||
_080B5F2C:
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
mov r10, r0
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x1
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 8
|
||||
movs r1, 0xE0
|
||||
|
|
@ -1808,7 +1808,7 @@ sub_80B6020: @ 80B6020
|
|||
ldr r4, _080B6178 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
str r0, [sp, 0x4]
|
||||
|
|
@ -1818,7 +1818,7 @@ sub_80B6020: @ 80B6020
|
|||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
str r0, [sp, 0x8]
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B6090
|
||||
|
|
@ -1840,7 +1840,7 @@ _080B6092:
|
|||
lsls r0, r4, 24
|
||||
lsrs r4, r0, 24
|
||||
adds r0, r4, 0
|
||||
bl sub_8072DF0
|
||||
bl IsBattlerSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B615E
|
||||
|
|
@ -1860,7 +1860,7 @@ _080B6092:
|
|||
beq _080B615E
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
mov r10, r0
|
||||
|
|
@ -2253,7 +2253,7 @@ sub_80B63B4: @ 80B63B4
|
|||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080B63FC
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B6414
|
||||
|
|
@ -2872,7 +2872,7 @@ sub_80B68C8: @ 80B68C8
|
|||
ldr r5, _080B6964 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x1A]
|
||||
|
|
@ -2898,7 +2898,7 @@ sub_80B68C8: @ 80B68C8
|
|||
lsrs r0, 24
|
||||
strh r0, [r4, 0x12]
|
||||
ldrb r0, [r5]
|
||||
bl sub_807685C
|
||||
bl GetBattlerSpriteSubpriority
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
subs r0, 0x2
|
||||
|
|
|
|||
46
asm/ground.s
46
asm/ground.s
|
|
@ -12,13 +12,13 @@ sub_80B8B6C: @ 80B8B6C
|
|||
ldr r5, _080B8BC4 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x20]
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x22]
|
||||
|
|
@ -27,13 +27,13 @@ sub_80B8B6C: @ 80B8B6C
|
|||
ldr r5, _080B8BC8 @ =gBattleAnimTarget
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x32]
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x36]
|
||||
|
|
@ -77,13 +77,13 @@ sub_80B8BD4: @ 80B8BD4
|
|||
ldr r4, _080B8C30 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x32]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x36]
|
||||
|
|
@ -141,7 +141,7 @@ _080B8C74:
|
|||
ldr r5, _080B8CBC @ =gBattleAnimTarget
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r1, [r4, 0x4]
|
||||
|
|
@ -149,13 +149,13 @@ _080B8C74:
|
|||
strh r0, [r6, 0x32]
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r4, [r4, 0x6]
|
||||
adds r0, r4
|
||||
strh r0, [r6, 0x36]
|
||||
ldr r0, _080B8CC0 @ =sub_8075590
|
||||
ldr r0, _080B8CC0 @ =StartAnimLinearTranslation
|
||||
str r0, [r6, 0x1C]
|
||||
ldr r1, _080B8CC4 @ =DestroyAnimSprite
|
||||
adds r0, r6, 0
|
||||
|
|
@ -167,7 +167,7 @@ _080B8C74:
|
|||
_080B8CB4: .4byte gBattleAnimAttacker
|
||||
_080B8CB8: .4byte gBattleAnimArgs
|
||||
_080B8CBC: .4byte gBattleAnimTarget
|
||||
_080B8CC0: .4byte sub_8075590
|
||||
_080B8CC0: .4byte StartAnimLinearTranslation
|
||||
_080B8CC4: .4byte DestroyAnimSprite
|
||||
thumb_func_end sub_80B8C54
|
||||
|
||||
|
|
@ -222,7 +222,7 @@ _080B8D20:
|
|||
strh r0, [r6, 0x32]
|
||||
adds r0, r7, r4
|
||||
strh r0, [r6, 0x36]
|
||||
ldr r0, _080B8D50 @ =sub_8075590
|
||||
ldr r0, _080B8D50 @ =StartAnimLinearTranslation
|
||||
str r0, [r6, 0x1C]
|
||||
ldr r1, _080B8D54 @ =move_anim_8074EE0
|
||||
adds r0, r6, 0
|
||||
|
|
@ -235,7 +235,7 @@ _080B8D20:
|
|||
.align 2, 0
|
||||
_080B8D48: .4byte gBattleAnimTarget
|
||||
_080B8D4C: .4byte gBattleAnimArgs
|
||||
_080B8D50: .4byte sub_8075590
|
||||
_080B8D50: .4byte StartAnimLinearTranslation
|
||||
_080B8D54: .4byte move_anim_8074EE0
|
||||
thumb_func_end sub_80B8CC8
|
||||
|
||||
|
|
@ -262,7 +262,7 @@ sub_80B8D58: @ 80B8D58
|
|||
ldr r4, _080B8DC4 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r2, [r6, 0x2]
|
||||
|
|
@ -270,7 +270,7 @@ sub_80B8D58: @ 80B8D58
|
|||
strh r0, [r5, 0x20]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r3, [r6, 0x4]
|
||||
|
|
@ -1080,7 +1080,7 @@ _080B9396:
|
|||
_080B93B2:
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
adds r0, r6
|
||||
|
|
@ -1150,7 +1150,7 @@ _080B943A:
|
|||
ldrb r5, [r0]
|
||||
adds r0, r5, 0
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r2, _080B949C @ =0x0000fff0
|
||||
|
|
@ -1224,7 +1224,7 @@ sub_80B94B4: @ 80B94B4
|
|||
_080B94D8: .4byte gTasks
|
||||
_080B94DC: .4byte gBattleAnimArgs
|
||||
_080B94E0:
|
||||
ldr r0, _080B950C @ =gUnknown_2037EEC
|
||||
ldr r0, _080B950C @ =gAnimMovePower
|
||||
ldrh r0, [r0]
|
||||
movs r1, 0xA
|
||||
bl __udivsi3
|
||||
|
|
@ -1247,7 +1247,7 @@ _080B94EC:
|
|||
ldr r0, _080B9514 @ =sub_80B9584
|
||||
b _080B9576
|
||||
.align 2, 0
|
||||
_080B950C: .4byte gUnknown_2037EEC
|
||||
_080B950C: .4byte gAnimMovePower
|
||||
_080B9510: .4byte gBattle_BG3_X
|
||||
_080B9514: .4byte sub_80B9584
|
||||
_080B9518:
|
||||
|
|
@ -1257,7 +1257,7 @@ _080B9518:
|
|||
_080B951E:
|
||||
lsls r0, r5, 24
|
||||
lsrs r0, 24
|
||||
bl sub_8072DF0
|
||||
bl IsBattlerSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B9548
|
||||
|
|
@ -1641,7 +1641,7 @@ sub_80B97D8: @ 80B97D8
|
|||
lsrs r1, r0, 24
|
||||
ldr r3, _080B97F8 @ =gBattleAnimArgs
|
||||
movs r2, 0
|
||||
ldr r0, _080B97FC @ =gUnknown_2037EEC
|
||||
ldr r0, _080B97FC @ =gAnimMovePower
|
||||
ldrh r0, [r0]
|
||||
cmp r0, 0x63
|
||||
bls _080B97EC
|
||||
|
|
@ -1654,7 +1654,7 @@ _080B97EC:
|
|||
bx r0
|
||||
.align 2, 0
|
||||
_080B97F8: .4byte gBattleAnimArgs
|
||||
_080B97FC: .4byte gUnknown_2037EEC
|
||||
_080B97FC: .4byte gAnimMovePower
|
||||
thumb_func_end sub_80B97D8
|
||||
|
||||
thumb_func_start sub_80B9800
|
||||
|
|
@ -1698,7 +1698,7 @@ _080B9832:
|
|||
adds r4, r0
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
movs r1, 0x20
|
||||
|
|
@ -1709,7 +1709,7 @@ _080B9832:
|
|||
strh r1, [r4, 0xA]
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
movs r1, 0x40
|
||||
|
|
|
|||
|
|
@ -138,7 +138,7 @@ _080F1EC4:
|
|||
bne _080F1EF0
|
||||
ldr r0, _080F1EEC @ =sub_80F1DC0
|
||||
bl SetMainCallback2
|
||||
movs r0, 0x8F
|
||||
movs r0, 0x8F @ BGM_FRLG_CONGRATULATIONS_HALL_OF_FAME >> 1
|
||||
lsls r0, 1
|
||||
bl PlayBGM
|
||||
movs r0, 0
|
||||
|
|
@ -1448,17 +1448,17 @@ sub_80F2934: @ 80F2934
|
|||
movs r0, 0x80
|
||||
lsls r0, 7
|
||||
bl FlagSet
|
||||
ldr r1, _080F2974 @ =gUnknown_2031DD8
|
||||
ldr r1, _080F2974 @ =gDisableMapMusicChangeOnMapLoad
|
||||
movs r0, 0x2
|
||||
strb r0, [r1]
|
||||
movs r2, 0x1
|
||||
negs r2, r2
|
||||
movs r0, 0x6
|
||||
str r0, [sp]
|
||||
movs r0, 0x3
|
||||
movs r1, 0x9
|
||||
movs r0, 0x3 @ MAP_GROUP(INDIGO_PLATEAU_EXTERIOR)
|
||||
movs r1, 0x9 @ MAP_NUM(INDIGO_PLATEAU_EXTERIOR)
|
||||
movs r3, 0xB
|
||||
bl Overworld_SetWarpDestination
|
||||
bl SetWarpDestination
|
||||
bl DoWarp
|
||||
bl ResetInitialPlayerAvatarState
|
||||
add sp, 0x4
|
||||
|
|
@ -1466,7 +1466,7 @@ sub_80F2934: @ 80F2934
|
|||
bx r0
|
||||
.align 2, 0
|
||||
_080F2970: .4byte 0x00004085
|
||||
_080F2974: .4byte gUnknown_2031DD8
|
||||
_080F2974: .4byte gDisableMapMusicChangeOnMapLoad
|
||||
thumb_func_end sub_80F2934
|
||||
|
||||
thumb_func_start sub_80F2978
|
||||
|
|
|
|||
88
asm/ice.s
88
asm/ice.s
|
|
@ -123,26 +123,26 @@ sub_80AF108: @ 80AF108
|
|||
ldr r4, _080AF218 @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
mov r9, r0
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
mov r8, r0
|
||||
ldr r4, _080AF21C @ =gBattleAnimAttacker
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r3, r0, 24
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
str r3, [sp]
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
ldr r1, _080AF220 @ =gBattleAnimArgs
|
||||
|
|
@ -387,7 +387,7 @@ sub_80AF330: @ 80AF330
|
|||
ldr r0, _080AF364 @ =gBattleAnimTarget
|
||||
ldrb r0, [r0]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x32]
|
||||
|
|
@ -417,7 +417,7 @@ _080AF37A:
|
|||
ldr r0, _080AF3AC @ =gBattleAnimTarget
|
||||
ldrb r0, [r0]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
ldr r1, _080AF3A8 @ =gBattleAnimArgs
|
||||
lsrs r0, 24
|
||||
|
|
@ -429,7 +429,7 @@ _080AF37A:
|
|||
ldr r1, _080AF3B0 @ =DestroyAnimSprite
|
||||
adds r0, r4, 0
|
||||
bl StoreSpriteCallbackInData6
|
||||
ldr r0, _080AF3B4 @ =sub_8075590
|
||||
ldr r0, _080AF3B4 @ =StartAnimLinearTranslation
|
||||
str r0, [r4, 0x1C]
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
|
|
@ -438,7 +438,7 @@ _080AF37A:
|
|||
_080AF3A8: .4byte gBattleAnimArgs
|
||||
_080AF3AC: .4byte gBattleAnimTarget
|
||||
_080AF3B0: .4byte DestroyAnimSprite
|
||||
_080AF3B4: .4byte sub_8075590
|
||||
_080AF3B4: .4byte StartAnimLinearTranslation
|
||||
thumb_func_end sub_80AF330
|
||||
|
||||
thumb_func_start sub_80AF3B8
|
||||
|
|
@ -553,13 +553,13 @@ sub_80AF468: @ 80AF468
|
|||
ldr r4, _080AF4B4 @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x32]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r6, [r6, 0x6]
|
||||
|
|
@ -868,13 +868,13 @@ sub_80AF6D8: @ 80AF6D8
|
|||
ldr r4, _080AF720 @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x32]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x36]
|
||||
|
|
@ -1243,7 +1243,7 @@ _080AF9D4:
|
|||
ldrsh r0, [r0, r1]
|
||||
cmp r0, 0
|
||||
beq _080AF9EC
|
||||
bl sub_8075290
|
||||
bl IsDoubleBattle
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080AF9F8
|
||||
|
|
@ -1393,7 +1393,7 @@ sub_80AFAE4: @ 80AFAE4
|
|||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl SetAnimBgAttribute
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080AFB26
|
||||
|
|
@ -1433,7 +1433,7 @@ _080AFB26:
|
|||
lsls r1, 4
|
||||
movs r2, 0x20
|
||||
bl LoadPalette
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080AFB88
|
||||
|
|
@ -1619,7 +1619,7 @@ _080AFCD6:
|
|||
adds r0, 0x1
|
||||
strh r0, [r1, 0x20]
|
||||
_080AFCF8:
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080AFD0C
|
||||
|
|
@ -1663,13 +1663,13 @@ sub_80AFD4C: @ 80AFD4C
|
|||
ldr r5, _080AFD78 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x20]
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x22]
|
||||
|
|
@ -1704,7 +1704,7 @@ sub_80AFD80: @ 80AFD80
|
|||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl SetAnimBgAttribute
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080AFDC2
|
||||
|
|
@ -1744,7 +1744,7 @@ _080AFDC2:
|
|||
lsls r1, 4
|
||||
movs r2, 0x20
|
||||
bl LoadPalette
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080AFE24
|
||||
|
|
@ -1920,7 +1920,7 @@ _080AFF5E:
|
|||
adds r0, 0x1
|
||||
strh r0, [r1, 0x20]
|
||||
_080AFF80:
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080AFF94
|
||||
|
|
@ -1970,12 +1970,12 @@ sub_80AFFD4: @ 80AFFD4
|
|||
mov r8, r0
|
||||
ldrb r0, [r0]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
adds r4, r0, 0
|
||||
ldr r7, _080B00C4 @ =gBattleAnimTarget
|
||||
ldrb r0, [r7]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r4, 24
|
||||
lsls r0, 24
|
||||
cmp r4, r0
|
||||
|
|
@ -1984,7 +1984,7 @@ sub_80AFFD4: @ 80AFFD4
|
|||
lsls r0, 8
|
||||
strh r0, [r5, 0x3C]
|
||||
_080B0008:
|
||||
ldr r3, _080B00C8 @ =gUnknown_2023BD6
|
||||
ldr r3, _080B00C8 @ =gBattlerPositions
|
||||
ldrb r0, [r7]
|
||||
adds r0, r3
|
||||
ldrb r1, [r0]
|
||||
|
|
@ -2036,13 +2036,13 @@ _080B0068:
|
|||
ldr r4, _080B00C0 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x20]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x22]
|
||||
|
|
@ -2058,7 +2058,7 @@ _080B0068:
|
|||
ldr r4, _080B00C4 @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r1, [r6, 0x6]
|
||||
|
|
@ -2075,7 +2075,7 @@ _080B0068:
|
|||
_080B00BC: .4byte gBattleAnimArgs
|
||||
_080B00C0: .4byte gBattleAnimAttacker
|
||||
_080B00C4: .4byte gBattleAnimTarget
|
||||
_080B00C8: .4byte gUnknown_2023BD6
|
||||
_080B00C8: .4byte gBattlerPositions
|
||||
_080B00CC: .4byte gSprites
|
||||
_080B00D0:
|
||||
ldrh r0, [r6, 0x2]
|
||||
|
|
@ -2085,7 +2085,7 @@ _080B00D0:
|
|||
ldr r4, _080B0140 @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r1, [r6, 0x6]
|
||||
|
|
@ -2098,7 +2098,7 @@ _080B00D0:
|
|||
ldrb r0, [r4]
|
||||
movs r1, 0x1
|
||||
_080B00F8:
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r6, [r6, 0x8]
|
||||
|
|
@ -2111,7 +2111,7 @@ _080B00F8:
|
|||
ldrh r1, [r5, 0x3C]
|
||||
orrs r0, r1
|
||||
strh r0, [r5, 0x3C]
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B012C
|
||||
|
|
@ -2197,7 +2197,7 @@ _080B01AA:
|
|||
ldr r6, _080B01F8 @ =gBattleAnimTarget
|
||||
ldrb r0, [r6]
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x20]
|
||||
|
|
@ -2213,11 +2213,11 @@ _080B01AA:
|
|||
ldrh r0, [r4, 0x3C]
|
||||
adds r0, 0x1
|
||||
strh r0, [r4, 0x3C]
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080B0200
|
||||
ldr r1, _080B01FC @ =gUnknown_2023BD6
|
||||
ldr r1, _080B01FC @ =gBattlerPositions
|
||||
ldrb r0, [r6]
|
||||
adds r0, r1
|
||||
ldrb r1, [r0]
|
||||
|
|
@ -2230,7 +2230,7 @@ _080B01AA:
|
|||
b _080B0202
|
||||
.align 2, 0
|
||||
_080B01F8: .4byte gBattleAnimTarget
|
||||
_080B01FC: .4byte gUnknown_2023BD6
|
||||
_080B01FC: .4byte gBattlerPositions
|
||||
_080B0200:
|
||||
strh r5, [r4, 0x38]
|
||||
_080B0202:
|
||||
|
|
@ -2283,7 +2283,7 @@ _080B0230:
|
|||
ldrh r1, [r4, 0x26]
|
||||
adds r0, r1
|
||||
strh r0, [r4, 0x26]
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080B02AE
|
||||
|
|
@ -2361,11 +2361,11 @@ _080B02CE:
|
|||
strh r0, [r4, 0x34]
|
||||
adds r0, 0x4
|
||||
strh r0, [r4, 0x36]
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080B0328
|
||||
ldr r1, _080B0320 @ =gUnknown_2023BD6
|
||||
ldr r1, _080B0320 @ =gBattlerPositions
|
||||
ldr r0, _080B0324 @ =gBattleAnimTarget
|
||||
ldrb r0, [r0]
|
||||
adds r0, r1
|
||||
|
|
@ -2378,7 +2378,7 @@ _080B02CE:
|
|||
lsls r0, 1
|
||||
b _080B032A
|
||||
.align 2, 0
|
||||
_080B0320: .4byte gUnknown_2023BD6
|
||||
_080B0320: .4byte gBattlerPositions
|
||||
_080B0324: .4byte gBattleAnimTarget
|
||||
_080B0328:
|
||||
ldr r0, _080B0340 @ =0x0000fff0
|
||||
|
|
@ -2583,7 +2583,7 @@ sub_80B0458: @ 80B0458
|
|||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
adds r0, r5, 0
|
||||
bl sub_8072DF0
|
||||
bl IsBattlerSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B0544
|
||||
|
|
@ -2591,12 +2591,12 @@ sub_80B0458: @ 80B0458
|
|||
str r0, [sp, 0x4]
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r7, r0, 24
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
mov r1, r8
|
||||
|
|
@ -2921,7 +2921,7 @@ _080B0742:
|
|||
ldr r4, _080B0788 @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r1, [r6, 0x4]
|
||||
|
|
@ -2929,7 +2929,7 @@ _080B0742:
|
|||
strh r0, [r5, 0x32]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r1, [r6, 0x6]
|
||||
|
|
|
|||
|
|
@ -154,14 +154,14 @@ _08107EC8: .4byte sub_80568A8
|
|||
thumb_func_start sub_8107ECC
|
||||
sub_8107ECC: @ 8107ECC
|
||||
push {lr}
|
||||
ldr r2, _08107EDC @ =sub_8030AEC
|
||||
ldr r2, _08107EDC @ =SetCB2ToReshowScreenAfterMenu2
|
||||
movs r0, 0x5
|
||||
movs r1, 0x3
|
||||
bl sub_8107DB4
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08107EDC: .4byte sub_8030AEC
|
||||
_08107EDC: .4byte SetCB2ToReshowScreenAfterMenu2
|
||||
thumb_func_end sub_8107ECC
|
||||
|
||||
thumb_func_start sub_8107EE0
|
||||
|
|
@ -3922,7 +3922,7 @@ sub_8109CC0: @ 8109CC0
|
|||
_08109D14: .4byte gTasks+0x8
|
||||
_08109D18:
|
||||
ldrh r0, [r4, 0x2]
|
||||
ldr r1, _08109D30 @ =gUnknown_84163DB
|
||||
ldr r1, _08109D30 @ =gText_TossOutHowManyStrVar1s
|
||||
bl sub_810971C
|
||||
adds r0, r7, 0
|
||||
subs r0, 0x8
|
||||
|
|
@ -3934,7 +3934,7 @@ _08109D2A:
|
|||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08109D30: .4byte gUnknown_84163DB
|
||||
_08109D30: .4byte gText_TossOutHowManyStrVar1s
|
||||
_08109D34: .4byte sub_8109DEC
|
||||
thumb_func_end sub_8109CC0
|
||||
|
||||
|
|
@ -3957,7 +3957,7 @@ sub_8109D38: @ 8109D38
|
|||
movs r3, 0x3
|
||||
bl ConvertIntToDecimalStringN
|
||||
ldr r5, _08109DA4 @ =gStringVar4
|
||||
ldr r1, _08109DA8 @ =gUnknown_8416409
|
||||
ldr r1, _08109DA8 @ =gText_ThrowAwayStrVar2OfThisItemQM
|
||||
adds r0, r5, 0
|
||||
bl StringExpandPlaceholders
|
||||
movs r0, 0x6
|
||||
|
|
@ -3988,7 +3988,7 @@ sub_8109D38: @ 8109D38
|
|||
_08109D9C: .4byte gTasks+0x8
|
||||
_08109DA0: .4byte gStringVar2
|
||||
_08109DA4: .4byte gStringVar4
|
||||
_08109DA8: .4byte gUnknown_8416409
|
||||
_08109DA8: .4byte gText_ThrowAwayStrVar2OfThisItemQM
|
||||
_08109DAC: .4byte gUnknown_8452F50
|
||||
thumb_func_end sub_8109D38
|
||||
|
||||
|
|
@ -4133,7 +4133,7 @@ sub_8109EA8: @ 8109EA8
|
|||
movs r3, 0x3
|
||||
bl ConvertIntToDecimalStringN
|
||||
ldr r6, _08109F38 @ =gStringVar4
|
||||
ldr r1, _08109F3C @ =gUnknown_84163F4
|
||||
ldr r1, _08109F3C @ =gText_ThrewAwayStrVar2StrVar1s
|
||||
adds r0, r6, 0
|
||||
bl StringExpandPlaceholders
|
||||
movs r0, 0x6
|
||||
|
|
@ -4167,7 +4167,7 @@ _08109F2C: .4byte gUnknown_203ACFC
|
|||
_08109F30: .4byte gStringVar1
|
||||
_08109F34: .4byte gStringVar2
|
||||
_08109F38: .4byte gStringVar4
|
||||
_08109F3C: .4byte gUnknown_84163F4
|
||||
_08109F3C: .4byte gText_ThrewAwayStrVar2StrVar1s
|
||||
_08109F40: .4byte sub_8109F44
|
||||
thumb_func_end sub_8109EA8
|
||||
|
||||
|
|
@ -4706,7 +4706,7 @@ _0810A3C4: .4byte gUnknown_841630F
|
|||
_0810A3C8: .4byte sub_810A1D0
|
||||
_0810A3CC:
|
||||
movs r0, 0xB6
|
||||
lsls r0, 1
|
||||
lsls r0, 1 @ ITEM_TM_CASE
|
||||
cmp r4, r0
|
||||
bne _0810A3DC
|
||||
ldr r0, _0810A3D8 @ =sub_810A434
|
||||
|
|
@ -4714,7 +4714,7 @@ _0810A3CC:
|
|||
.align 2, 0
|
||||
_0810A3D8: .4byte sub_810A434
|
||||
_0810A3DC:
|
||||
ldr r0, _0810A3F0 @ =0x0000016d
|
||||
ldr r0, _0810A3F0 @ =ITEM_BERRY_POUCH
|
||||
cmp r4, r0
|
||||
bne _0810A3F8
|
||||
ldr r0, _0810A3F4 @ =sub_810A448
|
||||
|
|
@ -4724,7 +4724,7 @@ _0810A3E4:
|
|||
bl ItemMenu_StartFadeToExitCallback
|
||||
b _0810A426
|
||||
.align 2, 0
|
||||
_0810A3F0: .4byte 0x0000016d
|
||||
_0810A3F0: .4byte 0x0000016d @ ITEM_BERRY_POUCH
|
||||
_0810A3F4: .4byte sub_810A448
|
||||
_0810A3F8:
|
||||
mov r1, r8
|
||||
|
|
@ -6124,14 +6124,14 @@ sub_810AF74: @ 810AF74
|
|||
movs r0, 0x4
|
||||
movs r1, 0x1
|
||||
bl AddBagItem
|
||||
ldr r2, _0810AF98 @ =sub_8030AEC
|
||||
ldr r2, _0810AF98 @ =SetCB2ToReshowScreenAfterMenu2
|
||||
movs r0, 0x6
|
||||
movs r1, 0
|
||||
bl sub_8107DB4
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0810AF98: .4byte sub_8030AEC
|
||||
_0810AF98: .4byte SetCB2ToReshowScreenAfterMenu2
|
||||
thumb_func_end sub_810AF74
|
||||
|
||||
thumb_func_start sub_810AF9C
|
||||
|
|
@ -6348,13 +6348,13 @@ sub_810B108: @ 810B108
|
|||
.align 2, 0
|
||||
_0810B15C: .4byte CB2_ReturnToTeachyTV
|
||||
_0810B160:
|
||||
ldr r2, _0810B168 @ =sub_8030AEC
|
||||
ldr r2, _0810B168 @ =SetCB2ToReshowScreenAfterMenu2
|
||||
movs r0, 0x7
|
||||
b _0810B170
|
||||
.align 2, 0
|
||||
_0810B168: .4byte sub_8030AEC
|
||||
_0810B168: .4byte SetCB2ToReshowScreenAfterMenu2
|
||||
_0810B16C:
|
||||
ldr r2, _0810B17C @ =sub_8030AEC
|
||||
ldr r2, _0810B17C @ =SetCB2ToReshowScreenAfterMenu2
|
||||
movs r0, 0x8
|
||||
_0810B170:
|
||||
movs r1, 0
|
||||
|
|
@ -6363,7 +6363,7 @@ _0810B170:
|
|||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0810B17C: .4byte sub_8030AEC
|
||||
_0810B17C: .4byte SetCB2ToReshowScreenAfterMenu2
|
||||
thumb_func_end sub_810B108
|
||||
|
||||
thumb_func_start sub_810B180
|
||||
|
|
|
|||
1347
asm/itemfinder.s
1347
asm/itemfinder.s
File diff suppressed because it is too large
Load Diff
|
|
@ -758,7 +758,7 @@ _080E4C7E:
|
|||
adds r5, r4
|
||||
ldrh r4, [r5]
|
||||
str r4, [sp]
|
||||
bl sub_8134738
|
||||
bl ShowSelectMovePokemonSummaryScreen
|
||||
ldr r1, [r7]
|
||||
movs r0, 0x1C
|
||||
b _080E4ED8
|
||||
|
|
|
|||
5196
asm/link.s
5196
asm/link.s
File diff suppressed because it is too large
Load Diff
238
asm/link_rfu_2.s
238
asm/link_rfu_2.s
|
|
@ -71,7 +71,7 @@ _080F863E:
|
|||
adds r0, r4, 0
|
||||
bl sub_80FC4D4
|
||||
strh r5, [r7]
|
||||
ldr r1, _080F86AC @ =gUnknown_3003F50
|
||||
ldr r1, _080F86AC @ =gSendCmd
|
||||
ldr r2, _080F86B0 @ =0x01000008
|
||||
adds r0, r7, 0
|
||||
bl CpuSet
|
||||
|
|
@ -97,7 +97,7 @@ _080F869C: .4byte gUnknown_3005450
|
|||
_080F86A0: .4byte 0x010004d6
|
||||
_080F86A4: .4byte gUnknown_30054BC
|
||||
_080F86A8: .4byte 0x00000634
|
||||
_080F86AC: .4byte gUnknown_3003F50
|
||||
_080F86AC: .4byte gSendCmd
|
||||
_080F86B0: .4byte 0x01000008
|
||||
_080F86B4: .4byte gRecvCmds
|
||||
_080F86B8: .4byte 0x01000028
|
||||
|
|
@ -1277,7 +1277,7 @@ _080F9034: .4byte 0x01000028
|
|||
thumb_func_start sub_80F9038
|
||||
sub_80F9038: @ 80F9038
|
||||
push {lr}
|
||||
ldr r3, _080F9064 @ =gUnknown_3003F50
|
||||
ldr r3, _080F9064 @ =gSendCmd
|
||||
ldr r2, _080F9068 @ =gRecvCmds
|
||||
movs r1, 0x6
|
||||
_080F9040:
|
||||
|
|
@ -1288,7 +1288,7 @@ _080F9040:
|
|||
subs r1, 0x1
|
||||
cmp r1, 0
|
||||
bge _080F9040
|
||||
ldr r1, _080F9064 @ =gUnknown_3003F50
|
||||
ldr r1, _080F9064 @ =gSendCmd
|
||||
movs r2, 0
|
||||
adds r0, r1, 0
|
||||
adds r0, 0xC
|
||||
|
|
@ -1300,7 +1300,7 @@ _080F9056:
|
|||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080F9064: .4byte gUnknown_3003F50
|
||||
_080F9064: .4byte gSendCmd
|
||||
_080F9068: .4byte gRecvCmds
|
||||
thumb_func_end sub_80F9038
|
||||
|
||||
|
|
@ -1360,8 +1360,8 @@ _080F90D4: .4byte 0x000008d4
|
|||
_080F90D8: .4byte 0x000008f2
|
||||
thumb_func_end sub_80F906C
|
||||
|
||||
thumb_func_start sub_80F90DC
|
||||
sub_80F90DC: @ 80F90DC
|
||||
thumb_func_start IsRfuRecvQueueEmpty
|
||||
IsRfuRecvQueueEmpty: @ 80F90DC
|
||||
push {r4,lr}
|
||||
ldr r0, _080F90EC @ =gUnknown_3007460
|
||||
ldr r0, [r0]
|
||||
|
|
@ -1398,7 +1398,7 @@ _080F9110:
|
|||
bx r1
|
||||
.align 2, 0
|
||||
_080F9118: .4byte gRecvCmds
|
||||
thumb_func_end sub_80F90DC
|
||||
thumb_func_end IsRfuRecvQueueEmpty
|
||||
|
||||
thumb_func_start sub_80F911C
|
||||
sub_80F911C: @ 80F911C
|
||||
|
|
@ -2007,7 +2007,7 @@ _080F95E4:
|
|||
ldrb r1, [r2]
|
||||
strb r0, [r2]
|
||||
bl sub_80FA510
|
||||
ldr r5, _080F9658 @ =gUnknown_3003F50
|
||||
ldr r5, _080F9658 @ =gSendCmd
|
||||
add r4, sp, 0x48
|
||||
adds r0, r5, 0
|
||||
adds r1, r4, 0
|
||||
|
|
@ -2029,7 +2029,7 @@ _080F9618:
|
|||
cmp r1, 0x6
|
||||
bls _080F9618
|
||||
_080F9628:
|
||||
bl sub_80F90DC
|
||||
bl IsRfuRecvQueueEmpty
|
||||
add sp, 0x58
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
|
|
@ -2045,7 +2045,7 @@ _080F9648: .4byte 0x0000099c
|
|||
_080F964C: .4byte gUnknown_3007460
|
||||
_080F9650: .4byte gReceivedRemoteLinkPlayers
|
||||
_080F9654: .4byte 0x00000988
|
||||
_080F9658: .4byte gUnknown_3003F50
|
||||
_080F9658: .4byte gSendCmd
|
||||
thumb_func_end sub_80F9514
|
||||
|
||||
thumb_func_start sub_80F965C
|
||||
|
|
@ -2148,8 +2148,8 @@ _080F9718: .4byte gUnknown_3005AF0
|
|||
_080F971C: .4byte gUnknown_30054BE
|
||||
thumb_func_end sub_80F965C
|
||||
|
||||
thumb_func_start sub_80F9720
|
||||
sub_80F9720: @ 80F9720
|
||||
thumb_func_start Rfu_SetBlockReceivedFlag
|
||||
Rfu_SetBlockReceivedFlag: @ 80F9720
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r1, r0, 24
|
||||
|
|
@ -2173,10 +2173,10 @@ _080F9740:
|
|||
_080F9748:
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80F9720
|
||||
thumb_func_end Rfu_SetBlockReceivedFlag
|
||||
|
||||
thumb_func_start sub_80F974C
|
||||
sub_80F974C: @ 80F974C
|
||||
thumb_func_start Rfu_ResetBlockReceivedFlag
|
||||
Rfu_ResetBlockReceivedFlag: @ 80F974C
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r3, _080F976C @ =gUnknown_3005450
|
||||
|
|
@ -2194,7 +2194,7 @@ sub_80F974C: @ 80F974C
|
|||
bx lr
|
||||
.align 2, 0
|
||||
_080F976C: .4byte gUnknown_3005450
|
||||
thumb_func_end sub_80F974C
|
||||
thumb_func_end Rfu_ResetBlockReceivedFlag
|
||||
|
||||
thumb_func_start sub_80F9770
|
||||
sub_80F9770: @ 80F9770
|
||||
|
|
@ -2244,7 +2244,7 @@ rfu_func_080F97B8: @ 80F97B8
|
|||
ldrb r0, [r0]
|
||||
cmp r0, 0
|
||||
beq _080F97EA
|
||||
ldr r3, _080F97F4 @ =gUnknown_3005028
|
||||
ldr r3, _080F97F4 @ =gHeldKeyCodeToSend
|
||||
ldrh r2, [r3]
|
||||
cmp r2, 0
|
||||
beq _080F97EA
|
||||
|
|
@ -2268,7 +2268,7 @@ _080F97EA:
|
|||
bx r0
|
||||
.align 2, 0
|
||||
_080F97F0: .4byte gReceivedRemoteLinkPlayers
|
||||
_080F97F4: .4byte gUnknown_3005028
|
||||
_080F97F4: .4byte gHeldKeyCodeToSend
|
||||
_080F97F8: .4byte gLinkTransferringData
|
||||
_080F97FC: .4byte gUnknown_3001188
|
||||
thumb_func_end rfu_func_080F97B8
|
||||
|
|
@ -2281,8 +2281,8 @@ sub_80F9800: @ 80F9800
|
|||
_080F9804: .4byte gUnknown_3005440
|
||||
thumb_func_end sub_80F9800
|
||||
|
||||
thumb_func_start sub_80F9808
|
||||
sub_80F9808: @ 80F9808
|
||||
thumb_func_start IsSendingKeysToRfu
|
||||
IsSendingKeysToRfu: @ 80F9808
|
||||
push {lr}
|
||||
movs r2, 0
|
||||
ldr r0, _080F9820 @ =gUnknown_3005450
|
||||
|
|
@ -2298,7 +2298,7 @@ _080F9818:
|
|||
.align 2, 0
|
||||
_080F9820: .4byte gUnknown_3005450
|
||||
_080F9824: .4byte rfu_func_080F97B8
|
||||
thumb_func_end sub_80F9808
|
||||
thumb_func_end IsSendingKeysToRfu
|
||||
|
||||
thumb_func_start sub_80F9828
|
||||
sub_80F9828: @ 80F9828
|
||||
|
|
@ -2326,15 +2326,15 @@ _080F9854: .4byte gUnknown_843EDC4
|
|||
_080F9858: .4byte rfu_func_080F97B8
|
||||
thumb_func_end sub_80F9828
|
||||
|
||||
thumb_func_start sub_80F985C
|
||||
sub_80F985C: @ 80F985C
|
||||
thumb_func_start Rfu_set_zero
|
||||
Rfu_set_zero: @ 80F985C
|
||||
ldr r1, _080F9864 @ =gUnknown_3005450
|
||||
movs r0, 0
|
||||
str r0, [r1]
|
||||
bx lr
|
||||
.align 2, 0
|
||||
_080F9864: .4byte gUnknown_3005450
|
||||
thumb_func_end sub_80F985C
|
||||
thumb_func_end Rfu_set_zero
|
||||
|
||||
thumb_func_start sub_80F9868
|
||||
sub_80F9868: @ 80F9868
|
||||
|
|
@ -2444,12 +2444,12 @@ _080F9914:
|
|||
beq _080F9924
|
||||
b _080F9BF8
|
||||
_080F9924:
|
||||
ldr r1, _080F9948 @ =gUnknown_3003ED2
|
||||
ldr r1, _080F9948 @ =gRecvCmds + 2
|
||||
adds r0, r2, r1
|
||||
ldrh r0, [r0]
|
||||
ldr r3, _080F993C @ =gUnknown_3005450
|
||||
strb r0, [r3, 0xD]
|
||||
ldr r4, _080F994C @ =gUnknown_3003ED4
|
||||
ldr r4, _080F994C @ =gRecvCmds + 4
|
||||
adds r0, r2, r4
|
||||
bl sub_80F9770
|
||||
ldr r1, _080F9950 @ =gUnknown_3005DD6
|
||||
|
|
@ -2459,8 +2459,8 @@ _080F9924:
|
|||
_080F993C: .4byte gUnknown_3005450
|
||||
_080F9940: .4byte gReceivedRemoteLinkPlayers
|
||||
_080F9944: .4byte gUnknown_3007460
|
||||
_080F9948: .4byte gUnknown_3003ED2
|
||||
_080F994C: .4byte gUnknown_3003ED4
|
||||
_080F9948: .4byte gRecvCmds + 2
|
||||
_080F994C: .4byte gRecvCmds + 4
|
||||
_080F9950: .4byte gUnknown_3005DD6
|
||||
_080F9954:
|
||||
ldr r2, _080F99AC @ =gUnknown_3005450
|
||||
|
|
@ -2484,13 +2484,13 @@ _080F9974:
|
|||
adds r0, 0x80
|
||||
movs r2, 0
|
||||
strh r4, [r0]
|
||||
ldr r1, _080F99B0 @ =gUnknown_3003ED2
|
||||
ldr r1, _080F99B0 @ =gRecvCmds + 2
|
||||
adds r0, r5, r1
|
||||
ldrh r0, [r0]
|
||||
adds r1, r3, 0
|
||||
adds r1, 0x82
|
||||
strh r0, [r1]
|
||||
ldr r1, _080F99B4 @ =gUnknown_3003ED4
|
||||
ldr r1, _080F99B4 @ =gRecvCmds + 4
|
||||
adds r0, r5, r1
|
||||
ldrh r1, [r0]
|
||||
adds r0, r3, 0
|
||||
|
|
@ -2510,8 +2510,8 @@ _080F9974:
|
|||
b _080F9BF8
|
||||
.align 2, 0
|
||||
_080F99AC: .4byte gUnknown_3005450
|
||||
_080F99B0: .4byte gUnknown_3003ED2
|
||||
_080F99B4: .4byte gUnknown_3003ED4
|
||||
_080F99B0: .4byte gRecvCmds + 2
|
||||
_080F99B4: .4byte gRecvCmds + 4
|
||||
_080F99B8:
|
||||
ldr r4, _080F9A88 @ =gUnknown_3005450
|
||||
mov r9, r4
|
||||
|
|
@ -2597,7 +2597,7 @@ _080F9A4C:
|
|||
mov r1, r8
|
||||
lsls r0, r1, 24
|
||||
lsrs r0, 24
|
||||
bl sub_80F9720
|
||||
bl Rfu_SetBlockReceivedFlag
|
||||
bl sub_80F9800
|
||||
ldrb r1, [r0, 0xA]
|
||||
movs r0, 0x7F
|
||||
|
|
@ -2628,7 +2628,7 @@ _080F9A94: .4byte gUnknown_843EBD4
|
|||
_080F9A98: .4byte gReceivedRemoteLinkPlayers
|
||||
_080F9A9C:
|
||||
ldr r2, _080F9AB8 @ =gUnknown_843EC64
|
||||
ldr r3, _080F9ABC @ =gUnknown_3003ED2
|
||||
ldr r3, _080F9ABC @ =gRecvCmds + 2
|
||||
adds r0, r5, r3
|
||||
ldrh r1, [r0]
|
||||
lsls r1, 3
|
||||
|
|
@ -2637,11 +2637,11 @@ _080F9A9C:
|
|||
adds r2, 0x4
|
||||
adds r1, r2
|
||||
ldrh r1, [r1]
|
||||
bl sub_80F9E60
|
||||
bl Rfu_InitBlockSend
|
||||
b _080F9BF4
|
||||
.align 2, 0
|
||||
_080F9AB8: .4byte gUnknown_843EC64
|
||||
_080F9ABC: .4byte gUnknown_3003ED2
|
||||
_080F9ABC: .4byte gRecvCmds + 2
|
||||
_080F9AC0:
|
||||
ldr r1, _080F9ACC @ =gUnknown_3005534
|
||||
add r1, r8
|
||||
|
|
@ -2655,7 +2655,7 @@ _080F9AD0:
|
|||
movs r4, 0x80
|
||||
lsls r4, 1
|
||||
adds r0, r2, r4
|
||||
ldr r3, _080F9AFC @ =gUnknown_3003ED2
|
||||
ldr r3, _080F9AFC @ =gRecvCmds + 2
|
||||
adds r1, r5, r3
|
||||
ldrh r0, [r0]
|
||||
mov r6, r8
|
||||
|
|
@ -2673,7 +2673,7 @@ _080F9AEA:
|
|||
b _080F9BF8
|
||||
.align 2, 0
|
||||
_080F9AF8: .4byte gUnknown_3005450
|
||||
_080F9AFC: .4byte gUnknown_3003ED2
|
||||
_080F9AFC: .4byte gRecvCmds + 2
|
||||
_080F9B00:
|
||||
ldr r7, _080F9B4C @ =gUnknown_3005450
|
||||
ldrb r2, [r7, 0xC]
|
||||
|
|
@ -2685,7 +2685,7 @@ _080F9B00:
|
|||
adds r6, 0x1
|
||||
cmp r0, 0
|
||||
beq _080F9BF8
|
||||
ldr r0, _080F9B54 @ =gUnknown_3003ED2
|
||||
ldr r0, _080F9B54 @ =gRecvCmds + 2
|
||||
adds r4, r5, r0
|
||||
ldrh r1, [r4]
|
||||
ldr r0, _080F9B58 @ =gUnknown_3007460
|
||||
|
|
@ -2696,7 +2696,7 @@ _080F9B00:
|
|||
beq _080F9B38
|
||||
strb r2, [r3]
|
||||
bl sub_80FEB14
|
||||
ldr r1, _080F9B5C @ =gUnknown_3003ED4
|
||||
ldr r1, _080F9B5C @ =gRecvCmds + 4
|
||||
adds r0, r5, r1
|
||||
ldrh r1, [r0]
|
||||
ldr r2, _080F9B60 @ =0x0000099c
|
||||
|
|
@ -2714,21 +2714,21 @@ _080F9B38:
|
|||
.align 2, 0
|
||||
_080F9B4C: .4byte gUnknown_3005450
|
||||
_080F9B50: .4byte gReceivedRemoteLinkPlayers
|
||||
_080F9B54: .4byte gUnknown_3003ED2
|
||||
_080F9B54: .4byte gRecvCmds + 2
|
||||
_080F9B58: .4byte gUnknown_3007460
|
||||
_080F9B5C: .4byte gUnknown_3003ED4
|
||||
_080F9B5C: .4byte gRecvCmds + 4
|
||||
_080F9B60: .4byte 0x0000099c
|
||||
_080F9B64: .4byte gRecvCmds
|
||||
_080F9B68:
|
||||
movs r0, 0xEE
|
||||
lsls r0, 8
|
||||
bl sub_80F9D04
|
||||
ldr r1, _080F9B90 @ =gUnknown_3003F50
|
||||
ldr r3, _080F9B94 @ =gUnknown_3003ED2
|
||||
ldr r1, _080F9B90 @ =gSendCmd
|
||||
ldr r3, _080F9B94 @ =gRecvCmds + 2
|
||||
adds r0, r5, r3
|
||||
ldrh r0, [r0]
|
||||
strh r0, [r1, 0x2]
|
||||
ldr r4, _080F9B98 @ =gUnknown_3003ED4
|
||||
ldr r4, _080F9B98 @ =gRecvCmds + 4
|
||||
adds r0, r5, r4
|
||||
ldrh r0, [r0]
|
||||
strh r0, [r1, 0x4]
|
||||
|
|
@ -2739,9 +2739,9 @@ _080F9B68:
|
|||
strh r0, [r1, 0x6]
|
||||
b _080F9BF4
|
||||
.align 2, 0
|
||||
_080F9B90: .4byte gUnknown_3003F50
|
||||
_080F9B94: .4byte gUnknown_3003ED2
|
||||
_080F9B98: .4byte gUnknown_3003ED4
|
||||
_080F9B90: .4byte gSendCmd
|
||||
_080F9B94: .4byte gRecvCmds + 2
|
||||
_080F9B98: .4byte gRecvCmds + 4
|
||||
_080F9B9C: .4byte gRecvCmds
|
||||
_080F9BA0:
|
||||
ldr r4, _080F9BD0 @ =gUnknown_3005450
|
||||
|
|
@ -2752,13 +2752,13 @@ _080F9BA0:
|
|||
bne _080F9C34
|
||||
ldr r0, _080F9BD4 @ =0x0000099b
|
||||
adds r2, r4, r0
|
||||
ldr r1, _080F9BD8 @ =gUnknown_3003ED2
|
||||
ldr r1, _080F9BD8 @ =gRecvCmds + 2
|
||||
adds r3, r5, r1
|
||||
ldrb r1, [r3]
|
||||
ldrb r0, [r2]
|
||||
orrs r0, r1
|
||||
strb r0, [r2]
|
||||
ldr r2, _080F9BDC @ =gUnknown_3003ED4
|
||||
ldr r2, _080F9BDC @ =gRecvCmds + 4
|
||||
adds r0, r5, r2
|
||||
ldrh r1, [r0]
|
||||
ldr r2, _080F9BE0 @ =0x0000099c
|
||||
|
|
@ -2770,15 +2770,15 @@ _080F9BA0:
|
|||
.align 2, 0
|
||||
_080F9BD0: .4byte gUnknown_3005450
|
||||
_080F9BD4: .4byte 0x0000099b
|
||||
_080F9BD8: .4byte gUnknown_3003ED2
|
||||
_080F9BDC: .4byte gUnknown_3003ED4
|
||||
_080F9BD8: .4byte gRecvCmds + 2
|
||||
_080F9BDC: .4byte gRecvCmds + 4
|
||||
_080F9BE0: .4byte 0x0000099c
|
||||
_080F9BE4:
|
||||
ldr r0, _080F9C24 @ =gUnknown_3003E60
|
||||
ldr r0, _080F9C24 @ =gLinkPartnersHeldKeys
|
||||
mov r3, r8
|
||||
lsls r1, r3, 1
|
||||
adds r1, r0
|
||||
ldr r4, _080F9C28 @ =gUnknown_3003ED2
|
||||
ldr r4, _080F9C28 @ =gRecvCmds + 2
|
||||
adds r0, r5, r4
|
||||
ldrh r0, [r0]
|
||||
strh r0, [r1]
|
||||
|
|
@ -2808,8 +2808,8 @@ _080F9BF8:
|
|||
strb r1, [r2]
|
||||
b _080F9C34
|
||||
.align 2, 0
|
||||
_080F9C24: .4byte gUnknown_3003E60
|
||||
_080F9C28: .4byte gUnknown_3003ED2
|
||||
_080F9C24: .4byte gLinkPartnersHeldKeys
|
||||
_080F9C28: .4byte gRecvCmds + 2
|
||||
_080F9C2C: .4byte gUnknown_3005450
|
||||
_080F9C30:
|
||||
adds r0, 0x1
|
||||
|
|
@ -2909,8 +2909,8 @@ sub_80F9CB4: @ 80F9CB4
|
|||
bx lr
|
||||
thumb_func_end sub_80F9CB4
|
||||
|
||||
thumb_func_start sub_80F9CC8
|
||||
sub_80F9CC8: @ 80F9CC8
|
||||
thumb_func_start Rfu_GetBlockReceivedStatus
|
||||
Rfu_GetBlockReceivedStatus: @ 80F9CC8
|
||||
push {r4,lr}
|
||||
movs r2, 0
|
||||
movs r1, 0
|
||||
|
|
@ -2942,14 +2942,14 @@ _080F9CEE:
|
|||
bx r1
|
||||
.align 2, 0
|
||||
_080F9D00: .4byte gUnknown_3005450
|
||||
thumb_func_end sub_80F9CC8
|
||||
thumb_func_end Rfu_GetBlockReceivedStatus
|
||||
|
||||
thumb_func_start sub_80F9D04
|
||||
sub_80F9D04: @ 80F9D04
|
||||
push {r4,r5,lr}
|
||||
lsls r0, 16
|
||||
lsrs r1, r0, 16
|
||||
ldr r5, _080F9D34 @ =gUnknown_3003F50
|
||||
ldr r5, _080F9D34 @ =gSendCmd
|
||||
strh r1, [r5]
|
||||
movs r0, 0xF0
|
||||
lsls r0, 7
|
||||
|
|
@ -2970,7 +2970,7 @@ sub_80F9D04: @ 80F9D04
|
|||
beq _080F9DFC
|
||||
b _080F9E22
|
||||
.align 2, 0
|
||||
_080F9D34: .4byte gUnknown_3003F50
|
||||
_080F9D34: .4byte gSendCmd
|
||||
_080F9D38:
|
||||
movs r0, 0xCC
|
||||
lsls r0, 7
|
||||
|
|
@ -3087,7 +3087,7 @@ _080F9E00:
|
|||
.align 2, 0
|
||||
_080F9E18: .4byte gUnknown_3005542
|
||||
_080F9E1C:
|
||||
ldr r0, _080F9E28 @ =gUnknown_3005028
|
||||
ldr r0, _080F9E28 @ =gHeldKeyCodeToSend
|
||||
ldrh r0, [r0]
|
||||
_080F9E20:
|
||||
strh r0, [r5, 0x2]
|
||||
|
|
@ -3096,14 +3096,14 @@ _080F9E22:
|
|||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080F9E28: .4byte gUnknown_3005028
|
||||
_080F9E28: .4byte gHeldKeyCodeToSend
|
||||
thumb_func_end sub_80F9D04
|
||||
|
||||
thumb_func_start sub_80F9E2C
|
||||
sub_80F9E2C: @ 80F9E2C
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
ldr r0, _080F9E58 @ =gUnknown_3003F50
|
||||
ldr r0, _080F9E58 @ =gSendCmd
|
||||
ldrh r0, [r0]
|
||||
cmp r0, 0
|
||||
bne _080F9E52
|
||||
|
|
@ -3122,12 +3122,12 @@ _080F9E52:
|
|||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080F9E58: .4byte gUnknown_3003F50
|
||||
_080F9E58: .4byte gSendCmd
|
||||
_080F9E5C: .4byte gUnknown_3005542
|
||||
thumb_func_end sub_80F9E2C
|
||||
|
||||
thumb_func_start sub_80F9E60
|
||||
sub_80F9E60: @ 80F9E60
|
||||
thumb_func_start Rfu_InitBlockSend
|
||||
Rfu_InitBlockSend: @ 80F9E60
|
||||
push {r4-r7,lr}
|
||||
mov r7, r9
|
||||
mov r6, r8
|
||||
|
|
@ -3146,7 +3146,7 @@ _080F9E7C:
|
|||
ldr r0, [r5]
|
||||
cmp r0, 0
|
||||
bne _080F9EA4
|
||||
ldr r0, _080F9EB8 @ =gUnknown_3003F50
|
||||
ldr r0, _080F9EB8 @ =gSendCmd
|
||||
ldrh r0, [r0]
|
||||
cmp r0, 0
|
||||
bne _080F9EA4
|
||||
|
|
@ -3170,7 +3170,7 @@ _080F9EA8: .4byte gUnknown_843ED94
|
|||
_080F9EAC: .4byte 0x00000701
|
||||
_080F9EB0: .4byte gUnknown_843EDD8
|
||||
_080F9EB4: .4byte gUnknown_3005450
|
||||
_080F9EB8: .4byte gUnknown_3003F50
|
||||
_080F9EB8: .4byte gSendCmd
|
||||
_080F9EBC: .4byte gUnknown_203AC08
|
||||
_080F9EC0:
|
||||
adds r0, r6, 0
|
||||
|
|
@ -3235,12 +3235,12 @@ _080F9F2A:
|
|||
_080F9F38: .4byte gBlockSendBuffer
|
||||
_080F9F3C: .4byte gUnknown_3005450
|
||||
_080F9F40: .4byte rfufunc_80F9F44
|
||||
thumb_func_end sub_80F9E60
|
||||
thumb_func_end Rfu_InitBlockSend
|
||||
|
||||
thumb_func_start rfufunc_80F9F44
|
||||
rfufunc_80F9F44: @ 80F9F44
|
||||
push {r4,r5,lr}
|
||||
ldr r0, _080F9F74 @ =gUnknown_3003F50
|
||||
ldr r0, _080F9F74 @ =gSendCmd
|
||||
ldrh r0, [r0]
|
||||
cmp r0, 0
|
||||
bne _080F9F98
|
||||
|
|
@ -3263,7 +3263,7 @@ rfufunc_80F9F44: @ 80F9F44
|
|||
bls _080F9F98
|
||||
b _080F9F94
|
||||
.align 2, 0
|
||||
_080F9F74: .4byte gUnknown_3003F50
|
||||
_080F9F74: .4byte gSendCmd
|
||||
_080F9F78: .4byte gUnknown_3005450
|
||||
_080F9F7C:
|
||||
bl GetMultiplayerId
|
||||
|
|
@ -3295,7 +3295,7 @@ sub_80F9FA8: @ 80F9FA8
|
|||
ldr r0, _080FA014 @ =gUnknown_3005450
|
||||
mov r12, r0
|
||||
ldr r5, [r0, 0x70]
|
||||
ldr r3, _080FA018 @ =gUnknown_3003F50
|
||||
ldr r3, _080FA018 @ =gSendCmd
|
||||
mov r2, r12
|
||||
adds r2, 0x6C
|
||||
ldrh r1, [r2]
|
||||
|
|
@ -3348,7 +3348,7 @@ _080FA00C:
|
|||
bx r0
|
||||
.align 2, 0
|
||||
_080FA014: .4byte gUnknown_3005450
|
||||
_080FA018: .4byte gUnknown_3003F50
|
||||
_080FA018: .4byte gSendCmd
|
||||
_080FA01C: .4byte rfufunc_80FA020
|
||||
thumb_func_end sub_80F9FA8
|
||||
|
||||
|
|
@ -3367,7 +3367,7 @@ rfufunc_80FA020: @ 80FA020
|
|||
ldrb r0, [r5, 0xC]
|
||||
cmp r0, 0
|
||||
bne _080FA0E8
|
||||
ldr r3, _080FA0CC @ =gUnknown_3003F50
|
||||
ldr r3, _080FA0CC @ =gSendCmd
|
||||
adds r2, r5, 0
|
||||
adds r2, 0x6E
|
||||
ldrh r0, [r2]
|
||||
|
|
@ -3439,7 +3439,7 @@ _080FA05C:
|
|||
b _080FA0EC
|
||||
.align 2, 0
|
||||
_080FA0C8: .4byte gUnknown_3005450
|
||||
_080FA0CC: .4byte gUnknown_3003F50
|
||||
_080FA0CC: .4byte gSendCmd
|
||||
_080FA0D0: .4byte 0xffff8900
|
||||
_080FA0D4: .4byte gRecvCmds
|
||||
_080FA0D8: .4byte gUnknown_843EBD4
|
||||
|
|
@ -3624,7 +3624,7 @@ _080FA220: .4byte sub_80FA160
|
|||
thumb_func_start sub_80FA224
|
||||
sub_80FA224: @ 80FA224
|
||||
push {r4,lr}
|
||||
ldr r0, _080FA250 @ =gUnknown_3003F50
|
||||
ldr r0, _080FA250 @ =gSendCmd
|
||||
ldrh r0, [r0]
|
||||
cmp r0, 0
|
||||
bne _080FA248
|
||||
|
|
@ -3645,7 +3645,7 @@ _080FA248:
|
|||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080FA250: .4byte gUnknown_3003F50
|
||||
_080FA250: .4byte gSendCmd
|
||||
_080FA254: .4byte gUnknown_3005450
|
||||
_080FA258: .4byte sub_80FA1C4
|
||||
thumb_func_end sub_80FA224
|
||||
|
|
@ -3789,7 +3789,7 @@ sub_80FA350: @ 80FA350
|
|||
ldrb r0, [r0]
|
||||
cmp r0, 0
|
||||
bne _080FA372
|
||||
ldr r0, _080FA380 @ =gUnknown_3003F50
|
||||
ldr r0, _080FA380 @ =gSendCmd
|
||||
ldrh r0, [r0]
|
||||
cmp r0, 0
|
||||
bne _080FA372
|
||||
|
|
@ -3805,7 +3805,7 @@ _080FA372:
|
|||
.align 2, 0
|
||||
_080FA378: .4byte gUnknown_3005450
|
||||
_080FA37C: .4byte 0x0000069e
|
||||
_080FA380: .4byte gUnknown_3003F50
|
||||
_080FA380: .4byte gSendCmd
|
||||
_080FA384: .4byte sub_80FA2B0
|
||||
thumb_func_end sub_80FA350
|
||||
|
||||
|
|
@ -3822,7 +3822,7 @@ sub_80FA388: @ 80FA388
|
|||
ldrb r0, [r0]
|
||||
cmp r0, 0
|
||||
bne _080FA416
|
||||
ldr r0, _080FA3BC @ =gUnknown_3003F50
|
||||
ldr r0, _080FA3BC @ =gSendCmd
|
||||
ldrh r0, [r0]
|
||||
cmp r0, 0
|
||||
bne _080FA416
|
||||
|
|
@ -3834,7 +3834,7 @@ sub_80FA388: @ 80FA388
|
|||
.align 2, 0
|
||||
_080FA3B4: .4byte gUnknown_3005450
|
||||
_080FA3B8: .4byte 0x0000069e
|
||||
_080FA3BC: .4byte gUnknown_3003F50
|
||||
_080FA3BC: .4byte gSendCmd
|
||||
_080FA3C0: .4byte sub_80FA2B0
|
||||
_080FA3C4:
|
||||
bl GetLinkPlayerCount
|
||||
|
|
@ -3869,7 +3869,7 @@ _080FA3F2:
|
|||
ldrb r0, [r0]
|
||||
cmp r0, 0
|
||||
bne _080FA416
|
||||
ldr r0, _080FA424 @ =gUnknown_3003F50
|
||||
ldr r0, _080FA424 @ =gSendCmd
|
||||
ldrh r0, [r0]
|
||||
cmp r0, 0
|
||||
bne _080FA416
|
||||
|
|
@ -3886,7 +3886,7 @@ _080FA416:
|
|||
.align 2, 0
|
||||
_080FA41C: .4byte gUnknown_3005450
|
||||
_080FA420: .4byte 0x0000069e
|
||||
_080FA424: .4byte gUnknown_3003F50
|
||||
_080FA424: .4byte gSendCmd
|
||||
_080FA428: .4byte sub_80FA350
|
||||
thumb_func_end sub_80FA388
|
||||
|
||||
|
|
@ -4003,17 +4003,17 @@ _080FA4E6:
|
|||
bx r1
|
||||
thumb_func_end rfu_get_multiplayer_id
|
||||
|
||||
thumb_func_start sub_80FA4EC
|
||||
sub_80FA4EC: @ 80FA4EC
|
||||
thumb_func_start GetRfuPlayerCount
|
||||
GetRfuPlayerCount: @ 80FA4EC
|
||||
ldr r0, _080FA4F4 @ =gUnknown_3005450
|
||||
ldrb r0, [r0, 0xD]
|
||||
bx lr
|
||||
.align 2, 0
|
||||
_080FA4F4: .4byte gUnknown_3005450
|
||||
thumb_func_end sub_80FA4EC
|
||||
thumb_func_end GetRfuPlayerCount
|
||||
|
||||
thumb_func_start IsNoOneConnected
|
||||
IsNoOneConnected: @ 80FA4F8
|
||||
thumb_func_start IsRfuTaskFinished
|
||||
IsRfuTaskFinished: @ 80FA4F8
|
||||
push {lr}
|
||||
movs r1, 0
|
||||
ldr r0, _080FA50C @ =gUnknown_3005450
|
||||
|
|
@ -4027,7 +4027,7 @@ _080FA506:
|
|||
bx r1
|
||||
.align 2, 0
|
||||
_080FA50C: .4byte gUnknown_3005450
|
||||
thumb_func_end IsNoOneConnected
|
||||
thumb_func_end IsRfuTaskFinished
|
||||
|
||||
thumb_func_start sub_80FA510
|
||||
sub_80FA510: @ 80FA510
|
||||
|
|
@ -4540,7 +4540,7 @@ _080FA8D8:
|
|||
.align 2, 0
|
||||
_080FA8E8: .4byte gTasks
|
||||
_080FA8EC:
|
||||
ldr r0, _080FA8FC @ =gUnknown_3003F50
|
||||
ldr r0, _080FA8FC @ =gSendCmd
|
||||
ldrh r0, [r0]
|
||||
cmp r0, 0
|
||||
bne _080FA9BC
|
||||
|
|
@ -4549,7 +4549,7 @@ _080FA8F4:
|
|||
strh r0, [r4, 0x8]
|
||||
b _080FA9BC
|
||||
.align 2, 0
|
||||
_080FA8FC: .4byte gUnknown_3003F50
|
||||
_080FA8FC: .4byte gSendCmd
|
||||
_080FA900:
|
||||
ldrb r0, [r5, 0xD]
|
||||
b _080FA92C
|
||||
|
|
@ -4590,7 +4590,7 @@ _080FA940:
|
|||
bl sub_800B110
|
||||
lsls r0, r4, 24
|
||||
lsrs r0, 24
|
||||
bl sub_80F974C
|
||||
bl Rfu_ResetBlockReceivedFlag
|
||||
adds r4, 0x1
|
||||
ldrb r2, [r5, 0xD]
|
||||
cmp r4, r2
|
||||
|
|
@ -4831,7 +4831,7 @@ _080FAB0C:
|
|||
.4byte _080FABEE
|
||||
.4byte _080FAC78
|
||||
_080FAB24:
|
||||
ldr r0, _080FAB40 @ =gUnknown_3003F50
|
||||
ldr r0, _080FAB40 @ =gSendCmd
|
||||
ldrh r0, [r0]
|
||||
cmp r0, 0
|
||||
beq _080FAB2E
|
||||
|
|
@ -4844,9 +4844,9 @@ _080FAB2E:
|
|||
bl sub_80F9D04
|
||||
b _080FAC2E
|
||||
.align 2, 0
|
||||
_080FAB40: .4byte gUnknown_3003F50
|
||||
_080FAB40: .4byte gSendCmd
|
||||
_080FAB44:
|
||||
ldr r0, _080FAB58 @ =gUnknown_3003F50
|
||||
ldr r0, _080FAB58 @ =gSendCmd
|
||||
ldrh r0, [r0]
|
||||
cmp r0, 0
|
||||
beq _080FAB4E
|
||||
|
|
@ -4857,7 +4857,7 @@ _080FAB4E:
|
|||
adds r1, r3
|
||||
b _080FAC36
|
||||
.align 2, 0
|
||||
_080FAB58: .4byte gUnknown_3003F50
|
||||
_080FAB58: .4byte gSendCmd
|
||||
_080FAB5C:
|
||||
bl GetBlockReceivedStatus
|
||||
lsls r0, 24
|
||||
|
|
@ -4996,7 +4996,7 @@ _080FAC58:
|
|||
.align 2, 0
|
||||
_080FAC74: .4byte 0x0000099d
|
||||
_080FAC78:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080FACD6
|
||||
|
|
@ -5103,7 +5103,7 @@ _080FAD3A:
|
|||
.align 2, 0
|
||||
_080FAD50: .4byte gBlockSendBuffer
|
||||
_080FAD54:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080FAD8A
|
||||
|
|
@ -5159,7 +5159,7 @@ sub_80FAD98: @ 80FAD98
|
|||
movs r0, 0x2
|
||||
strb r0, [r1]
|
||||
_080FADC0:
|
||||
ldr r4, _080FAE24 @ =c2_800ACD4
|
||||
ldr r4, _080FAE24 @ =CB2_LinkError
|
||||
adds r0, r4, 0
|
||||
bl SetMainCallback2
|
||||
str r4, [r6, 0x8]
|
||||
|
|
@ -5201,7 +5201,7 @@ _080FAE14: .4byte gUnknown_3005E10
|
|||
_080FAE18: .4byte gMain
|
||||
_080FAE1C: .4byte c2_mystery_gift_e_reader_run
|
||||
_080FAE20: .4byte gWirelessCommType
|
||||
_080FAE24: .4byte c2_800ACD4
|
||||
_080FAE24: .4byte CB2_LinkError
|
||||
_080FAE28: .4byte 0x0000069e
|
||||
_080FAE2C: .4byte 0x000008d2
|
||||
_080FAE30:
|
||||
|
|
@ -6812,14 +6812,14 @@ sub_80FBA1C: @ 80FBA1C
|
|||
_080FBA28: .4byte gUnknown_3005450
|
||||
thumb_func_end sub_80FBA1C
|
||||
|
||||
thumb_func_start sub_80FBA2C
|
||||
sub_80FBA2C: @ 80FBA2C
|
||||
thumb_func_start Rfu_IsMaster
|
||||
Rfu_IsMaster: @ 80FBA2C
|
||||
ldr r0, _080FBA34 @ =gUnknown_3005450
|
||||
ldrb r0, [r0, 0xC]
|
||||
bx lr
|
||||
.align 2, 0
|
||||
_080FBA34: .4byte gUnknown_3005450
|
||||
thumb_func_end sub_80FBA2C
|
||||
thumb_func_end Rfu_IsMaster
|
||||
|
||||
thumb_func_start RFUVSync
|
||||
RFUVSync: @ 80FBA38
|
||||
|
|
@ -6866,7 +6866,7 @@ sub_80FBA78: @ 80FBA78
|
|||
bl ResetPaletteFade
|
||||
ldr r0, _080FBAF4 @ =sub_80FBA64
|
||||
bl SetVBlankCallback
|
||||
bl sub_8009480
|
||||
bl IsWirelessAdapterConnected
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080FBAEC
|
||||
|
|
@ -6875,7 +6875,7 @@ sub_80FBA78: @ 80FBA78
|
|||
adds r0, r2, 0
|
||||
strh r0, [r1]
|
||||
bl sub_800B1F4
|
||||
bl sub_8009804
|
||||
bl OpenLink
|
||||
ldr r0, _080FBB00 @ =gMain
|
||||
ldrh r0, [r0, 0x24]
|
||||
bl SeedRng
|
||||
|
|
@ -7269,7 +7269,7 @@ sub_80FBDB8: @ 80FBDB8
|
|||
push {r4-r6,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
ldr r6, _080FBE10 @ =gUnknown_3003F50
|
||||
ldr r6, _080FBE10 @ =gSendCmd
|
||||
ldrh r0, [r6]
|
||||
cmp r0, 0
|
||||
bne _080FBE08
|
||||
|
|
@ -7309,7 +7309,7 @@ _080FBE08:
|
|||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080FBE10: .4byte gUnknown_3003F50
|
||||
_080FBE10: .4byte gSendCmd
|
||||
_080FBE14: .4byte gUnknown_3005450
|
||||
_080FBE18: .4byte gTasks
|
||||
_080FBE1C: .4byte gUnknown_843EC41
|
||||
|
|
@ -8105,8 +8105,8 @@ _080FC458: .4byte gUnknown_3005450
|
|||
_080FC45C: .4byte 0x000008d2
|
||||
thumb_func_end sub_80FC44C
|
||||
|
||||
thumb_func_start sub_80FC460
|
||||
sub_80FC460: @ 80FC460
|
||||
thumb_func_start GetRfuRecvQueueLength
|
||||
GetRfuRecvQueueLength: @ 80FC460
|
||||
ldr r0, _080FC46C @ =gUnknown_3005450
|
||||
ldr r1, _080FC470 @ =0x0000069e
|
||||
adds r0, r1
|
||||
|
|
@ -8115,7 +8115,7 @@ sub_80FC460: @ 80FC460
|
|||
.align 2, 0
|
||||
_080FC46C: .4byte gUnknown_3005450
|
||||
_080FC470: .4byte 0x0000069e
|
||||
thumb_func_end sub_80FC460
|
||||
thumb_func_end GetRfuRecvQueueLength
|
||||
|
||||
thumb_func_start nullsub_89
|
||||
nullsub_89: @ 80FC474
|
||||
|
|
@ -9184,7 +9184,7 @@ _080FCB88:
|
|||
ands r4, r1
|
||||
orrs r4, r0
|
||||
strb r4, [r7]
|
||||
bl sub_806E25C
|
||||
bl IsNationalPokedexEnabled
|
||||
ands r0, r6
|
||||
ldrb r1, [r7, 0x1]
|
||||
ands r5, r1
|
||||
|
|
@ -9368,8 +9368,8 @@ _080FCD6C: .4byte gUnknown_3005440
|
|||
_080FCD70: .4byte gUnknown_3005E00
|
||||
thumb_func_end sub_80FCD50
|
||||
|
||||
thumb_func_start sub_80FCD74
|
||||
sub_80FCD74: @ 80FCD74
|
||||
thumb_func_start CreateWirelessStatusIndicatorSprite
|
||||
CreateWirelessStatusIndicatorSprite: @ 80FCD74
|
||||
push {r4,r5,lr}
|
||||
lsls r0, 24
|
||||
lsrs r3, r0, 24
|
||||
|
|
@ -9464,7 +9464,7 @@ _080FCE34: .4byte gUnknown_203ACE4
|
|||
_080FCE38: .4byte gSprites
|
||||
_080FCE3C: .4byte 0x00001234
|
||||
_080FCE40: .4byte gUnknown_843F274
|
||||
thumb_func_end sub_80FCD74
|
||||
thumb_func_end CreateWirelessStatusIndicatorSprite
|
||||
|
||||
thumb_func_start DestroyWirelessStatusIndicatorSprite
|
||||
DestroyWirelessStatusIndicatorSprite: @ 80FCE44
|
||||
|
|
@ -9514,8 +9514,8 @@ _080FCEA0: .4byte gDummyOamData
|
|||
_080FCEA4: .4byte 0x070003e8
|
||||
thumb_func_end DestroyWirelessStatusIndicatorSprite
|
||||
|
||||
thumb_func_start sub_80FCEA8
|
||||
sub_80FCEA8: @ 80FCEA8
|
||||
thumb_func_start LoadWirelessStatusIndicatorSpriteGfx
|
||||
LoadWirelessStatusIndicatorSpriteGfx: @ 80FCEA8
|
||||
push {r4,lr}
|
||||
ldr r4, _080FCED4 @ =gUnknown_843F274
|
||||
ldrh r0, [r4, 0x6]
|
||||
|
|
@ -9540,7 +9540,7 @@ _080FCED4: .4byte gUnknown_843F274
|
|||
_080FCED8: .4byte 0xffff0000
|
||||
_080FCEDC: .4byte gUnknown_843F27C
|
||||
_080FCEE0: .4byte gUnknown_203ACE4
|
||||
thumb_func_end sub_80FCEA8
|
||||
thumb_func_end LoadWirelessStatusIndicatorSpriteGfx
|
||||
|
||||
thumb_func_start sub_80FCEE4
|
||||
sub_80FCEE4: @ 80FCEE4
|
||||
|
|
|
|||
|
|
@ -317,7 +317,7 @@ _08115B0C:
|
|||
movs r2, 0
|
||||
bl sub_80FAF58
|
||||
bl sub_800B1F4
|
||||
bl sub_8009804
|
||||
bl OpenLink
|
||||
ldrb r1, [r4]
|
||||
movs r0, 0xF
|
||||
ands r0, r1
|
||||
|
|
@ -707,10 +707,10 @@ _08115E84:
|
|||
beq _08115EC0
|
||||
b _081161D8
|
||||
_08115E8E:
|
||||
bl sub_80FCEA8
|
||||
bl LoadWirelessStatusIndicatorSpriteGfx
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_80FCD74
|
||||
bl CreateWirelessStatusIndicatorSprite
|
||||
movs r0, 0x5
|
||||
strb r0, [r5, 0x19]
|
||||
ldrb r1, [r5, 0x13]
|
||||
|
|
@ -1841,7 +1841,7 @@ _081167C0:
|
|||
ldrb r0, [r0]
|
||||
strb r0, [r1]
|
||||
bl sub_800B1F4
|
||||
bl sub_8009804
|
||||
bl OpenLink
|
||||
bl sub_80FBBD8
|
||||
movs r0, 0x70
|
||||
bl AllocZeroed
|
||||
|
|
@ -2475,10 +2475,10 @@ sub_8116D60: @ 8116D60
|
|||
push {r4,r5,lr}
|
||||
adds r4, r0, 0
|
||||
strb r1, [r4, 0xF]
|
||||
bl sub_80FCEA8
|
||||
bl LoadWirelessStatusIndicatorSpriteGfx
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_80FCD74
|
||||
bl CreateWirelessStatusIndicatorSprite
|
||||
ldrb r0, [r4, 0xE]
|
||||
bl RedrawListMenu
|
||||
ldr r5, _08116DD4 @ =gStringVar1
|
||||
|
|
@ -2595,7 +2595,7 @@ _08116E70:
|
|||
movs r2, 0
|
||||
bl sub_80FAF58
|
||||
bl sub_800B1F4
|
||||
bl sub_8009804
|
||||
bl OpenLink
|
||||
bl sub_80FBBD8
|
||||
movs r0, 0x1
|
||||
bl sub_80FB128
|
||||
|
|
@ -3356,7 +3356,7 @@ sub_8117440: @ 8117440
|
|||
asrs r5, 24
|
||||
str r5, [sp]
|
||||
adds r3, r4, 0
|
||||
bl Overworld_SetWarpDestination
|
||||
bl SetWarpDestination
|
||||
ldr r0, [r6]
|
||||
movs r1, 0x4
|
||||
ldrsb r1, [r0, r1]
|
||||
|
|
@ -3423,7 +3423,7 @@ sub_81174B4: @ 81174B4
|
|||
adds r0, r4, 0
|
||||
adds r1, r5, 0
|
||||
mov r3, r8
|
||||
bl Overworld_SetWarpDestination
|
||||
bl SetWarpDestination
|
||||
bl WarpIntoMap
|
||||
add sp, 0x4
|
||||
pop {r3}
|
||||
|
|
@ -3864,7 +3864,7 @@ _08117968:
|
|||
.align 2, 0
|
||||
_08117970: .4byte gPaletteFade
|
||||
_08117974:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08117988
|
||||
|
|
@ -3999,7 +3999,7 @@ _08117A7C:
|
|||
movs r1, 0
|
||||
bl sub_80FAF74
|
||||
bl sub_800B1F4
|
||||
bl sub_8009804
|
||||
bl OpenLink
|
||||
movs r0, 0x2
|
||||
bl sub_80FBB8C
|
||||
movs r0, 0x1
|
||||
|
|
@ -4188,10 +4188,10 @@ _08117C3C:
|
|||
beq _08117C84
|
||||
b _08117ECA
|
||||
_08117C42:
|
||||
bl sub_80FCEA8
|
||||
bl LoadWirelessStatusIndicatorSpriteGfx
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_80FCD74
|
||||
bl CreateWirelessStatusIndicatorSprite
|
||||
ldr r1, [r5]
|
||||
ldrb r0, [r5, 0x13]
|
||||
lsls r0, 5
|
||||
|
|
@ -4477,7 +4477,7 @@ _08117EB2:
|
|||
strb r0, [r5, 0xC]
|
||||
b _08117ECA
|
||||
_08117EBA:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08117ECA
|
||||
|
|
@ -4571,7 +4571,7 @@ _08117F7C:
|
|||
movs r2, 0
|
||||
bl sub_80FAF58
|
||||
bl sub_800B1F4
|
||||
bl sub_8009804
|
||||
bl OpenLink
|
||||
bl sub_80FBBD8
|
||||
movs r0, 0x70
|
||||
bl AllocZeroed
|
||||
|
|
@ -4702,10 +4702,10 @@ _0811808E:
|
|||
cmp r0, 0
|
||||
bne _08118130
|
||||
strb r2, [r5, 0xF]
|
||||
bl sub_80FCEA8
|
||||
bl LoadWirelessStatusIndicatorSpriteGfx
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_80FCD74
|
||||
bl CreateWirelessStatusIndicatorSprite
|
||||
ldrb r0, [r5, 0xE]
|
||||
bl RedrawListMenu
|
||||
ldr r4, _0811812C @ =gStringVar1
|
||||
|
|
@ -4897,7 +4897,7 @@ _0811826C:
|
|||
bl sub_800AB9C
|
||||
b _08118288
|
||||
_08118278:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08118288
|
||||
|
|
@ -4990,7 +4990,7 @@ _08118340:
|
|||
movs r2, 0
|
||||
bl sub_80FAF58
|
||||
bl sub_800B1F4
|
||||
bl sub_8009804
|
||||
bl OpenLink
|
||||
bl sub_80FBBD8
|
||||
movs r0, 0x70
|
||||
bl AllocZeroed
|
||||
|
|
@ -5118,10 +5118,10 @@ _0811843A:
|
|||
beq _0811849C
|
||||
strb r4, [r5, 0xF]
|
||||
strb r4, [r5, 0x14]
|
||||
bl sub_80FCEA8
|
||||
bl LoadWirelessStatusIndicatorSpriteGfx
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_80FCD74
|
||||
bl CreateWirelessStatusIndicatorSprite
|
||||
ldr r0, [r5]
|
||||
adds r4, r0, 0
|
||||
adds r4, 0x10
|
||||
|
|
@ -5302,7 +5302,7 @@ _081185E8:
|
|||
bl sub_800AB9C
|
||||
b _08118604
|
||||
_081185F4:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08118604
|
||||
|
|
@ -5582,7 +5582,7 @@ _0811887C:
|
|||
ldrh r2, [r2, 0xC]
|
||||
bl sub_80FAFA0
|
||||
bl sub_800B1F4
|
||||
bl sub_8009804
|
||||
bl OpenLink
|
||||
bl sub_80FBC00
|
||||
ldr r0, [r6, 0x8]
|
||||
movs r1, 0x1
|
||||
|
|
@ -6274,7 +6274,7 @@ _08118EAC:
|
|||
.align 2, 0
|
||||
_08118EC4: .4byte gStringVar4
|
||||
_08118EC8:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08118ED6
|
||||
|
|
@ -6796,7 +6796,7 @@ _08119354:
|
|||
movs r0, 0xF
|
||||
b _081198DA
|
||||
_0811935C:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08119368
|
||||
|
|
@ -7242,7 +7242,7 @@ _081196EC:
|
|||
lsrs r2, 2
|
||||
lsls r1, r2, 3
|
||||
subs r1, r2
|
||||
ldr r2, _0811972C @ =gUnknown_824F1A0
|
||||
ldr r2, _0811972C @ =gTypeNames
|
||||
adds r1, r2
|
||||
bl StringCopy
|
||||
ldr r1, _08119730 @ =gUnknown_8458ED0
|
||||
|
|
@ -7250,7 +7250,7 @@ _081196EC:
|
|||
.align 2, 0
|
||||
_08119724: .4byte gStringVar1
|
||||
_08119728: .4byte gStringVar2
|
||||
_0811972C: .4byte gUnknown_824F1A0
|
||||
_0811972C: .4byte gTypeNames
|
||||
_08119730: .4byte gUnknown_8458ED0
|
||||
_08119734:
|
||||
ldr r4, _08119774 @ =gStringVar1
|
||||
|
|
@ -7273,7 +7273,7 @@ _08119734:
|
|||
lsrs r2, 2
|
||||
lsls r1, r2, 3
|
||||
subs r1, r2
|
||||
ldr r2, _0811977C @ =gUnknown_824F1A0
|
||||
ldr r2, _0811977C @ =gTypeNames
|
||||
adds r1, r2
|
||||
bl StringCopy
|
||||
ldr r1, _08119780 @ =gUnknown_8458F04
|
||||
|
|
@ -7284,7 +7284,7 @@ _0811976A:
|
|||
.align 2, 0
|
||||
_08119774: .4byte gStringVar1
|
||||
_08119778: .4byte gStringVar2
|
||||
_0811977C: .4byte gUnknown_824F1A0
|
||||
_0811977C: .4byte gTypeNames
|
||||
_08119780: .4byte gUnknown_8458F04
|
||||
_08119784:
|
||||
adds r0, r6, 0
|
||||
|
|
@ -7640,7 +7640,7 @@ _08119A3E:
|
|||
movs r2, 0
|
||||
bl sub_80FAF58
|
||||
bl sub_800B1F4
|
||||
bl sub_8009804
|
||||
bl OpenLink
|
||||
bl sub_80FBC00
|
||||
movs r0, 0x1
|
||||
bl sub_80FB128
|
||||
|
|
@ -13134,7 +13134,7 @@ _0811C48C:
|
|||
.align 2, 0
|
||||
_0811C4A4: .4byte gMain
|
||||
_0811C4A8:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0811C516
|
||||
|
|
|
|||
|
|
@ -65,10 +65,9 @@
|
|||
.endm
|
||||
|
||||
.macro subsprite x, y, priority, tile_num_offset, size
|
||||
.2byte \x
|
||||
.2byte \y
|
||||
.byte \x
|
||||
.byte \y
|
||||
.2byte ((\priority) << 14) | ((\tile_num_offset) << 4) | SPRITE_SIZE_\size
|
||||
.2byte 0 @ padding
|
||||
.endm
|
||||
|
||||
.macro obj_image_anim_frame pic_id, duration, flags = 0
|
||||
|
|
|
|||
|
|
@ -538,7 +538,7 @@
|
|||
.byte \bank_or_side
|
||||
.endm
|
||||
|
||||
.macro atk62 bank_or_side
|
||||
.macro atk62_hidepartystatussummary bank_or_side
|
||||
.byte 0x62
|
||||
.byte \bank_or_side
|
||||
.endm
|
||||
|
|
|
|||
326
asm/mailbox_pc.s
326
asm/mailbox_pc.s
|
|
@ -1,326 +0,0 @@
|
|||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.syntax unified
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_810EB6C
|
||||
sub_810EB6C: @ 810EB6C
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
ldr r4, _0810EB84 @ =gUnknown_203ADE0
|
||||
lsrs r0, 21
|
||||
adds r0, 0x8
|
||||
bl Alloc
|
||||
str r0, [r4]
|
||||
cmp r0, 0
|
||||
bne _0810EB88
|
||||
movs r0, 0
|
||||
b _0810EBA2
|
||||
.align 2, 0
|
||||
_0810EB84: .4byte gUnknown_203ADE0
|
||||
_0810EB88:
|
||||
movs r2, 0
|
||||
ldr r4, _0810EBA8 @ =gUnknown_203ADDC
|
||||
movs r3, 0xFF
|
||||
_0810EB8E:
|
||||
adds r0, r2, r4
|
||||
ldrb r1, [r0]
|
||||
orrs r1, r3
|
||||
strb r1, [r0]
|
||||
adds r0, r2, 0x1
|
||||
lsls r0, 24
|
||||
lsrs r2, r0, 24
|
||||
cmp r2, 0x2
|
||||
bls _0810EB8E
|
||||
movs r0, 0x1
|
||||
_0810EBA2:
|
||||
pop {r4}
|
||||
pop {r1}
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_0810EBA8: .4byte gUnknown_203ADDC
|
||||
thumb_func_end sub_810EB6C
|
||||
|
||||
thumb_func_start sub_810EBAC
|
||||
sub_810EBAC: @ 810EBAC
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r1, r0, 24
|
||||
ldr r0, _0810EBD8 @ =gUnknown_203ADDC
|
||||
adds r4, r1, r0
|
||||
ldrb r0, [r4]
|
||||
cmp r0, 0xFF
|
||||
bne _0810EBD0
|
||||
lsls r0, r1, 3
|
||||
ldr r1, _0810EBDC @ =gUnknown_8453FE8
|
||||
adds r0, r1
|
||||
bl AddWindow
|
||||
strb r0, [r4]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0
|
||||
bl SetStdWindowBorderStyle
|
||||
_0810EBD0:
|
||||
ldrb r0, [r4]
|
||||
pop {r4}
|
||||
pop {r1}
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_0810EBD8: .4byte gUnknown_203ADDC
|
||||
_0810EBDC: .4byte gUnknown_8453FE8
|
||||
thumb_func_end sub_810EBAC
|
||||
|
||||
thumb_func_start sub_810EBE0
|
||||
sub_810EBE0: @ 810EBE0
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
ldr r0, _0810EC0C @ =gUnknown_203ADDC
|
||||
adds r4, r0
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0
|
||||
bl ClearStdWindowAndFrameToTransparent
|
||||
ldrb r0, [r4]
|
||||
bl ClearWindowTilemap
|
||||
ldrb r0, [r4]
|
||||
bl RemoveWindow
|
||||
movs r0, 0xFF
|
||||
strb r0, [r4]
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0810EC0C: .4byte gUnknown_203ADDC
|
||||
thumb_func_end sub_810EBE0
|
||||
|
||||
thumb_func_start sub_810EC10
|
||||
sub_810EC10: @ 810EC10
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r1, _0810EC1C @ =gUnknown_203ADDC
|
||||
adds r0, r1
|
||||
ldrb r0, [r0]
|
||||
bx lr
|
||||
.align 2, 0
|
||||
_0810EC1C: .4byte gUnknown_203ADDC
|
||||
thumb_func_end sub_810EC10
|
||||
|
||||
thumb_func_start sub_810EC20
|
||||
sub_810EC20: @ 810EC20
|
||||
push {r4,r5,lr}
|
||||
sub sp, 0x34
|
||||
adds r3, r1, 0
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
lsls r2, 24
|
||||
lsrs r5, r2, 24
|
||||
movs r0, 0x2
|
||||
negs r0, r0
|
||||
cmp r3, r0
|
||||
beq _0810EC82
|
||||
ldr r0, _0810EC8C @ =gSaveBlock1Ptr
|
||||
lsls r1, r3, 3
|
||||
adds r1, r3
|
||||
lsls r1, 2
|
||||
ldr r0, [r0]
|
||||
adds r1, r0
|
||||
ldr r0, _0810EC90 @ =0x00002dba
|
||||
adds r1, r0
|
||||
add r0, sp, 0x14
|
||||
bl StringCopy
|
||||
add r0, sp, 0x14
|
||||
bl StringLength
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
cmp r0, 0x5
|
||||
bhi _0810EC62
|
||||
add r0, sp, 0x14
|
||||
movs r1, 0x1
|
||||
bl ConvertInternationalString
|
||||
_0810EC62:
|
||||
movs r0, 0
|
||||
str r0, [sp]
|
||||
str r0, [sp, 0x4]
|
||||
ldr r0, _0810EC94 @ =gUnknown_8454000
|
||||
str r0, [sp, 0x8]
|
||||
movs r0, 0x1
|
||||
negs r0, r0
|
||||
str r0, [sp, 0xC]
|
||||
add r0, sp, 0x14
|
||||
str r0, [sp, 0x10]
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x2
|
||||
movs r2, 0x8
|
||||
adds r3, r5, 0
|
||||
bl AddTextPrinterParameterized4
|
||||
_0810EC82:
|
||||
add sp, 0x34
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0810EC8C: .4byte gSaveBlock1Ptr
|
||||
_0810EC90: .4byte 0x00002dba
|
||||
_0810EC94: .4byte gUnknown_8454000
|
||||
thumb_func_end sub_810EC20
|
||||
|
||||
thumb_func_start sub_810EC98
|
||||
sub_810EC98: @ 810EC98
|
||||
push {r4-r7,lr}
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
adds r6, r0, 0
|
||||
movs r3, 0
|
||||
ldr r7, _0810ED50 @ =gUnknown_203ADE0
|
||||
ldr r0, _0810ED54 @ =gFameCheckerText_Cancel
|
||||
mov r12, r0
|
||||
ldr r5, _0810ED58 @ =gMultiuseListMenuTemplate
|
||||
ldr r1, _0810ED5C @ =gUnknown_203ADDC
|
||||
mov r8, r1
|
||||
ldrb r0, [r6, 0x5]
|
||||
cmp r3, r0
|
||||
bcs _0810ECCE
|
||||
adds r2, r7, 0
|
||||
ldr r4, _0810ED60 @ =gUnknown_8454003
|
||||
_0810ECB8:
|
||||
ldr r1, [r2]
|
||||
lsls r0, r3, 3
|
||||
adds r0, r1
|
||||
str r4, [r0]
|
||||
str r3, [r0, 0x4]
|
||||
adds r0, r3, 0x1
|
||||
lsls r0, 16
|
||||
lsrs r3, r0, 16
|
||||
ldrb r1, [r6, 0x5]
|
||||
cmp r3, r1
|
||||
bcc _0810ECB8
|
||||
_0810ECCE:
|
||||
ldr r2, [r7]
|
||||
lsls r0, r3, 3
|
||||
adds r0, r2
|
||||
mov r1, r12
|
||||
str r1, [r0]
|
||||
movs r1, 0x2
|
||||
negs r1, r1
|
||||
str r1, [r0, 0x4]
|
||||
str r2, [r5]
|
||||
ldrb r0, [r6, 0x5]
|
||||
adds r0, 0x1
|
||||
movs r4, 0
|
||||
strh r0, [r5, 0xC]
|
||||
mov r1, r8
|
||||
ldrb r0, [r1, 0x1]
|
||||
strb r0, [r5, 0x10]
|
||||
strb r4, [r5, 0x11]
|
||||
movs r0, 0x2
|
||||
movs r1, 0
|
||||
bl GetMenuCursorDimensionByFont
|
||||
strb r0, [r5, 0x12]
|
||||
strb r4, [r5, 0x13]
|
||||
ldrb r0, [r5, 0x16]
|
||||
movs r2, 0x8
|
||||
negs r2, r2
|
||||
ands r2, r0
|
||||
movs r0, 0x39
|
||||
negs r0, r0
|
||||
ands r2, r0
|
||||
movs r0, 0x10
|
||||
orrs r2, r0
|
||||
movs r0, 0x8
|
||||
strh r0, [r5, 0xE]
|
||||
ldrb r0, [r5, 0x17]
|
||||
movs r1, 0x40
|
||||
negs r1, r1
|
||||
ands r1, r0
|
||||
movs r0, 0x2
|
||||
orrs r1, r0
|
||||
movs r0, 0x2A
|
||||
strb r0, [r5, 0x14]
|
||||
movs r0, 0x31
|
||||
strb r0, [r5, 0x15]
|
||||
ldr r0, _0810ED64 @ =sub_810ED6C
|
||||
str r0, [r5, 0x4]
|
||||
ldr r0, _0810ED68 @ =sub_810EC20
|
||||
str r0, [r5, 0x8]
|
||||
movs r0, 0x3F
|
||||
ands r1, r0
|
||||
strb r1, [r5, 0x17]
|
||||
ands r2, r0
|
||||
strb r2, [r5, 0x16]
|
||||
ldrh r1, [r6, 0x2]
|
||||
ldrh r2, [r6]
|
||||
adds r0, r5, 0
|
||||
bl ListMenuInit
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
pop {r4-r7}
|
||||
pop {r1}
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_0810ED50: .4byte gUnknown_203ADE0
|
||||
_0810ED54: .4byte gFameCheckerText_Cancel
|
||||
_0810ED58: .4byte gMultiuseListMenuTemplate
|
||||
_0810ED5C: .4byte gUnknown_203ADDC
|
||||
_0810ED60: .4byte gUnknown_8454003
|
||||
_0810ED64: .4byte sub_810ED6C
|
||||
_0810ED68: .4byte sub_810EC20
|
||||
thumb_func_end sub_810EC98
|
||||
|
||||
thumb_func_start sub_810ED6C
|
||||
sub_810ED6C: @ 810ED6C
|
||||
push {lr}
|
||||
lsls r1, 24
|
||||
lsrs r1, 24
|
||||
cmp r1, 0x1
|
||||
beq _0810ED7C
|
||||
movs r0, 0x5
|
||||
bl PlaySE
|
||||
_0810ED7C:
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_810ED6C
|
||||
|
||||
thumb_func_start sub_810ED80
|
||||
sub_810ED80: @ 810ED80
|
||||
push {r4,lr}
|
||||
sub sp, 0x10
|
||||
adds r4, r0, 0
|
||||
ldrb r0, [r4, 0x5]
|
||||
ldrb r1, [r4, 0x4]
|
||||
subs r0, r1
|
||||
adds r0, 0x1
|
||||
str r0, [sp]
|
||||
movs r0, 0x6E
|
||||
str r0, [sp, 0x4]
|
||||
str r0, [sp, 0x8]
|
||||
adds r0, r4, 0x2
|
||||
str r0, [sp, 0xC]
|
||||
movs r0, 0x2
|
||||
movs r1, 0xC2
|
||||
movs r2, 0xC
|
||||
movs r3, 0x94
|
||||
bl AddScrollIndicatorArrowPairParameterized
|
||||
strb r0, [r4, 0xA]
|
||||
add sp, 0x10
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_810ED80
|
||||
|
||||
thumb_func_start sub_810EDB0
|
||||
sub_810EDB0: @ 810EDB0
|
||||
push {lr}
|
||||
ldr r0, _0810EDC0 @ =gUnknown_203ADE0
|
||||
ldr r0, [r0]
|
||||
bl Free
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0810EDC0: .4byte gUnknown_203ADE0
|
||||
thumb_func_end sub_810EDB0
|
||||
|
||||
.align 2, 0 @ Don't pad with nop.
|
||||
|
|
@ -948,7 +948,7 @@ _0800CAEE:
|
|||
movs r0, 0
|
||||
b _0800CB22
|
||||
_0800CAF2:
|
||||
bl sub_8009480
|
||||
bl IsWirelessAdapterConnected
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
cmp r5, 0
|
||||
|
|
@ -1227,7 +1227,7 @@ sub_800CCF8: @ 800CCF8
|
|||
beq _0800CD44
|
||||
movs r0, 0x5
|
||||
bl PlaySE
|
||||
bl sub_8009480
|
||||
bl IsWirelessAdapterConnected
|
||||
movs r0, 0x1
|
||||
negs r0, r0
|
||||
movs r1, 0
|
||||
|
|
@ -1500,7 +1500,7 @@ sub_800CF3C: @ 800CF3C
|
|||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
bne _0800CFAE
|
||||
bl sub_806E25C
|
||||
bl IsNationalPokedexEnabled
|
||||
cmp r0, 0
|
||||
beq _0800CF64
|
||||
movs r0, 0x1
|
||||
|
|
|
|||
340
asm/new_game.s
340
asm/new_game.s
|
|
@ -1,340 +0,0 @@
|
|||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.syntax unified
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start WriteUnalignedWord
|
||||
WriteUnalignedWord: @ 80548FC
|
||||
strb r0, [r1]
|
||||
lsrs r2, r0, 8
|
||||
strb r2, [r1, 0x1]
|
||||
lsrs r2, r0, 16
|
||||
strb r2, [r1, 0x2]
|
||||
lsrs r0, 24
|
||||
strb r0, [r1, 0x3]
|
||||
bx lr
|
||||
thumb_func_end WriteUnalignedWord
|
||||
|
||||
thumb_func_start CopyUnalignedWord
|
||||
CopyUnalignedWord: @ 805490C
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
adds r3, r1, 0
|
||||
movs r2, 0
|
||||
_08054914:
|
||||
adds r0, r4, r2
|
||||
adds r1, r3, r2
|
||||
ldrb r1, [r1]
|
||||
strb r1, [r0]
|
||||
adds r2, 0x1
|
||||
cmp r2, 0x3
|
||||
ble _08054914
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end CopyUnalignedWord
|
||||
|
||||
thumb_func_start InitPlayerTrainerId
|
||||
InitPlayerTrainerId: @ 8054928
|
||||
push {r4,lr}
|
||||
bl Random
|
||||
adds r4, r0, 0
|
||||
bl GetGeneratedTrainerIdLower
|
||||
lsls r4, 16
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
orrs r4, r0
|
||||
ldr r0, _08054950 @ =gSaveBlock2Ptr
|
||||
ldr r1, [r0]
|
||||
adds r1, 0xA
|
||||
adds r0, r4, 0
|
||||
bl WriteUnalignedWord
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08054950: .4byte gSaveBlock2Ptr
|
||||
thumb_func_end InitPlayerTrainerId
|
||||
|
||||
thumb_func_start SetDefaultOptions
|
||||
SetDefaultOptions: @ 8054954
|
||||
ldr r3, _080549A8 @ =gSaveBlock2Ptr
|
||||
ldr r2, [r3]
|
||||
ldrb r1, [r2, 0x14]
|
||||
movs r0, 0x8
|
||||
negs r0, r0
|
||||
ands r0, r1
|
||||
movs r1, 0x1
|
||||
orrs r0, r1
|
||||
strb r0, [r2, 0x14]
|
||||
ldr r2, [r3]
|
||||
ldrb r1, [r2, 0x14]
|
||||
movs r0, 0x7
|
||||
ands r0, r1
|
||||
strb r0, [r2, 0x14]
|
||||
ldr r2, [r3]
|
||||
ldrb r1, [r2, 0x15]
|
||||
movs r0, 0x2
|
||||
negs r0, r0
|
||||
ands r0, r1
|
||||
strb r0, [r2, 0x15]
|
||||
ldr r2, [r3]
|
||||
ldrb r1, [r2, 0x15]
|
||||
movs r0, 0x3
|
||||
negs r0, r0
|
||||
ands r0, r1
|
||||
strb r0, [r2, 0x15]
|
||||
ldr r2, [r3]
|
||||
ldrb r1, [r2, 0x15]
|
||||
movs r0, 0x5
|
||||
negs r0, r0
|
||||
ands r0, r1
|
||||
strb r0, [r2, 0x15]
|
||||
ldr r2, [r3]
|
||||
ldrb r1, [r2, 0x15]
|
||||
movs r0, 0x9
|
||||
negs r0, r0
|
||||
ands r0, r1
|
||||
strb r0, [r2, 0x15]
|
||||
ldr r1, [r3]
|
||||
movs r0, 0
|
||||
strb r0, [r1, 0x13]
|
||||
bx lr
|
||||
.align 2, 0
|
||||
_080549A8: .4byte gSaveBlock2Ptr
|
||||
thumb_func_end SetDefaultOptions
|
||||
|
||||
thumb_func_start sub_80549AC
|
||||
sub_80549AC: @ 80549AC
|
||||
push {r4,lr}
|
||||
ldr r4, _080549D0 @ =gSaveBlock2Ptr
|
||||
ldr r0, [r4]
|
||||
adds r0, 0x28
|
||||
movs r1, 0
|
||||
movs r2, 0x34
|
||||
bl memset
|
||||
ldr r0, [r4]
|
||||
adds r0, 0x5C
|
||||
movs r1, 0
|
||||
movs r2, 0x34
|
||||
bl memset
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080549D0: .4byte gSaveBlock2Ptr
|
||||
thumb_func_end sub_80549AC
|
||||
|
||||
thumb_func_start sub_80549D4
|
||||
sub_80549D4: @ 80549D4
|
||||
push {lr}
|
||||
sub sp, 0x4
|
||||
movs r0, 0
|
||||
str r0, [sp]
|
||||
ldr r0, _080549F0 @ =gSaveBlock2Ptr
|
||||
ldr r1, [r0]
|
||||
adds r1, 0xB0
|
||||
ldr r2, _080549F4 @ =0x050001fa
|
||||
mov r0, sp
|
||||
bl CpuSet
|
||||
add sp, 0x4
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080549F0: .4byte gSaveBlock2Ptr
|
||||
_080549F4: .4byte 0x050001fa
|
||||
thumb_func_end sub_80549D4
|
||||
|
||||
thumb_func_start sub_80549F8
|
||||
sub_80549F8: @ 80549F8
|
||||
push {lr}
|
||||
sub sp, 0x4
|
||||
movs r2, 0x1
|
||||
negs r2, r2
|
||||
movs r0, 0x6
|
||||
str r0, [sp]
|
||||
movs r0, 0x4
|
||||
movs r1, 0x1
|
||||
movs r3, 0x6
|
||||
bl Overworld_SetWarpDestination
|
||||
bl WarpIntoMap
|
||||
add sp, 0x4
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80549F8
|
||||
|
||||
thumb_func_start Sav2_ClearSetDefault
|
||||
Sav2_ClearSetDefault: @ 8054A18
|
||||
push {lr}
|
||||
bl ClearSav2
|
||||
bl SetDefaultOptions
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end Sav2_ClearSetDefault
|
||||
|
||||
thumb_func_start ResetMenuAndMonGlobals
|
||||
ResetMenuAndMonGlobals: @ 8054A28
|
||||
push {lr}
|
||||
ldr r1, _08054A5C @ =gUnknown_2031DB0
|
||||
movs r0, 0
|
||||
strb r0, [r1]
|
||||
bl ZeroPlayerPartyMons
|
||||
bl ZeroEnemyPartyMons
|
||||
bl sub_81089BC
|
||||
bl ResetTMCaseCursorPos
|
||||
bl sub_813D6E4
|
||||
bl sub_811089C
|
||||
bl Random
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
bl sub_8083214
|
||||
bl sub_806E6FC
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08054A5C: .4byte gUnknown_2031DB0
|
||||
thumb_func_end ResetMenuAndMonGlobals
|
||||
|
||||
thumb_func_start sub_8054A60
|
||||
sub_8054A60: @ 8054A60
|
||||
push {r4-r6,lr}
|
||||
mov r6, r8
|
||||
push {r6}
|
||||
sub sp, 0x8
|
||||
ldr r6, _08054B50 @ =gSaveBlock1Ptr
|
||||
ldr r1, [r6]
|
||||
ldr r0, _08054B54 @ =0x00003a4c
|
||||
mov r8, r0
|
||||
add r1, r8
|
||||
mov r0, sp
|
||||
bl StringCopy
|
||||
ldr r1, _08054B58 @ =gUnknown_2031DB0
|
||||
movs r0, 0x1
|
||||
strb r0, [r1]
|
||||
ldr r4, _08054B5C @ =gSaveBlock2Ptr
|
||||
ldr r0, [r4]
|
||||
movs r1, 0xF2
|
||||
lsls r1, 4
|
||||
adds r0, r1
|
||||
movs r5, 0
|
||||
str r5, [r0]
|
||||
bl ZeroPlayerPartyMons
|
||||
bl ZeroEnemyPartyMons
|
||||
bl sub_80549D4
|
||||
bl ClearSav1
|
||||
bl ClearMailData
|
||||
ldr r0, [r4]
|
||||
strb r5, [r0, 0x9]
|
||||
ldr r0, [r4]
|
||||
adds r1, r0, 0
|
||||
adds r1, 0xA8
|
||||
str r5, [r1]
|
||||
adds r0, 0xAC
|
||||
movs r1, 0x1
|
||||
strb r1, [r0]
|
||||
ldr r0, [r4]
|
||||
adds r0, 0xAD
|
||||
strb r5, [r0]
|
||||
bl InitPlayerTrainerId
|
||||
bl PlayTimeCounter_Reset
|
||||
bl sub_80549AC
|
||||
bl sub_806E0D0
|
||||
bl ResetFameChecker
|
||||
ldr r0, [r6]
|
||||
movs r1, 0xA4
|
||||
lsls r1, 2
|
||||
adds r0, r1
|
||||
ldr r1, _08054B60 @ =0x00000bb8
|
||||
bl SetMoney
|
||||
bl sub_8054E68
|
||||
bl InitLinkBattleRecords
|
||||
bl sub_80A0904
|
||||
bl sub_80A0958
|
||||
bl sub_806E190
|
||||
ldr r0, _08054B64 @ =gPlayerPartyCount
|
||||
strb r5, [r0]
|
||||
bl ZeroPlayerPartyMons
|
||||
bl sub_808C7E0
|
||||
bl ClearRoamerData
|
||||
ldr r0, [r6]
|
||||
ldr r1, _08054B68 @ =0x00000296
|
||||
adds r0, r1
|
||||
strh r5, [r0]
|
||||
bl ClearItemSlotsInAllBagPockets
|
||||
bl sub_80EB658
|
||||
bl sub_809C794
|
||||
bl sub_80BDD34
|
||||
bl sub_8113044
|
||||
bl copy_strings_to_sav1
|
||||
bl sub_8054B70
|
||||
bl sub_8143D24
|
||||
bl sub_815D838
|
||||
bl sub_80549F8
|
||||
ldr r0, _08054B6C @ =gUnknown_81A6481
|
||||
bl ScriptContext2_RunNewScript
|
||||
ldr r0, [r6]
|
||||
add r0, r8
|
||||
mov r1, sp
|
||||
bl StringCopy
|
||||
bl sub_815EE0C
|
||||
add sp, 0x8
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08054B50: .4byte gSaveBlock1Ptr
|
||||
_08054B54: .4byte 0x00003a4c
|
||||
_08054B58: .4byte gUnknown_2031DB0
|
||||
_08054B5C: .4byte gSaveBlock2Ptr
|
||||
_08054B60: .4byte 0x00000bb8
|
||||
_08054B64: .4byte gPlayerPartyCount
|
||||
_08054B68: .4byte 0x00000296
|
||||
_08054B6C: .4byte gUnknown_81A6481
|
||||
thumb_func_end sub_8054A60
|
||||
|
||||
thumb_func_start sub_8054B70
|
||||
sub_8054B70: @ 8054B70
|
||||
push {r4-r6,lr}
|
||||
sub sp, 0x4
|
||||
mov r0, sp
|
||||
movs r5, 0
|
||||
strh r5, [r0]
|
||||
ldr r4, _08054BBC @ =gSaveBlock2Ptr
|
||||
ldr r1, [r4]
|
||||
movs r0, 0xAF
|
||||
lsls r0, 4
|
||||
adds r1, r0
|
||||
ldr r6, _08054BC0 @ =0x01000008
|
||||
mov r0, sp
|
||||
adds r2, r6, 0
|
||||
bl CpuSet
|
||||
ldr r0, [r4]
|
||||
ldr r1, _08054BC4 @ =0x00000af8
|
||||
adds r0, r1
|
||||
movs r1, 0
|
||||
bl sub_815EE54
|
||||
bl ResetPokeJumpResults
|
||||
mov r0, sp
|
||||
adds r0, 0x2
|
||||
strh r5, [r0]
|
||||
ldr r1, [r4]
|
||||
movs r2, 0xB1
|
||||
lsls r2, 4
|
||||
adds r1, r2
|
||||
adds r2, r6, 0
|
||||
bl CpuSet
|
||||
add sp, 0x4
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08054BBC: .4byte gSaveBlock2Ptr
|
||||
_08054BC0: .4byte 0x01000008
|
||||
_08054BC4: .4byte 0x00000af8
|
||||
thumb_func_end sub_8054B70
|
||||
|
||||
.align 2, 0 @ Don't pad with nop.
|
||||
|
|
@ -1185,7 +1185,7 @@ _080BA1D0:
|
|||
cmp r0, 0
|
||||
beq _080BA200
|
||||
ldr r2, _080BA274 @ =gSprites
|
||||
ldr r0, _080BA278 @ =gUnknown_3004FF0
|
||||
ldr r0, _080BA278 @ =gHealthboxSpriteIds
|
||||
add r0, r9
|
||||
ldrb r1, [r0]
|
||||
lsls r0, r1, 4
|
||||
|
|
@ -1258,7 +1258,7 @@ _080BA268: .4byte gBattleAnimAttacker
|
|||
_080BA26C: .4byte gBattleAnimTarget
|
||||
_080BA270: .4byte 0x0000ffff
|
||||
_080BA274: .4byte gSprites
|
||||
_080BA278: .4byte gUnknown_3004FF0
|
||||
_080BA278: .4byte gHealthboxSpriteIds
|
||||
thumb_func_end sub_80BA16C
|
||||
|
||||
thumb_func_start sub_80BA27C
|
||||
|
|
@ -1733,7 +1733,7 @@ sub_80BA5F8: @ 80BA5F8
|
|||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080BA61C
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080BA61C
|
||||
|
|
|
|||
110
asm/overworld.s
110
asm/overworld.s
|
|
@ -289,8 +289,8 @@ sub_8054E40: @ 8054E40
|
|||
_08054E64: .4byte 0x0000406e
|
||||
thumb_func_end sub_8054E40
|
||||
|
||||
thumb_func_start sub_8054E68
|
||||
sub_8054E68: @ 8054E68
|
||||
thumb_func_start ResetGameStats
|
||||
ResetGameStats: @ 8054E68
|
||||
push {r4,r5,lr}
|
||||
movs r2, 0
|
||||
ldr r5, _08054E8C @ =gSaveBlock1Ptr
|
||||
|
|
@ -311,7 +311,7 @@ _08054E74:
|
|||
bx r0
|
||||
.align 2, 0
|
||||
_08054E8C: .4byte gSaveBlock1Ptr
|
||||
thumb_func_end sub_8054E68
|
||||
thumb_func_end ResetGameStats
|
||||
|
||||
thumb_func_start IncrementGameStat
|
||||
IncrementGameStat: @ 8054E90
|
||||
|
|
@ -1003,8 +1003,8 @@ WarpIntoMap: @ 8055378
|
|||
bx r0
|
||||
thumb_func_end WarpIntoMap
|
||||
|
||||
thumb_func_start Overworld_SetWarpDestination
|
||||
Overworld_SetWarpDestination: @ 805538C
|
||||
thumb_func_start SetWarpDestination
|
||||
SetWarpDestination: @ 805538C
|
||||
push {r4-r6,lr}
|
||||
sub sp, 0x8
|
||||
adds r4, r0, 0
|
||||
|
|
@ -1034,7 +1034,7 @@ Overworld_SetWarpDestination: @ 805538C
|
|||
bx r0
|
||||
.align 2, 0
|
||||
_080553C4: .4byte gUnknown_2031DBC
|
||||
thumb_func_end Overworld_SetWarpDestination
|
||||
thumb_func_end SetWarpDestination
|
||||
|
||||
thumb_func_start warp1_set_2
|
||||
warp1_set_2: @ 80553C8
|
||||
|
|
@ -1049,7 +1049,7 @@ warp1_set_2: @ 80553C8
|
|||
movs r3, 0x1
|
||||
negs r3, r3
|
||||
str r3, [sp]
|
||||
bl Overworld_SetWarpDestination
|
||||
bl SetWarpDestination
|
||||
add sp, 0x4
|
||||
pop {r0}
|
||||
bx r0
|
||||
|
|
@ -1151,7 +1151,7 @@ sub_805546C: @ 805546C
|
|||
lsls r4, 24
|
||||
asrs r4, 24
|
||||
str r4, [sp]
|
||||
bl Overworld_SetWarpDestination
|
||||
bl SetWarpDestination
|
||||
_0805549A:
|
||||
add sp, 0x4
|
||||
pop {r4}
|
||||
|
|
@ -1228,7 +1228,7 @@ sub_805550C: @ 805550C
|
|||
lsrs r6, r0, 16
|
||||
lsls r1, 16
|
||||
lsrs r7, r1, 16
|
||||
bl sav1_map_get_light_level
|
||||
bl GetCurrentMapType
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
|
|
@ -1458,7 +1458,7 @@ _080556BC:
|
|||
lsls r4, r6, 24
|
||||
asrs r4, 24
|
||||
str r4, [sp]
|
||||
bl Overworld_SetWarpDestination
|
||||
bl SetWarpDestination
|
||||
_080556D6:
|
||||
add sp, 0x4
|
||||
pop {r4-r6}
|
||||
|
|
@ -1627,7 +1627,7 @@ sub_80557C4: @ 80557C4
|
|||
lsls r4, r5, 24
|
||||
asrs r4, 24
|
||||
str r4, [sp]
|
||||
bl Overworld_SetWarpDestination
|
||||
bl SetWarpDestination
|
||||
b _08055818
|
||||
_080557FC:
|
||||
bl mapheader_run_script_with_tag_x6
|
||||
|
|
@ -1700,7 +1700,7 @@ sub_8055864: @ 8055864
|
|||
negs r3, r3
|
||||
str r3, [sp]
|
||||
adds r2, r3, 0
|
||||
bl Overworld_SetWarpDestination
|
||||
bl SetWarpDestination
|
||||
bl sub_8055E94
|
||||
bl warp_shift
|
||||
bl set_current_map_header_from_sav1_save_old_name
|
||||
|
|
@ -1911,7 +1911,7 @@ _08055A68: .4byte gUnknown_2031DD4
|
|||
thumb_func_start sub_8055A6C
|
||||
sub_8055A6C: @ 8055A6C
|
||||
push {r4-r7,lr}
|
||||
bl sav1_map_get_light_level
|
||||
bl GetCurrentMapType
|
||||
adds r5, r0, 0
|
||||
lsls r5, 24
|
||||
lsrs r5, 24
|
||||
|
|
@ -2382,14 +2382,14 @@ sub_8055DB8: @ 8055DB8
|
|||
Overworld_PlaySpecialMapMusic: @ 8055DC4
|
||||
push {r4,r5,lr}
|
||||
sub sp, 0x4
|
||||
ldr r0, _08055DD8 @ =gUnknown_2031DD8
|
||||
ldr r0, _08055DD8 @ =gDisableMapMusicChangeOnMapLoad
|
||||
ldrb r0, [r0]
|
||||
cmp r0, 0x1
|
||||
bne _08055DDC
|
||||
bl StopMapMusic
|
||||
b _08055E6C
|
||||
.align 2, 0
|
||||
_08055DD8: .4byte gUnknown_2031DD8
|
||||
_08055DD8: .4byte gDisableMapMusicChangeOnMapLoad
|
||||
_08055DDC:
|
||||
cmp r0, 0x2
|
||||
beq _08055E6C
|
||||
|
|
@ -2488,14 +2488,14 @@ _08055E90: .4byte gSaveBlock1Ptr
|
|||
thumb_func_start sub_8055E94
|
||||
sub_8055E94: @ 8055E94
|
||||
push {r4-r6,lr}
|
||||
ldr r0, _08055EA4 @ =gUnknown_2031DD8
|
||||
ldr r0, _08055EA4 @ =gDisableMapMusicChangeOnMapLoad
|
||||
ldrb r0, [r0]
|
||||
cmp r0, 0x1
|
||||
bne _08055EA8
|
||||
bl StopMapMusic
|
||||
b _08055F14
|
||||
.align 2, 0
|
||||
_08055EA4: .4byte gUnknown_2031DD8
|
||||
_08055EA4: .4byte gDisableMapMusicChangeOnMapLoad
|
||||
_08055EA8:
|
||||
cmp r0, 0x2
|
||||
beq _08055F14
|
||||
|
|
@ -2701,7 +2701,7 @@ _08056014:
|
|||
adds r0, 0x32
|
||||
lsls r0, 24
|
||||
lsrs r2, r0, 24
|
||||
ldr r0, _08056050 @ =gUnknown_2031DD8
|
||||
ldr r0, _08056050 @ =gDisableMapMusicChangeOnMapLoad
|
||||
ldrb r0, [r0]
|
||||
cmp r0, 0x1
|
||||
bne _08056054
|
||||
|
|
@ -2709,7 +2709,7 @@ _08056014:
|
|||
b _0805606A
|
||||
.align 2, 0
|
||||
_0805604C: .4byte gUnknown_2031DDC
|
||||
_08056050: .4byte gUnknown_2031DD8
|
||||
_08056050: .4byte gDisableMapMusicChangeOnMapLoad
|
||||
_08056054:
|
||||
cmp r0, 0x2
|
||||
beq _0805606A
|
||||
|
|
@ -2884,8 +2884,8 @@ get_map_light_level_from_warp: @ 8056170
|
|||
bx r1
|
||||
thumb_func_end get_map_light_level_from_warp
|
||||
|
||||
thumb_func_start sav1_map_get_light_level
|
||||
sav1_map_get_light_level: @ 8056188
|
||||
thumb_func_start GetCurrentMapType
|
||||
GetCurrentMapType: @ 8056188
|
||||
push {lr}
|
||||
ldr r0, _0805619C @ =gSaveBlock1Ptr
|
||||
ldr r0, [r0]
|
||||
|
|
@ -2897,7 +2897,7 @@ sav1_map_get_light_level: @ 8056188
|
|||
bx r1
|
||||
.align 2, 0
|
||||
_0805619C: .4byte gSaveBlock1Ptr
|
||||
thumb_func_end sav1_map_get_light_level
|
||||
thumb_func_end GetCurrentMapType
|
||||
|
||||
thumb_func_start get_map_light_from_warp0
|
||||
get_map_light_from_warp0: @ 80561A0
|
||||
|
|
@ -3493,7 +3493,7 @@ CB2_NewGame: @ 8056644
|
|||
bl sub_80569BC
|
||||
bl StopMapMusic
|
||||
bl sub_8056420
|
||||
bl sub_8054A60
|
||||
bl NewGameInitData
|
||||
bl ResetInitialPlayerAvatarState
|
||||
bl PlayTimeCounter_Start
|
||||
bl ScriptContext1_Init
|
||||
|
|
@ -4058,10 +4058,10 @@ _08056B3C:
|
|||
ldrb r0, [r0]
|
||||
cmp r0, 0
|
||||
beq _08056B62
|
||||
bl sub_80FCEA8
|
||||
bl LoadWirelessStatusIndicatorSpriteGfx
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_80FCD74
|
||||
bl CreateWirelessStatusIndicatorSprite
|
||||
b _08056B62
|
||||
.align 2, 0
|
||||
_08056B54: .4byte gWirelessCommType
|
||||
|
|
@ -4389,10 +4389,10 @@ _08056E18:
|
|||
ldrb r0, [r0]
|
||||
cmp r0, 0
|
||||
beq _08056E3E
|
||||
bl sub_80FCEA8
|
||||
bl LoadWirelessStatusIndicatorSpriteGfx
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_80FCD74
|
||||
bl CreateWirelessStatusIndicatorSprite
|
||||
b _08056E3E
|
||||
.align 2, 0
|
||||
_08056E30: .4byte gWirelessCommType
|
||||
|
|
@ -5158,8 +5158,8 @@ _0805749A:
|
|||
_080574A0: .4byte sub_8056534
|
||||
thumb_func_end sub_8057430
|
||||
|
||||
thumb_func_start sub_80574A4
|
||||
sub_80574A4: @ 80574A4
|
||||
thumb_func_start Overworld_CreditsMainCB
|
||||
Overworld_CreditsMainCB: @ 80574A4
|
||||
push {r4,lr}
|
||||
ldr r0, _080574E8 @ =gPaletteFade
|
||||
ldrb r0, [r0, 0x7]
|
||||
|
|
@ -5187,7 +5187,7 @@ _080574E0:
|
|||
bx r0
|
||||
.align 2, 0
|
||||
_080574E8: .4byte gPaletteFade
|
||||
thumb_func_end sub_80574A4
|
||||
thumb_func_end Overworld_CreditsMainCB
|
||||
|
||||
thumb_func_start sub_80574EC
|
||||
sub_80574EC: @ 80574EC
|
||||
|
|
@ -5209,8 +5209,8 @@ _08057506:
|
|||
bx r1
|
||||
thumb_func_end sub_80574EC
|
||||
|
||||
thumb_func_start sub_805750C
|
||||
sub_805750C: @ 805750C
|
||||
thumb_func_start Overworld_DoScrollSceneForCredits
|
||||
Overworld_DoScrollSceneForCredits: @ 805750C
|
||||
push {lr}
|
||||
ldr r3, _08057520 @ =gUnknown_2031DE4
|
||||
str r1, [r3]
|
||||
|
|
@ -5223,7 +5223,7 @@ sub_805750C: @ 805750C
|
|||
.align 2, 0
|
||||
_08057520: .4byte gUnknown_2031DE4
|
||||
_08057524: .4byte gUnknown_2036E28
|
||||
thumb_func_end sub_805750C
|
||||
thumb_func_end Overworld_DoScrollSceneForCredits
|
||||
|
||||
thumb_func_start sub_8057528
|
||||
sub_8057528: @ 8057528
|
||||
|
|
@ -5451,7 +5451,7 @@ _08057712:
|
|||
ldr r2, _08057738 @ =0x3fffffff
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_807A944
|
||||
bl FieldWeather_StartFadingOutCreditsMap
|
||||
_0805772A:
|
||||
ldrb r0, [r4]
|
||||
adds r0, 0x1
|
||||
|
|
@ -5640,16 +5640,16 @@ c1_link_related: @ 8057884
|
|||
ldrb r0, [r0]
|
||||
cmp r0, 0
|
||||
beq _0805789E
|
||||
bl sub_80F90DC
|
||||
bl IsRfuRecvQueueEmpty
|
||||
cmp r0, 0
|
||||
beq _0805789E
|
||||
bl sub_800A00C
|
||||
bl IsSendingKeysToLink
|
||||
cmp r0, 0
|
||||
bne _080578C0
|
||||
_0805789E:
|
||||
ldr r0, _080578CC @ =gUnknown_300502C
|
||||
ldrb r4, [r0]
|
||||
ldr r0, _080578D0 @ =gUnknown_3003E60
|
||||
ldr r0, _080578D0 @ =gLinkPartnersHeldKeys
|
||||
adds r1, r4, 0
|
||||
bl sub_8057BE4
|
||||
ldr r0, _080578D4 @ =gUnknown_3000E84
|
||||
|
|
@ -5667,7 +5667,7 @@ _080578C0:
|
|||
.align 2, 0
|
||||
_080578C8: .4byte gWirelessCommType
|
||||
_080578CC: .4byte gUnknown_300502C
|
||||
_080578D0: .4byte gUnknown_3003E60
|
||||
_080578D0: .4byte gLinkPartnersHeldKeys
|
||||
_080578D4: .4byte gUnknown_3000E84
|
||||
thumb_func_end c1_link_related
|
||||
|
||||
|
|
@ -5686,12 +5686,12 @@ _080578E8: .4byte sub_8057D5C
|
|||
thumb_func_start sub_80578EC
|
||||
sub_80578EC: @ 80578EC
|
||||
push {lr}
|
||||
ldr r0, _080578F8 @ =gUnknown_3003E60
|
||||
ldr r0, _080578F8 @ =gLinkPartnersHeldKeys
|
||||
bl sub_8057D48
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080578F8: .4byte gUnknown_3003E60
|
||||
_080578F8: .4byte gLinkPartnersHeldKeys
|
||||
thumb_func_end sub_80578EC
|
||||
|
||||
thumb_func_start c1_link_related_func_set
|
||||
|
|
@ -6126,14 +6126,14 @@ sub_8057C4C: @ 8057C4C
|
|||
lsrs r0, 16
|
||||
cmp r0, 0xC
|
||||
bhi _08057C6C
|
||||
ldr r0, _08057C68 @ =gUnknown_3005028
|
||||
ldr r0, _08057C68 @ =gHeldKeyCodeToSend
|
||||
strh r4, [r0]
|
||||
b _08057C72
|
||||
.align 2, 0
|
||||
_08057C64: .4byte 0xffef0000
|
||||
_08057C68: .4byte gUnknown_3005028
|
||||
_08057C68: .4byte gHeldKeyCodeToSend
|
||||
_08057C6C:
|
||||
ldr r1, _08057CB0 @ =gUnknown_3005028
|
||||
ldr r1, _08057CB0 @ =gHeldKeyCodeToSend
|
||||
movs r0, 0x11
|
||||
strh r0, [r1]
|
||||
_08057C72:
|
||||
|
|
@ -6147,7 +6147,7 @@ _08057C72:
|
|||
bl IsUpdateLinkStateCBActive
|
||||
cmp r0, 0x1
|
||||
bne _08057CA8
|
||||
bl sub_800A00C
|
||||
bl IsSendingKeysToLink
|
||||
cmp r0, 0x1
|
||||
bne _08057CA8
|
||||
cmp r4, 0x11
|
||||
|
|
@ -6159,7 +6159,7 @@ _08057C72:
|
|||
cmp r4, 0x18
|
||||
blt _08057CA8
|
||||
_08057CA2:
|
||||
ldr r1, _08057CB0 @ =gUnknown_3005028
|
||||
ldr r1, _08057CB0 @ =gHeldKeyCodeToSend
|
||||
movs r0, 0
|
||||
strh r0, [r1]
|
||||
_08057CA8:
|
||||
|
|
@ -6167,7 +6167,7 @@ _08057CA8:
|
|||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08057CB0: .4byte gUnknown_3005028
|
||||
_08057CB0: .4byte gHeldKeyCodeToSend
|
||||
_08057CB4: .4byte gWirelessCommType
|
||||
thumb_func_end sub_8057C4C
|
||||
|
||||
|
|
@ -6289,7 +6289,7 @@ sub_8057D5C: @ 8057D5C
|
|||
movs r0, 0x11
|
||||
b _08057D92
|
||||
_08057D70:
|
||||
bl sub_800B248
|
||||
bl GetLinkRecvQueueLength
|
||||
cmp r0, 0x4
|
||||
bls _08057D7C
|
||||
movs r0, 0x1B
|
||||
|
|
@ -6344,7 +6344,7 @@ _08057DC4: .4byte sub_8057D98
|
|||
thumb_func_start sub_8057DC8
|
||||
sub_8057DC8: @ 8057DC8
|
||||
push {r4,lr}
|
||||
bl sub_800B248
|
||||
bl GetLinkRecvQueueLength
|
||||
movs r4, 0x11
|
||||
cmp r0, 0x2
|
||||
bhi _08057DE0
|
||||
|
|
@ -6982,7 +6982,7 @@ sub_8058244: @ 8058244
|
|||
movs r0, 0
|
||||
b _0805826C
|
||||
_08058252:
|
||||
bl sub_800B248
|
||||
bl GetLinkRecvQueueLength
|
||||
cmp r0, 0x2
|
||||
bls _08058264
|
||||
ldr r1, _08058260 @ =gUnknown_3000E88
|
||||
|
|
@ -7006,13 +7006,13 @@ _08058270: .4byte gUnknown_3000E88
|
|||
thumb_func_start sub_8058274
|
||||
sub_8058274: @ 8058274
|
||||
push {lr}
|
||||
bl sub_800B248
|
||||
bl GetLinkRecvQueueLength
|
||||
cmp r0, 0x1
|
||||
bls _080582D8
|
||||
bl IsUpdateLinkStateCBActive
|
||||
cmp r0, 0x1
|
||||
bne _080582D8
|
||||
bl sub_800A00C
|
||||
bl IsSendingKeysToLink
|
||||
cmp r0, 0x1
|
||||
bne _080582D8
|
||||
ldr r0, _080582C4 @ =gUnknown_3000E84
|
||||
|
|
@ -7065,7 +7065,7 @@ sub_80582E0: @ 80582E0
|
|||
bl IsUpdateLinkStateCBActive
|
||||
cmp r0, 0x1
|
||||
bne _08058304
|
||||
bl sub_800A00C
|
||||
bl IsSendingKeysToLink
|
||||
cmp r0, 0x1
|
||||
bne _08058304
|
||||
ldr r0, _08058308 @ =gUnknown_3000E84
|
||||
|
|
@ -7093,7 +7093,7 @@ sub_8058318: @ 8058318
|
|||
ldrb r0, [r0]
|
||||
cmp r0, 0
|
||||
bne _08058334
|
||||
bl sub_800A00C
|
||||
bl IsSendingKeysToLink
|
||||
cmp r0, 0
|
||||
beq _08058334
|
||||
movs r0, 0x1
|
||||
|
|
@ -7114,14 +7114,14 @@ sub_805833C: @ 805833C
|
|||
ldrb r0, [r0]
|
||||
cmp r0, 0
|
||||
bne _0805835C
|
||||
ldr r0, _08058354 @ =gUnknown_3003FB0
|
||||
ldr r0, _08058354 @ =gLink
|
||||
ldr r1, _08058358 @ =0x00000339
|
||||
adds r0, r1
|
||||
ldrb r0, [r0]
|
||||
b _08058364
|
||||
.align 2, 0
|
||||
_08058350: .4byte gWirelessCommType
|
||||
_08058354: .4byte gUnknown_3003FB0
|
||||
_08058354: .4byte gLink
|
||||
_08058358: .4byte 0x00000339
|
||||
_0805835C:
|
||||
ldr r0, _08058368 @ =gUnknown_3005450
|
||||
|
|
|
|||
2945
asm/palette.s
2945
asm/palette.s
File diff suppressed because it is too large
Load Diff
|
|
@ -2010,8 +2010,8 @@ _0811FA18: .4byte gUnknown_8459FC4
|
|||
_0811FA1C: .4byte gUnknown_8459FE0
|
||||
thumb_func_end sub_811F9DC
|
||||
|
||||
thumb_func_start sub_811FA20
|
||||
sub_811FA20: @ 811FA20
|
||||
thumb_func_start IsMultiBattle
|
||||
IsMultiBattle: @ 811FA20
|
||||
push {lr}
|
||||
ldr r0, _0811FA34 @ =gBattleTypeFlags
|
||||
ldr r0, [r0]
|
||||
|
|
@ -2028,7 +2028,7 @@ _0811FA38:
|
|||
_0811FA3A:
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_811FA20
|
||||
thumb_func_end IsMultiBattle
|
||||
|
||||
thumb_func_start sub_811FA40
|
||||
sub_811FA40: @ 811FA40
|
||||
|
|
@ -7145,7 +7145,7 @@ party_menu_icon_anim: @ 81221D4
|
|||
adds r7, r1, 0
|
||||
adds r4, r2, 0
|
||||
movs r6, 0x1
|
||||
bl sub_811FA20
|
||||
bl IsMultiBattle
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
|
|
@ -13549,7 +13549,7 @@ sub_8125554: @ 8125554
|
|||
bl sub_81202F8
|
||||
movs r0, 0x2
|
||||
bl ScheduleBgCopyTilemapToVram
|
||||
bl sub_803539C
|
||||
bl HandleBattleLowHpMusicChange
|
||||
ldr r1, _081255B4 @ =gTasks
|
||||
lsls r0, r5, 2
|
||||
adds r0, r5
|
||||
|
|
@ -14645,7 +14645,7 @@ sub_8125E4C: @ 8125E4C
|
|||
ldr r3, _08125E80 @ =sub_8125E84
|
||||
ldrh r4, [r4, 0xE]
|
||||
str r4, [sp]
|
||||
bl sub_8134738
|
||||
bl ShowSelectMovePokemonSummaryScreen
|
||||
add sp, 0x4
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
|
|
@ -15250,7 +15250,7 @@ sub_8126350: @ 8126350
|
|||
lsls r2, 2
|
||||
adds r1, r7, r2
|
||||
adds r0, r4, 0
|
||||
bl sub_811D130
|
||||
bl GetMonLevelUpWindowStats
|
||||
ldrb r0, [r6, 0x9]
|
||||
ldr r5, _0812641C @ =gSpecialVar_ItemId
|
||||
ldrh r1, [r5]
|
||||
|
|
@ -15260,7 +15260,7 @@ sub_8126350: @ 8126350
|
|||
lsls r0, 2
|
||||
adds r1, r7, r0
|
||||
adds r0, r4, 0
|
||||
bl sub_811D130
|
||||
bl GetMonLevelUpWindowStats
|
||||
ldr r1, _08126420 @ =gUnknown_203B0C0
|
||||
movs r0, 0x1
|
||||
strb r0, [r1]
|
||||
|
|
@ -15497,7 +15497,7 @@ sub_8126570: @ 8126570
|
|||
str r1, [sp, 0x4]
|
||||
adds r1, r4, 0
|
||||
movs r3, 0x1
|
||||
bl sub_811E7F0
|
||||
bl DrawLevelUpWindowPg1
|
||||
ldrb r0, [r4, 0x18]
|
||||
movs r1, 0x2
|
||||
bl CopyWindowToVram
|
||||
|
|
@ -15528,7 +15528,7 @@ sub_81265BC: @ 81265BC
|
|||
str r2, [sp]
|
||||
movs r2, 0x1
|
||||
movs r3, 0x2
|
||||
bl sub_811E93C
|
||||
bl DrawLevelUpWindowPg2
|
||||
ldrb r0, [r4, 0x18]
|
||||
movs r1, 0x2
|
||||
bl CopyWindowToVram
|
||||
|
|
@ -16284,7 +16284,7 @@ _08126C20: .4byte 0x0000ffff
|
|||
thumb_func_start sub_8126C24
|
||||
sub_8126C24: @ 8126C24
|
||||
push {lr}
|
||||
bl sub_806E25C
|
||||
bl IsNationalPokedexEnabled
|
||||
cmp r0, 0
|
||||
bne _08126C60
|
||||
ldr r0, _08126C54 @ =gUnknown_203B0A0
|
||||
|
|
@ -17909,14 +17909,14 @@ _081278B0: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
|
|||
thumb_func_start sub_81278B4
|
||||
sub_81278B4: @ 81278B4
|
||||
push {lr}
|
||||
bl sub_8075290
|
||||
bl IsDoubleBattle
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _081278C4
|
||||
movs r0, 0
|
||||
b _081278D6
|
||||
_081278C4:
|
||||
bl sub_811FA20
|
||||
bl IsMultiBattle
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
|
|
@ -17930,8 +17930,8 @@ _081278D6:
|
|||
bx r1
|
||||
thumb_func_end sub_81278B4
|
||||
|
||||
thumb_func_start sub_81278DC
|
||||
sub_81278DC: @ 81278DC
|
||||
thumb_func_start OpenPartyMenuInBattle
|
||||
OpenPartyMenuInBattle: @ 81278DC
|
||||
push {r4,lr}
|
||||
sub sp, 0xC
|
||||
lsls r0, 24
|
||||
|
|
@ -17955,7 +17955,7 @@ sub_81278DC: @ 81278DC
|
|||
str r0, [sp]
|
||||
ldr r0, _08127928 @ =sub_8120C3C
|
||||
str r0, [sp, 0x4]
|
||||
ldr r0, _0812792C @ =sub_8030ADC
|
||||
ldr r0, _0812792C @ =SetCB2ToReshowScreenAfterMenu
|
||||
str r0, [sp, 0x8]
|
||||
movs r0, 0x1
|
||||
adds r2, r4, 0
|
||||
|
|
@ -17967,7 +17967,7 @@ sub_81278DC: @ 81278DC
|
|||
.align 2, 0
|
||||
_08127924: .4byte gBattleTypeFlags
|
||||
_08127928: .4byte sub_8120C3C
|
||||
_0812792C: .4byte sub_8030ADC
|
||||
_0812792C: .4byte SetCB2ToReshowScreenAfterMenu
|
||||
_08127930:
|
||||
bl sub_81278B4
|
||||
adds r1, r0, 0
|
||||
|
|
@ -17977,7 +17977,7 @@ _08127930:
|
|||
str r0, [sp]
|
||||
ldr r0, _08127960 @ =sub_811FB28
|
||||
str r0, [sp, 0x4]
|
||||
ldr r0, _08127964 @ =sub_8030ADC
|
||||
ldr r0, _08127964 @ =SetCB2ToReshowScreenAfterMenu
|
||||
str r0, [sp, 0x8]
|
||||
movs r0, 0x1
|
||||
adds r2, r4, 0
|
||||
|
|
@ -17992,8 +17992,8 @@ _08127950:
|
|||
bx r0
|
||||
.align 2, 0
|
||||
_08127960: .4byte sub_811FB28
|
||||
_08127964: .4byte sub_8030ADC
|
||||
thumb_func_end sub_81278DC
|
||||
_08127964: .4byte SetCB2ToReshowScreenAfterMenu
|
||||
thumb_func_end OpenPartyMenuInBattle
|
||||
|
||||
thumb_func_start sub_8127968
|
||||
sub_8127968: @ 8127968
|
||||
|
|
@ -18007,7 +18007,7 @@ sub_8127968: @ 8127968
|
|||
str r0, [sp]
|
||||
ldr r0, _0812799C @ =sub_8120EBC
|
||||
str r0, [sp, 0x4]
|
||||
ldr r0, _081279A0 @ =sub_8030ADC
|
||||
ldr r0, _081279A0 @ =SetCB2ToReshowScreenAfterMenu
|
||||
str r0, [sp, 0x8]
|
||||
movs r0, 0x1
|
||||
movs r2, 0
|
||||
|
|
@ -18020,7 +18020,7 @@ sub_8127968: @ 8127968
|
|||
bx r0
|
||||
.align 2, 0
|
||||
_0812799C: .4byte sub_8120EBC
|
||||
_081279A0: .4byte sub_8030ADC
|
||||
_081279A0: .4byte SetCB2ToReshowScreenAfterMenu
|
||||
thumb_func_end sub_8127968
|
||||
|
||||
thumb_func_start sub_81279A4
|
||||
|
|
@ -18169,7 +18169,7 @@ sub_8127AC0: @ 8127AC0
|
|||
bl GetCursorSelectionMonId
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
bl sub_811FA20
|
||||
bl IsMultiBattle
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
|
|
@ -18290,7 +18290,7 @@ _08127BD8:
|
|||
ldrb r0, [r0, 0xB]
|
||||
cmp r0, 0x4
|
||||
bne _08127BEC
|
||||
bl sub_8044348
|
||||
bl SetMonPreventsSwitchingString
|
||||
b _08127C8A
|
||||
.align 2, 0
|
||||
_08127BE8: .4byte gUnknown_203B0A0
|
||||
|
|
@ -18402,7 +18402,7 @@ sub_8127CCC: @ 8127CCC
|
|||
adds r6, r0, 0
|
||||
lsls r1, 24
|
||||
lsrs r4, r1, 24
|
||||
bl sub_811FA20
|
||||
bl IsMultiBattle
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
|
|
@ -18425,7 +18425,7 @@ _08127CF4:
|
|||
strb r0, [r6, 0x2]
|
||||
b _08127D9C
|
||||
_08127D02:
|
||||
bl sub_8075290
|
||||
bl IsDoubleBattle
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08127D40
|
||||
|
|
@ -18565,7 +18565,7 @@ _08127E00:
|
|||
bl GetBattlerAtPosition
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
bl sub_811FA20
|
||||
bl IsMultiBattle
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
|
|
@ -18588,7 +18588,7 @@ _08127E26:
|
|||
strb r0, [r5, 0x2]
|
||||
b _08127EB6
|
||||
_08127E34:
|
||||
bl sub_8075290
|
||||
bl IsDoubleBattle
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08127E6C
|
||||
|
|
@ -18678,7 +18678,7 @@ sub_8127EC4: @ 8127EC4
|
|||
lsls r2, 24
|
||||
lsrs r6, r2, 24
|
||||
movs r7, 0
|
||||
bl sub_811FA20
|
||||
bl IsMultiBattle
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08127F72
|
||||
|
|
@ -19046,12 +19046,12 @@ _0812817A:
|
|||
sub_8128184: @ 8128184
|
||||
push {lr}
|
||||
bl sub_8108CF0
|
||||
ldr r0, _08128194 @ =sub_8030ADC
|
||||
ldr r0, _08128194 @ =SetCB2ToReshowScreenAfterMenu
|
||||
bl SetMainCallback2
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08128194: .4byte sub_8030ADC
|
||||
_08128194: .4byte SetCB2ToReshowScreenAfterMenu
|
||||
thumb_func_end sub_8128184
|
||||
|
||||
thumb_func_start sub_8128198
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_80EB658
|
||||
sub_80EB658: @ 80EB658
|
||||
thumb_func_start NewGameInitPCItems
|
||||
NewGameInitPCItems: @ 80EB658
|
||||
push {r4-r6,lr}
|
||||
movs r4, 0
|
||||
bl ClearPCItemSlots
|
||||
|
|
@ -48,7 +48,7 @@ _080EB6A0:
|
|||
bx r0
|
||||
.align 2, 0
|
||||
_080EB6A8: .4byte gUnknown_8402220
|
||||
thumb_func_end sub_80EB658
|
||||
thumb_func_end NewGameInitPCItems
|
||||
|
||||
thumb_func_start sub_80EB6AC
|
||||
sub_80EB6AC: @ 80EB6AC
|
||||
|
|
@ -369,7 +369,7 @@ _080EB95C:
|
|||
_080EB962:
|
||||
ldr r0, _080EB990 @ =gUnknown_203AAC4
|
||||
ldrb r0, [r0, 0x5]
|
||||
bl sub_810EB6C
|
||||
bl MailboxPC_InitBuffers
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
|
|
@ -1054,7 +1054,7 @@ sub_80EBEB0: @ 80EBEB0
|
|||
lsls r6, 24
|
||||
lsrs r6, 24
|
||||
movs r0, 0
|
||||
bl sub_810EBAC
|
||||
bl MailboxPC_GetAddWindow
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
|
|
@ -1066,7 +1066,7 @@ sub_80EBEB0: @ 80EBEB0
|
|||
bl GetStringWidth
|
||||
adds r5, r0, 0
|
||||
movs r0, 0x1
|
||||
bl sub_810EBAC
|
||||
bl MailboxPC_GetAddWindow
|
||||
movs r3, 0x50
|
||||
subs r3, r5
|
||||
lsrs r0, r3, 31
|
||||
|
|
@ -1087,7 +1087,7 @@ sub_80EBEB0: @ 80EBEB0
|
|||
bl ScheduleBgCopyTilemapToVram
|
||||
ldr r4, _080EBF38 @ =gUnknown_203AAC4
|
||||
adds r0, r4, 0
|
||||
bl sub_810EC98
|
||||
bl MailboxPC_InitListMenu
|
||||
ldr r2, _080EBF3C @ =gTasks
|
||||
lsls r1, r6, 2
|
||||
adds r1, r6
|
||||
|
|
@ -1097,7 +1097,7 @@ sub_80EBEB0: @ 80EBEB0
|
|||
lsrs r0, 24
|
||||
strh r0, [r1, 0x1E]
|
||||
adds r0, r4, 0
|
||||
bl sub_810ED80
|
||||
bl MailboxPC_AddScrollIndicatorArrows
|
||||
add sp, 0xC
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
|
|
@ -1168,9 +1168,9 @@ _080EBFB6:
|
|||
movs r0, 0x5
|
||||
bl PlaySE
|
||||
movs r0, 0
|
||||
bl sub_810EBE0
|
||||
bl MailboxPC_RemoveWindow
|
||||
movs r0, 0x1
|
||||
bl sub_810EBE0
|
||||
bl MailboxPC_RemoveWindow
|
||||
ldrb r0, [r4, 0x16]
|
||||
adds r1, r7, 0
|
||||
mov r2, r8
|
||||
|
|
@ -1282,16 +1282,16 @@ sub_80EC094: @ 80EC094
|
|||
ldr r0, _080EC0D4 @ =gTasks+0x8
|
||||
adds r4, r0
|
||||
movs r0, 0
|
||||
bl sub_810EBE0
|
||||
bl MailboxPC_RemoveWindow
|
||||
movs r0, 0x1
|
||||
bl sub_810EBE0
|
||||
bl MailboxPC_RemoveWindow
|
||||
ldrb r0, [r4, 0x16]
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl DestroyListMenuTask
|
||||
movs r0, 0
|
||||
bl ScheduleBgCopyTilemapToVram
|
||||
bl sub_810EDB0
|
||||
bl MailboxPC_DestroyListMenuBuffer
|
||||
adds r0, r5, 0
|
||||
bl sub_80EB8BC
|
||||
pop {r4,r5}
|
||||
|
|
@ -1311,7 +1311,7 @@ sub_80EC0D8: @ 80EC0D8
|
|||
lsls r5, 24
|
||||
lsrs r5, 24
|
||||
movs r0, 0x2
|
||||
bl sub_810EBAC
|
||||
bl MailboxPC_GetAddWindow
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
|
|
@ -1437,7 +1437,7 @@ sub_80EC1D4: @ 80EC1D4
|
|||
ands r0, r1
|
||||
cmp r0, 0
|
||||
bne _080EC216
|
||||
bl sub_810EDB0
|
||||
bl MailboxPC_DestroyListMenuBuffer
|
||||
bl CleanupOverworldWindowsAndTilemaps
|
||||
ldr r2, _080EC220 @ =gSaveBlock1Ptr
|
||||
ldr r1, _080EC224 @ =gUnknown_203AAC4
|
||||
|
|
@ -1519,7 +1519,7 @@ _080EC27E:
|
|||
lsrs r4, r0, 24
|
||||
ldr r0, _080EC2AC @ =gUnknown_203AAC4
|
||||
ldrb r0, [r0, 0x5]
|
||||
bl sub_810EB6C
|
||||
bl MailboxPC_InitBuffers
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
|
|
@ -1752,7 +1752,7 @@ sub_80EC444: @ 80EC444
|
|||
ands r0, r1
|
||||
cmp r0, 0
|
||||
bne _080EC468
|
||||
bl sub_810EDB0
|
||||
bl MailboxPC_DestroyListMenuBuffer
|
||||
bl CleanupOverworldWindowsAndTilemaps
|
||||
bl sub_81273D8
|
||||
adds r0, r4, 0
|
||||
|
|
@ -1810,7 +1810,7 @@ _080EC4C6:
|
|||
bl sub_80F6E9C
|
||||
ldr r0, _080EC4EC @ =gUnknown_203AAC4
|
||||
ldrb r0, [r0, 0x5]
|
||||
bl sub_810EB6C
|
||||
bl MailboxPC_InitBuffers
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
|
|
@ -1898,7 +1898,7 @@ sub_80EC574: @ 80EC574
|
|||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
movs r0, 0x2
|
||||
bl sub_810EBE0
|
||||
bl MailboxPC_RemoveWindow
|
||||
movs r0, 0
|
||||
bl ScheduleBgCopyTilemapToVram
|
||||
ldr r1, _080EC59C @ =gTasks
|
||||
|
|
|
|||
10
asm/poison.s
10
asm/poison.s
|
|
@ -26,13 +26,13 @@ _080B1636:
|
|||
ldr r4, _080B1678 @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x32]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x36]
|
||||
|
|
@ -166,7 +166,7 @@ sub_80B1744: @ 80B1744
|
|||
adds r0, r1
|
||||
strh r0, [r4, 0x36]
|
||||
adds r0, r4, 0
|
||||
bl sub_80754B8
|
||||
bl InitSpriteDataForLinearTranslation
|
||||
movs r1, 0x30
|
||||
ldrsh r0, [r4, r1]
|
||||
movs r2, 0x4
|
||||
|
|
@ -253,7 +253,7 @@ _080B17F0:
|
|||
strh r2, [r4, 0x32]
|
||||
adds r1, r3
|
||||
strh r1, [r4, 0x36]
|
||||
ldr r0, _080B1830 @ =sub_8075590
|
||||
ldr r0, _080B1830 @ =StartAnimLinearTranslation
|
||||
str r0, [r4, 0x1C]
|
||||
ldr r1, _080B1834 @ =DestroyAnimSprite
|
||||
adds r0, r4, 0
|
||||
|
|
@ -265,7 +265,7 @@ _080B17F0:
|
|||
_080B1824: .4byte gBattleAnimTarget
|
||||
_080B1828: .4byte gBattleAnimAttacker
|
||||
_080B182C: .4byte gBattleAnimArgs
|
||||
_080B1830: .4byte sub_8075590
|
||||
_080B1830: .4byte StartAnimLinearTranslation
|
||||
_080B1834: .4byte DestroyAnimSprite
|
||||
thumb_func_end sub_80B17C4
|
||||
|
||||
|
|
|
|||
|
|
@ -14,10 +14,10 @@ DoPokeballSendOutAnimation: @ 804A938
|
|||
lsrs r4, 16
|
||||
lsls r5, 24
|
||||
lsrs r5, 24
|
||||
ldr r1, _0804A98C @ =gUnknown_2024005
|
||||
ldr r1, _0804A98C @ =gDoingBattleAnim
|
||||
movs r0, 0x1
|
||||
strb r0, [r1]
|
||||
ldr r0, _0804A990 @ =gUnknown_2024018
|
||||
ldr r0, _0804A990 @ =gBattleSpritesDataPtr
|
||||
ldr r0, [r0]
|
||||
ldr r6, _0804A994 @ =gActiveBattler
|
||||
ldrb r1, [r6]
|
||||
|
|
@ -49,8 +49,8 @@ DoPokeballSendOutAnimation: @ 804A938
|
|||
pop {r1}
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_0804A98C: .4byte gUnknown_2024005
|
||||
_0804A990: .4byte gUnknown_2024018
|
||||
_0804A98C: .4byte gDoingBattleAnim
|
||||
_0804A990: .4byte gBattleSpritesDataPtr
|
||||
_0804A994: .4byte gActiveBattler
|
||||
_0804A998: .4byte sub_804A9A0
|
||||
_0804A99C: .4byte gTasks
|
||||
|
|
@ -132,7 +132,7 @@ _0804AA12:
|
|||
beq _0804AA60
|
||||
ldr r4, _0804AA5C @ =gLinkPlayers
|
||||
adds r0, r6, 0
|
||||
bl GetBankMultiplayerId
|
||||
bl GetBattlerMultiplayerId
|
||||
lsls r1, r0, 3
|
||||
subs r1, r0
|
||||
lsls r1, 2
|
||||
|
|
@ -220,13 +220,13 @@ _0804AAF4: .4byte SpriteCB_PlayerMonSendOut_1
|
|||
_0804AAF8:
|
||||
adds r0, r6, 0
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x20]
|
||||
adds r0, r6, 0
|
||||
movs r1, 0x1
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
adds r0, 0x18
|
||||
|
|
@ -276,13 +276,13 @@ _0804AB6C:
|
|||
strh r0, [r4, 0x2E]
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x32]
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x1
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
subs r0, 0x10
|
||||
|
|
@ -1265,11 +1265,11 @@ _0804B324:
|
|||
cmp r5, r0
|
||||
bne _0804B3A6
|
||||
_0804B34E:
|
||||
bl sub_8075290
|
||||
bl IsDoubleBattle
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0804B3A6
|
||||
ldr r0, _0804B390 @ =gUnknown_2024018
|
||||
ldr r0, _0804B390 @ =gBattleSpritesDataPtr
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x8]
|
||||
ldrb r1, [r0, 0x9]
|
||||
|
|
@ -1293,7 +1293,7 @@ _0804B34E:
|
|||
.align 2, 0
|
||||
_0804B388: .4byte gBattlerPartyIndexes
|
||||
_0804B38C: .4byte gPlayerParty
|
||||
_0804B390: .4byte gUnknown_2024018
|
||||
_0804B390: .4byte gBattleSpritesDataPtr
|
||||
_0804B394: .4byte gBattleTypeFlags
|
||||
_0804B398: .4byte gMPlayInfo_BGM
|
||||
_0804B39C:
|
||||
|
|
@ -1302,11 +1302,11 @@ _0804B39C:
|
|||
movs r2, 0x80
|
||||
bl m4aMPlayVolumeControl
|
||||
_0804B3A6:
|
||||
bl sub_8075290
|
||||
bl IsDoubleBattle
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0804B3C0
|
||||
ldr r0, _0804B3CC @ =gUnknown_2024018
|
||||
ldr r0, _0804B3CC @ =gBattleSpritesDataPtr
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x8]
|
||||
ldrb r1, [r0, 0x9]
|
||||
|
|
@ -1320,7 +1320,7 @@ _0804B3C0:
|
|||
.align 2, 0
|
||||
_0804B3C4: .4byte gMPlayInfo_BGM
|
||||
_0804B3C8: .4byte 0x0000ffff
|
||||
_0804B3CC: .4byte gUnknown_2024018
|
||||
_0804B3CC: .4byte gBattleSpritesDataPtr
|
||||
_0804B3D0:
|
||||
movs r0, 0
|
||||
bl GetBattlerAtPosition
|
||||
|
|
@ -1519,9 +1519,9 @@ _0804B52C:
|
|||
movs r2, 0
|
||||
movs r1, 0
|
||||
strh r1, [r0, 0x26]
|
||||
ldr r0, _0804B5C0 @ =gUnknown_2024005
|
||||
ldr r0, _0804B5C0 @ =gDoingBattleAnim
|
||||
strb r2, [r0]
|
||||
ldr r4, _0804B5C4 @ =gUnknown_2024018
|
||||
ldr r4, _0804B5C4 @ =gBattleSpritesDataPtr
|
||||
ldr r0, [r4]
|
||||
ldr r0, [r0, 0x4]
|
||||
lsls r1, r6, 1
|
||||
|
|
@ -1572,8 +1572,8 @@ _0804B5AE:
|
|||
_0804B5B4: .4byte 0xfffffee0
|
||||
_0804B5B8: .4byte gSprites
|
||||
_0804B5BC: .4byte gBattlerSpriteIds
|
||||
_0804B5C0: .4byte gUnknown_2024005
|
||||
_0804B5C4: .4byte gUnknown_2024018
|
||||
_0804B5C0: .4byte gDoingBattleAnim
|
||||
_0804B5C4: .4byte gBattleSpritesDataPtr
|
||||
thumb_func_end HandleBallAnimEnd
|
||||
|
||||
thumb_func_start sub_804B5C8
|
||||
|
|
@ -1592,7 +1592,7 @@ sub_804B5C8: @ 804B5C8
|
|||
beq _0804B666
|
||||
cmp r1, 0x5F
|
||||
bne _0804B600
|
||||
ldr r0, _0804B5F8 @ =gUnknown_2024005
|
||||
ldr r0, _0804B5F8 @ =gDoingBattleAnim
|
||||
movs r1, 0
|
||||
strb r1, [r0]
|
||||
bl m4aMPlayAllStop
|
||||
|
|
@ -1600,7 +1600,7 @@ sub_804B5C8: @ 804B5C8
|
|||
bl PlaySE
|
||||
b _0804B666
|
||||
.align 2, 0
|
||||
_0804B5F8: .4byte gUnknown_2024005
|
||||
_0804B5F8: .4byte gDoingBattleAnim
|
||||
_0804B5FC: .4byte 0x0000013f
|
||||
_0804B600:
|
||||
ldr r0, _0804B66C @ =0x0000013b
|
||||
|
|
@ -1639,7 +1639,7 @@ _0804B600:
|
|||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _0804B666
|
||||
ldr r0, _0804B680 @ =gUnknown_2024018
|
||||
ldr r0, _0804B680 @ =gBattleSpritesDataPtr
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x4]
|
||||
lsls r1, r7, 1
|
||||
|
|
@ -1661,7 +1661,7 @@ _0804B670: .4byte gSprites
|
|||
_0804B674: .4byte gBattlerSpriteIds
|
||||
_0804B678: .4byte gMain
|
||||
_0804B67C: .4byte 0x00000439
|
||||
_0804B680: .4byte gUnknown_2024018
|
||||
_0804B680: .4byte gBattleSpritesDataPtr
|
||||
thumb_func_end sub_804B5C8
|
||||
|
||||
thumb_func_start SpriteCB_PlayerMonSendOut_1
|
||||
|
|
@ -1674,7 +1674,7 @@ SpriteCB_PlayerMonSendOut_1: @ 804B684
|
|||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x32]
|
||||
|
|
@ -1682,7 +1682,7 @@ SpriteCB_PlayerMonSendOut_1: @ 804B684
|
|||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
adds r0, 0x18
|
||||
|
|
@ -1843,11 +1843,11 @@ _0804B7C8:
|
|||
ldrb r0, [r5, 0x6]
|
||||
strh r0, [r5, 0x3A]
|
||||
strh r1, [r5, 0x2E]
|
||||
bl sub_8075290
|
||||
bl IsDoubleBattle
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0804B828
|
||||
ldr r0, _0804B820 @ =gUnknown_2024018
|
||||
ldr r0, _0804B820 @ =gBattleSpritesDataPtr
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x8]
|
||||
ldrb r1, [r0, 0x9]
|
||||
|
|
@ -1866,7 +1866,7 @@ _0804B7C8:
|
|||
ldr r0, _0804B824 @ =SpriteCB_ReleaseMon2FromBall
|
||||
b _0804B82A
|
||||
.align 2, 0
|
||||
_0804B820: .4byte gUnknown_2024018
|
||||
_0804B820: .4byte gBattleSpritesDataPtr
|
||||
_0804B824: .4byte SpriteCB_ReleaseMon2FromBall
|
||||
_0804B828:
|
||||
ldr r0, _0804B840 @ =sub_804B268
|
||||
|
|
@ -1920,11 +1920,11 @@ SpriteCB_OpponentMonSendOut: @ 804B868
|
|||
ble _0804B8BC
|
||||
movs r0, 0
|
||||
strh r0, [r5, 0x2E]
|
||||
bl sub_8075290
|
||||
bl IsDoubleBattle
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0804B8B8
|
||||
ldr r0, _0804B8B0 @ =gUnknown_2024018
|
||||
ldr r0, _0804B8B0 @ =gBattleSpritesDataPtr
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x8]
|
||||
ldrb r1, [r0, 0x9]
|
||||
|
|
@ -1943,7 +1943,7 @@ SpriteCB_OpponentMonSendOut: @ 804B868
|
|||
ldr r0, _0804B8B4 @ =SpriteCB_ReleaseMon2FromBall
|
||||
b _0804B8BA
|
||||
.align 2, 0
|
||||
_0804B8B0: .4byte gUnknown_2024018
|
||||
_0804B8B0: .4byte gBattleSpritesDataPtr
|
||||
_0804B8B4: .4byte SpriteCB_ReleaseMon2FromBall
|
||||
_0804B8B8:
|
||||
ldr r0, _0804B8C4 @ =sub_804B268
|
||||
|
|
@ -2594,7 +2594,7 @@ sub_804BD94: @ 804BD94
|
|||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
adds r5, r0, 0
|
||||
ldr r0, _0804BE14 @ =gUnknown_3004FF0
|
||||
ldr r0, _0804BE14 @ =gHealthboxSpriteIds
|
||||
adds r0, r5, r0
|
||||
ldrb r1, [r0]
|
||||
lsls r0, r1, 4
|
||||
|
|
@ -2653,7 +2653,7 @@ _0804BE0C:
|
|||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0804BE14: .4byte gUnknown_3004FF0
|
||||
_0804BE14: .4byte gHealthboxSpriteIds
|
||||
_0804BE18: .4byte gSprites
|
||||
_0804BE1C: .4byte sub_804BE48
|
||||
_0804BE20: .4byte sub_804BE24
|
||||
|
|
@ -2723,7 +2723,7 @@ DoHitAnimHealthboxEffect: @ 804BE70
|
|||
adds r3, r1, r2
|
||||
movs r0, 0x1
|
||||
strh r0, [r3, 0x2E]
|
||||
ldr r0, _0804BEB0 @ =gUnknown_3004FF0
|
||||
ldr r0, _0804BEB0 @ =gHealthboxSpriteIds
|
||||
adds r4, r0
|
||||
ldrb r0, [r4]
|
||||
strh r0, [r3, 0x30]
|
||||
|
|
@ -2736,7 +2736,7 @@ DoHitAnimHealthboxEffect: @ 804BE70
|
|||
.align 2, 0
|
||||
_0804BEA8: .4byte SpriteCB_HitAnimHealthoxEffect
|
||||
_0804BEAC: .4byte gSprites
|
||||
_0804BEB0: .4byte gUnknown_3004FF0
|
||||
_0804BEB0: .4byte gHealthboxSpriteIds
|
||||
thumb_func_end DoHitAnimHealthboxEffect
|
||||
|
||||
thumb_func_start SpriteCB_HitAnimHealthoxEffect
|
||||
|
|
|
|||
|
|
@ -1,357 +0,0 @@
|
|||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.syntax unified
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_8134200
|
||||
sub_8134200: @ 8134200
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
lsls r1, r0, 2
|
||||
adds r1, r0
|
||||
lsls r1, 3
|
||||
ldr r0, _08134228 @ =gTasks+0x8
|
||||
adds r1, r0
|
||||
ldr r2, _0813422C @ =gSprites
|
||||
ldrb r1, [r1, 0xD]
|
||||
lsls r0, r1, 4
|
||||
adds r0, r1
|
||||
lsls r0, 2
|
||||
adds r0, r2
|
||||
adds r0, 0x3E
|
||||
ldrb r2, [r0]
|
||||
movs r1, 0x5
|
||||
negs r1, r1
|
||||
ands r1, r2
|
||||
strb r1, [r0]
|
||||
bx lr
|
||||
.align 2, 0
|
||||
_08134228: .4byte gTasks+0x8
|
||||
_0813422C: .4byte gSprites
|
||||
thumb_func_end sub_8134200
|
||||
|
||||
thumb_func_start sub_8134230
|
||||
sub_8134230: @ 8134230
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
mov r5, r8
|
||||
push {r5-r7}
|
||||
sub sp, 0x28
|
||||
mov r9, r0
|
||||
mov r8, r2
|
||||
adds r6, r3, 0
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
mov r9, r0
|
||||
lsls r1, 16
|
||||
lsls r2, 24
|
||||
lsrs r2, 24
|
||||
mov r8, r2
|
||||
lsls r6, 24
|
||||
lsrs r6, 24
|
||||
ldr r0, _081343C4 @ =gUnknown_846343C
|
||||
str r0, [sp, 0x20]
|
||||
ldr r3, _081343C8 @ =0xffff0000
|
||||
add r0, sp, 0x20
|
||||
ldr r2, [r0, 0x4]
|
||||
ands r2, r3
|
||||
movs r3, 0x94
|
||||
lsls r3, 3
|
||||
orrs r2, r3
|
||||
lsrs r7, r1, 16
|
||||
ldr r5, _081343CC @ =0x0000ffff
|
||||
ands r2, r5
|
||||
orrs r2, r1
|
||||
str r2, [r0, 0x4]
|
||||
bl LoadCompressedSpriteSheet
|
||||
ldr r0, _081343D0 @ =gUnknown_846341C
|
||||
mov r3, r8
|
||||
lsls r3, 4
|
||||
mov r8, r3
|
||||
movs r1, 0x80
|
||||
lsls r1, 1
|
||||
add r1, r8
|
||||
movs r2, 0x20
|
||||
bl LoadPalette
|
||||
ldr r0, _081343D4 @ =sub_8134200
|
||||
movs r1, 0
|
||||
bl CreateTask
|
||||
mov r10, r0
|
||||
mov r0, r10
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
mov r10, r0
|
||||
lsls r4, r0, 2
|
||||
add r4, r10
|
||||
lsls r4, 3
|
||||
ldr r0, _081343D8 @ =gTasks+0x8
|
||||
adds r4, r0
|
||||
movs r0, 0
|
||||
strb r0, [r4, 0xC]
|
||||
strh r7, [r4, 0xE]
|
||||
ldrh r0, [r4, 0x10]
|
||||
orrs r5, r0
|
||||
strh r5, [r4, 0x10]
|
||||
movs r0, 0xF0
|
||||
lsls r0, 1
|
||||
bl Alloc
|
||||
adds r1, r0, 0
|
||||
str r1, [r4, 0x8]
|
||||
str r1, [r4, 0x4]
|
||||
mov r0, r9
|
||||
bl sub_813C9DC
|
||||
strb r0, [r4]
|
||||
movs r1, 0x80
|
||||
lsls r1, 8
|
||||
movs r0, 0
|
||||
bl SetGpuRegBits
|
||||
ldr r1, _081343DC @ =0x00002f42
|
||||
movs r0, 0x50
|
||||
bl SetGpuReg
|
||||
ldr r1, _081343E0 @ =0x0000080c
|
||||
movs r0, 0x52
|
||||
bl SetGpuReg
|
||||
movs r0, 0x54
|
||||
movs r1, 0
|
||||
bl SetGpuReg
|
||||
ldr r1, _081343E4 @ =0x00001f1f
|
||||
movs r0, 0x48
|
||||
bl SetGpuReg
|
||||
ldr r1, _081343E8 @ =0x00002f3d
|
||||
movs r0, 0x4A
|
||||
bl SetGpuReg
|
||||
add r1, sp, 0x8
|
||||
ldr r0, _081343EC @ =gDummySpriteTemplate
|
||||
ldm r0!, {r2,r3,r5}
|
||||
stm r1!, {r2,r3,r5}
|
||||
ldm r0!, {r2,r3,r5}
|
||||
stm r1!, {r2,r3,r5}
|
||||
add r0, sp, 0x8
|
||||
strh r7, [r0]
|
||||
adds r6, 0x20
|
||||
movs r1, 0x68
|
||||
adds r2, r6, 0
|
||||
movs r3, 0
|
||||
bl CreateSprite
|
||||
strb r0, [r4, 0xD]
|
||||
ldrb r1, [r4, 0xD]
|
||||
lsls r0, r1, 4
|
||||
adds r0, r1
|
||||
lsls r0, 2
|
||||
ldr r5, _081343F0 @ =gSprites
|
||||
adds r0, r5
|
||||
adds r1, r4, 0
|
||||
bl SetSubspriteTables
|
||||
ldrb r1, [r4, 0xD]
|
||||
lsls r0, r1, 4
|
||||
adds r0, r1
|
||||
lsls r0, 2
|
||||
adds r0, r5
|
||||
ldrb r2, [r0, 0x1]
|
||||
movs r1, 0xD
|
||||
negs r1, r1
|
||||
ands r1, r2
|
||||
movs r2, 0x8
|
||||
orrs r1, r2
|
||||
strb r1, [r0, 0x1]
|
||||
ldrb r0, [r4, 0xD]
|
||||
lsls r1, r0, 4
|
||||
adds r1, r0
|
||||
lsls r1, 2
|
||||
adds r1, r5
|
||||
ldrb r2, [r1, 0x5]
|
||||
movs r0, 0xF
|
||||
ands r0, r2
|
||||
mov r2, r8
|
||||
orrs r0, r2
|
||||
strb r0, [r1, 0x5]
|
||||
ldrb r1, [r4, 0xD]
|
||||
lsls r0, r1, 4
|
||||
adds r0, r1
|
||||
lsls r0, 2
|
||||
adds r0, r5
|
||||
adds r0, 0x42
|
||||
ldrb r2, [r0]
|
||||
movs r1, 0x40
|
||||
negs r1, r1
|
||||
ands r1, r2
|
||||
strb r1, [r0]
|
||||
ldrb r1, [r4, 0xD]
|
||||
lsls r0, r1, 4
|
||||
adds r0, r1
|
||||
lsls r0, 2
|
||||
adds r0, r5
|
||||
adds r0, 0x3E
|
||||
ldrb r1, [r0]
|
||||
movs r2, 0x4
|
||||
orrs r1, r2
|
||||
strb r1, [r0]
|
||||
movs r0, 0x1
|
||||
bl HideBg
|
||||
movs r0, 0x1
|
||||
movs r1, 0x1
|
||||
movs r2, 0
|
||||
bl SetBgAttribute
|
||||
movs r0, 0x1E
|
||||
str r0, [sp]
|
||||
movs r0, 0x14
|
||||
str r0, [sp, 0x4]
|
||||
movs r0, 0x1
|
||||
movs r1, 0xF
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl FillBgTilemapBufferRect_Palette0
|
||||
movs r0, 0x1
|
||||
bl CopyBgTilemapBufferToVram
|
||||
movs r0, 0x1
|
||||
bl ShowBg
|
||||
mov r0, r10
|
||||
add sp, 0x28
|
||||
pop {r3-r5}
|
||||
mov r8, r3
|
||||
mov r9, r4
|
||||
mov r10, r5
|
||||
pop {r4-r7}
|
||||
pop {r1}
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_081343C4: .4byte gUnknown_846343C
|
||||
_081343C8: .4byte 0xffff0000
|
||||
_081343CC: .4byte 0x0000ffff
|
||||
_081343D0: .4byte gUnknown_846341C
|
||||
_081343D4: .4byte sub_8134200
|
||||
_081343D8: .4byte gTasks+0x8
|
||||
_081343DC: .4byte 0x00002f42
|
||||
_081343E0: .4byte 0x0000080c
|
||||
_081343E4: .4byte 0x00001f1f
|
||||
_081343E8: .4byte 0x00002f3d
|
||||
_081343EC: .4byte gDummySpriteTemplate
|
||||
_081343F0: .4byte gSprites
|
||||
thumb_func_end sub_8134230
|
||||
|
||||
thumb_func_start sub_81343F4
|
||||
sub_81343F4: @ 81343F4
|
||||
push {r4,r5,lr}
|
||||
sub sp, 0x8
|
||||
adds r5, r0, 0
|
||||
lsls r5, 24
|
||||
lsrs r5, 24
|
||||
lsls r4, r5, 2
|
||||
adds r4, r5
|
||||
lsls r4, 3
|
||||
ldr r0, _08134498 @ =gTasks+0x8
|
||||
adds r4, r0
|
||||
ldrh r0, [r4, 0xE]
|
||||
bl FreeSpriteTilesByTag
|
||||
ldrb r1, [r4, 0xD]
|
||||
lsls r0, r1, 4
|
||||
adds r0, r1
|
||||
lsls r0, 2
|
||||
ldr r1, _0813449C @ =gSprites
|
||||
adds r0, r1
|
||||
bl DestroySprite
|
||||
ldr r0, [r4, 0x8]
|
||||
bl Free
|
||||
movs r0, 0x50
|
||||
movs r1, 0
|
||||
bl SetGpuReg
|
||||
movs r0, 0x52
|
||||
movs r1, 0
|
||||
bl SetGpuReg
|
||||
movs r0, 0x54
|
||||
movs r1, 0
|
||||
bl SetGpuReg
|
||||
ldr r4, _081344A0 @ =0x00001f1f
|
||||
movs r0, 0x48
|
||||
adds r1, r4, 0
|
||||
bl SetGpuReg
|
||||
movs r0, 0x4A
|
||||
adds r1, r4, 0
|
||||
bl SetGpuReg
|
||||
movs r1, 0x80
|
||||
lsls r1, 8
|
||||
movs r0, 0
|
||||
bl ClearGpuRegBits
|
||||
movs r0, 0x1
|
||||
bl HideBg
|
||||
movs r0, 0x1
|
||||
movs r1, 0x1
|
||||
movs r2, 0x2
|
||||
bl SetBgAttribute
|
||||
movs r0, 0x1E
|
||||
str r0, [sp]
|
||||
movs r0, 0x14
|
||||
str r0, [sp, 0x4]
|
||||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl FillBgTilemapBufferRect_Palette0
|
||||
movs r0, 0x1
|
||||
bl CopyBgTilemapBufferToVram
|
||||
movs r0, 0x1
|
||||
bl ShowBg
|
||||
adds r0, r5, 0
|
||||
bl DestroyTask
|
||||
add sp, 0x8
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08134498: .4byte gTasks+0x8
|
||||
_0813449C: .4byte gSprites
|
||||
_081344A0: .4byte 0x00001f1f
|
||||
thumb_func_end sub_81343F4
|
||||
|
||||
thumb_func_start sub_81344A4
|
||||
sub_81344A4: @ 81344A4
|
||||
push {r4,lr}
|
||||
lsls r0, 2
|
||||
adds r0, r2
|
||||
ldr r4, _081344D8 @ =gUnknown_8463564
|
||||
ldr r3, _081344DC @ =gUnknown_8463580
|
||||
lsls r1, 2
|
||||
adds r2, r1, r3
|
||||
ldrb r2, [r2]
|
||||
lsls r2, 24
|
||||
asrs r2, 24
|
||||
lsls r2, 2
|
||||
adds r2, r4
|
||||
ldr r2, [r2]
|
||||
ldr r2, [r2]
|
||||
str r2, [r0]
|
||||
adds r2, r3, 0x1
|
||||
adds r2, r1, r2
|
||||
ldrb r2, [r2]
|
||||
strb r2, [r0]
|
||||
adds r3, 0x2
|
||||
adds r1, r3
|
||||
ldrb r1, [r1]
|
||||
strb r1, [r0, 0x1]
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_081344D8: .4byte gUnknown_8463564
|
||||
_081344DC: .4byte gUnknown_8463580
|
||||
thumb_func_end sub_81344A4
|
||||
|
||||
thumb_func_start sub_81344E0
|
||||
sub_81344E0: @ 81344E0
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
lsls r1, r0, 2
|
||||
adds r1, r0
|
||||
lsls r1, 3
|
||||
ldr r0, _081344F4 @ =gTasks+0x8
|
||||
adds r1, r0
|
||||
ldrb r0, [r1]
|
||||
bx lr
|
||||
.align 2, 0
|
||||
_081344F4: .4byte gTasks+0x8
|
||||
thumb_func_end sub_81344E0
|
||||
|
||||
.align 2, 0 @ Don't pad with nop.
|
||||
|
|
@ -49,7 +49,7 @@ sub_810250C: @ 810250C
|
|||
mov r6, r8
|
||||
push {r6}
|
||||
sub sp, 0xC
|
||||
bl sub_806E25C
|
||||
bl IsNationalPokedexEnabled
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
bl m4aSoundVSyncOff
|
||||
|
|
@ -594,7 +594,7 @@ _081029D0:
|
|||
adds r1, 0x62
|
||||
movs r2, 0
|
||||
bl ListMenuGetScrollAndRow
|
||||
bl sub_806E25C
|
||||
bl IsNationalPokedexEnabled
|
||||
cmp r0, 0
|
||||
beq _081029F4
|
||||
ldr r0, _081029F0 @ =gUnknown_84520E4
|
||||
|
|
@ -915,7 +915,7 @@ sub_8102C28: @ 8102C28
|
|||
bl AddWindow
|
||||
ldr r1, [r7]
|
||||
strb r0, [r1, 0x16]
|
||||
bl sub_806E25C
|
||||
bl IsNationalPokedexEnabled
|
||||
adds r5, r0, 0
|
||||
cmp r5, 0
|
||||
bne _08102C9E
|
||||
|
|
@ -1904,7 +1904,7 @@ sub_8103518: @ 8103518
|
|||
sub sp, 0x4
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
bl sub_806E25C
|
||||
bl IsNationalPokedexEnabled
|
||||
movs r1, 0x97
|
||||
str r1, [sp]
|
||||
cmp r0, 0
|
||||
|
|
@ -4491,7 +4491,7 @@ sub_81049FC: @ 81049FC
|
|||
adds r0, r5, 0
|
||||
movs r1, 0x8
|
||||
movs r3, 0x1
|
||||
bl sub_810C228
|
||||
bl LoadMonPicInWindow
|
||||
add sp, 0x8
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
|
|
@ -5594,7 +5594,7 @@ sub_81052D0: @ 81052D0
|
|||
sub sp, 0x8
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
bl sub_806E25C
|
||||
bl IsNationalPokedexEnabled
|
||||
cmp r0, 0
|
||||
beq _081052E8
|
||||
ldr r0, _081052E4 @ =gUnknown_84406E0
|
||||
|
|
@ -7412,7 +7412,7 @@ sub_810603C: @ 810603C
|
|||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl FillBgTilemapBufferRect_Palette0
|
||||
bl sub_80CC204
|
||||
bl GetUnlockedSeviiAreas
|
||||
ldr r1, [r6]
|
||||
adds r1, 0x64
|
||||
strb r0, [r1]
|
||||
|
|
@ -8137,7 +8137,7 @@ sub_8106810: @ 8106810
|
|||
push {r4,lr}
|
||||
lsls r0, 16
|
||||
lsrs r4, r0, 16
|
||||
bl sub_806E25C
|
||||
bl IsNationalPokedexEnabled
|
||||
cmp r0, 0x1
|
||||
beq _08106830
|
||||
adds r0, r4, 0
|
||||
|
|
@ -8609,7 +8609,7 @@ sub_8106B60: @ 8106B60
|
|||
movs r1, 0x3
|
||||
movs r2, 0x1
|
||||
bl sub_8104AB0
|
||||
bl sub_806E25C
|
||||
bl IsNationalPokedexEnabled
|
||||
cmp r0, 0
|
||||
bne _08106BA4
|
||||
adds r0, r5, 0
|
||||
|
|
|
|||
|
|
@ -442,10 +442,10 @@ _08147E0C:
|
|||
ldr r0, [r4]
|
||||
adds r0, 0xA4
|
||||
bl sub_8149CEC
|
||||
bl sub_80FCEA8
|
||||
bl LoadWirelessStatusIndicatorSpriteGfx
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_80FCD74
|
||||
bl CreateWirelessStatusIndicatorSprite
|
||||
ldr r1, [r4]
|
||||
b _08147EBC
|
||||
.align 2, 0
|
||||
|
|
@ -470,7 +470,7 @@ _08147E3C:
|
|||
.align 2, 0
|
||||
_08147E60: .4byte gUnknown_203F3D4
|
||||
_08147E64:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08147F04
|
||||
|
|
@ -6896,7 +6896,7 @@ _0814AE2A:
|
|||
ldrh r0, [r7]
|
||||
ldr r1, [r7, 0x4]
|
||||
ldr r2, [r7, 0x8]
|
||||
bl GetFrontSpritePalFromSpeciesAndPersonality
|
||||
bl GetMonSpritePalFromSpeciesAndPersonality
|
||||
str r0, [sp, 0x20]
|
||||
add r0, sp, 0x20
|
||||
ldr r1, [r0, 0x4]
|
||||
|
|
|
|||
|
|
@ -1508,8 +1508,8 @@ sub_811D120: @ 811D120
|
|||
bx r1
|
||||
thumb_func_end sub_811D120
|
||||
|
||||
thumb_func_start sub_811D130
|
||||
sub_811D130: @ 811D130
|
||||
thumb_func_start GetMonLevelUpWindowStats
|
||||
GetMonLevelUpWindowStats: @ 811D130
|
||||
push {r4,r5,lr}
|
||||
adds r4, r0, 0
|
||||
adds r5, r1, 0
|
||||
|
|
@ -1539,7 +1539,7 @@ sub_811D130: @ 811D130
|
|||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_811D130
|
||||
thumb_func_end GetMonLevelUpWindowStats
|
||||
|
||||
thumb_func_start sub_811D178
|
||||
sub_811D178: @ 811D178
|
||||
|
|
@ -2294,7 +2294,7 @@ sub_811D764: @ 811D764
|
|||
adds r1, r4, 0
|
||||
adds r2, r5, 0
|
||||
movs r3, 0x1
|
||||
bl sub_811E7F0
|
||||
bl DrawLevelUpWindowPg1
|
||||
movs r0, 0x1
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x1
|
||||
|
|
@ -2316,7 +2316,7 @@ sub_811D7A0: @ 811D7A0
|
|||
movs r0, 0x1
|
||||
movs r2, 0x1
|
||||
movs r3, 0x2
|
||||
bl sub_811E93C
|
||||
bl DrawLevelUpWindowPg2
|
||||
movs r0, 0x1
|
||||
movs r1, 0x2
|
||||
bl CopyWindowToVram
|
||||
|
|
@ -4457,8 +4457,8 @@ _0811E7E8:
|
|||
_0811E7EC: .4byte gTasks
|
||||
thumb_func_end sub_811E7B4
|
||||
|
||||
thumb_func_start sub_811E7F0
|
||||
sub_811E7F0: @ 811E7F0
|
||||
thumb_func_start DrawLevelUpWindowPg1
|
||||
DrawLevelUpWindowPg1: @ 811E7F0
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
|
|
@ -4622,10 +4622,10 @@ _0811E8F4:
|
|||
_0811E930: .4byte gUnknown_8459B48
|
||||
_0811E934: .4byte gUnknown_841B2E5
|
||||
_0811E938: .4byte gUnknown_841B2DC
|
||||
thumb_func_end sub_811E7F0
|
||||
thumb_func_end DrawLevelUpWindowPg1
|
||||
|
||||
thumb_func_start sub_811E93C
|
||||
sub_811E93C: @ 811E93C
|
||||
thumb_func_start DrawLevelUpWindowPg2
|
||||
DrawLevelUpWindowPg2: @ 811E93C
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
|
|
@ -4755,6 +4755,6 @@ _0811E9C0:
|
|||
bx r0
|
||||
.align 2, 0
|
||||
_0811EA40: .4byte gUnknown_8459B48
|
||||
thumb_func_end sub_811E93C
|
||||
thumb_func_end DrawLevelUpWindowPg2
|
||||
|
||||
.align 2, 0 @ Don't pad with nop.
|
||||
|
|
|
|||
|
|
@ -1897,8 +1897,8 @@ _0808C7D8: .4byte mapldr_0808C6D8
|
|||
_0808C7DC: .4byte CB2_ReturnToField
|
||||
thumb_func_end sub_808C7B4
|
||||
|
||||
thumb_func_start sub_808C7E0
|
||||
sub_808C7E0: @ 808C7E0
|
||||
thumb_func_start ResetPokemonStorageSystem
|
||||
ResetPokemonStorageSystem: @ 808C7E0
|
||||
push {r4-r6,lr}
|
||||
movs r0, 0
|
||||
bl sub_808BA00
|
||||
|
|
@ -1954,7 +1954,7 @@ _0808C832:
|
|||
bx r0
|
||||
.align 2, 0
|
||||
_0808C850: .4byte gUnknown_84186CD
|
||||
thumb_func_end sub_808C7E0
|
||||
thumb_func_end ResetPokemonStorageSystem
|
||||
|
||||
thumb_func_start sub_808C854
|
||||
sub_808C854: @ 808C854
|
||||
|
|
@ -16568,7 +16568,7 @@ _08093C4E:
|
|||
adds r1, r4
|
||||
ldrh r0, [r1]
|
||||
mov r1, r9
|
||||
bl GetFrontSpritePalFromSpeciesAndPersonality
|
||||
bl GetMonSpritePalFromSpeciesAndPersonality
|
||||
ldr r1, [r5]
|
||||
ldr r3, _08093CE8 @ =0x00000cd8
|
||||
adds r2, r1, r3
|
||||
|
|
|
|||
|
|
@ -270,8 +270,8 @@ _08134730: .4byte 0x00003204
|
|||
_08134734: .4byte sub_8135C34
|
||||
thumb_func_end sub_81344F8
|
||||
|
||||
thumb_func_start sub_8134738
|
||||
sub_8134738: @ 8134738
|
||||
thumb_func_start ShowSelectMovePokemonSummaryScreen
|
||||
ShowSelectMovePokemonSummaryScreen: @ 8134738
|
||||
push {r4,r5,lr}
|
||||
sub sp, 0x4
|
||||
ldr r5, [sp, 0x10]
|
||||
|
|
@ -296,7 +296,7 @@ sub_8134738: @ 8134738
|
|||
.align 2, 0
|
||||
_08134764: .4byte gUnknown_203B140
|
||||
_08134768: .4byte 0x00003260
|
||||
thumb_func_end sub_8134738
|
||||
thumb_func_end ShowSelectMovePokemonSummaryScreen
|
||||
|
||||
thumb_func_start sub_813476C
|
||||
sub_813476C: @ 813476C
|
||||
|
|
@ -3476,7 +3476,7 @@ _0813622C:
|
|||
ldr r0, [r6]
|
||||
ldr r2, _08136308 @ =0x00003084
|
||||
adds r0, r2
|
||||
ldr r1, _0813630C @ =gUnknown_84161CD
|
||||
ldr r1, _0813630C @ =gString_Dummy
|
||||
bl StringCopy
|
||||
_08136238:
|
||||
cmp r4, 0x20
|
||||
|
|
@ -3498,7 +3498,7 @@ _08136240:
|
|||
ldr r0, [r5]
|
||||
ldr r1, _08136308 @ =0x00003084
|
||||
adds r0, r1
|
||||
ldr r1, _0813630C @ =gUnknown_84161CD
|
||||
ldr r1, _0813630C @ =gString_Dummy
|
||||
bl StringCopy
|
||||
_08136264:
|
||||
ldr r6, _08136310 @ =gUnknown_203B140
|
||||
|
|
@ -3572,7 +3572,7 @@ _08136264:
|
|||
b _08136342
|
||||
.align 2, 0
|
||||
_08136308: .4byte 0x00003084
|
||||
_0813630C: .4byte gUnknown_84161CD
|
||||
_0813630C: .4byte gString_Dummy
|
||||
_08136310: .4byte gUnknown_203B140
|
||||
_08136314: .4byte 0x00003034
|
||||
_08136318: .4byte gSpeciesNames
|
||||
|
|
@ -8434,7 +8434,7 @@ sub_8138B4C: @ 8138B4C
|
|||
bl IsUpdateLinkStateCBActive
|
||||
cmp r0, 0
|
||||
bne _08138B84
|
||||
bl sub_811FA20
|
||||
bl IsMultiBattle
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
|
|
@ -13244,7 +13244,7 @@ _0813B198:
|
|||
ldrb r0, [r0]
|
||||
cmp r0, 0x1
|
||||
bne _0813B1C4
|
||||
bl sub_811FA20
|
||||
bl IsMultiBattle
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_80CA2E4
|
||||
sub_80CA2E4: @ 80CA2E4
|
||||
thumb_func_start Special_HallOfFame
|
||||
Special_HallOfFame: @ 80CA2E4
|
||||
push {r4-r7,lr}
|
||||
sub sp, 0x4
|
||||
bl sp000_heal_pokemon
|
||||
|
|
@ -104,7 +104,7 @@ _080CA3B4: .4byte gSaveBlock2Ptr
|
|||
_080CA3B8: .4byte gPlayerParty
|
||||
_080CA3BC: .4byte 0x0000083b
|
||||
_080CA3C0: .4byte CB2_DoHallOfFameScreen
|
||||
thumb_func_end sub_80CA2E4
|
||||
thumb_func_end Special_HallOfFame
|
||||
|
||||
thumb_func_start sub_80CA3C4
|
||||
sub_80CA3C4: @ 80CA3C4
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ sub_80B2ECC: @ 80B2ECC
|
|||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B2EE8
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B2EFE
|
||||
|
|
@ -32,7 +32,7 @@ _080B2EE8:
|
|||
movs r0, 0xC8
|
||||
strb r0, [r1]
|
||||
_080B2EFE:
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080B2F5A
|
||||
|
|
@ -51,7 +51,7 @@ _080B2EFE:
|
|||
orrs r1, r0
|
||||
lsrs r5, r1, 31
|
||||
adds r0, r4, 0
|
||||
bl sub_8072DF0
|
||||
bl IsBattlerSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B2F3C
|
||||
|
|
@ -63,7 +63,7 @@ _080B2F3C:
|
|||
adds r4, r0, 0
|
||||
eors r4, r7
|
||||
adds r0, r4, 0
|
||||
bl sub_8072DF0
|
||||
bl IsBattlerSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B2F5A
|
||||
|
|
@ -73,11 +73,11 @@ _080B2F3C:
|
|||
adds r1, r5, 0
|
||||
bl sub_8072E48
|
||||
_080B2F5A:
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080B2F90
|
||||
bl sub_8075290
|
||||
bl IsDoubleBattle
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B2F90
|
||||
|
|
@ -112,7 +112,7 @@ _080B2F90:
|
|||
_080B2FA6:
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
ldr r4, _080B3004 @ =gBattleAnimArgs
|
||||
lsrs r0, 24
|
||||
|
|
@ -121,14 +121,14 @@ _080B2FA6:
|
|||
strh r0, [r6, 0x20]
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x1
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r4, [r4, 0x2]
|
||||
adds r0, r4
|
||||
_080B2FCA:
|
||||
strh r0, [r6, 0x22]
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B2FDC
|
||||
|
|
@ -271,7 +271,7 @@ sub_80B30B0: @ 80B30B0
|
|||
negs r1, r1
|
||||
cmp r0, r1
|
||||
bne _080B3156
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080B3146
|
||||
|
|
@ -281,7 +281,7 @@ sub_80B30B0: @ 80B30B0
|
|||
lsrs r4, r0, 24
|
||||
adds r6, r4, 0
|
||||
adds r0, r4, 0
|
||||
bl sub_8072DF0
|
||||
bl IsBattlerSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B3118
|
||||
|
|
@ -304,7 +304,7 @@ _080B3118:
|
|||
adds r4, r0, 0
|
||||
eors r4, r6
|
||||
adds r0, r4, 0
|
||||
bl sub_8072DF0
|
||||
bl IsBattlerSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B3146
|
||||
|
|
@ -345,7 +345,7 @@ _080B3164: .4byte sub_80B3168
|
|||
sub_80B3168: @ 80B3168
|
||||
push {r4-r6,lr}
|
||||
adds r6, r0, 0
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080B31C0
|
||||
|
|
@ -363,7 +363,7 @@ sub_80B3168: @ 80B3168
|
|||
orrs r1, r0
|
||||
lsrs r5, r1, 31
|
||||
adds r0, r4, 0
|
||||
bl sub_8072DF0
|
||||
bl IsBattlerSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B31A6
|
||||
|
|
@ -373,7 +373,7 @@ _080B31A6:
|
|||
movs r0, 0x2
|
||||
eors r4, r0
|
||||
adds r0, r4, 0
|
||||
bl sub_8072DF0
|
||||
bl IsBattlerSpriteVisible
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B31C0
|
||||
|
|
@ -407,11 +407,11 @@ sub_80B31D0: @ 80B31D0
|
|||
bne _080B31EA
|
||||
movs r6, 0x1
|
||||
_080B31EA:
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080B3232
|
||||
bl sub_8075290
|
||||
bl IsDoubleBattle
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B3232
|
||||
|
|
@ -484,13 +484,13 @@ sub_80B3278: @ 80B3278
|
|||
ldr r4, _080B32C0 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x20]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x22]
|
||||
|
|
@ -573,14 +573,14 @@ sub_80B32F4: @ 80B32F4
|
|||
_080B333A:
|
||||
ldrb r0, [r6]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
adds r0, r4
|
||||
strh r0, [r5, 0x20]
|
||||
ldrb r0, [r6]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
adds r0, r7
|
||||
|
|
@ -860,7 +860,7 @@ _080B3544:
|
|||
lsls r1, 1
|
||||
strh r1, [r0, 0x20]
|
||||
ldrb r0, [r4, 0x8]
|
||||
bl sub_8075980
|
||||
bl ResetSpriteRotScale
|
||||
adds r0, r5, 0
|
||||
bl DestroyAnimVisualTask
|
||||
_080B357A:
|
||||
|
|
@ -888,13 +888,13 @@ sub_80B3584: @ 80B3584
|
|||
ldr r4, _080B3610 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x22]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x24]
|
||||
|
|
@ -1206,13 +1206,13 @@ sub_80B37EC: @ 80B37EC
|
|||
ldr r4, _080B382C @ =gBattleAnimAttacker
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x20]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x22]
|
||||
|
|
@ -1240,7 +1240,7 @@ sub_80B3834: @ 80B3834
|
|||
lsls r1, 3
|
||||
ldr r0, _080B3890 @ =gTasks
|
||||
adds r5, r1, r0
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B38D8
|
||||
|
|
@ -1860,7 +1860,7 @@ _080B3CD8:
|
|||
lsls r2, 1
|
||||
adds r1, r2, 0
|
||||
movs r3, 0
|
||||
bl obj_id_set_rotscale
|
||||
bl SetSpriteRotScale
|
||||
ldrb r3, [r4, 0x1]
|
||||
lsrs r1, r3, 6
|
||||
ldrb r2, [r4, 0x3]
|
||||
|
|
@ -1947,7 +1947,7 @@ _080B3DAA:
|
|||
ldrsh r2, [r4, r1]
|
||||
adds r1, r2, 0
|
||||
movs r3, 0
|
||||
bl obj_id_set_rotscale
|
||||
bl SetSpriteRotScale
|
||||
ldrh r0, [r4, 0x26]
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
|
|
@ -1986,7 +1986,7 @@ _080B3DFC:
|
|||
ldrsh r2, [r4, r1]
|
||||
adds r1, r2, 0
|
||||
movs r3, 0
|
||||
bl obj_id_set_rotscale
|
||||
bl SetSpriteRotScale
|
||||
ldrh r0, [r4, 0x26]
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
|
|
@ -2053,17 +2053,17 @@ _080B3EA4:
|
|||
ldr r4, _080B3EF8 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x20]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x1
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x22]
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B3ED2
|
||||
|
|
|
|||
|
|
@ -3805,7 +3805,7 @@ _080C1D24:
|
|||
ldrh r1, [r1]
|
||||
str r1, [sp]
|
||||
movs r1, 0x30
|
||||
bl sub_8071660
|
||||
bl TintPalette_CustomTone
|
||||
ldr r0, [r7]
|
||||
adds r0, r5
|
||||
movs r1, 0xD0
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
28
asm/rock.s
28
asm/rock.s
|
|
@ -143,7 +143,7 @@ _080B472E:
|
|||
adds r2, r0
|
||||
strh r2, [r5, 0x36]
|
||||
adds r0, r5, 0
|
||||
bl sub_80754B8
|
||||
bl InitSpriteDataForLinearTranslation
|
||||
strh r4, [r5, 0x34]
|
||||
strh r4, [r5, 0x36]
|
||||
ldr r0, _080B4774 @ =sub_8074D00
|
||||
|
|
@ -262,7 +262,7 @@ do_boulder_dust: @ 80B4810
|
|||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl SetAnimBgAttribute
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080B4854
|
||||
|
|
@ -299,7 +299,7 @@ _080B4854:
|
|||
lsls r1, 4
|
||||
movs r2, 0x20
|
||||
bl LoadCompressedPalette
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080B48B0
|
||||
|
|
@ -512,7 +512,7 @@ _080B4A4C:
|
|||
.align 2, 0
|
||||
_080B4A54: .4byte gTasks
|
||||
_080B4A58:
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080B4A6C
|
||||
|
|
@ -682,7 +682,7 @@ sub_80B4B8C: @ 80B4B8C
|
|||
ldrh r1, [r4, 0x22]
|
||||
adds r0, r1
|
||||
strh r0, [r4, 0x36]
|
||||
ldr r0, _080B4BC8 @ =sub_8075590
|
||||
ldr r0, _080B4BC8 @ =StartAnimLinearTranslation
|
||||
str r0, [r4, 0x1C]
|
||||
ldr r1, _080B4BCC @ =DestroyAnimSprite
|
||||
adds r0, r4, 0
|
||||
|
|
@ -692,7 +692,7 @@ sub_80B4B8C: @ 80B4B8C
|
|||
bx r0
|
||||
.align 2, 0
|
||||
_080B4BC4: .4byte gBattleAnimArgs
|
||||
_080B4BC8: .4byte sub_8075590
|
||||
_080B4BC8: .4byte StartAnimLinearTranslation
|
||||
_080B4BCC: .4byte DestroyAnimSprite
|
||||
thumb_func_end sub_80B4B8C
|
||||
|
||||
|
|
@ -713,13 +713,13 @@ sub_80B4BD0: @ 80B4BD0
|
|||
ldr r5, _080B4C54 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
mov r9, r0
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x1
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 8
|
||||
movs r1, 0xC0
|
||||
|
|
@ -729,13 +729,13 @@ sub_80B4BD0: @ 80B4BD0
|
|||
ldr r4, _080B4C58 @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
mov r10, r0
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x1
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 8
|
||||
movs r2, 0xC0
|
||||
|
|
@ -1331,13 +1331,13 @@ sub_80B50A0: @ 80B50A0
|
|||
ldr r5, _080B50EC @ =gBattleAnimTarget
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x20]
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x1
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r2, _080B50F0 @ =gBattleAnimArgs
|
||||
|
|
@ -1413,7 +1413,7 @@ sub_80B5148: @ 80B5148
|
|||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r3, r0, 24
|
||||
ldr r2, _080B5180 @ =gUnknown_2037EE8
|
||||
ldr r2, _080B5180 @ =gAnimMoveDmg
|
||||
ldr r0, [r2]
|
||||
cmp r0, 0x20
|
||||
bgt _080B515C
|
||||
|
|
@ -1441,7 +1441,7 @@ _080B5176:
|
|||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080B5180: .4byte gUnknown_2037EE8
|
||||
_080B5180: .4byte gAnimMoveDmg
|
||||
_080B5184: .4byte gBattleAnimArgs
|
||||
thumb_func_end sub_80B5148
|
||||
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ _080F8024:
|
|||
.align 2, 0
|
||||
_080F8030: .4byte gSaveBlock2Ptr
|
||||
_080F8034:
|
||||
bl sub_806E25C
|
||||
bl IsNationalPokedexEnabled
|
||||
cmp r0, 0
|
||||
beq _080F8044
|
||||
movs r0, 0x1
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ sub_80BF9BC: @ 80BF9BC
|
|||
ldr r3, _080BF9FC @ =CB2_ReturnToField
|
||||
movs r4, 0
|
||||
str r4, [sp]
|
||||
bl sub_8134738
|
||||
bl ShowSelectMovePokemonSummaryScreen
|
||||
movs r0, 0x3
|
||||
bl sub_8138B38
|
||||
ldr r1, _080BFA00 @ =gFieldCallback
|
||||
|
|
|
|||
|
|
@ -1386,7 +1386,7 @@ _0806F81A:
|
|||
cmp r0, 0x2
|
||||
bne _0806F82E
|
||||
_0806F826:
|
||||
ldr r0, _0806F83C @ =gUnknown_2031DB0
|
||||
ldr r0, _0806F83C @ =gDifferentSaveFile
|
||||
ldrb r0, [r0]
|
||||
cmp r0, 0
|
||||
bne _0806F848
|
||||
|
|
@ -1397,7 +1397,7 @@ _0806F82E:
|
|||
b _0806F864
|
||||
.align 2, 0
|
||||
_0806F838: .4byte gSaveFileStatus
|
||||
_0806F83C: .4byte gUnknown_2031DB0
|
||||
_0806F83C: .4byte gDifferentSaveFile
|
||||
_0806F840: .4byte gUnknown_3000FA4
|
||||
_0806F844: .4byte sub_806F86C
|
||||
_0806F848:
|
||||
|
|
@ -1423,7 +1423,7 @@ _0806F866:
|
|||
thumb_func_start sub_806F86C
|
||||
sub_806F86C: @ 806F86C
|
||||
push {lr}
|
||||
ldr r0, _0806F880 @ =gUnknown_2031DB0
|
||||
ldr r0, _0806F880 @ =gDifferentSaveFile
|
||||
ldrb r0, [r0]
|
||||
cmp r0, 0x1
|
||||
bne _0806F88C
|
||||
|
|
@ -1432,7 +1432,7 @@ sub_806F86C: @ 806F86C
|
|||
bl sub_806F69C
|
||||
b _0806F894
|
||||
.align 2, 0
|
||||
_0806F880: .4byte gUnknown_2031DB0
|
||||
_0806F880: .4byte gDifferentSaveFile
|
||||
_0806F884: .4byte gUnknown_81C566A
|
||||
_0806F888: .4byte sub_806F8C0
|
||||
_0806F88C:
|
||||
|
|
@ -1537,7 +1537,7 @@ sub_806F940: @ 806F940
|
|||
push {r4,lr}
|
||||
movs r0, 0
|
||||
bl IncrementGameStat
|
||||
ldr r4, _0806F95C @ =gUnknown_2031DB0
|
||||
ldr r4, _0806F95C @ =gDifferentSaveFile
|
||||
ldrb r0, [r4]
|
||||
cmp r0, 0x1
|
||||
bne _0806F960
|
||||
|
|
@ -1547,7 +1547,7 @@ sub_806F940: @ 806F940
|
|||
strb r0, [r4]
|
||||
b _0806F966
|
||||
.align 2, 0
|
||||
_0806F95C: .4byte gUnknown_2031DB0
|
||||
_0806F95C: .4byte gDifferentSaveFile
|
||||
_0806F960:
|
||||
movs r0, 0
|
||||
bl TrySavingData
|
||||
|
|
|
|||
60
asm/trade.s
60
asm/trade.s
|
|
@ -263,7 +263,7 @@ _0804C80A:
|
|||
cmp r0, 0
|
||||
beq _0804C880
|
||||
bl sub_800B1F4
|
||||
bl sub_8009804
|
||||
bl OpenLink
|
||||
bl sub_80FBB20
|
||||
b _0804C892
|
||||
.align 2, 0
|
||||
|
|
@ -275,7 +275,7 @@ _0804C874: .4byte 0x00001122
|
|||
_0804C878: .4byte gUnknown_2031DA8
|
||||
_0804C87C: .4byte gWirelessCommType
|
||||
_0804C880:
|
||||
bl sub_8009804
|
||||
bl OpenLink
|
||||
ldr r1, _0804C8A8 @ =gMain
|
||||
movs r7, 0x87
|
||||
lsls r7, 3
|
||||
|
|
@ -334,14 +334,14 @@ _0804C8F0: .4byte gUnknown_2031DA8
|
|||
_0804C8F4:
|
||||
bl GetLinkPlayerCount_2
|
||||
adds r4, r0, 0
|
||||
bl sub_800A944
|
||||
bl GetSavedPlayerCount
|
||||
lsls r4, 24
|
||||
lsls r0, 24
|
||||
cmp r4, r0
|
||||
bcs _0804C908
|
||||
b _0804CEE6
|
||||
_0804C908:
|
||||
bl sub_800AA48
|
||||
bl IsLinkMaster
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0804C940
|
||||
|
|
@ -357,7 +357,7 @@ _0804C908:
|
|||
bhi _0804C928
|
||||
b _0804CEE6
|
||||
_0804C928:
|
||||
bl sub_800A5BC
|
||||
bl CheckShouldAdvanceLinkState
|
||||
ldr r1, _0804C93C @ =gMain
|
||||
movs r3, 0x87
|
||||
lsls r3, 3
|
||||
|
|
@ -422,7 +422,7 @@ _0804C9B0:
|
|||
ldrb r0, [r0]
|
||||
cmp r0, 0
|
||||
beq _0804C9E8
|
||||
bl IsNoOneConnected
|
||||
bl IsRfuTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0804C9C4
|
||||
|
|
@ -435,10 +435,10 @@ _0804C9C4:
|
|||
ldrb r0, [r1]
|
||||
adds r0, 0x1
|
||||
strb r0, [r1]
|
||||
bl sub_80FCEA8
|
||||
bl LoadWirelessStatusIndicatorSpriteGfx
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_80FCD74
|
||||
bl CreateWirelessStatusIndicatorSprite
|
||||
b _0804CEE6
|
||||
.align 2, 0
|
||||
_0804C9E0: .4byte gWirelessCommType
|
||||
|
|
@ -1134,10 +1134,10 @@ _0804CFDC:
|
|||
ldrb r0, [r0]
|
||||
cmp r0, 0
|
||||
beq _0804CFF0
|
||||
bl sub_80FCEA8
|
||||
bl LoadWirelessStatusIndicatorSpriteGfx
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_80FCD74
|
||||
bl CreateWirelessStatusIndicatorSprite
|
||||
_0804CFF0:
|
||||
ldr r1, _0804D000 @ =gMain
|
||||
movs r3, 0x87
|
||||
|
|
@ -1832,7 +1832,7 @@ sub_804D5A4: @ 804D5A4
|
|||
ldrb r0, [r0]
|
||||
cmp r0, 0
|
||||
beq _0804D5FC
|
||||
bl IsNoOneConnected
|
||||
bl IsRfuTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0804D620
|
||||
|
|
@ -2201,7 +2201,7 @@ _0804D8D8: .4byte gBlockSendBuffer
|
|||
_0804D8DC: .4byte gPlayerParty
|
||||
_0804D8E0: .4byte gUnknown_2031DA8
|
||||
_0804D8E4:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0804D8F0
|
||||
|
|
@ -3875,7 +3875,7 @@ _0804E61C:
|
|||
adds r0, 0x80
|
||||
ldr r1, _0804E64C @ =0x0000bbbb
|
||||
strh r1, [r0]
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0804E668
|
||||
|
|
@ -3944,7 +3944,7 @@ _0804E6B0:
|
|||
movs r0, 0x3
|
||||
movs r1, 0x1
|
||||
bl sub_804F488
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0804E6DE
|
||||
|
|
@ -4285,7 +4285,7 @@ sub_804E944: @ 804E944
|
|||
ldrb r0, [r0]
|
||||
cmp r0, 0
|
||||
beq _0804E988
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0804E9AA
|
||||
|
|
@ -6443,7 +6443,7 @@ _0804FA2C:
|
|||
cmp r5, r7
|
||||
blt _0804FA2C
|
||||
_0804FA4E:
|
||||
bl sub_806E25C
|
||||
bl IsNationalPokedexEnabled
|
||||
mov r1, r9
|
||||
lsls r4, r1, 2
|
||||
cmp r0, 0
|
||||
|
|
@ -7179,7 +7179,7 @@ _0804FF7A:
|
|||
cmp r1, r0
|
||||
bls _0804FFAC
|
||||
bl CloseLink
|
||||
ldr r0, _0804FFC0 @ =c2_800ACD4
|
||||
ldr r0, _0804FFC0 @ =CB2_LinkError
|
||||
bl SetMainCallback2
|
||||
ldr r1, [r4]
|
||||
adds r3, r1, 0
|
||||
|
|
@ -7203,7 +7203,7 @@ _0804FFAC:
|
|||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0804FFC0: .4byte c2_800ACD4
|
||||
_0804FFC0: .4byte CB2_LinkError
|
||||
thumb_func_end sub_804FF4C
|
||||
|
||||
thumb_func_start sub_804FFC4
|
||||
|
|
@ -7508,7 +7508,7 @@ _08050240:
|
|||
adds r0, r1
|
||||
movs r1, 0x1
|
||||
strb r1, [r0]
|
||||
bl sub_8009804
|
||||
bl OpenLink
|
||||
ldr r1, _08050278 @ =gMain
|
||||
movs r2, 0x87
|
||||
lsls r2, 3
|
||||
|
|
@ -7549,7 +7549,7 @@ _08050298:
|
|||
.align 2, 0
|
||||
_080502A4: .4byte gUnknown_2031DAC
|
||||
_080502A8:
|
||||
bl sub_800AA48
|
||||
bl IsLinkMaster
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080502B4
|
||||
|
|
@ -7557,7 +7557,7 @@ _080502A8:
|
|||
_080502B4:
|
||||
bl GetLinkPlayerCount_2
|
||||
adds r4, r0, 0
|
||||
bl sub_800A944
|
||||
bl GetSavedPlayerCount
|
||||
lsls r4, 24
|
||||
lsls r0, 24
|
||||
cmp r4, r0
|
||||
|
|
@ -7571,7 +7571,7 @@ _080502B4:
|
|||
bhi _080502D6
|
||||
b _08050472
|
||||
_080502D6:
|
||||
bl sub_800A5BC
|
||||
bl CheckShouldAdvanceLinkState
|
||||
ldr r1, _080502E8 @ =gMain
|
||||
movs r2, 0x87
|
||||
lsls r2, 3
|
||||
|
|
@ -7749,10 +7749,10 @@ _0805044C:
|
|||
ldrb r0, [r0]
|
||||
cmp r0, 0
|
||||
beq _0805046C
|
||||
bl sub_80FCEA8
|
||||
bl LoadWirelessStatusIndicatorSpriteGfx
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_80FCD74
|
||||
bl CreateWirelessStatusIndicatorSprite
|
||||
_0805046C:
|
||||
ldr r0, _08050498 @ =sub_8053D84
|
||||
bl SetMainCallback2
|
||||
|
|
@ -8274,7 +8274,7 @@ sub_80508F4: @ 80508F4
|
|||
.align 2, 0
|
||||
_08050908: .4byte gUnknown_2031DAC
|
||||
_0805090C:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08050932
|
||||
|
|
@ -14405,7 +14405,7 @@ _08054080:
|
|||
strb r1, [r0]
|
||||
str r2, [r3, 0x64]
|
||||
_0805409C:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080540A8
|
||||
|
|
@ -14420,7 +14420,7 @@ _080540A8:
|
|||
_080540B4: .4byte gUnknown_2031DAC
|
||||
_080540B8: .4byte gMain
|
||||
_080540BC:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080540C8
|
||||
|
|
@ -14637,7 +14637,7 @@ _08054278:
|
|||
str r0, [r1, 0x64]
|
||||
b _08054396
|
||||
_0805427E:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0805428A
|
||||
|
|
@ -14672,7 +14672,7 @@ _080542A0:
|
|||
.align 2, 0
|
||||
_080542C0: .4byte gUnknown_2031DAC
|
||||
_080542C4:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08054396
|
||||
|
|
@ -14745,7 +14745,7 @@ _0805434C:
|
|||
ldr r0, _08054378 @ =sub_804C718
|
||||
cmp r1, r0
|
||||
bne _08054384
|
||||
bl IsNoOneConnected
|
||||
bl IsRfuTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08054396
|
||||
|
|
|
|||
|
|
@ -208,10 +208,10 @@ _0808919A:
|
|||
ldrb r0, [r0]
|
||||
cmp r0, 0x1
|
||||
bne _080891B6
|
||||
bl sub_80FCEA8
|
||||
bl LoadWirelessStatusIndicatorSpriteGfx
|
||||
movs r0, 0xE6
|
||||
movs r1, 0x96
|
||||
bl sub_80FCD74
|
||||
bl CreateWirelessStatusIndicatorSprite
|
||||
_080891B6:
|
||||
movs r0, 0x1
|
||||
negs r0, r0
|
||||
|
|
@ -2039,7 +2039,7 @@ _0808A0DC: .4byte gUnknown_8419CE7
|
|||
thumb_func_start sub_808A0E0
|
||||
sub_808A0E0: @ 808A0E0
|
||||
push {lr}
|
||||
bl sub_806E25C
|
||||
bl IsNationalPokedexEnabled
|
||||
cmp r0, 0
|
||||
bne _0808A0F2
|
||||
movs r0, 0x1
|
||||
|
|
@ -3283,7 +3283,7 @@ _0808AB50:
|
|||
movs r1, 0x60
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl sub_8071660
|
||||
bl TintPalette_CustomTone
|
||||
b _0808AB88
|
||||
.align 2, 0
|
||||
_0808AB64: .4byte 0x00000396
|
||||
|
|
@ -3297,7 +3297,7 @@ _0808AB68:
|
|||
lsls r1, 1
|
||||
str r1, [sp]
|
||||
movs r1, 0x60
|
||||
bl sub_8071660
|
||||
bl TintPalette_CustomTone
|
||||
b _0808AB88
|
||||
_0808AB80:
|
||||
adds r0, r4, r5
|
||||
|
|
|
|||
|
|
@ -177,10 +177,10 @@ _08128554:
|
|||
bl CreateTask
|
||||
ldr r1, [r4]
|
||||
strb r0, [r1, 0xF]
|
||||
bl sub_80FCEA8
|
||||
bl LoadWirelessStatusIndicatorSpriteGfx
|
||||
movs r0, 0xE8
|
||||
movs r1, 0x96
|
||||
bl sub_80FCD74
|
||||
bl CreateWirelessStatusIndicatorSprite
|
||||
_08128598:
|
||||
add sp, 0x4
|
||||
pop {r4-r6}
|
||||
|
|
@ -295,7 +295,7 @@ _08128662:
|
|||
adds r0, 0x1
|
||||
strh r0, [r1, 0x6]
|
||||
_08128674:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _081286BC
|
||||
|
|
@ -321,7 +321,7 @@ _08128674:
|
|||
.align 2, 0
|
||||
_081286A8: .4byte gUnknown_203B0E0
|
||||
_081286AC:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _081286BC
|
||||
|
|
@ -765,7 +765,7 @@ _08128A36:
|
|||
.align 2, 0
|
||||
_08128A40: .4byte gUnknown_203B0E0
|
||||
_08128A44:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08128A94
|
||||
|
|
@ -888,7 +888,7 @@ _08128B28:
|
|||
.align 2, 0
|
||||
_08128B48: .4byte gUnknown_203B0E0
|
||||
_08128B4C:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08128BFC
|
||||
|
|
@ -925,7 +925,7 @@ _08128B80:
|
|||
.align 2, 0
|
||||
_08128B9C: .4byte gUnknown_203B0E0
|
||||
_08128BA0:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08128BFC
|
||||
|
|
@ -1016,7 +1016,7 @@ _08128C44:
|
|||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08128CA2
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08128CA2
|
||||
|
|
@ -1134,7 +1134,7 @@ _08128D30:
|
|||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
beq _08128D9C
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08128D9C
|
||||
|
|
@ -1231,7 +1231,7 @@ _08128DEC:
|
|||
adds r0, 0x1
|
||||
strh r0, [r1, 0x6]
|
||||
_08128E00:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
|
|
@ -1277,7 +1277,7 @@ _08128E52:
|
|||
.align 2, 0
|
||||
_08128E5C: .4byte gUnknown_203B0E0
|
||||
_08128E60:
|
||||
bl sub_800A4BC
|
||||
bl IsLinkTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08128E70
|
||||
|
|
|
|||
68
asm/water.s
68
asm/water.s
|
|
@ -130,7 +130,7 @@ sub_80AAC98: @ 80AAC98
|
|||
beq _080AACC8
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r4, _080AACC4 @ =gBattleAnimArgs
|
||||
|
|
@ -143,7 +143,7 @@ _080AACC4: .4byte gBattleAnimArgs
|
|||
_080AACC8:
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
ldr r4, _080AADA0 @ =gBattleAnimArgs
|
||||
lsrs r0, 24
|
||||
|
|
@ -153,7 +153,7 @@ _080AACDA:
|
|||
strh r0, [r6, 0x20]
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r4, [r4, 0x2]
|
||||
|
|
@ -184,7 +184,7 @@ _080AAD10:
|
|||
ldr r4, _080AADA8 @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r6, 0x32]
|
||||
|
|
@ -192,7 +192,7 @@ _080AAD10:
|
|||
strh r0, [r6, 0x34]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r6, 0x36]
|
||||
|
|
@ -390,7 +390,7 @@ _080AAEBA:
|
|||
ldr r4, _080AAF14 @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
adds r0, r6
|
||||
|
|
@ -399,7 +399,7 @@ _080AAEBA:
|
|||
strh r0, [r5, 0x34]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r7, [r7, 0x6]
|
||||
|
|
@ -577,7 +577,7 @@ sub_80AB024: @ 80AB024
|
|||
ldr r4, _080AB08C @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x32]
|
||||
|
|
@ -585,7 +585,7 @@ sub_80AB024: @ 80AB024
|
|||
strh r0, [r5, 0x34]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x36]
|
||||
|
|
@ -737,23 +737,23 @@ sub_80AB168: @ 80AB168
|
|||
ldr r7, _080AB1B4 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r7]
|
||||
movs r1, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x20]
|
||||
ldrb r0, [r7]
|
||||
movs r1, 0x1
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x22]
|
||||
ldr r6, _080AB1B8 @ =0x0000fff6
|
||||
strh r6, [r4, 0x26]
|
||||
ldrb r0, [r7]
|
||||
bl sub_807685C
|
||||
bl GetBattlerSpriteSubpriority
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080AB1C2
|
||||
|
|
@ -877,7 +877,7 @@ _080AB27A:
|
|||
ldr r4, _080AB2BC @ =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r1, [r5, 0x4]
|
||||
|
|
@ -885,13 +885,13 @@ _080AB27A:
|
|||
strh r0, [r6, 0x32]
|
||||
ldrb r0, [r4]
|
||||
adds r1, r7, 0
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r5, [r5, 0x6]
|
||||
adds r0, r5
|
||||
strh r0, [r6, 0x36]
|
||||
ldr r0, _080AB2C4 @ =sub_8075590
|
||||
ldr r0, _080AB2C4 @ =StartAnimLinearTranslation
|
||||
str r0, [r6, 0x1C]
|
||||
ldr r1, _080AB2C8 @ =DestroyAnimSprite
|
||||
adds r0, r6, 0
|
||||
|
|
@ -903,7 +903,7 @@ _080AB27A:
|
|||
_080AB2B8: .4byte gBattleAnimAttacker
|
||||
_080AB2BC: .4byte gBattleAnimTarget
|
||||
_080AB2C0: .4byte gBattleAnimArgs
|
||||
_080AB2C4: .4byte sub_8075590
|
||||
_080AB2C4: .4byte StartAnimLinearTranslation
|
||||
_080AB2C8: .4byte DestroyAnimSprite
|
||||
thumb_func_end sub_80AB1F8
|
||||
|
||||
|
|
@ -923,7 +923,7 @@ sub_80AB2CC: @ 80AB2CC
|
|||
ldrh r0, [r4, 0x22]
|
||||
adds r1, r0
|
||||
strh r1, [r4, 0x36]
|
||||
ldr r0, _080AB300 @ =sub_8075590
|
||||
ldr r0, _080AB300 @ =StartAnimLinearTranslation
|
||||
str r0, [r4, 0x1C]
|
||||
ldr r1, _080AB304 @ =DestroyAnimSprite
|
||||
adds r0, r4, 0
|
||||
|
|
@ -933,7 +933,7 @@ sub_80AB2CC: @ 80AB2CC
|
|||
bx r0
|
||||
.align 2, 0
|
||||
_080AB2FC: .4byte gBattleAnimArgs
|
||||
_080AB300: .4byte sub_8075590
|
||||
_080AB300: .4byte StartAnimLinearTranslation
|
||||
_080AB304: .4byte DestroyAnimSprite
|
||||
thumb_func_end sub_80AB2CC
|
||||
|
||||
|
|
@ -1036,7 +1036,7 @@ sub_80AB38C: @ 80AB38C
|
|||
bl SetAnimBgAttribute
|
||||
mov r0, sp
|
||||
bl sub_80752A0
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080AB418
|
||||
|
|
@ -1140,7 +1140,7 @@ _080AB476:
|
|||
lsls r0, 5
|
||||
strh r0, [r7, 0xA]
|
||||
strh r0, [r7, 0xC]
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
cmp r4, 0
|
||||
|
|
@ -1461,7 +1461,7 @@ _080AB740: .4byte gBattle_BG1_X
|
|||
_080AB744: .4byte gBattle_BG1_Y
|
||||
_080AB748: .4byte gTasks
|
||||
_080AB74C:
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080AB760
|
||||
|
|
@ -2012,7 +2012,7 @@ sub_80ABB28: @ 80ABB28
|
|||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
movs r1, 0
|
||||
bl sub_80758E0
|
||||
bl PrepareBattlerSpriteForRotScale
|
||||
ldr r0, _080ABB80 @ =sub_80ABB84
|
||||
str r0, [r4]
|
||||
pop {r4}
|
||||
|
|
@ -2282,7 +2282,7 @@ _080ABD64:
|
|||
ldrh r0, [r4, 0x26]
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl sub_8075980
|
||||
bl ResetSpriteRotScale
|
||||
movs r0, 0x26
|
||||
ldrsh r1, [r4, r0]
|
||||
lsls r0, r1, 4
|
||||
|
|
@ -2397,18 +2397,18 @@ sub_80ABE4C: @ 80ABE4C
|
|||
ldr r4, _080ABF54 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
mov r8, r0
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
movs r5, 0xAC
|
||||
ldrb r0, [r4]
|
||||
bl sub_807685C
|
||||
bl GetBattlerSpriteSubpriority
|
||||
subs r0, 0x1
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
|
|
@ -3025,14 +3025,14 @@ sub_80AC328: @ 80AC328
|
|||
ldr r4, _080AC3B0 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
movs r6, 0
|
||||
strh r0, [r5, 0xE]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x10]
|
||||
|
|
@ -3047,7 +3047,7 @@ sub_80AC328: @ 80AC328
|
|||
movs r1, 0x1
|
||||
_080AC36C:
|
||||
strh r1, [r5, 0x16]
|
||||
bl sub_8073788
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080AC380
|
||||
|
|
@ -3502,13 +3502,13 @@ sub_80AC6D8: @ 80AC6D8
|
|||
ldr r5, _080AC714 @ =gBattleAnimTarget
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x2
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x30]
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x3
|
||||
bl sub_8074480
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0x32]
|
||||
|
|
@ -3679,7 +3679,7 @@ _080AC826:
|
|||
strh r0, [r4, 0x30]
|
||||
ldr r0, _080AC870 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r0]
|
||||
bl sub_807685C
|
||||
bl GetBattlerSpriteSubpriority
|
||||
subs r0, 0x1
|
||||
adds r1, r4, 0
|
||||
adds r1, 0x43
|
||||
|
|
@ -3737,7 +3737,7 @@ _080AC89C:
|
|||
strh r0, [r4, 0x30]
|
||||
ldr r0, _080AC8E8 @ =gBattleAnimAttacker
|
||||
ldrb r0, [r0]
|
||||
bl sub_807685C
|
||||
bl GetBattlerSpriteSubpriority
|
||||
subs r0, 0x1
|
||||
adds r1, r4, 0
|
||||
adds r1, 0x43
|
||||
|
|
|
|||
|
|
@ -298,7 +298,7 @@ _0808290C:
|
|||
sub_8082934: @ 8082934
|
||||
push {r4-r6,lr}
|
||||
movs r4, 0
|
||||
ldr r0, _08082990 @ =gUnknown_83C9CB8
|
||||
ldr r0, _08082990 @ =gWildMonHeaders
|
||||
ldrb r1, [r0]
|
||||
adds r5, r0, 0
|
||||
cmp r1, 0xFF
|
||||
|
|
@ -343,7 +343,7 @@ _08082980:
|
|||
adds r0, r4, 0
|
||||
b _080829B6
|
||||
.align 2, 0
|
||||
_08082990: .4byte gUnknown_83C9CB8
|
||||
_08082990: .4byte gWildMonHeaders
|
||||
_08082994: .4byte 0x00007a01
|
||||
_08082998: .4byte gSaveBlock1Ptr
|
||||
_0808299C: .4byte 0x00004024
|
||||
|
|
@ -799,7 +799,7 @@ _08082CE4:
|
|||
bl sub_8058F1C
|
||||
cmp r0, 0x1
|
||||
bne _08082D78
|
||||
ldr r1, _08082D4C @ =gUnknown_83C9CB8
|
||||
ldr r1, _08082D4C @ =gWildMonHeaders
|
||||
lsls r2, r4, 2
|
||||
adds r0, r2, r4
|
||||
lsls r0, 2
|
||||
|
|
@ -822,7 +822,7 @@ _08082D06:
|
|||
bne _08082D1E
|
||||
b _08082E46
|
||||
_08082D1E:
|
||||
ldr r1, _08082D4C @ =gUnknown_83C9CB8
|
||||
ldr r1, _08082D4C @ =gWildMonHeaders
|
||||
adds r0, r5, r4
|
||||
lsls r0, 2
|
||||
adds r1, 0x4
|
||||
|
|
@ -843,7 +843,7 @@ _08082D3A:
|
|||
.align 2, 0
|
||||
_08082D44: .4byte gUnknown_20386DC
|
||||
_08082D48: .4byte 0x0000ffff
|
||||
_08082D4C: .4byte gUnknown_83C9CB8
|
||||
_08082D4C: .4byte gWildMonHeaders
|
||||
_08082D50:
|
||||
bl TryStartRoamerEncounter
|
||||
lsls r0, 24
|
||||
|
|
@ -884,7 +884,7 @@ _08082D78:
|
|||
cmp r0, 0x1
|
||||
bne _08082E46
|
||||
_08082DA8:
|
||||
ldr r1, _08082E18 @ =gUnknown_83C9CB8
|
||||
ldr r1, _08082E18 @ =gWildMonHeaders
|
||||
lsls r2, r4, 2
|
||||
adds r0, r2, r4
|
||||
lsls r0, 2
|
||||
|
|
@ -904,7 +904,7 @@ _08082DA8:
|
|||
cmp r0, 0
|
||||
beq _08082E46
|
||||
_08082DD2:
|
||||
ldr r1, _08082E18 @ =gUnknown_83C9CB8
|
||||
ldr r1, _08082E18 @ =gWildMonHeaders
|
||||
adds r0, r5, r4
|
||||
lsls r0, 2
|
||||
adds r1, 0x8
|
||||
|
|
@ -936,7 +936,7 @@ _08082DFA:
|
|||
movs r0, 0x1
|
||||
b _08082E48
|
||||
.align 2, 0
|
||||
_08082E18: .4byte gUnknown_83C9CB8
|
||||
_08082E18: .4byte gWildMonHeaders
|
||||
_08082E1C: .4byte gSaveBlock1Ptr
|
||||
_08082E20: .4byte 0x000030d0
|
||||
_08082E24:
|
||||
|
|
@ -975,7 +975,7 @@ sub_8082E54: @ 8082E54
|
|||
ldr r0, _08082EA4 @ =0x0000ffff
|
||||
cmp r2, r0
|
||||
beq _08082EB0
|
||||
ldr r1, _08082EA8 @ =gUnknown_83C9CB8
|
||||
ldr r1, _08082EA8 @ =gWildMonHeaders
|
||||
lsls r0, r2, 2
|
||||
adds r0, r2
|
||||
lsls r0, 2
|
||||
|
|
@ -1006,7 +1006,7 @@ _08082E9C:
|
|||
b _08082EB6
|
||||
.align 2, 0
|
||||
_08082EA4: .4byte 0x0000ffff
|
||||
_08082EA8: .4byte gUnknown_83C9CB8
|
||||
_08082EA8: .4byte gWildMonHeaders
|
||||
_08082EAC: .4byte gSpecialVar_Result
|
||||
_08082EB0:
|
||||
ldr r1, _08082EBC @ =gSpecialVar_Result
|
||||
|
|
@ -1049,7 +1049,7 @@ SweetScentWildEncounter: @ 8082EC0
|
|||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
beq _08082F3C
|
||||
ldr r1, _08082F18 @ =gUnknown_83C9CB8
|
||||
ldr r1, _08082F18 @ =gWildMonHeaders
|
||||
lsls r0, r5, 2
|
||||
adds r0, r5
|
||||
lsls r0, 2
|
||||
|
|
@ -1062,7 +1062,7 @@ SweetScentWildEncounter: @ 8082EC0
|
|||
b _08082F58
|
||||
.align 2, 0
|
||||
_08082F14: .4byte 0x0000ffff
|
||||
_08082F18: .4byte gUnknown_83C9CB8
|
||||
_08082F18: .4byte gWildMonHeaders
|
||||
_08082F1C:
|
||||
mov r0, sp
|
||||
movs r1, 0
|
||||
|
|
@ -1083,7 +1083,7 @@ _08082F3C:
|
|||
movs r0, 0x1
|
||||
b _08082F6E
|
||||
_08082F44:
|
||||
ldr r1, _08082F68 @ =gUnknown_83C9CB8
|
||||
ldr r1, _08082F68 @ =gWildMonHeaders
|
||||
lsls r0, r5, 2
|
||||
adds r0, r5
|
||||
lsls r0, 2
|
||||
|
|
@ -1100,7 +1100,7 @@ _08082F58:
|
|||
movs r0, 0x1
|
||||
b _08082F6E
|
||||
.align 2, 0
|
||||
_08082F68: .4byte gUnknown_83C9CB8
|
||||
_08082F68: .4byte gWildMonHeaders
|
||||
_08082F6C:
|
||||
movs r0, 0
|
||||
_08082F6E:
|
||||
|
|
@ -1119,7 +1119,7 @@ sub_8082F78: @ 8082F78
|
|||
ldr r0, _08082FA0 @ =0x0000ffff
|
||||
cmp r2, r0
|
||||
beq _08082FA8
|
||||
ldr r0, _08082FA4 @ =gUnknown_83C9CB8
|
||||
ldr r0, _08082FA4 @ =gWildMonHeaders
|
||||
lsls r1, r2, 2
|
||||
adds r1, r2
|
||||
lsls r1, 2
|
||||
|
|
@ -1132,7 +1132,7 @@ sub_8082F78: @ 8082F78
|
|||
b _08082FAA
|
||||
.align 2, 0
|
||||
_08082FA0: .4byte 0x0000ffff
|
||||
_08082FA4: .4byte gUnknown_83C9CB8
|
||||
_08082FA4: .4byte gWildMonHeaders
|
||||
_08082FA8:
|
||||
movs r0, 0
|
||||
_08082FAA:
|
||||
|
|
@ -1146,7 +1146,7 @@ sub_8082FB0: @ 8082FB0
|
|||
adds r5, r0, 0
|
||||
lsls r5, 24
|
||||
lsrs r5, 24
|
||||
ldr r4, _08082FE4 @ =gUnknown_83C9CB8
|
||||
ldr r4, _08082FE4 @ =gWildMonHeaders
|
||||
bl sub_8082934
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
|
|
@ -1165,7 +1165,7 @@ sub_8082FB0: @ 8082FB0
|
|||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08082FE4: .4byte gUnknown_83C9CB8
|
||||
_08082FE4: .4byte gWildMonHeaders
|
||||
thumb_func_end sub_8082FB0
|
||||
|
||||
thumb_func_start GetLocalWildMon
|
||||
|
|
@ -1180,7 +1180,7 @@ GetLocalWildMon: @ 8082FE8
|
|||
ldr r0, _08083020 @ =0x0000ffff
|
||||
cmp r3, r0
|
||||
beq _0808301A
|
||||
ldr r2, _08083024 @ =gUnknown_83C9CB8
|
||||
ldr r2, _08083024 @ =gWildMonHeaders
|
||||
lsls r1, r3, 2
|
||||
adds r1, r3
|
||||
lsls r1, 2
|
||||
|
|
@ -1199,7 +1199,7 @@ _0808301A:
|
|||
b _0808306E
|
||||
.align 2, 0
|
||||
_08083020: .4byte 0x0000ffff
|
||||
_08083024: .4byte gUnknown_83C9CB8
|
||||
_08083024: .4byte gWildMonHeaders
|
||||
_08083028:
|
||||
cmp r4, 0
|
||||
bne _0808303C
|
||||
|
|
@ -1250,7 +1250,7 @@ GetLocalWaterMon: @ 8083074
|
|||
ldr r0, _080830A8 @ =0x0000ffff
|
||||
cmp r2, r0
|
||||
beq _080830B0
|
||||
ldr r1, _080830AC @ =gUnknown_83C9CB8
|
||||
ldr r1, _080830AC @ =gWildMonHeaders
|
||||
lsls r0, r2, 2
|
||||
adds r0, r2
|
||||
lsls r0, 2
|
||||
|
|
@ -1268,7 +1268,7 @@ GetLocalWaterMon: @ 8083074
|
|||
b _080830B2
|
||||
.align 2, 0
|
||||
_080830A8: .4byte 0x0000ffff
|
||||
_080830AC: .4byte gUnknown_83C9CB8
|
||||
_080830AC: .4byte gWildMonHeaders
|
||||
_080830B0:
|
||||
movs r0, 0
|
||||
_080830B2:
|
||||
|
|
@ -1513,7 +1513,7 @@ sub_808324C: @ 808324C
|
|||
beq _080832CC
|
||||
cmp r4, 0x1
|
||||
bne _0808328C
|
||||
ldr r1, _08083288 @ =gUnknown_83C9CB8
|
||||
ldr r1, _08083288 @ =gWildMonHeaders
|
||||
lsls r0, r2, 2
|
||||
adds r0, r2
|
||||
lsls r0, 2
|
||||
|
|
@ -1530,11 +1530,11 @@ sub_808324C: @ 808324C
|
|||
b _080832B8
|
||||
.align 2, 0
|
||||
_08083284: .4byte 0x0000ffff
|
||||
_08083288: .4byte gUnknown_83C9CB8
|
||||
_08083288: .4byte gWildMonHeaders
|
||||
_0808328C:
|
||||
cmp r5, 0x2
|
||||
bne _080832CC
|
||||
ldr r1, _080832AC @ =gUnknown_83C9CB8
|
||||
ldr r1, _080832AC @ =gWildMonHeaders
|
||||
lsls r0, r2, 2
|
||||
adds r0, r2
|
||||
lsls r0, 2
|
||||
|
|
@ -1550,7 +1550,7 @@ _080832A8:
|
|||
movs r0, 0
|
||||
b _080832CE
|
||||
.align 2, 0
|
||||
_080832AC: .4byte gUnknown_83C9CB8
|
||||
_080832AC: .4byte gWildMonHeaders
|
||||
_080832B0:
|
||||
cmp r1, 0x9
|
||||
bhi _080832B8
|
||||
|
|
|
|||
|
|
@ -1,380 +0,0 @@
|
|||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.syntax unified
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_813C9DC
|
||||
sub_813C9DC: @ 813C9DC
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
mov r5, r8
|
||||
push {r5-r7}
|
||||
sub sp, 0x24
|
||||
str r1, [sp, 0x10]
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
str r0, [sp, 0xC]
|
||||
bl sub_813CB34
|
||||
cmp r0, 0
|
||||
blt _0813CA02
|
||||
ldr r0, [sp, 0xC]
|
||||
ldr r1, [sp, 0x10]
|
||||
bl sub_813CB5C
|
||||
b _0813CB1A
|
||||
_0813CA02:
|
||||
bl sub_80CC204
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
str r0, [sp, 0x14]
|
||||
movs r0, 0
|
||||
str r0, [sp, 0x18]
|
||||
ldr r0, _0813CA74 @ =0x00004024
|
||||
bl VarGet
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
str r0, [sp, 0x1C]
|
||||
cmp r0, 0x8
|
||||
ble _0813CA24
|
||||
movs r1, 0
|
||||
str r1, [sp, 0x1C]
|
||||
_0813CA24:
|
||||
movs r6, 0
|
||||
mov r8, r6
|
||||
ldr r1, _0813CA78 @ =gUnknown_83C9CB8
|
||||
ldrb r0, [r1]
|
||||
cmp r0, 0xFF
|
||||
beq _0813CB18
|
||||
_0813CA30:
|
||||
lsls r0, r6, 2
|
||||
adds r0, r6
|
||||
lsls r0, 2
|
||||
adds r4, r0, r1
|
||||
adds r0, r4, 0
|
||||
bl sub_813CC44
|
||||
lsls r0, 16
|
||||
lsrs r5, r0, 16
|
||||
cmp r5, 0xB7
|
||||
bne _0813CA5A
|
||||
ldr r2, [sp, 0x18]
|
||||
adds r2, 0x1
|
||||
str r2, [sp, 0x18]
|
||||
adds r0, r2, 0
|
||||
subs r0, 0x1
|
||||
adds r1, r6, 0x1
|
||||
str r1, [sp, 0x20]
|
||||
ldr r2, [sp, 0x1C]
|
||||
cmp r2, r0
|
||||
bne _0813CB06
|
||||
_0813CA5A:
|
||||
adds r0, r4, 0
|
||||
ldr r1, [sp, 0xC]
|
||||
bl sub_813CBD0
|
||||
adds r6, 0x1
|
||||
str r6, [sp, 0x20]
|
||||
cmp r0, 0
|
||||
beq _0813CB06
|
||||
movs r0, 0
|
||||
str r0, [sp, 0x8]
|
||||
lsls r7, r5, 16
|
||||
add r6, sp, 0x8
|
||||
b _0813CA94
|
||||
.align 2, 0
|
||||
_0813CA74: .4byte 0x00004024
|
||||
_0813CA78: .4byte gUnknown_83C9CB8
|
||||
_0813CA7C:
|
||||
add r0, sp, 0x4
|
||||
ldrh r0, [r0]
|
||||
cmp r0, 0
|
||||
beq _0813CA94
|
||||
mov r0, r8
|
||||
movs r1, 0x1
|
||||
add r8, r1
|
||||
add r1, sp, 0x4
|
||||
ldrh r1, [r1]
|
||||
ldr r2, [sp, 0x10]
|
||||
bl sub_81344A4
|
||||
_0813CA94:
|
||||
lsrs r0, r7, 16
|
||||
add r2, sp, 0x4
|
||||
str r2, [sp]
|
||||
ldr r1, _0813CAC8 @ =gUnknown_8464148
|
||||
movs r2, 0x37
|
||||
adds r3, r6, 0
|
||||
bl sub_813CC58
|
||||
cmp r0, 0
|
||||
bne _0813CA7C
|
||||
movs r2, 0
|
||||
add r5, sp, 0x4
|
||||
ldr r0, _0813CACC @ =gUnknown_84642BC
|
||||
mov r10, r0
|
||||
_0813CAB0:
|
||||
ldr r0, [sp, 0x14]
|
||||
asrs r0, r2
|
||||
movs r1, 0x1
|
||||
ands r0, r1
|
||||
adds r1, r2, 0x1
|
||||
mov r9, r1
|
||||
cmp r0, 0
|
||||
beq _0813CB00
|
||||
movs r0, 0
|
||||
str r0, [sp, 0x8]
|
||||
lsls r4, r2, 3
|
||||
b _0813CAE4
|
||||
.align 2, 0
|
||||
_0813CAC8: .4byte gUnknown_8464148
|
||||
_0813CACC: .4byte gUnknown_84642BC
|
||||
_0813CAD0:
|
||||
ldrh r0, [r5]
|
||||
cmp r0, 0
|
||||
beq _0813CAE4
|
||||
mov r0, r8
|
||||
movs r2, 0x1
|
||||
add r8, r2
|
||||
ldrh r1, [r5]
|
||||
ldr r2, [sp, 0x10]
|
||||
bl sub_81344A4
|
||||
_0813CAE4:
|
||||
mov r1, r10
|
||||
adds r0, r4, r1
|
||||
ldr r1, [r0]
|
||||
ldr r2, _0813CB2C @ =gUnknown_84642C0
|
||||
adds r0, r4, r2
|
||||
ldr r2, [r0]
|
||||
add r0, sp, 0x4
|
||||
str r0, [sp]
|
||||
lsrs r0, r7, 16
|
||||
adds r3, r6, 0
|
||||
bl sub_813CC58
|
||||
cmp r0, 0
|
||||
bne _0813CAD0
|
||||
_0813CB00:
|
||||
mov r2, r9
|
||||
cmp r2, 0x6
|
||||
bls _0813CAB0
|
||||
_0813CB06:
|
||||
ldr r6, [sp, 0x20]
|
||||
ldr r1, _0813CB30 @ =gUnknown_83C9CB8
|
||||
lsls r0, r6, 2
|
||||
adds r0, r6
|
||||
lsls r0, 2
|
||||
adds r0, r1
|
||||
ldrb r0, [r0]
|
||||
cmp r0, 0xFF
|
||||
bne _0813CA30
|
||||
_0813CB18:
|
||||
mov r0, r8
|
||||
_0813CB1A:
|
||||
add sp, 0x24
|
||||
pop {r3-r5}
|
||||
mov r8, r3
|
||||
mov r9, r4
|
||||
mov r10, r5
|
||||
pop {r4-r7}
|
||||
pop {r1}
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_0813CB2C: .4byte gUnknown_84642C0
|
||||
_0813CB30: .4byte gUnknown_83C9CB8
|
||||
thumb_func_end sub_813C9DC
|
||||
|
||||
thumb_func_start sub_813CB34
|
||||
sub_813CB34: @ 813CB34
|
||||
push {lr}
|
||||
lsls r0, 16
|
||||
lsrs r3, r0, 16
|
||||
movs r1, 0
|
||||
ldr r2, _0813CB48 @ =gUnknown_84642F4
|
||||
_0813CB3E:
|
||||
ldrh r0, [r2]
|
||||
cmp r0, r3
|
||||
bne _0813CB4C
|
||||
adds r0, r1, 0
|
||||
b _0813CB58
|
||||
.align 2, 0
|
||||
_0813CB48: .4byte gUnknown_84642F4
|
||||
_0813CB4C:
|
||||
adds r2, 0x4
|
||||
adds r1, 0x1
|
||||
cmp r1, 0x2
|
||||
bls _0813CB3E
|
||||
movs r0, 0x1
|
||||
negs r0, r0
|
||||
_0813CB58:
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_813CB34
|
||||
|
||||
thumb_func_start sub_813CB5C
|
||||
sub_813CB5C: @ 813CB5C
|
||||
push {r4,r5,lr}
|
||||
sub sp, 0xC
|
||||
adds r5, r1, 0
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
bl sub_813CB34
|
||||
adds r4, r0, 0
|
||||
cmp r4, 0
|
||||
blt _0813CBC4
|
||||
ldr r0, _0813CBBC @ =gUnknown_84642F4
|
||||
lsls r4, 2
|
||||
adds r4, r0
|
||||
bl ScrSpecial_GetStarter
|
||||
ldrh r1, [r4, 0x2]
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
cmp r1, r0
|
||||
bne _0813CBC4
|
||||
bl GetRoamerLocationMapSectionId
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
movs r1, 0
|
||||
str r1, [sp, 0x8]
|
||||
ldr r1, _0813CBC0 @ =gUnknown_8464148
|
||||
add r3, sp, 0x8
|
||||
add r2, sp, 0x4
|
||||
str r2, [sp]
|
||||
movs r2, 0x37
|
||||
bl sub_813CC58
|
||||
cmp r0, 0
|
||||
beq _0813CBC4
|
||||
add r0, sp, 0x4
|
||||
ldrh r0, [r0]
|
||||
cmp r0, 0
|
||||
beq _0813CBC4
|
||||
add r0, sp, 0x4
|
||||
ldrh r1, [r0]
|
||||
movs r0, 0
|
||||
adds r2, r5, 0
|
||||
bl sub_81344A4
|
||||
movs r0, 0x1
|
||||
b _0813CBC6
|
||||
.align 2, 0
|
||||
_0813CBBC: .4byte gUnknown_84642F4
|
||||
_0813CBC0: .4byte gUnknown_8464148
|
||||
_0813CBC4:
|
||||
movs r0, 0
|
||||
_0813CBC6:
|
||||
add sp, 0xC
|
||||
pop {r4,r5}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_813CB5C
|
||||
|
||||
thumb_func_start sub_813CBD0
|
||||
sub_813CBD0: @ 813CBD0
|
||||
push {r4,r5,lr}
|
||||
adds r4, r0, 0
|
||||
adds r5, r1, 0
|
||||
ldr r0, [r4, 0x4]
|
||||
movs r2, 0xC
|
||||
bl sub_813CC18
|
||||
cmp r0, 0
|
||||
bne _0813CC10
|
||||
ldr r0, [r4, 0x8]
|
||||
adds r1, r5, 0
|
||||
movs r2, 0x5
|
||||
bl sub_813CC18
|
||||
cmp r0, 0
|
||||
bne _0813CC10
|
||||
ldr r0, [r4, 0x10]
|
||||
adds r1, r5, 0
|
||||
movs r2, 0xC
|
||||
bl sub_813CC18
|
||||
cmp r0, 0
|
||||
bne _0813CC10
|
||||
ldr r0, [r4, 0xC]
|
||||
adds r1, r5, 0
|
||||
movs r2, 0x5
|
||||
bl sub_813CC18
|
||||
cmp r0, 0
|
||||
bne _0813CC10
|
||||
movs r0, 0
|
||||
b _0813CC12
|
||||
_0813CC10:
|
||||
movs r0, 0x1
|
||||
_0813CC12:
|
||||
pop {r4,r5}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_813CBD0
|
||||
|
||||
thumb_func_start sub_813CC18
|
||||
sub_813CC18: @ 813CC18
|
||||
push {r4,lr}
|
||||
adds r4, r1, 0
|
||||
cmp r0, 0
|
||||
beq _0813CC3A
|
||||
movs r1, 0
|
||||
cmp r1, r2
|
||||
bge _0813CC3A
|
||||
ldr r3, [r0, 0x4]
|
||||
_0813CC28:
|
||||
ldrh r0, [r3, 0x2]
|
||||
cmp r0, r4
|
||||
bne _0813CC32
|
||||
movs r0, 0x1
|
||||
b _0813CC3C
|
||||
_0813CC32:
|
||||
adds r3, 0x4
|
||||
adds r1, 0x1
|
||||
cmp r1, r2
|
||||
blt _0813CC28
|
||||
_0813CC3A:
|
||||
movs r0, 0
|
||||
_0813CC3C:
|
||||
pop {r4}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_813CC18
|
||||
|
||||
thumb_func_start sub_813CC44
|
||||
sub_813CC44: @ 813CC44
|
||||
push {lr}
|
||||
ldrb r2, [r0]
|
||||
ldrb r1, [r0, 0x1]
|
||||
adds r0, r2, 0
|
||||
bl get_mapheader_by_bank_and_number
|
||||
ldrb r0, [r0, 0x14]
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_813CC44
|
||||
|
||||
thumb_func_start sub_813CC58
|
||||
sub_813CC58: @ 813CC58
|
||||
push {r4-r6,lr}
|
||||
adds r4, r2, 0
|
||||
ldr r6, [sp, 0x10]
|
||||
lsls r0, 16
|
||||
lsrs r5, r0, 16
|
||||
ldr r2, [r3]
|
||||
cmp r2, r4
|
||||
bge _0813CC86
|
||||
lsls r0, r2, 2
|
||||
adds r1, r0, r1
|
||||
_0813CC6C:
|
||||
ldrh r0, [r1]
|
||||
cmp r0, r5
|
||||
bne _0813CC7E
|
||||
ldrh r0, [r1, 0x2]
|
||||
strh r0, [r6]
|
||||
adds r0, r2, 0x1
|
||||
str r0, [r3]
|
||||
movs r0, 0x1
|
||||
b _0813CC88
|
||||
_0813CC7E:
|
||||
adds r1, 0x4
|
||||
adds r2, 0x1
|
||||
cmp r2, r4
|
||||
blt _0813CC6C
|
||||
_0813CC86:
|
||||
movs r0, 0
|
||||
_0813CC88:
|
||||
pop {r4-r6}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_813CC58
|
||||
|
||||
.align 2, 0 @ Don't pad with nop.
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/bash
|
||||
|
||||
OBJDUMP="./tools/binutils/bin/arm-none-eabi-objdump -D -bbinary -marmv4t -Mforce-thumb"
|
||||
OPTIONS="--start-address=$1 --stop-address=$2"
|
||||
OBJDUMP="$DEVKITARM/bin/arm-none-eabi-objdump -D -bbinary -marmv4t -Mforce-thumb"
|
||||
OPTIONS="--start-address=$(($1)) --stop-address=$(($1 + $2))"
|
||||
$OBJDUMP $OPTIONS baserom.gba > baserom.dump
|
||||
$OBJDUMP $OPTIONS pokefirered.gba > pokefirered.dump
|
||||
diff -u baserom.dump pokefirered.dump
|
||||
BIN
baserom.ips
BIN
baserom.ips
Binary file not shown.
|
|
@ -1,3 +1,5 @@
|
|||
COMPARE ?= 0
|
||||
|
||||
AS := ../tools/binutils/bin/arm-none-eabi-as
|
||||
CPP := $(CC) -E
|
||||
LD := ../tools/binutils/bin/arm-none-eabi-ld
|
||||
|
|
@ -57,7 +59,7 @@ FIX := ../tools/gbafix/gbafix$(EXE)
|
|||
# Secondary expansion is required for dependency variables in object rules.
|
||||
.SECONDEXPANSION:
|
||||
|
||||
.PHONY: rom clean compare tidy
|
||||
.PHONY: all rom clean compare tidy payload
|
||||
|
||||
C_SRCS := $(wildcard $(C_SUBDIR)/*.c $(C_SUBDIR)/*/*.c $(C_SUBDIR)/*/*/*.c)
|
||||
C_OBJS := $(patsubst $(C_SUBDIR)/%.c,$(C_BUILDDIR)/%.o,$(C_SRCS))
|
||||
|
|
@ -81,11 +83,16 @@ SUBDIRS := $(sort $(dir $(OBJS)))
|
|||
|
||||
$(shell mkdir -p $(SUBDIRS))
|
||||
|
||||
all: payload rom
|
||||
@:
|
||||
|
||||
rom: $(ROM)
|
||||
ifeq ($(COMPARE),1)
|
||||
@$(SHA1) rom.sha1
|
||||
endif
|
||||
|
||||
# For contributors to make sure a change didn't affect the contents of the ROM.
|
||||
compare: $(ROM)
|
||||
@$(SHA1) rom.sha1
|
||||
compare: ; @$(MAKE) COMPARE=1
|
||||
|
||||
clean: tidy
|
||||
rm -f sound/direct_sound_samples/*.bin
|
||||
|
|
@ -138,10 +145,10 @@ else
|
|||
$(DATA_ASM_BUILDDIR)/%.o: data_dep = $(shell $(SCANINC) $(DATA_ASM_SUBDIR)/$*.s)
|
||||
endif
|
||||
|
||||
payload: data/payload.gba.lz
|
||||
payload:
|
||||
@$(MAKE) -C payload COMPARE=$(COMPARE)
|
||||
|
||||
payload/payload.gba:
|
||||
$(MAKE) -C payload/
|
||||
payload/payload.gba: payload
|
||||
|
||||
data/payload.gba.lz: payload/payload.gba
|
||||
$(GFX) $< $@ -search 1
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
COMPARE ?= 0
|
||||
|
||||
AS := ../../tools/binutils/bin/arm-none-eabi-as
|
||||
CPP := $(CC) -E
|
||||
LD := ../../tools/binutils/bin/arm-none-eabi-ld
|
||||
|
|
@ -85,11 +87,17 @@ $(C_BUILDDIR)/agb_flash_1m.o: CC1FLAGS := -O1 -mthumb-interwork
|
|||
$(C_BUILDDIR)/agb_flash_mx.o: CC1FLAGS := -O1 -mthumb-interwork
|
||||
$(C_BUILDDIR)/agb_flash_le.o: CC1FLAGS := -O1 -mthumb-interwork
|
||||
|
||||
all: rom
|
||||
@:
|
||||
|
||||
rom: $(ROM)
|
||||
ifeq ($(COMPARE),1)
|
||||
@$(SHA1) rom.sha1
|
||||
endif
|
||||
|
||||
# For contributors to make sure a change didn't affect the contents of the ROM.
|
||||
compare: $(ROM)
|
||||
@$(SHA1) rom.sha1
|
||||
compare:
|
||||
@$(MAKE) COMPARE=1
|
||||
|
||||
clean: tidy
|
||||
rm -f sound/direct_sound_samples/*.bin
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
.include "../../asm/macros/asm.inc"
|
||||
.include "../../asm/macros/function.inc"
|
||||
.include "../../constants/gba_constants.inc"
|
||||
.include "asm/macros/function.inc"
|
||||
.include "constants/gba_constants.inc"
|
||||
|
||||
.syntax unified
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
.include "asm/macros/function.inc"
|
||||
.include "constants/gba_constants.inc"
|
||||
.include "asm/macros.inc"
|
||||
|
||||
.syntax unified
|
||||
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user