mirror of https://github.com/zeldaret/mm.git
ovl_en_ossan OK and documented (#223)
* Lots of progress, some came for OOT WIP * Some small cleanup * Fix merge conflict * Bring over updated z_en_girla.h * Fix merge error * some cleanup * fix msgcontext and add sfx ids * func_808AAB30 is ugly but it matches * Cleanup * More cleanup and matched func_808AA8E8 * Matched last two functions * Brought over data as a comment * Figured out data, but not late rodata * Document EnOssan * Cleanup * Added ShopItemIds * Cleanup * Switch left and right stick prompts * Remove testing NON_MATCHING define * Cleanup * Add header to .c file * Adjust header * Rename InitCutscenes to GetCutscenes * Cleanup * Cleanup before merge with upstream * More cleanup * Lower case Shopkeeper * More cleanup * More general cleaning * Found the late rodata issue * Format * Rename InitalUpdate * PR suggestions except texture stuff * Texture stuff * Rename Texture typedef to UNK_TEXPTR * One more rename * Remove * from TexturePtr arrays * Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: Derek Hensley <d.hensley@tempered.io> Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
This commit is contained in:
Derek Hensley
GitHub
parent
930d605c5c
commit
c774f880e1
|
|
@ -22,6 +22,7 @@ typedef volatile s64 vs64;
|
||||||
typedef float f32;
|
typedef float f32;
|
||||||
typedef double f64;
|
typedef double f64;
|
||||||
|
|
||||||
|
typedef void* TexturePtr;
|
||||||
|
|
||||||
typedef long int Mtx_t[4][4];
|
typedef long int Mtx_t[4][4];
|
||||||
typedef union {
|
typedef union {
|
||||||
|
|
|
||||||
|
|
@ -1671,7 +1671,7 @@ void func_800F0568(GlobalContext* globalCtx, Vec3f* position, s32 param_3, s16 s
|
||||||
// void func_800F0FF0(void);
|
// void func_800F0FF0(void);
|
||||||
// void func_800F10AC(void);
|
// void func_800F10AC(void);
|
||||||
// void func_800F112C(void);
|
// void func_800F112C(void);
|
||||||
// void func_800F1250(void);
|
u16 func_800F1250(GlobalContext* globalCtx, UNK_TYPE arg1);
|
||||||
void func_800F12D0(GlobalContext* globalCtx);
|
void func_800F12D0(GlobalContext* globalCtx);
|
||||||
void func_800F1304(GlobalContext* globalCtx, s16 param_2);
|
void func_800F1304(GlobalContext* globalCtx, s16 param_2);
|
||||||
void func_800F1374(s32 param_1, s16 param_2);
|
void func_800F1374(s32 param_1, s16 param_2);
|
||||||
|
|
|
||||||
|
|
@ -1269,10 +1269,9 @@ SECTIONS
|
||||||
ovl_En_Ossan : AT(RomLocation)
|
ovl_En_Ossan : AT(RomLocation)
|
||||||
{
|
{
|
||||||
build/src/overlays/actors/ovl_En_Ossan/z_en_ossan.o(.text)
|
build/src/overlays/actors/ovl_En_Ossan/z_en_ossan.o(.text)
|
||||||
build/asm/overlays/ovl_En_Ossan_data.o(.data)
|
build/src/overlays/actors/ovl_En_Ossan/z_en_ossan.o(.data)
|
||||||
build/src/overlays/actors/ovl_En_Ossan/z_en_ossan.o(.rodata)
|
build/src/overlays/actors/ovl_En_Ossan/z_en_ossan.o(.rodata)
|
||||||
build/asm/overlays/ovl_En_Ossan_rodata.o(.rodata)
|
build/src/overlays/actors/ovl_En_Ossan/z_en_ossan_overlay.o(.ovl)
|
||||||
build/asm/overlays/ovl_En_Ossan_late_rodata.o(.rodata)
|
|
||||||
}
|
}
|
||||||
SegmentEnd = .;
|
SegmentEnd = .;
|
||||||
SegmentSize = SegmentEnd - SegmentStart;
|
SegmentSize = SegmentEnd - SegmentStart;
|
||||||
|
|
|
||||||
|
|
@ -57,7 +57,6 @@ D_0401F740 = 0x0401F740;
|
||||||
D_0401F7C0 = 0x0401F7C0;
|
D_0401F7C0 = 0x0401F7C0;
|
||||||
D_0401F8C0 = 0x0401F8C0;
|
D_0401F8C0 = 0x0401F8C0;
|
||||||
|
|
||||||
|
|
||||||
/* gameplay_dangeon_keep (segment 05) */
|
/* gameplay_dangeon_keep (segment 05) */
|
||||||
D_05018090 = 0x05018090;
|
D_05018090 = 0x05018090;
|
||||||
D_05017EA0 = 0x05017EA0;
|
D_05017EA0 = 0x05017EA0;
|
||||||
|
|
@ -171,7 +170,6 @@ D_06000228 = 0x06000228;
|
||||||
D_06000A20 = 0x06000A20;
|
D_06000A20 = 0x06000A20;
|
||||||
D_06000040 = 0x06000040;
|
D_06000040 = 0x06000040;
|
||||||
|
|
||||||
|
|
||||||
/* z_bg_market_step */
|
/* z_bg_market_step */
|
||||||
D_0601F050 = 0x0601F050;
|
D_0601F050 = 0x0601F050;
|
||||||
D_06018DA0 = 0x06018DA0;
|
D_06018DA0 = 0x06018DA0;
|
||||||
|
|
@ -565,6 +563,30 @@ D_06002530 = 0x06002530;
|
||||||
/* z_en_nnh */
|
/* z_en_nnh */
|
||||||
D_06001510 = 0x06001510;
|
D_06001510 = 0x06001510;
|
||||||
|
|
||||||
|
/* z_en_ossan */
|
||||||
|
D_06013320 = 0x06013320;
|
||||||
|
D_06012C34 = 0x06012C34;
|
||||||
|
D_060028A0 = 0x060028A0;
|
||||||
|
D_06009D34 = 0x06009D34;
|
||||||
|
D_0600CB3C = 0x0600CB3C;
|
||||||
|
D_0600DE34 = 0x0600DE34;
|
||||||
|
D_0600E3EC = 0x0600E3EC;
|
||||||
|
D_0600C58C = 0x0600C58C;
|
||||||
|
D_0600F00C = 0x0600F00C;
|
||||||
|
D_0600B9D8 = 0x0600B9D8;
|
||||||
|
D_0600C26C = 0x0600C26C;
|
||||||
|
D_0600D354 = 0x0600D354;
|
||||||
|
D_060131FC = 0x060131FC;
|
||||||
|
D_0601430C = 0x0601430C;
|
||||||
|
D_060138B0 = 0x060138B0;
|
||||||
|
D_0600A460 = 0x0600A460;
|
||||||
|
D_06006498 = 0x06006498;
|
||||||
|
D_06007140 = 0x06007140;
|
||||||
|
D_06006D40 = 0x06006D40;
|
||||||
|
D_06005BC0 = 0x06005BC0;
|
||||||
|
D_06006F18 = 0x06006F18;
|
||||||
|
D_06006B18 = 0x06006B18;
|
||||||
|
|
||||||
/* z_en_pametfrog */
|
/* z_en_pametfrog */
|
||||||
D_06000994 = 0x06000994;
|
D_06000994 = 0x06000994;
|
||||||
D_06001B08 = 0x06001B08;
|
D_06001B08 = 0x06001B08;
|
||||||
|
|
|
||||||
|
|
@ -131,4 +131,9 @@ typedef struct {
|
||||||
/* 0x34 */ s32 isEnabled;
|
/* 0x34 */ s32 isEnabled;
|
||||||
} StickDirectionPrompt; // size = 0x38
|
} StickDirectionPrompt; // size = 0x38
|
||||||
|
|
||||||
|
typedef struct ShopItem {
|
||||||
|
/* 0x00 */ s16 shopItemId;
|
||||||
|
/* 0x02 */ Vec3s spawnPos;
|
||||||
|
} ShopItem; // size = 0x8;
|
||||||
|
|
||||||
#endif // Z_EN_GIRLA_H
|
#endif // Z_EN_GIRLA_H
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -3,13 +3,82 @@
|
||||||
|
|
||||||
#include <global.h>
|
#include <global.h>
|
||||||
|
|
||||||
|
#include "overlays/actors/ovl_En_GirlA/z_en_girla.h"
|
||||||
|
|
||||||
struct EnOssan;
|
struct EnOssan;
|
||||||
|
|
||||||
|
typedef void (*EnOssanActionFunc)(struct EnOssan*, GlobalContext*);
|
||||||
|
typedef void (*EnOssanBlinkFunc)(struct EnOssan*);
|
||||||
|
|
||||||
typedef struct EnOssan {
|
typedef struct EnOssan {
|
||||||
/* 0x000 */ Actor actor;
|
/* 0x000 */ Actor actor;
|
||||||
/* 0x144 */ char unk_144[0x2C8];
|
/* 0x144 */ SkelAnime skelAnime;
|
||||||
|
/* 0x188 */ EnOssanActionFunc actionFunc;
|
||||||
|
/* 0x18C */ EnOssanActionFunc tmpActionFunc; // Used to restore back to correct browsing function
|
||||||
|
/* 0x190 */ ColliderCylinder collider;
|
||||||
|
/* 0x1DC */ s16 delayTimer;
|
||||||
|
/* 0x1DE */ s8 objIndex;
|
||||||
|
/* 0x1E0 */ s16 eyeTexIndex;
|
||||||
|
/* 0x1E2 */ s16 blinkTimer;
|
||||||
|
/* 0x1E4 */ EnOssanBlinkFunc blinkFunc;
|
||||||
|
/* 0x1E8 */ EnGirlA* items[8];
|
||||||
|
/* 0x208 */ s32 stickAccumX;
|
||||||
|
/* 0x20C */ s32 stickAccumY;
|
||||||
|
/* 0x210 */ u8 moveHorizontal;
|
||||||
|
/* 0x211 */ u8 moveVertical;
|
||||||
|
/* 0x214 */ f32 cursorX;
|
||||||
|
/* 0x218 */ f32 cursorY;
|
||||||
|
/* 0x21C */ f32 cursorZ;
|
||||||
|
/* 0x220 */ u32 cursorColorR;
|
||||||
|
/* 0x224 */ u32 cursorColorG;
|
||||||
|
/* 0x228 */ u32 cursorColorB;
|
||||||
|
/* 0x22C */ u32 cursorColorA;
|
||||||
|
/* 0x230 */ f32 cursorAnimTween;
|
||||||
|
/* 0x234 */ u8 cursorAnimState;
|
||||||
|
/* 0x235 */ u8 drawCursor;
|
||||||
|
/* 0x236 */ u8 cursorIdx;
|
||||||
|
/* 0x238 */ StickDirectionPrompt stickLeftPrompt;
|
||||||
|
/* 0x270 */ StickDirectionPrompt stickRightPrompt;
|
||||||
|
/* 0x2A8 */ f32 arrowAnimTween;
|
||||||
|
/* 0x2AC */ f32 stickAnimTween;
|
||||||
|
/* 0x2B0 */ u8 arrowAnimState;
|
||||||
|
/* 0x2B1 */ u8 stickAnimState;
|
||||||
|
/* 0x2B4 */ f32 shopItemSelectedTween;
|
||||||
|
/* 0x2B8 */ s16 lookToShopkeeperCutscene;
|
||||||
|
/* 0x2BA */ s16 lookToLeftShelfCutscene;
|
||||||
|
/* 0x2BC */ s16 lookToRightShelfCutscene;
|
||||||
|
/* 0x2BE */ s16 lookToShopKeeperFromShelfCutscene;
|
||||||
|
/* 0x2C0 */ s16 cutscene;
|
||||||
|
/* 0x2C2 */ s16 cutsceneState;
|
||||||
|
/* 0x2C4 */ u16 textId;
|
||||||
|
/* 0x2C6 */ Vec3s headRot;
|
||||||
|
/* 0x2CC */ Vec3s unk2CC; // Set but never used
|
||||||
|
/* 0x2D2 */ s16 limbRotTableY[19];
|
||||||
|
/* 0x2F8 */ s16 limbRotTableZ[19];
|
||||||
|
/* 0x31E */ Vec3s limbDrawTbl[19];
|
||||||
|
/* 0x390 */ Vec3s transitionDrawTbl[19];
|
||||||
|
/* 0x402 */ s16 animationIdx;
|
||||||
|
/* 0x404 */ Vec3s headRotPartTimeWorker;
|
||||||
|
/* 0x40A */ u16 flags;
|
||||||
} EnOssan; // size = 0x40C
|
} EnOssan; // size = 0x40C
|
||||||
|
|
||||||
|
/* Note:
|
||||||
|
* Items on shelves are indexed as:
|
||||||
|
* 7 5 3 1
|
||||||
|
* 6 4 2 0
|
||||||
|
*/
|
||||||
|
|
||||||
|
typedef enum {
|
||||||
|
/* 0 */ ENOSSAN_CURIOSITY_SHOP_MAN,
|
||||||
|
/* 1 */ ENOSSAN_PART_TIME_WORKER
|
||||||
|
} EnOssanWorker;
|
||||||
|
|
||||||
|
typedef enum {
|
||||||
|
/* 0 */ ENOSSAN_CUTSCENESTATE_STOPPED,
|
||||||
|
/* 1 */ ENOSSAN_CUTSCENESTATE_WAITING,
|
||||||
|
/* 2 */ ENOSSAN_CUTSCENESTATE_PLAYING
|
||||||
|
} EnOssanCutsceneState;
|
||||||
|
|
||||||
extern const ActorInit En_Ossan_InitVars;
|
extern const ActorInit En_Ossan_InitVars;
|
||||||
|
|
||||||
#endif // Z_EN_OSSAN_H
|
#endif // Z_EN_OSSAN_H
|
||||||
|
|
|
||||||
|
|
@ -5764,74 +5764,74 @@
|
||||||
0x808A7E30:("EnRiverSound_Init",),
|
0x808A7E30:("EnRiverSound_Init",),
|
||||||
0x808A7EB8:("EnRiverSound_Update",),
|
0x808A7EB8:("EnRiverSound_Update",),
|
||||||
0x808A7FD0:("EnRiverSound_Draw",),
|
0x808A7FD0:("EnRiverSound_Draw",),
|
||||||
0x808A80A0:("func_808A80A0",),
|
0x808A80A0:("EnOssan_SetupAction",),
|
||||||
0x808A80AC:("func_808A80AC",),
|
0x808A80AC:("EnOssan_TestItemSelected",),
|
||||||
0x808A812C:("func_808A812C",),
|
0x808A812C:("EnOssan_CheckValidSpawn",),
|
||||||
0x808A8218:("func_808A8218",),
|
0x808A8218:("EnOssan_RotateHead",),
|
||||||
0x808A82F4:("func_808A82F4",),
|
0x808A82F4:("EnOssan_SpawnShopItems",),
|
||||||
0x808A83BC:("EnOssan_Init",),
|
0x808A83BC:("EnOssan_Init",),
|
||||||
0x808A8470:("EnOssan_Destroy",),
|
0x808A8470:("EnOssan_Destroy",),
|
||||||
0x808A849C:("func_808A849C",),
|
0x808A849C:("EnOssan_UpdateCursorPos",),
|
||||||
0x808A8500:("func_808A8500",),
|
0x808A8500:("EnOssan_EndInteraction",),
|
||||||
0x808A85FC:("func_808A85FC",),
|
0x808A85FC:("EnOssan_TestEndInteraction",),
|
||||||
0x808A8644:("func_808A8644",),
|
0x808A8644:("EnOssan_TestCancelOption",),
|
||||||
0x808A86A8:("func_808A86A8",),
|
0x808A86A8:("EnOssan_SetupStartShopping",),
|
||||||
0x808A8708:("func_808A8708",),
|
0x808A8708:("EnOssan_StartShopping",),
|
||||||
0x808A875C:("func_808A875C",),
|
0x808A875C:("EnOssan_SetupLookToShopkeeperFromShelf",),
|
||||||
0x808A8798:("func_808A8798",),
|
0x808A8798:("EnOssan_Idle",),
|
||||||
0x808A890C:("func_808A890C",),
|
0x808A890C:("EnOssan_BeginInteraction",),
|
||||||
0x808A8B74:("func_808A8B74",),
|
0x808A8B74:("EnOssan_UpdateJoystickInputState",),
|
||||||
0x808A8CC0:("func_808A8CC0",),
|
0x808A8CC0:("EnOssan_SetCursorIndexFromNeutral",),
|
||||||
0x808A8DF8:("func_808A8DF8",),
|
0x808A8DF8:("EnOssan_CursorRight",),
|
||||||
0x808A8E84:("func_808A8E84",),
|
0x808A8E84:("EnOssan_CursorLeft",),
|
||||||
0x808A8EEC:("func_808A8EEC",),
|
0x808A8EEC:("EnOssan_Hello",),
|
||||||
0x808A90A4:("func_808A90A4",),
|
0x808A90A4:("EnOssan_FacingShopkeeperDialogResult",),
|
||||||
0x808A91B4:("func_808A91B4",),
|
0x808A91B4:("EnOssan_FaceShopkeeper",),
|
||||||
0x808A935C:("func_808A935C",),
|
0x808A935C:("EnOssan_TalkToShopkeeper",),
|
||||||
0x808A9400:("func_808A9400",),
|
0x808A9400:("EnOssan_LookToLeftShelf",),
|
||||||
0x808A94FC:("func_808A94FC",),
|
0x808A94FC:("EnOssan_LookToRightShelf",),
|
||||||
0x808A95F8:("func_808A95F8",),
|
0x808A95F8:("EnOssan_CursorUpDown",),
|
||||||
0x808A980C:("func_808A980C",),
|
0x808A980C:("EnOssan_HasPlayerSelectedItem",),
|
||||||
0x808A98E4:("func_808A98E4",),
|
0x808A98E4:("EnOssan_BrowseLeftShelf",),
|
||||||
0x808A9AB8:("func_808A9AB8",),
|
0x808A9AB8:("EnOssan_BrowseRightShelf",),
|
||||||
0x808A9C8C:("func_808A9C8C",),
|
0x808A9C8C:("EnOssan_LookToShopkeeperFromShelf",),
|
||||||
0x808A9D64:("func_808A9D64",),
|
0x808A9D64:("EnOssan_SetupBuyItemWithFanfare",),
|
||||||
0x808A9E20:("func_808A9E20",),
|
0x808A9E20:("EnOssan_SetupCannotBuy",),
|
||||||
0x808A9E5C:("func_808A9E5C",),
|
0x808A9E5C:("EnOssan_SetupBuy",),
|
||||||
0x808A9E98:("func_808A9E98",),
|
0x808A9E98:("EnOssan_HandleCanBuyItem",),
|
||||||
0x808AA0C8:("func_808AA0C8",),
|
0x808AA0C8:("EnOssan_SelectItem",),
|
||||||
0x808AA1B0:("func_808AA1B0",),
|
0x808AA1B0:("EnOssan_CannotBuy",),
|
||||||
0x808AA224:("func_808AA224",),
|
0x808AA224:("EnOssan_CanBuy",),
|
||||||
0x808AA2C8:("func_808AA2C8",),
|
0x808AA2C8:("EnOssan_BuyItemWithFanfare",),
|
||||||
0x808AA33C:("func_808AA33C",),
|
0x808AA33C:("EnOssan_SetupItemPurchased",),
|
||||||
0x808AA404:("func_808AA404",),
|
0x808AA404:("EnOssan_ContinueShopping",),
|
||||||
0x808AA5E8:("func_808AA5E8",),
|
0x808AA5E8:("EnOssan_ItemPurchased",),
|
||||||
0x808AA6D8:("func_808AA6D8",),
|
0x808AA6D8:("EnOssan_PositionSelectedItem",),
|
||||||
0x808AA79C:("func_808AA79C",),
|
0x808AA79C:("EnOssan_ResetItemPosition",),
|
||||||
0x808AA7C0:("func_808AA7C0",),
|
0x808AA7C0:("EnOssan_TakeItemOffShelf",),
|
||||||
0x808AA85C:("func_808AA85C",),
|
0x808AA85C:("EnOssan_ReturnItemToShelf",),
|
||||||
0x808AA8E8:("func_808AA8E8",),
|
0x808AA8E8:("EnOssan_UpdateItemSelectedProperty",),
|
||||||
0x808AAA64:("func_808AAA64",),
|
0x808AAA64:("EnOssan_UpdateCursorAnim",),
|
||||||
0x808AAB30:("func_808AAB30",),
|
0x808AAB30:("EnOssan_UpdateStickDirectionPromptAnim",),
|
||||||
0x808AACE0:("func_808AACE0",),
|
0x808AACE0:("EnOssan_WaitForBlink",),
|
||||||
0x808AAD14:("func_808AAD14",),
|
0x808AAD14:("EnOssan_Blink",),
|
||||||
0x808AADB4:("func_808AADB4",),
|
0x808AADB4:("EnOssan_InitCuriosityShopMan",),
|
||||||
0x808AAE1C:("func_808AAE1C",),
|
0x808AAE1C:("EnOssan_InitPartTimeWorker",),
|
||||||
0x808AAE84:("func_808AAE84",),
|
0x808AAE84:("EnOssan_GetWelcomeCuriosityShopMan",),
|
||||||
0x808AAFB0:("func_808AAFB0",),
|
0x808AAFB0:("EnOssan_GetWelcomePartTimeWorker",),
|
||||||
0x808AB0B0:("func_808AB0B0",),
|
0x808AB0B0:("EnOssan_SetHaveMet",),
|
||||||
0x808AB16C:("func_808AB16C",),
|
0x808AB16C:("EnOssan_InitShop",),
|
||||||
0x808AB404:("func_808AB404",),
|
0x808AB404:("EnOssan_GetCutscenes",),
|
||||||
0x808AB458:("EnOssan_Update",),
|
0x808AB458:("EnOssan_Update",),
|
||||||
0x808AB52C:("func_808AB52C",),
|
0x808AB52C:("EnOssan_DrawCursor",),
|
||||||
0x808AB78C:("func_808AB78C",),
|
0x808AB78C:("EnOssan_DrawTextRec",),
|
||||||
0x808AB928:("func_808AB928",),
|
0x808AB928:("EnOssan_DrawStickDirectionPrompts",),
|
||||||
0x808ABCD0:("func_808ABCD0",),
|
0x808ABCD0:("EnOssan_OverrideLimbDrawCuriosityShopMan",),
|
||||||
0x808ABD10:("func_808ABD10",),
|
0x808ABD10:("EnOssan_OverrideLimbDrawPartTimeWorker",),
|
||||||
0x808ABD60:("func_808ABD60",),
|
0x808ABD60:("EnOssan_PostLimbDrawCuriosityShopMan",),
|
||||||
0x808ABE18:("func_808ABE18",),
|
0x808ABE18:("EnOssan_PostLimbDrawPartTimeWorker",),
|
||||||
0x808ABE58:("func_808ABE58",),
|
0x808ABE58:("EnOssan_DrawCuriosityShopMan",),
|
||||||
0x808ABF30:("func_808ABF30",),
|
0x808ABF30:("EnOssan_DrawPartTimeWorker",),
|
||||||
0x808AC920:("EnFamos_Init",),
|
0x808AC920:("EnFamos_Init",),
|
||||||
0x808ACB08:("EnFamos_Destroy",),
|
0x808ACB08:("EnFamos_Destroy",),
|
||||||
0x808ACB58:("func_808ACB58",),
|
0x808ACB58:("func_808ACB58",),
|
||||||
|
|
|
||||||
|
|
@ -6748,41 +6748,33 @@
|
||||||
0x808A8084:("enRiverSoundOverlayRelocations","u32","[5]",0x14),
|
0x808A8084:("enRiverSoundOverlayRelocations","u32","[5]",0x14),
|
||||||
0x808A809C:("enRiverSoundOverlayInfoOffset","u32","",0x4),
|
0x808A809C:("enRiverSoundOverlayInfoOffset","u32","",0x4),
|
||||||
0x808AC010:("En_Ossan_InitVars","UNK_TYPE1","",0x1),
|
0x808AC010:("En_Ossan_InitVars","UNK_TYPE1","",0x1),
|
||||||
0x808AC030:("D_808AC030","UNK_TYPE1","",0x1),
|
0x808AC030:("sAnimationsCuriosityShopMan","UNK_TYPE1","",0x1),
|
||||||
0x808AC100:("D_808AC100","UNK_TYPE1","",0x1),
|
0x808AC100:("sAnimationsPartTimeWorker","UNK_TYPE1","",0x1),
|
||||||
0x808AC1C0:("D_808AC1C0","UNK_TYPE1","",0x1),
|
0x808AC1C0:("sObjectIds","UNK_TYPE1","",0x1),
|
||||||
0x808AC1C4:("D_808AC1C4","UNK_TYPE1","",0x1),
|
0x808AC1C4:("sAnimations","UNK_TYPE1","",0x1),
|
||||||
0x808AC1CC:("D_808AC1CC","UNK_TYPE1","",0x1),
|
0x808AC1CC:("sShops","UNK_TYPE1","",0x1),
|
||||||
0x808AC1D4:("D_808AC1D4","UNK_TYPE1","",0x1),
|
0x808AC254:("sWelcomeHumanTextIds","UNK_TYPE2","",0x2),
|
||||||
0x808AC254:("D_808AC254","UNK_TYPE2","",0x2),
|
0x808AC258:("sTalkOptionTextIds","UNK_TYPE2","",0x2),
|
||||||
0x808AC256:("D_808AC256","UNK_TYPE2","",0x2),
|
0x808AC25C:("sWelcomeGoronFirstTimeTextIds","UNK_TYPE2","",0x2),
|
||||||
0x808AC258:("D_808AC258","UNK_TYPE1","",0x1),
|
0x808AC260:("sWelcomeZoraFirstTimeTextIds","UNK_TYPE2","",0x2),
|
||||||
0x808AC25C:("D_808AC25C","UNK_TYPE2","",0x2),
|
0x808AC264:("sWelcomeDekuFirstTimeTextIds","UNK_TYPE2","",0x2),
|
||||||
0x808AC25E:("D_808AC25E","UNK_TYPE2","",0x2),
|
0x808AC268:("sWelcomeGoronTextIds","UNK_TYPE2","",0x2),
|
||||||
0x808AC260:("D_808AC260","UNK_TYPE2","",0x2),
|
0x808AC26C:("sWelcomeZoraTextIds","UNK_TYPE2","",0x2),
|
||||||
0x808AC262:("D_808AC262","UNK_TYPE2","",0x2),
|
0x808AC270:("sWelcomeDekuTextIds","UNK_TYPE2","",0x2),
|
||||||
0x808AC264:("D_808AC264","UNK_TYPE2","",0x2),
|
0x808AC274:("sNeedEmptyBottleTextIds","UNK_TYPE1","",0x1),
|
||||||
0x808AC266:("D_808AC266","UNK_TYPE2","",0x2),
|
0x808AC278:("sNeedRupeesTextIds","UNK_TYPE1","",0x1),
|
||||||
0x808AC268:("D_808AC268","UNK_TYPE2","",0x2),
|
0x808AC27C:("sNoRoomTextIds","UNK_TYPE1","",0x1),
|
||||||
0x808AC26A:("D_808AC26A","UNK_TYPE2","",0x2),
|
0x808AC280:("sBuySuccessTextIds","UNK_TYPE1","",0x1),
|
||||||
0x808AC26C:("D_808AC26C","UNK_TYPE2","",0x2),
|
0x808AC284:("sCannotGetNowTextIds","UNK_TYPE1","",0x1),
|
||||||
0x808AC26E:("D_808AC26E","UNK_TYPE2","",0x2),
|
0x808AC288:("sInitChain","UNK_TYPE1","",0x1),
|
||||||
0x808AC270:("D_808AC270","UNK_TYPE2","",0x2),
|
0x808AC28C:("sSelectedItemPosition","UNK_TYPE4","",0x4),
|
||||||
0x808AC272:("D_808AC272","UNK_TYPE2","",0x2),
|
0x808AC2A4:("sInitFuncs","UNK_TYPE1","",0x1),
|
||||||
0x808AC274:("D_808AC274","UNK_TYPE1","",0x1),
|
0x808AC2AC:("sPartTimeWorkerFocusOffset","UNK_TYPE1","",0x1),
|
||||||
0x808AC278:("D_808AC278","UNK_TYPE1","",0x1),
|
0x808AC2B8:("sCuriosityShopManEyeTextures","UNK_TYPE1","",0x1),
|
||||||
0x808AC27C:("D_808AC27C","UNK_TYPE1","",0x1),
|
0x808AC2C4:("sPartTimeWorkerEyeTextures","UNK_TYPE1","",0x1),
|
||||||
0x808AC280:("D_808AC280","UNK_TYPE1","",0x1),
|
0x808AC2D0:("filename1","char","[]",0x1),
|
||||||
0x808AC284:("D_808AC284","UNK_TYPE1","",0x1),
|
0x808AC2E0:("filename2","char","[]",0x1),
|
||||||
0x808AC288:("D_808AC288","UNK_TYPE1","",0x1),
|
0x808AC2F0:("filename3","char","[]",0x1),
|
||||||
0x808AC28C:("D_808AC28C","UNK_TYPE4","",0x4),
|
|
||||||
0x808AC2A4:("D_808AC2A4","UNK_TYPE1","",0x1),
|
|
||||||
0x808AC2AC:("D_808AC2AC","UNK_TYPE1","",0x1),
|
|
||||||
0x808AC2B8:("D_808AC2B8","UNK_TYPE1","",0x1),
|
|
||||||
0x808AC2C4:("D_808AC2C4","UNK_TYPE1","",0x1),
|
|
||||||
0x808AC2D0:("D_808AC2D0","char","[]",0x1),
|
|
||||||
0x808AC2E0:("D_808AC2E0","char","[]",0x1),
|
|
||||||
0x808AC2F0:("D_808AC2F0","char","[]",0x1),
|
|
||||||
0x808AC300:("jtbl_D_808AC300","UNK_PTR","",0x4),
|
0x808AC300:("jtbl_D_808AC300","UNK_PTR","",0x4),
|
||||||
0x808AC32C:("jtbl_D_808AC32C","UNK_PTR","",0x4),
|
0x808AC32C:("jtbl_D_808AC32C","UNK_PTR","",0x4),
|
||||||
0x808AC34C:("D_808AC34C","f32","",0x4),
|
0x808AC34C:("D_808AC34C","f32","",0x4),
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue