mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-05-31 17:31:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into item-manager

Browse Source
This commit is contained in:
Aetias
2024-04-20 14:01:33 +02:00
parent 9a7bc06baa e54e6a277c
commit d994c9ee4b
123 changed files with 5374 additions and 5227 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+12 -4
View File
@@ -26,10 +26,12 @@ ARM7_BIOS := arm7_bios.bin
ASSETS_TXT := assets.txt
ASM_FILES := $(shell find asm -name *.s)
CXX_FILES := $(shell find src -name *.cpp)
CXX_FILES := $(shell find src -name *.cpp) $(shell find libs -name *.cpp)
C_FILES := $(shell find src -name *.c) $(shell find libs -name *.c)
ASM_OBJS = $(ASM_FILES:%.s=$(TARGET_DIR)/%.s.o)
ASM_INCS = $(ASM_FILES:%.s=%.inc)
CXX_OBJS = $(CXX_FILES:%.cpp=$(TARGET_DIR)/%.cpp.o)
C_OBJS = $(C_FILES:%.c=$(TARGET_DIR)/%.c.o)
OV_BINS := $(wildcard $(TARGET_DIR)/overlays/*.bin)
OV_LZS = $(OV_BINS:%.bin=%.lz)
@@ -47,7 +49,9 @@ LCF_FILE := $(ROOT)/$(BUILD_DIR)/arm9_linker_script.lcf
OBJS_FILE := $(ROOT)/$(BUILD_DIR)/arm9_objects.txt
ASM_FLAGS := -proc arm5te -d $(REGION) -i asm -msgstyle gcc
CC_FLAGS := -proc arm946e -interworking -O4,p -enum int -i include -i- -i libs/c/include -nolink -d $(REGION) -char signed -lang=c++ -sym on -msgstyle gcc
CC_FLAGS := -proc arm946e -interworking -O4,p -enum int -i include -i- -i libs/c/include -i libs/cpp/include -nolink -d $(REGION) -char signed -sym on -msgstyle gcc
C_FLAGS := -lang=c
CXX_FLAGS := -lang=c++
LD_FLAGS := -proc arm946e -nostdlib -interworking -nodead -m Entry -map closure,unused -o main.bin -msgstyle gcc
ifeq ($(NONMATCHING),1)
@@ -121,10 +125,14 @@ $(ASM_OBJS): $(TARGET_DIR)/%.o: %
$(CXX_OBJS): $(TARGET_DIR)/%.o: %
mkdir -p $(dir $@)
LM_LICENSE_FILE=$(MW_LICENSE) $(WINE) $(MW_CC) $(CC_FLAGS) $< -o $@
LM_LICENSE_FILE=$(MW_LICENSE) $(WINE) $(MW_CC) $(CC_FLAGS) $(CXX_FLAGS) $< -o $@
$(C_OBJS): $(TARGET_DIR)/%.o: %
mkdir -p $(dir $@)
LM_LICENSE_FILE=$(MW_LICENSE) $(WINE) $(MW_CC) $(CC_FLAGS) $(C_FLAGS) $< -o $@
.PHONY: link
link: lcf $(ASM_OBJS) $(CXX_OBJS)
link: lcf $(ASM_OBJS) $(CXX_OBJS) $(C_OBJS)
cd $(TARGET_DIR) && LM_LICENSE_FILE=$(MW_LICENSE) $(WINE) $(MW_LD) $(LD_FLAGS) $(LCF_FILE) @$(OBJS_FILE)
.PHONY: compress
asm/main.inc → asm/main/main_02000000.inc
+15
View File
@@ -14,6 +14,8 @@
.extern _ZN14AdventureFlags6ExistsEv
.extern _ZN17LinkStateInteract18func_ov00_020ab6c8Ev
.extern _ZNK11ItemManager7HasItemEi
.extern __global_destructor_chain
.extern __register_global_object
.extern data_027e0000
.extern data_027e0004
.extern data_027e0014
@@ -287,6 +289,19 @@
.extern func_01ffe468
.extern func_01fffcd8
.extern func_01ffff08
.extern func_0204f8f4
.extern func_0204faa4
.extern func_0204fb00
.extern func_0204fba0
.extern func_0204fbc0
.extern func_0204fbf0
.extern func_0204fc20
.extern func_0204fc68
.extern func_0204fcb4
.extern func_0204fd14
.extern func_0204fed8
.extern func_020508c4
.extern func_02050a20
.extern func_ov00_02078b40
.extern func_ov00_02078b88
.extern func_ov00_02078ffc
asm/main.s → asm/main/main_02000000.s
+16 -4287
View File
File diff suppressed because it is too large Load Diff
asm/main/main_0204f8f4.inc
+36
View File
@@ -0,0 +1,36 @@
#pragma once
.extern CpuSet
.extern WaitByLoop
.extern data_02057208
.extern data_02058b24
.extern data_02058b28
.extern data_02058be8
.extern data_02058cec
.extern func_0200730c
.extern func_020078f4
.extern func_02007908
.extern func_02007a44
.extern func_02007ad8
.extern func_02008a50
.extern func_02008b04
.extern func_02008b50
.extern func_02008b74
.extern func_0200c3c8
.extern func_0200c6a0
.extern func_0200c6ac
.extern func_0200c764
.extern func_0200c76c
.extern func_0200d5e4
.extern func_0200d6bc
.extern func_0200d880
.extern func_0200d938
.extern func_0200e254
.extern func_0200e288
.extern func_0200e62c
.extern func_0200ee4c
.extern func_0200ee60
.extern func_0200f248
.extern func_0204dec8
.extern func_0204dff0
.extern func_0204f358
.extern func_02050ca0
asm/main/main_0204f8f4.s
+4263
View File
File diff suppressed because it is too large Load Diff
asm/ov00/ov00_020773c0.inc
+1 -1
View File
@@ -127,7 +127,7 @@
.extern func_020426d4
.extern func_02042bb8
.extern func_0204366c
.extern func_0204f8d4
.extern __register_global_object
.extern func_ov00_0207bc48
.extern func_ov00_0207c170
.extern func_ov00_02082e1c
asm/ov00/ov00_020773c0.s
+1 -1
View File
@@ -6927,7 +6927,7 @@ func_ov00_020df34c: ; 0x020df34c
ldr r0, _020df36c ; =data_027e0d54
ldr r1, _020df370 ; =func_ov00_0207a2fc
ldr r2, _020df374 ; =data_027e0d48
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov00_020df34c
asm/ov00/ov00_0207af9c.inc
+7 -7
View File
@@ -9,6 +9,12 @@
.extern _ZN12ActorManager18func_ov00_020c3ce8Eii
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN14AdventureFlags15Get_FlagsUnk_00EiP9FlagsUnk2
.extern _ZN14AdventureFlags18func_ov00_020976c8Ev
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern _ZN14AdventureFlags18func_ov00_020980d0Ev
.extern _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14OverlayManager15LoadIfNotLoadedEjj
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
@@ -60,6 +66,7 @@
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager7HasItemEi
.extern __register_global_object
.extern data_02050f54
.extern data_02056be4
.extern data_02063e4c
@@ -258,7 +265,6 @@
.extern func_0204f614
.extern func_0204f754
.extern func_0204f7b0
.extern func_0204f8d4
.extern func_ov00_02078b40
.extern func_ov00_02078b88
.extern func_ov00_02078bc4
@@ -274,12 +280,6 @@
.extern func_ov00_020798bc
.extern func_ov00_02079e04
.extern func_ov00_02079e3c
.extern _ZN14AdventureFlags18func_ov00_020976c8Ev
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi
.extern _ZN14AdventureFlags15Get_FlagsUnk_00EiP9FlagsUnk2
.extern _ZN14AdventureFlags18func_ov00_020980d0Ev
.extern func_ov00_0209afc4
.extern func_ov00_0209b5a4
.extern func_ov00_0209b6f4
asm/ov00/ov00_0207af9c.s
+18 -18
View File
@@ -13863,7 +13863,7 @@ func_ov00_02084d4c: ; 0x02084d4c
ldr r2, _02084eb4 ; =data_ov00_020ec9c8
mov r0, ip
str lr, [r3, #0x78]
bl func_0204f8d4
bl __register_global_object
ldr r0, _02084ea4 ; =data_ov00_020ec964
ldr r1, [r0, #0x60]
orr r1, r1, #1
@@ -38352,7 +38352,7 @@ func_ov00_020df38c: ; 0x020df38c
ldr r0, _020df3ac ; =data_027e0d78
ldr r1, _020df3b0 ; =func_ov00_0207af9c
ldr r2, _020df3b4 ; =data_027e0d6c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov00_020df38c
@@ -38402,7 +38402,7 @@ func_ov00_020df3f4: ; 0x020df3f4
ldr r0, _020df414 ; =data_ov00_020e9e18
ldr r1, _020df418 ; =func_ov00_0207bab4
ldr r2, _020df41c ; =data_ov00_020e9e0c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov00_020df3f4
@@ -38497,14 +38497,14 @@ func_ov00_020df4cc: ; 0x020df4cc
str ip, [r3, #0x24]
mov ip, #0x60
str ip, [r3, #0x28]
bl func_0204f8d4
bl __register_global_object
ldr r0, _020df604 ; =data_ov00_020e24d0
mov r3, #0
ldr r1, _020df5fc ; =func_ov00_02086cd0
ldr r2, _020df608 ; =data_ov00_020ec970
str r3, [r0]
str r3, [r0, #4]
bl func_0204f8d4
bl __register_global_object
ldr r0, _020df60c ; =data_ov00_020e24d8
mov ip, #0x80
mov r3, #0x60
@@ -38512,7 +38512,7 @@ func_ov00_020df4cc: ; 0x020df4cc
ldr r2, _020df610 ; =data_ov00_020ec97c
str ip, [r0]
str r3, [r0, #4]
bl func_0204f8d4
bl __register_global_object
ldr r0, _020df614 ; =data_ov00_020e24e0
mov ip, #0x80
mov r3, #0
@@ -38520,7 +38520,7 @@ func_ov00_020df4cc: ; 0x020df4cc
ldr r2, _020df618 ; =data_ov00_020ec988
str ip, [r0]
str r3, [r0, #4]
bl func_0204f8d4
bl __register_global_object
mov r2, #0x80000
rsb r2, r2, #0
ldr r0, _020df5f4 ; =data_ov00_020e24a4
@@ -38530,7 +38530,7 @@ func_ov00_020df4cc: ; 0x020df4cc
ldr r0, _020df61c ; =data_ov00_020e24e8
ldr r1, _020df620 ; =func_ov00_0207dd9c
ldr r2, _020df624 ; =data_ov00_020ec994
bl func_0204f8d4
bl __register_global_object
ldr r0, _020df628 ; =data_ov00_020e24f0
mov r1, #0x80000
rsb r1, r1, #0
@@ -38539,7 +38539,7 @@ func_ov00_020df4cc: ; 0x020df4cc
str r1, [r0, #4]
ldr r1, _020df620 ; =func_ov00_0207dd9c
ldr r2, _020df62c ; =data_ov00_020ec9a0
bl func_0204f8d4
bl __register_global_object
ldr r0, _020df630 ; =data_ov00_020e24f8
mov r1, #0x80000
rsb r1, r1, #0
@@ -38548,7 +38548,7 @@ func_ov00_020df4cc: ; 0x020df4cc
str r1, [r0, #4]
ldr r1, _020df620 ; =func_ov00_0207dd9c
ldr r2, _020df634 ; =data_ov00_020ec9ac
bl func_0204f8d4
bl __register_global_object
ldr r0, _020df638 ; =data_ov00_020e2500
mov r1, #0x80000
rsb r1, r1, #0
@@ -38557,7 +38557,7 @@ func_ov00_020df4cc: ; 0x020df4cc
str r1, [r0, #4]
ldr r1, _020df620 ; =func_ov00_0207dd9c
ldr r2, _020df63c ; =data_ov00_020ec9b8
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov00_020df4cc
@@ -38593,7 +38593,7 @@ func_ov00_020df640: ; 0x020df640
ldr r0, _020df668 ; =data_ov00_020ecd50
ldr r1, _020df670 ; =func_0203ebc8
ldr r2, _020df674 ; =data_ov00_020ecd58
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov00_020df640
@@ -38614,7 +38614,7 @@ func_ov00_020df678: ; 0x020df678
ldr r0, _020df6a4 ; =data_ov00_020ecd70
ldr r1, _020df6b0 ; =func_0203e7b4
ldr r2, _020df6b4 ; =data_ov00_020ecd64
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov00_020df678
@@ -38636,7 +38636,7 @@ func_ov00_020df6b8: ; 0x020df6b8
ldr r0, _020df6e4 ; =data_ov00_020ecd90
ldr r1, _020df6f0 ; =func_0203e7b4
ldr r2, _020df6f4 ; =data_ov00_020ecd84
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov00_020df6b8
@@ -38658,7 +38658,7 @@ func_ov00_020df6f8: ; 0x020df6f8
ldr r0, _020df724 ; =data_ov00_020ecdb0
ldr r1, _020df730 ; =func_0203e7b4
ldr r2, _020df734 ; =data_ov00_020ecda4
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov00_020df6f8
@@ -38679,7 +38679,7 @@ func_ov00_020df738: ; 0x020df738
ldr r0, _020df760 ; =data_ov00_020ecdc4
ldr r1, _020df768 ; =func_0203ebc8
ldr r2, _020df76c ; =data_ov00_020ecdcc
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov00_020df738
@@ -40177,7 +40177,7 @@ _020e0774:
strb r4, [sp, #0x1c]
strb r0, [sp, #0x1d]
strb ip, [r7, #0x9cd]
bl func_0204f8d4
bl __register_global_object
add sp, sp, #0x238
add sp, sp, #0x400
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
@@ -40301,7 +40301,7 @@ func_ov00_020e1030: ; 0x020e1030
ldr r0, _020e1050 ; =data_ov00_020ee0a0
ldr r1, _020e1054 ; =func_ov08_021135b8
ldr r2, _020e1058 ; =data_ov00_020ee094
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov00_020e1030
asm/ov00/ov00_020980f4.inc
+1 -1
View File
@@ -58,6 +58,7 @@
.extern _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern __register_global_object
.extern data_02050f54
.extern data_02052f54
.extern data_02057840
@@ -179,7 +180,6 @@
.extern func_0204dd9c
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
.extern func_ov00_02078b40
.extern func_ov00_02079e68
.extern func_ov00_0207b2f0
asm/ov00/ov00_020980f4.s
+8 -8
View File
@@ -21968,7 +21968,7 @@ func_ov00_020e105c: ; 0x020e105c
ldr r0, _020e1088 ; =data_ov00_020ee0f4
ldr r1, _020e1094 ; =func_0203e7b4
ldr r2, _020e1098 ; =data_ov00_020ee0e8
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov00_020e105c
@@ -21989,7 +21989,7 @@ func_ov00_020e109c: ; 0x020e109c
ldr r0, _020e10c4 ; =data_ov00_020ee108
ldr r1, _020e10cc ; =func_0203ebc8
ldr r2, _020e10d0 ; =data_ov00_020ee110
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov00_020e109c
@@ -22010,7 +22010,7 @@ func_ov00_020e10d4: ; 0x020e10d4
ldr r0, _020e1100 ; =data_ov00_020ee128
ldr r1, _020e110c ; =func_0203e7b4
ldr r2, _020e1110 ; =data_ov00_020ee11c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov00_020e10d4
@@ -22043,14 +22043,14 @@ func_ov00_020e1128: ; 0x020e1128
str ip, [r3]
mov ip, #0x60
str ip, [r3, #4]
bl func_0204f8d4
bl __register_global_object
ldr r0, _020e11c0 ; =data_ov00_020e50f4
mov r3, #0
ldr r1, _020e11b8 ; =func_ov00_02086cd0
ldr r2, _020e11c4 ; =data_ov00_020ee154
str r3, [r0]
str r3, [r0, #4]
bl func_0204f8d4
bl __register_global_object
ldr r0, _020e11c8 ; =data_ov00_020e50fc
mov ip, #0x80
mov r3, #0x60
@@ -22058,7 +22058,7 @@ func_ov00_020e1128: ; 0x020e1128
ldr r2, _020e11cc ; =data_ov00_020ee148
str ip, [r0]
str r3, [r0, #4]
bl func_0204f8d4
bl __register_global_object
ldr r0, _020e11d0 ; =data_ov00_020e5104
mov ip, #0x80
mov r3, #0
@@ -22066,7 +22066,7 @@ func_ov00_020e1128: ; 0x020e1128
ldr r2, _020e11d4 ; =data_ov00_020ee13c
str ip, [r0]
str r3, [r0, #4]
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov00_020e1128
@@ -22114,7 +22114,7 @@ func_ov00_020e120c: ; 0x020e120c
str ip, [r3, #4]
mov ip, #0x28000
str ip, [r3, #8]
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov00_020e120c
asm/ov00/ov00_020b1498.inc
+9 -9
View File
@@ -50,6 +50,14 @@
.extern _ZN13PlayerControl13StopFollowingEv
.extern _ZN13PlayerControl18func_ov00_020aeef8Ev
.extern _ZN13PlayerControl18func_ov00_020b034cEv
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern _ZN14AdventureFlags18func_ov00_02097750Ev
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bbcEv
.extern _ZN14AdventureFlags18func_ov00_02097bccEv
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags3SetEjb
.extern _ZN15LinkStateDamage18func_ov00_020acb6cEP5Vec3pi
.extern _ZN15LinkStateDamage18func_ov00_020ace90EP5Vec3pi
.extern _ZN15LinkStateFollow20GetLinkStateCutsceneEv
@@ -121,6 +129,7 @@
.extern _ZNK11ItemManager7GetAmmoEi
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager8GetFairyEi
.extern __register_global_object
.extern data_02050f54
.extern data_02051f54
.extern data_02052f54
@@ -275,7 +284,6 @@
.extern func_0203e7b4
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
.extern func_ov00_02078b40
.extern func_ov00_02079878
.extern func_ov00_02079e3c
@@ -325,14 +333,6 @@
.extern func_ov00_0208b988
.extern func_ov00_0208f70c
.extern func_ov00_02093a1c
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern _ZN14AdventureFlags18func_ov00_02097750Ev
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags3SetEjb
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bbcEv
.extern _ZN14AdventureFlags18func_ov00_02097bccEv
.extern func_ov00_0209a4f4
.extern func_ov00_0209a508
.extern func_ov00_0209cbd4
asm/ov00/ov00_020b1498.s
+34 -34
View File
@@ -21530,7 +21530,7 @@ func_ov00_020e1250: ; 0x020e1250
ldr r0, _020e127c ; =data_ov00_020ee184
ldr r1, _020e1288 ; =func_0203e7b4
ldr r2, _020e128c ; =data_ov00_020ee178
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov00_020e1250
@@ -21576,13 +21576,13 @@ func_ov00_020e12d8: ; 0x020e12d8
ldr r0, _020e131c ; =data_ov00_020ee1ac
ldr r1, _020e1328 ; =func_0203e7b4
ldr r2, _020e132c ; =data_ov00_020ee1a0
bl func_0204f8d4
bl __register_global_object
ldr r0, _020e1330 ; =data_ov00_020ee1cc
bl func_ov00_020b8110
ldr r0, _020e1330 ; =data_ov00_020ee1cc
ldr r1, _020e1334 ; =func_ov00_020b8134
ldr r2, _020e1338 ; =data_ov00_020ee1c0
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov00_020e12d8
@@ -21607,7 +21607,7 @@ func_ov00_020e133c: ; 0x020e133c
ldr r0, _020e1368 ; =data_ov00_020ee1e4
ldr r1, _020e1374 ; =func_0203e7b4
ldr r2, _020e1378 ; =data_ov00_020ee1d8
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov00_020e133c
@@ -21635,7 +21635,7 @@ func_ov00_020e137c: ; 0x020e137c
ldr r1, _020e19c0 ; =func_0203005c
ldr r2, _020e19c4 ; =data_ov00_020ee2d4
strb ip, [r3, #0x21c]
bl func_0204f8d4
bl __register_global_object
ldr r0, _020e19ac ; =data_02057878
ldr r3, _020e19b0 ; =data_ov00_020ee1fc
ldr r1, _020e19c8 ; =data_ov00_020e69b0
@@ -21650,7 +21650,7 @@ func_ov00_020e137c: ; 0x020e137c
ldr r1, _020e19c0 ; =func_0203005c
ldr r2, _020e19d0 ; =data_ov00_020ee2a4
strb ip, [r3, #0x244]
bl func_0204f8d4
bl __register_global_object
ldr r0, _020e19ac ; =data_02057878
ldr r3, _020e19b0 ; =data_ov00_020ee1fc
ldr r1, _020e19d4 ; =data_ov00_020e69cc
@@ -21664,7 +21664,7 @@ func_ov00_020e137c: ; 0x020e137c
ldr r1, _020e19e0 ; =func_0203010c
ldr r2, _020e19e4 ; =data_ov00_020ee2e0
str ip, [r3, #0x160]
bl func_0204f8d4
bl __register_global_object
ldr r0, _020e19ac ; =data_02057878
ldr r3, _020e19b0 ; =data_ov00_020ee1fc
ldr r1, _020e19e8 ; =data_ov00_020e69dc
@@ -21678,7 +21678,7 @@ func_ov00_020e137c: ; 0x020e137c
ldr r1, _020e19e0 ; =func_0203010c
ldr r2, _020e19f0 ; =data_ov00_020ee2f8
str ip, [r3, #0x170]
bl func_0204f8d4
bl __register_global_object
ldr r0, _020e19ac ; =data_02057878
ldr r1, _020e19b0 ; =data_ov00_020ee1fc
ldr r2, _020e19f4 ; =data_ov00_020e69ec
@@ -21693,7 +21693,7 @@ func_ov00_020e137c: ; 0x020e137c
strb r3, [r1, #0x280]
ldr r1, _020e19c0 ; =func_0203005c
ldr r2, _020e19fc ; =data_ov00_020ee2ec
bl func_0204f8d4
bl __register_global_object
ldr r0, _020e19ac ; =data_02057878
ldr r3, _020e19b0 ; =data_ov00_020ee1fc
ldr r1, _020e1a00 ; =data_ov00_020e6a08
@@ -21708,7 +21708,7 @@ func_ov00_020e137c: ; 0x020e137c
ldr r1, _020e19c0 ; =func_0203005c
ldr r2, _020e1a08 ; =data_ov00_020ee31c
strb ip, [r3, #0x2a8]
bl func_0204f8d4
bl __register_global_object
ldr r0, _020e19ac ; =data_02057878
ldr r3, _020e19b0 ; =data_ov00_020ee1fc
ldr r1, _020e1a0c ; =data_ov00_020e6a2c
@@ -21722,7 +21722,7 @@ func_ov00_020e137c: ; 0x020e137c
ldr r1, _020e19e0 ; =func_0203010c
ldr r2, _020e1a14 ; =data_ov00_020ee268
str ip, [r3, #0x180]
bl func_0204f8d4
bl __register_global_object
ldr r0, _020e19ac ; =data_02057878
ldr r3, _020e19b0 ; =data_ov00_020ee1fc
ldr r1, _020e1a18 ; =data_ov00_020e6a3c
@@ -21736,7 +21736,7 @@ func_ov00_020e137c: ; 0x020e137c
ldr r1, _020e19e0 ; =func_0203010c
ldr r2, _020e1a20 ; =data_ov00_020ee28c
str ip, [r3, #0x190]
bl func_0204f8d4
bl __register_global_object
ldr r0, _020e19ac ; =data_02057878
ldr r3, _020e19b0 ; =data_ov00_020ee1fc
ldr r1, _020e1a24 ; =data_ov00_020e6a4c
@@ -21750,7 +21750,7 @@ func_ov00_020e137c: ; 0x020e137c
ldr r1, _020e19e0 ; =func_0203010c
ldr r2, _020e1a2c ; =data_ov00_020ee2bc
str ip, [r3, #0x1a0]
bl func_0204f8d4
bl __register_global_object
ldr r0, _020e19ac ; =data_02057878
ldr r1, _020e19b0 ; =data_ov00_020ee1fc
ldr r2, _020e1a30 ; =data_ov00_020e6a5c
@@ -21764,7 +21764,7 @@ func_ov00_020e137c: ; 0x020e137c
str r2, [r1, #0x1b0]
ldr r1, _020e19e0 ; =func_0203010c
ldr r2, _020e1a38 ; =data_ov00_020ee298
bl func_0204f8d4
bl __register_global_object
ldr r0, _020e19ac ; =data_02057878
ldr r3, _020e19b0 ; =data_ov00_020ee1fc
ldr r1, _020e1a3c ; =data_ov00_020e6a6c
@@ -21778,7 +21778,7 @@ func_ov00_020e137c: ; 0x020e137c
ldr r1, _020e19e0 ; =func_0203010c
ldr r2, _020e1a44 ; =data_ov00_020ee214
str ip, [r3, #0x1c0]
bl func_0204f8d4
bl __register_global_object
ldr r0, _020e19ac ; =data_02057878
ldr r3, _020e19b0 ; =data_ov00_020ee1fc
ldr r1, _020e1a48 ; =data_ov00_020e6a7c
@@ -21792,7 +21792,7 @@ func_ov00_020e137c: ; 0x020e137c
ldr r1, _020e19e0 ; =func_0203010c
ldr r2, _020e1a50 ; =data_ov00_020ee208
str ip, [r3, #0x150]
bl func_0204f8d4
bl __register_global_object
ldr r0, _020e19ac ; =data_02057878
ldr r3, _020e19b0 ; =data_ov00_020ee1fc
ldr r1, _020e1a54 ; =data_ov00_020e6a8c
@@ -21807,7 +21807,7 @@ func_ov00_020e137c: ; 0x020e137c
ldr r1, _020e19c0 ; =func_0203005c
ldr r2, _020e1a5c ; =data_ov00_020ee340
strb ip, [r3, #0x1f4]
bl func_0204f8d4
bl __register_global_object
ldr r0, _020e19ac ; =data_02057878
ldr r3, _020e19b0 ; =data_ov00_020ee1fc
ldr r1, _020e1a60 ; =data_ov00_020e6aa8
@@ -21822,7 +21822,7 @@ func_ov00_020e137c: ; 0x020e137c
ldr r1, _020e19c0 ; =func_0203005c
ldr r2, _020e1a68 ; =data_ov00_020ee280
strb ip, [r3, #0x208]
bl func_0204f8d4
bl __register_global_object
ldr r0, _020e19ac ; =data_02057878
ldr r1, _020e19b0 ; =data_ov00_020ee1fc
ldr r2, _020e1a6c ; =data_ov00_020e6ac4
@@ -21837,7 +21837,7 @@ func_ov00_020e137c: ; 0x020e137c
strb r3, [r1, #0x258]
ldr r1, _020e19c0 ; =func_0203005c
ldr r2, _020e1a74 ; =data_ov00_020ee2b0
bl func_0204f8d4
bl __register_global_object
ldr r0, _020e19ac ; =data_02057878
ldr r3, _020e19b0 ; =data_ov00_020ee1fc
ldr r1, _020e1a78 ; =data_ov00_020e6ae0
@@ -21852,7 +21852,7 @@ func_ov00_020e137c: ; 0x020e137c
ldr r1, _020e19c0 ; =func_0203005c
ldr r2, _020e1a80 ; =data_ov00_020ee250
strb ip, [r3, #0x26c]
bl func_0204f8d4
bl __register_global_object
ldr r0, _020e19ac ; =data_02057878
ldr r3, _020e19b0 ; =data_ov00_020ee1fc
ldr r1, _020e1a84 ; =data_ov00_020e6b04
@@ -21867,7 +21867,7 @@ func_ov00_020e137c: ; 0x020e137c
ldr r1, _020e19c0 ; =func_0203005c
ldr r2, _020e1a8c ; =data_ov00_020ee310
strb ip, [r3, #0x2bc]
bl func_0204f8d4
bl __register_global_object
ldr r0, _020e19ac ; =data_02057878
ldr r3, _020e19b0 ; =data_ov00_020ee1fc
ldr r1, _020e1a90 ; =data_ov00_020e6b24
@@ -21882,7 +21882,7 @@ func_ov00_020e137c: ; 0x020e137c
ldr r1, _020e19c0 ; =func_0203005c
ldr r2, _020e1a98 ; =data_ov00_020ee1fc
strb ip, [r3, #0x2d0]
bl func_0204f8d4
bl __register_global_object
ldr r0, _020e19ac ; =data_02057878
ldr r3, _020e19b0 ; =data_ov00_020ee1fc
ldr r1, _020e1a9c ; =data_ov00_020e6b40
@@ -21897,7 +21897,7 @@ func_ov00_020e137c: ; 0x020e137c
ldr r1, _020e19c0 ; =func_0203005c
ldr r2, _020e1aa4 ; =data_ov00_020ee244
strb ip, [r3, #0x2e4]
bl func_0204f8d4
bl __register_global_object
ldr r0, _020e19ac ; =data_02057878
ldr r1, _020e19b0 ; =data_ov00_020ee1fc
ldr r2, _020e1aa8 ; =data_ov00_020e6b5c
@@ -21912,7 +21912,7 @@ func_ov00_020e137c: ; 0x020e137c
strb r3, [r1, #0x1e0]
ldr r1, _020e19c0 ; =func_0203005c
ldr r2, _020e1ab0 ; =data_ov00_020ee328
bl func_0204f8d4
bl __register_global_object
ldr r0, _020e19ac ; =data_02057878
ldr r3, _020e19b0 ; =data_ov00_020ee1fc
ldr r1, _020e1ab4 ; =data_ov00_020e6b78
@@ -21927,7 +21927,7 @@ func_ov00_020e137c: ; 0x020e137c
ldr r1, _020e19c0 ; =func_0203005c
ldr r2, _020e1abc ; =data_ov00_020ee334
strb ip, [r3, #0x230]
bl func_0204f8d4
bl __register_global_object
ldr r0, _020e19ac ; =data_02057878
ldr r3, _020e19b0 ; =data_ov00_020ee1fc
ldr r1, _020e1ac0 ; =data_ov00_020e6b94
@@ -21942,7 +21942,7 @@ func_ov00_020e137c: ; 0x020e137c
ldr r1, _020e19c0 ; =func_0203005c
ldr r2, _020e1ac8 ; =data_ov00_020ee2c8
strb ip, [r3, #0x294]
bl func_0204f8d4
bl __register_global_object
ldr r0, _020e19ac ; =data_02057878
ldr r3, _020e19b0 ; =data_ov00_020ee1fc
ldr r1, _020e1acc ; =data_ov00_020e6ba8
@@ -21957,7 +21957,7 @@ func_ov00_020e137c: ; 0x020e137c
ldr r1, _020e19c0 ; =func_0203005c
ldr r2, _020e1ad4 ; =data_ov00_020ee220
strb ip, [r3, #0x2f8]
bl func_0204f8d4
bl __register_global_object
ldr r2, _020e1ad8 ; =data_ov00_020e6bbc
ldr r0, _020e1adc ; =data_ov00_020ee4f8
mov ip, #0
@@ -21969,7 +21969,7 @@ func_ov00_020e137c: ; 0x020e137c
str ip, [r0, #8]
str ip, [r0, #0xc]
strb ip, [r0, #0x10]
bl func_0204f8d4
bl __register_global_object
ldr r0, _020e1ae4 ; =data_ov00_020ee50c
mov r2, #0
ldr r3, _020e1ae8 ; =data_ov00_020e6bd8
@@ -21980,7 +21980,7 @@ func_ov00_020e137c: ; 0x020e137c
strb r2, [r0, #0x10]
ldr r1, _020e19c0 ; =func_0203005c
ldr r2, _020e1aec ; =data_ov00_020ee22c
bl func_0204f8d4
bl __register_global_object
ldr r0, _020e1af0 ; =data_ov00_020ee520
mov ip, #0
ldr lr, _020e1af4 ; =data_ov00_020e6bec
@@ -21991,7 +21991,7 @@ func_ov00_020e137c: ; 0x020e137c
ldr r1, _020e19c0 ; =func_0203005c
ldr r2, _020e1af8 ; =data_ov00_020ee304
strb ip, [r0, #0x10]
bl func_0204f8d4
bl __register_global_object
ldr r0, _020e1afc ; =data_ov00_020ee534
mov ip, #0
ldr lr, _020e1b00 ; =data_ov00_020e6c00
@@ -22002,7 +22002,7 @@ func_ov00_020e137c: ; 0x020e137c
ldr r1, _020e19c0 ; =func_0203005c
ldr r2, _020e1b04 ; =data_ov00_020ee274
strb ip, [r0, #0x10]
bl func_0204f8d4
bl __register_global_object
ldr r2, _020e1b08 ; =data_ov00_020e6c1c
ldr r0, _020e1b0c ; =data_ov00_020ee548
mov ip, #0
@@ -22014,7 +22014,7 @@ func_ov00_020e137c: ; 0x020e137c
str ip, [r0, #8]
str ip, [r0, #0xc]
strb ip, [r0, #0x10]
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov00_020e137c
@@ -22121,7 +22121,7 @@ func_ov00_020e1b14: ; 0x020e1b14
ldr r0, _020e1b40 ; =data_ov00_020ee568
ldr r1, _020e1b4c ; =func_0203e7b4
ldr r2, _020e1b50 ; =data_ov00_020ee55c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov00_020e1b14
@@ -22143,7 +22143,7 @@ func_ov00_020e1b54: ; 0x020e1b54
ldr r0, _020e1b80 ; =data_ov00_020ee59c
ldr r1, _020e1b8c ; =func_0203e7b4
ldr r2, _020e1b90 ; =data_ov00_020ee590
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov00_020e1b54
asm/ov00/ov00_020c3e54.inc
+1 -1
View File
@@ -91,6 +91,7 @@
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager8GetFairyEi
.extern __register_global_object
.extern data_02050f54
.extern data_020561f4
.extern data_02056be4
@@ -485,7 +486,6 @@
.extern func_0204f558
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
.extern func_ov00_02078b40
.extern func_ov00_02078e00
.extern func_ov00_02079470
asm/ov00/ov00_020c3e54.s
+9 -9
View File
@@ -28410,7 +28410,7 @@ func_ov00_020e1b94: ; 0x020e1b94
ldr r0, _020e1bc0 ; =data_ov00_020ee5bc
ldr r1, _020e1bcc ; =func_0203e7b4
ldr r2, _020e1bd0 ; =data_ov00_020ee5b0
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov00_020e1b94
@@ -28432,7 +28432,7 @@ func_ov00_020e1bd4: ; 0x020e1bd4
ldr r0, _020e1c00 ; =data_ov00_020ee5dc
ldr r1, _020e1c0c ; =func_0203e7b4
ldr r2, _020e1c10 ; =data_ov00_020ee5d0
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov00_020e1bd4
@@ -28454,7 +28454,7 @@ func_ov00_020e1c14: ; 0x020e1c14
ldr r0, _020e1c40 ; =data_ov00_020ee5fc
ldr r1, _020e1c4c ; =func_0203e7b4
ldr r2, _020e1c50 ; =data_ov00_020ee5f0
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov00_020e1c14
@@ -28502,7 +28502,7 @@ func_ov00_020e1c8c: ; 0x020e1c8c
ldr r0, _020e1cb8 ; =data_ov00_020ee61c
ldr r1, _020e1cc4 ; =func_0203e7b4
ldr r2, _020e1cc8 ; =data_ov00_020ee610
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov00_020e1c8c
@@ -28524,7 +28524,7 @@ func_ov00_020e1ccc: ; 0x020e1ccc
ldr r0, _020e1cf8 ; =data_ov00_020ee63c
ldr r1, _020e1d04 ; =func_0203e7b4
ldr r2, _020e1d08 ; =data_ov00_020ee630
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov00_020e1ccc
@@ -28546,7 +28546,7 @@ func_ov00_020e1d0c: ; 0x020e1d0c
ldr r0, _020e1d38 ; =data_ov00_020ee65c
ldr r1, _020e1d44 ; =func_0203e7b4
ldr r2, _020e1d48 ; =data_ov00_020ee650
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov00_020e1d0c
@@ -28566,7 +28566,7 @@ func_ov00_020e1d4c: ; 0x020e1d4c
ldr r0, _020e1d70 ; =data_ov00_020ee67c
ldr r1, _020e1d74 ; =func_ov00_020d435c
ldr r2, _020e1d78 ; =data_ov00_020ee670
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov00_020e1d4c
@@ -28583,7 +28583,7 @@ func_ov00_020e1d7c: ; 0x020e1d7c
ldr r0, _020e1d9c ; =data_ov00_020ee698
ldr r1, _020e1da0 ; =func_ov00_020d50f8
ldr r2, _020e1da4 ; =data_ov00_020ee68c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov00_020e1d7c
@@ -28603,7 +28603,7 @@ func_ov00_020e1da8: ; 0x020e1da8
ldr r0, _020e1dd4 ; =data_ov00_020ee6d4
ldr r1, _020e1de0 ; =func_0203e7b4
ldr r2, _020e1de4 ; =data_ov00_020ee6c8
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov00_020e1da8
asm/ov00/ov00_020d59f0.inc
+1 -1
View File
@@ -419,7 +419,7 @@ func_ov00_020d5f98: ; 0x020d5f98
str ip, [r3, #8]
mov ip, #0x1000
str ip, [r3, #0xc]
bl func_0204f8d4
bl __register_global_object
ldr r0, _020d6134 ; =data_ov00_020ee6e8
ldr r1, [r0]
orr r1, r1, #1
asm/ov02.inc
+2 -2
View File
@@ -2,6 +2,7 @@
.extern Divide
.extern LoadTreasureItemFanfare
.extern _ZN11ItemManager13EquipShipPartEjj
.extern _ZN14AdventureFlags3GetEj
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager10GetMaxAmmoEi
@@ -14,6 +15,7 @@
.extern _ZNK11ItemManager19GetEquippedShipPartEj
.extern _ZNK11ItemManager21HasTreasurePriceShownEj
.extern _ZNK11ItemManager7HasItemEi
.extern __register_global_object
.extern data_02050f54
.extern data_02057200
.extern data_020691a0
@@ -112,7 +114,6 @@
.extern func_0203d77c
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
.extern func_ov00_0207b1fc
.extern func_ov00_020847e0
.extern func_ov00_0208de04
@@ -123,7 +124,6 @@
.extern func_ov00_0208df74
.extern func_ov00_0208e420
.extern func_ov00_0208e4f4
.extern _ZN14AdventureFlags3GetEj
.extern func_ov00_0209cd80
.extern func_ov00_020a19fc
.extern func_ov00_020a1a24
asm/ov02.s
+1 -1
View File
@@ -9888,7 +9888,7 @@ func_ov02_020f6978: ; 0x020f6978
ldr r0, _020f6998 ; =data_ov02_020f716c
ldr r1, _020f699c ; =func_ov02_020f66d0
ldr r2, _020f69a0 ; =data_ov02_020f7160
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov02_020f6978
asm/ov03.inc
+1 -1
View File
@@ -58,6 +58,7 @@
.extern _ZNK11ItemManager16GetEquippedFairyEv
.extern _ZNK11ItemManager18func_ov00_020ae350Ev
.extern _ZNK11ItemManager7HasItemEi
.extern __register_global_object
.extern data_02050f54
.extern data_02056be4
.extern data_02057b18
@@ -237,7 +238,6 @@
.extern func_0204f614
.extern func_0204f754
.extern func_0204f7b0
.extern func_0204f8d4
.extern func_ov00_02078b40
.extern func_ov00_02078e00
.extern func_ov00_02078fac
asm/ov03.s
+2 -2
View File
@@ -43045,7 +43045,7 @@ func_ov03_020fff54: ; 0x020fff54
ldr r0, _020fff80 ; =data_ov03_02100a98
ldr r1, _020fff8c ; =func_0203e7b4
ldr r2, _020fff90 ; =data_ov03_02100a8c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov03_020fff54
@@ -43066,7 +43066,7 @@ func_ov03_020fff94: ; 0x020fff94
ldr r0, _020fffbc ; =data_ov03_02100ab0
ldr r1, _020fffc4 ; =func_0203ebc8
ldr r2, _020fffc8 ; =data_ov03_02100ab8
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov03_020fff94
asm/ov09.inc
+1 -1
View File
@@ -18,6 +18,7 @@
.extern _ZNK11ItemManager16GetShipPartCountEjj
.extern _ZNK11ItemManager16GetTreasureCountEj
.extern _ZNK11ItemManager19GetEquippedShipPartEj
.extern __register_global_object
.extern data_02050f54
.extern data_02057200
.extern data_0205785c
@@ -191,7 +192,6 @@
.extern func_0204dd9c
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
.extern func_ov00_02078b0c
.extern func_ov00_02078b40
.extern func_ov00_02078dac
asm/ov09.s
+5 -5
View File
@@ -20597,7 +20597,7 @@ func_ov09_0211e4b8: ; 0x0211e4b8
str ip, [r3, #0xc]
mov ip, #1
strb ip, [r3, #0x1c]
bl func_0204f8d4
bl __register_global_object
ldr r0, _0211e57c ; =data_02057878
ldr r3, _0211e580 ; =data_ov09_0211f538
ldr r1, _0211e598 ; =data_ov09_0211ea60
@@ -20613,7 +20613,7 @@ func_ov09_0211e4b8: ; 0x0211e4b8
str ip, [r3, #0x2c]
mov ip, #1
strb ip, [r3, #0x3c]
bl func_0204f8d4
bl __register_global_object
ldr r0, _0211e57c ; =data_02057878
ldr r3, _0211e580 ; =data_ov09_0211f538
ldr r1, _0211e5a4 ; =data_ov09_0211ea70
@@ -20628,7 +20628,7 @@ func_ov09_0211e4b8: ; 0x0211e4b8
ldr r1, _0211e590 ; =0x0203005d
ldr r2, _0211e5ac ; =data_ov09_0211f578
strb ip, [r3, #0x5c]
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov09_0211e4b8
@@ -20667,7 +20667,7 @@ func_ov09_0211e5c8: ; 0x0211e5c8
ldr r0, _0211e5e8 ; =data_ov09_0211f5b4
ldr r1, _0211e5ec ; =0x020f3de9
ldr r2, _0211e5f0 ; =data_ov09_0211f5a8
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov09_0211e5c8
@@ -20701,7 +20701,7 @@ func_ov09_0211e620: ; 0x0211e620
ldr r0, _0211e640 ; =data_ov09_0211f5dc
ldr r1, _0211e644 ; =func_ov09_0211cb74
ldr r2, _0211e648 ; =data_ov09_0211f5d0
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov09_0211e620
asm/ov12.inc
+1 -1
View File
@@ -79,6 +79,7 @@
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager18func_ov00_020ad594Ei
.extern _ZNK11ItemManager8GetFairyEi
.extern __register_global_object
.extern data_02050f54
.extern data_02056be4
.extern data_02057200
@@ -303,7 +304,6 @@
.extern func_0203f904
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
.extern func_ov00_020777d0
.extern func_ov00_02077830
.extern func_ov00_0207784c
asm/ov12.s
+17 -17
View File
@@ -44955,7 +44955,7 @@ func_ov12_021354cc: ; 0x021354cc
ldr r0, _02135634 ; =data_ov12_02137c74
ldr r1, _02135640 ; =func_0203e7b4
ldr r2, _02135644 ; =data_ov12_02137c68
bl func_0204f8d4
bl __register_global_object
ldr r3, _02135648 ; =data_ov12_02137c68
mov ip, #0
str ip, [r3, #0x68]
@@ -44964,7 +44964,7 @@ func_ov12_021354cc: ; 0x021354cc
ldr r1, _02135650 ; =func_0202bac0
ldr r2, _02135654 ; =data_ov12_02137c88
str ip, [r3, #0x70]
bl func_0204f8d4
bl __register_global_object
ldr r0, _02135658 ; =data_ov12_02137cdc
mov r3, #0
ldr r1, _02135650 ; =func_0202bac0
@@ -44972,7 +44972,7 @@ func_ov12_021354cc: ; 0x021354cc
str r3, [r0]
str r3, [r0, #4]
str r3, [r0, #8]
bl func_0204f8d4
bl __register_global_object
ldr r0, _02135660 ; =data_ov12_02137ce8
mov r1, #0
str r1, [r0]
@@ -44980,7 +44980,7 @@ func_ov12_021354cc: ; 0x021354cc
str r1, [r0, #8]
ldr r1, _02135650 ; =func_0202bac0
ldr r2, _02135664 ; =data_ov12_02137ca0
bl func_0204f8d4
bl __register_global_object
ldr r0, _02135668 ; =data_ov12_02137cf4
mov r1, #0
str r1, [r0]
@@ -44988,7 +44988,7 @@ func_ov12_021354cc: ; 0x021354cc
str r1, [r0, #8]
ldr r1, _02135650 ; =func_0202bac0
ldr r2, _0213566c ; =data_ov12_02137cac
bl func_0204f8d4
bl __register_global_object
ldr r0, _02135670 ; =data_ov12_02137d00
mov r1, #0
str r1, [r0]
@@ -44996,7 +44996,7 @@ func_ov12_021354cc: ; 0x021354cc
str r1, [r0, #8]
ldr r1, _02135650 ; =func_0202bac0
ldr r2, _02135674 ; =data_ov12_02137cb8
bl func_0204f8d4
bl __register_global_object
ldr r0, _02135678 ; =data_ov12_02137d0c
mov r3, #0
str r3, [r0]
@@ -45004,7 +45004,7 @@ func_ov12_021354cc: ; 0x021354cc
ldr r1, _02135650 ; =func_0202bac0
ldr r2, _0213567c ; =data_ov12_02137cc4
str r3, [r0, #8]
bl func_0204f8d4
bl __register_global_object
ldr r1, _02135680 ; =data_02057200
ldr r0, _02135684 ; =data_ov12_02135a44
ldr r2, [r1]
@@ -45085,7 +45085,7 @@ func_ov12_021356b4: ; 0x021356b4
ldr r0, _021356d4 ; =data_ov12_0213dc30
ldr r1, _021356d8 ; =func_ov12_0211ce4c
ldr r2, _021356dc ; =data_ov12_0213dc24
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov12_021356b4
@@ -45105,7 +45105,7 @@ func_ov12_021356e0: ; 0x021356e0
ldr r0, _0213570c ; =data_ov12_0213dc94
ldr r1, _02135718 ; =func_0203e7b4
ldr r2, _0213571c ; =data_ov12_0213dc88
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov12_021356e0
@@ -45127,7 +45127,7 @@ func_ov12_02135720: ; 0x02135720
ldr r0, _02135790 ; =data_ov12_0213dcbc
ldr r1, _0213579c ; =func_0203e7b4
ldr r2, _021357a0 ; =data_ov12_0213dcb0
bl func_0204f8d4
bl __register_global_object
ldr ip, _021357a4 ; =func_ov12_0212d87c
ldr r0, _021357a8 ; =data_ov12_0213dcdc
ldr r3, _021357ac ; =func_ov12_0212d86c
@@ -45138,13 +45138,13 @@ func_ov12_02135720: ; 0x02135720
ldr r1, _021357b0 ; =func_ov12_0212dcb4
ldr r2, _021357b4 ; =data_ov12_0213dcd0
mov r0, #0
bl func_0204f8d4
bl __register_global_object
ldr r0, _021357b8 ; =data_ov12_0213dd00
bl func_ov12_0212d86c
ldr r0, _021357b8 ; =data_ov12_0213dd00
ldr r1, _021357a4 ; =func_ov12_0212d87c
ldr r2, _021357bc ; =data_ov12_0213dcf4
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov12_02135720
@@ -45173,14 +45173,14 @@ func_ov12_021357c0: ; 0x021357c0
ldr r0, _02135808 ; =data_ov12_0213dd1c
ldr r1, _02135814 ; =func_0203e7b4
ldr r2, _02135818 ; =data_ov12_0213dd10
bl func_0204f8d4
bl __register_global_object
ldr r0, _0213581c ; =data_ov12_0213dd3c
mov r1, #4
bl func_ov00_020bebc0
ldr r0, _0213581c ; =data_ov12_0213dd3c
ldr r1, _02135820 ; =func_ov12_0212f2e8
ldr r2, _02135824 ; =data_ov12_0213dd30
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov12_021357c0
@@ -45204,7 +45204,7 @@ func_ov12_02135828: ; 0x02135828
ldr r0, _02135850 ; =data_ov12_0213dd60
ldr r1, _02135858 ; =func_0203ebc8
ldr r2, _0213585c ; =data_ov12_0213dd54
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov12_02135828
@@ -45225,7 +45225,7 @@ func_ov12_02135860: ; 0x02135860
ldr r0, _0213588c ; =data_ov12_0213dd78
ldr r1, _02135898 ; =func_0203e7b4
ldr r2, _0213589c ; =data_ov12_0213dd6c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov12_02135860
@@ -45247,7 +45247,7 @@ func_ov12_021358a0: ; 0x021358a0
ldr r0, _021358cc ; =data_ov12_0213dd9c
ldr r1, _021358d8 ; =func_0203e7b4
ldr r2, _021358dc ; =data_ov12_0213dd90
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov12_021358a0
asm/ov14/Actor/ActorRupee.inc
+1 -1
View File
@@ -62,7 +62,7 @@
.extern func_0202bc38
.extern func_0203e784
.extern func_0203e7b4
.extern func_0204f8d4
.extern __register_global_object
.extern func_ov00_0207a13c
.extern func_ov00_0207a1c8
.extern func_ov00_02083fb0
asm/ov14/Actor/ActorRupee.s
+1 -1
View File
@@ -744,7 +744,7 @@ func_ov14_0215517c: ; 0x0215517c
ldr r0, _021551bc ; =_ZN10ActorRupee5gTypeE
ldr r1, _021551c8 ; =func_0203e7b4
ldr r2, _021551cc ; =_ZN10ActorRupee9gResourceE
bl func_0204f8d4
bl __register_global_object
ldr r2, _021551d0 ; =0x000003bb
ldr r0, _021551d4 ; =data_ov14_021589b4
add r1, r2, #0xb30
asm/ov14/ov14_0211f640.inc
+12 -12
View File
@@ -12,6 +12,17 @@
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN13PlayerControl13IsNotTouchingEv
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern _ZN14AdventureFlags18func_ov00_02097750Ev
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bbcEv
.extern _ZN14AdventureFlags18func_ov00_02097bccEv
.extern _ZN14AdventureFlags18func_ov00_02098058Ev
.extern _ZN14AdventureFlags18func_ov00_02098064Ei
.extern _ZN14AdventureFlags18func_ov00_02098074Eisiib
.extern _ZN14AdventureFlags18func_ov00_0209809cEv
.extern _ZN14AdventureFlags3GetEj
.extern _ZN5Actor10GetUnk_08cEP8Cylinder
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor10SetUnk_129Eb
@@ -90,6 +101,7 @@
.extern _ZNK11ItemManager18func_ov00_020ad560Ei
.extern _ZNK11ItemManager18func_ov00_020ae350Ev
.extern _ZNK11ItemManager7HasItemEi
.extern __register_global_object
.extern data_02050f54
.extern data_02052f54
.extern data_02056be4
@@ -219,7 +231,6 @@
.extern func_0204366c
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
.extern func_ov00_02078b40
.extern func_ov00_02078fac
.extern func_ov00_02078fc0
@@ -352,17 +363,6 @@
.extern func_ov00_02094824
.extern func_ov00_02094884
.extern func_ov00_020965c0
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern _ZN14AdventureFlags18func_ov00_02097750Ev
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bbcEv
.extern _ZN14AdventureFlags18func_ov00_02097bccEv
.extern _ZN14AdventureFlags18func_ov00_02098058Ev
.extern _ZN14AdventureFlags18func_ov00_02098064Ei
.extern _ZN14AdventureFlags18func_ov00_02098074Eisiib
.extern _ZN14AdventureFlags18func_ov00_0209809cEv
.extern func_ov00_0209a4f4
.extern func_ov00_0209a508
.extern func_ov00_0209cbd4
asm/ov14/ov14_0211f640.s
+69 -69
View File
@@ -3136,7 +3136,7 @@ _02121f08:
str r6, [r3, #0x30]
mov r6, #0
str r6, [r3, #0x3c]
bl func_0204f8d4
bl __register_global_object
ldr r0, _02122aa4 ; =data_ov14_0215ac1c
ldr r1, [r0, #0x20]
orr r1, r1, #1
@@ -34415,14 +34415,14 @@ func_ov14_021541ec: ; 0x021541ec
ldr r0, _02154234 ; =data_ov14_0215abcc
ldr r1, _02154240 ; =func_0203e7b4
ldr r2, _02154244 ; =data_ov14_0215abc0
bl func_0204f8d4
bl __register_global_object
ldr r0, _02154248 ; =data_ov14_0215abec
mov r1, #0
bl func_ov00_020bebc0
ldr r0, _02154248 ; =data_ov14_0215abec
ldr r1, _0215424c ; =func_ov14_021213c8
ldr r2, _02154250 ; =data_ov14_0215abe0
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_021541ec
@@ -34447,7 +34447,7 @@ func_ov14_02154254: ; 0x02154254
ldr r0, _02154280 ; =data_ov14_0215ac08
ldr r1, _0215428c ; =func_0203e7b4
ldr r2, _02154290 ; =data_ov14_0215abfc
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_02154254
@@ -34469,7 +34469,7 @@ func_ov14_02154294: ; 0x02154294
ldr r0, _021542d4 ; =data_ov14_0215ac28
ldr r1, _021542e0 ; =func_0203e7b4
ldr r2, _021542e4 ; =data_ov14_0215ac1c
bl func_0204f8d4
bl __register_global_object
ldr r2, _021542e8 ; =0x00002199
ldr r0, _021542ec ; =data_ov14_02155b9c
ldr r1, _021542f0 ; =0x0000079e
@@ -34499,7 +34499,7 @@ func_ov14_021542f4: ; 0x021542f4
ldr r0, _02154320 ; =data_ov14_0215ac68
ldr r1, _0215432c ; =func_0203e7b4
ldr r2, _02154330 ; =data_ov14_0215ac5c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_021542f4
@@ -34521,7 +34521,7 @@ func_ov14_02154334: ; 0x02154334
ldr r0, _02154360 ; =data_ov14_0215ac88
ldr r1, _0215436c ; =func_0203e7b4
ldr r2, _02154370 ; =data_ov14_0215ac7c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_02154334
@@ -34543,7 +34543,7 @@ func_ov14_02154374: ; 0x02154374
ldr r0, _021543d0 ; =data_ov14_0215aca8
ldr r1, _021543dc ; =func_0203e7b4
ldr r2, _021543e0 ; =data_ov14_0215ac9c
bl func_0204f8d4
bl __register_global_object
ldr r0, _021543e4 ; =data_ov14_0215acc8
mov r1, #3
bl func_ov00_020beba8
@@ -34555,7 +34555,7 @@ func_ov14_02154374: ; 0x02154374
str ip, [r3, #0x2c]
mov ip, #0
str ip, [r3, #0x38]
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_02154374
@@ -34581,7 +34581,7 @@ func_ov14_021543f8: ; 0x021543f8
ldr r0, _02154420 ; =data_ov14_0215acd8
ldr r1, _02154428 ; =func_0203ebc8
ldr r2, _0215442c ; =data_ov14_0215ace0
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_021543f8
@@ -34601,7 +34601,7 @@ func_ov14_02154430: ; 0x02154430
ldr r0, _02154458 ; =data_ov14_0215acec
ldr r1, _02154460 ; =func_0203ebc8
ldr r2, _02154464 ; =data_ov14_0215acf4
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_02154430
@@ -34621,7 +34621,7 @@ func_ov14_02154468: ; 0x02154468
ldr r0, _02154490 ; =data_ov14_0215ad00
ldr r1, _02154498 ; =func_0203ebc8
ldr r2, _0215449c ; =data_ov14_0215ad08
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_02154468
@@ -34641,7 +34641,7 @@ func_ov14_021544a0: ; 0x021544a0
ldr r0, _021544c8 ; =data_ov14_0215ad14
ldr r1, _021544d0 ; =func_0203ebc8
ldr r2, _021544d4 ; =data_ov14_0215ad1c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_021544a0
@@ -34661,7 +34661,7 @@ func_ov14_021544d8: ; 0x021544d8
ldr r0, _02154500 ; =data_ov14_0215ad28
ldr r1, _02154508 ; =func_0203ebc8
ldr r2, _0215450c ; =data_ov14_0215ad30
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_021544d8
@@ -34681,7 +34681,7 @@ func_ov14_02154510: ; 0x02154510
ldr r0, _02154538 ; =data_ov14_0215ad3c
ldr r1, _02154540 ; =func_0203ebc8
ldr r2, _02154544 ; =data_ov14_0215ad44
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_02154510
@@ -34701,7 +34701,7 @@ func_ov14_02154548: ; 0x02154548
ldr r0, _02154570 ; =data_ov14_0215ad50
ldr r1, _02154578 ; =func_0203ebc8
ldr r2, _0215457c ; =data_ov14_0215ad58
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_02154548
@@ -34733,7 +34733,7 @@ func_ov14_02154598: ; 0x02154598
ldr r0, _021545c0 ; =data_ov14_0215ad70
ldr r1, _021545c8 ; =func_0203ebc8
ldr r2, _021545cc ; =data_ov14_0215ad64
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_02154598
@@ -34753,7 +34753,7 @@ func_ov14_021545d0: ; 0x021545d0
ldr r0, _02154604 ; =data_ov14_0215ad84
ldr r1, _0215460c ; =func_0203ebc8
ldr r2, _02154610 ; =data_ov14_0215ad78
bl func_0204f8d4
bl __register_global_object
ldr r1, _02154614 ; =0x0000219a
ldr r0, _02154618 ; =data_ov14_0215674c
str r1, [r0, #0x20]
@@ -34778,7 +34778,7 @@ func_ov14_0215461c: ; 0x0215461c
ldr r0, _02154644 ; =data_ov14_0215ad98
ldr r1, _0215464c ; =func_0203ebc8
ldr r2, _02154650 ; =data_ov14_0215ad8c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_0215461c
@@ -34798,7 +34798,7 @@ func_ov14_02154654: ; 0x02154654
ldr r0, _0215467c ; =data_ov14_0215ada0
ldr r1, _02154684 ; =func_0203ebc8
ldr r2, _02154688 ; =data_ov14_0215ada8
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_02154654
@@ -34818,7 +34818,7 @@ func_ov14_0215468c: ; 0x0215468c
ldr r0, _021546b4 ; =data_ov14_0215adb4
ldr r1, _021546bc ; =func_0203ebc8
ldr r2, _021546c0 ; =data_ov14_0215adbc
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_0215468c
@@ -34838,7 +34838,7 @@ func_ov14_021546c4: ; 0x021546c4
ldr r0, _021546ec ; =data_ov14_0215adc8
ldr r1, _021546f4 ; =func_0203ebc8
ldr r2, _021546f8 ; =data_ov14_0215add0
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_021546c4
@@ -34858,7 +34858,7 @@ func_ov14_021546fc: ; 0x021546fc
ldr r0, _02154724 ; =data_ov14_0215addc
ldr r1, _0215472c ; =func_0203ebc8
ldr r2, _02154730 ; =data_ov14_0215ade4
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_021546fc
@@ -34878,7 +34878,7 @@ func_ov14_02154734: ; 0x02154734
ldr r0, _0215475c ; =data_ov14_0215adf0
ldr r1, _02154764 ; =func_0203ebc8
ldr r2, _02154768 ; =data_ov14_0215adf8
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_02154734
@@ -34898,7 +34898,7 @@ func_ov14_0215476c: ; 0x0215476c
ldr r0, _02154794 ; =data_ov14_0215ae04
ldr r1, _0215479c ; =func_0203ebc8
ldr r2, _021547a0 ; =data_ov14_0215ae0c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_0215476c
@@ -34918,7 +34918,7 @@ func_ov14_021547a4: ; 0x021547a4
ldr r0, _021547cc ; =data_ov14_0215ae18
ldr r1, _021547d4 ; =func_0203ebc8
ldr r2, _021547d8 ; =data_ov14_0215ae20
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_021547a4
@@ -34938,7 +34938,7 @@ func_ov14_021547dc: ; 0x021547dc
ldr r0, _02154804 ; =data_ov14_0215ae2c
ldr r1, _0215480c ; =func_0203ebc8
ldr r2, _02154810 ; =data_ov14_0215ae34
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_021547dc
@@ -34958,7 +34958,7 @@ func_ov14_02154814: ; 0x02154814
ldr r0, _0215483c ; =data_ov14_0215ae40
ldr r1, _02154844 ; =func_0203ebc8
ldr r2, _02154848 ; =data_ov14_0215ae48
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_02154814
@@ -34978,7 +34978,7 @@ func_ov14_0215484c: ; 0x0215484c
ldr r0, _02154874 ; =data_ov14_0215ae54
ldr r1, _0215487c ; =func_0203ebc8
ldr r2, _02154880 ; =data_ov14_0215ae5c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_0215484c
@@ -34998,7 +34998,7 @@ func_ov14_02154884: ; 0x02154884
ldr r0, _021548ac ; =data_ov14_0215ae68
ldr r1, _021548b4 ; =func_0203ebc8
ldr r2, _021548b8 ; =data_ov14_0215ae70
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_02154884
@@ -35018,7 +35018,7 @@ func_ov14_021548bc: ; 0x021548bc
ldr r0, _021548e4 ; =data_ov14_0215ae7c
ldr r1, _021548ec ; =func_0203ebc8
ldr r2, _021548f0 ; =data_ov14_0215ae84
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_021548bc
@@ -35038,7 +35038,7 @@ func_ov14_021548f4: ; 0x021548f4
ldr r0, _0215491c ; =data_ov14_0215ae90
ldr r1, _02154924 ; =func_0203ebc8
ldr r2, _02154928 ; =data_ov14_0215ae98
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_021548f4
@@ -35058,7 +35058,7 @@ func_ov14_0215492c: ; 0x0215492c
ldr r0, _02154954 ; =data_ov14_0215aea4
ldr r1, _0215495c ; =func_0203ebc8
ldr r2, _02154960 ; =data_ov14_0215aeac
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_0215492c
@@ -35078,7 +35078,7 @@ func_ov14_02154964: ; 0x02154964
ldr r0, _0215498c ; =data_ov14_0215aeb8
ldr r1, _02154994 ; =func_0203ebc8
ldr r2, _02154998 ; =data_ov14_0215aec0
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_02154964
@@ -35098,7 +35098,7 @@ func_ov14_0215499c: ; 0x0215499c
ldr r0, _02154a40 ; =data_ov14_0215aecc
ldr r1, _02154a48 ; =func_0203ebc8
ldr r2, _02154a4c ; =data_ov14_0215aed4
bl func_0204f8d4
bl __register_global_object
ldr r3, _02154a50 ; =data_ov14_02157314
mov r1, #0x7b
ldr r0, _02154a54 ; =0x00000a14
@@ -35109,7 +35109,7 @@ func_ov14_0215499c: ; 0x0215499c
ldr r1, _02154a60 ; =func_0202bac0
ldr r2, _02154a64 ; =data_ov14_0215aee0
str ip, [r3, #8]
bl func_0204f8d4
bl __register_global_object
ldr r0, _02154a68 ; =data_ov14_02157320
ldr r2, _02154a6c ; =0x00000571
ldr ip, _02154a70 ; =0x00000c7b
@@ -35119,7 +35119,7 @@ func_ov14_0215499c: ; 0x0215499c
ldr r2, _02154a78 ; =data_ov14_0215aeec
str ip, [r0, #4]
str r3, [r0, #8]
bl func_0204f8d4
bl __register_global_object
ldr r0, _02154a7c ; =data_ov14_0215732c
ldr r2, _02154a80 ; =0xfffffab8
ldr r1, _02154a84 ; =0x000008f6
@@ -35129,7 +35129,7 @@ func_ov14_0215499c: ; 0x0215499c
str r1, [r0, #8]
ldr r1, _02154a60 ; =func_0202bac0
ldr r2, _02154a88 ; =data_ov14_0215aef8
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_0215499c
@@ -35164,7 +35164,7 @@ func_ov14_02154a8c: ; 0x02154a8c
ldr r0, _02154ab4 ; =data_ov14_0215af08
ldr r1, _02154abc ; =func_0203ebc8
ldr r2, _02154ac0 ; =data_ov14_0215af10
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_02154a8c
@@ -35184,7 +35184,7 @@ func_ov14_02154ac4: ; 0x02154ac4
ldr r0, _02154aec ; =data_ov14_0215af1c
ldr r1, _02154af4 ; =func_0203ebc8
ldr r2, _02154af8 ; =data_ov14_0215af24
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_02154ac4
@@ -35204,7 +35204,7 @@ func_ov14_02154afc: ; 0x02154afc
ldr r0, _02154b24 ; =data_ov14_0215af30
ldr r1, _02154b2c ; =func_0203ebc8
ldr r2, _02154b30 ; =data_ov14_0215af38
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_02154afc
@@ -35224,7 +35224,7 @@ func_ov14_02154b34: ; 0x02154b34
ldr r0, _02154b5c ; =data_ov14_0215af44
ldr r1, _02154b64 ; =func_0203ebc8
ldr r2, _02154b68 ; =data_ov14_0215af4c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_02154b34
@@ -35244,7 +35244,7 @@ func_ov14_02154b6c: ; 0x02154b6c
ldr r0, _02154b94 ; =data_ov14_0215af58
ldr r1, _02154b9c ; =func_0203ebc8
ldr r2, _02154ba0 ; =data_ov14_0215af60
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_02154b6c
@@ -35264,7 +35264,7 @@ func_ov14_02154ba4: ; 0x02154ba4
ldr r0, _02154bcc ; =data_ov14_0215af6c
ldr r1, _02154bd4 ; =func_0203ebc8
ldr r2, _02154bd8 ; =data_ov14_0215af74
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_02154ba4
@@ -35284,7 +35284,7 @@ func_ov14_02154bdc: ; 0x02154bdc
ldr r0, _02154c04 ; =data_ov14_0215af80
ldr r1, _02154c0c ; =func_0203ebc8
ldr r2, _02154c10 ; =data_ov14_0215af88
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_02154bdc
@@ -35305,7 +35305,7 @@ func_ov14_02154c14: ; 0x02154c14
ldr r0, _02154cd0 ; =data_ov14_0215afa0
ldr r1, _02154cdc ; =func_0203e7b4
ldr r2, _02154ce0 ; =data_ov14_0215af94
bl func_0204f8d4
bl __register_global_object
ldr r0, _02154ce4 ; =data_ov14_0215afc0
ldr r1, _02154ce8 ; =0x464c4254
ldr r2, _02154cec ; =func_ov14_02134e54
@@ -35314,7 +35314,7 @@ func_ov14_02154c14: ; 0x02154c14
ldr r0, _02154ce4 ; =data_ov14_0215afc0
ldr r1, _02154cdc ; =func_0203e7b4
ldr r2, _02154cf0 ; =data_ov14_0215afb4
bl func_0204f8d4
bl __register_global_object
ldr r0, _02154cf4 ; =data_ov14_0215afe0
ldr r1, _02154cf8 ; =0x464c414c
ldr r2, _02154cfc ; =func_ov14_02134e84
@@ -35323,7 +35323,7 @@ func_ov14_02154c14: ; 0x02154c14
ldr r0, _02154cf4 ; =data_ov14_0215afe0
ldr r1, _02154cdc ; =func_0203e7b4
ldr r2, _02154d00 ; =data_ov14_0215afd4
bl func_0204f8d4
bl __register_global_object
ldr r0, _02154d04 ; =data_ov14_0215b000
ldr r1, _02154d08 ; =0x464c544d
ldr r2, _02154d0c ; =func_ov14_02134eb4
@@ -35332,7 +35332,7 @@ func_ov14_02154c14: ; 0x02154c14
ldr r0, _02154d04 ; =data_ov14_0215b000
ldr r1, _02154cdc ; =func_0203e7b4
ldr r2, _02154d10 ; =data_ov14_0215aff4
bl func_0204f8d4
bl __register_global_object
ldr r0, _02154d14 ; =data_ov14_0215b020
ldr r1, _02154d18 ; =0x4c53544d
ldr r2, _02154d1c ; =func_ov14_02134ee4
@@ -35341,7 +35341,7 @@ func_ov14_02154c14: ; 0x02154c14
ldr r0, _02154d14 ; =data_ov14_0215b020
ldr r1, _02154cdc ; =func_0203e7b4
ldr r2, _02154d20 ; =data_ov14_0215b014
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_02154c14
@@ -35379,7 +35379,7 @@ func_ov14_02154d24: ; 0x02154d24
ldr r0, _02154e98 ; =data_ov14_0215b040
ldr r1, _02154ea4 ; =func_0203e7b4
ldr r2, _02154ea8 ; =data_ov14_0215b034
bl func_0204f8d4
bl __register_global_object
mov r0, #0x800
ldr r3, _02154eac ; =data_ov14_02157d70
rsb r0, r0, #0
@@ -35391,7 +35391,7 @@ func_ov14_02154d24: ; 0x02154d24
ldr r1, _02154eb8 ; =func_0202bac0
ldr r2, _02154ebc ; =data_ov14_0215b054
str ip, [r3, #8]
bl func_0204f8d4
bl __register_global_object
mov r1, #0x800
rsb r1, r1, #0
ldr r0, _02154ec0 ; =data_ov14_02157d7c
@@ -35402,7 +35402,7 @@ func_ov14_02154d24: ; 0x02154d24
str r2, [r0, #8]
ldr r1, _02154eb8 ; =func_0202bac0
ldr r2, _02154ec4 ; =data_ov14_0215b060
bl func_0204f8d4
bl __register_global_object
ldr r0, _02154ec8 ; =data_ov14_02157d88
mov r1, #0x800
str r1, [r0]
@@ -35412,7 +35412,7 @@ func_ov14_02154d24: ; 0x02154d24
str r1, [r0, #4]
ldr r1, _02154eb8 ; =func_0202bac0
ldr r2, _02154ecc ; =data_ov14_0215b06c
bl func_0204f8d4
bl __register_global_object
ldr r0, _02154ed0 ; =data_ov14_02157d94
mov r1, #0x800
str r1, [r0]
@@ -35422,7 +35422,7 @@ func_ov14_02154d24: ; 0x02154d24
str r1, [r0, #4]
ldr r1, _02154eb8 ; =func_0202bac0
ldr r2, _02154ed4 ; =data_ov14_0215b078
bl func_0204f8d4
bl __register_global_object
ldr r0, _02154ed8 ; =data_ov14_02157da0
ldr r2, _02154eb0 ; =0x00000548
mov r1, #0
@@ -35432,7 +35432,7 @@ func_ov14_02154d24: ; 0x02154d24
str r1, [r0, #8]
ldr r1, _02154eb8 ; =func_0202bac0
ldr r2, _02154edc ; =data_ov14_0215b084
bl func_0204f8d4
bl __register_global_object
mov r2, #0
ldr r0, _02154ee0 ; =data_ov14_02157dac
ldr r1, _02154ee4 ; =0xfffffab8
@@ -35441,7 +35441,7 @@ func_ov14_02154d24: ; 0x02154d24
ldr r1, _02154eb8 ; =func_0202bac0
ldr r2, _02154ee8 ; =data_ov14_0215b090
str r3, [r0, #8]
bl func_0204f8d4
bl __register_global_object
ldr r0, _02154eec ; =data_ov14_02157db8
ldr lr, _02154eb0 ; =0x00000548
mov ip, #0
@@ -35451,7 +35451,7 @@ func_ov14_02154d24: ; 0x02154d24
str lr, [r0]
str ip, [r0, #4]
str r3, [r0, #8]
bl func_0204f8d4
bl __register_global_object
ldr r0, _02154ef4 ; =data_ov14_02157dc4
ldr lr, _02154ee4 ; =0xfffffab8
mov ip, #0
@@ -35461,7 +35461,7 @@ func_ov14_02154d24: ; 0x02154d24
str lr, [r0]
str ip, [r0, #4]
str r3, [r0, #8]
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_02154d24
@@ -35503,7 +35503,7 @@ func_ov14_02154efc: ; 0x02154efc
ldr r0, _02154f28 ; =data_ov14_0215b0c0
ldr r1, _02154f34 ; =func_0203e7b4
ldr r2, _02154f38 ; =data_ov14_0215b0b4
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_02154efc
@@ -35525,7 +35525,7 @@ func_ov14_02154f3c: ; 0x02154f3c
ldr r0, _02154f68 ; =data_ov14_0215b0e0
ldr r1, _02154f74 ; =func_0203e7b4
ldr r2, _02154f78 ; =data_ov14_0215b0d4
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_02154f3c
@@ -35547,7 +35547,7 @@ func_ov14_02154f7c: ; 0x02154f7c
ldr r0, _02154fa8 ; =data_ov14_0215b100
ldr r1, _02154fb4 ; =func_0203e7b4
ldr r2, _02154fb8 ; =data_ov14_0215b0f4
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_02154f7c
@@ -35569,7 +35569,7 @@ func_ov14_02154fbc: ; 0x02154fbc
ldr r0, _02154fe8 ; =data_ov14_0215b120
ldr r1, _02154ff4 ; =func_0203e7b4
ldr r2, _02154ff8 ; =data_ov14_0215b114
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_02154fbc
@@ -35591,7 +35591,7 @@ func_ov14_02154ffc: ; 0x02154ffc
ldr r0, _02155028 ; =data_ov14_0215b140
ldr r1, _02155034 ; =func_0203e7b4
ldr r2, _02155038 ; =data_ov14_0215b134
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_02154ffc
@@ -35613,7 +35613,7 @@ func_ov14_0215503c: ; 0x0215503c
ldr r0, _02155068 ; =data_ov14_0215b160
ldr r1, _02155074 ; =func_0203e7b4
ldr r2, _02155078 ; =data_ov14_0215b154
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_0215503c
@@ -35635,7 +35635,7 @@ func_ov14_0215507c: ; 0x0215507c
ldr r0, _021550a8 ; =data_ov14_0215b180
ldr r1, _021550b4 ; =func_0203e7b4
ldr r2, _021550b8 ; =data_ov14_0215b174
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_0215507c
@@ -35657,7 +35657,7 @@ func_ov14_021550bc: ; 0x021550bc
ldr r0, _021550e8 ; =data_ov14_0215b1a0
ldr r1, _021550f4 ; =func_0203e7b4
ldr r2, _021550f8 ; =data_ov14_0215b194
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_021550bc
@@ -35679,7 +35679,7 @@ func_ov14_021550fc: ; 0x021550fc
ldr r0, _02155128 ; =data_ov14_0215b1c0
ldr r1, _02155134 ; =func_0203e7b4
ldr r2, _02155138 ; =data_ov14_0215b1b4
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_021550fc
@@ -35701,7 +35701,7 @@ func_ov14_0215513c: ; 0x0215513c
ldr r0, _02155168 ; =data_ov14_0215b1e0
ldr r1, _02155174 ; =func_0203e7b4
ldr r2, _02155178 ; =data_ov14_0215b1d4
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_0215513c
asm/ov14/ov14_0213b778.inc
+1 -1
View File
@@ -99,6 +99,7 @@
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager9HasPotionEj
.extern _ZTV11FilterActor
.extern __register_global_object
.extern data_02050f54
.extern data_02056be4
.extern data_02057200
@@ -295,7 +296,6 @@
.extern func_0204f558
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
.extern func_ov00_02078b40
.extern func_ov00_02079470
.extern func_ov00_02079680
asm/ov14/ov14_0213b778.s
+25 -25
View File
@@ -32159,7 +32159,7 @@ func_ov14_021551d8: ; 0x021551d8
ldr r0, _02155204 ; =data_ov14_0215b220
ldr r1, _02155210 ; =func_0203e7b4
ldr r2, _02155214 ; =data_ov14_0215b214
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_021551d8
@@ -32180,7 +32180,7 @@ func_ov14_02155218: ; 0x02155218
ldr r0, _02155240 ; =data_ov14_0215b240
ldr r1, _02155248 ; =func_0203ebc8
ldr r2, _0215524c ; =data_ov14_0215b234
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_02155218
@@ -32235,7 +32235,7 @@ func_ov14_021552ac: ; 0x021552ac
ldr r0, _021552d4 ; =data_ov14_0215b258
ldr r1, _021552dc ; =func_0203ebc8
ldr r2, _021552e0 ; =data_ov14_0215b260
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_021552ac
@@ -32255,7 +32255,7 @@ func_ov14_021552e4: ; 0x021552e4
ldr r0, _0215530c ; =data_ov14_0215b26c
ldr r1, _02155314 ; =func_0203ebc8
ldr r2, _02155318 ; =data_ov14_0215b274
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_021552e4
@@ -32276,7 +32276,7 @@ func_ov14_0215531c: ; 0x0215531c
ldr r0, _02155370 ; =data_ov14_0215b28c
ldr r1, _0215537c ; =func_0203e7b4
ldr r2, _02155380 ; =data_ov14_0215b280
bl func_0204f8d4
bl __register_global_object
ldr r0, _02155384 ; =data_ov14_0215b2ac
mov r1, #5
bl func_ov00_020beba8
@@ -32286,7 +32286,7 @@ func_ov14_0215531c: ; 0x0215531c
ldr r1, _02155390 ; =func_ov14_02146c40
ldr r2, _02155394 ; =data_ov14_0215b2a0
str ip, [r3, #0x2c]
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_0215531c
@@ -32338,7 +32338,7 @@ func_ov14_021553e4: ; 0x021553e4
ldr r0, _02155410 ; =data_ov14_0215b2d0
ldr r1, _0215541c ; =func_0203e7b4
ldr r2, _02155420 ; =data_ov14_0215b2c4
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_021553e4
@@ -32359,7 +32359,7 @@ func_ov14_02155424: ; 0x02155424
ldr r0, _0215544c ; =data_ov14_0215b2f0
ldr r1, _02155454 ; =func_0203ebc8
ldr r2, _02155458 ; =data_ov14_0215b2e4
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_02155424
@@ -32380,7 +32380,7 @@ func_ov14_0215545c: ; 0x0215545c
ldr r0, _021554ac ; =data_ov14_0215b304
ldr r1, _021554b8 ; =func_0203e7b4
ldr r2, _021554bc ; =data_ov14_0215b2f8
bl func_0204f8d4
bl __register_global_object
ldr r0, _021554c0 ; =data_ov14_0215b324
ldr r1, _021554c4 ; =0x4e434d32
ldr r2, _021554c8 ; =func_ov14_0214ab60
@@ -32389,7 +32389,7 @@ func_ov14_0215545c: ; 0x0215545c
ldr r0, _021554c0 ; =data_ov14_0215b324
ldr r1, _021554b8 ; =func_0203e7b4
ldr r2, _021554cc ; =data_ov14_0215b318
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_0215545c
@@ -32415,7 +32415,7 @@ func_ov14_021554d0: ; 0x021554d0
ldr r0, _021554fc ; =data_ov14_0215b344
ldr r1, _02155508 ; =func_0203e7b4
ldr r2, _0215550c ; =data_ov14_0215b338
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_021554d0
@@ -32436,7 +32436,7 @@ func_ov14_02155510: ; 0x02155510
ldr r0, _02155538 ; =data_ov14_0215b358
ldr r1, _02155540 ; =func_0203ebc8
ldr r2, _02155544 ; =data_ov14_0215b360
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_02155510
@@ -32457,7 +32457,7 @@ func_ov14_02155548: ; 0x02155548
ldr r0, _02155574 ; =data_ov14_0215b378
ldr r1, _02155580 ; =func_0203e7b4
ldr r2, _02155584 ; =data_ov14_0215b36c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_02155548
@@ -32478,7 +32478,7 @@ func_ov14_02155588: ; 0x02155588
ldr r0, _021555b0 ; =data_ov14_0215b38c
ldr r1, _021555b8 ; =func_0203ebc8
ldr r2, _021555bc ; =data_ov14_0215b394
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_02155588
@@ -32498,7 +32498,7 @@ func_ov14_021555c0: ; 0x021555c0
ldr r0, _021555e8 ; =data_ov14_0215b3a0
ldr r1, _021555f0 ; =func_0203ebc8
ldr r2, _021555f4 ; =data_ov14_0215b3a8
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_021555c0
@@ -32518,7 +32518,7 @@ func_ov14_021555f8: ; 0x021555f8
ldr r0, _02155620 ; =data_ov14_0215b3b4
ldr r1, _02155628 ; =func_0203ebc8
ldr r2, _0215562c ; =data_ov14_0215b3bc
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_021555f8
@@ -32538,7 +32538,7 @@ func_ov14_02155630: ; 0x02155630
ldr r0, _02155658 ; =data_ov14_0215b3c8
ldr r1, _02155660 ; =func_0203ebc8
ldr r2, _02155664 ; =data_ov14_0215b3d0
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_02155630
@@ -32558,7 +32558,7 @@ func_ov14_02155668: ; 0x02155668
ldr r0, _02155690 ; =data_ov14_0215b3dc
ldr r1, _02155698 ; =func_0203ebc8
ldr r2, _0215569c ; =data_ov14_0215b3e4
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_02155668
@@ -32578,7 +32578,7 @@ func_ov14_021556a0: ; 0x021556a0
ldr r0, _021556d4 ; =data_ov14_0215b3f0
ldr r1, _021556dc ; =func_0203ebc8
ldr r2, _021556e0 ; =data_ov14_0215b3f8
bl func_0204f8d4
bl __register_global_object
ldr r1, _021556e4 ; =0x00001e66
ldr r0, _021556e8 ; =data_ov14_0215a3b4
str r1, [r0]
@@ -32604,7 +32604,7 @@ func_ov14_021556ec: ; 0x021556ec
ldr r0, _02155718 ; =data_ov14_0215b410
ldr r1, _02155724 ; =func_0203e7b4
ldr r2, _02155728 ; =data_ov14_0215b404
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_021556ec
@@ -32625,7 +32625,7 @@ func_ov14_0215572c: ; 0x0215572c
ldr r0, _02155754 ; =data_ov14_0215b424
ldr r1, _0215575c ; =func_0203ebc8
ldr r2, _02155760 ; =data_ov14_0215b42c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_0215572c
@@ -32645,7 +32645,7 @@ func_ov14_02155764: ; 0x02155764
ldr r0, _0215578c ; =data_ov14_0215b438
ldr r1, _02155794 ; =func_0203ebc8
ldr r2, _02155798 ; =data_ov14_0215b440
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_02155764
@@ -32666,7 +32666,7 @@ func_ov14_0215579c: ; 0x0215579c
ldr r0, _021557c8 ; =data_ov14_0215b458
ldr r1, _021557d4 ; =func_0203e7b4
ldr r2, _021557d8 ; =data_ov14_0215b44c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_0215579c
@@ -32687,7 +32687,7 @@ func_ov14_021557dc: ; 0x021557dc
ldr r0, _02155804 ; =data_ov14_0215b46c
ldr r1, _0215580c ; =func_0203ebc8
ldr r2, _02155810 ; =data_ov14_0215b474
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_021557dc
@@ -32707,7 +32707,7 @@ func_ov14_02155814: ; 0x02155814
ldr r0, _0215583c ; =data_ov14_0215b480
ldr r1, _02155844 ; =func_0203ebc8
ldr r2, _02155848 ; =data_ov14_0215b488
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_02155814
asm/ov15.inc
+1 -1
View File
@@ -114,6 +114,7 @@
.extern _ZNK11ItemManager19GetFanfareItemScaleEP5Vec3p
.extern _ZNK11ItemManager7HasItemEi
.extern _ZTV11FilterActor
.extern __register_global_object
.extern data_02050f54
.extern data_02051f54
.extern data_02053f54
@@ -388,7 +389,6 @@
.extern func_0204dd9c
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
.extern func_ov00_02078b40
.extern func_ov00_02078fac
.extern func_ov00_02078ffc
asm/ov15.s
+114 -114
View File
@@ -328,7 +328,7 @@ func_ov15_0211f9dc: ; 0x0211f9dc
ldr r1, _0211fc2c ; =func_ov15_0211fc6c
ldr r2, _0211fc30 ; =data_ov15_0218ebe4
str r4, [r3, #0x1c]
bl func_0204f8d4
bl __register_global_object
ldr r0, _0211fc20 ; =data_ov15_0218ebe0
ldr r1, [r0]
orr r1, r1, #1
@@ -349,7 +349,7 @@ _0211fa64:
ldr r1, _0211fc3c ; =func_ov15_0211fc58
ldr r2, _0211fc40 ; =data_ov15_0218ec0c
str r4, [r3, #0x38]
bl func_0204f8d4
bl __register_global_object
ldr r0, _0211fc20 ; =data_ov15_0218ebe0
ldr r1, [r0, #0x28]
orr r1, r1, #1
@@ -676,7 +676,7 @@ _0211fed4:
ldr r1, _021205b0 ; =func_ov15_0211fc6c
ldr r2, _021205b4 ; =data_ov15_0218ec34
str r3, [r0, #0xc]
bl func_0204f8d4
bl __register_global_object
ldr r0, _021205a4 ; =data_ov15_0218ec30
ldr r1, [r0]
orr r1, r1, #1
@@ -25116,7 +25116,7 @@ func_ov15_021348c8: ; 0x021348c8
ldr r1, _02134988 ; =func_ov15_02134994
ldr r2, _0213498c ; =data_ov15_0218ee9c
str ip, [r3, #0x30]
bl func_0204f8d4
bl __register_global_object
ldr r0, _0213497c ; =data_ov15_0218ee78
ldr r1, [r0, #0x20]
orr r1, r1, #1
@@ -54788,7 +54788,7 @@ _0214dae0:
ldr r0, _0214dbf4 ; =data_ov15_0218f65c
ldr r1, _0214dbf8 ; =func_ov15_0214dc08
ldr r2, _0214dbfc ; =data_ov15_0218f650
bl func_0204f8d4
bl __register_global_object
ldr r0, _0214dbf0 ; =data_ov15_0218f62c
ldr r1, [r0, #0x20]
orr r1, r1, #1
@@ -82072,7 +82072,7 @@ _02165574:
ldr r1, _02165a1c ; =func_ov15_02165a34
ldr r2, _02165a20 ; =data_ov15_0218f8c0
str r4, [r3, #0x10]
bl func_0204f8d4
bl __register_global_object
ldr r0, _02165a10 ; =data_ov15_0218f8bc
ldr r1, [r0]
orr r1, r1, #1
@@ -124994,7 +124994,7 @@ func_ov15_02187408: ; 0x02187408
ldr r0, _02187434 ; =data_ov15_0218ec64
ldr r1, _02187440 ; =func_0203e7b4
ldr r2, _02187444 ; =data_ov15_0218ec58
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_02187408
@@ -125016,7 +125016,7 @@ func_ov15_02187448: ; 0x02187448
ldr r0, _02187474 ; =data_ov15_0218ec84
ldr r1, _02187480 ; =func_0203e7b4
ldr r2, _02187484 ; =data_ov15_0218ec78
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_02187448
@@ -125038,7 +125038,7 @@ func_ov15_02187488: ; 0x02187488
ldr r0, _021874b4 ; =data_ov15_0218eca8
ldr r1, _021874c0 ; =func_0203e7b4
ldr r2, _021874c4 ; =data_ov15_0218ec9c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_02187488
@@ -125060,7 +125060,7 @@ func_ov15_021874c8: ; 0x021874c8
ldr r0, _02187528 ; =data_ov15_0218ecc8
ldr r1, _02187534 ; =func_0203e7b4
ldr r2, _02187538 ; =data_ov15_0218ecbc
bl func_0204f8d4
bl __register_global_object
ldr r0, _0218753c ; =0x00000333
mov r1, #0x16000
bl Divide
@@ -125096,7 +125096,7 @@ func_ov15_02187544: ; 0x02187544
ldr r0, _0218756c ; =data_ov15_0218ecdc
ldr r1, _02187574 ; =func_0203ebc8
ldr r2, _02187578 ; =data_ov15_0218ece4
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_02187544
@@ -125116,7 +125116,7 @@ func_ov15_0218757c: ; 0x0218757c
ldr r0, _021875a4 ; =data_ov15_0218ecf0
ldr r1, _021875ac ; =func_0203ebc8
ldr r2, _021875b0 ; =data_ov15_0218ecf8
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_0218757c
@@ -125136,7 +125136,7 @@ func_ov15_021875b4: ; 0x021875b4
ldr r0, _021875dc ; =data_ov15_0218ed04
ldr r1, _021875e4 ; =func_0203ebc8
ldr r2, _021875e8 ; =data_ov15_0218ed0c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_021875b4
@@ -125156,7 +125156,7 @@ func_ov15_021875ec: ; 0x021875ec
ldr r0, _02187614 ; =data_ov15_0218ed18
ldr r1, _0218761c ; =func_0203ebc8
ldr r2, _02187620 ; =data_ov15_0218ed20
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_021875ec
@@ -125176,7 +125176,7 @@ func_ov15_02187624: ; 0x02187624
ldr r0, _0218764c ; =data_ov15_0218ed2c
ldr r1, _02187654 ; =func_0203ebc8
ldr r2, _02187658 ; =data_ov15_0218ed34
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_02187624
@@ -125196,7 +125196,7 @@ func_ov15_0218765c: ; 0x0218765c
ldr r0, _02187684 ; =data_ov15_0218ed40
ldr r1, _0218768c ; =func_0203ebc8
ldr r2, _02187690 ; =data_ov15_0218ed48
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_0218765c
@@ -125216,7 +125216,7 @@ func_ov15_02187694: ; 0x02187694
ldr r0, _021876bc ; =data_ov15_0218ed54
ldr r1, _021876c4 ; =func_0203ebc8
ldr r2, _021876c8 ; =data_ov15_0218ed5c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_02187694
@@ -125236,7 +125236,7 @@ func_ov15_021876cc: ; 0x021876cc
ldr r0, _021876f4 ; =data_ov15_0218ed68
ldr r1, _021876fc ; =func_0203ebc8
ldr r2, _02187700 ; =data_ov15_0218ed70
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_021876cc
@@ -125256,7 +125256,7 @@ func_ov15_02187704: ; 0x02187704
ldr r0, _0218772c ; =data_ov15_0218ed7c
ldr r1, _02187734 ; =func_0203ebc8
ldr r2, _02187738 ; =data_ov15_0218ed84
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_02187704
@@ -125276,7 +125276,7 @@ func_ov15_0218773c: ; 0x0218773c
ldr r0, _02187764 ; =data_ov15_0218ed90
ldr r1, _0218776c ; =func_0203ebc8
ldr r2, _02187770 ; =data_ov15_0218ed98
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_0218773c
@@ -125296,7 +125296,7 @@ func_ov15_02187774: ; 0x02187774
ldr r0, _0218779c ; =data_ov15_0218eda4
ldr r1, _021877a4 ; =func_0203ebc8
ldr r2, _021877a8 ; =data_ov15_0218edac
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_02187774
@@ -125316,7 +125316,7 @@ func_ov15_021877ac: ; 0x021877ac
ldr r0, _021877d4 ; =data_ov15_0218edb8
ldr r1, _021877dc ; =func_0203ebc8
ldr r2, _021877e0 ; =data_ov15_0218edc0
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_021877ac
@@ -125336,7 +125336,7 @@ func_ov15_021877e4: ; 0x021877e4
ldr r0, _0218780c ; =data_ov15_0218edcc
ldr r1, _02187814 ; =func_0203ebc8
ldr r2, _02187818 ; =data_ov15_0218edd4
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_021877e4
@@ -125357,7 +125357,7 @@ func_ov15_0218781c: ; 0x0218781c
ldr r1, _02187874 ; =func_0202bac0
ldr r2, _02187878 ; =data_ov15_0218ee0c
str ip, [r3, #8]
bl func_0204f8d4
bl __register_global_object
ldr r0, _0218787c ; =data_ov15_0218a440
mov r3, #0
mov ip, #0x8000
@@ -125366,7 +125366,7 @@ func_ov15_0218781c: ; 0x0218781c
str ip, [r0]
str r3, [r0, #4]
str r3, [r0, #8]
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_0218781c
@@ -125389,7 +125389,7 @@ func_ov15_02187884: ; 0x02187884
ldr r0, _021878d4 ; =data_ov15_0218ee24
ldr r1, _021878e0 ; =func_0203e7b4
ldr r2, _021878e4 ; =data_ov15_0218ee18
bl func_0204f8d4
bl __register_global_object
ldr r2, _021878e8 ; =0x0000f660
ldr r0, _021878ec ; =data_ov15_0218a464
mov r1, #0x400
@@ -125424,7 +125424,7 @@ func_ov15_021878f8: ; 0x021878f8
ldr r0, _02187924 ; =data_ov15_0218ee44
ldr r1, _02187934 ; =func_0203e7b4
ldr r2, _02187938 ; =data_ov15_0218ee38
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_021878f8
@@ -125447,7 +125447,7 @@ func_ov15_0218793c: ; 0x0218793c
ldr r0, _02187974 ; =data_ov15_0218ee64
ldr r1, _02187980 ; =func_0203e7b4
ldr r2, _02187984 ; =data_ov15_0218ee58
bl func_0204f8d4
bl __register_global_object
ldr r0, _02187988 ; =data_ov15_0218a6e0
mov r1, #0x2000
str r1, [r0, #0x10]
@@ -125473,7 +125473,7 @@ func_ov15_0218798c: ; 0x0218798c
ldr r0, _021879b8 ; =data_ov15_0218ee84
ldr r1, _021879c4 ; =func_0203e7b4
ldr r2, _021879c8 ; =data_ov15_0218ee78
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_0218798c
@@ -125513,7 +125513,7 @@ func_ov15_021879e0: ; 0x021879e0
ldr r0, _02187a2c ; =data_ov15_0218eec0
ldr r1, _02187a30 ; =0x020b1551
ldr r2, _02187a34 ; =data_ov15_0218eeb4
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_021879e0
@@ -125534,7 +125534,7 @@ func_ov15_02187a38: ; 0x02187a38
ldr r0, _02187a64 ; =data_ov15_0218eee8
ldr r1, _02187a70 ; =func_0203e7b4
ldr r2, _02187a74 ; =data_ov15_0218eedc
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_02187a38
@@ -125556,7 +125556,7 @@ func_ov15_02187a78: ; 0x02187a78
ldr r0, _02187aa4 ; =data_ov15_0218ef08
ldr r1, _02187ab0 ; =func_0203e7b4
ldr r2, _02187ab4 ; =data_ov15_0218eefc
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_02187a78
@@ -125579,7 +125579,7 @@ func_ov15_02187ab8: ; 0x02187ab8
ldr r0, _02187b18 ; =data_ov15_0218ef2c
ldr r1, _02187b24 ; =func_0203e7b4
ldr r2, _02187b28 ; =data_ov15_0218ef20
bl func_0204f8d4
bl __register_global_object
ldr r3, _02187b2c ; =data_ov15_0218ae88
mov r0, #0
str r0, [r3, #0x10]
@@ -125590,7 +125590,7 @@ func_ov15_02187ab8: ; 0x02187ab8
ldr r1, _02187b38 ; =func_ov15_0212346c
ldr r2, _02187b3c ; =data_ov15_0218ef40
str ip, [r3, #0x1c]
bl func_0204f8d4
bl __register_global_object
add sp, sp, #0xc
ldmia sp!, {pc}
.align 2, 0
@@ -125618,7 +125618,7 @@ func_ov15_02187b40: ; 0x02187b40
ldr r0, _02187b6c ; =data_ov15_0218ef58
ldr r1, _02187b78 ; =func_0203e7b4
ldr r2, _02187b7c ; =data_ov15_0218ef4c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_02187b40
@@ -125653,7 +125653,7 @@ func_ov15_02187b80: ; 0x02187b80
ldr r1, _02187bec ; =func_ov15_02123470
ldr r2, _02187bf0 ; =data_ov15_0218ef6c
strb ip, [r3, #0x69]
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_02187b80
@@ -125675,7 +125675,7 @@ func_ov15_02187bf4: ; 0x02187bf4
ldr r0, _02187c20 ; =data_ov15_0218efe8
ldr r1, _02187c2c ; =func_0203e7b4
ldr r2, _02187c30 ; =data_ov15_0218efdc
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_02187bf4
@@ -125697,7 +125697,7 @@ func_ov15_02187c34: ; 0x02187c34
ldr r0, _02187c60 ; =data_ov15_0218f40c
ldr r1, _02187c70 ; =func_0203e7b4
ldr r2, _02187c74 ; =data_ov15_0218f400
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_02187c34
@@ -125720,7 +125720,7 @@ func_ov15_02187c78: ; 0x02187c78
ldr r0, _02187cec ; =data_ov15_0218f4fc
ldr r1, _02187cf8 ; =func_0203e7b4
ldr r2, _02187cfc ; =data_ov15_0218f4f0
bl func_0204f8d4
bl __register_global_object
ldr ip, _02187d00 ; =0x00000666
ldr r3, _02187d04 ; =data_ov15_0218b3e0
ldr r0, _02187d08 ; =data_ov15_0218b3e0
@@ -125729,7 +125729,7 @@ func_ov15_02187c78: ; 0x02187c78
ldr r1, _02187d0c ; =func_0202bac0
ldr r2, _02187d10 ; =data_ov15_0218f510
str ip, [r3, #8]
bl func_0204f8d4
bl __register_global_object
ldr ip, _02187d14 ; =0x00000333
ldr r3, _02187d04 ; =data_ov15_0218b3e0
ldr r0, _02187d18 ; =data_ov15_0218b3ec
@@ -125738,7 +125738,7 @@ func_ov15_02187c78: ; 0x02187c78
ldr r1, _02187d0c ; =func_0202bac0
ldr r2, _02187d1c ; =data_ov15_0218f51c
str ip, [r3, #0x14]
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_02187c78
@@ -125767,7 +125767,7 @@ func_ov15_02187d20: ; 0x02187d20
ldr r0, _02187d48 ; =data_ov15_0218f528
ldr r1, _02187d50 ; =func_0203ebc8
ldr r2, _02187d54 ; =data_ov15_0218f530
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_02187d20
@@ -125788,7 +125788,7 @@ func_ov15_02187d58: ; 0x02187d58
ldr r0, _02187d84 ; =data_ov15_0218f548
ldr r1, _02187d90 ; =func_0203e7b4
ldr r2, _02187d94 ; =data_ov15_0218f53c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_02187d58
@@ -125815,7 +125815,7 @@ func_ov15_02187d98: ; 0x02187d98
ldr r1, _02187ea0 ; =func_0203010c
ldr r2, _02187ea4 ; =data_ov15_0218f560
str ip, [r3, #0x10]
bl func_0204f8d4
bl __register_global_object
ldr r0, _02187e8c ; =data_02057878
ldr r3, _02187e90 ; =data_ov15_0218f55c
ldr r1, _02187ea8 ; =data_ov15_0218b90c
@@ -125829,7 +125829,7 @@ func_ov15_02187d98: ; 0x02187d98
ldr r1, _02187ea0 ; =func_0203010c
ldr r2, _02187eb0 ; =data_ov15_0218f57c
str ip, [r3, #0x2c]
bl func_0204f8d4
bl __register_global_object
ldr r0, _02187e8c ; =data_02057878
ldr r3, _02187e90 ; =data_ov15_0218f55c
ldr r1, _02187eb4 ; =data_ov15_0218b91c
@@ -125844,7 +125844,7 @@ func_ov15_02187d98: ; 0x02187d98
ldr r1, _02187ec0 ; =func_0203005c
ldr r2, _02187ec4 ; =data_ov15_0218f598
strb ip, [r3, #0x58]
bl func_0204f8d4
bl __register_global_object
ldr r0, _02187e8c ; =data_02057878
ldr r3, _02187e90 ; =data_ov15_0218f55c
ldr r1, _02187ec8 ; =data_ov15_0218b92c
@@ -125860,7 +125860,7 @@ func_ov15_02187d98: ; 0x02187d98
str ip, [r3, #0x68]
mov ip, #1
strb ip, [r3, #0x78]
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_02187d98
@@ -125894,7 +125894,7 @@ func_ov15_02187ed4: ; 0x02187ed4
ldr r0, _02187efc ; =data_ov15_0218f5d8
ldr r1, _02187f04 ; =func_0203ebc8
ldr r2, _02187f08 ; =data_ov15_0218f5e0
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_02187ed4
@@ -125936,7 +125936,7 @@ func_ov15_02187f48: ; 0x02187f48
ldr r0, _02187f74 ; =data_ov15_0218f5f8
ldr r1, _02187f80 ; =func_0203e7b4
ldr r2, _02187f84 ; =data_ov15_0218f5ec
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_02187f48
@@ -125958,7 +125958,7 @@ func_ov15_02187f88: ; 0x02187f88
ldr r0, _02187fb4 ; =data_ov15_0218f618
ldr r1, _02187fc0 ; =func_0203e7b4
ldr r2, _02187fc4 ; =data_ov15_0218f60c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_02187f88
@@ -125980,7 +125980,7 @@ func_ov15_02187fc8: ; 0x02187fc8
ldr r0, _02187ff4 ; =data_ov15_0218f638
ldr r1, _02188000 ; =func_0203e7b4
ldr r2, _02188004 ; =data_ov15_0218f62c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_02187fc8
@@ -126039,7 +126039,7 @@ func_ov15_02188084: ; 0x02188084
ldr r0, _021880b0 ; =data_ov15_0218f674
ldr r1, _021880bc ; =func_0203e7b4
ldr r2, _021880c0 ; =data_ov15_0218f668
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_02188084
@@ -126061,7 +126061,7 @@ func_ov15_021880c4: ; 0x021880c4
ldr r0, _021880f0 ; =data_ov15_0218f694
ldr r1, _02188100 ; =func_0203e7b4
ldr r2, _02188104 ; =data_ov15_0218f688
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_021880c4
@@ -126084,7 +126084,7 @@ func_ov15_02188108: ; 0x02188108
ldr r0, _02188134 ; =data_ov15_0218f6b4
ldr r1, _02188140 ; =func_0203e7b4
ldr r2, _02188144 ; =data_ov15_0218f6a8
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_02188108
@@ -126106,7 +126106,7 @@ func_ov15_02188148: ; 0x02188148
ldr r0, _021881b0 ; =data_ov15_0218f6e0
ldr r1, _021881bc ; =func_0203e7b4
ldr r2, _021881c0 ; =data_ov15_0218f6d4
bl func_0204f8d4
bl __register_global_object
ldr r0, _021881c4 ; =data_027e0d0c
ldr r3, _021881c8 ; =data_ov15_0218c0e4
ldr r2, [r0]
@@ -126121,7 +126121,7 @@ func_ov15_02188148: ; 0x02188148
ldr r1, _021881d0 ; =func_ov15_021262d4
ldr r2, _021881d4 ; =data_ov15_0218f6f4
str ip, [r3, #0x20]
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_02188148
@@ -126148,7 +126148,7 @@ func_ov15_021881d8: ; 0x021881d8
ldr r0, _02188244 ; =data_ov15_0218f70c
ldr r1, _02188250 ; =func_0203e7b4
ldr r2, _02188254 ; =data_ov15_0218f700
bl func_0204f8d4
bl __register_global_object
ldr r0, _02188258 ; =data_027e0d0c
ldr r3, _0218825c ; =data_ov15_0218c1d8
ldr r2, [r0]
@@ -126164,7 +126164,7 @@ func_ov15_021881d8: ; 0x021881d8
ldr r1, _02188268 ; =func_ov15_021262d4
ldr r2, _0218826c ; =data_ov15_0218f720
str ip, [r3, #0x20]
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_021881d8
@@ -126192,7 +126192,7 @@ func_ov15_02188270: ; 0x02188270
ldr r0, _0218829c ; =data_ov15_0218f738
ldr r1, _021882a8 ; =func_0203e7b4
ldr r2, _021882ac ; =data_ov15_0218f72c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_02188270
@@ -126214,7 +126214,7 @@ func_ov15_021882b0: ; 0x021882b0
ldr r0, _021882ec ; =data_ov15_0218f758
ldr r1, _021882f8 ; =func_0203e7b4
ldr r2, _021882fc ; =data_ov15_0218f74c
bl func_0204f8d4
bl __register_global_object
ldr r0, _02188300 ; =data_ov15_0218c384
mov r1, #4
str r1, [r0, #0x10]
@@ -126241,7 +126241,7 @@ func_ov15_02188304: ; 0x02188304
ldr r0, _02188344 ; =data_ov15_0218f778
ldr r1, _02188350 ; =func_0203e7b4
ldr r2, _02188354 ; =data_ov15_0218f76c
bl func_0204f8d4
bl __register_global_object
mov r2, #0x44
ldr r0, _02188358 ; =data_ov15_0218c478
rsb r1, r2, #0x880
@@ -126269,7 +126269,7 @@ func_ov15_0218835c: ; 0x0218835c
ldr r0, _02188388 ; =data_ov15_0218f798
ldr r1, _02188394 ; =func_0203e7b4
ldr r2, _02188398 ; =data_ov15_0218f78c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_0218835c
@@ -126290,7 +126290,7 @@ func_ov15_0218839c: ; 0x0218839c
ldr r0, _021883c4 ; =data_ov15_0218f7ac
ldr r1, _021883cc ; =func_0203ebc8
ldr r2, _021883d0 ; =data_ov15_0218f7b4
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_0218839c
@@ -126310,7 +126310,7 @@ func_ov15_021883d4: ; 0x021883d4
ldr r0, _021883fc ; =data_ov15_0218f7c0
ldr r1, _02188404 ; =func_0203ebc8
ldr r2, _02188408 ; =data_ov15_0218f7c8
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_021883d4
@@ -126330,7 +126330,7 @@ func_ov15_0218840c: ; 0x0218840c
ldr r0, _02188434 ; =data_ov15_0218f7d4
ldr r1, _0218843c ; =func_0203ebc8
ldr r2, _02188440 ; =data_ov15_0218f7dc
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_0218840c
@@ -126350,7 +126350,7 @@ func_ov15_02188444: ; 0x02188444
ldr r0, _0218846c ; =data_ov15_0218f7e8
ldr r1, _02188474 ; =func_0203ebc8
ldr r2, _02188478 ; =data_ov15_0218f7f0
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_02188444
@@ -126371,7 +126371,7 @@ func_ov15_0218847c: ; 0x0218847c
ldr r0, _021884d0 ; =data_ov15_0218f808
ldr r1, _021884dc ; =func_0203e7b4
ldr r2, _021884e0 ; =data_ov15_0218f7fc
bl func_0204f8d4
bl __register_global_object
mov r1, #8
mov ip, #0
ldr lr, _021884e4 ; =0x00001f4d
@@ -126407,7 +126407,7 @@ func_ov15_021884f4: ; 0x021884f4
ldr r0, _02188520 ; =data_ov15_0218f868
ldr r1, _0218852c ; =func_0203e7b4
ldr r2, _02188530 ; =data_ov15_0218f85c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_021884f4
@@ -126429,7 +126429,7 @@ func_ov15_02188534: ; 0x02188534
ldr r0, _02188560 ; =data_ov15_0218f888
ldr r1, _0218856c ; =func_0203e7b4
ldr r2, _02188570 ; =data_ov15_0218f87c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_02188534
@@ -126451,7 +126451,7 @@ func_ov15_02188574: ; 0x02188574
ldr r0, _021885a0 ; =data_ov15_0218f8a8
ldr r1, _021885b0 ; =func_0203e7b4
ldr r2, _021885b4 ; =data_ov15_0218f89c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_02188574
@@ -126474,7 +126474,7 @@ func_ov15_021885b8: ; 0x021885b8
ldr r0, _021885e4 ; =data_ov15_0218f8dc
ldr r1, _021885f0 ; =func_0203e7b4
ldr r2, _021885f4 ; =data_ov15_0218f8d0
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_021885b8
@@ -126495,7 +126495,7 @@ func_ov15_021885f8: ; 0x021885f8
ldr r0, _02188620 ; =data_ov15_0218f8f0
ldr r1, _02188628 ; =func_0203ebc8
ldr r2, _0218862c ; =data_ov15_0218f8f8
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_021885f8
@@ -126515,7 +126515,7 @@ func_ov15_02188630: ; 0x02188630
ldr r0, _02188658 ; =data_ov15_0218f904
ldr r1, _02188660 ; =func_0203ebc8
ldr r2, _02188664 ; =data_ov15_0218f90c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_02188630
@@ -126536,7 +126536,7 @@ func_ov15_02188668: ; 0x02188668
ldr r0, _02188694 ; =data_ov15_0218f924
ldr r1, _021886a0 ; =func_0203e7b4
ldr r2, _021886a4 ; =data_ov15_0218f918
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_02188668
@@ -126558,7 +126558,7 @@ func_ov15_021886a8: ; 0x021886a8
ldr r0, _021886f8 ; =data_ov15_0218f944
ldr r1, _02188704 ; =func_0203e7b4
ldr r2, _02188708 ; =data_ov15_0218f938
bl func_0204f8d4
bl __register_global_object
mov r0, #0x8000
mov r1, #0xf
bl func_01ff9b4c
@@ -126592,7 +126592,7 @@ func_ov15_02188718: ; 0x02188718
ldr r0, _02188744 ; =data_ov15_0218f964
ldr r1, _02188750 ; =func_0203e7b4
ldr r2, _02188754 ; =data_ov15_0218f958
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_02188718
@@ -126614,7 +126614,7 @@ func_ov15_02188758: ; 0x02188758
ldr r0, _021887a8 ; =data_ov15_0218f984
ldr r1, _021887b4 ; =func_0203e7b4
ldr r2, _021887b8 ; =data_ov15_0218f978
bl func_0204f8d4
bl __register_global_object
ldr r0, _021887bc ; =data_ov15_0218f9a4
ldr r1, _021887c0 ; =0x534d544c
ldr r2, _021887c4 ; =func_ov15_0216ac18
@@ -126623,7 +126623,7 @@ func_ov15_02188758: ; 0x02188758
ldr r0, _021887bc ; =data_ov15_0218f9a4
ldr r1, _021887b4 ; =func_0203e7b4
ldr r2, _021887c8 ; =data_ov15_0218f998
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_02188758
@@ -126649,14 +126649,14 @@ func_ov15_021887cc: ; 0x021887cc
ldr r0, _02188840 ; =data_ov15_0218f9c4
ldr r1, _0218884c ; =func_0203e7b4
ldr r2, _02188850 ; =data_ov15_0218f9b8
bl func_0204f8d4
bl __register_global_object
ldr r0, _02188854 ; =data_ov15_0218f9e4
mov r1, #0
blx func_ov00_020a9588
ldr r0, _02188854 ; =data_ov15_0218f9e4
ldr r1, _02188858 ; =func_ov00_020a95a4
ldr r2, _0218885c ; =data_ov15_0218f9d8
bl func_0204f8d4
bl __register_global_object
ldr r0, _02188860 ; =data_ov15_0218fa4c
ldr r1, _02188864 ; =data_ov15_0218fa70
mov r2, #0
@@ -126667,7 +126667,7 @@ func_ov15_021887cc: ; 0x021887cc
str r2, [r1, #0x94]
ldr r1, _02188870 ; =func_ov00_020a9b6c
ldr r2, _02188874 ; =data_ov15_0218fa40
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_021887cc
@@ -126698,7 +126698,7 @@ func_ov15_02188878: ; 0x02188878
ldr r0, _021888a4 ; =data_ov15_0218fadc
ldr r1, _021888b0 ; =func_0203e7b4
ldr r2, _021888b4 ; =data_ov15_0218fad0
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_02188878
@@ -126720,7 +126720,7 @@ func_ov15_021888b8: ; 0x021888b8
ldr r0, _021888e4 ; =data_ov15_0218fafc
ldr r1, _021888f0 ; =func_0203e7b4
ldr r2, _021888f4 ; =data_ov15_0218faf0
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_021888b8
@@ -126742,7 +126742,7 @@ func_ov15_021888f8: ; 0x021888f8
ldr r0, _02188924 ; =data_ov15_0218fb1c
ldr r1, _02188930 ; =func_0203e7b4
ldr r2, _02188934 ; =data_ov15_0218fb10
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_021888f8
@@ -126764,7 +126764,7 @@ func_ov15_02188938: ; 0x02188938
ldr r0, _02188964 ; =data_ov15_0218fb3c
ldr r1, _02188970 ; =func_0203e7b4
ldr r2, _02188974 ; =data_ov15_0218fb30
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_02188938
@@ -126786,7 +126786,7 @@ func_ov15_02188978: ; 0x02188978
ldr r0, _02188a18 ; =data_ov15_0218fb5c
ldr r1, _02188a24 ; =func_0203e7b4
ldr r2, _02188a28 ; =data_ov15_0218fb50
bl func_0204f8d4
bl __register_global_object
ldr r3, _02188a2c ; =data_ov15_0218dc64
mov ip, #0x1000
str ip, [r3, #0x30]
@@ -126795,7 +126795,7 @@ func_ov15_02188978: ; 0x02188978
ldr r1, _02188a34 ; =func_0202bac0
ldr r2, _02188a38 ; =data_ov15_0218fb70
str ip, [r3, #0x38]
bl func_0204f8d4
bl __register_global_object
mov r2, #0x100
ldr r0, _02188a2c ; =data_ov15_0218dc64
mov r1, #0x400
@@ -126815,7 +126815,7 @@ func_ov15_02188978: ; 0x02188978
mov r0, #0
ldr r1, _02188a4c ; =func_ov15_021749a8
ldr r2, _02188a50 ; =data_ov15_0218fb7c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_02188978
@@ -126847,7 +126847,7 @@ func_ov15_02188a54: ; 0x02188a54
ldr r0, _02188b10 ; =data_ov15_021902a0
ldr r1, _02188b20 ; =func_0203e7b4
ldr r2, _02188b24 ; =data_ov15_02190294
bl func_0204f8d4
bl __register_global_object
ldr r0, _02188b28 ; =0x00000ccd
mov r1, #0xf000
bl Divide
@@ -126861,7 +126861,7 @@ func_ov15_02188a54: ; 0x02188a54
str ip, [r3, #0x18]
mov ip, #0x3800
str ip, [r3, #0x1c]
bl func_0204f8d4
bl __register_global_object
ldr r2, _02188b3c ; =0x0000199a
ldr r1, _02188b2c ; =data_ov15_0218ddc4
mov r0, #0
@@ -126872,7 +126872,7 @@ func_ov15_02188a54: ; 0x02188a54
str r2, [r1, #0x28]
ldr r1, _02188b34 ; =func_0202bac0
ldr r2, _02188b48 ; =data_ov15_021902c0
bl func_0204f8d4
bl __register_global_object
ldr r2, _02188b4c ; =0xffffe666
ldr r1, _02188b2c ; =data_ov15_0218ddc4
mov r0, #0
@@ -126883,7 +126883,7 @@ func_ov15_02188a54: ; 0x02188a54
str r2, [r1, #0x34]
ldr r1, _02188b34 ; =func_0202bac0
ldr r2, _02188b54 ; =data_ov15_021902cc
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_02188a54
@@ -126918,7 +126918,7 @@ func_ov15_02188b58: ; 0x02188b58
ldr r0, _02188dec ; =data_ov15_021902e4
ldr r1, _02188df8 ; =func_0203e7b4
ldr r2, _02188dfc ; =data_ov15_021902d8
bl func_0204f8d4
bl __register_global_object
ldr lr, _02188e00 ; =0x00001ccd
ldr r3, _02188e04 ; =data_ov15_0218df6c
sub ip, lr, #0x2c00
@@ -126929,7 +126929,7 @@ func_ov15_02188b58: ; 0x02188b58
str ip, [r3, #0x14]
sub ip, lr, #0x4800
str ip, [r3, #0x18]
bl func_0204f8d4
bl __register_global_object
ldr r2, _02188e00 ; =0x00001ccd
ldr r0, _02188e14 ; =data_ov15_0218df88
rsb ip, r2, #0x2c00
@@ -126939,7 +126939,7 @@ func_ov15_02188b58: ; 0x02188b58
ldr r2, _02188e18 ; =data_ov15_02190304
str ip, [r0, #4]
str r3, [r0, #8]
bl func_0204f8d4
bl __register_global_object
mov r1, #0
ldr r0, _02188e1c ; =data_ov15_0218df94
ldr r2, _02188e20 ; =0x00002e66
@@ -126949,7 +126949,7 @@ func_ov15_02188b58: ; 0x02188b58
str r1, [r0, #8]
ldr r1, _02188e0c ; =func_0202bac0
ldr r2, _02188e24 ; =data_ov15_02190310
bl func_0204f8d4
bl __register_global_object
ldr r0, _02188e28 ; =data_ov15_0218dfa0
ldr r2, _02188e00 ; =0x00001ccd
mov r1, #0
@@ -126959,7 +126959,7 @@ func_ov15_02188b58: ; 0x02188b58
ldr r1, _02188e0c ; =func_0202bac0
str r2, [r0, #8]
ldr r2, _02188e30 ; =data_ov15_0219031c
bl func_0204f8d4
bl __register_global_object
ldr r0, _02188e34 ; =data_ov15_0218dfac
ldr r2, _02188e38 ; =0x0000199a
mov r1, #0x1400
@@ -126969,7 +126969,7 @@ func_ov15_02188b58: ; 0x02188b58
str r1, [r0, #8]
ldr r1, _02188e0c ; =func_0202bac0
ldr r2, _02188e3c ; =data_ov15_02190328
bl func_0204f8d4
bl __register_global_object
ldr r0, _02188e40 ; =data_ov15_0218dfb8
ldr r2, _02188e44 ; =0x00000ccd
str r2, [r0]
@@ -126979,7 +126979,7 @@ func_ov15_02188b58: ; 0x02188b58
sub r3, r2, #0x800
ldr r2, _02188e48 ; =data_ov15_02190334
str r3, [r0, #8]
bl func_0204f8d4
bl __register_global_object
ldr r0, _02188e4c ; =data_ov15_0218dfc4
ldr ip, _02188e50 ; =0x00001b33
ldr r3, _02188e54 ; =0xffffe266
@@ -126989,7 +126989,7 @@ func_ov15_02188b58: ; 0x02188b58
str lr, [r0]
str ip, [r0, #4]
str r3, [r0, #8]
bl func_0204f8d4
bl __register_global_object
mov lr, #0x2000
ldr r0, _02188e5c ; =data_ov15_0218dfd0
ldr ip, _02188e50 ; =0x00001b33
@@ -126999,7 +126999,7 @@ func_ov15_02188b58: ; 0x02188b58
str lr, [r0]
str ip, [r0, #4]
str r3, [r0, #8]
bl func_0204f8d4
bl __register_global_object
mov r2, #0x1400
ldr r0, _02188e64 ; =data_ov15_0218dfdc
ldr r1, _02188e38 ; =0x0000199a
@@ -127010,7 +127010,7 @@ func_ov15_02188b58: ; 0x02188b58
str r2, [r0, #4]
ldr r2, _02188e68 ; =data_ov15_02190358
str r3, [r0, #8]
bl func_0204f8d4
bl __register_global_object
ldr r2, _02188e44 ; =0x00000ccd
ldr r0, _02188e6c ; =data_ov15_0218dfe8
ldr r1, _02188e70 ; =0xffffe666
@@ -127020,7 +127020,7 @@ func_ov15_02188b58: ; 0x02188b58
str r1, [r0, #8]
ldr r1, _02188e0c ; =func_0202bac0
ldr r2, _02188e74 ; =data_ov15_02190364
bl func_0204f8d4
bl __register_global_object
ldr r0, _02188e78 ; =data_ov15_0218dff4
mov r1, #0x1800
str r1, [r0]
@@ -127030,7 +127030,7 @@ func_ov15_02188b58: ; 0x02188b58
str r1, [r0, #8]
ldr r1, _02188e0c ; =func_0202bac0
ldr r2, _02188e80 ; =data_ov15_02190370
bl func_0204f8d4
bl __register_global_object
ldr r0, _02188e84 ; =data_ov15_0218e000
ldr r2, _02188e88 ; =0x00001e66
ldr r1, _02188e7c ; =0xffffe4cd
@@ -127041,7 +127041,7 @@ func_ov15_02188b58: ; 0x02188b58
str r1, [r0, #8]
ldr r1, _02188e0c ; =func_0202bac0
ldr r2, _02188e8c ; =data_ov15_0219037c
bl func_0204f8d4
bl __register_global_object
ldr r0, _02188e90 ; =0x00001f5c
ldr r3, _02188e04 ; =data_ov15_0218df6c
ldr ip, _02188e94 ; =0x00000a66
@@ -127052,7 +127052,7 @@ func_ov15_02188b58: ; 0x02188b58
str ip, [r3, #0xa4]
mov ip, #0x1800
str ip, [r3, #0xa8]
bl func_0204f8d4
bl __register_global_object
ldr r0, _02188ea0 ; =data_ov15_0218e018
ldr lr, _02188ea4 ; =0x000013d7
ldr ip, _02188e44 ; =0x00000ccd
@@ -127062,7 +127062,7 @@ func_ov15_02188b58: ; 0x02188b58
str lr, [r0]
str ip, [r0, #4]
str r3, [r0, #8]
bl func_0204f8d4
bl __register_global_object
ldr r0, _02188eb0 ; =data_ov15_0218e024
ldr ip, _02188eb4 ; =0x00000b33
ldr r3, _02188eb8 ; =0xffffeccd
@@ -127072,7 +127072,7 @@ func_ov15_02188b58: ; 0x02188b58
str lr, [r0]
str ip, [r0, #4]
str r3, [r0, #8]
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_02188b58
@@ -127142,7 +127142,7 @@ func_ov15_02188ec0: ; 0x02188ec0
ldr r0, _02188eec ; =data_ov15_021903b8
ldr r1, _02188ef8 ; =func_0203e7b4
ldr r2, _02188efc ; =data_ov15_021903ac
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_02188ec0
@@ -127164,7 +127164,7 @@ func_ov15_02188f00: ; 0x02188f00
ldr r0, _02188f2c ; =data_ov15_021903d8
ldr r1, _02188f38 ; =func_0203e7b4
ldr r2, _02188f3c ; =data_ov15_021903cc
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_02188f00
@@ -127186,7 +127186,7 @@ func_ov15_02188f40: ; 0x02188f40
ldr r0, _02188f6c ; =data_ov15_021903f8
ldr r1, _02188f78 ; =func_0203e7b4
ldr r2, _02188f7c ; =data_ov15_021903ec
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_02188f40
@@ -127343,7 +127343,7 @@ func_ov15_02188f80: ; 0x02188f80
strb ip, [sp, #0x14]
strb r0, [sp, #0x15]
strb r3, [r6, #0x12d]
bl func_0204f8d4
bl __register_global_object
mov r0, r6
mov r2, #0
str r2, [r0, #0x140]
@@ -127373,7 +127373,7 @@ func_ov15_021891fc: ; 0x021891fc
ldr r0, _0218923c ; =data_ov15_02190424
ldr r1, _02189248 ; =func_0203e7b4
ldr r2, _0218924c ; =data_ov15_02190418
bl func_0204f8d4
bl __register_global_object
ldr r2, _02189250 ; =0x00009998
ldr r0, _02189254 ; =data_ov15_0218e8c8
ldr r1, _02189258 ; =0x00000aaa
@@ -127403,7 +127403,7 @@ func_ov15_0218925c: ; 0x0218925c
ldr r0, _02189288 ; =data_ov15_02190444
ldr r1, _02189294 ; =func_0203e7b4
ldr r2, _02189298 ; =data_ov15_02190438
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov15_0218925c
asm/ov17.inc
+8 -8
View File
@@ -10,6 +10,13 @@
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN13PlayerControl13IsNotTouchingEv
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bacEv
.extern _ZN14AdventureFlags18func_ov00_02097bccEv
.extern _ZN14AdventureFlags18func_ov00_02098058Ev
.extern _ZN14AdventureFlags3GetEj
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12ApplyGravityEv
@@ -70,6 +77,7 @@
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager18func_ov00_020ad594Ei
.extern __register_global_object
.extern data_02050f54
.extern data_02063e4c
.extern data_027e0618
@@ -184,7 +192,6 @@
.extern func_0203ebc8
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
.extern func_ov00_02078b40
.extern func_ov00_02078f80
.extern func_ov00_02079008
@@ -313,13 +320,6 @@
.extern func_ov00_02094824
.extern func_ov00_02094884
.extern func_ov00_020965c0
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bacEv
.extern _ZN14AdventureFlags18func_ov00_02097bccEv
.extern _ZN14AdventureFlags18func_ov00_02098058Ev
.extern func_ov00_0209a4f4
.extern func_ov00_0209a508
.extern func_ov00_0209cd9c
asm/ov17.s
+27 -27
View File
@@ -20199,7 +20199,7 @@ func_ov17_0216b2c4: ; 0x0216b2c4
ldr r1, _0216b300 ; =func_ov17_0215bd7c
ldr r2, _0216b304 ; =data_ov17_0216cea0
strh ip, [r3, #0x14]
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov17_0216b2c4
@@ -20221,7 +20221,7 @@ func_ov17_0216b308: ; 0x0216b308
ldr r0, _0216b330 ; =data_ov17_0216ceb8
ldr r1, _0216b338 ; =func_0203ebc8
ldr r2, _0216b33c ; =data_ov17_0216cec0
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov17_0216b308
@@ -20241,7 +20241,7 @@ func_ov17_0216b340: ; 0x0216b340
ldr r0, _0216b368 ; =data_ov17_0216cecc
ldr r1, _0216b370 ; =func_0203ebc8
ldr r2, _0216b374 ; =data_ov17_0216ced4
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov17_0216b340
@@ -20262,7 +20262,7 @@ func_ov17_0216b378: ; 0x0216b378
ldr r0, _0216b3a4 ; =data_ov17_0216ceec
ldr r1, _0216b3b0 ; =func_0203e7b4
ldr r2, _0216b3b4 ; =data_ov17_0216cee0
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov17_0216b378
@@ -20284,7 +20284,7 @@ func_ov17_0216b3b8: ; 0x0216b3b8
ldr r0, _0216b3e4 ; =data_ov17_0216cf0c
ldr r1, _0216b3f0 ; =func_0203e7b4
ldr r2, _0216b3f4 ; =data_ov17_0216cf00
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov17_0216b3b8
@@ -20306,7 +20306,7 @@ func_ov17_0216b3f8: ; 0x0216b3f8
ldr r0, _0216b424 ; =data_ov17_0216cf2c
ldr r1, _0216b430 ; =func_0203e7b4
ldr r2, _0216b434 ; =data_ov17_0216cf20
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov17_0216b3f8
@@ -20344,7 +20344,7 @@ func_ov17_0216b460: ; 0x0216b460
ldr r0, _0216b48c ; =data_ov17_0216cf4c
ldr r1, _0216b498 ; =func_0203e7b4
ldr r2, _0216b49c ; =data_ov17_0216cf40
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov17_0216b460
@@ -20365,7 +20365,7 @@ func_ov17_0216b4a0: ; 0x0216b4a0
ldr r0, _0216b4d4 ; =data_ov17_0216cf60
ldr r1, _0216b4dc ; =func_0203ebc8
ldr r2, _0216b4e0 ; =data_ov17_0216cf68
bl func_0204f8d4
bl __register_global_object
ldr r1, _0216b4e4 ; =0x00001e66
ldr r0, _0216b4e8 ; =data_ov17_0216c0c0
str r1, [r0]
@@ -20390,7 +20390,7 @@ func_ov17_0216b4ec: ; 0x0216b4ec
ldr r0, _0216b520 ; =data_ov17_0216cf74
ldr r1, _0216b528 ; =func_0203ebc8
ldr r2, _0216b52c ; =data_ov17_0216cf7c
bl func_0204f8d4
bl __register_global_object
ldr r1, _0216b530 ; =0x00001e66
ldr r0, _0216b534 ; =data_ov17_0216c17c
str r1, [r0]
@@ -20415,7 +20415,7 @@ func_ov17_0216b538: ; 0x0216b538
ldr r0, _0216b588 ; =data_ov17_0216cf88
ldr r1, _0216b590 ; =func_0203ebc8
ldr r2, _0216b594 ; =data_ov17_0216cf90
bl func_0204f8d4
bl __register_global_object
ldr r3, _0216b598 ; =data_ov17_0216c238
mov r0, #0x1000
str r0, [r3]
@@ -20425,7 +20425,7 @@ func_ov17_0216b538: ; 0x0216b538
ldr r1, _0216b5a4 ; =func_0202bac0
ldr r2, _0216b5a8 ; =data_ov17_0216cf9c
str ip, [r3, #8]
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov17_0216b538
@@ -20450,7 +20450,7 @@ func_ov17_0216b5ac: ; 0x0216b5ac
ldr r0, _0216b5d4 ; =data_ov17_0216cfa8
ldr r1, _0216b5dc ; =func_0203ebc8
ldr r2, _0216b5e0 ; =data_ov17_0216cfb0
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov17_0216b5ac
@@ -20470,7 +20470,7 @@ func_ov17_0216b5e4: ; 0x0216b5e4
ldr r0, _0216b60c ; =data_ov17_0216cfbc
ldr r1, _0216b614 ; =func_0203ebc8
ldr r2, _0216b618 ; =data_ov17_0216cfc4
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov17_0216b5e4
@@ -20490,7 +20490,7 @@ func_ov17_0216b61c: ; 0x0216b61c
ldr r0, _0216b654 ; =data_ov17_0216cfd0
ldr r1, _0216b65c ; =func_0203ebc8
ldr r2, _0216b660 ; =data_ov17_0216cfd8
bl func_0204f8d4
bl __register_global_object
mov r0, #0x96000
bl func_01ff991c
ldr r1, _0216b664 ; =data_ov17_0216c470
@@ -20515,7 +20515,7 @@ func_ov17_0216b668: ; 0x0216b668
ldr r0, _0216b690 ; =data_ov17_0216cfe4
ldr r1, _0216b698 ; =func_0203ebc8
ldr r2, _0216b69c ; =data_ov17_0216cfec
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov17_0216b668
@@ -20535,7 +20535,7 @@ func_ov17_0216b6a0: ; 0x0216b6a0
ldr r0, _0216b6c8 ; =data_ov17_0216cff8
ldr r1, _0216b6d0 ; =func_0203ebc8
ldr r2, _0216b6d4 ; =data_ov17_0216d000
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov17_0216b6a0
@@ -20555,7 +20555,7 @@ func_ov17_0216b6d8: ; 0x0216b6d8
ldr r0, _0216b700 ; =data_ov17_0216d018
ldr r1, _0216b708 ; =func_0203ebc8
ldr r2, _0216b70c ; =data_ov17_0216d00c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov17_0216b6d8
@@ -20575,7 +20575,7 @@ func_ov17_0216b710: ; 0x0216b710
ldr r0, _0216b738 ; =data_ov17_0216d020
ldr r1, _0216b740 ; =func_0203ebc8
ldr r2, _0216b744 ; =data_ov17_0216d028
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov17_0216b710
@@ -20596,7 +20596,7 @@ func_ov17_0216b748: ; 0x0216b748
ldr r0, _0216b774 ; =data_ov17_0216d044
ldr r1, _0216b780 ; =func_0203e7b4
ldr r2, _0216b784 ; =data_ov17_0216d038
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov17_0216b748
@@ -20618,7 +20618,7 @@ func_ov17_0216b788: ; 0x0216b788
ldr r0, _0216b7b4 ; =data_ov17_0216d064
ldr r1, _0216b7c0 ; =func_0203e7b4
ldr r2, _0216b7c4 ; =data_ov17_0216d058
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov17_0216b788
@@ -20639,7 +20639,7 @@ func_ov17_0216b7c8: ; 0x0216b7c8
ldr r0, _0216b7f0 ; =data_ov17_0216d078
ldr r1, _0216b7f8 ; =func_0203ebc8
ldr r2, _0216b7fc ; =data_ov17_0216d080
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov17_0216b7c8
@@ -20659,7 +20659,7 @@ func_ov17_0216b800: ; 0x0216b800
ldr r0, _0216b828 ; =data_ov17_0216d08c
ldr r1, _0216b830 ; =func_0203ebc8
ldr r2, _0216b834 ; =data_ov17_0216d094
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov17_0216b800
@@ -20679,7 +20679,7 @@ func_ov17_0216b838: ; 0x0216b838
ldr r0, _0216b860 ; =data_ov17_0216d0a0
ldr r1, _0216b868 ; =func_0203ebc8
ldr r2, _0216b86c ; =data_ov17_0216d0a8
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov17_0216b838
@@ -20699,7 +20699,7 @@ func_ov17_0216b870: ; 0x0216b870
ldr r0, _0216b898 ; =data_ov17_0216d0b4
ldr r1, _0216b8a0 ; =func_0203ebc8
ldr r2, _0216b8a4 ; =data_ov17_0216d0bc
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov17_0216b870
@@ -20719,7 +20719,7 @@ func_ov17_0216b8a8: ; 0x0216b8a8
ldr r0, _0216b8d0 ; =data_ov17_0216d0c8
ldr r1, _0216b8d8 ; =func_0203ebc8
ldr r2, _0216b8dc ; =data_ov17_0216d0d0
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov17_0216b8a8
@@ -20739,7 +20739,7 @@ func_ov17_0216b8e0: ; 0x0216b8e0
ldr r0, _0216b914 ; =data_ov17_0216d0dc
ldr r1, _0216b91c ; =func_0203ebc8
ldr r2, _0216b920 ; =data_ov17_0216d0e4
bl func_0204f8d4
bl __register_global_object
ldr r1, _0216b924 ; =0x00001e66
ldr r0, _0216b928 ; =data_ov17_0216cd00
str r1, [r0]
@@ -20764,7 +20764,7 @@ func_ov17_0216b92c: ; 0x0216b92c
ldr r0, _0216b954 ; =data_ov17_0216d0f0
ldr r1, _0216b95c ; =func_0203ebc8
ldr r2, _0216b960 ; =data_ov17_0216d0f8
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov17_0216b92c
asm/ov18.inc
+9 -9
View File
@@ -5,6 +5,14 @@
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bccEv
.extern _ZN14AdventureFlags18func_ov00_02097ff4Ebb
.extern _ZN14AdventureFlags18func_ov00_02098058Ev
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags3SetEjb
.extern _ZN17LinkStateInteract18func_ov00_020ab934EP5Vec3p
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor10SetUnk_11bEv
@@ -60,6 +68,7 @@
.extern _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern __register_global_object
.extern data_02050f54
.extern data_02051054
.extern data_02057840
@@ -203,7 +212,6 @@
.extern func_0204dd9c
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
.extern func_ov00_02079008
.extern func_ov00_02079470
.extern func_ov00_02079680
@@ -334,14 +342,6 @@
.extern func_ov00_02093af0
.extern func_ov00_02094824
.extern func_ov00_02094884
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags3SetEjb
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bccEv
.extern _ZN14AdventureFlags18func_ov00_02097ff4Ebb
.extern _ZN14AdventureFlags18func_ov00_02098058Ev
.extern func_ov00_0209a4f4
.extern func_ov00_0209a508
.extern func_ov00_020a5e9c
asm/ov18.s
+28 -28
View File
@@ -20175,7 +20175,7 @@ func_ov18_0216b780: ; 0x0216b780
ldr r0, _0216b86c ; =data_ov18_0216d44c
ldr r1, _0216b878 ; =func_0203e7b4
ldr r2, _0216b87c ; =data_ov18_0216d440
bl func_0204f8d4
bl __register_global_object
ldr r1, _0216b880 ; =0x0000023d
mov r0, #0x1000
bl Divide
@@ -20191,7 +20191,7 @@ func_ov18_0216b780: ; 0x0216b780
ldr r1, _0216b890 ; =func_0202bac0
str r3, [r2, #0x2c]
ldr r2, _0216b894 ; =data_ov18_0216d460
bl func_0204f8d4
bl __register_global_object
mov r2, #0x1800
rsb r2, r2, #0
ldr r0, _0216b884 ; =data_ov18_0216c25c
@@ -20203,7 +20203,7 @@ func_ov18_0216b780: ; 0x0216b780
ldr r0, _0216b898 ; =data_ov18_0216c28c
ldr r1, _0216b890 ; =func_0202bac0
ldr r2, _0216b89c ; =data_ov18_0216d46c
bl func_0204f8d4
bl __register_global_object
mov r2, #0x1000
ldr r0, _0216b884 ; =data_ov18_0216c25c
mov r1, #0
@@ -20213,7 +20213,7 @@ func_ov18_0216b780: ; 0x0216b780
ldr r0, _0216b8a0 ; =data_ov18_0216c298
ldr r1, _0216b890 ; =func_0202bac0
ldr r2, _0216b8a4 ; =data_ov18_0216d478
bl func_0204f8d4
bl __register_global_object
mov r2, #0x2000
ldr r0, _0216b884 ; =data_ov18_0216c25c
mov r1, #0
@@ -20223,7 +20223,7 @@ func_ov18_0216b780: ; 0x0216b780
ldr r0, _0216b8a8 ; =data_ov18_0216c2a4
ldr r1, _0216b890 ; =func_0202bac0
ldr r2, _0216b8ac ; =data_ov18_0216d484
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov18_0216b780
@@ -20256,7 +20256,7 @@ func_ov18_0216b8b0: ; 0x0216b8b0
ldr r0, _0216bab0 ; =data_ov18_0216d490
ldr r1, _0216bab8 ; =func_0203ebc8
ldr r2, _0216babc ; =data_ov18_0216d498
bl func_0204f8d4
bl __register_global_object
ldr r3, _0216bac0 ; =data_ov18_0216c3a8
mov r0, #1
strb r0, [r3]
@@ -20431,7 +20431,7 @@ func_ov18_0216bb54: ; 0x0216bb54
ldr r0, _0216bb7c ; =data_ov18_0216d4a4
ldr r1, _0216bb84 ; =func_0203ebc8
ldr r2, _0216bb88 ; =data_ov18_0216d4ac
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov18_0216bb54
@@ -20451,7 +20451,7 @@ func_ov18_0216bb8c: ; 0x0216bb8c
ldr r0, _0216bbb4 ; =data_ov18_0216d4b8
ldr r1, _0216bbbc ; =func_0203ebc8
ldr r2, _0216bbc0 ; =data_ov18_0216d4c0
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov18_0216bb8c
@@ -20471,7 +20471,7 @@ func_ov18_0216bbc4: ; 0x0216bbc4
ldr r0, _0216bbec ; =data_ov18_0216d4cc
ldr r1, _0216bbf4 ; =func_0203ebc8
ldr r2, _0216bbf8 ; =data_ov18_0216d4d4
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov18_0216bbc4
@@ -20491,7 +20491,7 @@ func_ov18_0216bbfc: ; 0x0216bbfc
ldr r0, _0216bc24 ; =data_ov18_0216d4e0
ldr r1, _0216bc2c ; =func_0203ebc8
ldr r2, _0216bc30 ; =data_ov18_0216d4e8
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov18_0216bbfc
@@ -20511,7 +20511,7 @@ func_ov18_0216bc34: ; 0x0216bc34
ldr r0, _0216bc5c ; =data_ov18_0216d4f4
ldr r1, _0216bc64 ; =func_0203ebc8
ldr r2, _0216bc68 ; =data_ov18_0216d4fc
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov18_0216bc34
@@ -20531,7 +20531,7 @@ func_ov18_0216bc6c: ; 0x0216bc6c
ldr r0, _0216bc94 ; =data_ov18_0216d508
ldr r1, _0216bc9c ; =func_0203ebc8
ldr r2, _0216bca0 ; =data_ov18_0216d510
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov18_0216bc6c
@@ -20551,7 +20551,7 @@ func_ov18_0216bca4: ; 0x0216bca4
ldr r0, _0216bccc ; =data_ov18_0216d51c
ldr r1, _0216bcd4 ; =func_0203ebc8
ldr r2, _0216bcd8 ; =data_ov18_0216d524
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov18_0216bca4
@@ -20571,7 +20571,7 @@ func_ov18_0216bcdc: ; 0x0216bcdc
ldr r0, _0216bd04 ; =data_ov18_0216d530
ldr r1, _0216bd0c ; =func_0203ebc8
ldr r2, _0216bd10 ; =data_ov18_0216d538
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov18_0216bcdc
@@ -20591,7 +20591,7 @@ func_ov18_0216bd14: ; 0x0216bd14
ldr r0, _0216bd3c ; =data_ov18_0216d544
ldr r1, _0216bd44 ; =func_0203ebc8
ldr r2, _0216bd48 ; =data_ov18_0216d54c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov18_0216bd14
@@ -20611,7 +20611,7 @@ func_ov18_0216bd4c: ; 0x0216bd4c
ldr r0, _0216bd74 ; =data_ov18_0216d558
ldr r1, _0216bd7c ; =func_0203ebc8
ldr r2, _0216bd80 ; =data_ov18_0216d560
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov18_0216bd4c
@@ -20631,7 +20631,7 @@ func_ov18_0216bd84: ; 0x0216bd84
ldr r0, _0216bdac ; =data_ov18_0216d56c
ldr r1, _0216bdb4 ; =func_0203ebc8
ldr r2, _0216bdb8 ; =data_ov18_0216d574
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov18_0216bd84
@@ -20651,7 +20651,7 @@ func_ov18_0216bdbc: ; 0x0216bdbc
ldr r0, _0216bde4 ; =data_ov18_0216d580
ldr r1, _0216bdec ; =func_0203ebc8
ldr r2, _0216bdf0 ; =data_ov18_0216d588
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov18_0216bdbc
@@ -20671,7 +20671,7 @@ func_ov18_0216bdf4: ; 0x0216bdf4
ldr r0, _0216be1c ; =data_ov18_0216d594
ldr r1, _0216be24 ; =func_0203ebc8
ldr r2, _0216be28 ; =data_ov18_0216d59c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov18_0216bdf4
@@ -20691,7 +20691,7 @@ func_ov18_0216be2c: ; 0x0216be2c
ldr r0, _0216be54 ; =data_ov18_0216d5a8
ldr r1, _0216be5c ; =func_0203ebc8
ldr r2, _0216be60 ; =data_ov18_0216d5b0
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov18_0216be2c
@@ -20711,7 +20711,7 @@ func_ov18_0216be64: ; 0x0216be64
ldr r0, _0216be8c ; =data_ov18_0216d5bc
ldr r1, _0216be94 ; =func_0203ebc8
ldr r2, _0216be98 ; =data_ov18_0216d5c4
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov18_0216be64
@@ -20731,7 +20731,7 @@ func_ov18_0216be9c: ; 0x0216be9c
ldr r0, _0216bec4 ; =data_ov18_0216d5d0
ldr r1, _0216becc ; =func_0203ebc8
ldr r2, _0216bed0 ; =data_ov18_0216d5d8
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov18_0216be9c
@@ -20752,7 +20752,7 @@ func_ov18_0216bed4: ; 0x0216bed4
ldr r0, _0216bf00 ; =data_ov18_0216d5f0
ldr r1, _0216bf0c ; =func_0203e7b4
ldr r2, _0216bf10 ; =data_ov18_0216d5e4
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov18_0216bed4
@@ -20774,7 +20774,7 @@ func_ov18_0216bf14: ; 0x0216bf14
ldr r0, _0216bf40 ; =data_ov18_0216d610
ldr r1, _0216bf4c ; =func_0203e7b4
ldr r2, _0216bf50 ; =data_ov18_0216d604
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov18_0216bf14
@@ -20795,7 +20795,7 @@ func_ov18_0216bf54: ; 0x0216bf54
ldr r0, _0216bf7c ; =data_ov18_0216d634
ldr r1, _0216bf84 ; =func_0203ebc8
ldr r2, _0216bf88 ; =data_ov18_0216d63c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov18_0216bf54
@@ -20816,7 +20816,7 @@ func_ov18_0216bf8c: ; 0x0216bf8c
ldr r0, _0216bfe4 ; =data_ov18_0216d654
ldr r1, _0216bff0 ; =func_0203e7b4
ldr r2, _0216bff4 ; =data_ov18_0216d648
bl func_0204f8d4
bl __register_global_object
mov r1, #0
ldr r3, _0216bff8 ; =data_ov18_0216d254
sub r0, r1, #0x1000
@@ -20827,7 +20827,7 @@ func_ov18_0216bf8c: ; 0x0216bf8c
ldr r1, _0216c004 ; =func_0202bac0
ldr r2, _0216c008 ; =data_ov18_0216d668
str ip, [r3, #8]
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov18_0216bf8c
@@ -20854,7 +20854,7 @@ func_ov18_0216c00c: ; 0x0216c00c
ldr r0, _0216c038 ; =data_ov18_0216d684
ldr r1, _0216c044 ; =func_0203e7b4
ldr r2, _0216c048 ; =data_ov18_0216d678
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov18_0216c00c
asm/ov19.inc
+1 -1
View File
@@ -164,7 +164,7 @@
.extern func_02042f74
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
.extern __register_global_object
.extern func_ov00_02079e68
.extern func_ov00_0207a1c8
.extern func_ov00_0207b2f0
asm/ov19.s
+11 -11
View File
@@ -10594,7 +10594,7 @@ func_ov19_02175f04: ; 0x02175f04
ldr r0, _02175ffc ; =data_ov19_02176e8c
ldr r1, _02176008 ; =func_0203e7b4
ldr r2, _0217600c ; =data_ov19_02176e80
bl func_0204f8d4
bl __register_global_object
mov r2, #0
str r2, [sp]
mov r3, #1
@@ -10643,7 +10643,7 @@ func_ov19_02175f04: ; 0x02175f04
ldr r0, _02176014 ; =data_ov19_02176340
ldr r1, _02176018 ; =func_ov00_020cceec
ldr r2, _0217601c ; =data_ov19_02176ea0
bl func_0204f8d4
bl __register_global_object
add sp, sp, #0x84
ldmia sp!, {pc}
.align 2, 0
@@ -10670,7 +10670,7 @@ func_ov19_02176020: ; 0x02176020
ldr r0, _0217604c ; =data_ov19_02176ebc
ldr r1, _02176058 ; =func_0203e7b4
ldr r2, _0217605c ; =data_ov19_02176eb0
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov19_02176020
@@ -10692,7 +10692,7 @@ func_ov19_02176060: ; 0x02176060
ldr r0, _0217608c ; =data_ov19_021775bc
ldr r1, _02176098 ; =func_0203e7b4
ldr r2, _0217609c ; =data_ov19_021775b0
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov19_02176060
@@ -10714,7 +10714,7 @@ func_ov19_021760a0: ; 0x021760a0
ldr r0, _021760cc ; =data_ov19_021775dc
ldr r1, _021760d8 ; =func_0203e7b4
ldr r2, _021760dc ; =data_ov19_021775d0
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov19_021760a0
@@ -10735,7 +10735,7 @@ func_ov19_021760e0: ; 0x021760e0
ldr r0, _02176108 ; =data_ov19_021775f0
ldr r1, _02176110 ; =func_0203ebc8
ldr r2, _02176114 ; =data_ov19_021775f8
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov19_021760e0
@@ -10755,7 +10755,7 @@ func_ov19_02176118: ; 0x02176118
ldr r0, _02176140 ; =data_ov19_02177604
ldr r1, _02176148 ; =func_0203ebc8
ldr r2, _0217614c ; =data_ov19_0217760c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov19_02176118
@@ -10775,7 +10775,7 @@ func_ov19_02176150: ; 0x02176150
ldr r0, _02176178 ; =data_ov19_02177618
ldr r1, _02176180 ; =func_0203ebc8
ldr r2, _02176184 ; =data_ov19_02177620
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov19_02176150
@@ -10797,7 +10797,7 @@ func_ov19_02176188: ; 0x02176188
ldr r0, _02176274 ; =data_ov19_02177638
ldr r1, _02176280 ; =func_0203e7b4
ldr r2, _02176284 ; =data_ov19_0217762c
bl func_0204f8d4
bl __register_global_object
mov r0, #6
mov r2, #0
str r0, [sp]
@@ -10843,7 +10843,7 @@ func_ov19_02176188: ; 0x02176188
ldr r0, _02176288 ; =data_ov19_02176b88
ldr r1, _0217628c ; =func_ov00_020cceec
ldr r2, _02176290 ; =data_ov19_0217764c
bl func_0204f8d4
bl __register_global_object
add sp, sp, #0x84
ldmia sp!, {pc}
.align 2, 0
@@ -10869,7 +10869,7 @@ func_ov19_02176294: ; 0x02176294
ldr r0, _021762c0 ; =data_ov19_02177664
ldr r1, _021762cc ; =func_0203e7b4
ldr r2, _021762d0 ; =data_ov19_02177658
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov19_02176294
asm/ov20.inc
+1 -1
View File
@@ -153,7 +153,7 @@
.extern func_02042f68
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
.extern __register_global_object
.extern func_ov00_02079e68
.extern func_ov00_02079eb4
.extern func_ov00_0207a1c8
asm/ov20.s
+21 -21
View File
@@ -12754,7 +12754,7 @@ func_ov20_02177af4: ; 0x02177af4
ldr r0, _02177bf0 ; =data_ov20_0217950c
ldr r1, _02177bfc ; =func_0203e7b4
ldr r2, _02177c00 ; =data_ov20_02179500
bl func_0204f8d4
bl __register_global_object
mov r3, #0
str r3, [sp]
mov ip, #1
@@ -12804,7 +12804,7 @@ func_ov20_02177af4: ; 0x02177af4
ldr r0, _02177c0c ; =data_ov20_02178320
ldr r1, _02177c10 ; =func_ov00_020cceec
ldr r2, _02177c14 ; =data_ov20_02179520
bl func_0204f8d4
bl __register_global_object
add sp, sp, #0x84
ldmia sp!, {pc}
.align 2, 0
@@ -12833,7 +12833,7 @@ func_ov20_02177c18: ; 0x02177c18
ldr r0, _02177d00 ; =data_ov20_02179538
ldr r1, _02177d0c ; =func_0203e7b4
ldr r2, _02177d10 ; =data_ov20_0217952c
bl func_0204f8d4
bl __register_global_object
mov r3, #0
str r3, [sp]
mov r0, #1
@@ -12878,7 +12878,7 @@ func_ov20_02177c18: ; 0x02177c18
ldr r0, _02177d18 ; =data_ov20_021784c4
ldr r1, _02177d1c ; =func_ov00_020cceec
ldr r2, _02177d20 ; =data_ov20_0217954c
bl func_0204f8d4
bl __register_global_object
add sp, sp, #0x84
ldmia sp!, {pc}
.align 2, 0
@@ -12905,7 +12905,7 @@ func_ov20_02177d24: ; 0x02177d24
ldr r0, _02177d50 ; =data_ov20_02179564
ldr r1, _02177d5c ; =func_0203e7b4
ldr r2, _02177d60 ; =data_ov20_02179558
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov20_02177d24
@@ -12927,7 +12927,7 @@ func_ov20_02177d64: ; 0x02177d64
ldr r0, _02177d90 ; =data_ov20_02179584
ldr r1, _02177d9c ; =func_0203e7b4
ldr r2, _02177da0 ; =data_ov20_02179578
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov20_02177d64
@@ -12949,7 +12949,7 @@ func_ov20_02177da4: ; 0x02177da4
ldr r0, _02177dd0 ; =data_ov20_021795a4
ldr r1, _02177ddc ; =func_0203e7b4
ldr r2, _02177de0 ; =data_ov20_02179598
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov20_02177da4
@@ -12971,7 +12971,7 @@ func_ov20_02177de4: ; 0x02177de4
ldr r0, _02177ecc ; =data_ov20_021795b8
ldr r1, _02177ed4 ; =func_0203ebc8
ldr r2, _02177ed8 ; =data_ov20_021795c0
bl func_0204f8d4
bl __register_global_object
mov r3, #0x80
mov r2, #0x60
ldr r0, _02177edc ; =data_ov20_021788e0
@@ -13017,7 +13017,7 @@ func_ov20_02177de4: ; 0x02177de4
ldr r1, _02177ef4 ; =0x02173888
ldr r2, _02177ef8 ; =data_ov20_021795cc
mov r0, #0
bl func_0204f8d4
bl __register_global_object
add sp, sp, #0x30
ldmia sp!, {r3, pc}
.align 2, 0
@@ -13047,7 +13047,7 @@ func_ov20_02177efc: ; 0x02177efc
ldr r0, _02177f28 ; =data_ov20_021795e4
ldr r1, _02177f34 ; =func_0203e7b4
ldr r2, _02177f38 ; =data_ov20_021795d8
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov20_02177efc
@@ -13069,7 +13069,7 @@ func_ov20_02177f3c: ; 0x02177f3c
ldr r0, _02177f68 ; =data_ov20_02179604
ldr r1, _02177f74 ; =func_0203e7b4
ldr r2, _02177f78 ; =data_ov20_021795f8
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov20_02177f3c
@@ -13092,7 +13092,7 @@ func_ov20_02177f7c: ; 0x02177f7c
ldr r0, _02178080 ; =data_ov20_02179624
ldr r1, _0217808c ; =func_0203e7b4
ldr r2, _02178090 ; =data_ov20_02179618
bl func_0204f8d4
bl __register_global_object
mov r3, #1
str r3, [sp]
mov r1, #5
@@ -13144,7 +13144,7 @@ func_ov20_02177f7c: ; 0x02177f7c
ldr r0, _0217809c ; =data_ov20_02178c34
ldr r1, _021780a0 ; =func_ov00_020cceec
ldr r2, _021780a4 ; =data_ov20_02179638
bl func_0204f8d4
bl __register_global_object
add sp, sp, #0x84
ldmia sp!, {pc}
.align 2, 0
@@ -13171,7 +13171,7 @@ func_ov20_021780a8: ; 0x021780a8
ldr r0, _021780d0 ; =data_ov20_02179644
ldr r1, _021780d8 ; =func_0203ebc8
ldr r2, _021780dc ; =data_ov20_0217964c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov20_021780a8
@@ -13192,7 +13192,7 @@ func_ov20_021780e0: ; 0x021780e0
ldr r0, _0217810c ; =data_ov20_02179664
ldr r1, _02178118 ; =func_0203e7b4
ldr r2, _0217811c ; =data_ov20_02179658
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov20_021780e0
@@ -13214,7 +13214,7 @@ func_ov20_02178120: ; 0x02178120
ldr r0, _0217814c ; =data_ov20_02179684
ldr r1, _02178158 ; =func_0203e7b4
ldr r2, _0217815c ; =data_ov20_02179678
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov20_02178120
@@ -13236,7 +13236,7 @@ func_ov20_02178160: ; 0x02178160
ldr r0, _0217818c ; =data_ov20_021796a4
ldr r1, _02178198 ; =func_0203e7b4
ldr r2, _0217819c ; =data_ov20_02179698
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov20_02178160
@@ -13258,7 +13258,7 @@ func_ov20_021781a0: ; 0x021781a0
ldr r0, _021781cc ; =data_ov20_021796c4
ldr r1, _021781d8 ; =func_0203e7b4
ldr r2, _021781dc ; =data_ov20_021796b8
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov20_021781a0
@@ -13280,7 +13280,7 @@ func_ov20_021781e0: ; 0x021781e0
ldr r0, _0217820c ; =data_ov20_021796e4
ldr r1, _02178218 ; =func_0203e7b4
ldr r2, _0217821c ; =data_ov20_021796d8
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov20_021781e0
@@ -13301,7 +13301,7 @@ func_ov20_02178220: ; 0x02178220
ldr r0, _02178248 ; =data_ov20_021796f8
ldr r1, _02178250 ; =func_0203ebc8
ldr r2, _02178254 ; =data_ov20_02179700
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov20_02178220
@@ -13322,7 +13322,7 @@ func_ov20_02178258: ; 0x02178258
ldr r0, _02178284 ; =data_ov20_02179718
ldr r1, _02178290 ; =func_0203e7b4
ldr r2, _02178294 ; =data_ov20_0217970c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov20_02178258
asm/ov21.inc
+1 -1
View File
@@ -114,7 +114,7 @@
.extern func_0203eba8
.extern func_0203ebc8
.extern func_0204f754
.extern func_0204f8d4
.extern __register_global_object
.extern func_ov00_020791dc
.extern func_ov00_020792a0
.extern func_ov00_020793b8
asm/ov21.s
+23 -23
View File
@@ -2818,7 +2818,7 @@ func_ov21_0216f7c8: ; 0x0216f7c8
ldr r1, _0216fb94 ; =func_0202bac0
ldr r2, _0216fb98 ; =data_ov21_02171bd8
str r4, [r3, #8]
bl func_0204f8d4
bl __register_global_object
ldr r0, _0216fb9c ; =data_ov21_0217175c
mov r3, #0x1800
ldr r1, _0216fb94 ; =func_0202bac0
@@ -2826,7 +2826,7 @@ func_ov21_0216f7c8: ; 0x0216f7c8
str r4, [r0]
str r4, [r0, #4]
str r3, [r0, #8]
bl func_0204f8d4
bl __register_global_object
mov r4, #0x1800
ldr r0, _0216fba4 ; =data_ov21_02171768
mov r3, #0
@@ -2836,7 +2836,7 @@ func_ov21_0216f7c8: ; 0x0216f7c8
str r4, [r0]
str r3, [r0, #4]
str r3, [r0, #8]
bl func_0204f8d4
bl __register_global_object
mov r2, #0
ldr r0, _0216fbac ; =data_ov21_02171774
sub r1, r2, #0x1800
@@ -2845,7 +2845,7 @@ func_ov21_0216f7c8: ; 0x0216f7c8
str r2, [r0]
str r2, [r0, #4]
ldr r2, _0216fbb0 ; =data_ov21_02171bfc
bl func_0204f8d4
bl __register_global_object
ldr r0, _0216fb88 ; =data_ov21_02171bb4
ldr r1, [r0, #0x20]
orr r1, r1, #1
@@ -3076,14 +3076,14 @@ _0216fcc0:
ldr r1, _02170008 ; =func_ov21_0217004c
ldr r2, _0217000c ; =data_ov21_02171c0c
str r5, [r3, #0x34]
bl func_0204f8d4
bl __register_global_object
ldr r0, _02170010 ; =data_ov21_02171788
mov r3, r5
ldr r1, _02170008 ; =func_ov21_0217004c
ldr r2, _02170014 ; =data_ov21_02171c18
str r3, [r0]
str r3, [r0, #4]
bl func_0204f8d4
bl __register_global_object
ldr r0, _02170018 ; =data_ov21_02171790
mov r2, r5
str r2, [r0]
@@ -3091,7 +3091,7 @@ _0216fcc0:
ldr r1, _02170008 ; =func_ov21_0217004c
ldr r2, _0217001c ; =data_ov21_02171c24
str r3, [r0, #4]
bl func_0204f8d4
bl __register_global_object
mov r2, r5
ldr r0, _02170020 ; =data_ov21_02171798
sub r1, r2, #2
@@ -3099,7 +3099,7 @@ _0216fcc0:
str r1, [r0, #4]
ldr r1, _02170008 ; =func_ov21_0217004c
ldr r2, _02170024 ; =data_ov21_02171c30
bl func_0204f8d4
bl __register_global_object
ldr r0, _02170028 ; =data_ov21_021717a0
mov r1, #0
str r1, [r0]
@@ -3107,14 +3107,14 @@ _0216fcc0:
str r1, [r0, #4]
ldr r1, _02170008 ; =func_ov21_0217004c
ldr r2, _0217002c ; =data_ov21_02171c3c
bl func_0204f8d4
bl __register_global_object
ldr r0, _02170030 ; =data_ov21_021717a8
mvn r1, #0
str r1, [r0]
str r1, [r0, #4]
ldr r1, _02170008 ; =func_ov21_0217004c
ldr r2, _02170034 ; =data_ov21_02171c48
bl func_0204f8d4
bl __register_global_object
ldr r0, _02170038 ; =data_ov21_021717b0
mvn r1, #0
str r1, [r0]
@@ -3122,7 +3122,7 @@ _0216fcc0:
str r1, [r0, #4]
ldr r1, _02170008 ; =func_ov21_0217004c
ldr r2, _0217003c ; =data_ov21_02171c54
bl func_0204f8d4
bl __register_global_object
ldr r0, _02170040 ; =data_ov21_021717b8
mvn r1, #0
str r1, [r0]
@@ -3130,7 +3130,7 @@ _0216fcc0:
str r1, [r0, #4]
ldr r1, _02170008 ; =func_ov21_0217004c
ldr r2, _02170044 ; =data_ov21_02171c60
bl func_0204f8d4
bl __register_global_object
ldr r0, _0216fffc ; =data_ov21_02171bb4
ldr r1, [r0, #0x54]
orr r1, r1, #1
@@ -4459,7 +4459,7 @@ func_ov21_02170cec: ; 0x02170cec
ldr r0, _02170d14 ; =data_ov21_02171aec
ldr r1, _02170d1c ; =func_0203ebc8
ldr r2, _02170d20 ; =data_ov21_02171ae0
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov21_02170cec
@@ -4480,7 +4480,7 @@ func_ov21_02170d24: ; 0x02170d24
ldr r0, _02170d50 ; =data_ov21_02171b00
ldr r1, _02170d5c ; =func_0203e7b4
ldr r2, _02170d60 ; =data_ov21_02171af4
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov21_02170d24
@@ -4502,7 +4502,7 @@ func_ov21_02170d64: ; 0x02170d64
ldr r0, _02170e20 ; =data_ov21_02171b20
ldr r1, _02170e2c ; =func_0203e7b4
ldr r2, _02170e30 ; =data_ov21_02171b14
bl func_0204f8d4
bl __register_global_object
ldr r0, _02170e34 ; =data_ov21_02171b40
ldr r1, _02170e38 ; =0x434d4d53
ldr r2, _02170e3c ; =func_ov21_0216ed74
@@ -4511,7 +4511,7 @@ func_ov21_02170d64: ; 0x02170d64
ldr r0, _02170e34 ; =data_ov21_02171b40
ldr r1, _02170e2c ; =func_0203e7b4
ldr r2, _02170e40 ; =data_ov21_02171b34
bl func_0204f8d4
bl __register_global_object
ldr r0, _02170e44 ; =data_ov21_02171b60
ldr r1, _02170e48 ; =0x43434c44
ldr r2, _02170e4c ; =func_ov21_0216edf0
@@ -4520,7 +4520,7 @@ func_ov21_02170d64: ; 0x02170d64
ldr r0, _02170e44 ; =data_ov21_02171b60
ldr r1, _02170e2c ; =func_0203e7b4
ldr r2, _02170e50 ; =data_ov21_02171b54
bl func_0204f8d4
bl __register_global_object
ldr r0, _02170e54 ; =data_ov21_02171b80
ldr r1, _02170e58 ; =0x43534f4e
ldr r2, _02170e5c ; =func_ov21_0216eed8
@@ -4529,7 +4529,7 @@ func_ov21_02170d64: ; 0x02170d64
ldr r0, _02170e54 ; =data_ov21_02171b80
ldr r1, _02170e2c ; =func_0203e7b4
ldr r2, _02170e60 ; =data_ov21_02171b74
bl func_0204f8d4
bl __register_global_object
ldr r0, _02170e64 ; =data_ov21_02171ba0
ldr r1, _02170e68 ; =0x43574946
ldr r2, _02170e6c ; =func_ov21_0216ef54
@@ -4538,7 +4538,7 @@ func_ov21_02170d64: ; 0x02170d64
ldr r0, _02170e64 ; =data_ov21_02171ba0
ldr r1, _02170e2c ; =func_0203e7b4
ldr r2, _02170e70 ; =data_ov21_02171b94
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov21_02170d64
@@ -4576,7 +4576,7 @@ func_ov21_02170e74: ; 0x02170e74
ldr r0, _02170ea0 ; =data_ov21_02171bc0
ldr r1, _02170eac ; =func_0203e7b4
ldr r2, _02170eb0 ; =data_ov21_02171bb4
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov21_02170e74
@@ -4597,7 +4597,7 @@ func_ov21_02170eb4: ; 0x02170eb4
ldr r0, _02170edc ; =data_ov21_02171c6c
ldr r1, _02170ee4 ; =func_0203ebc8
ldr r2, _02170ee8 ; =data_ov21_02171c74
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov21_02170eb4
@@ -4618,7 +4618,7 @@ func_ov21_02170eec: ; 0x02170eec
ldr r0, _02170f18 ; =data_ov21_02171c8c
ldr r1, _02170f24 ; =func_0203e7b4
ldr r2, _02170f28 ; =data_ov21_02171c80
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov21_02170eec
@@ -4639,7 +4639,7 @@ func_ov21_02170f2c: ; 0x02170f2c
ldr r0, _02170f54 ; =data_ov21_02171ca0
ldr r1, _02170f5c ; =func_0203ebc8
ldr r2, _02170f60 ; =data_ov21_02171ca8
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov21_02170f2c
asm/ov22.inc
+1 -1
View File
@@ -163,7 +163,7 @@
.extern func_0203ebc8
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
.extern __register_global_object
.extern func_ov00_02079e68
.extern func_ov00_0207a188
.extern func_ov00_0207a1c8
asm/ov22.s
+21 -21
View File
@@ -14311,7 +14311,7 @@ func_ov22_021789c8: ; 0x021789c8
ldr r0, _021789f4 ; =data_ov22_0217a40c
ldr r1, _02178a00 ; =func_0203e7b4
ldr r2, _02178a04 ; =data_ov22_0217a400
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov22_021789c8
@@ -14332,7 +14332,7 @@ func_ov22_02178a08: ; 0x02178a08
ldr r0, _02178a30 ; =data_ov22_0217a420
ldr r1, _02178a38 ; =func_0203ebc8
ldr r2, _02178a3c ; =data_ov22_0217a428
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov22_02178a08
@@ -14352,7 +14352,7 @@ func_ov22_02178a40: ; 0x02178a40
ldr r0, _02178a68 ; =data_ov22_0217a434
ldr r1, _02178a70 ; =func_0203ebc8
ldr r2, _02178a74 ; =data_ov22_0217a43c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov22_02178a40
@@ -14374,7 +14374,7 @@ func_ov22_02178a78: ; 0x02178a78
ldr r0, _02178b2c ; =data_ov22_0217a454
ldr r1, _02178b38 ; =func_0203e7b4
ldr r2, _02178b3c ; =data_ov22_0217a448
bl func_0204f8d4
bl __register_global_object
ldr r0, _02178b40 ; =data_ov22_0217a474
ldr r1, _02178b44 ; =0x534e4d42
ldr r2, _02178b48 ; =func_ov22_0216f308
@@ -14383,7 +14383,7 @@ func_ov22_02178a78: ; 0x02178a78
ldr r0, _02178b40 ; =data_ov22_0217a474
ldr r1, _02178b38 ; =func_0203e7b4
ldr r2, _02178b4c ; =data_ov22_0217a468
bl func_0204f8d4
bl __register_global_object
ldr r0, _02178b50 ; =data_ov22_0217a494
ldr r1, _02178b54 ; =0x534e4d59
ldr r2, _02178b58 ; =func_ov22_0216f33c
@@ -14392,7 +14392,7 @@ func_ov22_02178a78: ; 0x02178a78
ldr r0, _02178b50 ; =data_ov22_0217a494
ldr r1, _02178b38 ; =func_0203e7b4
ldr r2, _02178b5c ; =data_ov22_0217a488
bl func_0204f8d4
bl __register_global_object
ldr r1, _02178b60 ; =data_02057200
ldr r0, _02178b64 ; =data_ov22_02179224
ldr r2, [r1]
@@ -14440,7 +14440,7 @@ func_ov22_02178b68: ; 0x02178b68
ldr r0, _02178c70 ; =data_ov22_0217a4b4
ldr r1, _02178c7c ; =func_0203e7b4
ldr r2, _02178c80 ; =data_ov22_0217a4a8
bl func_0204f8d4
bl __register_global_object
mov ip, #1
str ip, [sp]
mov r2, #2
@@ -14493,7 +14493,7 @@ func_ov22_02178b68: ; 0x02178b68
ldr r0, _02178c8c ; =data_ov22_02179430
ldr r1, _02178c90 ; =func_ov00_020cceec
ldr r2, _02178c94 ; =data_ov22_0217a4c8
bl func_0204f8d4
bl __register_global_object
add sp, sp, #0x84
ldmia sp!, {pc}
.align 2, 0
@@ -14521,7 +14521,7 @@ func_ov22_02178c98: ; 0x02178c98
ldr r0, _02178cc4 ; =data_ov22_0217a4e0
ldr r1, _02178cd0 ; =func_0203e7b4
ldr r2, _02178cd4 ; =data_ov22_0217a4d4
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov22_02178c98
@@ -14543,7 +14543,7 @@ func_ov22_02178cd8: ; 0x02178cd8
ldr r0, _02178d04 ; =data_ov22_0217a500
ldr r1, _02178d10 ; =func_0203e7b4
ldr r2, _02178d14 ; =data_ov22_0217a4f4
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov22_02178cd8
@@ -14565,7 +14565,7 @@ func_ov22_02178d18: ; 0x02178d18
ldr r0, _02178d44 ; =data_ov22_0217a520
ldr r1, _02178d50 ; =func_0203e7b4
ldr r2, _02178d54 ; =data_ov22_0217a514
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov22_02178d18
@@ -14586,7 +14586,7 @@ func_ov22_02178d58: ; 0x02178d58
ldr r0, _02178d80 ; =data_ov22_0217a534
ldr r1, _02178d88 ; =func_0203ebc8
ldr r2, _02178d8c ; =data_ov22_0217a53c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov22_02178d58
@@ -14607,7 +14607,7 @@ func_ov22_02178d90: ; 0x02178d90
ldr r0, _02178dbc ; =data_ov22_0217a554
ldr r1, _02178dc8 ; =func_0203e7b4
ldr r2, _02178dcc ; =data_ov22_0217a548
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov22_02178d90
@@ -14629,7 +14629,7 @@ func_ov22_02178dd0: ; 0x02178dd0
ldr r0, _02178dfc ; =data_ov22_0217a578
ldr r1, _02178e08 ; =func_0203e7b4
ldr r2, _02178e0c ; =data_ov22_0217a56c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov22_02178dd0
@@ -14650,7 +14650,7 @@ func_ov22_02178e10: ; 0x02178e10
ldr r0, _02178e38 ; =data_ov22_0217a58c
ldr r1, _02178e40 ; =func_0203ebc8
ldr r2, _02178e44 ; =data_ov22_0217a594
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov22_02178e10
@@ -14670,7 +14670,7 @@ func_ov22_02178e48: ; 0x02178e48
ldr r0, _02178e70 ; =data_ov22_0217a5ac
ldr r1, _02178e78 ; =func_0203ebc8
ldr r2, _02178e7c ; =data_ov22_0217a5a0
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov22_02178e48
@@ -14692,7 +14692,7 @@ func_ov22_02178e80: ; 0x02178e80
ldr r0, _02178ef4 ; =data_ov22_0217a5c0
ldr r1, _02178f00 ; =func_0203e7b4
ldr r2, _02178f04 ; =data_ov22_0217a5b4
bl func_0204f8d4
bl __register_global_object
ldr r1, _02178f08 ; =data_02057200
ldr r0, _02178f0c ; =data_ov22_02179d5c
ldr r2, [r1]
@@ -14732,7 +14732,7 @@ func_ov22_02178f10: ; 0x02178f10
ldr r0, _02178f38 ; =data_ov22_0217a5d8
ldr r1, _02178f40 ; =func_0203ebc8
ldr r2, _02178f44 ; =data_ov22_0217a5e0
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov22_02178f10
@@ -14752,7 +14752,7 @@ func_ov22_02178f48: ; 0x02178f48
ldr r0, _02178f70 ; =data_ov22_0217a5ec
ldr r1, _02178f78 ; =func_0203ebc8
ldr r2, _02178f7c ; =data_ov22_0217a5f4
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov22_02178f48
@@ -14773,7 +14773,7 @@ func_ov22_02178f80: ; 0x02178f80
ldr r0, _02178fd0 ; =data_ov22_0217a60c
ldr r1, _02178fdc ; =func_0203e7b4
ldr r2, _02178fe0 ; =data_ov22_0217a600
bl func_0204f8d4
bl __register_global_object
ldr r0, _02178fe4 ; =data_ov22_0217a62c
ldr r1, _02178fe8 ; =0x59455442
ldr r2, _02178fec ; =func_ov22_02178308
@@ -14782,7 +14782,7 @@ func_ov22_02178f80: ; 0x02178f80
ldr r0, _02178fe4 ; =data_ov22_0217a62c
ldr r1, _02178fdc ; =func_0203e7b4
ldr r2, _02178ff0 ; =data_ov22_0217a620
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov22_02178f80
asm/ov23.inc
+1 -1
View File
@@ -201,7 +201,7 @@
.extern func_0203ebc8
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
.extern __register_global_object
.extern func_ov00_02079470
.extern func_ov00_0207977c
.extern func_ov00_02079eb4
asm/ov23.s
+21 -21
View File
@@ -2309,7 +2309,7 @@ func_ov23_0216f2a4: ; 0x0216f2a4
ldr r1, _0216f3fc ; =func_ov23_0216f1d0
ldr r2, _0216f400 ; =data_ov23_0217ac50
str ip, [r3, #0x3c]
bl func_0204f8d4
bl __register_global_object
ldr r0, _0216f3f0 ; =data_ov23_0217ac20
ldr r1, [r0, #0x2c]
orr r1, r1, #1
@@ -9826,7 +9826,7 @@ func_ov23_02175878: ; 0x02175878
str ip, [r3, #0x34]
mov ip, #0
str ip, [r3, #0x38]
bl func_0204f8d4
bl __register_global_object
ldr r0, _021758e4 ; =data_ov23_0217acac
ldr r1, [r0, #0x24]
orr r1, r1, #1
@@ -15212,7 +15212,7 @@ func_ov23_02179698: ; 0x02179698
ldr r0, _02179798 ; =data_ov23_0217ab6c
ldr r1, _021797a4 ; =func_0203e7b4
ldr r2, _021797a8 ; =data_ov23_0217ab60
bl func_0204f8d4
bl __register_global_object
ldr r0, _021797ac ; =data_ov23_0217ab8c
ldr r1, _021797b0 ; =0x47524e57
ldr r2, _021797b4 ; =func_ov23_0216e818
@@ -15221,7 +15221,7 @@ func_ov23_02179698: ; 0x02179698
ldr r0, _021797ac ; =data_ov23_0217ab8c
ldr r1, _021797a4 ; =func_0203e7b4
ldr r2, _021797b8 ; =data_ov23_0217ab80
bl func_0204f8d4
bl __register_global_object
ldr r0, _021797bc ; =data_ov23_0217abac
ldr r1, _021797c0 ; =0x47524e43
ldr r2, _021797c4 ; =func_ov23_0216e848
@@ -15230,7 +15230,7 @@ func_ov23_02179698: ; 0x02179698
ldr r0, _021797bc ; =data_ov23_0217abac
ldr r1, _021797a4 ; =func_0203e7b4
ldr r2, _021797c8 ; =data_ov23_0217aba0
bl func_0204f8d4
bl __register_global_object
ldr r0, _021797cc ; =data_ov23_0217abcc
ldr r1, _021797d0 ; =0x47524342
ldr r2, _021797d4 ; =func_ov23_0216e878
@@ -15239,7 +15239,7 @@ func_ov23_02179698: ; 0x02179698
ldr r0, _021797cc ; =data_ov23_0217abcc
ldr r1, _021797a4 ; =func_0203e7b4
ldr r2, _021797d8 ; =data_ov23_0217abc0
bl func_0204f8d4
bl __register_global_object
ldr r0, _021797dc ; =data_ov23_0217abec
ldr r1, _021797e0 ; =0x47524d47
ldr r2, _021797e4 ; =func_ov23_0216e8a8
@@ -15248,7 +15248,7 @@ func_ov23_02179698: ; 0x02179698
ldr r0, _021797dc ; =data_ov23_0217abec
ldr r1, _021797a4 ; =func_0203e7b4
ldr r2, _021797e8 ; =data_ov23_0217abe0
bl func_0204f8d4
bl __register_global_object
add sp, sp, #8
ldmia sp!, {r4, pc}
.align 2, 0
@@ -15289,7 +15289,7 @@ func_ov23_021797ec: ; 0x021797ec
ldr r0, _02179830 ; =data_ov23_0217ac0c
ldr r1, _0217983c ; =func_0203e7b4
ldr r2, _02179840 ; =data_ov23_0217ac00
bl func_0204f8d4
bl __register_global_object
ldr r1, _02179844 ; =data_02057200
ldr r0, _02179848 ; =data_ov23_02179ed8
ldr r2, [r1]
@@ -15320,7 +15320,7 @@ func_ov23_0217984c: ; 0x0217984c
ldr r0, _02179954 ; =data_ov23_0217ac2c
ldr r1, _02179960 ; =func_0203e7b4
ldr r2, _02179964 ; =data_ov23_0217ac20
bl func_0204f8d4
bl __register_global_object
mov ip, #1
str ip, [sp]
ldr r1, _02179968 ; =0x00001333
@@ -15373,7 +15373,7 @@ func_ov23_0217984c: ; 0x0217984c
ldr r0, _0217996c ; =data_ov23_0217a030
ldr r1, _02179970 ; =func_ov00_020cceec
ldr r2, _02179974 ; =data_ov23_0217ac40
bl func_0204f8d4
bl __register_global_object
add sp, sp, #0x84
ldmia sp!, {pc}
.align 2, 0
@@ -15414,7 +15414,7 @@ func_ov23_02179998: ; 0x02179998
ldr r0, _021799c4 ; =data_ov23_0217ac6c
ldr r1, _021799d0 ; =func_0203e7b4
ldr r2, _021799d4 ; =data_ov23_0217ac60
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov23_02179998
@@ -15437,7 +15437,7 @@ func_ov23_021799d8: ; 0x021799d8
ldr r0, _02179ae0 ; =data_ov23_0217ac8c
ldr r1, _02179aec ; =func_0203e7b4
ldr r2, _02179af0 ; =data_ov23_0217ac80
bl func_0204f8d4
bl __register_global_object
mov ip, #1
str ip, [sp]
mov r2, #2
@@ -15490,7 +15490,7 @@ func_ov23_021799d8: ; 0x021799d8
ldr r0, _02179afc ; =data_ov23_0217a3e0
ldr r1, _02179b00 ; =func_ov00_020cceec
ldr r2, _02179b04 ; =data_ov23_0217aca0
bl func_0204f8d4
bl __register_global_object
add sp, sp, #0x84
ldmia sp!, {pc}
.align 2, 0
@@ -15518,7 +15518,7 @@ func_ov23_02179b08: ; 0x02179b08
ldr r0, _02179b34 ; =data_ov23_0217acb8
ldr r1, _02179b40 ; =func_0203e7b4
ldr r2, _02179b44 ; =data_ov23_0217acac
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov23_02179b08
@@ -15539,7 +15539,7 @@ func_ov23_02179b48: ; 0x02179b48
ldr r0, _02179b70 ; =data_ov23_0217ace8
ldr r1, _02179b78 ; =func_0203ebc8
ldr r2, _02179b7c ; =data_ov23_0217acf0
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov23_02179b48
@@ -15559,7 +15559,7 @@ func_ov23_02179b80: ; 0x02179b80
ldr r0, _02179bd4 ; =data_ov23_0217acfc
ldr r1, _02179bdc ; =func_0203ebc8
ldr r2, _02179be0 ; =data_ov23_0217ad04
bl func_0204f8d4
bl __register_global_object
ldr ip, _02179be4 ; =0xfffffd9a
ldr r3, _02179be8 ; =data_ov23_0217a7b0
mov r0, #0
@@ -15570,7 +15570,7 @@ func_ov23_02179b80: ; 0x02179b80
str ip, [r3, #4]
rsb ip, ip, #0
str ip, [r3, #8]
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov23_02179b80
@@ -15596,7 +15596,7 @@ func_ov23_02179bf8: ; 0x02179bf8
ldr r0, _02179c24 ; =data_ov23_0217ad28
ldr r1, _02179c30 ; =func_0203e7b4
ldr r2, _02179c34 ; =data_ov23_0217ad1c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov23_02179bf8
@@ -15617,7 +15617,7 @@ func_ov23_02179c38: ; 0x02179c38
ldr r0, _02179c60 ; =data_ov23_0217ad3c
ldr r1, _02179c68 ; =func_0203ebc8
ldr r2, _02179c6c ; =data_ov23_0217ad44
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov23_02179c38
@@ -15637,7 +15637,7 @@ func_ov23_02179c70: ; 0x02179c70
ldr r0, _02179c98 ; =data_ov23_0217ad50
ldr r1, _02179ca0 ; =func_0203ebc8
ldr r2, _02179ca4 ; =data_ov23_0217ad58
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov23_02179c70
@@ -15657,7 +15657,7 @@ func_ov23_02179ca8: ; 0x02179ca8
ldr r0, _02179cd0 ; =data_ov23_0217ad64
ldr r1, _02179cd8 ; =func_0203ebc8
ldr r2, _02179cdc ; =data_ov23_0217ad6c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov23_02179ca8
asm/ov24.inc
+1 -1
View File
@@ -155,7 +155,7 @@
.extern func_0203ebc8
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
.extern __register_global_object
.extern func_ov00_02079e68
.extern func_ov00_0207a188
.extern func_ov00_0207a1c8
asm/ov24.s
+21 -21
View File
@@ -12047,7 +12047,7 @@ func_ov24_021773cc: ; 0x021773cc
ldr r1, _0217749c ; =func_ov24_021774a4
ldr r2, _021774a0 ; =data_ov24_0217b0dc
str ip, [r3, #0x30]
bl func_0204f8d4
bl __register_global_object
ldr r0, _02177490 ; =data_ov24_0217b0b8
ldr r1, [r0, #0x20]
orr r1, r1, #1
@@ -14998,7 +14998,7 @@ func_ov24_021795d0: ; 0x021795d0
ldr r0, _021795f8 ; =data_ov24_0217af60
ldr r1, _02179600 ; =func_0203ebc8
ldr r2, _02179604 ; =data_ov24_0217af68
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov24_021795d0
@@ -15019,7 +15019,7 @@ func_ov24_02179608: ; 0x02179608
ldr r0, _021796f4 ; =data_ov24_0217af80
ldr r1, _02179700 ; =func_0203e7b4
ldr r2, _02179704 ; =data_ov24_0217af74
bl func_0204f8d4
bl __register_global_object
ldr r3, _02179708 ; =data_ov24_021791d4
ldr r0, _0217970c ; =0x00001333
ldr r2, [r3]
@@ -15092,7 +15092,7 @@ func_ov24_02179714: ; 0x02179714
ldr r0, _02179764 ; =data_ov24_0217afa0
ldr r1, _02179770 ; =func_0203e7b4
ldr r2, _02179774 ; =data_ov24_0217af94
bl func_0204f8d4
bl __register_global_object
ldr r0, _02179778 ; =data_ov24_0217afc0
ldr r1, _0217977c ; =0x4d55544f
ldr r2, _02179780 ; =func_ov24_0216e92c
@@ -15101,7 +15101,7 @@ func_ov24_02179714: ; 0x02179714
ldr r0, _02179778 ; =data_ov24_0217afc0
ldr r1, _02179770 ; =func_0203e7b4
ldr r2, _02179784 ; =data_ov24_0217afb4
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov24_02179714
@@ -15126,7 +15126,7 @@ func_ov24_02179788: ; 0x02179788
ldr r0, _021797b0 ; =data_ov24_0217afd4
ldr r1, _021797b8 ; =func_0203ebc8
ldr r2, _021797bc ; =data_ov24_0217afdc
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov24_02179788
@@ -15148,7 +15148,7 @@ func_ov24_021797c0: ; 0x021797c0
ldr r0, _0217984c ; =data_ov24_0217aff4
ldr r1, _02179858 ; =func_0203e7b4
ldr r2, _0217985c ; =data_ov24_0217afe8
bl func_0204f8d4
bl __register_global_object
ldr r1, _02179860 ; =data_02057200
ldr r0, _02179864 ; =data_ov24_0217a1a8
ldr r2, [r1]
@@ -15196,7 +15196,7 @@ func_ov24_02179868: ; 0x02179868
ldr r0, _02179954 ; =data_ov24_0217b014
ldr r1, _02179960 ; =func_0203e7b4
ldr r2, _02179964 ; =data_ov24_0217b008
bl func_0204f8d4
bl __register_global_object
mov r1, #1
str r1, [sp]
str r1, [sp, #4]
@@ -15242,7 +15242,7 @@ func_ov24_02179868: ; 0x02179868
ldr r0, _02179968 ; =data_ov24_0217a38c
ldr r1, _0217996c ; =func_ov00_020cceec
ldr r2, _02179970 ; =data_ov24_0217b028
bl func_0204f8d4
bl __register_global_object
add sp, sp, #0x84
ldmia sp!, {pc}
.align 2, 0
@@ -15269,7 +15269,7 @@ func_ov24_02179974: ; 0x02179974
ldr r0, _02179a68 ; =data_ov24_0217b040
ldr r1, _02179a74 ; =func_0203e7b4
ldr r2, _02179a78 ; =data_ov24_0217b034
bl func_0204f8d4
bl __register_global_object
mov r1, #1
str r1, [sp]
str r1, [sp, #4]
@@ -15317,7 +15317,7 @@ func_ov24_02179974: ; 0x02179974
ldr r0, _02179a80 ; =data_ov24_0217a52c
ldr r1, _02179a84 ; =func_ov00_020cceec
ldr r2, _02179a88 ; =data_ov24_0217b054
bl func_0204f8d4
bl __register_global_object
add sp, sp, #0x84
ldmia sp!, {pc}
.align 2, 0
@@ -15345,7 +15345,7 @@ func_ov24_02179a8c: ; 0x02179a8c
ldr r0, _02179b80 ; =data_ov24_0217b06c
ldr r1, _02179b8c ; =func_0203e7b4
ldr r2, _02179b90 ; =data_ov24_0217b060
bl func_0204f8d4
bl __register_global_object
mov r1, #1
str r1, [sp]
str r1, [sp, #4]
@@ -15393,7 +15393,7 @@ func_ov24_02179a8c: ; 0x02179a8c
ldr r0, _02179b98 ; =data_ov24_0217a70c
ldr r1, _02179b9c ; =func_ov00_020cceec
ldr r2, _02179ba0 ; =data_ov24_0217b080
bl func_0204f8d4
bl __register_global_object
add sp, sp, #0x84
ldmia sp!, {pc}
.align 2, 0
@@ -15421,7 +15421,7 @@ func_ov24_02179ba4: ; 0x02179ba4
ldr r0, _02179c98 ; =data_ov24_0217b098
ldr r1, _02179ca4 ; =func_0203e7b4
ldr r2, _02179ca8 ; =data_ov24_0217b08c
bl func_0204f8d4
bl __register_global_object
mov r3, #0
str r3, [sp]
mov r1, #1
@@ -15469,7 +15469,7 @@ func_ov24_02179ba4: ; 0x02179ba4
ldr r0, _02179cb0 ; =data_ov24_0217a908
ldr r1, _02179cb4 ; =func_ov00_020cceec
ldr r2, _02179cb8 ; =data_ov24_0217b0ac
bl func_0204f8d4
bl __register_global_object
add sp, sp, #0x84
ldmia sp!, {pc}
.align 2, 0
@@ -15496,7 +15496,7 @@ func_ov24_02179cbc: ; 0x02179cbc
ldr r0, _02179ce8 ; =data_ov24_0217b0c4
ldr r1, _02179cf4 ; =func_0203e7b4
ldr r2, _02179cf8 ; =data_ov24_0217b0b8
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov24_02179cbc
@@ -15517,7 +15517,7 @@ func_ov24_02179cfc: ; 0x02179cfc
ldr r0, _02179d24 ; =data_ov24_0217b0ec
ldr r1, _02179d2c ; =func_0203ebc8
ldr r2, _02179d30 ; =data_ov24_0217b0f4
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov24_02179cfc
@@ -15537,7 +15537,7 @@ func_ov24_02179d34: ; 0x02179d34
ldr r0, _02179d5c ; =data_ov24_0217b100
ldr r1, _02179d64 ; =func_0203ebc8
ldr r2, _02179d68 ; =data_ov24_0217b108
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov24_02179d34
@@ -15558,7 +15558,7 @@ func_ov24_02179d6c: ; 0x02179d6c
ldr r0, _02179d98 ; =data_ov24_0217b120
ldr r1, _02179da4 ; =func_0203e7b4
ldr r2, _02179da8 ; =data_ov24_0217b114
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov24_02179d6c
@@ -15579,7 +15579,7 @@ func_ov24_02179dac: ; 0x02179dac
ldr r0, _02179dd4 ; =data_ov24_0217b134
ldr r1, _02179ddc ; =func_0203ebc8
ldr r2, _02179de0 ; =data_ov24_0217b13c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov24_02179dac
@@ -15599,7 +15599,7 @@ func_ov24_02179de4: ; 0x02179de4
ldr r0, _02179e0c ; =data_ov24_0217b148
ldr r1, _02179e14 ; =func_0203ebc8
ldr r2, _02179e18 ; =data_ov24_0217b150
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov24_02179de4
asm/ov25.inc
+1 -1
View File
@@ -154,7 +154,7 @@
.extern func_02042f68
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
.extern __register_global_object
.extern func_ov00_0207a1c8
.extern func_ov00_0207b2f0
.extern func_ov00_0207c1b0
asm/ov25.s
+15 -15
View File
@@ -12685,7 +12685,7 @@ func_ov25_0217809c: ; 0x0217809c
ldr r1, _021781c8 ; =func_ov25_021781d8
ldr r2, _021781cc ; =data_ov25_0217a994
str ip, [r3, #0x30]
bl func_0204f8d4
bl __register_global_object
ldr r0, _021781bc ; =data_ov25_0217a970
ldr r1, [r0, #0x20]
orr r1, r1, #1
@@ -14699,7 +14699,7 @@ func_ov25_02179680: ; 0x02179680
ldr r0, _02179760 ; =data_ov25_0217a88c
ldr r1, _0217976c ; =func_0203e7b4
ldr r2, _02179770 ; =data_ov25_0217a880
bl func_0204f8d4
bl __register_global_object
mov r3, #0
str r3, [sp]
mov r1, #1
@@ -14742,7 +14742,7 @@ func_ov25_02179680: ; 0x02179680
ldr r0, _02179778 ; =data_ov25_02179be0
ldr r1, _0217977c ; =func_ov00_020cceec
ldr r2, _02179780 ; =data_ov25_0217a8a0
bl func_0204f8d4
bl __register_global_object
add sp, sp, #0x84
ldmia sp!, {pc}
.align 2, 0
@@ -14769,7 +14769,7 @@ func_ov25_02179784: ; 0x02179784
ldr r0, _021797b0 ; =data_ov25_0217a8bc
ldr r1, _021797bc ; =func_0203e7b4
ldr r2, _021797c0 ; =data_ov25_0217a8b0
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov25_02179784
@@ -14791,7 +14791,7 @@ func_ov25_021797c4: ; 0x021797c4
ldr r0, _021797f0 ; =data_ov25_0217a8dc
ldr r1, _021797fc ; =func_0203e7b4
ldr r2, _02179800 ; =data_ov25_0217a8d0
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov25_021797c4
@@ -14813,7 +14813,7 @@ func_ov25_02179804: ; 0x02179804
ldr r0, _02179830 ; =data_ov25_0217a8fc
ldr r1, _0217983c ; =func_0203e7b4
ldr r2, _02179840 ; =data_ov25_0217a8f0
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov25_02179804
@@ -14835,7 +14835,7 @@ func_ov25_02179844: ; 0x02179844
ldr r0, _02179870 ; =data_ov25_0217a91c
ldr r1, _0217987c ; =func_0203e7b4
ldr r2, _02179880 ; =data_ov25_0217a910
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov25_02179844
@@ -14856,7 +14856,7 @@ func_ov25_02179884: ; 0x02179884
ldr r0, _021798ac ; =data_ov25_0217a930
ldr r1, _021798b4 ; =func_0203ebc8
ldr r2, _021798b8 ; =data_ov25_0217a938
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov25_02179884
@@ -14878,7 +14878,7 @@ func_ov25_021798bc: ; 0x021798bc
ldr r0, _021799a8 ; =data_ov25_0217a950
ldr r1, _021799b4 ; =func_0203e7b4
ldr r2, _021799b8 ; =data_ov25_0217a944
bl func_0204f8d4
bl __register_global_object
mov r1, #1
str r1, [sp]
ldr ip, _021799bc ; =0x00001b33
@@ -14924,7 +14924,7 @@ func_ov25_021798bc: ; 0x021798bc
ldr r0, _021799c0 ; =data_ov25_0217a238
ldr r1, _021799c4 ; =func_ov00_020cceec
ldr r2, _021799c8 ; =data_ov25_0217a964
bl func_0204f8d4
bl __register_global_object
add sp, sp, #0x84
ldmia sp!, {pc}
.align 2, 0
@@ -14951,7 +14951,7 @@ func_ov25_021799cc: ; 0x021799cc
ldr r0, _021799f8 ; =data_ov25_0217a97c
ldr r1, _02179a04 ; =func_0203e7b4
ldr r2, _02179a08 ; =data_ov25_0217a970
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov25_021799cc
@@ -14973,7 +14973,7 @@ func_ov25_02179a0c: ; 0x02179a0c
ldr r0, _02179a38 ; =data_ov25_0217a9b0
ldr r1, _02179a44 ; =func_0203e7b4
ldr r2, _02179a48 ; =data_ov25_0217a9a4
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov25_02179a0c
@@ -14995,7 +14995,7 @@ func_ov25_02179a4c: ; 0x02179a4c
ldr r0, _02179a78 ; =data_ov25_0217a9d0
ldr r1, _02179a84 ; =func_0203e7b4
ldr r2, _02179a88 ; =data_ov25_0217a9c4
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov25_02179a4c
@@ -15018,7 +15018,7 @@ func_ov25_02179a8c: ; 0x02179a8c
ldr r0, _02179b78 ; =data_ov25_0217a9f0
ldr r1, _02179b84 ; =func_0203e7b4
ldr r2, _02179b88 ; =data_ov25_0217a9e4
bl func_0204f8d4
bl __register_global_object
mov r1, #1
str r1, [sp]
str r1, [sp, #4]
@@ -15064,7 +15064,7 @@ func_ov25_02179a8c: ; 0x02179a8c
ldr r0, _02179b8c ; =data_ov25_0217a680
ldr r1, _02179b90 ; =func_ov00_020cceec
ldr r2, _02179b94 ; =data_ov25_0217aa04
bl func_0204f8d4
bl __register_global_object
add sp, sp, #0x84
ldmia sp!, {pc}
.align 2, 0
asm/ov26.inc
+12 -12
View File
@@ -6,6 +6,17 @@
.extern _ZN11ItemManager7AddItemEi
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bacEv
.extern _ZN14AdventureFlags18func_ov00_02097bccEv
.extern _ZN14AdventureFlags18func_ov00_02098058Ev
.extern _ZN14AdventureFlags18func_ov00_02098074Eisiib
.extern _ZN14AdventureFlags18func_ov00_0209809cEv
.extern _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags3SetEjb
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12ApplyGravityEv
@@ -63,6 +74,7 @@
.extern _ZNK11ItemManager18IsTreasureSalvagedEj
.extern _ZNK11ItemManager19GetActiveFairyLevelEi
.extern _ZNK11ItemManager7HasItemEi
.extern __register_global_object
.extern data_02050f54
.extern data_02056be4
.extern data_02063e4c
@@ -191,7 +203,6 @@
.extern func_0203fe60
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
.extern func_ov00_02079470
.extern func_ov00_02079680
.extern func_ov00_02079ab4
@@ -276,17 +287,6 @@
.extern func_ov00_02093af0
.extern func_ov00_02094824
.extern func_ov00_02094884
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags3SetEjb
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bacEv
.extern _ZN14AdventureFlags18func_ov00_02097bccEv
.extern _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi
.extern _ZN14AdventureFlags18func_ov00_02098058Ev
.extern _ZN14AdventureFlags18func_ov00_02098074Eisiib
.extern _ZN14AdventureFlags18func_ov00_0209809cEv
.extern func_ov00_0209a4f4
.extern func_ov00_0209a508
.extern func_ov00_0209d8d8
asm/ov26.s
+28 -28
View File
@@ -16221,7 +16221,7 @@ func_ov26_021797dc: ; 0x021797dc
ldr r0, _02179994 ; =data_ov26_0217b2cc
ldr r1, _021799a0 ; =func_0203e7b4
ldr r2, _021799a4 ; =data_ov26_0217b2c0
bl func_0204f8d4
bl __register_global_object
ldr r0, _021799a8 ; =data_ov26_0217b2ec
ldr r1, _021799ac ; =0x434d4e42
ldr r2, _021799b0 ; =func_ov26_0216d7c0
@@ -16230,7 +16230,7 @@ func_ov26_021797dc: ; 0x021797dc
ldr r0, _021799a8 ; =data_ov26_0217b2ec
ldr r1, _021799a0 ; =func_0203e7b4
ldr r2, _021799b4 ; =data_ov26_0217b2e0
bl func_0204f8d4
bl __register_global_object
ldr r0, _021799b8 ; =data_ov26_0217b30c
ldr r1, _021799bc ; =0x43574d4e
ldr r2, _021799c0 ; =func_ov26_0216d800
@@ -16239,7 +16239,7 @@ func_ov26_021797dc: ; 0x021797dc
ldr r0, _021799b8 ; =data_ov26_0217b30c
ldr r1, _021799a0 ; =func_0203e7b4
ldr r2, _021799c4 ; =data_ov26_0217b300
bl func_0204f8d4
bl __register_global_object
ldr r0, _021799c8 ; =data_ov26_0217b32c
ldr r1, _021799cc ; =0x43574d42
ldr r2, _021799d0 ; =func_ov26_0216d840
@@ -16248,7 +16248,7 @@ func_ov26_021797dc: ; 0x021797dc
ldr r0, _021799c8 ; =data_ov26_0217b32c
ldr r1, _021799a0 ; =func_0203e7b4
ldr r2, _021799d4 ; =data_ov26_0217b320
bl func_0204f8d4
bl __register_global_object
ldr r0, _021799d8 ; =data_ov26_0217b34c
ldr r1, _021799dc ; =0x43574d43
ldr r2, _021799e0 ; =func_ov26_0216d880
@@ -16257,7 +16257,7 @@ func_ov26_021797dc: ; 0x021797dc
ldr r0, _021799d8 ; =data_ov26_0217b34c
ldr r1, _021799a0 ; =func_0203e7b4
ldr r2, _021799e4 ; =data_ov26_0217b340
bl func_0204f8d4
bl __register_global_object
ldr r0, _021799e8 ; =data_ov26_0217b36c
ldr r1, _021799ec ; =0x434f4d41
ldr r2, _021799f0 ; =func_ov26_0216d8c0
@@ -16266,7 +16266,7 @@ func_ov26_021797dc: ; 0x021797dc
ldr r0, _021799e8 ; =data_ov26_0217b36c
ldr r1, _021799a0 ; =func_0203e7b4
ldr r2, _021799f4 ; =data_ov26_0217b360
bl func_0204f8d4
bl __register_global_object
ldr r0, _021799f8 ; =data_ov26_0217b38c
ldr r1, _021799fc ; =0x434f4d42
ldr r2, _02179a00 ; =func_ov26_0216d900
@@ -16275,7 +16275,7 @@ func_ov26_021797dc: ; 0x021797dc
ldr r0, _021799f8 ; =data_ov26_0217b38c
ldr r1, _021799a0 ; =func_0203e7b4
ldr r2, _02179a04 ; =data_ov26_0217b380
bl func_0204f8d4
bl __register_global_object
ldr r0, _02179a08 ; =data_ov26_0217b3ac
ldr r1, _02179a0c ; =0x434d4547
ldr r2, _02179a10 ; =func_ov26_0216d940
@@ -16284,7 +16284,7 @@ func_ov26_021797dc: ; 0x021797dc
ldr r0, _02179a08 ; =data_ov26_0217b3ac
ldr r1, _021799a0 ; =func_0203e7b4
ldr r2, _02179a14 ; =data_ov26_0217b3a0
bl func_0204f8d4
bl __register_global_object
ldr r0, _02179a18 ; =data_ov26_0217b3cc
ldr r1, _02179a1c ; =0x434d4e43
ldr r2, _02179a20 ; =func_ov26_0216dabc
@@ -16293,7 +16293,7 @@ func_ov26_021797dc: ; 0x021797dc
ldr r0, _02179a18 ; =data_ov26_0217b3cc
ldr r1, _021799a0 ; =func_0203e7b4
ldr r2, _02179a24 ; =data_ov26_0217b3c0
bl func_0204f8d4
bl __register_global_object
ldr r0, _02179a28 ; =data_ov26_0217b3ec
ldr r1, _02179a2c ; =0x434f4153
ldr r2, _02179a30 ; =func_ov26_0216dba0
@@ -16302,7 +16302,7 @@ func_ov26_021797dc: ; 0x021797dc
ldr r0, _02179a28 ; =data_ov26_0217b3ec
ldr r1, _021799a0 ; =func_0203e7b4
ldr r2, _02179a34 ; =data_ov26_0217b3e0
bl func_0204f8d4
bl __register_global_object
ldr r0, _02179a38 ; =data_ov26_0217b40c
ldr r1, _02179a3c ; =0x434f4253
ldr r2, _02179a40 ; =func_ov26_0216dbe0
@@ -16311,7 +16311,7 @@ func_ov26_021797dc: ; 0x021797dc
ldr r0, _02179a38 ; =data_ov26_0217b40c
ldr r1, _021799a0 ; =func_0203e7b4
ldr r2, _02179a44 ; =data_ov26_0217b400
bl func_0204f8d4
bl __register_global_object
ldr r0, _02179a48 ; =data_ov26_0217b42c
ldr r1, _02179a4c ; =0x424d5354
ldr r2, _02179a50 ; =func_ov26_0216dd64
@@ -16320,7 +16320,7 @@ func_ov26_021797dc: ; 0x021797dc
ldr r0, _02179a48 ; =data_ov26_0217b42c
ldr r1, _021799a0 ; =func_0203e7b4
ldr r2, _02179a54 ; =data_ov26_0217b420
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov26_021797dc
@@ -16385,7 +16385,7 @@ func_ov26_02179a58: ; 0x02179a58
ldr r0, _02179a80 ; =data_ov26_0217b440
ldr r1, _02179a88 ; =func_0203ebc8
ldr r2, _02179a8c ; =data_ov26_0217b448
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov26_02179a58
@@ -16407,7 +16407,7 @@ func_ov26_02179a90: ; 0x02179a90
ldr r0, _02179b88 ; =data_ov26_0217b460
ldr r1, _02179b94 ; =func_0203e7b4
ldr r2, _02179b98 ; =data_ov26_0217b454
bl func_0204f8d4
bl __register_global_object
mov r2, #0
str r2, [sp]
str r2, [sp, #4]
@@ -16456,7 +16456,7 @@ func_ov26_02179a90: ; 0x02179a90
ldr r0, _02179ba0 ; =data_ov26_0217a67c
ldr r1, _02179ba4 ; =func_ov00_020cceec
ldr r2, _02179ba8 ; =data_ov26_0217b474
bl func_0204f8d4
bl __register_global_object
add sp, sp, #0x84
ldmia sp!, {pc}
.align 2, 0
@@ -16482,7 +16482,7 @@ func_ov26_02179bac: ; 0x02179bac
ldr r0, _02179bd4 ; =data_ov26_0217b48c
ldr r1, _02179bdc ; =func_0203ebc8
ldr r2, _02179be0 ; =data_ov26_0217b480
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov26_02179bac
@@ -16502,7 +16502,7 @@ func_ov26_02179be4: ; 0x02179be4
ldr r0, _02179c0c ; =data_ov26_0217b494
ldr r1, _02179c14 ; =func_0203ebc8
ldr r2, _02179c18 ; =data_ov26_0217b49c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov26_02179be4
@@ -16522,7 +16522,7 @@ func_ov26_02179c1c: ; 0x02179c1c
ldr r0, _02179c44 ; =data_ov26_0217b4b4
ldr r1, _02179c4c ; =func_0203ebc8
ldr r2, _02179c50 ; =data_ov26_0217b4a8
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov26_02179c1c
@@ -16542,7 +16542,7 @@ func_ov26_02179c54: ; 0x02179c54
ldr r0, _02179c7c ; =data_ov26_0217b4c8
ldr r1, _02179c84 ; =func_0203ebc8
ldr r2, _02179c88 ; =data_ov26_0217b4bc
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov26_02179c54
@@ -16562,7 +16562,7 @@ func_ov26_02179c8c: ; 0x02179c8c
ldr r0, _02179cf8 ; =data_ov26_0217b4d0
ldr r1, _02179d00 ; =func_0203ebc8
ldr r2, _02179d04 ; =data_ov26_0217b4d8
bl func_0204f8d4
bl __register_global_object
ldr r1, _02179d08 ; =data_ov26_0217ad44
ldr r3, _02179d0c ; =data_ov26_0217b4d0
mov r0, #0x7b
@@ -16579,7 +16579,7 @@ func_ov26_02179c8c: ; 0x02179c8c
ldr r1, _02179d18 ; =func_ov26_02175f00
ldr r2, _02179d1c ; =data_ov26_0217b4e4
str ip, [r3, #0x20]
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov26_02179c8c
@@ -16605,7 +16605,7 @@ func_ov26_02179d20: ; 0x02179d20
ldr r0, _02179d48 ; =data_ov26_0217b500
ldr r1, _02179d50 ; =func_0203ebc8
ldr r2, _02179d54 ; =data_ov26_0217b508
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov26_02179d20
@@ -16625,7 +16625,7 @@ func_ov26_02179d58: ; 0x02179d58
ldr r0, _02179d80 ; =data_ov26_0217b514
ldr r1, _02179d88 ; =func_0203ebc8
ldr r2, _02179d8c ; =data_ov26_0217b51c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov26_02179d58
@@ -16646,7 +16646,7 @@ func_ov26_02179d90: ; 0x02179d90
ldr r0, _02179dc8 ; =data_ov26_0217b534
ldr r1, _02179dd4 ; =func_0203e7b4
ldr r2, _02179dd8 ; =data_ov26_0217b528
bl func_0204f8d4
bl __register_global_object
ldr r1, _02179ddc ; =0x000005b6
ldr r0, _02179de0 ; =data_ov26_0217aea4
str r1, [r0]
@@ -16673,7 +16673,7 @@ func_ov26_02179de4: ; 0x02179de4
ldr r0, _02179f14 ; =data_ov26_0217b554
ldr r1, _02179f20 ; =func_0203e7b4
ldr r2, _02179f24 ; =data_ov26_0217b548
bl func_0204f8d4
bl __register_global_object
ldr r1, _02179f28 ; =data_ov26_0217af64
mov r9, #0
strb r9, [r1]
@@ -16778,7 +16778,7 @@ func_ov26_02179f70: ; 0x02179f70
ldr r0, _02179f9c ; =data_ov26_0217b574
ldr r1, _02179fa8 ; =func_0203e7b4
ldr r2, _02179fac ; =data_ov26_0217b568
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov26_02179f70
@@ -16799,7 +16799,7 @@ func_ov26_02179fb0: ; 0x02179fb0
ldr r0, _02179fd8 ; =data_ov26_0217b58c
ldr r1, _02179fe0 ; =func_0203ebc8
ldr r2, _02179fe4 ; =data_ov26_0217b594
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov26_02179fb0
@@ -16819,7 +16819,7 @@ func_ov26_02179fe8: ; 0x02179fe8
ldr r0, _0217a010 ; =data_ov26_0217b5a0
ldr r1, _0217a018 ; =func_0203ebc8
ldr r2, _0217a01c ; =data_ov26_0217b5a8
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov26_02179fe8
asm/ov27.inc
+1 -1
View File
@@ -165,7 +165,7 @@
.extern func_0203ebc8
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
.extern __register_global_object
.extern func_ov00_0207ba90
.extern func_ov00_0207c1b0
.extern func_ov00_0207c1f8
asm/ov27.s
+8 -8
View File
@@ -14198,7 +14198,7 @@ func_ov27_0217913c: ; 0x0217913c
ldr r0, _02179174 ; =data_ov27_0217a0cc
ldr r1, _02179180 ; =func_0203e7b4
ldr r2, _02179184 ; =data_ov27_0217a0c0
bl func_0204f8d4
bl __register_global_object
ldr r1, _02179188 ; =0x0000019b
ldr r0, _0217918c ; =data_ov27_021794c0
str r1, [r0, #0x20]
@@ -14225,7 +14225,7 @@ func_ov27_02179190: ; 0x02179190
ldr r0, _021791bc ; =data_ov27_0217a0ec
ldr r1, _021791c8 ; =func_0203e7b4
ldr r2, _021791cc ; =data_ov27_0217a0e0
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov27_02179190
@@ -14247,7 +14247,7 @@ func_ov27_021791d0: ; 0x021791d0
ldr r0, _021791fc ; =data_ov27_0217a10c
ldr r1, _02179208 ; =func_0203e7b4
ldr r2, _0217920c ; =data_ov27_0217a100
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov27_021791d0
@@ -14270,7 +14270,7 @@ func_ov27_02179210: ; 0x02179210
ldr r0, _02179284 ; =data_ov27_0217a12c
ldr r1, _02179290 ; =func_0203e7b4
ldr r2, _02179294 ; =data_ov27_0217a120
bl func_0204f8d4
bl __register_global_object
ldr r1, _02179298 ; =data_02057200
ldr r0, _0217929c ; =data_ov27_021798ec
ldr r2, [r1]
@@ -14311,7 +14311,7 @@ func_ov27_021792a0: ; 0x021792a0
ldr r0, _021792cc ; =data_ov27_0217a14c
ldr r1, _021792d8 ; =func_0203e7b4
ldr r2, _021792dc ; =data_ov27_0217a140
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov27_021792a0
@@ -14334,7 +14334,7 @@ func_ov27_021792e0: ; 0x021792e0
ldr r0, _0217939c ; =data_ov27_0217a16c
ldr r1, _021793a8 ; =func_0203e7b4
ldr r2, _021793ac ; =data_ov27_0217a160
bl func_0204f8d4
bl __register_global_object
ldr r1, _021793b0 ; =data_02057200
ldr r0, _021793b4 ; =data_ov27_02179bc4
ldr r2, [r1]
@@ -14395,7 +14395,7 @@ func_ov27_021793bc: ; 0x021793bc
ldr r0, _02179420 ; =data_ov27_0217a18c
ldr r1, _0217942c ; =func_0203e7b4
ldr r2, _02179430 ; =data_ov27_0217a180
bl func_0204f8d4
bl __register_global_object
ldr r1, _02179434 ; =data_02057200
ldr r0, _02179438 ; =data_ov27_02179e6c
ldr r2, [r1]
@@ -14431,7 +14431,7 @@ func_ov27_0217943c: ; 0x0217943c
ldr r0, _02179464 ; =data_ov27_0217a1a0
ldr r1, _0217946c ; =func_0203ebc8
ldr r2, _02179470 ; =data_ov27_0217a1a8
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov27_0217943c
asm/ov28.inc
+1 -1
View File
@@ -155,7 +155,7 @@
.extern func_0203ebc8
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
.extern __register_global_object
.extern func_ov00_0207a1c8
.extern func_ov00_0207c1b0
.extern func_ov00_0207c1f8
asm/ov28.s
+15 -15
View File
@@ -13875,7 +13875,7 @@ func_ov28_02178504: ; 0x02178504
ldr r0, _02178530 ; =data_ov28_02179b0c
ldr r1, _0217853c ; =func_0203e7b4
ldr r2, _02178540 ; =data_ov28_02179b00
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov28_02178504
@@ -13897,7 +13897,7 @@ func_ov28_02178544: ; 0x02178544
ldr r0, _021785dc ; =data_ov28_02179b30
ldr r1, _021785e8 ; =func_0203e7b4
ldr r2, _021785ec ; =data_ov28_02179b24
bl func_0204f8d4
bl __register_global_object
ldr r0, _021785f0 ; =data_ov28_02179b50
ldr r1, _021785f4 ; =0x4d4e5254
ldr r2, _021785f8 ; =func_ov28_02170008
@@ -13906,7 +13906,7 @@ func_ov28_02178544: ; 0x02178544
ldr r0, _021785f0 ; =data_ov28_02179b50
ldr r1, _021785e8 ; =func_0203e7b4
ldr r2, _021785fc ; =data_ov28_02179b44
bl func_0204f8d4
bl __register_global_object
ldr r0, _02178600 ; =data_ov28_02179b70
ldr r1, _02178604 ; =0x46554a49
ldr r2, _02178608 ; =func_ov28_02170434
@@ -13915,7 +13915,7 @@ func_ov28_02178544: ; 0x02178544
ldr r0, _02178600 ; =data_ov28_02179b70
ldr r1, _021785e8 ; =func_0203e7b4
ldr r2, _0217860c ; =data_ov28_02179b64
bl func_0204f8d4
bl __register_global_object
ldr r0, _02178610 ; =data_ov28_02179b90
ldr r1, _02178614 ; =0x43484d54
ldr r2, _02178618 ; =func_ov28_02170644
@@ -13924,7 +13924,7 @@ func_ov28_02178544: ; 0x02178544
ldr r0, _02178610 ; =data_ov28_02179b90
ldr r1, _021785e8 ; =func_0203e7b4
ldr r2, _0217861c ; =data_ov28_02179b84
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov28_02178544
@@ -13958,7 +13958,7 @@ func_ov28_02178620: ; 0x02178620
ldr r0, _0217864c ; =data_ov28_02179bb0
ldr r1, _02178658 ; =func_0203e7b4
ldr r2, _0217865c ; =data_ov28_02179ba4
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov28_02178620
@@ -13979,7 +13979,7 @@ func_ov28_02178660: ; 0x02178660
ldr r0, _02178688 ; =data_ov28_02179bc4
ldr r1, _02178690 ; =func_0203ebc8
ldr r2, _02178694 ; =data_ov28_02179bcc
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov28_02178660
@@ -13999,7 +13999,7 @@ func_ov28_02178698: ; 0x02178698
ldr r0, _021786c0 ; =data_ov28_02179bd8
ldr r1, _021786c8 ; =func_0203ebc8
ldr r2, _021786cc ; =data_ov28_02179be0
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov28_02178698
@@ -14020,7 +14020,7 @@ func_ov28_021786d0: ; 0x021786d0
ldr r0, _021786fc ; =data_ov28_02179bf8
ldr r1, _02178708 ; =func_0203e7b4
ldr r2, _0217870c ; =data_ov28_02179bec
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov28_021786d0
@@ -14042,7 +14042,7 @@ func_ov28_02178710: ; 0x02178710
ldr r0, _0217873c ; =data_ov28_02179c18
ldr r1, _02178748 ; =func_0203e7b4
ldr r2, _0217874c ; =data_ov28_02179c0c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov28_02178710
@@ -14064,7 +14064,7 @@ func_ov28_02178750: ; 0x02178750
ldr r0, _0217877c ; =data_ov28_02179c3c
ldr r1, _02178788 ; =func_0203e7b4
ldr r2, _0217878c ; =data_ov28_02179c30
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov28_02178750
@@ -14086,7 +14086,7 @@ func_ov28_02178790: ; 0x02178790
ldr r0, _021787bc ; =data_ov28_02179c60
ldr r1, _021787c8 ; =func_0203e7b4
ldr r2, _021787cc ; =data_ov28_02179c54
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov28_02178790
@@ -14108,7 +14108,7 @@ func_ov28_021787d0: ; 0x021787d0
ldr r0, _021787fc ; =data_ov28_02179c84
ldr r1, _02178808 ; =func_0203e7b4
ldr r2, _0217880c ; =data_ov28_02179c78
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov28_021787d0
@@ -14130,7 +14130,7 @@ func_ov28_02178810: ; 0x02178810
ldr r0, _0217883c ; =data_ov28_02179ca4
ldr r1, _0217884c ; =func_0203e7b4
ldr r2, _02178850 ; =data_ov28_02179c98
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov28_02178810
@@ -14153,7 +14153,7 @@ func_ov28_02178854: ; 0x02178854
ldr r0, _02178880 ; =data_ov28_02179cc4
ldr r1, _0217888c ; =func_0203e7b4
ldr r2, _02178890 ; =data_ov28_02179cb8
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov28_02178854
asm/ov29.inc
+1 -1
View File
@@ -175,7 +175,7 @@
.extern func_0203ebc8
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
.extern __register_global_object
.extern func_ov00_02079e68
.extern func_ov00_0207a1c8
.extern func_ov00_0207b89c
asm/ov29.s
+14 -14
View File
@@ -14264,7 +14264,7 @@ func_ov29_021794b0: ; 0x021794b0
ldr r0, _021794d0 ; =data_ov29_0217a4ac
ldr r1, _021794d4 ; =func_ov29_0216dc38
ldr r2, _021794d8 ; =data_ov29_0217a4a0
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov29_021794b0
@@ -14284,7 +14284,7 @@ func_ov29_021794dc: ; 0x021794dc
ldr r0, _02179560 ; =data_ov29_0217a5c0
ldr r1, _0217956c ; =func_0203e7b4
ldr r2, _02179570 ; =data_ov29_0217a5b4
bl func_0204f8d4
bl __register_global_object
ldr r3, _02179574 ; =data_ov29_021798e8
mov r0, #0x7000
str r0, [r3]
@@ -14295,7 +14295,7 @@ func_ov29_021794dc: ; 0x021794dc
str ip, [r3, #4]
mov ip, #0xb000
str ip, [r3, #8]
bl func_0204f8d4
bl __register_global_object
ldr r3, _02179574 ; =data_ov29_021798e8
mov r0, #0xb000
str r0, [r3, #0xc]
@@ -14306,7 +14306,7 @@ func_ov29_021794dc: ; 0x021794dc
str ip, [r3, #0x10]
mov ip, #0x7000
str ip, [r3, #0x14]
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov29_021794dc
@@ -14334,7 +14334,7 @@ func_ov29_0217958c: ; 0x0217958c
ldr r0, _021795b8 ; =data_ov29_0217a5f8
ldr r1, _021795c4 ; =func_0203e7b4
ldr r2, _021795c8 ; =data_ov29_0217a5ec
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov29_0217958c
@@ -14356,7 +14356,7 @@ func_ov29_021795cc: ; 0x021795cc
ldr r0, _021795f8 ; =data_ov29_0217a618
ldr r1, _02179604 ; =func_0203e7b4
ldr r2, _02179608 ; =data_ov29_0217a60c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov29_021795cc
@@ -14378,7 +14378,7 @@ func_ov29_0217960c: ; 0x0217960c
ldr r0, _02179638 ; =data_ov29_0217bc3c
ldr r1, _02179644 ; =func_0203e7b4
ldr r2, _02179648 ; =data_ov29_0217bc30
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov29_0217960c
@@ -14400,7 +14400,7 @@ func_ov29_0217964c: ; 0x0217964c
ldr r0, _02179678 ; =data_ov29_0217bc64
ldr r1, _02179684 ; =func_0203e7b4
ldr r2, _02179688 ; =data_ov29_0217bc58
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov29_0217964c
@@ -14422,7 +14422,7 @@ func_ov29_0217968c: ; 0x0217968c
ldr r0, _021796b8 ; =data_ov29_0217bc84
ldr r1, _021796c4 ; =func_0203e7b4
ldr r2, _021796c8 ; =data_ov29_0217bc78
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov29_0217968c
@@ -14443,7 +14443,7 @@ func_ov29_021796cc: ; 0x021796cc
ldr r0, _021796f4 ; =data_ov29_0217bca4
ldr r1, _021796fc ; =func_0203ebc8
ldr r2, _02179700 ; =data_ov29_0217bcac
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov29_021796cc
@@ -14464,7 +14464,7 @@ func_ov29_02179704: ; 0x02179704
ldr r0, _02179730 ; =data_ov29_0217bcc4
ldr r1, _0217973c ; =func_0203e7b4
ldr r2, _02179740 ; =data_ov29_0217bcb8
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov29_02179704
@@ -14498,7 +14498,7 @@ func_ov29_0217975c: ; 0x0217975c
ldr r0, _02179788 ; =data_ov29_0217bd14
ldr r1, _02179794 ; =func_0203e7b4
ldr r2, _02179798 ; =data_ov29_0217bd08
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov29_0217975c
@@ -14520,7 +14520,7 @@ func_ov29_0217979c: ; 0x0217979c
ldr r0, _021797c8 ; =data_ov29_0217bd38
ldr r1, _021797d4 ; =func_0203e7b4
ldr r2, _021797d8 ; =data_ov29_0217bd2c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov29_0217979c
@@ -14544,7 +14544,7 @@ func_ov29_021797dc: ; 0x021797dc
ldr r0, _02179814 ; =data_ov29_0217bd5c
ldr r1, _0217981c ; =func_ov29_02179214
ldr r2, _02179820 ; =data_ov29_0217bd50
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov29_021797dc
asm/ov30.inc
+4 -4
View File
@@ -5,6 +5,9 @@
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN14AdventureFlags18func_ov00_02098058Ev
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags3SetEjb
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
@@ -70,6 +73,7 @@
.extern _ZNK11ItemManager19GetActiveFairyLevelEi
.extern _ZNK11ItemManager7HasItemEi
.extern _ZTV11FilterActor
.extern __register_global_object
.extern data_02050f54
.extern data_02063e4c
.extern data_027e0764
@@ -131,7 +135,6 @@
.extern func_0203e7b4
.extern func_0204f558
.extern func_0204f754
.extern func_0204f8d4
.extern func_ov00_02079470
.extern func_ov00_0207c1b0
.extern func_ov00_0207c1f8
@@ -148,9 +151,6 @@
.extern func_ov00_02087d34
.extern func_ov00_020884b4
.extern func_ov00_02093a1c
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags3SetEjb
.extern _ZN14AdventureFlags18func_ov00_02098058Ev
.extern func_ov00_0209a4f4
.extern func_ov00_0209a508
.extern func_ov00_020a5e9c
asm/ov30.s
+6 -6
View File
@@ -16200,7 +16200,7 @@ func_ov30_02188824: ; 0x02188824
ldr r0, _02188988 ; =data_ov30_021894ac
ldr r1, _02188998 ; =func_0203e7b4
ldr r2, _0218899c ; =data_ov30_021894a0
bl func_0204f8d4
bl __register_global_object
ldr r0, _021889a0 ; =data_ov30_021894cc
ldr r1, _021889a4 ; =0x43485332
ldr r2, _021889a8 ; =func_ov30_0218066c
@@ -16209,7 +16209,7 @@ func_ov30_02188824: ; 0x02188824
ldr r0, _021889a0 ; =data_ov30_021894cc
ldr r1, _02188998 ; =func_0203e7b4
ldr r2, _021889b0 ; =data_ov30_021894c0
bl func_0204f8d4
bl __register_global_object
ldr r0, _021889b4 ; =data_ov30_021894ec
ldr r1, _021889b8 ; =0x43485336
ldr r2, _021889bc ; =func_ov30_021806b0
@@ -16218,7 +16218,7 @@ func_ov30_02188824: ; 0x02188824
ldr r0, _021889b4 ; =data_ov30_021894ec
ldr r1, _02188998 ; =func_0203e7b4
ldr r2, _021889c4 ; =data_ov30_021894e0
bl func_0204f8d4
bl __register_global_object
ldr r0, _021889c8 ; =data_ov30_0218950c
ldr r1, _021889cc ; =0x43485334
ldr r2, _021889d0 ; =func_ov30_021806f4
@@ -16227,7 +16227,7 @@ func_ov30_02188824: ; 0x02188824
ldr r0, _021889c8 ; =data_ov30_0218950c
ldr r1, _02188998 ; =func_0203e7b4
ldr r2, _021889d8 ; =data_ov30_02189500
bl func_0204f8d4
bl __register_global_object
mov lr, #0
str lr, [sp]
str lr, [sp, #4]
@@ -16276,7 +16276,7 @@ func_ov30_02188824: ; 0x02188824
ldr r0, _021889e0 ; =data_ov30_02188c9c
ldr r1, _021889e4 ; =func_ov00_020cceec
ldr r2, _021889e8 ; =data_ov30_02189520
bl func_0204f8d4
bl __register_global_object
add sp, sp, #0x84
ldmia sp!, {pc}
.align 2, 0
@@ -16319,7 +16319,7 @@ func_ov30_021889ec: ; 0x021889ec
ldr r0, _02188a18 ; =data_ov30_0218953c
ldr r1, _02188a24 ; =func_0203e7b4
ldr r2, _02188a28 ; =data_ov30_02189530
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov30_021889ec
asm/ov31.inc
+1 -1
View File
@@ -62,6 +62,7 @@
.extern _ZNK11ItemManager19GetMaxTreasureCountEv
.extern _ZNK11ItemManager7GetAmmoEi
.extern _ZNK11ItemManager7HasItemEi
.extern __register_global_object
.extern data_02050f54
.extern data_0205785c
.extern data_02057878
@@ -145,7 +146,6 @@
.extern func_02039250
.extern func_0203e784
.extern func_0203e7b4
.extern func_0204f8d4
.extern func_ov00_02079e68
.extern func_ov00_02079ed8
.extern func_ov00_02079f3c
asm/ov31.s
+22 -22
View File
@@ -8224,7 +8224,7 @@ func_ov31_02181b6c: ; 0x02181b6c
ldr r0, _02181e40 ; =data_ov31_02183e94
ldr r1, _02181e4c ; =func_0203e7b4
ldr r2, _02181e50 ; =data_ov31_02183e88
bl func_0204f8d4
bl __register_global_object
ldr r0, _02181e54 ; =data_ov31_02183eb4
ldr r1, _02181e58 ; =0x4954534f
ldr r2, _02181e5c ; =func_ov31_0217dc1c
@@ -8233,7 +8233,7 @@ func_ov31_02181b6c: ; 0x02181b6c
ldr r0, _02181e54 ; =data_ov31_02183eb4
ldr r1, _02181e4c ; =func_0203e7b4
ldr r2, _02181e60 ; =data_ov31_02183ea8
bl func_0204f8d4
bl __register_global_object
ldr r0, _02181e64 ; =data_ov31_02183ed4
ldr r1, _02181e68 ; =0x49544855
ldr r2, _02181e6c ; =func_ov31_0217dc5c
@@ -8242,7 +8242,7 @@ func_ov31_02181b6c: ; 0x02181b6c
ldr r0, _02181e64 ; =data_ov31_02183ed4
ldr r1, _02181e4c ; =func_0203e7b4
ldr r2, _02181e70 ; =data_ov31_02183ec8
bl func_0204f8d4
bl __register_global_object
ldr r0, _02181e74 ; =data_ov31_02183ef4
ldr r1, _02181e78 ; =0x49544152
ldr r2, _02181e7c ; =func_ov31_0217dc9c
@@ -8251,7 +8251,7 @@ func_ov31_02181b6c: ; 0x02181b6c
ldr r0, _02181e74 ; =data_ov31_02183ef4
ldr r1, _02181e4c ; =func_0203e7b4
ldr r2, _02181e80 ; =data_ov31_02183ee8
bl func_0204f8d4
bl __register_global_object
ldr r0, _02181e84 ; =data_ov31_02183f14
ldr r1, _02181e88 ; =0x4954424d
ldr r2, _02181e8c ; =func_ov31_0217dcdc
@@ -8260,7 +8260,7 @@ func_ov31_02181b6c: ; 0x02181b6c
ldr r0, _02181e84 ; =data_ov31_02183f14
ldr r1, _02181e4c ; =func_0203e7b4
ldr r2, _02181e90 ; =data_ov31_02183f08
bl func_0204f8d4
bl __register_global_object
ldr r0, _02181e94 ; =data_ov31_02183f34
ldr r1, _02181e98 ; =0x49544254
ldr r2, _02181e9c ; =func_ov31_0217dd1c
@@ -8269,7 +8269,7 @@ func_ov31_02181b6c: ; 0x02181b6c
ldr r0, _02181e94 ; =data_ov31_02183f34
ldr r1, _02181e4c ; =func_0203e7b4
ldr r2, _02181ea0 ; =data_ov31_02183f28
bl func_0204f8d4
bl __register_global_object
ldr r0, _02181ea4 ; =data_ov31_02183f54
ldr r1, _02181ea8 ; =0x49544150
ldr r2, _02181eac ; =func_ov31_0217dd5c
@@ -8278,7 +8278,7 @@ func_ov31_02181b6c: ; 0x02181b6c
ldr r0, _02181ea4 ; =data_ov31_02183f54
ldr r1, _02181e4c ; =func_0203e7b4
ldr r2, _02181eb0 ; =data_ov31_02183f48
bl func_0204f8d4
bl __register_global_object
ldr r0, _02181eb4 ; =data_ov31_02183f74
ldr r1, _02181eb8 ; =0x49544242
ldr r2, _02181ebc ; =func_ov31_0217dd9c
@@ -8287,7 +8287,7 @@ func_ov31_02181b6c: ; 0x02181b6c
ldr r0, _02181eb4 ; =data_ov31_02183f74
ldr r1, _02181e4c ; =func_0203e7b4
ldr r2, _02181ec0 ; =data_ov31_02183f68
bl func_0204f8d4
bl __register_global_object
ldr r0, _02181ec4 ; =data_ov31_02183f94
ldr r1, _02181ec8 ; =0x49544232
ldr r2, _02181ecc ; =func_ov31_0217dddc
@@ -8296,7 +8296,7 @@ func_ov31_02181b6c: ; 0x02181b6c
ldr r0, _02181ec4 ; =data_ov31_02183f94
ldr r1, _02181e4c ; =func_0203e7b4
ldr r2, _02181ed0 ; =data_ov31_02183f88
bl func_0204f8d4
bl __register_global_object
ldr r0, _02181ed4 ; =data_ov31_02183fb4
ldr r1, _02181ed8 ; =0x49545452
ldr r2, _02181edc ; =func_ov31_0217de1c
@@ -8305,7 +8305,7 @@ func_ov31_02181b6c: ; 0x02181b6c
ldr r0, _02181ed4 ; =data_ov31_02183fb4
ldr r1, _02181e4c ; =func_0203e7b4
ldr r2, _02181ee0 ; =data_ov31_02183fa8
bl func_0204f8d4
bl __register_global_object
ldr r0, _02181ee4 ; =data_ov31_02183fd4
ldr r1, _02181ee8 ; =0x49545350
ldr r2, _02181eec ; =func_ov31_0217de4c
@@ -8314,7 +8314,7 @@ func_ov31_02181b6c: ; 0x02181b6c
ldr r0, _02181ee4 ; =data_ov31_02183fd4
ldr r1, _02181e4c ; =func_0203e7b4
ldr r2, _02181ef0 ; =data_ov31_02183fc8
bl func_0204f8d4
bl __register_global_object
ldr r0, _02181ef4 ; =data_ov31_02183ff4
ldr r1, _02181ef8 ; =0x49545352
ldr r2, _02181efc ; =func_ov31_0217de7c
@@ -8323,7 +8323,7 @@ func_ov31_02181b6c: ; 0x02181b6c
ldr r0, _02181ef4 ; =data_ov31_02183ff4
ldr r1, _02181e4c ; =func_0203e7b4
ldr r2, _02181f00 ; =data_ov31_02183fe8
bl func_0204f8d4
bl __register_global_object
ldr r0, _02181f04 ; =data_ov31_02184014
ldr r1, _02181f08 ; =0x4954534c
ldr r2, _02181f0c ; =func_ov31_0217debc
@@ -8332,7 +8332,7 @@ func_ov31_02181b6c: ; 0x02181b6c
ldr r0, _02181f04 ; =data_ov31_02184014
ldr r1, _02181e4c ; =func_0203e7b4
ldr r2, _02181f10 ; =data_ov31_02184008
bl func_0204f8d4
bl __register_global_object
ldr r0, _02181f14 ; =data_ov31_02184034
ldr r1, _02181f18 ; =0x49545042
ldr r2, _02181f1c ; =func_ov31_0217defc
@@ -8341,7 +8341,7 @@ func_ov31_02181b6c: ; 0x02181b6c
ldr r0, _02181f14 ; =data_ov31_02184034
ldr r1, _02181e4c ; =func_0203e7b4
ldr r2, _02181f20 ; =data_ov31_02184028
bl func_0204f8d4
bl __register_global_object
ldr r0, _02181f24 ; =data_ov31_02184054
ldr r1, _02181f28 ; =0x4954424b
ldr r2, _02181f2c ; =func_ov31_0217df3c
@@ -8350,7 +8350,7 @@ func_ov31_02181b6c: ; 0x02181b6c
ldr r0, _02181f24 ; =data_ov31_02184054
ldr r1, _02181e4c ; =func_0203e7b4
ldr r2, _02181f30 ; =data_ov31_02184048
bl func_0204f8d4
bl __register_global_object
ldr r0, _02181f34 ; =data_ov31_02184074
ldr r1, _02181f38 ; =0x49544343
ldr r2, _02181f3c ; =func_ov31_0217df7c
@@ -8359,7 +8359,7 @@ func_ov31_02181b6c: ; 0x02181b6c
ldr r0, _02181f34 ; =data_ov31_02184074
ldr r1, _02181e4c ; =func_0203e7b4
ldr r2, _02181f40 ; =data_ov31_02184068
bl func_0204f8d4
bl __register_global_object
ldr r0, _02181f44 ; =data_ov31_02184094
ldr r1, _02181f48 ; =0x49544259
ldr r2, _02181f4c ; =func_ov31_0217dfbc
@@ -8368,7 +8368,7 @@ func_ov31_02181b6c: ; 0x02181b6c
ldr r0, _02181f44 ; =data_ov31_02184094
ldr r1, _02181e4c ; =func_0203e7b4
ldr r2, _02181f50 ; =data_ov31_02184088
bl func_0204f8d4
bl __register_global_object
mov r1, #0
ldr r0, _02181f54 ; =data_ov31_021822b0
mov r2, #0x32
@@ -8481,7 +8481,7 @@ func_ov31_02181f58: ; 0x02181f58
ldr r0, _02181fcc ; =data_ov31_02184160
ldr r1, _02181fd8 ; =func_0203e7b4
ldr r2, _02181fdc ; =data_ov31_02184154
bl func_0204f8d4
bl __register_global_object
ldr r0, _02181fe0 ; =data_ov31_02184180
ldr r1, _02181fe4 ; =0x49545332
ldr r2, _02181fe8 ; =func_ov31_0218074c
@@ -8490,7 +8490,7 @@ func_ov31_02181f58: ; 0x02181f58
ldr r0, _02181fe0 ; =data_ov31_02184180
ldr r1, _02181fd8 ; =func_0203e7b4
ldr r2, _02181fec ; =data_ov31_02184174
bl func_0204f8d4
bl __register_global_object
ldr r0, _02181ff0 ; =data_ov31_021841a0
ldr r1, _02181ff4 ; =0x49545333
ldr r2, _02181ff8 ; =func_ov31_02180790
@@ -8499,7 +8499,7 @@ func_ov31_02181f58: ; 0x02181f58
ldr r0, _02181ff0 ; =data_ov31_021841a0
ldr r1, _02181fd8 ; =func_0203e7b4
ldr r2, _02181ffc ; =data_ov31_02184194
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov31_02181f58
@@ -8529,7 +8529,7 @@ func_ov31_02182000: ; 0x02182000
ldr r0, _0218202c ; =data_ov31_021841c0
ldr r1, _02182038 ; =func_0203e7b4
ldr r2, _0218203c ; =data_ov31_021841b4
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov31_02182000
@@ -8551,7 +8551,7 @@ func_ov31_02182040: ; 0x02182040
ldr r0, _0218206c ; =data_ov31_021841e0
ldr r1, _02182078 ; =func_0203e7b4
ldr r2, _0218207c ; =data_ov31_021841d4
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov31_02182040
asm/ov32.inc
+1 -1
View File
@@ -143,7 +143,7 @@
.extern func_0203ebc8
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
.extern __register_global_object
.extern func_ov00_0207c1b0
.extern func_ov00_0207c1f8
.extern func_ov00_0207c444
asm/ov32.s
+14 -14
View File
@@ -11157,7 +11157,7 @@ func_ov32_02184d3c: ; 0x02184d3c
ldr r0, _02184e40 ; =data_ov32_021861ec
ldr r1, _02184e4c ; =func_0203e7b4
ldr r2, _02184e50 ; =data_ov32_021861e0
bl func_0204f8d4
bl __register_global_object
mov r3, #1
str r3, [sp]
mov r1, #5
@@ -11209,7 +11209,7 @@ func_ov32_02184d3c: ; 0x02184d3c
ldr r0, _02184e5c ; =data_ov32_02185524
ldr r1, _02184e60 ; =func_ov00_020cceec
ldr r2, _02184e64 ; =data_ov32_02186200
bl func_0204f8d4
bl __register_global_object
add sp, sp, #0x84
ldmia sp!, {pc}
.align 2, 0
@@ -11238,7 +11238,7 @@ func_ov32_02184e68: ; 0x02184e68
ldr r0, _02184f68 ; =data_ov32_02186218
ldr r1, _02184f74 ; =func_0203e7b4
ldr r2, _02184f78 ; =data_ov32_0218620c
bl func_0204f8d4
bl __register_global_object
mov r3, #1
str r3, [sp]
str r3, [sp, #4]
@@ -11289,7 +11289,7 @@ func_ov32_02184e68: ; 0x02184e68
ldr r0, _02184f84 ; =data_ov32_02185738
ldr r1, _02184f88 ; =func_ov00_020cceec
ldr r2, _02184f8c ; =data_ov32_0218622c
bl func_0204f8d4
bl __register_global_object
add sp, sp, #0x84
ldmia sp!, {pc}
.align 2, 0
@@ -11318,7 +11318,7 @@ func_ov32_02184f90: ; 0x02184f90
ldr r0, _02185090 ; =data_ov32_02186244
ldr r1, _0218509c ; =func_0203e7b4
ldr r2, _021850a0 ; =data_ov32_02186238
bl func_0204f8d4
bl __register_global_object
mov r1, #1
str r1, [sp]
ldr lr, _021850a4 ; =0x00001b33
@@ -11369,7 +11369,7 @@ func_ov32_02184f90: ; 0x02184f90
ldr r0, _021850ac ; =data_ov32_02185a4c
ldr r1, _021850b0 ; =func_ov00_020cceec
ldr r2, _021850b4 ; =data_ov32_02186258
bl func_0204f8d4
bl __register_global_object
add sp, sp, #0x84
ldmia sp!, {pc}
.align 2, 0
@@ -11396,7 +11396,7 @@ func_ov32_021850b8: ; 0x021850b8
ldr r0, _0218510c ; =data_ov32_02186264
ldr r1, _02185114 ; =func_0203ebc8
ldr r2, _02185118 ; =data_ov32_0218626c
bl func_0204f8d4
bl __register_global_object
ldr r3, _0218511c ; =data_ov32_02185c10
mov r0, #0
str r0, [r3]
@@ -11407,7 +11407,7 @@ func_ov32_021850b8: ; 0x021850b8
ldr r1, _02185128 ; =func_0202bac0
ldr r2, _0218512c ; =data_ov32_02186278
str ip, [r3, #8]
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov32_021850b8
@@ -11432,7 +11432,7 @@ func_ov32_02185130: ; 0x02185130
ldr r0, _02185158 ; =data_ov32_02186284
ldr r1, _02185160 ; =func_0203ebc8
ldr r2, _02185164 ; =data_ov32_0218628c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov32_02185130
@@ -11454,7 +11454,7 @@ func_ov32_02185168: ; 0x02185168
ldr r0, _02185258 ; =data_ov32_021862a4
ldr r1, _02185264 ; =func_0203e7b4
ldr r2, _02185268 ; =data_ov32_02186298
bl func_0204f8d4
bl __register_global_object
mov r3, #0
str r3, [sp]
str r3, [sp, #4]
@@ -11501,7 +11501,7 @@ func_ov32_02185168: ; 0x02185168
ldr r0, _0218526c ; =data_ov32_02185da8
ldr r1, _02185270 ; =func_ov00_020cceec
ldr r2, _02185274 ; =data_ov32_021862b8
bl func_0204f8d4
bl __register_global_object
add sp, sp, #0x84
ldmia sp!, {pc}
.align 2, 0
@@ -11528,7 +11528,7 @@ func_ov32_02185278: ; 0x02185278
ldr r0, _02185368 ; =data_ov32_021862d0
ldr r1, _02185374 ; =func_0203e7b4
ldr r2, _02185378 ; =data_ov32_021862c4
bl func_0204f8d4
bl __register_global_object
mov r2, #0
str r2, [sp]
str r2, [sp, #4]
@@ -11575,7 +11575,7 @@ func_ov32_02185278: ; 0x02185278
ldr r0, _0218537c ; =data_ov32_02185f38
ldr r1, _02185380 ; =func_ov00_020cceec
ldr r2, _02185384 ; =data_ov32_021862e4
bl func_0204f8d4
bl __register_global_object
add sp, sp, #0x84
ldmia sp!, {pc}
.align 2, 0
@@ -11601,7 +11601,7 @@ func_ov32_02185388: ; 0x02185388
ldr r0, _021853b4 ; =data_ov32_021862fc
ldr r1, _021853c0 ; =func_0203e7b4
ldr r2, _021853c4 ; =data_ov32_021862f0
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov32_02185388
asm/ov33.inc
+1 -1
View File
@@ -60,6 +60,7 @@
.extern _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern __register_global_object
.extern data_02050f54
.extern data_020691a0
.extern data_027e0764
@@ -110,7 +111,6 @@
.extern func_0203e7b4
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
.extern func_ov00_0207a1c8
.extern func_ov00_0207c474
.extern func_ov00_02081f4c
asm/ov33.s
+7 -7
View File
@@ -4866,7 +4866,7 @@ func_ov33_0217fb90: ; 0x0217fb90
ldr r0, _0217fc8c ; =data_ov33_0218058c
ldr r1, _0217fc98 ; =func_0203e7b4
ldr r2, _0217fc9c ; =data_ov33_02180580
bl func_0204f8d4
bl __register_global_object
mov r2, #0
str r2, [sp]
mov r3, #1
@@ -4916,7 +4916,7 @@ func_ov33_0217fb90: ; 0x0217fb90
ldr r0, _0217fca4 ; =data_ov33_0217fec0
ldr r1, _0217fca8 ; =func_ov00_020cceec
ldr r2, _0217fcac ; =data_ov33_021805a0
bl func_0204f8d4
bl __register_global_object
add sp, sp, #0x84
ldmia sp!, {pc}
.align 2, 0
@@ -4943,7 +4943,7 @@ func_ov33_0217fcb0: ; 0x0217fcb0
ldr r0, _0217fcdc ; =data_ov33_021805b8
ldr r1, _0217fce8 ; =func_0203e7b4
ldr r2, _0217fcec ; =data_ov33_021805ac
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov33_0217fcb0
@@ -4965,7 +4965,7 @@ func_ov33_0217fcf0: ; 0x0217fcf0
ldr r0, _0217fd1c ; =data_ov33_021805d8
ldr r1, _0217fd28 ; =func_0203e7b4
ldr r2, _0217fd2c ; =data_ov33_021805cc
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov33_0217fcf0
@@ -4988,7 +4988,7 @@ func_ov33_0217fd30: ; 0x0217fd30
ldr r0, _0217fe30 ; =data_ov33_021805f8
ldr r1, _0217fe3c ; =func_0203e7b4
ldr r2, _0217fe40 ; =data_ov33_021805ec
bl func_0204f8d4
bl __register_global_object
mov r3, #0
str r3, [sp]
ldr r1, _0217fe44 ; =0x00001333
@@ -5039,7 +5039,7 @@ func_ov33_0217fd30: ; 0x0217fd30
ldr r0, _0217fe48 ; =data_ov33_021802a8
ldr r1, _0217fe4c ; =func_ov00_020cceec
ldr r2, _0217fe50 ; =data_ov33_0218060c
bl func_0204f8d4
bl __register_global_object
add sp, sp, #0x84
ldmia sp!, {pc}
.align 2, 0
@@ -5066,7 +5066,7 @@ func_ov33_0217fe54: ; 0x0217fe54
ldr r0, _0217fe80 ; =data_ov33_02180624
ldr r1, _0217fe8c ; =func_0203e7b4
ldr r2, _0217fe90 ; =data_ov33_02180618
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov33_0217fe54
asm/ov34.inc
+3 -3
View File
@@ -3,6 +3,8 @@
.extern Divide
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN14AdventureFlags18func_ov00_02097968Ei
.extern _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
@@ -61,6 +63,7 @@
.extern _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern __register_global_object
.extern data_02050f54
.extern data_02057200
.extern data_027e0194
@@ -119,7 +122,6 @@
.extern func_0203e7b4
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
.extern func_ov00_0207a1c8
.extern func_ov00_0207c1b0
.extern func_ov00_0207c1f8
@@ -141,8 +143,6 @@
.extern func_ov00_02093a5c
.extern func_ov00_02093af0
.extern func_ov00_02094824
.extern _ZN14AdventureFlags18func_ov00_02097968Ei
.extern _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi
.extern func_ov00_0209a4f4
.extern func_ov00_0209a508
.extern func_ov00_020a6110
asm/ov34.s
+5 -5
View File
@@ -11166,7 +11166,7 @@ func_ov34_02185818: ; 0x02185818
ldr r0, _02185938 ; =data_ov34_021861ac
ldr r1, _02185944 ; =func_0203e7b4
ldr r2, _02185948 ; =data_ov34_021861a0
bl func_0204f8d4
bl __register_global_object
ldr r3, _0218594c ; =data_ov34_021861a0
mov ip, #0
str ip, [r3, #0x2c]
@@ -11177,7 +11177,7 @@ func_ov34_02185818: ; 0x02185818
str ip, [r3, #0x34]
mov ip, #0x1000
str ip, [r3, #0x38]
bl func_0204f8d4
bl __register_global_object
ldr r1, _0218595c ; =data_02057200
ldr r0, _02185960 ; =data_ov34_02185aa0
ldr r3, [r1]
@@ -11258,14 +11258,14 @@ func_ov34_02185974: ; 0x02185974
ldr r0, _021859bc ; =data_ov34_02186374
ldr r1, _021859c8 ; =func_0203e7b4
ldr r2, _021859cc ; =data_ov34_02186368
bl func_0204f8d4
bl __register_global_object
ldr r0, _021859d0 ; =data_ov34_02186394
mov r1, #0
bl func_ov00_020bebc0
ldr r0, _021859d0 ; =data_ov34_02186394
ldr r1, _021859d4 ; =func_ov34_02185020
ldr r2, _021859d8 ; =data_ov34_02186388
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov34_02185974
@@ -11291,7 +11291,7 @@ func_ov34_021859dc: ; 0x021859dc
ldr r0, _02185a48 ; =data_ov34_021863ac
ldr r1, _02185a54 ; =func_0203e7b4
ldr r2, _02185a58 ; =data_ov34_021863a0
bl func_0204f8d4
bl __register_global_object
ldr r1, _02185a5c ; =data_02057200
ldr r0, _02185a60 ; =data_ov34_02186070
ldr r2, [r1]
asm/ov35.inc
+1 -1
View File
@@ -156,7 +156,7 @@
.extern func_0203e7b4
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
.extern __register_global_object
.extern func_ov00_02079e68
.extern func_ov00_0207a1c8
.extern func_ov00_0207b89c
asm/ov35.s
+10 -10
View File
@@ -11811,7 +11811,7 @@ func_ov35_02185668: ; 0x02185668
ldr r0, _021856c8 ; =data_ov35_02185ecc
ldr r1, _021856d4 ; =func_0203e7b4
ldr r2, _021856d8 ; =data_ov35_02185ec0
bl func_0204f8d4
bl __register_global_object
ldr r3, _021856dc ; =data_ov35_0218595c
mov r0, #0
str r0, [r3, #0x18]
@@ -11822,7 +11822,7 @@ func_ov35_02185668: ; 0x02185668
ldr r1, _021856e8 ; =func_ov35_0217cd98
ldr r2, _021856ec ; =data_ov35_02185ee0
str ip, [r3, #0x24]
bl func_0204f8d4
bl __register_global_object
add sp, sp, #0xc
ldmia sp!, {pc}
.align 2, 0
@@ -11850,7 +11850,7 @@ func_ov35_021856f0: ; 0x021856f0
ldr r0, _0218571c ; =data_ov35_02185ef8
ldr r1, _02185728 ; =func_0203e7b4
ldr r2, _0218572c ; =data_ov35_02185eec
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov35_021856f0
@@ -11872,7 +11872,7 @@ func_ov35_02185730: ; 0x02185730
ldr r0, _02185858 ; =data_ov35_02186f9c
ldr r1, _02185864 ; =func_0203e7b4
ldr r2, _02185868 ; =data_ov35_02186f90
bl func_0204f8d4
bl __register_global_object
ldr ip, _0218586c ; =0x00002333
ldr r3, _02185870 ; =data_ov35_02185c70
mov r0, #0
@@ -11884,7 +11884,7 @@ func_ov35_02185730: ; 0x02185730
ldr r1, _02185878 ; =func_ov35_0217cd98
ldr r2, _0218587c ; =data_ov35_02186fb0
str ip, [r3, #0x2c]
bl func_0204f8d4
bl __register_global_object
ldr r3, _02185870 ; =data_ov35_02185c70
mov r0, #0
ldr ip, _02185880 ; =0x00001666
@@ -11895,7 +11895,7 @@ func_ov35_02185730: ; 0x02185730
ldr r1, _02185878 ; =func_ov35_0217cd98
ldr r2, _02185888 ; =data_ov35_02186fbc
str ip, [r3, #0x3c]
bl func_0204f8d4
bl __register_global_object
ldr r2, _0218588c ; =0x00000d53
ldr r3, _02185890 ; =0xfffffb55
ldr r1, _02185870 ; =data_ov35_02185c70
@@ -11908,7 +11908,7 @@ func_ov35_02185730: ; 0x02185730
str r2, [r1, #0x4c]
ldr r1, _02185878 ; =func_ov35_0217cd98
ldr r2, _0218589c ; =data_ov35_02186fc8
bl func_0204f8d4
bl __register_global_object
mov r2, #0
ldr r0, _02185870 ; =data_ov35_02185c70
ldr r1, _021858a0 ; =0x00000d07
@@ -11921,7 +11921,7 @@ func_ov35_02185730: ; 0x02185730
ldr r0, _021858a8 ; =data_ov35_02185cc0
ldr r1, _02185878 ; =func_ov35_0217cd98
ldr r2, _021858ac ; =data_ov35_02186fd4
bl func_0204f8d4
bl __register_global_object
ldr r1, _021858b0 ; =data_027e0d0c
ldr r0, _02185870 ; =data_ov35_02185c70
ldr r3, [r1]
@@ -11935,7 +11935,7 @@ func_ov35_02185730: ; 0x02185730
ldr r0, _021858b8 ; =data_ov35_02185cd0
ldr r1, _02185878 ; =func_ov35_0217cd98
ldr r2, _021858bc ; =data_ov35_02186fe0
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov35_02185730
@@ -11978,7 +11978,7 @@ func_ov35_021858c0: ; 0x021858c0
ldr r0, _021858ec ; =data_ov35_02186ff8
ldr r1, _021858f8 ; =func_0203e7b4
ldr r2, _021858fc ; =data_ov35_02186fec
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov35_021858c0
asm/ov36.inc
+1 -1
View File
@@ -146,7 +146,7 @@
.extern func_0203e7b4
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
.extern __register_global_object
.extern func_ov00_02079470
.extern func_ov00_02079e68
.extern func_ov00_0207a1c8
asm/ov36.s
+2 -2
View File
@@ -12920,7 +12920,7 @@ func_ov36_02186bb4: ; 0x02186bb4
ldr r0, _02186be0 ; =data_ov36_02186fac
ldr r1, _02186bec ; =func_0203e7b4
ldr r2, _02186bf0 ; =data_ov36_02186fa0
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov36_02186bb4
@@ -12942,7 +12942,7 @@ func_ov36_02186bf4: ; 0x02186bf4
ldr r0, _02186c20 ; =data_ov36_02186fcc
ldr r1, _02186c2c ; =func_0203e7b4
ldr r2, _02186c30 ; =data_ov36_02186fc0
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov36_02186bf4
asm/ov37.inc
+2 -2
View File
@@ -6,6 +6,7 @@
.extern _ZN11ItemManager12GetItemModelEj
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN14AdventureFlags18func_ov00_02097968Ei
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
@@ -67,6 +68,7 @@
.extern _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern __register_global_object
.extern data_02050f54
.extern data_027e0764
.extern data_027e0c54
@@ -134,7 +136,6 @@
.extern func_0203e7b4
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
.extern func_ov00_0207a1c8
.extern func_ov00_0207c1b0
.extern func_ov00_0207c1f8
@@ -155,7 +156,6 @@
.extern func_ov00_02093a5c
.extern func_ov00_02093af0
.extern func_ov00_02094824
.extern _ZN14AdventureFlags18func_ov00_02097968Ei
.extern func_ov00_0209a4f4
.extern func_ov00_0209a508
.extern func_ov00_020a61ac
asm/ov37.s
+8 -8
View File
@@ -15355,7 +15355,7 @@ func_ov37_02188690: ; 0x02188690
ldr r0, _02188790 ; =data_ov37_0218916c
ldr r1, _0218879c ; =func_0203e7b4
ldr r2, _021887a0 ; =data_ov37_02189160
bl func_0204f8d4
bl __register_global_object
mov lr, #0
str lr, [sp]
mov ip, #1
@@ -15406,7 +15406,7 @@ func_ov37_02188690: ; 0x02188690
ldr r0, _021887a8 ; =data_ov37_02188a20
ldr r1, _021887ac ; =func_ov00_020cceec
ldr r2, _021887b0 ; =data_ov37_02189180
bl func_0204f8d4
bl __register_global_object
add sp, sp, #0x84
ldmia sp!, {pc}
.align 2, 0
@@ -15433,14 +15433,14 @@ func_ov37_021887b4: ; 0x021887b4
ldr r0, _021887fc ; =data_ov37_021891a0
ldr r1, _02188808 ; =func_0203e7b4
ldr r2, _0218880c ; =data_ov37_02189194
bl func_0204f8d4
bl __register_global_object
ldr r0, _02188810 ; =data_ov37_021891c0
mov r1, #0
bl func_ov00_020bebc0
ldr r0, _02188810 ; =data_ov37_021891c0
ldr r1, _02188814 ; =func_ov37_02185054
ldr r2, _02188818 ; =data_ov37_021891b4
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov37_021887b4
@@ -15465,7 +15465,7 @@ func_ov37_0218881c: ; 0x0218881c
ldr r0, _02188848 ; =data_ov37_021891d8
ldr r1, _02188854 ; =func_0203e7b4
ldr r2, _02188858 ; =data_ov37_021891cc
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov37_0218881c
@@ -15487,7 +15487,7 @@ func_ov37_0218885c: ; 0x0218885c
ldr r0, _02188888 ; =data_ov37_021891f8
ldr r1, _02188894 ; =func_0203e7b4
ldr r2, _02188898 ; =data_ov37_021891ec
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov37_0218885c
@@ -15510,7 +15510,7 @@ func_ov37_0218889c: ; 0x0218889c
ldr r0, _02188994 ; =data_ov37_02189218
ldr r1, _021889a0 ; =func_0203e7b4
ldr r2, _021889a4 ; =data_ov37_0218920c
bl func_0204f8d4
bl __register_global_object
mov r2, #0
str r2, [sp]
mov r1, #1
@@ -15559,7 +15559,7 @@ func_ov37_0218889c: ; 0x0218889c
ldr r0, _021889a8 ; =data_ov37_02188f00
ldr r1, _021889ac ; =func_ov00_020cceec
ldr r2, _021889b0 ; =data_ov37_0218922c
bl func_0204f8d4
bl __register_global_object
add sp, sp, #0x84
ldmia sp!, {pc}
.align 2, 0
asm/ov38.inc
+8 -8
View File
@@ -3,6 +3,13 @@
.extern Divide
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097968Ei
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bccEv
.extern _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags3SetEjb
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12CollidesWithEPKS_
@@ -55,6 +62,7 @@
.extern _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern __register_global_object
.extern data_02050f54
.extern data_02051054
.extern data_02057200
@@ -148,7 +156,6 @@
.extern func_0203e7b4
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
.extern func_ov00_0207a1c8
.extern func_ov00_0207c1b0
.extern func_ov00_0207c1f8
@@ -164,13 +171,6 @@
.extern func_ov00_02093a5c
.extern func_ov00_02093af0
.extern func_ov00_02094824
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags3SetEjb
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097968Ei
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bccEv
.extern _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi
.extern func_ov00_0209a4f4
.extern func_ov00_0209a508
.extern func_ov00_020a6110
asm/ov38.s
+5 -5
View File
@@ -14768,7 +14768,7 @@ func_ov38_02188ae4: ; 0x02188ae4
ldr r0, _02188bdc ; =data_ov38_021891ec
ldr r1, _02188be8 ; =func_0203e7b4
ldr r2, _02188bec ; =data_ov38_021891e0
bl func_0204f8d4
bl __register_global_object
ldr r1, _02188bf0 ; =data_02057200
ldr r0, _02188bf4 ; =data_ov38_02188ca0
ldr r2, [r1]
@@ -14807,17 +14807,17 @@ func_ov38_02188ae4: ; 0x02188ae4
ldr r1, _02188c04 ; =func_0202bac0
ldr r2, _02188c08 ; =data_ov38_0218929c
str ip, [r3, #0x5c]
bl func_0204f8d4
bl __register_global_object
ldr r0, _02188c0c ; =data_ov38_021892c0
ldr r1, _02188c04 ; =func_0202bac0
ldr r2, _02188c10 ; =data_ov38_021892b4
bl func_0204f8d4
bl __register_global_object
ldr r0, _02188c14 ; =data_ov38_02189414
blx func_0202ab78
ldr r0, _02188c14 ; =data_ov38_02189414
ldr r1, _02188c18 ; =0x0202ab65
ldr r2, _02188c1c ; =data_ov38_02189408
bl func_0204f8d4
bl __register_global_object
add sp, sp, #8
ldmia sp!, {r3, pc}
.align 2, 0
@@ -14852,7 +14852,7 @@ func_ov38_02188c20: ; 0x02188c20
ldr r0, _02188c4c ; =data_ov38_02189470
ldr r1, _02188c58 ; =func_0203e7b4
ldr r2, _02188c5c ; =data_ov38_02189464
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov38_02188c20
asm/ov39.inc
+1 -1
View File
@@ -139,7 +139,7 @@
.extern func_0203e7b4
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
.extern __register_global_object
.extern func_ov00_02079e68
.extern func_ov00_0207c1b0
.extern func_ov00_0207c444
asm/ov39.s
+1 -1
View File
@@ -13270,7 +13270,7 @@ func_ov39_02186968: ; 0x02186968
ldr r0, _021869a0 ; =data_ov39_02186ccc
ldr r1, _021869ac ; =func_0203e7b4
ldr r2, _021869b0 ; =data_ov39_02186cc0
bl func_0204f8d4
bl __register_global_object
ldr r0, _021869b4 ; =data_ov39_02186cc0
ldr r1, _021869b8 ; =data_ov39_02186a28
str r1, [r0, #0x20]
asm/ov40.inc
+11 -11
View File
@@ -5,6 +5,16 @@
.extern _ZN11ItemManager8GiveItemEi
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN14AdventureFlags15Get_FlagsUnk_18EiP9FlagsUnk2
.extern _ZN14AdventureFlags15Get_FlagsUnk_30Ei
.extern _ZN14AdventureFlags18func_ov00_02097c08Ev
.extern _ZN14AdventureFlags18func_ov00_02097e6cEv
.extern _ZN14AdventureFlags18func_ov00_02097e7cEv
.extern _ZN14AdventureFlags18func_ov00_02097ea4Ev
.extern _ZN14AdventureFlags18func_ov00_02097fd0Ev
.extern _ZN14AdventureFlags18func_ov00_02097ff4Ebb
.extern _ZN14AdventureFlags18func_ov00_02098074Eisiib
.extern _ZN14AdventureFlags3SetEjb
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12CollidesWithEPKS_
@@ -54,6 +64,7 @@
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager7HasItemEi
.extern __register_global_object
.extern data_02050f54
.extern data_02057840
.extern data_02057878
@@ -240,7 +251,6 @@
.extern func_0204dd9c
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
.extern func_ov00_02078b40
.extern func_ov00_02078b88
.extern func_ov00_02079e68
@@ -262,16 +272,6 @@
.extern func_ov00_02093a5c
.extern func_ov00_02093af0
.extern func_ov00_02094824
.extern _ZN14AdventureFlags3SetEjb
.extern _ZN14AdventureFlags18func_ov00_02097c08Ev
.extern _ZN14AdventureFlags15Get_FlagsUnk_30Ei
.extern _ZN14AdventureFlags15Get_FlagsUnk_18EiP9FlagsUnk2
.extern _ZN14AdventureFlags18func_ov00_02097e6cEv
.extern _ZN14AdventureFlags18func_ov00_02097e7cEv
.extern _ZN14AdventureFlags18func_ov00_02097ea4Ev
.extern _ZN14AdventureFlags18func_ov00_02097fd0Ev
.extern _ZN14AdventureFlags18func_ov00_02097ff4Ebb
.extern _ZN14AdventureFlags18func_ov00_02098074Eisiib
.extern func_ov00_020985c4
.extern func_ov00_0209ed18
.extern func_ov00_0209ed2c
asm/ov40.s
+7 -7
View File
@@ -16342,7 +16342,7 @@ func_ov40_02188360: ; 0x02188360
ldr r0, _0218838c ; =data_ov40_02189acc
ldr r1, _02188398 ; =func_0203e7b4
ldr r2, _0218839c ; =data_ov40_02189ac0
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov40_02188360
@@ -16364,7 +16364,7 @@ func_ov40_021883a0: ; 0x021883a0
ldr r0, _021883cc ; =data_ov40_0219a0ec
ldr r1, _021883d8 ; =func_0203e7b4
ldr r2, _021883dc ; =data_ov40_0219a0e0
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov40_021883a0
@@ -16386,7 +16386,7 @@ func_ov40_021883e0: ; 0x021883e0
ldr r0, _0218840c ; =data_ov40_0219a10c
ldr r1, _02188418 ; =func_0203e7b4
ldr r2, _0218841c ; =data_ov40_0219a100
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov40_021883e0
@@ -16408,7 +16408,7 @@ func_ov40_02188420: ; 0x02188420
ldr r0, _0218844c ; =data_ov40_0219a12c
ldr r1, _02188458 ; =func_0203e7b4
ldr r2, _0218845c ; =data_ov40_0219a120
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov40_02188420
@@ -16471,7 +16471,7 @@ func_ov40_021884ac: ; 0x021884ac
ldr r0, _021884d8 ; =data_ov40_0219a14c
ldr r1, _021884e4 ; =func_0203e7b4
ldr r2, _021884e8 ; =data_ov40_0219a140
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov40_021884ac
@@ -16493,7 +16493,7 @@ func_ov40_021884ec: ; 0x021884ec
ldr r0, _02188518 ; =data_ov40_0219a16c
ldr r1, _02188524 ; =func_0203e7b4
ldr r2, _02188528 ; =data_ov40_0219a160
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov40_021884ec
@@ -16597,7 +16597,7 @@ func_ov40_021885c4: ; 0x021885c4
ldr r0, _021885f0 ; =data_ov40_0219a18c
ldr r1, _021885fc ; =func_0203e7b4
ldr r2, _02188600 ; =data_ov40_0219a180
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov40_021885c4
asm/ov41.inc
+1 -1
View File
@@ -126,7 +126,7 @@
.extern func_0203e7b4
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
.extern __register_global_object
.extern func_ov00_0207a1c8
.extern func_ov00_0207c1b0
.extern func_ov00_0207c31c
asm/ov41.s
+7 -7
View File
@@ -6019,7 +6019,7 @@ func_ov41_0218e098: ; 0x0218e098
ldr r0, _0218e0c4 ; =data_ov41_0218ea8c
ldr r1, _0218e0d0 ; =func_0203e7b4
ldr r2, _0218e0d4 ; =data_ov41_0218ea80
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov41_0218e098
@@ -6041,7 +6041,7 @@ func_ov41_0218e0d8: ; 0x0218e0d8
ldr r0, _0218e11c ; =data_ov41_0218eaac
ldr r1, _0218e128 ; =func_0203e7b4
ldr r2, _0218e12c ; =data_ov41_0218eaa0
bl func_0204f8d4
bl __register_global_object
ldr r1, _0218e130 ; =data_02057200
ldr r0, _0218e134 ; =data_ov41_0218e444
ldr r2, [r1]
@@ -6071,7 +6071,7 @@ func_ov41_0218e138: ; 0x0218e138
ldr r0, _0218e164 ; =data_ov41_0218eacc
ldr r1, _0218e170 ; =func_0203e7b4
ldr r2, _0218e174 ; =data_ov41_0218eac0
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov41_0218e138
@@ -6093,7 +6093,7 @@ func_ov41_0218e178: ; 0x0218e178
ldr r0, _0218e1a4 ; =data_ov41_0218eaec
ldr r1, _0218e1b0 ; =func_0203e7b4
ldr r2, _0218e1b4 ; =data_ov41_0218eae0
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov41_0218e178
@@ -6115,7 +6115,7 @@ func_ov41_0218e1b8: ; 0x0218e1b8
ldr r0, _0218e1e4 ; =data_ov41_0218eb10
ldr r1, _0218e1f0 ; =func_0203e7b4
ldr r2, _0218e1f4 ; =data_ov41_0218eb04
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov41_0218e1b8
@@ -6138,7 +6138,7 @@ func_ov41_0218e1f8: ; 0x0218e1f8
ldr r0, _0218e2e8 ; =data_ov41_0218eb30
ldr r1, _0218e2f4 ; =func_0203e7b4
ldr r2, _0218e2f8 ; =data_ov41_0218eb24
bl func_0204f8d4
bl __register_global_object
mov r0, #0xc
str r0, [sp]
ldr r3, _0218e2fc ; =0x00001b33
@@ -6185,7 +6185,7 @@ func_ov41_0218e1f8: ; 0x0218e1f8
ldr r0, _0218e300 ; =data_ov41_0218e85c
ldr r1, _0218e304 ; =func_ov00_020cceec
ldr r2, _0218e308 ; =data_ov41_0218eb44
bl func_0204f8d4
bl __register_global_object
add sp, sp, #0x84
ldmia sp!, {pc}
.align 2, 0
asm/ov42.inc
+1 -1
View File
@@ -108,7 +108,7 @@
.extern func_020385b8
.extern func_0203e784
.extern func_0203e7b4
.extern func_0204f8d4
.extern __register_global_object
.extern func_ov00_0207a1c8
.extern func_ov00_0207bb1c
.extern func_ov00_0207c1b0
asm/ov42.s
+3 -3
View File
@@ -3946,7 +3946,7 @@ func_ov42_0218c744: ; 0x0218c744
ldr r0, _0218c770 ; =data_ov42_0218cd30
ldr r1, _0218c77c ; =func_0203e7b4
ldr r2, _0218c780 ; =data_ov42_0218cd24
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov42_0218c744
@@ -3968,7 +3968,7 @@ func_ov42_0218c784: ; 0x0218c784
ldr r0, _0218c7d4 ; =data_ov42_0218cd54
ldr r1, _0218c7e0 ; =func_0203e7b4
ldr r2, _0218c7e4 ; =data_ov42_0218cd48
bl func_0204f8d4
bl __register_global_object
ldr r0, _0218c7e8 ; =data_ov42_0218cd74
ldr r1, _0218c7ec ; =0x4d544752
ldr r2, _0218c7f0 ; =func_ov42_0218b944
@@ -3977,7 +3977,7 @@ func_ov42_0218c784: ; 0x0218c784
ldr r0, _0218c7e8 ; =data_ov42_0218cd74
ldr r1, _0218c7e0 ; =func_0203e7b4
ldr r2, _0218c7f4 ; =data_ov42_0218cd68
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov42_0218c784
asm/ov43.inc
+1 -1
View File
@@ -93,7 +93,7 @@
.extern func_0203e784
.extern func_0203e7b4
.extern func_0204f754
.extern func_0204f8d4
.extern __register_global_object
.extern func_ov00_0207c474
.extern func_ov00_02081f4c
.extern func_ov00_02081f50
asm/ov43.s
+4 -4
View File
@@ -4712,7 +4712,7 @@ func_ov43_0218d414: ; 0x0218d414
ldr r0, _0218d544 ; =data_ov43_0218db0c
ldr r1, _0218d550 ; =func_0203e7b4
ldr r2, _0218d554 ; =data_ov43_0218db00
bl func_0204f8d4
bl __register_global_object
ldr r0, _0218d558 ; =data_ov43_0218db2c
ldr r1, _0218d55c ; =0x55424c4e
ldr r2, _0218d560 ; =func_ov43_021895a0
@@ -4721,7 +4721,7 @@ func_ov43_0218d414: ; 0x0218d414
ldr r0, _0218d558 ; =data_ov43_0218db2c
ldr r1, _0218d550 ; =func_0203e7b4
ldr r2, _0218d564 ; =data_ov43_0218db20
bl func_0204f8d4
bl __register_global_object
mov r0, #1
str r0, [sp]
str r0, [sp, #4]
@@ -4775,7 +4775,7 @@ func_ov43_0218d414: ; 0x0218d414
ldr r0, _0218d574 ; =data_ov43_0218d5e0
ldr r1, _0218d578 ; =func_ov00_020cceec
ldr r2, _0218d57c ; =data_ov43_0218db40
bl func_0204f8d4
bl __register_global_object
add sp, sp, #0x84
ldmia sp!, {pc}
.align 2, 0
@@ -4808,7 +4808,7 @@ func_ov43_0218d580: ; 0x0218d580
ldr r0, _0218d5ac ; =data_ov43_0218db58
ldr r1, _0218d5b8 ; =func_0203e7b4
ldr r2, _0218d5bc ; =data_ov43_0218db4c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov43_0218d580
asm/ov44.inc
+60 -60
View File
@@ -1,9 +1,69 @@
#pragma once
.extern Approach_thunk
.extern Divide
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor12XzDistanceToEP5Vec3p
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor14ResetWallTouchEv
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
.extern _ZN5Actor18func_ov00_020c1fc8Ej
.extern _ZN5Actor18func_ov00_020c29ecEi
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor18func_ov00_020c3200Ei
.extern _ZN5Actor20IncreaseActiveFramesEv
.extern _ZN5Actor4KillEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager19GetActiveFairyLevelEi
.extern _ZTV11FilterActor
.extern __register_global_object
.extern data_02050f54
.extern data_027e0194
.extern data_027e0764
@@ -16,7 +76,6 @@
.extern data_027e0fec
.extern data_027e0ff0
.extern data_027e0ffc
.extern _ZTV11FilterActor
.extern data_ov00_020e8398
.extern data_ov00_020e892c
.extern data_ov00_020e9370
@@ -46,7 +105,6 @@
.extern func_02042f74
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
.extern func_ov00_0207a1c8
.extern func_ov00_0207c1b0
.extern func_ov00_0207c474
@@ -67,65 +125,7 @@
.extern func_ov00_020c0cc8
.extern func_ov00_020c0e24
.extern func_ov00_020c1500
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
.extern _ZN5Actor18func_ov00_020c1fc8Ej
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor12XzDistanceToEP5Vec3p
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor14ResetWallTouchEv
.extern _ZN5Actor18func_ov00_020c29ecEi
.extern _ZN5Actor20IncreaseActiveFramesEv
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor4KillEv
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor18func_ov00_020c3200Ei
.extern _ZN5Actor8vfunc_b0Ev
.extern func_ov00_020c3348
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
.extern func_ov00_020c4048
.extern func_ov00_020c4588
.extern func_ov00_020c4ae8
asm/ov44.s
+15 -15
View File
@@ -3866,7 +3866,7 @@ func_ov44_0218c360: ; 0x0218c360
ldr r1, _0218c49c ; =func_ov44_0218c4a4
ldr r2, _0218c4a0 ; =data_ov44_0218ffb4
str ip, [r3, #0x30]
bl func_0204f8d4
bl __register_global_object
ldr r0, _0218c490 ; =data_ov44_0218ff90
ldr r1, [r0, #0x20]
orr r1, r1, #1
@@ -7119,7 +7119,7 @@ func_ov44_0218ea9c: ; 0x0218ea9c
ldr r0, _0218eba0 ; =data_ov44_0218feec
ldr r1, _0218ebac ; =func_0203e7b4
ldr r2, _0218ebb0 ; =data_ov44_0218fee0
bl func_0204f8d4
bl __register_global_object
mov r1, #1
str r1, [sp]
str r1, [sp, #4]
@@ -7171,7 +7171,7 @@ func_ov44_0218ea9c: ; 0x0218ea9c
ldr r0, _0218ebbc ; =data_ov44_0218f200
ldr r1, _0218ebc0 ; =func_ov00_020cceec
ldr r2, _0218ebc4 ; =data_ov44_0218ff00
bl func_0204f8d4
bl __register_global_object
add sp, sp, #0x84
ldmia sp!, {pc}
.align 2, 0
@@ -7200,7 +7200,7 @@ func_ov44_0218ebc8: ; 0x0218ebc8
ldr r0, _0218ecc0 ; =data_ov44_0218ff18
ldr r1, _0218eccc ; =func_0203e7b4
ldr r2, _0218ecd0 ; =data_ov44_0218ff0c
bl func_0204f8d4
bl __register_global_object
mov r3, #1
str r3, [sp]
str r3, [sp, #4]
@@ -7249,7 +7249,7 @@ func_ov44_0218ebc8: ; 0x0218ebc8
ldr r0, _0218ecd8 ; =data_ov44_0218f3e4
ldr r1, _0218ecdc ; =func_ov00_020cceec
ldr r2, _0218ece0 ; =data_ov44_0218ff2c
bl func_0204f8d4
bl __register_global_object
add sp, sp, #0x84
ldmia sp!, {pc}
.align 2, 0
@@ -7276,7 +7276,7 @@ func_ov44_0218ece4: ; 0x0218ece4
ldr r0, _0218ed10 ; =data_ov44_0218ff44
ldr r1, _0218ed1c ; =func_0203e7b4
ldr r2, _0218ed20 ; =data_ov44_0218ff38
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov44_0218ece4
@@ -7299,7 +7299,7 @@ func_ov44_0218ed24: ; 0x0218ed24
ldr r0, _0218eee0 ; =data_ov44_0218ff64
ldr r1, _0218eeec ; =func_0203e7b4
ldr r2, _0218eef0 ; =data_ov44_0218ff58
bl func_0204f8d4
bl __register_global_object
mov r3, #1
str r3, [sp]
ldr ip, _0218eef4 ; =0x00001b33
@@ -7348,7 +7348,7 @@ func_ov44_0218ed24: ; 0x0218ed24
ldr r0, _0218eef8 ; =data_ov44_0218f670
ldr r1, _0218eefc ; =func_ov00_020cceec
ldr r2, _0218ef00 ; =data_ov44_0218ff78
bl func_0204f8d4
bl __register_global_object
mov lr, #1
str lr, [sp]
ldr ip, _0218eef4 ; =0x00001b33
@@ -7397,7 +7397,7 @@ func_ov44_0218ed24: ; 0x0218ed24
ldr r0, _0218ef04 ; =data_ov44_0218f6f0
ldr r1, _0218eefc ; =func_ov00_020cceec
ldr r2, _0218ef08 ; =data_ov44_0218ff84
bl func_0204f8d4
bl __register_global_object
add sp, sp, #0x84
ldmia sp!, {pc}
.align 2, 0
@@ -7426,7 +7426,7 @@ func_ov44_0218ef0c: ; 0x0218ef0c
ldr r0, _0218ef38 ; =data_ov44_0218ff9c
ldr r1, _0218ef44 ; =func_0203e7b4
ldr r2, _0218ef48 ; =data_ov44_0218ff90
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov44_0218ef0c
@@ -7449,7 +7449,7 @@ func_ov44_0218ef4c: ; 0x0218ef4c
ldr r0, _0218f048 ; =data_ov44_0218ffd0
ldr r1, _0218f054 ; =func_0203e7b4
ldr r2, _0218f058 ; =data_ov44_0218ffc4
bl func_0204f8d4
bl __register_global_object
mov r1, #1
str r1, [sp]
str r1, [sp, #4]
@@ -7499,7 +7499,7 @@ func_ov44_0218ef4c: ; 0x0218ef4c
ldr r0, _0218f064 ; =data_ov44_0218fa58
ldr r1, _0218f068 ; =func_ov00_020cceec
ldr r2, _0218f06c ; =data_ov44_0218ffe4
bl func_0204f8d4
bl __register_global_object
add sp, sp, #0x84
ldmia sp!, {pc}
.align 2, 0
@@ -7528,7 +7528,7 @@ func_ov44_0218f070: ; 0x0218f070
ldr r0, _0218f168 ; =data_ov44_0218fffc
ldr r1, _0218f174 ; =func_0203e7b4
ldr r2, _0218f178 ; =data_ov44_0218fff0
bl func_0204f8d4
bl __register_global_object
mov r3, #1
str r3, [sp]
str r3, [sp, #4]
@@ -7577,7 +7577,7 @@ func_ov44_0218f070: ; 0x0218f070
ldr r0, _0218f180 ; =data_ov44_0218fc68
ldr r1, _0218f184 ; =func_ov00_020cceec
ldr r2, _0218f188 ; =data_ov44_02190010
bl func_0204f8d4
bl __register_global_object
add sp, sp, #0x84
ldmia sp!, {pc}
.align 2, 0
@@ -7604,7 +7604,7 @@ func_ov44_0218f18c: ; 0x0218f18c
ldr r0, _0218f1b8 ; =data_ov44_02190028
ldr r1, _0218f1c4 ; =func_0203e7b4
ldr r2, _0218f1c8 ; =data_ov44_0219001c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov44_0218f18c
asm/ov45.inc
+2 -2
View File
@@ -3,6 +3,7 @@
.extern _ZN11ItemManager16SetTreasureCountEjc
.extern _ZN11ItemManager19SetTreasureSalvagedEjj
.extern _ZN11ItemManager21AddTreasurePriceShownEj
.extern _ZN14AdventureFlags3GetEj
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor11SetVelocityEP5Vec3p
@@ -47,6 +48,7 @@
.extern _ZNK11ItemManager16GetTreasureCountEj
.extern _ZNK11ItemManager18IsTreasureSalvagedEjj
.extern _ZNK11ItemManager21HasTreasurePriceShownEj
.extern __register_global_object
.extern data_020691a0
.extern data_027e0618
.extern data_027e077c
@@ -107,13 +109,11 @@
.extern func_0203d77c
.extern func_0203e784
.extern func_0203e7b4
.extern func_0204f8d4
.extern func_ov00_0207b1fc
.extern func_ov00_0207c1b0
.extern func_ov00_0207c474
.extern func_ov00_0208726c
.extern func_ov00_02087338
.extern _ZN14AdventureFlags3GetEj
.extern func_ov00_020a9588
.extern func_ov00_020a95a4
.extern func_ov00_020a9aec
asm/ov45.s
+3 -3
View File
@@ -6583,7 +6583,7 @@ func_ov45_0218e3e8: ; 0x0218e3e8
ldr r0, _0218e414 ; =data_ov45_0218ed8c
ldr r1, _0218e420 ; =func_0203e7b4
ldr r2, _0218e424 ; =data_ov45_0218ed80
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov45_0218e3e8
@@ -6605,7 +6605,7 @@ func_ov45_0218e428: ; 0x0218e428
ldr r0, _0218e454 ; =data_ov45_0218edb0
ldr r1, _0218e460 ; =func_0203e7b4
ldr r2, _0218e464 ; =data_ov45_0218eda4
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov45_0218e428
@@ -6627,7 +6627,7 @@ func_ov45_0218e468: ; 0x0218e468
ldr r0, _0218e494 ; =data_ov45_0218edd4
ldr r1, _0218e4a0 ; =func_0203e7b4
ldr r2, _0218e4a4 ; =data_ov45_0218edc8
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov45_0218e468
asm/ov46.inc
+1 -1
View File
@@ -58,6 +58,7 @@
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager16GetTreasureCountEj
.extern __register_global_object
.extern data_02050f54
.extern data_02057200
.extern data_027e0160
@@ -117,7 +118,6 @@
.extern func_02037628
.extern func_0203e784
.extern func_0203e7b4
.extern func_0204f8d4
.extern func_ov00_02079e68
.extern func_ov00_0207a1c8
.extern func_ov00_0207ba90
asm/ov46.s
+4 -4
View File
@@ -5273,7 +5273,7 @@ func_ov46_021944ac: ; 0x021944ac
ldr r0, _021944d8 ; =data_ov46_02194bac
ldr r1, _021944e4 ; =func_0203e7b4
ldr r2, _021944e8 ; =data_ov46_02194ba0
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov46_021944ac
@@ -5295,7 +5295,7 @@ func_ov46_021944ec: ; 0x021944ec
ldr r0, _02194518 ; =data_ov46_02194bcc
ldr r1, _02194524 ; =func_0203e7b4
ldr r2, _02194528 ; =data_ov46_02194bc0
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov46_021944ec
@@ -5318,7 +5318,7 @@ func_ov46_0219452c: ; 0x0219452c
ldr r0, _02194590 ; =data_ov46_02194c54
ldr r1, _0219459c ; =func_0203e7b4
ldr r2, _021945a0 ; =data_ov46_02194c48
bl func_0204f8d4
bl __register_global_object
ldr r1, _021945a4 ; =data_02057200
ldr r0, _021945a8 ; =data_ov46_02194900
ldr r2, [r1]
@@ -5356,7 +5356,7 @@ func_ov46_021945ac: ; 0x021945ac
ldr r0, _02194620 ; =data_ov46_02194c74
ldr r1, _0219462c ; =func_0203e7b4
ldr r2, _02194630 ; =data_ov46_02194c68
bl func_0204f8d4
bl __register_global_object
ldr r1, _02194634 ; =data_02057200
ldr r0, _02194638 ; =data_ov46_02194a6c
ldr r2, [r1]
asm/ov47.inc
+1 -1
View File
@@ -102,7 +102,7 @@
.extern func_0203e7b4
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
.extern __register_global_object
.extern func_ov00_0207a1c8
.extern func_ov00_0207c1b0
.extern func_ov00_0207c1f8
asm/ov47.s
+5 -5
View File
@@ -5140,7 +5140,7 @@ func_ov47_021942f0: ; 0x021942f0
ldr r0, _0219431c ; =data_ov47_02194a0c
ldr r1, _02194328 ; =func_0203e7b4
ldr r2, _0219432c ; =data_ov47_02194a00
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov47_021942f0
@@ -5162,7 +5162,7 @@ func_ov47_02194330: ; 0x02194330
ldr r0, _0219435c ; =data_ov47_02194a2c
ldr r1, _02194368 ; =func_0203e7b4
ldr r2, _0219436c ; =data_ov47_02194a20
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov47_02194330
@@ -5185,7 +5185,7 @@ func_ov47_02194370: ; 0x02194370
ldr r0, _02194480 ; =data_ov47_02194a4c
ldr r1, _0219448c ; =func_0203e7b4
ldr r2, _02194490 ; =data_ov47_02194a40
bl func_0204f8d4
bl __register_global_object
mov r0, #7
mov r2, #2
str r0, [sp]
@@ -5240,7 +5240,7 @@ func_ov47_02194370: ; 0x02194370
ldr r0, _0219449c ; =data_ov47_021946d8
ldr r1, _021944a0 ; =func_ov00_020cceec
ldr r2, _021944a4 ; =data_ov47_02194a60
bl func_0204f8d4
bl __register_global_object
add sp, sp, #0x84
ldmia sp!, {pc}
.align 2, 0
@@ -5268,7 +5268,7 @@ func_ov47_021944a8: ; 0x021944a8
ldr r0, _021944d4 ; =data_ov47_02194a78
ldr r1, _021944e0 ; =func_0203e7b4
ldr r2, _021944e4 ; =data_ov47_02194a6c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov47_021944a8
asm/ov48.inc
+61 -1
View File
@@ -63,10 +63,71 @@
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor12XzDistanceToEP5Vec3p
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor18CollidesWithShieldEP8Cylinder
.extern _ZN5Actor18func_ov00_020c1cf8Ev
.extern _ZN5Actor18func_ov00_020c1d58Ev
.extern _ZN5Actor18func_ov00_020c1f5cEP5Vec3pS1_iS1_ii
.extern _ZN5Actor18func_ov00_020c1fc8Ej
.extern _ZN5Actor18func_ov00_020c243cEiPi
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor18func_ov00_020c3200Ei
.extern _ZN5Actor20IncreaseActiveFramesEv
.extern _ZN5Actor4KillEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_08Ev
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager19GetActiveFairyLevelEi
.extern _ZTV11FilterActor
.extern __register_global_object
.extern data_02050f54
.extern data_027e0764
.extern data_027e0d38
@@ -105,7 +166,6 @@
.extern func_0203e7b4
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
.extern func_ov00_0207a1c8
.extern func_ov00_0207c1b0
.extern func_ov00_0207c1f8
asm/ov48.s
+10 -10
View File
@@ -1991,7 +1991,7 @@ _02191694:
ldr r1, _02191c20 ; =func_ov48_02191c60
ldr r2, _02191c24 ; =data_ov48_0219545c
str r5, [r3, #0x3c]
bl func_0204f8d4
bl __register_global_object
ldr r0, _02191c14 ; =data_ov48_0219542c
ldr r1, [r0, #0x2c]
orr r1, r1, #1
@@ -5763,7 +5763,7 @@ func_ov48_021946c0: ; 0x021946c0
ldr r0, _021947b0 ; =data_ov48_0219540c
ldr r1, _021947bc ; =func_0203e7b4
ldr r2, _021947c0 ; =data_ov48_02195400
bl func_0204f8d4
bl __register_global_object
mov ip, #1
str ip, [sp]
mov r1, #3
@@ -5810,7 +5810,7 @@ func_ov48_021946c0: ; 0x021946c0
ldr r0, _021947c4 ; =data_ov48_02194b40
ldr r1, _021947c8 ; =func_ov00_020cceec
ldr r2, _021947cc ; =data_ov48_02195420
bl func_0204f8d4
bl __register_global_object
add sp, sp, #0x84
ldmia sp!, {pc}
.align 2, 0
@@ -5837,7 +5837,7 @@ func_ov48_021947d0: ; 0x021947d0
ldr r0, _021948d4 ; =data_ov48_02195438
ldr r1, _021948e0 ; =func_0203e7b4
ldr r2, _021948e4 ; =data_ov48_0219542c
bl func_0204f8d4
bl __register_global_object
mov r3, #0
str r3, [sp]
str r3, [sp, #4]
@@ -5889,7 +5889,7 @@ func_ov48_021947d0: ; 0x021947d0
ldr r0, _021948ec ; =data_ov48_02194d50
ldr r1, _021948f0 ; =func_ov00_020cceec
ldr r2, _021948f4 ; =data_ov48_0219544c
bl func_0204f8d4
bl __register_global_object
add sp, sp, #0x84
ldmia sp!, {pc}
.align 2, 0
@@ -5917,7 +5917,7 @@ func_ov48_021948f8: ; 0x021948f8
ldr r0, _021949f0 ; =data_ov48_02195478
ldr r1, _021949fc ; =func_0203e7b4
ldr r2, _02194a00 ; =data_ov48_0219546c
bl func_0204f8d4
bl __register_global_object
mov ip, #1
str ip, [sp]
str ip, [sp, #4]
@@ -5966,7 +5966,7 @@ func_ov48_021948f8: ; 0x021948f8
ldr r0, _02194a08 ; =data_ov48_02194f30
ldr r1, _02194a0c ; =func_ov00_020cceec
ldr r2, _02194a10 ; =data_ov48_0219548c
bl func_0204f8d4
bl __register_global_object
add sp, sp, #0x84
ldmia sp!, {pc}
.align 2, 0
@@ -5993,7 +5993,7 @@ func_ov48_02194a14: ; 0x02194a14
ldr r0, _02194a40 ; =data_ov48_021954a4
ldr r1, _02194a4c ; =func_0203e7b4
ldr r2, _02194a50 ; =data_ov48_02195498
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov48_02194a14
@@ -6015,7 +6015,7 @@ func_ov48_02194a54: ; 0x02194a54
ldr r0, _02194a80 ; =data_ov48_021954c4
ldr r1, _02194a8c ; =func_0203e7b4
ldr r2, _02194a90 ; =data_ov48_021954b8
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov48_02194a54
@@ -6037,7 +6037,7 @@ func_ov48_02194a94: ; 0x02194a94
ldr r0, _02194ac0 ; =data_ov48_021954e4
ldr r1, _02194acc ; =func_0203e7b4
ldr r2, _02194ad0 ; =data_ov48_021954d8
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov48_02194a94
asm/ov49.inc
+1 -1
View File
@@ -71,6 +71,7 @@
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager7HasItemEi
.extern __register_global_object
.extern data_02050f54
.extern data_02052f54
.extern data_027e0764
@@ -112,7 +113,6 @@
.extern func_0203e784
.extern func_0203e7b4
.extern func_0204f754
.extern func_0204f8d4
.extern func_ov00_02079e68
.extern func_ov00_0207a1c8
.extern func_ov00_0207c1b0
asm/ov49.s
+4 -4
View File
@@ -3500,7 +3500,7 @@ func_ov49_021982c8: ; 0x021982c8
ldr r0, _021983cc ; =data_ov49_0219892c
ldr r1, _021983d8 ; =func_0203e7b4
ldr r2, _021983dc ; =data_ov49_02198920
bl func_0204f8d4
bl __register_global_object
mov r4, #1
str r4, [sp]
ldr r0, _021983e0 ; =0x00001b33
@@ -3552,7 +3552,7 @@ func_ov49_021982c8: ; 0x021982c8
ldr r0, _021983e8 ; =data_ov49_021984e0
ldr r1, _021983ec ; =func_ov00_020cceec
ldr r2, _021983f0 ; =data_ov49_02198940
bl func_0204f8d4
bl __register_global_object
add sp, sp, #0x84
ldmia sp!, {r3, r4, pc}
.align 2, 0
@@ -3580,7 +3580,7 @@ func_ov49_021983f4: ; 0x021983f4
ldr r0, _02198420 ; =data_ov49_02198958
ldr r1, _0219842c ; =func_0203e7b4
ldr r2, _02198430 ; =data_ov49_0219894c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov49_021983f4
@@ -3602,7 +3602,7 @@ func_ov49_02198434: ; 0x02198434
ldr r0, _02198460 ; =data_ov49_02198978
ldr r1, _0219846c ; =func_0203e7b4
ldr r2, _02198470 ; =data_ov49_0219896c
bl func_0204f8d4
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov49_02198434
asm/ov50.inc
+1 -1
View File
@@ -107,7 +107,7 @@
.extern func_0203e7b4
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
.extern __register_global_object
.extern func_ov00_0207a1c8
.extern func_ov00_0207c1b0
.extern func_ov00_0207c1f8
asm/ov50.s
+4 -4
View File
@@ -2524,7 +2524,7 @@ func_ov50_0219769c: ; 0x0219769c
ldr r1, _0219775c ; =func_ov50_02197768
ldr r2, _02197760 ; =data_ov50_02198cf0
str ip, [r3, #0x3c]
bl func_0204f8d4
bl __register_global_object
ldr r0, _02197750 ; =data_ov50_02198cc0
ldr r1, [r0, #0x2c]
orr r1, r1, #1
@@ -3902,7 +3902,7 @@ func_ov50_0219882c: ; 0x0219882c
ldr r0, _02198874 ; =data_ov50_02198cac
ldr r1, _02198880 ; =func_0203e7b4
ldr r2, _02198884 ; =data_ov50_02198ca0
bl func_0204f8d4
bl __register_global_object
ldr r1, _02198888 ; =0x00004b5c
ldr r2, _0219888c ; =data_ov50_021989c0
mov r0, #0x10000000
@@ -3934,7 +3934,7 @@ func_ov50_02198890: ; 0x02198890
ldr r0, _02198984 ; =data_ov50_02198ccc
ldr r1, _02198990 ; =func_0203e7b4
ldr r2, _02198994 ; =data_ov50_02198cc0
bl func_0204f8d4
bl __register_global_object
mov ip, #1
str ip, [sp]
ldr r1, _02198998 ; =0x00001b33
@@ -3982,7 +3982,7 @@ func_ov50_02198890: ; 0x02198890
ldr r0, _0219899c ; =data_ov50_02198ad8
ldr r1, _021989a0 ; =func_ov00_020cceec
ldr r2, _021989a4 ; =data_ov50_02198ce0
bl func_0204f8d4
bl __register_global_object
add sp, sp, #0x84
ldmia sp!, {pc}
.align 2, 0

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