mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-24 14:09:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

more d_save funcs OK, initial map out of dcomifg_play_c and it's classes

Browse Source
This commit is contained in:
Pheenoh
2021-01-02 17:47:43 -05:00
parent 992cf48c7f
commit 458be4d8cb
203 changed files with 1931 additions and 941 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_save/d_save/asm/func_800332F8.s
+2 -2
View File
@@ -8,8 +8,8 @@ lbl_8003330C:
/* 80033310 00030250 7C 83 01 AE */ stbx r4, r3, r0
/* 80033314 00030254 38 C6 00 01 */ addi r6, r6, 1
/* 80033318 00030258 42 00 FF F4 */ bdnz lbl_8003330C
/* 8003331C 0003025C 3C 80 80 3A */ lis r4, lbl_803A7270@ha
/* 80033320 00030260 38 84 72 70 */ addi r4, r4, lbl_803A7270@l
/* 8003331C 0003025C 3C 80 80 3A */ lis r4, i_item_lst@ha
/* 80033320 00030260 38 84 72 70 */ addi r4, r4, i_item_lst@l
/* 80033324 00030264 38 00 00 17 */ li r0, 0x17
/* 80033328 00030268 7C 09 03 A6 */ mtctr r0
lbl_8003332C:
include/d/d_save/d_save/asm/func_80034644.s
+2 -2
View File
@@ -1,13 +1,13 @@
/* 80034644 00031584 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80034648 00031588 7C 08 02 A6 */ mflr r0
/* 8003464C 0003158C 90 01 00 14 */ stw r0, 0x14(r1)
/* 80034650 00031590 80 0D 8F 60 */ lwz r0, lbl_804514E0-_SDA_BASE_(r13)
/* 80034650 00031590 80 0D 8F 60 */ lwz r0, _sRumbleSupported-_SDA_BASE_(r13)
/* 80034654 00031594 54 00 00 01 */ rlwinm. r0, r0, 0, 0, 0
/* 80034658 00031598 41 82 00 18 */ beq lbl_80034670
/* 8003465C 0003159C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80034660 000315A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80034664 000315A4 38 63 0F 38 */ addi r3, r3, 0xf38
/* 80034668 000315A8 4B FF 6D 49 */ bl dComIfG_play_c_NS_getNowVibration
/* 80034668 000315A8 4B FF 6D 49 */ bl getNowVibration__14dComIfG_play_cFv
/* 8003466C 000315AC 48 00 00 08 */ b lbl_80034674
lbl_80034670:
/* 80034670 000315B0 38 60 00 00 */ li r3, 0
include/d/d_save/d_save/d_save.h
+272 -268
View File
@@ -1,6 +1,8 @@
#ifndef __D_SAVE_H_
#define __D_SAVE_H_
#include "SComponent/c_xyz/c_xyz.h"
#include "d/d_meter2/d_meter2_info/d_meter2_info.h"
#include "dolphin/types.h"
#include "global.h"
@@ -44,262 +46,262 @@ enum ItemSlots {
};
enum ItemTable {
AIR_LETTER = 234,
ANCIENT_DOCUMENT = 233,
ANCIENT_DOCUMENT2 = 235,
ARMOR = 48,
ARROW_1 = 17,
ARROW_10 = 14,
ARROW_20 = 15,
ARROW_30 = 16,
ARROW_LV1 = 84,
ARROW_LV2 = 85,
ARROW_LV3 = 86,
ASHS_SCRIBBLING = 145,
BEE_CHILD = 118,
BEE_ROD = 91,
BILL = 129,
BLUE_BOTTLE = 99,
BLUE_RUPEE = 2,
BOMB_10 = 11,
BOMB_20 = 12,
BOMB_30 = 13,
BOMB_5 = 10,
BOMB_ARROW = 89,
BOMB_BAG_LV1 = 80,
BOMB_BAG_LV2 = 79,
BOMB_INSECT_10 = 27,
BOMB_INSECT_20 = 28,
BOMB_INSECT_30 = 29,
BOMB_INSECT_5 = 26,
BOMB_IN_BAG = 81,
BOOMERANG = 64,
BOSSRIDER_KEY = 243,
BOSS_KEY = 38,
BOW = 67,
CHUCHU_BLACK = 159,
CHUCHU_BLUE = 121,
CHUCHU_GREEN = 122,
CHUCHU_PURPLE = 124,
CHUCHU_RARE = 119,
CHUCHU_RED = 120,
CHUCHU_YELLOW = 123,
CHUCHU_YELLOW2 = 156,
COMPUS = 36,
COPY_ROD = 70,
COPY_ROD_2 = 76,
DROP_BOTTLE = 117,
DROP_CONTAINER = 161,
DROP_CONTAINER02 = 162,
DROP_CONTAINER03 = 163,
DUNGEON_BACK = 39,
DUNGEON_EXIT = 37,
DUNGEON_EXIT_2 = 51,
EMPTY_BOTTLE = 96,
FAIRY = 108,
FAIRY_DROP = 115,
FILLED_CONTAINER = 164,
FISHING_ROD_1 = 74,
F_ANT = 213,
F_BEETLE = 193,
F_BUTTERFLY = 195,
F_DANGOMUSHI = 203,
F_DRAGONFLY = 211,
F_GRASSHOPPER = 199,
F_LADYBUG = 207,
F_MANTIS = 205,
F_MAYFLY = 215,
F_NANAFUSHI = 201,
F_SNAIL = 209,
F_STAG_BEETLE = 197,
GREEN_BOTTLE = 98,
GREEN_RUPEE = 1,
HALF_MILK_BOTTLE = 101,
HAWK_ARROW = 90,
HAWK_EYE = 62,
HEART = 0,
HOOKSHOT = 68,
HORSE_FLUTE = 132,
HOT_SPRING = 107,
HOT_SPRING_2 = 109,
HVY_BOOTS = 69,
HYLIA_SHIELD = 44,
IRIAS_PENDANT = 131,
IRONBALL = 66,
JEWEL_BEE_ROD = 94,
JEWEL_ROD = 92,
JEWEL_WORM_ROD = 95,
KAKERA_HEART = 33,
KANTERA = 72,
KANTERA2 = 248,
KEY_OF_CARAVAN = 252,
KEY_OF_FILONE = 254,
L2_KEY_PIECES1 = 249,
L2_KEY_PIECES2 = 250,
L2_KEY_PIECES3 = 251,
LETTER = 128,
LIGHT_ARROW = 83,
LIGHT_DROP = 160,
LIGHT_SWORD = 73,
LINKS_SAVINGS = 237,
LURE_ROD = 88,
LV1_SOUP = 125,
LV2_BOSS_KEY = 253,
LV2_SOUP = 126,
LV3_SOUP = 127,
LV5_BOSS_KEY = 246,
LV7_DUNGEON_EXIT = 236,
L_MAGIC = 9,
MAGIC_LV1 = 50,
MAP = 35,
MASTER_SWORD = 41,
MILK_BOTTLE = 100,
MIRROR_PIECE_2 = 165,
MIRROR_PIECE_3 = 166,
MIRROR_PIECE_4 = 167,
M_ANT = 212,
M_BEETLE = 192,
M_BUTTERFLY = 194,
M_DANGOMUSHI = 202,
M_DRAGONFLY = 210,
M_GRASSHOPPER = 198,
M_LADYBUG = 206,
M_MANTIS = 204,
M_MAYFLY = 214,
M_NANAFUSHI = 200,
M_SNAIL = 208,
M_STAG_BEETLE = 196,
NORMAL_BOMB = 112,
NO_ITEM = 255,
OIL = 111,
OIL2 = 110,
OIL_BOTTLE = 102,
OIL_BOTTLE3 = 157,
OIL_BOTTLE_2 = 104,
ORANGE_RUPEE = 6,
PACHINKO = 75,
PACHINKO_SHOT = 18,
POKE_BOMB = 114,
POU_FIRE1 = 239,
POU_FIRE2 = 240,
POU_FIRE3 = 241,
POU_FIRE4 = 242,
POU_SPIRIT = 224,
PURPLE_RUPEE = 5,
RAFRELS_MEMO = 144,
RECOVERY_FAILY = 30,
RED_BOTTLE = 97,
RED_BOTTLE_2 = 105,
RED_RUPEE = 4,
SHIELD = 43,
SHOP_BEE_CHILD = 158,
SILVER_RUPEE = 7,
SMALL_KEY = 32,
SMALL_KEY2 = 238,
SMELL_CHILDREN = 180,
SMELL_FISH = 179,
SMELL_MEDICINE = 181,
SMELL_POH = 178,
SMELL_PUMPKIN = 177,
SMELL_YELIA_POUCH = 176,
SPINNER = 65,
SURFBOARD = 247,
SWORD = 40,
S_MAGIC = 8,
TASTE = 245,
TKS_LETTER = 45,
TOMATO_PUREE = 244,
TRIPLE_HEART = 31,
UGLY_SOUP = 106,
UTAWA_HEART = 34,
WALLET_LV1 = 52,
WALLET_LV2 = 53,
WALLET_LV3 = 54,
WATER_BOMB = 113,
WATER_BOMB_10 = 23,
WATER_BOMB_20 = 24,
WATER_BOMB_30 = 25,
WATER_BOMB_5 = 22,
WATER_BOTTLE = 103,
WEARS_CASUAL = 46,
WEAR_KOKIRI = 47,
WEAR_ZORA = 49,
WOOD_SHIELD = 42,
WOOD_STATUE = 130,
WOOD_STICK = 63,
WORM = 116,
WORM_ROD = 93,
W_HOOKSHOT = 71,
YELLOW_RUPEE = 3,
ZORAS_JEWEL = 61,
noentry1 = 19,
noentry10 = 77,
noentry11 = 78,
noentry12 = 82,
noentry13 = 87,
noentry14 = 133,
noentry15 = 134,
noentry16 = 135,
noentry17 = 136,
noentry18 = 137,
noentry19 = 138,
noentry2 = 20,
noentry20 = 139,
noentry21 = 140,
noentry22 = 141,
noentry23 = 142,
noentry24 = 143,
noentry25 = 146,
noentry26 = 147,
noentry27 = 148,
noentry28 = 149,
noentry29 = 150,
noentry3 = 21,
noentry30 = 151,
noentry31 = 152,
noentry32 = 153,
noentry33 = 154,
noentry34 = 155,
noentry35 = 168,
noentry36 = 169,
noentry37 = 170,
noentry38 = 171,
noentry39 = 172,
noentry4 = 55,
noentry40 = 173,
noentry41 = 174,
noentry42 = 175,
noentry43 = 182,
noentry44 = 183,
noentry45 = 184,
noentry46 = 185,
noentry47 = 186,
noentry48 = 187,
noentry49 = 188,
noentry5 = 56,
noentry50 = 189,
noentry51 = 190,
noentry52 = 191,
noentry53 = 216,
noentry54 = 217,
noentry55 = 218,
noentry56 = 219,
noentry57 = 220,
noentry58 = 221,
noentry59 = 222,
noentry6 = 57,
noentry60 = 223,
noentry61 = 225,
noentry62 = 226,
noentry63 = 227,
noentry64 = 228,
noentry65 = 229,
noentry66 = 230,
noentry67 = 231,
noentry68 = 232,
noentry7 = 58,
noentry8 = 59,
noentry9 = 60
HEART,
GREEN_RUPEE,
BLUE_RUPEE,
YELLOW_RUPEE,
RED_RUPEE,
PURPLE_RUPEE,
ORANGE_RUPEE,
SILVER_RUPEE,
S_MAGIC,
L_MAGIC,
BOMB_5,
BOMB_10,
BOMB_20,
BOMB_30,
ARROW_10,
ARROW_20,
ARROW_30,
ARROW_1,
PACHINKO_SHOT,
noentry1,
noentry2,
noentry3,
WATER_BOMB_5,
WATER_BOMB_10,
WATER_BOMB_20,
WATER_BOMB_30,
BOMB_INSECT_5,
BOMB_INSECT_10,
BOMB_INSECT_20,
BOMB_INSECT_30,
RECOVERY_FAILY,
TRIPLE_HEART,
SMALL_KEY,
KAKERA_HEART,
UTAWA_HEART,
MAP,
COMPUS,
DUNGEON_EXIT,
BOSS_KEY,
DUNGEON_BACK,
SWORD,
MASTER_SWORD,
WOOD_SHIELD,
SHIELD,
HYLIA_SHIELD,
TKS_LETTER,
WEARS_CASUAL,
WEAR_KOKIRI,
ARMOR,
WEAR_ZORA,
MAGIC_LV1,
DUNGEON_EXIT_2,
WALLET_LV1,
WALLET_LV2,
WALLET_LV3,
noentry4,
noentry5,
noentry6,
noentry7,
noentry8,
noentry9,
ZORAS_JEWEL,
HAWK_EYE,
WOOD_STICK,
BOOMERANG,
SPINNER,
IRONBALL,
BOW,
HOOKSHOT,
HVY_BOOTS,
COPY_ROD,
W_HOOKSHOT,
KANTERA,
LIGHT_SWORD,
FISHING_ROD_1,
PACHINKO,
COPY_ROD_2,
noentry10,
noentry11,
BOMB_BAG_LV2,
BOMB_BAG_LV1,
BOMB_IN_BAG,
noentry12,
LIGHT_ARROW,
ARROW_LV1,
ARROW_LV2,
ARROW_LV3,
noentry13,
LURE_ROD,
BOMB_ARROW,
HAWK_ARROW,
BEE_ROD,
JEWEL_ROD,
WORM_ROD,
JEWEL_BEE_ROD,
JEWEL_WORM_ROD,
EMPTY_BOTTLE,
RED_BOTTLE,
GREEN_BOTTLE,
BLUE_BOTTLE,
MILK_BOTTLE,
HALF_MILK_BOTTLE,
OIL_BOTTLE,
WATER_BOTTLE,
OIL_BOTTLE_2,
RED_BOTTLE_2,
UGLY_SOUP,
HOT_SPRING,
FAIRY,
HOT_SPRING_2,
OIL2,
OIL,
NORMAL_BOMB,
WATER_BOMB,
POKE_BOMB,
FAIRY_DROP,
WORM,
DROP_BOTTLE,
BEE_CHILD,
CHUCHU_RARE,
CHUCHU_RED,
CHUCHU_BLUE,
CHUCHU_GREEN,
CHUCHU_YELLOW,
CHUCHU_PURPLE,
LV1_SOUP,
LV2_SOUP,
LV3_SOUP,
LETTER,
BILL,
WOOD_STATUE,
IRIAS_PENDANT,
HORSE_FLUTE,
noentry14,
noentry15,
noentry16,
noentry17,
noentry18,
noentry19,
noentry20,
noentry21,
noentry22,
noentry23,
noentry24,
RAFRELS_MEMO,
ASHS_SCRIBBLING,
noentry25,
noentry26,
noentry27,
noentry28,
noentry29,
noentry30,
noentry31,
noentry32,
noentry33,
noentry34,
CHUCHU_YELLOW2,
OIL_BOTTLE3,
SHOP_BEE_CHILD,
CHUCHU_BLACK,
LIGHT_DROP,
DROP_CONTAINER,
DROP_CONTAINER02,
DROP_CONTAINER03,
FILLED_CONTAINER,
MIRROR_PIECE_2,
MIRROR_PIECE_3,
MIRROR_PIECE_4,
noentry35,
noentry36,
noentry37,
noentry38,
noentry39,
noentry40,
noentry41,
noentry42,
SMELL_YELIA_POUCH,
SMELL_PUMPKIN,
SMELL_POH,
SMELL_FISH,
SMELL_CHILDREN,
SMELL_MEDICINE,
noentry43,
noentry44,
noentry45,
noentry46,
noentry47,
noentry48,
noentry49,
noentry50,
noentry51,
noentry52,
M_BEETLE,
F_BEETLE,
M_BUTTERFLY,
F_BUTTERFLY,
M_STAG_BEETLE,
F_STAG_BEETLE,
M_GRASSHOPPER,
F_GRASSHOPPER,
M_NANAFUSHI,
F_NANAFUSHI,
M_DANGOMUSHI,
F_DANGOMUSHI,
M_MANTIS,
F_MANTIS,
M_LADYBUG,
F_LADYBUG,
M_SNAIL,
F_SNAIL,
M_DRAGONFLY,
F_DRAGONFLY,
M_ANT,
F_ANT,
M_MAYFLY,
F_MAYFLY,
noentry53,
noentry54,
noentry55,
noentry56,
noentry57,
noentry58,
noentry59,
noentry60,
POU_SPIRIT,
noentry61,
noentry62,
noentry63,
noentry64,
noentry65,
noentry66,
noentry67,
noentry68,
ANCIENT_DOCUMENT,
AIR_LETTER,
ANCIENT_DOCUMENT2,
LV7_DUNGEON_EXIT,
LINKS_SAVINGS,
SMALL_KEY2,
POU_FIRE1,
POU_FIRE2,
POU_FIRE3,
POU_FIRE4,
BOSSRIDER_KEY,
TOMATO_PUREE,
TASTE,
LV5_BOSS_KEY,
SURFBOARD,
KANTERA2,
L2_KEY_PIECES1,
L2_KEY_PIECES2,
L2_KEY_PIECES3,
KEY_OF_CARAVAN,
LV2_BOSS_KEY,
KEY_OF_FILONE,
NO_ITEM
};
enum EquipmentBits { CLOTHING_BITFIELD, SWORD_BITFIELD, SHIELD_BITFIELD };
@@ -325,6 +327,7 @@ public:
int isMagicFlag(u8) const;
u16& getCurrentHealth() { return mCurrentHealth; }
u16& getCurrentLanternOil() { return mCurrentLanternOil; }
u8& getScent() { return mEquipment[3]; }
void setWalletLV(u8 lv) { mCurrentWallet = lv; }
void setLanternOil(u16 amount) {
@@ -376,10 +379,6 @@ private:
};
// move to SComponent later
class cXyz {
public:
float x, y, z;
};
class dSv_horse_place_c {
public:
@@ -454,7 +453,7 @@ public:
void setEquipBottleItemIn(u8, u8);
void setEquipBottleItemEmpty(u8);
u8 checkBottle(u8);
u8 checkInsectBottle(void);
int checkInsectBottle(void);
u8 checkEmptyBottle(void);
void setBombBagItemIn(u8, u8, bool);
void setBombBagItemIn(u8, u8, u8, bool);
@@ -891,15 +890,20 @@ public:
dSv_save_c& getSaveFile() { return save_file; }
dSv_memory_c& getMemory() { return memory; }
dSv_zone_c* getZones() { return zones; }
private:
dSv_save_c save_file;
dSv_memory_c memory;
dSv_danBit_c dungeon_bit;
dSv_zone_c zones[32];
dSv_restart_c restart;
dSv_event_c events;
dSv_turnRestart_c turn_restart;
/* 0x000 */ dSv_save_c save_file;
/* 0x958 */ dSv_memory_c memory;
/* 0x978 */ dSv_danBit_c dungeon_bit;
/* 0x9B4 */ dSv_zone_c zones[32];
/* 0xDB4 */ dSv_restart_c restart;
/* 0xDD8 */ dSv_event_c events;
/* 0xED8 */ dSv_turnRestart_c turn_restart;
};
// u8 dMeter2Info_getOilGaugeBackUp() {
// return g_meter2_info.getDirectUseItem();
// }
#endif