mirror of
https://github.com/pret/pmd-red.git
synced 2026-09-13 03:25:43 -05:00
decomp a few more easy ones
This commit is contained in:
@@ -5,30 +5,6 @@
|
|||||||
|
|
||||||
.text
|
.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
|
thumb_func_start sub_8073D14
|
||||||
sub_8073D14:
|
sub_8073D14:
|
||||||
push {r4-r7,lr}
|
push {r4-r7,lr}
|
||||||
|
|||||||
@@ -12482,12 +12482,4 @@ sub_8083260:
|
|||||||
bx r0
|
bx r0
|
||||||
thumb_func_end sub_8083260
|
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
|
.align 2, 0
|
||||||
@@ -37,6 +37,9 @@ enum ItemTargetFlag
|
|||||||
};
|
};
|
||||||
|
|
||||||
extern void sub_8077274(struct DungeonEntity *, struct DungeonEntity *);
|
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 s32 gNumPotentialTargets;
|
||||||
extern u32 gPotentialTargetWeights[NUM_DIRECTIONS];
|
extern u32 gPotentialTargetWeights[NUM_DIRECTIONS];
|
||||||
@@ -428,3 +431,18 @@ void TargetThrownItem(struct DungeonEntity *pokemon, struct DungeonEntity *targe
|
|||||||
gNumPotentialTargets++;
|
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);
|
||||||
|
}
|
||||||
|
|||||||
@@ -5,6 +5,13 @@
|
|||||||
#include "dungeon_map_access.h"
|
#include "dungeon_map_access.h"
|
||||||
#include "map.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)
|
bool8 InSameRoom_2(struct Position *pos1, struct Position *pos2)
|
||||||
{
|
{
|
||||||
u8 pos1RoomIndex;
|
u8 pos1RoomIndex;
|
||||||
|
|||||||
Reference in New Issue
Block a user