diff options
| -rw-r--r-- | asm/code_8073CF0.s | 24 | ||||
| -rw-r--r-- | asm/code_807CABC.s | 2 | ||||
| -rw-r--r-- | asm/code_807CD9C.s | 10 | ||||
| -rw-r--r-- | src/dungeon_ai_items.c | 18 | ||||
| -rw-r--r-- | src/dungeon_range.c | 7 |
5 files changed, 27 insertions, 34 deletions
diff --git a/asm/code_8073CF0.s b/asm/code_8073CF0.s index 36da354..6a1b2ea 100644 --- a/asm/code_8073CF0.s +++ b/asm/code_8073CF0.s @@ -5,30 +5,6 @@ .text - thumb_func_start sub_8073CF0 -sub_8073CF0: - push {lr} - bl sub_8067110 - pop {r0} - bx r0 - thumb_func_end sub_8073CF0 - - thumb_func_start sub_8073CFC -sub_8073CFC: - push {lr} - bl sub_80671A0 - pop {r0} - bx r0 - thumb_func_end sub_8073CFC - - thumb_func_start sub_8073D08 -sub_8073D08: - push {lr} - bl sub_8073D14 - pop {r0} - bx r0 - thumb_func_end sub_8073D08 - thumb_func_start sub_8073D14 sub_8073D14: push {r4-r7,lr} diff --git a/asm/code_807CABC.s b/asm/code_807CABC.s index 888017d..2e8680f 100644 --- a/asm/code_807CABC.s +++ b/asm/code_807CABC.s @@ -327,4 +327,4 @@ _0807CD54: bx r0 thumb_func_end sub_807CB3C - .align 2, 0
\ No newline at end of file + .align 2, 0 diff --git a/asm/code_807CD9C.s b/asm/code_807CD9C.s index f5de8e0..cf1de2c 100644 --- a/asm/code_807CD9C.s +++ b/asm/code_807CD9C.s @@ -12482,12 +12482,4 @@ sub_8083260: bx r0 thumb_func_end sub_8083260 - thumb_func_start sub_8083288 -sub_8083288: - push {lr} - bl sub_8082FE0 - pop {r0} - bx r0 - thumb_func_end sub_8083288 - - .align 2, 0
\ No newline at end of file + .align 2, 0 diff --git a/src/dungeon_ai_items.c b/src/dungeon_ai_items.c index 183d143..35a5f14 100644 --- a/src/dungeon_ai_items.c +++ b/src/dungeon_ai_items.c @@ -37,6 +37,9 @@ enum ItemTargetFlag }; extern void sub_8077274(struct DungeonEntity *, struct DungeonEntity *); +extern void sub_8067110(struct DungeonEntity *); +extern void sub_80671A0(struct DungeonEntity *); +extern void sub_8073D14(struct DungeonEntity *); extern s32 gNumPotentialTargets; extern u32 gPotentialTargetWeights[NUM_DIRECTIONS]; @@ -428,3 +431,18 @@ void TargetThrownItem(struct DungeonEntity *pokemon, struct DungeonEntity *targe gNumPotentialTargets++; } } + +void sub_8073CF0(struct DungeonEntity *pokemon) +{ + sub_8067110(pokemon); +} + +void sub_8073CFC(struct DungeonEntity *pokemon) +{ + sub_80671A0(pokemon); +} + +void sub_8073D08(struct DungeonEntity *pokemon) +{ + sub_8073D14(pokemon); +} diff --git a/src/dungeon_range.c b/src/dungeon_range.c index facd71d..8dd7ffa 100644 --- a/src/dungeon_range.c +++ b/src/dungeon_range.c @@ -5,6 +5,13 @@ #include "dungeon_map_access.h" #include "map.h" +extern void sub_8082FE0(u32, u32, u32); + +void sub_8083288(u32 r0, u32 r1, u32 r2) +{ + sub_8082FE0(r0, r1, r2); +} + bool8 InSameRoom_2(struct Position *pos1, struct Position *pos2) { u8 pos1RoomIndex; |