mirror of
https://github.com/pret/pmd-red.git
synced 2024-11-23 13:09:56 +00:00
more trap stuff and sub_808B1CC
This commit is contained in:
Seth Barberee
parent
4051053fd8
commit
197574e0ed
@ -5,73 +5,6 @@
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start HandleMudTrap
|
||||
HandleMudTrap:
|
||||
push {r4,r5,lr}
|
||||
sub sp, 0x8
|
||||
adds r5, r0, 0
|
||||
adds r4, r1, 0
|
||||
cmp r4, 0
|
||||
beq _08080240
|
||||
movs r0, 0x64
|
||||
bl DungeonRandInt
|
||||
adds r1, r0, 0
|
||||
cmp r0, 0x18
|
||||
bgt _080801EC
|
||||
ldr r0, _080801E8
|
||||
b _080801F2
|
||||
.align 2, 0
|
||||
_080801E8: .4byte gUnknown_8106A4C
|
||||
_080801EC:
|
||||
cmp r0, 0x31
|
||||
bgt _0808020C
|
||||
ldr r0, _08080208
|
||||
_080801F2:
|
||||
ldr r2, [r0]
|
||||
movs r0, 0x1
|
||||
str r0, [sp]
|
||||
str r0, [sp, 0x4]
|
||||
adds r0, r5, 0
|
||||
adds r1, r4, 0
|
||||
movs r3, 0x1
|
||||
bl LowerAttackStageTarget
|
||||
b _08080240
|
||||
.align 2, 0
|
||||
_08080208: .4byte gUnknown_8106A50
|
||||
_0808020C:
|
||||
cmp r1, 0x4A
|
||||
bgt _0808022C
|
||||
ldr r0, _08080228
|
||||
ldr r2, [r0]
|
||||
movs r0, 0x1
|
||||
str r0, [sp]
|
||||
str r0, [sp, 0x4]
|
||||
adds r0, r5, 0
|
||||
adds r1, r4, 0
|
||||
movs r3, 0x1
|
||||
bl LowerDefenseStageTarget
|
||||
b _08080240
|
||||
.align 2, 0
|
||||
_08080228: .4byte gUnknown_8106A4C
|
||||
_0808022C:
|
||||
ldr r0, _08080248
|
||||
ldr r2, [r0]
|
||||
movs r0, 0x1
|
||||
str r0, [sp]
|
||||
str r0, [sp, 0x4]
|
||||
adds r0, r5, 0
|
||||
adds r1, r4, 0
|
||||
movs r3, 0x1
|
||||
bl LowerDefenseStageTarget
|
||||
_08080240:
|
||||
add sp, 0x8
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08080248: .4byte gUnknown_8106A50
|
||||
thumb_func_end HandleMudTrap
|
||||
|
||||
thumb_func_start HandleStickyTrap
|
||||
HandleStickyTrap:
|
||||
push {r4-r7,lr}
|
||||
|
||||
@ -119,7 +119,9 @@ typedef struct Dungeon
|
||||
u8 unk678;
|
||||
u8 unk679;
|
||||
u8 unk67A;
|
||||
u8 unk67B[0x688 - 0x67B];
|
||||
u8 unk67B[0x684 - 0x67B];
|
||||
s16 unk684;
|
||||
s16 unk686;
|
||||
s16 unk688;
|
||||
/* 0x68A */ u8 unk68A;
|
||||
u8 fill68B[0x699 - 0x68B];
|
||||
|
||||
@ -456,6 +456,9 @@ extern void sub_808BB3C(Position *);
|
||||
extern void sub_8046860(Entity *, Position *, Item *, u32);
|
||||
extern u32 sub_803D73C(u32);
|
||||
|
||||
extern void sub_80460F8(Position *, Item *, u8);
|
||||
extern void sub_807FE04(Position *, u8);
|
||||
|
||||
void ZapdosReFightDialogue(void)
|
||||
{
|
||||
Entity *LeaderEntity;
|
||||
@ -3169,7 +3172,7 @@ void sub_808AE54(char param_1,char param_2,u32 *param_3)
|
||||
LeaderEntity = xxx_call_GetLeader();
|
||||
sub_8052D44(IDStack,LeaderEntity,0);
|
||||
if ((sub_8098100(0x22) == 0) && (param_2 == 0x2E) && (param_1 == 0x17)) {
|
||||
sub_808B1CC(0);
|
||||
sub_808B1CC(ITEM_NOTHING);
|
||||
if (sub_8098100(0x1d) == 0) {
|
||||
xxx_init_itemslot_8090A8C(&item,ITEM_ROCK_PART,0);
|
||||
sub_80464C8(GetLeader(),param_3,&item);
|
||||
@ -3192,7 +3195,7 @@ void sub_808AEC8(char param_1,char param_2,u32 *param_3)
|
||||
LeaderEntity = xxx_call_GetLeader();
|
||||
sub_8052D44(IDStack,LeaderEntity,0);
|
||||
if ((sub_8098100(0x22) == 0) && (param_2 == 0x2F) && (param_1 == 0x18)) {
|
||||
sub_808B1CC(0);
|
||||
sub_808B1CC(ITEM_NOTHING);
|
||||
if (sub_8098100(0x1d) == 0) {
|
||||
xxx_init_itemslot_8090A8C(&item,ITEM_ICE_PART,0);
|
||||
sub_80464C8(GetLeader(),param_3,&item);
|
||||
@ -3214,7 +3217,7 @@ void sub_808AF3C(char param_1,char param_2,u32 *param_3)
|
||||
LeaderEntity = xxx_call_GetLeader();
|
||||
sub_8052D44(IDStack,LeaderEntity,0);
|
||||
if ((sub_8098100(0x22) == 0) && (param_2 == 0x30) && (param_1 == 0x19)) {
|
||||
sub_808B1CC(0);
|
||||
sub_808B1CC(ITEM_NOTHING);
|
||||
if (sub_8098100(0x1d) == 0) {
|
||||
xxx_init_itemslot_8090A8C(&item,ITEM_STEEL_PART,0);
|
||||
sub_80464C8(GetLeader(),param_3, &item);
|
||||
@ -3316,117 +3319,36 @@ void RegisteelPreFightDialogue(void)
|
||||
}
|
||||
}
|
||||
|
||||
NAKED
|
||||
void sub_808B1CC(u8 r0)
|
||||
void sub_808B1CC(u8 itemID)
|
||||
{
|
||||
asm_unified(
|
||||
"\tpush {r4-r7,lr}\n"
|
||||
"\tsub sp, 0x8\n"
|
||||
"\tlsls r0, 24\n"
|
||||
"\tlsrs r6, r0, 24\n"
|
||||
"\tldr r7, _0808B21C\n"
|
||||
"\tldr r2, [r7]\n"
|
||||
"\tldr r1, _0808B220\n"
|
||||
"\tadds r0, r2, r1\n"
|
||||
"\tldrh r0, [r0]\n"
|
||||
"\tldr r5, _0808B224\n"
|
||||
"\tldr r1, [sp]\n"
|
||||
"\tands r1, r5\n"
|
||||
"\torrs r1, r0\n"
|
||||
"\tstr r1, [sp]\n"
|
||||
"\tldr r3, _0808B228\n"
|
||||
"\tadds r2, r3\n"
|
||||
"\tldrh r0, [r2]\n"
|
||||
"\tlsls r0, 16\n"
|
||||
"\tldr r4, _0808B22C\n"
|
||||
"\tadds r2, r4, 0\n"
|
||||
"\tands r2, r1\n"
|
||||
"\torrs r2, r0\n"
|
||||
"\tstr r2, [sp]\n"
|
||||
"\tmov r0, sp\n"
|
||||
"\tmovs r1, 0\n"
|
||||
"\tldrsh r0, [r0, r1]\n"
|
||||
"\tcmp r0, 0\n"
|
||||
"\tblt _0808B208\n"
|
||||
"\tcmp r2, 0\n"
|
||||
"\tbge _0808B244\n"
|
||||
"_0808B208:\n"
|
||||
"\tbl GetLeader\n"
|
||||
"\tadds r2, r0, 0\n"
|
||||
"\tcmp r2, 0\n"
|
||||
"\tbne _0808B230\n"
|
||||
"\tldr r1, [r7]\n"
|
||||
"\tmovs r0, 0x1\n"
|
||||
"\tstrb r0, [r1, 0x2]\n"
|
||||
"\tb _0808B2A8\n"
|
||||
"\t.align 2, 0\n"
|
||||
"_0808B21C: .4byte gDungeon\n"
|
||||
"_0808B220: .4byte 0x00000684\n"
|
||||
"_0808B224: .4byte 0xffff0000\n"
|
||||
"_0808B228: .4byte 0x00000686\n"
|
||||
"_0808B22C: .4byte 0x0000ffff\n"
|
||||
"_0808B230:\n"
|
||||
"\tldrh r0, [r2, 0x4]\n"
|
||||
"\tldr r1, [sp]\n"
|
||||
"\tands r1, r5\n"
|
||||
"\torrs r1, r0\n"
|
||||
"\tstr r1, [sp]\n"
|
||||
"\tldrh r0, [r2, 0x6]\n"
|
||||
"\tlsls r0, 16\n"
|
||||
"\tands r1, r4\n"
|
||||
"\torrs r1, r0\n"
|
||||
"\tstr r1, [sp]\n"
|
||||
"_0808B244:\n"
|
||||
"\tmov r5, sp\n"
|
||||
"\tmov r0, sp\n"
|
||||
"\tmovs r1, 0\n"
|
||||
"\tbl sub_807FE04\n"
|
||||
"\tmov r0, sp\n"
|
||||
"\tmovs r2, 0\n"
|
||||
"\tldrsh r0, [r0, r2]\n"
|
||||
"\tmovs r3, 0x2\n"
|
||||
"\tldrsh r1, [r5, r3]\n"
|
||||
"\tbl GetTileSafe\n"
|
||||
"\tldrh r2, [r0]\n"
|
||||
"\tmovs r3, 0x80\n"
|
||||
"\tlsls r3, 2\n"
|
||||
"\tadds r1, r3, 0\n"
|
||||
"\torrs r1, r2\n"
|
||||
"\tstrh r1, [r0]\n"
|
||||
"\tcmp r6, 0\n"
|
||||
"\tbeq _0808B2A0\n"
|
||||
"\tadds r0, r6, 0\n"
|
||||
"\tbl sub_80860A8\n"
|
||||
"\tlsls r0, 24\n"
|
||||
"\tcmp r0, 0\n"
|
||||
"\tbne _0808B2A0\n"
|
||||
"\tmovs r0, 0x7A\n"
|
||||
"\tbl sub_80860A8\n"
|
||||
"\tlsls r0, 24\n"
|
||||
"\tcmp r0, 0\n"
|
||||
"\tbne _0808B2A0\n"
|
||||
"\tadd r4, sp, 0x4\n"
|
||||
"\tadds r0, r4, 0\n"
|
||||
"\tadds r1, r6, 0\n"
|
||||
"\tmovs r2, 0\n"
|
||||
"\tbl xxx_init_itemslot_8090A8C\n"
|
||||
"\tldrh r0, [r5, 0x2]\n"
|
||||
"\tsubs r0, 0x1\n"
|
||||
"\tstrh r0, [r5, 0x2]\n"
|
||||
"\tmov r0, sp\n"
|
||||
"\tadds r1, r4, 0\n"
|
||||
"\tmovs r2, 0x1\n"
|
||||
"\tbl sub_80460F8\n"
|
||||
"_0808B2A0:\n"
|
||||
"\tbl sub_8049ED4\n"
|
||||
"\tbl sub_8040A84\n"
|
||||
"_0808B2A8:\n"
|
||||
"\tadd sp, 0x8\n"
|
||||
"\tpop {r4-r7}\n"
|
||||
"\tpop {r0}\n"
|
||||
"\tbx r0");
|
||||
}
|
||||
Entity *entity;
|
||||
Tile *tile;
|
||||
Position pos;
|
||||
Item item;
|
||||
|
||||
pos.x = gDungeon->unk684;
|
||||
pos.y = gDungeon->unk686;
|
||||
if ((pos.x < 0) || (pos.y < 0)) {
|
||||
entity = GetLeader();
|
||||
if (entity == NULL) {
|
||||
gDungeon->unk2 = 1;
|
||||
return;
|
||||
}
|
||||
pos.x = entity->pos.x;
|
||||
pos.y = entity->pos.y;
|
||||
}
|
||||
sub_807FE04(&pos, 0);
|
||||
tile = GetTileSafe(pos.x, pos.y);
|
||||
tile->terrainType = tile->terrainType | TERRAIN_TYPE_STAIRS;
|
||||
if (((itemID != ITEM_NOTHING) && (sub_80860A8(itemID) == 0)) &&
|
||||
(sub_80860A8(ITEM_MUSIC_BOX) == 0)) {
|
||||
xxx_init_itemslot_8090A8C(&item,itemID,0);
|
||||
pos.y--;
|
||||
sub_80460F8(&pos,&item,1);
|
||||
}
|
||||
sub_8049ED4();
|
||||
sub_8040A84();
|
||||
}
|
||||
|
||||
void SetupRegiFacingDirection(Entity *regiEntity)
|
||||
{
|
||||
|
||||
33
src/trap.c
33
src/trap.c
@ -9,6 +9,7 @@
|
||||
#include "dungeon_map_access.h"
|
||||
#include "dungeon_util.h"
|
||||
#include "structs/map.h"
|
||||
#include "move_effects_target.h"
|
||||
|
||||
extern u8 gAvailablePokemonNames[];
|
||||
|
||||
@ -22,6 +23,8 @@ extern u8 *gUnknown_80FD7F8[];
|
||||
|
||||
extern s16 gUnknown_80F4F84;
|
||||
extern s16 gUnknown_80F4F86;
|
||||
extern u32 gUnknown_8106A4C;
|
||||
extern u32 gUnknown_8106A50;
|
||||
|
||||
|
||||
void HandleTripTrap(Entity *pokemon,Entity *target);
|
||||
@ -159,7 +162,7 @@ bool8 sub_807FE04(Position *pos, char param_2)
|
||||
}
|
||||
}
|
||||
|
||||
bool8 sub_807FE44(Position *pos,char param_2)
|
||||
bool8 sub_807FE44(Position *pos, char param_2)
|
||||
{
|
||||
Tile *tile;
|
||||
|
||||
@ -181,7 +184,7 @@ void GetTrapName(u8 *buffer, u8 trapIndex)
|
||||
strcpy(buffer, gTrapNames[trapIndex]);
|
||||
}
|
||||
|
||||
void sub_807FE9C(Entity *pokemon,Position *pos,int param_3,char param_4)
|
||||
void sub_807FE9C(Entity *pokemon, Position *pos, int param_3, char param_4)
|
||||
{
|
||||
Tile *tile;
|
||||
bool8 flag1;
|
||||
@ -326,3 +329,29 @@ void sub_807FE9C(Entity *pokemon,Position *pos,int param_3,char param_4)
|
||||
sub_807FE04(pos,1);
|
||||
}
|
||||
}
|
||||
|
||||
void HandleMudTrap(Entity *pokemon, Entity *target)
|
||||
{
|
||||
int rand;
|
||||
#ifdef NONMATCHING
|
||||
int rand1;
|
||||
#else
|
||||
register int rand1 asm("r1");
|
||||
#endif
|
||||
|
||||
if (target != NULL) {
|
||||
rand1 = rand = DungeonRandInt(100);
|
||||
if (rand <= 0x18) {
|
||||
LowerAttackStageTarget(pokemon,target,gUnknown_8106A4C,1,1,1);
|
||||
}
|
||||
else if (0x32 > rand) {
|
||||
LowerAttackStageTarget(pokemon,target,gUnknown_8106A50,1,1,1);
|
||||
}
|
||||
else if (rand1 < 0x4b) {
|
||||
LowerDefenseStageTarget(pokemon,target,gUnknown_8106A4C,1,1,1);
|
||||
}
|
||||
else {
|
||||
LowerDefenseStageTarget(pokemon,target,gUnknown_8106A50,1,1,1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user