Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Match Handle action #366

Merged
merged 2 commits into from
Mar 17, 2025
Merged

Match Handle action #366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1aa0b25
Match handleaction
DizzyEggg Mar 17, 2025
7ea9ff8
merge ground script files
DizzyEggg Mar 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,858 changes: 0 additions & 1,858 deletions asm/handleaction.s
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions include/code_8002774.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ s32 VecDirection8Sign(PixelPos *param_1);
s32 VecDirection4SignYX(PixelPos *param_1);
s8 VecDirection8Radial(PixelPos *param_1);
s8 VecDirection4Radial(PixelPos *param_1);
s8 SizedDeltaDirection4(PixelPos *r0, PixelPos *r1, PixelPos *r2, PixelPos *r3);
s8 SizedDeltaDirection8(PixelPos *r0, PixelPos *r1, PixelPos *r2, PixelPos *r3);
s8 SizedDeltaDirection4(const PixelPos *r0, const PixelPos *r1, const PixelPos *r2, const PixelPos *r3);
s8 SizedDeltaDirection8(const PixelPos *r0, const PixelPos *r1, const PixelPos *r2, const PixelPos *r3);

#endif
19 changes: 19 additions & 0 deletions include/ground_main.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,25 @@
#ifndef GUARD_GROUND_MAIN_H
#define GUARD_GROUND_MAIN_H

#include "structs/str_pokemon.h"
#include "structs/str_wonder_mail.h"

struct unkStruct_20398C8
{
u8 unk0;
u8 unk1;
u8 unk2;
u8 unk3;
u8 unk4;
u8 fill5[0xB - 0x5];
u8 unkB;
u8 unkC;
u8 unkD;
WonderMailSub unk10;
PokemonStruct1 unk18;
u8 fill70[0x88 - 0x70];
};

// size: 0xC
typedef struct GroundConversionStruct
{
Expand Down
2 changes: 1 addition & 1 deletion include/ground_script.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ typedef struct CallbackData
/* 0x20 */ void (*setPositionBounds)(void*, PixelPos *from, PixelPos *to);
/* 0x24 */ bool8 (*moveReal)(void*, PixelPos*);
/* 0x28 */ void (*setPosHeight)(void*, u32 height);
/* 0x2C */ s32 (*setDirection)(void*, s8 dir); // direction must be signed char!
/* 0x2C */ s32 (*setDirection)(void*, s32 dir); // direction must be signed char!
/* 0x30 */ void (*setEventIndex)(void*, u16);
/* 0x34 */ void (*livesOnlyNullsub)(void*, u16);
/* 0x38 */ void (*func38)(void*, s16, u32);
Expand Down
2 changes: 0 additions & 2 deletions ld_script.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,8 +313,6 @@ SECTIONS {
asm/code_809C5C4.o(.text);
src/code_809D148.o(.text);
src/ground_script.o(.text);
asm/handleaction.o(.text);
src/ground_script_1.o(.text);
asm/ground_script.o(.text);
src/ground_script_2.o(.text);
src/code_80A26CC.o(.text);
Expand Down
6 changes: 4 additions & 2 deletions src/code_8002774.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,8 @@ s8 VecDirection4Radial(PixelPos *pixelPos)
return DIRECTION_SOUTH;
}

s8 SizedDeltaDirection4(PixelPos *r0, PixelPos *r1, PixelPos *r2, PixelPos *r3) {
s8 SizedDeltaDirection4(const PixelPos *r0, const PixelPos *r1, const PixelPos *r2, const PixelPos *r3)
{
PixelPos stack;
s32 iVar1;
s32 iVar2;
Expand Down Expand Up @@ -377,7 +378,8 @@ s8 SizedDeltaDirection4(PixelPos *r0, PixelPos *r1, PixelPos *r2, PixelPos *r3)
return VecDirection4Radial(&stack);
}

s8 SizedDeltaDirection8(PixelPos *r0, PixelPos *r1, PixelPos *r2, PixelPos *r3) {
s8 SizedDeltaDirection8(const PixelPos *r0, const PixelPos *r1, const PixelPos *r2, const PixelPos *r3)
{
PixelPos stack;
s32 iVar1;
s32 iVar2;
Expand Down
18 changes: 0 additions & 18 deletions src/ground_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,6 @@
#include "pokemon.h"
#include "text_util.h"

// size: 0x88
struct unkStruct_20398C8
{
u8 unk0;
u8 unk1;
u8 unk2;
u8 unk3;
u8 unk4;
u8 fill5[0xB - 0x5];
u8 unkB;
u8 unkC;
u8 unkD;
WonderMailSub unk10;
PokemonStruct1 unk18;
u8 fill70[0x88 - 0x70];
};


EWRAM_DATA u32 gUnknown_20398A8 = {0};
EWRAM_DATA u32 gUnknown_20398AC = {0};
EWRAM_DATA u32 gUnknown_20398B0 = {0};
Expand Down
Loading