dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/pret/master'

Browse Source 
# Conflicts:
#	asm/libagbbackup.s
This commit is contained in:
Diegoisawesome
2016-11-01 14:18:05 -05:00
parent 7dad2846f8 d708372ea9
commit 265e1b712f
154 changed files with 38838 additions and 35319 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1 -3
View File
@@ -12,9 +12,7 @@
*.latfont
*.hwjpnfont
*.fwjpnfont
pokeas
pokeld
pokeobjcopy
src/*.s
tools/*
*.map
*.ld
Makefile
+28 -12
View File
@@ -1,14 +1,16 @@
SHELL := /bin/bash -o pipefail
AS := $(DEVKITARM)/bin/arm-none-eabi-as
ASFLAGS := -mcpu=arm7tdmi
CC1 := tools/agbcc/bin/agbcc
CFLAGS := -mthumb-interwork -O2
CC1 := tools/agbcc/bin/agbcc
override CFLAGS += -mthumb-interwork -Wimplicit -O2 -fhex-asm
CPP := $(DEVKITARM)/bin/arm-none-eabi-cpp
CPPFLAGS := -I tools/agbcc/include -iquote include -nostdinc -undef
LD := $(DEVKITARM)/bin/arm-none-eabi-ld
LDFLAGS := -T ld_script.txt -T iwram_syms.txt -T ewram_syms.txt -Map pokeemerald.map
LDFLAGS := -T ld_script.ld -Map pokeemerald.map
OBJCOPY := $(DEVKITARM)/bin/arm-none-eabi-objcopy
@@ -16,11 +18,12 @@ LIBGCC := tools/agbcc/lib/libgcc.a
SHA1 := sha1sum -c
GFX := @tools/gbagfx/gbagfx
GFX := tools/gbagfx/gbagfx
AIF := tools/aif2pcm/aif2pcm
MID := tools/mid2agb/mid2agb
SCANINC := tools/scaninc/scaninc
PREPROC := tools/preproc/preproc
RAMSCRGEN := tools/ramscrgen/ramscrgen
# Clear the default suffixes.
.SUFFIXES:
@@ -52,11 +55,11 @@ rom: $(ROM)
compare: $(ROM)
@$(SHA1) rom.sha1
clean:
rm -f $(ROM) $(ELF) $(OBJS) $(C_SRCS:%.c=%.i) pokeemerald.map
clean: tidy
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 {} +
tidy:
rm -f ld_script.ld sym_bss.ld sym_common.ld sym_ewram.ld
rm -f $(ROM) $(ELF) $(OBJS) $(C_SRCS:%.c=%.i) pokeemerald.map
include graphics_file_rules.mk
@@ -98,7 +101,20 @@ $(ASM_OBJS): %.o: %.s $$(dep)
$(DATA_ASM_OBJS): %.o: %.s $$(dep)
$(PREPROC) $< charmap.txt | $(AS) $(ASFLAGS) -o $@
# Link objects to produce the ROM.
$(ROM): $(OBJS)
$(LD) $(LDFLAGS) -o $(ELF) $(OBJS) $(LIBGCC)
$(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $(ELF) $(ROM)
sym_bss.ld: sym_bss.txt
$(RAMSCRGEN) .bss sym_bss.txt >$@
sym_common.ld: sym_common.txt $(C_OBJS) $(wildcard common_syms/*.txt)
$(RAMSCRGEN) COMMON sym_common.txt -c src,common_syms >$@
sym_ewram.ld: sym_ewram.txt
$(RAMSCRGEN) ewram_data sym_ewram.txt >$@
ld_script.ld: ld_script.txt sym_bss.ld sym_common.ld sym_ewram.ld
sed -f ld_script.sed ld_script.txt >ld_script.ld
$(ELF): ld_script.ld $(OBJS)
$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBGCC)
$(ROM): $(ELF)
$(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $< $@
asm/battle_814AEAC.s
+430 -430
View File
File diff suppressed because it is too large Load Diff
asm/battle_ai.s
+456 -456
View File
File diff suppressed because it is too large Load Diff
asm/battle_anim_80FE840.s
+1724 -1724
View File
File diff suppressed because it is too large Load Diff
asm/battle_message.s
+210 -210
View File
File diff suppressed because it is too large Load Diff
asm/battle_records.s
+30 -30
View File
@@ -311,7 +311,7 @@ sub_813C170: @ 813C170
strh r7, [r4, 0x8]
adds r2, r6, 0
adds r2, 0x54
ldr r1, =0x020229e8
ldr r1, =gUnknown_020229E8
mov r3, r9
lsls r0, r3, 3
subs r0, r3
@@ -339,7 +339,7 @@ _0813C1D4:
thumb_func_start sub_813C1F8
sub_813C1F8: @ 813C1F8
push {lr}
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r1, =0x00003150
adds r0, r1
@@ -354,7 +354,7 @@ sub_813C214: @ 813C214
push {lr}
movs r1, 0x64
muls r1, r0
ldr r0, =0x02039b6c
ldr r0, =gUnknown_02039B6C
adds r1, r0
ldrh r0, [r1]
adds r0, 0x1
@@ -376,7 +376,7 @@ sub_813C23C: @ 813C23C
push {lr}
movs r1, 0x64
muls r1, r0
ldr r0, =0x02039b6e
ldr r0, =gUnknown_02039B6E
adds r1, r0
ldrh r0, [r1]
adds r0, 0x1
@@ -397,7 +397,7 @@ _0813C258:
sub_813C264: @ 813C264
push {r4,lr}
adds r4, r0, 0
ldr r0, =0x0202433a
ldr r0, =gUnknown_0202433A
ldrb r0, [r0]
cmp r0, 0x1
beq _0813C27C
@@ -433,19 +433,19 @@ sub_813C2A0: @ 813C2A0
beq _0813C2DA
adds r0, r4, 0
bl sub_813C264
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r1, =0x00003150
adds r0, r1
movs r1, 0x64
adds r3, r4, 0
muls r3, r1
ldr r2, =0x02039b88
ldr r2, =gUnknown_02039B88
adds r1, r3, r2
subs r2, 0x30
adds r3, r2
ldrh r2, [r3, 0xE]
ldr r3, =0x0202433a
ldr r3, =gUnknown_0202433A
ldrb r3, [r3]
lsls r4, 24
lsrs r4, 24
@@ -463,7 +463,7 @@ _0813C2DA:
sub_813C2F4: @ 813C2F4
push {r4,lr}
sub sp, 0xC
ldr r4, =0x02021cc4
ldr r4, =gUnknown_02021CC4
movs r0, 0x17
bl sub_80847F8
adds r1, r0, 0
@@ -471,7 +471,7 @@ sub_813C2F4: @ 813C2F4
movs r2, 0
movs r3, 0x4
bl ConvertIntToDecimalString
ldr r4, =0x02021dc4
ldr r4, =gUnknown_02021DC4
movs r0, 0x18
bl sub_80847F8
adds r1, r0, 0
@@ -479,7 +479,7 @@ sub_813C2F4: @ 813C2F4
movs r2, 0
movs r3, 0x4
bl ConvertIntToDecimalString
ldr r4, =0x02021ec4
ldr r4, =gUnknown_02021EC4
movs r0, 0x19
bl sub_80847F8
adds r1, r0, 0
@@ -487,7 +487,7 @@ sub_813C2F4: @ 813C2F4
movs r2, 0
movs r3, 0x4
bl ConvertIntToDecimalString
ldr r4, =0x02021fc4
ldr r4, =gUnknown_02021FC4
ldr r1, =gUnknown_085EF6A1
adds r0, r4, 0
bl ExpandStringRefs
@@ -496,7 +496,7 @@ sub_813C2F4: @ 813C2F4
movs r2, 0xD0
bl GetStringCenterAlignXOffset
adds r3, r0, 0
ldr r0, =0x0203ab74
ldr r0, =gUnknown_0203AB74
ldrb r0, [r0]
lsls r3, 24
lsrs r3, 24
@@ -531,7 +531,7 @@ sub_813C384: @ 813C384
ldr r7, [r6, 0xC]
cmp r7, 0
bne _0813C40C
ldr r0, =0x0203ab74
ldr r0, =gUnknown_0203AB74
mov r8, r0
ldrb r0, [r0]
ldr r2, =gUnknown_085B3D84
@@ -576,18 +576,18 @@ sub_813C384: @ 813C384
b _0813C4A8
.pool
_0813C40C:
ldr r0, =0x02021cc4
ldr r0, =gUnknown_02021CC4
movs r1, 0x8
bl RepeatStringTerminator
ldr r0, =0x02021cc4
ldr r0, =gUnknown_02021CC4
adds r1, r6, 0
movs r2, 0x7
bl CopyString_LimitN
lsls r1, r5, 24
lsrs r1, 24
ldr r0, =0x02021cc4
ldr r0, =gUnknown_02021CC4
bl StopMusicWhileStringIsPrinted
ldr r0, =0x0203ab74
ldr r0, =gUnknown_0203AB74
mov r8, r0
ldrb r0, [r0]
lsls r4, 3
@@ -599,11 +599,11 @@ _0813C40C:
str r5, [sp, 0x4]
str r5, [sp, 0x8]
movs r1, 0x1
ldr r2, =0x02021cc4
ldr r2, =gUnknown_02021CC4
movs r3, 0x8
bl Print
ldrh r1, [r6, 0xA]
ldr r0, =0x02021cc4
ldr r0, =gUnknown_02021CC4
movs r2, 0x1
movs r3, 0x4
bl ConvertIntToDecimalString
@@ -613,11 +613,11 @@ _0813C40C:
str r5, [sp, 0x4]
str r5, [sp, 0x8]
movs r1, 0x1
ldr r2, =0x02021cc4
ldr r2, =gUnknown_02021CC4
movs r3, 0x50
bl Print
ldrh r1, [r6, 0xC]
ldr r0, =0x02021cc4
ldr r0, =gUnknown_02021CC4
movs r2, 0x1
movs r3, 0x4
bl ConvertIntToDecimalString
@@ -627,11 +627,11 @@ _0813C40C:
str r5, [sp, 0x4]
str r5, [sp, 0x8]
movs r1, 0x1
ldr r2, =0x02021cc4
ldr r2, =gUnknown_02021CC4
movs r3, 0x80
bl Print
ldrh r1, [r6, 0xE]
ldr r0, =0x02021cc4
ldr r0, =gUnknown_02021CC4
movs r2, 0x1
movs r3, 0x4
bl ConvertIntToDecimalString
@@ -641,7 +641,7 @@ _0813C40C:
str r5, [sp, 0x4]
str r5, [sp, 0x8]
movs r1, 0x1
ldr r2, =0x02021cc4
ldr r2, =gUnknown_02021CC4
movs r3, 0xB0
bl Print
_0813C4A8:
@@ -661,7 +661,7 @@ sub_813C4BC: @ 813C4BC
mov r6, r8
push {r6,r7}
sub sp, 0xC
ldr r6, =0x0203ab74
ldr r6, =gUnknown_0203AB74
ldr r0, =gUnknown_085B3D7C
bl AddWindow
strb r0, [r6]
@@ -671,7 +671,7 @@ sub_813C4BC: @ 813C4BC
ldrb r0, [r6]
movs r1, 0x11
bl FillWindowPixelBuffer
ldr r5, =0x02021fc4
ldr r5, =gUnknown_02021FC4
ldr r1, =gUnknown_085EF68D
adds r0, r5, 0
bl ExpandStringRefs
@@ -690,7 +690,7 @@ sub_813C4BC: @ 813C4BC
str r4, [sp, 0x8]
adds r2, r5, 0
bl Print
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
mov r8, r0
ldr r0, [r0]
ldr r1, =0x00003150
@@ -729,7 +729,7 @@ _0813C540:
adds r4, 0x1
cmp r4, 0x4
ble _0813C540
ldr r4, =0x0203ab74
ldr r4, =gUnknown_0203AB74
ldrb r0, [r4]
bl PutWindowTilemap
ldrb r0, [r4]
@@ -748,7 +748,7 @@ _0813C540:
thumb_func_start sub_813C5A0
sub_813C5A0: @ 813C5A0
push {r4,lr}
ldr r4, =0x0203ab74
ldr r4, =gUnknown_0203AB74
ldrb r0, [r4]
movs r1, 0
bl sub_819746C
asm/battle_setup.s
+155 -155
View File
@@ -13,7 +13,7 @@ task01_battle_start: @ 80B05F0
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
ldr r1, =0x03005e08
ldr r1, =gTasks + 0x8
adds r4, r0, r1
movs r1, 0
ldrsh r0, [r4, r1]
@@ -68,7 +68,7 @@ task_add_01_battle_start: @ 80B065C
bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
@@ -111,10 +111,10 @@ sub_80B06BC: @ 80B06BC
bl script_env_2_enable
bl player_bitmagic
bl sub_808BCF4
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
ldr r0, =sub_80B0AF8
str r0, [r1, 0x8]
ldr r4, =0x02022fec
ldr r4, =gUnknown_02022FEC
movs r0, 0
str r0, [r4]
bl InBattlePyramid
@@ -153,10 +153,10 @@ sub_80B072C: @ 80B072C
bl script_env_2_enable
bl player_bitmagic
bl sub_808BCF4
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
ldr r0, =sub_80B0AF8
str r0, [r1, 0x8]
ldr r1, =0x02022fec
ldr r1, =gUnknown_02022FEC
movs r0, 0x80
lsls r0, 3
str r0, [r1]
@@ -182,10 +182,10 @@ sub_80B077C: @ 80B077C
bl script_env_2_enable
bl player_bitmagic
bl sub_808BCF4
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
ldr r0, =sub_80FC190
str r0, [r1, 0x8]
ldr r1, =0x02022fec
ldr r1, =gUnknown_02022FEC
movs r0, 0x80
str r0, [r1]
bl sub_80B0EC8
@@ -204,10 +204,10 @@ sub_80B07B4: @ 80B07B4
bl script_env_2_enable
bl player_bitmagic
bl sub_808BCF4
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
ldr r0, =sub_80B0AF8
str r0, [r1, 0x8]
ldr r1, =0x02022fec
ldr r1, =gUnknown_02022FEC
movs r0, 0x80
lsls r0, 13
str r0, [r1]
@@ -278,16 +278,16 @@ _080B0856:
thumb_func_start sub_80B086C
sub_80B086C: @ 80B086C
push {lr}
ldr r0, =0x02024744
ldr r0, =gUnknown_02024744
movs r1, 0xC4
lsls r1, 1
movs r2, 0x5
bl sub_8067FF8
bl script_env_2_enable
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music
str r0, [r1, 0x8]
ldr r1, =0x02022fec
ldr r1, =gUnknown_02022FEC
movs r0, 0x80
lsls r0, 2
str r0, [r1]
@@ -303,10 +303,10 @@ sub_80B086C: @ 80B086C
sub_80B08A8: @ 80B08A8
push {lr}
bl script_env_2_enable
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
ldr r0, =sub_80B0B6C
str r0, [r1, 0x8]
ldr r1, =0x02022fec
ldr r1, =gUnknown_02022FEC
movs r0, 0
str r0, [r1]
bl sub_80B0EC8
@@ -329,10 +329,10 @@ sub_80B08A8: @ 80B08A8
sub_80B08EC: @ 80B08EC
push {lr}
bl script_env_2_enable
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
ldr r0, =sub_80B0B6C
str r0, [r1, 0x8]
ldr r1, =0x02022fec
ldr r1, =gUnknown_02022FEC
movs r0, 0x80
lsls r0, 6
str r0, [r1]
@@ -356,14 +356,14 @@ sub_80B08EC: @ 80B08EC
sub_80B0934: @ 80B0934
push {r4,lr}
bl script_env_2_enable
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
ldr r0, =sub_80B0B6C
str r0, [r1, 0x8]
ldr r4, =0x02022fec
ldr r4, =gUnknown_02022FEC
movs r0, 0x80
lsls r0, 6
str r0, [r4]
ldr r0, =0x02024744
ldr r0, =gUnknown_02024744
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
@@ -396,7 +396,7 @@ _080B0988:
cmp r1, r0
beq _080B09E4
_080B099A:
ldr r2, =0x02022fec
ldr r2, =gUnknown_02022FEC
ldr r0, [r2]
movs r1, 0x80
lsls r1, 21
@@ -458,10 +458,10 @@ _080B09FE:
sub_80B0A18: @ 80B0A18
push {lr}
bl script_env_2_enable
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
ldr r0, =sub_80B0B6C
str r0, [r1, 0x8]
ldr r1, =0x02022fec
ldr r1, =gUnknown_02022FEC
movs r0, 0xC0
lsls r0, 6
str r0, [r1]
@@ -495,14 +495,14 @@ _080B0A5A:
sub_80B0A74: @ 80B0A74
push {lr}
bl script_env_2_enable
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
ldr r0, =sub_80B0B6C
str r0, [r1, 0x8]
ldr r1, =0x02022fec
ldr r1, =gUnknown_02022FEC
movs r0, 0xC0
lsls r0, 7
str r0, [r1]
ldr r0, =0x02024744
ldr r0, =gUnknown_02024744
movs r1, 0xB
bl pokemon_getattr
lsls r0, 16
@@ -565,7 +565,7 @@ sub_80B0AF8: @ 80B0AF8
movs r0, 0
movs r1, 0x80
bl ResetSpriteRange
ldr r0, =0x0202433a
ldr r0, =gUnknown_0202433A
ldrb r0, [r0]
bl battle_exit_is_player_defeat
cmp r0, 0x1
@@ -585,7 +585,7 @@ sub_80B0AF8: @ 80B0AF8
_080B0B4C:
ldr r0, =c2_exit_to_overworld_2_switch
bl SetMainCallback2
ldr r1, =0x03005dac
ldr r1, =gUnknown_03005DAC
ldr r0, =sub_80AF6F0
str r0, [r1]
_080B0B58:
@@ -610,7 +610,7 @@ sub_80B0B6C: @ 80B0B6C
movs r0, 0
movs r1, 0x80
bl ResetSpriteRange
ldr r0, =0x0202433a
ldr r0, =gUnknown_0202433A
ldrb r0, [r0]
bl battle_exit_is_player_defeat
cmp r0, 0x1
@@ -678,7 +678,7 @@ _080B0C16:
lsls r0, 24
cmp r0, 0
bne _080B0D18
ldr r0, =0x02037318
ldr r0, =gUnknown_02037318
ldrb r0, [r0, 0x17]
subs r0, 0x1
cmp r0, 0x8
@@ -775,7 +775,7 @@ _080B0CF2:
movs r0, 0x4
b _080B0D1A
_080B0CF6:
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldrh r1, [r0, 0x4]
movs r0, 0xE0
@@ -830,7 +830,7 @@ _080B0D54:
lsls r0, 24
cmp r0, 0
bne _080B0D7C
ldr r0, =0x02037318
ldr r0, =gUnknown_02037318
ldrb r0, [r0, 0x17]
cmp r0, 0x4
beq _080B0D78
@@ -862,7 +862,7 @@ _080B0D92:
movs r0, 0x64
adds r1, r6, 0
muls r1, r0
ldr r0, =0x020244ec
ldr r0, =gUnknown_020244EC
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x41
@@ -1034,7 +1034,7 @@ sub_80B0EC8: @ 80B0EC8
lsls r0, 24
lsrs r5, r0, 24
adds r6, r5, 0
ldr r0, =0x02024744
ldr r0, =gUnknown_02024744
movs r1, 0x38
bl pokemon_getattr
adds r4, r0, 0
@@ -1082,7 +1082,7 @@ _080B0F2E:
thumb_func_start reads_trainer_data_byte1_byte0x18
reads_trainer_data_byte1_byte0x18: @ 80B0F34
push {r4-r6,lr}
ldr r4, =0x02038bca
ldr r4, =gUnknown_02038BCA
ldrh r1, [r4]
movs r0, 0x80
lsls r0, 3
@@ -1195,7 +1195,7 @@ _080B1000:
sub_80B100C: @ 80B100C
push {r4,r5,lr}
adds r5, r0, 0
ldr r0, =0x02024744
ldr r0, =gUnknown_02024744
movs r1, 0x38
bl pokemon_getattr
adds r4, r0, 0
@@ -1290,7 +1290,7 @@ _080B10C8:
b _080B1112
.pool
_080B10EC:
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r1, [r0]
ldr r2, =0x00000cb2
adds r0, r1, r2
@@ -1330,7 +1330,7 @@ sub_80B1138: @ 80B1138
push {lr}
ldr r0, =set_256color_bg_bg0
bl SetMainCallback2
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
ldr r0, =sub_80B1158
str r0, [r1, 0x8]
pop {r0}
@@ -1344,7 +1344,7 @@ sub_80B1158: @ 80B1158
sub sp, 0x8
ldr r0, =0x00004023
bl GetVarPointer
ldr r2, =0x020375f0
ldr r2, =gUnknown_020375F0
ldrh r1, [r2]
strh r1, [r0]
ldrh r0, [r2]
@@ -1380,10 +1380,10 @@ sub_80B11A8: @ 80B11A8
lsrs r0, 24
cmp r0, 0x1
bne _080B11F0
ldr r1, =0x02022fec
ldr r1, =gUnknown_02022FEC
movs r0, 0x10
str r0, [r1]
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
ldr r0, =sub_80B1204
str r0, [r1, 0x8]
bl FreeAllWindowBuffers
@@ -1481,7 +1481,7 @@ TrainerBattleLoadArg8: @ 80B1274
thumb_func_start trainerflag_opponent
trainerflag_opponent: @ 80B1278
ldr r1, =0x02038bca
ldr r1, =gUnknown_02038BCA
movs r2, 0xA0
lsls r2, 3
adds r0, r2, 0
@@ -1495,7 +1495,7 @@ trainerflag_opponent: @ 80B1278
thumb_func_start sub_80B1290
sub_80B1290: @ 80B1290
ldr r1, =0x02038bcc
ldr r1, =gUnknown_02038BCC
movs r2, 0xA0
lsls r2, 3
adds r0, r2, 0
@@ -1540,10 +1540,10 @@ _080B12E2:
thumb_func_start ResetTrainerOpponentIds
ResetTrainerOpponentIds: @ 80B12E8
ldr r0, =0x02038bca
ldr r0, =gUnknown_02038BCA
movs r1, 0
strh r1, [r0]
ldr r0, =0x02038bcc
ldr r0, =gUnknown_02038BCC
strh r1, [r0]
bx lr
.pool
@@ -1553,38 +1553,38 @@ ResetTrainerOpponentIds: @ 80B12E8
@ void InitTrainerBattleVariables()
InitTrainerBattleVariables: @ 80B12FC
push {lr}
ldr r0, =0x02038bc8
ldr r0, =gUnknown_02038BC8
movs r1, 0
strh r1, [r0]
ldr r0, =0x02038bfc
ldr r0, =gUnknown_02038BFC
ldrb r1, [r0]
cmp r1, 0
bne _080B132C
ldr r0, =0x02038bd4
ldr r0, =gUnknown_02038BD4
str r1, [r0]
ldr r0, =0x02038bdc
ldr r0, =gUnknown_02038BDC
str r1, [r0]
ldr r0, =0x02038bf0
ldr r0, =gUnknown_02038BF0
b _080B1338
.pool
_080B132C:
ldr r0, =0x02038bd8
ldr r0, =gUnknown_02038BD8
movs r1, 0
str r1, [r0]
ldr r0, =0x02038be0
ldr r0, =gUnknown_02038BE0
str r1, [r0]
ldr r0, =0x02038bf4
ldr r0, =gUnknown_02038BF4
_080B1338:
str r1, [r0]
ldr r1, =0x02038bd0
ldr r1, =gUnknown_02038BD0
movs r0, 0
strh r0, [r1]
ldr r0, =0x02038be4
ldr r0, =gUnknown_02038BE4
movs r1, 0
str r1, [r0]
ldr r0, =0x02038be8
ldr r0, =gUnknown_02038BE8
str r1, [r0]
ldr r0, =0x02038bec
ldr r0, =gUnknown_02038BEC
str r1, [r0]
pop {r0}
bx r0
@@ -1665,20 +1665,20 @@ _080B13EC:
thumb_func_start battle_80801F0
battle_80801F0: @ 80B13F8
push {lr}
ldr r0, =0x02038bd0
ldr r0, =gUnknown_02038BD0
ldrh r1, [r0]
cmp r1, 0
beq _080B141A
ldr r0, =0x020375f2
ldr r0, =gUnknown_020375F2
strh r1, [r0]
lsls r0, r1, 24
lsrs r0, 24
ldr r1, =0x03005d8c
ldr r1, =gUnknown_03005D8C
ldr r2, [r1]
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
bl GetFieldObjectIdByLocalIdAndMap
ldr r1, =0x03005df0
ldr r1, =gUnknown_03005DF0
strb r0, [r1]
_080B141A:
pop {r0}
@@ -1692,7 +1692,7 @@ TrainerBattleConfigure: @ 80B1430
push {r4,r5,lr}
adds r5, r0, 0
bl InitTrainerBattleVariables
ldr r4, =0x02038bc8
ldr r4, =gUnknown_02038BC8
adds r0, r5, 0
bl TrainerBattleLoadArg8
lsls r0, 24
@@ -1736,7 +1736,7 @@ _080B14A8:
b _080B14D6
.pool
_080B14B0:
ldr r0, =0x02038bfc
ldr r0, =gUnknown_02038BFC
ldrb r0, [r0]
cmp r0, 0
bne _080B14C4
@@ -1765,7 +1765,7 @@ _080B14EC:
adds r1, r5, 0
bl TrainerBattleLoadArgs
bl battle_80801F0
ldr r4, =0x02038bca
ldr r4, =gUnknown_02038BCA
ldrh r0, [r4]
bl sub_80B2234
strh r0, [r4]
@@ -1777,7 +1777,7 @@ _080B1514:
adds r1, r5, 0
bl TrainerBattleLoadArgs
bl battle_80801F0
ldr r4, =0x02038bca
ldr r4, =gUnknown_02038BCA
ldrh r0, [r4]
bl sub_80B2234
strh r0, [r4]
@@ -1785,7 +1785,7 @@ _080B1514:
b _080B161E
.pool
_080B153C:
ldr r0, =0x02038bfc
ldr r0, =gUnknown_02038BFC
ldrb r0, [r0]
cmp r0, 0
bne _080B156C
@@ -1793,21 +1793,21 @@ _080B153C:
adds r1, r5, 0
bl TrainerBattleLoadArgs
bl battle_80801F0
ldr r0, =0x020375f2
ldr r0, =gUnknown_020375F2
ldrb r0, [r0]
bl sub_81A9AA8
ldr r1, =0x02038bca
ldr r1, =gUnknown_02038BCA
b _080B157E
.pool
_080B156C:
ldr r0, =gUnknown_08550014
adds r1, r5, 0
bl TrainerBattleLoadArgs
ldr r0, =0x020375f2
ldr r0, =gUnknown_020375F2
ldrb r0, [r0]
bl sub_81A9AA8
_080B157C:
ldr r1, =0x02038bcc
ldr r1, =gUnknown_02038BCC
_080B157E:
strh r0, [r1]
b _080B161C
@@ -1825,7 +1825,7 @@ _080B159A:
b _080B161E
.pool
_080B15A8:
ldr r0, =0x02038bfc
ldr r0, =gUnknown_02038BFC
ldrb r0, [r0]
cmp r0, 0
bne _080B15D8
@@ -1833,23 +1833,23 @@ _080B15A8:
adds r1, r5, 0
bl TrainerBattleLoadArgs
bl battle_80801F0
ldr r0, =0x020375f2
ldr r0, =gUnknown_020375F2
ldrb r0, [r0]
bl battle_init
ldr r1, =0x02038bca
ldr r1, =gUnknown_02038BCA
b _080B157E
.pool
_080B15D8:
ldr r0, =gUnknown_08550014
adds r1, r5, 0
bl TrainerBattleLoadArgs
ldr r0, =0x020375f2
ldr r0, =gUnknown_020375F2
ldrb r0, [r0]
bl battle_init
b _080B157C
.pool
_080B15F4:
ldr r0, =0x02038bfc
ldr r0, =gUnknown_02038BFC
ldrb r0, [r0]
cmp r0, 0
bne _080B1614
@@ -1880,10 +1880,10 @@ SingleTrainerWantsBattle: @ 80B162C
push {r4,lr}
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005df0
ldr r2, =gUnknown_03005DF0
strb r0, [r2]
ldr r4, =0x020375f2
ldr r3, =0x02037350
ldr r4, =gUnknown_020375F2
ldr r3, =gUnknown_02037350
lsls r2, r0, 3
adds r2, r0
lsls r2, 2
@@ -1908,10 +1908,10 @@ TwoTrainersWantBattle: @ 80B1670
push {r4,lr}
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005df0
ldr r2, =gUnknown_03005DF0
strb r0, [r2]
ldr r4, =0x020375f2
ldr r3, =0x02037350
ldr r4, =gUnknown_020375F2
ldr r3, =gUnknown_02037350
lsls r2, r0, 3
adds r2, r0
lsls r2, 2
@@ -1960,12 +1960,12 @@ GetTrainerFlagFromScriptPointer: @ 80B16B8
thumb_func_start sub_80B16D8
sub_80B16D8: @ 80B16D8
push {r4,lr}
ldr r0, =0x03005df0
ldr r0, =gUnknown_03005DF0
ldrb r0, [r0]
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, =0x02037350
ldr r0, =gUnknown_02037350
adds r4, r0
ldrb r0, [r4, 0x18]
lsls r0, 28
@@ -1984,7 +1984,7 @@ sub_80B16D8: @ 80B16D8
thumb_func_start sub_80B170C
sub_80B170C: @ 80B170C
ldr r0, =0x02038bc8
ldr r0, =gUnknown_02038BC8
ldrb r0, [r0]
bx lr
.pool
@@ -1998,7 +1998,7 @@ check_trainer_flag: @ 80B1718
lsls r0, 24
cmp r0, 0
beq _080B1734
ldr r0, =0x03005df0
ldr r0, =gUnknown_03005DF0
ldrb r0, [r0]
bl GetBattlePyramidTrainerFlag
b _080B1752
@@ -2013,7 +2013,7 @@ _080B1734:
bl FlagGet
b _080B1752
_080B174A:
ldr r0, =0x03005df0
ldr r0, =gUnknown_03005DF0
ldrb r0, [r0]
bl GetTrainerHillTrainerFlag
_080B1752:
@@ -2027,7 +2027,7 @@ _080B1752:
thumb_func_start rom_npc_set_flag_for_script_id
rom_npc_set_flag_for_script_id: @ 80B1760
push {lr}
ldr r0, =0x02038bcc
ldr r0, =gUnknown_02038BCC
ldrh r0, [r0]
cmp r0, 0
beq _080B1776
@@ -2100,16 +2100,16 @@ trainer_flag_clear: @ 80B17CC
thumb_func_start sub_80B17E0
sub_80B17E0: @ 80B17E0
push {r4,lr}
ldr r0, =0x030060a8
ldr r0, =gUnknown_030060A8
ldrb r0, [r0]
cmp r0, 0x2
bne _080B17FC
ldr r1, =0x02022fec
ldr r1, =gUnknown_02022FEC
ldr r0, =0x00008009
b _080B1800
.pool
_080B17FC:
ldr r1, =0x02022fec
ldr r1, =gUnknown_02022FEC
movs r0, 0x8
_080B1800:
str r0, [r1]
@@ -2120,19 +2120,19 @@ _080B1800:
ldr r0, =0x0000400e
movs r1, 0
bl VarSet
ldr r2, =0x02022fec
ldr r2, =gUnknown_02022FEC
ldr r0, [r2]
movs r1, 0x80
lsls r1, 14
orrs r0, r1
str r0, [r2]
ldr r0, =0x030060a8
ldr r0, =gUnknown_030060A8
ldrb r0, [r0]
cmp r0, 0x2
bne _080B1864
movs r0, 0x1
bl sub_816306C
ldr r4, =0x020247a8
ldr r4, =gUnknown_020247A8
adds r0, r4, 0
bl zero_pokemon_struct
adds r0, r4, 0
@@ -2151,7 +2151,7 @@ _080B1800:
_080B1864:
movs r0, 0x1
bl sub_8163048
ldr r4, =0x020247a8
ldr r4, =gUnknown_020247A8
adds r0, r4, 0
bl zero_pokemon_struct
adds r4, 0x64
@@ -2166,13 +2166,13 @@ _080B1884:
lsls r0, 24
cmp r0, 0
beq _080B18B8
ldr r2, =0x02022fec
ldr r2, =gUnknown_02022FEC
ldr r0, [r2]
movs r1, 0x80
lsls r1, 19
orrs r0, r1
str r0, [r2]
ldr r0, =0x030060a8
ldr r0, =gUnknown_030060A8
ldrb r0, [r0]
cmp r0, 0x2
bne _080B18B0
@@ -2184,18 +2184,18 @@ _080B18B0:
_080B18B4:
bl sub_81D61E8
_080B18B8:
ldr r1, =0x02038bf9
ldr r2, =0x030060a8
ldr r1, =gUnknown_02038BF9
ldr r2, =gUnknown_030060A8
ldrb r0, [r2]
strb r0, [r1]
movs r1, 0
strb r1, [r2]
ldr r0, =0x02038bf8
ldr r0, =gUnknown_02038BF8
strb r1, [r0]
ldr r1, =0x03006080
ldr r1, =gUnknown_03006080
movs r0, 0
strh r0, [r1]
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
ldr r0, =sub_80B1918
str r0, [r1, 0x8]
bl InBattlePyramid
@@ -2222,13 +2222,13 @@ _080B190C:
thumb_func_start sub_80B1918
sub_80B1918: @ 80B1918
push {lr}
ldr r0, =0x02038bca
ldr r0, =gUnknown_02038BCA
ldrh r1, [r0]
movs r0, 0x80
lsls r0, 3
cmp r1, r0
beq _080B1946
ldr r0, =0x0202433a
ldr r0, =gUnknown_0202433A
ldrb r0, [r0]
bl battle_exit_is_player_defeat
cmp r0, 0x1
@@ -2273,7 +2273,7 @@ _080B198A:
thumb_func_start sub_80B1994
sub_80B1994: @ 80B1994
push {lr}
ldr r0, =0x02038bca
ldr r0, =gUnknown_02038BCA
ldrh r1, [r0]
movs r0, 0x80
lsls r0, 3
@@ -2284,7 +2284,7 @@ sub_80B1994: @ 80B1994
b _080B19E2
.pool
_080B19B4:
ldr r0, =0x0202433a
ldr r0, =gUnknown_0202433A
ldrb r0, [r0]
bl battle_exit_is_player_defeat
cmp r0, 0x1
@@ -2308,10 +2308,10 @@ _080B19E2:
thumb_func_start sub_80B19EC
sub_80B19EC: @ 80B19EC
push {lr}
ldr r1, =0x02022fec
ldr r1, =gUnknown_02022FEC
movs r0, 0x8
str r0, [r1]
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
ldr r0, =sub_80B1994
str r0, [r1, 0x8]
bl task_add_01_battle_start_with_music_and_stats
@@ -2328,11 +2328,11 @@ sub_80B1A14: @ 80B1A14
lsls r0, 24
cmp r0, 0
beq _080B1A7C
ldr r0, =0x030060a8
ldr r0, =gUnknown_030060A8
ldrb r0, [r0]
cmp r0, 0x1
bhi _080B1A44
ldr r0, =0x020375f2
ldr r0, =gUnknown_020375F2
ldrb r0, [r0]
bl sub_81A9AA8
lsls r0, 16
@@ -2341,9 +2341,9 @@ sub_80B1A14: @ 80B1A14
b _080B1AD8
.pool
_080B1A44:
ldr r3, =0x02037350
ldr r2, =0x03006090
ldr r0, =0x02038bfc
ldr r3, =gUnknown_02037350
ldr r2, =gUnknown_03006090
ldr r0, =gUnknown_02038BFC
ldrb r1, [r0]
lsls r0, r1, 1
adds r0, r1
@@ -2366,11 +2366,11 @@ _080B1A7C:
lsls r0, 24
cmp r0, 0
beq _080B1AEC
ldr r0, =0x030060a8
ldr r0, =gUnknown_030060A8
ldrb r0, [r0]
cmp r0, 0x1
bhi _080B1AAC
ldr r0, =0x020375f2
ldr r0, =gUnknown_020375F2
ldrb r0, [r0]
bl battle_init
adds r1, r0, 0
@@ -2381,9 +2381,9 @@ _080B1A7C:
b _080B1AD8
.pool
_080B1AAC:
ldr r3, =0x02037350
ldr r2, =0x03006090
ldr r0, =0x02038bfc
ldr r3, =gUnknown_02037350
ldr r2, =gUnknown_03006090
ldr r0, =gUnknown_02038BFC
ldrb r1, [r0]
lsls r0, r1, 1
adds r0, r1
@@ -2416,7 +2416,7 @@ _080B1AF4:
thumb_func_start sub_80B1AF8
sub_80B1AF8: @ 80B1AF8
push {lr}
ldr r0, =0x02038bec
ldr r0, =gUnknown_02038BEC
ldr r0, [r0]
cmp r0, 0
bne _080B1B04
@@ -2430,28 +2430,28 @@ _080B1B04:
thumb_func_start sub_80B1B10
sub_80B1B10: @ 80B1B10
push {lr}
ldr r1, =0x02038bf8
ldr r1, =gUnknown_02038BF8
ldrb r2, [r1]
cmp r2, 0
beq _080B1B3C
movs r0, 0
strb r0, [r1]
ldr r0, =0x02038bf4
ldr r0, =gUnknown_02038BF4
ldr r2, [r0]
cmp r2, 0
beq _080B1B54
ldr r1, =0x03006080
ldr r1, =gUnknown_03006080
movs r0, 0x1
strh r0, [r1]
adds r0, r2, 0
b _080B1B56
.pool
_080B1B3C:
ldr r0, =0x02038bf0
ldr r0, =gUnknown_02038BF0
ldr r1, [r0]
cmp r1, 0
beq _080B1B54
ldr r0, =0x03006080
ldr r0, =gUnknown_03006080
strh r2, [r0]
adds r0, r1, 0
b _080B1B56
@@ -2477,18 +2477,18 @@ special_trainer_unable_to_battle: @ 80B1B60
@ void SetUpTrainerEncounterMusic()
SetUpTrainerEncounterMusic: @ 80B1B70
push {lr}
ldr r0, =0x02038bfc
ldr r0, =gUnknown_02038BFC
ldrb r0, [r0]
cmp r0, 0
bne _080B1B88
ldr r0, =0x02038bca
ldr r0, =gUnknown_02038BCA
b _080B1B8A
.pool
_080B1B88:
ldr r0, =0x02038bcc
ldr r0, =gUnknown_02038BCC
_080B1B8A:
ldrh r1, [r0]
ldr r0, =0x02038bc8
ldr r0, =gUnknown_02038BC8
ldrh r0, [r0]
cmp r0, 0x1
beq _080B1C62
@@ -2600,15 +2600,15 @@ _080B1C74:
thumb_func_start sub_80B1C7C
sub_80B1C7C: @ 80B1C7C
push {lr}
ldr r0, =0x02038bfc
ldr r0, =gUnknown_02038BFC
ldrb r0, [r0]
cmp r0, 0
beq _080B1C94
ldr r0, =0x02038bd8
ldr r0, =gUnknown_02038BD8
b _080B1C96
.pool
_080B1C94:
ldr r0, =0x02038bd4
ldr r0, =gUnknown_02038BD4
_080B1C96:
ldr r0, [r0]
bl ReturnEmptyStringIfNull
@@ -2620,7 +2620,7 @@ _080B1C96:
thumb_func_start sub_80B1CA4
sub_80B1CA4: @ 80B1CA4
push {r4,lr}
ldr r0, =0x02038bca
ldr r0, =gUnknown_02038BCA
ldrh r1, [r0]
movs r0, 0x80
lsls r0, 3
@@ -2630,10 +2630,10 @@ sub_80B1CA4: @ 80B1CA4
b _080B1CC0
.pool
_080B1CBC:
ldr r0, =0x02038bdc
ldr r0, =gUnknown_02038BDC
ldr r0, [r0]
_080B1CC0:
ldr r4, =0x02021fc4
ldr r4, =gUnknown_02021FC4
bl ReturnEmptyStringIfNull
adds r1, r0, 0
adds r0, r4, 0
@@ -2648,8 +2648,8 @@ _080B1CC0:
thumb_func_start sub_80B1CE0
sub_80B1CE0: @ 80B1CE0
push {r4,lr}
ldr r4, =0x02021fc4
ldr r0, =0x02038be0
ldr r4, =gUnknown_02021FC4
ldr r0, =gUnknown_02038BE0
ldr r0, [r0]
bl ReturnEmptyStringIfNull
adds r1, r0, 0
@@ -2665,7 +2665,7 @@ sub_80B1CE0: @ 80B1CE0
thumb_func_start sub_80B1D04
sub_80B1D04: @ 80B1D04
push {lr}
ldr r0, =0x02038be4
ldr r0, =gUnknown_02038BE4
ldr r0, [r0]
bl ReturnEmptyStringIfNull
pop {r1}
@@ -2676,7 +2676,7 @@ sub_80B1D04: @ 80B1D04
thumb_func_start sub_80B1D18
sub_80B1D18: @ 80B1D18
push {lr}
ldr r0, =0x02038be8
ldr r0, =gUnknown_02038BE8
ldr r0, [r0]
bl ReturnEmptyStringIfNull
pop {r1}
@@ -2801,7 +2801,7 @@ _080B1DCE:
cmp r0, 0
bne _080B1DCA
_080B1DE2:
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r1, =0x000009ca
adds r0, r1
@@ -2841,7 +2841,7 @@ _080B1E1A:
bl sub_80B1D94
cmp r0, 0
bne _080B1E74
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r1, =0x000009ca
adds r0, r1
@@ -2920,7 +2920,7 @@ sub_80B1EC0: @ 80B1EC0
movs r1, 0
adds r3, r0, 0
adds r3, 0xA
ldr r5, =0x03005d8c
ldr r5, =gUnknown_03005D8C
_080B1ED2:
ldrh r0, [r3]
cmp r0, r4
@@ -2994,7 +2994,7 @@ sub_80B1F38: @ 80B1F38
beq _080B1F6C
cmp r1, 0x63
bgt _080B1F6C
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r2, =0x000009ca
adds r0, r2
@@ -3025,7 +3025,7 @@ sub_80B1F74: @ 80B1F74
beq _080B1FA8
cmp r1, 0x63
bgt _080B1FA8
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r2, =0x000009ca
adds r0, r2
@@ -3153,7 +3153,7 @@ sub_80B205C: @ 80B205C
negs r0, r0
cmp r1, r0
beq _080B207E
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r2, =0x000009ca
adds r0, r2
@@ -3202,7 +3202,7 @@ sub_80B20BC: @ 80B20BC
lsls r0, 24
cmp r0, 0
beq _080B20E2
ldr r0, =0x02038bca
ldr r0, =gUnknown_02038BCA
ldrh r0, [r0]
bl sub_80B208C
adds r1, r0, 0
@@ -3284,7 +3284,7 @@ sub_80B215C: @ 80B215C
bl sub_80B2128
cmp r0, 0
beq _080B2184
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r2, =0x000009c8
adds r1, r0, r2
@@ -3309,7 +3309,7 @@ sub_80B2188: @ 80B2188
bl sub_80B2128
cmp r0, 0
beq _080B21AC
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r1, =0x000009c8
adds r0, r1
@@ -3342,7 +3342,7 @@ sub_80B21B4: @ 80B21B4
bl sub_80B1DFC
cmp r0, 0x1
bne _080B21E0
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r1, =0x000009c8
adds r0, r1
@@ -3423,7 +3423,7 @@ sub_80B2250: @ 80B2250
sub_80B226C: @ 80B226C
push {r4,r5,lr}
ldr r5, =gUnknown_085500A4
ldr r4, =0x02038bca
ldr r4, =gUnknown_02038BCA
ldrh r1, [r4]
adds r0, r5, 0
bl sub_80B1F38
@@ -3449,7 +3449,7 @@ _080B229A:
sub_80B22A0: @ 80B22A0
push {lr}
ldr r0, =gUnknown_085500A4
ldr r1, =0x02038bca
ldr r1, =gUnknown_02038BCA
ldrh r1, [r1]
bl sub_80B1F74
lsls r0, 24
@@ -3463,7 +3463,7 @@ sub_80B22A0: @ 80B22A0
sub_80B22BC: @ 80B22BC
push {lr}
ldr r0, =gUnknown_085500A4
ldr r1, =0x02038bca
ldr r1, =gUnknown_02038BCA
ldrh r1, [r1]
bl sub_80B205C
bl rom_npc_set_flag_for_script_id
@@ -3475,24 +3475,24 @@ sub_80B22BC: @ 80B22BC
thumb_func_start CheckIfMultipleTrainersWantBattle
CheckIfMultipleTrainersWantBattle: @ 80B22D8
push {lr}
ldr r1, =0x02038bf9
ldr r1, =gUnknown_02038BF9
ldrb r0, [r1]
cmp r0, 0x1
bls _080B2300
movs r0, 0
strb r0, [r1]
ldr r1, =0x02038bf8
ldr r1, =gUnknown_02038BF8
movs r0, 0x1
strb r0, [r1]
ldr r1, =0x020375f0
ldr r1, =gUnknown_020375F0
movs r0, 0x1
b _080B230A
.pool
_080B2300:
ldr r1, =0x02038bf8
ldr r1, =gUnknown_02038BF8
movs r0, 0
strb r0, [r1]
ldr r1, =0x020375f0
ldr r1, =gUnknown_020375F0
movs r0, 0
_080B230A:
strh r0, [r1]
asm/battle_transition.s
+259 -259
View File
File diff suppressed because it is too large Load Diff
asm/berry.s
+33 -33
View File
@@ -12,7 +12,7 @@ sub_80E15B8: @ 80E15B8
mov r1, sp
movs r0, 0
strh r0, [r1]
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r1, [r0]
ldr r0, =0x000031f8
adds r1, r0
@@ -29,7 +29,7 @@ sub_80E15B8: @ 80E15B8
sub_80E15E4: @ 80E15E4
push {r4,lr}
adds r4, r0, 0
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r1, =0x000031f8
adds r3, r0, r1
@@ -69,7 +69,7 @@ _080E1618:
thumb_func_start sub_80E162C
sub_80E162C: @ 80E162C
push {r4,lr}
ldr r4, =0x03005d8c
ldr r4, =gUnknown_03005D8C
ldr r1, [r4]
ldr r2, =0x0000320c
adds r0, r1, r2
@@ -112,7 +112,7 @@ GetBerryInfo: @ 80E167C
bl sub_80E162C
cmp r0, 0
beq _080E16A0
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r1, =0x000031f8
b _080E16B4
@@ -141,7 +141,7 @@ _080E16B4:
@ struct BerryTreeInfo *GetBerryTreeInfo(u8 berryTreeId)
GetBerryTreeInfo: @ 80E16C0
lsls r0, 24
ldr r1, =0x03005d8c
ldr r1, =gUnknown_03005D8C
lsrs r0, 21
ldr r2, =0x0000169c
adds r0, r2
@@ -156,7 +156,7 @@ GetBerryTreeInfo: @ 80E16C0
@ bool8 FieldObjectInteractionWaterBerryTree()
FieldObjectInteractionWaterBerryTree: @ 80E16DC
push {lr}
ldr r0, =0x03005df0
ldr r0, =gUnknown_03005DF0
ldrb r0, [r0]
bl FieldObjectGetBerryTreeId
lsls r0, 24
@@ -217,7 +217,7 @@ IsPlayerFacingPlantedBerryTree: @ 80E1738
ldr r1, =gUnknown_082742F9
cmp r0, r1
bne _080E1768
ldr r0, =0x03005df0
ldr r0, =gUnknown_03005DF0
ldrb r0, [r0]
bl FieldObjectGetBerryTreeId
lsls r0, 24
@@ -261,7 +261,7 @@ _080E178E:
RemoveAllBerryTrees: @ 80E1794
push {r4-r6,lr}
movs r2, 0
ldr r6, =0x03005d8c
ldr r6, =gUnknown_03005D8C
ldr r5, =0x0000169c
ldr r0, =gUnknown_0858ABD0
ldr r3, [r0]
@@ -378,7 +378,7 @@ BerryTreeTimeUpdate: @ 80E1870
adds r6, r0, 0
movs r2, 0
_080E1876:
ldr r1, =0x03005d8c
ldr r1, =gUnknown_03005D8C
lsls r0, r2, 3
ldr r3, =0x0000169c
adds r0, r3
@@ -518,7 +518,7 @@ _080E197A:
@ void RemoveBerryTree(u8 berryTreeId)
RemoveBerryTree: @ 80E1984
lsls r0, 24
ldr r1, =0x03005d8c
ldr r1, =gUnknown_03005D8C
ldr r2, [r1]
lsrs r0, 21
adds r2, r0
@@ -537,7 +537,7 @@ RemoveBerryTree: @ 80E1984
@ u8 GetBerryTypeByBerryTreeId(u8 berryTreeId)
GetBerryTypeByBerryTreeId: @ 80E19AC
lsls r0, 24
ldr r1, =0x03005d8c
ldr r1, =gUnknown_03005D8C
ldr r1, [r1]
lsrs r0, 21
adds r1, r0
@@ -552,7 +552,7 @@ GetBerryTypeByBerryTreeId: @ 80E19AC
@ u8 GetStageByBerryTreeId(u8 berryTreeId)
GetStageByBerryTreeId: @ 80E19C8
lsls r0, 24
ldr r1, =0x03005d8c
ldr r1, =gUnknown_03005D8C
ldr r1, [r1]
lsrs r0, 21
adds r1, r0
@@ -793,7 +793,7 @@ CalcBerryYield: @ 80E1B38
@ u8 GetBerryCountByBerryTreeId(u8 berryTreeId)
GetBerryCountByBerryTreeId: @ 80E1B64
lsls r0, 24
ldr r1, =0x03005d8c
ldr r1, =gUnknown_03005D8C
ldr r1, [r1]
lsrs r0, 21
adds r1, r0
@@ -825,7 +825,7 @@ GetStageDurationByBerryType: @ 80E1B7C
@ void FieldObjectInteractionGetBerryTreeData()
FieldObjectInteractionGetBerryTreeData: @ 80E1B94
push {r4-r6,lr}
ldr r0, =0x03005df0
ldr r0, =gUnknown_03005DF0
ldrb r0, [r0]
bl FieldObjectGetBerryTreeId
lsls r0, 24
@@ -836,9 +836,9 @@ FieldObjectInteractionGetBerryTreeData: @ 80E1B94
lsrs r6, r0, 24
adds r0, r5, 0
bl ResetBerryTreeSparkleFlag
ldr r0, =0x020375f2
ldr r0, =gUnknown_020375F2
ldrb r0, [r0]
ldr r1, =0x03005d8c
ldr r1, =gUnknown_03005D8C
ldr r2, [r1]
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
@@ -846,32 +846,32 @@ FieldObjectInteractionGetBerryTreeData: @ 80E1B94
lsls r0, 24
cmp r0, 0
beq _080E1BE0
ldr r1, =0x020375e0
ldr r1, =gUnknown_020375E0
movs r0, 0xFF
strh r0, [r1]
b _080E1BEE
.pool
_080E1BE0:
ldr r4, =0x020375e0
ldr r4, =gUnknown_020375E0
adds r0, r5, 0
bl GetStageByBerryTreeId
lsls r0, 24
lsrs r0, 24
strh r0, [r4]
_080E1BEE:
ldr r4, =0x020375e2
ldr r4, =gUnknown_020375E2
adds r0, r5, 0
bl GetNumStagesWateredByBerryTreeId
lsls r0, 24
lsrs r0, 24
strh r0, [r4]
ldr r4, =0x020375e4
ldr r4, =gUnknown_020375E4
adds r0, r5, 0
bl GetBerryCountByBerryTreeId
lsls r0, 24
lsrs r0, 24
strh r0, [r4]
ldr r1, =0x02021cc4
ldr r1, =gUnknown_02021CC4
ldrh r2, [r4]
adds r0, r6, 0
bl GetBerryCountStringByBerryType
@@ -885,7 +885,7 @@ _080E1BEE:
@ void FieldObjectInteractionGetBerryName()
FieldObjectInteractionGetBerryName: @ 80E1C2C
push {lr}
ldr r0, =0x03005df0
ldr r0, =gUnknown_03005DF0
ldrb r0, [r0]
bl FieldObjectGetBerryTreeId
lsls r0, 24
@@ -893,7 +893,7 @@ FieldObjectInteractionGetBerryName: @ 80E1C2C
bl GetBerryTypeByBerryTreeId
lsls r0, 24
lsrs r0, 24
ldr r1, =0x02021cc4
ldr r1, =gUnknown_02021CC4
bl GetBerryNameByBerryType
pop {r0}
bx r0
@@ -904,7 +904,7 @@ FieldObjectInteractionGetBerryName: @ 80E1C2C
@ void FieldObjectInteractionGetBerryCountString()
FieldObjectInteractionGetBerryCountString: @ 80E1C54
push {r4,r5,lr}
ldr r0, =0x03005df0
ldr r0, =gUnknown_03005DF0
ldrb r0, [r0]
bl FieldObjectGetBerryTreeId
adds r4, r0, 0
@@ -920,7 +920,7 @@ FieldObjectInteractionGetBerryCountString: @ 80E1C54
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
ldr r1, =0x02021cc4
ldr r1, =gUnknown_02021CC4
adds r0, r5, 0
bl GetBerryCountStringByBerryType
pop {r4,r5}
@@ -944,13 +944,13 @@ ChooseBerry: @ 80E1C94
@ void FieldObjectInteractionPlantBerryTree()
FieldObjectInteractionPlantBerryTree: @ 80E1CA4
push {r4,lr}
ldr r0, =0x0203ce7c
ldr r0, =gUnknown_0203CE7C
ldrh r0, [r0]
bl ItemIdToBerryType
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, =0x03005df0
ldr r0, =gUnknown_03005DF0
ldrb r0, [r0]
bl FieldObjectGetBerryTreeId
lsls r0, 24
@@ -970,7 +970,7 @@ FieldObjectInteractionPlantBerryTree: @ 80E1CA4
@ void FieldObjectInteractionPickBerryTree()
FieldObjectInteractionPickBerryTree: @ 80E1CDC
push {r4-r6,lr}
ldr r0, =0x03005df0
ldr r0, =gUnknown_03005DF0
ldrb r0, [r0]
bl FieldObjectGetBerryTreeId
adds r5, r0, 0
@@ -980,7 +980,7 @@ FieldObjectInteractionPickBerryTree: @ 80E1CDC
bl GetBerryTypeByBerryTreeId
lsls r0, 24
lsrs r0, 24
ldr r6, =0x020375e0
ldr r6, =gUnknown_020375E0
bl BerryTypeToItemId
adds r4, r0, 0
lsls r4, 16
@@ -1005,15 +1005,15 @@ FieldObjectInteractionPickBerryTree: @ 80E1CDC
@ void FieldObjectInteractionRemoveBerryTree()
FieldObjectInteractionRemoveBerryTree: @ 80E1D28
push {lr}
ldr r0, =0x03005df0
ldr r0, =gUnknown_03005DF0
ldrb r0, [r0]
bl FieldObjectGetBerryTreeId
lsls r0, 24
lsrs r0, 24
bl RemoveBerryTree
ldr r0, =0x020375f2
ldr r0, =gUnknown_020375F2
ldrb r0, [r0]
ldr r1, =0x03005d8c
ldr r1, =gUnknown_03005D8C
ldr r2, [r1]
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
@@ -1065,7 +1065,7 @@ ResetBerryTreeSparkleFlags: @ 80E1D6C
lsls r2, 16
asrs r2, 16
mov r9, r2
ldr r4, =0x02037350
ldr r4, =gUnknown_02037350
lsls r3, 16
asrs r3, 16
mov r8, r3
asm/berry_blender.s
+312 -312
View File
File diff suppressed because it is too large Load Diff
asm/berry_tag_screen.s
+53 -53
View File
@@ -8,11 +8,11 @@
thumb_func_start sub_8177C14
sub_8177C14: @ 8177C14
push {r4,lr}
ldr r4, =0x0203bcf4
ldr r4, =gUnknown_0203BCF4
ldr r0, =0x0000180c
bl AllocZeroed
str r0, [r4]
ldr r0, =0x0203ce7c
ldr r0, =gUnknown_0203CE7C
ldrh r0, [r0]
bl ItemIdToBerryType
ldr r1, [r4]
@@ -80,7 +80,7 @@ _08177CAA:
sub_8177CB0: @ 8177CB0
push {lr}
sub sp, 0x4
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
movs r1, 0x87
lsls r1, 3
adds r0, r1
@@ -123,7 +123,7 @@ _08177D26:
b _08177DDC
_08177D2C:
bl sub_80A1A74
ldr r2, =0x02037fd4
ldr r2, =gUnknown_02037FD4
ldrb r0, [r2, 0x8]
movs r1, 0x80
orrs r0, r1
@@ -144,7 +144,7 @@ _08177D4C:
b _08177DDC
_08177D5C:
bl sub_8177E14
ldr r0, =0x0203bcf4
ldr r0, =gUnknown_0203BCF4
ldr r0, [r0]
ldr r1, =0x00001808
adds r0, r1
@@ -195,14 +195,14 @@ _08177DC2:
movs r2, 0x10
movs r3, 0
bl pal_fade_maybe
ldr r2, =0x02037fd4
ldr r2, =gUnknown_02037FD4
ldrb r1, [r2, 0x8]
movs r0, 0x7F
ands r0, r1
_08177DDA:
strb r0, [r2, 0x8]
_08177DDC:
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
movs r0, 0x87
lsls r0, 3
adds r1, r0
@@ -236,7 +236,7 @@ sub_8177E14: @ 8177E14
movs r0, 0
movs r2, 0x4
bl InitBgsFromTemplates
ldr r4, =0x0203bcf4
ldr r4, =gUnknown_0203BCF4
ldr r1, [r4]
movs r0, 0x2
bl SetBgTilemapBuffer
@@ -276,7 +276,7 @@ sub_8177E14: @ 8177E14
sub_8177E88: @ 8177E88
push {r4-r7,lr}
sub sp, 0x4
ldr r1, =0x0203bcf4
ldr r1, =gUnknown_0203BCF4
ldr r0, [r1]
ldr r2, =0x00001808
adds r0, r2
@@ -309,7 +309,7 @@ _08177ECC:
movs r2, 0
movs r3, 0
bl decompress_and_copy_tile_data_to_vram
ldr r0, =0x0203bcf4
ldr r0, =gUnknown_0203BCF4
ldr r1, [r0]
ldr r0, =0x00001808
adds r1, r0
@@ -324,7 +324,7 @@ _08177EF8:
b _08177FFC
_08177F06:
ldr r0, =gUnknown_08D9BF98
ldr r4, =0x0203bcf4
ldr r4, =gUnknown_0203BCF4
ldr r1, [r4]
bl LZDecompressWram
ldr r1, [r4]
@@ -343,13 +343,13 @@ _08177F1C:
b _08177FD6
.pool
_08177F3C:
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r0, [r0]
ldrb r0, [r0, 0x8]
cmp r0, 0
bne _08177F78
movs r2, 0
ldr r6, =0x0203bcf4
ldr r6, =gUnknown_0203BCF4
movs r5, 0x80
lsls r5, 4
ldr r4, =0x00004042
@@ -369,7 +369,7 @@ _08177F52:
.pool
_08177F78:
movs r2, 0
ldr r6, =0x0203bcf4
ldr r6, =gUnknown_0203BCF4
movs r5, 0x80
lsls r5, 4
ldr r4, =0x00005042
@@ -394,7 +394,7 @@ _08177FA8:
movs r1, 0
movs r2, 0xC0
bl decompress_palette
ldr r0, =0x0203bcf4
ldr r0, =gUnknown_0203BCF4
ldr r1, [r0]
ldr r0, =0x00001808
adds r1, r0
@@ -403,7 +403,7 @@ _08177FA8:
_08177FC8:
ldr r0, =gUnknown_0857FDEC
bl LoadCompressedObjectPic
ldr r0, =0x0203bcf4
ldr r0, =gUnknown_0203BCF4
ldr r1, [r0]
_08177FD2:
ldr r2, =0x00001808
@@ -500,7 +500,7 @@ sub_8178090: @ 8178090
sub sp, 0x8
movs r0, 0
bl GetBgTilemapBuffer
ldr r1, =0x0203bcf4
ldr r1, =gUnknown_0203BCF4
ldr r1, [r1]
movs r2, 0x80
lsls r2, 5
@@ -554,7 +554,7 @@ sub_81780F4: @ 81780F4
sub_8178110: @ 8178110
push {r4-r6,lr}
sub sp, 0x8
ldr r5, =0x0203bcf4
ldr r5, =gUnknown_0203BCF4
ldr r0, [r5]
movs r4, 0xC0
lsls r4, 5
@@ -562,17 +562,17 @@ sub_8178110: @ 8178110
ldrb r0, [r0]
bl GetBerryInfo
adds r6, r0, 0
ldr r0, =0x02021cc4
ldr r0, =gUnknown_02021CC4
ldr r1, [r5]
adds r1, r4
ldrh r1, [r1]
movs r2, 0x2
movs r3, 0x2
bl ConvertIntToDecimalString
ldr r0, =0x02021dc4
ldr r0, =gUnknown_02021DC4
adds r1, r6, 0
bl CopyString
ldr r4, =0x02021fc4
ldr r4, =gUnknown_02021FC4
ldr r1, =gUnknown_085E9263
adds r0, r4, 0
bl ExpandStringRefs
@@ -594,7 +594,7 @@ sub_8178110: @ 8178110
sub_8178174: @ 8178174
push {r4-r7,lr}
sub sp, 0xC
ldr r0, =0x0203bcf4
ldr r0, =gUnknown_0203BCF4
ldr r0, [r0]
movs r1, 0xC0
lsls r1, 5
@@ -641,17 +641,17 @@ _081781C8:
movs r1, 0x64
bl __udivsi3
adds r5, r0, 0
ldr r0, =0x02021cc4
ldr r0, =gUnknown_02021CC4
adds r1, r5, 0
movs r2, 0
movs r3, 0x2
bl ConvertIntToDecimalString
ldr r0, =0x02021dc4
ldr r0, =gUnknown_02021DC4
adds r1, r4, 0
movs r2, 0
movs r3, 0x2
bl ConvertIntToDecimalString
ldr r4, =0x02021fc4
ldr r4, =gUnknown_02021FC4
ldr r1, =gUnknown_085E9233
adds r0, r4, 0
bl ExpandStringRefs
@@ -686,7 +686,7 @@ _08178242:
itemid_copy_name: @ 8178250
push {r4-r6,lr}
sub sp, 0xC
ldr r0, =0x0203bcf4
ldr r0, =gUnknown_0203BCF4
ldr r0, [r0]
movs r1, 0xC0
lsls r1, 5
@@ -744,7 +744,7 @@ _081782C2:
sub_81782D0: @ 81782D0
push {lr}
sub sp, 0xC
ldr r0, =0x0203bcf4
ldr r0, =gUnknown_0203BCF4
ldr r0, [r0]
movs r1, 0xC0
lsls r1, 5
@@ -771,7 +771,7 @@ sub_81782D0: @ 81782D0
sub_8178304: @ 8178304
push {lr}
sub sp, 0xC
ldr r0, =0x0203bcf4
ldr r0, =gUnknown_0203BCF4
ldr r0, [r0]
movs r1, 0xC0
lsls r1, 5
@@ -797,7 +797,7 @@ sub_8178304: @ 8178304
thumb_func_start sub_8178338
sub_8178338: @ 8178338
push {r4,lr}
ldr r4, =0x0203bcf4
ldr r4, =gUnknown_0203BCF4
ldr r0, [r4]
movs r1, 0xC0
lsls r1, 5
@@ -822,7 +822,7 @@ sub_8178338: @ 8178338
thumb_func_start sub_817836C
sub_817836C: @ 817836C
push {lr}
ldr r0, =0x0203bcf4
ldr r0, =gUnknown_0203BCF4
ldr r0, [r0]
ldr r1, =0x00001802
adds r0, r1
@@ -830,7 +830,7 @@ sub_817836C: @ 817836C
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =0x02020630
ldr r1, =gUnknown_02020630
adds r0, r1
bl RemoveObjectAndFreeTiles
bl sub_80D510C
@@ -844,7 +844,7 @@ sub_817839C: @ 817839C
push {r4,lr}
movs r0, 0x40
bl sub_80D518C
ldr r4, =0x0203bcf4
ldr r4, =gUnknown_0203BCF4
ldr r1, [r4]
ldr r2, =0x00001803
adds r1, r2
@@ -882,7 +882,7 @@ sub_817839C: @ 817839C
thumb_func_start sub_8178404
sub_8178404: @ 8178404
push {r4,r5,lr}
ldr r4, =0x0203bcf4
ldr r4, =gUnknown_0203BCF4
ldr r0, [r4]
movs r1, 0xC0
lsls r1, 5
@@ -893,7 +893,7 @@ sub_8178404: @ 8178404
ldrb r0, [r5, 0x15]
cmp r0, 0
beq _08178448
ldr r3, =0x02020630
ldr r3, =gUnknown_02020630
ldr r0, [r4]
ldr r1, =0x00001803
adds r0, r1
@@ -910,7 +910,7 @@ sub_8178404: @ 8178404
b _08178462
.pool
_08178448:
ldr r3, =0x02020630
ldr r3, =gUnknown_02020630
ldr r0, [r4]
ldr r1, =0x00001803
adds r0, r1
@@ -929,7 +929,7 @@ _08178462:
ldrb r0, [r5, 0x16]
cmp r0, 0
beq _0817849C
ldr r3, =0x0203bcf4
ldr r3, =gUnknown_0203BCF4
ldr r0, [r3]
ldr r1, =0x00001804
adds r0, r1
@@ -946,7 +946,7 @@ _08178462:
b _081784B6
.pool
_0817849C:
ldr r3, =0x0203bcf4
ldr r3, =gUnknown_0203BCF4
ldr r0, [r3]
ldr r1, =0x00001804
adds r0, r1
@@ -1071,7 +1071,7 @@ sub_8178594: @ 8178594
push {r4,lr}
movs r4, 0
_08178598:
ldr r0, =0x0203bcf4
ldr r0, =gUnknown_0203BCF4
ldr r0, [r0]
ldr r1, =0x00001803
adds r0, r1
@@ -1080,7 +1080,7 @@ _08178598:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =0x02020630
ldr r1, =gUnknown_02020630
adds r0, r1
bl RemoveObjectAndFreeTiles
adds r0, r4, 0x1
@@ -1110,7 +1110,7 @@ sub_81785D0: @ 81785D0
movs r2, 0
movs r3, 0x10
bl pal_fade_maybe
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
@@ -1129,7 +1129,7 @@ sub_8178610: @ 8178610
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =0x02037fd4
ldr r0, =gUnknown_02037FD4
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1137,7 +1137,7 @@ sub_8178610: @ 8178610
bne _08178642
bl sub_817836C
bl sub_8178594
ldr r0, =0x0203bcf4
ldr r0, =gUnknown_0203BCF4
ldr r0, [r0]
bl Free
bl FreeAllWindowBuffers
@@ -1158,13 +1158,13 @@ sub_8178654: @ 8178654
lsls r0, 24
lsrs r2, r0, 24
adds r4, r2, 0
ldr r0, =0x02037fd4
ldr r0, =gUnknown_02037FD4
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
cmp r0, 0
bne _081786A6
ldr r3, =0x030022c0
ldr r3, =gUnknown_030022C0
ldrh r0, [r3, 0x30]
movs r1, 0xF0
ands r1, r0
@@ -1206,9 +1206,9 @@ sub_81786AC: @ 81786AC
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
ldr r2, =0x03005e08
ldr r2, =gTasks + 0x8
adds r4, r0, r2
ldr r2, =0x0203ce58
ldr r2, =gUnknown_0203CE58
ldrh r0, [r2, 0xE]
ldrh r2, [r2, 0x18]
adds r0, r2
@@ -1242,7 +1242,7 @@ _081786F6:
lsls r0, r7, 24
asrs r0, 24
bl sub_8178728
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
@@ -1259,7 +1259,7 @@ _08178718:
thumb_func_start sub_8178728
sub_8178728: @ 8178728
push {r4-r6,lr}
ldr r5, =0x0203ce70
ldr r5, =gUnknown_0203CE70
adds r6, r5, 0
subs r6, 0xA
lsls r0, 24
@@ -1312,7 +1312,7 @@ _0817877A:
lsls r0, 16
lsrs r0, 16
bl ItemIdToBerryType
ldr r1, =0x0203bcf4
ldr r1, =gUnknown_0203BCF4
ldr r1, [r1]
lsls r0, 24
lsrs r0, 24
@@ -1337,7 +1337,7 @@ sub_81787AC: @ 81787AC
lsls r0, 2
add r0, r8
lsls r0, 3
ldr r1, =0x03005e08
ldr r1, =gTasks + 0x8
adds r6, r0, r1
ldrh r0, [r6]
adds r0, 0x10
@@ -1475,8 +1475,8 @@ _081788A6:
_081788B8:
ldrh r5, [r6]
_081788BA:
ldr r2, =0x02020630
ldr r3, =0x0203bcf4
ldr r2, =gUnknown_02020630
ldr r3, =gUnknown_0203BCF4
ldr r0, [r3]
ldr r1, =0x00001802
adds r0, r1
@@ -1518,7 +1518,7 @@ _081788D6:
ldrsh r0, [r6, r2]
cmp r0, 0
bne _08178922
ldr r0, =0x03005e00
ldr r0, =gTasks
mov r2, r8
lsls r1, r2, 2
add r1, r8
asm/bg.s
+72 -72
View File
@@ -10,7 +10,7 @@
ResetBgs: @ 80012F0
push {lr}
bl ResetBgControlStructs
ldr r1, =0x030008e0
ldr r1, =gUnknown_030008E0
movs r0, 0
strh r0, [r1, 0x10]
bl SetTextModeAndHideBgs
@@ -24,7 +24,7 @@ ResetBgs: @ 80012F0
SetBgModeInternal: @ 8001308
lsls r0, 24
lsrs r0, 24
ldr r3, =0x030008e0
ldr r3, =gUnknown_030008E0
ldrh r2, [r3, 0x10]
ldr r1, =0x0000fff8
ands r1, r2
@@ -37,7 +37,7 @@ SetBgModeInternal: @ 8001308
thumb_func_start GetBgMode
@ u8 GetBgMode()
GetBgMode: @ 8001324
ldr r0, =0x030008e0
ldr r0, =gUnknown_030008E0
ldrb r1, [r0, 0x10]
movs r0, 0x7
ands r0, r1
@@ -49,7 +49,7 @@ GetBgMode: @ 8001324
@ void ResetBgControlStructs()
ResetBgControlStructs: @ 8001334
push {lr}
ldr r2, =0x030008e0
ldr r2, =gUnknown_030008E0
ldr r0, =gZeroedBgControlStruct
ldr r0, [r0]
adds r1, r2, 0
@@ -75,7 +75,7 @@ Unused_ResetBgControlStruct: @ 8001354
lsls r0, 24
cmp r0, 0
bne _08001372
ldr r1, =0x030008e0
ldr r1, =gUnknown_030008E0
lsls r0, r4, 2
adds r0, r1
ldr r1, =gZeroedBgControlStruct
@@ -133,7 +133,7 @@ SetBgControlAttributes: @ 8001380
mov r12, r0
cmp r0, 0
bne _08001498
ldr r2, =0x030008e0
ldr r2, =gUnknown_030008E0
mov r8, r2
mov r0, r10
cmp r0, 0xFF
@@ -262,7 +262,7 @@ GetBgControlAttribute: @ 80014AC
lsls r0, 24
cmp r0, 0
bne _08001558
ldr r1, =0x030008e0
ldr r1, =gUnknown_030008E0
lsls r2, r4, 2
adds r0, r2, r1
ldrb r0, [r0]
@@ -364,7 +364,7 @@ LoadBgVram: @ 8001560
lsls r0, 24
cmp r0, 0
bne _080015D8
ldr r1, =0x030008e0
ldr r1, =gUnknown_030008E0
lsls r0, r4, 2
adds r1, r0, r1
ldrb r0, [r1]
@@ -430,7 +430,7 @@ ShowBgInternal: @ 80015E8
lsls r0, 24
cmp r0, 0
bne _08001656
ldr r5, =0x030008e0
ldr r5, =gUnknown_030008E0
lsls r0, r4, 2
adds r2, r0, r5
ldrb r3, [r2]
@@ -493,7 +493,7 @@ HideBgInternal: @ 8001664
lsls r0, 24
cmp r0, 0
bne _0800168A
ldr r2, =0x030008e0
ldr r2, =gUnknown_030008E0
adds r0, r4, 0
adds r0, 0x8
movs r1, 0x1
@@ -518,7 +518,7 @@ SyncBgVisibilityAndMode: @ 8001698
bl GetGpuReg
ldr r1, =0x0000f0f8
ands r1, r0
ldr r0, =0x030008e0
ldr r0, =gUnknown_030008E0
ldrh r0, [r0, 0x10]
orrs r1, r0
movs r0, 0
@@ -568,7 +568,7 @@ SetBgAffineInternal: @ 80016D8
lsrs r4, 16
lsls r5, 16
lsrs r5, 16
ldr r0, =0x030008e0
ldr r0, =gUnknown_030008E0
ldrh r0, [r0, 0x10]
movs r1, 0x7
ands r1, r0
@@ -671,7 +671,7 @@ ResetBgsAndClearDma3BusyFlags: @ 80017BC
push {r4,lr}
adds r4, r0, 0
bl ResetBgs
ldr r1, =0x03000938
ldr r1, =gUnknown_03000938
movs r2, 0
adds r0, r1, 0
adds r0, 0xC
@@ -680,7 +680,7 @@ _080017CC:
subs r0, 0x4
cmp r0, r1
bge _080017CC
ldr r0, =0x03002f54
ldr r0, =gUnknown_03002F54
str r4, [r0]
pop {r4}
pop {r0}
@@ -707,7 +707,7 @@ InitBgsFromTemplates: @ 80017E8
cmp r4, 0
beq _08001894
movs r7, 0
ldr r0, =0x030008f8
ldr r0, =gUnknown_030008F8
mov r9, r0
movs r2, 0xC
add r2, r9
@@ -816,7 +816,7 @@ InitBgFromTemplate: @ 80018B0
str r6, [sp, 0xC]
adds r0, r5, 0
bl SetBgControlAttributes
ldr r4, =0x030008f8
ldr r4, =gUnknown_030008F8
lsls r5, 4
adds r3, r5, r4
ldr r1, [r7]
@@ -886,7 +886,7 @@ LoadBgTiles: @ 8001944
lsls r0, 16
cmp r0, 0
bne _08001980
ldr r1, =0x030008f8
ldr r1, =gUnknown_030008F8
lsls r0, r5, 4
adds r0, r1
ldrh r0, [r0]
@@ -897,7 +897,7 @@ LoadBgTiles: @ 8001944
b _08001990
.pool
_08001980:
ldr r1, =0x030008f8
ldr r1, =gUnknown_030008F8
lsls r0, r5, 4
adds r0, r1
ldrh r0, [r0]
@@ -923,7 +923,7 @@ _08001990:
b _080019E6
.pool
_080019B8:
ldr r0, =0x03000938
ldr r0, =gUnknown_03000938
lsrs r2, 29
lsls r2, 2
adds r2, r0
@@ -934,7 +934,7 @@ _080019B8:
ldr r0, [r2]
orrs r0, r1
str r0, [r2]
ldr r0, =0x03002f54
ldr r0, =gUnknown_03002F54
ldr r0, [r0]
cmp r0, 0x1
bne _080019E4
@@ -974,7 +974,7 @@ LoadBgTilemap: @ 80019FC
lsrs r3, r2, 24
cmp r3, 0xFF
beq _08001A3C
ldr r0, =0x03000938
ldr r0, =gUnknown_03000938
lsrs r2, 29
lsls r2, 2
adds r2, r0
@@ -1013,7 +1013,7 @@ Unused_LoadBgPalette: @ 8001A4C
bl IsInvalidBg_
cmp r0, 0
bne _08001A98
ldr r1, =0x030008f8
ldr r1, =gUnknown_030008F8
lsls r0, r4, 4
adds r0, r1
ldrb r1, [r0, 0x1]
@@ -1042,7 +1042,7 @@ _08001A98:
b _08001AC8
.pool
_08001AA4:
ldr r4, =0x03000938
ldr r4, =gUnknown_03000938
adds r0, r1, 0
cmp r1, 0
bge _08001AAE
@@ -1087,7 +1087,7 @@ _08001AE4:
subs r0, r5, r0
lsls r0, 24
lsrs r0, 24
ldr r1, =0x03000938
ldr r1, =gUnknown_03000938
lsrs r2, 22
adds r4, r2, r1
movs r6, 0x1
@@ -1344,7 +1344,7 @@ _08001CDE:
lsrs r0, 16
b _08001CFA
_08001CE4:
ldr r0, =0x030008f8
ldr r0, =gUnknown_030008F8
lsls r1, r4, 4
adds r1, r0
ldrh r0, [r1]
@@ -1392,7 +1392,7 @@ _08001D2E:
cmp r5, 0x2
beq _08001D60
_08001D3A:
ldr r0, =0x030008f8
ldr r0, =gUnknown_030008F8
lsls r1, r4, 4
adds r0, 0x8
adds r0, r1, r0
@@ -1401,7 +1401,7 @@ _08001D3A:
b _08001D70
.pool
_08001D4C:
ldr r0, =0x030008f8
ldr r0, =gUnknown_030008F8
lsls r2, r4, 4
adds r0, 0x8
adds r0, r2, r0
@@ -1410,7 +1410,7 @@ _08001D4C:
b _08001D6C
.pool
_08001D60:
ldr r0, =0x030008f8
ldr r0, =gUnknown_030008F8
lsls r2, r4, 4
adds r0, 0x8
adds r0, r2, r0
@@ -1438,7 +1438,7 @@ _08001D8C:
beq _08001DF8
b _08001E2C
_08001D96:
ldr r0, =0x030008f8
ldr r0, =gUnknown_030008F8
ldr r0, [r0, 0x8]
lsls r0, 8
lsrs r1, r0, 16
@@ -1447,7 +1447,7 @@ _08001D96:
b _08001E2C
.pool
_08001DAC:
ldr r0, =0x030008f8
ldr r0, =gUnknown_030008F8
ldr r0, [r0, 0x18]
lsls r0, 8
lsrs r1, r0, 16
@@ -1458,7 +1458,7 @@ _08001DAC:
_08001DC0:
cmp r0, 0
bne _08001DD8
ldr r0, =0x030008f8
ldr r0, =gUnknown_030008F8
ldr r0, [r0, 0x28]
lsls r0, 8
lsrs r1, r0, 16
@@ -1467,7 +1467,7 @@ _08001DC0:
b _08001E2C
.pool
_08001DD8:
ldr r0, =0x030008f8
ldr r0, =gUnknown_030008F8
ldr r0, [r0, 0x28]
lsrs r1, r0, 16
lsls r0, 16
@@ -1482,7 +1482,7 @@ _08001DD8:
_08001DF8:
cmp r0, 0
bne _08001E10
ldr r0, =0x030008f8
ldr r0, =gUnknown_030008F8
ldr r0, [r0, 0x38]
lsls r0, 8
lsrs r1, r0, 16
@@ -1493,7 +1493,7 @@ _08001DF8:
_08001E10:
cmp r0, 0x2
bne _08001E2C
ldr r0, =0x030008f8
ldr r0, =gUnknown_030008F8
ldr r0, [r0, 0x38]
lsrs r1, r0, 16
lsls r0, 16
@@ -1504,7 +1504,7 @@ _08001E10:
adds r1, r4, 0
bl SetGpuReg
_08001E2C:
ldr r0, =0x030008f8
ldr r0, =gUnknown_030008F8
adds r0, 0x8
adds r0, r5, r0
ldr r0, [r0]
@@ -1531,7 +1531,7 @@ GetBgX: @ 8001E40
lsls r0, 16
cmp r0, 0
beq _08001E70
ldr r0, =0x030008f8
ldr r0, =gUnknown_030008F8
lsls r1, r4, 4
adds r0, 0x8
adds r1, r0
@@ -1578,7 +1578,7 @@ _08001EA6:
cmp r5, 0x2
beq _08001ED8
_08001EB2:
ldr r0, =0x030008f8
ldr r0, =gUnknown_030008F8
lsls r1, r4, 4
adds r0, 0xC
adds r0, r1, r0
@@ -1587,7 +1587,7 @@ _08001EB2:
b _08001EE8
.pool
_08001EC4:
ldr r0, =0x030008f8
ldr r0, =gUnknown_030008F8
lsls r2, r4, 4
adds r0, 0xC
adds r0, r2, r0
@@ -1596,7 +1596,7 @@ _08001EC4:
b _08001EE4
.pool
_08001ED8:
ldr r0, =0x030008f8
ldr r0, =gUnknown_030008F8
lsls r2, r4, 4
adds r0, 0xC
adds r0, r2, r0
@@ -1624,7 +1624,7 @@ _08001F04:
beq _08001F70
b _08001FA4
_08001F0E:
ldr r0, =0x030008f8
ldr r0, =gUnknown_030008F8
ldr r0, [r0, 0xC]
lsls r0, 8
lsrs r1, r0, 16
@@ -1633,7 +1633,7 @@ _08001F0E:
b _08001FA4
.pool
_08001F24:
ldr r0, =0x030008f8
ldr r0, =gUnknown_030008F8
ldr r0, [r0, 0x1C]
lsls r0, 8
lsrs r1, r0, 16
@@ -1644,7 +1644,7 @@ _08001F24:
_08001F38:
cmp r0, 0
bne _08001F50
ldr r0, =0x030008f8
ldr r0, =gUnknown_030008F8
ldr r0, [r0, 0x2C]
lsls r0, 8
lsrs r1, r0, 16
@@ -1653,7 +1653,7 @@ _08001F38:
b _08001FA4
.pool
_08001F50:
ldr r0, =0x030008f8
ldr r0, =gUnknown_030008F8
ldr r0, [r0, 0x2C]
lsrs r1, r0, 16
lsls r0, 16
@@ -1668,7 +1668,7 @@ _08001F50:
_08001F70:
cmp r0, 0
bne _08001F88
ldr r0, =0x030008f8
ldr r0, =gUnknown_030008F8
ldr r0, [r0, 0x3C]
lsls r0, 8
lsrs r1, r0, 16
@@ -1679,7 +1679,7 @@ _08001F70:
_08001F88:
cmp r0, 0x2
bne _08001FA4
ldr r0, =0x030008f8
ldr r0, =gUnknown_030008F8
ldr r0, [r0, 0x3C]
lsrs r1, r0, 16
lsls r0, 16
@@ -1690,7 +1690,7 @@ _08001F88:
adds r1, r4, 0
bl SetGpuReg
_08001FA4:
ldr r0, =0x030008f8
ldr r0, =gUnknown_030008F8
adds r0, 0xC
adds r0, r5, r0
ldr r0, [r0]
@@ -1732,7 +1732,7 @@ _08001FE2:
cmp r5, 0x2
beq _08002014
_08001FEE:
ldr r0, =0x030008f8
ldr r0, =gUnknown_030008F8
lsls r1, r4, 4
adds r0, 0xC
adds r0, r1, r0
@@ -1741,7 +1741,7 @@ _08001FEE:
b _08002024
.pool
_08002000:
ldr r0, =0x030008f8
ldr r0, =gUnknown_030008F8
lsls r2, r4, 4
adds r0, 0xC
adds r0, r2, r0
@@ -1750,7 +1750,7 @@ _08002000:
b _08002020
.pool
_08002014:
ldr r0, =0x030008f8
ldr r0, =gUnknown_030008F8
lsls r2, r4, 4
adds r0, 0xC
adds r0, r2, r0
@@ -1778,7 +1778,7 @@ _08002040:
beq _080020AC
b _080020E0
_0800204A:
ldr r0, =0x030008f8
ldr r0, =gUnknown_030008F8
ldr r0, [r0, 0xC]
lsls r0, 8
lsrs r1, r0, 16
@@ -1787,7 +1787,7 @@ _0800204A:
b _080020E0
.pool
_08002060:
ldr r0, =0x030008f8
ldr r0, =gUnknown_030008F8
ldr r0, [r0, 0x1C]
lsls r0, 8
lsrs r1, r0, 16
@@ -1798,7 +1798,7 @@ _08002060:
_08002074:
cmp r0, 0
bne _0800208C
ldr r0, =0x030008f8
ldr r0, =gUnknown_030008F8
ldr r0, [r0, 0x2C]
lsls r0, 8
lsrs r1, r0, 16
@@ -1807,7 +1807,7 @@ _08002074:
b _080020E0
.pool
_0800208C:
ldr r0, =0x030008f8
ldr r0, =gUnknown_030008F8
ldr r0, [r0, 0x2C]
lsrs r1, r0, 16
lsls r0, 16
@@ -1822,7 +1822,7 @@ _0800208C:
_080020AC:
cmp r0, 0
bne _080020C4
ldr r0, =0x030008f8
ldr r0, =gUnknown_030008F8
ldr r0, [r0, 0x3C]
lsls r0, 8
lsrs r1, r0, 16
@@ -1833,7 +1833,7 @@ _080020AC:
_080020C4:
cmp r0, 0x2
bne _080020E0
ldr r0, =0x030008f8
ldr r0, =gUnknown_030008F8
ldr r0, [r0, 0x3C]
lsrs r1, r0, 16
lsls r0, 16
@@ -1844,7 +1844,7 @@ _080020C4:
adds r1, r4, 0
bl SetGpuReg_ForcedBlank
_080020E0:
ldr r0, =0x030008f8
ldr r0, =gUnknown_030008F8
adds r0, 0xC
adds r0, r5, r0
ldr r0, [r0]
@@ -1871,7 +1871,7 @@ GetBgY: @ 80020F4
lsls r0, 16
cmp r0, 0
beq _08002124
ldr r0, =0x030008f8
ldr r0, =gUnknown_030008F8
lsls r1, r4, 4
adds r0, 0xC
adds r1, r0
@@ -2062,7 +2062,7 @@ SetBgTilemapBuffer: @ 8002250
lsls r0, 16
cmp r0, 0
beq _0800227A
ldr r0, =0x030008f8
ldr r0, =gUnknown_030008F8
lsls r1, r4, 4
adds r0, 0x4
adds r1, r0
@@ -2091,7 +2091,7 @@ UnsetBgTilemapBuffer: @ 8002284
lsls r0, 16
cmp r0, 0
beq _080022AE
ldr r0, =0x030008f8
ldr r0, =gUnknown_030008F8
lsls r1, r4, 4
adds r0, 0x4
adds r1, r0
@@ -2119,7 +2119,7 @@ GetBgTilemapBuffer: @ 80022B8
lsls r0, 16
cmp r0, 0
beq _080022E8
ldr r0, =0x030008f8
ldr r0, =gUnknown_030008F8
lsls r1, r4, 4
adds r0, 0x4
adds r1, r0
@@ -2161,7 +2161,7 @@ CopyToBgTilemapBuffer: @ 80022F0
bne _08002358
cmp r6, 0
beq _08002340
ldr r0, =0x030008f8
ldr r0, =gUnknown_030008F8
lsls r1, r4, 4
adds r0, 0x4
adds r1, r0
@@ -2174,7 +2174,7 @@ CopyToBgTilemapBuffer: @ 80022F0
b _08002358
.pool
_08002340:
ldr r0, =0x030008f8
ldr r0, =gUnknown_030008F8
mov r2, r9
lsls r1, r2, 4
adds r0, 0x4
@@ -2233,7 +2233,7 @@ _080023A6:
_080023B0:
lsrs r2, r0, 16
_080023B2:
ldr r0, =0x030008f8
ldr r0, =gUnknown_030008F8
lsls r1, r4, 4
adds r0, 0x4
adds r1, r0
@@ -2298,7 +2298,7 @@ _08002422:
bge _080024C4
mov r12, r0
lsls r1, r5, 4
ldr r0, =0x030008fc
ldr r0, =gUnknown_030008FC
adds r1, r0
mov r8, r1
_08002436:
@@ -2353,7 +2353,7 @@ _0800248E:
adds r7, r3, 0x1
cmp r2, r0
bge _080024BC
ldr r6, =0x030008fc
ldr r6, =gUnknown_030008FC
add r6, r8
ldr r1, [sp]
adds r5, r3, 0
@@ -2547,7 +2547,7 @@ _080025F8:
bge _0800265A
ldr r2, [sp, 0x4]
lsls r0, r2, 4
ldr r1, =0x030008fc
ldr r1, =gUnknown_030008FC
adds r0, r1
mov r10, r0
ldr r7, [sp, 0x20]
@@ -2619,7 +2619,7 @@ _08002674:
subs r2, r7, r2
str r2, [sp, 0x34]
str r0, [sp, 0x38]
ldr r7, =0x030008fc
ldr r7, =gUnknown_030008FC
mov r10, r7
ldr r0, [sp, 0x4]
lsls r0, 4
@@ -2722,7 +2722,7 @@ _08002756:
bge _080027F0
adds r7, r5, 0
lsls r1, r6, 4
ldr r0, =0x030008fc
ldr r0, =gUnknown_030008FC
adds r1, r0
mov r12, r1
_08002768:
@@ -2775,7 +2775,7 @@ _080027BC:
adds r6, r3, 0x1
cmp r2, r0
bge _080027E8
ldr r5, =0x030008fc
ldr r5, =gUnknown_030008FC
add r5, r12
ldr r1, [sp]
adds r4, r3, 0
@@ -2933,7 +2933,7 @@ _080028E0:
bge _08002944
mov r3, r9
lsls r1, r3, 4
ldr r0, =0x030008fc
ldr r0, =gUnknown_030008FC
adds r6, r1, r0
_080028F6:
ldr r0, [sp, 0x18]
@@ -3005,7 +3005,7 @@ _0800297A:
mov r8, r1
cmp r4, r0
bge _080029C8
ldr r2, =0x030008fc
ldr r2, =gUnknown_030008FC
add r2, r12
str r2, [sp, 0x28]
ldr r7, [sp, 0x20]
@@ -3342,7 +3342,7 @@ _08002BAC:
IsTileMapOutsideWram: @ 8002BB0
push {lr}
lsls r0, 24
ldr r1, =0x030008f8
ldr r1, =gUnknown_030008F8
lsrs r0, 20
adds r1, 0x4
adds r0, r1
asm/big_shroomish_barboach.s
+12 -12
View File
@@ -225,7 +225,7 @@ sub_80F9984: @ 80F9984
adds r7, r1, 0
lsls r0, 16
lsrs r6, r0, 16
ldr r1, =0x020375f0
ldr r1, =gUnknown_020375F0
ldrh r0, [r1]
cmp r0, 0xFF
bne _080F99A0
@@ -236,7 +236,7 @@ _080F99A0:
ldrh r1, [r1]
movs r0, 0x64
muls r1, r0
ldr r0, =0x020244ec
ldr r0, =gUnknown_020244EC
adds r5, r1, r0
adds r0, r5, 0
movs r1, 0x2D
@@ -266,7 +266,7 @@ _080F99CC:
adds r0, r6, 0
bl sub_80F989C
adds r4, r0, 0
ldr r0, =0x02021dc4
ldr r0, =gUnknown_02021DC4
adds r1, r5, 0
bl sub_80F9910
cmp r5, r4
@@ -297,9 +297,9 @@ sub_80F9A14: @ 80F9A14
adds r0, r4, 0
bl sub_80F989C
adds r1, r0, 0
ldr r0, =0x02021ec4
ldr r0, =gUnknown_02021EC4
bl sub_80F9910
ldr r0, =0x02021cc4
ldr r0, =gUnknown_02021CC4
movs r1, 0xB
muls r1, r4
ldr r2, =gSpeciesNames
@@ -310,14 +310,14 @@ sub_80F9A14: @ 80F9A14
lsls r0, 8
cmp r1, r0
bne _080F9A64
ldr r0, =0x02021dc4
ldr r0, =gUnknown_02021DC4
ldr r1, =gUnknown_085ECF6B
bl CopyString
b _080F9A6E
.pool
_080F9A64:
ldr r0, =0x02021dc4
ldr r1, =0x03005d90
ldr r0, =gUnknown_02021DC4
ldr r1, =gUnknown_03005D90
ldr r1, [r1]
bl CopyString
_080F9A6E:
@@ -359,7 +359,7 @@ sub_80F9AAC: @ 80F9AAC
ldr r0, =0x00004047
bl GetVarPointer
adds r1, r0, 0
ldr r4, =0x020375f0
ldr r4, =gUnknown_020375F0
movs r0, 0x95
lsls r0, 1
bl sub_80F9984
@@ -403,7 +403,7 @@ sub_80F9B04: @ 80F9B04
ldr r0, =0x0000404f
bl GetVarPointer
adds r1, r0, 0
ldr r4, =0x020375f0
ldr r4, =gUnknown_020375F0
ldr r0, =0x00000127
bl sub_80F9984
lsls r0, 24
@@ -438,7 +438,7 @@ sub_80F9B30: @ 80F9B30
bhi _080F9BAC
cmp r5, 0x40
bhi _080F9BAC
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r1, =0x000031a8
adds r0, r1
@@ -449,7 +449,7 @@ _080F9B6A:
movs r0, 0x64
adds r1, r5, 0
muls r1, r0
ldr r0, =0x020244ec
ldr r0, =gUnknown_020244EC
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
asm/bike.s
+73 -73
View File
@@ -15,7 +15,7 @@ MovePlayerOnBike: @ 8119164
lsrs r4, r1, 16
lsls r2, 16
lsrs r2, 16
ldr r0, =0x02037590
ldr r0, =gUnknown_02037590
ldrb r1, [r0]
movs r0, 0x2
ands r0, r1
@@ -72,7 +72,7 @@ CheckMovementInputMachBike: @ 81191CC
cmp r1, 0
bne _081191F4
strb r0, [r4]
ldr r2, =0x02037590
ldr r2, =gUnknown_02037590
ldrb r0, [r2, 0xB]
cmp r0, 0
bne _08119208
@@ -81,7 +81,7 @@ CheckMovementInputMachBike: @ 81191CC
b _0811921C
.pool
_081191F4:
ldr r2, =0x02037590
ldr r2, =gUnknown_02037590
cmp r1, r3
beq _08119218
ldrb r0, [r2, 0x2]
@@ -126,12 +126,12 @@ sub_8119238: @ 8119238
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r0, =0x02037590
ldr r0, =gUnknown_02037590
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =0x02037350
ldr r1, =gUnknown_02037350
adds r4, r0, r1
ldrb r1, [r4, 0x1E]
adds r0, r5, 0
@@ -161,12 +161,12 @@ sub_8119280: @ 8119280
lsls r0, 24
lsrs r5, r0, 24
adds r7, r5, 0
ldr r6, =0x02037590
ldr r6, =gUnknown_02037590
ldrb r1, [r6, 0x5]
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =0x02037350
ldr r1, =gUnknown_02037350
adds r4, r0, r1
ldrb r1, [r4, 0x1E]
adds r0, r5, 0
@@ -255,7 +255,7 @@ sub_8119344: @ 8119344
lsls r0, 24
lsrs r5, r0, 24
adds r7, r5, 0
ldr r6, =0x02037590
ldr r6, =gUnknown_02037590
ldrb r0, [r6, 0xB]
cmp r0, 0
beq _0811935A
@@ -352,7 +352,7 @@ CheckMovementInputAcroBike: @ 8119400
lsls r2, 16
lsrs r2, 16
ldr r4, =gUnknown_0859749C
ldr r3, =0x02037590
ldr r3, =gUnknown_02037590
ldrb r3, [r3, 0x8]
lsls r3, 2
adds r3, r4
@@ -377,7 +377,7 @@ CheckMovementInputAcroBikeNormal: @ 811942C
bl player_get_direction_upper_nybble
lsls r0, 24
lsrs r3, r0, 24
ldr r2, =0x02037590
ldr r2, =gUnknown_02037590
movs r0, 0
strb r0, [r2, 0xA]
ldrb r1, [r4]
@@ -417,11 +417,11 @@ _0811946C:
b _081194C0
_0811948A:
ldrb r0, [r4]
ldr r2, =0x02037590
ldr r2, =gUnknown_02037590
cmp r0, r3
beq _081194BC
_08119492:
ldr r0, =0x02037590
ldr r0, =gUnknown_02037590
ldrb r1, [r0, 0x2]
adds r2, r0, 0
cmp r1, 0x2
@@ -453,7 +453,7 @@ _081194C0:
CheckMovementInputAcroBikeChangingDirection: @ 81194C8
push {r4-r6,lr}
adds r5, r0, 0
ldr r4, =0x02037590
ldr r4, =gUnknown_02037590
ldrb r0, [r4, 0x9]
strb r0, [r5]
ldrb r0, [r4, 0xA]
@@ -520,12 +520,12 @@ CheckMovementInputAcroBikeStandingWheelie: @ 8119540
bl player_get_direction_upper_nybble
lsls r0, 24
lsrs r6, r0, 24
ldr r5, =0x02037590
ldr r5, =gUnknown_02037590
ldrb r1, [r5, 0x5]
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =0x02037350
ldr r1, =gUnknown_02037350
adds r1, r0, r1
movs r0, 0
strb r0, [r5, 0x2]
@@ -553,7 +553,7 @@ _08119594:
adds r0, 0x1
strb r0, [r5, 0xA]
_0811959A:
ldr r1, =0x02037590
ldr r1, =gUnknown_02037590
ldrb r0, [r1, 0xA]
cmp r0, 0x27
bls _081195B4
@@ -608,12 +608,12 @@ CheckMovementInputAcroBikeBunnyHop: @ 81195E0
lsls r0, 24
lsrs r5, r0, 24
adds r2, r5, 0
ldr r4, =0x02037590
ldr r4, =gUnknown_02037590
ldrb r1, [r4, 0x5]
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =0x02037350
ldr r1, =gUnknown_02037350
adds r7, r0, r1
movs r0, 0x2
mov r1, r8
@@ -661,7 +661,7 @@ _08119668:
movs r0, 0x6
b _08119676
_0811966E:
ldr r1, =0x02037590
ldr r1, =gUnknown_02037590
movs r0, 0x2
strb r0, [r1, 0x2]
movs r0, 0x7
@@ -693,12 +693,12 @@ CheckMovementInputAcroBikeMovingWheelie: @ 8119688
lsls r0, 24
lsrs r5, r0, 24
adds r2, r5, 0
ldr r4, =0x02037590
ldr r4, =gUnknown_02037590
ldrb r1, [r4, 0x5]
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =0x02037350
ldr r1, =gUnknown_02037350
adds r7, r0, r1
movs r0, 0x2
mov r9, r0
@@ -732,7 +732,7 @@ _081196F6:
movs r0, 0x4
b _08119750
_081196FC:
ldr r1, =0x02037590
ldr r1, =gUnknown_02037590
movs r0, 0x2
strb r0, [r1, 0x2]
movs r0, 0xC
@@ -770,7 +770,7 @@ _08119736:
movs r0, 0x5
b _08119750
_08119748:
ldr r1, =0x02037590
ldr r1, =gUnknown_02037590
movs r0, 0x2
strb r0, [r1, 0x2]
movs r0, 0xA
@@ -797,12 +797,12 @@ CheckMovementInputAcroBikeUnknownMode5: @ 8119764
lsrs r4, 16
lsls r5, 16
lsrs r5, 16
ldr r6, =0x02037590
ldr r6, =gUnknown_02037590
ldrb r1, [r6, 0x5]
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =0x02037350
ldr r1, =gUnknown_02037350
adds r0, r1
ldrb r2, [r0, 0x1]
movs r1, 0x3
@@ -836,7 +836,7 @@ CheckMovementInputAcroBikeUnknownMode6: @ 81197C0
lsrs r1, 16
lsls r2, 16
lsrs r2, 16
ldr r4, =0x02037590
ldr r4, =gUnknown_02037590
movs r3, 0
strb r3, [r4, 0x8]
bl CheckMovementInputAcroBike
@@ -863,12 +863,12 @@ sub_81197F4: @ 81197F4
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =0x02037590
ldr r0, =gUnknown_02037590
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =0x02037350
ldr r1, =gUnknown_02037350
adds r5, r0, r1
ldrb r1, [r5, 0x1E]
adds r0, r4, 0
@@ -893,12 +893,12 @@ sub_8119830: @ 8119830
lsls r0, 24
lsrs r5, r0, 24
adds r6, r5, 0
ldr r0, =0x02037590
ldr r0, =gUnknown_02037590
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =0x02037350
ldr r1, =gUnknown_02037350
adds r4, r0, r1
ldrb r1, [r4, 0x1E]
adds r0, r5, 0
@@ -961,12 +961,12 @@ sub_81198C0: @ 81198C0
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =0x02037590
ldr r0, =gUnknown_02037590
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =0x02037350
ldr r1, =gUnknown_02037350
adds r5, r0, r1
ldrb r1, [r5, 0x1E]
adds r0, r4, 0
@@ -990,12 +990,12 @@ sub_81198FC: @ 81198FC
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =0x02037590
ldr r0, =gUnknown_02037590
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =0x02037350
ldr r1, =gUnknown_02037350
adds r5, r0, r1
ldrb r1, [r5, 0x1E]
adds r0, r4, 0
@@ -1019,12 +1019,12 @@ sub_8119938: @ 8119938
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =0x02037590
ldr r0, =gUnknown_02037590
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =0x02037350
ldr r1, =gUnknown_02037350
adds r5, r0, r1
ldrb r1, [r5, 0x1E]
adds r0, r4, 0
@@ -1048,12 +1048,12 @@ sub_8119974: @ 8119974
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =0x02037590
ldr r0, =gUnknown_02037590
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =0x02037350
ldr r1, =gUnknown_02037350
adds r5, r0, r1
ldrb r1, [r5, 0x1E]
adds r0, r4, 0
@@ -1077,12 +1077,12 @@ sub_81199B0: @ 81199B0
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =0x02037590
ldr r0, =gUnknown_02037590
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =0x02037350
ldr r1, =gUnknown_02037350
adds r5, r0, r1
ldrb r1, [r5, 0x1E]
adds r0, r4, 0
@@ -1156,12 +1156,12 @@ _08119A50:
bl sub_81197F4
b _08119A84
_08119A58:
ldr r0, =0x02037590
ldr r0, =gUnknown_02037590
ldrb r0, [r0, 0x5]
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, =0x02037350
ldr r0, =gUnknown_02037350
adds r4, r0
movs r0, 0x22
bl audio_play
@@ -1198,12 +1198,12 @@ sub_8119AA4: @ 8119AA4
lsls r0, 24
lsrs r4, r0, 24
adds r6, r4, 0
ldr r7, =0x02037590
ldr r7, =gUnknown_02037590
ldrb r1, [r7, 0x5]
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =0x02037350
ldr r1, =gUnknown_02037350
adds r5, r0, r1
ldrb r1, [r5, 0x1E]
adds r0, r4, 0
@@ -1267,12 +1267,12 @@ sub_8119B34: @ 8119B34
lsls r0, 24
lsrs r4, r0, 24
adds r6, r4, 0
ldr r7, =0x02037590
ldr r7, =gUnknown_02037590
ldrb r1, [r7, 0x5]
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =0x02037350
ldr r1, =gUnknown_02037350
adds r5, r0, r1
ldrb r1, [r5, 0x1E]
adds r0, r4, 0
@@ -1336,12 +1336,12 @@ sub_8119BC4: @ 8119BC4
lsls r0, 24
lsrs r4, r0, 24
adds r6, r4, 0
ldr r0, =0x02037590
ldr r0, =gUnknown_02037590
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =0x02037350
ldr r1, =gUnknown_02037350
adds r5, r0, r1
ldrb r1, [r5, 0x1E]
adds r0, r4, 0
@@ -1396,7 +1396,7 @@ sub_8119C3C: @ 8119C3C
lsrs r3, r0, 16
lsls r1, 16
lsrs r2, r1, 16
ldr r0, =0x02037590
ldr r0, =gUnknown_02037590
ldrb r1, [r0]
movs r0, 0x4
ands r0, r1
@@ -1421,7 +1421,7 @@ sub_8119C64: @ 8119C64
bl sub_8119DF8
lsls r0, 24
lsrs r2, r0, 24
ldr r4, =0x02037590
ldr r4, =gUnknown_02037590
ldr r0, [r4, 0xC]
movs r1, 0xF
ands r0, r1
@@ -1443,7 +1443,7 @@ _08119C9A:
movs r0, 0xF
adds r2, r5, 0
ands r2, r0
ldr r4, =0x02037590
ldr r4, =gUnknown_02037590
ldr r0, [r4, 0x10]
movs r1, 0xF
ands r0, r1
@@ -1476,7 +1476,7 @@ sub_8119CCC: @ 8119CCC
ldrb r0, [r3]
cmp r0, 0
beq _08119CF6
ldr r5, =0x020375a4
ldr r5, =gUnknown_020375A4
_08119CDC:
adds r0, r2, r5
adds r1, r3, r2
@@ -1496,7 +1496,7 @@ _08119CF6:
ldrb r0, [r4]
cmp r0, 0
beq _08119D26
ldr r3, =0x020375ac
ldr r3, =gUnknown_020375AC
_08119D00:
adds r0, r2, r3
adds r1, r4, r2
@@ -1532,7 +1532,7 @@ sub_8119D30: @ 8119D30
_08119D36:
ldr r0, =gUnknown_085974C0
adds r4, r5, r0
ldr r0, =0x02037590
ldr r0, =gUnknown_02037590
ldr r1, [r0, 0xC]
ldr r2, [r0, 0x10]
ldr r0, [r4, 0x8]
@@ -1570,7 +1570,7 @@ _08119D7A:
sub_8119D80: @ 8119D80
push {r4,lr}
lsls r0, 24
ldr r3, =0x02037590
ldr r3, =gUnknown_02037590
ldr r2, [r3, 0xC]
lsls r2, 4
movs r1, 0xF0
@@ -1604,7 +1604,7 @@ _08119D9C:
sub_8119DBC: @ 8119DBC
push {r4,lr}
lsls r0, 24
ldr r3, =0x02037590
ldr r3, =gUnknown_02037590
ldr r2, [r3, 0x10]
lsls r2, 4
movs r1, 0xF0
@@ -1681,12 +1681,12 @@ sub_8119E38: @ 8119E38
adds r6, r0, 0
lsls r6, 24
lsrs r6, 24
ldr r0, =0x02037590
ldr r0, =gUnknown_02037590
ldrb r0, [r0, 0x5]
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, =0x02037350
ldr r0, =gUnknown_02037350
adds r4, r0
ldrh r1, [r4, 0x10]
add r0, sp, 0x4
@@ -1775,7 +1775,7 @@ sub_8119EF0: @ 8119EF0
lsls r0, 24
cmp r0, 0
bne _08119F08
ldr r0, =0x02037318
ldr r0, =gUnknown_02037318
ldrb r0, [r0, 0x17]
cmp r0, 0x8
bne _08119F10
@@ -1825,11 +1825,11 @@ _08119F48:
thumb_func_start sub_8119F50
sub_8119F50: @ 8119F50
push {lr}
ldr r0, =0x0203ab54
ldr r0, =gUnknown_0203AB54
ldrb r0, [r0]
cmp r0, 0
beq _08119F66
ldr r1, =0x0203ab55
ldr r1, =gUnknown_0203AB55
ldrb r0, [r1]
cmp r0, 0x63
bhi _08119F66
@@ -1922,7 +1922,7 @@ _08119FF2:
sub_8119FF8: @ 8119FF8
push {r4,lr}
sub sp, 0x4
ldr r0, =0x02037590
ldr r0, =gUnknown_02037590
ldrb r1, [r0]
movs r0, 0x18
ands r0, r1
@@ -1965,8 +1965,8 @@ player_should_look_direction_be_enforced_upon_movement: @ 811A044
lsls r0, 24
cmp r0, 0
beq _0811A078
ldr r2, =0x02037350
ldr r0, =0x02037590
ldr r2, =gUnknown_02037350
ldr r0, =gUnknown_02037590
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -1993,10 +1993,10 @@ GetOnOffBike: @ 811A080
push {r4,lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r1, =0x02037348
ldr r1, =gUnknown_02037348
movs r0, 0
strb r0, [r1]
ldr r0, =0x02037590
ldr r0, =gUnknown_02037590
ldrb r1, [r0]
movs r0, 0x6
ands r0, r1
@@ -2026,7 +2026,7 @@ _0811A0C4:
thumb_func_start sub_811A0D0
sub_811A0D0: @ 811A0D0
push {lr}
ldr r2, =0x02037590
ldr r2, =gUnknown_02037590
movs r3, 0
strb r3, [r2, 0x8]
strb r3, [r2, 0x9]
@@ -2045,7 +2045,7 @@ _0811A0E6:
cmp r1, 0x7
bls _0811A0E6
movs r1, 0
ldr r3, =0x020375ac
ldr r3, =gUnknown_020375AC
movs r2, 0
_0811A0FA:
adds r0, r1, r3
@@ -2064,7 +2064,7 @@ _0811A0FA:
sub_811A114: @ 811A114
lsls r0, 24
lsrs r0, 24
ldr r2, =0x02037590
ldr r2, =gUnknown_02037590
strb r0, [r2, 0xA]
lsrs r1, r0, 1
adds r0, r1
@@ -2075,7 +2075,7 @@ sub_811A114: @ 811A114
thumb_func_start sub_811A128
sub_811A128: @ 811A128
ldr r1, =0x02037590
ldr r1, =gUnknown_02037590
movs r0, 0
strb r0, [r1, 0xA]
strb r0, [r1, 0xB]
@@ -2091,7 +2091,7 @@ sub_811A138: @ 811A138
mov r0, sp
movs r2, 0x6
bl memcpy
ldr r2, =0x02037590
ldr r2, =gUnknown_02037590
ldrb r1, [r2]
movs r0, 0x2
ands r0, r1
@@ -2130,7 +2130,7 @@ _0811A182:
sub_811A188: @ 811A188
push {r4,r5,lr}
sub sp, 0x4
ldr r5, =0x02037590
ldr r5, =gUnknown_02037590
ldrb r1, [r5]
movs r0, 0x4
ands r0, r1
@@ -2173,7 +2173,7 @@ IsRunningDisallowed: @ 811A1DC
push {lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r0, =0x02037318
ldr r0, =gUnknown_02037318
ldrb r1, [r0, 0x1A]
movs r0, 0x4
ands r0, r1
asm/blend_palette.s
+2 -2
View File
@@ -26,9 +26,9 @@ pal_fade_1: @ 806F98C
movs r6, 0
cmp r6, r12
bcs _0806FA12
ldr r0, =0x02037714
ldr r0, =gUnknown_02037714
mov r10, r0
ldr r1, =0x02037b14
ldr r1, =gUnknown_02037B14
mov r9, r1
_0806F9BA:
mov r0, r8
asm/cable_car.s
+73 -73
View File
@@ -10,7 +10,7 @@ sub_814FC70: @ 814FC70
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =0x02037fd4
ldr r0, =gUnknown_02037FD4
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -57,7 +57,7 @@ sub_814FCC8: @ 814FCC8
sub sp, 0x18
movs r4, 0
str r4, [sp, 0x14]
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
movs r2, 0x87
lsls r2, 3
adds r0, r1, r2
@@ -152,11 +152,11 @@ _0814FD4E:
orrs r3, r0
str r3, [r2, 0x8]
ldr r0, [r2, 0x8]
ldr r4, =0x0203abac
ldr r4, =gUnknown_0203ABAC
ldr r0, =0x00004110
bl AllocZeroed
str r0, [r4]
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
movs r2, 0x87
lsls r2, 3
adds r1, r2
@@ -194,7 +194,7 @@ _0814FDFC:
movs r0, 0
movs r2, 0x4
bl InitBgsFromTemplates
ldr r4, =0x0203abac
ldr r4, =gUnknown_0203ABAC
ldr r1, [r4]
adds r1, 0xFC
movs r0, 0
@@ -214,12 +214,12 @@ _0814FDFC:
adds r1, r2
movs r0, 0x3
bl SetBgTilemapBuffer
ldr r2, =0x02021bbc
ldr r1, =0x02021bbe
ldr r2, =gUnknown_02021BBC
ldr r1, =gUnknown_02021BBE
movs r0, 0
strh r0, [r1]
strh r0, [r2]
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
movs r3, 0x87
lsls r3, 3
adds r1, r3
@@ -245,7 +245,7 @@ _0814FE96:
ldr r0, =gUnknown_085CD67C
adds r1, r5, 0
bl malloc_and_decompress
ldr r4, =0x0203abac
ldr r4, =gUnknown_0203ABAC
ldr r1, [r4]
ldr r2, =0x000040fc
adds r1, r2
@@ -282,7 +282,7 @@ _0814FE96:
movs r2, 0
movs r3, 0
bl decompress_and_copy_tile_data_to_vram
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
movs r2, 0x87
lsls r2, 3
adds r1, r2
@@ -301,7 +301,7 @@ _0814FF5C:
movs r1, 0
movs r2, 0x80
bl gpu_pal_apply
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
movs r3, 0x87
lsls r3, 3
adds r1, r3
@@ -312,7 +312,7 @@ _0814FF5C:
_0814FF7C:
bl sub_8150D28
bl RunTasks
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
movs r0, 0x87
lsls r0, 3
adds r1, r0
@@ -321,7 +321,7 @@ _0814FF7C:
b _08150224
.pool
_0814FF98:
ldr r0, =0x0203abac
ldr r0, =gUnknown_0203ABAC
ldr r0, [r0]
ldrb r0, [r0, 0x2]
cmp r0, 0x7
@@ -371,7 +371,7 @@ _0814FFDE:
b _08150224
.pool
_0814FFF8:
ldr r6, =0x0203abac
ldr r6, =gUnknown_0203ABAC
ldr r0, [r6]
movs r1, 0x82
lsls r1, 7
@@ -426,7 +426,7 @@ _0814FFF8:
movs r2, 0
movs r3, 0x2
bl CopyToBgTilemapBufferRect_ChangePalette
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
movs r0, 0x87
lsls r0, 3
adds r1, r0
@@ -435,10 +435,10 @@ _0814FFF8:
b _08150224
.pool
_08150090:
ldr r0, =0x020375e0
ldr r0, =gUnknown_020375E0
ldrb r0, [r0]
bl sub_81514C8
ldr r1, =0x0203abac
ldr r1, =gUnknown_0203ABAC
mov r9, r1
ldr r0, [r1]
ldr r2, =0x000040fc
@@ -539,7 +539,7 @@ _08150090:
movs r2, 0x18
movs r3, 0x17
bl CopyToBgTilemapBufferRect_ChangePalette
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
movs r2, 0x87
lsls r2, 3
adds r1, r2
@@ -561,7 +561,7 @@ _08150190:
bl sub_80A3194
movs r0, 0x1
bl sub_8150B6C
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
movs r3, 0x87
lsls r3, 3
adds r1, r3
@@ -587,7 +587,7 @@ _081501C8:
ldr r0, =sub_81503E4
movs r1, 0
bl CreateTask
ldr r0, =0x020375e0
ldr r0, =gUnknown_020375E0
ldrh r0, [r0]
cmp r0, 0
bne _08150218
@@ -599,7 +599,7 @@ _08150218:
_0815021A:
movs r1, 0x1
bl CreateTask
ldr r1, =0x0203abac
ldr r1, =gUnknown_0203ABAC
ldr r1, [r1]
_08150224:
strb r0, [r1]
@@ -643,7 +643,7 @@ c2_8011A1C: @ 8150258
bl HideBg
movs r0, 0
bl sub_8150B6C
ldr r0, =0x02021bbc
ldr r0, =gUnknown_02021BBC
strh r4, [r0]
movs r0, 0
bl sub_80AB130
@@ -676,7 +676,7 @@ _08150298:
bl UnsetBgTilemapBuffer
movs r0, 0
bl ResetBgsAndClearDma3BusyFlags
ldr r6, =0x0203abac
ldr r6, =gUnknown_0203ABAC
ldr r0, [r6]
ldr r2, =0x00004108
adds r1, r0, r2
@@ -775,7 +775,7 @@ _08150340:
str r3, [r2, 0x8]
ldr r0, [r2, 0x8]
bl warp_in
ldr r0, =0x03005dac
ldr r0, =gUnknown_03005DAC
str r4, [r0]
ldr r0, =c2_load_new_map
bl SetMainCallback2
@@ -795,7 +795,7 @@ sub_81503E4: @ 81503E4
lsls r0, 24
lsrs r6, r0, 24
movs r4, 0
ldr r5, =0x0203abac
ldr r5, =gUnknown_0203ABAC
ldr r3, [r5]
ldrh r0, [r3, 0x6]
adds r0, 0x1
@@ -946,7 +946,7 @@ _081504EA:
b _08150542
.pool
_08150510:
ldr r0, =0x02037fd4
ldr r0, =gUnknown_02037FD4
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -978,7 +978,7 @@ _08150542:
sub_8150550: @ 8150550
push {r4-r6,lr}
sub sp, 0xC
ldr r6, =0x0203abac
ldr r6, =gUnknown_0203ABAC
ldr r1, [r6]
ldrb r0, [r1, 0x1]
cmp r0, 0xFF
@@ -1091,7 +1091,7 @@ _081505F4:
strb r0, [r1, 0x15]
_08150630:
bl sub_815115C
ldr r3, =0x02021bbc
ldr r3, =gUnknown_02021BBC
movs r0, 0
ldrsh r2, [r3, r0]
adds r1, r2, 0x1
@@ -1116,7 +1116,7 @@ _08150646:
sub_8150664: @ 8150664
push {r4-r7,lr}
sub sp, 0xC
ldr r7, =0x0203abac
ldr r7, =gUnknown_0203ABAC
ldr r1, [r7]
ldrb r0, [r1, 0x1]
cmp r0, 0xFF
@@ -1278,13 +1278,13 @@ _08150784:
bl FillBgTilemapBufferRect
_081507B6:
bl sub_81511B8
ldr r0, =0x0203abac
ldr r0, =gUnknown_0203ABAC
ldr r1, [r0]
ldrh r0, [r1, 0x6]
ldrh r1, [r1, 0x4]
cmp r0, r1
bcs _081507DC
ldr r4, =0x02021bbc
ldr r4, =gUnknown_02021BBC
movs r1, 0
ldrsh r0, [r4, r1]
b _081507E6
@@ -1314,7 +1314,7 @@ sub_8150800: @ 8150800
bl CopyBgTilemapBufferToVram
movs r0, 0x3
bl CopyBgTilemapBufferToVram
ldr r4, =0x0203abac
ldr r4, =gUnknown_0203ABAC
ldr r0, [r4]
ldrb r1, [r0, 0x14]
movs r0, 0x1C
@@ -1357,12 +1357,12 @@ nullsub_58: @ 8150864
sub_8150868: @ 8150868
push {r4-r6,lr}
adds r5, r0, 0
ldr r0, =0x0203abac
ldr r0, =gUnknown_0203ABAC
ldr r6, [r0]
ldrb r0, [r6, 0x1]
cmp r0, 0xFF
beq _08150934
ldr r0, =0x020375e0
ldr r0, =gUnknown_020375E0
ldrh r0, [r0]
cmp r0, 0
bne _081508E4
@@ -1448,14 +1448,14 @@ _08150934:
sub_8150948: @ 8150948
push {r4-r6,lr}
adds r5, r0, 0
ldr r0, =0x0203abac
ldr r0, =gUnknown_0203ABAC
ldr r6, [r0]
ldrb r0, [r6, 0x1]
cmp r0, 0xFF
bne _08150958
b _08150A60
_08150958:
ldr r0, =0x020375e0
ldr r0, =gUnknown_020375E0
ldrh r0, [r0]
cmp r0, 0
bne _081509C8
@@ -1806,11 +1806,11 @@ _08150C1C:
movs r0, 0x46
movs r1, 0
bl SetGpuReg
ldr r0, =0x020375e0
ldr r0, =gUnknown_020375E0
ldrh r3, [r0]
cmp r3, 0
bne _08150C74
ldr r1, =0x0203abac
ldr r1, =gUnknown_0203ABAC
ldr r2, [r1]
movs r0, 0xB0
strb r0, [r2, 0x14]
@@ -1824,7 +1824,7 @@ _08150C1C:
b _08150C8C
.pool
_08150C74:
ldr r1, =0x0203abac
ldr r1, =gUnknown_0203ABAC
ldr r2, [r1]
movs r3, 0
movs r0, 0x60
@@ -1936,7 +1936,7 @@ sub_8150D28: @ 8150D28
ldr r0, [r0]
str r0, [sp, 0x20]
str r1, [sp, 0x24]
ldr r0, =0x020375e0
ldr r0, =gUnknown_020375E0
ldrh r0, [r0]
mov r8, r6
mov r10, r5
@@ -1945,7 +1945,7 @@ sub_8150D28: @ 8150D28
cmp r0, 0x1
beq _08150E68
_08150D86:
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r0, [r0]
ldrb r0, [r0, 0x8]
add r0, sp
@@ -1961,7 +1961,7 @@ _08150D86:
lsrs r6, r0, 24
cmp r6, 0x40
beq _08150DD0
ldr r0, =0x02020630
ldr r0, =gUnknown_02020630
lsls r1, r6, 4
adds r1, r6
lsls r1, 2
@@ -1990,7 +1990,7 @@ _08150DD0:
bl AddObjectToFront
lsls r0, 24
lsrs r6, r0, 24
ldr r5, =0x02020630
ldr r5, =gUnknown_02020630
lsls r0, r6, 4
adds r0, r6
lsls r0, 2
@@ -2022,7 +2022,7 @@ _08150DD0:
strh r1, [r0, 0x2E]
movs r1, 0x63
strh r1, [r0, 0x30]
ldr r2, =0x0203abac
ldr r2, =gUnknown_0203ABAC
ldr r1, [r2]
movs r0, 0x7
strb r0, [r1, 0x2]
@@ -2035,7 +2035,7 @@ _08150DD0:
b _08150F3A
.pool
_08150E68:
ldr r7, =0x0203abac
ldr r7, =gUnknown_0203ABAC
ldr r0, [r7]
ldr r1, =0x000040fc
adds r0, r1
@@ -2051,7 +2051,7 @@ _08150E68:
movs r2, 0x18
movs r3, 0x1A
bl CopyToBgTilemapBufferRect_ChangePalette
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r0, [r0]
ldrb r0, [r0, 0x8]
add r0, sp
@@ -2067,7 +2067,7 @@ _08150E68:
lsrs r6, r0, 24
cmp r6, 0x40
beq _08150ED4
ldr r0, =0x02020630
ldr r0, =gUnknown_02020630
lsls r1, r6, 4
adds r1, r6
lsls r1, 2
@@ -2096,7 +2096,7 @@ _08150ED4:
bl AddObjectToFront
lsls r0, 24
lsrs r6, r0, 24
ldr r5, =0x02020630
ldr r5, =gUnknown_02020630
lsls r0, r6, 4
adds r0, r6
lsls r0, 2
@@ -2138,7 +2138,7 @@ _08150ED4:
bl sub_80AB130
_08150F3A:
movs r4, 0
ldr r5, =0x02020630
ldr r5, =gUnknown_02020630
_08150F3E:
lsls r1, r4, 20
movs r2, 0xC0
@@ -2178,7 +2178,7 @@ _08150F3E:
lsrs r0, 16
add r0, r8
ldrb r0, [r0]
ldr r5, =0x020375e0
ldr r5, =gUnknown_020375E0
ldrh r4, [r5]
lsls r4, 2
add r1, sp, 0x20
@@ -2200,7 +2200,7 @@ _08150F3E:
lsrs r6, r0, 24
cmp r6, 0x40
beq _08151074
ldr r1, =0x02020630
ldr r1, =gUnknown_02020630
lsls r2, r6, 4
adds r0, r2, r6
lsls r0, 2
@@ -2265,7 +2265,7 @@ _08151056:
bl StartObjectImageAnim
strh r5, [r4, 0x30]
_0815105C:
ldr r0, =0x02020630
ldr r0, =gUnknown_02020630
mov r2, r8
adds r1, r2, r6
lsls r1, 2
@@ -2299,7 +2299,7 @@ sub_8151088: @ 8151088
sub sp, 0xC
movs r3, 0
mov r9, r3
ldr r2, =0x0203abac
ldr r2, =gUnknown_0203ABAC
ldr r0, [r2]
ldrb r1, [r0, 0x1B]
adds r1, 0x2
@@ -2327,7 +2327,7 @@ _081510AA:
lsls r0, 3
mov r8, r0
_081510CC:
ldr r0, =0x0203abac
ldr r0, =gUnknown_0203ABAC
ldr r6, [r0]
lsls r3, r7, 1
ldr r1, [sp]
@@ -2399,7 +2399,7 @@ _081510CC:
thumb_func_start sub_815115C
sub_815115C: @ 815115C
push {r4,r5,lr}
ldr r5, =0x0203abac
ldr r5, =gUnknown_0203ABAC
ldr r4, [r5]
ldrb r0, [r4, 0x1C]
adds r0, 0x1
@@ -2447,7 +2447,7 @@ _081511AC:
thumb_func_start sub_81511B8
sub_81511B8: @ 81511B8
push {r4,r5,lr}
ldr r5, =0x0203abac
ldr r5, =gUnknown_0203ABAC
ldr r4, [r5]
ldrb r0, [r4, 0x1C]
adds r0, 0x1
@@ -2501,7 +2501,7 @@ sub_8151214: @ 8151214
push {r5-r7}
sub sp, 0xC
movs r7, 0
ldr r3, =0x0203abac
ldr r3, =gUnknown_0203ABAC
ldr r0, [r3]
strb r7, [r0, 0x1E]
strb r7, [r0, 0x1D]
@@ -2525,7 +2525,7 @@ sub_8151214: @ 8151214
ldrb r0, [r1, 0x18]
subs r0, 0x2
strb r0, [r1, 0x18]
ldr r4, =0x0203abb2
ldr r4, =gUnknown_0203ABB2
ldr r0, [r3]
ldrb r1, [r0, 0x1A]
adds r2, r1, 0
@@ -2535,16 +2535,16 @@ sub_8151214: @ 8151214
lsls r0, 5
subs r0, r2, r0
strb r0, [r4]
ldr r6, =0x0203abb0
ldr r6, =gUnknown_0203ABB0
mov r9, r3
ldr r0, =0x0203abb1
ldr r0, =gUnknown_0203ABB1
mov r8, r0
_0815126E:
mov r1, r9
ldr r2, [r1]
ldrb r0, [r2, 0x19]
strb r0, [r6]
ldr r0, =0x0203abb2
ldr r0, =gUnknown_0203ABB2
ldrb r0, [r0]
adds r1, r0, r7
adds r0, r1, 0
@@ -2604,8 +2604,8 @@ _0815126E:
lsrs r7, r0, 24
cmp r7, 0x8
bls _0815126E
ldr r5, =0x0203abb0
ldr r4, =0x0203abac
ldr r5, =gUnknown_0203ABB0
ldr r4, =gUnknown_0203ABAC
ldr r0, [r4]
ldrb r1, [r0, 0x19]
adds r2, r1, 0
@@ -2681,7 +2681,7 @@ sub_8151388: @ 8151388
push {r5-r7}
sub sp, 0xC
movs r7, 0
ldr r2, =0x0203abac
ldr r2, =gUnknown_0203ABAC
ldr r0, [r2]
strb r7, [r0, 0x1E]
strb r7, [r0, 0x1D]
@@ -2704,20 +2704,20 @@ sub_8151388: @ 8151388
ldrb r0, [r1, 0x18]
adds r0, 0x2
strb r0, [r1, 0x18]
ldr r1, =0x0203abb5
ldr r1, =gUnknown_0203ABB5
ldr r0, [r2]
ldrb r0, [r0, 0x1A]
strb r0, [r1]
ldr r6, =0x0203abb3
ldr r6, =gUnknown_0203ABB3
mov r10, r2
ldr r0, =0x0203abb4
ldr r0, =gUnknown_0203ABB4
mov r9, r0
_081513D4:
mov r1, r10
ldr r2, [r1]
ldrb r0, [r2, 0x19]
strb r0, [r6]
ldr r0, =0x0203abb5
ldr r0, =gUnknown_0203ABB5
ldrb r0, [r0]
adds r1, r0, r7
adds r0, r1, 0
@@ -2777,8 +2777,8 @@ _081513D4:
lsrs r7, r0, 24
cmp r7, 0x8
bls _081513D4
ldr r4, =0x0203abb4
ldr r5, =0x0203abac
ldr r4, =gUnknown_0203ABB4
ldr r5, =gUnknown_0203ABAC
ldr r3, [r5]
ldrb r1, [r3, 0x1A]
adds r2, r1, 0
@@ -2836,7 +2836,7 @@ sub_81514C8: @ 81514C8
cmp r0, 0x1
beq _08151500
_081514D6:
ldr r1, =0x0203abac
ldr r1, =gUnknown_0203ABAC
ldr r2, [r1]
movs r3, 0
movs r0, 0x2
@@ -2854,7 +2854,7 @@ _081514D6:
b _08151522
.pool
_08151500:
ldr r1, =0x0203abac
ldr r1, =gUnknown_0203ABAC
ldr r2, [r1]
movs r0, 0x2
strb r0, [r2, 0x1B]
@@ -2870,7 +2870,7 @@ _08151500:
bl sub_8151088
bl sub_8151388
_08151522:
ldr r0, =0x0203abac
ldr r0, =gUnknown_0203ABAC
ldr r1, [r0]
movs r0, 0
strb r0, [r1, 0x1C]
asm/cable_car_util.s
+12 -12
View File
@@ -173,7 +173,7 @@ sub_81521C0: @ 81521C0
bls _081521D6
movs r4, 0x40
_081521D6:
ldr r6, =0x0203abb8
ldr r6, =gUnknown_0203ABB8
movs r0, 0x8
bl AllocZeroed
str r0, [r6]
@@ -240,7 +240,7 @@ _08152244:
sub_8152254: @ 8152254
push {r4-r7,lr}
movs r3, 0
ldr r0, =0x0203abb8
ldr r0, =gUnknown_0203ABB8
ldr r2, [r0]
adds r5, r0, 0
cmp r2, 0
@@ -252,7 +252,7 @@ _0815226C:
ldrb r2, [r2]
cmp r3, r2
bcs _08152292
ldr r0, =0x030024f8
ldr r0, =gUnknown_030024F8
mov r12, r0
ldr r4, =gDefaultOamAttributes
adds r2, r5, 0
@@ -304,7 +304,7 @@ sub_81522D4: @ 81522D4
mov r7, r8
push {r7}
movs r6, 0
ldr r0, =0x0203abb8
ldr r0, =gUnknown_0203ABB8
ldr r1, [r0]
adds r3, r0, 0
cmp r1, 0
@@ -350,7 +350,7 @@ _08152322:
cmp r0, 0
beq _08152348
lsls r0, r6, 3
ldr r1, =0x030024f8
ldr r1, =gUnknown_030024F8
adds r0, r1
ldr r1, =gDefaultOamAttributes
ldm r1!, {r2,r3}
@@ -412,14 +412,14 @@ _08152348:
orrs r0, r1
strh r0, [r2, 0x4]
lsls r1, r6, 3
ldr r2, =0x030024f8
ldr r2, =gUnknown_030024F8
ldr r0, [r4, 0x4]
adds r1, r2
adds r0, r5, r0
ldm r0!, {r2,r3}
stm r1!, {r2,r3}
_081523C0:
ldr r3, =0x0203abb8
ldr r3, =gUnknown_0203ABB8
_081523C2:
adds r0, r6, 0x1
lsls r0, 24
@@ -482,7 +482,7 @@ sub_8152438: @ 8152438
adds r4, r1, 0
lsls r0, 24
lsrs r2, r0, 24
ldr r0, =0x0203abb8
ldr r0, =gUnknown_0203ABB8
ldr r0, [r0]
cmp r0, 0
beq _0815246C
@@ -520,7 +520,7 @@ sub_8152474: @ 8152474
lsrs r4, r1, 24
lsls r2, 16
lsrs r5, r2, 16
ldr r0, =0x0203abb8
ldr r0, =gUnknown_0203ABB8
ldr r0, [r0]
cmp r0, 0
beq _081524A8
@@ -587,7 +587,7 @@ sub_81524C4: @ 81524C4
lsrs r5, 24
mov r10, r5
movs r5, 0
ldr r0, =0x0203abb8
ldr r0, =gUnknown_0203ABB8
ldr r0, [r0]
cmp r0, 0
beq _0815255E
@@ -702,7 +702,7 @@ sub_81525D0: @ 81525D0
push {r4-r6,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r6, =0x0203abb8
ldr r6, =gUnknown_0203ABB8
ldr r0, [r6]
cmp r0, 0
beq _081525F2
@@ -746,7 +746,7 @@ _081525FC:
orrs r0, r2
strb r0, [r1, 0x19]
lsls r1, r5, 3
ldr r0, =0x030024f8
ldr r0, =gUnknown_030024F8
adds r1, r0
ldr r0, =gDefaultOamAttributes
ldm r0!, {r2,r3}
asm/cable_club.s
+165 -165
View File
File diff suppressed because it is too large Load Diff
asm/calculate_base_damage.s
+24 -24
View File
@@ -36,7 +36,7 @@ sub_806957C: @ 806957C
movs r5, 0
cmp r3, 0
bne _080695D4
ldr r2, =0x020244e0
ldr r2, =gUnknown_020244E0
ldr r1, =gBattleMoves
ldr r3, [sp, 0x8]
lsls r0, r3, 1
@@ -48,7 +48,7 @@ sub_806957C: @ 806957C
b _080695D8
.pool
_080695D4:
ldr r0, =0x020244e0
ldr r0, =gUnknown_020244E0
strh r3, [r0]
_080695D8:
cmp r7, 0
@@ -82,7 +82,7 @@ _08069602:
ldrh r0, [r6, 0x2E]
cmp r0, 0xAF
bne _08069634
ldr r1, =0x02024404
ldr r1, =gUnknown_02024404
ldr r2, [sp, 0x10]
lsls r0, r2, 3
subs r0, r2
@@ -109,7 +109,7 @@ _0806964A:
ldrh r0, [r1, 0x2E]
cmp r0, 0xAF
bne _0806967E
ldr r1, =0x02024404
ldr r1, =gUnknown_02024404
ldr r2, [sp, 0x14]
lsls r0, r2, 3
subs r0, r2
@@ -261,7 +261,7 @@ _08069790:
mov r0, r9
cmp r0, 0x22
bne _080697C6
ldr r0, =0x02022fec
ldr r0, =gUnknown_02022FEC
ldr r0, [r0]
ldr r1, =0x003f0100
ands r0, r1
@@ -288,7 +288,7 @@ _080697C6:
ldr r0, [sp, 0x20]
cmp r0, 0x22
bne _080697FC
ldr r0, =0x02022fec
ldr r0, =gUnknown_02022FEC
ldr r0, [r0]
ldr r1, =0x003f0100
ands r0, r1
@@ -487,7 +487,7 @@ _08069936:
lsls r0, 24
cmp r0, 0
beq _0806995A
ldr r1, =0x020244e0
ldr r1, =gUnknown_020244E0
ldrh r0, [r1]
lsrs r0, 1
strh r0, [r1]
@@ -505,7 +505,7 @@ _0806995A:
lsls r0, 24
cmp r0, 0
beq _0806997E
ldr r1, =0x020244e0
ldr r1, =gUnknown_020244E0
ldrh r0, [r1]
lsrs r0, 1
strh r0, [r1]
@@ -525,7 +525,7 @@ _0806997E:
lsrs r0, 16
cmp r1, r0
bhi _080699AE
ldr r4, =0x020244e0
ldr r4, =gUnknown_020244E0
ldrh r1, [r4]
movs r0, 0x96
muls r0, r1
@@ -548,7 +548,7 @@ _080699AE:
lsrs r0, 16
cmp r1, r0
bhi _080699DE
ldr r4, =0x020244e0
ldr r4, =gUnknown_020244E0
ldrh r1, [r4]
movs r0, 0x96
muls r0, r1
@@ -571,7 +571,7 @@ _080699DE:
lsrs r0, 16
cmp r1, r0
bhi _08069A0E
ldr r4, =0x020244e0
ldr r4, =gUnknown_020244E0
ldrh r1, [r4]
movs r0, 0x96
muls r0, r1
@@ -594,7 +594,7 @@ _08069A0E:
lsrs r0, 16
cmp r1, r0
bhi _08069A3E
ldr r4, =0x020244e0
ldr r4, =gUnknown_020244E0
ldrh r1, [r4]
movs r0, 0x96
muls r0, r1
@@ -603,7 +603,7 @@ _08069A0E:
strh r0, [r4]
_08069A3E:
ldr r2, =gBattleMoves
ldr r0, =0x020241ea
ldr r0, =gUnknown_020241EA
ldrh r1, [r0]
lsls r0, r1, 1
adds r0, r1
@@ -621,7 +621,7 @@ _08069A58:
bls _08069A60
b _08069BC2
_08069A60:
ldr r0, =0x02024211
ldr r0, =gUnknown_02024211
ldrb r1, [r0]
adds r4, r0, 0
cmp r1, 0x2
@@ -653,7 +653,7 @@ _08069AA6:
bl __divsi3
adds r5, r0, 0
_08069ABE:
ldr r0, =0x020244e0
ldr r0, =gUnknown_020244E0
ldrh r0, [r0]
muls r5, r0
adds r0, r6, 0
@@ -728,7 +728,7 @@ _08069B48:
ldrb r1, [r4]
cmp r1, 0x1
bne _08069B8A
ldr r0, =0x02022fec
ldr r0, =gUnknown_02022FEC
ldr r0, [r0]
ands r0, r1
cmp r0, 0
@@ -750,7 +750,7 @@ _08069B84:
adds r0, r5, r0
asrs r5, r0, 1
_08069B8A:
ldr r0, =0x02022fec
ldr r0, =gUnknown_02022FEC
ldr r0, [r0]
movs r1, 0x1
ands r0, r1
@@ -789,7 +789,7 @@ _08069BCA:
bhi _08069BD2
b _08069DD4
_08069BD2:
ldr r0, =0x02024211
ldr r0, =gUnknown_02024211
ldrb r1, [r0]
adds r4, r0, 0
cmp r1, 0x2
@@ -821,7 +821,7 @@ _08069C02:
bl __divsi3
adds r5, r0, 0
_08069C1A:
ldr r0, =0x020244e0
ldr r0, =gUnknown_020244E0
ldrh r0, [r0]
muls r5, r0
adds r0, r6, 0
@@ -880,7 +880,7 @@ _08069C76:
ldrb r1, [r4]
cmp r1, 0x1
bne _08069CCA
ldr r0, =0x02022fec
ldr r0, =gUnknown_02022FEC
ldr r0, [r0]
ands r0, r1
cmp r0, 0
@@ -902,7 +902,7 @@ _08069CC4:
adds r0, r5, r0
asrs r5, r0, 1
_08069CCA:
ldr r0, =0x02022fec
ldr r0, =gUnknown_02022FEC
ldr r0, [r0]
movs r1, 0x1
ands r0, r1
@@ -947,7 +947,7 @@ _08069CFC:
lsls r0, 24
cmp r0, 0
bne _08069DAC
ldr r2, =0x020243cc
ldr r2, =gUnknown_020243CC
ldrh r1, [r2]
movs r0, 0x1
ands r0, r1
@@ -978,7 +978,7 @@ _08069D64:
ands r0, r1
cmp r0, 0
beq _08069D7C
ldr r0, =0x020241ea
ldr r0, =gUnknown_020241EA
ldrh r0, [r0]
cmp r0, 0x4C
bne _08069D7C
@@ -1010,7 +1010,7 @@ _08069DA6:
adds r0, r5, r0
asrs r5, r0, 1
_08069DAC:
ldr r0, =0x020244a8
ldr r0, =gUnknown_020244A8
ldr r0, [r0]
ldr r0, [r0, 0x4]
ldr r7, [sp, 0x10]
asm/clear_save_data_screen.s
+9 -9
View File
@@ -47,7 +47,7 @@ sub_817ACE4: @ 817ACE4
movs r2, 0xE
movs r3, 0x1
bl CreateYesNoMenu
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
@@ -96,7 +96,7 @@ _0817AD68:
movs r1, 0x1
movs r3, 0
bl Print
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
@@ -158,7 +158,7 @@ sub_817ADF4: @ 817ADF4
sub_817AE00: @ 817AE00
push {r4,lr}
sub sp, 0xC
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
movs r1, 0x87
lsls r1, 3
adds r0, r1
@@ -237,10 +237,10 @@ _0817AE18:
str r0, [r1, 0x8]
ldr r0, [r1, 0x8]
bl sub_80A1A74
ldr r2, =0x02037714
ldr r2, =gUnknown_02037714
ldr r0, =0x00007fff
strh r0, [r2]
ldr r1, =0x02037b14
ldr r1, =gUnknown_02037B14
strh r0, [r1]
ldr r0, =0x00003945
strh r0, [r2, 0x2]
@@ -301,7 +301,7 @@ _0817AEEC:
bl EnableInterrupts
ldr r0, =sub_817ADF4
bl SetVBlankCallback
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
movs r1, 0x87
lsls r1, 3
adds r0, r1
@@ -311,7 +311,7 @@ _0817AEEC:
.pool
_0817AFA4:
bl fade_and_return_progress_probably
ldr r0, =0x02037fd4
ldr r0, =gUnknown_02037FD4
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -335,7 +335,7 @@ _0817AFCA:
sub_817AFD4: @ 817AFD4
push {r4,lr}
sub sp, 0x4
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
movs r1, 0x87
lsls r1, 3
adds r4, r0, r1
@@ -357,7 +357,7 @@ _0817AFEA:
.pool
_0817B008:
bl fade_and_return_progress_probably
ldr r0, =0x02037fd4
ldr r0, =gUnknown_02037FD4
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
asm/coins.s
+9 -9
View File
@@ -11,11 +11,11 @@ PrintCoinsString: @ 8145B54
push {r4,lr}
sub sp, 0xC
adds r1, r0, 0
ldr r0, =0x02021cc4
ldr r0, =gUnknown_02021CC4
movs r2, 0x1
movs r3, 0x4
bl ConvertIntToDecimalString
ldr r4, =0x02021fc4
ldr r4, =gUnknown_02021FC4
ldr r1, =gUnknown_085E8DAB
adds r0, r4, 0
bl ExpandStringRefs
@@ -24,7 +24,7 @@ PrintCoinsString: @ 8145B54
movs r2, 0x40
bl GetStringRightAlignXOffset
adds r3, r0, 0
ldr r0, =0x0203ab9c
ldr r0, =gUnknown_0203AB9C
ldrb r0, [r0]
lsls r3, 24
lsrs r3, 24
@@ -67,7 +67,7 @@ ShowCoinsWindow: @ 8145BAC
movs r1, 0
adds r2, r4, 0
bl rbox_template_set
ldr r4, =0x0203ab9c
ldr r4, =gUnknown_0203AB9C
add r0, sp, 0x10
bl AddWindow
strb r0, [r4]
@@ -95,7 +95,7 @@ ShowCoinsWindow: @ 8145BAC
@ void HideCoinsWindow()
HideCoinsWindow: @ 8145C14
push {r4,lr}
ldr r4, =0x0203ab9c
ldr r4, =gUnknown_0203AB9C
ldrb r0, [r4]
movs r1, 0x1
bl sub_819746C
@@ -110,11 +110,11 @@ HideCoinsWindow: @ 8145C14
thumb_func_start GetCoins
@ u16 GetCoins()
GetCoins: @ 8145C30
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r1, [r0]
ldr r0, =0x00000494
adds r1, r0
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r0, [r0]
adds r0, 0xAC
ldr r0, [r0]
@@ -131,9 +131,9 @@ GetCoins: @ 8145C30
SetCoins: @ 8145C58
lsls r0, 16
lsrs r0, 16
ldr r1, =0x03005d8c
ldr r1, =gUnknown_03005D8C
ldr r2, [r1]
ldr r1, =0x03005d90
ldr r1, =gUnknown_03005D90
ldr r1, [r1]
adds r1, 0xAC
ldr r1, [r1]
asm/contest.s
+652 -652
View File
File diff suppressed because it is too large Load Diff
asm/contest_ai.s
+329 -329
View File
File diff suppressed because it is too large Load Diff
asm/contest_effect.s
+77 -77
View File
@@ -68,7 +68,7 @@ ContestEffectFunc_080E547C: @ 80E547C
thumb_func_start ContestEffectFunc_080E5480
ContestEffectFunc_080E5480: @ 80E5480
push {lr}
ldr r3, =0x02039f34
ldr r3, =gUnknown_02039F34
ldr r1, [r3]
ldr r0, [r1, 0x8]
ldrb r2, [r0, 0x11]
@@ -94,7 +94,7 @@ ContestEffectFunc_080E5480: @ 80E5480
thumb_func_start ContestEffectFunc_080E54B0
ContestEffectFunc_080E54B0: @ 80E54B0
push {lr}
ldr r3, =0x02039f34
ldr r3, =gUnknown_02039F34
ldr r1, [r3]
ldr r0, [r1, 0x8]
ldrb r2, [r0, 0x11]
@@ -119,7 +119,7 @@ ContestEffectFunc_080E54B0: @ 80E54B0
thumb_func_start ContestEffectFunc_080E54E0
ContestEffectFunc_080E54E0: @ 80E54E0
ldr r3, =0x02039f34
ldr r3, =gUnknown_02039F34
ldr r1, [r3]
ldr r0, [r1, 0x8]
ldrb r2, [r0, 0x11]
@@ -165,7 +165,7 @@ ContestEffectFunc_080E54E0: @ 80E54E0
thumb_func_start ContestEffectFunc_080E5534
ContestEffectFunc_080E5534: @ 80E5534
push {lr}
ldr r3, =0x02039f34
ldr r3, =gUnknown_02039F34
ldr r1, [r3]
ldr r0, [r1, 0x8]
ldrb r2, [r0, 0x11]
@@ -189,7 +189,7 @@ ContestEffectFunc_080E5534: @ 80E5534
thumb_func_start ContestEffectFunc_080E5560
ContestEffectFunc_080E5560: @ 80E5560
push {lr}
ldr r3, =0x02039f34
ldr r3, =gUnknown_02039F34
ldr r1, [r3]
ldr r0, [r1, 0x8]
ldrb r2, [r0, 0x11]
@@ -215,7 +215,7 @@ ContestEffectFunc_080E5560: @ 80E5560
thumb_func_start ContestEffectFunc_080E5590
ContestEffectFunc_080E5590: @ 80E5590
push {lr}
ldr r3, =0x02039f34
ldr r3, =gUnknown_02039F34
ldr r1, [r3]
ldr r0, [r1, 0x8]
ldrb r2, [r0, 0x11]
@@ -239,7 +239,7 @@ ContestEffectFunc_080E5590: @ 80E5590
thumb_func_start ContestEffectFunc_080E55BC
ContestEffectFunc_080E55BC: @ 80E55BC
push {lr}
ldr r3, =0x02039f34
ldr r3, =gUnknown_02039F34
ldr r1, [r3]
ldr r0, [r1, 0x8]
ldrb r2, [r0, 0x11]
@@ -266,7 +266,7 @@ ContestEffectFunc_080E55BC: @ 80E55BC
ContestEffectFunc_080E55EC: @ 80E55EC
push {r4,r5,lr}
movs r2, 0
ldr r5, =0x02039f34
ldr r5, =gUnknown_02039F34
ldr r0, [r5]
ldr r1, [r0, 0x8]
ldrb r4, [r1, 0x11]
@@ -293,7 +293,7 @@ _080E560A:
cmp r0, r1
bne _080E560A
_080E5622:
ldr r1, =0x02039f34
ldr r1, =gUnknown_02039F34
ldr r0, [r1]
ldr r0, [r0, 0x8]
strb r2, [r0, 0x8]
@@ -307,14 +307,14 @@ _080E5622:
_080E563A:
cmp r2, 0
bne _080E564C
ldr r0, =0x02039f34
ldr r0, =gUnknown_02039F34
ldr r0, [r0]
ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x11]
movs r1, 0x36
bl sub_80DD3F0
_080E564C:
ldr r0, =0x02039f34
ldr r0, =gUnknown_02039F34
ldr r0, [r0]
ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x11]
@@ -330,7 +330,7 @@ _080E564C:
ContestEffectFunc_080E5664: @ 80E5664
push {r4-r6,lr}
movs r1, 0
ldr r2, =0x02039f34
ldr r2, =gUnknown_02039F34
ldr r0, [r2]
ldr r0, [r0, 0x8]
ldrb r5, [r0, 0x11]
@@ -359,7 +359,7 @@ _080E5698:
adds r3, 0x1
cmp r3, 0x3
ble _080E567E
ldr r0, =0x02039f34
ldr r0, =gUnknown_02039F34
ldr r0, [r0]
ldr r0, [r0, 0x8]
adds r0, 0x8
@@ -372,14 +372,14 @@ _080E5698:
_080E56B4:
cmp r1, 0
bne _080E56C6
ldr r0, =0x02039f34
ldr r0, =gUnknown_02039F34
ldr r0, [r0]
ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x11]
movs r1, 0x36
bl sub_80DD3F0
_080E56C6:
ldr r0, =0x02039f34
ldr r0, =gUnknown_02039F34
ldr r0, [r0]
ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x11]
@@ -409,7 +409,7 @@ ContestEffectFunc_080E56E0: @ 80E56E0
bhi _080E5702
movs r1, 0x28
_080E5702:
ldr r0, =0x02039f34
ldr r0, =gUnknown_02039F34
ldr r0, [r0]
ldr r0, [r0, 0x8]
strh r1, [r0, 0x4]
@@ -425,7 +425,7 @@ ContestEffectFunc_080E5718: @ 80E5718
mov r7, r8
push {r7}
movs r7, 0
ldr r1, =0x02039f34
ldr r1, =gUnknown_02039F34
ldr r0, [r1]
ldr r0, [r0, 0x8]
ldrb r5, [r0, 0x11]
@@ -521,7 +521,7 @@ ContestEffectFunc_080E57CC: @ 80E57CC
push {r5-r7}
movs r0, 0
mov r9, r0
ldr r1, =0x02039f34
ldr r1, =gUnknown_02039F34
ldr r0, [r1]
ldr r0, [r0, 0x8]
ldrb r2, [r0, 0x11]
@@ -619,7 +619,7 @@ ContestEffectFunc_080E588C: @ 80E588C
push {r6,r7}
movs r0, 0
mov r9, r0
ldr r1, =0x02039f34
ldr r1, =gUnknown_02039F34
ldr r0, [r1]
ldr r0, [r0, 0x8]
ldrb r7, [r0, 0x11]
@@ -674,7 +674,7 @@ _080E58DA:
_080E5900:
adds r6, 0x1C
adds r5, 0x1
ldr r4, =0x02039f34
ldr r4, =gUnknown_02039F34
cmp r5, 0x3
ble _080E58B0
_080E590A:
@@ -704,7 +704,7 @@ _080E5928:
thumb_func_start ContestEffectFunc_080E5938
ContestEffectFunc_080E5938: @ 80E5938
push {r4,lr}
ldr r4, =0x02039f34
ldr r4, =gUnknown_02039F34
ldr r1, [r4]
ldr r0, [r1, 0x8]
ldrb r2, [r0, 0x11]
@@ -732,7 +732,7 @@ ContestEffectFunc_080E5938: @ 80E5938
thumb_func_start ContestEffectFunc_080E5970
ContestEffectFunc_080E5970: @ 80E5970
push {r4,lr}
ldr r4, =0x02039f34
ldr r4, =gUnknown_02039F34
ldr r1, [r4]
ldr r0, [r1, 0x8]
ldrb r2, [r0, 0x11]
@@ -765,7 +765,7 @@ ContestEffectFunc_080E59B0: @ 80E59B0
push {lr}
movs r0, 0
bl sub_80E6934
ldr r0, =0x02039f34
ldr r0, =gUnknown_02039F34
ldr r0, [r0]
ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x11]
@@ -781,7 +781,7 @@ ContestEffectFunc_080E59D0: @ 80E59D0
push {lr}
movs r0, 0x1
bl sub_80E6934
ldr r0, =0x02039f34
ldr r0, =gUnknown_02039F34
ldr r0, [r0]
ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x11]
@@ -797,7 +797,7 @@ ContestEffectFunc_080E59F0: @ 80E59F0
push {lr}
movs r0, 0x2
bl sub_80E6934
ldr r0, =0x02039f34
ldr r0, =gUnknown_02039F34
ldr r0, [r0]
ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x11]
@@ -813,7 +813,7 @@ ContestEffectFunc_080E5A10: @ 80E5A10
push {lr}
movs r0, 0x3
bl sub_80E6934
ldr r0, =0x02039f34
ldr r0, =gUnknown_02039F34
ldr r0, [r0]
ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x11]
@@ -829,7 +829,7 @@ ContestEffectFunc_080E5A30: @ 80E5A30
push {lr}
movs r0, 0x4
bl sub_80E6934
ldr r0, =0x02039f34
ldr r0, =gUnknown_02039F34
ldr r0, [r0]
ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x11]
@@ -844,7 +844,7 @@ ContestEffectFunc_080E5A30: @ 80E5A30
ContestEffectFunc_080E5A50: @ 80E5A50
push {r4-r6,lr}
movs r4, 0
ldr r2, =0x02039f34
ldr r2, =gUnknown_02039F34
ldr r0, [r2]
ldr r0, [r0, 0x8]
ldrb r1, [r0, 0x11]
@@ -855,7 +855,7 @@ ContestEffectFunc_080E5A50: @ 80E5A50
beq _080E5AB0
movs r5, 0
_080E5A68:
ldr r0, =0x02039f34
ldr r0, =gUnknown_02039F34
ldr r0, [r0]
ldr r1, [r0, 0x8]
ldrb r0, [r1, 0x11]
@@ -932,7 +932,7 @@ ContestEffectFunc_080E5AD4: @ 80E5AD4
mov r10, r3
movs r6, 0
_080E5B00:
ldr r0, =0x02039f34
ldr r0, =gUnknown_02039F34
ldr r2, [r0]
ldr r1, [r2, 0x8]
ldrb r0, [r1, 0x11]
@@ -1000,7 +1000,7 @@ _080E5B76:
bge _080E5B76
_080E5B7E:
movs r5, 0
ldr r7, =0x02039f34
ldr r7, =gUnknown_02039F34
movs r6, 0
mov r4, r10
_080E5B86:
@@ -1125,7 +1125,7 @@ _080E5C70:
lsrs r0, 24
mov r9, r0
_080E5C86:
ldr r0, =0x02039f34
ldr r0, =gUnknown_02039F34
ldr r0, [r0]
ldr r0, [r0, 0x8]
adds r0, 0xD
@@ -1139,7 +1139,7 @@ _080E5C86:
cmp r0, 0xFF
bne _080E5C16
_080E5CA0:
ldr r6, =0x02039f34
ldr r6, =gUnknown_02039F34
ldr r0, [r6]
ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x11]
@@ -1173,7 +1173,7 @@ ContestEffectFunc_080E5CD4: @ 80E5CD4
movs r0, 0
mov r8, r0
movs r6, 0
ldr r7, =0x02039f34
ldr r7, =gUnknown_02039F34
movs r5, 0
_080E5CE4:
ldr r2, [r7]
@@ -1228,7 +1228,7 @@ _080E5D46:
adds r6, 0x1
cmp r6, 0x3
ble _080E5CE4
ldr r4, =0x02039f34
ldr r4, =gUnknown_02039F34
ldr r0, [r4]
ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x11]
@@ -1256,7 +1256,7 @@ ContestEffectFunc_080E5D7C: @ 80E5D7C
push {r4-r7,lr}
movs r7, 0
movs r4, 0
ldr r5, =0x02039f34
ldr r5, =gUnknown_02039F34
movs r6, 0
_080E5D86:
ldr r3, [r5]
@@ -1301,7 +1301,7 @@ _080E5DD2:
adds r4, 0x1
cmp r4, 0x3
ble _080E5D86
ldr r4, =0x02039f34
ldr r4, =gUnknown_02039F34
ldr r0, [r4]
ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x11]
@@ -1324,8 +1324,8 @@ _080E5DF8:
thumb_func_start ContestEffectFunc_080E5E04
ContestEffectFunc_080E5E04: @ 80E5E04
push {r4,lr}
ldr r1, =0x02039f26
ldr r0, =0x02039f34
ldr r1, =gUnknown_02039F26
ldr r0, =gUnknown_02039F34
ldr r4, [r0]
ldr r0, [r4, 0x8]
ldrb r2, [r0, 0x11]
@@ -1365,8 +1365,8 @@ _080E5E46:
thumb_func_start ContestEffectFunc_080E5E5C
ContestEffectFunc_080E5E5C: @ 80E5E5C
push {r4,lr}
ldr r1, =0x02039f26
ldr r0, =0x02039f34
ldr r1, =gUnknown_02039F26
ldr r0, =gUnknown_02039F34
ldr r4, [r0]
ldr r0, [r4, 0x8]
ldrb r2, [r0, 0x11]
@@ -1408,7 +1408,7 @@ ContestEffectFunc_080E5EB4: @ 80E5EB4
push {r4-r7,lr}
movs r1, 0
movs r5, 0
ldr r0, =0x02039f34
ldr r0, =gUnknown_02039F34
ldr r4, [r0]
ldr r2, [r4, 0x8]
ldrb r0, [r2, 0x11]
@@ -1434,7 +1434,7 @@ _080E5EDA:
bge _080E5EE8
movs r5, 0
_080E5EE8:
ldr r0, =0x02039f34
ldr r0, =gUnknown_02039F34
ldr r3, [r0]
ldr r0, [r3, 0x8]
ldrb r2, [r0, 0x11]
@@ -1467,7 +1467,7 @@ _080E5F0C:
movs r1, 0x11
bl sub_80DD3D4
_080E5F2C:
ldr r4, =0x02039f34
ldr r4, =gUnknown_02039F34
ldr r1, [r4]
ldr r0, [r1, 0x8]
ldrb r2, [r0, 0x11]
@@ -1498,7 +1498,7 @@ _080E5F2C:
ContestEffectFunc_080E5F64: @ 80E5F64
push {r4-r7,lr}
movs r6, 0
ldr r0, =0x02039f34
ldr r0, =gUnknown_02039F34
ldr r4, [r0]
ldr r2, [r4, 0x8]
ldrb r1, [r2, 0x11]
@@ -1567,7 +1567,7 @@ _080E5FDE:
thumb_func_start ContestEffectFunc_080E5FE4
ContestEffectFunc_080E5FE4: @ 80E5FE4
push {r4,r5,lr}
ldr r1, =0x02039f34
ldr r1, =gUnknown_02039F34
ldr r3, [r1]
ldr r0, [r3, 0x8]
ldrb r2, [r0, 0x11]
@@ -1647,7 +1647,7 @@ ContestEffectFunc_080E6068: @ 80E6068
cmp r0, 0x2
bhi _080E6098
movs r4, 0xA
ldr r0, =0x02039f34
ldr r0, =gUnknown_02039F34
ldr r0, [r0]
ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x11]
@@ -1659,7 +1659,7 @@ _080E6098:
cmp r0, 0x5
bhi _080E60B4
movs r4, 0x14
ldr r0, =0x02039f34
ldr r0, =gUnknown_02039F34
ldr r0, [r0]
ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x11]
@@ -1671,7 +1671,7 @@ _080E60B4:
cmp r0, 0x7
bhi _080E60D0
movs r4, 0x28
ldr r0, =0x02039f34
ldr r0, =gUnknown_02039F34
ldr r0, [r0]
ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x11]
@@ -1683,7 +1683,7 @@ _080E60D0:
cmp r1, 0x8
bhi _080E60EC
movs r4, 0x3C
ldr r0, =0x02039f34
ldr r0, =gUnknown_02039F34
ldr r0, [r0]
ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x11]
@@ -1693,14 +1693,14 @@ _080E60D0:
.pool
_080E60EC:
movs r4, 0x50
ldr r0, =0x02039f34
ldr r0, =gUnknown_02039F34
ldr r0, [r0]
ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x11]
movs r1, 0x1E
bl sub_80DD3D4
_080E60FC:
ldr r0, =0x02039f34
ldr r0, =gUnknown_02039F34
ldr r1, [r0]
ldr r0, [r1, 0x8]
ldrb r2, [r0, 0x11]
@@ -1721,7 +1721,7 @@ ContestEffectFunc_080E611C: @ 80E611C
push {r4-r7,lr}
mov r7, r8
push {r7}
ldr r2, =0x02039f34
ldr r2, =gUnknown_02039F34
ldr r0, [r2]
ldr r3, [r0, 0x8]
ldrb r0, [r3, 0x11]
@@ -1743,7 +1743,7 @@ _080E6140:
adds r5, r0, 0
cmp r6, r1
beq _080E616A
ldr r4, =0x02039f34
ldr r4, =gUnknown_02039F34
_080E614E:
lsls r0, r2, 24
movs r2, 0x80
@@ -1845,7 +1845,7 @@ ContestEffectFunc_080E620C: @ 80E620C
mov r7, r9
mov r6, r8
push {r6,r7}
ldr r0, =0x02039f34
ldr r0, =gUnknown_02039F34
ldr r3, [r0]
ldr r1, [r3, 0x8]
ldrb r2, [r1, 0x11]
@@ -1928,7 +1928,7 @@ _080E62AC:
thumb_func_start ContestEffectFunc_080E62B8
ContestEffectFunc_080E62B8: @ 80E62B8
push {r4-r7,lr}
ldr r0, =0x02039f34
ldr r0, =gUnknown_02039F34
ldr r0, [r0]
ldr r0, [r0, 0x8]
ldrb r1, [r0, 0x11]
@@ -1939,7 +1939,7 @@ ContestEffectFunc_080E62B8: @ 80E62B8
movs r5, 0
movs r6, 0
_080E62CE:
ldr r0, =0x02039f34
ldr r0, =gUnknown_02039F34
ldr r4, [r0]
ldr r1, [r4, 0x8]
ldrb r2, [r1, 0x11]
@@ -1994,7 +1994,7 @@ _080E632E:
thumb_func_start ContestEffectFunc_080E6334
ContestEffectFunc_080E6334: @ 80E6334
push {r4,lr}
ldr r4, =0x02039f34
ldr r4, =gUnknown_02039F34
ldr r1, [r4]
ldr r0, [r1, 0x8]
ldrb r2, [r0, 0x11]
@@ -2046,7 +2046,7 @@ _080E6390:
thumb_func_start ContestEffectFunc_080E6398
ContestEffectFunc_080E6398: @ 80E6398
push {lr}
ldr r3, =0x02039f34
ldr r3, =gUnknown_02039F34
ldr r1, [r3]
ldr r0, [r1, 0x8]
ldrb r2, [r0, 0x11]
@@ -2090,7 +2090,7 @@ _080E63E4:
ContestEffectFunc_080E63E8: @ 80E63E8
push {r4-r7,lr}
sub sp, 0x4
ldr r0, =0x02039f34
ldr r0, =gUnknown_02039F34
ldr r2, [r0]
ldr r1, [r2]
ldrb r1, [r1, 0x1]
@@ -2258,7 +2258,7 @@ ContestEffectFunc_080E6520: @ 80E6520
mov r7, r8
push {r7}
sub sp, 0x4
ldr r0, =0x02039f34
ldr r0, =gUnknown_02039F34
ldr r2, [r0]
ldr r1, [r2]
ldrb r1, [r1, 0x1]
@@ -2434,7 +2434,7 @@ ContestEffectFunc_080E6664: @ 80E6664
ContestEffectFunc_080E6668: @ 80E6668
push {r4-r7,lr}
sub sp, 0x8
ldr r0, =0x02039f34
ldr r0, =gUnknown_02039F34
ldr r1, [r0]
ldr r0, [r1]
ldrb r0, [r0, 0x1]
@@ -2517,7 +2517,7 @@ _080E66FC:
cmp r0, 0x3
ble _080E66AA
movs r6, 0
ldr r5, =0x02039f34
ldr r5, =gUnknown_02039F34
adds r4, r5, 0
_080E6712:
ldr r0, [r4]
@@ -2576,7 +2576,7 @@ _080E676C:
ContestEffectFunc_080E6778: @ 80E6778
push {lr}
ldr r3, =gContestMoves
ldr r0, =0x02039f34
ldr r0, =gUnknown_02039F34
ldr r1, [r0]
ldr r0, [r1, 0x8]
ldrb r2, [r0, 0x11]
@@ -2590,7 +2590,7 @@ ContestEffectFunc_080E6778: @ 80E6778
adds r0, r3
ldrb r0, [r0, 0x1]
lsls r0, 29
ldr r1, =0x02039f2c
ldr r1, =gUnknown_02039F2C
lsrs r0, 29
ldrh r1, [r1]
cmp r0, r1
@@ -2613,7 +2613,7 @@ ContestEffectFunc_080E67BC: @ 80E67BC
movs r0, 0
mov r8, r0
movs r4, 0
ldr r5, =0x02039f34
ldr r5, =gUnknown_02039F34
movs r6, 0
_080E67CC:
ldr r3, [r5]
@@ -2672,14 +2672,14 @@ _080E682E:
mov r7, r8
cmp r7, 0
bne _080E684A
ldr r0, =0x02039f34
ldr r0, =gUnknown_02039F34
ldr r0, [r0]
ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x11]
movs r1, 0x36
bl sub_80DD3F0
_080E684A:
ldr r0, =0x02039f34
ldr r0, =gUnknown_02039F34
ldr r0, [r0]
ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x11]
@@ -2696,7 +2696,7 @@ _080E684A:
thumb_func_start ContestEffectFunc_080E6868
ContestEffectFunc_080E6868: @ 80E6868
push {r4,lr}
ldr r0, =0x02039f34
ldr r0, =gUnknown_02039F34
ldr r1, [r0]
ldr r0, [r1]
ldrb r0, [r0, 0x13]
@@ -2745,7 +2745,7 @@ _080E68C2:
movs r1, 0x1E
bl sub_80DD3D4
_080E68CE:
ldr r0, =0x02039f34
ldr r0, =gUnknown_02039F34
ldr r1, [r0]
ldr r0, [r1, 0x8]
ldrb r2, [r0, 0x11]
@@ -2764,7 +2764,7 @@ _080E68CE:
thumb_func_start ContestEffectFunc_080E68EC
ContestEffectFunc_080E68EC: @ 80E68EC
push {r4,lr}
ldr r4, =0x02039f34
ldr r4, =gUnknown_02039F34
ldr r0, [r4]
ldr r2, [r0, 0x10]
ldrb r1, [r2, 0x1]
@@ -2811,7 +2811,7 @@ sub_80E6934: @ 80E6934
mov r8, r0
movs r7, 0
movs r4, 0
ldr r6, =0x02039f34
ldr r6, =gUnknown_02039F34
ldr r0, =gContestMoves
mov r9, r0
movs r5, 0
@@ -2861,7 +2861,7 @@ _080E699E:
ble _080E694E
cmp r7, 0
bne _080E69B8
ldr r0, =0x02039f34
ldr r0, =gUnknown_02039F34
ldr r0, [r0]
ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x11]
@@ -2882,7 +2882,7 @@ sub_80E69C8: @ 80E69C8
push {lr}
lsls r0, 24
lsrs r3, r0, 24
ldr r2, =0x02039f34
ldr r2, =gUnknown_02039F34
ldr r0, [r2]
ldr r0, [r0, 0x8]
adds r0, 0xD
@@ -2945,7 +2945,7 @@ sub_80E6A2C: @ 80E6A2C
movs r2, 0x8
bl memset
movs r7, 0
ldr r4, =0x02039f34
ldr r4, =gUnknown_02039F34
ldr r0, [r4]
ldr r0, [r0, 0x8]
ldrb r0, [r0, 0x8]
@@ -3040,7 +3040,7 @@ _080E6AD6:
strh r0, [r1]
_080E6AFE:
adds r7, 0x1
ldr r4, =0x02039f34
ldr r4, =gUnknown_02039F34
ldr r0, [r4]
ldr r0, [r0, 0x8]
adds r0, 0x8
@@ -3081,7 +3081,7 @@ sub_80E6B3C: @ 80E6B3C
lsrs r0, 24
lsls r1, 24
lsrs r1, 24
ldr r2, =0x02039f34
ldr r2, =gUnknown_02039F34
ldr r4, [r2]
ldr r3, [r4, 0x4]
lsls r2, r0, 3
asm/contest_link_80F57C4.s
+264 -264
View File
File diff suppressed because it is too large Load Diff
asm/contest_link_80FC4F4.s
+93 -93
View File
@@ -88,9 +88,9 @@ sub_80FC580: @ 80FC580
lsls r0, 24
lsrs r2, r0, 24
movs r1, 0
ldr r5, =0x03005e00
ldr r5, =gTasks
ldr r6, =sub_80FC5C0
ldr r4, =0x020223c4
ldr r4, =gUnknown_020223C4
movs r3, 0xFF
_080FC590:
lsls r0, r1, 8
@@ -118,7 +118,7 @@ _080FC590:
sub_80FC5C0: @ 80FC5C0
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
@@ -134,20 +134,20 @@ sub_80FC5DC: @ 80FC5DC
push {r4-r7,lr}
lsls r0, 24
lsrs r7, r0, 24
ldr r0, =0x03003124
ldr r0, =gUnknown_03003124
ldrb r0, [r0]
cmp r0, 0
beq _080FC650
bl link_get_multiplayer_id
ldr r1, =0x02039f25
ldr r1, =gUnknown_02039F25
strb r0, [r1]
bl sub_8009FCC
ldr r4, =0x02039f30
ldr r4, =gUnknown_02039F30
strb r0, [r4]
ldr r1, =0x02039f2a
ldr r1, =gUnknown_02039F2A
movs r0, 0x1
strb r0, [r1]
ldr r0, =0x030030fc
ldr r0, =gUnknown_030030FC
ldrb r0, [r0]
cmp r0, 0x1
bne _080FC60C
@@ -158,7 +158,7 @@ _080FC60C:
ldrb r2, [r4]
cmp r3, r2
bge _080FC64A
ldr r1, =0x020229e8
ldr r1, =gUnknown_020229E8
ldrb r0, [r1]
subs r0, 0x1
adds r6, r4, 0
@@ -182,7 +182,7 @@ _080FC63A:
ldrb r6, [r6]
cmp r3, r6
bge _080FC64A
ldr r0, =0x02039f2a
ldr r0, =gUnknown_02039F2A
ldrb r1, [r0]
movs r2, 0x4
orrs r1, r2
@@ -201,7 +201,7 @@ _080FC650:
sub_80FC670: @ 80FC670
push {r4,lr}
adds r4, r0, 0
ldr r0, =0x02039f2a
ldr r0, =gUnknown_02039F2A
ldrb r1, [r0]
movs r0, 0x4
ands r0, r1
@@ -250,7 +250,7 @@ sub_80FC6BC: @ 80FC6BC
lsls r6, r7, 2
adds r0, r6, r7
lsls r4, r0, 3
ldr r5, =0x03005e08
ldr r5, =gTasks + 0x8
adds r0, r4, r5
adds r0, 0x18
bl sub_80FC670
@@ -284,11 +284,11 @@ _080FC6FE:
lsls r0, 24
cmp r0, 0
beq _080FC7F4
ldr r0, =0x020228c4
ldr r1, =0x02039f25
ldr r0, =gUnknown_020228C4
ldr r1, =gUnknown_02039F25
ldrb r1, [r1]
lsls r1, 6
ldr r2, =0x02039e00
ldr r2, =gUnknown_02039E00
adds r1, r2
movs r2, 0x40
bl memcpy
@@ -297,11 +297,11 @@ _080FC6FE:
b _080FC7F4
.pool
_080FC738:
ldr r0, =0x020228c4
ldr r1, =0x02039f25
ldr r0, =gUnknown_020228C4
ldr r1, =gUnknown_02039F25
ldrb r1, [r1]
lsls r1, 6
ldr r2, =0x02039e00
ldr r2, =gUnknown_02039E00
adds r1, r2
movs r2, 0x40
bl memcpy
@@ -313,18 +313,18 @@ _080FC758:
cmp r0, 0
beq _080FC7F4
movs r5, 0
ldr r0, =0x02039f30
ldr r0, =gUnknown_02039F30
mov r8, r6
ldrb r0, [r0]
cmp r5, r0
bge _080FC798
ldr r6, =0x020229e8
ldr r6, =gUnknown_020229E8
_080FC770:
lsls r4, r5, 6
ldr r0, =0x02039e00
ldr r0, =gUnknown_02039E00
adds r4, r0
lsls r1, r5, 8
ldr r0, =0x020223c4
ldr r0, =gUnknown_020223C4
adds r1, r0
adds r0, r4, 0
movs r2, 0x40
@@ -334,12 +334,12 @@ _080FC770:
bl sub_80DFA08
adds r6, 0x1C
adds r5, 0x1
ldr r0, =0x02039f30
ldr r0, =gUnknown_02039F30
ldrb r0, [r0]
cmp r5, r0
blt _080FC770
_080FC798:
ldr r0, =0x03005e00
ldr r0, =gTasks
mov r2, r8
adds r1, r2, r7
lsls r1, 3
@@ -365,7 +365,7 @@ _080FC7D6:
strh r0, [r4, 0x8]
b _080FC7F4
_080FC7DC:
ldr r0, =0x03005e00
ldr r0, =gTasks
lsls r1, r7, 2
adds r1, r7
lsls r1, 3
@@ -390,7 +390,7 @@ sub_80FC804: @ 80FC804
push {r4,r5,lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r2, 2
adds r0, r2
lsls r0, 3
@@ -416,7 +416,7 @@ _080FC830:
lsls r0, 24
cmp r0, 0
beq _080FC880
ldr r0, =0x03005d80
ldr r0, =gUnknown_03005D80
movs r1, 0x4
bl sub_80FC4F4
cmp r0, 0x1
@@ -429,12 +429,12 @@ _080FC858:
lsls r0, 24
cmp r0, 0
beq _080FC880
ldr r0, =0x03005d80
ldr r4, =0x020223c4
ldr r0, =gUnknown_03005D80
ldr r4, =gUnknown_020223C4
adds r1, r4, 0
movs r2, 0x4
bl memcpy
ldr r0, =0x030060b8
ldr r0, =gUnknown_030060B8
adds r1, r4, 0
movs r2, 0x4
bl memcpy
@@ -461,7 +461,7 @@ sub_80FC894: @ 80FC894
mov r8, r0
adds r0, r6
lsls r5, r0, 3
ldr r7, =0x03005e08
ldr r7, =gTasks + 0x8
adds r0, r5, r7
adds r0, 0x18
bl sub_80FC670
@@ -487,7 +487,7 @@ _080FC8D8:
beq _080FC954
b _080FC96E
_080FC8DE:
ldr r1, =0x020228c4
ldr r1, =gUnknown_020228C4
ldrh r0, [r4, 0x1A]
strb r0, [r1]
bl link_get_multiplayer_id
@@ -513,11 +513,11 @@ _080FC90C:
cmp r0, 0
beq _080FC986
movs r3, 0
ldr r1, =0x02039f30
ldr r1, =gUnknown_02039F30
ldrb r0, [r1]
cmp r3, r0
bge _080FC93A
ldr r4, =0x020223c4
ldr r4, =gUnknown_020223C4
adds r0, r7, 0x2
adds r2, r5, r0
movs r5, 0x80
@@ -555,7 +555,7 @@ _080FC954:
strh r0, [r4, 0x8]
b _080FC986
_080FC96E:
ldr r0, =0x03005e00
ldr r0, =gTasks
lsls r1, r6, 2
adds r1, r6
lsls r1, 3
@@ -581,7 +581,7 @@ sub_80FC998: @ 80FC998
push {r4,lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r2, 2
adds r0, r2
lsls r0, 3
@@ -603,7 +603,7 @@ _080FC9C4:
lsls r0, 24
cmp r0, 0
beq _080FC9F0
ldr r0, =0x02039f25
ldr r0, =gUnknown_02039F25
movs r1, 0x1
bl sub_80FC4F4
cmp r0, 0x1
@@ -633,7 +633,7 @@ sub_80FC9F8: @ 80FC9F8
push {r6,r7}
lsls r0, 24
lsrs r5, r0, 24
ldr r0, =0x03005e00
ldr r0, =gTasks
mov r8, r0
lsls r7, r5, 2
adds r0, r7, r5
@@ -657,9 +657,9 @@ _080FCA30:
lsls r0, 24
cmp r0, 0
beq _080FCAB2
ldr r0, =0x02039f34
ldr r0, =gUnknown_02039F34
ldr r2, [r0]
ldr r0, =0x02039f25
ldr r0, =gUnknown_02039F25
ldrb r0, [r0]
lsls r1, r0, 3
subs r1, r0
@@ -682,15 +682,15 @@ _080FCA68:
cmp r0, 0
beq _080FCAB2
movs r2, 0
ldr r6, =0x02039f30
ldr r6, =gUnknown_02039F30
mov r9, r8
mov r12, r7
ldrb r0, [r6]
cmp r2, r0
bge _080FCAA4
ldr r1, =0x02039f34
ldr r1, =gUnknown_02039F34
mov r8, r1
ldr r4, =0x020223c4
ldr r4, =gUnknown_020223C4
movs r3, 0
movs r7, 0x80
lsls r7, 1
@@ -730,7 +730,7 @@ sub_80FCACC: @ 80FCACC
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
@@ -769,7 +769,7 @@ _080FCB2C:
bne _080FCB38
b _080FCC82
_080FCB38:
ldr r0, =0x02039f08
ldr r0, =gUnknown_02039F08
movs r1, 0x8
b _080FCC16
.pool
@@ -780,11 +780,11 @@ _080FCB44:
bne _080FCB50
b _080FCC82
_080FCB50:
ldr r0, =0x02039f08
ldr r1, =0x02039f2b
ldr r0, =gUnknown_02039F08
ldr r1, =gUnknown_02039F2B
ldrb r1, [r1]
lsls r1, 8
ldr r2, =0x020223c4
ldr r2, =gUnknown_020223C4
adds r1, r2
movs r2, 0x8
b _080FCC50
@@ -814,7 +814,7 @@ _080FCB90:
lsls r0, 24
cmp r0, 0
beq _080FCC82
ldr r0, =0x02039f10
ldr r0, =gUnknown_02039F10
movs r1, 0x8
b _080FCC16
.pool
@@ -823,11 +823,11 @@ _080FCBA4:
lsls r0, 24
cmp r0, 0
beq _080FCC82
ldr r0, =0x02039f10
ldr r1, =0x02039f2b
ldr r0, =gUnknown_02039F10
ldr r1, =gUnknown_02039F2B
ldrb r1, [r1]
lsls r1, 8
ldr r2, =0x020223c4
ldr r2, =gUnknown_020223C4
adds r1, r2
movs r2, 0x8
b _080FCC50
@@ -837,7 +837,7 @@ _080FCBCC:
lsls r0, 24
cmp r0, 0
beq _080FCC82
ldr r0, =0x02039f18
ldr r0, =gUnknown_02039F18
movs r1, 0x8
b _080FCC16
.pool
@@ -846,11 +846,11 @@ _080FCBE0:
lsls r0, 24
cmp r0, 0
beq _080FCC82
ldr r0, =0x02039f18
ldr r1, =0x02039f2b
ldr r0, =gUnknown_02039F18
ldr r1, =gUnknown_02039F2B
ldrb r1, [r1]
lsls r1, 8
ldr r2, =0x020223c4
ldr r2, =gUnknown_020223C4
adds r1, r2
movs r2, 0x8
b _080FCC50
@@ -860,13 +860,13 @@ _080FCC08:
lsls r0, 24
cmp r0, 0
beq _080FCC82
ldr r0, =0x02039f20
ldr r0, =gUnknown_02039F20
movs r1, 0x4
_080FCC16:
bl sub_80FC4F4
cmp r0, 0x1
bne _080FCC82
ldr r0, =0x03005e00
ldr r0, =gTasks
lsls r1, r4, 2
adds r1, r4
lsls r1, 3
@@ -881,16 +881,16 @@ _080FCC38:
lsls r0, 24
cmp r0, 0
beq _080FCC82
ldr r0, =0x02039f20
ldr r1, =0x02039f2b
ldr r0, =gUnknown_02039F20
ldr r1, =gUnknown_02039F2B
ldrb r1, [r1]
lsls r1, 8
ldr r2, =0x020223c4
ldr r2, =gUnknown_020223C4
adds r1, r2
movs r2, 0x4
_080FCC50:
bl memcpy
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
@@ -916,7 +916,7 @@ sub_80FCC88: @ 80FCC88
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
@@ -955,7 +955,7 @@ _080FCCE8:
bne _080FCCF4
b _080FCE42
_080FCCF4:
ldr r0, =0x02039f34
ldr r0, =gUnknown_02039F34
ldr r0, [r0]
ldr r0, [r0, 0x4]
movs r1, 0x70
@@ -968,13 +968,13 @@ _080FCD04:
bne _080FCD10
b _080FCE42
_080FCD10:
ldr r0, =0x02039f34
ldr r0, =gUnknown_02039F34
ldr r0, [r0]
ldr r0, [r0, 0x4]
ldr r1, =0x02039f2b
ldr r1, =gUnknown_02039F2B
ldrb r1, [r1]
lsls r1, 8
ldr r2, =0x020223c4
ldr r2, =gUnknown_020223C4
adds r1, r2
movs r2, 0x70
b _080FCE10
@@ -1004,7 +1004,7 @@ _080FCD54:
lsls r0, 24
cmp r0, 0
beq _080FCE42
ldr r0, =0x02039f34
ldr r0, =gUnknown_02039F34
ldr r0, [r0]
ldr r0, [r0, 0x8]
movs r1, 0x14
@@ -1015,13 +1015,13 @@ _080FCD6C:
lsls r0, 24
cmp r0, 0
beq _080FCE42
ldr r0, =0x02039f34
ldr r0, =gUnknown_02039F34
ldr r0, [r0]
ldr r0, [r0, 0x8]
ldr r1, =0x02039f2b
ldr r1, =gUnknown_02039F2B
ldrb r1, [r1]
lsls r1, 8
ldr r2, =0x020223c4
ldr r2, =gUnknown_020223C4
adds r1, r2
movs r2, 0x14
b _080FCE10
@@ -1031,7 +1031,7 @@ _080FCD98:
lsls r0, 24
cmp r0, 0
beq _080FCE42
ldr r0, =0x02039f34
ldr r0, =gUnknown_02039F34
ldr r0, [r0]
ldr r0, [r0, 0x10]
b _080FCDD4
@@ -1041,7 +1041,7 @@ _080FCDB0:
lsls r0, 24
cmp r0, 0
beq _080FCE42
ldr r0, =0x02039f34
ldr r0, =gUnknown_02039F34
ldr r0, [r0]
ldr r0, [r0, 0x10]
b _080FCE04
@@ -1051,14 +1051,14 @@ _080FCDC8:
lsls r0, 24
cmp r0, 0
beq _080FCE42
ldr r0, =0x02039f26
ldr r0, =gUnknown_02039F26
_080FCDD4:
movs r1, 0x4
_080FCDD6:
bl sub_80FC4F4
cmp r0, 0x1
bne _080FCE42
ldr r0, =0x03005e00
ldr r0, =gTasks
lsls r1, r4, 2
adds r1, r4
lsls r1, 3
@@ -1073,17 +1073,17 @@ _080FCDF8:
lsls r0, 24
cmp r0, 0
beq _080FCE42
ldr r0, =0x02039f26
ldr r0, =gUnknown_02039F26
_080FCE04:
ldr r1, =0x02039f2b
ldr r1, =gUnknown_02039F2B
ldrb r1, [r1]
lsls r1, 8
ldr r2, =0x020223c4
ldr r2, =gUnknown_020223C4
adds r1, r2
movs r2, 0x4
_080FCE10:
bl memcpy
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
@@ -1116,7 +1116,7 @@ sub_80FCE48: @ 80FCE48
mov r8, r0
adds r0, r6
lsls r5, r0, 3
ldr r7, =0x03005e08
ldr r7, =gTasks + 0x8
adds r0, r5, r7
adds r0, 0x18
bl sub_80FC670
@@ -1142,7 +1142,7 @@ _080FCE8C:
beq _080FCEFC
b _080FCF16
_080FCE92:
ldr r1, =0x020228c4
ldr r1, =gUnknown_020228C4
movs r0, 0x6E
strb r0, [r1]
bl link_get_multiplayer_id
@@ -1169,7 +1169,7 @@ _080FCEC0:
beq _080FCF2E
mov r1, r8
mov r8, r9
ldr r4, =0x020223c4
ldr r4, =gUnknown_020223C4
adds r0, r7, 0
adds r0, 0xA
adds r2, r5, r0
@@ -1206,7 +1206,7 @@ _080FCEFC:
strh r0, [r4, 0x8]
b _080FCF2E
_080FCF16:
ldr r0, =0x03005e00
ldr r0, =gTasks
lsls r1, r6, 2
adds r1, r6
lsls r1, 3
@@ -1235,7 +1235,7 @@ sub_80FCF40: @ 80FCF40
lsls r0, r5, 2
adds r0, r5
lsls r4, r0, 3
ldr r6, =0x03005e08
ldr r6, =gTasks + 0x8
adds r0, r4, r6
adds r0, 0x18
bl sub_80FC670
@@ -1262,7 +1262,7 @@ _080FCF80:
lsls r0, 24
cmp r0, 0
beq _080FCFBE
ldr r0, =0x02039f00
ldr r0, =gUnknown_02039F00
movs r1, 0x8
bl sub_80FC4F4
cmp r0, 0x1
@@ -1274,11 +1274,11 @@ _080FCF9C:
lsls r0, 24
cmp r0, 0
beq _080FCFBE
ldr r0, =0x02039f00
ldr r1, =0x02039f2b
ldr r0, =gUnknown_02039F00
ldr r1, =gUnknown_02039F2B
ldrb r1, [r1]
lsls r1, 8
ldr r2, =0x020223c4
ldr r2, =gUnknown_020223C4
adds r1, r2
movs r2, 0x8
bl memcpy
@@ -1301,7 +1301,7 @@ sub_80FCFD0: @ 80FCFD0
lsls r0, r5, 2
adds r0, r5
lsls r4, r0, 3
ldr r6, =0x03005e08
ldr r6, =gTasks + 0x8
adds r0, r4, r6
adds r0, 0x18
bl sub_80FC670
@@ -1328,7 +1328,7 @@ _080FD010:
lsls r0, 24
cmp r0, 0
beq _080FD04E
ldr r0, =0x02039f26
ldr r0, =gUnknown_02039F26
movs r1, 0x4
bl sub_80FC4F4
cmp r0, 0x1
@@ -1340,11 +1340,11 @@ _080FD02C:
lsls r0, 24
cmp r0, 0
beq _080FD04E
ldr r0, =0x02039f26
ldr r1, =0x02039f2b
ldr r0, =gUnknown_02039F26
ldr r1, =gUnknown_02039F2B
ldrb r1, [r1]
lsls r1, 8
ldr r2, =0x020223c4
ldr r2, =gUnknown_020223C4
adds r1, r2
movs r2, 0x4
bl memcpy
asm/contest_painting.s
+70 -70
View File
@@ -8,14 +8,14 @@
thumb_func_start sub_812FDA8
sub_812FDA8: @ 812FDA8
push {r4-r7,lr}
ldr r3, =0x02039f5d
ldr r4, =0x02039f5c
ldr r1, =0x03005d8c
ldr r3, =gUnknown_02039F5D
ldr r4, =gUnknown_02039F5C
ldr r1, =gUnknown_03005D8C
ldr r2, [r1]
subs r0, 0x1
lsls r1, r0, 5
adds r2, r1
ldr r1, =0x02039f3c
ldr r1, =gUnknown_02039F3C
ldr r5, =0x00002e90
adds r2, r5
ldm r2!, {r5-r7}
@@ -54,19 +54,19 @@ sub_812FDF8: @ 812FDF8
thumb_func_start sub_812FE0C
sub_812FE0C: @ 812FE0C
push {r4,r5,lr}
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
ldr r0, [r0, 0x8]
bl SetMainCallback2
ldr r4, =0x030061c4
ldr r4, =gUnknown_030061C4
ldr r0, [r4]
bl Free
movs r5, 0
str r5, [r4]
ldr r4, =0x03006190
ldr r4, =gUnknown_03006190
ldr r0, [r4]
bl Free
str r5, [r4]
ldr r0, =0x030011f7
ldr r0, =gUnknown_030011F7
ldrb r0, [r0]
bl RemoveWindow
movs r0, 0x1
@@ -83,7 +83,7 @@ sub_812FE0C: @ 812FE0C
sub_812FE58: @ 812FE58
push {r4-r7,lr}
sub sp, 0x4
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
movs r2, 0x87
lsls r2, 3
adds r0, r1, r2
@@ -111,13 +111,13 @@ _0812FE94:
movs r0, 0
bl SetVBlankCallback
bl init_uns_table_pokemon_copy
ldr r1, =0x030061c0
ldr r0, =0x02039f3c
ldr r1, =gUnknown_030061C0
ldr r0, =gUnknown_02039F3C
str r0, [r1]
movs r0, 0x1
bl sub_8130238
bl sub_81301EC
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
movs r0, 0x87
lsls r0, 3
adds r1, r0
@@ -168,13 +168,13 @@ _0812FF14:
adds r1, r4, r0
b _0812FF3E
_0812FF2A:
ldr r0, =0x02039f5d
ldr r0, =gUnknown_02039F5D
ldrb r0, [r0]
ldr r1, =0x02039f5c
ldr r1, =gUnknown_02039F5C
ldrb r1, [r1]
bl sub_8130884
_0812FF36:
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
movs r2, 0x87
lsls r2, 3
adds r1, r2
@@ -185,9 +185,9 @@ _0812FF3E:
b _0812FFA0
.pool
_0812FF54:
ldr r0, =0x02039f5d
ldr r0, =gUnknown_02039F5D
ldrb r0, [r0]
ldr r1, =0x02039f5c
ldr r1, =gUnknown_02039F5C
ldrb r1, [r1]
bl sub_813010C
ldr r0, =gUnknown_085B0838
@@ -209,7 +209,7 @@ _0812FF54:
bl sub_80A2390
ldr r0, =sub_81302D0
bl SetVBlankCallback
ldr r0, =0x030011f0
ldr r0, =gUnknown_030011F0
strb r4, [r0]
movs r1, 0x9A
lsls r1, 5
@@ -229,7 +229,7 @@ _0812FFA0:
sub_812FFC8: @ 812FFC8
push {lr}
sub sp, 0x4
ldr r3, =0x030011f0
ldr r3, =gUnknown_030011F0
ldrb r1, [r3]
cmp r1, 0x1
beq _0813001C
@@ -244,7 +244,7 @@ _0812FFE4:
beq _0813005C
b _08130082
_0812FFEA:
ldr r0, =0x02037fd4
ldr r0, =gUnknown_02037FD4
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -253,11 +253,11 @@ _0812FFEA:
movs r0, 0x1
strb r0, [r3]
_0812FFFA:
ldr r0, =0x030011f6
ldr r0, =gUnknown_030011F6
ldrb r0, [r0]
cmp r0, 0
beq _08130082
ldr r1, =0x030011f4
ldr r1, =gUnknown_030011F4
ldrh r0, [r1]
cmp r0, 0
beq _08130082
@@ -265,7 +265,7 @@ _0812FFFA:
b _08130080
.pool
_0813001C:
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
ldrh r2, [r0, 0x2E]
ands r1, r2
cmp r1, 0
@@ -284,16 +284,16 @@ _0813002E:
movs r3, 0x10
bl pal_fade_maybe
_08130040:
ldr r0, =0x030011f6
ldr r0, =gUnknown_030011F6
ldrb r0, [r0]
cmp r0, 0
beq _08130082
ldr r1, =0x030011f4
ldr r1, =gUnknown_030011F4
movs r0, 0
b _08130080
.pool
_0813005C:
ldr r0, =0x02037fd4
ldr r0, =gUnknown_02037FD4
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -302,11 +302,11 @@ _0813005C:
ldr r0, =sub_812FE0C
bl SetMainCallback2
_0813006E:
ldr r0, =0x030011f6
ldr r0, =gUnknown_030011F6
ldrb r0, [r0]
cmp r0, 0
beq _08130082
ldr r1, =0x030011f4
ldr r1, =gUnknown_030011F4
ldrh r0, [r1]
cmp r0, 0x1D
bhi _08130082
@@ -343,7 +343,7 @@ sub_8130098: @ 8130098
adds r1, r0, 0
movs r0, 0x1
bl SetBgTilemapBuffer
ldr r4, =0x030011f7
ldr r4, =gUnknown_030011F7
ldr r0, =gUnknown_085B07EC
bl AddWindow
strb r0, [r4]
@@ -374,12 +374,12 @@ sub_813010C: @ 813010C
lsrs r1, 24
cmp r1, 0x1
beq _081301D4
ldr r6, =0x030061c0
ldr r6, =gUnknown_030061C0
ldr r1, [r6]
ldrb r5, [r1, 0xA]
cmp r0, 0x7
bhi _08130190
ldr r4, =0x02021cc4
ldr r4, =gUnknown_02021CC4
adds r0, r4, 0
adds r1, r5, 0
bl sub_818E868
@@ -394,40 +394,40 @@ sub_813010C: @ 813010C
ldr r1, [r0]
adds r0, r4, 0
bl AppendString
ldr r4, =0x02021dc4
ldr r4, =gUnknown_02021DC4
ldr r1, [r6]
adds r1, 0x16
adds r0, r4, 0
bl CopyString
adds r0, r4, 0
bl sub_81DB5AC
ldr r0, =0x02021ec4
ldr r0, =gUnknown_02021EC4
ldr r1, [r6]
adds r1, 0xB
bl CopyString
ldr r0, =0x02021fc4
ldr r0, =gUnknown_02021FC4
ldr r1, =gUnknown_0827EA0C
bl ExpandStringRefs
b _081301A6
.pool
_08130190:
ldr r0, =0x02021cc4
ldr r0, =gUnknown_02021CC4
adds r1, 0xB
bl CopyString
ldr r0, =0x02021fc4
ldr r0, =gUnknown_02021FC4
ldr r2, =gUnknown_085B07F4
lsls r1, r5, 2
adds r1, r2
ldr r1, [r1]
bl ExpandStringRefs
_081301A6:
ldr r4, =0x02021fc4
ldr r4, =gUnknown_02021FC4
movs r0, 0x1
adds r1, r4, 0
movs r2, 0xD0
bl GetStringCenterAlignXOffset
adds r3, r0, 0
ldr r0, =0x030011f7
ldr r0, =gUnknown_030011F7
ldrb r0, [r0]
lsls r3, 24
lsrs r3, 24
@@ -487,22 +487,22 @@ sub_8130238: @ 8130238
lsrs r1, r0, 24
cmp r1, 0
bne _0813025C
ldr r0, =0x030011f6
ldr r0, =gUnknown_030011F6
strb r1, [r0]
ldr r0, =0x030011f2
ldr r0, =gUnknown_030011F2
strh r1, [r0]
ldr r0, =0x030011f4
ldr r0, =gUnknown_030011F4
strh r1, [r0]
b _0813026E
.pool
_0813025C:
ldr r1, =0x030011f6
ldr r1, =gUnknown_030011F6
movs r0, 0x1
strb r0, [r1]
ldr r1, =0x030011f2
ldr r1, =gUnknown_030011F2
movs r0, 0xF
strh r0, [r1]
ldr r1, =0x030011f4
ldr r1, =gUnknown_030011F4
movs r0, 0x1E
strh r0, [r1]
_0813026E:
@@ -514,7 +514,7 @@ _0813026E:
thumb_func_start sub_8130280
sub_8130280: @ 8130280
push {lr}
ldr r0, =0x030011f6
ldr r0, =gUnknown_030011F6
ldrb r0, [r0]
cmp r0, 0
bne _08130298
@@ -527,8 +527,8 @@ _08130298:
ldr r1, =0x00000a45
movs r0, 0xA
bl SetGpuReg
ldr r1, =0x030011f2
ldr r0, =0x030011f4
ldr r1, =gUnknown_030011F2
ldr r0, =gUnknown_030011F4
ldrh r0, [r0]
lsrs r0, 1
strh r0, [r1]
@@ -567,13 +567,13 @@ sub_81302E8: @ 81302E8
lsrs r5, r0, 16
lsls r4, 24
lsrs r4, 24
ldr r6, =0x030061c0
ldr r6, =gUnknown_030061C0
ldr r0, [r6]
ldr r1, [r0, 0x4]
ldr r2, [r0]
adds r0, r5, 0
bl species_and_otid_get_pal
ldr r7, =0x030061c4
ldr r7, =gUnknown_030061C4
ldr r1, [r7]
bl LZDecompressVram
cmp r4, 0
@@ -581,7 +581,7 @@ sub_81302E8: @ 81302E8
lsls r0, r5, 3
ldr r1, =gMonFrontPicTable
adds r0, r1
ldr r4, =0x020244d4
ldr r4, =gUnknown_020244D4
ldr r1, [r4]
ldr r1, [r1, 0x8]
ldr r2, [r6]
@@ -591,7 +591,7 @@ sub_81302E8: @ 81302E8
ldr r0, [r4]
ldr r0, [r0, 0x8]
ldr r1, [r7]
ldr r2, =0x03006190
ldr r2, =gUnknown_03006190
ldr r2, [r2]
bl sub_8130380
b _0813036C
@@ -600,7 +600,7 @@ _08130348:
lsls r0, r5, 3
ldr r1, =gMonBackPicTable
adds r0, r1
ldr r4, =0x020244d4
ldr r4, =gUnknown_020244D4
ldr r1, [r4]
ldr r1, [r1, 0x4]
ldr r2, [r6]
@@ -610,7 +610,7 @@ _08130348:
ldr r0, [r4]
ldr r0, [r0, 0x4]
ldr r1, [r7]
ldr r2, =0x03006190
ldr r2, =gUnknown_03006190
ldr r2, [r2]
bl sub_8130380
_0813036C:
@@ -737,7 +737,7 @@ sub_8130430: @ 8130430
beq _0813044E
b _081305A4
_0813044E:
ldr r0, =0x030061c0
ldr r0, =gUnknown_030061C0
ldr r0, [r0]
ldrb r0, [r0, 0xA]
movs r1, 0x3
@@ -790,7 +790,7 @@ _081304D4:
bl RLUnCompVram
ldr r0, =gUnknown_085AF898
_081304E0:
ldr r1, =0x03006190
ldr r1, =gUnknown_03006190
ldr r1, [r1]
bl RLUnCompWram
b _0813050C
@@ -801,7 +801,7 @@ _081304F8:
lsls r1, 19
bl RLUnCompVram
ldr r0, =gUnknown_085AFDA4
ldr r1, =0x03006190
ldr r1, =gUnknown_03006190
ldr r1, [r1]
bl RLUnCompWram
_0813050C:
@@ -830,7 +830,7 @@ _08130518:
movs r1, 0
ldr r0, =0x0600608c
mov r12, r0
ldr r7, =0x03006190
ldr r7, =gUnknown_03006190
_0813053C:
movs r3, 0
adds r6, r1, 0x1
@@ -858,7 +858,7 @@ _08130544:
bls _0813053C
movs r3, 0
ldr r4, =0x0600608e
ldr r2, =0x03006190
ldr r2, =gUnknown_03006190
_08130570:
lsls r1, r3, 1
adds r1, r4
@@ -884,7 +884,7 @@ _081305A4:
b _08130650
.pool
_081305C0:
ldr r0, =0x030061c0
ldr r0, =gUnknown_030061C0
ldr r0, [r0]
ldrb r0, [r0, 0xA]
movs r1, 0x3
@@ -961,7 +961,7 @@ sub_8130688: @ 8130688
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r3, =0x030022c0
ldr r3, =gUnknown_030022C0
ldr r1, =gUnknown_085B0830
ldr r2, [r1, 0x4]
ldr r1, [r1]
@@ -993,13 +993,13 @@ sub_81306CC: @ 81306CC
lsrs r0, 24
cmp r0, 0x7
bhi _081306E4
ldr r0, =0x030061c0
ldr r0, =gUnknown_030061C0
ldr r0, [r0]
ldrb r0, [r0, 0xA]
b _081306F4
.pool
_081306E4:
ldr r0, =0x030061c0
ldr r0, =gUnknown_030061C0
ldr r0, [r0]
ldrb r0, [r0, 0xA]
movs r1, 0x3
@@ -1044,12 +1044,12 @@ _08130732:
thumb_func_start sub_8130738
sub_8130738: @ 8130738
push {r4,lr}
ldr r4, =0x030061c4
ldr r4, =gUnknown_030061C4
movs r0, 0x80
lsls r0, 2
bl AllocZeroed
str r0, [r4]
ldr r4, =0x03006190
ldr r4, =gUnknown_03006190
movs r0, 0x80
lsls r0, 6
bl AllocZeroed
@@ -1065,16 +1065,16 @@ sub_8130760: @ 8130760
push {r4,lr}
lsls r0, 24
lsrs r3, r0, 24
ldr r1, =0x030061a0
ldr r0, =0x03006190
ldr r1, =gUnknown_030061A0
ldr r0, =gUnknown_03006190
ldr r0, [r0]
str r0, [r1, 0x4]
ldr r0, =0x030061c4
ldr r0, =gUnknown_030061C4
ldr r0, [r0]
str r0, [r1, 0x8]
movs r2, 0
strb r2, [r1, 0x18]
ldr r0, =0x030061c0
ldr r0, =gUnknown_030061C0
ldr r0, [r0]
ldrb r0, [r0]
strb r0, [r1, 0x1F]
@@ -1150,7 +1150,7 @@ _08130846:
bl sub_81261A4
adds r0, r4, 0
bl sub_8126058
ldr r0, =0x030061c4
ldr r0, =gUnknown_030061C4
ldr r0, [r0]
movs r1, 0x80
lsls r1, 1
@@ -1173,7 +1173,7 @@ sub_8130884: @ 8130884
lsls r5, 24
lsrs r5, 24
bl sub_8130738
ldr r0, =0x030061c0
ldr r0, =gUnknown_030061C0
ldr r0, [r0]
ldrh r0, [r0, 0x8]
movs r1, 0
asm/crt0.s
+2 -2
View File
@@ -116,7 +116,7 @@ InterruptMain_Loop:
InterruptMain_FoundIntr:
strh r0, [r3, OFFSET_REG_IF - 0x200]
bic r2, r2, r0
ldr r0, =0x03007868
ldr r0, =gUnknown_03007868
ldr r0, [r0]
ldrb r0, [r0, 0xA]
mov r1, 0x8
@@ -129,7 +129,7 @@ InterruptMain_FoundIntr:
bic r3, r3, PSR_I_BIT | PSR_F_BIT | PSR_MODE_MASK
orr r3, r3, PSR_SYS_MODE
msr cpsr_cf, r3
ldr r1, =0x03002710
ldr r1, =gUnknown_03002710
add r1, r1, r12
ldr r0, [r1]
stmdb sp!, {lr}
asm/cute_sketch.s
+156 -156
View File
@@ -8,28 +8,28 @@
thumb_func_start sub_8124F2C
sub_8124F2C: @ 8124F2C
push {lr}
ldr r2, =0x03006168
ldr r2, =gUnknown_03006168
ldr r1, [r0, 0x4]
str r1, [r2]
ldr r2, =0x0300617c
ldr r2, =gUnknown_0300617C
ldrb r1, [r0, 0x1F]
strb r1, [r2]
ldr r2, =0x03006164
ldr r2, =gUnknown_03006164
ldrb r1, [r0, 0x19]
strb r1, [r2]
ldr r2, =0x03006178
ldr r2, =gUnknown_03006178
ldrb r1, [r0, 0x1A]
strb r1, [r2]
ldr r2, =0x03006174
ldr r2, =gUnknown_03006174
ldrb r1, [r0, 0x1B]
strb r1, [r2]
ldr r2, =0x0300616c
ldr r2, =gUnknown_0300616C
ldrb r1, [r0, 0x1C]
strb r1, [r2]
ldr r2, =0x03006180
ldr r2, =gUnknown_03006180
ldrb r1, [r0, 0x1D]
strb r1, [r2]
ldr r2, =0x03006170
ldr r2, =gUnknown_03006170
ldrb r1, [r0, 0x1E]
strb r1, [r2]
ldrb r0, [r0]
@@ -89,7 +89,7 @@ _0812502A:
b _081250B4
_08125030:
bl sub_81254E0
ldr r0, =0x0300617c
ldr r0, =gUnknown_0300617C
ldrb r0, [r0]
bl sub_81253A4
b _081250B4
@@ -151,26 +151,26 @@ sub_81250B8: @ 81250B8
lsls r0, 24
lsrs r7, r0, 24
movs r2, 0
ldr r0, =0x0300616c
ldr r0, =gUnknown_0300616C
mov r8, r0
ldrb r0, [r0]
cmp r2, r0
bcs _0812514A
ldr r1, =0x03006174
ldr r1, =gUnknown_03006174
mov r12, r1
ldr r3, =0x03006180
ldr r3, =gUnknown_03006180
mov r10, r3
ldr r0, =0x03006164
ldr r0, =gUnknown_03006164
mov r9, r0
_081250DE:
ldr r1, =0x03006178
ldr r1, =gUnknown_03006178
ldrb r0, [r1]
adds r0, r2
mov r3, r10
ldrb r1, [r3]
muls r0, r1
lsls r0, 1
ldr r3, =0x03006168
ldr r3, =gUnknown_03006168
ldr r1, [r3]
adds r1, r0
mov r3, r9
@@ -243,24 +243,24 @@ sub_8125170: @ 8125170
lsrs r0, 24
mov r8, r0
movs r2, 0
ldr r0, =0x0300616c
ldr r0, =gUnknown_0300616C
ldrb r0, [r0]
cmp r2, r0
bcs _08125208
ldr r1, =0x03006174
ldr r1, =gUnknown_03006174
mov r10, r1
_0812518E:
ldr r3, =0x03006178
ldr r3, =gUnknown_03006178
ldrb r0, [r3]
adds r0, r2
ldr r3, =0x03006180
ldr r3, =gUnknown_03006180
ldrb r1, [r3]
muls r0, r1
lsls r0, 1
ldr r3, =0x03006168
ldr r3, =gUnknown_03006168
ldr r1, [r3]
adds r1, r0
ldr r3, =0x03006164
ldr r3, =gUnknown_03006164
ldrb r0, [r3]
lsls r0, 1
adds r3, r1, r0
@@ -311,7 +311,7 @@ _081251EC:
_081251FC:
lsls r0, r7, 24
lsrs r2, r0, 24
ldr r1, =0x0300616c
ldr r1, =gUnknown_0300616C
ldrb r1, [r1]
cmp r2, r1
bcc _0812518E
@@ -351,25 +351,25 @@ sub_8125250: @ 8125250
push {r7}
sub sp, 0x4
movs r2, 0
ldr r0, =0x0300616c
ldr r0, =gUnknown_0300616C
ldrb r0, [r0]
cmp r2, r0
bcs _081252C2
ldr r0, =0x03006168
ldr r0, =gUnknown_03006168
mov r8, r0
ldr r3, =0x03006174
ldr r3, =gUnknown_03006174
_08125268:
ldr r0, =0x03006178
ldr r0, =gUnknown_03006178
ldrb r1, [r0]
adds r1, r2
ldr r0, =0x03006180
ldr r0, =gUnknown_03006180
ldrb r0, [r0]
muls r0, r1
lsls r0, 1
mov r4, r8
ldr r1, [r4]
adds r1, r0
ldr r0, =0x03006164
ldr r0, =gUnknown_03006164
ldrb r0, [r0]
lsls r0, 1
adds r4, r1, r0
@@ -402,7 +402,7 @@ _081252A8:
_081252B6:
lsls r0, r6, 24
lsrs r2, r0, 24
ldr r0, =0x0300616c
ldr r0, =gUnknown_0300616C
ldrb r0, [r0]
cmp r2, r0
bcc _08125268
@@ -423,15 +423,15 @@ sub_81252E8: @ 81252E8
push {r7}
sub sp, 0x8
movs r2, 0
ldr r0, =0x03006174
ldr r0, =gUnknown_03006174
ldrb r0, [r0]
cmp r2, r0
bcs _0812537E
ldr r0, =0x03006168
ldr r0, =gUnknown_03006168
mov r8, r0
ldr r3, =0x03006180
ldr r3, =gUnknown_03006180
_08125300:
ldr r0, =0x03006178
ldr r0, =gUnknown_03006178
ldrb r1, [r0]
ldrb r0, [r3]
muls r0, r1
@@ -439,7 +439,7 @@ _08125300:
mov r4, r8
ldr r1, [r4]
adds r1, r0
ldr r0, =0x03006164
ldr r0, =gUnknown_03006164
ldrb r0, [r0]
adds r0, r2
lsls r0, 1
@@ -451,13 +451,13 @@ _08125300:
ldrb r0, [r3]
lsls r0, 1
adds r4, r0
ldr r0, =0x0300616c
ldr r0, =gUnknown_0300616C
ldrb r0, [r0]
subs r0, 0x1
adds r7, r2, 0x1
cmp r5, r0
bge _08125372
ldr r6, =0x03006180
ldr r6, =gUnknown_03006180
_08125336:
ldrh r0, [r4]
movs r2, 0x80
@@ -484,7 +484,7 @@ _0812535C:
ldrb r0, [r6]
lsls r0, 1
adds r4, r0
ldr r0, =0x0300616c
ldr r0, =gUnknown_0300616C
ldrb r0, [r0]
subs r0, 0x1
cmp r5, r0
@@ -492,7 +492,7 @@ _0812535C:
_08125372:
lsls r0, r7, 24
lsrs r2, r0, 24
ldr r0, =0x03006174
ldr r0, =gUnknown_03006174
ldrb r0, [r0]
cmp r2, r0
bcc _08125300
@@ -517,25 +517,25 @@ sub_81253A4: @ 81253A4
lsrs r0, 24
mov r8, r0
movs r2, 0
ldr r0, =0x0300616c
ldr r0, =gUnknown_0300616C
ldrb r0, [r0]
cmp r2, r0
bcs _08125420
ldr r0, =0x03006168
ldr r0, =gUnknown_03006168
mov r9, r0
ldr r3, =0x03006174
ldr r3, =gUnknown_03006174
_081253C4:
ldr r0, =0x03006178
ldr r0, =gUnknown_03006178
ldrb r1, [r0]
adds r1, r2
ldr r0, =0x03006180
ldr r0, =gUnknown_03006180
ldrb r0, [r0]
muls r0, r1
lsls r0, 1
mov r4, r9
ldr r1, [r4]
adds r1, r0
ldr r0, =0x03006164
ldr r0, =gUnknown_03006164
ldrb r0, [r0]
lsls r0, 1
adds r4, r1, r0
@@ -569,7 +569,7 @@ _08125406:
_08125414:
lsls r0, r6, 24
lsrs r2, r0, 24
ldr r0, =0x0300616c
ldr r0, =gUnknown_0300616C
ldrb r0, [r0]
cmp r2, r0
bcc _081253C4
@@ -591,25 +591,25 @@ sub_8125448: @ 8125448
push {r7}
sub sp, 0x4
movs r2, 0
ldr r0, =0x0300616c
ldr r0, =gUnknown_0300616C
ldrb r0, [r0]
cmp r2, r0
bcs _081254BA
ldr r0, =0x03006168
ldr r0, =gUnknown_03006168
mov r8, r0
ldr r3, =0x03006174
ldr r3, =gUnknown_03006174
_08125460:
ldr r0, =0x03006178
ldr r0, =gUnknown_03006178
ldrb r1, [r0]
adds r1, r2
ldr r0, =0x03006180
ldr r0, =gUnknown_03006180
ldrb r0, [r0]
muls r0, r1
lsls r0, 1
mov r4, r8
ldr r1, [r4]
adds r1, r0
ldr r0, =0x03006164
ldr r0, =gUnknown_03006164
ldrb r0, [r0]
lsls r0, 1
adds r4, r1, r0
@@ -642,7 +642,7 @@ _081254A0:
_081254AE:
lsls r0, r6, 24
lsrs r2, r0, 24
ldr r0, =0x0300616c
ldr r0, =gUnknown_0300616C
ldrb r0, [r0]
cmp r2, r0
bcc _08125460
@@ -663,24 +663,24 @@ sub_81254E0: @ 81254E0
mov r6, r8
push {r6,r7}
movs r7, 0
ldr r0, =0x0300616c
ldr r0, =gUnknown_0300616C
ldrb r0, [r0]
cmp r7, r0
bcs _0812556C
ldr r0, =0x03006168
ldr r0, =gUnknown_03006168
mov r8, r0
_081254F6:
ldr r0, =0x03006178
ldr r0, =gUnknown_03006178
ldrb r1, [r0]
adds r1, r7
ldr r0, =0x03006180
ldr r0, =gUnknown_03006180
ldrb r0, [r0]
muls r0, r1
lsls r0, 1
mov r2, r8
ldr r1, [r2]
adds r1, r0
ldr r0, =0x03006164
ldr r0, =gUnknown_03006164
ldrb r0, [r0]
lsls r0, 1
adds r5, r1, r0
@@ -691,7 +691,7 @@ _081254F6:
strh r0, [r5]
movs r6, 0x1
adds r5, r4, 0
ldr r0, =0x03006174
ldr r0, =gUnknown_03006174
ldrb r0, [r0]
subs r0, 0x1
adds r7, 0x1
@@ -711,7 +711,7 @@ _0812552E:
lsls r0, 24
lsrs r6, r0, 24
adds r5, r4, 0
ldr r0, =0x03006174
ldr r0, =gUnknown_03006174
ldrb r0, [r0]
subs r0, 0x1
cmp r6, r0
@@ -723,22 +723,22 @@ _08125556:
strh r0, [r5]
lsls r0, r7, 24
lsrs r7, r0, 24
ldr r0, =0x0300616c
ldr r0, =gUnknown_0300616C
ldrb r0, [r0]
cmp r7, r0
bcc _081254F6
_0812556C:
movs r6, 0
ldr r0, =0x03006174
ldr r0, =gUnknown_03006174
ldrb r0, [r0]
cmp r6, r0
bcs _0812560C
ldr r3, =0x03006168
ldr r3, =gUnknown_03006168
mov r9, r3
ldr r0, =0x03006180
ldr r0, =gUnknown_03006180
mov r8, r0
_0812557E:
ldr r0, =0x03006178
ldr r0, =gUnknown_03006178
ldrb r0, [r0]
mov r2, r8
ldrb r1, [r2]
@@ -747,7 +747,7 @@ _0812557E:
mov r3, r9
ldr r2, [r3]
adds r2, r0
ldr r0, =0x03006164
ldr r0, =gUnknown_03006164
ldrb r0, [r0]
adds r0, r6
lsls r0, 1
@@ -762,13 +762,13 @@ _0812557E:
ldrb r0, [r1]
lsls r0, 1
adds r5, r0
ldr r0, =0x0300616c
ldr r0, =gUnknown_0300616C
ldrb r0, [r0]
subs r0, 0x1
adds r6, 0x1
cmp r7, r0
bge _081255F0
ldr r4, =0x03006180
ldr r4, =gUnknown_03006180
_081255BE:
ldrb r1, [r4]
lsls r1, 1
@@ -788,7 +788,7 @@ _081255BE:
ldrb r0, [r4]
lsls r0, 1
adds r5, r0
ldr r0, =0x0300616c
ldr r0, =gUnknown_0300616C
ldrb r0, [r0]
subs r0, 0x1
cmp r7, r0
@@ -803,7 +803,7 @@ _081255F0:
strh r0, [r5]
lsls r0, r6, 24
lsrs r6, r0, 24
ldr r0, =0x03006174
ldr r0, =gUnknown_03006174
ldrb r0, [r0]
cmp r6, r0
bcc _0812557E
@@ -824,25 +824,25 @@ sub_8125630: @ 8125630
push {r7}
sub sp, 0x4
movs r2, 0
ldr r0, =0x0300616c
ldr r0, =gUnknown_0300616C
ldrb r0, [r0]
cmp r2, r0
bcs _081256A2
ldr r0, =0x03006168
ldr r0, =gUnknown_03006168
mov r8, r0
ldr r3, =0x03006174
ldr r3, =gUnknown_03006174
_08125648:
ldr r0, =0x03006178
ldr r0, =gUnknown_03006178
ldrb r1, [r0]
adds r1, r2
ldr r0, =0x03006180
ldr r0, =gUnknown_03006180
ldrb r0, [r0]
muls r0, r1
lsls r0, 1
mov r4, r8
ldr r1, [r4]
adds r1, r0
ldr r0, =0x03006164
ldr r0, =gUnknown_03006164
ldrb r0, [r0]
lsls r0, 1
adds r4, r1, r0
@@ -875,7 +875,7 @@ _08125688:
_08125696:
lsls r0, r6, 24
lsrs r2, r0, 24
ldr r0, =0x0300616c
ldr r0, =gUnknown_0300616C
ldrb r0, [r0]
cmp r2, r0
bcc _08125648
@@ -897,7 +897,7 @@ sub_81256C8: @ 81256C8
mov r5, r8
push {r5-r7}
sub sp, 0x8
ldr r0, =0x03006168
ldr r0, =gUnknown_03006168
ldr r4, [r0]
movs r6, 0
movs r0, 0x80
@@ -926,7 +926,7 @@ _081256F2:
cmp r6, 0x3F
bls _081256E0
movs r7, 0
ldr r1, =0x03006168
ldr r1, =gUnknown_03006168
mov r10, r1
mov r3, sp
movs r2, 0x80
@@ -1011,7 +1011,7 @@ _08125794:
lsrs r7, r0, 24
cmp r7, 0x3F
bls _08125716
ldr r0, =0x03006168
ldr r0, =gUnknown_03006168
ldr r4, [r0]
movs r6, 0
movs r0, 0x80
@@ -1058,24 +1058,24 @@ sub_81257F8: @ 81257F8
push {r7}
sub sp, 0x4
movs r2, 0
ldr r0, =0x0300616c
ldr r0, =gUnknown_0300616C
ldrb r0, [r0]
cmp r2, r0
bcs _0812587A
ldr r0, =0x03006168
ldr r0, =gUnknown_03006168
mov r8, r0
_0812580E:
ldr r0, =0x03006178
ldr r0, =gUnknown_03006178
ldrb r1, [r0]
adds r1, r2
ldr r0, =0x03006180
ldr r0, =gUnknown_03006180
ldrb r0, [r0]
muls r0, r1
lsls r0, 1
mov r3, r8
ldr r1, [r3]
adds r1, r0
ldr r0, =0x03006164
ldr r0, =gUnknown_03006164
ldrb r0, [r0]
lsls r0, 1
adds r4, r1, r0
@@ -1084,7 +1084,7 @@ _0812580E:
strh r1, [r0]
movs r5, 0x1
adds r4, 0x2
ldr r0, =0x03006174
ldr r0, =gUnknown_03006174
ldrb r0, [r0]
subs r0, 0x1
adds r6, r2, 0x1
@@ -1109,7 +1109,7 @@ _0812585C:
lsls r0, 24
lsrs r5, r0, 24
adds r4, 0x2
ldr r0, =0x03006174
ldr r0, =gUnknown_03006174
ldrb r0, [r0]
subs r0, 0x1
cmp r5, r0
@@ -1117,7 +1117,7 @@ _0812585C:
_0812586E:
lsls r0, r6, 24
lsrs r2, r0, 24
ldr r0, =0x0300616c
ldr r0, =gUnknown_0300616C
ldrb r0, [r0]
cmp r2, r0
bcc _0812580E
@@ -1138,15 +1138,15 @@ sub_81258A0: @ 81258A0
push {r7}
sub sp, 0x8
movs r2, 0
ldr r0, =0x03006174
ldr r0, =gUnknown_03006174
ldrb r0, [r0]
cmp r2, r0
bcs _0812592E
ldr r0, =0x03006168
ldr r0, =gUnknown_03006168
mov r8, r0
ldr r7, =0x03006180
ldr r7, =gUnknown_03006180
_081258B8:
ldr r0, =0x03006178
ldr r0, =gUnknown_03006178
ldrb r1, [r0]
ldrb r0, [r7]
muls r0, r1
@@ -1154,7 +1154,7 @@ _081258B8:
mov r3, r8
ldr r1, [r3]
adds r1, r0
ldr r0, =0x03006164
ldr r0, =gUnknown_03006164
ldrb r0, [r0]
adds r0, r2
lsls r0, 1
@@ -1166,7 +1166,7 @@ _081258B8:
ldrb r0, [r7]
lsls r0, 1
adds r4, r0
ldr r0, =0x0300616c
ldr r0, =gUnknown_0300616C
ldrb r0, [r0]
subs r0, 0x1
adds r6, r2, 0x1
@@ -1195,7 +1195,7 @@ _0812590C:
ldrb r0, [r7]
lsls r0, 1
adds r4, r0
ldr r0, =0x0300616c
ldr r0, =gUnknown_0300616C
ldrb r0, [r0]
subs r0, 0x1
cmp r5, r0
@@ -1203,7 +1203,7 @@ _0812590C:
_08125922:
lsls r0, r6, 24
lsrs r2, r0, 24
ldr r0, =0x03006174
ldr r0, =gUnknown_03006174
ldrb r0, [r0]
cmp r2, r0
bcc _081258B8
@@ -1323,7 +1323,7 @@ _08125A06:
_08125A14:
movs r3, 0x1F
_08125A16:
ldr r1, =0x03006168
ldr r1, =gUnknown_03006168
mov r4, r8
lsls r0, r4, 2
mov r2, sp
@@ -2371,35 +2371,35 @@ _08126194:
thumb_func_start sub_81261A4
sub_81261A4: @ 81261A4
push {lr}
ldr r2, =0x03006188
ldr r2, =gUnknown_03006188
ldrb r1, [r0, 0x18]
lsls r1, 4
strh r1, [r2]
ldr r3, =0x03006184
ldr r3, =gUnknown_03006184
ldrh r2, [r2]
lsls r2, 1
ldr r1, [r0, 0x8]
adds r1, r2
str r1, [r3]
ldr r2, =0x03006168
ldr r2, =gUnknown_03006168
ldr r1, [r0, 0x4]
str r1, [r2]
ldr r2, =0x03006164
ldr r2, =gUnknown_03006164
ldrb r1, [r0, 0x19]
strb r1, [r2]
ldr r2, =0x03006178
ldr r2, =gUnknown_03006178
ldrb r1, [r0, 0x1A]
strb r1, [r2]
ldr r2, =0x03006174
ldr r2, =gUnknown_03006174
ldrb r1, [r0, 0x1B]
strb r1, [r2]
ldr r2, =0x0300616c
ldr r2, =gUnknown_0300616C
ldrb r1, [r0, 0x1C]
strb r1, [r2]
ldr r2, =0x03006180
ldr r2, =gUnknown_03006180
ldrb r1, [r0, 0x1D]
strb r1, [r2]
ldr r2, =0x03006170
ldr r2, =gUnknown_03006170
ldrb r1, [r0, 0x1E]
strb r1, [r2]
ldrh r0, [r0, 0x14]
@@ -2449,7 +2449,7 @@ _0812626A:
thumb_func_start sub_8126270
sub_8126270: @ 8126270
ldr r2, =0x03006184
ldr r2, =gUnknown_03006184
ldr r1, [r2]
movs r0, 0
strh r0, [r1]
@@ -2505,7 +2505,7 @@ sub_8126270: @ 8126270
thumb_func_start sub_8126318
sub_8126318: @ 8126318
ldr r2, =0x03006184
ldr r2, =gUnknown_03006184
ldr r0, [r2]
movs r1, 0
strh r1, [r0]
@@ -2521,7 +2521,7 @@ sub_8126318: @ 8126318
thumb_func_start sub_8126334
sub_8126334: @ 8126334
push {r4,r5,lr}
ldr r1, =0x03006184
ldr r1, =gUnknown_03006184
ldr r0, [r1]
movs r2, 0
strh r2, [r0]
@@ -2554,7 +2554,7 @@ _08126346:
thumb_func_start sub_8126370
sub_8126370: @ 8126370
push {r4,lr}
ldr r2, =0x03006184
ldr r2, =gUnknown_03006184
ldr r1, [r2]
movs r0, 0
strh r0, [r1]
@@ -2596,11 +2596,11 @@ sub_81263A4: @ 81263A4
mov r9, r2
_081263BC:
movs r6, 0
ldr r3, =0x03006184
ldr r3, =gUnknown_03006184
mov r12, r3
mov r0, r9
lsls r4, r0, 1
ldr r5, =0x0300616c
ldr r5, =gUnknown_0300616C
cmp r6, r9
bcs _081263E0
movs r2, 0
@@ -2626,29 +2626,29 @@ _081263E0:
cmp r3, r5
bcs _081264E4
_081263F4:
ldr r2, =0x03006168
ldr r0, =0x03006178
ldr r2, =gUnknown_03006168
ldr r0, =gUnknown_03006178
ldrb r1, [r0]
adds r1, r3
ldr r0, =0x03006180
ldr r0, =gUnknown_03006180
ldrb r0, [r0]
muls r0, r1
lsls r0, 1
ldr r1, [r2]
adds r1, r0
ldr r0, =0x03006164
ldr r0, =gUnknown_03006164
ldrb r0, [r0]
lsls r0, 1
adds r4, r1, r0
movs r6, 0
ldr r0, =0x03006174
ldr r0, =gUnknown_03006174
adds r2, r0, 0
adds r3, 0x1
mov r10, r3
ldrb r3, [r2]
cmp r6, r3
bcs _081264D6
ldr r0, =0x03006188
ldr r0, =gUnknown_03006188
mov r8, r0
_08126424:
ldrh r0, [r4]
@@ -2675,7 +2675,7 @@ _08126464:
adds r7, r4, 0x2
cmp r3, r9
bcs _081264C0
ldr r0, =0x03006184
ldr r0, =gUnknown_03006184
ldr r2, [r0]
ldrh r1, [r2, 0x2]
mov r12, r0
@@ -2713,7 +2713,7 @@ _081264B8:
_081264BE:
strh r0, [r4]
_081264C0:
ldr r2, =0x03006174
ldr r2, =gUnknown_03006174
cmp r3, r9
bne _081264CA
mov r3, r9
@@ -2729,7 +2729,7 @@ _081264D6:
mov r1, r10
lsls r0, r1, 24
lsrs r3, r0, 24
ldr r0, =0x0300616c
ldr r0, =gUnknown_0300616C
ldrb r0, [r0]
cmp r3, r0
bcc _081263F4
@@ -2750,35 +2750,35 @@ sub_81264FC: @ 81264FC
mov r7, r8
push {r7}
movs r2, 0
ldr r0, =0x0300616c
ldr r0, =gUnknown_0300616C
ldrb r0, [r0]
cmp r2, r0
bcs _081265A0
ldr r0, =0x03006168
ldr r0, =gUnknown_03006168
mov r8, r0
_08126510:
ldr r0, =0x03006178
ldr r0, =gUnknown_03006178
ldrb r1, [r0]
adds r1, r2
ldr r0, =0x03006180
ldr r0, =gUnknown_03006180
ldrb r0, [r0]
muls r0, r1
lsls r0, 1
mov r3, r8
ldr r1, [r3]
adds r1, r0
ldr r0, =0x03006164
ldr r0, =gUnknown_03006164
ldrb r0, [r0]
lsls r0, 1
adds r4, r1, r0
movs r6, 0
ldr r0, =0x03006174
ldr r0, =gUnknown_03006174
adds r3, r0, 0
adds r7, r2, 0x1
ldrb r0, [r3]
cmp r6, r0
bcs _08126594
ldr r5, =0x03006188
ldr r5, =gUnknown_03006188
_0812653C:
ldrh r0, [r4]
movs r2, 0x80
@@ -2805,7 +2805,7 @@ _0812657E:
adds r0, 0x2
_08126582:
strh r0, [r4]
ldr r3, =0x03006174
ldr r3, =gUnknown_03006174
_08126586:
adds r0, r6, 0x1
lsls r0, 24
@@ -2817,7 +2817,7 @@ _08126586:
_08126594:
lsls r0, r7, 24
lsrs r2, r0, 24
ldr r0, =0x0300616c
ldr r0, =gUnknown_0300616C
ldrb r0, [r0]
cmp r2, r0
bcc _08126510
@@ -2837,34 +2837,34 @@ sub_81265B4: @ 81265B4
push {r7}
sub sp, 0x4
movs r2, 0
ldr r0, =0x0300616c
ldr r0, =gUnknown_0300616C
ldrb r0, [r0]
cmp r2, r0
bcs _08126650
ldr r0, =0x03006168
ldr r0, =gUnknown_03006168
mov r8, r0
_081265CA:
ldr r0, =0x03006178
ldr r0, =gUnknown_03006178
ldrb r1, [r0]
adds r1, r2
ldr r0, =0x03006180
ldr r0, =gUnknown_03006180
ldrb r0, [r0]
muls r0, r1
lsls r0, 1
mov r3, r8
ldr r1, [r3]
adds r1, r0
ldr r0, =0x03006164
ldr r0, =gUnknown_03006164
ldrb r0, [r0]
lsls r0, 1
adds r4, r1, r0
movs r5, 0
ldr r0, =0x03006174
ldr r0, =gUnknown_03006174
adds r7, r2, 0x1
ldrb r0, [r0]
cmp r5, r0
bcs _08126644
ldr r6, =0x03006188
ldr r6, =gUnknown_03006188
movs r0, 0x80
lsls r0, 8
adds r2, r0, 0
@@ -2890,14 +2890,14 @@ _08126634:
lsls r0, 24
lsrs r5, r0, 24
adds r4, 0x2
ldr r0, =0x03006174
ldr r0, =gUnknown_03006174
ldrb r0, [r0]
cmp r5, r0
bcc _081265FA
_08126644:
lsls r0, r7, 24
lsrs r2, r0, 24
ldr r0, =0x0300616c
ldr r0, =gUnknown_0300616C
ldrb r0, [r0]
cmp r2, r0
bcc _081265CA
@@ -2918,34 +2918,34 @@ sub_8126664: @ 8126664
push {r7}
sub sp, 0x4
movs r2, 0
ldr r0, =0x0300616c
ldr r0, =gUnknown_0300616C
ldrb r0, [r0]
cmp r2, r0
bcs _08126700
ldr r0, =0x03006168
ldr r0, =gUnknown_03006168
mov r8, r0
_0812667A:
ldr r0, =0x03006178
ldr r0, =gUnknown_03006178
ldrb r1, [r0]
adds r1, r2
ldr r0, =0x03006180
ldr r0, =gUnknown_03006180
ldrb r0, [r0]
muls r0, r1
lsls r0, 1
mov r3, r8
ldr r1, [r3]
adds r1, r0
ldr r0, =0x03006164
ldr r0, =gUnknown_03006164
ldrb r0, [r0]
lsls r0, 1
adds r4, r1, r0
movs r5, 0
ldr r0, =0x03006174
ldr r0, =gUnknown_03006174
adds r7, r2, 0x1
ldrb r0, [r0]
cmp r5, r0
bcs _081266F4
ldr r6, =0x03006188
ldr r6, =gUnknown_03006188
movs r0, 0x80
lsls r0, 8
adds r2, r0, 0
@@ -2971,14 +2971,14 @@ _081266E4:
lsls r0, 24
lsrs r5, r0, 24
adds r4, 0x2
ldr r0, =0x03006174
ldr r0, =gUnknown_03006174
ldrb r0, [r0]
cmp r5, r0
bcc _081266AA
_081266F4:
lsls r0, r7, 24
lsrs r2, r0, 24
ldr r0, =0x0300616c
ldr r0, =gUnknown_0300616C
ldrb r0, [r0]
cmp r2, r0
bcc _0812667A
@@ -2999,34 +2999,34 @@ sub_8126714: @ 8126714
push {r7}
sub sp, 0x4
movs r2, 0
ldr r0, =0x0300616c
ldr r0, =gUnknown_0300616C
ldrb r0, [r0]
cmp r2, r0
bcs _081267B0
ldr r0, =0x03006168
ldr r0, =gUnknown_03006168
mov r8, r0
_0812672A:
ldr r0, =0x03006178
ldr r0, =gUnknown_03006178
ldrb r1, [r0]
adds r1, r2
ldr r0, =0x03006180
ldr r0, =gUnknown_03006180
ldrb r0, [r0]
muls r0, r1
lsls r0, 1
mov r3, r8
ldr r1, [r3]
adds r1, r0
ldr r0, =0x03006164
ldr r0, =gUnknown_03006164
ldrb r0, [r0]
lsls r0, 1
adds r4, r1, r0
movs r5, 0
ldr r0, =0x03006174
ldr r0, =gUnknown_03006174
adds r7, r2, 0x1
ldrb r0, [r0]
cmp r5, r0
bcs _081267A4
ldr r6, =0x03006188
ldr r6, =gUnknown_03006188
movs r0, 0x80
lsls r0, 8
adds r2, r0, 0
@@ -3052,14 +3052,14 @@ _08126794:
lsls r0, 24
lsrs r5, r0, 24
adds r4, 0x2
ldr r0, =0x03006174
ldr r0, =gUnknown_03006174
ldrb r0, [r0]
cmp r5, r0
bcc _0812675A
_081267A4:
lsls r0, r7, 24
lsrs r2, r0, 24
ldr r0, =0x0300616c
ldr r0, =gUnknown_0300616C
ldrb r0, [r0]
cmp r2, r0
bcc _0812672A
asm/daycare.s
+67 -67
View File
@@ -170,7 +170,7 @@ sub_806FB38: @ 806FB38
beq _0806FBBC
adds r0, r5, 0
adds r0, 0x74
ldr r1, =0x03005d90
ldr r1, =gUnknown_03005D90
ldr r1, [r1]
bl CopyString
adds r4, r5, 0
@@ -202,7 +202,7 @@ sub_806FB38: @ 806FB38
bl pokemon_getattr
lsls r0, 24
lsrs r0, 24
ldr r1, =0x03005d8c
ldr r1, =gUnknown_03005D8C
ldr r1, [r1]
lsls r2, r0, 3
adds r2, r0
@@ -270,9 +270,9 @@ daycare_send_selected_pokemon: @ 806FC18
lsrs r0, 24
movs r1, 0x64
muls r0, r1
ldr r1, =0x020244ec
ldr r1, =gUnknown_020244EC
adds r0, r1
ldr r1, =0x03005d8c
ldr r1, =gUnknown_03005D8C
ldr r1, [r1]
ldr r2, =0x00003030
adds r1, r2
@@ -347,7 +347,7 @@ _0806FCC4:
movs r6, 0
cmp r0, r7
bne _0806FCD4
ldr r0, =0x020244e2
ldr r0, =gUnknown_020244E2
ldrh r1, [r0]
adds r0, r4, 0
bl sub_8069424
@@ -375,7 +375,7 @@ sub_806FCF8: @ 806FCF8
push {r4-r7,lr}
sub sp, 0x68
adds r5, r0, 0
ldr r1, =0x02021cc4
ldr r1, =gUnknown_02021CC4
bl pokemon_get_nick_
adds r0, r5, 0
movs r1, 0xB
@@ -405,7 +405,7 @@ sub_806FCF8: @ 806FCF8
mov r0, sp
bl sub_806FCA4
_0806FD46:
ldr r0, =0x020244ec
ldr r0, =gUnknown_020244EC
movs r1, 0xFA
lsls r1, 1
adds r6, r0, r1
@@ -466,11 +466,11 @@ sub_806FD9C: @ 806FD9C
thumb_func_start sub_806FDC4
sub_806FDC4: @ 806FDC4
push {lr}
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r1, =0x00003030
adds r0, r1
ldr r1, =0x020375e0
ldr r1, =gUnknown_020375E0
ldrb r1, [r1]
bl sub_806FD9C
lsls r0, 16
@@ -540,12 +540,12 @@ sub_806FE54: @ 806FE54
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, =0x02021dc4
ldr r0, =gUnknown_02021DC4
adds r1, r4, 0
movs r2, 0
movs r3, 0x2
bl ConvertIntToDecimalString
ldr r1, =0x02021cc4
ldr r1, =gUnknown_02021CC4
adds r0, r5, 0
bl pokemon_get_nick_
adds r0, r4, 0
@@ -563,13 +563,13 @@ sub_806FE88: @ 806FE88
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r1, =0x02021cc4
ldr r1, =gUnknown_02021CC4
adds r0, r5, 0
bl pokemon_get_nick_
movs r0, 0x64
muls r4, r0
adds r4, 0x64
ldr r0, =0x02021dc4
ldr r0, =gUnknown_02021DC4
adds r1, r4, 0
movs r2, 0
movs r3, 0x5
@@ -599,14 +599,14 @@ sub_806FEC0: @ 806FEC0
thumb_func_start sub_806FED8
sub_806FED8: @ 806FED8
push {lr}
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r1, =0x00003030
adds r0, r1
ldr r1, =0x020375e0
ldr r1, =gUnknown_020375E0
ldrb r1, [r1]
bl sub_806FEC0
ldr r1, =0x020375e2
ldr r1, =gUnknown_020375E2
strh r0, [r1]
pop {r0}
bx r0
@@ -617,7 +617,7 @@ sub_806FED8: @ 806FED8
sub_806FF04: @ 806FF04
lsls r0, 16
lsrs r0, 16
ldr r1, =0x03005d8c
ldr r1, =gUnknown_03005D8C
ldr r2, [r1]
ldr r1, =0x000030b8
adds r3, r2, r1
@@ -636,8 +636,8 @@ sub_806FF04: @ 806FF04
thumb_func_start sub_806FF30
sub_806FF30: @ 806FF30
push {r4-r6,lr}
ldr r6, =0x03005d8c
ldr r5, =0x020375e0
ldr r6, =gUnknown_03005D8C
ldr r5, =gUnknown_020375E0
ldrh r0, [r5]
movs r4, 0x8C
adds r1, r0, 0
@@ -899,7 +899,7 @@ sub_8070114: @ 8070114
push {r4-r7,lr}
adds r5, r0, 0
movs r6, 0
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
ldrh r0, [r0, 0x24]
bl SeedRng2
adds r0, r5, 0
@@ -995,7 +995,7 @@ sub_80701B8: @ 80701B8
thumb_func_start sub_80701E0
sub_80701E0: @ 80701E0
push {lr}
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r1, =0x00003030
adds r0, r1
@@ -1008,7 +1008,7 @@ sub_80701E0: @ 80701E0
thumb_func_start sub_80701FC
sub_80701FC: @ 80701FC
push {lr}
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r1, =0x00003030
adds r0, r1
@@ -1333,10 +1333,10 @@ daycare_build_child_moveset: @ 8070470
movs r0, 0
str r0, [sp]
movs r6, 0
ldr r5, =0x02024a4c
ldr r5, =gUnknown_02024A4C
movs r2, 0
ldr r4, =0x02024a28
ldr r3, =0x02024a30
ldr r4, =gUnknown_02024A28
ldr r3, =gUnknown_02024A30
_08070490:
lsls r1, r6, 1
adds r0, r1, r5
@@ -1351,7 +1351,7 @@ _08070490:
cmp r6, 0x3
bls _08070490
movs r6, 0
ldr r2, =0x02024a38
ldr r2, =gUnknown_02024A38
movs r1, 0
_080704AE:
lsls r0, r6, 1
@@ -1363,7 +1363,7 @@ _080704AE:
cmp r6, 0x9
bls _080704AE
movs r6, 0
ldr r2, =0x020249c4
ldr r2, =gUnknown_020249C4
movs r1, 0
_080704C4:
lsls r0, r6, 1
@@ -1379,13 +1379,13 @@ _080704C4:
bl pokemon_getattr
lsls r0, 16
lsrs r0, 16
ldr r1, =0x020249c4
ldr r1, =gUnknown_020249C4
bl sub_806E204
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x4]
movs r6, 0
ldr r1, =0x02024a28
ldr r1, =gUnknown_02024A28
mov r8, r1
_080704F2:
adds r5, r6, 0
@@ -1400,7 +1400,7 @@ _080704F2:
mov r0, r9
adds r1, r5, 0
bl pokemon_getattr_encrypted
ldr r1, =0x02024a4c
ldr r1, =gUnknown_02024A4C
adds r4, r1
strh r0, [r4]
adds r0, r6, 0x1
@@ -1408,7 +1408,7 @@ _080704F2:
lsrs r6, r0, 16
cmp r6, 0x3
bls _080704F2
ldr r1, =0x02024a38
ldr r1, =gUnknown_02024A38
adds r0, r7, 0
bl pokemon_get_eggmoves
lsls r0, 24
@@ -1416,7 +1416,7 @@ _080704F2:
mov r8, r0
movs r6, 0
_0807052E:
ldr r0, =0x02024a28
ldr r0, =gUnknown_02024A28
lsls r1, r6, 1
adds r2, r1, r0
ldrh r1, [r2]
@@ -1429,7 +1429,7 @@ _0807052E:
adds r4, r2, 0
ldr r2, =0x0000ffff
_08070546:
ldr r0, =0x02024a38
ldr r0, =gUnknown_02024A38
lsls r1, r5, 1
adds r1, r0
ldrh r0, [r4]
@@ -1460,7 +1460,7 @@ _08070596:
adds r0, r6, 0x1
lsls r0, 16
lsrs r6, r0, 16
ldr r3, =0x02024a28
ldr r3, =gUnknown_02024A28
mov r9, r3
cmp r6, 0x3
bls _0807052E
@@ -1477,7 +1477,7 @@ _080705A6:
cmp r1, 0
beq _08070608
movs r5, 0
ldr r0, =0x02024a28
ldr r0, =gUnknown_02024A28
adds r4, r2, r0
ldr r6, =0x0000ffff
mov r9, r0
@@ -1523,12 +1523,12 @@ _08070608:
movs r6, 0
mov r2, r9
ldrh r0, [r2]
ldr r3, =0x02024a30
ldr r3, =gUnknown_02024A30
mov r10, r3
cmp r0, 0
beq _08070672
mov r4, r9
ldr r0, =0x02024a4c
ldr r0, =gUnknown_02024A4C
mov r9, r0
mov r12, r10
_08070628:
@@ -1586,7 +1586,7 @@ _0807067C:
bcs _080706E4
ldr r2, =0x0000ffff
_0807068A:
ldr r1, =0x020249c4
ldr r1, =gUnknown_020249C4
lsls r0, r5, 1
adds r0, r1
ldrh r1, [r0]
@@ -1625,7 +1625,7 @@ _080706E4:
lsrs r6, r0, 16
cmp r6, 0x3
bhi _080706FC
ldr r0, =0x02024a30
ldr r0, =gUnknown_02024A30
lsls r1, r6, 1
adds r1, r0
ldrh r1, [r1]
@@ -1662,7 +1662,7 @@ sub_8070710: @ 8070710
thumb_func_start sub_8070728
sub_8070728: @ 8070728
push {lr}
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r1, =0x00003030
adds r0, r1
@@ -1920,7 +1920,7 @@ _08070918:
mov r0, sp
movs r1, 0x2D
bl pokemon_setattr
ldr r0, =0x020244ec
ldr r0, =gUnknown_020244EC
movs r1, 0xFA
lsls r1, 1
adds r0, r1
@@ -2099,7 +2099,7 @@ sub_8070A0C: @ 8070A0C
thumb_func_start sp0B8_daycare
sp0B8_daycare: @ 8070AA8
push {lr}
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r1, =0x00003030
adds r0, r1
@@ -2179,11 +2179,11 @@ _08070B34:
lsls r0, 24
lsrs r6, r0, 24
movs r5, 0
ldr r0, =0x020244e9
ldr r0, =gUnknown_020244E9
ldrb r0, [r0]
cmp r5, r0
bcs _08070BC0
ldr r4, =0x020244ec
ldr r4, =gUnknown_020244EC
_08070B5C:
adds r0, r4, 0
movs r1, 0x2D
@@ -2217,7 +2217,7 @@ _08070B9A:
bl pokemon_setattr
b _08070BB4
_08070BA8:
ldr r0, =0x020375e0
ldr r0, =gUnknown_020375E0
strh r5, [r0]
movs r0, 0x1
b _08070BC2
@@ -2225,7 +2225,7 @@ _08070BA8:
_08070BB4:
adds r4, 0x64
adds r5, 0x1
ldr r0, =0x020244e9
ldr r0, =gUnknown_020244E9
ldrb r0, [r0]
cmp r5, r0
bcc _08070B5C
@@ -2242,7 +2242,7 @@ _08070BC2:
thumb_func_start sub_8070BD0
sub_8070BD0: @ 8070BD0
push {lr}
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r1, =0x00003030
adds r0, r1
@@ -2278,14 +2278,14 @@ sub_8070C04: @ 8070C04
bl pokemon_getattr_encrypted
cmp r0, 0
beq _08070C2E
ldr r1, =0x02021cc4
ldr r1, =gUnknown_02021CC4
adds r0, r4, 0
bl pokemon_get_nick_
adds r0, r4, 0
movs r1, 0x7
mov r2, sp
bl pokemon_getattr_encrypted
ldr r0, =0x02021ec4
ldr r0, =gUnknown_02021EC4
mov r1, sp
bl CopyString
_08070C2E:
@@ -2295,7 +2295,7 @@ _08070C2E:
bl pokemon_getattr_encrypted
cmp r0, 0
beq _08070C44
ldr r1, =0x02021dc4
ldr r1, =gUnknown_02021DC4
adds r0, r4, 0
bl pokemon_get_nick_
_08070C44:
@@ -2314,9 +2314,9 @@ sub_8070C58: @ 8070C58
lsrs r0, 24
movs r5, 0x64
muls r0, r5
ldr r4, =0x020244ec
ldr r4, =gUnknown_020244EC
adds r0, r4
ldr r1, =0x02021cc4
ldr r1, =gUnknown_02021CC4
bl pokemon_get_nick_
bl brm_get_pokemon_selection
lsls r0, 24
@@ -2336,7 +2336,7 @@ sub_8070C58: @ 8070C58
thumb_func_start sp0B5_daycare
sp0B5_daycare: @ 8070C94
push {lr}
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r1, =0x00003030
adds r0, r1
@@ -2349,7 +2349,7 @@ sp0B5_daycare: @ 8070C94
thumb_func_start sp0B6_daycare
sp0B6_daycare: @ 8070CB0
push {r4,lr}
ldr r4, =0x03005d8c
ldr r4, =gUnknown_03005D8C
ldr r0, [r4]
ldr r1, =0x00003030
adds r0, r1
@@ -2385,7 +2385,7 @@ _08070CF2:
thumb_func_start sub_8070CF8
sub_8070CF8: @ 8070CF8
push {lr}
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r1, =0x00003030
adds r0, r1
@@ -2587,7 +2587,7 @@ _08070E5C:
thumb_func_start daycare_relationship_score_from_savegame
daycare_relationship_score_from_savegame: @ 8070E6C
push {lr}
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r1, =0x00003030
adds r0, r1
@@ -2623,7 +2623,7 @@ _08070EAC:
bne _08070EB2
movs r1, 0
_08070EB2:
ldr r0, =0x02021fc4
ldr r0, =gUnknown_02021FC4
ldr r2, =gUnknown_0832B6F8
lsls r1, 2
adds r1, r2
@@ -2893,7 +2893,7 @@ sub_807109C: @ 807109C
adds r0, r2, 0
ands r0, r1
strb r0, [r3, 0xC]
ldr r3, =0x03003014
ldr r3, =gUnknown_03003014
ldrb r1, [r3]
movs r0, 0x3
negs r0, r0
@@ -3023,7 +3023,7 @@ sub_80711B8: @ 80711B8
lsrs r5, r2, 24
cmp r6, 0x1
bhi _080711F0
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
mov r8, r0
ldr r0, [r0]
ldr r4, =0x00003030
@@ -3054,7 +3054,7 @@ c3_080469FC: @ 8071204
lsls r0, 24
lsrs r0, 24
adds r5, r0, 0
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
@@ -3062,7 +3062,7 @@ c3_080469FC: @ 8071204
ldrb r0, [r4, 0x8]
bl ListMenuHandleInput
adds r1, r0, 0
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
ldrh r2, [r0, 0x2E]
movs r0, 0x1
ands r0, r2
@@ -3075,16 +3075,16 @@ c3_080469FC: @ 8071204
b _0807124E
.pool
_0807123C:
ldr r0, =0x020375f0
ldr r0, =gUnknown_020375F0
strh r1, [r0]
b _0807124E
.pool
_08071248:
ldr r1, =0x020375f0
ldr r1, =gUnknown_020375F0
movs r0, 0x2
strh r0, [r1]
_0807124E:
ldr r0, =0x03005e00
ldr r0, =gTasks
lsls r4, r5, 2
adds r4, r5
lsls r4, 3
@@ -3109,7 +3109,7 @@ _08071284:
ands r0, r2
cmp r0, 0
beq _080712B4
ldr r0, =0x020375f0
ldr r0, =gUnknown_020375F0
strh r1, [r0]
ldrb r0, [r4, 0x8]
movs r1, 0
@@ -3164,7 +3164,7 @@ sub_80712C0: @ 80712C0
bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
@@ -3182,7 +3182,7 @@ sub_80712C0: @ 80712C0
sub_8071330: @ 8071330
push {lr}
bl sub_81B9328
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
ldr r0, =c2_exit_to_overworld_2_switch
str r0, [r1, 0x8]
pop {r0}
asm/decoration.s
+339 -339
View File
File diff suppressed because it is too large Load Diff
asm/dewford_trend.s
+15 -15
View File
@@ -9,7 +9,7 @@
sub_81224D4: @ 81224D4
push {r4-r7,lr}
movs r6, 0
ldr r5, =0x03005d8c
ldr r5, =gUnknown_03005D8C
_081224DA:
movs r0, 0xA
bl sub_811EE38
@@ -66,7 +66,7 @@ _08122522:
lsrs r6, r0, 16
cmp r6, 0x4
bls _081224DA
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r1, =0x00002e68
adds r0, r1
@@ -109,7 +109,7 @@ _081225AA:
lsls r0, r3, 3
ldr r4, =0x00002e68
adds r0, r4
ldr r3, =0x03005d8c
ldr r3, =gUnknown_03005D8C
ldr r1, [r3]
adds r5, r1, r0
ldrb r6, [r5, 0x1]
@@ -236,7 +236,7 @@ _0812269E:
bhi _081226AE
b _081225AA
_081226AE:
ldr r4, =0x03005d8c
ldr r4, =gUnknown_03005D8C
ldr r0, [r4]
ldr r1, =0x00002e68
adds r0, r1
@@ -286,7 +286,7 @@ _081226F8:
lsls r0, 24
cmp r0, 0
bne _08122744
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r1, [r0]
mov r0, r8
ldrh r2, [r0]
@@ -317,7 +317,7 @@ _08122744:
bl sub_8122B28
movs r5, 0
_08122762:
ldr r6, =0x03005d8c
ldr r6, =gUnknown_03005D8C
lsls r4, r5, 3
ldr r1, =0x00002e68
adds r0, r4, r1
@@ -576,7 +576,7 @@ _08122946:
movs r2, 0x2
bl sub_8122804
adds r4, r7, 0
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r1, =0x00002e68
adds r1, r0
@@ -613,13 +613,13 @@ _08122980:
thumb_func_start sub_8122998
sub_8122998: @ 8122998
push {lr}
ldr r2, =0x03005d8c
ldr r0, =0x020375e0
ldr r2, =gUnknown_03005D8C
ldr r0, =gUnknown_020375E0
ldrh r1, [r0]
lsls r1, 3
ldr r0, [r2]
adds r1, r0
ldr r0, =0x02021cc4
ldr r0, =gUnknown_02021CC4
ldr r2, =0x00002e6c
adds r1, r2
movs r2, 0x2
@@ -634,7 +634,7 @@ sub_8122998: @ 8122998
sub_81229C8: @ 81229C8
push {r4,lr}
movs r4, 0
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r3, [r0]
ldr r1, =0x00002e68
adds r0, r3, r1
@@ -667,7 +667,7 @@ sub_81229C8: @ 81229C8
negs r0, r0
lsrs r4, r0, 31
_08122A0C:
ldr r0, =0x020375f0
ldr r0, =gUnknown_020375F0
strh r4, [r0]
pop {r4}
pop {r0}
@@ -677,8 +677,8 @@ _08122A0C:
thumb_func_start sub_8122A30
sub_8122A30: @ 8122A30
ldr r2, =0x020375f0
ldr r0, =0x03005d8c
ldr r2, =gUnknown_020375F0
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r3, =0x00002e6c
adds r1, r0, r3
@@ -877,7 +877,7 @@ sub_8122BB0: @ 8122BB0
push {r4-r6,lr}
adds r5, r0, 0
movs r4, 0
ldr r6, =0x03005d8c
ldr r6, =gUnknown_03005D8C
_08122BB8:
lsls r1, r4, 3
ldr r0, [r6]
asm/diploma.s
+12 -12
View File
@@ -100,7 +100,7 @@ sub_8177888: @ 8177888
movs r1, 0
movs r2, 0x40
bl gpu_pal_apply
ldr r4, =0x0203bcf0
ldr r4, =gUnknown_0203BCF0
movs r0, 0x80
lsls r0, 5
bl Alloc
@@ -121,7 +121,7 @@ _0817797C:
cmp r5, 0
bne _0817797C
ldr r0, =gUnknown_085E70C8
ldr r1, =0x0203bcf0
ldr r1, =gUnknown_0203BCF0
ldr r1, [r1]
bl LZDecompressWram
movs r0, 0x1
@@ -171,13 +171,13 @@ sub_8177A20: @ 8177A20
push {lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r0, =0x02037fd4
ldr r0, =gUnknown_02037FD4
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
cmp r0, 0
bne _08177A40
ldr r0, =0x03005e00
ldr r0, =gTasks
lsls r1, r2, 2
adds r1, r2
lsls r1, 3
@@ -196,7 +196,7 @@ sub_8177A50: @ 8177A50
sub sp, 0x4
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
ldrh r1, [r0, 0x2E]
movs r0, 0x3
ands r0, r1
@@ -209,7 +209,7 @@ sub_8177A50: @ 8177A50
movs r2, 0
movs r3, 0x10
bl pal_fade_maybe
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
@@ -229,13 +229,13 @@ sub_8177A98: @ 8177A98
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =0x02037fd4
ldr r0, =gUnknown_02037FD4
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
cmp r0, 0
bne _08177AC2
ldr r0, =0x0203bcf0
ldr r0, =gUnknown_0203BCF0
ldr r0, [r0]
bl Free
bl FreeAllWindowBuffers
@@ -261,7 +261,7 @@ pokedex_diploma_something: @ 8177AD4
lsls r1, 1
movs r0, 0x14
bl SetGpuReg
ldr r0, =0x02021cc4
ldr r0, =gUnknown_02021CC4
ldr r1, =gUnknown_085EE855
bl CopyString
b _08177B0C
@@ -270,11 +270,11 @@ _08177AFC:
movs r0, 0x14
movs r1, 0
bl SetGpuReg
ldr r0, =0x02021cc4
ldr r0, =gUnknown_02021CC4
ldr r1, =gUnknown_085EE84F
bl CopyString
_08177B0C:
ldr r4, =0x02021fc4
ldr r4, =gUnknown_02021FC4
ldr r1, =gUnknown_085EE85E
adds r0, r4, 0
bl ExpandStringRefs
@@ -302,7 +302,7 @@ sub_8177B44: @ 8177B44
movs r0, 0
movs r2, 0x2
bl InitBgsFromTemplates
ldr r0, =0x0203bcf0
ldr r0, =gUnknown_0203BCF0
ldr r1, [r0]
movs r0, 0x1
bl SetBgTilemapBuffer
asm/dma3_manager.s
+2 -2
View File
@@ -260,7 +260,7 @@ _08000DB2:
mov r5, r12
ldrb r0, [r5]
lsls r0, 4
ldr r3, =0x0300001c
ldr r3, =gUnknown_0300001C
adds r0, r3
ldr r0, [r0]
strh r0, [r1]
@@ -276,7 +276,7 @@ _08000DB2:
bhi _08000DB2
ldrb r0, [r5]
lsls r0, 4
ldr r5, =0x0300001c
ldr r5, =gUnknown_0300001C
adds r0, r5
ldr r0, [r0]
strh r0, [r1]
asm/easy_chat.s
+309 -309
View File
File diff suppressed because it is too large Load Diff
asm/egg_hatch.s
+63 -63
View File
@@ -189,9 +189,9 @@ sub_80714B8: @ 80714B8
movs r1, 0x64
adds r5, r0, 0
muls r5, r1
ldr r0, =0x020244ec
ldr r0, =gUnknown_020244EC
adds r5, r0
ldr r1, =0x02024744
ldr r1, =gUnknown_02024744
adds r0, r5, 0
bl sub_8071348
adds r0, r5, 0
@@ -222,7 +222,7 @@ sub_80714B8: @ 80714B8
adds r0, r4, 0
movs r1, 0x3
bl pokedex_flag_operation
ldr r1, =0x02021cc4
ldr r1, =gUnknown_02021CC4
adds r0, r5, 0
bl pokemon_get_nick
mov r2, sp
@@ -259,7 +259,7 @@ sub_80714B8: @ 80714B8
thumb_func_start sub_8071578
sub_8071578: @ 8071578
push {lr}
ldr r0, =0x020375e0
ldr r0, =gUnknown_020375E0
ldrb r0, [r0]
bl sub_80714B8
pop {r0}
@@ -293,24 +293,24 @@ sub_807158C: @ 807158C
adds r5, 0x74
cmp r0, 0
bne _080715CE
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r0, [r0]
adds r1, r5, 0
bl CompareStringWithoutExtendedControlCodes
cmp r0, 0
beq _08071608
_080715CE:
ldr r0, =0x02021cc4
ldr r0, =gUnknown_02021CC4
mov r1, sp
bl CopyString
ldr r0, =0x02021dc4
ldr r0, =gUnknown_02021DC4
adds r4, 0x87
ldrb r2, [r4]
lsls r2, 28
lsrs r2, 28
adds r1, r5, 0
bl sub_81DB5E8
ldr r0, =0x02021ec4
ldr r0, =gUnknown_02021EC4
ldrb r2, [r4]
lsrs r2, 4
adds r1, r6, 0
@@ -330,11 +330,11 @@ _0807160A:
thumb_func_start sub_8071614
sub_8071614: @ 8071614
push {lr}
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r1, =0x00003030
adds r0, r1
ldr r1, =0x020375e0
ldr r1, =gUnknown_020375E0
ldrb r1, [r1]
bl sub_807158C
lsls r0, 24
@@ -366,7 +366,7 @@ sub_807163C: @ 807163C
bne _0807166A
movs r0, 0x64
muls r1, r0
ldr r0, =0x020244ec
ldr r0, =gUnknown_020244EC
adds r5, r1, r0
movs r4, 0x1
_0807166A:
@@ -375,7 +375,7 @@ _0807166A:
movs r0, 0x64
adds r1, r2, 0
muls r1, r0
ldr r0, =0x020244ec
ldr r0, =gUnknown_020244EC
adds r5, r1, r0
movs r4, 0x3
_0807167A:
@@ -399,7 +399,7 @@ _08071688:
lsls r0, r4, 3
ldr r1, =gMonFrontPicTable
adds r0, r1
ldr r1, =0x020244d4
ldr r1, =gUnknown_020244D4
ldr r2, [r1]
mov r6, r8
lsls r1, r6, 1
@@ -423,14 +423,14 @@ _080716D8:
ldrh r0, [r0, 0x4]
adds r1, r4, 0
bl sub_806A068
ldr r0, =0x0202499c
ldr r0, =gUnknown_0202499C
movs r1, 0x78
movs r2, 0x4B
movs r3, 0x6
bl AddObjectToFront
lsls r0, 24
lsrs r7, r0, 24
ldr r4, =0x02020630
ldr r4, =gUnknown_02020630
lsls r1, r7, 4
adds r1, r7
lsls r1, 2
@@ -485,7 +485,7 @@ sub_8071760: @ 8071760
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =0x02037fd4
ldr r0, =gUnknown_02037FD4
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -494,7 +494,7 @@ sub_8071760: @ 8071760
bl overworld_free_bg_tilemaps
ldr r0, =c1_hatching_egg
bl SetMainCallback2
ldr r1, =0x03005dac
ldr r1, =gUnknown_03005DAC
ldr r0, =sub_80AF168
str r0, [r1]
adds r0, r4, 0
@@ -510,7 +510,7 @@ _08071788:
c1_hatching_egg: @ 80717A0
push {r4,lr}
sub sp, 0x4
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
movs r1, 0x87
lsls r1, 3
adds r0, r1
@@ -540,13 +540,13 @@ _080717EC:
movs r0, 0
movs r1, 0
bl SetGpuReg
ldr r4, =0x03000de0
ldr r4, =gUnknown_03000DE0
movs r0, 0x14
bl Alloc
str r0, [r4]
bl init_uns_table_pokemon_copy
ldr r2, [r4]
ldr r0, =0x020375e0
ldr r0, =gUnknown_020375E0
ldrh r0, [r0]
movs r1, 0
strb r0, [r2, 0x4]
@@ -555,7 +555,7 @@ _080717EC:
ldr r0, =sub_807172C
bl SetVBlankCallback
bl current_map_music_get
ldr r1, =0x020375e2
ldr r1, =gUnknown_020375E2
strh r0, [r1]
bl reset_temp_tile_data_buffers
movs r0, 0
@@ -608,7 +608,7 @@ _080717EC:
_080718B8:
ldr r0, =gUnknown_0832C06C
bl InitWindows
ldr r0, =0x03000de0
ldr r0, =gUnknown_03000DE0
ldr r1, [r0]
movs r0, 0
strb r0, [r1, 0x8]
@@ -644,14 +644,14 @@ _08071904:
_08071924:
movs r0, 0
bl CopyBgTilemapBufferToVram
ldr r0, =0x03000de0
ldr r0, =gUnknown_03000DE0
ldr r0, [r0]
ldrb r0, [r0, 0x4]
bl sub_80714B8
b _080719A6
.pool
_0807193C:
ldr r0, =0x03000de0
ldr r0, =gUnknown_03000DE0
ldr r3, [r0]
ldrb r2, [r3, 0x4]
adds r3, 0xC
@@ -661,7 +661,7 @@ _0807193C:
b _080719A6
.pool
_08071954:
ldr r4, =0x03000de0
ldr r4, =gUnknown_03000DE0
ldr r3, [r4]
ldrb r2, [r3, 0x4]
adds r3, 0xC
@@ -696,7 +696,7 @@ _08071970:
movs r0, 0x1
bl CopyBgTilemapBufferToVram
_080719A6:
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
movs r0, 0x87
lsls r0, 3
adds r1, r0
@@ -708,7 +708,7 @@ _080719A6:
_080719C8:
ldr r0, =sub_8071A94
bl SetMainCallback2
ldr r0, =0x03000de0
ldr r0, =gUnknown_03000DE0
ldr r1, [r0]
movs r0, 0
strb r0, [r1, 0x2]
@@ -728,17 +728,17 @@ _080719D6:
thumb_func_start sub_80719FC
sub_80719FC: @ 80719FC
push {lr}
ldr r0, =0x020375e0
ldr r0, =gUnknown_020375E0
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =0x020244ec
ldr r1, =gUnknown_020244EC
adds r0, r1
ldr r2, =0x02021ec4
ldr r2, =gUnknown_02021EC4
movs r1, 0x2
bl pokemon_setattr
bl sub_805F094
ldr r0, =0x03000de0
ldr r0, =gUnknown_03000DE0
ldr r0, [r0]
bl Free
ldr r0, =c2_exit_to_overworld_2_switch
@@ -753,7 +753,7 @@ c3_080472E4: @ 8071A3C
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
@@ -798,7 +798,7 @@ sub_8071A94: @ 8071A94
mov r6, r8
push {r6,r7}
sub sp, 0x8
ldr r1, =0x03000de0
ldr r1, =gUnknown_03000DE0
ldr r0, [r1]
ldrb r0, [r0, 0x2]
adds r5, r1, 0
@@ -840,7 +840,7 @@ _08071AF4:
movs r2, 0x4B
movs r3, 0x5
bl AddObjectToFront
ldr r4, =0x03000de0
ldr r4, =gUnknown_03000DE0
ldr r1, [r4]
strb r0, [r1]
movs r0, 0
@@ -857,7 +857,7 @@ _08071AF4:
b _08071E06
.pool
_08071B40:
ldr r0, =0x02037fd4
ldr r0, =gUnknown_02037FD4
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -891,7 +891,7 @@ _08071B7A:
ldrb r0, [r1, 0x2]
adds r0, 0x1
strb r0, [r1, 0x2]
ldr r2, =0x02020630
ldr r2, =gUnknown_02020630
ldr r0, [r5]
ldrb r1, [r0]
lsls r0, r1, 4
@@ -904,7 +904,7 @@ _08071B7A:
b _08071E06
.pool
_08071BA0:
ldr r4, =0x02020630
ldr r4, =gUnknown_02020630
ldr r2, [r5]
ldrb r1, [r2]
lsls r0, r1, 4
@@ -922,7 +922,7 @@ _08071BBC:
ldrb r1, [r2, 0x4]
movs r0, 0x64
muls r0, r1
ldr r1, =0x020244ec
ldr r1, =gUnknown_020244EC
adds r0, r1
movs r1, 0xB
bl pokemon_getattr
@@ -942,7 +942,7 @@ _08071BBC:
b _08071DC8
.pool
_08071BF8:
ldr r2, =0x02020630
ldr r2, =gUnknown_02020630
ldr r3, [r5]
ldrb r1, [r3, 0x1]
lsls r0, r1, 4
@@ -966,11 +966,11 @@ _08071C24:
ldrb r1, [r0, 0x4]
movs r0, 0x64
muls r0, r1
ldr r1, =0x020244ec
ldr r1, =gUnknown_020244EC
adds r0, r1
ldr r1, =0x02021cc4
ldr r1, =gUnknown_02021CC4
bl pokemon_get_nick
ldr r4, =0x02021fc4
ldr r4, =gUnknown_02021FC4
ldr r1, =gUnknown_085ED5A5
adds r0, r4, 0
bl ExpandStringRefs
@@ -1018,11 +1018,11 @@ _08071CA4:
ldrb r1, [r0, 0x4]
movs r0, 0x64
muls r0, r1
ldr r1, =0x020244ec
ldr r1, =gUnknown_020244EC
adds r0, r1
ldr r1, =0x02021cc4
ldr r1, =gUnknown_02021CC4
bl pokemon_get_nick
ldr r4, =0x02021fc4
ldr r4, =gUnknown_02021FC4
ldr r1, =gUnknown_085ED5BE
adds r0, r4, 0
bl ExpandStringRefs
@@ -1079,15 +1079,15 @@ _08071D36:
beq _08071DC4
b _08071E06
_08071D3C:
ldr r0, =0x03000de0
ldr r0, =gUnknown_03000DE0
mov r8, r0
ldr r0, [r0]
ldrb r0, [r0, 0x4]
movs r6, 0x64
muls r0, r6
ldr r5, =0x020244ec
ldr r5, =gUnknown_020244EC
adds r0, r5
ldr r1, =0x02021ec4
ldr r1, =gUnknown_02021EC4
mov r9, r1
bl pokemon_get_nick
mov r1, r8
@@ -1135,7 +1135,7 @@ _08071DB4:
movs r3, 0x10
bl pal_fade_maybe
_08071DC4:
ldr r0, =0x03000de0
ldr r0, =gUnknown_03000DE0
ldr r1, [r0]
_08071DC8:
ldrb r0, [r1, 0x2]
@@ -1144,14 +1144,14 @@ _08071DC8:
b _08071E06
.pool
_08071DD4:
ldr r0, =0x02037fd4
ldr r0, =gUnknown_02037FD4
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
cmp r0, 0
bne _08071E06
bl sub_805F094
ldr r4, =0x03000de0
ldr r4, =gUnknown_03000DE0
ldr r0, [r4]
ldrb r0, [r0, 0x8]
bl RemoveWindow
@@ -1296,16 +1296,16 @@ sub_8071EF0: @ 8071EF0
ldr r0, =sub_8071FA4
str r0, [r4, 0x1C]
strh r5, [r4, 0x2E]
ldr r4, =0x03000de0
ldr r4, =gUnknown_03000DE0
ldr r0, [r4]
ldrb r1, [r0, 0x4]
movs r0, 0x64
muls r0, r1
ldr r1, =0x020244ec
ldr r1, =gUnknown_020244EC
adds r0, r1
movs r1, 0xB
bl pokemon_getattr
ldr r3, =0x02020630
ldr r3, =gUnknown_02020630
ldr r2, [r4]
ldrb r1, [r2, 0x1]
lsls r0, r1, 4
@@ -1413,7 +1413,7 @@ _08072004:
ldrh r0, [r5, 0x2E]
adds r0, 0x1
strh r0, [r5, 0x2E]
ldr r0, =0x02037fd4
ldr r0, =gUnknown_02037FD4
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1449,8 +1449,8 @@ sub_8072048: @ 8072048
ldrsh r0, [r5, r1]
cmp r0, 0
bne _08072084
ldr r4, =0x02020630
ldr r3, =0x03000de0
ldr r4, =gUnknown_02020630
ldr r3, =gUnknown_03000DE0
ldr r0, [r3]
ldrb r1, [r0, 0x1]
lsls r0, r1, 4
@@ -1489,8 +1489,8 @@ _0807209E:
ldrsh r0, [r5, r1]
cmp r0, 0x9
bgt _080720BC
ldr r2, =0x02020630
ldr r0, =0x03000de0
ldr r2, =gUnknown_02020630
ldr r0, =gUnknown_03000DE0
ldr r0, [r0]
ldrb r1, [r0, 0x1]
lsls r0, r1, 4
@@ -1573,7 +1573,7 @@ sub_8072140: @ 8072140
push {r4-r6,lr}
sub sp, 0x8
ldr r2, =gUnknown_0832C084
ldr r0, =0x03000de0
ldr r0, =gUnknown_03000DE0
ldr r6, [r0]
ldrb r3, [r6, 0x7]
lsls r0, r3, 2
@@ -1650,7 +1650,7 @@ sub_8072194: @ 8072194
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
ldr r2, =0x02020630
ldr r2, =gUnknown_02020630
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
@@ -1697,7 +1697,7 @@ sub_8072214: @ 8072214
adds r0, r5, 0
movs r1, 0xFF
bl FillWindowPixelBuffer
ldr r3, =0x03000de0
ldr r3, =gUnknown_03000DE0
ldr r0, [r3]
movs r2, 0
strb r2, [r0, 0xE]
@@ -1745,7 +1745,7 @@ _0807229C:
movs r0, 0x64
adds r1, r5, 0
muls r1, r0
ldr r0, =0x020244ec
ldr r0, =gUnknown_020244EC
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x6
asm/evolution_scene.s
+300 -300
View File
File diff suppressed because it is too large Load Diff
asm/field_camera.s
+62 -62
View File
@@ -53,7 +53,7 @@ coords8_add: @ 8089B84
@ void move_tilemap_camera_to_upper_left_corner()
move_tilemap_camera_to_upper_left_corner: @ 8089B94
push {lr}
ldr r0, =0x03000e20
ldr r0, =gUnknown_03000E20
bl move_tilemap_camera_to_upper_left_corner_
pop {r0}
bx r0
@@ -64,13 +64,13 @@ move_tilemap_camera_to_upper_left_corner: @ 8089B94
@ void FieldUpdateBgTilemapScroll()
FieldUpdateBgTilemapScroll: @ 8089BA4
push {r4,r5,lr}
ldr r1, =0x03000e20
ldr r0, =0x03000e28
ldr r1, =gUnknown_03000E20
ldr r0, =gUnknown_03000E28
movs r2, 0
ldrsh r5, [r0, r2]
ldrb r0, [r1]
adds r5, r0
ldr r0, =0x03000e2a
ldr r0, =gUnknown_03000E2A
movs r2, 0
ldrsh r4, [r0, r2]
ldrb r1, [r1, 0x1]
@@ -107,13 +107,13 @@ FieldUpdateBgTilemapScroll: @ 8089BA4
thumb_func_start sub_8089C08
sub_8089C08: @ 8089C08
push {r4,lr}
ldr r3, =0x03000e20
ldr r2, =0x03000e28
ldr r3, =gUnknown_03000E20
ldr r2, =gUnknown_03000E28
ldrh r2, [r2]
ldrb r4, [r3]
adds r2, r4
strh r2, [r0]
ldr r0, =0x03000e2a
ldr r0, =gUnknown_03000E2A
ldrh r0, [r0]
ldrb r3, [r3, 0x1]
adds r0, r3
@@ -129,16 +129,16 @@ sub_8089C08: @ 8089C08
@ void DrawWholeMapView()
DrawWholeMapView: @ 8089C34
push {lr}
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r1, [r0]
movs r2, 0
ldrsh r0, [r1, r2]
movs r2, 0x2
ldrsh r1, [r1, r2]
ldr r2, =0x02037318
ldr r2, =gUnknown_02037318
ldr r2, [r2]
bl DrawWholeMapViewInternal
ldr r1, =0x03000e20
ldr r1, =gUnknown_03000E20
movs r0, 0x1
strb r0, [r1, 0x4]
pop {r0}
@@ -160,7 +160,7 @@ DrawWholeMapViewInternal: @ 8089C60
mov r8, r2
movs r1, 0
_08089C74:
ldr r2, =0x03000e20
ldr r2, =gUnknown_03000E20
ldrb r0, [r2, 0x3]
adds r0, r1, r0
lsls r0, 24
@@ -177,7 +177,7 @@ _08089C88:
str r7, [sp]
lsrs r5, r1, 1
_08089C92:
ldr r1, =0x03000e20
ldr r1, =gUnknown_03000E20
ldrb r0, [r1, 0x2]
adds r0, r4, r0
lsls r0, 24
@@ -225,7 +225,7 @@ RedrawMapSlicesForCameraUpdate: @ 8089CE4
adds r5, r0, 0
adds r6, r1, 0
adds r7, r2, 0
ldr r0, =0x02037318
ldr r0, =gUnknown_02037318
ldr r4, [r0]
cmp r6, 0
ble _08089CFC
@@ -291,7 +291,7 @@ _08089D5E:
adds r1, r6, r0
lsls r1, 16
lsrs r1, 16
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r3, [r0]
movs r0, 0
ldrsh r2, [r3, r0]
@@ -334,7 +334,7 @@ _08089D9C:
lsrs r0, 24
_08089DAE:
adds r1, r6, r0
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r3, [r0]
movs r0, 0
ldrsh r2, [r3, r0]
@@ -380,7 +380,7 @@ _08089DFC:
adds r1, r6
lsls r1, 16
lsrs r1, 16
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
movs r3, 0
ldrsh r2, [r0, r3]
@@ -438,7 +438,7 @@ _08089E66:
adds r1, r5
lsls r1, 16
lsrs r1, 16
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
movs r3, 0
ldrsh r2, [r0, r3]
@@ -468,7 +468,7 @@ CurrentMapDrawMetatileAt: @ 8089EA0
push {r4-r6,lr}
adds r4, r0, 0
adds r5, r1, 0
ldr r6, =0x03000e20
ldr r6, =gUnknown_03000E20
adds r0, r6, 0
adds r1, r4, 0
adds r2, r5, 0
@@ -476,7 +476,7 @@ CurrentMapDrawMetatileAt: @ 8089EA0
adds r1, r0, 0
cmp r1, 0
blt _08089ECC
ldr r0, =0x02037318
ldr r0, =gUnknown_02037318
ldr r0, [r0]
lsls r1, 16
lsrs r1, 16
@@ -499,7 +499,7 @@ DrawDoorMetatileAt: @ 8089EDC
adds r3, r0, 0
adds r4, r1, 0
adds r5, r2, 0
ldr r6, =0x03000e20
ldr r6, =gUnknown_03000E20
adds r0, r6, 0
adds r1, r3, 0
adds r2, r4, 0
@@ -592,7 +592,7 @@ DrawMetatile: @ 8089F78
_08089F8E:
cmp r0, 0x2
bne _0808A082
ldr r0, =0x03005da4
ldr r0, =gUnknown_03005DA4
ldr r0, [r0]
lsls r3, r2, 1
adds r0, r3, r0
@@ -607,7 +607,7 @@ _08089F8E:
adds r0, 0x42
ldrh r1, [r4, 0x6]
strh r1, [r0]
ldr r0, =0x03005d9c
ldr r0, =gUnknown_03005D9C
ldr r0, [r0]
adds r0, r3, r0
movs r2, 0
@@ -621,7 +621,7 @@ _08089F8E:
b _0808A066
.pool
_08089FD0:
ldr r0, =0x03005da4
ldr r0, =gUnknown_03005DA4
ldr r0, [r0]
lsls r3, r2, 1
adds r0, r3, r0
@@ -636,7 +636,7 @@ _08089FD0:
adds r0, 0x42
ldrh r1, [r4, 0x6]
strh r1, [r0]
ldr r0, =0x03005d9c
ldr r0, =gUnknown_03005D9C
ldr r0, [r0]
adds r0, r3, r0
ldrh r1, [r4, 0x8]
@@ -650,7 +650,7 @@ _08089FD0:
adds r0, 0x42
ldrh r1, [r4, 0xE]
strh r1, [r0]
ldr r0, =0x03005da0
ldr r0, =gUnknown_03005DA0
ldr r0, [r0]
adds r3, r0
movs r1, 0
@@ -664,7 +664,7 @@ _08089FD0:
b _0808A082
.pool
_0808A030:
ldr r0, =0x03005da4
ldr r0, =gUnknown_03005DA4
ldr r0, [r0]
lsls r3, r2, 1
adds r0, r3, r0
@@ -677,7 +677,7 @@ _0808A030:
strh r2, [r1]
adds r0, 0x42
strh r2, [r0]
ldr r0, =0x03005d9c
ldr r0, =gUnknown_03005D9C
ldr r0, [r0]
adds r0, r3, r0
ldrh r1, [r4]
@@ -692,7 +692,7 @@ _0808A030:
ldrh r1, [r4, 0x6]
strh r1, [r0]
_0808A066:
ldr r0, =0x03005da0
ldr r0, =gUnknown_03005DA0
ldr r0, [r0]
adds r3, r0
ldrh r0, [r4, 0x8]
@@ -724,7 +724,7 @@ _0808A082:
MapPosToBgTilemapOffset: @ 808A0AC
push {r4,r5,lr}
adds r4, r0, 0
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r3, [r0]
movs r5, 0
ldrsh r0, [r3, r5]
@@ -772,7 +772,7 @@ CameraUpdateCallback: @ 808A0F4
ldr r2, [r3, 0x4]
cmp r2, 0
beq _0808A114
ldr r1, =0x02020630
ldr r1, =gUnknown_02020630
lsls r0, r2, 4
adds r0, r2
lsls r0, 2
@@ -792,7 +792,7 @@ _0808A114:
thumb_func_start ResetCameraUpdateInfo
@ void ResetCameraUpdateInfo()
ResetCameraUpdateInfo: @ 808A11C
ldr r1, =0x03005dd0
ldr r1, =gUnknown_03005DD0
movs r0, 0
str r0, [r1, 0x8]
str r0, [r1, 0xC]
@@ -810,14 +810,14 @@ InitCameraUpdateCallback: @ 808A134
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r4, =0x03005dd0
ldr r4, =gUnknown_03005DD0
ldr r1, [r4, 0x4]
cmp r1, 0
beq _0808A150
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =0x02020630
ldr r1, =gUnknown_02020630
adds r0, r1
bl RemoveObjectAndFreeTiles
_0808A150:
@@ -841,7 +841,7 @@ CameraUpdate: @ 808A174
push {r4-r7,lr}
mov r7, r8
push {r7}
ldr r6, =0x03005dd0
ldr r6, =gUnknown_03005DD0
ldr r1, [r6]
cmp r1, 0
beq _0808A188
@@ -896,7 +896,7 @@ _0808A1CC:
ble _0808A1E0
movs r4, 0x1
_0808A1E0:
ldr r2, =0x03005dd0
ldr r2, =gUnknown_03005DD0
ldr r0, [r2, 0x10]
adds r1, r0, r7
str r1, [r2, 0x10]
@@ -937,7 +937,7 @@ _0808A218:
adds r1, r5, 0
bl RotatingGatePuzzleCameraUpdate
bl ResetBerryTreeSparkleFlags
ldr r6, =0x03000e20
ldr r6, =gUnknown_03000E20
lsls r4, 1
lsls r5, 1
adds r0, r6, 0
@@ -949,15 +949,15 @@ _0808A218:
adds r2, r5, 0
bl RedrawMapSlicesForCameraUpdate
_0808A24E:
ldr r0, =0x03000e20
ldr r0, =gUnknown_03000E20
adds r1, r7, 0
mov r2, r8
bl coords8_add
ldr r1, =0x03005dec
ldr r1, =gUnknown_03005DEC
ldrh r0, [r1]
subs r0, r7
strh r0, [r1]
ldr r1, =0x03005de8
ldr r1, =gUnknown_03005DE8
ldrh r0, [r1]
mov r2, r8
subs r0, r2
@@ -982,12 +982,12 @@ sub_808A284: @ 808A284
asrs r1, 16
bl UpdateFieldObjectsForCameraUpdate
bl DrawWholeMapView
ldr r1, =0x03005dec
ldr r1, =gUnknown_03005DEC
lsls r4, 4
ldrh r0, [r1]
subs r0, r4
strh r0, [r1]
ldr r1, =0x03005de8
ldr r1, =gUnknown_03005DE8
lsls r5, 4
ldrh r0, [r1]
subs r0, r5
@@ -1001,7 +1001,7 @@ sub_808A284: @ 808A284
thumb_func_start SetCameraPanningCallback
@ void SetCameraPanningCallback(void ( *callback)())
SetCameraPanningCallback: @ 808A2C0
ldr r1, =0x03000e30
ldr r1, =gUnknown_03000E30
str r0, [r1]
bx lr
.pool
@@ -1010,9 +1010,9 @@ SetCameraPanningCallback: @ 808A2C0
thumb_func_start SetCameraPanning
@ void SetCameraPanning(s16 x, s16 y)
SetCameraPanning: @ 808A2CC
ldr r2, =0x03000e28
ldr r2, =gUnknown_03000E28
strh r0, [r2]
ldr r0, =0x03000e2a
ldr r0, =gUnknown_03000E2A
lsls r1, 16
asrs r1, 16
adds r1, 0x20
@@ -1024,16 +1024,16 @@ SetCameraPanning: @ 808A2CC
thumb_func_start InstallCameraPanAheadCallback
@ void InstallCameraPanAheadCallback()
InstallCameraPanAheadCallback: @ 808A2E4
ldr r1, =0x03000e30
ldr r1, =gUnknown_03000E30
ldr r0, =CameraPanningCB_PanAhead
str r0, [r1]
ldr r1, =0x03000e2c
ldr r1, =gUnknown_03000E2C
movs r0, 0
strb r0, [r1]
ldr r1, =0x03000e28
ldr r1, =gUnknown_03000E28
movs r0, 0
strh r0, [r1]
ldr r1, =0x03000e2a
ldr r1, =gUnknown_03000E2A
movs r0, 0x20
strh r0, [r1]
bx lr
@@ -1044,22 +1044,22 @@ InstallCameraPanAheadCallback: @ 808A2E4
@ void UpdateCameraPanning()
UpdateCameraPanning: @ 808A314
push {lr}
ldr r0, =0x03000e30
ldr r0, =gUnknown_03000E30
ldr r0, [r0]
cmp r0, 0
beq _0808A322
bl _call_via_r0
_0808A322:
ldr r2, =0x02021bbc
ldr r0, =0x03005dec
ldr r1, =0x03000e28
ldr r2, =gUnknown_02021BBC
ldr r0, =gUnknown_03005DEC
ldr r1, =gUnknown_03000E28
ldrh r0, [r0]
ldrh r1, [r1]
subs r0, r1
strh r0, [r2]
ldr r2, =0x02021bbe
ldr r0, =0x03005de8
ldr r1, =0x03000e2a
ldr r2, =gUnknown_02021BBE
ldr r0, =gUnknown_03005DE8
ldr r1, =gUnknown_03000E2A
ldrh r0, [r0]
ldrh r1, [r1]
subs r0, r1
@@ -1074,7 +1074,7 @@ _0808A322:
@ void CameraPanningCB_PanAhead()
CameraPanningCB_PanAhead: @ 808A360
push {lr}
ldr r0, =0x02037348
ldr r0, =gUnknown_02037348
ldrb r0, [r0]
cmp r0, 0
bne _0808A374
@@ -1082,11 +1082,11 @@ CameraPanningCB_PanAhead: @ 808A360
b _0808A3FC
.pool
_0808A374:
ldr r0, =0x02037590
ldr r0, =gUnknown_02037590
ldrb r0, [r0, 0x3]
cmp r0, 0x1
bne _0808A394
ldr r0, =0x03000e2c
ldr r0, =gUnknown_03000E2C
ldrb r1, [r0]
movs r2, 0x1
eors r1, r2
@@ -1096,7 +1096,7 @@ _0808A374:
b _0808A39A
.pool
_0808A394:
ldr r1, =0x03000e2c
ldr r1, =gUnknown_03000E2C
movs r0, 0
strb r0, [r1]
_0808A39A:
@@ -1105,7 +1105,7 @@ _0808A39A:
lsrs r0, 24
cmp r0, 0x2
bne _0808A3C4
ldr r2, =0x03000e2a
ldr r2, =gUnknown_03000E2A
ldrh r3, [r2]
movs r0, 0
ldrsh r1, [r2, r0]
@@ -1119,7 +1119,7 @@ _0808A39A:
_0808A3C4:
cmp r0, 0x1
bne _0808A3E0
ldr r1, =0x03000e2a
ldr r1, =gUnknown_03000E2A
ldrh r2, [r1]
movs r3, 0
ldrsh r0, [r1, r3]
@@ -1130,7 +1130,7 @@ _0808A3C4:
b _0808A3FC
.pool
_0808A3E0:
ldr r2, =0x03000e2a
ldr r2, =gUnknown_03000E2A
ldrh r0, [r2]
movs r3, 0
ldrsh r1, [r2, r3]
asm/field_door.s
+7 -7
View File
@@ -206,10 +206,10 @@ sub_808A568: @ 808A568
lsls r0, 24
cmp r0, 0
beq _0808A5E2
ldr r0, =0x020375e0
ldr r0, =gUnknown_020375E0
ldrh r1, [r0]
adds r1, 0x7
ldr r0, =0x020375e2
ldr r0, =gUnknown_020375E2
ldrh r2, [r0]
adds r2, 0x7
adds r0, r4, 0
@@ -229,10 +229,10 @@ _0808A5B0:
lsls r0, 24
cmp r0, 0
beq _0808A5E2
ldr r0, =0x020375e0
ldr r0, =gUnknown_020375E0
ldrh r1, [r0]
adds r1, 0x7
ldr r0, =0x020375e2
ldr r0, =gUnknown_020375E2
ldrh r2, [r0]
adds r2, 0x7
ldr r3, [r4, 0x8]
@@ -309,7 +309,7 @@ task50_overworld_door: @ 808A654
lsls r2, r4, 2
adds r2, r4
lsls r2, 3
ldr r0, =0x03005e08
ldr r0, =gTasks + 0x8
adds r2, r0
ldrh r1, [r2]
lsls r1, 16
@@ -396,7 +396,7 @@ task_overworld_door_add_if_inactive: @ 808A6C4
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
ldr r2, =0x03005e08
ldr r2, =gTasks + 0x8
adds r1, r2
strh r7, [r1, 0xC]
mov r2, r8
@@ -735,7 +735,7 @@ sub_808A964: @ 808A964
lsls r0, 24
cmp r0, 0
beq _0808A990
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldrh r1, [r0, 0x4]
ldr r0, =0x0000101a
asm/field_effect.s
+6 -6
View File
@@ -305,7 +305,7 @@ FieldEffectFreeTilesIfUnused: @ 80B5D04
cmp r3, r0
beq _080B5D58
movs r2, 0
ldr r5, =0x02020630
ldr r5, =gUnknown_02020630
_080B5D1E:
lsls r0, r2, 4
adds r0, r2
@@ -357,7 +357,7 @@ FieldEffectFreePaletteIfUnused: @ 80B5D68
cmp r5, r0
beq _080B5DB0
movs r2, 0
ldr r6, =0x02020630
ldr r6, =gUnknown_02020630
adds r3, r4, 0
_080B5D84:
lsls r0, r2, 4
@@ -394,7 +394,7 @@ _080B5DB0:
FieldEffectActiveListClear: @ 80B5DC0
push {r4,lr}
movs r2, 0
ldr r4, =0x03000f58
ldr r4, =gUnknown_03000F58
movs r3, 0xFF
_080B5DC8:
adds r0, r2, r4
@@ -419,7 +419,7 @@ FieldEffectActiveListAdd: @ 80B5DE4
lsls r0, 24
lsrs r3, r0, 24
movs r2, 0
ldr r4, =0x03000f58
ldr r4, =gUnknown_03000F58
_080B5DEE:
adds r1, r2, r4
ldrb r0, [r1]
@@ -447,7 +447,7 @@ FieldEffectActiveListRemove: @ 80B5E10
lsls r0, 24
lsrs r3, r0, 24
movs r2, 0
ldr r4, =0x03000f58
ldr r4, =gUnknown_03000F58
movs r5, 0xFF
_080B5E1C:
adds r1, r2, r4
@@ -477,7 +477,7 @@ FieldEffectActiveListContains: @ 80B5E40
lsls r0, 24
lsrs r2, r0, 24
movs r1, 0
ldr r3, =0x03000f58
ldr r3, =gUnknown_03000F58
_080B5E4A:
adds r0, r1, r3
ldrb r0, [r0]
asm/field_effect_helpers.s
+104 -104
View File
@@ -26,7 +26,7 @@ SetUpReflection: @ 8153ED4
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r0, =0x02020630
ldr r0, =gUnknown_02020630
adds r7, r1, r0
ldr r0, =objc_reflection_maybe
str r0, [r7, 0x1C]
@@ -248,13 +248,13 @@ objc_reflection_maybe: @ 81540A8
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =0x02037350
ldr r1, =gUnknown_02037350
adds r7, r0, r1
ldrb r1, [r7, 0x4]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =0x02020630
ldr r1, =gUnknown_02020630
adds r5, r0, r1
ldr r0, [r7]
ldr r1, =0x00020001
@@ -444,7 +444,7 @@ sub_8154228: @ 8154228
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r0, =0x02020630
ldr r0, =gUnknown_02020630
adds r1, r0
ldrb r2, [r1, 0x5]
movs r0, 0xD
@@ -471,7 +471,7 @@ _08154266:
objid_set_invisible: @ 8154278
lsls r0, 24
lsrs r0, 24
ldr r2, =0x02020630
ldr r2, =gUnknown_02020630
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
@@ -503,7 +503,7 @@ sub_8154298: @ 8154298
lsls r0, r5, 4
adds r0, r5
lsls r0, 2
ldr r1, =0x02020630
ldr r1, =gUnknown_02020630
adds r2, r0, r1
adds r0, r2, 0
adds r0, 0x3E
@@ -537,7 +537,7 @@ _081542E2:
lsls r0, r5, 4
adds r0, r5
lsls r0, 2
ldr r1, =0x02020630
ldr r1, =gUnknown_02020630
adds r2, r0, r1
mov r0, sp
ldrh r0, [r0]
@@ -574,14 +574,14 @@ _0815432E:
thumb_func_start oei_shadow
oei_shadow: @ 8154340
push {r4,r5,lr}
ldr r5, =0x02038c08
ldr r5, =gUnknown_02038C08
ldrb r0, [r5]
ldrb r1, [r5, 0x4]
ldrb r2, [r5, 0x8]
bl GetFieldObjectIdByLocalIdAndMap
lsls r0, 24
lsrs r0, 24
ldr r2, =0x02037350
ldr r2, =gUnknown_02037350
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
@@ -607,7 +607,7 @@ oei_shadow: @ 8154340
lsrs r1, r0, 24
cmp r1, 0x40
beq _081543C4
ldr r0, =0x02020630
ldr r0, =gUnknown_02020630
lsls r2, r1, 4
adds r2, r1
lsls r2, 2
@@ -673,13 +673,13 @@ _08154412:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =0x02037350
ldr r1, =gUnknown_02037350
adds r4, r0, r1
ldrb r0, [r4, 0x4]
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r0, =0x02020630
ldr r0, =gUnknown_02020630
adds r1, r0
ldrb r0, [r1, 0x5]
movs r2, 0xC
@@ -742,7 +742,7 @@ _08154498:
oei_grass_normal: @ 81544AC
push {r4,r5,lr}
sub sp, 0x4
ldr r5, =0x02038c08
ldr r5, =gUnknown_02038C08
ldrh r1, [r5]
mov r0, sp
strh r1, [r0]
@@ -771,7 +771,7 @@ oei_grass_normal: @ 81544AC
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =0x02020630
ldr r1, =gUnknown_02020630
adds r3, r0, r1
adds r2, r3, 0
adds r2, 0x3E
@@ -827,13 +827,13 @@ unc_grass_normal: @ 8154550
lsrs r4, r0, 8
lsls r0, 24
lsrs r7, r0, 24
ldr r3, =0x02037334
ldr r3, =gUnknown_02037334
ldrb r1, [r3]
movs r0, 0x1
ands r0, r1
cmp r0, 0
beq _0815459C
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r2, [r0]
movs r0, 0x5
ldrsb r0, [r2, r0]
@@ -909,7 +909,7 @@ _08154604:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =0x02037350
ldr r1, =gUnknown_02037350
adds r2, r0, r1
ldr r0, [r2, 0x10]
ldr r1, [r5, 0x30]
@@ -951,7 +951,7 @@ _08154648:
thumb_func_start sub_8154658
sub_8154658: @ 8154658
push {r4,lr}
ldr r4, =0x02038c08
ldr r4, =gUnknown_02038C08
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -972,7 +972,7 @@ sub_8154658: @ 8154658
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
ldr r0, =0x02020630
ldr r0, =gUnknown_02020630
adds r2, r0
adds r3, r2, 0
adds r3, 0x3E
@@ -1016,7 +1016,7 @@ sub_81546C8: @ 81546C8
lsls r2, 24
lsrs r6, r2, 24
movs r5, 0
ldr r0, =0x02020630
ldr r0, =gUnknown_02020630
mov r8, r0
lsls r3, 16
asrs r3, 16
@@ -1080,7 +1080,7 @@ _0815474C:
sub_8154758: @ 8154758
push {r4,r5,lr}
sub sp, 0x4
ldr r5, =0x02038c08
ldr r5, =gUnknown_02038C08
ldrh r1, [r5]
mov r0, sp
strh r1, [r0]
@@ -1109,7 +1109,7 @@ sub_8154758: @ 8154758
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =0x02020630
ldr r1, =gUnknown_02020630
adds r4, r0, r1
adds r2, r4, 0
adds r2, 0x3E
@@ -1166,13 +1166,13 @@ unc_grass_tall: @ 8154800
lsrs r7, r0, 8
lsls r0, 24
lsrs r6, r0, 24
ldr r3, =0x02037334
ldr r3, =gUnknown_02037334
ldrb r1, [r3]
movs r0, 0x1
ands r0, r1
cmp r0, 0
beq _0815484C
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r2, [r0]
movs r0, 0x5
ldrsb r0, [r2, r0]
@@ -1248,7 +1248,7 @@ _081548B4:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =0x02037350
ldr r1, =gUnknown_02037350
adds r2, r0, r1
ldr r0, [r2, 0x10]
ldr r1, [r5, 0x30]
@@ -1282,7 +1282,7 @@ _081548EA:
thumb_func_start sub_81548FC
sub_81548FC: @ 81548FC
push {r4,lr}
ldr r4, =0x02038c08
ldr r4, =gUnknown_02038C08
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -1303,7 +1303,7 @@ sub_81548FC: @ 81548FC
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
ldr r0, =0x02020630
ldr r0, =gUnknown_02020630
adds r2, r0
adds r3, r2, 0
adds r3, 0x3E
@@ -1336,7 +1336,7 @@ _08154958:
thumb_func_start sub_815496C
sub_815496C: @ 815496C
push {r4-r6,lr}
ldr r6, =0x02038c08
ldr r6, =gUnknown_02038C08
ldrb r0, [r6]
ldrb r1, [r6, 0x4]
ldrb r2, [r6, 0x8]
@@ -1346,7 +1346,7 @@ sub_815496C: @ 815496C
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, =0x02037350
ldr r0, =gUnknown_02037350
adds r5, r1, r0
ldr r0, =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x78]
@@ -1361,7 +1361,7 @@ sub_815496C: @ 815496C
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
ldr r4, =0x02020630
ldr r4, =gUnknown_02020630
adds r2, r4
adds r3, r2, 0
adds r3, 0x3E
@@ -1432,7 +1432,7 @@ sub_8154A10: @ 8154A10
lsls r0, 24
cmp r0, 0
bne _08154A4E
ldr r5, =0x02037350
ldr r5, =gUnknown_02037350
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -1463,7 +1463,7 @@ _08154A5C:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =0x02020630
ldr r1, =gUnknown_02020630
adds r6, r0, r1
ldrh r5, [r6, 0x22]
ldrh r7, [r6, 0x20]
@@ -1537,7 +1537,7 @@ _08154AF2:
thumb_func_start sub_8154B04
sub_8154B04: @ 8154B04
push {r4,lr}
ldr r4, =0x02038c08
ldr r4, =gUnknown_02038C08
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -1558,7 +1558,7 @@ sub_8154B04: @ 8154B04
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =0x02020630
ldr r1, =gUnknown_02020630
adds r0, r1
adds r3, r0, 0
adds r3, 0x3E
@@ -1591,7 +1591,7 @@ _08154B62:
thumb_func_start sub_8154B78
sub_8154B78: @ 8154B78
push {r4,r5,lr}
ldr r4, =0x02038c08
ldr r4, =gUnknown_02038C08
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -1613,7 +1613,7 @@ sub_8154B78: @ 8154B78
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =0x02020630
ldr r1, =gUnknown_02020630
adds r0, r1
adds r3, r0, 0
adds r3, 0x3E
@@ -1646,7 +1646,7 @@ _08154BD8:
thumb_func_start sub_8154BEC
sub_8154BEC: @ 8154BEC
push {r4,r5,lr}
ldr r4, =0x02038c08
ldr r4, =gUnknown_02038C08
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -1668,7 +1668,7 @@ sub_8154BEC: @ 8154BEC
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =0x02020630
ldr r1, =gUnknown_02020630
adds r0, r1
adds r3, r0, 0
adds r3, 0x3E
@@ -1777,7 +1777,7 @@ _08154CE4:
thumb_func_start sub_8154CEC
sub_8154CEC: @ 8154CEC
push {r4-r6,lr}
ldr r6, =0x02038c08
ldr r6, =gUnknown_02038C08
ldrb r0, [r6]
ldrb r1, [r6, 0x4]
ldrb r2, [r6, 0x8]
@@ -1787,7 +1787,7 @@ sub_8154CEC: @ 8154CEC
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, =0x02037350
ldr r0, =gUnknown_02037350
adds r5, r1, r0
ldr r0, =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x34]
@@ -1804,7 +1804,7 @@ sub_8154CEC: @ 8154CEC
lsls r3, r4, 4
adds r3, r4
lsls r3, 2
ldr r4, =0x02020630
ldr r4, =gUnknown_02020630
adds r3, r4
movs r1, 0x3E
adds r1, r3
@@ -1880,8 +1880,8 @@ _08154DC0:
bl FieldEffectStop
b _08154E0A
_08154DCA:
ldr r3, =0x02020630
ldr r2, =0x02037350
ldr r3, =gUnknown_02020630
ldr r2, =gUnknown_02037350
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -1922,7 +1922,7 @@ _08154E0A:
thumb_func_start sub_8154E1C
sub_8154E1C: @ 8154E1C
push {r4,lr}
ldr r4, =0x02038c08
ldr r4, =gUnknown_02038C08
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -1943,7 +1943,7 @@ sub_8154E1C: @ 8154E1C
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
ldr r0, =0x02020630
ldr r0, =gUnknown_02020630
adds r2, r0
adds r3, r2, 0
adds r3, 0x3E
@@ -1976,7 +1976,7 @@ _08154E78:
thumb_func_start oei_water_drop_tall
oei_water_drop_tall: @ 8154E8C
push {r4,lr}
ldr r4, =0x02038c08
ldr r4, =gUnknown_02038C08
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -1997,7 +1997,7 @@ oei_water_drop_tall: @ 8154E8C
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
ldr r0, =0x02020630
ldr r0, =gUnknown_02020630
adds r2, r0
adds r3, r2, 0
adds r3, 0x3E
@@ -2030,7 +2030,7 @@ _08154EE8:
thumb_func_start sub_8154EFC
sub_8154EFC: @ 8154EFC
push {r4-r7,lr}
ldr r7, =0x02038c08
ldr r7, =gUnknown_02038C08
ldrb r0, [r7]
ldrb r1, [r7, 0x4]
ldrb r2, [r7, 0x8]
@@ -2040,7 +2040,7 @@ sub_8154EFC: @ 8154EFC
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, =0x02037350
ldr r0, =gUnknown_02037350
adds r6, r1, r0
ldr r0, =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x34]
@@ -2058,7 +2058,7 @@ sub_8154EFC: @ 8154EFC
lsls r0, r5, 4
adds r0, r5
lsls r0, 2
ldr r3, =0x02020630
ldr r3, =gUnknown_02020630
adds r0, r3
ldr r1, =sub_8154FB4
str r1, [r0, 0x1C]
@@ -2127,7 +2127,7 @@ sub_8154FB4: @ 8154FB4
lsls r0, 24
cmp r0, 0
bne _08154FEE
ldr r2, =0x02037350
ldr r2, =gUnknown_02037350
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -2149,7 +2149,7 @@ _08154FFC:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =0x02020630
ldr r1, =gUnknown_02020630
adds r0, r1
ldrh r1, [r0, 0x20]
strh r1, [r4, 0x20]
@@ -2193,7 +2193,7 @@ oei_ripples: @ 8155054
push {r4,lr}
ldr r0, =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x14]
ldr r4, =0x02038c08
ldr r4, =gUnknown_02038C08
movs r2, 0
ldrsh r1, [r4, r2]
movs r3, 0x4
@@ -2207,7 +2207,7 @@ oei_ripples: @ 8155054
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
ldr r0, =0x02020630
ldr r0, =gUnknown_02020630
adds r2, r0
adds r3, r2, 0
adds r3, 0x3E
@@ -2238,7 +2238,7 @@ _081550A0:
thumb_func_start sub_81550B4
sub_81550B4: @ 81550B4
push {r4-r6,lr}
ldr r6, =0x02038c08
ldr r6, =gUnknown_02038C08
ldrb r0, [r6]
ldrb r1, [r6, 0x4]
ldrb r2, [r6, 0x8]
@@ -2248,7 +2248,7 @@ sub_81550B4: @ 81550B4
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, =0x02037350
ldr r0, =gUnknown_02037350
adds r5, r1, r0
ldr r0, =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x7C]
@@ -2263,7 +2263,7 @@ sub_81550B4: @ 81550B4
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
ldr r4, =0x02020630
ldr r4, =gUnknown_02020630
adds r2, r4
adds r3, r2, 0
adds r3, 0x3E
@@ -2332,7 +2332,7 @@ sub_8155158: @ 8155158
lsls r0, 24
cmp r0, 0
bne _08155192
ldr r5, =0x02037350
ldr r5, =gUnknown_02037350
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -2362,7 +2362,7 @@ _081551A0:
lsls r1, r2, 4
adds r1, r2
lsls r1, 2
ldr r2, =0x02020630
ldr r2, =gUnknown_02020630
adds r1, r2
ldrh r2, [r1, 0x20]
strh r2, [r4, 0x20]
@@ -2393,7 +2393,7 @@ _081551E4:
thumb_func_start sub_81551F0
sub_81551F0: @ 81551F0
push {r4,lr}
ldr r4, =0x02038c08
ldr r4, =gUnknown_02038C08
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -2414,7 +2414,7 @@ sub_81551F0: @ 81551F0
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
ldr r0, =0x02020630
ldr r0, =gUnknown_02020630
adds r2, r0
adds r3, r2, 0
adds r3, 0x3E
@@ -2445,7 +2445,7 @@ _08155248:
thumb_func_start sub_815525C
sub_815525C: @ 815525C
push {r4,lr}
ldr r4, =0x02038c08
ldr r4, =gUnknown_02038C08
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -2466,7 +2466,7 @@ sub_815525C: @ 815525C
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
ldr r0, =0x02020630
ldr r0, =gUnknown_02020630
adds r2, r0
adds r3, r2, 0
adds r3, 0x3E
@@ -2497,7 +2497,7 @@ _081552B4:
thumb_func_start sub_81552C8
sub_81552C8: @ 81552C8
push {r4,lr}
ldr r4, =0x02038c08
ldr r4, =gUnknown_02038C08
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -2518,7 +2518,7 @@ sub_81552C8: @ 81552C8
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
ldr r0, =0x02020630
ldr r0, =gUnknown_02020630
adds r2, r0
adds r3, r2, 0
adds r3, 0x3E
@@ -2549,7 +2549,7 @@ _08155320:
thumb_func_start sub_8155334
sub_8155334: @ 8155334
push {r4,lr}
ldr r4, =0x02038c08
ldr r4, =gUnknown_02038C08
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -2570,7 +2570,7 @@ sub_8155334: @ 8155334
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
ldr r0, =0x02020630
ldr r0, =gUnknown_02020630
adds r2, r0
adds r3, r2, 0
adds r3, 0x3E
@@ -2603,7 +2603,7 @@ ash: @ 81553A0
push {r4,lr}
lsls r2, 16
lsrs r2, 16
ldr r4, =0x02038c08
ldr r4, =gUnknown_02038C08
lsls r0, 16
asrs r0, 16
str r0, [r4]
@@ -2630,7 +2630,7 @@ ash: @ 81553A0
oei_ash: @ 81553D4
push {r4,r5,lr}
sub sp, 0x4
ldr r5, =0x02038c08
ldr r5, =gUnknown_02038C08
ldrh r1, [r5]
mov r0, sp
strh r1, [r0]
@@ -2659,7 +2659,7 @@ oei_ash: @ 81553D4
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
ldr r0, =0x02020630
ldr r0, =gUnknown_02020630
adds r2, r0
adds r3, r2, 0
adds r3, 0x3E
@@ -2765,8 +2765,8 @@ sub_81554AC: @ 81554AC
movs r2, 0x32
ldrsh r1, [r4, r2]
bl CurrentMapDrawMetatileAt
ldr r2, =0x02037350
ldr r0, =0x02037590
ldr r2, =gUnknown_02037350
ldr r0, =gUnknown_02037590
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -2809,7 +2809,7 @@ _0815552C:
thumb_func_start sub_8155534
sub_8155534: @ 8155534
push {r4,r5,lr}
ldr r4, =0x02038c08
ldr r4, =gUnknown_02038C08
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -2831,7 +2831,7 @@ sub_8155534: @ 8155534
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r0, =0x02020630
ldr r0, =gUnknown_02020630
adds r1, r0
adds r3, r1, 0
adds r3, 0x3E
@@ -2866,7 +2866,7 @@ sub_81555AC: @ 81555AC
lsls r0, 24
lsrs r0, 24
lsls r1, 24
ldr r3, =0x02020630
ldr r3, =gUnknown_02020630
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
@@ -2890,7 +2890,7 @@ sub_81555D8: @ 81555D8
lsls r0, 24
lsrs r0, 24
lsls r1, 24
ldr r3, =0x02020630
ldr r3, =gUnknown_02020630
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
@@ -2915,7 +2915,7 @@ sub_8155604: @ 8155604
lsls r0, 24
lsrs r0, 24
lsls r1, 24
ldr r4, =0x02020630
ldr r4, =gUnknown_02020630
lsls r3, r0, 4
adds r3, r0
lsls r3, 2
@@ -2972,13 +2972,13 @@ sub_8155658: @ 8155658
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, =0x02037350
ldr r0, =gUnknown_02037350
adds r4, r0
ldrb r0, [r4, 0x4]
lsls r5, r0, 4
adds r5, r0
lsls r5, 2
ldr r0, =0x02020630
ldr r0, =gUnknown_02020630
adds r5, r0
adds r0, r4, 0
adds r1, r6, 0
@@ -3200,7 +3200,7 @@ sub_8155800: @ 8155800
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
ldr r1, =0x02020630
ldr r1, =gUnknown_02020630
adds r2, r1
ldr r1, =sub_8155850
str r1, [r2, 0x1C]
@@ -3230,7 +3230,7 @@ sub_8155850: @ 8155850
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =0x02020630
ldr r1, =gUnknown_02020630
adds r3, r0, r1
ldrh r1, [r2, 0x32]
adds r0, r1, 0x1
@@ -3261,7 +3261,7 @@ _08155888:
thumb_func_start sub_8155890
sub_8155890: @ 8155890
push {r4,lr}
ldr r4, =0x02038c08
ldr r4, =gUnknown_02038C08
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -3282,7 +3282,7 @@ sub_8155890: @ 8155890
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
ldr r0, =0x02020630
ldr r0, =gUnknown_02020630
adds r2, r0
adds r3, r2, 0
adds r3, 0x3E
@@ -3315,7 +3315,7 @@ _081558EC:
thumb_func_start sub_8155900
sub_8155900: @ 8155900
push {r4-r7,lr}
ldr r7, =0x02038c08
ldr r7, =gUnknown_02038C08
ldrb r0, [r7]
ldrb r1, [r7, 0x4]
ldrb r2, [r7, 0x8]
@@ -3325,7 +3325,7 @@ sub_8155900: @ 8155900
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, =0x02037350
ldr r0, =gUnknown_02037350
adds r6, r1, r0
ldr r0, =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x74]
@@ -3343,7 +3343,7 @@ sub_8155900: @ 8155900
lsls r0, r4, 4
adds r0, r4
lsls r0, 2
ldr r4, =0x02020630
ldr r4, =gUnknown_02020630
adds r0, r4
adds r3, r0, 0
adds r3, 0x3E
@@ -3419,7 +3419,7 @@ sub_81559BC: @ 81559BC
lsls r0, 24
cmp r0, 0
bne _081559F6
ldr r2, =0x02037350
ldr r2, =gUnknown_02037350
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -3437,7 +3437,7 @@ _081559F6:
b _08155A76
.pool
_08155A04:
ldr r2, =0x02020630
ldr r2, =gUnknown_02020630
ldrb r1, [r1, 0x4]
lsls r0, r1, 4
adds r0, r1
@@ -3473,8 +3473,8 @@ _08155A2C:
_08155A46:
strh r6, [r4, 0x20]
strh r5, [r4, 0x22]
ldr r3, =0x02020630
ldr r2, =0x02037350
ldr r3, =gUnknown_02020630
ldr r2, =gUnknown_02037350
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -3505,7 +3505,7 @@ _08155A76:
thumb_func_start sub_8155A88
sub_8155A88: @ 8155A88
push {r4,lr}
ldr r4, =0x02038c08
ldr r4, =gUnknown_02038C08
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -3527,7 +3527,7 @@ sub_8155A88: @ 8155A88
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r0, =0x02020630
ldr r0, =gUnknown_02020630
adds r1, r0
adds r3, r1, 0
adds r3, 0x3E
@@ -3586,7 +3586,7 @@ _08155B20:
thumb_func_start sub_8155B2C
sub_8155B2C: @ 8155B2C
push {r4,lr}
ldr r4, =0x02038c08
ldr r4, =gUnknown_02038C08
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -3607,7 +3607,7 @@ sub_8155B2C: @ 8155B2C
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
ldr r0, =0x02020630
ldr r0, =gUnknown_02020630
adds r2, r0
adds r3, r2, 0
adds r3, 0x3E
@@ -3689,7 +3689,7 @@ ShowDisguiseFieldEffect: @ 8155BD0
lsrs r6, r1, 24
lsls r2, 24
lsrs r7, r2, 24
ldr r5, =0x02038c08
ldr r5, =gUnknown_02038C08
ldrb r0, [r5]
ldrb r1, [r5, 0x4]
ldrb r2, [r5, 0x8]
@@ -3723,7 +3723,7 @@ _08155C08:
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
ldr r0, =0x02020630
ldr r0, =gUnknown_02020630
adds r2, r0
movs r0, 0x3E
adds r0, r2
@@ -3793,7 +3793,7 @@ sub_8155C88: @ 8155C88
adds r0, r5, 0
bl FieldEffectStop
_08155CB8:
ldr r4, =0x02037350
ldr r4, =gUnknown_02037350
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -3812,7 +3812,7 @@ _08155CB8:
lsls r2, r1, 4
adds r2, r1
lsls r2, 2
ldr r1, =0x02020630
ldr r1, =gUnknown_02020630
adds r2, r1
adds r1, r2, 0
adds r1, 0x3E
@@ -3896,7 +3896,7 @@ sub_8155D78: @ 8155D78
ldrb r0, [r0]
cmp r0, 0x1
bne _08155D96
ldr r2, =0x02020630
ldr r2, =gUnknown_02020630
ldrb r1, [r1, 0x1A]
lsls r0, r1, 4
adds r0, r1
@@ -3925,7 +3925,7 @@ sub_8155DA0: @ 8155DA0
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =0x02020630
ldr r1, =gUnknown_02020630
adds r1, r0, r1
movs r3, 0x3C
ldrsh r0, [r1, r3]
@@ -3950,7 +3950,7 @@ _08155DD8:
thumb_func_start sub_8155DDC
sub_8155DDC: @ 8155DDC
push {r4,lr}
ldr r4, =0x02038c08
ldr r4, =gUnknown_02038C08
ldr r0, [r4]
adds r0, 0x7
str r0, [r4]
@@ -3975,7 +3975,7 @@ sub_8155DDC: @ 8155DDC
lsrs r2, r0, 24
cmp r2, 0x40
beq _08155E3C
ldr r0, =0x02020630
ldr r0, =gUnknown_02020630
lsls r1, r2, 4
adds r1, r2
lsls r1, 2
@@ -4514,7 +4514,7 @@ _08156212:
lsls r0, r7, 3
adds r0, r7
lsls r0, 2
ldr r1, =0x02037350
ldr r1, =gUnknown_02037350
adds r4, r0, r1
ldrb r0, [r4]
lsls r0, 31
@@ -4526,7 +4526,7 @@ _08156212:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =0x02020630
ldr r1, =gUnknown_02020630
adds r5, r0, r1
adds r0, r6, 0
adds r0, 0x28
asm/field_ground_effect.s
+17 -17
View File
@@ -1095,7 +1095,7 @@ SetObjectSubpriorityByZCoord: @ 8096E0C
movs r5, 0
ldrsb r5, [r3, r5]
ldrh r4, [r1, 0x22]
ldr r3, =0x02021bbe
ldr r3, =gUnknown_02021BBE
subs r4, r5
ldrh r3, [r3]
adds r4, r3
@@ -1166,7 +1166,7 @@ _08096E8C:
@ void GroundEffect_SpawnOnTallGrass(struct npc_state *fieldObject, struct obj *object)
GroundEffect_SpawnOnTallGrass: @ 8096E90
push {lr}
ldr r3, =0x02038c08
ldr r3, =gUnknown_02038C08
movs r2, 0x10
ldrsh r1, [r0, r2]
str r1, [r3]
@@ -1185,7 +1185,7 @@ GroundEffect_SpawnOnTallGrass: @ 8096E90
str r1, [r3, 0x10]
ldrb r0, [r0, 0xA]
str r0, [r3, 0x14]
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r1, [r0]
ldrb r0, [r1, 0x5]
lsls r0, 8
@@ -1205,7 +1205,7 @@ GroundEffect_SpawnOnTallGrass: @ 8096E90
@ void GroundEffect_StepOnTallGrass(struct npc_state *fieldObject, struct obj *object)
GroundEffect_StepOnTallGrass: @ 8096EDC
push {lr}
ldr r3, =0x02038c08
ldr r3, =gUnknown_02038C08
movs r2, 0x10
ldrsh r1, [r0, r2]
str r1, [r3]
@@ -1224,7 +1224,7 @@ GroundEffect_StepOnTallGrass: @ 8096EDC
str r1, [r3, 0x10]
ldrb r0, [r0, 0xA]
str r0, [r3, 0x14]
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r1, [r0]
ldrb r0, [r1, 0x5]
lsls r0, 8
@@ -1244,7 +1244,7 @@ GroundEffect_StepOnTallGrass: @ 8096EDC
@ void GroundEffect_SpawnOnLongGrass(struct npc_state *fieldObject, struct obj *object)
GroundEffect_SpawnOnLongGrass: @ 8096F28
push {lr}
ldr r3, =0x02038c08
ldr r3, =gUnknown_02038C08
movs r2, 0x10
ldrsh r1, [r0, r2]
str r1, [r3]
@@ -1263,7 +1263,7 @@ GroundEffect_SpawnOnLongGrass: @ 8096F28
str r1, [r3, 0x10]
ldrb r0, [r0, 0xA]
str r0, [r3, 0x14]
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r1, [r0]
ldrb r0, [r1, 0x5]
lsls r0, 8
@@ -1283,7 +1283,7 @@ GroundEffect_SpawnOnLongGrass: @ 8096F28
@ void GroundEffect_StepOnLongGrass(struct npc_state *fieldObject, struct obj *object)
GroundEffect_StepOnLongGrass: @ 8096F74
push {lr}
ldr r3, =0x02038c08
ldr r3, =gUnknown_02038C08
movs r2, 0x10
ldrsh r1, [r0, r2]
str r1, [r3]
@@ -1302,7 +1302,7 @@ GroundEffect_StepOnLongGrass: @ 8096F74
str r1, [r3, 0x10]
ldrb r0, [r0, 0xA]
str r0, [r3, 0x14]
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r1, [r0]
ldrb r0, [r1, 0x5]
lsls r0, 8
@@ -1413,7 +1413,7 @@ DoTracksGroundEffect_Footprints: @ 8097044
mov r0, sp
movs r2, 0x4
bl memcpy
ldr r1, =0x02038c08
ldr r1, =gUnknown_02038C08
movs r2, 0x14
ldrsh r0, [r5, r2]
str r0, [r1]
@@ -1449,7 +1449,7 @@ DoTracksGroundEffect_BikeTireTracks: @ 8097094
ldr r0, [r4, 0x14]
cmp r1, r0
beq _080970D6
ldr r2, =0x02038c08
ldr r2, =gUnknown_02038C08
movs r1, 0x14
ldrsh r0, [r4, r1]
str r0, [r2]
@@ -1520,7 +1520,7 @@ GroundEffect_JumpOnTallGrass: @ 8097110
sub sp, 0x4
adds r5, r0, 0
adds r6, r1, 0
ldr r1, =0x02038c08
ldr r1, =gUnknown_02038C08
movs r2, 0x10
ldrsh r0, [r5, r2]
str r0, [r1]
@@ -1562,7 +1562,7 @@ _0809715A:
@ void GroundEffect_JumpOnLongGrass(struct npc_state *fieldObject, struct obj *object)
GroundEffect_JumpOnLongGrass: @ 8097168
push {lr}
ldr r2, =0x02038c08
ldr r2, =gUnknown_02038C08
movs r3, 0x10
ldrsh r1, [r0, r3]
str r1, [r2]
@@ -1585,7 +1585,7 @@ GroundEffect_JumpOnLongGrass: @ 8097168
@ void GroundEffect_JumpOnShallowWater(struct npc_state *fieldObject, struct obj *object)
GroundEffect_JumpOnShallowWater: @ 8097190
push {r4,lr}
ldr r3, =0x02038c08
ldr r3, =gUnknown_02038C08
movs r4, 0x10
ldrsh r2, [r0, r4]
str r2, [r3]
@@ -1611,7 +1611,7 @@ GroundEffect_JumpOnShallowWater: @ 8097190
@ void GroundEffect_JumpOnWater(struct npc_state *fieldObject, struct obj *object)
GroundEffect_JumpOnWater: @ 80971C0
push {r4,lr}
ldr r3, =0x02038c08
ldr r3, =gUnknown_02038C08
movs r4, 0x10
ldrsh r2, [r0, r4]
str r2, [r3]
@@ -1637,7 +1637,7 @@ GroundEffect_JumpOnWater: @ 80971C0
@ void GroundEffect_JumpLandingDust(struct npc_state *fieldObject, struct obj *object)
GroundEffect_JumpLandingDust: @ 80971F0
push {r4,lr}
ldr r3, =0x02038c08
ldr r3, =gUnknown_02038C08
movs r4, 0x10
ldrsh r2, [r0, r4]
str r2, [r3]
@@ -1685,7 +1685,7 @@ GroundEffect_HotSprings: @ 8097230
@ void GroundEffect_Seaweed(struct npc_state *fieldObject, struct obj *object)
GroundEffect_Seaweed: @ 8097240
push {lr}
ldr r2, =0x02038c08
ldr r2, =gUnknown_02038C08
movs r3, 0x10
ldrsh r1, [r0, r3]
str r1, [r2]
asm/field_map_obj.s
+170 -170
View File
File diff suppressed because it is too large Load Diff
asm/field_message_box.s
+17 -17
View File
@@ -7,10 +7,10 @@
thumb_func_start sub_8098128
sub_8098128: @ 8098128
ldr r1, =0x020375bc
ldr r1, =gUnknown_020375BC
movs r0, 0
strb r0, [r1]
ldr r2, =0x03003014
ldr r2, =gUnknown_03003014
ldrb r1, [r2]
movs r0, 0x2
negs r0, r0
@@ -35,7 +35,7 @@ sub_8098154: @ 8098154
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
ldr r1, =0x03005e00
ldr r1, =gTasks
adds r4, r0, r1
movs r1, 0x8
ldrsh r0, [r4, r1]
@@ -69,7 +69,7 @@ _08098198:
lsrs r0, 16
cmp r0, 0x1
beq _080981B0
ldr r1, =0x020375bc
ldr r1, =gUnknown_020375BC
movs r0, 0
strb r0, [r1]
adds r0, r5, 0
@@ -112,7 +112,7 @@ _080981E4:
box_related_two__2: @ 80981EC
push {r4,lr}
adds r1, r0, 0
ldr r4, =0x020375bc
ldr r4, =gUnknown_020375BC
ldrb r0, [r4]
cmp r0, 0
bne _0809820C
@@ -141,7 +141,7 @@ sub_8098214: @ 8098214
adds r1, r0, 0
cmp r1, 0
bne _0809822E
ldr r0, =0x020375bc
ldr r0, =gUnknown_020375BC
strb r1, [r0]
adds r0, r4, 0
bl DestroyTask
@@ -156,11 +156,11 @@ _0809822E:
sub_8098238: @ 8098238
push {r4,r5,lr}
adds r4, r0, 0
ldr r5, =0x020375bc
ldr r5, =gUnknown_020375BC
ldrb r0, [r5]
cmp r0, 0
bne _08098270
ldr r0, =0x02021fc4
ldr r0, =gUnknown_02021FC4
adds r1, r4, 0
bl ExpandStringRefs
ldr r0, =sub_8098214
@@ -185,7 +185,7 @@ _08098272:
box_related_two__3: @ 8098278
push {lr}
adds r1, r0, 0
ldr r2, =0x020375bc
ldr r2, =gUnknown_020375BC
ldrb r0, [r2]
cmp r0, 0
bne _08098298
@@ -207,7 +207,7 @@ _0809829A:
thumb_func_start sub_80982A0
sub_80982A0: @ 80982A0
push {lr}
ldr r2, =0x020375bc
ldr r2, =gUnknown_020375BC
movs r1, 0x3
strb r1, [r2]
movs r1, 0x1
@@ -221,7 +221,7 @@ sub_80982A0: @ 80982A0
thumb_func_start sub_80982B8
sub_80982B8: @ 80982B8
push {lr}
ldr r1, =0x020375bc
ldr r1, =gUnknown_020375BC
ldrb r0, [r1]
cmp r0, 0
bne _080982D4
@@ -243,7 +243,7 @@ textbox_fdecode_auto_and_task_add: @ 80982DC
push {r4,lr}
adds r2, r0, 0
adds r4, r1, 0
ldr r0, =0x02021fc4
ldr r0, =gUnknown_02021FC4
adds r1, r2, 0
bl ExpandStringRefs
lsls r4, 24
@@ -274,7 +274,7 @@ textbox_close: @ 8098314
movs r0, 0
movs r1, 0x1
bl sub_8197434
ldr r1, =0x020375bc
ldr r1, =gUnknown_020375BC
movs r0, 0
strb r0, [r1]
pop {r0}
@@ -284,7 +284,7 @@ textbox_close: @ 8098314
thumb_func_start textbox_any_visible
textbox_any_visible: @ 8098330
ldr r0, =0x020375bc
ldr r0, =gUnknown_020375BC
ldrb r0, [r0]
bx lr
.pool
@@ -293,7 +293,7 @@ textbox_any_visible: @ 8098330
thumb_func_start sub_809833C
sub_809833C: @ 809833C
push {lr}
ldr r0, =0x020375bc
ldr r0, =gUnknown_020375BC
ldrb r0, [r0]
cmp r0, 0
beq _08098350
@@ -314,7 +314,7 @@ sub_8098358: @ 8098358
movs r0, 0
movs r1, 0x1
bl sub_81973FC
ldr r1, =0x020375bc
ldr r1, =gUnknown_020375BC
movs r0, 0
strb r0, [r1]
pop {r0}
@@ -326,7 +326,7 @@ sub_8098358: @ 8098358
sub_8098374: @ 8098374
push {lr}
bl task_del_textbox
ldr r1, =0x020375bc
ldr r1, =gUnknown_020375BC
movs r0, 0
strb r0, [r1]
pop {r0}
asm/field_player_avatar.s
+165 -165
View File
File diff suppressed because it is too large Load Diff
asm/field_poison.s
+9 -9
View File
@@ -31,7 +31,7 @@ _080F9586:
thumb_func_start sub_80F958C
sub_80F958C: @ 80F958C
push {r4,r5,lr}
ldr r4, =0x020244ec
ldr r4, =gUnknown_020244EC
movs r5, 0
_080F9592:
adds r0, r4, 0
@@ -67,7 +67,7 @@ sub_80F95C0: @ 80F95C0
movs r1, 0x64
adds r4, r0, 0
muls r4, r1
ldr r0, =0x020244ec
ldr r0, =gUnknown_020244EC
adds r4, r0
movs r0, 0
str r0, [sp]
@@ -78,7 +78,7 @@ sub_80F95C0: @ 80F95C0
movs r1, 0x37
mov r2, sp
bl pokemon_setattr
ldr r5, =0x02021cc4
ldr r5, =gUnknown_02021CC4
adds r0, r4, 0
movs r1, 0x2
adds r2, r5, 0
@@ -99,7 +99,7 @@ sub_80F960C: @ 80F960C
lsrs r0, 24
movs r1, 0x64
muls r1, r0
ldr r0, =0x020244ec
ldr r0, =gUnknown_020244EC
adds r4, r1, r0
adds r0, r4, 0
bl sub_80F9568
@@ -137,7 +137,7 @@ sub_80F9654: @ 80F9654
lsls r0, r6, 2
adds r0, r6
lsls r0, 3
ldr r1, =0x03005e08
ldr r1, =gTasks + 0x8
adds r4, r0, r1
movs r0, 0
ldrsh r5, [r4, r0]
@@ -203,12 +203,12 @@ _080F96C0:
cmp r0, 0
beq _080F96F0
_080F96E6:
ldr r0, =0x020375f0
ldr r0, =gUnknown_020375F0
strh r5, [r0]
b _080F9718
.pool
_080F96F0:
ldr r1, =0x020375f0
ldr r1, =gUnknown_020375F0
movs r0, 0x1
strh r0, [r1]
b _080F9718
@@ -224,7 +224,7 @@ _080F96FC:
b _080F9722
.pool
_080F9714:
ldr r0, =0x020375f0
ldr r0, =gUnknown_020375F0
strh r1, [r0]
_080F9718:
bl script_env_2_enable_and_set_ctx_running
@@ -253,7 +253,7 @@ sub_80F972C: @ 80F972C
overworld_poison: @ 80F9744
push {r4-r7,lr}
sub sp, 0x4
ldr r4, =0x020244ec
ldr r4, =gUnknown_020244EC
movs r7, 0
movs r6, 0
movs r5, 0x5
asm/fieldmap.s
+75 -75
View File
@@ -19,7 +19,7 @@ mapconnection_get_mapheader: @ 8087D44
thumb_func_start not_trainer_hill_battle_pyramid
not_trainer_hill_battle_pyramid: @ 8087D54
push {r4,lr}
ldr r4, =0x02037318
ldr r4, =gUnknown_02037318
adds r0, r4, 0
bl mapheader_copy_mapdata_with_padding
ldr r0, [r4, 0x4]
@@ -34,7 +34,7 @@ not_trainer_hill_battle_pyramid: @ 8087D54
thumb_func_start sub_8087D74
sub_8087D74: @ 8087D74
push {r4,lr}
ldr r4, =0x02037318
ldr r4, =gUnknown_02037318
adds r0, r4, 0
bl mapheader_copy_mapdata_with_padding
movs r0, 0
@@ -43,7 +43,7 @@ sub_8087D74: @ 8087D74
bl sub_80E8EE0
bl mapdata_from_sav2
bl mapheader_run_script_with_tag_x1
ldr r1, =0x03005dc0
ldr r1, =gUnknown_03005DC0
ldr r0, [r1]
ldr r1, [r1, 0x4]
bl UpdateTVScreensOnMap
@@ -62,7 +62,7 @@ battle_pyramid_map_load_related: @ 8087DAC
lsrs r4, 24
ldr r0, =0x03ff03ff
str r0, [sp]
ldr r5, =0x02032318
ldr r5, =gUnknown_02032318
ldr r2, =0x01001400
mov r0, sp
adds r1, r5, 0
@@ -83,7 +83,7 @@ trainer_hill_map_load_related: @ 8087DE4
sub sp, 0x4
ldr r0, =0x03ff03ff
str r0, [sp]
ldr r4, =0x02032318
ldr r4, =gUnknown_02032318
ldr r2, =0x01001400
mov r0, sp
adds r1, r4, 0
@@ -106,12 +106,12 @@ mapheader_copy_mapdata_with_padding: @ 8087E14
ldr r5, [r6]
ldr r0, =0x03ff03ff
str r0, [sp]
ldr r4, =0x02032318
ldr r4, =gUnknown_02032318
ldr r2, =0x01001400
mov r0, sp
adds r1, r4, 0
bl CpuFastSet
ldr r2, =0x03005dc0
ldr r2, =gUnknown_03005DC0
str r4, [r2, 0x8]
ldr r1, [r5]
adds r1, 0xF
@@ -151,7 +151,7 @@ map_copy_with_padding: @ 8087E70
mov r8, r1
lsls r2, 16
lsrs r2, 16
ldr r0, =0x03005dc0
ldr r0, =gUnknown_03005DC0
ldr r4, [r0, 0x8]
ldr r1, [r0]
lsls r0, r1, 3
@@ -197,7 +197,7 @@ mapheader_copy_mapdata_of_adjacent_maps: @ 8087EC8
beq _08087F4C
ldr r1, [r0]
ldr r5, [r0, 0x4]
ldr r2, =0x02037340
ldr r2, =gUnknown_02037340
ldr r0, =gUnknown_08486EF8
ldr r0, [r0]
str r0, [r2]
@@ -276,7 +276,7 @@ sub_8087F54: @ 8087F54
lsls r2, 1
ldr r3, [r4, 0xC]
adds r6, r3, r2
ldr r3, =0x03005dc0
ldr r3, =gUnknown_03005DC0
ldr r2, [r3]
muls r1, r2
adds r1, r0
@@ -296,7 +296,7 @@ _08087F86:
mov r3, r8
ands r2, r3
bl CpuSet
ldr r0, =0x03005dc0
ldr r0, =gUnknown_03005DC0
ldr r0, [r0]
lsls r0, 1
adds r5, r0
@@ -332,7 +332,7 @@ sub_8087FB8: @ 8087FB8
bge _08087FEC
negs r6, r2
adds r2, r4
ldr r0, =0x03005dc0
ldr r0, =gUnknown_03005DC0
ldr r3, [r0]
cmp r2, r3
bge _08087FE2
@@ -344,7 +344,7 @@ _08087FE2:
_08087FEC:
movs r6, 0
adds r0, r2, r4
ldr r1, =0x03005dc0
ldr r1, =gUnknown_03005DC0
ldr r1, [r1]
subs r3, r1, r2
cmp r0, r1
@@ -385,7 +385,7 @@ sub_8088020: @ 8088020
bge _08088050
negs r6, r2
adds r2, r4
ldr r0, =0x03005dc0
ldr r0, =gUnknown_03005DC0
ldr r3, [r0]
cmp r2, r3
bge _08088046
@@ -397,7 +397,7 @@ _08088046:
_08088050:
movs r6, 0
adds r0, r2, r4
ldr r1, =0x03005dc0
ldr r1, =gUnknown_03005DC0
ldr r1, [r1]
subs r3, r1, r2
cmp r0, r1
@@ -437,7 +437,7 @@ sub_8088080: @ 8088080
bge _080880B0
negs r6, r2
adds r1, r2, r4
ldr r0, =0x03005dc0
ldr r0, =gUnknown_03005DC0
ldr r3, [r0, 0x4]
cmp r1, r3
bge _080880A6
@@ -449,7 +449,7 @@ _080880A6:
_080880B0:
movs r6, 0
adds r0, r2, r4
ldr r1, =0x03005dc0
ldr r1, =gUnknown_03005DC0
ldr r1, [r1, 0x4]
subs r3, r1, r2
cmp r0, r1
@@ -491,7 +491,7 @@ sub_80880E0: @ 80880E0
bge _08088114
negs r6, r2
adds r1, r2, r4
ldr r0, =0x03005dc0
ldr r0, =gUnknown_03005DC0
ldr r3, [r0, 0x4]
cmp r1, r3
bge _0808810A
@@ -503,7 +503,7 @@ _0808810A:
_08088114:
movs r6, 0
adds r0, r2, r4
ldr r1, =0x03005dc0
ldr r1, =gUnknown_03005DC0
ldr r1, [r1, 0x4]
subs r3, r1, r2
cmp r0, r1
@@ -535,7 +535,7 @@ MapGridGetZCoordAt: @ 8088144
adds r4, r1, 0
cmp r2, 0
blt _08088174
ldr r1, =0x03005dc0
ldr r1, =gUnknown_03005DC0
ldr r3, [r1]
cmp r2, r3
bge _08088174
@@ -554,7 +554,7 @@ MapGridGetZCoordAt: @ 8088144
b _08088196
.pool
_08088174:
ldr r0, =0x02037318
ldr r0, =gUnknown_02037318
ldr r3, [r0]
adds r1, r2, 0x1
movs r2, 0x1
@@ -594,7 +594,7 @@ MapGridIsImpassableAt: @ 80881B0
adds r4, r1, 0
cmp r2, 0
blt _080881E0
ldr r1, =0x03005dc0
ldr r1, =gUnknown_03005DC0
ldr r3, [r1]
cmp r2, r3
bge _080881E0
@@ -613,7 +613,7 @@ MapGridIsImpassableAt: @ 80881B0
b _08088202
.pool
_080881E0:
ldr r0, =0x02037318
ldr r0, =gUnknown_02037318
ldr r3, [r0]
adds r1, r2, 0x1
movs r2, 0x1
@@ -656,7 +656,7 @@ MapGridGetMetatileIdAt: @ 8088224
adds r6, r1, 0
cmp r5, 0
blt _08088254
ldr r1, =0x03005dc0
ldr r1, =gUnknown_03005DC0
ldr r2, [r1]
cmp r5, r2
bge _08088254
@@ -675,7 +675,7 @@ MapGridGetMetatileIdAt: @ 8088224
b _08088278
.pool
_08088254:
ldr r0, =0x02037318
ldr r0, =gUnknown_02037318
ldr r3, [r0]
adds r1, r5, 0x1
movs r2, 0x1
@@ -702,7 +702,7 @@ _08088278:
b _080882B0
.pool
_0808828C:
ldr r0, =0x02037318
ldr r0, =gUnknown_02037318
ldr r3, [r0]
adds r1, r5, 0x1
movs r2, 0x1
@@ -768,7 +768,7 @@ MapGridSetMetatileIdAt: @ 80882F0
lsrs r5, r2, 16
cmp r3, 0
blt _08088328
ldr r2, =0x03005dc0
ldr r2, =gUnknown_03005DC0
ldr r4, [r2]
cmp r3, r4
bge _08088328
@@ -806,7 +806,7 @@ MapGridSetMetatileEntryAt: @ 8088338
lsrs r5, r2, 16
cmp r3, 0
blt _08088364
ldr r2, =0x03005dc0
ldr r2, =gUnknown_03005DC0
ldr r4, [r2]
cmp r3, r4
bge _08088364
@@ -839,7 +839,7 @@ GetBehaviorByMetatileId: @ 8088370
ldr r0, =0x000001ff
cmp r2, r0
bhi _08088394
ldr r0, =0x02037318
ldr r0, =gUnknown_02037318
ldr r0, [r0]
ldr r0, [r0, 0x10]
ldr r1, [r0, 0x10]
@@ -854,7 +854,7 @@ _08088394:
b _080883B6
.pool
_080883A4:
ldr r0, =0x02037318
ldr r0, =gUnknown_02037318
ldr r0, [r0]
ldr r0, [r0, 0x14]
ldr r1, [r0, 0x10]
@@ -876,11 +876,11 @@ save_serialize_map: @ 80883C4
mov r7, r9
mov r6, r8
push {r6,r7}
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r1, [r0]
adds r4, r1, 0
adds r4, 0x34
ldr r0, =0x03005dc0
ldr r0, =gUnknown_03005DC0
ldr r0, [r0]
mov r8, r0
movs r0, 0
@@ -892,7 +892,7 @@ save_serialize_map: @ 80883C4
cmp r0, r1
bge _08088420
mov r12, r1
ldr r1, =0x02032318
ldr r1, =gUnknown_02032318
mov r9, r1
lsls r7, r6, 1
_080883F2:
@@ -936,7 +936,7 @@ sub_8088438: @ 8088438
push {r4,lr}
movs r2, 0
movs r1, 0
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
adds r3, r0, 0
adds r3, 0x34
@@ -971,7 +971,7 @@ sav2_mapdata_clear: @ 8088474
mov r1, sp
movs r0, 0
strh r0, [r1]
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r1, [r0]
adds r1, 0x34
ldr r2, =0x01000100
@@ -991,14 +991,14 @@ mapdata_from_sav2: @ 808849C
mov r5, r8
push {r5-r7}
sub sp, 0x10
ldr r4, =0x03005d8c
ldr r4, =gUnknown_03005D8C
ldr r0, [r4]
adds r7, r0, 0
adds r7, 0x34
bl sub_8088438
cmp r0, 0
bne _080885AC
ldr r0, =0x03005dc0
ldr r0, =gUnknown_03005DC0
ldr r0, [r0]
str r0, [sp]
ldr r0, [r4]
@@ -1029,7 +1029,7 @@ _080884EC:
mov r9, r1
cmp r6, r0
bne _08088508
ldr r0, =0x02037318
ldr r0, =gUnknown_02037318
ldr r0, [r0]
ldr r0, [r0, 0x4]
subs r0, 0x1
@@ -1056,7 +1056,7 @@ _08088520:
muls r0, r6
adds r0, r5, r0
lsls r0, 1
ldr r1, =0x02032318
ldr r1, =gUnknown_02032318
adds r4, r0, r1
adds r0, r4, 0
lsrs r1, r3, 16
@@ -1104,7 +1104,7 @@ _08088574:
asrs r1, r2, 16
bl sub_80D423C
_08088584:
ldr r0, =0x02037318
ldr r0, =gUnknown_02037318
ldr r0, [r0]
ldr r0, [r0, 0x4]
subs r0, 0x1
@@ -1147,12 +1147,12 @@ sub_80885C4: @ 80885C4
lsls r0, 24
lsrs r3, r0, 24
adds r2, r3, 0
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r1, [r0]
adds r0, r1, 0
adds r0, 0x34
str r0, [sp, 0x4]
ldr r0, =0x03005dc0
ldr r0, =gUnknown_03005DC0
ldr r0, [r0]
str r0, [sp]
movs r4, 0
@@ -1205,7 +1205,7 @@ _0808863E:
movs r1, 0
cmp r1, r12
bge _08088682
ldr r0, =0x02032318
ldr r0, =gUnknown_02032318
mov r10, r0
_08088648:
adds r4, r1, 0x1
@@ -1260,7 +1260,7 @@ GetMapBorderIdAt: @ 808869C
adds r5, r1, 0
cmp r4, 0
blt _080886D8
ldr r1, =0x03005dc0
ldr r1, =gUnknown_03005DC0
ldr r2, [r1]
cmp r4, r2
bge _080886D8
@@ -1282,7 +1282,7 @@ GetMapBorderIdAt: @ 808869C
b _08088700
.pool
_080886D8:
ldr r0, =0x02037318
ldr r0, =gUnknown_02037318
ldr r3, [r0]
adds r1, r4, 0x1
movs r2, 0x1
@@ -1303,12 +1303,12 @@ _080886D8:
cmp r0, r1
beq _08088770
_08088700:
ldr r1, =0x03005dc0
ldr r1, =gUnknown_03005DC0
ldr r0, [r1]
subs r0, 0x8
cmp r4, r0
blt _0808872C
ldr r0, =0x02037340
ldr r0, =gUnknown_02037340
ldrb r1, [r0]
movs r0, 0x8
ands r0, r1
@@ -1320,7 +1320,7 @@ _08088700:
_0808872C:
cmp r4, 0x6
bgt _08088744
ldr r0, =0x02037340
ldr r0, =gUnknown_02037340
ldrb r1, [r0]
movs r0, 0x4
ands r0, r1
@@ -1334,7 +1334,7 @@ _08088744:
subs r0, 0x7
cmp r5, r0
blt _08088760
ldr r0, =0x02037340
ldr r0, =gUnknown_02037340
ldrb r1, [r0]
movs r0, 0x1
ands r0, r1
@@ -1346,7 +1346,7 @@ _08088744:
_08088760:
cmp r5, 0x6
bgt _08088780
ldr r0, =0x02037340
ldr r0, =gUnknown_02037340
ldrb r1, [r0]
movs r0, 0x2
ands r0, r1
@@ -1373,7 +1373,7 @@ _08088782:
GetPostCameraMoveMapBorderId: @ 8088788
push {r4,lr}
adds r3, r1, 0
ldr r1, =0x03005d8c
ldr r1, =gUnknown_03005D8C
ldr r1, [r1]
movs r4, 0
ldrsh r2, [r1, r4]
@@ -1395,7 +1395,7 @@ GetPostCameraMoveMapBorderId: @ 8088788
@ bool32 CanCameraMoveInDirection(u8 direction)
CanCameraMoveInDirection: @ 80887B0
push {r4,r5,lr}
ldr r1, =0x03005d8c
ldr r1, =gUnknown_03005D8C
ldr r4, [r1]
movs r1, 0
ldrsh r3, [r4, r1]
@@ -1450,7 +1450,7 @@ _08088816:
beq _08088834
cmp r4, 0x4
bne _08088872
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r1, [r0]
negs r0, r6
strh r0, [r1]
@@ -1460,7 +1460,7 @@ _08088816:
b _08088870
.pool
_08088834:
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r1, [r0]
ldr r0, [r3]
ldr r0, [r0]
@@ -1471,7 +1471,7 @@ _08088834:
b _08088870
.pool
_0808884C:
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r1, [r0]
ldr r2, [r5, 0x4]
ldrh r0, [r1]
@@ -1481,7 +1481,7 @@ _0808884C:
b _08088870
.pool
_08088860:
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r1, [r0]
ldr r2, [r5, 0x4]
ldrh r0, [r1]
@@ -1508,12 +1508,12 @@ CameraMove: @ 808887C
push {r5-r7}
mov r10, r0
mov r9, r1
ldr r1, =0x02037334
ldr r1, =gUnknown_02037334
ldrb r0, [r1]
movs r1, 0x2
negs r1, r1
ands r1, r0
ldr r2, =0x02037334
ldr r2, =gUnknown_02037334
strb r1, [r2]
mov r0, r10
mov r1, r9
@@ -1522,7 +1522,7 @@ CameraMove: @ 808887C
adds r0, r7, 0x1
cmp r0, 0x1
bhi _080888C4
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r1, [r0]
ldrh r0, [r1]
add r0, r10
@@ -1535,7 +1535,7 @@ CameraMove: @ 808887C
_080888C4:
bl save_serialize_map
bl sub_81BE72C
ldr r1, =0x03005d8c
ldr r1, =gUnknown_03005D8C
ldr r0, [r1]
movs r2, 0
ldrsh r5, [r0, r2]
@@ -1556,23 +1556,23 @@ _080888C4:
ldrb r0, [r4, 0x8]
ldrb r1, [r4, 0x9]
bl mliX_load_map
ldr r1, =0x02037334
ldr r1, =gUnknown_02037334
ldrb r0, [r1]
movs r1, 0x1
orrs r0, r1
ldr r2, =0x02037334
ldr r2, =gUnknown_02037334
strb r0, [r2]
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r1, [r0]
movs r2, 0
ldrsh r0, [r1, r2]
subs r5, r0
ldr r0, =0x02037334
ldr r0, =gUnknown_02037334
str r5, [r0, 0x4]
movs r2, 0x2
ldrsh r0, [r1, r2]
subs r6, r0
ldr r0, =0x02037334
ldr r0, =gUnknown_02037334
str r6, [r0, 0x8]
ldrh r0, [r1]
add r0, r10
@@ -1583,7 +1583,7 @@ _080888C4:
mov r0, r8
bl sub_80885C4
_08088932:
ldr r0, =0x02037334
ldr r0, =gUnknown_02037334
ldrb r0, [r0]
lsls r0, 31
lsrs r0, 31
@@ -1607,7 +1607,7 @@ sub_8088950: @ 8088950
mov r8, r2
lsls r0, 24
lsrs r6, r0, 24
ldr r0, =0x02037318
ldr r0, =gUnknown_02037318
ldr r0, [r0, 0xC]
ldr r7, [r0]
ldr r4, [r0, 0x4]
@@ -1664,7 +1664,7 @@ sub_80889A8: @ 80889A8
blt _08088A00
cmp r4, 0x2
bgt _080889E0
ldr r0, =0x02037318
ldr r0, =gUnknown_02037318
ldr r0, [r0]
ldr r1, [r0]
ldr r0, [r2]
@@ -1676,7 +1676,7 @@ sub_80889A8: @ 80889A8
_080889E0:
cmp r6, 0x4
bgt _08088A00
ldr r0, =0x02037318
ldr r0, =gUnknown_02037318
ldr r0, [r0]
ldr r1, [r0, 0x4]
ldr r0, [r2]
@@ -1792,7 +1792,7 @@ sub_8088A8C: @ 8088A8C
mov r8, r0
lsls r1, 16
lsrs r1, 16
ldr r2, =0x02037318
ldr r2, =gUnknown_02037318
ldr r0, [r2, 0xC]
cmp r0, 0
bne _08088AB4
@@ -1884,7 +1884,7 @@ sub_8088B3C: @ 8088B3C
lsrs r0, 16
lsls r1, 16
lsrs r1, 16
ldr r2, =0x03005d8c
ldr r2, =gUnknown_03005D8C
ldr r2, [r2]
subs r0, 0x7
strh r0, [r2]
@@ -1896,7 +1896,7 @@ sub_8088B3C: @ 8088B3C
thumb_func_start sav1_camera_get_focus_coords
sav1_camera_get_focus_coords: @ 8088B58
ldr r2, =0x03005d8c
ldr r2, =gUnknown_03005D8C
ldr r3, [r2]
ldrh r2, [r3]
adds r2, 0x7
@@ -1911,7 +1911,7 @@ sav1_camera_get_focus_coords: @ 8088B58
thumb_func_start SetCameraCoords
@ void SetCameraCoords(u16 x, u16 y)
SetCameraCoords: @ 8088B70
ldr r2, =0x03005d8c
ldr r2, =gUnknown_03005D8C
ldr r2, [r2]
strh r0, [r2]
strh r1, [r2, 0x2]
@@ -1922,7 +1922,7 @@ SetCameraCoords: @ 8088B70
thumb_func_start GetCameraCoords
@ void GetCameraCoords(u16 *x, u16 *y)
GetCameraCoords: @ 8088B80
ldr r2, =0x03005d8c
ldr r2, =gUnknown_03005D8C
ldr r3, [r2]
ldrh r2, [r3]
strh r2, [r0]
@@ -1940,7 +1940,7 @@ sub_8088B94: @ 8088B94
adds r5, r2, 0
cmp r4, 0
blt _08088BE6
ldr r2, =0x03005dc0
ldr r2, =gUnknown_03005DC0
ldr r1, [r2]
cmp r4, r1
bge _08088BE6
asm/flag.s
+2 -2
View File
@@ -20,7 +20,7 @@ _0809D6FC:
ldr r0, =0x00003fff
cmp r2, r0
bhi _0809D71C
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
lsrs r1, 19
ldr r2, =0x00001270
adds r1, r2
@@ -36,7 +36,7 @@ _0809D71C:
adds r0, r3, r2
_0809D728:
asrs r0, 3
ldr r1, =0x020375fc
ldr r1, =gUnknown_020375FC
_0809D72C:
adds r0, r1
_0809D72E:
asm/fldeff_80F9BCC.s
+81 -81
View File
@@ -86,7 +86,7 @@ sub_80F9C44: @ 80F9C44
lsls r0, 24
lsrs r0, 24
adds r2, r0, 0
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r2, 2
adds r0, r2
lsls r0, 3
@@ -122,7 +122,7 @@ sub_80F9C90: @ 80F9C90
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
ldr r1, =0x03005e00
ldr r1, =gTasks
adds r4, r0, r1
movs r1, 0x8
ldrsh r0, [r4, r1]
@@ -220,7 +220,7 @@ _080F9D50:
movs r1, 0
movs r2, 0
bl sub_80A2A20
ldr r0, =0x02037b14
ldr r0, =gUnknown_02037B14
strh r5, [r0]
_080F9D76:
ldrh r1, [r4, 0xE]
@@ -299,7 +299,7 @@ sub_80F9DFC: @ 80F9DFC
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
ldr r1, =0x03005e00
ldr r1, =gTasks
adds r4, r0, r1
movs r0, 0x8
ldrsh r1, [r4, r0]
@@ -318,7 +318,7 @@ _080F9E24:
beq _080F9ED8
b _080F9F2C
_080F9E2E:
ldr r0, =0x02037b14
ldr r0, =gUnknown_02037B14
strh r1, [r0]
b _080F9F4E
.pool
@@ -422,7 +422,7 @@ _080F9EF6:
movs r1, 0x10
movs r2, 0
bl sub_80A2A20
ldr r1, =0x02037b14
ldr r1, =gUnknown_02037B14
movs r0, 0
strh r0, [r1]
_080F9F0C:
@@ -467,8 +467,8 @@ _080F9F54:
thumb_func_start sub_80F9F5C
sub_80F9F5C: @ 80F9F5C
push {lr}
ldr r0, =0x0203ab40
ldr r1, =0x02037318
ldr r0, =gUnknown_0203AB40
ldr r1, =gUnknown_02037318
ldr r1, [r1, 0x4]
bl sub_80E9608
bl sub_80E8B6C
@@ -480,13 +480,13 @@ sub_80F9F5C: @ 80F9F5C
thumb_func_start sub_80F9F78
sub_80F9F78: @ 80F9F78
push {lr}
ldr r0, =0x02037590
ldr r0, =gUnknown_02037590
ldrb r1, [r0]
movs r0, 0x6
ands r0, r1
cmp r0, 0
beq _080F9FC0
ldr r1, =0x02038c08
ldr r1, =gUnknown_02038C08
ldr r0, [r1, 0x4]
cmp r0, 0x2
beq _080F9FAE
@@ -517,7 +517,7 @@ _080F9FB6:
movs r0, 0x18
b _080F9FFC
_080F9FC0:
ldr r1, =0x02038c08
ldr r1, =gUnknown_02038C08
ldr r0, [r1, 0x4]
cmp r0, 0x2
beq _080F9FEA
@@ -563,7 +563,7 @@ _080F9FFE:
sub_80FA004: @ 80FA004
push {r4,lr}
bl sub_80E8BC8
ldr r0, =0x020375f0
ldr r0, =gUnknown_020375F0
ldrh r0, [r0]
cmp r0, 0x1
beq _080FA0AE
@@ -572,7 +572,7 @@ sub_80FA004: @ 80FA004
lsrs r0, 24
cmp r0, 0x2
bne _080FA0AE
ldr r4, =0x0203ab40
ldr r4, =gUnknown_0203AB40
adds r1, r4, 0x2
adds r0, r4, 0
bl GetXYCoordsOneStepInFrontOfPlayer
@@ -590,10 +590,10 @@ sub_80FA004: @ 80FA004
cmp r0, 0x1
bne _080FA070
bl sub_80F9F5C
ldr r1, =0x03005db0
ldr r1, =gUnknown_03005DB0
ldr r0, =hm_add_c3_launch_phase_2
str r0, [r1]
ldr r1, =0x0203ceec
ldr r1, =gUnknown_0203CEEC
ldr r0, =sub_80FA0DC
b _080FA0C0
.pool
@@ -605,10 +605,10 @@ _080FA070:
cmp r0, 0x1
bne _080FA0A0
bl sub_80F9F5C
ldr r1, =0x03005db0
ldr r1, =gUnknown_03005DB0
ldr r0, =hm_add_c3_launch_phase_2
str r0, [r1]
ldr r1, =0x0203ceec
ldr r1, =gUnknown_0203CEEC
ldr r0, =sub_80FA1E8
b _080FA0C0
.pool
@@ -624,10 +624,10 @@ _080FA0AE:
b _080FA0C4
_080FA0B2:
bl sub_80F9F5C
ldr r1, =0x03005db0
ldr r1, =gUnknown_03005DB0
ldr r0, =hm_add_c3_launch_phase_2
str r0, [r1]
ldr r1, =0x0203ceec
ldr r1, =gUnknown_0203CEEC
ldr r0, =sub_80FA34C
_080FA0C0:
str r0, [r1]
@@ -643,7 +643,7 @@ _080FA0C4:
sub_80FA0DC: @ 80FA0DC
push {lr}
bl brm_get_pokemon_selection
ldr r1, =0x02038c08
ldr r1, =gUnknown_02038C08
lsls r0, 24
lsrs r0, 24
str r0, [r1]
@@ -660,7 +660,7 @@ oei_sweet_scent: @ 80FA0FC
bl oei_task_add
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
@@ -691,8 +691,8 @@ sub_80FA13C: @ 80FA13C
push {r4,lr}
bl sub_80F9F78
ldr r0, =gUnknown_0858E600
ldr r3, =0x02020630
ldr r1, =0x02037590
ldr r3, =gUnknown_02020630
ldr r1, =gUnknown_02037590
ldrb r1, [r1, 0x4]
lsls r2, r1, 4
adds r2, r1
@@ -701,7 +701,7 @@ sub_80FA13C: @ 80FA13C
ldrh r1, [r2, 0x2]
lsls r1, 23
lsrs r1, 23
ldr r4, =0x02038c08
ldr r4, =gUnknown_02038C08
ldr r3, [r4, 0x14]
adds r1, r3
lsls r1, 16
@@ -778,7 +778,7 @@ sub_80FA1D8: @ 80FA1D8
sub_80FA1E8: @ 80FA1E8
push {lr}
bl brm_get_pokemon_selection
ldr r1, =0x02038c08
ldr r1, =gUnknown_02038C08
lsls r0, 24
lsrs r0, 24
str r0, [r1]
@@ -795,7 +795,7 @@ sub_80FA208: @ 80FA208
bl oei_task_add
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
@@ -824,7 +824,7 @@ sub_80FA234: @ 80FA234
thumb_func_start sub_80FA248
sub_80FA248: @ 80FA248
push {r4,lr}
ldr r1, =0x0203ab40
ldr r1, =gUnknown_0203AB40
movs r2, 0
ldrsh r0, [r1, r2]
movs r2, 0x2
@@ -836,20 +836,20 @@ sub_80FA248: @ 80FA248
ands r2, r0
cmp r2, 0x96
bne _080FA26A
ldr r1, =0x02038c08
ldr r1, =gUnknown_02038C08
movs r0, 0
str r0, [r1, 0x1C]
_080FA26A:
cmp r2, 0x9C
bne _080FA274
ldr r1, =0x02038c08
ldr r1, =gUnknown_02038C08
movs r0, 0x2
str r0, [r1, 0x1C]
_080FA274:
bl sub_80F9F78
ldr r0, =gUnknown_0858E618
ldr r3, =0x02020630
ldr r1, =0x02037590
ldr r3, =gUnknown_02020630
ldr r1, =gUnknown_02037590
ldrb r1, [r1, 0x4]
lsls r2, r1, 4
adds r2, r1
@@ -858,7 +858,7 @@ _080FA274:
ldrh r1, [r2, 0x2]
lsls r1, 23
lsrs r1, 23
ldr r4, =0x02038c08
ldr r4, =gUnknown_02038C08
ldr r3, [r4, 0x14]
adds r1, r3
lsls r1, 16
@@ -891,7 +891,7 @@ sub_80FA2D8: @ 80FA2D8
adds r4, r0, 0
movs r0, 0x9B
bl audio_play
ldr r0, =0x02038c08
ldr r0, =gUnknown_02038C08
ldr r1, [r0, 0x1C]
adds r2, r4, 0
adds r2, 0x2A
@@ -917,7 +917,7 @@ sub_80FA304: @ 80FA304
asrs r0, 16
cmp r0, 0x27
ble _080FA32E
ldr r0, =0x02038c08
ldr r0, =gUnknown_02038C08
ldr r0, [r0, 0x1C]
cmp r0, 0
beq _080FA322
@@ -951,7 +951,7 @@ sub_80FA33C: @ 80FA33C
sub_80FA34C: @ 80FA34C
push {lr}
bl brm_get_pokemon_selection
ldr r1, =0x02038c08
ldr r1, =gUnknown_02038C08
lsls r0, 24
lsrs r0, 24
str r0, [r1]
@@ -968,7 +968,7 @@ sub_80FA36C: @ 80FA36C
bl oei_task_add
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
@@ -999,8 +999,8 @@ sub_80FA3AC: @ 80FA3AC
push {r4,lr}
bl sub_80F9F78
ldr r0, =gUnknown_0858E630
ldr r3, =0x02020630
ldr r1, =0x02037590
ldr r3, =gUnknown_02020630
ldr r1, =gUnknown_02037590
ldrb r1, [r1, 0x4]
lsls r2, r1, 4
adds r2, r1
@@ -1009,7 +1009,7 @@ sub_80FA3AC: @ 80FA3AC
ldrh r1, [r2, 0x2]
lsls r1, 23
lsrs r1, 23
ldr r4, =0x02038c08
ldr r4, =gUnknown_02038C08
ldr r3, [r4, 0x14]
adds r1, r3
lsls r1, 16
@@ -1096,7 +1096,7 @@ sub_80FA458: @ 80FA458
bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
@@ -1124,7 +1124,7 @@ sub_80FA4A0: @ 80FA4A0
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
ldr r1, =0x03005e08
ldr r1, =gTasks + 0x8
adds r4, r0, r1
ldrh r0, [r4, 0x4]
subs r0, 0x4
@@ -1274,7 +1274,7 @@ sub_80FA5E4: @ 80FA5E4
bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
@@ -1300,7 +1300,7 @@ sub_80FA62C: @ 80FA62C
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
ldr r1, =0x03005e08
ldr r1, =gTasks + 0x8
adds r4, r0, r1
ldrh r1, [r4, 0x6]
movs r2, 0x6
@@ -1456,7 +1456,7 @@ sub_80FA754: @ 80FA754
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
@@ -1512,7 +1512,7 @@ _080FA7BC:
bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
@@ -1533,7 +1533,7 @@ sub_80FA7EC: @ 80FA7EC
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
@@ -1678,7 +1678,7 @@ sub_80FA970: @ 80FA970
bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
@@ -1722,8 +1722,8 @@ _080FA9CA:
sub_80FA9D0: @ 80FA9D0
push {r4,lr}
sub sp, 0x4
ldr r3, =0x02037350
ldr r2, =0x02037590
ldr r3, =gUnknown_02037350
ldr r2, =gUnknown_02037590
ldrb r1, [r2, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -1759,7 +1759,7 @@ sub_80FA9D0: @ 80FA9D0
lsrs r0, 24
cmp r0, 0x40
beq _080FAA5E
ldr r3, =0x02020630
ldr r3, =gUnknown_02020630
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
@@ -1807,7 +1807,7 @@ sub_80FAA7C: @ 80FAA7C
mov r0, sp
adds r1, r4, 0
bl GetXYCoordsOneStepInFrontOfPlayer
ldr r1, =0x02038c08
ldr r1, =gUnknown_02038C08
mov r0, sp
movs r2, 0
ldrsh r0, [r0, r2]
@@ -1834,8 +1834,8 @@ _080FAABC:
b _080FAB8C
_080FAAC6:
ldr r0, =gUnknown_0858E68C
ldr r3, =0x02020630
ldr r1, =0x02037590
ldr r3, =gUnknown_02020630
ldr r1, =gUnknown_02037590
ldrb r1, [r1, 0x4]
lsls r2, r1, 4
adds r2, r1
@@ -1856,8 +1856,8 @@ _080FAAC6:
.pool
_080FAAFC:
ldr r0, =gUnknown_0858E68C
ldr r3, =0x02020630
ldr r1, =0x02037590
ldr r3, =gUnknown_02020630
ldr r1, =gUnknown_02037590
ldrb r1, [r1, 0x4]
lsls r2, r1, 4
adds r2, r1
@@ -1875,8 +1875,8 @@ _080FAAFC:
.pool
_080FAB2C:
ldr r0, =gUnknown_0858E68C
ldr r3, =0x02020630
ldr r1, =0x02037590
ldr r3, =gUnknown_02020630
ldr r1, =gUnknown_02037590
ldrb r1, [r1, 0x4]
lsls r2, r1, 4
adds r2, r1
@@ -1897,8 +1897,8 @@ _080FAB4C:
.pool
_080FAB64:
ldr r0, =gUnknown_0858E68C
ldr r3, =0x02020630
ldr r1, =0x02037590
ldr r3, =gUnknown_02020630
ldr r1, =gUnknown_02037590
ldrb r1, [r1, 0x4]
lsls r2, r1, 4
adds r2, r1
@@ -1930,7 +1930,7 @@ door_restore_tilemap: @ 80FABA4
adds r5, r0, 0
movs r0, 0x83
bl audio_play
ldr r4, =0x02038c08
ldr r4, =gUnknown_02038C08
ldr r0, [r4, 0x14]
ldr r1, [r4, 0x18]
subs r1, 0x1
@@ -1953,7 +1953,7 @@ _080FABDC:
lsls r2, 2
bl MapGridSetMetatileIdAt
_080FABEA:
ldr r4, =0x02038c08
ldr r4, =gUnknown_02038C08
ldr r0, [r4, 0x14]
ldr r1, [r4, 0x18]
ldr r2, =0x0000020a
@@ -1988,7 +1988,7 @@ sub_80FAC24: @ 80FAC24
strh r0, [r5, 0x2E]
b _080FAC54
_080FAC38:
ldr r4, =0x02038c08
ldr r4, =gUnknown_02038C08
ldr r0, [r4, 0x14]
ldr r1, [r4, 0x18]
ldr r2, =0x00000e8c
@@ -2055,15 +2055,15 @@ _080FACB4:
beq _080FACC2
b _080FADCE
_080FACC2:
ldr r0, =0x02021cc4
ldr r0, =gUnknown_02021CC4
movs r1, 0x64
movs r2, 0
movs r3, 0x3
bl ConvertIntToDecimalString
ldr r0, =0x02021dc4
ldr r0, =gUnknown_02021DC4
ldr r1, =gUnknown_085EA88B
bl CopyString
ldr r1, =0x020375f0
ldr r1, =gUnknown_020375F0
movs r0, 0
strh r0, [r1]
ldr r0, =0x00004054
@@ -2079,15 +2079,15 @@ _080FACC2:
b _080FAD8A
.pool
_080FAD14:
ldr r0, =0x02021cc4
ldr r0, =gUnknown_02021CC4
movs r1, 0x32
movs r2, 0
movs r3, 0x2
bl ConvertIntToDecimalString
ldr r0, =0x02021dc4
ldr r0, =gUnknown_02021DC4
ldr r1, =gUnknown_085EA890
bl CopyString
ldr r1, =0x020375f0
ldr r1, =gUnknown_020375F0
movs r0, 0
strh r0, [r1]
ldr r0, =0x00004054
@@ -2103,12 +2103,12 @@ _080FAD14:
b _080FAD8A
.pool
_080FAD60:
ldr r1, =0x020375f0
ldr r1, =gUnknown_020375F0
movs r0, 0x1
b _080FAD70
.pool
_080FAD6C:
ldr r1, =0x020375f0
ldr r1, =gUnknown_020375F0
movs r0, 0x2
_080FAD70:
strh r0, [r1]
@@ -2131,7 +2131,7 @@ _080FAD8A:
b _080FADCE
.pool
_080FADA4:
ldr r1, =0x020375f0
ldr r1, =gUnknown_020375F0
movs r0, 0x3
strh r0, [r1]
ldr r0, =0x00004054
@@ -2208,7 +2208,7 @@ task50_overworld_posion_effect: @ 80FAE38
lsls r0, r2, 2
adds r0, r2
lsls r0, 3
ldr r1, =0x03005e08
ldr r1, =gTasks + 0x8
adds r1, r0, r1
movs r3, 0
ldrsh r0, [r1, r3]
@@ -2291,7 +2291,7 @@ c3_80A0DD8_is_running: @ 80FAEC0
sub_80FAED4: @ 80FAED4
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
@@ -2307,12 +2307,12 @@ sub_80FAEF0: @ 80FAEF0
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r0, =0x02037590
ldr r0, =gUnknown_02037590
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =0x02037350
ldr r1, =gUnknown_02037350
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
@@ -2338,7 +2338,7 @@ _080FAF1C:
lsrs r1, 24
adds r0, r4, 0
bl FieldObjectSetSpecialAnim
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
@@ -2357,19 +2357,19 @@ sub_80FAF64: @ 80FAF64
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =0x02037590
ldr r0, =gUnknown_02037590
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =0x02037350
ldr r1, =gUnknown_02037350
adds r5, r0, r1
adds r0, r5, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
beq _080FAFC8
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
@@ -2448,7 +2448,7 @@ sub_80FB00C: @ 80FB00C
lsls r0, r5, 4
adds r0, r5
lsls r0, 2
ldr r1, =0x02020630
ldr r1, =gUnknown_02020630
adds r4, r0, r1
adds r2, r4, 0
adds r2, 0x20
@@ -2483,7 +2483,7 @@ _080FB06E:
thumb_func_start sub_80FB074
sub_80FB074: @ 80FB074
push {r4-r7,lr}
ldr r4, =0x02020630
ldr r4, =gUnknown_02020630
adds r7, r4, 0
movs r6, 0
movs r5, 0x3F
asm/fldeff_emotion.s
+21 -21
View File
@@ -20,7 +20,7 @@ oei_exclamation_mark: @ 80B4620
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =0x02020630
ldr r1, =gUnknown_02020630
adds r0, r1
movs r1, 0
movs r2, 0
@@ -47,7 +47,7 @@ sub_80B4658: @ 80B4658
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =0x02020630
ldr r1, =gUnknown_02020630
adds r0, r1
movs r1, 0x21
movs r2, 0x1
@@ -74,7 +74,7 @@ sub_80B4690: @ 80B4690
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
ldr r0, =0x02020630
ldr r0, =gUnknown_02020630
adds r4, r0
adds r0, r4, 0
movs r1, 0x2E
@@ -115,7 +115,7 @@ sub_80B46D8: @ 80B46D8
orrs r3, r4
mov r4, r12
strb r3, [r4]
ldr r4, =0x02038c08
ldr r4, =gUnknown_02038C08
ldr r3, [r4]
strh r3, [r0, 0x2E]
ldr r3, [r4, 0x4]
@@ -167,7 +167,7 @@ _080B4756:
bl FieldEffectStop
b _080B47B2
_080B4764:
ldr r2, =0x02037350
ldr r2, =gUnknown_02037350
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -178,7 +178,7 @@ _080B4764:
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r0, =0x02020630
ldr r0, =gUnknown_02020630
adds r1, r0
ldrh r3, [r4, 0x34]
ldrh r0, [r4, 0x36]
@@ -214,16 +214,16 @@ _080B47B2:
thumb_func_start sub_80B47BC
sub_80B47BC: @ 80B47BC
push {lr}
ldr r0, =0x02038bfc
ldr r0, =gUnknown_02038BFC
ldrb r0, [r0]
cmp r0, 0
beq _080B47D4
ldr r0, =0x03006090
ldr r0, =gUnknown_03006090
ldrb r0, [r0, 0xC]
b _080B47D8
.pool
_080B47D4:
ldr r0, =0x03006090
ldr r0, =gUnknown_03006090
ldrb r0, [r0]
_080B47D8:
pop {r1}
@@ -243,12 +243,12 @@ sub_80B47E0: @ 80B47E0
_080B47EE:
cmp r0, 0
beq _080B47FC
ldr r0, =0x03006090
ldr r0, =gUnknown_03006090
ldrb r0, [r0, 0xC]
b _080B4800
.pool
_080B47FC:
ldr r0, =0x03006090
ldr r0, =gUnknown_03006090
ldrb r0, [r0]
_080B4800:
pop {r1}
@@ -259,12 +259,12 @@ _080B4800:
thumb_func_start sub_80B4808
sub_80B4808: @ 80B4808
push {lr}
ldr r0, =0x030060ac
ldr r0, =gUnknown_030060AC
ldrb r0, [r0]
cmp r0, 0x1
bne _080B4870
ldr r2, =0x03006090
ldr r0, =0x03006080
ldr r2, =gUnknown_03006090
ldr r0, =gUnknown_03006080
ldrh r1, [r0]
lsls r0, r1, 1
adds r0, r1
@@ -274,7 +274,7 @@ sub_80B4808: @ 80B4808
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =0x02037350
ldr r1, =gUnknown_02037350
adds r0, r1
ldrb r0, [r0, 0x18]
lsls r0, 28
@@ -283,11 +283,11 @@ sub_80B4808: @ 80B4808
lsls r0, 24
lsrs r0, 24
bl GetFaceDirectionAnimId
ldr r3, =0x03006084
ldr r3, =gUnknown_03006084
strb r0, [r3]
movs r0, 0xFE
strb r0, [r3, 0x1]
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldrb r1, [r0, 0x5]
ldrb r2, [r0, 0x4]
@@ -296,22 +296,22 @@ sub_80B4808: @ 80B4808
b _080B489E
.pool
_080B4870:
ldr r0, =0x02037590
ldr r0, =gUnknown_02037590
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =0x02037350
ldr r1, =gUnknown_02037350
adds r0, r1
ldrb r0, [r0, 0x18]
lsls r0, 28
lsrs r0, 28
bl GetFaceDirectionAnimId
ldr r3, =0x03006084
ldr r3, =gUnknown_03006084
strb r0, [r3]
movs r0, 0xFE
strb r0, [r3, 0x1]
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldrb r1, [r0, 0x5]
ldrb r2, [r0, 0x4]
asm/fldeff_strength.s
+8 -8
View File
@@ -17,15 +17,15 @@ hm_prepare_rocksmash: @ 8145DC4
movs r0, 0
b _08145DF2
_08145DD8:
ldr r4, =0x020375f0
ldr r4, =gUnknown_020375F0
bl brm_get_pokemon_selection
lsls r0, 24
lsrs r0, 24
strh r0, [r4]
ldr r1, =0x03005db0
ldr r1, =gUnknown_03005DB0
ldr r0, =hm_add_c3_launch_phase_2
str r0, [r1]
ldr r1, =0x0203ceec
ldr r1, =gUnknown_0203CEEC
ldr r0, =sub_8145E0C
str r0, [r1]
movs r0, 0x1
@@ -40,7 +40,7 @@ _08145DF2:
sub_8145E0C: @ 8145E0C
push {lr}
bl brm_get_pokemon_selection
ldr r1, =0x02038c08
ldr r1, =gUnknown_02038C08
lsls r0, 24
lsrs r0, 24
str r0, [r1]
@@ -57,7 +57,7 @@ sub_8145E2C: @ 8145E2C
bl oei_task_add
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
@@ -66,13 +66,13 @@ sub_8145E2C: @ 8145E2C
lsrs r0, r2, 16
strh r0, [r1, 0x18]
strh r2, [r1, 0x1A]
ldr r0, =0x02038c08
ldr r0, =gUnknown_02038C08
ldr r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =0x020244ec
ldr r1, =gUnknown_020244EC
adds r0, r1
ldr r1, =0x02021cc4
ldr r1, =gUnknown_02021CC4
bl GetMonNickname
movs r0, 0
pop {r1}
asm/front_pic_anim.s
+54 -54
View File
@@ -12,7 +12,7 @@ sub_817F498: @ 817F498
push {r7}
lsls r0, 24
lsrs r5, r0, 24
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r6, r5, 2
adds r0, r6, r5
lsls r0, 3
@@ -40,7 +40,7 @@ sub_817F498: @ 817F498
movs r0, 0x2
adds r1, r6, 0
ldr r6, =gUnknown_0860AA88
ldr r7, =0x03001274
ldr r7, =gUnknown_03001274
movs r4, 0
adds r2, r3, 0
adds r2, 0x32
@@ -100,7 +100,7 @@ sub_817F544: @ 817F544
bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
@@ -118,7 +118,7 @@ sub_817F544: @ 817F544
thumb_func_start sub_817F578
sub_817F578: @ 817F578
lsls r1, 24
ldr r3, =0x03001274
ldr r3, =gUnknown_03001274
movs r2, 0x1
str r2, [r3]
ldr r2, =gUnknown_0860AA88
@@ -141,7 +141,7 @@ sub_817F594: @ 817F594
bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r4, r0, 2
adds r4, r0
lsls r4, 3
@@ -151,13 +151,13 @@ sub_817F594: @ 817F594
strh r5, [r4, 0xC]
ldrh r0, [r5, 0x2E]
lsls r0, 24
ldr r1, =0x0202406e
ldr r1, =gUnknown_0202406E
lsrs r0, 23
adds r0, r1
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =0x020244ec
ldr r1, =gUnknown_020244EC
adds r0, r1
bl GetNature
lsls r0, 24
@@ -213,7 +213,7 @@ sub_817F618: @ 817F618
movs r2, 0x1
movs r3, 0x2
bl ObjAffineSet
ldr r0, =0x02021bc0
ldr r0, =gUnknown_02021BC0
lsls r4, 3
adds r4, r0
ldrh r0, [r5]
@@ -241,7 +241,7 @@ sub_817F670: @ 817F670
strb r0, [r4, 0x1]
ldr r0, =gUnknown_0860AD68
str r0, [r4, 0x10]
ldr r0, =0x03001274
ldr r0, =gUnknown_03001274
ldr r0, [r0]
cmp r0, 0x1
bne _0817F68E
@@ -337,7 +337,7 @@ sub_817F724: @ 817F724
lsrs r2, r0, 24
cmp r2, 0x3
bhi _0817F750
ldr r1, =0x03001240
ldr r1, =gUnknown_03001240
lsls r0, r2, 1
adds r0, r2
lsls r0, 2
@@ -362,7 +362,7 @@ _0817F752:
thumb_func_start sub_817F758
sub_817F758: @ 817F758
push {r4,lr}
ldr r4, =0x03001270
ldr r4, =gUnknown_03001270
ldrb r1, [r4]
adds r2, r1, 0x1
adds r0, r2, 0
@@ -397,7 +397,7 @@ sub_817F77C: @ 817F77C
lsrs r3, 30
adds r0, r4, 0
bl CalcVecFromObjectCenterToObjectUpperLeft
ldr r0, =0x03001274
ldr r0, =gUnknown_03001274
ldr r0, [r0]
cmp r0, 0x1
bne _0817F800
@@ -1294,7 +1294,7 @@ _0817FE24:
sub_817FE30: @ 817FE30
push {r4-r6,lr}
adds r4, r0, 0
ldr r2, =0x03001240
ldr r2, =gUnknown_03001240
ldrh r6, [r4, 0x2E]
movs r0, 0x2E
ldrsh r1, [r4, r0]
@@ -1324,7 +1324,7 @@ _0817FE54:
adds r0, 0x1
strh r0, [r5, 0x8]
_0817FE70:
ldr r2, =0x03001240
ldr r2, =gUnknown_03001240
lsls r1, r6, 16
asrs r1, 16
lsls r0, r1, 1
@@ -1405,7 +1405,7 @@ pokemonanimfunc_12: @ 817FF00
lsrs r0, 24
movs r3, 0
strh r0, [r4, 0x2E]
ldr r2, =0x03001240
ldr r2, =gUnknown_03001240
lsls r1, r0, 1
adds r1, r0
lsls r1, 2
@@ -1440,7 +1440,7 @@ sub_817FF3C: @ 817FF3C
_0817FF54:
movs r2, 0x32
ldrsh r6, [r4, r2]
ldr r1, =0x03001240
ldr r1, =gUnknown_03001240
lsls r0, r5, 1
adds r0, r5
lsls r0, 2
@@ -1491,7 +1491,7 @@ pokemonanimfunc_1F: @ 817FFB8
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x2E]
ldr r2, =0x03001240
ldr r2, =gUnknown_03001240
lsls r1, r0, 1
adds r1, r0
lsls r1, 2
@@ -1519,7 +1519,7 @@ sub_817FFF0: @ 817FFF0
lsrs r7, r0, 24
adds r0, r5, 0
bl sub_817F70C
ldr r1, =0x03001240
ldr r1, =gUnknown_03001240
lsls r0, r7, 1
adds r0, r7
lsls r0, 2
@@ -1569,7 +1569,7 @@ _0818003E:
adds r0, r1
strh r0, [r5, 0x26]
_0818006A:
ldr r0, =0x03001240
ldr r0, =gUnknown_03001240
lsls r1, r7, 1
adds r1, r7
lsls r1, 2
@@ -1594,7 +1594,7 @@ pokemonanimfunc_14: @ 8180090
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x2E]
ldr r2, =0x03001240
ldr r2, =gUnknown_03001240
lsls r1, r0, 1
adds r1, r0
lsls r1, 2
@@ -2667,7 +2667,7 @@ sub_8180900: @ 8180900
ldrh r1, [r4, 0x2E]
lsls r1, 24
lsrs r1, 24
ldr r2, =0x03001240
ldr r2, =gUnknown_03001240
lsls r0, r1, 1
adds r0, r1
lsls r0, 2
@@ -2825,7 +2825,7 @@ pokemonanimfunc_05: @ 8180A50
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x2E]
ldr r2, =0x03001240
ldr r2, =gUnknown_03001240
lsls r1, r0, 1
adds r1, r0
lsls r1, 2
@@ -3805,7 +3805,7 @@ pokemonanimfunc_2A: @ 81811E0
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x2E]
ldr r2, =0x03001240
ldr r2, =gUnknown_03001240
lsls r1, r0, 1
adds r1, r0
lsls r1, 2
@@ -3826,7 +3826,7 @@ pokemonanimfunc_2A: @ 81811E0
sub_8181214: @ 8181214
push {r4-r6,lr}
adds r4, r0, 0
ldr r6, =0x03001240
ldr r6, =gUnknown_03001240
movs r0, 0x2E
ldrsh r1, [r4, r0]
lsls r0, r1, 1
@@ -3934,7 +3934,7 @@ _081812DA:
movs r3, 0
strh r3, [r4, 0x24]
strh r3, [r4, 0x26]
ldr r5, =0x03001240
ldr r5, =gUnknown_03001240
movs r6, 0x2E
ldrsh r0, [r4, r6]
lsls r1, r0, 1
@@ -4187,7 +4187,7 @@ sub_81814D4: @ 81814D4
_081814E6:
adds r0, r6, 0
bl sub_817F70C
ldr r4, =0x03001240
ldr r4, =gUnknown_03001240
movs r3, 0x2E
ldrsh r1, [r6, r3]
lsls r0, r1, 1
@@ -4278,7 +4278,7 @@ pokemonanimfunc_2D: @ 81815A0
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x2E]
ldr r2, =0x03001240
ldr r2, =gUnknown_03001240
lsls r1, r0, 1
adds r1, r0
lsls r1, 2
@@ -4308,7 +4308,7 @@ sub_81815D4: @ 81815D4
_081815E6:
adds r0, r6, 0
bl sub_817F70C
ldr r4, =0x03001240
ldr r4, =gUnknown_03001240
movs r3, 0x2E
ldrsh r1, [r6, r3]
lsls r0, r1, 1
@@ -4400,7 +4400,7 @@ pokemonanimfunc_2E: @ 81816A0
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x2E]
ldr r2, =0x03001240
ldr r2, =gUnknown_03001240
lsls r1, r0, 1
adds r1, r0
lsls r1, 2
@@ -4578,7 +4578,7 @@ _08181800:
sub_8181810: @ 8181810
push {r4-r6,lr}
adds r5, r0, 0
ldr r4, =0x03001240
ldr r4, =gUnknown_03001240
movs r0, 0x2E
ldrsh r1, [r5, r0]
lsls r0, r1, 1
@@ -4718,7 +4718,7 @@ _08181922:
ldr r0, =sub_8184D88
str r0, [r5, 0x1C]
_0818193A:
ldr r2, =0x03001240
ldr r2, =gUnknown_03001240
movs r3, 0x2E
ldrsh r1, [r5, r3]
lsls r0, r1, 1
@@ -4744,7 +4744,7 @@ pokemonanimfunc_30: @ 8181960
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x2E]
ldr r2, =0x03001240
ldr r2, =gUnknown_03001240
lsls r1, r0, 1
adds r1, r0
lsls r1, 2
@@ -4902,7 +4902,7 @@ pokemonanimfunc_32: @ 8181A78
lsrs r0, 24
movs r5, 0
strh r0, [r4, 0x2E]
ldr r2, =0x03001240
ldr r2, =gUnknown_03001240
lsls r1, r0, 1
adds r1, r0
lsls r1, 2
@@ -4926,7 +4926,7 @@ pokemonanimfunc_32: @ 8181A78
sub_8181ABC: @ 8181ABC
push {r4-r6,lr}
adds r4, r0, 0
ldr r6, =0x03001240
ldr r6, =gUnknown_03001240
movs r0, 0x2E
ldrsh r1, [r4, r0]
lsls r0, r1, 1
@@ -5040,7 +5040,7 @@ _08181B7C:
ldrh r0, [r4, 0x34]
adds r0, 0x8
strh r0, [r4, 0x34]
ldr r2, =0x03001240
ldr r2, =gUnknown_03001240
movs r0, 0x2E
ldrsh r1, [r4, r0]
lsls r0, r1, 1
@@ -5117,7 +5117,7 @@ sub_8181C2C: @ 8181C2C
ldrsh r3, [r4, r0]
cmp r3, 0x80
ble _08181C90
ldr r3, =0x03001240
ldr r3, =gUnknown_03001240
movs r1, 0x2E
ldrsh r0, [r4, r1]
lsls r1, r0, 1
@@ -5157,7 +5157,7 @@ _08181C84:
b _08181CD0
.pool
_08181C90:
ldr r2, =0x03001240
ldr r2, =gUnknown_03001240
movs r5, 0x2E
ldrsh r1, [r4, r5]
lsls r0, r1, 1
@@ -5232,7 +5232,7 @@ _08181D00:
adds r1, r2, 0
movs r3, 0
bl sub_817F6D4
ldr r2, =0x03001240
ldr r2, =gUnknown_03001240
movs r0, 0x2E
ldrsh r1, [r4, r0]
lsls r0, r1, 1
@@ -5279,7 +5279,7 @@ _08181D60:
adds r0, r4, 0
adds r1, r2, 0
bl sub_817F6D4
ldr r2, =0x03001240
ldr r2, =gUnknown_03001240
movs r0, 0x2E
ldrsh r1, [r4, r0]
lsls r0, r1, 1
@@ -5307,7 +5307,7 @@ pokemonanimfunc_33: @ 8181DB0
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x2E]
ldr r2, =0x03001240
ldr r2, =gUnknown_03001240
lsls r1, r0, 1
adds r1, r0
lsls r1, 2
@@ -7354,7 +7354,7 @@ pokemonanimfunc_48: @ 8182D78
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x2E]
ldr r2, =0x03001240
ldr r2, =gUnknown_03001240
lsls r1, r0, 1
adds r1, r0
lsls r1, 2
@@ -7465,7 +7465,7 @@ pokemonanimfunc_4E: @ 8182E3C
lsrs r0, 24
movs r3, 0
strh r0, [r4, 0x2E]
ldr r2, =0x03001240
ldr r2, =gUnknown_03001240
lsls r1, r0, 1
adds r1, r0
lsls r1, 2
@@ -7494,7 +7494,7 @@ pokemonanimfunc_4F: @ 8182E7C
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x2E]
ldr r2, =0x03001240
ldr r2, =gUnknown_03001240
lsls r1, r0, 1
adds r1, r0
lsls r1, 2
@@ -7572,7 +7572,7 @@ pokemonanimfunc_53: @ 8182F10
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x2E]
ldr r2, =0x03001240
ldr r2, =gUnknown_03001240
lsls r1, r0, 1
adds r1, r0
lsls r1, 2
@@ -7599,7 +7599,7 @@ pokemonanimfunc_54: @ 8182F48
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x2E]
ldr r2, =0x03001240
ldr r2, =gUnknown_03001240
lsls r1, r0, 1
adds r1, r0
lsls r1, 2
@@ -7626,7 +7626,7 @@ pokemonanimfunc_55: @ 8182F80
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x2E]
ldr r2, =0x03001240
ldr r2, =gUnknown_03001240
lsls r1, r0, 1
adds r1, r0
lsls r1, 2
@@ -7654,7 +7654,7 @@ pokemonanimfunc_56: @ 8182FB8
lsrs r0, 24
movs r5, 0
strh r0, [r4, 0x2E]
ldr r2, =0x03001240
ldr r2, =gUnknown_03001240
lsls r1, r0, 1
adds r1, r0
lsls r1, 2
@@ -7684,7 +7684,7 @@ pokemonanimfunc_07: @ 8182FFC
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x2E]
ldr r2, =0x03001240
ldr r2, =gUnknown_03001240
lsls r1, r0, 1
adds r1, r0
lsls r1, 2
@@ -7709,7 +7709,7 @@ pokemonanimfunc_08: @ 8183030
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x2E]
ldr r2, =0x03001240
ldr r2, =gUnknown_03001240
lsls r1, r0, 1
adds r1, r0
lsls r1, 2
@@ -7736,7 +7736,7 @@ pokemonanimfunc_0B: @ 8183068
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x2E]
ldr r2, =0x03001240
ldr r2, =gUnknown_03001240
lsls r1, r0, 1
adds r1, r0
lsls r1, 2
@@ -7761,7 +7761,7 @@ pokemonanimfunc_0C: @ 818309C
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x2E]
ldr r2, =0x03001240
ldr r2, =gUnknown_03001240
lsls r1, r0, 1
adds r1, r0
lsls r1, 2
@@ -7788,7 +7788,7 @@ pokemonanimfunc_0D: @ 81830D4
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x2E]
ldr r2, =0x03001240
ldr r2, =gUnknown_03001240
lsls r1, r0, 1
adds r1, r0
lsls r1, 2
@@ -7813,7 +7813,7 @@ pokemonanimfunc_0E: @ 8183108
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x2E]
ldr r2, =0x03001240
ldr r2, =gUnknown_03001240
lsls r1, r0, 1
adds r1, r0
lsls r1, 2
@@ -8697,7 +8697,7 @@ pokemonanimfunc_64: @ 818379C
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x2E]
ldr r2, =0x03001240
ldr r2, =gUnknown_03001240
lsls r1, r0, 1
adds r1, r0
lsls r1, 2
asm/intro.s
+120 -120
View File
@@ -23,11 +23,11 @@ sub_816CC00: @ 816CC00
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
ldrh r0, [r0, 0x2E]
cmp r0, 0
beq _0816CC3C
ldr r0, =0x02037fd4
ldr r0, =gUnknown_02037FD4
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -38,7 +38,7 @@ sub_816CC00: @ 816CC00
b _0816CC4C
.pool
_0816CC3C:
ldr r2, =0x030062a0
ldr r2, =gUnknown_030062A0
ldr r1, [r2]
movs r0, 0x1
negs r0, r0
@@ -103,7 +103,7 @@ load_copyright_graphics: @ 816CC70
thumb_func_start SerialCb_CopyrightScreen
SerialCb_CopyrightScreen: @ 816CCB8
push {lr}
ldr r0, =0x030062b0
ldr r0, =gUnknown_030062B0
bl GameCubeMultiBoot_HandleSerialInterrupt
pop {r0}
bx r0
@@ -114,7 +114,7 @@ SerialCb_CopyrightScreen: @ 816CCB8
do_copyright_screen: @ 816CCC8
push {r4-r6,lr}
sub sp, 0x10
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
movs r1, 0x87
lsls r1, 3
adds r5, r0, r1
@@ -212,23 +212,23 @@ _0816CCF4:
strh r0, [r1]
ldr r0, =SerialCb_CopyrightScreen
bl SetSerialCallback
ldr r0, =0x030062b0
ldr r0, =gUnknown_030062B0
bl GameCubeMultiBoot_Init
_0816CDBC:
bl fade_and_return_progress_probably
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
movs r1, 0x87
lsls r1, 3
adds r0, r1
ldrb r1, [r0]
adds r1, 0x1
strb r1, [r0]
ldr r0, =0x030062b0
ldr r0, =gUnknown_030062B0
bl GameCubeMultiBoot_Main
b _0816CEA0
.pool
_0816CE00:
ldr r4, =0x030062b0
ldr r4, =gUnknown_030062B0
adds r0, r4, 0
bl GameCubeMultiBoot_Main
ldrb r0, [r4, 0x2]
@@ -256,7 +256,7 @@ _0816CE2C:
bl CreateTask
ldr r0, =sub_816CC00
bl SetMainCallback2
ldr r5, =0x030062b0
ldr r5, =gUnknown_030062B0
ldrb r0, [r5, 0x2]
cmp r0, 0
beq _0816CE8C
@@ -312,7 +312,7 @@ c2_copyright_1: @ 816CEAC
bl sub_8152680
movs r0, 0
bl sub_81534D0
ldr r0, =0x03006210
ldr r0, =gUnknown_03006210
ldrh r0, [r0]
cmp r0, 0
beq _0816CEDE
@@ -321,7 +321,7 @@ c2_copyright_1: @ 816CEAC
_0816CEDE:
bl init_sav2
_0816CEE2:
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r0, [r0]
ldrb r0, [r0, 0x15]
lsls r0, 31
@@ -358,7 +358,7 @@ task_intro_1: @ 816CF18
mov r8, r0
movs r0, 0
bl SetVBlankCallback
ldr r4, =0x0203bcc8
ldr r4, =gUnknown_0203BCC8
bl GenerateRandomNumber
movs r1, 0x1
ands r1, r0
@@ -452,7 +452,7 @@ task_intro_1: @ 816CF18
bl LoadCompressedObjectPic
ldr r0, =gUnknown_085E4A84
bl LoadTaggedObjectPalettes
ldr r4, =0x02037914
ldr r4, =gUnknown_02037914
movs r3, 0xF0
lsls r3, 1
adds r1, r4, r3
@@ -509,7 +509,7 @@ task_intro_1: @ 816CF18
adds r2, r5, 0
movs r3, 0x1
bl sub_816F7D0
ldr r2, =0x03005e00
ldr r2, =gTasks
mov r3, r8
lsls r1, r3, 2
add r1, r8
@@ -550,14 +550,14 @@ task_intro_2: @ 816D12C
lsls r1, 5
movs r0, 0
bl SetGpuReg
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
adds r0, r1
ldr r1, =task_intro_3
str r1, [r0]
ldr r0, =0x030062a0
ldr r0, =gUnknown_030062A0
str r5, [r0]
movs r0, 0xCF
lsls r0, 1
@@ -577,12 +577,12 @@ task_intro_3: @ 816D190
lsls r0, 24
lsrs r4, r0, 24
adds r6, r4, 0
ldr r5, =0x030062a0
ldr r5, =gUnknown_030062A0
ldr r0, [r5]
cmp r0, 0x4C
bne _0816D1BE
ldr r2, =0x02020630
ldr r1, =0x03005e00
ldr r2, =gUnknown_02020630
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
@@ -606,8 +606,8 @@ _0816D1CC:
ldr r0, [r5]
cmp r0, 0xFB
bne _0816D1EE
ldr r2, =0x02020630
ldr r1, =0x03005e00
ldr r2, =gUnknown_02020630
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
@@ -674,7 +674,7 @@ _0816D252:
ldr r0, [r5]
cmp r0, r4
bls _0816D27A
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r6, 2
adds r0, r6
lsls r0, 3
@@ -707,7 +707,7 @@ task_intro_3_3: @ 816D2A0
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
ldr r1, =0x03005e08
ldr r1, =gTasks + 0x8
adds r4, r0, r1
ldrh r0, [r4, 0x4]
adds r0, 0x1
@@ -802,12 +802,12 @@ task_intro_4: @ 816D354
lsls r0, 24
lsrs r1, r0, 24
adds r4, r1, 0
ldr r5, =0x030062a0
ldr r5, =gUnknown_030062A0
ldr r2, [r5]
ldr r0, =0x00000387
cmp r2, r0
bhi _0816D418
ldr r0, =0x03005e00
ldr r0, =gTasks
lsls r4, r1, 2
adds r4, r1
lsls r4, 3
@@ -863,7 +863,7 @@ task_intro_4: @ 816D354
bl AddObjectToFront
lsls r0, 24
lsrs r0, 24
ldr r2, =0x02020630
ldr r2, =gUnknown_02020630
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
@@ -887,7 +887,7 @@ _0816D418:
movs r2, 0
movs r3, 0x10
bl pal_fade_maybe
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
@@ -907,12 +907,12 @@ task_intro_5: @ 816D458
push {lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r0, =0x030062a0
ldr r0, =gUnknown_030062A0
ldr r1, [r0]
ldr r0, =0x00000402
cmp r1, r0
bls _0816D476
ldr r0, =0x03005e00
ldr r0, =gTasks
lsls r1, r2, 2
adds r1, r2
lsls r1, 3
@@ -936,16 +936,16 @@ task_intro_6: @ 816D48C
bl SetVBlankCallback
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
ldr r0, =0x0203bd24
ldr r0, =gUnknown_0203BD24
movs r1, 0
strh r1, [r0]
ldr r0, =0x0203bd26
ldr r0, =gUnknown_0203BD26
strh r1, [r0]
ldr r0, =0x0203bccc
ldr r0, =gUnknown_0203BCCC
strh r1, [r0]
movs r0, 0x1
bl load_intro_part2_graphics
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
@@ -964,7 +964,7 @@ task_intro_7: @ 816D4E4
sub sp, 0x4
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =0x0203bcc8
ldr r0, =gUnknown_0203BCC8
ldrh r0, [r0]
cmp r0, 0
bne _0816D504
@@ -1009,7 +1009,7 @@ _0816D51C:
movs r2, 0x6E
movs r3, 0x1
bl AddObjectToFront
ldr r0, =0x0203bcc8
ldr r0, =gUnknown_0203BCC8
ldrh r0, [r0]
cmp r0, 0
bne _0816D590
@@ -1025,7 +1025,7 @@ _0816D590:
_0816D598:
lsls r0, 24
lsrs r6, r0, 24
ldr r2, =0x02020630
ldr r2, =gUnknown_02020630
lsls r0, r6, 4
adds r0, r6
lsls r0, 2
@@ -1038,7 +1038,7 @@ _0816D598:
adds r0, r2
ldr r1, =gUnknown_085E4DC4
str r1, [r0]
ldr r0, =0x03005e00
ldr r0, =gTasks
adds r4, r7, r4
lsls r4, 3
adds r4, r0
@@ -1101,16 +1101,16 @@ task_intro_8: @ 816D650
lsls r0, 24
lsrs r4, r0, 24
adds r6, r4, 0
ldr r5, =0x030062a0
ldr r5, =gUnknown_030062A0
ldr r1, [r5]
movs r0, 0xE8
lsls r0, 3
cmp r1, r0
bne _0816D67C
ldr r1, =0x0203bd28
ldr r1, =gUnknown_0203BD28
movs r0, 0x2
strh r0, [r1]
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
@@ -1130,7 +1130,7 @@ _0816D67C:
movs r2, 0
movs r3, 0x10
bl pal_fade_maybe
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
@@ -1140,10 +1140,10 @@ _0816D67C:
_0816D6A4:
ldr r1, [r5]
ldr r0, =0x00000455
ldr r3, =0x03005e00
ldr r3, =gTasks
cmp r1, r0
bne _0816D6C8
ldr r2, =0x02020630
ldr r2, =gUnknown_02020630
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
@@ -1161,7 +1161,7 @@ _0816D6C8:
ldr r0, =0x000004be
cmp r1, r0
bne _0816D6EA
ldr r2, =0x02020630
ldr r2, =gUnknown_02020630
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
@@ -1179,7 +1179,7 @@ _0816D6EA:
ldr r0, =0x00000572
cmp r1, r0
bne _0816D70C
ldr r2, =0x02020630
ldr r2, =gUnknown_02020630
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
@@ -1197,7 +1197,7 @@ _0816D70C:
ldr r0, =0x00000576
cmp r1, r0
bne _0816D72E
ldr r2, =0x02020630
ldr r2, =gUnknown_02020630
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
@@ -1216,7 +1216,7 @@ _0816D72E:
lsls r0, 3
cmp r1, r0
bne _0816D752
ldr r2, =0x02020630
ldr r2, =gUnknown_02020630
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
@@ -1234,7 +1234,7 @@ _0816D752:
ldr r0, =0x000006bf
cmp r1, r0
bne _0816D774
ldr r2, =0x02020630
ldr r2, =gUnknown_02020630
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
@@ -1259,7 +1259,7 @@ _0816D774:
ands r0, r1
movs r1, 0x30
bl sine
ldr r1, =0x0203bccc
ldr r1, =gUnknown_0203BCCC
strh r0, [r1]
ldrh r2, [r4, 0xE]
movs r7, 0xE
@@ -1284,12 +1284,12 @@ task_intro_9: @ 816D7E8
push {lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r0, =0x030062a0
ldr r0, =gUnknown_030062A0
ldr r1, [r0]
ldr r0, =0x00000814
cmp r1, r0
bls _0816D806
ldr r0, =0x03005e00
ldr r0, =gTasks
lsls r1, r2, 2
adds r1, r2
lsls r1, 3
@@ -1542,7 +1542,7 @@ _0816D9DC:
.4byte _0816DA9A
.4byte _0816DACA
_0816D9F4:
ldr r0, =0x030062a0
ldr r0, =gUnknown_030062A0
ldr r1, [r0]
movs r0, 0x99
lsls r0, 3
@@ -1551,7 +1551,7 @@ _0816D9F4:
b _0816DABA
.pool
_0816DA08:
ldr r0, =0x030062a0
ldr r0, =gUnknown_030062A0
ldr r1, [r0]
movs r0, 0xC5
lsls r0, 3
@@ -1562,7 +1562,7 @@ _0816DA08:
b _0816DABE
.pool
_0816DA20:
ldr r0, =0x030062a0
ldr r0, =gUnknown_030062A0
ldr r1, [r0]
ldr r0, =0x000006c7
cmp r1, r0
@@ -1651,7 +1651,7 @@ _0816DABE:
strh r0, [r4, 0x2E]
b _0816DADA
_0816DACA:
ldr r0, =0x030062a0
ldr r0, =gUnknown_030062A0
ldr r1, [r0]
ldr r0, =0x0000073f
cmp r1, r0
@@ -1684,7 +1684,7 @@ _0816DAFE:
beq _0816DB42
b _0816DBA4
_0816DB04:
ldr r0, =0x030062a0
ldr r0, =gUnknown_030062A0
ldr r1, [r0]
movs r0, 0x88
lsls r0, 3
@@ -1699,7 +1699,7 @@ _0816DB1C:
ldrh r0, [r4, 0x20]
subs r0, 0x2
strh r0, [r4, 0x20]
ldr r0, =0x030062a0
ldr r0, =gUnknown_030062A0
ldr r1, [r0]
movs r0, 0x92
lsls r0, 3
@@ -1791,7 +1791,7 @@ task_intro_10: @ 816DBAC
lsls r2, 2
movs r1, 0
bl gpu_pal_apply
ldr r0, =0x03005e00
ldr r0, =gTasks
lsls r4, r5, 2
adds r4, r5
lsls r4, 3
@@ -1824,7 +1824,7 @@ task_intro_10: @ 816DBAC
bl SetGpuReg
ldr r0, =task_intro_11
str r0, [r4]
ldr r0, =0x030062a0
ldr r0, =gUnknown_030062A0
str r5, [r0]
movs r0, 0xDD
lsls r0, 1
@@ -1842,7 +1842,7 @@ task_intro_11: @ 816DC64
sub sp, 0x4
lsls r0, 24
lsrs r5, r0, 24
ldr r2, =0x03005e00
ldr r2, =gTasks
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
@@ -1886,7 +1886,7 @@ _0816DCA8:
movs r0, 0x78
movs r1, 0x50
bl sub_816F2A8
ldr r0, =0x030062a0
ldr r0, =gUnknown_030062A0
ldr r0, [r0]
cmp r0, 0x1C
bne _0816DCE6
@@ -1911,11 +1911,11 @@ task_intro_12: @ 816DCFC
push {lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r0, =0x030062a0
ldr r0, =gUnknown_030062A0
ldr r0, [r0]
cmp r0, 0x2B
bls _0816DD18
ldr r0, =0x03005e00
ldr r0, =gTasks
lsls r1, r2, 2
adds r1, r2
lsls r1, 3
@@ -1933,7 +1933,7 @@ task_intro_13: @ 816DD28
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =0x02037fd4
ldr r0, =gUnknown_02037FD4
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1942,7 +1942,7 @@ task_intro_13: @ 816DD28
bl intro_reset_and_hide_bgs
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
ldr r1, =0x0300301c
ldr r1, =gUnknown_0300301C
movs r0, 0x8
strb r0, [r1]
ldr r0, =gUnknown_08D88494
@@ -1963,11 +1963,11 @@ task_intro_13: @ 816DD28
ldr r0, =gUnknown_0852561C
bl LoadCompressedObjectPaletteUsingHeap
ldr r0, =gUnknown_08D85CD0
ldr r1, =0x02037714
ldr r1, =gUnknown_02037714
movs r2, 0x80
lsls r2, 1
bl CpuSet
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
@@ -2017,7 +2017,7 @@ task_intro_14: @ 816DDD8
movs r2, 0x10
movs r3, 0
bl pal_fade_maybe
ldr r0, =0x03005e00
ldr r0, =gTasks
lsls r4, r5, 2
adds r4, r5
lsls r4, 3
@@ -2047,7 +2047,7 @@ task_intro_15: @ 816DE7C
push {r4,lr}
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
@@ -2089,7 +2089,7 @@ _0816DEC6:
task_intro_16: @ 816DED0
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
@@ -2106,7 +2106,7 @@ task_intro_17: @ 816DEEC
sub sp, 0xC
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
@@ -2140,7 +2140,7 @@ task_intro_18: @ 816DF2C
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
ldr r1, =0x03005e08
ldr r1, =gTasks + 0x8
adds r4, r0, r1
ldrh r0, [r4, 0xA]
adds r0, 0x1
@@ -2231,7 +2231,7 @@ _0816DFF4:
ldrsh r0, [r4, r1]
ldr r1, =gUnknown_08D85CD0
adds r0, r1
ldr r1, =0x02037b52
ldr r1, =gUnknown_02037B52
movs r2, 0x1
bl CpuSet
ldrh r0, [r4, 0xE]
@@ -2273,7 +2273,7 @@ _0816E046:
ldrsh r0, [r4, r2]
ldr r1, =gUnknown_08D85CD0
adds r0, r1
ldr r1, =0x02037b52
ldr r1, =gUnknown_02037B52
movs r2, 0x1
bl CpuSet
ldrh r0, [r4, 0xE]
@@ -2398,20 +2398,20 @@ _0816E14E:
strh r0, [r4]
b _0816E176
_0816E156:
ldr r0, =0x02037fd4
ldr r0, =gUnknown_02037FD4
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
cmp r0, 0
bne _0816E176
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
adds r0, r1
ldr r1, =task_intro_19
str r1, [r0]
ldr r1, =0x02039b28
ldr r1, =gUnknown_02039B28
movs r0, 0x3
strb r0, [r1, 0x15]
_0816E176:
@@ -2428,7 +2428,7 @@ sub_816E190: @ 816E190
lsls r0, 24
lsrs r7, r0, 24
movs r4, 0
ldr r6, =0x02020630
ldr r6, =gUnknown_02020630
ldr r5, =gUnknown_085E4C64
_0816E19C:
movs r0, 0
@@ -2519,7 +2519,7 @@ _0816E222:
movs r0, 0xFF
ands r2, r0
strh r2, [r3, 0x32]
ldr r2, =0x03005e00
ldr r2, =gTasks
movs r0, 0x36
ldrsh r1, [r3, r0]
lsls r0, r1, 2
@@ -2593,7 +2593,7 @@ task_intro_19: @ 816E2A0
movs r2, 0x10
movs r3, 0
bl pal_fade_maybe
ldr r0, =0x03005e00
ldr r0, =gTasks
lsls r1, r4, 2
adds r1, r4
lsls r1, 3
@@ -2640,7 +2640,7 @@ task_intro_20: @ 816E358
lsls r0, r6, 2
adds r0, r6
lsls r0, 3
ldr r1, =0x03005e08
ldr r1, =gTasks + 0x8
adds r5, r0, r1
ldrh r0, [r5, 0x2]
ldrh r1, [r5, 0x4]
@@ -2696,7 +2696,7 @@ _0816E3E0:
movs r1, 0x80
lsls r1, 1
bl sine
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r4, r6, 2
adds r4, r6
lsls r4, 3
@@ -2739,7 +2739,7 @@ _0816E43C:
beq _0816E44A
b _0816E6BC
_0816E44A:
ldr r0, =0x03005e00
ldr r0, =gTasks
lsls r1, r6, 2
adds r1, r6
lsls r1, 3
@@ -2774,7 +2774,7 @@ _0816E488:
beq _0816E496
b _0816E6BC
_0816E496:
ldr r0, =0x03005e00
ldr r0, =gTasks
lsls r1, r6, 2
adds r1, r6
lsls r1, 3
@@ -2803,7 +2803,7 @@ _0816E4C4:
beq _0816E4D2
b _0816E6BC
_0816E4D2:
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r6, 2
adds r0, r6
lsls r0, 3
@@ -2824,7 +2824,7 @@ _0816E4EC:
beq _0816E4FA
b _0816E6BC
_0816E4FA:
ldr r0, =0x03005e00
ldr r0, =gTasks
lsls r1, r6, 2
adds r1, r6
lsls r1, 3
@@ -2890,7 +2890,7 @@ _0816E56E:
ldrsh r0, [r5, r2]
ldr r1, =gUnknown_08D85CD0
adds r0, r1
ldr r1, =0x02037b72
ldr r1, =gUnknown_02037B72
movs r2, 0x1
bl CpuSet
ldrh r0, [r5, 0xE]
@@ -2934,7 +2934,7 @@ _0816E5BC:
ldrsh r0, [r5, r2]
ldr r1, =gUnknown_08D85CD0
adds r0, r1
ldr r1, =0x02037b72
ldr r1, =gUnknown_02037B72
movs r2, 0x1
bl CpuSet
ldrh r0, [r5, 0xE]
@@ -2975,7 +2975,7 @@ _0816E61A:
ldrsh r0, [r5, r1]
movs r1, 0x3C
bl sine
ldr r2, =0x03005e00
ldr r2, =gTasks
lsls r1, r6, 2
adds r1, r6
lsls r1, 3
@@ -3007,7 +3007,7 @@ _0816E664:
ldrsh r0, [r5, r1]
movs r1, 0x14
bl sine
ldr r2, =0x03005e00
ldr r2, =gTasks
lsls r1, r6, 2
adds r1, r6
lsls r1, 3
@@ -3025,20 +3025,20 @@ _0816E690:
b _0816E6BC
.pool
_0816E69C:
ldr r0, =0x02037fd4
ldr r0, =gUnknown_02037FD4
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
cmp r0, 0
bne _0816E6BC
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r6, 2
adds r0, r6
lsls r0, 3
adds r0, r1
ldr r1, =task_intro_21
str r1, [r0]
ldr r1, =0x02039b28
ldr r1, =gUnknown_02039B28
movs r0, 0x3
strb r0, [r1, 0x15]
_0816E6BC:
@@ -3060,7 +3060,7 @@ sub_816E6D4: @ 816E6D4
mov r8, r0
movs r5, 0
ldr r7, =gUnknown_085E4CA8
ldr r0, =0x02020630
ldr r0, =gUnknown_02020630
mov r9, r0
adds r4, r7, 0
movs r6, 0
@@ -3116,7 +3116,7 @@ sub_816E74C: @ 816E74C
ldr r7, =gUnknown_085E4CA8
adds r4, r7, 0x4
movs r6, 0x24
ldr r0, =0x02020630
ldr r0, =gUnknown_02020630
mov r8, r0
_0816E75E:
movs r3, 0x20
@@ -3219,7 +3219,7 @@ _0816E80A:
ands r0, r1
strb r0, [r2]
_0816E82A:
ldr r2, =0x03005e00
ldr r2, =gTasks
movs r0, 0x38
ldrsh r1, [r4, r0]
lsls r0, r1, 2
@@ -3330,7 +3330,7 @@ task_intro_21: @ 816E888
ldr r0, =gUnknown_08D8B6E8
ldr r1, =0x0600e000
bl LZDecompressVram
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
@@ -3355,7 +3355,7 @@ task_intro_22: @ 816E954
ldr r0, =gUnknown_08D8B440
ldr r1, =0x0600d000
bl LZDecompressVram
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
@@ -3383,7 +3383,7 @@ task_intro_23: @ 816E998
movs r0, 0x54
movs r1, 0
bl SetGpuReg
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
@@ -3409,7 +3409,7 @@ task_intro_24: @ 816E9DC
lsls r1, r0, 2
adds r1, r0
lsls r5, r1, 3
ldr r6, =0x03005e08
ldr r6, =gTasks + 0x8
adds r4, r5, r6
ldrh r1, [r4, 0xC]
lsls r1, 16
@@ -3484,7 +3484,7 @@ _0816EA74:
b _0816EAA6
.pool
_0816EA90:
ldr r0, =0x02037fd4
ldr r0, =gUnknown_02037FD4
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -3526,7 +3526,7 @@ task_intro_25: @ 816EAB8
lsls r1, 6
movs r0, 0
bl SetGpuReg
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
@@ -3556,7 +3556,7 @@ task_intro_26: @ 816EB44
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
ldr r2, =0x03005e08
ldr r2, =gTasks + 0x8
adds r6, r1, r2
movs r3, 0
ldrsh r0, [r6, r3]
@@ -3595,7 +3595,7 @@ _0816EB72:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r5, =0x02020630
ldr r5, =gUnknown_02020630
adds r0, r5
movs r1, 0x1
bl StartObjectImageAnim
@@ -3642,7 +3642,7 @@ _0816EBE0:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r5, =0x02020630
ldr r5, =gUnknown_02020630
adds r0, r5
movs r1, 0x1
bl StartObjectImageAnim
@@ -3727,7 +3727,7 @@ _0816ECAC:
ldrsh r0, [r4, r1]
ldr r1, =gUnknown_08D85CD0
adds r0, r1
ldr r1, =0x02037bce
ldr r1, =gUnknown_02037BCE
movs r2, 0x1
bl CpuSet
ldrh r0, [r4, 0x30]
@@ -3759,7 +3759,7 @@ _0816ECDC:
ldrsh r0, [r4, r1]
ldr r1, =gUnknown_08D85CD0
adds r0, r1
ldr r1, =0x02037bce
ldr r1, =gUnknown_02037BCE
movs r2, 0x1
bl CpuSet
ldrh r0, [r4, 0x30]
@@ -3794,7 +3794,7 @@ task_intro_27: @ 816ED20
lsls r1, 6
movs r0, 0
bl SetGpuReg
ldr r6, =0x03005e00
ldr r6, =gTasks
lsls r4, r5, 2
adds r4, r5
lsls r4, 3
@@ -3842,7 +3842,7 @@ task_intro_28: @ 816EDB4
lsls r1, r0, 2
adds r1, r0
lsls r4, r1, 3
ldr r5, =0x03005e08
ldr r5, =gTasks + 0x8
adds r2, r4, r5
ldrh r0, [r2, 0xE]
movs r3, 0x1
@@ -3919,7 +3919,7 @@ _0816EE3A:
ldrh r0, [r2, 0x8]
subs r0, 0x2
strh r0, [r2, 0x8]
ldr r0, =0x02037fd4
ldr r0, =gUnknown_02037FD4
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -3973,7 +3973,7 @@ sub_816EEA8: @ 816EEA8
lsls r0, r2, 2
adds r0, r2
lsls r0, 3
ldr r1, =0x03005e08
ldr r1, =gTasks + 0x8
adds r5, r0, r1
ldrh r0, [r5, 0x4]
adds r0, 0x1
@@ -4009,7 +4009,7 @@ _0816EEF4:
lsls r0, 1
ldr r1, =gUnknown_08D85E72
adds r0, r1
ldr r1, =0x02037bd0
ldr r1, =gUnknown_02037BD0
movs r2, 0x1
bl CpuSet
ldrh r0, [r5, 0x2]
@@ -4045,7 +4045,7 @@ _0816EF34:
lsls r0, 1
ldr r1, =gUnknown_08D85E72
adds r0, r1
ldr r1, =0x02037bc4
ldr r1, =gUnknown_02037BC4
movs r2, 0x1
bl CpuSet
ldrh r0, [r5, 0x2]
@@ -4082,7 +4082,7 @@ _0816EF80:
lsls r0, 1
ldr r1, =gUnknown_08D85E52
adds r0, r1
ldr r1, =0x02037bcc
ldr r1, =gUnknown_02037BCC
movs r2, 0x1
bl CpuSet
ldrh r0, [r5, 0x2]
@@ -4105,7 +4105,7 @@ _0816EFB6:
lsrs r4, 24
movs r0, 0x67
bl audio_play
ldr r1, =0x02020630
ldr r1, =gUnknown_02020630
lsls r0, r4, 4
adds r0, r4
lsls r0, 2
@@ -4149,7 +4149,7 @@ _0816F00A:
movs r1, 0x10
bl pal_fade_1
ldr r4, =gUnknown_08D85E7C
ldr r5, =0x02037bd0
ldr r5, =gUnknown_02037BD0
adds r0, r4, 0
adds r1, r5, 0
movs r2, 0x1
@@ -4195,7 +4195,7 @@ _0816F074:
b _0816F0B2
.pool
_0816F0A0:
ldr r0, =0x02037fd4
ldr r0, =gUnknown_02037FD4
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -4260,7 +4260,7 @@ task_intro_3_1: @ 816F128
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
@@ -4346,7 +4346,7 @@ task_intro_3_2: @ 816F1E0
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
asm/item.s
+33 -33
View File
@@ -8,7 +8,7 @@
thumb_func_start decrypt_bag_item_quantity
decrypt_bag_item_quantity: @ 80D6554
adds r1, r0, 0
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r0, [r0]
adds r0, 0xAC
ldr r0, [r0]
@@ -24,7 +24,7 @@ decrypt_bag_item_quantity: @ 80D6554
encrypt_bag_item_quantity: @ 80D656C
lsls r1, 16
lsrs r1, 16
ldr r2, =0x03005d90
ldr r2, =gUnknown_03005D90
ldr r2, [r2]
adds r2, 0xAC
ldr r2, [r2]
@@ -55,7 +55,7 @@ encrypt_decrypt_all_item_quantities: @ 80D658C
sub sp, 0x4
mov r8, r0
movs r1, 0
ldr r0, =0x02039dd8
ldr r0, =gUnknown_02039DD8
mov r9, r0
_080D659E:
movs r6, 0
@@ -66,7 +66,7 @@ _080D659E:
ldrb r0, [r0, 0x4]
cmp r6, r0
bcs _080D65CC
ldr r2, =0x02039dd8
ldr r2, =gUnknown_02039DD8
_080D65B0:
adds r4, r5, r2
lsls r1, r6, 2
@@ -107,8 +107,8 @@ call_encrypt_decrypt_all_item_quantities: @ 80D65E4
@ void init_bag_pockets()
init_bag_pockets: @ 80D65F0
push {r4,lr}
ldr r1, =0x02039dd8
ldr r0, =0x03005d8c
ldr r1, =gUnknown_02039DD8
ldr r0, =gUnknown_03005D8C
ldr r2, [r0]
movs r3, 0xAC
lsls r3, 3
@@ -239,7 +239,7 @@ IsBagPocketNonEmpty: @ 80D66EC
push {lr}
lsls r0, 24
movs r2, 0
ldr r1, =0x02039dd8
ldr r1, =gUnknown_02039DD8
lsrs r0, 21
subs r0, 0x8
adds r0, r1
@@ -308,7 +308,7 @@ _080D6768:
subs r0, 0x1
lsls r0, 24
movs r6, 0
ldr r1, =0x02039dd8
ldr r1, =gUnknown_02039DD8
lsrs r4, r0, 21
b _080D67AE
.pool
@@ -335,7 +335,7 @@ _080D67A6:
adds r0, r6, 0x1
lsls r0, 24
lsrs r6, r0, 24
ldr r1, =0x02039dd8
ldr r1, =gUnknown_02039DD8
_080D67AE:
adds r0, r4, r1
ldrb r0, [r0, 0x4]
@@ -362,7 +362,7 @@ _080D67C8:
lsrs r1, r0, 24
cmp r1, 0x1
bne _080D67E4
ldr r0, =0x020375f0
ldr r0, =gUnknown_020375F0
strh r1, [r0]
movs r0, 0x1
b _080D67F6
@@ -373,7 +373,7 @@ _080D67E4:
lsrs r4, r0, 16
cmp r4, 0xB2
bls _080D67C8
ldr r1, =0x020375f0
ldr r1, =gUnknown_020375F0
movs r0, 0
strh r0, [r1]
movs r0, 0
@@ -431,7 +431,7 @@ _080D684C:
movs r7, 0x63
_080D6860:
movs r6, 0
ldr r1, =0x02039dd8
ldr r1, =gUnknown_02039DD8
lsls r4, r2, 3
adds r0, r4, r1
mov r9, r4
@@ -472,7 +472,7 @@ _080D68AC:
adds r0, r6, 0x1
lsls r0, 24
lsrs r6, r0, 24
ldr r1, =0x02039dd8
ldr r1, =gUnknown_02039DD8
adds r0, r4, r1
ldrb r0, [r0, 0x4]
cmp r6, r0
@@ -481,7 +481,7 @@ _080D68BC:
cmp r5, 0
beq _080D6914
movs r6, 0
ldr r3, =0x02039dd8
ldr r3, =gUnknown_02039DD8
mov r1, r9
adds r0, r1, r3
ldrb r0, [r0, 0x4]
@@ -582,7 +582,7 @@ _080D6978:
lsrs r0, 24
mov r10, r0
lsls r1, r0, 3
ldr r0, =0x02039dd8
ldr r0, =gUnknown_02039DD8
adds r7, r1, r0
ldrb r0, [r7, 0x4]
lsls r0, 2
@@ -769,7 +769,7 @@ _080D6AF4:
lsrs r0, 24
mov r9, r0
lsls r1, r0, 3
ldr r0, =0x02039dd8
ldr r0, =gUnknown_02039DD8
adds r5, r1, r0
movs r6, 0
ldrb r2, [r5, 0x4]
@@ -992,7 +992,7 @@ _080D6CA6:
sub_80D6CAC: @ 80D6CAC
push {lr}
movs r1, 0
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r2, [r0]
movs r3, 0x93
lsls r3, 3
@@ -1027,7 +1027,7 @@ sub_80D6CE4: @ 80D6CE4
push {r4,lr}
movs r2, 0
movs r1, 0
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r3, [r0]
movs r4, 0x93
lsls r4, 3
@@ -1063,7 +1063,7 @@ sub_80D6D1C: @ 80D6D1C
lsrs r5, r1, 16
movs r4, 0
_080D6D28:
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r2, [r0]
lsls r1, r4, 2
adds r0, r2, r1
@@ -1110,7 +1110,7 @@ sub_80D6D70: @ 80D6D70
movs r0, 0xC8
bl AllocZeroed
adds r7, r0, 0
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r1, [r0]
movs r0, 0x93
lsls r0, 3
@@ -1179,7 +1179,7 @@ _080D6E10:
adds r1, r5, 0
bl sub_80D6588
_080D6E20:
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
movs r1, 0x93
lsls r1, 3
@@ -1205,7 +1205,7 @@ sub_80D6E48: @ 80D6E48
lsls r0, 24
lsls r1, 16
lsrs r1, 16
ldr r2, =0x03005d8c
ldr r2, =gUnknown_03005D8C
ldr r2, [r2]
lsrs r0, 22
adds r3, r2, r0
@@ -1240,7 +1240,7 @@ _080D6E88:
adds r6, r1, 0
cmp r4, 0x31
bhi _080D6ECA
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
mov r12, r0
lsls r5, r2, 2
movs r7, 0x93
@@ -1283,7 +1283,7 @@ _080D6ECA:
thumb_func_start sub_80D6EDC
sub_80D6EDC: @ 80D6EDC
push {lr}
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r2, =0x00000496
adds r1, r0, r2
@@ -1314,7 +1314,7 @@ _080D6F0E:
bag_pocket_get_itemid: @ 80D6F14
lsls r0, 24
lsls r1, 16
ldr r2, =0x02039dd8
ldr r2, =gUnknown_02039DD8
lsrs r0, 21
subs r0, 0x8
adds r0, r2
@@ -1332,7 +1332,7 @@ bag_pocket_get_item_quantity: @ 80D6F30
push {lr}
lsls r0, 24
lsls r1, 16
ldr r2, =0x02039dd8
ldr r2, =gUnknown_02039DD8
lsrs r0, 21
subs r0, 0x8
adds r0, r2
@@ -1535,7 +1535,7 @@ _080D708C:
sub_80D7094: @ 80D7094
push {r4,r5,lr}
movs r4, 0
ldr r5, =0x02039dd8
ldr r5, =gUnknown_02039DD8
_080D709A:
lsls r1, r4, 3
adds r1, r5
@@ -1564,7 +1564,7 @@ CountTotalItemQuantityInBag: @ 80D70BC
bl itemid_get_pocket_number
lsls r0, 24
lsrs r0, 21
ldr r1, =0x02039dd0
ldr r1, =gUnknown_02039DD0
adds r5, r0, r1
movs r4, 0
ldrb r0, [r5, 0x4]
@@ -1604,7 +1604,7 @@ sub_80D710C: @ 80D710C
lsrs r5, r0, 16
lsls r1, 16
lsrs r4, r1, 16
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r3, [r0]
ldr r1, =0x00000ca9
adds r0, r3, r1
@@ -1664,7 +1664,7 @@ sub_80D7184: @ 80D7184
lsrs r5, r0, 16
lsls r1, 16
lsrs r4, r1, 16
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r3, [r0]
ldr r1, =0x00000ca9
adds r0, r3, r1
@@ -1731,7 +1731,7 @@ sub_80D7204: @ 80D7204
lsrs r7, r0, 16
lsls r1, 16
lsrs r4, r1, 16
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r3, [r0]
ldr r1, =0x00000ca9
adds r0, r3, r1
@@ -1879,7 +1879,7 @@ sub_80D7334: @ 80D7334
mov r9, r0
lsls r1, 16
lsrs r4, r1, 16
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r3, [r0]
ldr r1, =0x00000ca9
adds r0, r3, r1
@@ -1900,7 +1900,7 @@ sub_80D7334: @ 80D7334
ldr r1, =0x00000e54
adds r0, r1
adds r7, r3, r0
ldr r1, =0x0203cf30
ldr r1, =gUnknown_0203CF30
ldrh r0, [r1, 0x8]
ldrh r1, [r1, 0x6]
adds r0, r1
asm/item_use.s
+114 -114
View File
@@ -11,11 +11,11 @@ SetUpItemUseCallback: @ 80FD060
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r1, =0x0203ce7c
ldr r1, =gUnknown_0203CE7C
ldrh r0, [r1]
cmp r0, 0xAF
bne _080FD084
ldr r0, =0x03005e00
ldr r0, =gTasks
lsls r1, r5, 2
adds r1, r5
lsls r1, 3
@@ -34,7 +34,7 @@ _080FD08A:
lsls r0, 24
cmp r0, 0
bne _080FD0B8
ldr r0, =0x0203ce54
ldr r0, =gUnknown_0203CE54
ldr r2, [r0]
ldr r1, =gUnknown_085920D8
lsls r0, r4, 2
@@ -46,7 +46,7 @@ _080FD08A:
b _080FD0CC
.pool
_080FD0B8:
ldr r0, =0x0203cf2c
ldr r0, =gUnknown_0203CF2C
ldr r2, [r0]
ldr r1, =gUnknown_085920D8
lsls r0, r4, 2
@@ -68,7 +68,7 @@ SetUpItemUseOnFieldCallback: @ 80FD0DC
push {lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r2, 2
adds r0, r2
lsls r0, 3
@@ -77,7 +77,7 @@ SetUpItemUseOnFieldCallback: @ 80FD0DC
ldrsh r0, [r0, r1]
cmp r0, 0x1
beq _080FD110
ldr r1, =0x03005dac
ldr r1, =gUnknown_03005DAC
ldr r0, =MapPostLoadHook_UseItem
str r0, [r1]
adds r0, r2, 0
@@ -85,7 +85,7 @@ SetUpItemUseOnFieldCallback: @ 80FD0DC
b _080FD11A
.pool
_080FD110:
ldr r0, =0x0203a0f4
ldr r0, =gUnknown_0203A0F4
ldr r1, [r0]
adds r0, r2, 0
bl _call_via_r1
@@ -119,7 +119,7 @@ Task_CallItemUseOnFieldCallback: @ 80FD13C
lsrs r0, 24
cmp r0, 0x1
bne _080FD158
ldr r0, =0x0203a0f4
ldr r0, =gUnknown_0203A0F4
ldr r1, [r0]
adds r0, r4, 0
bl _call_via_r1
@@ -140,7 +140,7 @@ DisplayCannotUseItemMessage: @ 80FD164
lsrs r5, r0, 24
lsls r4, 24
lsrs r4, 24
ldr r6, =0x02021fc4
ldr r6, =gUnknown_02021FC4
adds r0, r6, 0
bl ExpandStringRefs
cmp r4, 0
@@ -260,7 +260,7 @@ sub_80FD254: @ 80FD254
push {lr}
sub sp, 0x24
mov r1, sp
ldr r0, =0x0203ce7c
ldr r0, =gUnknown_0203CE7C
ldrh r0, [r0]
strh r0, [r1, 0x20]
ldr r1, =bag_menu_mail_related
@@ -279,7 +279,7 @@ ItemUseOutOfBattle_Mail: @ 80FD278
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r1, =0x0203ce54
ldr r1, =gUnknown_0203CE54
ldr r2, [r1]
ldr r1, =sub_80FD254
str r1, [r2]
@@ -299,7 +299,7 @@ ItemUseOutOfBattle_Bike: @ 80FD298
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
ldr r1, =0x03005e08
ldr r1, =gTasks + 0x8
adds r6, r0, r1
mov r4, sp
adds r4, 0x2
@@ -358,7 +358,7 @@ _080FD320:
lsls r0, 24
cmp r0, 0
bne _080FD348
ldr r1, =0x0203a0f4
ldr r1, =gUnknown_0203A0F4
ldr r0, =ItemUseOnFieldCB_Bike
str r0, [r1]
adds r0, r5, 0
@@ -381,7 +381,7 @@ ItemUseOnFieldCB_Bike: @ 80FD358
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =0x0203ce7c
ldr r0, =gUnknown_0203CE7C
ldrh r0, [r0]
bl itemid_get_x28
lsls r0, 24
@@ -486,7 +486,7 @@ ItemUseOutOfBattle_Rod: @ 80FD428
bl CanFish
cmp r0, 0x1
bne _080FD44C
ldr r1, =0x0203a0f4
ldr r1, =gUnknown_0203A0F4
ldr r0, =ItemUseOnFieldCB_Rod
str r0, [r1]
adds r0, r4, 0
@@ -494,7 +494,7 @@ ItemUseOutOfBattle_Rod: @ 80FD428
b _080FD45E
.pool
_080FD44C:
ldr r0, =0x03005e00
ldr r0, =gTasks
lsls r1, r4, 2
adds r1, r4
lsls r1, 3
@@ -515,7 +515,7 @@ ItemUseOnFieldCB_Rod: @ 80FD468
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, =0x0203ce7c
ldr r0, =gUnknown_0203CE7C
ldrh r0, [r0]
bl itemid_get_x28
lsls r0, 24
@@ -537,7 +537,7 @@ ItemUseOutOfBattle_Itemfinder: @ 80FD490
lsrs r4, 24
movs r0, 0x27
bl sav12_xor_increment
ldr r1, =0x0203a0f4
ldr r1, =gUnknown_0203A0F4
ldr r0, =ItemUseOnFieldCB_Itemfinder
str r0, [r1]
adds r0, r4, 0
@@ -553,7 +553,7 @@ ItemUseOnFieldCB_Itemfinder: @ 80FD4B8
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =0x02037318
ldr r0, =gUnknown_02037318
ldr r0, [r0, 0x4]
adds r1, r4, 0
bl ItemfinderCheckForHiddenItems
@@ -561,7 +561,7 @@ ItemUseOnFieldCB_Itemfinder: @ 80FD4B8
lsrs r0, 24
cmp r0, 0x1
bne _080FD4EC
ldr r0, =0x03005e00
ldr r0, =gTasks
lsls r1, r4, 2
adds r1, r4
lsls r1, 3
@@ -592,7 +592,7 @@ sub_80FD504: @ 80FD504
lsls r6, r5, 2
adds r0, r6, r5
lsls r7, r0, 3
ldr r0, =0x03005e08
ldr r0, =gTasks + 0x8
mov r8, r0
adds r4, r7, r0
movs r1, 0x6
@@ -646,7 +646,7 @@ _080FD584:
lsrs r1, r0, 24
cmp r1, 0x3
bls _080FD574
ldr r1, =0x03005e00
ldr r1, =gTasks
adds r0, r3, r5
lsls r0, 3
adds r0, r1
@@ -711,7 +711,7 @@ ItemfinderCheckForHiddenItems: @ 80FD5F0
mov r0, sp
adds r1, r4, 0
bl PlayerGetDestCoords
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r6, 2
adds r0, r6
lsls r0, 3
@@ -790,7 +790,7 @@ _080FD694:
_080FD6A4:
adds r0, r6, 0
bl sub_80FD7C8
ldr r0, =0x03005e00
ldr r0, =gTasks
lsls r1, r6, 2
adds r1, r6
lsls r1, 3
@@ -906,7 +906,7 @@ _080FD76C:
subs r0, r5, r0
lsls r0, 16
lsrs r1, r0, 16
ldr r0, =0x02037318
ldr r0, =gUnknown_02037318
ldr r0, [r0]
ldr r0, [r0, 0x4]
b _080FD79E
@@ -918,7 +918,7 @@ _080FD784:
adds r0, r5
b _080FD798
_080FD78E:
ldr r0, =0x02037318
ldr r0, =gUnknown_02037318
ldr r0, [r0]
ldr r0, [r0]
adds r0, 0x7
@@ -964,7 +964,7 @@ sub_80FD7C8: @ 80FD7C8
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x4]
ldr r0, =0x02037318
ldr r0, =gUnknown_02037318
ldr r1, [r0]
ldr r0, [r1]
adds r0, 0x7
@@ -1114,7 +1114,7 @@ sub_80FD8E0: @ 80FD8E0
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
ldr r0, =0x03005e08
ldr r0, =gTasks + 0x8
adds r3, r1, r0
movs r1, 0x4
ldrsh r0, [r3, r1]
@@ -1306,7 +1306,7 @@ sub_80FDA24: @ 80FDA24
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r4, =0x02037350
ldr r4, =gUnknown_02037350
adds r0, r4
bl FieldObjectClearAnimIfSpecialAnimFinished
movs r0, 0xFF
@@ -1356,7 +1356,7 @@ sub_80FDA94: @ 80FDA94
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =0x02037350
ldr r1, =gUnknown_02037350
adds r0, r1
bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
lsls r0, 24
@@ -1383,7 +1383,7 @@ sub_80FDADC: @ 80FDADC
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
ldr r1, =0x03005e08
ldr r1, =gTasks + 0x8
adds r4, r0, r1
movs r0, 0xFF
movs r1, 0
@@ -1395,7 +1395,7 @@ sub_80FDADC: @ 80FDADC
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =0x02037350
ldr r1, =gUnknown_02037350
adds r0, r1
bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
lsls r0, 24
@@ -1448,7 +1448,7 @@ ItemUseOutOfBattle_PokeblockCase: @ 80FDB6C
lsrs r0, 24
cmp r0, 0x1
bne _080FDB98
ldr r0, =0x03005e00
ldr r0, =gTasks
lsls r1, r4, 2
adds r1, r4
lsls r1, 3
@@ -1459,7 +1459,7 @@ ItemUseOutOfBattle_PokeblockCase: @ 80FDB6C
b _080FDBDA
.pool
_080FDB98:
ldr r0, =0x03005e00
ldr r0, =gTasks
lsls r1, r4, 2
adds r1, r4
lsls r1, 3
@@ -1468,7 +1468,7 @@ _080FDB98:
ldrsh r0, [r5, r1]
cmp r0, 0x1
beq _080FDBC8
ldr r0, =0x0203ce54
ldr r0, =gUnknown_0203CE54
ldr r1, [r0]
ldr r0, =sub_80FDBEC
str r0, [r1]
@@ -1477,7 +1477,7 @@ _080FDB98:
b _080FDBDA
.pool
_080FDBC8:
ldr r0, =0x03005dac
ldr r0, =gUnknown_03005DAC
ldr r1, =sub_80AF6D4
str r1, [r0]
movs r0, 0x1
@@ -1508,7 +1508,7 @@ sub_80FDC00: @ 80FDC00
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =0x02037fd4
ldr r0, =gUnknown_02037FD4
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1532,7 +1532,7 @@ ItemUseOutOfBattle_CoinCase: @ 80FDC34
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r4, =0x02021cc4
ldr r4, =gUnknown_02021CC4
bl GetCoins
adds r1, r0, 0
lsls r1, 16
@@ -1541,11 +1541,11 @@ ItemUseOutOfBattle_CoinCase: @ 80FDC34
movs r2, 0
movs r3, 0x4
bl ConvertIntToDecimalString
ldr r4, =0x02021fc4
ldr r4, =gUnknown_02021FC4
ldr r1, =gUnknown_085E9026
adds r0, r4, 0
bl ExpandStringRefs
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
@@ -1578,18 +1578,18 @@ ItemUseOutOfBattle_PowderJar: @ 80FDCA4
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r4, =0x02021cc4
ldr r4, =gUnknown_02021CC4
bl sub_80247BC
adds r1, r0, 0
adds r0, r4, 0
movs r2, 0
movs r3, 0x5
bl ConvertIntToDecimalString
ldr r4, =0x02021fc4
ldr r4, =gUnknown_02021FC4
ldr r1, =gUnknown_085E9138
adds r0, r4, 0
bl ExpandStringRefs
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
@@ -1627,13 +1627,13 @@ sub_80FDD10: @ 80FDD10
lsrs r0, 24
cmp r0, 0x1
bne _080FDD58
ldr r1, =0x0203a0f4
ldr r1, =gUnknown_0203A0F4
ldr r0, =sub_80FDD74
str r0, [r1]
ldr r1, =0x03005dac
ldr r1, =gUnknown_03005DAC
ldr r0, =MapPostLoadHook_UseItem
str r0, [r1]
ldr r0, =0x0203ce54
ldr r0, =gUnknown_0203CE54
ldr r1, [r0]
ldr r0, =c2_exit_to_overworld_2_switch
str r0, [r1]
@@ -1642,7 +1642,7 @@ sub_80FDD10: @ 80FDD10
b _080FDD68
.pool
_080FDD58:
ldr r0, =0x0203ce7c
ldr r0, =gUnknown_0203CE7C
ldrh r0, [r0]
bl itemid_get_overworld_function
adds r1, r0, 0
@@ -1661,7 +1661,7 @@ sub_80FDD74: @ 80FDD74
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, =0x0203ce7c
ldr r0, =gUnknown_0203CE7C
ldrh r0, [r0]
movs r1, 0x1
bl remove_item
@@ -1687,7 +1687,7 @@ ItemUseOutOfBattle_WailmerPail: @ 80FDDA4
lsrs r0, 24
cmp r0, 0x1
bne _080FDDC8
ldr r1, =0x0203a0f4
ldr r1, =gUnknown_0203A0F4
ldr r0, =sub_80FDE7C
b _080FDDD8
.pool
@@ -1697,7 +1697,7 @@ _080FDDC8:
lsrs r0, 24
cmp r0, 0x1
bne _080FDDEC
ldr r1, =0x0203a0f4
ldr r1, =gUnknown_0203A0F4
ldr r0, =sub_80FDE08
_080FDDD8:
str r0, [r1]
@@ -1706,7 +1706,7 @@ _080FDDD8:
b _080FDDFE
.pool
_080FDDEC:
ldr r0, =0x03005e00
ldr r0, =gTasks
lsls r1, r5, 2
adds r1, r5
lsls r1, 3
@@ -1759,7 +1759,7 @@ sub_80FDE2C: @ 80FDE2C
lsrs r2, r0, 24
cmp r2, 0x10
beq _080FDE68
ldr r0, =0x02037350
ldr r0, =gUnknown_02037350
lsls r1, r2, 3
adds r1, r2
lsls r1, 2
@@ -1802,7 +1802,7 @@ ItemUseOutOfBattle_Medicine: @ 80FDEA0
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03006328
ldr r2, =gUnknown_03006328
ldr r1, =ItemUseCB_Medicine
str r1, [r2]
bl SetUpItemUseCallback
@@ -1816,7 +1816,7 @@ ItemUseOutOfBattle_ReduceEV: @ 80FDEBC
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03006328
ldr r2, =gUnknown_03006328
ldr r1, =sub_81B67C8
str r1, [r2]
bl SetUpItemUseCallback
@@ -1830,7 +1830,7 @@ ItemUseOutOfBattle_SacredAsh: @ 80FDED8
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03006328
ldr r2, =gUnknown_03006328
ldr r1, =sub_81B79E8
str r1, [r2]
bl SetUpItemUseCallback
@@ -1844,7 +1844,7 @@ ItemUseOutOfBattle_PPRecovery: @ 80FDEF4
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03006328
ldr r2, =gUnknown_03006328
ldr r1, =dp05_ether
str r1, [r2]
bl SetUpItemUseCallback
@@ -1858,7 +1858,7 @@ ItemUseOutOfBattle_PPUp: @ 80FDF10
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03006328
ldr r2, =gUnknown_03006328
ldr r1, =dp05_pp_up
str r1, [r2]
bl SetUpItemUseCallback
@@ -1872,7 +1872,7 @@ ItemUseOutOfBattle_RareCandy: @ 80FDF2C
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03006328
ldr r2, =gUnknown_03006328
ldr r1, =dp05_rare_candy
str r1, [r2]
bl SetUpItemUseCallback
@@ -1886,7 +1886,7 @@ ItemUseOutOfBattle_TMHM: @ 80FDF48
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =0x0203ce7c
ldr r0, =gUnknown_0203CE7C
ldrh r1, [r0]
movs r0, 0xA9
lsls r0, 1
@@ -1920,7 +1920,7 @@ sub_80FDF90: @ 80FDF90
lsrs r4, 24
movs r0, 0x2
bl audio_play
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
@@ -1938,14 +1938,14 @@ task08_0809AD8C: @ 80FDFBC
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
ldrh r1, [r0, 0x2E]
movs r0, 0x3
ands r0, r1
cmp r0, 0
beq _080FE000
ldr r4, =0x02021cc4
ldr r0, =0x0203ce7c
ldr r4, =gUnknown_02021CC4
ldr r0, =gUnknown_0203CE7C
ldrh r0, [r0]
bl ItemIdToBattleMoveId
lsls r0, 16
@@ -1956,7 +1956,7 @@ task08_0809AD8C: @ 80FDFBC
adds r1, r0
adds r0, r4, 0
bl CopyString
ldr r4, =0x02021fc4
ldr r4, =gUnknown_02021FC4
ldr r1, =gUnknown_085E9058
adds r0, r4, 0
bl ExpandStringRefs
@@ -1990,7 +1990,7 @@ sub_80FE03C: @ 80FE03C
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03006328
ldr r2, =gUnknown_03006328
ldr r1, =sub_81B6DC4
str r1, [r2]
bl SetUpItemUseCallback
@@ -2002,14 +2002,14 @@ sub_80FE03C: @ 80FE03C
thumb_func_start sub_80FE058
sub_80FE058: @ 80FE058
push {r4,lr}
ldr r4, =0x0203ce7c
ldr r4, =gUnknown_0203CE7C
ldrh r0, [r4]
movs r1, 0x1
bl remove_item
ldrh r0, [r4]
ldr r1, =0x02021dc4
ldr r1, =gUnknown_02021DC4
bl itemid_get_name
ldr r0, =0x02021fc4
ldr r0, =gUnknown_02021FC4
ldr r1, =gUnknown_085E9080
bl ExpandStringRefs
bl InBattlePyramid
@@ -2048,7 +2048,7 @@ ItemUseOutOfBattle_Repel: @ 80FE0BC
lsls r0, 16
cmp r0, 0
bne _080FE0EC
ldr r0, =0x03005e00
ldr r0, =gTasks
lsls r1, r4, 2
adds r1, r4
lsls r1, 3
@@ -2089,7 +2089,7 @@ sub_80FE124: @ 80FE124
lsls r1, r0, 2
adds r1, r0
lsls r4, r1, 3
ldr r5, =0x03005e08
ldr r5, =gTasks + 0x8
adds r1, r4, r5
ldrh r0, [r1, 0x10]
adds r0, 0x1
@@ -2125,7 +2125,7 @@ sub_80FE164: @ 80FE164
cmp r0, 0
bne _080FE1C2
ldr r4, =0x00004021
ldr r0, =0x0203ce7c
ldr r0, =gUnknown_0203CE7C
ldrh r0, [r0]
bl itemid_get_quality
adds r1, r0, 0
@@ -2138,7 +2138,7 @@ sub_80FE164: @ 80FE164
lsls r0, 24
cmp r0, 0
bne _080FE1B8
ldr r2, =0x02021fc4
ldr r2, =gUnknown_02021FC4
ldr r3, =bag_menu_inits_lists_menu
adds r0, r5, 0
movs r1, 0x1
@@ -2146,7 +2146,7 @@ sub_80FE164: @ 80FE164
b _080FE1C2
.pool
_080FE1B8:
ldr r1, =0x02021fc4
ldr r1, =gUnknown_02021FC4
ldr r2, =sub_81C6714
adds r0, r6, 0
bl DisplayItemMessageInBattlePyramid
@@ -2163,7 +2163,7 @@ sub_80FE1D0: @ 80FE1D0
lsls r0, 24
lsrs r4, r0, 24
adds r5, r4, 0
ldr r0, =0x03005e00
ldr r0, =gTasks
lsls r1, r4, 2
adds r1, r4
lsls r1, 3
@@ -2181,7 +2181,7 @@ sub_80FE1D0: @ 80FE1D0
lsls r0, 24
cmp r0, 0
bne _080FE21C
ldr r2, =0x02021fc4
ldr r2, =gUnknown_02021FC4
ldr r3, =bag_menu_inits_lists_menu
adds r0, r4, 0
movs r1, 0x1
@@ -2189,7 +2189,7 @@ sub_80FE1D0: @ 80FE1D0
b _080FE226
.pool
_080FE21C:
ldr r1, =0x02021fc4
ldr r1, =gUnknown_02021FC4
ldr r2, =sub_81C6714
adds r0, r5, 0
bl DisplayItemMessageInBattlePyramid
@@ -2205,9 +2205,9 @@ ItemUseOutOfBattle_BlackWhiteFlute: @ 80FE234
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r4, =0x0203ce7c
ldr r4, =gUnknown_0203CE7C
ldrh r0, [r4]
ldr r1, =0x02021dc4
ldr r1, =gUnknown_02021DC4
bl itemid_get_name
ldrh r0, [r4]
cmp r0, 0x2B
@@ -2216,7 +2216,7 @@ ItemUseOutOfBattle_BlackWhiteFlute: @ 80FE234
bl FlagSet
ldr r0, =0x000008ae
bl FlagReset
ldr r0, =0x02021fc4
ldr r0, =gUnknown_02021FC4
ldr r1, =gUnknown_085E90C6
bl ExpandStringRefs
b _080FE28C
@@ -2226,11 +2226,11 @@ _080FE278:
bl FlagSet
ldr r0, =0x000008ad
bl FlagReset
ldr r0, =0x02021fc4
ldr r0, =gUnknown_02021FC4
ldr r1, =gUnknown_085E90F4
bl ExpandStringRefs
_080FE28C:
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
@@ -2268,14 +2268,14 @@ re_escape_rope: @ 80FE2D8
lsrs r4, 24
bl flagmods_08054D70
bl sub_80FE058
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
adds r0, r1
movs r1, 0
strh r1, [r0, 0x8]
ldr r1, =0x02021fc4
ldr r1, =gUnknown_02021FC4
ldr r2, =task08_080A1C44
adds r0, r4, 0
bl DisplayItemMessageOnField
@@ -2288,7 +2288,7 @@ re_escape_rope: @ 80FE2D8
thumb_func_start sub_80FE314
sub_80FE314: @ 80FE314
push {lr}
ldr r0, =0x02037318
ldr r0, =gUnknown_02037318
ldrb r1, [r0, 0x1A]
movs r0, 0x2
ands r0, r1
@@ -2314,7 +2314,7 @@ ItemUseOutOfBattle_EscapeRope: @ 80FE334
lsrs r0, 24
cmp r0, 0x1
bne _080FE35C
ldr r1, =0x0203a0f4
ldr r1, =gUnknown_0203A0F4
ldr r0, =re_escape_rope
str r0, [r1]
adds r0, r4, 0
@@ -2322,7 +2322,7 @@ ItemUseOutOfBattle_EscapeRope: @ 80FE334
b _080FE36E
.pool
_080FE35C:
ldr r0, =0x03005e00
ldr r0, =gTasks
lsls r1, r4, 2
adds r1, r4
lsls r1, 3
@@ -2342,7 +2342,7 @@ ItemUseOutOfBattle_EvolutionStone: @ 80FE378
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03006328
ldr r2, =gUnknown_03006328
ldr r1, =sub_81B7C74
str r1, [r2]
bl SetUpItemUseCallback
@@ -2361,7 +2361,7 @@ ItemUseInBattle_PokeBall: @ 80FE394
lsls r0, 24
cmp r0, 0
bne _080FE3D0
ldr r0, =0x0203ce7c
ldr r0, =gUnknown_0203CE7C
ldrh r0, [r0]
movs r1, 0x1
bl remove_item
@@ -2407,7 +2407,7 @@ sub_80FE408: @ 80FE408
lsls r0, 24
lsrs r4, r0, 24
adds r5, r4, 0
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
ldrh r1, [r0, 0x2E]
movs r0, 0x3
ands r0, r1
@@ -2436,7 +2436,7 @@ sub_80FE440: @ 80FE440
lsls r0, 24
lsrs r5, r0, 24
adds r6, r5, 0
ldr r0, =0x03005e00
ldr r0, =gTasks
lsls r1, r5, 2
adds r1, r5
lsls r1, 3
@@ -2450,7 +2450,7 @@ sub_80FE440: @ 80FE440
ble _080FE4AC
movs r0, 0x1
bl audio_play
ldr r4, =0x0203ce7c
ldr r4, =gUnknown_0203CE7C
ldrh r0, [r4]
movs r1, 0x1
bl remove_item
@@ -2486,17 +2486,17 @@ ItemUseInBattle_StatIncrease: @ 80FE4B8
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r1, =0x0202406e
ldr r0, =0x020244b8
ldr r1, =gUnknown_0202406E
ldr r0, =gUnknown_020244B8
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
ldrh r2, [r0]
movs r0, 0x64
muls r0, r2
ldr r1, =0x020244ec
ldr r1, =gUnknown_020244EC
adds r0, r1
ldr r1, =0x0203ce7c
ldr r1, =gUnknown_0203CE7C
ldrh r1, [r1]
lsls r2, 24
lsrs r2, 24
@@ -2525,7 +2525,7 @@ _080FE518:
b _080FE53C
.pool
_080FE52C:
ldr r0, =0x03005e00
ldr r0, =gTasks
lsls r1, r4, 2
adds r1, r4
lsls r1, 3
@@ -2549,7 +2549,7 @@ sub_80FE54C: @ 80FE54C
lsls r0, 24
cmp r0, 0
bne _080FE574
ldr r0, =0x0203ce54
ldr r0, =gUnknown_0203CE54
ldr r1, [r0]
ldr r0, =sub_81B89F0
str r0, [r1]
@@ -2558,7 +2558,7 @@ sub_80FE54C: @ 80FE54C
b _080FE582
.pool
_080FE574:
ldr r0, =0x0203cf2c
ldr r0, =gUnknown_0203CF2C
ldr r1, [r0]
ldr r0, =sub_81B89F0
str r0, [r1]
@@ -2576,7 +2576,7 @@ ItemUseInBattle_Medicine: @ 80FE590
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03006328
ldr r2, =gUnknown_03006328
ldr r1, =ItemUseCB_Medicine
str r1, [r2]
bl sub_80FE54C
@@ -2590,7 +2590,7 @@ sub_80FE5AC: @ 80FE5AC
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03006328
ldr r2, =gUnknown_03006328
ldr r1, =sub_81B79E8
str r1, [r2]
bl sub_80FE54C
@@ -2604,7 +2604,7 @@ ItemUseInBattle_PPRecovery: @ 80FE5C8
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03006328
ldr r2, =gUnknown_03006328
ldr r1, =dp05_ether
str r1, [r2]
bl sub_80FE54C
@@ -2618,7 +2618,7 @@ ItemUseInBattle_Escape: @ 80FE5E4
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =0x02022fec
ldr r0, =gUnknown_02022FEC
ldr r0, [r0]
movs r1, 0x8
ands r0, r1
@@ -2629,7 +2629,7 @@ ItemUseInBattle_Escape: @ 80FE5E4
lsls r0, 24
cmp r0, 0
bne _080FE620
ldr r2, =0x02021fc4
ldr r2, =gUnknown_02021FC4
ldr r3, =unknown_ItemMenu_Confirm
adds r0, r4, 0
movs r1, 0x1
@@ -2637,14 +2637,14 @@ ItemUseInBattle_Escape: @ 80FE5E4
b _080FE646
.pool
_080FE620:
ldr r1, =0x02021fc4
ldr r1, =gUnknown_02021FC4
ldr r2, =sub_81C5B14
adds r0, r4, 0
bl DisplayItemMessageInBattlePyramid
b _080FE646
.pool
_080FE634:
ldr r0, =0x03005e00
ldr r0, =gTasks
lsls r1, r4, 2
adds r1, r4
lsls r1, 3
@@ -2664,7 +2664,7 @@ ItemUseOutOfBattle_EnigmaBerry: @ 80FE650
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =0x0203ce7c
ldr r0, =gUnknown_0203CE7C
ldrh r0, [r0]
bl GetItemEffectType
lsls r0, 24
@@ -2704,7 +2704,7 @@ _080FE67C:
.4byte _080FE724
.4byte _080FE740
_080FE6D0:
ldr r0, =0x03005e00
ldr r0, =gTasks
lsls r1, r4, 2
adds r1, r4
lsls r1, 3
@@ -2716,7 +2716,7 @@ _080FE6D0:
b _080FE770
.pool
_080FE6EC:
ldr r0, =0x03005e00
ldr r0, =gTasks
lsls r1, r4, 2
adds r1, r4
lsls r1, 3
@@ -2728,7 +2728,7 @@ _080FE6EC:
b _080FE770
.pool
_080FE708:
ldr r0, =0x03005e00
ldr r0, =gTasks
lsls r1, r4, 2
adds r1, r4
lsls r1, 3
@@ -2740,7 +2740,7 @@ _080FE708:
b _080FE770
.pool
_080FE724:
ldr r0, =0x03005e00
ldr r0, =gTasks
lsls r1, r4, 2
adds r1, r4
lsls r1, 3
@@ -2752,7 +2752,7 @@ _080FE724:
b _080FE770
.pool
_080FE740:
ldr r0, =0x03005e00
ldr r0, =gTasks
lsls r1, r4, 2
adds r1, r4
lsls r1, 3
@@ -2764,7 +2764,7 @@ _080FE740:
b _080FE770
.pool
_080FE75C:
ldr r0, =0x03005e00
ldr r0, =gTasks
lsls r1, r4, 2
adds r1, r4
lsls r1, 3
@@ -2785,7 +2785,7 @@ ItemUseInBattle_EnigmaBerry: @ 80FE77C
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =0x0203ce7c
ldr r0, =gUnknown_0203CE7C
ldrh r0, [r0]
bl GetItemEffectType
lsls r0, 24
@@ -2848,7 +2848,7 @@ ItemUseOutOfBattle_CannotUse: @ 80FE820
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
asm/libagbsyscall.s
+1 -1
View File
@@ -90,7 +90,7 @@ SoftReset: @ 82E70AC
ldr r3, =0x04000208
movs r2, 0
strb r2, [r3]
ldr r1, =0x03007f00
ldr r1, =gUnknown_03007F00
mov sp, r1
swi 0x1
swi 0
asm/libmks4agb.s
+43 -43
View File
@@ -74,7 +74,7 @@ _082DF0BE:
ldr r3, _082DF0D0
bx r3
.align 2, 0
_082DF0C8: .4byte 0x03007ff0
_082DF0C8: .4byte gUnknown_03007FF0
_082DF0CC: .4byte 0x68736d53
_082DF0D0: .4byte 0x03001aa9
_082DF0D4: .4byte 0x04000006
@@ -699,7 +699,7 @@ _082DF7CC:
ldrsb r1, [r5, r0]
ldmia sp!, {r0,r2,r5-r7,pc}
.align 2, 0
_082DF7DC: .4byte 0x03001300
_082DF7DC: .4byte gUnknown_03001300
_082DF7E0: .4byte gUnknown_08675A70
arm_func_end sub_82DF758
@@ -1436,7 +1436,7 @@ _082DFCB4:
bx r3
.align 2, 0
_082DFCB8: .4byte gUnknown_08675C64
_082DFCBC: .4byte 0x03007ff0
_082DFCBC: .4byte gUnknown_03007FF0
_082DFCC0: .4byte 0x68736d53
thumb_func_end MPlayMain_rev01
@@ -1478,7 +1478,7 @@ _082DFCFC:
pop {r0}
bx r0
.align 2, 0
_082DFD04: .4byte 0x03007ff0
_082DFD04: .4byte gUnknown_03007FF0
thumb_func_end TrackStop_rev01
thumb_func_start ChnVolSetAsm
@@ -1789,7 +1789,7 @@ _082DFF22:
pop {r0}
bx r0
.align 2, 0
_082DFF34: .4byte 0x03007ff0
_082DFF34: .4byte gUnknown_03007FF0
_082DFF38: .4byte gUnknown_08675C64
thumb_func_end ply_note_rev01
@@ -2048,16 +2048,16 @@ _082E00CC:
_082E00F0: .4byte SoundMainRAM
_082E00F4: .4byte 0x03001aa8
_082E00F8: .4byte 0x04000200
_082E00FC: .4byte 0x03006380
_082E0100: .4byte 0x030074f0
_082E00FC: .4byte gUnknown_03006380
_082E0100: .4byte gUnknown_030074F0
_082E0104: .4byte 0x0094c500
_082E0108: .4byte 0x00000004
_082E010C: .4byte gUnknown_086B49C0
_082E0110: .4byte 0x030077f0
_082E0114: .4byte 0x030077b0
_082E0110: .4byte gUnknown_030077F0
_082E0114: .4byte gUnknown_030077B0
_082E0118: .4byte gUnknown_08675C98
_082E011C: .4byte 0x030073a0
_082E0120: .4byte 0x03007670
_082E011C: .4byte gUnknown_030073A0
_082E0120: .4byte gUnknown_03007670
thumb_func_end m4aSoundInit
thumb_func_start m4aSoundMain
@@ -2266,7 +2266,7 @@ _082E0286:
.align 2, 0
_082E029C: .4byte 0x00000004
_082E02A0: .4byte gUnknown_086B49C0
_082E02A4: .4byte 0x030073a0
_082E02A4: .4byte gUnknown_030073A0
thumb_func_end m4aMPlayAllStop
thumb_func_start m4aMPlayContinue
@@ -2310,7 +2310,7 @@ _082E02D6:
.align 2, 0
_082E02EC: .4byte 0x00000004
_082E02F0: .4byte gUnknown_086B49C0
_082E02F4: .4byte 0x030073a0
_082E02F4: .4byte gUnknown_030073A0
thumb_func_end m4aMPlayAllContinue
thumb_func_start m4aMPlayFadeOut
@@ -2517,9 +2517,9 @@ _082E0458:
_082E0460: .4byte 0x04000084
_082E0464: .4byte 0x04000080
_082E0468: .4byte 0x04000063
_082E046C: .4byte 0x03007ff0
_082E046C: .4byte gUnknown_03007FF0
_082E0470: .4byte 0x68736d53
_082E0474: .4byte 0x03007460
_082E0474: .4byte gUnknown_03007460
_082E0478: .4byte ply_memacc
_082E047C: .4byte ply_lfos_rev01
_082E0480: .4byte ply_mod_rev01
@@ -2551,7 +2551,7 @@ ClearChain_rev: @ 82E04B4
pop {r0}
bx r0
.align 2, 0
_082E04C4: .4byte 0x030074e8
_082E04C4: .4byte gUnknown_030074E8
thumb_func_end ClearChain_rev
thumb_func_start Clear64byte_rev
@@ -2563,7 +2563,7 @@ Clear64byte_rev: @ 82E04C8
pop {r0}
bx r0
.align 2, 0
_082E04D8: .4byte 0x030074ec
_082E04D8: .4byte gUnknown_030074EC
thumb_func_end Clear64byte_rev
thumb_func_start SoundInit_rev01
@@ -2671,11 +2671,11 @@ _082E05AC: .4byte 0x04000089
_082E05B0: .4byte 0x040000bc
_082E05B4: .4byte 0x040000a0
_082E05B8: .4byte 0x040000a4
_082E05BC: .4byte 0x03007ff0
_082E05BC: .4byte gUnknown_03007FF0
_082E05C0: .4byte 0x050003ec
_082E05C4: .4byte ply_note_rev01
_082E05C8: .4byte DummyFunc_rev
_082E05CC: .4byte 0x03007460
_082E05CC: .4byte gUnknown_03007460
_082E05D0: .4byte 0x68736d53
thumb_func_end SoundInit_rev01
@@ -2742,7 +2742,7 @@ _082E0640:
pop {r0}
bx r0
.align 2, 0
_082E0654: .4byte 0x03007ff0
_082E0654: .4byte gUnknown_03007FF0
_082E0658: .4byte gUnknown_08675B64
_082E065C: .4byte 0x00091d1b
_082E0660: .4byte 0x00001388
@@ -2831,7 +2831,7 @@ _082E06FE:
pop {r0}
bx r0
.align 2, 0
_082E0704: .4byte 0x03007ff0
_082E0704: .4byte gUnknown_03007FF0
_082E0708: .4byte 0x68736d53
_082E070C: .4byte 0x04000089
thumb_func_end SoundMode_rev01
@@ -2880,7 +2880,7 @@ _082E0756:
pop {r0}
bx r0
.align 2, 0
_082E075C: .4byte 0x03007ff0
_082E075C: .4byte gUnknown_03007FF0
_082E0760: .4byte 0x68736d53
thumb_func_end SoundClear_rev01
@@ -2936,7 +2936,7 @@ _082E07BC:
pop {r0}
bx r0
.align 2, 0
_082E07C4: .4byte 0x03007ff0
_082E07C4: .4byte gUnknown_03007FF0
_082E07C8: .4byte 0x978c92ad
_082E07CC: .4byte 0x040000c4
_082E07D0: .4byte 0x84400004
@@ -2972,7 +2972,7 @@ _082E0808:
pop {r0}
bx r0
.align 2, 0
_082E0810: .4byte 0x03007ff0
_082E0810: .4byte gUnknown_03007FF0
_082E0814: .4byte 0x68736d53
_082E0818: .4byte 0x040000c6
thumb_func_end SoundVSyncOn_rev01
@@ -3037,7 +3037,7 @@ _082E0880:
pop {r0}
bx r0
.align 2, 0
_082E0888: .4byte 0x03007ff0
_082E0888: .4byte gUnknown_03007FF0
_082E088C: .4byte 0x68736d53
_082E0890: .4byte MPlayMain_rev01
thumb_func_end MPlayOpen_rev01
@@ -3585,7 +3585,7 @@ CgbModVol: @ 82E0C2C
strb r0, [r2, 0x1B]
b _082E0C7A
.align 2, 0
_082E0C5C: .4byte 0x03007ff0
_082E0C5C: .4byte gUnknown_03007FF0
_082E0C60:
lsrs r0, 25
cmp r0, r4
@@ -3648,7 +3648,7 @@ CgbSound: @ 82E0CA8
strb r0, [r1, 0xA]
b _082E0CD2
.align 2, 0
_082E0CC8: .4byte 0x03007ff0
_082E0CC8: .4byte gUnknown_03007FF0
_082E0CCC:
movs r0, 0xE
ldr r2, [sp, 0x4]
@@ -4740,7 +4740,7 @@ _082E14A0:
bl _call_via_r2
b _082E14BA
.align 2, 0
_082E14B0: .4byte 0x03007464
_082E14B0: .4byte gUnknown_03007464
_082E14B4:
ldr r0, [r6, 0x40]
adds r0, 0x4
@@ -4778,7 +4778,7 @@ ply_xxx: @ 82E14E0
pop {r0}
bx r0
.align 2, 0
_082E14F0: .4byte 0x03007460
_082E14F0: .4byte gUnknown_03007460
thumb_func_end ply_xxx
thumb_func_start ply_xwave
@@ -5107,10 +5107,10 @@ _082E16C6:
pop {r1}
bx r1
.align 2, 0
_082E1730: .4byte 0x030073a0
_082E1734: .4byte 0x03007330
_082E1738: .4byte 0x030077b0
_082E173C: .4byte 0x03007670
_082E1730: .4byte gUnknown_030073A0
_082E1734: .4byte gUnknown_03007330
_082E1738: .4byte gUnknown_030077B0
_082E173C: .4byte gUnknown_03007670
_082E1740: .4byte 0x68736d53
thumb_func_end sub_82E1674
@@ -5124,7 +5124,7 @@ sub_82E1744: @ 82E1744
strb r0, [r2, 0x1D]
bx lr
.align 2, 0
_082E1754: .4byte 0x030077b0
_082E1754: .4byte gUnknown_030077B0
thumb_func_end sub_82E1744
thumb_func_start sub_82E1758
@@ -5139,7 +5139,7 @@ sub_82E1758: @ 82E1758
strb r0, [r2]
bx lr
.align 2, 0
_082E176C: .4byte 0x030077b0
_082E176C: .4byte gUnknown_030077B0
thumb_func_end sub_82E1758
thumb_func_start sub_82E1770
@@ -5171,7 +5171,7 @@ sub_82E1770: @ 82E1770
pop {r0}
bx r0
.align 2, 0
_082E17A4: .4byte 0x030077b0
_082E17A4: .4byte gUnknown_030077B0
thumb_func_end sub_82E1770
thumb_func_start sub_82E17A8
@@ -5180,7 +5180,7 @@ sub_82E17A8: @ 82E17A8
strh r0, [r1, 0x2E]
bx lr
.align 2, 0
_082E17B0: .4byte 0x030077b0
_082E17B0: .4byte gUnknown_030077B0
thumb_func_end sub_82E17A8
thumb_func_start sub_82E17B4
@@ -5190,7 +5190,7 @@ sub_82E17B4: @ 82E17B4
strb r0, [r1]
bx lr
.align 2, 0
_082E17BC: .4byte 0x030077b0
_082E17BC: .4byte gUnknown_030077B0
thumb_func_end sub_82E17B4
thumb_func_start sub_82E17C0
@@ -5199,7 +5199,7 @@ sub_82E17C0: @ 82E17C0
str r0, [r1, 0x20]
bx lr
.align 2, 0
_082E17C8: .4byte 0x030077b0
_082E17C8: .4byte gUnknown_030077B0
thumb_func_end sub_82E17C0
thumb_func_start sub_82E17CC
@@ -5235,7 +5235,7 @@ sub_82E17E4: @ 82E17E4
strb r0, [r2, 0x19]
b _082E180A
.align 2, 0
_082E1800: .4byte 0x030077b0
_082E1800: .4byte gUnknown_030077B0
_082E1804:
ldr r1, _082E180C
movs r0, 0x1
@@ -5243,7 +5243,7 @@ _082E1804:
_082E180A:
bx lr
.align 2, 0
_082E180C: .4byte 0x030077b0
_082E180C: .4byte gUnknown_030077B0
thumb_func_end sub_82E17E4
thumb_func_start sub_82E1810
@@ -5261,7 +5261,7 @@ sub_82E1810: @ 82E1810
ands r0, r1
b _082E1842
.align 2, 0
_082E1828: .4byte 0x03007ff0
_082E1828: .4byte gUnknown_03007FF0
_082E182C: .4byte 0x04000082
_082E1830: .4byte 0x0000210e
_082E1834:
@@ -5286,7 +5286,7 @@ sub_82E1850: @ 82E1850
strb r0, [r1, 0x2]
bx lr
.align 2, 0
_082E1858: .4byte 0x030077b0
_082E1858: .4byte gUnknown_030077B0
thumb_func_end sub_82E1850
.align 2, 0 @ Don't pad with nop.
asm/librfu.s
+246 -246
View File
File diff suppressed because it is too large Load Diff
asm/librtc.s
+26 -26
View File
@@ -10,7 +10,7 @@ RTC_SetReadWrite: @ 82E2150
push {r7,lr}
mov r7, sp
bl RTC_SetReadWriteInternal
ldr r0, =0x03001a7e
ldr r0, =gUnknown_03001A7E
movs r1, 0
strb r1, [r0]
pop {r7}
@@ -25,7 +25,7 @@ RTC_SetReadOnly: @ 82E2168
push {r7,lr}
mov r7, sp
bl RTC_SetReadOnlyInternal
ldr r0, =0x03001a7e
ldr r0, =gUnknown_03001A7E
movs r1, 0x1
strb r1, [r0]
pop {r7}
@@ -155,7 +155,7 @@ RTC_Reset: @ 82E2258
push {r7,lr}
sub sp, 0x10
mov r7, sp
ldr r0, =0x03001a7e
ldr r0, =gUnknown_03001A7E
ldrb r1, [r0]
cmp r1, 0x1
bne _082E2270
@@ -163,7 +163,7 @@ RTC_Reset: @ 82E2258
b _082E22D4
.pool
_082E2270:
ldr r0, =0x03001a7e
ldr r0, =gUnknown_03001A7E
movs r1, 0x1
strb r1, [r0]
ldr r0, =GPIOPortData
@@ -183,7 +183,7 @@ _082E2270:
ldr r0, =GPIOPortData
movs r1, 0x1
strh r1, [r0]
ldr r0, =0x03001a7e
ldr r0, =gUnknown_03001A7E
movs r1, 0
strb r1, [r0]
adds r0, r7, 0x4
@@ -220,7 +220,7 @@ RTC_GetControlReg: @ 82E22DC
sub sp, 0x8
mov r7, sp
str r0, [r7]
ldr r0, =0x03001a7e
ldr r0, =gUnknown_03001A7E
ldrb r1, [r0]
cmp r1, 0x1
bne _082E22F4
@@ -228,7 +228,7 @@ RTC_GetControlReg: @ 82E22DC
b _082E23A0
.pool
_082E22F4:
ldr r0, =0x03001a7e
ldr r0, =gUnknown_03001A7E
movs r1, 0x1
strb r1, [r0]
ldr r0, =GPIOPortData
@@ -301,7 +301,7 @@ _082E22F4:
ldr r0, =GPIOPortData
movs r1, 0x1
strh r1, [r0]
ldr r0, =0x03001a7e
ldr r0, =gUnknown_03001A7E
movs r1, 0
strb r1, [r0]
movs r0, 0x1
@@ -321,7 +321,7 @@ RTC_SetControlReg: @ 82E23A8
sub sp, 0x8
mov r7, sp
str r0, [r7]
ldr r0, =0x03001a7e
ldr r0, =gUnknown_03001A7E
ldrb r1, [r0]
cmp r1, 0x1
bne _082E23C0
@@ -329,7 +329,7 @@ RTC_SetControlReg: @ 82E23A8
b _082E2448
.pool
_082E23C0:
ldr r0, =0x03001a7e
ldr r0, =gUnknown_03001A7E
movs r1, 0x1
strb r1, [r0]
ldr r0, =GPIOPortData
@@ -383,7 +383,7 @@ _082E23C0:
ldr r0, =GPIOPortData
movs r1, 0x1
strh r1, [r0]
ldr r0, =0x03001a7e
ldr r0, =gUnknown_03001A7E
movs r1, 0
strb r1, [r0]
movs r0, 0x1
@@ -403,7 +403,7 @@ RTC_GetDateTime: @ 82E2450
sub sp, 0x8
mov r7, sp
str r0, [r7]
ldr r0, =0x03001a7e
ldr r0, =gUnknown_03001A7E
ldrb r1, [r0]
cmp r1, 0x1
bne _082E2468
@@ -411,7 +411,7 @@ RTC_GetDateTime: @ 82E2450
b _082E24F8
.pool
_082E2468:
ldr r0, =0x03001a7e
ldr r0, =gUnknown_03001A7E
movs r1, 0x1
strb r1, [r0]
ldr r0, =GPIOPortData
@@ -470,7 +470,7 @@ _082E24C6:
ldr r0, =GPIOPortData
movs r1, 0x1
strh r1, [r0]
ldr r0, =0x03001a7e
ldr r0, =gUnknown_03001A7E
movs r1, 0
strb r1, [r0]
movs r0, 0x1
@@ -490,7 +490,7 @@ RTC_SetDateTime: @ 82E2500
sub sp, 0x8
mov r7, sp
str r0, [r7]
ldr r0, =0x03001a7e
ldr r0, =gUnknown_03001A7E
ldrb r1, [r0]
cmp r1, 0x1
bne _082E2518
@@ -498,7 +498,7 @@ RTC_SetDateTime: @ 82E2500
b _082E2594
.pool
_082E2518:
ldr r0, =0x03001a7e
ldr r0, =gUnknown_03001A7E
movs r1, 0x1
strb r1, [r0]
ldr r0, =GPIOPortData
@@ -545,7 +545,7 @@ _082E2574:
ldr r0, =GPIOPortData
movs r1, 0x1
strh r1, [r0]
ldr r0, =0x03001a7e
ldr r0, =gUnknown_03001A7E
movs r1, 0
strb r1, [r0]
movs r0, 0x1
@@ -565,7 +565,7 @@ RTC_GetTime: @ 82E259C
sub sp, 0x8
mov r7, sp
str r0, [r7]
ldr r0, =0x03001a7e
ldr r0, =gUnknown_03001A7E
ldrb r1, [r0]
cmp r1, 0x1
bne _082E25B4
@@ -573,7 +573,7 @@ RTC_GetTime: @ 82E259C
b _082E2648
.pool
_082E25B4:
ldr r0, =0x03001a7e
ldr r0, =gUnknown_03001A7E
movs r1, 0x1
strb r1, [r0]
ldr r0, =GPIOPortData
@@ -633,7 +633,7 @@ _082E2614:
ldr r0, =GPIOPortData
movs r1, 0x1
strh r1, [r0]
ldr r0, =0x03001a7e
ldr r0, =gUnknown_03001A7E
movs r1, 0
strb r1, [r0]
movs r0, 0x1
@@ -653,7 +653,7 @@ RTC_SetTime: @ 82E2650
sub sp, 0x8
mov r7, sp
str r0, [r7]
ldr r0, =0x03001a7e
ldr r0, =gUnknown_03001A7E
ldrb r1, [r0]
cmp r1, 0x1
bne _082E2668
@@ -661,7 +661,7 @@ RTC_SetTime: @ 82E2650
b _082E26E4
.pool
_082E2668:
ldr r0, =0x03001a7e
ldr r0, =gUnknown_03001A7E
movs r1, 0x1
strb r1, [r0]
ldr r0, =GPIOPortData
@@ -709,7 +709,7 @@ _082E26C6:
ldr r0, =GPIOPortData
movs r1, 0x1
strh r1, [r0]
ldr r0, =0x03001a7e
ldr r0, =gUnknown_03001A7E
movs r1, 0
strb r1, [r0]
movs r0, 0x1
@@ -729,7 +729,7 @@ RTC_SetUnknownData: @ 82E26EC
sub sp, 0xC
mov r7, sp
str r0, [r7]
ldr r0, =0x03001a7e
ldr r0, =gUnknown_03001A7E
ldrb r1, [r0]
cmp r1, 0x1
bne _082E2704
@@ -737,7 +737,7 @@ RTC_SetUnknownData: @ 82E26EC
b _082E2818
.pool
_082E2704:
ldr r0, =0x03001a7e
ldr r0, =gUnknown_03001A7E
movs r1, 0x1
strb r1, [r0]
adds r0, r7, 0
@@ -863,7 +863,7 @@ _082E27FA:
ldr r0, =GPIOPortData
movs r1, 0x1
strh r1, [r0]
ldr r0, =0x03001a7e
ldr r0, =gUnknown_03001A7E
movs r1, 0
strb r1, [r0]
movs r0, 0x1
asm/link.s
+2211 -2211
View File
File diff suppressed because it is too large Load Diff
asm/load_save.s
+65 -65
View File
@@ -13,14 +13,14 @@ CheckForFlashMemory: @ 8076B68
lsls r0, 16
cmp r0, 0
bne _08076B84
ldr r1, =0x03005d88
ldr r1, =gUnknown_03005D88
movs r0, 0x1
str r0, [r1]
bl StartFlashMemoryTimer
b _08076B8A
.pool
_08076B84:
ldr r1, =0x03005d88
ldr r1, =gUnknown_03005D88
movs r0, 0
str r0, [r1]
_08076B8A:
@@ -36,7 +36,7 @@ memclr_stdsav2: @ 8076B94
mov r1, sp
movs r0, 0
strh r0, [r1]
ldr r1, =0x02024a54
ldr r1, =gUnknown_02024A54
ldr r2, =0x010007d6
mov r0, sp
bl CpuSet
@@ -53,7 +53,7 @@ clear_sav1: @ 8076BB8
mov r1, sp
movs r0, 0
strh r0, [r1]
ldr r1, =0x02025a00
ldr r1, =gUnknown_02025A00
ldr r2, =0x01001f04
mov r0, sp
bl CpuSet
@@ -70,20 +70,20 @@ InitSaveBlockPointersWithRandomOffset: @ 8076BDC
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
ldr r5, =0x03005d8c
ldr r5, =gUnknown_03005D8C
bl GenerateRandomNumber
adds r4, r0
movs r0, 0x7C
ands r4, r0
ldr r1, =0x03005d90
ldr r0, =0x02024a54
ldr r1, =gUnknown_03005D90
ldr r0, =gUnknown_02024A54
adds r0, r4, r0
str r0, [r1]
ldr r0, =0x02025a00
ldr r0, =gUnknown_02025A00
adds r0, r4, r0
str r0, [r5]
ldr r1, =0x03005d94
ldr r0, =0x02029808
ldr r1, =gUnknown_03005D94
ldr r0, =gUnknown_02029808
adds r4, r0
str r4, [r1]
bl init_bag_pockets
@@ -102,7 +102,7 @@ saveblock_randomize_and_relocate: @ 8076C2C
mov r5, r8
push {r5-r7}
sub sp, 0x8
ldr r5, =0x030022c0
ldr r5, =gUnknown_030022C0
ldr r0, [r5, 0xC]
str r0, [sp]
ldr r1, [r5, 0x10]
@@ -110,23 +110,23 @@ saveblock_randomize_and_relocate: @ 8076C2C
movs r0, 0
str r0, [r5, 0xC]
str r0, [r5, 0x10]
ldr r1, =0x0203cf5c
ldr r1, =gUnknown_0203CF5C
str r0, [r1]
ldr r4, =0x02000000
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r1, [r0]
ldr r6, =0x00000f2c
adds r0, r4, 0
adds r2, r6, 0
bl memcpy
ldr r1, =0x03005d8c
ldr r1, =gUnknown_03005D8C
mov r10, r1
ldr r1, [r1]
ldr r7, =0x00003d88
ldr r0, =0x02000f2c
adds r2, r7, 0
bl memcpy
ldr r0, =0x03005d94
ldr r0, =gUnknown_03005D94
mov r8, r0
ldr r1, [r0]
ldr r0, =0x000083d0
@@ -142,7 +142,7 @@ saveblock_randomize_and_relocate: @ 8076C2C
ldrb r0, [r4, 0xD]
adds r0, r1
bl InitSaveBlockPointersWithRandomOffset
ldr r1, =0x03005d90
ldr r1, =gUnknown_03005D90
ldr r0, [r1]
adds r1, r4, 0
adds r2, r6, 0
@@ -174,7 +174,7 @@ saveblock_randomize_and_relocate: @ 8076C2C
adds r4, r0
adds r0, r4, 0
bl saveblock_apply_crypto
ldr r1, =0x03005d90
ldr r1, =gUnknown_03005D90
ldr r0, [r1]
adds r0, 0xAC
str r4, [r0]
@@ -191,7 +191,7 @@ saveblock_randomize_and_relocate: @ 8076C2C
thumb_func_start sav2_x1_query_bit1
sav2_x1_query_bit1: @ 8076D24
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r0, [r0]
ldrb r1, [r0, 0x9]
movs r0, 0x1
@@ -202,7 +202,7 @@ sav2_x1_query_bit1: @ 8076D24
thumb_func_start sav2_x9_clear_bit1
sav2_x9_clear_bit1: @ 8076D34
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r2, [r0]
ldrb r1, [r2, 0x9]
movs r0, 0xFE
@@ -214,7 +214,7 @@ sav2_x9_clear_bit1: @ 8076D34
thumb_func_start sub_8076D48
sub_8076D48: @ 8076D48
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r2, [r0]
ldrb r1, [r2, 0x9]
movs r0, 0x1
@@ -229,7 +229,7 @@ sub_8076D5C: @ 8076D5C
push {lr}
movs r0, 0
bl sub_8084FAC
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r2, [r0]
ldrb r1, [r2, 0x9]
movs r0, 0x1
@@ -242,7 +242,7 @@ sub_8076D5C: @ 8076D5C
thumb_func_start sav2_gender2_inplace_and_xFE
sav2_gender2_inplace_and_xFE: @ 8076D78
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r2, [r0]
ldrb r1, [r2, 0x9]
movs r0, 0xFE
@@ -256,9 +256,9 @@ sav2_gender2_inplace_and_xFE: @ 8076D78
@ void copy_player_party_to_sav1()
copy_player_party_to_sav1: @ 8076D8C
push {r4,lr}
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r1, =0x020244e9
ldr r1, =gUnknown_020244E9
ldrb r1, [r1]
movs r2, 0x8D
lsls r2, 2
@@ -266,7 +266,7 @@ copy_player_party_to_sav1: @ 8076D8C
strb r1, [r0]
movs r4, 0
_08076DA0:
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
movs r1, 0x64
muls r1, r4
@@ -274,7 +274,7 @@ _08076DA0:
movs r2, 0x8E
lsls r2, 2
adds r0, r2
ldr r2, =0x020244ec
ldr r2, =gUnknown_020244EC
adds r1, r2
movs r2, 0x64
bl memcpy
@@ -290,8 +290,8 @@ _08076DA0:
thumb_func_start copy_player_party_from_sav1
copy_player_party_from_sav1: @ 8076DD4
push {r4,r5,lr}
ldr r1, =0x020244e9
ldr r0, =0x03005d8c
ldr r1, =gUnknown_020244E9
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
movs r2, 0x8D
lsls r2, 2
@@ -299,13 +299,13 @@ copy_player_party_from_sav1: @ 8076DD4
ldrb r0, [r0]
strb r0, [r1]
movs r4, 0
ldr r5, =0x020244ec
ldr r5, =gUnknown_020244EC
_08076DEA:
movs r0, 0x64
adds r2, r4, 0
muls r2, r0
adds r0, r2, r5
ldr r1, =0x03005d8c
ldr r1, =gUnknown_03005D8C
ldr r1, [r1]
adds r1, r2
movs r2, 0x8E
@@ -327,12 +327,12 @@ save_serialize_npcs: @ 8076E1C
push {r4-r7,lr}
mov r7, r8
push {r7}
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
mov r12, r0
movs r5, 0xA3
lsls r5, 4
mov r8, r5
ldr r4, =0x02037350
ldr r4, =gUnknown_02037350
movs r3, 0
movs r2, 0xF
_08076E32:
@@ -365,12 +365,12 @@ save_deserialize_npcs: @ 8076E64
push {r4-r7,lr}
mov r7, r8
push {r7}
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
mov r12, r0
movs r5, 0xA3
lsls r5, 4
mov r8, r5
ldr r4, =0x02037350
ldr r4, =gUnknown_02037350
movs r3, 0
movs r2, 0xF
_08076E7A:
@@ -424,14 +424,14 @@ copy_bags_and_unk_data_from_save_blocks: @ 8076ECC
mov r5, r8
push {r5-r7}
movs r2, 0
ldr r0, =0x02032180
ldr r0, =gUnknown_02032180
mov r12, r0
ldr r1, =0x03005d90
ldr r1, =gUnknown_03005D90
mov r10, r1
ldr r5, =0x03005d8c
ldr r5, =gUnknown_03005D8C
movs r3, 0xAC
lsls r3, 3
ldr r4, =0x02031c58
ldr r4, =gUnknown_02031C58
_08076EE8:
lsls r0, r2, 2
ldr r1, [r5]
@@ -443,8 +443,8 @@ _08076EE8:
cmp r2, 0x1D
ble _08076EE8
movs r2, 0
ldr r0, =0x02031c58
ldr r5, =0x03005d8c
ldr r0, =gUnknown_02031C58
ldr r5, =gUnknown_03005D8C
movs r3, 0xBB
lsls r3, 3
adds r4, r0, 0
@@ -460,8 +460,8 @@ _08076F08:
cmp r2, 0x1D
ble _08076F08
movs r2, 0
ldr r0, =0x02031c58
ldr r5, =0x03005d8c
ldr r0, =gUnknown_02031C58
ldr r5, =gUnknown_03005D8C
movs r3, 0xCA
lsls r3, 3
adds r4, r0, 0
@@ -477,8 +477,8 @@ _08076F28:
cmp r2, 0xF
ble _08076F28
movs r2, 0
ldr r0, =0x02031c58
ldr r5, =0x03005d8c
ldr r0, =gUnknown_02031C58
ldr r5, =gUnknown_03005D8C
movs r6, 0x98
lsls r6, 1
adds r4, r0, r6
@@ -495,8 +495,8 @@ _08076F4A:
cmp r2, 0x3F
ble _08076F4A
movs r2, 0
ldr r0, =0x02031c58
ldr r5, =0x03005d8c
ldr r0, =gUnknown_02031C58
ldr r5, =gUnknown_03005D8C
movs r7, 0x8C
lsls r7, 2
adds r4, r0, r7
@@ -512,8 +512,8 @@ _08076F6C:
adds r2, 0x1
cmp r2, 0x2D
ble _08076F6C
ldr r0, =0x02031c58
ldr r1, =0x03005d8c
ldr r0, =gUnknown_02031C58
ldr r1, =gUnknown_03005D8C
mov r8, r1
movs r5, 0xBA
lsls r5, 2
@@ -563,14 +563,14 @@ copy_bags_and_unk_data_to_save_blocks: @ 8076FE0
mov r5, r8
push {r5-r7}
movs r2, 0
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
mov r8, r0
ldr r1, =0x02032180
ldr r1, =gUnknown_02032180
mov r12, r1
ldr r5, =0x03005d8c
ldr r5, =gUnknown_03005D8C
movs r3, 0xAC
lsls r3, 3
ldr r4, =0x02031c58
ldr r4, =gUnknown_02031C58
_08076FFC:
ldr r0, [r5]
lsls r1, r2, 2
@@ -582,10 +582,10 @@ _08076FFC:
cmp r2, 0x1D
ble _08076FFC
movs r2, 0
ldr r5, =0x03005d8c
ldr r5, =gUnknown_03005D8C
movs r4, 0xBB
lsls r4, 3
ldr r0, =0x02031c58
ldr r0, =gUnknown_02031C58
adds r3, r0, 0
adds r3, 0x78
_0807701C:
@@ -599,10 +599,10 @@ _0807701C:
cmp r2, 0x1D
ble _0807701C
movs r2, 0
ldr r5, =0x03005d8c
ldr r5, =gUnknown_03005D8C
movs r4, 0xCA
lsls r4, 3
ldr r0, =0x02031c58
ldr r0, =gUnknown_02031C58
adds r3, r0, 0
adds r3, 0xF0
_0807703C:
@@ -616,10 +616,10 @@ _0807703C:
cmp r2, 0xF
ble _0807703C
movs r2, 0
ldr r5, =0x03005d8c
ldr r5, =gUnknown_03005D8C
movs r4, 0xD2
lsls r4, 3
ldr r0, =0x02031c58
ldr r0, =gUnknown_02031C58
movs r6, 0x98
lsls r6, 1
adds r3, r0, r6
@@ -634,10 +634,10 @@ _0807705E:
cmp r2, 0x3F
ble _0807705E
movs r2, 0
ldr r5, =0x03005d8c
ldr r5, =gUnknown_03005D8C
movs r4, 0xF2
lsls r4, 3
ldr r0, =0x02031c58
ldr r0, =gUnknown_02031C58
movs r7, 0x8C
lsls r7, 2
adds r3, r0, r7
@@ -651,11 +651,11 @@ _08077080:
adds r2, 0x1
cmp r2, 0x2D
ble _08077080
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
mov r9, r0
ldr r1, =0x00002be0
mov r10, r1
ldr r4, =0x02031c58
ldr r4, =gUnknown_02031C58
movs r3, 0
movs r2, 0xF
_080770A0:
@@ -701,7 +701,7 @@ _080770A0:
thumb_func_start apply_u16_xor_crypto
apply_u16_xor_crypto: @ 8077100
ldr r2, =0x03005d90
ldr r2, =gUnknown_03005D90
ldr r2, [r2]
adds r2, 0xAC
ldr r2, [r2]
@@ -715,7 +715,7 @@ apply_u16_xor_crypto: @ 8077100
thumb_func_start apply_u32_xor_crypto
apply_u32_xor_crypto: @ 8077118
ldr r2, =0x03005d90
ldr r2, =gUnknown_03005D90
ldr r3, [r2]
adds r3, 0xAC
ldr r2, [r0]
@@ -736,7 +736,7 @@ saveblock_apply_crypto: @ 8077130
bl call_encrypt_decrypt_all_item_quantities
adds r0, r4, 0
bl sub_8024690
ldr r5, =0x03005d8c
ldr r5, =gUnknown_03005D8C
ldr r0, [r5]
movs r1, 0x92
lsls r1, 3
asm/lottery_corner.s
+19 -19
View File
@@ -64,7 +64,7 @@ _081775B4:
sub_81775CC: @ 81775CC
push {lr}
bl sub_817783C
ldr r1, =0x020375f0
ldr r1, =gUnknown_020375F0
strh r0, [r1]
pop {r0}
bx r0
@@ -79,7 +79,7 @@ sub_81775E0: @ 81775E0
mov r5, r8
push {r5-r7}
sub sp, 0x8
ldr r1, =0x020375e0
ldr r1, =gUnknown_020375E0
movs r0, 0
strh r0, [r1]
movs r0, 0
@@ -91,7 +91,7 @@ _081775FC:
movs r0, 0x64
adds r1, r7, 0
muls r1, r0
ldr r0, =0x020244ec
ldr r0, =gUnknown_020244EC
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
@@ -107,14 +107,14 @@ _081775FC:
movs r1, 0x1
bl pokemon_getattr
adds r1, r0, 0
ldr r0, =0x020375f0
ldr r0, =gUnknown_020375F0
ldrh r0, [r0]
lsls r1, 16
lsrs r1, 16
bl sub_817778C
lsls r0, 24
lsrs r0, 24
ldr r1, =0x020375e0
ldr r1, =gUnknown_020375E0
ldrh r2, [r1]
cmp r0, r2
bls _0817764E
@@ -133,7 +133,7 @@ _0817764E:
bls _081775FC
_08177658:
movs r7, 0
ldr r1, =0x03005d94
ldr r1, =gUnknown_03005D94
mov r9, r1
_0817765E:
movs r6, 0
@@ -174,14 +174,14 @@ _0817766A:
movs r1, 0x1
bl pokemon_getattr_encrypted
adds r1, r0, 0
ldr r0, =0x020375f0
ldr r0, =gUnknown_020375F0
ldrh r0, [r0]
lsls r1, 16
lsrs r1, 16
bl sub_817778C
lsls r0, 24
lsrs r0, 24
ldr r1, =0x020375e0
ldr r1, =gUnknown_020375E0
ldrh r2, [r1]
cmp r0, r2
bls _081776D2
@@ -202,11 +202,11 @@ _081776D2:
lsrs r7, r0, 16
cmp r7, 0xD
bls _0817765E
ldr r3, =0x020375e0
ldr r3, =gUnknown_020375E0
ldrh r0, [r3]
cmp r0, 0
beq _0817776E
ldr r2, =0x020375e2
ldr r2, =gUnknown_020375E2
ldr r1, =gUnknown_085E7080
subs r0, 0x1
lsls r0, 1
@@ -216,24 +216,24 @@ _081776D2:
ldr r2, [sp]
cmp r2, 0xE
bne _0817773C
ldr r1, =0x020375e4
ldr r1, =gUnknown_020375E4
movs r0, 0
strh r0, [r1]
movs r0, 0x64
ldr r1, [sp, 0x4]
muls r0, r1
ldr r1, =0x020244ec
ldr r1, =gUnknown_020244EC
adds r0, r1
ldr r2, =0x02021cc4
ldr r2, =gUnknown_02021CC4
movs r1, 0x2
bl pokemon_getattr
b _08177768
.pool
_0817773C:
ldr r1, =0x020375e4
ldr r1, =gUnknown_020375E4
movs r0, 0x1
strh r0, [r1]
ldr r2, =0x03005d94
ldr r2, =gUnknown_03005D94
ldr r1, [sp]
lsls r0, r1, 2
adds r0, r1
@@ -248,11 +248,11 @@ _0817773C:
adds r1, r2
lsls r1, 4
adds r0, r1
ldr r2, =0x02021cc4
ldr r2, =gUnknown_02021CC4
movs r1, 0x2
bl pokemon_getattr_encrypted
_08177768:
ldr r0, =0x02021cc4
ldr r0, =gUnknown_02021CC4
bl GetStringEnd_Limit7
_0817776E:
add sp, 0x8
@@ -280,9 +280,9 @@ sub_817778C: @ 817778C
movs r0, 0
mov r8, r0
movs r7, 0
ldr r1, =0x0203bcec
ldr r1, =gUnknown_0203BCEC
mov r10, r1
ldr r0, =0x0203bcee
ldr r0, =gUnknown_0203BCEE
mov r9, r0
_081777AC:
adds r0, r6, 0
asm/mail.s
+31 -31
View File
@@ -13,7 +13,7 @@ sub_8121478: @ 8121478
adds r7, r1, 0
lsls r2, 24
lsrs r6, r2, 24
ldr r4, =0x0203a134
ldr r4, =gUnknown_0203A134
ldr r0, =0x0000222c
bl AllocZeroed
str r0, [r4]
@@ -57,7 +57,7 @@ _081214E8:
strb r0, [r1]
movs r6, 0
_081214F2:
ldr r0, =0x0203a134
ldr r0, =gUnknown_0203A134
ldr r1, [r0]
ldr r2, =0x0000021e
adds r0, r1, r2
@@ -103,7 +103,7 @@ _08121540:
lsls r1, 17
cmp r0, r1
bhi _081215AC
ldr r1, =0x0203a134
ldr r1, =gUnknown_0203A134
ldr r2, [r1]
ldr r3, =0x0000021a
adds r0, r2, r3
@@ -134,7 +134,7 @@ _0812159C:
b _081215BA
.pool
_081215AC:
ldr r0, =0x0203a134
ldr r0, =gUnknown_0203A134
ldr r1, [r0]
ldr r2, =0x0000021b
adds r1, r2
@@ -167,7 +167,7 @@ _081215BA:
sub_81215EC: @ 81215EC
push {r4-r6,lr}
sub sp, 0xC
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
movs r1, 0x87
lsls r1, 3
adds r0, r1
@@ -271,7 +271,7 @@ _081216F4:
movs r0, 0
movs r2, 0x3
bl InitBgsFromTemplates
ldr r4, =0x0203a134
ldr r4, =gUnknown_0203A134
ldr r1, [r4]
movs r2, 0x8B
lsls r2, 2
@@ -293,7 +293,7 @@ _08121730:
.pool
_08121740:
ldr r2, =gUnknown_0859F2B8
ldr r0, =0x0203a134
ldr r0, =gUnknown_0203A134
ldr r0, [r0]
ldr r1, =0x0000021a
adds r0, r1
@@ -338,7 +338,7 @@ _08121782:
movs r3, 0
bl FillBgTilemapBufferRect_Palette0
ldr r2, =gUnknown_0859F2B8
ldr r0, =0x0203a134
ldr r0, =gUnknown_0203A134
ldr r0, [r0]
ldr r1, =0x0000021a
adds r0, r1
@@ -368,9 +368,9 @@ _081217EC:
movs r1, 0xF0
movs r2, 0x20
bl gpu_pal_apply
ldr r6, =0x02037714
ldr r6, =gUnknown_02037714
ldr r4, =gUnknown_0859F2B8
ldr r0, =0x0203a134
ldr r0, =gUnknown_0203A134
ldr r3, [r0]
ldr r2, =0x0000021a
adds r3, r2
@@ -383,7 +383,7 @@ _081217EC:
subs r2, 0x26
adds r0, r6, r2
strh r1, [r0]
ldr r5, =0x02037b14
ldr r5, =gUnknown_02037B14
ldrb r1, [r3]
lsls r0, r1, 2
adds r0, r1
@@ -420,7 +420,7 @@ _081217EC:
movs r2, 0x20
bl gpu_pal_apply
ldr r1, =gUnknown_0859F2B0
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r2, [r0]
ldrb r0, [r2, 0x8]
lsls r0, 2
@@ -446,7 +446,7 @@ _081217EC:
b _081219D4
.pool
_081218B0:
ldr r0, =0x0203a134
ldr r0, =gUnknown_0203A134
ldr r0, [r0]
movs r1, 0x86
lsls r1, 2
@@ -460,7 +460,7 @@ _081218C2:
b _081219D4
.pool
_081218CC:
ldr r0, =0x0203a134
ldr r0, =gUnknown_0203A134
ldr r0, [r0]
movs r2, 0x86
lsls r2, 2
@@ -482,7 +482,7 @@ _081218EC:
_081218F6:
ldr r0, =sub_8121C50
bl SetVBlankCallback
ldr r2, =0x02037fd4
ldr r2, =gUnknown_02037FD4
ldrb r0, [r2, 0x8]
movs r1, 0x80
orrs r0, r1
@@ -490,7 +490,7 @@ _081218F6:
b _081219D4
.pool
_08121910:
ldr r5, =0x0203a134
ldr r5, =gUnknown_0203A134
ldr r0, [r5]
movs r1, 0x85
lsls r1, 2
@@ -558,12 +558,12 @@ _08121980:
movs r2, 0x10
movs r3, 0
bl pal_fade_maybe
ldr r2, =0x02037fd4
ldr r2, =gUnknown_02037FD4
ldrb r1, [r2, 0x8]
movs r0, 0x7F
ands r0, r1
strb r0, [r2, 0x8]
ldr r0, =0x0203a134
ldr r0, =gUnknown_0203A134
ldr r0, [r0]
movs r1, 0x84
lsls r1, 2
@@ -574,7 +574,7 @@ _08121980:
b _081219E4
.pool
_081219D4:
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
movs r2, 0x87
lsls r2, 3
adds r1, r2
@@ -622,7 +622,7 @@ sub_8121A1C: @ 8121A1C
push {r7}
movs r6, 0
movs r5, 0
ldr r2, =0x0203a134
ldr r2, =gUnknown_0203A134
ldr r0, [r2]
movs r1, 0x8A
lsls r1, 2
@@ -673,7 +673,7 @@ _08121A3C:
cmp r5, r1
bcc _08121A3C
_08121A8A:
ldr r4, =0x0203a134
ldr r4, =gUnknown_0203A134
ldr r1, [r4]
movs r2, 0x80
lsls r2, 2
@@ -757,7 +757,7 @@ sub_8121B1C: @ 8121B1C
movs r1, 0
bl FillWindowPixelBuffer
movs r6, 0
ldr r1, =0x0203a134
ldr r1, =gUnknown_0203A134
ldr r0, [r1]
movs r2, 0x8A
lsls r2, 2
@@ -817,7 +817,7 @@ _08121BB8:
adds r0, r6, 0x1
lsls r0, 16
lsrs r6, r0, 16
ldr r2, =0x0203a134
ldr r2, =gUnknown_0203A134
ldr r0, [r2]
add r0, r10
ldr r0, [r0]
@@ -828,7 +828,7 @@ _08121BCC:
ldr r1, =gUnknown_085EEA78
add r0, sp, 0xC
bl CopyString
ldr r4, =0x0203a134
ldr r4, =gUnknown_0203A134
ldr r1, [r4]
movs r2, 0x80
lsls r2, 2
@@ -893,7 +893,7 @@ sub_8121C50: @ 8121C50
thumb_func_start sub_8121C64
sub_8121C64: @ 8121C64
push {r4,lr}
ldr r4, =0x0203a134
ldr r4, =gUnknown_0203A134
ldr r0, [r4]
ldr r1, =0x0000021b
adds r0, r1
@@ -922,7 +922,7 @@ sub_8121C98: @ 8121C98
lsls r0, 24
cmp r0, 0
bne _08121CB2
ldr r0, =0x0203a134
ldr r0, =gUnknown_0203A134
ldr r0, [r0]
movs r1, 0x84
lsls r1, 2
@@ -939,7 +939,7 @@ _08121CB2:
sub_8121CC0: @ 8121CC0
push {lr}
sub sp, 0x4
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
ldrh r1, [r0, 0x2E]
movs r0, 0x3
ands r0, r1
@@ -952,7 +952,7 @@ sub_8121CC0: @ 8121CC0
movs r2, 0
movs r3, 0x10
bl pal_fade_maybe
ldr r0, =0x0203a134
ldr r0, =gUnknown_0203A134
ldr r0, [r0]
movs r1, 0x84
lsls r1, 2
@@ -973,7 +973,7 @@ sub_8121D00: @ 8121D00
lsls r0, 24
cmp r0, 0
bne _08121D88
ldr r4, =0x0203a134
ldr r4, =gUnknown_0203A134
ldr r0, [r4]
movs r1, 0x83
lsls r1, 2
@@ -1004,11 +1004,11 @@ sub_8121D00: @ 8121D00
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =0x02020630
ldr r1, =gUnknown_02020630
adds r0, r1
bl sub_80D2EF8
_08121D58:
ldr r4, =0x0203a134
ldr r4, =gUnknown_0203A134
ldr r0, [r4]
ldr r2, =0x0000222c
movs r1, 0
asm/main.s
+52 -52
View File
@@ -38,30 +38,30 @@ Main: @ 80003A4
movs r1, 0xE0
lsls r1, 9
bl InitHeap
ldr r0, =0x03002700
ldr r0, =gUnknown_03002700
movs r4, 0
strb r4, [r0]
ldr r0, =0x03005d88
ldr r0, =gUnknown_03005D88
ldr r0, [r0]
cmp r0, 0x1
beq _08000414
movs r0, 0
bl SetMainCallback2
_08000414:
ldr r2, =0x030022b4
ldr r2, =gUnknown_030022B4
strb r4, [r2]
ldr r1, =0x03000000
ldr r1, =gUnknown_03000000
movs r3, 0xFC
lsls r3, 4
adds r0, r3, 0
strh r0, [r1]
ldr r7, =0x030022c0
ldr r7, =gUnknown_030022C0
movs r0, 0
mov r8, r0
adds r6, r2, 0
_0800042A:
bl ReadKeypad
ldr r0, =0x03002700
ldr r0, =gUnknown_03002700
ldrb r0, [r0]
cmp r0, 0
bne _08000454
@@ -88,7 +88,7 @@ _08000454:
b _080004B2
.pool
_0800048C:
ldr r5, =0x030022b4
ldr r5, =gUnknown_030022B4
movs r0, 0
strb r0, [r5]
bl HandleLinkConnectionAndCallMainCallbacks
@@ -129,20 +129,20 @@ _080004D4:
@ void InitVariablesAndSetCopyrightScreenCallback()
InitVariablesAndSetCopyrightScreenCallback: @ 80004D8
push {lr}
ldr r2, =0x030022c0
ldr r2, =gUnknown_030022C0
movs r0, 0
str r0, [r2, 0x20]
ldr r1, =0x0203cf5c
ldr r1, =gUnknown_0203CF5C
str r0, [r1]
str r0, [r2, 0x24]
str r0, [r2]
ldr r0, =c2_copyright_1
bl SetMainCallback2
ldr r1, =0x03005d90
ldr r0, =0x02024a54
ldr r1, =gUnknown_03005D90
ldr r0, =gUnknown_02024A54
str r0, [r1]
ldr r1, =0x03005d94
ldr r0, =0x02029808
ldr r1, =gUnknown_03005D94
ldr r0, =gUnknown_02029808
str r0, [r1]
pop {r0}
bx r0
@@ -153,7 +153,7 @@ InitVariablesAndSetCopyrightScreenCallback: @ 80004D8
@ void CallMainCallbacks()
CallMainCallbacks: @ 800051C
push {r4,lr}
ldr r4, =0x030022c0
ldr r4, =gUnknown_030022C0
ldr r0, [r4]
cmp r0, 0
beq _0800052A
@@ -173,7 +173,7 @@ _08000534:
thumb_func_start SetMainCallback2
@ void SetMainCallback2(void ( *func)())
SetMainCallback2: @ 8000540
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
str r0, [r1, 0x4]
movs r0, 0x87
lsls r0, 3
@@ -205,7 +205,7 @@ SeedRngAndSetTrainerId: @ 8000560
ldr r1, =0x04000106
movs r0, 0
strh r0, [r1]
ldr r0, =0x02020000
ldr r0, =gUnknown_02020000
strh r4, [r0]
pop {r4}
pop {r0}
@@ -216,7 +216,7 @@ SeedRngAndSetTrainerId: @ 8000560
thumb_func_start GetTrainerId
@ u16 GetTrainerId()
GetTrainerId: @ 8000588
ldr r0, =0x02020000
ldr r0, =gUnknown_02020000
ldrh r0, [r0]
bx lr
.pool
@@ -247,13 +247,13 @@ EnableVCountIntrAtLine150: @ 8000594
thumb_func_start InitKeypadData
@ void InitKeypadData()
InitKeypadData: @ 80005BC
ldr r1, =0x030026fc
ldr r1, =gUnknown_030026FC
movs r0, 0x5
strh r0, [r1]
ldr r1, =0x030022b0
ldr r1, =gUnknown_030022B0
movs r0, 0x28
strh r0, [r1]
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
movs r0, 0
strh r0, [r1, 0x2C]
strh r0, [r1, 0x2E]
@@ -274,7 +274,7 @@ ReadKeypad: @ 80005E4
adds r0, r2, 0
adds r3, r0, 0
eors r3, r1
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
ldrh r2, [r1, 0x28]
adds r0, r3, 0
bics r0, r2
@@ -294,18 +294,18 @@ ReadKeypad: @ 80005E4
cmp r0, 0
bne _08000636
strh r3, [r2, 0x30]
ldr r0, =0x030026fc
ldr r0, =gUnknown_030026FC
b _08000632
.pool
_08000630:
ldr r0, =0x030022b0
ldr r0, =gUnknown_030022B0
_08000632:
ldrh r0, [r0]
strh r0, [r2, 0x32]
_08000636:
strh r3, [r2, 0x28]
strh r3, [r2, 0x2C]
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r0, [r0]
ldrb r0, [r0, 0x13]
cmp r0, 0x2
@@ -348,9 +348,9 @@ _08000676:
InitIntrHandlers: @ 8000684
push {r4,r5,lr}
ldr r5, =InterruptMain
ldr r4, =0x03002750
ldr r4, =gUnknown_03002750
ldr r3, =gRomInterruptTable
ldr r2, =0x03002710
ldr r2, =gUnknown_03002710
movs r1, 0xD
_08000690:
ldm r3!, {r0}
@@ -364,7 +364,7 @@ _08000690:
ldr r1, =0x84000200
str r1, [r0, 0x8]
ldr r0, [r0, 0x8]
ldr r0, =0x03007ffc
ldr r0, =gUnknown_03007FFC
str r4, [r0]
movs r0, 0
bl SetVBlankCallback
@@ -386,7 +386,7 @@ _08000690:
thumb_func_start SetVBlankCallback
@ void SetVBlankCallback(void ( *func)())
SetVBlankCallback: @ 80006F0
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
str r0, [r1, 0xC]
bx lr
.pool
@@ -395,7 +395,7 @@ SetVBlankCallback: @ 80006F0
thumb_func_start SetHBlankCallback
@ void SetHBlankCallback(void ( *func)())
SetHBlankCallback: @ 80006FC
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
str r0, [r1, 0x10]
bx lr
.pool
@@ -404,7 +404,7 @@ SetHBlankCallback: @ 80006FC
thumb_func_start SetVCountCallback
@ void SetVCountCallback(void ( *func)())
SetVCountCallback: @ 8000708
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
str r0, [r1, 0x14]
bx lr
.pool
@@ -413,7 +413,7 @@ SetVCountCallback: @ 8000708
thumb_func_start RestoreSerialTimer3IntrHandlers
@ void RestoreSerialTimer3IntrHandlers()
RestoreSerialTimer3IntrHandlers: @ 8000714
ldr r0, =0x03002710
ldr r0, =gUnknown_03002710
ldr r1, =SerialIntr
str r1, [r0, 0x4]
ldr r1, =Timer3Intr
@@ -425,7 +425,7 @@ RestoreSerialTimer3IntrHandlers: @ 8000714
thumb_func_start SetSerialCallback
@ void SetSerialCallback(void ( *func)())
SetSerialCallback: @ 800072C
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
str r0, [r1, 0x18]
bx lr
.pool
@@ -435,7 +435,7 @@ SetSerialCallback: @ 800072C
@ void VBlankIntr()
VBlankIntr: @ 8000738
push {r4,lr}
ldr r0, =0x030030fc
ldr r0, =gUnknown_030030FC
ldrb r0, [r0]
cmp r0, 0
beq _0800074C
@@ -443,17 +443,17 @@ VBlankIntr: @ 8000738
b _08000758
.pool
_0800074C:
ldr r0, =0x03002748
ldr r0, =gUnknown_03002748
ldrb r0, [r0]
cmp r0, 0
bne _08000758
bl sub_800B9B8
_08000758:
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
ldr r1, [r0, 0x20]
adds r1, 0x1
str r1, [r0, 0x20]
ldr r1, =0x0203cf5c
ldr r1, =gUnknown_0203CF5C
ldr r1, [r1]
adds r4, r0, 0
cmp r1, 0
@@ -476,8 +476,8 @@ _08000782:
str r0, [r4, 0x24]
bl CopyBufferedValuesToGpuRegs
bl ProcessDma3Requests
ldr r1, =0x03002f50
ldr r0, =0x03006380
ldr r1, =gUnknown_03002F50
ldr r0, =gUnknown_03006380
ldrb r0, [r0, 0x4]
strb r0, [r1]
bl m4aSoundMain
@@ -489,7 +489,7 @@ _08000782:
ands r0, r1
cmp r0, 0
beq _080007BA
ldr r0, =0x02022fec
ldr r0, =gUnknown_02022FEC
ldr r0, [r0]
ldr r1, =0x013f0102
ands r0, r1
@@ -499,12 +499,12 @@ _080007BA:
bl GenerateRandomNumber
_080007BE:
bl sub_800E174
ldr r2, =0x03007ff8
ldr r2, =gUnknown_03007FF8
ldrh r0, [r2]
movs r1, 0x1
orrs r0, r1
strh r0, [r2]
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
ldrh r2, [r0, 0x1C]
ldrh r3, [r0, 0x1C]
orrs r1, r2
@@ -519,7 +519,7 @@ _080007BE:
@ void StartFlashMemoryTimer()
StartFlashMemoryTimer: @ 8000800
push {lr}
ldr r1, =0x0300272c
ldr r1, =gUnknown_0300272C
movs r0, 0x2
bl SetFlashTimerIntr
pop {r0}
@@ -531,13 +531,13 @@ StartFlashMemoryTimer: @ 8000800
@ void HBlankIntr()
HBlankIntr: @ 8000814
push {r4,lr}
ldr r4, =0x030022c0
ldr r4, =gUnknown_030022C0
ldr r0, [r4, 0x10]
cmp r0, 0
beq _08000822
bl _call_via_r0
_08000822:
ldr r2, =0x03007ff8
ldr r2, =gUnknown_03007FF8
ldrh r0, [r2]
movs r1, 0x2
orrs r0, r1
@@ -556,14 +556,14 @@ _08000822:
@ void VCountIntr()
VCountIntr: @ 8000844
push {r4,lr}
ldr r4, =0x030022c0
ldr r4, =gUnknown_030022C0
ldr r0, [r4, 0x14]
cmp r0, 0
beq _08000852
bl _call_via_r0
_08000852:
bl SoundVSync_rev01
ldr r2, =0x03007ff8
ldr r2, =gUnknown_03007FF8
ldrh r0, [r2]
movs r1, 0x4
orrs r0, r1
@@ -582,13 +582,13 @@ _08000852:
@ void SerialIntr()
SerialIntr: @ 8000878
push {r4,lr}
ldr r4, =0x030022c0
ldr r4, =gUnknown_030022C0
ldr r0, [r4, 0x18]
cmp r0, 0
beq _08000886
bl _call_via_r0
_08000886:
ldr r2, =0x03007ff8
ldr r2, =gUnknown_03007FF8
ldrh r0, [r2]
movs r1, 0x80
orrs r0, r1
@@ -613,7 +613,7 @@ DummyIntrHandler: @ 80008A8
@ void WaitForVBlankIntr()
WaitForVBlankIntr: @ 80008AC
push {lr}
ldr r2, =0x030022c0
ldr r2, =gUnknown_030022C0
ldrh r1, [r2, 0x1C]
ldr r0, =0x0000fffe
ands r0, r1
@@ -639,7 +639,7 @@ _080008D0:
thumb_func_start sub_80008DC
sub_80008DC: @ 80008DC
ldr r1, =0x0203cf5c
ldr r1, =gUnknown_0203CF5C
str r0, [r1]
bx lr
.pool
@@ -647,7 +647,7 @@ sub_80008DC: @ 80008DC
thumb_func_start sub_80008E8
sub_80008E8: @ 80008E8
ldr r1, =0x0203cf5c
ldr r1, =gUnknown_0203CF5C
movs r0, 0
str r0, [r1]
bx lr
@@ -709,7 +709,7 @@ sub_8000964: @ 8000964
mov r1, sp
movs r0, 0
strh r0, [r1]
ldr r1, =0x03007330
ldr r1, =gUnknown_03007330
ldr r2, =0x01000034
mov r0, sp
bl CpuSet
asm/main_menu.s
+145 -145
View File
File diff suppressed because it is too large Load Diff
asm/map_obj_8097404.s
+29 -29
View File
@@ -20,7 +20,7 @@ sub_8097404: @ 8097404
movs r4, 0x1
orrs r0, r4
strb r0, [r5, 0x1]
ldr r3, =0x02020630
ldr r3, =gUnknown_02020630
ldrb r1, [r5, 0x4]
lsls r0, r1, 4
adds r0, r1
@@ -87,7 +87,7 @@ _0809748E:
player_bitmagic: @ 8097494
push {r4,r5,lr}
movs r4, 0
ldr r5, =0x02037350
ldr r5, =gUnknown_02037350
_0809749A:
lsls r0, r4, 3
adds r0, r4
@@ -97,7 +97,7 @@ _0809749A:
lsls r0, 31
cmp r0, 0
beq _080974B8
ldr r0, =0x02037590
ldr r0, =gUnknown_02037590
ldrb r0, [r0, 0x5]
cmp r4, r0
beq _080974B8
@@ -121,7 +121,7 @@ sub_80974D0: @ 80974D0
lsls r0, 24
lsrs r5, r0, 24
movs r4, 0
ldr r6, =0x02037350
ldr r6, =gUnknown_02037350
_080974DA:
cmp r4, r5
beq _080974FC
@@ -133,7 +133,7 @@ _080974DA:
lsls r0, 31
cmp r0, 0
beq _080974FC
ldr r0, =0x02037590
ldr r0, =gUnknown_02037590
ldrb r0, [r0, 0x5]
cmp r4, r0
beq _080974FC
@@ -167,7 +167,7 @@ npc_sync_anim_pause_bits: @ 8097514
negs r0, r0
ands r0, r1
strb r0, [r5, 0x1]
ldr r4, =0x02020630
ldr r4, =gUnknown_02020630
ldrb r0, [r5, 0x4]
lsls r1, r0, 4
adds r1, r0
@@ -209,7 +209,7 @@ _0809756C:
sub_809757C: @ 809757C
push {r4,r5,lr}
movs r4, 0
ldr r5, =0x02037350
ldr r5, =gUnknown_02037350
_08097582:
lsls r0, r4, 3
adds r0, r4
@@ -864,7 +864,7 @@ sub_80979D4: @ 80979D4
adds r4, 0x28
movs r0, 0
ldrsb r0, [r4, r0]
ldr r2, =0x02021bbc
ldr r2, =gUnknown_02021BBC
adds r0, r1
ldrh r2, [r2]
adds r0, r2
@@ -877,7 +877,7 @@ sub_80979D4: @ 80979D4
subs r3, 0x15
movs r0, 0
ldrsb r0, [r3, r0]
ldr r2, =0x02021bbe
ldr r2, =gUnknown_02021BBE
adds r0, r1
ldrh r2, [r2]
adds r0, r2
@@ -991,7 +991,7 @@ sub_8097AF0: @ 8097AF0
movs r5, 0
movs r4, 0x3F
_08097AF6:
ldr r0, =0x02020630
ldr r0, =gUnknown_02020630
adds r2, r5, r0
adds r0, r2, 0
adds r0, 0x3E
@@ -1023,7 +1023,7 @@ sub_8097B2C: @ 8097B2C
lsls r0, 24
lsrs r5, r0, 24
movs r3, 0
ldr r6, =0x02020630
ldr r6, =gUnknown_02020630
movs r4, 0
_08097B38:
adds r2, r4, r6
@@ -1073,7 +1073,7 @@ sub_8097B78: @ 8097B78
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
ldr r0, =0x02020630
ldr r0, =gUnknown_02020630
adds r4, r0
adds r0, r5, 0
bl FieldObjectDirectionToImageAnimId
@@ -1103,7 +1103,7 @@ sub_8097BB4: @ 8097BB4
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =0x02020630
ldr r1, =gUnknown_02020630
adds r4, r0, r1
adds r0, r5, 0
bl GetFieldObjectGraphicsInfo
@@ -1174,7 +1174,7 @@ sub_8097C44: @ 8097C44
beq _08097C80
cmp r4, 0
beq _08097C74
ldr r0, =0x02020630
ldr r0, =gUnknown_02020630
lsls r1, r2, 4
adds r1, r2
lsls r1, 2
@@ -1184,7 +1184,7 @@ sub_8097C44: @ 8097C44
b _08097C80
.pool
_08097C74:
ldr r1, =0x02020630
ldr r1, =gUnknown_02020630
lsls r0, r3, 4
adds r0, r3
lsls r0, 2
@@ -1211,7 +1211,7 @@ sub_8097C8C: @ 8097C8C
b _08097CBA
_08097CA2:
movs r3, 0
ldr r0, =0x02020630
ldr r0, =gUnknown_02020630
lsls r1, r2, 4
adds r1, r2
lsls r1, 2
@@ -1241,7 +1241,7 @@ sub_8097CC4: @ 8097CC4
lsrs r2, r0, 24
cmp r2, 0x40
beq _08097CEA
ldr r0, =0x02020630
ldr r0, =gUnknown_02020630
lsls r1, r2, 4
adds r1, r2
lsls r1, 2
@@ -1369,7 +1369,7 @@ sub_8097D9C: @ 8097D9C
lsrs r2, r0, 24
cmp r2, 0x40
beq _08097DC0
ldr r0, =0x02020630
ldr r0, =gUnknown_02020630
lsls r1, r2, 4
adds r1, r2
lsls r1, 2
@@ -1396,7 +1396,7 @@ oe_exec_and_other_stuff: @ 8097DD0
adds r0, r1, 0
lsls r4, 24
lsrs r4, 24
ldr r1, =0x02038c08
ldr r1, =gUnknown_02038C08
adds r2, r1, 0x4
adds r3, r1, 0
adds r3, 0x8
@@ -1434,7 +1434,7 @@ DoRippleFieldEffect: @ 8097E14
adds r4, r1, 0
ldrb r0, [r0, 0x5]
bl GetFieldObjectGraphicsInfo
ldr r2, =0x02038c08
ldr r2, =gUnknown_02038C08
movs r3, 0x20
ldrsh r1, [r4, r3]
str r1, [r2]
@@ -1467,7 +1467,7 @@ sub_8097E50: @ 8097E50
mov r8, r1
movs r0, 0
mov r12, r0
ldr r0, =0x020375b8
ldr r0, =gUnknown_020375B8
ldr r1, [r0]
adds r6, r0, 0
cmp r1, 0
@@ -1557,7 +1557,7 @@ sub_8097EF0: @ 8097EF0
mov r8, r1
movs r0, 0x1
strh r0, [r1, 0x32]
ldr r5, =0x020375b8
ldr r5, =gUnknown_020375B8
ldr r0, [r5]
cmp r0, 0
beq _08097F68
@@ -1624,7 +1624,7 @@ _08097F68:
sub_8097F78: @ 8097F78
push {lr}
movs r2, 0
ldr r1, =0x020375b8
ldr r1, =gUnknown_020375B8
ldr r1, [r1]
ldrb r3, [r0, 0x8]
_08097F82:
@@ -1660,7 +1660,7 @@ sub_8097FA4: @ 8097FA4
lsls r4, r5, 2
adds r4, r5
lsls r4, 3
ldr r0, =0x03005e00
ldr r0, =gTasks
adds r4, r0
adds r0, r4, 0
adds r0, 0x8
@@ -1684,7 +1684,7 @@ sub_8097FE4: @ 8097FE4
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
ldr r0, =0x03005e00
ldr r0, =gTasks
adds r4, r1, r0
adds r0, r4, 0
adds r0, 0x8
@@ -1695,7 +1695,7 @@ sub_8097FE4: @ 8097FE4
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =0x02020630
ldr r1, =gUnknown_02020630
adds r2, r0, r1
ldrh r1, [r4, 0xC]
movs r0, 0x3
@@ -1735,7 +1735,7 @@ sub_8098044: @ 8098044
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
ldr r1, =0x03005e00
ldr r1, =gTasks
adds r0, r1
adds r0, 0x8
mov r1, sp
@@ -1757,7 +1757,7 @@ sub_8098074: @ 8098074
lsls r1, 24
lsrs r5, r1, 24
movs r4, 0
ldr r7, =0x02037350
ldr r7, =gUnknown_02037350
_08098082:
cmp r4, r6
beq _080980A8
@@ -1771,7 +1771,7 @@ _08098082:
lsls r0, 31
cmp r0, 0
beq _080980A8
ldr r0, =0x02037590
ldr r0, =gUnknown_02037590
ldrb r0, [r0, 0x5]
cmp r4, r0
beq _080980A8
asm/map_obj_lock.s
+22 -22
View File
@@ -8,7 +8,7 @@
thumb_func_start walkrun_is_standing_still
walkrun_is_standing_still: @ 8098388
push {lr}
ldr r0, =0x02037590
ldr r0, =gUnknown_02037590
ldrb r0, [r0, 0x3]
cmp r0, 0x1
beq _0809839C
@@ -79,7 +79,7 @@ sub_8098400: @ 8098400
lsls r0, r6, 2
adds r0, r6
lsls r0, 3
ldr r1, =0x03005e00
ldr r1, =gTasks
adds r5, r0, r1
movs r1, 0x8
ldrsh r0, [r5, r1]
@@ -97,8 +97,8 @@ _0809842A:
ldrsh r0, [r5, r1]
cmp r0, 0
bne _08098452
ldr r2, =0x02037350
ldr r0, =0x03005df0
ldr r2, =gUnknown_02037350
ldr r0, =gUnknown_03005DF0
ldrb r1, [r0]
lsls r0, r1, 3
adds r0, r1
@@ -152,7 +152,7 @@ _0809849A:
thumb_func_start sub_80984A0
sub_80984A0: @ 80984A0
push {r4,r5,lr}
ldr r4, =0x03005df0
ldr r4, =gUnknown_03005DF0
ldrb r0, [r4]
bl sub_80974D0
ldr r0, =sub_8098400
@@ -160,7 +160,7 @@ sub_80984A0: @ 80984A0
bl CreateTask
lsls r0, 24
lsrs r5, r0, 24
ldr r2, =0x02037350
ldr r2, =gUnknown_02037350
ldrb r1, [r4]
lsls r0, r1, 3
adds r0, r1
@@ -172,7 +172,7 @@ sub_80984A0: @ 80984A0
blt _080984DE
adds r0, r1, 0
bl sub_8097404
ldr r0, =0x03005e00
ldr r0, =gTasks
lsls r1, r5, 2
adds r1, r5
lsls r1, 3
@@ -199,7 +199,7 @@ sub_80984F4: @ 80984F4
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =0x02037350
ldr r1, =gUnknown_02037350
adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimFinished
bl sub_80D338C
@@ -212,8 +212,8 @@ sub_80984F4: @ 80984F4
thumb_func_start sub_8098524
sub_8098524: @ 8098524
push {r4,lr}
ldr r4, =0x02037350
ldr r0, =0x03005df0
ldr r4, =gUnknown_02037350
ldr r0, =gUnknown_03005DF0
ldrb r1, [r0]
lsls r0, r1, 3
adds r0, r1
@@ -249,14 +249,14 @@ _08098542:
thumb_func_start sub_8098574
sub_8098574: @ 8098574
push {lr}
ldr r0, =0x03005df0
ldr r0, =gUnknown_03005DF0
ldrb r1, [r0]
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =0x02037350
ldr r1, =gUnknown_02037350
adds r0, r1
ldr r1, =0x020375f4
ldr r1, =gUnknown_020375F4
ldrb r1, [r1]
bl FieldObjectFaceOppositeDirection
pop {r0}
@@ -267,12 +267,12 @@ sub_8098574: @ 8098574
thumb_func_start sub_809859C
sub_809859C: @ 809859C
push {lr}
ldr r0, =0x03005df0
ldr r0, =gUnknown_03005DF0
ldrb r1, [r0]
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =0x02037350
ldr r1, =gUnknown_02037350
adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimActive
pop {r0}
@@ -288,7 +288,7 @@ sub_80985BC: @ 80985BC
lsls r0, r6, 2
adds r0, r6
lsls r0, 3
ldr r1, =0x03005e00
ldr r1, =gTasks
adds r5, r0, r1
ldrb r7, [r5, 0xC]
movs r1, 0x8
@@ -307,7 +307,7 @@ _080985E8:
ldrsh r0, [r5, r1]
cmp r0, 0
bne _0809860C
ldr r0, =0x02037350
ldr r0, =gUnknown_02037350
lsls r1, r7, 3
adds r1, r7
lsls r1, 2
@@ -348,7 +348,7 @@ sub_8098630: @ 8098630
bl sub_80B47E0
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =0x030060a8
ldr r0, =gUnknown_030060A8
ldrb r0, [r0]
cmp r0, 0x2
bne _080986E0
@@ -366,7 +366,7 @@ sub_8098630: @ 8098630
bl CreateTask
lsls r0, 24
lsrs r2, r0, 24
ldr r0, =0x03005e00
ldr r0, =gTasks
mov r9, r0
lsls r0, r2, 2
adds r0, r2
@@ -374,7 +374,7 @@ sub_8098630: @ 8098630
mov r1, r9
adds r6, r0, r1
strh r4, [r6, 0xC]
ldr r2, =0x02037350
ldr r2, =gUnknown_02037350
mov r8, r2
lsls r0, r4, 3
adds r0, r4
@@ -423,13 +423,13 @@ _080986E0:
bl CreateTask
lsls r0, 24
lsrs r2, r0, 24
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r2, 2
adds r0, r2
lsls r0, 3
adds r5, r0, r1
strh r4, [r5, 0xC]
ldr r1, =0x02037350
ldr r1, =gUnknown_02037350
lsls r0, r4, 3
adds r0, r4
lsls r0, 2
asm/mauville_old_man.s
+92 -92
View File
@@ -8,7 +8,7 @@
thumb_func_start sub_81200A0
sub_81200A0: @ 81200A0
push {r4,lr}
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r2, [r0]
ldr r1, =0x00002e28
adds r0, r2, r1
@@ -45,7 +45,7 @@ _081200C6:
thumb_func_start sub_81200F8
sub_81200F8: @ 81200F8
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r1, [r0]
ldr r0, =0x00002e28
adds r1, r0
@@ -70,7 +70,7 @@ sub_812011C: @ 812011C
thumb_func_start sub_8120128
sub_8120128: @ 8120128
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r1, [r0]
ldr r0, =0x00002e28
adds r2, r1, r0
@@ -98,7 +98,7 @@ sub_8120154: @ 8120154
thumb_func_start sub_8120160
sub_8120160: @ 8120160
push {lr}
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r0, [r0]
ldrb r1, [r0, 0xB]
lsls r1, 8
@@ -145,7 +145,7 @@ _081201C0:
thumb_func_start sub_81201C8
sub_81201C8: @ 81201C8
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r1, =0x00002e28
adds r0, r1
@@ -157,7 +157,7 @@ sub_81201C8: @ 81201C8
thumb_func_start sub_81201DC
sub_81201DC: @ 81201DC
push {r4,lr}
ldr r4, =0x020375f0
ldr r4, =gUnknown_020375F0
bl sub_81201C8
lsls r0, 24
lsrs r0, 24
@@ -170,8 +170,8 @@ sub_81201DC: @ 81201DC
thumb_func_start sub_81201F4
sub_81201F4: @ 81201F4
ldr r1, =0x020375f0
ldr r0, =0x03005d8c
ldr r1, =gUnknown_020375F0
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r2, =0x00002e51
adds r0, r2
@@ -184,13 +184,13 @@ sub_81201F4: @ 81201F4
thumb_func_start sub_8120210
sub_8120210: @ 8120210
push {r4-r6,lr}
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r4, [r0]
ldr r0, =0x00002e28
adds r6, r4, r0
ldr r1, =0x00002e42
adds r0, r4, r1
ldr r5, =0x03005d90
ldr r5, =gUnknown_03005D90
ldr r1, [r5]
bl CopyString
movs r2, 0
@@ -236,9 +236,9 @@ _0812024E:
thumb_func_start sub_8120280
sub_8120280: @ 8120280
push {r4-r7,lr}
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r1, [r0]
ldr r0, =0x020375e0
ldr r0, =gUnknown_020375E0
ldrh r0, [r0]
ldr r2, =0x00002e36
adds r5, r1, r2
@@ -247,7 +247,7 @@ sub_8120280: @ 8120280
ldr r0, =0x00002e2a
adds r5, r1, r0
_08120296:
ldr r2, =0x02021fc4
ldr r2, =gUnknown_02021FC4
adds r4, r2, 0
movs r6, 0
_0812029C:
@@ -336,7 +336,7 @@ _0812031E:
thumb_func_start sub_8120340
sub_8120340: @ 8120340
push {lr}
ldr r0, =0x020375e0
ldr r0, =gUnknown_020375E0
ldrb r0, [r0]
bl sub_81206C0
bl script_env_2_set_ctx_paused
@@ -347,8 +347,8 @@ sub_8120340: @ 8120340
thumb_func_start sub_8120358
sub_8120358: @ 8120358
ldr r1, =0x020375f0
ldr r0, =0x03005d8c
ldr r1, =gUnknown_020375F0
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r2, =0x00002e28
adds r0, r2
@@ -360,7 +360,7 @@ sub_8120358: @ 8120358
thumb_func_start sub_8120374
sub_8120374: @ 8120374
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r1, =0x00002e28
adds r0, r1
@@ -379,14 +379,14 @@ sub_812038C: @ 812038C
ldr r0, =0x0000ffff
cmp r1, r0
bne _081203AC
ldr r1, =0x020375f0
ldr r1, =gUnknown_020375F0
movs r0, 0
b _081203B6
.pool
_081203AC:
ldr r0, =0x02021cc4
ldr r0, =gUnknown_02021CC4
bl CopyEasyChatWord
ldr r1, =0x020375f0
ldr r1, =gUnknown_020375F0
movs r0, 0x1
_081203B6:
strh r0, [r1]
@@ -398,21 +398,21 @@ _081203B6:
thumb_func_start sub_81203C4
sub_81203C4: @ 81203C4
push {lr}
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r1, =0x00002e28
adds r2, r0, r1
ldrb r0, [r2, 0x1]
cmp r0, 0xA
bne _081203EC
ldr r1, =0x020375f0
ldr r1, =gUnknown_020375F0
movs r0, 0
strh r0, [r1]
strb r0, [r2, 0x1]
b _081203F2
.pool
_081203EC:
ldr r1, =0x020375f0
ldr r1, =gUnknown_020375F0
movs r0, 0x1
strh r0, [r1]
_081203F2:
@@ -424,7 +424,7 @@ _081203F2:
thumb_func_start sub_81203FC
sub_81203FC: @ 81203FC
push {r4-r6,lr}
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r4, [r0]
ldr r0, =0x00002e28
adds r5, r4, r0
@@ -448,7 +448,7 @@ _08120410:
lsrs r4, 16
movs r0, 0x7
ands r4, r0
ldr r0, =0x02021fc4
ldr r0, =gUnknown_02021FC4
ldrb r1, [r5, 0x1]
lsls r1, 1
adds r1, r6, r1
@@ -470,7 +470,7 @@ _08120410:
b _081204A2
.pool
_08120480:
ldr r0, =0x02021fc4
ldr r0, =gUnknown_02021FC4
ldr r3, =gUnknown_0859F010
ldrb r2, [r5, 0x2]
adds r1, r2, 0x1
@@ -503,7 +503,7 @@ _081204C4:
adds r0, 0x1
_081204C8:
strb r0, [r5, 0x1]
ldr r1, =0x020375f0
ldr r1, =gUnknown_020375F0
movs r0, 0x1
strh r0, [r1]
pop {r4-r6}
@@ -520,7 +520,7 @@ sub_81204DC: @ 81204DC
mov r5, r8
push {r5-r7}
sub sp, 0x1C
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r4, [r0]
ldr r0, =0x00002e28
adds r0, r4, r0
@@ -676,7 +676,7 @@ _0812060E:
thumb_func_start sub_8120628
sub_8120628: @ 8120628
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r1, =0x00002e51
adds r0, r1
@@ -688,7 +688,7 @@ sub_8120628: @ 8120628
thumb_func_start sub_8120640
sub_8120640: @ 8120640
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r1, =0x00002e28
adds r0, r1
@@ -763,7 +763,7 @@ sub_81206C0: @ 81206C0
bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
@@ -777,7 +777,7 @@ sub_81206C0: @ 81206C0
thumb_func_start sub_81206F0
sub_81206F0: @ 81206F0
ldr r1, =0x03002f84
ldr r1, =gUnknown_03002F84
movs r0, 0
strb r0, [r1]
bx lr
@@ -786,7 +786,7 @@ sub_81206F0: @ 81206F0
thumb_func_start sub_81206FC
sub_81206FC: @ 81206FC
ldr r1, =0x03002f84
ldr r1, =gUnknown_03002F84
movs r0, 0x1
strb r0, [r1]
bx lr
@@ -811,7 +811,7 @@ sub_8120708: @ 8120708
adds r2, r5, 0
movs r3, 0
bl Print
ldr r0, =0x03002f84
ldr r0, =gUnknown_03002F84
strb r4, [r0]
movs r0, 0
movs r1, 0x3
@@ -848,9 +848,9 @@ _08120764:
.4byte _081207F8
.4byte _08120938
_0812077C:
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r2, [r0]
ldr r0, =0x020375e0
ldr r0, =gUnknown_020375E0
ldrh r0, [r0]
ldr r3, =0x00002e36
adds r1, r2, r3
@@ -965,7 +965,7 @@ _08120850:
lsls r1, 1
adds r0, r1
strh r0, [r6, 0x6]
ldr r4, =0x03007630
ldr r4, =gUnknown_03007630
ldr r5, =0x0000ffff
ldrh r2, [r6, 0x6]
adds r0, r4, 0
@@ -1008,7 +1008,7 @@ _081208BC:
subs r0, 0x40
_081208C0:
strh r0, [r6, 0x8]
ldr r4, =0x03007630
ldr r4, =gUnknown_03007630
ldr r5, =0x0000ffff
ldrh r2, [r6, 0x6]
adds r0, r4, 0
@@ -1059,7 +1059,7 @@ _08120922:
lsls r0, 24
cmp r0, 0
bne _08120938
ldr r0, =0x03007630
ldr r0, =gUnknown_03007630
bl MPlayStop_rev01
movs r0, 0x4
_08120936:
@@ -1079,9 +1079,9 @@ sub_8120944: @ 8120944
lsls r0, r6, 2
adds r0, r6
lsls r0, 3
ldr r1, =0x03005e00
ldr r1, =gTasks
adds r5, r0, r1
ldr r1, =0x03006130
ldr r1, =gUnknown_03006130
adds r0, r5, 0
bl sub_8120748
movs r1, 0x8
@@ -1106,7 +1106,7 @@ _0812097C:
.4byte _08120A6E
_08120994:
bl sub_8120280
ldr r0, =0x02021fc4
ldr r0, =gUnknown_02021FC4
bl sub_8120708
movs r0, 0
strh r0, [r5, 0xA]
@@ -1128,19 +1128,19 @@ _081209C4:
movs r0, 0x2
b _08120B4E
_081209C8:
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r2, =0x00002e28
adds r4, r0, r2
movs r0, 0xE
ldrsh r1, [r5, r0]
ldr r0, =0x02021fc4
ldr r0, =gUnknown_02021FC4
adds r1, r0
movs r3, 0
ldrb r0, [r1]
ldr r7, =0x03006130
ldr r7, =gUnknown_03006130
ldrh r2, [r5, 0x12]
ldr r6, =0x0203a128
ldr r6, =gUnknown_0203A128
b _08120A02
.pool
_081209F8:
@@ -1219,7 +1219,7 @@ _08120A6E:
strh r0, [r5, 0xC]
b _08120B50
_08120A7E:
ldr r1, =0x02021fc4
ldr r1, =gUnknown_02021FC4
movs r2, 0xE
ldrsh r0, [r5, r2]
adds r0, r1
@@ -1228,7 +1228,7 @@ _08120A7E:
bne _08120AB0
movs r0, 0x6
bl sub_80A3228
ldr r0, =0x03007630
ldr r0, =gUnknown_03007630
movs r1, 0x2
bl sub_82E0308
bl script_env_2_enable_and_set_ctx_running
@@ -1307,7 +1307,7 @@ _08120B28:
movs r1, 0
strh r0, [r5, 0xE]
strh r1, [r5, 0xA]
ldr r0, =0x03006130
ldr r0, =gUnknown_03006130
ldrh r0, [r0, 0x4]
strh r0, [r5, 0xC]
movs r0, 0x4
@@ -1716,8 +1716,8 @@ _08120E02:
thumb_func_start sub_8120E08
sub_8120E08: @ 8120E08
push {r4,r5,lr}
ldr r2, =0x0203a12c
ldr r0, =0x03005d8c
ldr r2, =gUnknown_0203A12C
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r1, =0x00002e28
adds r0, r1
@@ -1751,8 +1751,8 @@ _08120E24:
thumb_func_start sub_8120E50
sub_8120E50: @ 8120E50
ldr r3, =0x0203a12c
ldr r0, =0x03005d8c
ldr r3, =gUnknown_0203A12C
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r1, =0x00002e28
adds r0, r1
@@ -1836,7 +1836,7 @@ sub_8120ECC: @ 8120ECC
sub_8120ED8: @ 8120ED8
push {lr}
movs r1, 0
ldr r2, =0x0203a12c
ldr r2, =gUnknown_0203A12C
ldr r0, [r2]
ldrb r0, [r0, 0x4]
cmp r0, 0
@@ -1862,7 +1862,7 @@ _08120EFC:
thumb_func_start sub_8120F08
sub_8120F08: @ 8120F08
ldr r1, =0x0203a12c
ldr r1, =gUnknown_0203A12C
lsls r0, 2
adds r0, 0x24
ldr r2, [r1]
@@ -1883,7 +1883,7 @@ sub_8120F08: @ 8120F08
thumb_func_start sub_8120F2C
sub_8120F2C: @ 8120F2C
ldr r2, =0x0203a12c
ldr r2, =gUnknown_0203A12C
lsls r0, 2
adds r0, 0x24
ldr r2, [r2]
@@ -1903,7 +1903,7 @@ sub_8120F2C: @ 8120F2C
sub_8120F4C: @ 8120F4C
push {r4,r5,lr}
adds r5, r0, 0
ldr r0, =0x0203a12c
ldr r0, =gUnknown_0203A12C
ldr r0, [r0]
adds r0, 0x4
adds r0, r5
@@ -1929,7 +1929,7 @@ _08120F76:
sub_8120F7C: @ 8120F7C
push {r4,r5,lr}
adds r5, r1, 0
ldr r2, =0x0203a12c
ldr r2, =gUnknown_0203A12C
lsls r1, r0, 3
subs r1, r0
adds r1, 0x8
@@ -1953,7 +1953,7 @@ sub_8120F7C: @ 8120F7C
sub_8120FAC: @ 8120FAC
push {r4,r5,lr}
adds r5, r1, 0
ldr r2, =0x0203a12c
ldr r2, =gUnknown_0203A12C
lsls r1, r0, 3
subs r1, r0
adds r1, 0x8
@@ -1981,13 +1981,13 @@ sub_8120FDC: @ 8120FDC
push {r5,r6}
mov r8, r0
adds r6, r1, 0
ldr r0, =0x0203a12c
ldr r0, =gUnknown_0203A12C
mov r9, r0
ldr r0, [r0]
adds r0, 0x4
add r0, r8
strb r6, [r0]
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r1, [r0]
mov r0, r8
bl sub_8120FAC
@@ -1998,7 +1998,7 @@ sub_8120FDC: @ 8120FDC
adds r1, r0, 0
mov r0, r8
bl sub_8120F2C
ldr r5, =0x02021cc4
ldr r5, =gUnknown_02021CC4
adds r0, r4, 0
bl sub_8120E74
adds r1, r0, 0
@@ -2006,7 +2006,7 @@ sub_8120FDC: @ 8120FDC
movs r2, 0
movs r3, 0xA
bl ConvertIntToDecimalString
ldr r4, =0x02021dc4
ldr r4, =gUnknown_02021DC4
adds r0, r6, 0
bl sub_8120ECC
adds r1, r0, 0
@@ -2106,7 +2106,7 @@ _081210E4:
ldrb r4, [r0]
ldrb r6, [r0, 0x1]
movs r1, 0
ldr r2, =0x0203a12c
ldr r2, =gUnknown_0203A12C
ldr r0, [r2]
ldrb r0, [r0, 0x4]
cmp r0, r4
@@ -2128,7 +2128,7 @@ _08121112:
bl sub_8120E74
cmp r0, r6
bcc _08121162
ldr r0, =0x0203a12c
ldr r0, =gUnknown_0203A12C
ldr r1, [r0]
movs r0, 0x1
strb r0, [r1, 0x1]
@@ -2137,7 +2137,7 @@ _08121112:
lsrs r0, 24
cmp r0, 0x4
bne _08121150
ldr r0, =0x03001178
ldr r0, =gUnknown_03001178
ldrb r0, [r0]
adds r1, r4, 0
bl sub_8120FDC
@@ -2173,13 +2173,13 @@ sub_8121178: @ 8121178
mov r6, r8
push {r6}
adds r5, r0, 0
ldr r6, =0x0203a12c
ldr r6, =gUnknown_0203A12C
ldr r0, [r6]
adds r0, 0x4
adds r0, r5
ldrb r0, [r0]
mov r8, r0
ldr r4, =0x02021cc4
ldr r4, =gUnknown_02021CC4
adds r0, r5, 0
bl sub_8120F08
adds r1, r0, 0
@@ -2187,13 +2187,13 @@ sub_8121178: @ 8121178
movs r2, 0
movs r3, 0xA
bl ConvertIntToDecimalString
ldr r4, =0x02021dc4
ldr r4, =gUnknown_02021DC4
mov r0, r8
bl sub_8120ECC
adds r1, r0, 0
adds r0, r4, 0
bl CopyString
ldr r4, =0x02021ec4
ldr r4, =gUnknown_02021EC4
adds r0, r5, 0
adds r1, r4, 0
bl sub_8120F7C
@@ -2224,7 +2224,7 @@ sub_81211EC: @ 81211EC
bl GetStringWidth
adds r5, r0, 0
movs r4, 0
ldr r0, =0x0203a12c
ldr r0, =gUnknown_0203A12C
ldr r0, [r0]
ldrb r0, [r0, 0x4]
cmp r0, 0
@@ -2242,7 +2242,7 @@ _0812121C:
adds r4, 0x1
cmp r4, 0x3
bgt _08121230
ldr r0, =0x0203a12c
ldr r0, =gUnknown_0203A12C
ldr r0, [r0]
adds r0, 0x4
adds r0, r4
@@ -2266,13 +2266,13 @@ _08121230:
movs r1, 0
adds r2, r4, 0
bl CreateWindowFromRect
ldr r1, =0x0203a130
ldr r1, =gUnknown_0203A130
strb r0, [r1]
ldrb r0, [r1]
movs r1, 0
bl SetStandardWindowBorderStyle
movs r4, 0
ldr r0, =0x0203a12c
ldr r0, =gUnknown_0203A12C
ldr r0, [r0]
ldrb r0, [r0, 0x4]
cmp r0, 0
@@ -2282,7 +2282,7 @@ _08121230:
_08121272:
bl sub_8120EB4
adds r2, r0, 0
ldr r0, =0x0203a130
ldr r0, =gUnknown_0203A130
ldrb r0, [r0]
lsrs r1, r5, 24
str r1, [sp]
@@ -2299,7 +2299,7 @@ _08121272:
adds r4, 0x1
cmp r4, 0x3
bgt _081212AA
ldr r0, =0x0203a12c
ldr r0, =gUnknown_0203A12C
ldr r0, [r0]
adds r0, 0x4
adds r0, r4
@@ -2307,7 +2307,7 @@ _08121272:
cmp r0, 0
bne _08121272
_081212AA:
ldr r5, =0x0203a130
ldr r5, =gUnknown_0203A130
ldrb r0, [r5]
ldr r2, =gUnknown_085EB7EA
lsls r1, r4, 4
@@ -2349,7 +2349,7 @@ sub_81212FC: @ 81212FC
lsls r0, r6, 2
adds r0, r6
lsls r0, 3
ldr r1, =0x03005e00
ldr r1, =gTasks
adds r4, r0, r1
movs r0, 0x8
ldrsh r5, [r4, r0]
@@ -2382,18 +2382,18 @@ _0812132C:
cmp r4, r0
bne _0812135C
_0812134E:
ldr r1, =0x020375f0
ldr r1, =gUnknown_020375F0
movs r0, 0
strh r0, [r1]
b _08121364
.pool
_0812135C:
ldr r0, =0x020375f0
ldr r0, =gUnknown_020375F0
strh r5, [r0]
ldr r0, =0x03001178
ldr r0, =gUnknown_03001178
strb r4, [r0]
_08121364:
ldr r0, =0x0203a130
ldr r0, =gUnknown_0203A130
ldrb r0, [r0]
bl sub_80E2A78
adds r0, r6, 0
@@ -2420,7 +2420,7 @@ sub_8121388: @ 8121388
thumb_func_start sub_812139C
sub_812139C: @ 812139C
push {lr}
ldr r0, =0x03001178
ldr r0, =gUnknown_03001178
ldrb r0, [r0]
bl sub_8121178
pop {r0}
@@ -2431,8 +2431,8 @@ sub_812139C: @ 812139C
thumb_func_start sub_81213B0
sub_81213B0: @ 81213B0
push {lr}
ldr r1, =0x0203a12c
ldr r0, =0x03005d8c
ldr r1, =gUnknown_0203A12C
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r2, =0x00002e28
adds r0, r2
@@ -2448,13 +2448,13 @@ sub_81213B0: @ 81213B0
thumb_func_start sub_81213D8
sub_81213D8: @ 81213D8
push {r4,r5,lr}
ldr r2, =0x0203a12c
ldr r0, =0x03005d8c
ldr r2, =gUnknown_0203A12C
ldr r0, =gUnknown_03005D8C
ldr r1, [r0]
ldr r3, =0x00002e28
adds r0, r1, r3
str r0, [r2]
ldr r5, =0x03001178
ldr r5, =gUnknown_03001178
ldrb r0, [r5]
ldr r2, =0x00002e2c
adds r1, r2
@@ -2480,8 +2480,8 @@ _0812141E:
thumb_func_start sub_8121424
sub_8121424: @ 8121424
push {lr}
ldr r1, =0x0203a12c
ldr r0, =0x03005d8c
ldr r1, =gUnknown_0203A12C
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r2, =0x00002e28
adds r0, r2
@@ -2502,8 +2502,8 @@ _0812144A:
thumb_func_start sub_8121450
sub_8121450: @ 8121450
push {lr}
ldr r1, =0x0203a12c
ldr r0, =0x03005d8c
ldr r1, =gUnknown_0203A12C
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r2, =0x00002e28
adds r0, r2
asm/menu_helpers.s
+24 -24
View File
@@ -126,12 +126,12 @@ DisplayMessageAndContinueTask: @ 8121E7C
lsrs r7, r4, 24
lsls r5, 24
lsrs r5, 24
ldr r0, =0x0203a140
ldr r0, =gUnknown_0203A140
strb r6, [r0]
adds r0, r6, 0
movs r1, 0x1
bl sub_8197B1C
ldr r4, =0x02021fc4
ldr r4, =gUnknown_02021FC4
ldr r0, [sp, 0x30]
cmp r0, r4
beq _08121EC0
@@ -139,7 +139,7 @@ DisplayMessageAndContinueTask: @ 8121E7C
ldr r1, [sp, 0x30]
bl ExpandStringRefs
_08121EC0:
ldr r2, =0x03003014
ldr r2, =gUnknown_03003014
ldrb r0, [r2]
movs r1, 0x1
orrs r0, r1
@@ -157,10 +157,10 @@ _08121EC0:
adds r2, r4, 0
adds r3, r5, 0
bl AddTextPrinterParametrized
ldr r1, =0x0300117c
ldr r1, =gUnknown_0300117C
ldr r0, [sp, 0x34]
str r0, [r1]
ldr r1, =0x03005e00
ldr r1, =gTasks
mov r2, r8
lsls r0, r2, 2
add r0, r8
@@ -199,13 +199,13 @@ Task_ContinueTaskAfterMessagePrints: @ 8121F3C
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =0x0203a140
ldr r0, =gUnknown_0203A140
ldrb r0, [r0]
bl sub_8121F20
lsls r0, 16
cmp r0, 0
bne _08121F5A
ldr r0, =0x0300117c
ldr r0, =gUnknown_0300117C
ldr r1, [r0]
adds r0, r4, 0
bl _call_via_r1
@@ -220,12 +220,12 @@ _08121F5A:
sub_8121F68: @ 8121F68
lsls r0, 24
lsrs r0, 24
ldr r3, =0x0203a138
ldr r3, =gUnknown_0203A138
ldr r2, [r1, 0x4]
ldr r1, [r1]
str r1, [r3]
str r2, [r3, 0x4]
ldr r2, =0x03005e00
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
@@ -253,12 +253,12 @@ CreateYesNoMenuWithCallbacks: @ 8121F94
lsrs r2, 24
movs r3, 0
bl CreateYesNoMenu
ldr r2, =0x0203a138
ldr r2, =gUnknown_0203A138
ldr r0, [r5]
ldr r1, [r5, 0x4]
str r0, [r2]
str r1, [r2, 0x4]
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
@@ -296,7 +296,7 @@ _08121FFC:
_08122002:
movs r0, 0x5
bl audio_play
ldr r0, =0x0203a138
ldr r0, =gUnknown_0203A138
ldr r1, [r0]
adds r0, r4, 0
bl _call_via_r1
@@ -305,7 +305,7 @@ _08122002:
_08122018:
movs r0, 0x5
bl audio_play
ldr r0, =0x0203a138
ldr r0, =gUnknown_0203A138
ldr r1, [r0, 0x4]
adds r0, r4, 0
bl _call_via_r1
@@ -326,7 +326,7 @@ AdjustQuantityAccordingToDPadInput: @ 8122034
adds r5, r1, 0
ldrh r4, [r2]
adds r6, r4, 0
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
ldrh r0, [r0, 0x30]
movs r3, 0xF0
ands r3, r0
@@ -409,12 +409,12 @@ _081220C8:
thumb_func_start GetLRKeysState
GetLRKeysState: @ 81220D0
push {lr}
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r0, [r0]
ldrb r0, [r0, 0x13]
cmp r0, 0x1
bne _08122106
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
ldrh r1, [r0, 0x2E]
movs r0, 0x80
lsls r0, 2
@@ -442,12 +442,12 @@ _08122108:
thumb_func_start sub_812210C
sub_812210C: @ 812210C
push {lr}
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r0, [r0]
ldrb r0, [r0, 0x13]
cmp r0, 0x1
bne _08122142
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
ldrh r1, [r0, 0x30]
movs r0, 0x80
lsls r0, 2
@@ -479,7 +479,7 @@ sub_8122148: @ 8122148
lsrs r0, 16
cmp r0, 0xAF
bne _08122174
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldrh r1, [r0, 0x4]
ldr r0, =0x00001919
@@ -533,7 +533,7 @@ sub_81221AC: @ 81221AC
bl is_c1_link_related_active
cmp r0, 0x1
beq _081221BE
ldr r0, =0x03003124
ldr r0, =gUnknown_03003124
ldrb r0, [r0]
cmp r0, 0x1
bne _081221C8
@@ -775,7 +775,7 @@ sub_8122344: @ 8122344
movs r5, 0
cmp r5, r6
bcs _0812239C
ldr r7, =0x02020630
ldr r7, =gUnknown_02020630
_08122358:
lsls r1, r5, 4
ldr r0, =gUnknown_0859F524
@@ -828,7 +828,7 @@ sub_81223B0: @ 81223B0
movs r4, 0
cmp r4, r5
bcs _081223F6
ldr r7, =0x02020630
ldr r7, =gUnknown_02020630
_081223C0:
subs r0, r5, 0x1
cmp r4, r0
@@ -873,7 +873,7 @@ sub_81223FC: @ 81223FC
movs r3, 0
cmp r3, r4
bcs _0812243E
ldr r1, =0x02020630
ldr r1, =gUnknown_02020630
mov r12, r1
movs r1, 0x1
ands r0, r1
@@ -930,7 +930,7 @@ sub_8122448: @ 8122448
movs r3, 0
cmp r3, r4
bcs _081224C8
ldr r5, =0x02020630
ldr r5, =gUnknown_02020630
lsls r0, r7, 16
asrs r0, 16
subs r0, 0x8
asm/mon_markings.s
+30 -30
View File
@@ -7,7 +7,7 @@
thumb_func_start sub_811F90C
sub_811F90C: @ 811F90C
ldr r1, =0x0203a124
ldr r1, =gUnknown_0203A124
str r0, [r1]
bx lr
.pool
@@ -17,12 +17,12 @@ sub_811F90C: @ 811F90C
sub_811F918: @ 811F918
push {lr}
sub sp, 0x4
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r0, [r0]
ldrb r0, [r0, 0x14]
lsrs r0, 3
bl sub_8098758
ldr r3, =0x0203a124
ldr r3, =gUnknown_0203A124
ldr r2, [r3]
ldr r1, [r0]
str r1, [r2, 0x2C]
@@ -47,7 +47,7 @@ sub_811F918: @ 811F918
thumb_func_start sub_811F960
sub_811F960: @ 811F960
push {r4-r7,lr}
ldr r0, =0x0203a124
ldr r0, =gUnknown_0203A124
ldr r1, [r0]
ldr r2, =0x000010b4
adds r0, r1, r2
@@ -76,7 +76,7 @@ _0811F98E:
adds r7, r5, 0
adds r7, 0xE0
_0811F99E:
ldr r6, =0x0203a124
ldr r6, =gUnknown_0203A124
ldr r0, [r6]
ldr r0, [r0, 0x2C]
adds r0, 0x20
@@ -101,7 +101,7 @@ _0811F99E:
b _0811FA1E
.pool
_0811F9D8:
ldr r0, =0x0203a124
ldr r0, =gUnknown_0203A124
ldr r0, [r0]
ldr r0, [r0, 0x2C]
adds r0, 0x60
@@ -112,7 +112,7 @@ _0811F9D8:
adds r7, r5, 0
adds r7, 0xE0
_0811F9EE:
ldr r6, =0x0203a124
ldr r6, =gUnknown_0203A124
ldr r0, [r6]
ldr r0, [r0, 0x2C]
adds r0, 0x80
@@ -150,7 +150,7 @@ _0811FA30:
adds r7, r5, 0
adds r7, 0xE0
_0811FA42:
ldr r6, =0x0203a124
ldr r6, =gUnknown_0203A124
ldr r0, [r6]
ldr r0, [r0, 0x2C]
adds r0, 0xE0
@@ -209,7 +209,7 @@ sub_811FAA4: @ 811FAA4
lsrs r5, r1, 16
lsls r2, 16
lsrs r6, r2, 16
ldr r2, =0x0203a124
ldr r2, =gUnknown_0203A124
ldr r3, [r2]
movs r1, 0
strb r1, [r3, 0x5]
@@ -250,7 +250,7 @@ _0811FAC2:
sub_811FAF8: @ 811FAF8
push {r4-r7,lr}
movs r5, 0
ldr r4, =0x0203a124
ldr r4, =gUnknown_0203A124
_0811FAFE:
ldr r0, [r4]
ldrh r0, [r0]
@@ -270,7 +270,7 @@ _0811FAFE:
cmp r5, 0x1
bls _0811FAFE
movs r5, 0
ldr r6, =0x0203a124
ldr r6, =gUnknown_0203A124
_0811FB28:
ldr r0, [r6]
lsls r4, r5, 2
@@ -291,7 +291,7 @@ _0811FB28:
cmp r5, 0x1
bls _0811FB28
movs r5, 0
ldr r6, =0x0203a124
ldr r6, =gUnknown_0203A124
_0811FB52:
ldr r0, [r6]
lsls r4, r5, 2
@@ -311,7 +311,7 @@ _0811FB52:
lsrs r5, r0, 16
cmp r5, 0x3
bls _0811FB52
ldr r4, =0x0203a124
ldr r4, =gUnknown_0203A124
ldr r0, [r4]
ldr r0, [r0, 0x24]
cmp r0, 0
@@ -337,7 +337,7 @@ _0811FB9A:
thumb_func_start sub_811FBA4
sub_811FBA4: @ 811FBA4
push {r4,r5,lr}
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
ldrh r1, [r0, 0x2E]
movs r0, 0x40
ands r0, r1
@@ -347,7 +347,7 @@ sub_811FBA4: @ 811FBA4
beq _0811FBDC
movs r0, 0x5
bl audio_play
ldr r2, =0x0203a124
ldr r2, =gUnknown_0203A124
ldr r1, [r2]
ldrb r0, [r1, 0x5]
subs r0, 0x1
@@ -369,7 +369,7 @@ _0811FBDC:
beq _0811FC0C
movs r0, 0x5
bl audio_play
ldr r2, =0x0203a124
ldr r2, =gUnknown_0203A124
ldr r1, [r2]
ldrb r0, [r1, 0x5]
adds r0, 0x1
@@ -389,7 +389,7 @@ _0811FC0C:
beq _0811FC68
movs r0, 0x5
bl audio_play
ldr r2, =0x0203a124
ldr r2, =gUnknown_0203A124
ldr r0, [r2]
movs r1, 0x5
ldrsb r1, [r0, r1]
@@ -467,7 +467,7 @@ sub_811FC80: @ 811FC80
lsrs r5, 16
lsls r6, 16
lsrs r6, 16
ldr r4, =0x0203a124
ldr r4, =gUnknown_0203A124
ldr r0, [r4]
adds r0, 0x34
str r0, [sp, 0x18]
@@ -562,7 +562,7 @@ _0811FD58:
bne _0811FD70
b _0811FEFC
_0811FD70:
ldr r6, =0x0203a124
ldr r6, =gUnknown_0203A124
ldr r2, [r6]
lsls r0, r5, 2
adds r2, 0xC
@@ -570,7 +570,7 @@ _0811FD70:
lsls r0, r3, 4
adds r0, r3
lsls r0, 2
ldr r1, =0x02020630
ldr r1, =gUnknown_02020630
adds r0, r1
str r0, [r2]
lsls r1, r5, 24
@@ -625,7 +625,7 @@ _0811FDC8:
bne _0811FDEE
b _0811FF0C
_0811FDEE:
ldr r6, =0x0203a124
ldr r6, =gUnknown_0203A124
ldr r1, [r6]
lsls r0, r5, 2
adds r1, 0x14
@@ -633,7 +633,7 @@ _0811FDEE:
lsls r0, r3, 4
adds r0, r3
lsls r0, 2
ldr r7, =0x02020630
ldr r7, =gUnknown_02020630
adds r0, r7
str r0, [r1]
strh r5, [r0, 0x2E]
@@ -712,12 +712,12 @@ _0811FEAE:
lsrs r3, r0, 24
cmp r3, 0x40
beq _0811FF20
ldr r0, =0x0203a124
ldr r0, =gUnknown_0203A124
ldr r2, [r0]
lsls r1, r3, 4
adds r1, r3
lsls r1, 2
ldr r0, =0x02020630
ldr r0, =gUnknown_02020630
adds r1, r0
str r1, [r2, 0x24]
ldr r3, [sp, 0x4C]
@@ -730,14 +730,14 @@ _0811FEAE:
b _0811FF28
.pool
_0811FEFC:
ldr r0, =0x0203a124
ldr r0, =gUnknown_0203A124
ldr r0, [r0]
lsls r1, r5, 2
adds r0, 0xC
b _0811FF14
.pool
_0811FF0C:
ldr r0, =0x0203a124
ldr r0, =gUnknown_0203A124
ldr r0, [r0]
lsls r1, r5, 2
adds r0, 0x14
@@ -748,7 +748,7 @@ _0811FF14:
b _0811FF28
.pool
_0811FF20:
ldr r0, =0x0203a124
ldr r0, =gUnknown_0203A124
ldr r1, [r0]
movs r0, 0
str r0, [r1, 0x24]
@@ -773,7 +773,7 @@ TaskDummy7: @ 811FF3C
sub_811FF40: @ 811FF40
push {lr}
adds r2, r0, 0
ldr r0, =0x0203a124
ldr r0, =gUnknown_0203A124
ldr r0, [r0]
movs r3, 0x2E
ldrsh r1, [r2, r3]
@@ -802,7 +802,7 @@ _0811FF76:
thumb_func_start sub_811FF7C
sub_811FF7C: @ 811FF7C
ldr r1, =0x0203a124
ldr r1, =gUnknown_0203A124
ldr r1, [r1]
ldrb r1, [r1, 0x5]
lsls r1, 24
@@ -916,7 +916,7 @@ _08120068:
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =0x02020630
ldr r1, =gUnknown_02020630
adds r0, r1
_08120072:
add sp, 0x28
asm/money.s
+15 -15
View File
@@ -8,7 +8,7 @@
thumb_func_start DecryptMoney
@ int DecryptMoney(u32 *moneyPointer)
DecryptMoney: @ 80E5114
ldr r1, =0x03005d90
ldr r1, =gUnknown_03005D90
ldr r1, [r1]
adds r1, 0xAC
ldr r0, [r0]
@@ -21,7 +21,7 @@ DecryptMoney: @ 80E5114
thumb_func_start EncryptMoney
@ void EncryptMoney(u32 *moneyPointer, u32 moneyAmount)
EncryptMoney: @ 80E5128
ldr r2, =0x03005d90
ldr r2, =gUnknown_03005D90
ldr r2, [r2]
adds r2, 0xAC
ldr r2, [r2]
@@ -103,12 +103,12 @@ _080E51A2:
thumb_func_start sub_80E51B0
sub_80E51B0: @ 80E51B0
push {lr}
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
movs r1, 0x92
lsls r1, 3
adds r0, r1
ldr r1, =0x020375e2
ldr r1, =gUnknown_020375E2
ldrh r1, [r1]
bl IsEnoughMoney
lsls r0, 24
@@ -121,12 +121,12 @@ sub_80E51B0: @ 80E51B0
thumb_func_start sub_80E51D4
sub_80E51D4: @ 80E51D4
push {lr}
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
movs r1, 0x92
lsls r1, 3
adds r0, r1
ldr r1, =0x020375e2
ldr r1, =gUnknown_020375E2
ldrh r1, [r1]
bl subtract_money
pop {r0}
@@ -170,7 +170,7 @@ PrintMoneyAmount: @ 80E5214
lsrs r6, r2, 24
lsls r4, 24
lsrs r5, r4, 24
ldr r4, =0x02021cc4
ldr r4, =gUnknown_02021CC4
adds r0, r4, 0
adds r1, r3, 0
movs r2, 0
@@ -182,7 +182,7 @@ PrintMoneyAmount: @ 80E5214
lsrs r0, 16
movs r1, 0x6
subs r1, r0
ldr r2, =0x02021fc4
ldr r2, =gUnknown_02021FC4
adds r0, r1, 0
subs r1, 0x1
cmp r0, 0
@@ -199,7 +199,7 @@ _080E5264:
ldr r1, =gUnknown_085E969C
adds r0, r2, 0
bl ExpandStringRefs
ldr r2, =0x02021fc4
ldr r2, =gUnknown_02021FC4
str r6, [sp]
str r5, [sp, 0x4]
movs r0, 0
@@ -253,7 +253,7 @@ set_window_border_style_and_print_money_box: @ 80E5298
sub_80E52D4: @ 80E52D4
push {lr}
adds r1, r0, 0
ldr r0, =0x02039f98
ldr r0, =gUnknown_02039F98
ldrb r0, [r0]
movs r2, 0
bl PrintMoneyAmountInMoneyBox
@@ -294,7 +294,7 @@ sub_80E52EC: @ 80E52EC
movs r1, 0
adds r2, r4, 0
bl rbox_template_set
ldr r4, =0x02039f98
ldr r4, =gUnknown_02039F98
add r0, sp, 0x10
bl AddWindow
strb r0, [r4]
@@ -338,7 +338,7 @@ sub_80E52EC: @ 80E52EC
sub_80E5384: @ 80E5384
push {r4,lr}
bl RemoveMoneyLabelObject
ldr r4, =0x02039f98
ldr r4, =gUnknown_02039F98
ldrb r0, [r4]
movs r1, 0
bl sub_8198070
@@ -375,7 +375,7 @@ AddMoneyLabelObject: @ 80E53AC
adds r2, r5, 0
movs r3, 0
bl AddObjectToFront
ldr r1, =0x02039f99
ldr r1, =gUnknown_02039F99
strb r0, [r1]
pop {r4,r5}
pop {r0}
@@ -386,12 +386,12 @@ AddMoneyLabelObject: @ 80E53AC
thumb_func_start RemoveMoneyLabelObject
RemoveMoneyLabelObject: @ 80E53F4
push {lr}
ldr r0, =0x02039f99
ldr r0, =gUnknown_02039F99
ldrb r1, [r0]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =0x02020630
ldr r1, =gUnknown_02020630
adds r0, r1
bl RemoveObjectAndFreeResources
pop {r0}
asm/multiboot.s
+3 -3
View File
@@ -242,7 +242,7 @@ _081BA892:
strb r0, [r1]
movs r5, 0x3
mov r12, r1
ldr r3, =0x0300129c
ldr r3, =gUnknown_0300129C
_081BA8A0:
lsls r0, r5, 1
ldr r2, =0x04000120
@@ -289,7 +289,7 @@ _081BA8F0:
mov r12, r0
mov r4, r12
movs r6, 0x1
ldr r1, =0x0300129c
ldr r1, =gUnknown_0300129C
mov r9, r1
ldr r2, =0x04000120
mov r8, r2
@@ -327,7 +327,7 @@ _081BA93C:
mov r12, r0
adds r6, r7, 0
adds r6, 0x19
ldr r1, =0x0300129c
ldr r1, =gUnknown_0300129C
mov r8, r1
_081BA94E:
lsls r0, r5, 1
asm/mystery_event_menu.s
+28 -28
View File
@@ -19,7 +19,7 @@ sub_8178944: @ 8178944
sub_8178958: @ 8178958
push {lr}
movs r2, 0
ldr r1, =0x020229e8
ldr r1, =gUnknown_020229E8
ldrh r0, [r1, 0x1A]
ldrh r1, [r1, 0x36]
cmp r0, r1
@@ -140,7 +140,7 @@ _08178A66:
sub_8178A78: @ 8178A78
push {r4-r6,lr}
sub sp, 0x8
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
movs r2, 0x87
lsls r2, 3
adds r0, r1, r2
@@ -196,7 +196,7 @@ _08178AE4:
movs r3, 0
b _08178E30
_08178B12:
ldr r0, =0x02037fd4
ldr r0, =gUnknown_02037FD4
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -211,7 +211,7 @@ _08178B20:
movs r2, 0x1
movs r3, 0x2
bl sub_8178EC4
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
movs r2, 0x87
lsls r2, 3
adds r1, r2
@@ -225,14 +225,14 @@ _08178B48:
beq _08178B56
b _08178E58
_08178B56:
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
movs r0, 0x87
lsls r0, 3
adds r1, r0
ldrb r0, [r1]
adds r0, 0x1
strb r0, [r1]
ldr r1, =0x020229c6
ldr r1, =gUnknown_020229C6
ldr r2, =0x00005501
adds r0, r2, 0
strh r0, [r1]
@@ -240,7 +240,7 @@ _08178B56:
b _08178E58
.pool
_08178B80:
ldr r0, =0x030030e0
ldr r0, =gUnknown_030030E0
ldr r1, [r0]
movs r0, 0x20
ands r0, r1
@@ -263,7 +263,7 @@ _08178B98:
movs r2, 0x1
movs r3, 0x2
bl sub_8178EC4
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
movs r0, 0x87
lsls r0, 3
adds r1, r0
@@ -287,7 +287,7 @@ _08178BDC:
lsrs r2, r0, 24
cmp r2, 0x2
bne _08178CD0
ldr r4, =0x030022c0
ldr r4, =gUnknown_030022C0
ldrh r1, [r4, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -337,7 +337,7 @@ _08178C54:
lsls r0, 24
cmp r0, 0
beq _08178D00
ldr r0, =0x03003124
ldr r0, =gUnknown_03003124
ldrb r0, [r0]
cmp r0, 0
bne _08178C68
@@ -351,7 +351,7 @@ _08178C68:
cmp r0, 0x3
bne _08178CAC
bl sub_800AC34
ldr r4, =0x02021fc4
ldr r4, =gUnknown_02021FC4
adds r0, r4, 0
movs r1, 0x1
bl sub_8178A40
@@ -362,7 +362,7 @@ _08178C68:
movs r2, 0x1
movs r3, 0x2
bl sub_8178EC4
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
movs r2, 0x87
lsls r2, 3
adds r0, r2
@@ -385,7 +385,7 @@ _08178CAC:
_08178CCC:
bl sub_80097E8
_08178CD0:
ldr r4, =0x02021fc4
ldr r4, =gUnknown_02021FC4
adds r0, r4, 0
movs r1, 0x1
bl sub_8178A40
@@ -396,7 +396,7 @@ _08178CD0:
movs r2, 0x1
movs r3, 0x2
bl sub_8178EC4
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
movs r1, 0x87
lsls r1, 3
adds r0, r1
@@ -406,7 +406,7 @@ _08178CF2:
b _08178E58
.pool
_08178D00:
ldr r4, =0x030022c0
ldr r4, =gUnknown_030022C0
ldrh r1, [r4, 0x2E]
movs r0, 0x2
ands r0, r1
@@ -442,7 +442,7 @@ _08178D38:
b _08178E58
_08178D44:
bl sub_800A5B4
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
movs r2, 0x87
lsls r2, 3
adds r1, r2
@@ -455,14 +455,14 @@ _08178D58:
b _08178E3C
_08178D60:
bl sub_800AC34
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
movs r2, 0x87
lsls r2, 3
adds r1, r2
b _08178E3C
.pool
_08178D74:
ldr r0, =0x03003124
ldr r0, =gUnknown_03003124
ldrb r6, [r0]
cmp r6, 0
bne _08178E58
@@ -477,7 +477,7 @@ _08178D74:
add r0, sp, 0x4
adds r1, r5, 0
bl CpuSet
ldr r0, =0x02021fc4
ldr r0, =gUnknown_02021FC4
adds r1, r4, 0
bl sub_8178A40
lsls r0, 24
@@ -488,14 +488,14 @@ _08178D74:
b _08178E34
.pool
_08178DBC:
ldr r1, =0x02021fc4
ldr r1, =gUnknown_02021FC4
movs r0, 0x1
str r0, [sp]
movs r0, 0
movs r2, 0x1
movs r3, 0x2
bl sub_8178EC4
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
movs r2, 0x87
lsls r2, 3
adds r1, r2
@@ -508,14 +508,14 @@ _08178DE0:
lsrs r2, r0, 16
cmp r2, 0
bne _08178E58
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
movs r1, 0x87
lsls r1, 3
adds r0, r1
ldrb r1, [r0]
adds r1, 0x1
strb r1, [r0]
ldr r0, =0x0203bcf8
ldr r0, =gUnknown_0203BCF8
strb r2, [r0]
b _08178E58
.pool
@@ -541,7 +541,7 @@ _08178E24:
_08178E30:
bl pal_fade_maybe
_08178E34:
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
movs r0, 0x87
lsls r0, 3
adds r1, r0
@@ -552,7 +552,7 @@ _08178E3C:
b _08178E58
.pool
_08178E48:
ldr r0, =0x02037fd4
ldr r0, =gUnknown_02037FD4
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -560,7 +560,7 @@ _08178E48:
bne _08178E58
bl Reset
_08178E58:
ldr r0, =0x030030e0
ldr r0, =gUnknown_030030E0
ldr r0, [r0]
movs r1, 0x40
ands r0, r1
@@ -571,7 +571,7 @@ _08178E58:
cmp r0, 0
bne _08178E98
bl sub_80097E8
ldr r4, =0x02021fc4
ldr r4, =gUnknown_02021FC4
adds r0, r4, 0
movs r1, 0x1
bl sub_8178A40
@@ -582,7 +582,7 @@ _08178E58:
movs r2, 0x1
movs r3, 0x2
bl sub_8178EC4
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
movs r1, 0x87
lsls r1, 3
adds r0, r1
asm/mystery_event_script.s
+29 -29
View File
@@ -42,7 +42,7 @@ _081537FE:
thumb_func_start sub_8153804
sub_8153804: @ 8153804
push {lr}
ldr r0, =0x02021fc4
ldr r0, =gUnknown_02021FC4
ldr r1, =gUnknown_08674C86
bl ExpandStringRefs
movs r0, 0x3
@@ -99,7 +99,7 @@ _0815386A:
sub_8153870: @ 8153870
push {lr}
adds r1, r0, 0
ldr r0, =0x0203bbc0
ldr r0, =gUnknown_0203BBC0
bl sub_8153820
pop {r0}
bx r0
@@ -110,7 +110,7 @@ sub_8153870: @ 8153870
sub_8153884: @ 8153884
push {r4,r5,lr}
adds r5, r0, 0
ldr r4, =0x0203bbc0
ldr r4, =gUnknown_0203BBC0
adds r0, r4, 0
bl sub_8153850
ldr r1, [r4, 0x6C]
@@ -125,7 +125,7 @@ sub_8153884: @ 8153884
sub_81538A0: @ 81538A0
push {r4,lr}
adds r1, r0, 0
ldr r4, =0x0203bbc0
ldr r4, =gUnknown_0203BBC0
adds r0, r4, 0
bl sub_8153820
_081538AC:
@@ -142,7 +142,7 @@ _081538AC:
thumb_func_start sub_81538C4
sub_81538C4: @ 81538C4
ldr r1, =0x0203bbc0
ldr r1, =gUnknown_0203BBC0
str r0, [r1, 0x6C]
bx lr
.pool
@@ -152,7 +152,7 @@ sub_81538C4: @ 81538C4
sub_81538D0: @ 81538D0
push {lr}
movs r2, 0
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r1, =0x00003b18
adds r3, r0, r1
@@ -173,7 +173,7 @@ _081538DE:
thumb_func_start sub_81538F8
sub_81538F8: @ 81538F8
push {r4,r5,lr}
ldr r5, =0x03005d8c
ldr r5, =gUnknown_03005D8C
ldr r0, [r5]
ldr r1, =0x00003b18
adds r4, r0, r1
@@ -215,7 +215,7 @@ sub_8153944: @ 8153944
mov r1, sp
movs r0, 0
strh r0, [r1]
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r1, [r0]
ldr r0, =0x00003b14
adds r1, r0
@@ -250,7 +250,7 @@ _08153990:
bl sub_8153944
b _081539BC
_08153996:
ldr r4, =0x03005d8c
ldr r4, =gUnknown_03005D8C
ldr r0, [r4]
ldr r1, =0x00003b18
adds r0, r1
@@ -278,7 +278,7 @@ _081539BC:
thumb_func_start sub_81539D4
sub_81539D4: @ 81539D4
push {r4-r6,lr}
ldr r6, =0x03005d8c
ldr r6, =gUnknown_03005D8C
ldr r0, [r6]
ldr r1, =0x00003b18
adds r4, r0, r1
@@ -399,7 +399,7 @@ sub_8153A94: @ 8153A94
cmp r5, r0
bne _08153ABE
_08153AB8:
ldr r0, =0x02021fc4
ldr r0, =gUnknown_02021FC4
bl ExpandStringRefs
_08153ABE:
movs r0, 0
@@ -441,9 +441,9 @@ sub_8153AE8: @ 8153AE8
subs r4, r0
ldr r0, [r7, 0x64]
adds r4, r0
ldr r0, =0x02021cc4
ldr r0, =gUnknown_02021CC4
mov r9, r0
ldr r6, =0x03005d8c
ldr r6, =gUnknown_03005D8C
ldr r1, [r6]
ldr r5, =0x000031f8
adds r1, r5
@@ -451,7 +451,7 @@ sub_8153AE8: @ 8153AE8
bl CopyString_LimitN
adds r0, r4, 0
bl sub_80E15E4
ldr r4, =0x02021dc4
ldr r4, =gUnknown_02021DC4
ldr r1, [r6]
adds r1, r5
adds r0, r4, 0
@@ -460,7 +460,7 @@ sub_8153AE8: @ 8153AE8
mov r0, r8
cmp r0, 0
bne _08153B54
ldr r0, =0x02021fc4
ldr r0, =gUnknown_02021FC4
ldr r1, =gUnknown_08674AE4
b _08153B74
.pool
@@ -470,12 +470,12 @@ _08153B54:
bl CompareString
cmp r0, 0
beq _08153B70
ldr r0, =0x02021fc4
ldr r0, =gUnknown_02021FC4
ldr r1, =gUnknown_08674B16
b _08153B74
.pool
_08153B70:
ldr r0, =0x02021fc4
ldr r0, =gUnknown_02021FC4
ldr r1, =gUnknown_08674B42
_08153B74:
bl ExpandStringRefs
@@ -514,7 +514,7 @@ sub_8153BB0: @ 8153BB0
adds r2, 0x1
str r2, [r4, 0x8]
bl sub_80F9B30
ldr r0, =0x02021fc4
ldr r0, =gUnknown_02021FC4
ldr r1, =gUnknown_08674B6A
bl ExpandStringRefs
movs r0, 0x2
@@ -583,7 +583,7 @@ sub_8153C4C: @ 8153C4C
push {r4,lr}
adds r4, r0, 0
bl sub_809D3E8
ldr r0, =0x02021fc4
ldr r0, =gUnknown_02021FC4
ldr r1, =gUnknown_08674B9E
bl ExpandStringRefs
movs r0, 0x2
@@ -604,7 +604,7 @@ sub_8153C70: @ 8153C70
adds r1, 0x1
str r1, [r4, 0x8]
bl sub_811EFC0
ldr r0, =0x02021fc4
ldr r0, =gUnknown_02021FC4
ldr r1, =gUnknown_08674BD4
bl ExpandStringRefs
movs r0, 0x2
@@ -668,30 +668,30 @@ sub_8153CC8: @ 8153CC8
lsls r0, 1
cmp r4, r0
bne _08153D18
ldr r0, =0x02021cc4
ldr r0, =gUnknown_02021CC4
ldr r1, =gUnknown_085E8264
movs r2, 0xB
bl CopyString_LimitN
b _08153D22
.pool
_08153D18:
ldr r0, =0x02021cc4
ldr r0, =gUnknown_02021CC4
ldr r1, =gUnknown_085E8268
movs r2, 0xB
bl CopyString_LimitN
_08153D22:
ldr r0, =0x020244e9
ldr r0, =gUnknown_020244E9
ldrb r0, [r0]
cmp r0, 0x6
bne _08153D4C
ldr r0, =0x02021fc4
ldr r0, =gUnknown_02021FC4
ldr r1, =gUnknown_08674C02
bl ExpandStringRefs
movs r0, 0x3
b _08153DB6
.pool
_08153D4C:
ldr r7, =0x020246e0
ldr r7, =gUnknown_020246E0
adds r0, r7, 0
adds r1, r5, 0
movs r2, 0x64
@@ -731,7 +731,7 @@ _08153D86:
_08153DA4:
bl party_compaction
bl calc_player_party_count
ldr r0, =0x02021fc4
ldr r0, =gUnknown_02021FC4
ldr r1, =gUnknown_08674BF0
bl ExpandStringRefs
movs r0, 0x2
@@ -757,14 +757,14 @@ sub_8153DD4: @ 8153DD4
subs r1, r0
ldr r0, [r4, 0x64]
adds r1, r0
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r0, [r0]
ldr r2, =0x00000bec
adds r0, r2
movs r2, 0xBC
bl memcpy
bl sub_81652B4
ldr r0, =0x02021fc4
ldr r0, =gUnknown_02021FC4
ldr r1, =gUnknown_08674C31
bl ExpandStringRefs
movs r0, 0x2
@@ -781,7 +781,7 @@ sub_8153E1C: @ 8153E1C
push {r4,lr}
adds r4, r0, 0
bl sub_809D5F4
ldr r0, =0x02021fc4
ldr r0, =gUnknown_02021FC4
ldr r1, =gUnknown_085ECAD8
bl ExpandStringRefs
movs r0, 0x2
asm/naming_screen.s
+104 -104
View File
@@ -18,7 +18,7 @@ do_choose_name_or_words_screen: @ 80E2D78
lsrs r5, r2, 16
lsls r3, 16
lsrs r6, r3, 16
ldr r4, =0x02039f94
ldr r4, =gUnknown_02039F94
movs r0, 0xF2
lsls r0, 5
bl Alloc
@@ -70,7 +70,7 @@ _080E2DE2:
thumb_func_start c2_choose_name_or_words_screen
c2_choose_name_or_words_screen: @ 80E2E04
push {lr}
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
movs r1, 0x87
lsls r1, 3
adds r0, r1
@@ -121,7 +121,7 @@ _080E2E7A:
bl fade_and_return_progress_probably
bl sub_80E501C
_080E2E86:
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
movs r0, 0x87
lsls r0, 3
adds r1, r0
@@ -142,7 +142,7 @@ _080E2EA4:
@ void choose_name_or_words_screen_setup()
choose_name_or_words_screen_setup: @ 80E2EA8
push {r4-r7,lr}
ldr r5, =0x02039f94
ldr r5, =gUnknown_02039F94
ldr r0, [r5]
ldr r1, =0x00001e10
adds r0, r1
@@ -209,7 +209,7 @@ choose_name_or_words_screen_setup: @ 80E2EA8
strh r0, [r1]
_080E2F2C:
ldr r0, [r5]
ldr r4, =0x030022b0
ldr r4, =gUnknown_030022B0
ldrh r1, [r4]
ldr r2, =0x00001e25
adds r0, r2
@@ -247,7 +247,7 @@ _080E2F64:
sub_80E2FA4: @ 80E2FA4
push {r4,r5,lr}
movs r3, 0
ldr r4, =0x02020630
ldr r4, =gUnknown_02020630
movs r5, 0x5
negs r5, r5
_080E2FAE:
@@ -395,7 +395,7 @@ _080E30D8:
ldr r1, =gUnknown_0858BE10
adds r0, r1
bl AddWindow
ldr r5, =0x02039f94
ldr r5, =gUnknown_02039F94
ldr r1, [r5]
ldr r2, =0x00001e11
adds r1, r2
@@ -479,7 +479,7 @@ sub_80E3194: @ 80E3194
thumb_func_start sub_80E31B0
sub_80E31B0: @ 80E31B0
push {lr}
ldr r0, =0x02039f94
ldr r0, =gUnknown_02039F94
ldr r0, [r0]
ldr r1, =0x00001e10
adds r0, r1
@@ -553,7 +553,7 @@ sub_80E3244: @ 80E3244
thumb_func_start sub_80E3254
sub_80E3254: @ 80E3254
ldr r1, =gUnknown_0858BEBE
ldr r0, =0x02039f94
ldr r0, =gUnknown_02039F94
ldr r0, [r0]
ldr r2, =0x00001e22
adds r0, r2
@@ -567,7 +567,7 @@ sub_80E3254: @ 80E3254
thumb_func_start sub_80E3274
sub_80E3274: @ 80E3274
ldr r1, =gUnknown_0858BEC1
ldr r0, =0x02039f94
ldr r0, =gUnknown_02039F94
ldr r0, [r0]
ldr r2, =0x00001e22
adds r0, r2
@@ -585,7 +585,7 @@ sub_80E3294: @ 80E3294
ldr r1, =gUnknown_08DD4544
movs r0, 0x3
bl sub_80E4CF8
ldr r5, =0x02039f94
ldr r5, =gUnknown_02039F94
ldr r0, [r5]
ldr r1, =0x00001e22
adds r0, r1
@@ -654,7 +654,7 @@ sub_80E3294: @ 80E3294
thumb_func_start sub_80E335C
sub_80E335C: @ 80E335C
push {lr}
ldr r0, =0x02037fd4
ldr r0, =gUnknown_02037FD4
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -664,7 +664,7 @@ sub_80E335C: @ 80E335C
bl sub_80E4630
movs r0, 0x1
bl sub_80E3E94
ldr r0, =0x02039f94
ldr r0, =gUnknown_02039F94
ldr r1, [r0]
ldr r0, =0x00001e10
adds r1, r0
@@ -698,7 +698,7 @@ sub_80E33A8: @ 80E33A8
movs r0, 0x1
bl sub_80E4630
bl sub_80E3E28
ldr r0, =0x02039f94
ldr r0, =gUnknown_02039F94
ldr r0, [r0]
ldr r1, =0x00001e10
adds r0, r1
@@ -723,7 +723,7 @@ pokemon_store: @ 80E33D8
movs r1, 0
movs r2, 0x1
bl sub_80E3948
ldr r4, =0x02039f94
ldr r4, =gUnknown_02039F94
ldr r0, [r4]
ldr r1, =0x00001e2c
adds r0, r1
@@ -745,7 +745,7 @@ pokemon_store: @ 80E33D8
b _080E343A
.pool
_080E342C:
ldr r0, =0x02039f94
ldr r0, =gUnknown_02039F94
ldr r0, [r0]
ldr r1, =0x00001e10
adds r0, r1
@@ -770,7 +770,7 @@ sub_80E3448: @ 80E3448
movs r2, 0
movs r3, 0x10
bl pal_fade_maybe
ldr r0, =0x02039f94
ldr r0, =gUnknown_02039F94
ldr r1, [r0]
ldr r0, =0x00001e10
adds r1, r0
@@ -787,7 +787,7 @@ sub_80E3448: @ 80E3448
thumb_func_start sub_80E347C
sub_80E347C: @ 80E347C
push {r4,r5,lr}
ldr r0, =0x02037fd4
ldr r0, =gUnknown_02037FD4
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -795,7 +795,7 @@ sub_80E347C: @ 80E347C
lsrs r5, r0, 24
cmp r5, 0
bne _080E34C6
ldr r4, =0x02039f94
ldr r4, =gUnknown_02039F94
ldr r0, [r4]
ldr r1, =0x00001e2c
adds r0, r1
@@ -835,7 +835,7 @@ pokemon_transfer_to_pc_with_message: @ 80E34E4
lsls r0, 24
cmp r0, 0
bne _080E3534
ldr r4, =0x02021cc4
ldr r4, =gUnknown_02021CC4
ldr r0, =0x00004036
bl VarGet
lsls r0, 24
@@ -844,8 +844,8 @@ pokemon_transfer_to_pc_with_message: @ 80E34E4
adds r1, r0, 0
adds r0, r4, 0
bl CopyString
ldr r0, =0x02021dc4
ldr r1, =0x02039f94
ldr r0, =gUnknown_02021DC4
ldr r1, =gUnknown_02039F94
ldr r1, [r1]
ldr r2, =0x00001e30
adds r1, r2
@@ -854,7 +854,7 @@ pokemon_transfer_to_pc_with_message: @ 80E34E4
b _080E3574
.pool
_080E3534:
ldr r4, =0x02021cc4
ldr r4, =gUnknown_02021CC4
ldr r0, =0x00004036
bl VarGet
lsls r0, 24
@@ -863,14 +863,14 @@ _080E3534:
adds r1, r0, 0
adds r0, r4, 0
bl CopyString
ldr r0, =0x02021dc4
ldr r1, =0x02039f94
ldr r0, =gUnknown_02021DC4
ldr r1, =gUnknown_02039F94
ldr r1, [r1]
ldr r2, =0x00001e30
adds r1, r2
ldr r1, [r1]
bl CopyString
ldr r4, =0x02021ec4
ldr r4, =gUnknown_02021EC4
bl get_unknown_box_id
lsls r0, 24
lsrs r0, 24
@@ -889,7 +889,7 @@ _080E3574:
lsls r0, 24
lsrs r5, r0, 24
_080E3586:
ldr r4, =0x02021fc4
ldr r4, =gUnknown_02021FC4
ldr r1, =gUnknown_0858BDB8
lsls r0, r5, 2
adds r0, r1
@@ -899,7 +899,7 @@ _080E3586:
movs r0, 0
movs r1, 0
bl sub_81973C4
ldr r2, =0x03003014
ldr r2, =gUnknown_03003014
ldrb r0, [r2]
movs r1, 0x1
orrs r0, r1
@@ -939,13 +939,13 @@ sub_80E3604: @ 80E3604
lsls r0, 16
cmp r0, 0
bne _080E362E
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
cmp r0, 0
beq _080E362E
ldr r0, =0x02039f94
ldr r0, =gUnknown_02039F94
ldr r0, [r0]
ldr r1, =0x00001e10
adds r0, r1
@@ -973,7 +973,7 @@ sub_80E3640: @ 80E3640
bl sub_80E3948
movs r0, 0x6
bl audio_play
ldr r0, =0x02039f94
ldr r0, =gUnknown_02039F94
ldr r0, [r0]
ldr r1, =0x00001e10
adds r0, r1
@@ -1010,7 +1010,7 @@ sub_80E3680: @ 80E3680
bne _080E36B2
movs r5, 0x1
_080E36B2:
ldr r2, =0x02039f94
ldr r2, =gUnknown_02039F94
ldr r0, [r2]
ldr r1, =0x00001e10
adds r0, r1
@@ -1094,7 +1094,7 @@ sub_80E375C: @ 80E375C
lsls r0, 24
lsrs r0, 24
ldr r5, =gUnknown_0858BEC4
ldr r2, =0x03005e00
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
@@ -1137,7 +1137,7 @@ _080E37AE:
thumb_func_start sub_80E37B4
sub_80E37B4: @ 80E37B4
ldr r1, =0x02039f94
ldr r1, =gUnknown_02039F94
ldr r1, [r1]
ldr r3, =0x00001e18
adds r2, r1, r3
@@ -1159,7 +1159,7 @@ sub_80E37DC: @ 80E37DC
push {r4,r5,lr}
sub sp, 0x8
adds r4, r0, 0
ldr r5, =0x02039f94
ldr r5, =gUnknown_02039F94
ldr r0, [r5]
ldr r2, =0x00001e1a
adds r1, r0, r2
@@ -1227,7 +1227,7 @@ sub_80E3870: @ 80E3870
push {r4,r5,lr}
sub sp, 0x8
adds r4, r0, 0
ldr r5, =0x02039f94
ldr r5, =gUnknown_02039F94
ldr r0, [r5]
ldr r2, =0x00001e1a
adds r1, r0, r2
@@ -1314,7 +1314,7 @@ sub_80E3920: @ 80E3920
bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
@@ -1342,7 +1342,7 @@ sub_80E3948: @ 80E3948
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
ldr r0, =0x03005e00
ldr r0, =gTasks
adds r4, r1, r0
movs r1, 0x8
ldrsh r0, [r4, r1]
@@ -1392,7 +1392,7 @@ c3_0809E58C: @ 80E39BC
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
ldr r0, =0x03005e00
ldr r0, =gTasks
adds r4, r1, r0
ldrh r1, [r4, 0x8]
movs r2, 0x8
@@ -1545,10 +1545,10 @@ sub_80E3AE8: @ 80E3AE8
lsrs r0, 24
bl sub_80E3A74
lsls r0, 16
ldr r2, =0x02037b14
ldr r2, =gUnknown_02037B14
lsrs r0, 15
adds r2, r0, r2
ldr r1, =0x02037714
ldr r1, =gUnknown_02037714
adds r0, r1
ldrh r0, [r0]
strh r0, [r2]
@@ -1813,14 +1813,14 @@ sub_80E3CE4: @ 80E3CE4
movs r2, 0x58
movs r3, 0x1
bl AddObjectToFront
ldr r5, =0x02039f94
ldr r5, =gUnknown_02039F94
ldr r1, [r5]
ldr r4, =0x00001e23
adds r1, r4
strb r0, [r1]
movs r0, 0x1
bl sub_80E3E3C
ldr r6, =0x02020630
ldr r6, =gUnknown_02020630
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
@@ -1880,7 +1880,7 @@ sub_80E3D78: @ 80E3D78
lsls r0, 16
lsls r1, 16
lsrs r7, r1, 16
ldr r1, =0x02039f94
ldr r1, =gUnknown_02039F94
ldr r1, [r1]
ldr r2, =0x00001e23
adds r1, r2
@@ -1888,7 +1888,7 @@ sub_80E3D78: @ 80E3D78
lsls r1, r2, 4
adds r1, r2
lsls r1, 2
ldr r2, =0x02020630
ldr r2, =gUnknown_02020630
adds r5, r1, r2
lsrs r1, r0, 16
mov r8, r1
@@ -1935,7 +1935,7 @@ _080E3DDA:
thumb_func_start sub_80E3DFC
sub_80E3DFC: @ 80E3DFC
ldr r2, =0x02039f94
ldr r2, =gUnknown_02039F94
ldr r2, [r2]
ldr r3, =0x00001e23
adds r2, r3
@@ -1943,7 +1943,7 @@ sub_80E3DFC: @ 80E3DFC
lsls r2, r3, 4
adds r2, r3
lsls r2, 2
ldr r3, =0x02020630
ldr r3, =gUnknown_02020630
adds r2, r3
ldrh r3, [r2, 0x2E]
strh r3, [r0]
@@ -1970,8 +1970,8 @@ sub_80E3E3C: @ 80E3E3C
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
ldr r5, =0x02020630
ldr r1, =0x02039f94
ldr r5, =gUnknown_02020630
ldr r1, =gUnknown_02039F94
ldr r4, [r1]
ldr r1, =0x00001e23
adds r4, r1
@@ -2009,8 +2009,8 @@ sub_80E3E3C: @ 80E3E3C
sub_80E3E94: @ 80E3E94
push {r4,r5,lr}
lsls r0, 24
ldr r5, =0x02020630
ldr r1, =0x02039f94
ldr r5, =gUnknown_02020630
ldr r1, =gUnknown_02039F94
ldr r4, [r1]
ldr r1, =0x00001e23
adds r4, r1
@@ -2041,7 +2041,7 @@ sub_80E3E94: @ 80E3E94
thumb_func_start sub_80E3ED8
sub_80E3ED8: @ 80E3ED8
push {lr}
ldr r0, =0x02039f94
ldr r0, =gUnknown_02039F94
ldr r0, [r0]
ldr r1, =0x00001e23
adds r0, r1
@@ -2049,7 +2049,7 @@ sub_80E3ED8: @ 80E3ED8
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =0x02020630
ldr r1, =gUnknown_02020630
adds r0, r1
movs r1, 0x1
bl StartObjectImageAnim
@@ -2060,8 +2060,8 @@ sub_80E3ED8: @ 80E3ED8
thumb_func_start sub_80E3F04
sub_80E3F04: @ 80E3F04
ldr r2, =0x02020630
ldr r0, =0x02039f94
ldr r2, =gUnknown_02020630
ldr r0, =gUnknown_02039F94
ldr r0, [r0]
ldr r1, =0x00001e23
adds r0, r1
@@ -2138,7 +2138,7 @@ sub_80E3F8C: @ 80E3F8C
bl AddObjectToFront
lsls r0, 24
lsrs r0, 24
ldr r1, =0x02039f94
ldr r1, =gUnknown_02039F94
ldr r1, [r1]
ldr r2, =0x00001e24
adds r1, r2
@@ -2146,7 +2146,7 @@ sub_80E3F8C: @ 80E3F8C
lsls r5, r0, 4
adds r5, r0
lsls r5, 2
ldr r0, =0x02020630
ldr r0, =gUnknown_02020630
mov r8, r0
add r5, r8
ldr r1, =gUnknown_0858C050
@@ -2209,7 +2209,7 @@ sub_80E3F8C: @ 80E3F8C
thumb_func_start sub_80E4050
sub_80E4050: @ 80E4050
ldr r0, =0x02039f94
ldr r0, =gUnknown_02039F94
ldr r2, [r0]
ldr r1, =0x00001e24
adds r0, r2, r1
@@ -2217,7 +2217,7 @@ sub_80E4050: @ 80E4050
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =0x02020630
ldr r1, =gUnknown_02020630
adds r0, r1
movs r1, 0x2
strh r1, [r0, 0x2E]
@@ -2260,7 +2260,7 @@ sub_80E40AC: @ 80E40AC
lsls r5, r0, 4
adds r5, r0
lsls r5, 2
ldr r1, =0x02020630
ldr r1, =gUnknown_02020630
adds r5, r1
movs r2, 0x3C
ldrsh r0, [r6, r2]
@@ -2268,7 +2268,7 @@ sub_80E40AC: @ 80E40AC
adds r4, r0
lsls r4, 2
adds r4, r1
ldr r0, =0x02039f94
ldr r0, =gUnknown_02039F94
ldr r0, [r0]
ldr r1, =0x00001e22
adds r0, r1
@@ -2304,7 +2304,7 @@ sub_80E4104: @ 80E4104
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r2, =0x02020630
ldr r2, =gUnknown_02020630
adds r4, r0, r2
movs r0, 0x3C
ldrsh r1, [r3, r0]
@@ -2361,7 +2361,7 @@ sub_80E4178: @ 80E4178
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =0x02020630
ldr r1, =gUnknown_02020630
adds r2, r0, r1
adds r3, r2, 0
adds r3, 0x3E
@@ -2450,7 +2450,7 @@ sub_80E4218: @ 80E4218
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
ldr r6, =0x02020630
ldr r6, =gUnknown_02020630
adds r4, r6
ldr r0, =gUnknown_0858C070
mov r8, r0
@@ -2491,7 +2491,7 @@ sub_80E4218: @ 80E4218
thumb_func_start sub_80E4290
sub_80E4290: @ 80E4290
push {r4-r6,lr}
ldr r5, =0x02039f94
ldr r5, =gUnknown_02039F94
ldr r0, [r5]
ldr r4, =0x00001e16
adds r0, r4
@@ -2505,7 +2505,7 @@ sub_80E4290: @ 80E4290
bl AddObjectToFront
lsls r0, 24
lsrs r1, r0, 24
ldr r3, =0x02020630
ldr r3, =gUnknown_02020630
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
@@ -2563,7 +2563,7 @@ _080E42E2:
adds r4, 0x8
lsls r4, 16
lsrs r1, r4, 16
ldr r0, =0x02039f94
ldr r0, =gUnknown_02039F94
ldr r0, [r0]
ldr r2, =0x00001e28
adds r0, r2
@@ -2582,7 +2582,7 @@ _080E4334:
sub_80E4354: @ 80E4354
push {lr}
ldr r1, =gUnknown_0858BF04
ldr r0, =0x02039f94
ldr r0, =gUnknown_02039F94
ldr r0, [r0]
ldr r2, =0x00001e28
adds r0, r2
@@ -2606,7 +2606,7 @@ TaskDummy2: @ 80E4380
sub_80E4384: @ 80E4384
push {lr}
sub sp, 0x4
ldr r0, =0x02039f94
ldr r0, =gUnknown_02039F94
ldr r0, [r0]
ldr r1, =0x00001e34
adds r0, r1
@@ -2624,7 +2624,7 @@ sub_80E4384: @ 80E4384
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
ldr r2, =0x02020630
ldr r2, =gUnknown_02020630
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
@@ -2654,7 +2654,7 @@ sub_80E43E0: @ 80E43E0
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
ldr r0, =0x02020630
ldr r0, =gUnknown_02020630
adds r4, r0
ldr r1, =gUnknown_0858C078
adds r0, r4, 0
@@ -2674,7 +2674,7 @@ sub_80E4420: @ 80E4420
push {lr}
sub sp, 0xC
bl sub_80D2F04
ldr r0, =0x02039f94
ldr r0, =gUnknown_02039F94
ldr r3, [r0]
ldr r1, =0x00001e34
adds r0, r3, r1
@@ -2693,7 +2693,7 @@ sub_80E4420: @ 80E4420
bl sub_80D2CC4
lsls r0, 24
lsrs r0, 24
ldr r2, =0x02020630
ldr r2, =gUnknown_02020630
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
@@ -2722,7 +2722,7 @@ sub_80E447C: @ 80E447C
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
ldr r2, =0x02020630
ldr r2, =gUnknown_02020630
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
@@ -2803,7 +2803,7 @@ sub_80E450C: @ 80E450C
beq _080E4546
movs r0, 0x2
bl sub_80E4630
ldr r0, =0x02039f94
ldr r0, =gUnknown_02039F94
ldr r0, [r0]
ldr r1, =0x00001e10
adds r0, r1
@@ -2878,7 +2878,7 @@ sub_80E45A4: @ 80E45A4
_080E45BE:
movs r0, 0x5
bl audio_play
ldr r0, =0x02039f94
ldr r0, =gUnknown_02039F94
ldr r0, [r0]
ldr r1, =0x00001e10
adds r0, r1
@@ -2894,7 +2894,7 @@ _080E45D2:
thumb_func_start sub_80E45E0
sub_80E45E0: @ 80E45E0
ldr r0, =0x02039f94
ldr r0, =gUnknown_02039F94
ldr r0, [r0]
ldr r1, =0x00001e10
adds r0, r1
@@ -2923,7 +2923,7 @@ sub_80E460C: @ 80E460C
bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
@@ -2944,7 +2944,7 @@ sub_80E4630: @ 80E4630
bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
@@ -2963,7 +2963,7 @@ sub_80E465C: @ 80E465C
lsls r1, 24
lsrs r1, 24
ldr r3, =gUnknown_0858BF28
ldr r2, =0x03005e00
ldr r2, =gTasks
lsls r0, r1, 2
adds r0, r1
lsls r0, 3
@@ -2992,7 +2992,7 @@ sub_80E4692: @ 80E4692
adds r2, r0, 0
movs r0, 0
strh r0, [r2, 0xA]
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -3079,7 +3079,7 @@ sub_80E46F0: @ 80E46F0
adds r0, r4, 0
adds r1, r5, 0
bl sub_80E3DFC
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
ldrh r2, [r0, 0x30]
movs r0, 0x40
ands r0, r2
@@ -3255,7 +3255,7 @@ _080E4878:
sub_80E4894: @ 80E4894
push {r4,r5,lr}
sub sp, 0xC
ldr r5, =0x02039f94
ldr r5, =gUnknown_02039F94
ldr r0, [r5]
ldr r4, =0x00001e14
adds r0, r4
@@ -3292,7 +3292,7 @@ sub_80E4894: @ 80E4894
sub_80E48E8: @ 80E48E8
push {r4,r5,lr}
sub sp, 0x2C
ldr r5, =0x02039f94
ldr r5, =gUnknown_02039F94
ldr r0, [r5]
ldr r1, =0x00001e34
adds r0, r1
@@ -3344,7 +3344,7 @@ sub_80E48E8: @ 80E48E8
sub_80E4964: @ 80E4964
push {lr}
ldr r1, =gUnknown_0858BF58
ldr r0, =0x02039f94
ldr r0, =gUnknown_02039F94
ldr r0, [r0]
ldr r2, =0x00001e2c
adds r0, r2
@@ -3362,7 +3362,7 @@ sub_80E4964: @ 80E4964
sub_80E498C: @ 80E498C
push {lr}
ldr r1, =gUnknown_0858BF6C
ldr r0, =0x02039f94
ldr r0, =gUnknown_02039F94
ldr r0, [r0]
ldr r2, =0x00001e28
adds r0, r2
@@ -3390,7 +3390,7 @@ sub_80E49BC: @ 80E49BC
ldr r1, =gUnknown_085E8D49
add r0, sp, 0xC
bl CopyString
ldr r5, =0x02039f94
ldr r5, =gUnknown_02039F94
ldr r0, [r5]
ldr r1, =0x00001e36
adds r0, r1
@@ -3461,7 +3461,7 @@ sub_80E4A2C: @ 80E4A2C
sub_80E4A60: @ 80E4A60
push {r4,r5,lr}
movs r2, 0
ldr r0, =0x02039f94
ldr r0, =gUnknown_02039F94
ldr r4, [r0]
ldr r3, =0x00001e28
adds r1, r4, r3
@@ -3506,7 +3506,7 @@ _080E4AAA:
thumb_func_start sub_80E4AB4
sub_80E4AB4: @ 80E4AB4
push {lr}
ldr r0, =0x02039f94
ldr r0, =gUnknown_02039F94
ldr r2, [r0]
ldr r1, =0x00001e28
adds r0, r2, r1
@@ -3547,7 +3547,7 @@ sub_80E4AF8: @ 80E4AF8
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r6, =0x02039f94
ldr r6, =gUnknown_02039F94
ldr r0, [r6]
movs r5, 0xC0
lsls r5, 5
@@ -3610,7 +3610,7 @@ sub_80E4B54: @ 80E4B54
bl sub_80E4AB4
lsls r0, 24
lsrs r0, 24
ldr r1, =0x02039f94
ldr r1, =gUnknown_02039F94
ldr r1, [r1]
ldr r2, =0x00001e28
adds r1, r2
@@ -3640,7 +3640,7 @@ sub_80E4BBC: @ 80E4BBC
bl sub_80E4A60
lsls r0, 24
lsrs r0, 24
ldr r1, =0x02039f94
ldr r1, =gUnknown_02039F94
ldr r1, [r1]
movs r2, 0xC0
lsls r2, 5
@@ -3657,7 +3657,7 @@ sub_80E4BBC: @ 80E4BBC
sub_80E4BE4: @ 80E4BE4
push {r4,r5,lr}
movs r2, 0
ldr r1, =0x02039f94
ldr r1, =gUnknown_02039F94
ldr r0, [r1]
ldr r4, =0x00001e28
adds r0, r4
@@ -3713,7 +3713,7 @@ _080E4C4A:
choose_name_or_words_screen_load_bg_tile_patterns: @ 80E4C54
push {r4-r6,lr}
ldr r0, =gUnknown_08DD3838
ldr r6, =0x02039f94
ldr r6, =gUnknown_02039F94
ldr r1, [r6]
ldr r4, =0x00001810
adds r1, r4
@@ -3803,7 +3803,7 @@ sub_80E4D10: @ 80E4D10
mov r5, r8
push {r5-r7}
sub sp, 0x10
ldr r7, =0x02039f94
ldr r7, =gUnknown_02039F94
ldr r1, [r7]
ldr r2, =0x00001e28
adds r0, r1, r2
@@ -3873,7 +3873,7 @@ _080E4D76:
bcc _080E4D52
_080E4DA6:
bl sub_80E498C
ldr r5, =0x02039f94
ldr r5, =gUnknown_02039F94
ldr r0, [r5]
ldr r4, =0x00001e13
adds r0, r4
@@ -3966,7 +3966,7 @@ sub_80E4E5C: @ 80E4E5C
bls _080E4E8C
movs r5, 0x1
movs r6, 0x1
ldr r1, =0x02039f94
ldr r1, =gUnknown_02039F94
ldr r0, [r1]
ldr r2, =0x00001e11
b _080E4E96
@@ -3974,7 +3974,7 @@ sub_80E4E5C: @ 80E4E5C
_080E4E8C:
movs r5, 0x2
movs r6, 0x2
ldr r1, =0x02039f94
ldr r1, =gUnknown_02039F94
ldr r0, [r1]
ldr r2, =0x00001e12
_080E4E96:
@@ -4019,7 +4019,7 @@ sub_80E4EF0: @ 80E4EF0
add r0, sp, 0xC
movs r2, 0x3
bl memcpy
ldr r5, =0x02039f94
ldr r5, =gUnknown_02039F94
ldr r0, [r5]
ldr r4, =0x00001e15
adds r0, r4
@@ -4093,7 +4093,7 @@ sub_80E4F94: @ 80E4F94
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl copy_pal_bg_faded_to_pal_ram
ldr r5, =0x02039f94
ldr r5, =gUnknown_02039F94
ldr r0, [r5]
ldr r1, =0x00001e18
adds r0, r1
@@ -4188,7 +4188,7 @@ _080E5066:
sub_80E5074: @ 80E5074
push {lr}
sub sp, 0x8
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r1, [r0]
ldrb r2, [r1, 0x8]
movs r0, 0
@@ -4208,7 +4208,7 @@ sub_80E5074: @ 80E5074
sub_80E509C: @ 80E509C
push {lr}
sub sp, 0x8
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r1, [r0]
ldrb r2, [r1, 0x8]
movs r0, 0
@@ -4228,7 +4228,7 @@ sub_80E509C: @ 80E509C
sub_80E50C4: @ 80E50C4
push {lr}
sub sp, 0x8
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r1, [r0]
ldrb r2, [r1, 0x8]
movs r0, 0
@@ -4248,7 +4248,7 @@ sub_80E50C4: @ 80E50C4
sub_80E50EC: @ 80E50EC
push {lr}
sub sp, 0x8
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r1, [r0]
ldrb r2, [r1, 0x8]
movs r0, 0
asm/new_game.s
+13 -13
View File
@@ -63,7 +63,7 @@ set_player_trainer_id: @ 8084310
lsls r0, 16
lsrs r0, 16
orrs r4, r0
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r1, [r0]
adds r1, 0xA
adds r0, r4, 0
@@ -76,7 +76,7 @@ set_player_trainer_id: @ 8084310
thumb_func_start init_options
init_options: @ 808433C
ldr r3, =0x03005d90
ldr r3, =gUnknown_03005D90
ldr r2, [r3]
ldrb r1, [r2, 0x14]
movs r0, 0x8
@@ -121,10 +121,10 @@ init_options: @ 808433C
thumb_func_start sub_8084390
sub_8084390: @ 8084390
push {r4,lr}
ldr r1, =0x030060b0
ldr r1, =gUnknown_030060B0
movs r0, 0
strb r0, [r1]
ldr r4, =0x03005d90
ldr r4, =gUnknown_03005D90
ldr r0, [r4]
adds r0, 0x28
movs r1, 0
@@ -146,7 +146,7 @@ sub_80843C0: @ 80843C0
push {r4-r7,lr}
bl sub_80DF040
movs r2, 0x8
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
mov r12, r0
ldr r4, =0x00002e90
ldr r3, =gUnknown_08339D1C
@@ -178,7 +178,7 @@ sub_8084400: @ 8084400
sub sp, 0x4
movs r0, 0
str r0, [sp]
ldr r4, =0x03005d90
ldr r4, =gUnknown_03005D90
ldr r1, [r4]
ldr r0, =0x0000064c
adds r1, r0
@@ -232,7 +232,7 @@ init_sav2: @ 808446C
thumb_func_start sub_808447C
sub_808447C: @ 808447C
push {lr}
ldr r1, =0x020322d4
ldr r1, =gUnknown_020322D4
movs r0, 0
strb r0, [r1]
bl sub_80BB358
@@ -249,7 +249,7 @@ sub_808447C: @ 808447C
@ void NewGameInitData()
NewGameInitData: @ 80844A0
push {r4,r5,lr}
ldr r0, =0x03006210
ldr r0, =gUnknown_03006210
ldrh r0, [r0]
cmp r0, 0
beq _080844AE
@@ -258,10 +258,10 @@ NewGameInitData: @ 80844A0
_080844AE:
bl GameFreakRTC_Reset
_080844B2:
ldr r1, =0x020322d4
ldr r1, =gUnknown_020322D4
movs r0, 0x1
strb r0, [r1]
ldr r4, =0x03005d90
ldr r4, =gUnknown_03005D90
ldr r0, [r4]
adds r0, 0xAC
movs r5, 0
@@ -285,7 +285,7 @@ _080844B2:
bl GabbyAndTyNewGameInitData
bl sub_80E8B28
bl RemoveAllBerryTrees
ldr r4, =0x03005d8c
ldr r4, =gUnknown_03005D8C
ldr r0, [r4]
movs r1, 0x92
lsls r1, 3
@@ -300,7 +300,7 @@ _080844B2:
bl sub_813C1F8
bl sub_80F9A7C
bl sub_80F9AD4
ldr r0, =0x020244e9
ldr r0, =gUnknown_020244E9
strb r5, [r0]
bl zero_player_party_data
bl sub_80C7770
@@ -345,7 +345,7 @@ sub_80845CC: @ 80845CC
mov r0, sp
movs r5, 0
strh r5, [r0]
ldr r4, =0x03005d90
ldr r4, =gUnknown_03005D90
ldr r1, [r4]
movs r0, 0xF6
lsls r0, 1
asm/option_menu.s
+41 -41
View File
@@ -32,7 +32,7 @@ CB2_OptionsMenu: @ 80BA4DC
mov r7, r8
push {r7}
sub sp, 0xC
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
movs r2, 0x87
lsls r2, 3
adds r0, r1, r2
@@ -63,7 +63,7 @@ _080BA508:
_080BA538:
movs r0, 0
bl SetVBlankCallback
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
movs r0, 0x87
lsls r0, 3
adds r1, r0
@@ -213,14 +213,14 @@ _080BA69C:
bl remove_some_task
bl ResetTasks
bl ResetAllObjectData
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
movs r0, 0x87
lsls r0, 3
adds r1, r0
b _080BA7F4
.pool
_080BA6BC:
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r0, [r0]
ldrb r0, [r0, 0x14]
lsrs r0, 3
@@ -239,7 +239,7 @@ _080BA6E0:
movs r1, 0
movs r2, 0x2
bl gpu_pal_apply
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r0, [r0]
ldrb r0, [r0, 0x14]
lsrs r0, 3
@@ -248,7 +248,7 @@ _080BA6E0:
movs r1, 0x70
movs r2, 0x20
bl gpu_pal_apply
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
movs r0, 0x87
lsls r0, 3
adds r1, r0
@@ -265,7 +265,7 @@ _080BA728:
movs r0, 0
bl PutWindowTilemap
bl sub_80BB0D0
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
movs r0, 0x87
lsls r0, 3
adds r1, r0
@@ -280,7 +280,7 @@ _080BA748:
movs r0, 0x1
bl PutWindowTilemap
bl sub_80BB104
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
movs r2, 0x87
lsls r2, 3
adds r1, r2
@@ -289,7 +289,7 @@ _080BA748:
strb r0, [r1]
_080BA760:
bl sub_80BB154
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
movs r0, 0x87
lsls r0, 3
adds r1, r0
@@ -301,14 +301,14 @@ _080BA774:
bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r4, r0, 2
adds r4, r0
lsls r4, 3
adds r4, r1
movs r0, 0
strh r0, [r4, 0x8]
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r2, [r0]
ldrb r0, [r2, 0x14]
lsls r0, 29
@@ -348,7 +348,7 @@ _080BA774:
movs r1, 0x3
bl CopyWindowToVram
_080BA7EC:
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
movs r2, 0x87
lsls r2, 3
adds r1, r2
@@ -385,13 +385,13 @@ sub_80BA83C: @ 80BA83C
push {lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r0, =0x02037fd4
ldr r0, =gUnknown_02037FD4
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
cmp r0, 0
bne _080BA85C
ldr r0, =0x03005e00
ldr r0, =gTasks
lsls r1, r2, 2
adds r1, r2
lsls r1, 3
@@ -409,13 +409,13 @@ sub_80BA86C: @ 80BA86C
push {r4-r7,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
cmp r0, 0
beq _080BA89C
ldr r0, =0x03005e00
ldr r0, =gTasks
lsls r1, r4, 2
adds r1, r4
lsls r1, 3
@@ -433,7 +433,7 @@ _080BA89C:
ands r0, r1
cmp r0, 0
beq _080BA8BC
ldr r0, =0x03005e00
ldr r0, =gTasks
lsls r1, r4, 2
adds r1, r4
lsls r1, 3
@@ -450,7 +450,7 @@ _080BA8BC:
lsrs r6, r0, 16
cmp r6, 0
beq _080BA8EC
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r2, r4, 2
adds r0, r2, r4
lsls r0, 3
@@ -472,7 +472,7 @@ _080BA8EC:
ands r0, r1
cmp r0, 0
beq _080BA924
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r2, r4, 2
adds r0, r2, r4
lsls r0, 3
@@ -498,7 +498,7 @@ _080BA916:
bl sub_80BAB38
b _080BAA5A
_080BA924:
ldr r0, =0x03005e00
ldr r0, =gTasks
lsls r2, r4, 2
adds r1, r2, r4
lsls r1, 3
@@ -632,7 +632,7 @@ _080BAA22:
adds r0, r1, 0
bl sub_80BAF0C
_080BAA46:
ldr r1, =0x02039b48
ldr r1, =gUnknown_02039B48
ldrb r0, [r1]
cmp r0, 0
beq _080BAA5A
@@ -654,9 +654,9 @@ sub_80BAA64: @ 80BAA64
sub sp, 0x4
lsls r0, 24
lsrs r0, 24
ldr r6, =0x03005d90
ldr r6, =gUnknown_03005D90
ldr r3, [r6]
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r4, r0, 2
adds r4, r0
lsls r4, 3
@@ -733,7 +733,7 @@ sub_80BAB08: @ 80BAB08
push {lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r0, =0x02037fd4
ldr r0, =gUnknown_02037FD4
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -742,7 +742,7 @@ sub_80BAB08: @ 80BAB08
adds r0, r2, 0
bl DestroyTask
bl FreeAllWindowBuffers
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
ldr r0, [r0, 0x8]
bl SetMainCallback2
_080BAB2C:
@@ -845,7 +845,7 @@ sub_80BABDC: @ 80BABDC
push {lr}
lsls r0, 24
lsrs r3, r0, 24
ldr r2, =0x030022c0
ldr r2, =gUnknown_030022C0
ldrh r1, [r2, 0x2E]
movs r0, 0x10
ands r0, r1
@@ -861,7 +861,7 @@ sub_80BABDC: @ 80BABDC
_080BAC00:
movs r3, 0
_080BAC02:
ldr r1, =0x02039b48
ldr r1, =gUnknown_02039B48
movs r0, 0x1
strb r0, [r1]
_080BAC08:
@@ -880,7 +880,7 @@ _080BAC08:
_080BAC24:
movs r3, 0x2
_080BAC26:
ldr r1, =0x02039b48
ldr r1, =gUnknown_02039B48
movs r0, 0x1
strb r0, [r1]
_080BAC2C:
@@ -970,7 +970,7 @@ sub_80BACE0: @ 80BACE0
push {lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
ldrh r1, [r0, 0x2E]
movs r0, 0x30
ands r0, r1
@@ -978,7 +978,7 @@ sub_80BACE0: @ 80BACE0
beq _080BACFA
movs r1, 0x1
eors r2, r1
ldr r0, =0x02039b48
ldr r0, =gUnknown_02039B48
strb r1, [r0]
_080BACFA:
adds r0, r2, 0
@@ -1031,7 +1031,7 @@ sub_80BAD5C: @ 80BAD5C
push {lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
ldrh r1, [r0, 0x2E]
movs r0, 0x30
ands r0, r1
@@ -1039,7 +1039,7 @@ sub_80BAD5C: @ 80BAD5C
beq _080BAD76
movs r1, 0x1
eors r2, r1
ldr r0, =0x02039b48
ldr r0, =gUnknown_02039B48
strb r1, [r0]
_080BAD76:
adds r0, r2, 0
@@ -1092,7 +1092,7 @@ sub_80BADD8: @ 80BADD8
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
ldrh r1, [r0, 0x2E]
movs r0, 0x30
ands r0, r1
@@ -1102,7 +1102,7 @@ sub_80BADD8: @ 80BADD8
eors r5, r4
adds r0, r5, 0
bl sub_82E1810
ldr r0, =0x02039b48
ldr r0, =gUnknown_02039B48
strb r4, [r0]
_080BADF8:
adds r0, r5, 0
@@ -1156,7 +1156,7 @@ sub_80BAE5C: @ 80BAE5C
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
ldrh r1, [r0, 0x2E]
movs r0, 0x10
ands r0, r1
@@ -1187,11 +1187,11 @@ _080BAE82:
movs r1, 0x70
movs r2, 0x20
bl gpu_pal_apply
ldr r1, =0x02039b48
ldr r1, =gUnknown_02039B48
movs r0, 0x1
strb r0, [r1]
_080BAEAE:
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
ldrh r1, [r0, 0x2E]
movs r0, 0x20
ands r0, r1
@@ -1222,7 +1222,7 @@ _080BAED2:
movs r1, 0x70
movs r2, 0x20
bl gpu_pal_apply
ldr r1, =0x02039b48
ldr r1, =gUnknown_02039B48
movs r0, 0x1
strb r0, [r1]
_080BAEFE:
@@ -1333,7 +1333,7 @@ sub_80BAFCC: @ 80BAFCC
push {lr}
lsls r0, 24
lsrs r3, r0, 24
ldr r2, =0x030022c0
ldr r2, =gUnknown_030022C0
ldrh r1, [r2, 0x2E]
movs r0, 0x10
ands r0, r1
@@ -1349,7 +1349,7 @@ sub_80BAFCC: @ 80BAFCC
_080BAFF0:
movs r3, 0
_080BAFF2:
ldr r1, =0x02039b48
ldr r1, =gUnknown_02039B48
movs r0, 0x1
strb r0, [r1]
_080BAFF8:
@@ -1368,7 +1368,7 @@ _080BAFF8:
_080BB014:
movs r3, 0x2
_080BB016:
ldr r1, =0x02039b48
ldr r1, =gUnknown_02039B48
movs r0, 0x1
strb r0, [r1]
_080BB01C:
asm/palette.s
+83 -83
View File
@@ -16,10 +16,10 @@ sub_80A1818: @ 80A1818
lsrs r1, 14
adds r1, r2
ldr r0, [r1]
ldr r1, =0x02037814
ldr r1, =gUnknown_02037814
movs r2, 0x10
bl CpuSet
ldr r0, =0x02037fd4
ldr r0, =gUnknown_02037FD4
ldrh r2, [r0, 0x4]
lsls r2, 21
lsrs r2, 27
@@ -35,10 +35,10 @@ sub_80A1818: @ 80A1818
lsrs r0, 24
cmp r0, 0xFF
beq _080A1862
ldr r1, =0x03000f44
ldr r1, =gUnknown_03000F44
ldr r0, =sub_80A1670
str r0, [r1]
ldr r1, =0x03000f3c
ldr r1, =gUnknown_03000F3C
movs r0, 0x20
strh r0, [r1]
_080A1862:
@@ -58,7 +58,7 @@ sub_80A1884: @ 80A1884
lsrs r1, 14
adds r1, r2
ldr r0, [r1]
ldr r1, =0x02037814
ldr r1, =gUnknown_02037814
movs r2, 0x10
bl CpuSet
ldr r0, =sub_8149DFC
@@ -67,7 +67,7 @@ sub_80A1884: @ 80A1884
lsrs r0, 24
cmp r0, 0xFF
bne _080A18D6
ldr r0, =0x02037fd4
ldr r0, =gUnknown_02037FD4
ldrh r2, [r0, 0x4]
lsls r2, 21
lsrs r2, 27
@@ -77,7 +77,7 @@ sub_80A1884: @ 80A1884
movs r0, 0x80
movs r1, 0x10
bl pal_fade_1
ldr r1, =0x03000f3c
ldr r1, =gUnknown_03000F3C
ldrh r0, [r1]
subs r0, 0x1
strh r0, [r1]
@@ -85,7 +85,7 @@ sub_80A1884: @ 80A1884
lsrs r1, r0, 16
cmp r1, 0
bne _080A18D6
ldr r0, =0x03000f44
ldr r0, =gUnknown_03000F44
str r1, [r0]
_080A18D6:
pop {r0}
@@ -102,17 +102,17 @@ decompress_palette: @ 80A18F4
lsls r4, 16
lsrs r4, 16
lsls r5, 16
ldr r6, =0x02037fe8
ldr r6, =gUnknown_02037FE8
adds r1, r6, 0
bl LZDecompressWram
lsls r4, 1
ldr r1, =0x02037714
ldr r1, =gUnknown_02037714
adds r1, r4, r1
lsrs r5, 17
adds r0, r6, 0
adds r2, r5, 0
bl CpuSet
ldr r0, =0x02037b14
ldr r0, =gUnknown_02037B14
adds r4, r0
adds r0, r6, 0
adds r1, r4, 0
@@ -134,12 +134,12 @@ gpu_pal_apply: @ 80A1938
lsls r4, 16
lsls r5, 16
lsrs r4, 15
ldr r1, =0x02037714
ldr r1, =gUnknown_02037714
adds r1, r4, r1
lsrs r5, 17
adds r2, r5, 0
bl CpuSet
ldr r0, =0x02037b14
ldr r0, =gUnknown_02037B14
adds r4, r0
adds r0, r6, 0
adds r1, r4, 0
@@ -165,7 +165,7 @@ rboxid_80040B8: @ 80A1970
mov r0, sp
strh r6, [r0]
lsrs r4, 15
ldr r1, =0x02037714
ldr r1, =gUnknown_02037714
adds r1, r4, r1
lsrs r5, 17
movs r0, 0x80
@@ -177,7 +177,7 @@ rboxid_80040B8: @ 80A1970
mov r0, sp
adds r0, 0x2
strh r6, [r0]
ldr r1, =0x02037b14
ldr r1, =gUnknown_02037B14
adds r4, r1
adds r1, r4, 0
adds r2, r5, 0
@@ -193,7 +193,7 @@ rboxid_80040B8: @ 80A1970
@ void copy_pal_bg_faded_to_pal_ram()
copy_pal_bg_faded_to_pal_ram: @ 80A19C0
push {r4,r5,lr}
ldr r4, =0x02037fd4
ldr r4, =gUnknown_02037FD4
ldrb r1, [r4, 0x8]
movs r5, 0x80
adds r0, r5, 0
@@ -202,7 +202,7 @@ copy_pal_bg_faded_to_pal_ram: @ 80A19C0
lsrs r3, r0, 24
cmp r3, 0
bne _080A1A02
ldr r1, =0x02037b14
ldr r1, =gUnknown_02037B14
movs r2, 0xA0
lsls r2, 19
ldr r0, =0x040000d4
@@ -211,7 +211,7 @@ copy_pal_bg_faded_to_pal_ram: @ 80A19C0
ldr r1, =0x80000200
str r1, [r0, 0x8]
ldr r0, [r0, 0x8]
ldr r0, =0x02037fe4
ldr r0, =gUnknown_02037FE4
str r3, [r0]
ldrb r1, [r4, 0x9]
movs r0, 0x3
@@ -235,7 +235,7 @@ _080A1A02:
@ int fade_and_return_progress_probably()
fade_and_return_progress_probably: @ 80A1A1C
push {lr}
ldr r0, =0x02037fe4
ldr r0, =gUnknown_02037FE4
ldr r0, [r0]
cmp r0, 0
beq _080A1A30
@@ -243,7 +243,7 @@ fade_and_return_progress_probably: @ 80A1A1C
b _080A1A68
.pool
_080A1A30:
ldr r0, =0x02037fd4
ldr r0, =gUnknown_02037FD4
ldrb r0, [r0, 0x9]
movs r1, 0x3
ands r1, r0
@@ -262,8 +262,8 @@ _080A1A52:
_080A1A56:
lsls r0, 24
lsrs r3, r0, 24
ldr r2, =0x02037fe4
ldr r0, =0x02037fd4
ldr r2, =gUnknown_02037FE4
ldr r0, =gUnknown_02037FD4
ldr r0, [r0]
movs r1, 0
orrs r0, r1
@@ -300,8 +300,8 @@ sub_80A1A94: @ 80A1A94
lsls r0, 19
mov r12, r0
movs r4, 0
ldr r7, =0x02037714
ldr r6, =0x02037b14
ldr r7, =gUnknown_02037714
ldr r6, =gUnknown_02037B14
ldr r5, =0x000001ff
_080A1AA4:
lsls r1, r4, 1
@@ -341,7 +341,7 @@ pal_fade_maybe: @ 80A1AD4
lsls r0, 16
lsrs r0, 16
mov r8, r0
ldr r5, =0x02037fd4
ldr r5, =gUnknown_02037FD4
ldrb r1, [r5, 0x7]
movs r0, 0x80
ands r0, r1
@@ -436,18 +436,18 @@ _080A1BB0:
_080A1BB4:
strb r3, [r5, 0x8]
bl fade_and_return_progress_probably
ldr r4, =0x02037fd4
ldr r4, =gUnknown_02037FD4
ldrb r1, [r4, 0x8]
lsrs r5, r1, 7
movs r0, 0x7F
ands r0, r1
strb r0, [r4, 0x8]
ldr r0, =0x02037b14
ldr r0, =gUnknown_02037B14
movs r1, 0xA0
lsls r1, 19
ldr r2, =0x04000100
bl CpuSet
ldr r1, =0x02037fe4
ldr r1, =gUnknown_02037FE4
movs r0, 0
str r0, [r1]
ldrb r1, [r4, 0x9]
@@ -462,7 +462,7 @@ _080A1BB4:
beq _080A1BF0
bl sub_80A2968
_080A1BF0:
ldr r2, =0x02037fd4
ldr r2, =gUnknown_02037FD4
lsls r3, r5, 7
ldrb r1, [r2, 0x8]
movs r0, 0x7F
@@ -528,7 +528,7 @@ _080A1C6E:
lsls r0, r5, 1
adds r0, r5
lsls r0, 2
ldr r1, =0x02037f14
ldr r1, =gUnknown_02037F14
adds r4, r0, r1
ldrb r0, [r4, 0x4]
lsls r0, 31
@@ -606,9 +606,9 @@ sub_80A1CDC: @ 80A1CDC
lsrs r0, r2, 27
cmp r6, r0
bcs _080A1DC4
ldr r0, =0x02037714
ldr r0, =gUnknown_02037714
mov r12, r0
ldr r7, =0x02037b14
ldr r7, =gUnknown_02037B14
_080A1D10:
ldr r0, [r4, 0x4]
lsls r0, 11
@@ -659,7 +659,7 @@ _080A1D78:
lsrs r0, r2, 27
cmp r6, r0
bcs _080A1DC4
ldr r3, =0x02037b14
ldr r3, =gUnknown_02037B14
_080A1D80:
ldr r1, [r4, 0x4]
lsls r1, 11
@@ -759,7 +759,7 @@ _080A1E14:
sub_80A1E40: @ 80A1E40
push {r4-r6,lr}
adds r4, r0, 0
ldr r3, =0x02037fd4
ldr r3, =gUnknown_02037FD4
ldrb r1, [r3, 0x7]
movs r0, 0x80
ands r0, r1
@@ -823,7 +823,7 @@ _080A1E9C:
adds r1, r2, 0
cmp r3, r1
bcs _080A1EF4
ldr r6, =0x02037b14
ldr r6, =gUnknown_02037B14
_080A1EC8:
ldrh r1, [r4, 0x4]
lsls r1, 21
@@ -921,7 +921,7 @@ _080A1F6E:
palslot_dead_struct_update: @ 80A1F74
lsls r0, 24
lsrs r0, 24
ldr r2, =0x02037f14
ldr r2, =gUnknown_02037F14
lsls r1, r0, 1
adds r1, r0
lsls r1, 2
@@ -959,7 +959,7 @@ palslot_dead_struct_update: @ 80A1F74
thumb_func_start pal_fade_control_reset_maybe
pal_fade_control_reset_maybe: @ 80A1FD0
ldr r2, =0x02037fd4
ldr r2, =gUnknown_02037FD4
movs r0, 0
str r0, [r2]
subs r0, 0x40
@@ -1024,7 +1024,7 @@ sub_80A2048: @ 80A2048
lsrs r2, r0, 24
cmp r2, 0x10
beq _080A206C
ldr r1, =0x02037f14
ldr r1, =gUnknown_02037F14
lsls r0, r2, 1
adds r0, r2
lsls r0, 2
@@ -1049,7 +1049,7 @@ sub_80A2074: @ 80A2074
lsrs r2, r0, 24
cmp r2, 0x10
beq _080A209A
ldr r0, =0x02037f14
ldr r0, =gUnknown_02037F14
lsls r1, r2, 1
adds r1, r2
lsls r1, 2
@@ -1071,7 +1071,7 @@ sub_80A20A4: @ 80A20A4
lsls r0, 16
lsrs r2, r0, 16
movs r1, 0
ldr r3, =0x02037f14
ldr r3, =gUnknown_02037F14
_080A20AE:
lsls r0, r1, 1
adds r0, r1
@@ -1099,7 +1099,7 @@ _080A20D4:
thumb_func_start pal_fade__0
pal_fade__0: @ 80A20D8
push {r4-r7,lr}
ldr r4, =0x02037fd4
ldr r4, =gUnknown_02037FD4
ldrb r1, [r4, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1145,7 +1145,7 @@ _080A212A:
strb r0, [r4, 0x4]
_080A2132:
movs r5, 0
ldr r2, =0x02037fd4
ldr r2, =gUnknown_02037FD4
ldrb r1, [r2, 0xA]
movs r0, 0x4
ands r0, r1
@@ -1162,7 +1162,7 @@ _080A214C:
_080A2152:
cmp r4, 0
beq _080A2184
ldr r7, =0x02037fd4
ldr r7, =gUnknown_02037FD4
adds r6, r7, 0
_080A215A:
movs r0, 0x1
@@ -1273,7 +1273,7 @@ sub_80A2218: @ 80A2218
movs r3, 0
cmp r1, 0
beq _080A2256
ldr r7, =0x02037b14
ldr r7, =gUnknown_02037B14
_080A2224:
movs r0, 0x1
ands r0, r1
@@ -1343,7 +1343,7 @@ _080A228A:
cmp r0, 0
beq _080A230E
movs r4, 0
ldr r2, =0x02037b14
ldr r2, =gUnknown_02037B14
mov r8, r2
ldr r1, [sp]
lsls r0, r1, 24
@@ -1429,9 +1429,9 @@ sub_80A2334: @ 80A2334
movs r3, 0
cmp r1, 0
beq _080A237E
ldr r0, =0x02037b14
ldr r0, =gUnknown_02037B14
mov r8, r0
ldr r0, =0x02037714
ldr r0, =gUnknown_02037714
mov r12, r0
_080A234A:
movs r0, 0x1
@@ -1476,7 +1476,7 @@ sub_80A2390: @ 80A2390
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r3, =0x02037fd4
ldr r3, =gUnknown_02037FD4
ldrb r2, [r3, 0xA]
movs r1, 0x79
negs r1, r1
@@ -1497,7 +1497,7 @@ sub_80A23B4: @ 80A23B4
lsls r0, 24
lsrs r0, 24
adds r4, r0, 0
ldr r2, =0x02037fd4
ldr r2, =gUnknown_02037FD4
ldrh r0, [r2, 0x4]
movs r3, 0xF8
lsls r3, 3
@@ -1528,7 +1528,7 @@ sub_80A23B4: @ 80A23B4
mov r1, sp
movs r0, 0
strh r0, [r1]
ldr r1, =0x02037b14
ldr r1, =gUnknown_02037B14
ldr r2, =0x01000200
mov r0, sp
bl CpuSet
@@ -1540,7 +1540,7 @@ _080A2406:
ldr r2, =0x00007fff
adds r1, r2, 0
strh r1, [r0]
ldr r1, =0x02037b14
ldr r1, =gUnknown_02037B14
ldr r2, =0x01000200
bl CpuSet
_080A241C:
@@ -1560,7 +1560,7 @@ pal_fade__1: @ 80A2438
mov r5, r8
push {r5-r7}
sub sp, 0x8
ldr r4, =0x02037fd4
ldr r4, =gUnknown_02037FD4
ldrb r1, [r4, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1594,7 +1594,7 @@ _080A247C:
lsls r1, 1
mov r10, r1
_080A2484:
ldr r1, =0x02037fd4
ldr r1, =gUnknown_02037FD4
ldrb r0, [r1, 0x8]
lsls r0, 26
lsrs r0, 26
@@ -1623,7 +1623,7 @@ _080A24AE:
b _080A2694
_080A24B6:
lsls r2, r7, 1
ldr r0, =0x02037714
ldr r0, =gUnknown_02037714
adds r0, r2, r0
ldr r1, [r0]
lsls r3, r1, 27
@@ -1633,7 +1633,7 @@ _080A24B6:
lsls r1, 17
lsrs r1, 27
mov r8, r1
ldr r0, =0x02037b14
ldr r0, =gUnknown_02037B14
adds r2, r0
mov r9, r2
ldr r1, [r2]
@@ -1700,7 +1700,7 @@ _080A2544:
b _080A2694
_080A254C:
lsls r1, r7, 1
ldr r0, =0x02037b14
ldr r0, =gUnknown_02037B14
adds r2, r1, r0
ldr r1, [r2]
lsls r0, r1, 27
@@ -1753,7 +1753,7 @@ _080A25A8:
bcs _080A2694
_080A25AE:
lsls r2, r7, 1
ldr r0, =0x02037714
ldr r0, =gUnknown_02037714
adds r0, r2, r0
ldr r1, [r0]
lsls r3, r1, 27
@@ -1763,7 +1763,7 @@ _080A25AE:
lsls r1, 17
lsrs r1, 27
mov r8, r1
ldr r0, =0x02037b14
ldr r0, =gUnknown_02037B14
adds r2, r0
ldr r1, [r2]
lsls r0, r1, 27
@@ -1820,7 +1820,7 @@ _080A2630:
adds r7, r2, 0
cmp r7, r10
bcs _080A2694
ldr r4, =0x02037b14
ldr r4, =gUnknown_02037B14
mov r8, r4
_080A263A:
lsls r0, r7, 1
@@ -1872,7 +1872,7 @@ _080A2678:
cmp r7, r10
bcc _080A263A
_080A2694:
ldr r0, =0x02037fd4
ldr r0, =gUnknown_02037FD4
ldrb r2, [r0, 0xA]
lsls r0, r2, 29
lsrs r0, 31
@@ -1883,7 +1883,7 @@ _080A2694:
negs r3, r3
ands r3, r2
orrs r3, r1
ldr r1, =0x02037fd4
ldr r1, =gUnknown_02037FD4
strb r3, [r1, 0xA]
movs r0, 0x4
ands r0, r3
@@ -1893,7 +1893,7 @@ _080A2694:
b _080A2790
.pool
_080A26C4:
ldr r2, =0x02037fd4
ldr r2, =gUnknown_02037FD4
ldrh r4, [r2, 0x4]
lsls r5, r4, 21
lsrs r0, r5, 27
@@ -1904,7 +1904,7 @@ _080A26C4:
bge _080A26E8
ldr r0, =0xfffff83f
ands r0, r4
ldr r3, =0x02037fd4
ldr r3, =gUnknown_02037FD4
strh r0, [r3, 0x4]
b _080A26FE
.pool
@@ -1918,17 +1918,17 @@ _080A26E8:
ldr r0, =0xfffff83f
ands r0, r4
orrs r0, r1
ldr r4, =0x02037fd4
ldr r4, =gUnknown_02037FD4
strh r0, [r4, 0x4]
_080A26FE:
ldr r1, =0x02037fd4
ldr r1, =gUnknown_02037FD4
ldrh r0, [r1, 0x4]
movs r1, 0xF8
lsls r1, 3
ands r1, r0
cmp r1, 0
bne _080A278C
ldr r2, =0x02037fd4
ldr r2, =gUnknown_02037FD4
ldrb r0, [r2, 0x8]
lsls r0, 26
lsrs r0, 26
@@ -1947,8 +1947,8 @@ _080A272C:
beq _080A276C
b _080A2778
_080A2736:
ldr r0, =0x02037714
ldr r1, =0x02037b14
ldr r0, =gUnknown_02037714
ldr r1, =gUnknown_02037B14
ldr r2, =0x04000100
bl CpuSet
b _080A2778
@@ -1957,7 +1957,7 @@ _080A2750:
movs r0, 0x1
negs r0, r0
str r0, [sp]
ldr r1, =0x02037b14
ldr r1, =gUnknown_02037B14
ldr r2, =0x05000100
mov r0, sp
bl CpuSet
@@ -1966,11 +1966,11 @@ _080A2750:
_080A276C:
str r1, [sp, 0x4]
add r0, sp, 0x4
ldr r1, =0x02037b14
ldr r1, =gUnknown_02037B14
ldr r2, =0x05000100
bl CpuSet
_080A2778:
ldr r2, =0x02037fd4
ldr r2, =gUnknown_02037FD4
ldrb r1, [r2, 0x9]
movs r0, 0x4
negs r0, r0
@@ -1981,7 +1981,7 @@ _080A2778:
orrs r0, r1
strb r0, [r2, 0xA]
_080A278C:
ldr r3, =0x02037fd4
ldr r3, =gUnknown_02037FD4
ldrb r0, [r3, 0x7]
_080A2790:
lsrs r0, 7
@@ -2011,7 +2011,7 @@ sub_80A27B0: @ 80A27B0
lsrs r3, 24
lsls r5, 24
lsrs r5, 24
ldr r7, =0x02037fd4
ldr r7, =gUnknown_02037FD4
str r0, [r7]
movs r0, 0x3F
ands r1, r0
@@ -2080,7 +2080,7 @@ _080A2844:
thumb_func_start pal_fade__2
pal_fade__2: @ 80A284C
push {r4-r7,lr}
ldr r2, =0x02037fd4
ldr r2, =gUnknown_02037FD4
ldrb r1, [r2, 0x7]
movs r0, 0x80
ands r0, r1
@@ -2229,7 +2229,7 @@ _080A295C:
thumb_func_start sub_80A2968
sub_80A2968: @ 80A2968
push {r4,lr}
ldr r4, =0x02037fd4
ldr r4, =gUnknown_02037FD4
ldrh r1, [r4]
movs r0, 0x50
bl SetGpuReg
@@ -2270,7 +2270,7 @@ _080A29AC:
thumb_func_start sub_80A29BC
sub_80A29BC: @ 80A29BC
push {r4,lr}
ldr r3, =0x02037fd4
ldr r3, =gUnknown_02037FD4
ldrb r4, [r3, 0xA]
movs r0, 0x2
ands r0, r4
@@ -2363,8 +2363,8 @@ sub_80A2A5C: @ 80A2A5C
lsrs r1, 24
lsls r2, 16
lsrs r2, 16
ldr r4, =0x02037714
ldr r5, =0x02037b14
ldr r4, =gUnknown_02037714
ldr r5, =gUnknown_02037B14
ldr r3, =0x040000d4
str r4, [r3]
str r5, [r3, 0x4]
@@ -2651,7 +2651,7 @@ sub_80A2C44: @ 80A2C44
bl CreateTask
lsls r0, 24
lsrs r5, r0, 24
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
@@ -2676,7 +2676,7 @@ _080A2CAC:
lsls r4, r5, 2
cmp r6, r7
bcs _080A2CC4
ldr r0, =0x03005e00
ldr r0, =gTasks
adds r1, r4, r5
lsls r1, 3
adds r1, r0
@@ -2689,7 +2689,7 @@ _080A2CC4:
movs r1, 0x5
mov r2, r10
bl SetWordTaskArg
ldr r0, =0x03005e00
ldr r0, =gTasks
adds r1, r4, r5
lsls r1, 3
adds r1, r0
@@ -2717,7 +2717,7 @@ sub_80A2CF8: @ 80A2CF8
lsrs r3, r0, 24
movs r2, 0
ldr r4, =sub_80A2D54
ldr r1, =0x03005e00
ldr r1, =gTasks
_080A2D04:
ldrb r0, [r1, 0x4]
cmp r0, 0x1
@@ -2770,7 +2770,7 @@ sub_80A2D54: @ 80A2D54
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
ldr r1, =0x03005e08
ldr r1, =gTasks + 0x8
adds r4, r0, r1
adds r0, r5, 0
movs r1, 0x5
asm/play_time.s
+9 -9
View File
@@ -7,10 +7,10 @@
thumb_func_start reset_playtime
reset_playtime: @ 80841E4
ldr r1, =0x03000e08
ldr r1, =gUnknown_03000E08
movs r0, 0
strb r0, [r1]
ldr r2, =0x03005d90
ldr r2, =gUnknown_03005D90
ldr r3, [r2]
movs r1, 0
movs r0, 0
@@ -27,10 +27,10 @@ reset_playtime: @ 80841E4
thumb_func_start set_max_playtime_if_appropriate
set_max_playtime_if_appropriate: @ 8084208
push {lr}
ldr r1, =0x03000e08
ldr r1, =gUnknown_03000E08
movs r0, 0x1
strb r0, [r1]
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r0, [r0]
ldrh r1, [r0, 0xE]
ldr r0, =0x000003e7
@@ -45,7 +45,7 @@ _08084220:
thumb_func_start sub_8084230
sub_8084230: @ 8084230
ldr r1, =0x03000e08
ldr r1, =gUnknown_03000E08
movs r0, 0
strb r0, [r1]
bx lr
@@ -55,11 +55,11 @@ sub_8084230: @ 8084230
thumb_func_start gametime_increment
gametime_increment: @ 808423C
push {lr}
ldr r0, =0x03000e08
ldr r0, =gUnknown_03000E08
ldrb r0, [r0]
cmp r0, 0x1
bne _08084294
ldr r2, =0x03005d90
ldr r2, =gUnknown_03005D90
ldr r0, [r2]
ldrb r1, [r0, 0x12]
adds r1, 0x1
@@ -105,10 +105,10 @@ _08084294:
thumb_func_start set_max_playtime
set_max_playtime: @ 80842A4
ldr r1, =0x03000e08
ldr r1, =gUnknown_03000E08
movs r0, 0x2
strb r0, [r1]
ldr r2, =0x03005d90
ldr r2, =gUnknown_03005D90
ldr r3, [r2]
ldr r0, =0x000003e7
strh r0, [r3, 0xE]
asm/player_pc.s
+158 -158
View File
File diff suppressed because it is too large Load Diff
asm/pokedex.s
+417 -417
View File
File diff suppressed because it is too large Load Diff
asm/pokedex_area_screen.s
+48 -48
View File
@@ -7,7 +7,7 @@
thumb_func_start sub_813CA54
sub_813CA54: @ 813CA54
ldr r0, =0x0203ab7c
ldr r0, =gUnknown_0203AB7C
ldr r0, [r0]
movs r1, 0x8A
lsls r1, 1
@@ -22,7 +22,7 @@ sub_813CA54: @ 813CA54
sub_813CA68: @ 813CA68
push {lr}
sub sp, 0x4
ldr r0, =0x0203ab7c
ldr r0, =gUnknown_0203AB7C
ldr r0, [r0]
movs r1, 0x8A
lsls r1, 1
@@ -44,7 +44,7 @@ _0813CA90:
.4byte _0813CAEC
.4byte _0813CB10
_0813CAA4:
ldr r0, =0x0203ab7c
ldr r0, =gUnknown_0203AB7C
ldr r0, [r0]
ldrh r0, [r0, 0xE]
bl sub_813CB40
@@ -61,7 +61,7 @@ _0813CABA:
movs r2, 0
movs r3, 0
bl decompress_and_copy_tile_data_to_vram
ldr r0, =0x0203ab7c
ldr r0, =gUnknown_0203AB7C
ldr r1, [r0]
movs r0, 0x8B
lsls r0, 1
@@ -79,7 +79,7 @@ _0813CAEC:
cmp r0, 0
bne _0813CB34
ldr r0, =gUnknown_085B3D94
ldr r1, =0x02037854
ldr r1, =gUnknown_02037854
ldr r2, =0x04000008
bl CpuSet
b _0813CB24
@@ -95,7 +95,7 @@ _0813CB20:
movs r0, 0
b _0813CB36
_0813CB24:
ldr r0, =0x0203ab7c
ldr r0, =gUnknown_0203AB7C
ldr r1, [r0]
movs r0, 0x8A
lsls r0, 1
@@ -120,7 +120,7 @@ sub_813CB40: @ 813CB40
push {r6,r7}
lsls r0, 16
lsrs r7, r0, 16
ldr r5, =0x0203ab7c
ldr r5, =gUnknown_0203AB7C
ldr r0, [r5]
ldr r1, =0x000006e2
adds r0, r1
@@ -138,7 +138,7 @@ sub_813CB40: @ 813CB40
bls _0813CB70
strh r4, [r1]
_0813CB70:
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r3, =0x000031dc
adds r0, r3
@@ -339,7 +339,7 @@ sub_813CD04: @ 813CD04
lsrs r5, r0, 16
lsls r1, 16
lsrs r3, r1, 16
ldr r4, =0x0203ab7c
ldr r4, =gUnknown_0203AB7C
ldr r2, [r4]
movs r0, 0x88
lsls r0, 1
@@ -388,7 +388,7 @@ sub_813CD64: @ 813CD64
lsrs r2, r0, 16
lsls r1, 16
lsrs r1, 16
ldr r0, =0x0203ab7c
ldr r0, =gUnknown_0203AB7C
ldr r0, [r0]
movs r3, 0x89
lsls r3, 1
@@ -441,7 +441,7 @@ _0813CDC8:
bne _0813CDB2
_0813CDD2:
movs r3, 0
ldr r0, =0x0203ab7c
ldr r0, =gUnknown_0203AB7C
ldr r2, [r0]
movs r4, 0x89
lsls r4, 1
@@ -515,7 +515,7 @@ sub_813CE48: @ 813CE48
lsrs r0, 16
cmp r0, 0xD2
bne _0813CE7C
ldr r0, =0x0203ab7c
ldr r0, =gUnknown_0203AB7C
ldr r2, [r0]
ldr r0, =0x000006e2
adds r1, r2, r0
@@ -614,7 +614,7 @@ sub_813CF0C: @ 813CF0C
push {r5-r7}
sub sp, 0x4
movs r4, 0
ldr r2, =0x0203ab7c
ldr r2, =gUnknown_0203AB7C
adds r7, r2, 0
movs r6, 0x8B
lsls r6, 1
@@ -697,7 +697,7 @@ _0813CF84:
_0813CFB2:
movs r5, 0
movs r6, 0
ldr r7, =0x0203ab7c
ldr r7, =gUnknown_0203AB7C
mov r12, r7
movs r7, 0x8B
lsls r7, 1
@@ -867,7 +867,7 @@ _0813D0E4:
b _0813CFC0
_0813D0F0:
movs r4, 0
ldr r6, =0x0203ab7c
ldr r6, =gUnknown_0203AB7C
movs r5, 0x8B
lsls r5, 1
ldr r7, =0x0000ffff
@@ -968,7 +968,7 @@ _0813D198:
thumb_func_start sub_813D1C8
sub_813D1C8: @ 813D1C8
push {lr}
ldr r1, =0x0203ab7c
ldr r1, =gUnknown_0203AB7C
ldr r2, [r1]
movs r3, 0x89
lsls r3, 1
@@ -1034,7 +1034,7 @@ sub_813D25C: @ 813D25C
push {r4-r7,lr}
mov r7, r8
push {r7}
ldr r0, =0x0203ab7c
ldr r0, =gUnknown_0203AB7C
ldr r2, [r0]
ldr r3, =0x0000061e
adds r1, r2, r3
@@ -1219,7 +1219,7 @@ sub_813D3D8: @ 813D3D8
adds r6, r1, 0
lsls r4, 16
lsrs r4, 16
ldr r5, =0x0203ab7c
ldr r5, =gUnknown_0203AB7C
ldr r0, =0x000015bc
bl AllocZeroed
str r0, [r5]
@@ -1236,7 +1236,7 @@ sub_813D3D8: @ 813D3D8
bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
@@ -1254,7 +1254,7 @@ sub_813D42C: @ 813D42C
sub sp, 0x4
lsls r0, 24
lsrs r4, r0, 24
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
@@ -1303,7 +1303,7 @@ _0813D4A8:
bl SetBgAttribute
ldr r0, =gUnknown_085B4018
bl sub_81C4D70
ldr r0, =0x0203ab7c
ldr r0, =gUnknown_0203AB7C
ldr r0, [r0]
movs r1, 0xF7
lsls r1, 4
@@ -1331,7 +1331,7 @@ _0813D4EC:
bne _0813D594
b _0813D584
_0813D4F8:
ldr r0, =0x0203ab7c
ldr r0, =gUnknown_0203AB7C
ldr r0, [r0]
ldr r2, =0x000006ec
adds r0, r2
@@ -1390,7 +1390,7 @@ _0813D56C:
b _0813D594
.pool
_0813D584:
ldr r0, =0x03005e00
ldr r0, =gTasks
lsls r1, r4, 2
adds r1, r4
lsls r1, 3
@@ -1413,7 +1413,7 @@ sub_813D5A0: @ 813D5A0
lsls r0, 24
lsrs r5, r0, 24
bl sub_813D25C
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
@@ -1434,7 +1434,7 @@ _0813D5CC:
cmp r1, 0x3
beq _0813D652
_0813D5D4:
ldr r0, =0x03005e00
ldr r0, =gTasks
lsls r1, r5, 2
adds r1, r5
lsls r1, 3
@@ -1442,7 +1442,7 @@ _0813D5D4:
movs r0, 0
strh r0, [r1, 0x8]
_0813D5E2:
ldr r0, =0x02037fd4
ldr r0, =gUnknown_02037FD4
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1451,7 +1451,7 @@ _0813D5E2:
b _0813D698
.pool
_0813D5F8:
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
ldrh r2, [r0, 0x2E]
movs r3, 0x2
adds r0, r3, 0
@@ -1473,7 +1473,7 @@ _0813D614:
ands r0, r2
cmp r0, 0
beq _0813D6A8
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r0, [r0]
ldrb r0, [r0, 0x13]
cmp r0, 0x1
@@ -1494,7 +1494,7 @@ _0813D640:
bl pal_fade_maybe
b _0813D698
_0813D652:
ldr r0, =0x02037fd4
ldr r0, =gUnknown_02037FD4
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1503,7 +1503,7 @@ _0813D652:
cmp r7, 0
bne _0813D6A8
bl sub_813D824
ldr r4, =0x0203ab7c
ldr r4, =gUnknown_0203AB7C
ldr r0, [r4]
movs r1, 0xDD
lsls r1, 3
@@ -1521,7 +1521,7 @@ _0813D652:
b _0813D6A8
.pool
_0813D698:
ldr r0, =0x03005e00
ldr r0, =gTasks
lsls r1, r5, 2
adds r1, r5
lsls r1, 3
@@ -1563,12 +1563,12 @@ sub_813D6D0: @ 813D6D0
bl LoadObjectPic
ldr r0, =gUnknown_085B4024
bl LoadTaggedObjectPalette
ldr r0, =0x03001204
ldr r0, =gUnknown_03001204
movs r1, 0
strh r1, [r0]
ldr r2, =0x03001200
ldr r2, =gUnknown_03001200
strh r1, [r2]
ldr r1, =0x0203ab7c
ldr r1, =gUnknown_0203AB7C
ldr r0, [r1]
movs r3, 0x89
lsls r3, 1
@@ -1576,13 +1576,13 @@ sub_813D6D0: @ 813D6D0
ldrh r0, [r0]
cmp r0, 0
beq _0813D7D8
ldr r5, =0x03001202
ldr r5, =gUnknown_03001202
mov r10, r1
adds r7, r2, 0
ldr r0, =0x030011fc
ldr r0, =gUnknown_030011FC
mov r9, r0
ldr r6, =gRegionMapEntries
ldr r1, =0x030011fe
ldr r1, =gUnknown_030011FE
mov r8, r1
_0813D710:
mov r2, r10
@@ -1647,7 +1647,7 @@ _0813D710:
lsrs r1, r0, 24
cmp r1, 0x40
beq _0813D7BE
ldr r0, =0x02020630
ldr r0, =gUnknown_02020630
lsls r2, r1, 4
adds r2, r1
lsls r2, 2
@@ -1660,7 +1660,7 @@ _0813D710:
strb r0, [r3]
mov r1, r10
ldr r3, [r1]
ldr r4, =0x03001204
ldr r4, =gUnknown_03001204
ldrh r1, [r4]
adds r0, r1, 0x1
strh r0, [r4]
@@ -1686,9 +1686,9 @@ _0813D7BE:
cmp r1, r0
blt _0813D710
_0813D7D8:
ldr r0, =0x0203ab7c
ldr r0, =gUnknown_0203AB7C
ldr r0, [r0]
ldr r1, =0x03001204
ldr r1, =gUnknown_03001204
ldrh r1, [r1]
movs r3, 0xDC
lsls r3, 3
@@ -1712,7 +1712,7 @@ sub_813D824: @ 813D824
movs r0, 0x2
bl FreeObjectPaletteByTag
movs r4, 0
ldr r1, =0x0203ab7c
ldr r1, =gUnknown_0203AB7C
ldr r0, [r1]
movs r2, 0xDC
lsls r2, 3
@@ -1747,7 +1747,7 @@ _0813D86C:
bl FreeObjectPaletteByTag
movs r4, 0
_0813D87A:
ldr r0, =0x0203ab7c
ldr r0, =gUnknown_0203AB7C
ldr r0, [r0]
lsls r1, r4, 2
movs r2, 0xFB
@@ -1774,7 +1774,7 @@ _0813D892:
sub_813D8A8: @ 813D8A8
push {lr}
sub sp, 0x8
ldr r0, =0x0203ab7c
ldr r0, =gUnknown_0203AB7C
ldr r1, [r0]
ldr r0, =0x00000fbc
adds r1, r0
@@ -1796,7 +1796,7 @@ sub_813D8A8: @ 813D8A8
thumb_func_start sub_813D8E8
sub_813D8E8: @ 813D8E8
push {r4-r6,lr}
ldr r1, =0x0203ab7c
ldr r1, =gUnknown_0203AB7C
ldr r0, [r1]
movs r2, 0x88
lsls r2, 1
@@ -1824,7 +1824,7 @@ _0813D904:
.pool
_0813D920:
movs r4, 0
ldr r5, =0x02020630
ldr r5, =gUnknown_02020630
_0813D924:
lsls r1, r4, 21
movs r6, 0xA0
@@ -1856,7 +1856,7 @@ _0813D924:
ands r2, r1
orrs r2, r0
strh r2, [r3, 0x4]
ldr r0, =0x0203ab7c
ldr r0, =gUnknown_0203AB7C
ldr r0, [r0]
lsls r1, r4, 2
movs r2, 0xFB
@@ -1867,7 +1867,7 @@ _0813D924:
b _0813D99A
.pool
_0813D988:
ldr r0, =0x0203ab7c
ldr r0, =gUnknown_0203AB7C
ldr r1, [r0]
lsls r0, r4, 2
movs r6, 0xFB
asm/pokedex_cry_screen.s
+32 -32
View File
@@ -15,7 +15,7 @@ sub_8145354: @ 8145354
lsrs r7, r1, 24
movs r0, 0
mov r8, r0
ldr r0, =0x030061ec
ldr r0, =gUnknown_030061EC
ldrb r0, [r0]
cmp r0, 0x1
beq _081453F8
@@ -30,14 +30,14 @@ _0814537C:
beq _08145434
b _0814544A
_08145382:
ldr r5, =0x0203ab90
ldr r5, =gUnknown_0203AB90
ldr r0, [r5]
cmp r0, 0
bne _0814539E
movs r0, 0x1C
bl AllocZeroed
str r0, [r5]
ldr r4, =0x0203ab94
ldr r4, =gUnknown_0203AB94
adds r0, r7, 0
movs r1, 0x7
bl GetWindowAttribute
@@ -83,7 +83,7 @@ _081453D2:
.pool
_081453F8:
movs r4, 0
ldr r1, =0x0203ab90
ldr r1, =gUnknown_0203AB90
ldr r0, [r1]
ldrb r0, [r0, 0x16]
lsls r0, 3
@@ -103,7 +103,7 @@ _08145408:
cmp r4, r0
blt _08145408
_08145420:
ldr r1, =0x030061ec
ldr r1, =gUnknown_030061EC
ldrb r0, [r1]
adds r0, 0x1
strb r0, [r1]
@@ -139,7 +139,7 @@ sub_814545C: @ 814545C
bl sub_8145814
adds r0, r4, 0
bl sub_8145648
ldr r2, =0x0203ab90
ldr r2, =gUnknown_0203AB90
ldr r1, [r2]
ldrb r0, [r1, 0x1B]
cmp r0, 0
@@ -163,7 +163,7 @@ _0814547E:
b _0814552A
.pool
_081454A4:
ldr r5, =0x0203ab90
ldr r5, =gUnknown_0203AB90
ldr r0, [r5]
ldrb r0, [r0, 0x10]
cmp r0, 0
@@ -194,7 +194,7 @@ _081454DC:
movs r0, 0x1
strb r0, [r1, 0x10]
_081454E6:
ldr r5, =0x0203ab90
ldr r5, =gUnknown_0203AB90
ldr r1, [r5]
ldrb r4, [r1, 0x10]
subs r4, 0x1
@@ -239,11 +239,11 @@ sub_8145534: @ 8145534
lsls r0, 16
lsrs r4, r0, 16
adds r5, r4, 0
ldr r0, =0x03007420
ldr r0, =gUnknown_03007420
ldr r0, [r0, 0x4]
cmp r0, 0
bge _08145582
ldr r6, =0x0203ab90
ldr r6, =gUnknown_0203AB90
ldr r1, [r6]
ldrb r0, [r1, 0x1A]
cmp r0, 0
@@ -283,7 +283,7 @@ sub_8145588: @ 8145588
movs r2, 0x7D
movs r3, 0xA
bl sub_80A32C0
ldr r0, =0x0203ab90
ldr r0, =gUnknown_0203AB90
ldr r1, [r0]
movs r0, 0x1
strb r0, [r1, 0x10]
@@ -295,16 +295,16 @@ sub_8145588: @ 8145588
thumb_func_start sub_81455A8
sub_81455A8: @ 81455A8
push {r4,lr}
ldr r3, =0x03002f50
ldr r3, =gUnknown_03002F50
movs r0, 0
ldrsb r0, [r3, r0]
cmp r0, 0x1
bgt _081455C0
ldr r0, =0x030066d0
ldr r0, =gUnknown_030066D0
b _081455D8
.pool
_081455C0:
ldr r2, =0x03006380
ldr r2, =gUnknown_03006380
ldrb r1, [r2, 0xB]
movs r0, 0
ldrsb r0, [r3, r0]
@@ -321,7 +321,7 @@ _081455D8:
lsls r1, 3
adds r3, r0, r1
movs r2, 0
ldr r4, =0x0203ab90
ldr r4, =gUnknown_0203AB90
_081455E2:
ldr r1, [r4]
adds r1, r2
@@ -346,7 +346,7 @@ _081455E2:
thumb_func_start sub_814560C
sub_814560C: @ 814560C
push {r4,lr}
ldr r4, =0x0203ab90
ldr r4, =gUnknown_0203AB90
ldr r1, [r4]
ldrb r0, [r1, 0x16]
lsls r0, 3
@@ -378,7 +378,7 @@ sub_8145648: @ 8145648
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
ldr r4, =0x0203ab90
ldr r4, =gUnknown_0203AB90
ldr r0, [r4]
ldrb r1, [r0, 0x11]
adds r0, r6, 0
@@ -517,9 +517,9 @@ _08145700:
.align 2, 0
_08145764: .4byte 0x40920000
_08145768: .4byte 0x00000000
_0814576C: .4byte 0x0203ab90
_0814576C: .4byte gUnknown_0203AB90
_08145770: .4byte gUnknown_085B8C30
_08145774: .4byte 0x0203ab94
_08145774: .4byte gUnknown_0203AB94
_08145778: .4byte gUnknown_085B8770
_0814577C: .4byte gUnknown_085B8C32
_08145780:
@@ -591,10 +591,10 @@ _081457EA:
pop {r0}
bx r0
.align 2, 0
_08145804: .4byte 0x0203ab94
_08145804: .4byte gUnknown_0203AB94
_08145808: .4byte gUnknown_085B8770
_0814580C: .4byte gUnknown_085B8C32
_08145810: .4byte 0x0203ab90
_08145810: .4byte gUnknown_0203AB90
thumb_func_end sub_81456A8
thumb_func_start sub_8145814
@@ -642,7 +642,7 @@ sub_8145850: @ 8145850
lsrs r7, r1, 24
movs r0, 0
mov r8, r0
ldr r6, =0x030061ec
ldr r6, =gUnknown_030061EC
ldrb r0, [r6]
cmp r0, 0
beq _08145874
@@ -651,7 +651,7 @@ sub_8145850: @ 8145850
b _081458F8
.pool
_08145874:
ldr r5, =0x0203ab98
ldr r5, =gUnknown_0203AB98
ldr r0, [r5]
cmp r0, 0
bne _08145884
@@ -694,7 +694,7 @@ _081458B0:
asrs r2, 16
movs r3, 0x1
bl AddObjectToFront
ldr r2, =0x0203ab98
ldr r2, =gUnknown_0203AB98
ldr r3, [r2]
lsls r0, 24
lsrs r0, 24
@@ -721,8 +721,8 @@ _081458F8:
thumb_func_start sub_8145914
sub_8145914: @ 8145914
push {r4-r6,lr}
ldr r4, =0x02020630
ldr r6, =0x0203ab98
ldr r4, =gUnknown_02020630
ldr r6, =gUnknown_0203AB98
ldr r0, [r6]
ldrh r1, [r0, 0x4]
lsls r0, r1, 4
@@ -742,7 +742,7 @@ sub_8145914: @ 8145914
lsls r0, 2
adds r0, r4
bl RemoveObjectAndFreeTiles
ldr r4, =0x0203ab90
ldr r4, =gUnknown_0203AB90
ldr r0, [r4]
bl Free
movs r5, 0
@@ -761,8 +761,8 @@ sub_814596C: @ 814596C
push {r4-r7,lr}
sub sp, 0x14
adds r7, r0, 0
ldr r3, =0x02020630
ldr r4, =0x0203ab98
ldr r3, =gUnknown_02020630
ldr r4, =gUnknown_0203AB98
ldr r0, [r4]
ldrh r1, [r0, 0x4]
lsls r0, r1, 4
@@ -784,7 +784,7 @@ sub_814596C: @ 814596C
adds r0, r3
movs r1, 0
strh r1, [r0, 0x6]
ldr r0, =0x0203ab90
ldr r0, =gUnknown_0203AB90
ldr r0, [r0]
ldrb r1, [r0, 0x10]
cmp r1, 0x2
@@ -859,7 +859,7 @@ _08145A20:
_08145A2E:
add r4, sp, 0xC
_08145A30:
ldr r0, =0x0203ab98
ldr r0, =gUnknown_0203AB98
ldr r2, [r0]
ldrb r5, [r2]
movs r1, 0
@@ -996,7 +996,7 @@ sub_8145B24: @ 8145B24
bhi _08145B40
movs r2, 0xE0
_08145B40:
ldr r1, =0x0203ab98
ldr r1, =gUnknown_0203AB98
ldr r0, [r1]
strb r2, [r0, 0x1]
ldr r1, [r1]
asm/pokemon_1.s
+29 -29
View File
@@ -83,7 +83,7 @@ zero_pokemon_struct: @ 8067A8C
@ void zero_player_party_data()
zero_player_party_data: @ 8067B0C
push {r4,r5,lr}
ldr r4, =0x020244ec
ldr r4, =gUnknown_020244EC
movs r0, 0xFA
lsls r0, 1
adds r5, r4, r0
@@ -102,7 +102,7 @@ _08067B16:
thumb_func_start zero_enemy_party_data
zero_enemy_party_data: @ 8067B2C
push {r4,r5,lr}
ldr r4, =0x02024744
ldr r4, =gUnknown_02024744
movs r0, 0xFA
lsls r0, 1
adds r5, r4, r0
@@ -263,7 +263,7 @@ _08067C64:
str r0, [sp, 0x18]
b _08067C8A
_08067C70:
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r2, [r0]
ldrb r1, [r2, 0xA]
ldrb r0, [r2, 0xB]
@@ -301,7 +301,7 @@ _08067C8A:
adds r0, r7, 0
movs r1, 0x3
bl pokemon_setattr_encrypted
ldr r5, =0x03005d90
ldr r5, =gUnknown_03005D90
ldr r2, [r5]
adds r0, r7, 0
movs r1, 0x7
@@ -1081,7 +1081,7 @@ sub_8068338: @ 8068338
adds r6, r1, 0
lsls r2, 24
lsrs r2, 24
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r0, [r0]
ldr r1, =0x00000ca9
adds r0, r1
@@ -1785,13 +1785,13 @@ _08068914:
.4byte _08068A00
.4byte _08068990
_0806892C:
ldr r0, =0x02022fec
ldr r0, =gUnknown_02022FEC
ldr r0, [r0]
movs r1, 0x40
ands r0, r1
cmp r0, 0
beq _080689CE
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
ldr r1, =0x00000439
adds r0, r1
ldrb r1, [r0]
@@ -1802,13 +1802,13 @@ _0806892C:
b _080689B6
.pool
_08068958:
ldr r0, =0x02022fec
ldr r0, =gUnknown_02022FEC
ldr r0, [r0]
movs r1, 0x40
ands r0, r1
cmp r0, 0
beq _080689CE
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
ldr r1, =0x00000439
adds r0, r1
ldrb r1, [r0]
@@ -1825,14 +1825,14 @@ _08068958:
b _080689CE
.pool
_08068990:
ldr r0, =0x02022fec
ldr r0, =gUnknown_02022FEC
ldr r2, [r0]
movs r3, 0x2
adds r0, r2, 0
ands r0, r3
cmp r0, 0
beq _080689E4
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
ldr r1, =0x00000439
adds r0, r1
ldrb r1, [r0]
@@ -1845,7 +1845,7 @@ _08068990:
cmp r2, 0
beq _080689F4
_080689B6:
ldr r4, =0x020229e8
ldr r4, =gUnknown_020229E8
bl link_get_multiplayer_id
lsls r0, 24
lsrs r0, 24
@@ -1861,7 +1861,7 @@ _080689CE:
b _08068A02
.pool
_080689E4:
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
ldr r1, =0x00000439
adds r0, r1
ldrb r1, [r0]
@@ -1889,7 +1889,7 @@ get_pokemon_data_3: @ 8068A10
push {r4-r6,lr}
adds r5, r0, 0
adds r6, r1, 0
ldr r0, =0x02022fec
ldr r0, =gUnknown_02022FEC
ldr r0, [r0]
movs r1, 0x20
ands r0, r1
@@ -1967,7 +1967,7 @@ _08068AAA:
movs r0, 0x64
adds r1, r5, 0
muls r1, r0
ldr r0, =0x020244ec
ldr r0, =gUnknown_020244EC
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
@@ -2036,14 +2036,14 @@ _08068B34:
thumb_func_start sub_8068B48
sub_8068B48: @ 8068B48
push {lr}
ldr r0, =0x02022fec
ldr r0, =gUnknown_02022FEC
ldr r0, [r0]
movs r1, 0x80
lsls r1, 18
ands r0, r1
cmp r0, 0
beq _08068B6C
ldr r0, =0x0203c7b4
ldr r0, =gUnknown_0203C7B4
ldrb r1, [r0]
movs r0, 0x1
eors r0, r1
@@ -2056,7 +2056,7 @@ _08068B6C:
lsls r0, 24
lsrs r0, 24
_08068B78:
ldr r3, =0x020229e8
ldr r3, =gUnknown_020229E8
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
@@ -2084,14 +2084,14 @@ _08068B78:
thumb_func_start sub_8068BB0
sub_8068BB0: @ 8068BB0
push {lr}
ldr r0, =0x02022fec
ldr r0, =gUnknown_02022FEC
ldr r0, [r0]
movs r1, 0x80
lsls r1, 18
ands r0, r1
cmp r0, 0
beq _08068BD4
ldr r0, =0x0203c7b4
ldr r0, =gUnknown_0203C7B4
ldrb r1, [r0]
movs r0, 0x1
eors r0, r1
@@ -2104,7 +2104,7 @@ _08068BD4:
lsls r0, 24
lsrs r0, 24
_08068BE0:
ldr r3, =0x020229e8
ldr r3, =gUnknown_020229E8
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
@@ -2133,14 +2133,14 @@ _08068BE0:
DoScriptedWildBattle: @ 8068C18
push {r4-r7,lr}
sub sp, 0x14
ldr r0, =0x020375e0
ldr r0, =gUnknown_020375E0
ldrh r5, [r0]
ldr r0, =0x020375e2
ldr r0, =gUnknown_020375E2
ldrh r4, [r0]
ldr r0, =0x020375e4
ldr r0, =gUnknown_020375E4
ldrh r6, [r0]
bl zero_enemy_party_data
ldr r7, =0x02024744
ldr r7, =gUnknown_02024744
lsls r4, 24
lsrs r4, 24
movs r0, 0
@@ -2376,7 +2376,7 @@ _08068E12:
adds r0, 0xA
str r0, [sp, 0x4]
_08068E26:
ldr r1, =0x02024474
ldr r1, =gUnknown_02024474
add r2, sp, 0x4
ldrb r0, [r2]
mov r3, r8
@@ -3033,7 +3033,7 @@ sub_8069318: @ 8069318
mov r10, r0
cmp r4, 0
beq _080693B0
ldr r4, =0x020244e8
ldr r4, =gUnknown_020244E8
mov r1, sp
ldrb r1, [r1]
strb r1, [r4]
@@ -3082,7 +3082,7 @@ _080693B0:
mov r1, r9
lsls r4, r1, 2
adds r1, r4, r3
ldr r2, =0x020244e8
ldr r2, =gUnknown_020244E8
ldrb r0, [r2]
ldr r1, [r1]
lsls r0, 1
@@ -3099,7 +3099,7 @@ _080693B0:
cmp r0, r1
bne _08069402
_080693D8:
ldr r2, =0x020244e2
ldr r2, =gUnknown_020244E2
mov r0, r12
adds r1, r3, r0
ldrb r0, [r6]
asm/pokemon_2.s
+51 -51
View File
@@ -25,9 +25,9 @@ _08069E04:
b _08069EC2
_08069E0A:
movs r5, 0
ldr r0, =0x02024064
ldr r0, =gUnknown_02024064
ldrb r3, [r0]
ldr r4, =0x02024210
ldr r4, =gUnknown_02024210
ldr r2, =gUnknown_0832A328
_08069E14:
cmp r5, r3
@@ -54,14 +54,14 @@ _08069E42:
lsrs r0, 24
bl battle_side_get_owner
adds r4, r0, 0
ldr r0, =0x0202420b
ldr r0, =gUnknown_0202420B
ldrb r0, [r0]
bl battle_side_get_owner
lsls r4, 24
lsls r0, 24
cmp r4, r0
bne _08069E74
ldr r0, =0x02024210
ldr r0, =gUnknown_02024210
ldrb r1, [r0]
ldr r2, =gUnknown_0832A328
lsls r0, r5, 2
@@ -86,14 +86,14 @@ _08069E8A:
lsrs r0, 24
bl battle_side_get_owner
adds r4, r0, 0
ldr r0, =0x0202420c
ldr r0, =gUnknown_0202420C
ldrb r0, [r0]
bl battle_side_get_owner
lsls r4, 24
lsls r0, 24
cmp r4, r0
bne _08069EBC
ldr r0, =0x02024210
ldr r0, =gUnknown_02024210
ldrb r1, [r0]
ldr r2, =gUnknown_0832A328
lsls r0, r5, 2
@@ -124,7 +124,7 @@ sub_8069ED8: @ 8069ED8
lsrs r5, r0, 16
lsls r1, 24
lsrs r2, r1, 24
ldr r4, =0x02022fec
ldr r4, =gUnknown_02022FEC
ldr r0, [r4]
ldr r1, =0x023f0902
ands r0, r1
@@ -140,7 +140,7 @@ sub_8069ED8: @ 8069ED8
ands r0, r1
cmp r0, 0
beq _08069F10
ldr r0, =0x02038bca
ldr r0, =gUnknown_02038BCA
ldrh r1, [r0]
movs r0, 0x80
lsls r0, 3
@@ -176,7 +176,7 @@ sub_8069F34: @ 8069F34
ands r4, r0
eors r4, r1
adds r5, r4, 0
ldr r0, =0x02022fec
ldr r0, =gUnknown_02022FEC
ldr r0, [r0]
ands r0, r6
cmp r0, 0
@@ -203,7 +203,7 @@ _08069F7C:
adds r0, r4, 0
b _08069FA6
_08069F80:
ldr r0, =0x02024210
ldr r0, =gUnknown_02024210
ldrb r1, [r0]
ldr r2, =gUnknown_0832A328
lsls r0, r4, 2
@@ -335,11 +335,11 @@ sub_806A068: @ 806A068
lsrs r5, r0, 16
lsls r1, 24
lsrs r4, r1, 24
ldr r0, =0x020244d4
ldr r0, =gUnknown_020244D4
ldr r2, [r0]
cmp r2, 0
beq _0806A09C
ldr r0, =0x0202499c
ldr r0, =gUnknown_0202499C
lsls r1, r4, 1
adds r1, r4
lsls r1, 3
@@ -354,11 +354,11 @@ sub_806A068: @ 806A068
b _0806A0DA
.pool
_0806A09C:
ldr r1, =0x020249b4
ldr r1, =gUnknown_020249B4
ldr r0, [r1]
cmp r0, 0
beq _0806A0B4
ldr r3, =0x0202499c
ldr r3, =gUnknown_0202499C
ldr r2, [r0, 0xC]
b _0806A0C8
.pool
@@ -366,12 +366,12 @@ _0806A0B4:
ldr r0, [r1, 0x4]
cmp r0, 0
beq _0806A0C4
ldr r3, =0x0202499c
ldr r3, =gUnknown_0202499C
ldr r2, [r0, 0xC]
b _0806A0C8
.pool
_0806A0C4:
ldr r3, =0x0202499c
ldr r3, =gUnknown_0202499C
ldr r2, =gUnknown_08329D98
_0806A0C8:
lsls r0, r4, 1
@@ -429,7 +429,7 @@ template_build_for_pokemon_or_trainer: @ 806A12C
lsrs r4, r0, 16
lsls r1, 24
lsrs r3, r1, 24
ldr r0, =0x0202499c
ldr r0, =gUnknown_0202499C
strh r4, [r0, 0x2]
adds r5, r0, 0
cmp r3, 0
@@ -454,7 +454,7 @@ _0806A144:
b _0806A1B0
.pool
_0806A170:
ldr r0, =0x020244d4
ldr r0, =gUnknown_020244D4
ldr r1, [r0]
cmp r1, 0
beq _0806A194
@@ -501,11 +501,11 @@ sub_806A1C0: @ 806A1C0
lsrs r5, r0, 16
lsls r1, 24
lsrs r4, r1, 24
ldr r0, =0x020244d4
ldr r0, =gUnknown_020244D4
ldr r2, [r0]
cmp r2, 0
beq _0806A1F4
ldr r0, =0x0202499c
ldr r0, =gUnknown_0202499C
lsls r1, r4, 1
adds r1, r4
lsls r1, 3
@@ -520,7 +520,7 @@ sub_806A1C0: @ 806A1C0
b _0806A20A
.pool
_0806A1F4:
ldr r3, =0x0202499c
ldr r3, =gUnknown_0202499C
ldr r2, =gUnknown_08329D98
lsls r0, r4, 1
adds r0, r4
@@ -2879,7 +2879,7 @@ memcpy_pokemon: @ 806B408
pokemon_catch: @ 806B414
push {r4-r6,lr}
adds r6, r0, 0
ldr r4, =0x03005d90
ldr r4, =gUnknown_03005D90
ldr r2, [r4]
movs r1, 0x7
bl pokemon_setattr
@@ -2904,7 +2904,7 @@ _0806B446:
movs r0, 0x64
adds r1, r5, 0
muls r1, r0
ldr r0, =0x020244ec
ldr r0, =gUnknown_020244EC
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
@@ -2916,7 +2916,7 @@ _0806B446:
adds r1, r6, 0
movs r2, 0x64
bl memcpy_pokemon
ldr r1, =0x020244e9
ldr r1, =gUnknown_020244E9
adds r0, r5, 0x1
strb r0, [r1]
movs r0, 0
@@ -2968,9 +2968,9 @@ _0806B4B2:
mov r1, r8
movs r2, 0x50
bl memcpy_pokemon
ldr r0, =0x020375f6
ldr r0, =gUnknown_020375F6
strh r5, [r0]
ldr r0, =0x020375f8
ldr r0, =gUnknown_020375F8
strh r6, [r0]
bl get_unknown_box_id
lsls r0, 16
@@ -3014,7 +3014,7 @@ _0806B530:
@ u8 calc_player_party_count()
calc_player_party_count: @ 806B53C
push {r4,lr}
ldr r0, =0x020244e9
ldr r0, =gUnknown_020244E9
movs r1, 0
strb r1, [r0]
b _0806B554
@@ -3032,7 +3032,7 @@ _0806B554:
adds r1, r0, 0
movs r0, 0x64
muls r0, r1
ldr r1, =0x020244ec
ldr r1, =gUnknown_020244EC
adds r0, r1
movs r1, 0xB
movs r2, 0
@@ -3051,7 +3051,7 @@ _0806B572:
@ u8 calc_enemy_party_count()
calc_enemy_party_count: @ 806B580
push {r4,lr}
ldr r0, =0x020244ea
ldr r0, =gUnknown_020244EA
movs r1, 0
strb r1, [r0]
b _0806B598
@@ -3069,7 +3069,7 @@ _0806B598:
adds r1, r0, 0
movs r0, 0x64
muls r0, r1
ldr r1, =0x02024744
ldr r1, =gUnknown_02024744
adds r0, r1
movs r1, 0xB
movs r2, 0
@@ -3089,7 +3089,7 @@ sub_806B5C4: @ 806B5C4
push {r4-r6,lr}
movs r6, 0
bl calc_player_party_count
ldr r1, =0x020244e9
ldr r1, =gUnknown_020244E9
ldrb r0, [r1]
cmp r0, 0x1
beq _0806B628
@@ -3101,7 +3101,7 @@ _0806B5DC:
movs r0, 0x64
adds r1, r5, 0
muls r1, r0
ldr r0, =0x020244ec
ldr r0, =gUnknown_020244EC
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x41
@@ -3126,7 +3126,7 @@ _0806B5DC:
adds r6, 0x1
_0806B616:
adds r5, 0x1
ldr r0, =0x020244e9
ldr r0, =gUnknown_020244E9
ldrb r0, [r0]
cmp r5, r0
blt _0806B5DC
@@ -3152,7 +3152,7 @@ _0806B63E:
movs r0, 0x64
adds r1, r5, 0
muls r1, r0
ldr r0, =0x020244ec
ldr r0, =gUnknown_020244EC
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x41
@@ -3201,7 +3201,7 @@ sub_806B694: @ 806B694
lsls r1, 24
cmp r1, 0
beq _0806B6B8
ldr r2, =0x0202420a
ldr r2, =gUnknown_0202420A
ldr r1, =gBaseStats
lsls r0, r3, 3
subs r0, r3
@@ -3211,7 +3211,7 @@ sub_806B694: @ 806B694
b _0806B6C6
.pool
_0806B6B8:
ldr r2, =0x0202420a
ldr r2, =gUnknown_0202420A
ldr r1, =gBaseStats
lsls r0, r3, 3
subs r0, r3
@@ -3263,7 +3263,7 @@ create_enemy_party: @ 806B70C
sub sp, 0x14
adds r5, r0, 0
bl zero_enemy_party_data
ldr r4, =0x020244a8
ldr r4, =gUnknown_020244A8
ldr r0, [r4]
ldr r0, [r0]
adds r1, r5, 0
@@ -3272,7 +3272,7 @@ create_enemy_party: @ 806B70C
movs r0, 0
mov r9, r0
_0806B730:
ldr r1, =0x020244a8
ldr r1, =gUnknown_020244A8
ldr r3, [r1]
ldr r2, [r3]
mov r4, r9
@@ -3288,7 +3288,7 @@ _0806B730:
movs r0, 0x64
mov r6, r9
muls r6, r0
ldr r4, =0x02024744
ldr r4, =gUnknown_02024744
mov r8, r4
adds r5, r6, r4
ldrh r1, [r1]
@@ -3312,7 +3312,7 @@ _0806B730:
adds r0, r5, 0
movs r3, 0xF
bl create_pokemon_set_level
ldr r1, =0x020244a8
ldr r1, =gUnknown_020244A8
ldr r0, [r1]
adds r1, r7, 0
adds r1, 0x88
@@ -3329,7 +3329,7 @@ _0806B730:
_0806B7A0:
adds r1, r5, 0
adds r1, 0x1A
ldr r2, =0x020244a8
ldr r2, =gUnknown_020244A8
ldr r0, [r2]
ldr r2, [r0]
adds r2, r7
@@ -3342,7 +3342,7 @@ _0806B7A0:
movs r3, 0x64
mov r0, r9
muls r0, r3
ldr r1, =0x02024744
ldr r1, =gUnknown_02024744
adds r7, r0, r1
mov r4, r10
lsls r0, r4, 1
@@ -3352,7 +3352,7 @@ _0806B7A0:
_0806B7CE:
adds r1, r5, 0
adds r1, 0xD
ldr r2, =0x020244a8
ldr r2, =gUnknown_020244A8
ldr r0, [r2]
ldr r2, [r0]
adds r2, r6
@@ -3360,7 +3360,7 @@ _0806B7CE:
bl pokemon_setattr
adds r1, r5, 0
adds r1, 0x11
ldr r3, =0x020244a8
ldr r3, =gUnknown_020244A8
ldr r0, [r3]
ldr r0, [r0]
adds r0, 0x4C
@@ -3398,7 +3398,7 @@ _0806B80A:
sub_806B830: @ 806B830
push {r4,r5,lr}
ldr r5, =gUnknown_08329EB8
ldr r0, =0x020244a8
ldr r0, =gUnknown_020244A8
ldr r0, [r0]
ldr r4, [r0]
ldrb r0, [r4, 0x9]
@@ -3427,7 +3427,7 @@ sub_806B830: @ 806B830
sub_806B870: @ 806B870
push {r4,r5,lr}
ldr r5, =gUnknown_08329EB8
ldr r0, =0x020244a8
ldr r0, =gUnknown_020244A8
ldr r0, [r0]
ldr r4, [r0]
ldrb r0, [r4, 0x9]
@@ -3459,7 +3459,7 @@ sub_806B8B0: @ 806B8B0
_0806B8B4:
movs r0, 0x64
muls r0, r4
ldr r1, =0x020244ec
ldr r1, =gUnknown_020244EC
adds r0, r1
movs r1, 0xB
movs r2, 0
@@ -3658,13 +3658,13 @@ battle_data_fill: @ 806B9FC
movs r0, 0x64
mov r5, r9
muls r5, r0
ldr r0, =0x020244ec
ldr r0, =gUnknown_020244EC
adds r5, r0
adds r0, r5, 0
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
ldr r1, =0x02024084
ldr r1, =gUnknown_02024084
mov r8, r1
movs r1, 0x58
ldr r2, [sp, 0x14]
@@ -3707,7 +3707,7 @@ _0806BA4E:
movs r0, 0x64
mov r4, r9
muls r4, r0
ldr r0, =0x020244ec
ldr r0, =gUnknown_020244EC
adds r4, r0
adds r0, r4, 0
movs r1, 0x15
@@ -3946,7 +3946,7 @@ _0806BA4E:
bl pokemon_getattr
ldr r0, [sp, 0x14]
bl battle_side_get_owner
ldr r1, =0x0202449c
ldr r1, =gUnknown_0202449C
lsls r0, 24
lsrs r0, 23
adds r0, 0xA8
asm/porthole.s
+8 -8
View File
@@ -55,12 +55,12 @@ sub_80FB5E8: @ 80FB5E8
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
ldr r1, =0x03005e08
ldr r1, =gTasks + 0x8
adds r4, r0, r1
ldr r0, =0x000040b4
bl GetVarPointer
adds r7, r0, 0
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r3, [r0]
adds r6, r3, 0x4
movs r0, 0
@@ -80,7 +80,7 @@ _080FB624:
beq _080FB6C4
b _080FB6E2
_080FB62E:
ldr r0, =0x02037fd4
ldr r0, =gUnknown_02037FD4
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -92,7 +92,7 @@ _080FB62E:
b _080FB6E2
.pool
_080FB648:
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
ldrh r1, [r0, 0x2E]
adds r0, r2, 0
ands r0, r1
@@ -185,7 +185,7 @@ sub_80FB6EC: @ 80FB6EC
bl AddPseudoFieldObject
lsls r0, 24
lsrs r0, 24
ldr r2, =0x02020630
ldr r2, =gUnknown_02020630
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
@@ -231,8 +231,8 @@ _080FB75E:
sub_80FB768: @ 80FB768
push {lr}
bl sub_80FB6EC
ldr r2, =0x02037350
ldr r0, =0x02037590
ldr r2, =gUnknown_02037350
ldr r0, =gUnknown_02037590
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -262,7 +262,7 @@ sub_80FB7A4: @ 80FB7A4
movs r0, 0x80
lsls r0, 7
bl FlagSet
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
movs r1, 0x4
ldrsb r1, [r0, r1]
asm/record_mixing.s
+110 -110
View File
@@ -18,45 +18,45 @@ sub_80E6BE8: @ 80E6BE8
thumb_func_start sub_80E6BF8
sub_80E6BF8: @ 80E6BF8
push {r4,lr}
ldr r2, =0x03001134
ldr r0, =0x03005d8c
ldr r2, =gUnknown_03001134
ldr r0, =gUnknown_03005D8C
ldr r1, [r0]
ldr r3, =0x00001a9c
adds r0, r1, r3
str r0, [r2]
ldr r2, =0x03001138
ldr r2, =gUnknown_03001138
ldr r4, =0x000027cc
adds r0, r1, r4
str r0, [r2]
ldr r2, =0x0300113c
ldr r2, =gUnknown_0300113C
ldr r3, =0x00002b50
adds r0, r1, r3
str r0, [r2]
ldr r2, =0x03001140
ldr r2, =gUnknown_03001140
ldr r4, =0x00002e28
adds r0, r1, r4
str r0, [r2]
ldr r2, =0x03001144
ldr r2, =gUnknown_03001144
ldr r3, =0x00002e68
adds r0, r1, r3
str r0, [r2]
ldr r2, =0x03001148
ldr r0, =0x02039f9c
ldr r2, =gUnknown_03001148
ldr r0, =gUnknown_02039F9C
str r0, [r2]
ldr r2, =0x0300114c
ldr r0, =0x03005d90
ldr r2, =gUnknown_0300114C
ldr r0, =gUnknown_03005D90
ldr r0, [r0]
ldr r4, =0x0000064c
adds r3, r0, r4
str r3, [r2]
ldr r2, =0x03001150
ldr r2, =gUnknown_03001150
ldr r4, =0x00003b58
adds r1, r4
str r1, [r2]
ldr r1, =0x03001154
ldr r1, =gUnknown_03001154
adds r0, 0xDC
str r0, [r1]
ldr r0, =0x03001158
ldr r0, =gUnknown_03001158
str r3, [r0]
pop {r4}
pop {r0}
@@ -68,7 +68,7 @@ sub_80E6BF8: @ 80E6BF8
sub_80E6CA0: @ 80E6CA0
push {r4,r5,lr}
adds r5, r0, 0
ldr r0, =0x03001134
ldr r0, =gUnknown_03001134
ldr r1, [r0]
movs r4, 0xC8
lsls r4, 4
@@ -76,7 +76,7 @@ sub_80E6CA0: @ 80E6CA0
adds r2, r4, 0
bl memcpy
adds r4, r5, r4
ldr r0, =0x03001138
ldr r0, =gUnknown_03001138
ldr r1, [r0]
movs r2, 0xE1
lsls r2, 2
@@ -86,26 +86,26 @@ sub_80E6CA0: @ 80E6CA0
bl sub_80F14F8
ldr r1, =0x00001004
adds r0, r5, r1
ldr r1, =0x0300113c
ldr r1, =gUnknown_0300113C
ldr r1, [r1]
movs r2, 0x40
bl memcpy
ldr r2, =0x00001044
adds r0, r5, r2
ldr r1, =0x03001140
ldr r1, =gUnknown_03001140
ldr r1, [r1]
movs r2, 0x40
bl memcpy
ldr r1, =0x00001084
adds r0, r5, r1
ldr r1, =0x03001144
ldr r1, =gUnknown_03001144
ldr r1, [r1]
movs r2, 0x28
bl memcpy
ldr r2, =0x000010ac
adds r0, r5, r2
bl sub_80E89F8
ldr r0, =0x0300114c
ldr r0, =gUnknown_0300114C
ldr r0, [r0]
ldr r2, =0x00001124
adds r1, r5, r2
@@ -129,7 +129,7 @@ _080E6D1C:
sub_80E6D54: @ 80E6D54
push {r4,r5,lr}
adds r5, r0, 0
ldr r0, =0x03001134
ldr r0, =gUnknown_03001134
ldr r1, [r0]
movs r4, 0xC8
lsls r4, 4
@@ -139,7 +139,7 @@ sub_80E6D54: @ 80E6D54
adds r0, r5, 0
bl sub_80EB18C
adds r4, r5, r4
ldr r0, =0x03001138
ldr r0, =gUnknown_03001138
ldr r1, [r0]
movs r2, 0xE1
lsls r2, 2
@@ -149,13 +149,13 @@ sub_80E6D54: @ 80E6D54
bl sub_80F1208
ldr r1, =0x00001004
adds r0, r5, r1
ldr r1, =0x0300113c
ldr r1, =gUnknown_0300113C
ldr r1, [r1]
movs r2, 0x40
bl memcpy
ldr r2, =0x00001044
adds r4, r5, r2
ldr r0, =0x03001140
ldr r0, =gUnknown_03001140
ldr r1, [r0]
adds r0, r4, 0
movs r2, 0x40
@@ -164,7 +164,7 @@ sub_80E6D54: @ 80E6D54
bl sub_8120B70
ldr r1, =0x00001084
adds r0, r5, r1
ldr r1, =0x03001144
ldr r1, =gUnknown_03001144
ldr r1, [r1]
movs r2, 0x28
bl memcpy
@@ -174,7 +174,7 @@ sub_80E6D54: @ 80E6D54
bl sub_80E89F8
adds r0, r4, 0
bl sub_80E8A54
ldr r0, =0x0300114c
ldr r0, =gUnknown_0300114C
ldr r0, [r0]
ldr r1, =0x00001124
adds r4, r5, r1
@@ -209,21 +209,21 @@ sub_80E6E24: @ 80E6E24
bl sub_800A03C
cmp r0, 0
bne _080E6E50
ldr r0, =0x0203a018
ldr r0, =gUnknown_0203A018
ldr r0, [r0]
bl sub_80E6CA0
b _080E6F12
.pool
_080E6E50:
ldr r0, =0x0203a018
ldr r0, =gUnknown_0203A018
ldr r0, [r0]
bl sub_80E6D54
b _080E6F12
.pool
_080E6E60:
ldr r5, =0x0203a018
ldr r5, =gUnknown_0203A018
ldr r0, [r5]
ldr r1, =0x03001134
ldr r1, =gUnknown_03001134
ldr r1, [r1]
movs r4, 0xC8
lsls r4, 4
@@ -231,7 +231,7 @@ _080E6E60:
bl memcpy
ldr r0, [r5]
adds r0, r4
ldr r1, =0x03001138
ldr r1, =gUnknown_03001138
ldr r1, [r1]
movs r2, 0xE1
lsls r2, 2
@@ -239,28 +239,28 @@ _080E6E60:
ldr r0, [r5]
ldr r1, =0x00001004
adds r0, r1
ldr r1, =0x0300113c
ldr r1, =gUnknown_0300113C
ldr r1, [r1]
movs r2, 0x40
bl memcpy
ldr r0, [r5]
ldr r2, =0x00001044
adds r0, r2
ldr r1, =0x03001140
ldr r1, =gUnknown_03001140
ldr r1, [r1]
movs r2, 0x40
bl memcpy
ldr r0, [r5]
ldr r1, =0x00001214
adds r0, r1
ldr r1, =0x03001150
ldr r1, =gUnknown_03001150
ldr r1, [r1]
movs r2, 0x40
bl memcpy
ldr r0, [r5]
ldr r2, =0x00001084
adds r0, r2
ldr r1, =0x03001144
ldr r1, =gUnknown_03001144
ldr r1, [r1]
movs r2, 0x28
bl memcpy
@@ -271,7 +271,7 @@ _080E6E60:
ldr r0, [r5]
ldr r4, =0x00001124
adds r0, r4
ldr r1, =0x0300114c
ldr r1, =gUnknown_0300114C
ldr r1, [r1]
movs r2, 0xEC
bl memcpy
@@ -291,7 +291,7 @@ _080E6EFA:
ldr r0, [r5]
ldr r1, =0x00001254
adds r0, r1
ldr r1, =0x03001154
ldr r1, =gUnknown_03001154
ldr r1, [r1]
bl sub_80E8110
ldr r0, [r5]
@@ -314,7 +314,7 @@ sub_80E6F60: @ 80E6F60
bl sub_800A064
cmp r0, 0
beq _080E7014
ldr r5, =0x0203a014
ldr r5, =gUnknown_0203A014
ldr r0, [r5]
movs r1, 0xC8
lsls r1, 4
@@ -372,7 +372,7 @@ sub_80E6F60: @ 80E6F60
b _080E70BE
.pool
_080E7014:
ldr r5, =0x0203a014
ldr r5, =gUnknown_0203A014
ldr r0, [r5]
movs r1, 0xC8
lsls r1, 4
@@ -485,7 +485,7 @@ sub_80E7128: @ 80E7128
push {r4,lr}
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
@@ -516,7 +516,7 @@ sub_80E715C: @ 80E715C
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
ldr r1, =0x03005e08
ldr r1, =gTasks + 0x8
adds r5, r0, r1
movs r1, 0
ldrsh r0, [r5, r1]
@@ -539,22 +539,22 @@ _080E7188:
.4byte _080E72AC
.4byte _080E72C0
_080E71A0:
ldr r4, =0x0203a018
ldr r4, =gUnknown_0203A018
ldr r0, =0x00001444
bl Alloc
str r0, [r4]
ldr r4, =0x0203a014
ldr r4, =gUnknown_0203A014
ldr r0, =0x00005110
bl Alloc
str r0, [r4]
ldr r0, =0x020375e2
ldr r0, =gUnknown_020375E2
ldrb r0, [r0]
bl sub_8009628
movs r0, 0x80
lsls r0, 7
movs r1, 0x1
bl VarSet
ldr r1, =0x03001130
ldr r1, =gUnknown_03001130
movs r0, 0
strb r0, [r1]
bl sub_80E6E24
@@ -576,7 +576,7 @@ _080E71A0:
b _080E730A
.pool
_080E7218:
ldr r2, =0x03005e00
ldr r2, =gTasks
movs r0, 0x14
ldrsh r1, [r5, r0]
lsls r0, r1, 2
@@ -609,7 +609,7 @@ _080E724C:
b _080E730A
.pool
_080E726C:
ldr r2, =0x03005e00
ldr r2, =gTasks
movs r0, 0x14
ldrsh r1, [r5, r0]
lsls r0, r1, 2
@@ -621,7 +621,7 @@ _080E726C:
bne _080E730A
movs r0, 0x4
strh r0, [r5]
ldr r0, =0x030030fc
ldr r0, =gUnknown_030030FC
ldrb r0, [r0]
cmp r0, 0
bne _080E7296
@@ -647,7 +647,7 @@ _080E72AC:
strh r0, [r5]
b _080E730A
_080E72C0:
ldr r2, =0x03005e00
ldr r2, =gTasks
movs r0, 0x14
ldrsh r1, [r5, r0]
lsls r0, r1, 2
@@ -657,14 +657,14 @@ _080E72C0:
ldrb r0, [r0, 0x4]
cmp r0, 0
bne _080E730A
ldr r0, =0x0203a014
ldr r0, =gUnknown_0203A014
ldr r0, [r0]
bl Free
ldr r0, =0x0203a018
ldr r0, =gUnknown_0203A018
ldr r0, [r0]
bl Free
bl sub_808729C
ldr r0, =0x030030fc
ldr r0, =gUnknown_030030FC
ldrb r0, [r0]
cmp r0, 0
beq _080E72F8
@@ -693,7 +693,7 @@ sub_80E7324: @ 80E7324
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
ldr r6, =0x03005e00
ldr r6, =gTasks
adds r5, r0, r6
movs r0, 0x8
ldrsh r1, [r5, r0]
@@ -849,13 +849,13 @@ _080E745A:
strh r0, [r5, 0x20]
b _080E7566
_080E7464:
ldr r0, =0x03003124
ldr r0, =gUnknown_03003124
ldrb r0, [r0]
cmp r0, 0
bne _080E746E
b _080E7566
_080E746E:
ldr r4, =0x02021cc4
ldr r4, =gUnknown_02021CC4
bl sub_80E7810
adds r1, r0, 0
lsls r1, 24
@@ -883,7 +883,7 @@ _080E7490:
bl sub_800A064
cmp r0, 0
beq _080E7504
ldr r0, =0x0203a018
ldr r0, =gUnknown_0203A018
ldr r0, [r0]
adds r1, r5, 0
adds r1, 0xC
@@ -899,18 +899,18 @@ _080E7490:
lsls r1, 3
adds r0, r1, r6
strh r4, [r0, 0x8]
ldr r0, =0x0203a014
ldr r0, =gUnknown_0203A014
ldr r0, [r0]
adds r1, r6, r1
adds r1, 0x12
bl sub_80E7808
ldr r1, =0x0300115c
ldr r1, =gUnknown_0300115C
ldr r0, =0x00001230
str r0, [r1]
b _080E7566
.pool
_080E7504:
ldr r0, =0x0203a018
ldr r0, =gUnknown_0203A018
ldr r0, [r0]
adds r1, r5, 0
adds r1, 0xC
@@ -926,12 +926,12 @@ _080E7504:
lsls r1, 3
adds r0, r1, r6
strh r4, [r0, 0x8]
ldr r0, =0x0203a014
ldr r0, =gUnknown_0203A014
ldr r0, [r0]
adds r1, r6, r1
adds r1, 0x12
bl sub_80E7808
ldr r1, =0x0300115c
ldr r1, =gUnknown_0300115C
ldr r0, =0x00001444
str r0, [r1]
b _080E7566
@@ -963,7 +963,7 @@ sub_80E756C: @ 80E756C
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
ldr r0, =0x03005e00
ldr r0, =gTasks
adds r5, r1, r0
movs r2, 0x8
ldrsh r1, [r5, r2]
@@ -993,7 +993,7 @@ _080E75AC:
movs r0, 0xC8
muls r0, r2
adds r1, r0
ldr r0, =0x020228c4
ldr r0, =gUnknown_020228C4
movs r2, 0xC8
bl memcpy
b _080E75FC
@@ -1012,7 +1012,7 @@ _080E75E2:
strh r0, [r5, 0x10]
movs r1, 0x10
ldrsh r4, [r5, r1]
ldr r0, =0x0300115c
ldr r0, =gUnknown_0300115C
ldr r0, [r0]
movs r1, 0xC8
bl __udivsi3
@@ -1063,7 +1063,7 @@ sub_80E7630: @ 80E7630
ldr r1, [sp]
adds r0, r1
lsls r0, 3
ldr r1, =0x03005e00
ldr r1, =gTasks
adds r0, r1
mov r10, r0
bl sub_800A550
@@ -1106,7 +1106,7 @@ _080E7678:
movs r7, 0xC8
muls r1, r7
adds r0, r1
ldr r3, =0x0300115c
ldr r3, =gUnknown_0300115C
ldr r1, [r3]
mov r2, r8
muls r2, r1
@@ -1119,7 +1119,7 @@ _080E7678:
ldrsh r2, [r4, r3]
adds r0, r2, 0x1
muls r0, r7
ldr r4, =0x0300115c
ldr r4, =gUnknown_0300115C
ldr r3, [r4]
cmp r0, r3
bls _080E76DC
@@ -1144,7 +1144,7 @@ _080E76E4:
strh r0, [r1]
movs r2, 0
ldrsh r4, [r1, r2]
ldr r3, =0x0300115c
ldr r3, =gUnknown_0300115C
ldr r0, [r3]
movs r1, 0xC8
bl __udivsi3
@@ -1167,7 +1167,7 @@ _080E771C:
lsrs r0, 24
cmp r8, r0
bcc _080E7678
ldr r2, =0x03005e00
ldr r2, =gTasks
mov r0, r10
movs r3, 0x8
ldrsh r1, [r0, r3]
@@ -1207,7 +1207,7 @@ sub_80E776C: @ 80E776C
lsls r0, r3, 2
adds r0, r3
lsls r0, 3
ldr r2, =0x03005e00
ldr r2, =gTasks
adds r0, r2
movs r4, 0x1C
ldrsh r1, [r0, r4]
@@ -1235,11 +1235,11 @@ sub_80E77A0: @ 80E77A0
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
ldr r0, =0x03005e00
ldr r0, =gTasks
adds r1, r0
ldr r0, =sub_80E776C
str r0, [r1]
ldr r0, =0x03001130
ldr r0, =gUnknown_03001130
ldrb r0, [r0]
cmp r0, 0x1
bne _080E77C4
@@ -1256,14 +1256,14 @@ _080E77C4:
sub_80E77D4: @ 80E77D4
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r1, r2
ldr r0, =sub_80E77A0
str r0, [r1]
ldr r1, =0x03001130
ldr r1, =gUnknown_03001130
movs r0, 0x1
strb r0, [r1]
bx lr
@@ -1302,7 +1302,7 @@ sub_80E7810: @ 80E7810
sub_80E7820: @ 80E7820
lsls r0, 24
lsrs r0, 16
ldr r1, =0x020223c4
ldr r1, =gUnknown_020223C4
adds r0, r1
bx lr
.pool
@@ -1405,7 +1405,7 @@ sub_80E78C4: @ 80E78C4
muls r0, r1
mov r2, r9
adds r6, r2, r0
ldr r2, =0x020229e8
ldr r2, =gUnknown_020229E8
lsls r0, r1, 3
subs r0, r1
lsls r0, 2
@@ -1427,7 +1427,7 @@ _080E7910:
adds r2, r5, 0
bl sub_8120CD0
_080E791A:
ldr r0, =0x03001140
ldr r0, =gUnknown_03001140
ldr r0, [r0]
lsls r1, r7, 2
add r1, sp
@@ -1481,7 +1481,7 @@ sub_80E7948: @ 80E7948
cmp r0, 0x1
bne _080E79FE
adds r7, r6, 0
ldr r2, =0x020229e8
ldr r2, =gUnknown_020229E8
ldr r1, [r5]
lsls r0, r1, 3
subs r0, r1
@@ -1563,7 +1563,7 @@ sub_80E7A14: @ 80E7A14
adds r0, r7, 0
muls r0, r5
add r0, r8
ldr r6, =0x03001150
ldr r6, =gUnknown_03001150
ldr r1, [r6]
movs r2, 0x40
bl memcpy
@@ -1584,7 +1584,7 @@ sub_80E7A14: @ 80E7A14
_080E7A60:
movs r4, 0
_080E7A62:
ldr r0, =0x03001150
ldr r0, =gUnknown_03001150
ldr r0, [r0]
lsls r1, r5, 2
add r1, sp
@@ -1693,7 +1693,7 @@ sub_80E7B2C: @ 80E7B2C
adds r3, r0, 0
movs r2, 0
movs r1, 0
ldr r4, =0x03001160
ldr r4, =gUnknown_03001160
_080E7B36:
adds r0, r3, r1
ldrb r0, [r0]
@@ -1712,7 +1712,7 @@ _080E7B36:
thumb_func_start sub_80E7B54
sub_80E7B54: @ 80E7B54
ldr r0, =0x03001160
ldr r0, =gUnknown_03001160
ldrb r0, [r0]
bx lr
.pool
@@ -1735,7 +1735,7 @@ sub_80E7B60: @ 80E7B60
lsls r0, 16
lsrs r0, 16
str r0, [sp, 0x38]
ldr r0, =0x020229e8
ldr r0, =gUnknown_020229E8
ldrh r0, [r0, 0x4]
bl SeedRng2
bl sub_8009FCC
@@ -1797,7 +1797,7 @@ _080E7BF8:
muls r0, r1
ldr r2, [sp, 0x2C]
adds r7, r2, r0
ldr r1, =0x020229e8
ldr r1, =gUnknown_020229E8
mov r3, r8
lsls r0, r3, 3
subs r0, r3
@@ -2215,7 +2215,7 @@ _080E7F1C:
ldr r1, [sp, 0x2C]
ldr r2, [sp, 0x44]
adds r7, r1, r2
ldr r4, =0x03005d8c
ldr r4, =gUnknown_03005D8C
ldr r0, [r4]
movs r3, 0xC2
lsls r3, 6
@@ -2279,8 +2279,8 @@ sub_80E7F68: @ 80E7F68
ldr r0, =0x00004001
ldrh r1, [r4]
bl VarSet
ldr r0, =0x02021cc4
ldr r1, =0x020229f0
ldr r0, =gUnknown_02021CC4
ldr r1, =gUnknown_020229F0
bl CopyString
ldrh r1, [r4]
ldr r0, =0x00000113
@@ -2309,7 +2309,7 @@ sub_80E7FF8: @ 80E7FF8
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
ldr r1, =0x03005e00
ldr r1, =gTasks
adds r4, r0, r1
movs r1, 0x8
ldrsh r0, [r4, r1]
@@ -2368,7 +2368,7 @@ _080E807C:
bl sub_800AC34
b _080E80F2
_080E8090:
ldr r0, =0x03003124
ldr r0, =gUnknown_03003124
ldrb r0, [r0]
cmp r0, 0
bne _080E810A
@@ -2393,7 +2393,7 @@ _080E80C0:
lsls r0, 24
cmp r0, 0
bne _080E810A
ldr r0, =0x030030fc
ldr r0, =gUnknown_030030FC
ldrb r0, [r0]
cmp r0, 0
beq _080E80E8
@@ -2458,7 +2458,7 @@ sub_80E8110: @ 80E8110
str r2, [sp, 0x4]
mov r8, r2
movs r7, 0
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
mov r9, r0
_080E8150:
mov r1, r9
@@ -2543,7 +2543,7 @@ _080E81EC:
ldr r1, =0x33330000
cmp r0, r1
bls _080E8224
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r0, [r0]
adds r0, 0xB2
ldrb r0, [r0]
@@ -2562,7 +2562,7 @@ _080E820E:
b _080E824C
.pool
_080E8224:
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r0, [r0]
adds r0, 0xB2
ldrb r0, [r0]
@@ -2602,7 +2602,7 @@ sub_80E8260: @ 80E8260
sub sp, 0xC
mov r8, r0
movs r6, 0
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
mov r10, r0
_080E8274:
movs r7, 0
@@ -2635,7 +2635,7 @@ _080E8286:
mov r6, r9
cmp r6, 0x8
ble _080E8274
ldr r1, =0x03005d90
ldr r1, =gUnknown_03005D90
mov r10, r1
ldr r2, =0x00000ee1
str r2, [sp, 0x4]
@@ -2694,7 +2694,7 @@ _080E82DA:
cmp r7, 0
bge _080E82DA
movs r6, 0
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r3, [r0]
mov r4, r8
movs r1, 0xC4
@@ -2867,7 +2867,7 @@ _080E8496:
ldrb r0, [r6]
cmp r0, 0xFF
beq _080E84B4
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r1, [r0]
adds r1, 0xDC
adds r0, r4, 0
@@ -2891,7 +2891,7 @@ _080E84B4:
b _080E8566
.pool
_080E84CC:
ldr r4, =0x03005d90
ldr r4, =gUnknown_03005D90
ldr r0, [r4]
adds r1, r0, 0
adds r1, 0xB2
@@ -2925,7 +2925,7 @@ _080E8508:
_080E850C:
movs r0, 0x1
eors r0, r5
ldr r7, =0x03005d90
ldr r7, =gUnknown_03005D90
ldr r4, [r7]
adds r1, r4, 0
adds r1, 0xB2
@@ -2990,7 +2990,7 @@ sub_80E8578: @ 80E8578
mov r8, r4
movs r5, 0
str r5, [sp, 0x4]
ldr r4, =0x03001168
ldr r4, =gUnknown_03001168
b _080E85A0
.pool
_080E8598:
@@ -3035,7 +3035,7 @@ _080E85BE:
_080E85DC:
movs r6, 0
mov r8, r6
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r1, [r0]
ldr r2, [sp, 0x10]
lsls r0, r2, 5
@@ -3101,7 +3101,7 @@ _080E864A:
adds r0, r1, r2
ldr r4, [sp]
adds r5, r0, r4
ldr r0, =0x03001168
ldr r0, =gUnknown_03001168
adds r0, r6, r0
str r0, [sp, 0x50]
_080E8666:
@@ -3144,7 +3144,7 @@ _080E86A8:
ldr r3, [sp, 0xC]
cmp r3, 0
bne _080E86CE
ldr r0, =0x03001168
ldr r0, =gUnknown_03001168
ldr r4, [sp, 0x38]
adds r0, r4, r0
ldr r0, [r0]
@@ -3190,7 +3190,7 @@ _080E8702:
ldr r5, [sp, 0x8]
adds r5, 0x1
str r5, [sp, 0x2C]
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r1, [r0]
movs r0, 0x54
ldr r6, [sp, 0x8]
@@ -3248,7 +3248,7 @@ _080E8766:
mov r1, r8
adds r1, 0x1
str r1, [sp, 0x30]
ldr r0, =0x03001168
ldr r0, =gUnknown_03001168
ldr r2, [sp, 0x38]
adds r2, r0
mov r9, r2
@@ -3338,7 +3338,7 @@ _080E8808:
adds r1, r2
ldr r3, [sp]
adds r1, r3, r1
ldr r0, =0x03001168
ldr r0, =gUnknown_03001168
ldr r4, [sp, 0x38]
adds r0, r4, r0
ldr r0, [r0]
@@ -3486,7 +3486,7 @@ sub_80E8924: @ 80E8924
push {r5-r7}
mov r9, r0
movs r0, 0
ldr r1, =0x03005d90
ldr r1, =gUnknown_03005D90
mov r10, r1
_080E8936:
lsls r1, r0, 1
@@ -3518,7 +3518,7 @@ _080E8950:
cmp r0, 0x8
ble _080E8936
movs r5, 0
ldr r4, =0x03005d90
ldr r4, =gUnknown_03005D90
_080E8972:
movs r0, 0x54
adds r1, r5, 0
@@ -3587,8 +3587,8 @@ sub_80E89AC: @ 80E89AC
sub_80E89F8: @ 80E89F8
push {r4-r6,lr}
adds r6, r0, 0
ldr r5, =0x02039f9c
ldr r4, =0x03005d8c
ldr r5, =gUnknown_02039F9C
ldr r4, =gUnknown_03005D8C
ldr r1, [r4]
movs r0, 0xC2
lsls r0, 6
@@ -3608,7 +3608,7 @@ sub_80E89F8: @ 80E89F8
adds r0, r1
adds r1, r5, 0
bl sub_806FA9C
ldr r0, =0x03001148
ldr r0, =gUnknown_03001148
ldr r1, [r0]
adds r0, r6, 0
movs r2, 0x78
asm/region_map.s
+102 -102
View File
@@ -27,7 +27,7 @@ sub_8122CF8: @ 8122CF8
adds r4, r1, 0
lsls r2, 24
lsrs r2, 24
ldr r3, =0x0203a144
ldr r3, =gUnknown_0203A144
str r0, [r3]
movs r1, 0x79
adds r1, r0
@@ -97,7 +97,7 @@ _08122D80:
thumb_func_start sub_8122D88
sub_8122D88: @ 8122D88
push {r4,lr}
ldr r4, =0x0203a144
ldr r4, =gUnknown_0203A144
str r0, [r4]
bl sub_81238AC
ldr r2, [r4]
@@ -120,7 +120,7 @@ sub_8122D88: @ 8122D88
sub_8122DB0: @ 8122DB0
push {r4,r5,lr}
sub sp, 0xC
ldr r0, =0x0203a144
ldr r0, =gUnknown_0203A144
ldr r0, [r0]
adds r0, 0x79
ldrb r0, [r0]
@@ -145,7 +145,7 @@ _08122DD4:
.4byte _08122F10
.4byte _08122F8C
_08122DF4:
ldr r0, =0x0203a144
ldr r0, =gUnknown_0203A144
ldr r1, [r0]
adds r0, r1, 0
adds r0, 0x83
@@ -167,7 +167,7 @@ _08122E18:
b _08123014
.pool
_08122E2C:
ldr r4, =0x0203a144
ldr r4, =gUnknown_0203A144
ldr r0, [r4]
adds r0, 0x83
ldrb r0, [r0]
@@ -212,7 +212,7 @@ _08122E84:
.pool
_08122E94:
ldr r0, =gUnknown_0859F60C
ldr r1, =0x0203a144
ldr r1, =gUnknown_0203A144
ldr r1, [r1]
movs r2, 0xC2
lsls r2, 1
@@ -222,7 +222,7 @@ _08122E94:
.pool
_08122EB0:
ldr r0, =gUnknown_0859F650
ldr r1, =0x0203a144
ldr r1, =gUnknown_0203A144
ldr r1, [r1]
movs r5, 0xA1
lsls r5, 2
@@ -232,7 +232,7 @@ _08122EB0:
.pool
_08122ECC:
bl sub_81238AC
ldr r4, =0x0203a144
ldr r4, =gUnknown_0203A144
ldr r2, [r4]
adds r0, r2, 0
adds r0, 0x54
@@ -260,7 +260,7 @@ _08122ECC:
b _08123014
.pool
_08122F10:
ldr r0, =0x0203a144
ldr r0, =gUnknown_0203A144
ldr r4, [r0]
adds r0, r4, 0
adds r0, 0x78
@@ -322,7 +322,7 @@ _08122F3C:
_08122F8C:
bl sub_8123FB0
bl sub_81237B4
ldr r4, =0x0203a144
ldr r4, =gUnknown_0203A144
ldr r0, [r4]
movs r1, 0
str r1, [r0, 0x1C]
@@ -383,7 +383,7 @@ _0812300C:
b _08123022
.pool
_08123014:
ldr r0, =0x0203a144
ldr r0, =gUnknown_0203A144
ldr r1, [r0]
adds r1, 0x79
ldrb r0, [r1]
@@ -409,8 +409,8 @@ sub_8123030: @ 8123030
lsls r1, 24
lsrs r1, 24
bl sub_80A2A20
ldr r0, =0x02037bf4
ldr r1, =0x020377f4
ldr r0, =gUnknown_02037BF4
ldr r1, =gUnknown_020377F4
movs r2, 0x30
bl CpuSet
pop {r0}
@@ -421,7 +421,7 @@ sub_8123030: @ 8123030
thumb_func_start sub_812305C
sub_812305C: @ 812305C
push {r4,lr}
ldr r4, =0x0203a144
ldr r4, =gUnknown_0203A144
ldr r0, [r4]
ldr r0, [r0, 0x1C]
cmp r0, 0
@@ -459,7 +459,7 @@ _081230A0:
thumb_func_start sub_81230AC
sub_81230AC: @ 81230AC
push {lr}
ldr r0, =0x0203a144
ldr r0, =gUnknown_0203A144
ldr r0, [r0]
ldr r0, [r0, 0x18]
bl _call_via_r0
@@ -474,14 +474,14 @@ sub_81230AC: @ 81230AC
sub_81230C4: @ 81230C4
push {r4,lr}
movs r4, 0
ldr r2, =0x0203a144
ldr r2, =gUnknown_0203A144
ldr r0, [r2]
adds r0, 0x7B
strb r4, [r0]
ldr r0, [r2]
adds r0, 0x7C
strb r4, [r0]
ldr r3, =0x030022c0
ldr r3, =gUnknown_030022C0
ldrh r1, [r3, 0x2C]
movs r0, 0x40
ands r0, r1
@@ -581,7 +581,7 @@ _08123184:
thumb_func_start _swiopen
_swiopen: @ 8123190
push {r4,r5,lr}
ldr r5, =0x0203a144
ldr r5, =gUnknown_0203A144
ldr r1, [r5]
adds r0, r1, 0
adds r0, 0x7A
@@ -684,7 +684,7 @@ _08123248:
sub_8123254: @ 8123254
push {r4-r6,lr}
movs r4, 0
ldr r3, =0x0203a144
ldr r3, =gUnknown_0203A144
ldr r0, [r3]
mov r12, r0
adds r0, 0x6A
@@ -692,7 +692,7 @@ sub_8123254: @ 8123254
mov r5, r12
adds r5, 0x68
strh r4, [r5]
ldr r2, =0x030022c0
ldr r2, =gUnknown_030022C0
ldrh r1, [r2, 0x2C]
movs r0, 0x40
ands r0, r1
@@ -798,7 +798,7 @@ _0812331A:
thumb_func_start sub_8123334
sub_8123334: @ 8123334
push {r4,r5,lr}
ldr r5, =0x0203a144
ldr r5, =gUnknown_0203A144
ldr r2, [r5]
adds r3, r2, 0
adds r3, 0x5E
@@ -892,7 +892,7 @@ _081233C2:
_081233EE:
bl sub_8123FB0
_081233F2:
ldr r0, =0x0203a144
ldr r0, =gUnknown_0203A144
ldr r2, [r0]
adds r1, r2, 0
adds r1, 0x6C
@@ -914,7 +914,7 @@ _08123412:
thumb_func_start sub_8123418
sub_8123418: @ 8123418
push {r4-r6,lr}
ldr r1, =0x0203a144
ldr r1, =gUnknown_0203A144
ldr r2, [r1]
adds r0, r2, 0
adds r0, 0x78
@@ -1045,7 +1045,7 @@ _081234FA:
sub_8123514: @ 8123514
push {r4-r6,lr}
sub sp, 0xC
ldr r0, =0x0203a144
ldr r0, =gUnknown_0203A144
ldr r3, [r0]
adds r2, r3, 0
adds r2, 0x6E
@@ -1205,7 +1205,7 @@ _0812363C:
strh r1, [r3]
str r0, [r2, 0x48]
_0812364E:
ldr r0, =0x0203a144
ldr r0, =gUnknown_0203A144
ldr r2, [r0]
adds r0, r2, 0
adds r0, 0x78
@@ -1233,7 +1233,7 @@ _08123674:
_08123684:
movs r4, 0x1
_08123686:
ldr r0, =0x0203a144
ldr r0, =gUnknown_0203A144
ldr r3, [r0]
adds r0, r3, 0
adds r0, 0x5C
@@ -1285,7 +1285,7 @@ sub_81236C4: @ 81236C4
mov r9, r4
lsls r5, 24
lsrs r5, 24
ldr r4, =0x0203a144
ldr r4, =gUnknown_0203A144
ldr r6, [r4]
ldr r7, =gUnknown_08329F40
mov r12, r7
@@ -1367,7 +1367,7 @@ sub_81236C4: @ 81236C4
thumb_func_start sub_812378C
sub_812378C: @ 812378C
ldr r2, =0x0203a144
ldr r2, =gUnknown_0203A144
ldr r2, [r2]
lsls r0, 16
asrs r0, 8
@@ -1391,7 +1391,7 @@ sub_812378C: @ 812378C
thumb_func_start sub_81237B4
sub_81237B4: @ 81237B4
push {r4,lr}
ldr r4, =0x0203a144
ldr r4, =gUnknown_0203A144
ldr r1, [r4]
adds r0, r1, 0
adds r0, 0x7D
@@ -1460,7 +1460,7 @@ sub_8123824: @ 8123824
movs r3, 0x48
bl sub_81236C4
bl sub_81237B4
ldr r0, =0x0203a144
ldr r0, =gUnknown_0203A144
ldr r2, [r0]
ldr r1, [r2, 0x20]
cmp r1, 0
@@ -1522,7 +1522,7 @@ sub_81238AC: @ 81238AC
mov r5, r8
push {r5-r7}
sub sp, 0xC
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r2, [r0]
movs r1, 0x4
ldrsb r1, [r2, r1]
@@ -1569,9 +1569,9 @@ _08123904:
.4byte _08123A28
.4byte _081239E4
_08123928:
ldr r4, =0x0203a144
ldr r4, =gUnknown_0203A144
ldr r0, [r4]
ldr r3, =0x02037318
ldr r3, =gUnknown_02037318
ldrb r1, [r3, 0x14]
movs r2, 0
strh r1, [r0]
@@ -1581,7 +1581,7 @@ _08123928:
ldrh r2, [r0]
ldrh r0, [r0, 0x4]
mov r9, r0
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldrh r6, [r0]
ldrh r3, [r0, 0x2]
@@ -1599,13 +1599,13 @@ _08123956:
b _08123ABE
.pool
_0812396C:
ldr r2, =0x02037318
ldr r2, =gUnknown_02037318
ldrb r1, [r2, 0x1A]
movs r0, 0x2
ands r0, r1
cmp r0, 0
beq _081239C8
ldr r4, =0x03005d8c
ldr r4, =gUnknown_03005D8C
ldr r1, [r4]
adds r0, r1, 0
adds r0, 0x24
@@ -1622,7 +1622,7 @@ _0812396C:
lsrs r1, 16
bl get_mapheader_by_bank_and_number
adds r5, r0, 0
ldr r0, =0x0203a144
ldr r0, =gUnknown_0203A144
ldr r0, [r0]
ldrb r1, [r5, 0x14]
strh r1, [r0]
@@ -1639,7 +1639,7 @@ _0812396C:
b _08123ABE
.pool
_081239C8:
ldr r0, =0x0203a144
ldr r0, =gUnknown_0203A144
ldr r0, [r0]
ldrb r1, [r2, 0x14]
strh r1, [r0]
@@ -1653,7 +1653,7 @@ _081239C8:
b _08123ABE
.pool
_081239E4:
ldr r4, =0x03005d8c
ldr r4, =gUnknown_03005D8C
ldr r1, [r4]
movs r0, 0x14
ldrsb r0, [r1, r0]
@@ -1666,7 +1666,7 @@ _081239E4:
lsrs r1, 16
bl get_mapheader_by_bank_and_number
adds r5, r0, 0
ldr r0, =0x0203a144
ldr r0, =gUnknown_0203A144
ldr r0, [r0]
ldrb r1, [r5, 0x14]
strh r1, [r0]
@@ -1683,14 +1683,14 @@ _081239E4:
b _08123ABE
.pool
_08123A28:
ldr r4, =0x0203a144
ldr r4, =gUnknown_0203A144
ldr r0, [r4]
ldr r1, =0x02037318
ldr r1, =gUnknown_02037318
ldrb r1, [r1, 0x14]
strh r1, [r0]
cmp r1, 0x57
beq _08123A64
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
adds r7, r0, 0
adds r7, 0x24
@@ -1707,7 +1707,7 @@ _08123A28:
b _08123A8A
.pool
_08123A64:
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
adds r7, r0, 0
adds r7, 0x14
@@ -1726,7 +1726,7 @@ _08123A64:
ldrb r0, [r5, 0x14]
strh r0, [r1]
_08123A8A:
ldr r4, =0x0203a144
ldr r4, =gUnknown_0203A144
ldr r0, [r4]
ldrb r0, [r0]
bl sub_8123F74
@@ -1752,7 +1752,7 @@ _08123AB0:
_08123ABE:
str r6, [sp]
ldr r5, =gRegionMapEntries
ldr r4, =0x0203a144
ldr r4, =gUnknown_0203A144
ldr r0, [r4]
mov r10, r0
ldrh r7, [r0]
@@ -1831,7 +1831,7 @@ _08123B56:
b _08123BC6
_08123B5E:
movs r6, 0
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r1, [r0]
movs r2, 0
ldrsh r0, [r1, r2]
@@ -1888,7 +1888,7 @@ _08123BB8:
bl sub_8123F30
b _08123BEC
_08123BC6:
ldr r0, =0x0203a144
ldr r0, =gUnknown_0203A144
ldr r2, [r0]
ldrh r0, [r2]
lsls r0, 3
@@ -1959,28 +1959,28 @@ _08123C40:
.4byte _08123C74
.4byte _08123C84
_08123C54:
ldr r2, =0x0203a144
ldr r2, =gUnknown_0203A144
ldr r1, [r2]
movs r0, 0x8
strh r0, [r1]
b _08123D10
.pool
_08123C64:
ldr r2, =0x0203a144
ldr r2, =gUnknown_0203A144
ldr r1, [r2]
movs r0, 0xC
strh r0, [r1]
b _08123D10
.pool
_08123C74:
ldr r2, =0x0203a144
ldr r2, =gUnknown_0203A144
ldr r1, [r2]
movs r0, 0x27
strh r0, [r1]
b _08123D10
.pool
_08123C84:
ldr r2, =0x0203a144
ldr r2, =gUnknown_0203A144
ldr r1, [r2]
movs r0, 0x2E
strh r0, [r1]
@@ -1991,7 +1991,7 @@ _08123C94:
ldrb r0, [r0]
ldrb r1, [r4]
bl get_mapheader_by_bank_and_number
ldr r1, =0x0203a144
ldr r1, =gUnknown_0203A144
mov r9, r1
ldr r2, [r1]
ldrb r1, [r0, 0x14]
@@ -2409,7 +2409,7 @@ sub_8123F9C: @ 8123F9C
thumb_func_start sub_8123FB0
sub_8123FB0: @ 8123FB0
push {r4-r6,lr}
ldr r0, =0x0203a144
ldr r0, =gUnknown_0203A144
ldr r1, [r0]
ldrh r0, [r1]
cmp r0, 0xD5
@@ -2443,7 +2443,7 @@ _08123FE6:
adds r0, r4, 0
adds r1, r5, 0
bl sub_812386C
ldr r1, =0x0203a144
ldr r1, =gUnknown_0203A144
ldr r1, [r1]
lsls r0, 16
lsrs r0, 16
@@ -2468,7 +2468,7 @@ _08124008:
b _08124008
.pool
_08124028:
ldr r0, =0x0203a144
ldr r0, =gUnknown_0203A144
ldr r0, [r0]
strb r6, [r0, 0x3]
_0812402E:
@@ -2499,7 +2499,7 @@ _0812405A:
adds r0, r4, 0
adds r1, r5, 0
bl sub_812386C
ldr r1, =0x0203a144
ldr r1, =gUnknown_0203A144
ldr r1, [r1]
lsls r0, 16
lsrs r0, 16
@@ -2524,7 +2524,7 @@ _0812407C:
sub_8124088: @ 8124088
push {r4,lr}
adds r2, r0, 0
ldr r0, =0x0203a144
ldr r0, =gUnknown_0203A144
ldr r1, [r0]
adds r3, r1, 0
adds r3, 0x7A
@@ -2590,7 +2590,7 @@ sub_81240D4: @ 81240D4
str r1, [r2, 0x4]
mov r0, sp
strh r3, [r0]
ldr r0, =0x0203a144
ldr r0, =gUnknown_0203A144
ldr r4, [r0]
adds r0, r4, 0
adds r0, 0x58
@@ -2651,12 +2651,12 @@ _0812416E:
lsrs r1, r0, 24
cmp r1, 0x40
beq _08124228
ldr r4, =0x0203a144
ldr r4, =gUnknown_0203A144
ldr r2, [r4]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =0x02020630
ldr r1, =gUnknown_02020630
adds r3, r0, r1
str r3, [r2, 0x1C]
adds r2, 0x78
@@ -2705,7 +2705,7 @@ _081241DC:
adds r0, 0x4
strh r0, [r2, 0x22]
_08124204:
ldr r4, =0x0203a144
ldr r4, =gUnknown_0203A144
ldr r0, [r4]
ldr r1, [r0, 0x1C]
movs r0, 0x2
@@ -2733,7 +2733,7 @@ _08124228:
thumb_func_start sub_8124238
sub_8124238: @ 8124238
push {r4,lr}
ldr r4, =0x0203a144
ldr r4, =gUnknown_0203A144
ldr r0, [r4]
ldr r0, [r0, 0x1C]
cmp r0, 0
@@ -2756,7 +2756,7 @@ _0812425C:
thumb_func_start sub_8124268
sub_8124268: @ 8124268
ldr r0, =0x0203a144
ldr r0, =gUnknown_0203A144
ldr r0, [r0]
ldr r1, [r0, 0x1C]
movs r0, 0x1
@@ -2767,7 +2767,7 @@ sub_8124268: @ 8124268
thumb_func_start sub_8124278
sub_8124278: @ 8124278
ldr r0, =0x0203a144
ldr r0, =gUnknown_0203A144
ldr r0, [r0]
ldr r1, [r0, 0x1C]
movs r0, 0
@@ -2811,18 +2811,18 @@ sub_8124288: @ 8124288
str r0, [sp, 0x10]
ldr r0, =DummyObjectCallback
str r0, [sp, 0x14]
ldr r0, =0x02037318
ldr r0, =gUnknown_02037318
ldrb r0, [r0, 0x14]
bl sub_8124668
cmp r0, 0
beq _08124304
ldr r0, =0x0203a144
ldr r0, =gUnknown_0203A144
ldr r0, [r0]
str r5, [r0, 0x20]
b _081243A4
.pool
_08124304:
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r0, [r0]
ldrb r0, [r0, 0x8]
cmp r0, 0x1
@@ -2843,12 +2843,12 @@ _08124316:
bl AddObjectToFront
lsls r0, 24
lsrs r0, 24
ldr r1, =0x0203a144
ldr r1, =gUnknown_0203A144
ldr r2, [r1]
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r0, =0x02020630
ldr r0, =gUnknown_02020630
adds r1, r0
str r1, [r2, 0x20]
adds r0, r2, 0
@@ -2902,7 +2902,7 @@ _081243A4:
thumb_func_start sub_81243B0
sub_81243B0: @ 81243B0
push {lr}
ldr r3, =0x0203a144
ldr r3, =gUnknown_0203A144
ldr r0, [r3]
ldr r2, [r0, 0x20]
cmp r2, 0
@@ -2925,7 +2925,7 @@ _081243CE:
thumb_func_start sub_81243DC
sub_81243DC: @ 81243DC
push {lr}
ldr r0, =0x0203a144
ldr r0, =gUnknown_0203A144
ldr r3, [r0]
ldr r1, [r3, 0x20]
cmp r1, 0
@@ -2991,7 +2991,7 @@ _08124452:
sub_812445C: @ 812445C
push {r4,lr}
adds r3, r0, 0
ldr r0, =0x0203a144
ldr r0, =gUnknown_0203A144
ldr r1, [r0]
adds r0, r1, 0
adds r0, 0x5C
@@ -3077,7 +3077,7 @@ sub_81244EC: @ 81244EC
sub_81244F8: @ 81244F8
push {lr}
adds r2, r0, 0
ldr r0, =0x0203a144
ldr r0, =gUnknown_0203A144
ldr r0, [r0]
adds r0, 0x7E
ldrb r0, [r0]
@@ -3122,7 +3122,7 @@ _08124548:
thumb_func_start sub_812454C
sub_812454C: @ 812454C
push {lr}
ldr r0, =0x0203a144
ldr r0, =gUnknown_0203A144
ldr r1, [r0]
adds r0, r1, 0
adds r0, 0x7F
@@ -3271,7 +3271,7 @@ sub_8124630: @ 8124630
thumb_func_start sub_8124658
sub_8124658: @ 8124658
ldr r0, =0x0203a144
ldr r0, =gUnknown_0203A144
ldr r0, [r0]
adds r0, 0x78
ldrb r0, [r0]
@@ -3308,7 +3308,7 @@ _0812468C:
sub_8124690: @ 8124690
push {r4,lr}
sub sp, 0xC
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
movs r1, 0x87
lsls r1, 3
adds r0, r1
@@ -3366,7 +3366,7 @@ _081246E4:
movs r0, 0x1E
movs r1, 0
bl SetGpuReg
ldr r4, =0x0203a148
ldr r4, =gUnknown_0203A148
ldr r0, =0x00000a74
bl Alloc
str r0, [r4]
@@ -3405,7 +3405,7 @@ _0812478C:
bl clear_scheduled_bg_copies_to_vram
b _0812489C
_0812479C:
ldr r4, =0x0203a148
ldr r4, =gUnknown_0203A148
ldr r0, [r4]
adds r0, 0x8
movs r1, 0
@@ -3424,7 +3424,7 @@ _0812479C:
movs r1, 0
movs r2, 0x10
bl RepeatChar
ldr r1, =0x03001180
ldr r1, =gUnknown_03001180
movs r0, 0x1
str r0, [r1]
bl sub_8124904
@@ -3498,7 +3498,7 @@ _0812486C:
ldr r0, =sub_81248D4
bl SetMainCallback2
_0812489C:
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
movs r0, 0x87
lsls r0, 3
adds r1, r0
@@ -3526,7 +3526,7 @@ sub_81248C0: @ 81248C0
thumb_func_start sub_81248D4
sub_81248D4: @ 81248D4
push {lr}
ldr r0, =0x0203a148
ldr r0, =gUnknown_0203A148
ldr r0, [r0]
ldr r0, [r0]
bl _call_via_r0
@@ -3540,7 +3540,7 @@ sub_81248D4: @ 81248D4
thumb_func_start sub_81248F4
sub_81248F4: @ 81248F4
ldr r1, =0x0203a148
ldr r1, =gUnknown_0203A148
ldr r1, [r1]
str r0, [r1]
movs r0, 0
@@ -3553,7 +3553,7 @@ sub_81248F4: @ 81248F4
sub_8124904: @ 8124904
push {r4-r7,lr}
sub sp, 0xC
ldr r2, =0x0203a148
ldr r2, =gUnknown_0203A148
ldr r0, [r2]
ldrb r0, [r0, 0xA]
subs r0, 0x1
@@ -3631,7 +3631,7 @@ _08124926:
bl Print
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
ldr r0, =0x03001180
ldr r0, =gUnknown_03001180
str r7, [r0]
b _081249CE
.pool
@@ -3644,7 +3644,7 @@ _081249C4:
_081249CE:
cmp r7, 0
bne _08124A62
ldr r0, =0x03001180
ldr r0, =gUnknown_03001180
ldr r0, [r0]
cmp r0, 0x1
bne _081249F4
@@ -3663,7 +3663,7 @@ _081249F4:
movs r1, 0x11
bl FillWindowPixelBuffer
_081249FC:
ldr r0, =0x0203a148
ldr r0, =gUnknown_0203A148
ldr r2, [r0]
adds r2, 0xC
movs r0, 0x1
@@ -3677,12 +3677,12 @@ _081249FC:
bl Print
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
ldr r0, =0x03001180
ldr r0, =gUnknown_03001180
str r4, [r0]
b _08124A62
.pool
_08124A2C:
ldr r4, =0x03001180
ldr r4, =gUnknown_03001180
ldr r0, [r4]
cmp r0, 0x1
bne _08124A48
@@ -3718,7 +3718,7 @@ sub_8124A70: @ 8124A70
push {r4,r5,lr}
sub sp, 0x8
ldr r0, =gUnknown_085A1D68
ldr r5, =0x0203a148
ldr r5, =gUnknown_0203A148
ldr r1, [r5]
ldr r4, =0x0000088c
adds r1, r4
@@ -3823,7 +3823,7 @@ _08124B44:
lsrs r5, r0, 24
cmp r5, 0x40
beq _08124BB8
ldr r1, =0x02020630
ldr r1, =gUnknown_02020630
mov r8, r1
lsls r4, r5, 4
adds r0, r4, r5
@@ -3854,7 +3854,7 @@ _08124B9C:
_08124BA2:
adds r4, r5
lsls r4, 2
ldr r0, =0x02020630
ldr r0, =gUnknown_02020630
adds r4, r0
lsls r1, r7, 24
lsrs r1, 24
@@ -3903,7 +3903,7 @@ sub_8124BE4: @ 8124BE4
mov r5, sp
adds r5, 0x6
add r7, sp, 0x4
ldr r1, =0x02020630
ldr r1, =gUnknown_02020630
mov r9, r1
movs r0, 0x1C
add r0, r9
@@ -3994,7 +3994,7 @@ _08124C9C:
sub_8124CBC: @ 8124CBC
push {lr}
adds r2, r0, 0
ldr r0, =0x0203a148
ldr r0, =gUnknown_0203A148
ldr r0, [r0]
ldrh r1, [r0, 0x8]
movs r3, 0x2E
@@ -4042,7 +4042,7 @@ _08124D0E:
sub_8124D14: @ 8124D14
push {r4,lr}
sub sp, 0x4
ldr r4, =0x0203a148
ldr r4, =gUnknown_0203A148
ldr r0, [r4]
ldrh r1, [r0, 0x4]
cmp r1, 0
@@ -4082,7 +4082,7 @@ _08124D56:
thumb_func_start sub_8124D64
sub_8124D64: @ 8124D64
push {r4,lr}
ldr r0, =0x0203a148
ldr r0, =gUnknown_0203A148
ldr r0, [r0]
ldrh r0, [r0, 0x4]
cmp r0, 0
@@ -4110,7 +4110,7 @@ _08124DA8:
bl sub_8124904
b _08124DF8
_08124DAE:
ldr r4, =0x0203a148
ldr r4, =gUnknown_0203A148
ldr r0, [r4]
ldrb r0, [r0, 0xA]
cmp r0, 0x2
@@ -4132,7 +4132,7 @@ _08124DBC:
_08124DE0:
movs r0, 0x5
bl m4aSongNumStart
ldr r0, =0x0203a148
ldr r0, =gUnknown_0203A148
ldr r0, [r0]
ldr r1, =0x00000a72
adds r0, r1
@@ -4151,7 +4151,7 @@ _08124DF8:
sub_8124E0C: @ 8124E0C
push {r4,lr}
sub sp, 0x4
ldr r4, =0x0203a148
ldr r4, =gUnknown_0203A148
ldr r0, [r4]
ldrh r1, [r0, 0x4]
cmp r1, 0
@@ -4207,7 +4207,7 @@ _08124E7C:
bl sub_8084CCC
b _08124EFA
_08124E84:
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r0, [r0]
ldrb r0, [r0, 0x8]
movs r1, 0xD
@@ -4235,7 +4235,7 @@ _08124EB0:
.pool
_08124EBC:
ldr r3, =gUnknown_085A1E3C
ldr r0, =0x0203a148
ldr r0, =gUnknown_0203A148
ldr r0, [r0]
ldrh r1, [r0, 0x8]
lsls r0, r1, 1
@@ -4268,7 +4268,7 @@ _08124F00:
ldr r0, =sub_81B58A8
bl SetMainCallback2
_08124F06:
ldr r4, =0x0203a148
ldr r4, =gUnknown_0203A148
ldr r0, [r4]
cmp r0, 0
beq _08124F16
asm/reset_rtc_screen.s
+29 -29
View File
@@ -9,7 +9,7 @@
sub_809E8E8: @ 809E8E8
push {lr}
adds r3, r0, 0
ldr r2, =0x03005e00
ldr r2, =gTasks
movs r0, 0x2E
ldrsh r1, [r3, r0]
lsls r0, r1, 2
@@ -154,7 +154,7 @@ _0809E9FE:
sub_809EA04: @ 809EA04
push {lr}
adds r3, r0, 0
ldr r2, =0x03005e00
ldr r2, =gTasks
movs r0, 0x2E
ldrsh r1, [r3, r0]
lsls r0, r1, 2
@@ -299,7 +299,7 @@ sub_809EB04: @ 809EB04
bl AddObjectToBack
lsls r0, 24
lsrs r1, r0, 24
ldr r6, =0x02020630
ldr r6, =gUnknown_02020630
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
@@ -404,8 +404,8 @@ sub_809EBC4: @ 809EBC4
lsls r2, 24
lsrs r2, 24
mov r8, r2
ldr r7, =0x02021fc4
ldr r4, =0x02021cc4
ldr r7, =gUnknown_02021FC4
ldr r4, =gUnknown_02021CC4
adds r0, r4, 0
movs r2, 0x1
movs r3, 0x4
@@ -450,7 +450,7 @@ sub_809EBC4: @ 809EBC4
adds r0, r7, 0
adds r1, r4, 0
bl CopyString
ldr r2, =0x02021fc4
ldr r2, =gUnknown_02021FC4
mov r0, r9
str r0, [sp]
movs r0, 0xFF
@@ -603,7 +603,7 @@ _0809ED98:
sub_809EDA0: @ 809EDA0
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
@@ -622,7 +622,7 @@ sub_809EDB8: @ 809EDB8
lsls r4, r0, 2
adds r4, r0
lsls r4, 3
ldr r5, =0x03005e08
ldr r5, =gTasks + 0x8
adds r0, r4, r5
ldrb r0, [r0, 0x10]
bl sub_809EBA0
@@ -648,7 +648,7 @@ sub_809EDE8: @ 809EDE8
lsls r0, r6, 2
adds r0, r6
lsls r7, r0, 3
ldr r0, =0x03005e08
ldr r0, =gTasks + 0x8
mov r8, r0
adds r5, r7, r0
ldrb r4, [r5, 0x4]
@@ -657,7 +657,7 @@ sub_809EDE8: @ 809EDE8
lsls r0, 2
ldr r1, =gUnknown_0851041C
adds r2, r0, r1
ldr r1, =0x030022c0
ldr r1, =gUnknown_030022C0
ldrh r3, [r1, 0x2E]
movs r0, 0x2
ands r0, r3
@@ -707,7 +707,7 @@ _0809EE66:
ands r0, r1
cmp r0, 0
beq _0809EEF4
ldr r1, =0x03005cf8
ldr r1, =gUnknown_03005CF8
ldrh r0, [r5, 0x6]
strh r0, [r1]
ldrh r0, [r5, 0x8]
@@ -718,7 +718,7 @@ _0809EE66:
strb r0, [r1, 0x4]
movs r0, 0x5
bl audio_play
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r6, 2
adds r0, r6
lsls r0, 3
@@ -782,12 +782,12 @@ sub_809EF00: @ 809EF00
lsls r6, r0, 2
add r6, r8
lsls r6, 3
ldr r0, =0x03005e08
ldr r0, =gTasks + 0x8
mov r9, r0
adds r5, r6, r0
movs r0, 0
strh r0, [r5]
ldr r1, =0x03005cf8
ldr r1, =gUnknown_03005CF8
ldrh r0, [r1]
strh r0, [r5, 0x6]
movs r0, 0x2
@@ -994,7 +994,7 @@ sub_809F0F8: @ 809F0F8
lsls r0, r7, 2
adds r0, r7
lsls r0, 3
ldr r1, =0x03005e08
ldr r1, =gTasks + 0x8
adds r6, r0, r1
movs r0, 0
ldrsh r5, [r6, r0]
@@ -1021,7 +1021,7 @@ _0809F11C:
movs r1, 0x1
movs r3, 0
bl Print
ldr r1, =0x03005cf8
ldr r1, =gUnknown_03005CF8
ldrh r3, [r1]
ldrb r0, [r1, 0x2]
str r0, [sp]
@@ -1042,7 +1042,7 @@ _0809F11C:
movs r1, 0x1
movs r3, 0
bl Print
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r1, [r0]
adds r0, r1, 0
adds r0, 0xA0
@@ -1073,7 +1073,7 @@ _0809F11C:
adds r0, 0x1
strh r0, [r6]
_0809F1B2:
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
ldrh r1, [r0, 0x2E]
movs r0, 0x2
ands r0, r1
@@ -1109,7 +1109,7 @@ sub_809F200: @ 809F200
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
ldr r1, =0x03005e08
ldr r1, =gTasks + 0x8
adds r5, r0, r1
movs r1, 0
ldrsh r0, [r5, r1]
@@ -1146,7 +1146,7 @@ _0809F24C:
b _0809F404
.pool
_0809F268:
ldr r0, =0x02037fd4
ldr r0, =gUnknown_02037FD4
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1154,7 +1154,7 @@ _0809F268:
beq _0809F276
b _0809F404
_0809F276:
ldr r0, =0x03006210
ldr r0, =gUnknown_03006210
ldrh r0, [r0]
cmp r0, 0
beq _0809F282
@@ -1178,7 +1178,7 @@ _0809F29C:
b _0809F334
.pool
_0809F2B4:
ldr r2, =0x03005e00
ldr r2, =gTasks
movs r0, 0x2
ldrsh r1, [r5, r0]
lsls r0, r1, 2
@@ -1195,8 +1195,8 @@ _0809F2CA:
bl sub_8198070
ldr r0, =gUnknown_085ECA38
bl sub_809F0C0
ldr r2, =0x03005cf8
ldr r0, =0x03005d90
ldr r2, =gUnknown_03005CF8
ldr r0, =gUnknown_03005D90
ldr r0, [r0]
adds r0, 0xA0
ldr r1, [r0, 0x4]
@@ -1214,7 +1214,7 @@ _0809F2CA:
b _0809F404
.pool
_0809F310:
ldr r2, =0x03005e00
ldr r2, =gTasks
movs r0, 0x2
ldrsh r1, [r5, r0]
lsls r0, r1, 2
@@ -1240,7 +1240,7 @@ _0809F340:
ldrb r0, [r5, 0x2]
bl DestroyTask
bl GameFreakRTC_Reset
ldr r4, =0x03005cf8
ldr r4, =gUnknown_03005CF8
movs r1, 0
ldrsh r0, [r4, r1]
movs r1, 0x2
@@ -1250,7 +1250,7 @@ _0809F340:
movs r3, 0x4
ldrsb r3, [r4, r3]
bl GameFreakRTC_CalcRTCToLocalDelta
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r2, [r0]
adds r2, 0xA0
ldr r0, [r4]
@@ -1289,7 +1289,7 @@ _0809F3C4:
movs r0, 0x5
strh r0, [r5]
_0809F3C8:
ldr r0, =0x030022c0
ldr r0, =gUnknown_030022C0
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -1306,7 +1306,7 @@ _0809F3C8:
movs r0, 0x6
strh r0, [r5]
_0809F3EA:
ldr r0, =0x02037fd4
ldr r0, =gUnknown_02037FD4
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
asm/rng.s
+6 -6
View File
@@ -8,14 +8,14 @@
thumb_func_start GenerateRandomNumber
@ u16 GenerateRandomNumber()
GenerateRandomNumber: @ 806F5CC
ldr r2, =0x03005d80
ldr r2, =gUnknown_03005D80
ldr r1, [r2]
ldr r0, =0x41c64e6d
muls r0, r1
ldr r1, =0x00006073
adds r0, r1
str r0, [r2]
ldr r2, =0x020249c0
ldr r2, =gUnknown_020249C0
ldr r1, [r2]
adds r1, 0x1
str r1, [r2]
@@ -29,9 +29,9 @@ GenerateRandomNumber: @ 806F5CC
SeedRng: @ 806F5F8
lsls r0, 16
lsrs r0, 16
ldr r1, =0x03005d80
ldr r1, =gUnknown_03005D80
str r0, [r1]
ldr r1, =0x020249bc
ldr r1, =gUnknown_020249BC
movs r0, 0
strb r0, [r1]
bx lr
@@ -42,7 +42,7 @@ SeedRng: @ 806F5F8
SeedRng2: @ 806F610
lsls r0, 16
lsrs r0, 16
ldr r1, =0x03005d84
ldr r1, =gUnknown_03005D84
str r0, [r1]
bx lr
.pool
@@ -50,7 +50,7 @@ SeedRng2: @ 806F610
thumb_func_start GenerateRandomNumber2
GenerateRandomNumber2: @ 806F620
ldr r2, =0x03005d84
ldr r2, =gUnknown_03005D84
ldr r1, [r2]
ldr r0, =0x41c64e6d
muls r0, r1
asm/rom3.s
+219 -219
View File
File diff suppressed because it is too large Load Diff
asm/rom4.s
+249 -249
View File
File diff suppressed because it is too large Load Diff
asm/rom5.s
+100 -100
View File
@@ -13,7 +13,7 @@ nullsub_35: @ 80A92F4
thumb_func_start sub_80A92F8
sub_80A92F8: @ 80A92F8
push {lr}
ldr r2, =0x02037fd4
ldr r2, =gUnknown_02037FD4
ldrb r0, [r2, 0x8]
movs r1, 0x80
orrs r0, r1
@@ -25,7 +25,7 @@ sub_80A92F8: @ 80A92F8
movs r0, 0x4C
movs r1, 0
bl SetGpuReg
ldr r0, =0x02024474
ldr r0, =gUnknown_02024474
adds r2, r0, 0
adds r2, 0x21
movs r1, 0
@@ -43,7 +43,7 @@ sub_80A92F8: @ 80A92F8
c2_80777E8: @ 80A933C
push {r4-r7,lr}
sub sp, 0x8
ldr r0, =0x02024474
ldr r0, =gUnknown_02024474
adds r0, 0x21
ldrb r0, [r0]
cmp r0, 0x13
@@ -98,22 +98,22 @@ _080A93B0:
movs r0, 0x3
bl ShowBg
bl sub_80A1A74
ldr r0, =0x02022e14
ldr r0, =gUnknown_02022E14
movs r1, 0
strh r1, [r0]
ldr r0, =0x02022e16
ldr r0, =gUnknown_02022E16
strh r1, [r0]
ldr r0, =0x02022e18
ldr r0, =gUnknown_02022E18
strh r1, [r0]
ldr r0, =0x02022e1a
ldr r0, =gUnknown_02022E1A
strh r1, [r0]
ldr r0, =0x02022e1c
ldr r0, =gUnknown_02022E1C
strh r1, [r0]
ldr r0, =0x02022e1e
ldr r0, =gUnknown_02022E1E
strh r1, [r0]
ldr r0, =0x02022e20
ldr r0, =gUnknown_02022E20
strh r1, [r0]
ldr r0, =0x02022e22
ldr r0, =gUnknown_02022E22
strh r1, [r0]
b _080A95D2
.pool
@@ -135,7 +135,7 @@ _080A944A:
b _080A95D2
_080A9450:
bl ResetObjectPaletteAllocator
ldr r1, =0x0300301c
ldr r1, =gUnknown_0300301C
movs r0, 0x4
strb r0, [r1]
b _080A95D2
@@ -144,7 +144,7 @@ _080A9460:
bl sub_805E350
b _080A95D2
_080A9466:
ldr r5, =0x02024474
ldr r5, =gUnknown_02024474
adds r4, r5, 0
adds r4, 0x22
ldrb r0, [r4]
@@ -180,7 +180,7 @@ _080A949C:
beq _080A94A8
b _080A95D2
_080A94A8:
ldr r1, =0x02024474
ldr r1, =gUnknown_02024474
_080A94AA:
adds r1, 0x21
ldrb r0, [r1]
@@ -227,13 +227,13 @@ _080A94F8:
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r7, =0x0202406e
ldr r7, =gUnknown_0202406E
lsls r0, r4, 1
adds r0, r7
ldrh r0, [r0]
movs r6, 0x64
muls r0, r6
ldr r5, =0x02024744
ldr r5, =gUnknown_02024744
adds r0, r5
movs r1, 0xB
bl pokemon_getattr
@@ -264,18 +264,18 @@ _080A94F8:
adds r0, r4, 0
bl sub_805EE54
_080A955C:
ldr r1, =0x020244ac
ldr r0, =0x020244b8
ldr r1, =gUnknown_020244AC
ldr r0, =gUnknown_020244B8
ldrb r0, [r0]
adds r0, r1
ldrb r0, [r0]
movs r1, 0
bl sub_8059CB4
ldr r0, =0x030030fc
ldr r0, =gUnknown_030030FC
ldrb r0, [r0]
cmp r0, 0
beq _080A95D2
ldr r0, =0x03003124
ldr r0, =gUnknown_03003124
ldrb r0, [r0]
cmp r0, 0
beq _080A95D2
@@ -296,7 +296,7 @@ _080A95A4:
movs r2, 0x10
movs r3, 0
bl sub_80A27B0
ldr r2, =0x02037fd4
ldr r2, =gUnknown_02037FD4
ldrb r1, [r2, 0x8]
movs r0, 0x7F
ands r0, r1
@@ -305,7 +305,7 @@ _080A95A4:
bl SetMainCallback2
bl sub_805EF14
_080A95D2:
ldr r1, =0x02024474
ldr r1, =gUnknown_02024474
adds r1, 0x21
ldrb r0, [r1]
adds r0, 0x1
@@ -339,7 +339,7 @@ sub_80A9614: @ 80A9614
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =0x0202406c
ldr r0, =gUnknown_0202406C
ldrb r0, [r0]
cmp r4, r0
bcs _080A96FC
@@ -348,7 +348,7 @@ sub_80A9614: @ 80A9614
lsls r0, 24
cmp r0, 0
beq _080A9676
ldr r0, =0x020244d0
ldr r0, =gUnknown_020244D0
ldr r0, [r0]
ldr r1, [r0]
lsls r0, r4, 2
@@ -358,13 +358,13 @@ sub_80A9614: @ 80A9614
ands r0, r1
cmp r0, 0
bne _080A966C
ldr r1, =0x0202406e
ldr r1, =gUnknown_0202406E
lsls r0, r4, 1
adds r0, r1
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =0x02024744
ldr r1, =gUnknown_02024744
adds r0, r1
adds r1, r4, 0
bl sub_805DC0C
@@ -376,7 +376,7 @@ _080A966C:
bl sub_805E7DC
b _080A96F4
_080A9676:
ldr r0, =0x02022fec
ldr r0, =gUnknown_02022FEC
ldr r1, [r0]
movs r2, 0x80
ands r1, r2
@@ -384,7 +384,7 @@ _080A9676:
beq _080A9698
cmp r4, 0
bne _080A9698
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r0, [r0]
ldrb r0, [r0, 0x8]
b _080A96AA
@@ -404,7 +404,7 @@ _080A96AA:
bl sub_805DF84
b _080A96F4
_080A96B2:
ldr r0, =0x020244d0
ldr r0, =gUnknown_020244D0
ldr r0, [r0]
ldr r1, [r0]
lsls r0, r4, 2
@@ -414,13 +414,13 @@ _080A96B2:
ands r0, r1
cmp r0, 0
bne _080A96EC
ldr r1, =0x0202406e
ldr r1, =gUnknown_0202406E
lsls r0, r4, 1
adds r0, r1
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =0x020244ec
ldr r1, =gUnknown_020244EC
adds r0, r1
adds r1, r4, 0
bl sub_805DD7C
@@ -431,7 +431,7 @@ _080A96EC:
movs r1, 0
bl sub_805E7DC
_080A96F4:
ldr r0, =0x02024474
ldr r0, =gUnknown_02024474
adds r0, 0x22
movs r1, 0
strb r1, [r0]
@@ -453,13 +453,13 @@ sub_80A9708: @ 80A9708
sub sp, 0x4
lsls r0, 24
lsrs r7, r0, 24
ldr r0, =0x0202406c
ldr r0, =gUnknown_0202406C
ldrb r0, [r0]
cmp r7, r0
bcc _080A9722
b _080A9AA0
_080A9722:
ldr r0, =0x020244d0
ldr r0, =gUnknown_020244D0
ldr r0, [r0]
ldr r0, [r0]
lsls r2, r7, 2
@@ -488,7 +488,7 @@ _080A974E:
bne _080A9762
b _080A986C
_080A9762:
ldr r1, =0x0202406e
ldr r1, =gUnknown_0202406E
lsls r0, r7, 1
adds r6, r0, r1
ldrh r0, [r6]
@@ -497,7 +497,7 @@ _080A9762:
mov r2, r10
muls r2, r0
adds r0, r2, 0
ldr r1, =0x02024744
ldr r1, =gUnknown_02024744
mov r9, r1
add r0, r9
movs r1, 0x39
@@ -523,7 +523,7 @@ _080A9786:
lsrs r1, 24
adds r0, r4, 0
bl sub_806A068
ldr r5, =0x0202499c
ldr r5, =gUnknown_0202499C
adds r0, r7, 0
movs r1, 0x2
bl sub_80A5C6C
@@ -539,10 +539,10 @@ _080A9786:
adds r1, r4, 0
mov r2, r8
bl AddObjectToFront
ldr r1, =0x020241e4
ldr r1, =gUnknown_020241E4
adds r4, r7, r1
strb r0, [r4]
ldr r5, =0x02020630
ldr r5, =gUnknown_02020630
ldrb r0, [r4]
lsls r1, r0, 4
adds r1, r0
@@ -587,11 +587,11 @@ _080A9786:
adds r0, r1
lsls r0, 2
adds r0, r5
ldr r1, =0x020244e4
ldr r1, =gUnknown_020244E4
adds r1, r7, r1
ldrb r1, [r1]
bl StartObjectImageAnim
ldr r0, =0x020244d0
ldr r0, =gUnknown_020244D0
ldr r0, [r0]
ldr r0, [r0]
ldr r2, [sp]
@@ -599,7 +599,7 @@ _080A9786:
b _080A9A50
.pool
_080A986C:
ldr r0, =0x02022fec
ldr r0, =gUnknown_02022FEC
ldr r1, [r0]
movs r2, 0x80
ands r1, r2
@@ -607,7 +607,7 @@ _080A986C:
beq _080A98D0
cmp r7, 0
bne _080A98D0
ldr r5, =0x03005d90
ldr r5, =gUnknown_03005D90
ldr r0, [r5]
ldrb r4, [r0, 0x8]
movs r0, 0
@@ -617,7 +617,7 @@ _080A986C:
lsrs r1, 24
adds r0, r4, 0
bl template_build_for_pokemon_or_trainer
ldr r6, =0x0202499c
ldr r6, =gUnknown_0202499C
ldr r1, =gUnknown_08305D2C
ldr r0, [r5]
ldrb r0, [r0, 0x8]
@@ -655,7 +655,7 @@ _080A98D0:
lsrs r1, 24
movs r0, 0x6
bl template_build_for_pokemon_or_trainer
ldr r5, =0x0202499c
ldr r5, =gUnknown_0202499C
ldr r0, =gUnknown_08305D2C
ldrb r0, [r0, 0x18]
movs r4, 0x8
@@ -675,9 +675,9 @@ _080A9914:
movs r1, 0x50
adds r2, r4, 0
bl AddObjectToFront
ldr r3, =0x020241e4
ldr r3, =gUnknown_020241E4
strb r0, [r3]
ldr r4, =0x02020630
ldr r4, =gUnknown_02020630
ldrb r0, [r3]
lsls r1, r0, 4
adds r1, r0
@@ -705,7 +705,7 @@ _080A9914:
b _080A9A70
.pool
_080A9968:
ldr r1, =0x0202406e
ldr r1, =gUnknown_0202406E
lsls r0, r7, 1
adds r6, r0, r1
ldrh r0, [r6]
@@ -714,7 +714,7 @@ _080A9968:
mov r1, r10
muls r1, r0
adds r0, r1, 0
ldr r2, =0x020244ec
ldr r2, =gUnknown_020244EC
mov r9, r2
add r0, r9
movs r1, 0x39
@@ -740,7 +740,7 @@ _080A998C:
lsrs r1, 24
adds r0, r4, 0
bl sub_806A068
ldr r5, =0x0202499c
ldr r5, =gUnknown_0202499C
adds r0, r7, 0
movs r1, 0x2
bl sub_80A5C6C
@@ -756,10 +756,10 @@ _080A998C:
adds r1, r4, 0
mov r2, r8
bl AddObjectToFront
ldr r1, =0x020241e4
ldr r1, =gUnknown_020241E4
adds r4, r7, r1
strb r0, [r4]
ldr r5, =0x02020630
ldr r5, =gUnknown_02020630
ldrb r0, [r4]
lsls r1, r0, 4
adds r1, r0
@@ -804,11 +804,11 @@ _080A998C:
adds r0, r1
lsls r0, 2
adds r0, r5
ldr r1, =0x020244e4
ldr r1, =gUnknown_020244E4
adds r1, r7, r1
ldrb r1, [r1]
bl StartObjectImageAnim
ldr r0, =0x020244d0
ldr r0, =gUnknown_020244D0
ldr r0, [r0]
ldr r0, [r0]
ldr r1, [sp]
@@ -831,15 +831,15 @@ _080A9A50:
ldr r0, [r0]
str r0, [r1]
_080A9A70:
ldr r1, =0x02020630
ldr r0, =0x020241e4
ldr r1, =gUnknown_02020630
ldr r0, =gUnknown_020241E4
adds r0, r7, r0
ldrb r0, [r0]
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
adds r2, r1
ldr r0, =0x020244d0
ldr r0, =gUnknown_020244D0
ldr r0, [r0]
ldr r0, [r0]
ldr r1, [sp]
@@ -872,13 +872,13 @@ sub_80A9ADC: @ 80A9ADC
push {r4-r6,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r0, =0x0202406c
ldr r0, =gUnknown_0202406C
ldrb r0, [r0]
cmp r5, r0
bcc _080A9AEC
b _080A9C5E
_080A9AEC:
ldr r0, =0x02022fec
ldr r0, =gUnknown_02022FEC
ldr r1, [r0]
movs r2, 0x80
ands r1, r2
@@ -905,7 +905,7 @@ _080A9B1E:
_080A9B24:
lsls r0, 24
lsrs r6, r0, 24
ldr r0, =0x03005d70
ldr r0, =gUnknown_03005D70
adds r4, r5, r0
strb r6, [r4]
adds r0, r5, 0
@@ -918,33 +918,33 @@ _080A9B24:
cmp r0, 0
beq _080A9B6C
ldrb r0, [r4]
ldr r1, =0x0202406e
ldr r1, =gUnknown_0202406E
lsls r4, r5, 1
adds r1, r4, r1
ldrh r2, [r1]
movs r1, 0x64
muls r1, r2
ldr r2, =0x02024744
ldr r2, =gUnknown_02024744
adds r1, r2
movs r2, 0
bl healthbar_draw_field_maybe
b _080A9BB8
.pool
_080A9B6C:
ldr r0, =0x02022fec
ldr r0, =gUnknown_02022FEC
ldr r0, [r0]
movs r1, 0x80
ands r0, r1
cmp r0, 0
beq _080A9BA0
ldrb r0, [r4]
ldr r1, =0x0202406e
ldr r1, =gUnknown_0202406E
lsls r4, r5, 1
adds r1, r4, r1
ldrh r2, [r1]
movs r1, 0x64
muls r1, r2
ldr r2, =0x020244ec
ldr r2, =gUnknown_020244EC
adds r1, r2
movs r2, 0xA
bl healthbar_draw_field_maybe
@@ -952,13 +952,13 @@ _080A9B6C:
.pool
_080A9BA0:
ldrb r0, [r4]
ldr r1, =0x0202406e
ldr r1, =gUnknown_0202406E
lsls r4, r5, 1
adds r1, r4, r1
ldrh r2, [r1]
movs r1, 0x64
muls r1, r2
ldr r2, =0x020244ec
ldr r2, =gUnknown_020244EC
adds r1, r2
movs r2, 0
bl healthbar_draw_field_maybe
@@ -976,7 +976,7 @@ _080A9BB8:
cmp r0, 0x2
bne _080A9BF0
_080A9BD4:
ldr r0, =0x03005d70
ldr r0, =gUnknown_03005D70
adds r0, r5, r0
ldrb r0, [r0]
movs r1, 0x1
@@ -984,7 +984,7 @@ _080A9BD4:
b _080A9BFC
.pool
_080A9BF0:
ldr r0, =0x03005d70
ldr r0, =gUnknown_03005D70
adds r0, r5, r0
ldrb r0, [r0]
movs r1, 0
@@ -995,12 +995,12 @@ _080A9BFC:
lsls r0, 24
cmp r0, 0
beq _080A9C34
ldr r0, =0x0202406e
ldr r0, =gUnknown_0202406E
adds r0, r4, r0
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =0x02024744
ldr r1, =gUnknown_02024744
adds r0, r1
movs r1, 0x39
bl pokemon_getattr
@@ -1011,18 +1011,18 @@ _080A9BFC:
b _080A9C5E
.pool
_080A9C34:
ldr r0, =0x02022fec
ldr r0, =gUnknown_02022FEC
ldr r0, [r0]
movs r1, 0x80
ands r0, r1
cmp r0, 0
bne _080A9C5E
ldr r0, =0x0202406e
ldr r0, =gUnknown_0202406E
adds r0, r4, r0
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =0x020244ec
ldr r1, =gUnknown_020244EC
adds r0, r1
movs r1, 0x39
bl pokemon_getattr
@@ -1048,7 +1048,7 @@ sub_80A9C70: @ 80A9C70
lsrs r4, 24
lsls r5, 24
lsrs r5, 24
ldr r0, =0x020241e4
ldr r0, =gUnknown_020241E4
adds r0, r4, r0
ldrb r6, [r0]
ldr r0, =sub_80A9DB4
@@ -1061,7 +1061,7 @@ sub_80A9C70: @ 80A9C70
bl LoadCompressedObjectPicUsingHeap
ldr r0, =gUnknown_0852588C
bl LoadCompressedObjectPaletteUsingHeap
ldr r1, =0x03005e00
ldr r1, =gTasks
mov r2, r8
lsls r0, r2, 2
add r0, r8
@@ -1074,7 +1074,7 @@ sub_80A9C70: @ 80A9C70
strh r0, [r1, 0xA]
movs r5, 0
lsls r0, r6, 4
ldr r7, =0x02020630
ldr r7, =gUnknown_02020630
adds r0, r6
lsls r0, 2
adds r6, r0, r7
@@ -1126,7 +1126,7 @@ _080A9D30:
strh r0, [r1, 0xA]
movs r5, 0
lsls r0, r6, 4
ldr r7, =0x02020630
ldr r7, =gUnknown_02020630
adds r0, r6
lsls r0, 2
adds r6, r0, r7
@@ -1171,7 +1171,7 @@ _080A9D86:
cmp r5, 0x9
bls _080A9D42
_080A9D90:
ldr r0, =0x02020630
ldr r0, =gUnknown_02020630
lsls r1, r4, 4
adds r1, r4
lsls r1, 2
@@ -1192,7 +1192,7 @@ sub_80A9DB4: @ 80A9DB4
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
@@ -1362,7 +1362,7 @@ sub_80A9EF4: @ 80A9EF4
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
ldr r4, =0x02038437
ldr r4, =gUnknown_02038437
ldrb r0, [r4]
movs r1, 0x2
bl sub_80A5C6C
@@ -1411,7 +1411,7 @@ _080A9F32:
ldr r1, =0xffff0000
cmp r0, r1
bne _080A9F7C
ldr r1, =0x02020630
ldr r1, =gUnknown_02020630
lsls r0, r4, 4
adds r0, r4
lsls r0, 2
@@ -1425,11 +1425,11 @@ _080A9F7C:
lsls r0, r4, 4
adds r0, r4
lsls r0, 2
ldr r1, =0x02020630
ldr r1, =gUnknown_02020630
adds r0, r1
ldr r1, =gUnknown_0853EF40
bl SetSpriteOamTables_NoPriorityFromTable
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r6, 2
adds r0, r6
lsls r0, 3
@@ -1448,7 +1448,7 @@ sub_80A9FD0: @ 80A9FD0
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
@@ -1493,7 +1493,7 @@ sub_80AA020: @ 80AA020
bl IndexOfObjectPaletteTag
lsls r0, 24
lsrs r2, r0, 24
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
@@ -1513,7 +1513,7 @@ sub_80AA020: @ 80AA020
asrs r0, 16
cmp r0, 0x3
bne _080AA0B0
ldr r3, =0x02037b14
ldr r3, =gUnknown_02037B14
lsls r2, 4
mov r12, r2
ldr r1, =0x0000010d
@@ -1568,7 +1568,7 @@ sub_80AA0D0: @ 80AA0D0
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
@@ -1611,7 +1611,7 @@ sub_80AA124: @ 80AA124
lsls r0, 24
lsrs r0, 24
adds r4, r0, 0
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
@@ -1629,7 +1629,7 @@ sub_80AA124: @ 80AA124
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
ldr r0, =0x02020630
ldr r0, =gUnknown_02020630
adds r4, r0
adds r0, r4, 0
bl obj_free_rotscale_entry
@@ -1660,7 +1660,7 @@ sub_80AA18C: @ 80AA18C
lsls r0, 24
lsrs r4, r0, 24
movs r3, 0
ldr r0, =0x020244d0
ldr r0, =gUnknown_020244D0
ldr r0, [r0]
ldr r0, [r0, 0x8]
ldrh r0, [r0]
@@ -1863,14 +1863,14 @@ _080AA328:
bl move_anim_task_del
b _080AA352
_080AA330:
ldr r0, =0x0203841e
ldr r0, =gUnknown_0203841E
movs r1, 0
strh r5, [r0]
strh r2, [r0, 0x2]
strh r1, [r0, 0x4]
strh r1, [r0, 0x6]
strh r3, [r0, 0x8]
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
@@ -1894,9 +1894,9 @@ move_anim_start_t2: @ 80AA364
lsrs r4, 24
lsls r1, 24
lsrs r1, 24
ldr r0, =0x02038436
ldr r0, =gUnknown_02038436
strb r4, [r0]
ldr r0, =0x02038437
ldr r0, =gUnknown_02038437
strb r4, [r0]
ldr r0, =gUnknown_082C92FC
movs r2, 0
@@ -1906,7 +1906,7 @@ move_anim_start_t2: @ 80AA364
bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
@@ -1923,16 +1923,16 @@ task0A_80788BC: @ 80AA3B4
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =0x020383f8
ldr r0, =gUnknown_020383F8
ldr r0, [r0]
bl _call_via_r0
ldr r0, =0x020383fd
ldr r0, =gUnknown_020383FD
ldrb r0, [r0]
cmp r0, 0
bne _080AA3F6
ldr r0, =0x020244d0
ldr r0, =gUnknown_020244D0
ldr r2, [r0]
ldr r1, =0x03005e00
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
asm/rom6.s
+484 -484
View File
File diff suppressed because it is too large Load Diff
asm/rom_8034C54.s
+6950 -6950
View File
File diff suppressed because it is too large Load Diff
asm/rom_806BD04.s
+142 -142
View File
File diff suppressed because it is too large Load Diff
asm/rom_806F640.s
+1 -1
View File
@@ -16,7 +16,7 @@ object_new_hidden_with_callback: @ 806F640
bl AddObjectToFront
lsls r0, 24
lsrs r0, 24
ldr r5, =0x02020630
ldr r5, =gUnknown_02020630
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
asm/rom_8072304.s
+209 -209
View File
File diff suppressed because it is too large Load Diff
asm/rom_809BEDC.s
+45 -45
View File
@@ -44,7 +44,7 @@ process_overworld_input: @ 809BF08
lsls r2, 16
lsrs r2, 16
mov r8, r2
ldr r0, =0x02037590
ldr r0, =gUnknown_02037590
ldrb r6, [r0, 0x3]
ldrb r0, [r0, 0x2]
mov r9, r0
@@ -184,10 +184,10 @@ sub_809C014: @ 809C014
push {r4-r6,lr}
sub sp, 0x8
adds r5, r0, 0
ldr r0, =0x020375f2
ldr r0, =gUnknown_020375F2
movs r1, 0
strh r1, [r0]
ldr r0, =0x03005df0
ldr r0, =gUnknown_03005DF0
strb r1, [r0]
bl player_get_direction_lower_nybble
lsls r0, 24
@@ -552,7 +552,7 @@ _0809C30E:
lsrs r3, r0, 24
cmp r3, 0x10
beq _0809C32E
ldr r1, =0x02037350
ldr r1, =gUnknown_02037350
lsls r2, r3, 3
adds r0, r2, r3
lsls r0, 2
@@ -567,7 +567,7 @@ _0809C32E:
.pool
_0809C33C:
movs r4, 0
ldr r1, =0x02032308
ldr r1, =gUnknown_02032308
_0809C340:
ldrb r0, [r1]
cmp r0, 0x1
@@ -580,15 +580,15 @@ _0809C34C:
adds r4, 0x1
cmp r4, 0x3
ble _0809C340
ldr r0, =0x03005df0
ldr r0, =gUnknown_03005DF0
strb r3, [r0]
ldr r1, =0x020375f2
ldr r1, =gUnknown_020375F2
adds r0, r2, r3
lsls r0, 2
adds r0, r5
ldrb r0, [r0, 0x8]
strh r0, [r1]
ldr r0, =0x020375f4
ldr r0, =gUnknown_020375F4
strh r6, [r0]
adds r0, r3, 0
bl GetFieldObjectScriptPointerByFieldObjectId
@@ -615,7 +615,7 @@ TryGetMapObjectScript: @ 809C384
lsrs r4, r0, 24
cmp r4, 0x10
beq _0809C3B4
ldr r1, =0x02037350
ldr r1, =gUnknown_02037350
lsls r2, r4, 3
adds r0, r2, r4
lsls r0, 2
@@ -652,7 +652,7 @@ _0809C3B4:
lsrs r4, r0, 24
cmp r4, 0x10
beq _0809C400
ldr r1, =0x02037350
ldr r1, =gUnknown_02037350
lsls r2, r4, 3
adds r0, r2, r4
lsls r0, 2
@@ -666,15 +666,15 @@ _0809C400:
b _0809C44E
.pool
_0809C40C:
ldr r0, =0x03005df0
ldr r0, =gUnknown_03005DF0
strb r4, [r0]
ldr r1, =0x020375f2
ldr r1, =gUnknown_020375F2
adds r0, r2, r4
lsls r0, 2
adds r0, r3
ldrb r0, [r0, 0x8]
strh r0, [r1]
ldr r0, =0x020375f4
ldr r0, =gUnknown_020375F4
strh r7, [r0]
bl InTrainerHill
cmp r0, 0x1
@@ -687,7 +687,7 @@ _0809C43C:
bl GetFieldObjectScriptPointerByFieldObjectId
_0809C442:
adds r1, r0, 0
ldr r0, =0x020375f2
ldr r0, =gUnknown_020375F2
ldrb r0, [r0]
bl sub_8099188
adds r1, r0, 0
@@ -704,7 +704,7 @@ TryGetInvisibleMapObjectScript: @ 809C458
push {r4,r5,lr}
lsls r2, 24
lsrs r5, r2, 24
ldr r4, =0x02037318
ldr r4, =gUnknown_02037318
ldrh r1, [r0]
subs r1, 0x7
lsls r1, 16
@@ -764,13 +764,13 @@ _0809C4DC:
beq _0809C530
b _0809C4CC
_0809C4E2:
ldr r1, =0x020375e0
ldr r1, =gUnknown_020375E0
lsrs r0, r2, 16
movs r3, 0xFA
lsls r3, 1
adds r0, r3
strh r0, [r1]
ldr r0, =0x020375e2
ldr r0, =gUnknown_020375E2
strh r2, [r0]
ldrh r0, [r1]
bl FlagGet
@@ -784,7 +784,7 @@ _0809C4E2:
_0809C510:
cmp r5, 0x2
bne _0809C4CC
ldr r0, =0x020375e0
ldr r0, =gUnknown_020375E0
strh r2, [r0]
bl sub_80E9680
lsls r0, 24
@@ -1194,7 +1194,7 @@ sub_809C89C: @ 809C89C
lsls r0, 24
cmp r0, 0
beq _0809C8D4
ldr r0, =0x02037318
ldr r0, =gUnknown_02037318
ldrb r0, [r0, 0x17]
cmp r0, 0x5
bne _0809C8D4
@@ -1264,7 +1264,7 @@ _0809C930:
thumb_func_start mapheader_trigger_activate_at__run_now
mapheader_trigger_activate_at__run_now: @ 809C938
push {r4,lr}
ldr r4, =0x02037318
ldr r4, =gUnknown_02037318
ldrh r1, [r0]
subs r1, 0x7
lsls r1, 16
@@ -1368,7 +1368,7 @@ _0809CA04:
bl sub_80B215C
bl happiness_algorithm_step
bl sub_81D4998
ldr r0, =0x02037590
ldr r0, =gUnknown_02037590
ldrb r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -1514,7 +1514,7 @@ happiness_algorithm_step: @ 809CB44
strh r1, [r0]
cmp r1, 0
bne _0809CB72
ldr r5, =0x020244ec
ldr r5, =gUnknown_020244EC
movs r4, 0x5
_0809CB62:
adds r0, r5, 0
@@ -1545,7 +1545,7 @@ overworld_poison_timer_set: @ 809CB80
thumb_func_start overworld_poison_step
overworld_poison_step: @ 809CB94
push {lr}
ldr r0, =0x02037318
ldr r0, =gUnknown_02037318
ldrb r0, [r0, 0x17]
cmp r0, 0x9
beq _0809CBD4
@@ -1579,7 +1579,7 @@ _0809CBD6:
thumb_func_start prev_quest_postbuffer_cursor_backup_reset
prev_quest_postbuffer_cursor_backup_reset: @ 809CBDC
ldr r1, =0x020375d4
ldr r1, =gUnknown_020375D4
movs r0, 0
strb r0, [r1]
bx lr
@@ -1592,19 +1592,19 @@ is_it_battle_time_3: @ 809CBE8
lsls r0, 16
lsrs r4, r0, 16
adds r7, r4, 0
ldr r6, =0x020375d4
ldr r6, =gUnknown_020375D4
ldrb r0, [r6]
cmp r0, 0x3
bhi _0809CC0C
adds r0, 0x1
strb r0, [r6]
ldr r0, =0x020375d6
ldr r0, =gUnknown_020375D6
strh r4, [r0]
movs r0, 0
b _0809CC30
.pool
_0809CC0C:
ldr r5, =0x020375d6
ldr r5, =gUnknown_020375D6
ldrh r1, [r5]
adds r0, r4, 0
bl is_it_battle_time_2
@@ -1639,7 +1639,7 @@ mapheader_run_first_tag2_script_list_match_conditionally: @ 809CC38
lsrs r4, 16
lsls r5, 24
lsrs r5, 24
ldr r0, =0x02037318
ldr r0, =gUnknown_02037318
mov r8, r0
adds r1, r7, 0
bl map_warp_check_packed
@@ -1683,7 +1683,7 @@ sub_809CC9C: @ 809CC9C
adds r6, r0, 0
lsls r1, 16
lsrs r5, r1, 16
ldr r7, =0x02037318
ldr r7, =gUnknown_02037318
adds r0, r7, 0
adds r1, r6, 0
bl map_warp_check_packed
@@ -1958,7 +1958,7 @@ sub_809CEB0: @ 809CEB0
adds r4, r0, 0
cmp r4, 0
bne _0809CEE8
ldr r0, =0x02037318
ldr r0, =gUnknown_02037318
ldr r0, [r0, 0x4]
ldr r5, [r0, 0x8]
b _0809CF0E
@@ -1976,7 +1976,7 @@ _0809CEF0:
adds r5, r0, 0
b _0809CF0E
_0809CF00:
ldr r0, =0x02037318
ldr r0, =gUnknown_02037318
ldr r0, [r0, 0x4]
lsls r2, r4, 24
asrs r1, r2, 21
@@ -2019,7 +2019,7 @@ _0809CF20:
lsls r0, r3, 3
adds r0, r1
ldrb r0, [r0, 0x5]
ldr r1, =0x03005d8c
ldr r1, =gUnknown_03005D8C
ldr r2, [r1]
movs r1, 0x4
ldrsb r1, [r2, r1]
@@ -2053,7 +2053,7 @@ map_warp_consider_2_to_inside: @ 809CF78
lsrs r0, 24
cmp r0, 0x1
bne _0809CFB0
ldr r0, =0x02037318
ldr r0, =gUnknown_02037318
ldr r1, [r0, 0x4]
adds r0, r5, 0
bl sub_80E9668
@@ -2067,7 +2067,7 @@ _0809CFB0:
lsrs r0, 24
cmp r0, 0x1
bne _0809CFFC
ldr r6, =0x02037318
ldr r6, =gUnknown_02037318
adds r0, r6, 0
adds r1, r5, 0
bl map_warp_check_packed
@@ -2243,7 +2243,7 @@ _0809D0E4:
thumb_func_start sub_809D0F4
sub_809D0F4: @ 809D0F4
push {r4,lr}
ldr r4, =0x02037318
ldr r4, =gUnknown_02037318
ldrh r1, [r0]
subs r1, 0x7
lsls r1, 16
@@ -2316,7 +2316,7 @@ dive_warp: @ 809D16C
adds r4, r0, 0
lsls r1, 16
lsrs r5, r1, 16
ldr r0, =0x02037318
ldr r0, =gUnknown_02037318
ldrb r0, [r0, 0x17]
cmp r0, 0x5
bne _0809D1A4
@@ -2389,7 +2389,7 @@ sub_809D1E8: @ 809D1E8
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r5, r0, 24
ldr r0, =0x02037318
ldr r0, =gUnknown_02037318
ldrb r0, [r0, 0x17]
cmp r0, 0x5
bne _0809D244
@@ -2491,7 +2491,7 @@ sub_809D2BC: @ 809D2BC
movs r2, 0x2
ldrsh r1, [r4, r2]
bl MapGridGetMetatileBehaviorAt
ldr r4, =0x02037318
ldr r4, =gUnknown_02037318
adds r0, r4, 0
mov r1, sp
bl map_warp_check_packed
@@ -2512,7 +2512,7 @@ sub_809D2BC: @ 809D2BC
thumb_func_start sub_809D300
sub_809D300: @ 809D300
push {r4,lr}
ldr r4, =0x03005d8c
ldr r4, =gUnknown_03005D8C
ldr r0, [r4]
ldr r1, =0x00001270
adds r0, r1
@@ -2527,7 +2527,7 @@ sub_809D300: @ 809D300
lsls r2, 2
movs r1, 0
bl memset
ldr r0, =0x020375fc
ldr r0, =gUnknown_020375FC
movs r1, 0
movs r2, 0x10
bl memset
@@ -2540,7 +2540,7 @@ sub_809D300: @ 809D300
thumb_func_start sub_809D344
sub_809D344: @ 809D344
push {lr}
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r1, =0x00001270
adds r2, r0, r1
@@ -2570,7 +2570,7 @@ sub_809D344: @ 809D344
thumb_func_start sub_809D3A0
sub_809D3A0: @ 809D3A0
push {lr}
ldr r0, =0x03005d8c
ldr r0, =gUnknown_03005D8C
ldr r0, [r0]
ldr r1, =0x00001394
adds r0, r1
@@ -2587,7 +2587,7 @@ sub_809D3C0: @ 809D3C0
push {lr}
ldr r0, =0x00004046
bl GetVarPointer
ldr r1, =0x03005d90
ldr r1, =gUnknown_03005D90
ldr r2, [r1]
movs r1, 0
strb r1, [r2, 0x1A]
@@ -2604,7 +2604,7 @@ sub_809D3E8: @ 809D3E8
push {r4,r5,lr}
ldr r0, =0x00004046
bl GetVarPointer
ldr r4, =0x03005d90
ldr r4, =gUnknown_03005D90
ldr r2, [r4]
movs r5, 0
movs r1, 0xDA
@@ -2629,7 +2629,7 @@ sub_809D3E8: @ 809D3E8
thumb_func_start sub_809D42C
sub_809D42C: @ 809D42C
push {lr}
ldr r0, =0x03005d90
ldr r0, =gUnknown_03005D90
ldr r0, [r0]
ldrb r0, [r0, 0x1A]
cmp r0, 0xDA

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