diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_setup.h | 1 | ||||
| -rw-r--r-- | include/constants/flags.h | 2 | ||||
| -rw-r--r-- | include/constants/metatile_behaviors.h | 118 | ||||
| -rw-r--r-- | include/constants/movement_commands.h | 117 | ||||
| -rw-r--r-- | include/event_scripts.h | 4 | ||||
| -rw-r--r-- | include/field_effect.h | 4 | ||||
| -rw-r--r-- | include/field_map_obj.h | 3 | ||||
| -rw-r--r-- | include/field_specials.h | 1 | ||||
| -rw-r--r-- | include/item_menu.h | 8 | ||||
| -rw-r--r-- | include/item_use.h | 9 | ||||
| -rw-r--r-- | include/metatile_behavior.h | 293 | ||||
| -rw-r--r-- | include/metatile_behaviors.h | 179 | ||||
| -rw-r--r-- | include/new_menu_helpers.h | 4 | ||||
| -rw-r--r-- | include/unk_810c3a4.h | 7 | ||||
| -rw-r--r-- | include/vs_seeker.h | 14 |
15 files changed, 435 insertions, 329 deletions
diff --git a/include/battle_setup.h b/include/battle_setup.h index b4c0201a3..2806295ca 100644 --- a/include/battle_setup.h +++ b/include/battle_setup.h @@ -16,5 +16,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 diff --git a/include/constants/flags.h b/include/constants/flags.h index 04c20b2f2..ea2d7d8bc 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -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 diff --git a/include/constants/metatile_behaviors.h b/include/constants/metatile_behaviors.h new file mode 100644 index 000000000..0ceeda33f --- /dev/null +++ b/include/constants/metatile_behaviors.h @@ -0,0 +1,118 @@ +#ifndef GUARD_METATILE_BEHAVIORS +#define GUARD_METATILE_BEHAVIORS + +#define METATILE_COUNT 0xF0 +#define MB_NORMAL 0x00 +#define MB_01 0x01 +#define MB_TALL_GRASS 0x02 +#define MB_CAVE 0x08 +#define MB_0A 0x0A +#define MB_0B 0x0B +#define MB_0C 0x0C +#define MB_POND_WATER 0x10 +#define MB_SEMI_DEEP_WATER 0x11 +#define MB_DEEP_WATER 0x12 +#define MB_WATERFALL 0x13 +#define MB_SPLASHING_WATER 0x15 +#define MB_PUDDLE 0x16 +#define MB_WATERFALL_BOTTOM 0x17 +#define MB_19 0x19 +#define MB_1A 0x1A +#define MB_1B 0x1B +#define MB_STRENGTH_BUTTON 0x20 +#define MB_21 0x21 +#define MB_22 0x22 +#define MB_ICE 0x23 +#define MB_THIN_ICE 0x26 +#define MB_CRACKED_ICE 0x27 +#define MB_HOT_SPRINGS 0x28 +#define MB_ROCK_STAIRS 0x2A +#define MB_SAND 0x2B +#define MB_IMPASSABLE_EAST 0x30 +#define MB_IMPASSABLE_WEST 0x31 +#define MB_IMPASSABLE_NORTH 0x32 +#define MB_IMPASSABLE_SOUTH 0x33 +#define MB_IMPASSABLE_NORTHEAST 0x34 +#define MB_IMPASSABLE_NORTHWEST 0x35 +#define MB_IMPASSABLE_SOUTHEAST 0x36 +#define MB_IMPASSABLE_SOUTHWEST 0x37 +#define MB_JUMP_EAST 0x38 +#define MB_JUMP_WEST 0x39 +#define MB_JUMP_NORTH 0x3A +#define MB_JUMP_SOUTH 0x3B +#define MB_JUMP_SOUTHEAST 0x3E +#define MB_JUMP_SOUTHWEST 0x3F +#define MB_WALK_EAST 0x40 +#define MB_WALK_WEST 0x41 +#define MB_WALK_NORTH 0x42 +#define MB_WALK_SOUTH 0x43 +#define MB_SLIDE_EAST 0x44 +#define MB_SLIDE_WEST 0x45 +#define MB_SLIDE_NORTH 0x46 +#define MB_SLIDE_SOUTH 0x47 +#define MB_UNKNOWN_MOVEMENT_48 0x48 +#define MB_EASTWARD_CURRENT 0x50 +#define MB_WESTWARD_CURRENT 0x51 +#define MB_NORTHWARD_CURRENT 0x52 +#define MB_SOUTHWARD_CURRENT 0x53 +#define MB_SPIN_RIGHT 0x54 +#define MB_SPIN_LEFT 0x55 +#define MB_SPIN_UP 0x56 +#define MB_SPIN_DOWN 0x57 +#define MB_STOP_SPINNING 0x58 +#define MB_CAVE_DOOR 0x60 +#define MB_LADDER 0x61 +#define MB_EAST_ARROW_WARP 0x62 +#define MB_WEST_ARROW_WARP 0x63 +#define MB_NORTH_ARROW_WARP 0x64 +#define MB_SOUTH_ARROW_WARP 0x65 +#define MB_FALL_WARP 0x66 +#define MB_REGULAR_WARP 0x67 +#define MB_68 0x68 +#define MB_WARP_DOOR 0x69 +#define MB_UP_ESCALATOR 0x6A +#define MB_DOWN_ESCALATOR 0x6B +#define MB_UNKNOWN_WARP_6C 0x6C +#define MB_UNKNOWN_WARP_6D 0x6D +#define MB_UNKNOWN_WARP_6E 0x6E +#define MB_UNKNOWN_WARP_6F 0x6F +#define MB_UNION_ROOM_WARP 0x71 +#define MB_COUNTER 0x80 +#define MB_BOOKSHELF 0x81 +#define MB_POKEMART_SHELF 0x82 +#define MB_PC 0x83 +#define MB_SIGNPOST 0x84 +#define MB_REGION_MAP 0x85 +#define MB_TELEVISION 0x86 +#define MB_POKEMON_CENTER_SIGN 0x87 +#define MB_POKEMART_SIGN 0x88 +#define MB_CABINET 0x89 +#define MB_KITCHEN 0x8A +#define MB_DRESSER 0x8B +#define MB_SNACKS 0x8C +#define MB_8D 0x8D +#define MB_BATTLE_RECORDS 0x8E +#define MB_QUESTIONNAIRE 0x8F +#define MB_FOOD 0x90 +#define MB_INDIGO_PLATEAU_MARK_DPAD 0x91 +#define MB_INDIGO_PLATEAU_MARK_2_DPAD 0x92 +#define MB_BLUEPRINTS 0x93 +#define MB_PAINTING 0x94 +#define MB_POWER_PLANT_MACHINE 0x95 +#define MB_TELEPHONE 0x96 +#define MB_COMPUTER 0x97 +#define MB_ADVERTISING_POSTER 0x98 +#define MB_FOOD_SMELLS_TASTY 0x99 +#define MB_TRASH_BIN 0x9A +#define MB_CUP 0x9B +#define MB_PORTHOLE 0x9C +#define MB_BLINKING_LIGHTS 0x9E +#define MB_9F 0x9F +#define MB_IMPRESSIVE_MACHINE 0xA0 +#define MB_VIDEO_GAME 0xA1 +#define MB_BURGLARY 0xA2 +#define MB_A3 0xA3 +#define MB_CYCLING_ROAD_PULL_DOWN 0xD0 +#define MB_CYCLING_ROAD_PULL_DOWN_GRASS 0xD1 + +#endif // GUARD_METATILE_BEHAVIORS diff --git a/include/constants/movement_commands.h b/include/constants/movement_commands.h new file mode 100644 index 000000000..0451e16b7 --- /dev/null +++ b/include/constants/movement_commands.h @@ -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 diff --git a/include/event_scripts.h b/include/event_scripts.h index 900755108..ebfdb4fe3 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -377,4 +377,8 @@ extern const u8 SecretBase_RedCave1_Text_2758CC[]; extern const u8 gUnknown_84178D0[]; extern const u8 gUnknown_84178DA[]; +// vs_seeker +extern const u8 gUnknown_81C137C[]; +extern const u8 gUnknown_81C13D6[]; +extern const u8 gUnknown_81C1429[]; #endif //GUARD_EVENT_SCRIPTS_H diff --git a/include/field_effect.h b/include/field_effect.h index 8d96e4929..bb5e0f1d5 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -68,7 +68,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]; diff --git a/include/field_map_obj.h b/include/field_map_obj.h index ebe68ea01..9ff5ecedc 100644 --- a/include/field_map_obj.h +++ b/include/field_map_obj.h @@ -80,6 +80,9 @@ u8 FieldObjectClearAnimIfSpecialAnimFinished(struct MapObject *); u8 GetFieldObjectIdByXYZ(u16 x, u16 y, u8 z); void sub_8063E28(struct MapObject *, struct Sprite *); void sub_8063CA4(struct MapObject *, u8); +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 diff --git a/include/field_specials.h b/include/field_specials.h index fbe004355..2b7991b55 100644 --- a/include/field_specials.h +++ b/include/field_specials.h @@ -4,5 +4,6 @@ #include "global.h" u8 GetLeadMonIndex(void); +void TV_PrintIntToStringVar(u8, int); #endif // GUARD_FIELD_SPECIALS_H diff --git a/include/item_menu.h b/include/item_menu.h index 24f700918..731c7cf2b 100644 --- a/include/item_menu.h +++ b/include/item_menu.h @@ -1,5 +1,5 @@ -#ifndef GUARD_item_menu_H -#define GUARD_item_menu_H +#ifndef GUARD_ITEM_MENU_H +#define GUARD_ITEM_MENU_H #include "global.h" @@ -7,8 +7,10 @@ // 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 diff --git a/include/item_use.h b/include/item_use.h new file mode 100644 index 000000000..5ec5f2b33 --- /dev/null +++ b/include/item_use.h @@ -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 diff --git a/include/metatile_behavior.h b/include/metatile_behavior.h index 973d96cbb..62bcfdd38 100644 --- a/include/metatile_behavior.h +++ b/include/metatile_behavior.h @@ -3,149 +3,154 @@ #include "global.h" -bool8 ShouldDoJumpLandingDustEffect(u8); -bool8 MetatileBehavior_IsEncounterTile(u8); -bool8 MetatileBehavior_IsJumpEast(u8); -bool8 MetatileBehavior_IsJumpWest(u8); -bool8 MetatileBehavior_IsJumpNorth(u8); -bool8 MetatileBehavior_IsJumpSouth(u8); -bool8 MetatileBehavior_IsPokeGrass(u8); -bool8 MetatileBehavior_IsSandOrDeepSand(u8); -bool8 MetatileBehavior_IsDeepSand(u8); -bool8 MetatileBehavior_IsReflective(u8); -bool8 MetatileBehavior_IsIce(u8); -bool8 MetatileBehavior_IsWarpDoor(u8); -bool8 MetatileBehavior_IsDoor(u8); -bool8 MetatileBehavior_IsEscalator(u8); -bool8 MetatileBehavior_IsMB_04(u8); -bool8 MetatileBehavior_IsLadder(u8); -bool8 MetatileBehavior_IsNonAnimDoor(u8); -bool8 MetatileBehavior_IsDeepSouthWarp(u8); -bool8 MetatileBehavior_IsSurfableWaterOrUnderwater(u8); -bool8 MetatileBehavior_IsEastArrowWarp(u8); -bool8 MetatileBehavior_IsWestArrowWarp(u8); -bool8 MetatileBehavior_IsNorthArrowWarp(u8); -bool8 MetatileBehavior_IsSouthArrowWarp(u8); -bool8 MetatileBehavior_IsArrowWarp(u8); -bool8 MetatileBehavior_IsMoveTile(u8); -bool8 MetatileBehavior_IsIce_2(u8); -bool8 MetatileBehavior_IsTrickHouseSlipperyFloor(u8); -bool8 MetatileBehavior_IsMB_05(u8); -bool8 MetatileBehavior_IsWalkNorth(u8); -bool8 MetatileBehavior_IsWalkSouth(u8); -bool8 MetatileBehavior_IsWalkWest(u8); -bool8 MetatileBehavior_IsWalkEast(u8); -bool8 MetatileBehavior_IsNorthwardCurrent(u8); -bool8 MetatileBehavior_IsSouthwardCurrent(u8); -bool8 MetatileBehavior_IsWestwardCurrent(u8); -bool8 MetatileBehavior_IsEastwardCurrent(u8); -bool8 MetatileBehavior_IsSlideNorth(u8); -bool8 MetatileBehavior_IsSlideSouth(u8); -bool8 MetatileBehavior_IsSlideWest(u8); -bool8 MetatileBehavior_IsSlideEast(u8); -bool8 MetatileBehavior_IsCounter(u8); -bool8 MetatileBehavior_IsPlayerFacingTVScreen(u8 tile, u8 playerDir); -bool8 MetatileBehavior_IsPC(u8); -bool8 MetatileBehavior_IsCableBoxResults1(u8); -bool8 MetatileBehavior_IsSecretBaseOpen(u8); -bool8 MetatileBehavior_IsSecretBaseCave(u8); -bool8 MetatileBehavior_IsSecretBaseTree(u8); -bool8 MetatileBehavior_IsSecretBaseShrub(u8); -bool8 MetatileBehavior_IsSecretBasePC(u8); -bool8 MetatileBehavior_IsSecretBaseRegisterPC(u8); -bool8 MetatileBehavior_IsMB_B2(u8); -bool8 MetatileBehavior_IsMB_B3(u8); -bool8 MetatileBehavior_IsMB_B9(u8); -bool8 MetatileBehavior_IsMB_C6(u8); -bool8 MetatileBehavior_IsSecretBasePoster(u8); -bool8 MetatileBehavior_IsNormal(u8); -bool8 MetatileBehavior_IsMB_B7(u8); -bool8 MetatileBehavior_IsMB_B2_Duplicate(u8); -bool8 MetatileBehavior_IsMB_B5(u8); -bool8 MetatileBehavior_IsMB_C3(u8); -bool8 MetatileBehavior_IsMB_C2(u8); -bool8 MetatileBehavior_IsSecretBaseBalloon(u8); -bool8 MetatileBehavior_IsMB_BE(u8); -bool8 MetatileBehavior_IsSecretBaseSoundMat(u8); -bool8 MetatileBehavior_IsSecretBaseGlitterMat(u8); -bool8 MetatileBehavior_IsMB_BF(u8); -bool8 MetatileBehavior_IsSecretBaseTvOrShield(u8); -bool8 MetatileBehavior_IsMB_C5(u8); -bool8 MetatileBehavior_HasRipples(u8); -bool8 MetatileBehavior_IsPuddle(u8); -bool8 MetatileBehavior_IsTallGrass(u8); -bool8 MetatileBehavior_IsLongGrass(u8); -bool8 MetatileBehavior_IsBerryTreeSoil(u8); -bool8 MetatileBehavior_IsAsh(u8); -bool8 MetatileBehavior_IsUnusedFootprintMetatile(u8); -bool8 MetatileBehavior_IsBridge(u8); -u8 MetatileBehavior_GetBridgeSth(u8); -u8 MetatileBehavior_8089510(u8); -bool8 MetatileBehavior_IsLandWildEncounter(u8); -bool8 MetatileBehavior_IsWaterWildEncounter(u8); -bool8 MetatileBehavior_IsMB_0B(u8); -bool8 MetatileBehavior_IsMountain(u8); -bool8 MetatileBehavior_IsDiveable(u8); -bool8 MetatileBehavior_IsUnableToEmerge(u8); -bool8 MetatileBehavior_IsShallowFlowingWater(u8); -bool8 MetatileBehavior_IsThinIce(u8); -bool8 MetatileBehavior_IsCrackedIce(u8); -bool8 MetatileBehavior_IsDeepOrOceanWater(u8); -bool8 MetatileBehavior_IsMB_18_OrMB_1A(u8); -bool8 MetatileBehavior_IsSurfableAndNotWaterfall(u8); -bool8 MetatileBehavior_IsEastBlocked(u8); -bool8 MetatileBehavior_IsWestBlocked(u8); -bool8 MetatileBehavior_IsNorthBlocked(u8); -bool8 MetatileBehavior_IsSouthBlocked(u8); -bool8 MetatileBehavior_IsShortGrass(u8); -bool8 MetatileBehavior_IsHotSprings(u8); -bool8 MetatileBehavior_IsWaterfall(u8); -bool8 MetatileBehavior_IsFortreeBridge(u8); -bool8 MetatileBehavior_IsPacifilogVerticalLog1(u8); -bool8 MetatileBehavior_IsPacifilogVerticalLog2(u8); -bool8 MetatileBehavior_IsPacifilogHorizontalLog1(u8); -bool8 MetatileBehavior_IsPacifilogHorizontalLog2(u8); -bool8 MetatileBehavior_IsPacifidlogLog(u8); -bool8 MetatileBehavior_IsTrickHousePuzzleDoor(u8); -bool8 MetatileBehavior_IsRegionMap(u8); -bool8 MetatileBehavior_IsClosedSootopolisGymDoor(u8); -bool8 MetatileBehavior_IsUnknownClosedDoor(u8); -bool8 MetatileBehavior_IsRoulette(u8); -bool8 MetatileBehavior_IsPokeblockFeeder(u8); -bool8 MetatileBehavior_IsSecretBaseJumpMat(u8); -bool8 MetatileBehavior_IsSecretBaseSpinMat(u8); -bool8 MetatileBehavior_IsLavaridgeB1FWarp(u8); -bool8 MetatileBehavior_IsLavaridgeB1FWarp(u8); -bool8 MetatileBehavior_IsAquaHideoutWarp(u8); -bool8 MetatileBehavior_IsWarpOrBridge(u8); -bool8 MetatileBehavior_IsMossdeepGymWarp(u8); -bool8 MetatileBehavior_IsSurfableFishableWater(u8); -bool8 MetatileBehavior_IsMtPyreHole(u8); -bool8 MetatileBehavior_IsCrackedFloorHole(u8); -bool8 MetatileBehavior_IsCrackedFloor(u8); -bool8 MetatileBehavior_IsMuddySlope(u8); -bool8 MetatileBehavior_IsBumpySlope(u8); -bool8 MetatileBehavior_IsIsolatedVerticalRail(u8); -bool8 MetatileBehavior_IsIsolatedHorizontalRail(u8); -bool8 MetatileBehavior_IsVerticalRail(u8); -bool8 MetatileBehavior_IsHorizontalRail(u8); -bool8 MetatileBehavior_IsSeaweed(u8); -bool8 MetatileBehavior_IsRunningDisallowed(u8); -bool8 MetatileBehavior_IsCuttableGrass(u8); -bool8 MetatileBehavior_IsRunningShoesInstruction(u8); -bool8 MetatileBehavior_IsPictureBookShelf(u8); -bool8 MetatileBehavior_IsBookShelf(u8); -bool8 MetatileBehavior_IsPokeCenterBookShelf(u8); -bool8 MetatileBehavior_IsVase(u8); -bool8 MetatileBehavior_IsTrashCan(u8); -bool8 MetatileBehavior_IsShopShelf(u8); -bool8 MetatileBehavior_IsBlueprint(u8); -bool8 MetatileBehavior_IsBattlePyramidWarp(u8); -bool8 MetatileBehavior_IsPlayerFacingWirelessBoxResults(u8 tile, u8 playerDir); -bool8 MetatileBehavior_IsCableBoxResults2(u8 tile, u8 playerDir); -bool8 MetatileBehavior_IsQuestionnaire(u8); -bool8 MetatileBehavior_IsLongGrass_Duplicate(u8); -bool8 MetatileBehavior_IsLongGrassSouthEdge(u8); -bool8 MetatileBehavior_IsTrainerHillTimer(u8); +bool8 MetatileBehavior_UnusedReturnTrue(u8 metatileBehavior); +bool8 MetatileBehavior_IsJumpEast(u8 metatileBehavior); +bool8 MetatileBehavior_IsJumpWest(u8 metatileBehavior); +bool8 MetatileBehavior_IsJumpNorth(u8 metatileBehavior); +bool8 MetatileBehavior_IsJumpSouth(u8 metatileBehavior); +bool8 MetatileBehavior_IsTallGrass(u8 metatileBehavior); +bool8 MetatileBehavior_IsMB21OrSand(u8 metatileBehavior); +bool8 MetatileBehavior_IsMB21OrWaterfallBottom(u8 metatileBehavior); +bool8 MetatileBehavior_ReturnFalse(u8 metatileBehavior); +bool8 MetatileBehavior_IsReflective(u8 metatileBehavior); +bool8 MetatileBehavior_IsIce(u8 metatileBehavior); +bool8 MetatileBehavior_IsWarpDoor(u8 metatileBehavior); +bool8 MetatileBehavior_IsWarpDoor_2(u8 metatileBehavior); +bool8 MetatileBehavior_IsEscalator(u8 metatileBehavior); +bool8 MetatileBehavior_IsUnknownWarp6C(u8 metatileBehavior); +bool8 MetatileBehavior_IsUnknownWarp6D(u8 metatileBehavior); +bool8 MetatileBehavior_IsUnknownWarp6E(u8 metatileBehavior); +bool8 MetatileBehavior_IsUnknownWarp6F(u8 metatileBehavior); +bool8 MetatileBehavior_IsUnknownWarp6C_to_6F(u8 metatileBehavior); +bool8 MetatileBehavior_IsLadder(u8 metatileBehavior); +bool8 MetatileBehavior_IsCaveDoor(u8 metatileBehavior); +bool8 MetatileBehavior_ReturnFalse_2(u8 metatileBehavior); +bool8 MetatileBehavior_IsSurfable(u8 metatileBehavior); +bool8 MetatileBehavior_IsSemiDeepWater(u8 metatileBehavior); +bool8 MetatileBehavior_IsEastArrowWarp(u8 metatileBehavior); +bool8 MetatileBehavior_IsWestArrowWarp(u8 metatileBehavior); +bool8 MetatileBehavior_IsNorthArrowWarp(u8 metatileBehavior); +bool8 MetatileBehavior_IsSouthArrowWarp(u8 metatileBehavior); +bool8 MetatileBehavior_UnusedIsArrowWarp(u8 metatileBehavior); +bool8 MetatileBehavior_IsForcedMovementTile(u8 metatileBehavior); +bool8 MetatileBehavior_IsIce_2(u8 metatileBehavior); +bool8 MetatileBehavior_IsUnknownMovement48(u8 metatileBehavior); +bool8 MetatileBehavior_IsWalkNorth(u8 metatileBehavior); +bool8 MetatileBehavior_IsWalkSouth(u8 metatileBehavior); +bool8 MetatileBehavior_IsWalkWest(u8 metatileBehavior); +bool8 MetatileBehavior_IsWalkEast(u8 metatileBehavior); +bool8 MetatileBehavior_IsNorthwardCurrent(u8 metatileBehavior); +bool8 MetatileBehavior_IsSouthwardCurrent(u8 metatileBehavior); +bool8 MetatileBehavior_IsWestwardCurrent(u8 metatileBehavior); +bool8 MetatileBehavior_IsEastwardCurrent(u8 metatileBehavior); +bool8 MetatileBehavior_IsSlideNorth(u8 metatileBehavior); +bool8 MetatileBehavior_IsSlideSouth(u8 metatileBehavior); +bool8 MetatileBehavior_IsSlideWest(u8 metatileBehavior); +bool8 MetatileBehavior_IsSlideEast(u8 metatileBehavior); +bool8 MetatileBehavior_IsCounter(u8 metatileBehavior); +bool8 MetatileBehavior_IsPlayerFacingTVScreen(u8 tile, u8 playerDirection); +bool8 MetatileBehavior_IsPC(u8 metatileBehavior); +bool8 MetatileBehavior_IsPondWaterOrPuddle(u8 metatileBehavior); +bool8 MetatileBehavior_IsPuddle(u8 metatileBehavior); +bool8 MetatileBehavior_IsTallGrass_2(u8 metatileBehavior); +bool8 MetatileBehavior_ReturnFalse_3(u8 metatileBehavior); +bool8 MetatileBehavior_ReturnFalse_4(u8 metatileBehavior); +bool8 MetatileBehavior_ReturnFalse_5(u8 metatileBehavior); +bool8 MetatileBehavior_ReturnFalse_6(u8 metatileBehavior); +bool8 MetatileBehavior_ReturnFalse_7(u8 metatileBehavior); +bool8 MetatileBehavior_UnusedIsMB_01(u8 metatileBehavior); +bool8 MetatileBehavior_UnusedIsTallGrass(u8 metatileBehavior); +bool8 MetatileBehavior_IsMB0B(u8 metatileBehavior); +bool8 MetatileBehavior_IsMB0C(u8 metatileBehavior); +bool8 MetatileBehavior_IsDeepOrSemiDeepWater(u8 metatileBehavior); +bool8 MetatileBehavior_IsMB19(u8 metatileBehavior); +bool8 MetatileBehavior_IsWaterfallBottom(u8 metatileBehavior); +bool8 MetatileBehavior_IsThinIce(u8 metatileBehavior); +bool8 MetatileBehavior_IsCrackedIce(u8 metatileBehavior); +bool8 MetatileBehavior_IsDeepSemiDeepOrSplashingWater(u8 metatileBehavior); +bool8 MetatileBehavior_IsMB1A(u8 metatileBehavior); +bool8 MetatileBehavior_IsSurfableAndNotWaterfall(u8 metatileBehavior); +bool8 MetatileBehavior_IsEastBlocked(u8 metatileBehavior); +bool8 MetatileBehavior_IsWestBlocked(u8 metatileBehavior); +bool8 MetatileBehavior_IsNorthBlocked(u8 metatileBehavior); +bool8 MetatileBehavior_IsSouthBlocked(u8 metatileBehavior); +bool8 MetatileBehavior_ReturnFalse_8(u8 metatileBehavior); +bool8 MetatileBehavior_IsHotSprings(u8 metatileBehavior); +bool8 MetatileBehavior_IsWaterfall(u8 metatileBehavior); +bool8 MetatileBehavior_ReturnFalse_9(u8 metatileBehavior); +bool8 MetatileBehavior_UnusedReturnFalse(u8 metatileBehavior); +bool8 MetatileBehavior_UnusedReturnFalse_2(u8 metatileBehavior); +bool8 MetatileBehavior_UnusedReturnFalse_3(u8 metatileBehavior); +bool8 MetatileBehavior_UnusedReturnFalse_4(u8 metatileBehavior); +bool8 MetatileBehavior_ReturnFalse_10(u8 metatileBehavior); +bool8 MetatileBehavior_ReturnFalse_11(u8 metatileBehavior); +bool8 MetatileBehavior_IsRegionMap(u8 metatileBehavior); +bool8 MetatileBehavior_UnusedReturnFalse_5(u8 metatileBehavior); +bool8 MetatileBehavior_UnusedReturnFalse_6(u8 metatileBehavior); +bool8 MetatileBehavior_UnusedReturnFalse_7(u8 metatileBehavior); +bool8 MetatileBehavior_UnusedReturnFalse_8(u8 metatileBehavior); +bool8 MetatileBehavior_ReturnFalse_12(u8 metatileBehavior); +bool8 MetatileBheavior_IsMB_68(u8 metatileBehavior); +bool8 MetatileBehavior_IsRegularWarp(u8 metatileBehavior); +bool8 MetatileBehavior_IsUnionRoomWarp(u8 metatileBehavior); +bool8 MetatileBehavior_IsWater(u8 metatileBehavior); +bool8 MetatileBehavior_IsFallWarp(u8 metatileBehavior); +bool8 MetatileBehavior_ReturnFalse_13(u8 metatileBehavior); +bool8 MetatileBehavior_IsCyclingRoadPullDownTile(u8 metatileBehavior); +bool8 MetatileBehavior_IsCyclingRoadPullDownTileGrass(u8 metatileBehavior); +bool8 MetatileBehavior_ReturnFalse_14(u8 metatileBehavior); +bool8 MetatileBehavior_ReturnFalse_15(u8 metatileBehavior); +bool8 MetatileBehavior_ReturnFalse_16(u8 metatileBehavior); +bool8 MetatileBehavior_ReturnFalse_17(u8 metatileBehavior); +bool8 MetatileBehavior_ReturnFalse_18(u8 metatileBehavior); +bool8 MetatileBehavior_IsMB22(u8 metatileBehavior); +bool8 MetatileBehavior_IsMB0A(u8 metatileBehavior); +bool8 MetatileBehavior_UnusedReturnFalse_9(u8 metatileBehavior); +bool8 MetatileBehavior_IsBookshelf(u8 metatileBehavior); +bool8 MetatileBehavior_IsPokeMartShelf(u8 metatileBehavior); +bool8 MetatileBehavior_IsPlayerFacingPokemonCenterSign(u8 tile, u8 playerDirection); +bool8 MetatileBehavior_IsPlayerFacingPokeMartSign(u8 tile, u8 playerDirection); +bool8 MetatileBehavior_UnusedReturnFalse_10(u8 metatileBehavior); +bool8 MetatileBehavior_UnusedReturnFalse_11(u8 metatileBehavior); +bool8 MetatileBehavior_UnusedReturnFalse_12(u8 metatileBehavior); +bool8 MetatileBehavior_UnusedReturnFalse_13(u8 metatileBehavior); +bool8 sub_805A2BC(u8 metatileBehavior, u8 playerDirection); +bool8 MetatileBehavior_UnusedIsSpinRight(u8 metatileBehavior); +bool8 MetatileBehavior_UnusedIsSpinLeft(u8 metatileBehavior); +bool8 MetatileBehavior_UnusedIsSpinUp(u8 metatileBehavior); +bool8 MetatileBehavior_UnusedIsSpinDown(u8 metatileBehavior); +bool8 MetatileBehavior_IsStopSpinning(u8 metatileBehavior); +bool8 MetatileBehavior_IsSpinTile(u8 metatileBehavior); +bool8 MetatileBehavior_IsSignpost(u8 metatileBehavior); +bool8 MetatileBehavior_IsCabinet(u8 metatileBehavior); +bool8 MetatileBehavior_IsKitchen(u8 metatileBehavior); +bool8 MetatileBehavior_IsDresser(u8 metatileBehavior); +bool8 MetatileBehavior_IsSnacks(u8 metatileBehavior); +bool8 MetatileBehavior_IsStrengthButton(u8 metatileBehavior); +bool8 MetatileBehavior_IsPlayerFacingMB_8D(u8 tile, u8 playerDirection); +bool8 MetatileBehavior_IsPlayerFacingBattleRecords(u8 tile, u8 playerDirection); +bool8 MetatileBehavior_IsQuestionnaire(u8 metatileBehavior); +bool8 MetatileBehavior_IsIndigoPlateauMark(u8 metatileBehavior); +bool8 MetatileBehavior_IsIndigoPlateauMark2(u8 metatileBehavior); +bool8 MetatileBehavior_IsFood(u8 metatileBehavior); +bool8 MetatileBehavior_IsRockStairs(u8 metatileBehavior); +bool8 MetatileBehavior_IsBlueprints(u8 metatileBehavior); +bool8 MetatileBehavior_IsPainting(u8 metatileBehavior); +bool8 MetatileBehavior_IsPowerPlantMachine(u8 metatileBehavior); +bool8 MetatileBehavior_IsTelephone(u8 metatileBehavior); +bool8 MetatileBehavior_IsComputer(u8 metatileBehavior); +bool8 MetatileBehavior_IsAdvertisingPoster(u8 metatileBehavior); +bool8 MetatileBehavior_IsTastyFood(u8 metatileBehavior); +bool8 MetatileBehavior_IsTrashBin(u8 metatileBehavior); +bool8 MetatileBehavior_IsCup(u8 metatileBehavior); +bool8 MetatileBehavior_ReturnFalse_19(u8 metatileBehavior); +bool8 MetatileBehavior_ReturnFalse_20(u8 metatileBehavior); +bool8 MetatileBehavior_IsBlinkingLights(u8 metatileBehavior); +bool8 MetatileBehavior_IsMB9F(u8 metatileBehavior); +bool8 MetatileBehavior_IsImpressiveMachine(u8 metatileBehavior); +bool8 MetatileBehavior_IsVideoGame(u8 metatileBehavior); +bool8 MetatileBehavior_IsBurglary(u8 metatileBehavior); +bool8 MetatileBehavior_IsMBA3(u8 metatileBehavior); +extern u8 gUnknown_8353068[]; #endif // GUARD_METATILE_BEHAVIOR diff --git a/include/metatile_behaviors.h b/include/metatile_behaviors.h deleted file mode 100644 index dd3a8b4f4..000000000 --- a/include/metatile_behaviors.h +++ /dev/null @@ -1,179 +0,0 @@ -#ifndef GUARD_METATILE_BEHAVIORS -#define GUARD_METATILE_BEHAVIORS - -#define MB_NORMAL 0x00 -#define MB_TALL_GRASS 0x02 -#define MB_LONG_GRASS 0x03 -#define MB_04 0x04 -#define MB_05 0x05 -#define MB_DEEP_SAND 0x06 -#define MB_SHORT_GRASS 0x07 -#define MB_CAVE 0x08 -#define MB_LONG_GRASS_SOUTH_EDGE 0x09 -#define MB_NO_RUNNING 0x0A -#define MB_0B 0x0B -#define MB_MOUNTAIN_TOP 0x0C -#define MB_BATTLE_PYRAMID_WARP 0x0D -#define MB_MOSSDEEP_GYM_WARP 0x0E -#define MB_MT_PYRE_HOLE 0x0F -#define MB_POND_WATER 0x10 -#define MB_SEMI_DEEP_WATER 0x11 -#define MB_DEEP_WATER 0x12 -#define MB_WATERFALL 0x13 -#define MB_SOOTOPOLIS_DEEP_WATER 0x14 -#define MB_OCEAN_WATER 0x15 -#define MB_PUDDLE 0x16 -#define MB_SHALLOW_WATER 0x17 -#define MB_18 0x18 -#define MB_NO_SURFACING 0x19 -#define MB_1A 0x1A -#define MB_STAIRS_OUTSIDE_ABANDONED_SHIP 0x1B -#define MB_SHOAL_CAVE_ENTRANCE 0x1C -#define MB_ICE 0x20 -#define MB_SAND 0x21 -#define MB_SEAWEED 0x22 -#define MB_ASHGRASS 0x24 -#define MB_25 0x25 -#define MB_THIN_ICE 0x26 -#define MB_CRACKED_ICE 0x27 -#define MB_HOT_SPRINGS 0x28 -#define MB_LAVARIDGE_GYM_B1F_WARP 0x29 -#define MB_SEAWEED_NO_SURFACING 0x2A -#define MB_REFLECTION_UNDER_BRIDGE 0x2B -#define MB_IMPASSABLE_EAST 0x30 -#define MB_IMPASSABLE_WEST 0x31 -#define MB_IMPASSABLE_NORTH 0x32 -#define MB_IMPASSABLE_SOUTH 0x33 -#define MB_IMPASSABLE_NORTHEAST 0x34 -#define MB_IMPASSABLE_NORTHWEST 0x35 -#define MB_IMPASSABLE_SOUTHEAST 0x36 -#define MB_IMPASSABLE_SOUTHWEST 0x37 -#define MB_JUMP_EAST 0x38 -#define MB_JUMP_WEST 0x39 -#define MB_JUMP_NORTH 0x3A -#define MB_JUMP_SOUTH 0x3B -#define MB_JUMP_SOUTHEAST 0x3E -#define MB_JUMP_SOUTHWEST 0x3F -#define MB_WALK_EAST 0x40 -#define MB_WALK_WEST 0x41 -#define MB_WALK_NORTH 0x42 -#define MB_WALK_SOUTH 0x43 -#define MB_SLIDE_EAST 0x44 -#define MB_SLIDE_WEST 0x45 -#define MB_SLIDE_NORTH 0x46 -#define MB_SLIDE_SOUTH 0x47 -#define MB_TRICK_HOUSE_PUZZLE_8_FLOOR 0x48 -#define MB_EASTWARD_CURRENT 0x50 -#define MB_WESTWARD_CURRENT 0x51 -#define MB_NORTHWARD_CURRENT 0x52 -#define MB_SOUTHWARD_CURRENT 0x53 -#define MB_NON_ANIMATED_DOOR 0x60 -#define MB_LADDER 0x61 -#define MB_EAST_ARROW_WARP 0x62 -#define MB_WEST_ARROW_WARP 0x63 -#define MB_NORTH_ARROW_WARP 0x64 -#define MB_SOUTH_ARROW_WARP 0x65 -#define MB_CRACKED_FLOOR_HOLE 0x66 -#define MB_AQUA_HIDEOUT_WARP 0x67 -#define MB_LAVARIDGE_GYM_1F_WARP 0x68 -#define MB_ANIMATED_DOOR 0x69 -#define MB_UP_ESCALATOR 0x6A -#define MB_DOWN_ESCALATOR 0x6B -#define MB_WATER_DOOR 0x6C -#define MB_WATER_SOUTH_ARROW_WARP 0x6D -#define MB_DEEP_SOUTH_WARP 0x6E -#define MB_WARP_OR_BRIDGE 0x70 -#define MB_71 0x71 -#define MB_ROUTE120_NORTH_BRIDGE_1 0x72 -#define MB_ROUTE120_NORTH_BRIDGE_2 0x73 -#define MB_PACIFIDLOG_VERTICAL_LOG_1 0x74 -#define MB_PACIFIDLOG_VERTICAL_LOG_2 0x75 -#define MB_PACIFIDLOG_HORIZONTAL_LOG_1 0x76 -#define MB_PACIFIDLOG_HORIZONTAL_LOG_2 0x77 -#define MB_FORTREE_BRIDGE 0x78 -#define MB_ROUTE120_SOUTH_BRIDGE_1 0x7A -#define MB_ROUTE120_SOUTH_BRIDGE_2 0x7B -#define MB_ROUTE120_NORTH_BRIDGE_3 0x7C -#define MB_ROUTE120_NORTH_BRIDGE_4 0x7D -#define MB_7E 0x7E -#define MB_ROUTE110_BRIDGE 0x7F -#define MB_COUNTER 0x80 -#define MB_PC 0x83 -#define MB_CABLE_BOX_RESULTS_1 0x84 -#define MB_REGION_MAP 0x85 -#define MB_TELEVISION 0x86 -#define MB_POKEBLOCK_FEEDER 0x87 -#define MB_SLOT_MACHINE 0x89 -#define MB_ROULETTE 0x8A -#define MB_CLOSED_SOOTOPOLIS_GYM_DOOR 0x8B -#define MB_TRICK_HOUSE_PUZZLE_DOOR 0x8C -#define MB_8D 0x8D -#define MB_RUNNING_SHOES_INSTRUCTION 0x8E -#define MB_QUESTIONNAIRE 0x8F -#define MB_SECRET_BASE_SPOT_RED_CAVE 0x90 -#define MB_SECRET_BASE_SPOT_RED_CAVE_OPEN 0x91 -#define MB_SECRET_BASE_SPOT_BROWN_CAVE 0x92 -#define MB_SECRET_BASE_SPOT_BROWN_CAVE_OPEN 0x93 -#define MB_SECRET_BASE_SPOT_YELLOW_CAVE 0x94 -#define MB_SECRET_BASE_SPOT_YELLOW_CAVE_OPEN 0x95 -#define MB_SECRET_BASE_SPOT_TREE_LEFT 0x96 -#define MB_SECRET_BASE_SPOT_TREE_LEFT_OPEN 0x97 -#define MB_SECRET_BASE_SPOT_SHRUB 0x98 -#define MB_SECRET_BASE_SPOT_SHRUB_OPEN 0x99 -#define MB_SECRET_BASE_SPOT_BLUE_CAVE 0x9A -#define MB_SECRET_BASE_SPOT_BLUE_CAVE_OPEN 0x9B -#define MB_SECRET_BASE_SPOT_TREE_RIGHT 0x9C -#define MB_SECRET_BASE_SPOT_TREE_RIGHT_OPEN 0x9D -#define MB_BERRY_TREE_SOIL 0xA0 -#define MB_SECRET_BASE_PC 0xB0 -#define MB_SECRET_BASE_REGISTER_PC 0xB1 -#define MB_B2 0xB2 -#define MB_B3 0xB3 -#define MB_B4 0xB4 -#define MB_B5 0xB5 -#define MB_B6 0xB6 -#define MB_B7 0xB7 -#define MB_SECRET_BASE_BALLOON 0xB8 -#define MB_B9 0xB9 -#define MB_SECRET_BASE_GLITTER_MAT 0xBA -#define MB_SECRET_BASE_JUMP_MAT 0xBB -#define MB_SECRET_BASE_SPIN_MAT 0xBC -#define MB_SECRET_BASE_SOUND_MAT 0xBD -#define MB_BE 0xBE -#define MB_BF 0xBF -#define MB_BED 0xC0 -#define MB_C1 0xC1 -#define MB_C2 0xC2 -#define MB_C3 0xC3 -#define MB_SECRET_BASE_TV_SHIELD 0xC4 -#define MB_C5 0xC5 -#define MB_C6 0xC6 -#define MB_SECRET_BASE_POSTER 0xC7 -#define MB_C8 0xC8 -#define MB_C9 0xC9 -#define MB_CA 0xCA -#define MB_CB 0xCB -#define MB_CC 0xCC -#define MB_CD 0xCD -#define MB_CE 0xCE -#define MB_CF 0xCF -#define MB_MUDDY_SLOPE 0xD0 -#define MB_BUMPY_SLOPE 0xD1 -#define MB_CRACKED_FLOOR 0xD2 -#define MB_ISOLATED_VERTICAL_RAIL 0xD3 -#define MB_ISOLATED_HORIZONTAL_RAIL 0xD4 -#define MB_VERTICAL_RAIL 0xD5 -#define MB_HORIZONTAL_RAIL 0xD6 -#define MB_PICTURE_BOOK_SHELF 0xE0 -#define MB_BOOKSHELF 0xE1 -#define MB_POKEMON_CENTER_BOOKSHELF 0xE2 -#define MB_VASE 0xE3 -#define MB_TRASH_CAN 0xE4 -#define MB_SHOP_SHELF 0xE5 -#define MB_BLUEPRINT 0xE6 -#define MB_CABLE_BOX_RESULTS_2 0xE7 -#define MB_WIRELESS_BOX_RESULTS 0xE8 -#define MB_TRAINER_HILL_TIMER 0xE9 -#define MB_UNKNOWN_CLOSED_DOOR 0xEA - -#endif // GUARD_METATILE_BEHAVIORS diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h index ffe5c2e3f..639395941 100644 --- a/include/new_menu_helpers.h +++ b/include/new_menu_helpers.h @@ -2,7 +2,6 @@ #define GUARD_NEW_MENU_HELPERS_H #include "global.h" - #include "text.h" #include "task.h" @@ -11,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 diff --git a/include/unk_810c3a4.h b/include/unk_810c3a4.h new file mode 100644 index 000000000..3f85ab00f --- /dev/null +++ b/include/unk_810c3a4.h @@ -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 diff --git a/include/vs_seeker.h b/include/vs_seeker.h new file mode 100644 index 000000000..efc014a4a --- /dev/null +++ b/include/vs_seeker.h @@ -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 |