dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #17 from PikalaxALT/vs_seeker

Browse Source 
Vs seeker
This commit is contained in:
Marcus Huderle
2018-11-08 08:53:27 -06:00
committed by GitHub
parent c0a9d62091 aa6e1a91fc
commit be4624024c
21 changed files with 1564 additions and 1796 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/item_use.s
+2 -2
View File
@@ -1810,7 +1810,7 @@ _080A1DEC: .4byte gSaveBlock1Ptr
_080A1DF0: .4byte gTasks
_080A1DF4:
ldr r1, _080A1E04 @ =gUnknown_2039998
ldr r0, _080A1E08 @ =sub_810C670
ldr r0, _080A1E08 @ =Task_VsSeeker_0
str r0, [r1]
adds r0, r2, 0
bl sub_80A103C
@@ -1819,7 +1819,7 @@ _080A1E00:
bx r0
.align 2, 0
_080A1E04: .4byte gUnknown_2039998
_080A1E08: .4byte sub_810C670
_080A1E08: .4byte Task_VsSeeker_0
thumb_func_end sub_80A1D9C
thumb_func_start sub_80A1E0C
asm/macros/movement.inc
+4
View File
@@ -104,6 +104,10 @@
create_movement step_5f
create_movement step_60
create_movement step_61
create_movement step_62
create_movement step_63
create_movement step_64
create_movement step_65
enum_start 0x91
create_movement step_91
asm/vs_seeker.s
-1767
View File
File diff suppressed because it is too large Load Diff
data/data_83FECCC.s
+2 -17
View File
@@ -2709,24 +2709,9 @@ gUnknown_8453178:: @ 8453178
gUnknown_8453184:: @ 8453184
.incbin "baserom.gba", 0x453184, 0x8
gUnknown_845318C:: @ 845318C
.incbin "baserom.gba", 0x45318C, 0xDD0
gUnknown_8453F5C:: @ 8453F5C
.incbin "baserom.gba", 0x453F5C, 0x4
gUnknown_8453F60:: @ 8453F60
.incbin "baserom.gba", 0x453F60, 0x2
gUnknown_8453F62:: @ 8453F62
.incbin "baserom.gba", 0x453F62, 0x2
gUnknown_8453F64:: @ 8453F64
.incbin "baserom.gba", 0x453F64, 0x3
gUnknown_8453F67:: @ 8453F67
.incbin "baserom.gba", 0x453F67, 0x5
.section .rodata.8453F6C
// item_pc.o
gUnknown_8453F6C:: @ 8453F6C
.incbin "baserom.gba", 0x453F6C, 0x8
include/battle_setup.h
+1
View File
@@ -14,5 +14,6 @@ void trainer_flag_clear(u16);
void BattleSetup_StartTrainerBattle(void);
u8 *BattleSetup_GetScriptAddrAfterBattle(void);
u8 *BattleSetup_GetTrainerPostBattleScript(void);
void sub_80803FC(void);
#endif // GUARD_BATTLE_SETUP_H
include/constants/flags.h
+2
View File
@@ -1,6 +1,8 @@
#ifndef GUARD_CONSTANTS_FLAGS_H
#define GUARD_CONSTANTS_FLAGS_H
// TODO: Get correct names and numbers
#define FLAG_0x001 0x1
#define FLAG_0x002 0x2
#define FLAG_0x003 0x3
include/constants/movement_commands.h
+117
View File
@@ -0,0 +1,117 @@
#ifndef GUARD_CONSTANTS_MOVEMENT_COMMANDS_H
#define GUARD_CONSTANTS_MOVEMENT_COMMANDS_H
enum
{
step_00,
step_01,
step_02,
step_03,
slow_step_down,
slow_step_up,
slow_step_left,
slow_step_right,
step_down,
step_up,
step_left,
step_right,
fast_step_down,
fast_step_up,
fast_step_left,
fast_step_right,
step_10,
step_11,
step_12,
step_13,
step_14,
step_15,
step_16,
step_17,
step_18,
step_19,
step_1a,
step_1b,
step_1c,
step_1d,
step_1e,
step_1f,
step_20,
step_21,
step_22,
step_23,
step_24,
step_25,
step_26,
step_27,
step_28,
step_29,
step_2a,
step_2b,
step_2c,
step_2d,
step_2e,
step_2f,
step_30,
step_31,
step_32,
step_33,
step_34,
step_35,
step_36,
step_37,
step_38,
step_39,
step_3a,
step_3b,
step_3c,
step_3d,
step_3e,
step_3f,
step_40,
step_41,
step_42,
step_43,
step_44,
step_45,
step_46,
step_47,
step_48,
step_49,
step_4a,
step_4b,
step_4c,
step_4d,
step_4e,
step_4f,
step_50,
step_51,
step_52,
step_53,
step_54,
step_55,
step_56,
step_57,
step_58,
step_59,
step_5a,
step_5b,
step_5c,
step_5d,
step_5e,
step_5f,
step_60,
step_61,
step_62,
step_63,
step_64,
step_65,
step_91 = 0x91,
step_92,
step_96 = 0x96,
step_end = 0xfe,
};
#endif //GUARD_CONSTANTS_MOVEMENT_COMMANDS_H
include/event_scripts.h
+5
View File
@@ -372,4 +372,9 @@ extern const u8 SecretBase_RedCave1_Text_274E75[];
extern const u8 SecretBase_RedCave1_Text_2751E1[];
extern const u8 SecretBase_RedCave1_Text_2754F6[];
extern const u8 SecretBase_RedCave1_Text_2758CC[];
// vs_seeker
extern const u8 gUnknown_81C137C[];
extern const u8 gUnknown_81C13D6[];
extern const u8 gUnknown_81C1429[];
#endif //GUARD_EVENT_SCRIPTS_H
include/field_effect.h
+3 -1
View File
@@ -66,7 +66,9 @@ enum FieldEffectScriptIdx
FLDEFF_USE_FLY_ANCIENT_TOMB,
FLDEFF_PCTURN_ON,
FLDEFF_HALL_OF_FAME_RECORD,
FLDEFF_USE_TELEPORT
FLDEFF_USE_TELEPORT,
FLDEFF_UNK_40,
FLDEFF_UNK_41 // TODO: related to vs_seeker
};
extern u32 gFieldEffectArguments[8];
include/field_map_obj.h
+3
View File
@@ -76,6 +76,9 @@ void MoveCoords(u8, s16 *, s16 *);
bool8 FieldObjectIsSpecialAnimActive(struct MapObject *);
u8 FieldObjectClearAnimIfSpecialAnimFinished(struct MapObject *);
u8 GetFieldObjectIdByXYZ(u16 x, u16 y, u8 z);
void npc_coords_shift_still(struct MapObject *);
void sub_805FE7C(struct MapObject *, u8);
void npc_set_running_behaviour_etc(struct MapObject *, u8);
// Exported data declarations
include/field_specials.h
+1
View File
@@ -2,5 +2,6 @@
#define GUARD_FIELD_SPECIALS_H
u8 GetLeadMonIndex(void);
void TV_PrintIntToStringVar(u8, int);
#endif // GUARD_FIELD_SPECIALS_H
include/item_menu.h
+5 -3
View File
@@ -1,12 +1,14 @@
#ifndef GUARD_item_menu_H
#define GUARD_item_menu_H
#ifndef GUARD_ITEM_MENU_H
#define GUARD_ITEM_MENU_H
// Exported type declarations
// Exported RAM declarations
extern u16 gUnknown_203AD30;
// Exported ROM declarations
void sub_81AAC50(void);
void sub_81AAC70(void);
#endif //GUARD_item_menu_H
#endif //GUARD_ITEM_MENU_H
include/item_use.h
+9
View File
@@ -0,0 +1,9 @@
#ifndef GUARD_ITEM_USE_H
#define GUARD_ITEM_USE_H
#include "global.h"
void sub_80A1E0C(u8);
void sub_80A2294(u8, u8, u16, u16);
#endif //GUARD_ITEM_USE_H
include/map_obj_lock.h
+1
View File
@@ -7,5 +7,6 @@ bool8 sub_809847C(void);
void LockSelectedMapObject(void);
void sub_8098630(void);
bool8 sub_8098734(void);
void sub_80696C0(void);
#endif // GUARD_MAP_OBJ_LOCK_H
include/new_menu_helpers.h
+3 -1
View File
@@ -1,6 +1,7 @@
#ifndef GUARD_NEW_MENU_HELPERS_H
#define GUARD_NEW_MENU_HELPERS_H
#include "global.h"
#include "text.h"
#include "task.h"
@@ -9,10 +10,11 @@ void sub_81973C4(u8, u8);
void sub_819746C(u8 windowId, bool8 copyToVram);
void sub_81973FC(u8, u8);
u16 AddTextPrinterParametrized(u8 windowId, u8 fontId, const u8 *str, u8 speed, void ( *callback)(u16, struct TextPrinter *), u8 fgColor, u8 bgColor, u8 shadowColor);
void DisplayItemMessageOnField(u8 taskId, const u8 *src, TaskFunc callback);
void DisplayItemMessageOnField(u8 taskId, u8 bgId, const u8 *src, TaskFunc callback);
void sub_8197434(u8 a0, u8 a1);
void SetStandardWindowBorderStyle(u8 a0, u8 a1);
void sub_8197930(void);
u8 GetPlayerTextSpeed(void);
void sub_80F6F54(u8, u8);
#endif // GUARD_NEW_MENU_HELPERS_H
include/unk_810c3a4.h
+7
View File
@@ -0,0 +1,7 @@
#ifndef GUARD_UNK_810C3A4_H
#define GUARD_UNK_810C3A4_H
void sub_810C604(void);
void sub_810C640(void);
#endif //GUARD_UNK_810C3A4_H
include/vs_seeker.h
+14
View File
@@ -0,0 +1,14 @@
#ifndef GUARD_VS_SEEKER_H
#define GUARD_VS_SEEKER_H
#include "global.h"
void Task_VsSeeker_0(u8 taskId);
void sub_810CB90(void);
void sub_810CDE8(void);
int sub_810CE64(u16 a0);
bool8 sub_810CF04(u8 a0);
u8 sub_810CF54();
void sub_810D0D0(void);
#endif //GUARD_VS_SEEKER_H
ld_script.txt
+3 -1
View File
@@ -215,7 +215,7 @@ SECTIONS {
asm/bag.o(.text);
asm/battle_dome_cards.o(.text);
asm/unk_810C3A4.o(.text);
asm/vs_seeker.o(.text);
src/vs_seeker.o(.text);
asm/item_pc.o(.text);
asm/mailbox_pc.o(.text);
asm/menu.o(.text);
@@ -368,6 +368,8 @@ SECTIONS {
data/data_83F5738.o(.rodata);
src/save.o(.rodata);
data/data_83FECCC.o(.rodata);
src/vs_seeker.o(.rodata);
data/data_83FECCC.o(.rodata.8453F6C);
src/menews_jisan.o(.rodata);
data/data_8468C98.o(.rodata);
src/m4a_tables.o(.rodata);
src/menews_jisan.c
+2 -2
View File
@@ -89,12 +89,12 @@ void sub_8146C88(void)
r5->unk_0_2 = 0;
r5->unk_0_5 = 0;
r5->unk_1 = 0;
VarSet(0x4028, 0);
VarSet(VAR_0x4028, 0);
}
void sub_8146CA4(void)
{
u16 *r4 = sub_806E454(0x4028);
u16 *r4 = sub_806E454(VAR_0x4028);
struct MysteryEventStruct *r2 = sub_8143D94();
struct MysteryEventStruct r0 = *r2;
src/vs_seeker.c
+1379
View File
File diff suppressed because it is too large Load Diff
sym_ewram.txt
+1 -2
View File
@@ -1448,8 +1448,7 @@ gUnknown_203AD40: @ 203AD40
gUnknown_203AD58: @ 203AD58
.space 0x60
gUnknown_203ADB8: @ 203ADB8
.space 0x4
.include "src/vs_seeker.o"
gUnknown_203ADBC: @ 203ADBC
.space 0x4