izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

z_draw OK and Documented (#900)

Browse Source 
* Import data for z_draw

* Match z_draw

* cleanup

* rupees

* Some object gi docs

* More documents

* Add explanation on function names

* more cleanup

* Fixed some things

* More docs

* Object docs WIP, still not done. I'll continue tomorrow

* More WIP, should just be mask gi objects left now

* Some masks done, many more to go

* cleanup

* Last masks finish

* Shield Stolen

* cleanup

* Apply various dicussions

* remove casts

* PR Suggestions

* Sync PowderKeg
This commit is contained in:
engineer124
2022-07-23 15:25:20 -04:00
committed by GitHub
parent fbb38416ca
commit f3f147cc3d
125 changed files with 2204 additions and 805 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+2 -24
View File
@@ -1390,30 +1390,8 @@ s32 Cutscene_GetActorActionIndex(PlayState* play, u16 actorActionCmd);
s32 Cutscene_CheckActorAction(PlayState* play, u16 actorActionCmd);
u8 Cutscene_IsPlaying(PlayState* play);
void GetItem_Draw(PlayState* play, s16 index);
void func_800EE364(PlayState* play, s16 index);
void func_800EE400(PlayState* play, s16 index);
void func_800EE5FC(PlayState* play, s16 index);
void func_800EE7D8(PlayState* play, s16 index);
void func_800EE940(PlayState* play, s16 index);
void func_800EEA48(PlayState* play, s16 index);
void func_800EEC18(PlayState* play, s16 index);
void func_800EED20(PlayState* play, s16 index);
void func_800EEE34(PlayState* play, s16 index);
void func_800EEF4C(PlayState* play, s16 index);
void func_800EF054(PlayState* play, s16 index);
void func_800EF0F0(PlayState* play, s16 index);
void func_800EF1F4(PlayState* play, s16 index);
void func_800EF2AC(PlayState* play, s16 index);
void func_800EF364(PlayState* play, s16 index);
void func_800EF4D4(PlayState* play, s16 index);
void func_800EF65C(PlayState* play, s16 index);
void func_800EF780(PlayState* play, s16 index);
void func_800EF89C(PlayState* play, s16 index);
void func_800EF984(PlayState* play, s16 index);
void func_800EFAB8(PlayState* play, s16 index);
void func_800EFBFC(PlayState* play, s16 index);
void func_800EFD44(PlayState* play, s16 index);
void GetItem_Draw(PlayState* play, s16 drawId);
void EffFootmark_Init(PlayState* play);
void EffFootmark_Add(PlayState* play, MtxF* displayMatrix, Actor* actor, u8 id, Vec3f* location, u16 size, u8 red, u8 green, u8 blue, u16 alpha, u16 alphaChange, u16 fadeoutDelay);
void EffFootmark_Update(PlayState* play);
include/variables.h
-1
View File
@@ -870,7 +870,6 @@ extern EffectShieldParticleInit shieldParticleInitWood;
extern u8 D_801BB12C;
extern s801BB170 D_801BB170[118];
// extern UNK_TYPE1 D_801BC210;
extern Gfx D_801BC240[9];
extern Gfx D_801BC288[3];
include/z64.h
-14
View File
@@ -901,22 +901,8 @@ typedef void (*ColChkApplyFunc)(PlayState*, CollisionCheckContext*, Collider*);
typedef void (*ColChkVsFunc)(PlayState*, CollisionCheckContext*, Collider*, Collider*);
typedef s32 (*ColChkLineFunc)(PlayState*, CollisionCheckContext*, Collider*, Vec3f*, Vec3f*);
typedef void(*draw_func)(PlayState* play, s16 index);
typedef void(*room_draw_func)(PlayState* play, Room* room, u32 flags);
typedef struct {
/* 0x00 */ draw_func unk0;
/* 0x04 */ u32 unk4;
/* 0x08 */ u32 unk8;
/* 0x0C */ u32 unkC;
/* 0x10 */ u32 unk10;
/* 0x14 */ u32 unk14;
/* 0x18 */ u32 unk18;
/* 0x1C */ u32 unk1C;
/* 0x20 */ u32 unk20;
} s801BB170; // size = 0x24
typedef struct {
/* 0x00 */ Vec3f atOffset;
/* 0x0C */ Vec3f eyeOffset;
include/z64actor.h
+2 -2
View File
@@ -226,7 +226,7 @@ typedef enum {
/* 0x00 */ ITEM00_RUPEE_GREEN,
/* 0x01 */ ITEM00_RUPEE_BLUE,
/* 0x02 */ ITEM00_RUPEE_RED,
/* 0x03 */ ITEM00_HEART,
/* 0x03 */ ITEM00_RECOVERY_HEART,
/* 0x04 */ ITEM00_BOMBS_A,
/* 0x05 */ ITEM00_ARROWS_10,
/* 0x06 */ ITEM00_HEART_PIECE,
@@ -268,7 +268,7 @@ typedef struct EnItem00 {
/* 0x000 */ Actor actor;
/* 0x144 */ EnItem00ActionFunc actionFunc;
/* 0x148 */ s16 collectibleFlag;
/* 0x14A */ s16 unk14A;
/* 0x14A */ s16 getItemId;
/* 0x14C */ s16 unk14C;
/* 0x14E */ s16 unk14E;
/* 0x150 */ s16 unk150;
include/z64item.h
+170 -55
View File
@@ -154,7 +154,7 @@ typedef enum {
/* 0x21 */ ITEM_ZORA_EGG,
/* 0x22 */ ITEM_GOLD_DUST,
/* 0x23 */ ITEM_MUSHROOM,
/* 0x24 */ ITEM_SEA_HORSE,
/* 0x24 */ ITEM_SEAHORSE,
/* 0x25 */ ITEM_CHATEAU,
/* 0x26 */ ITEM_HYLIAN_LOACH,
/* 0x27 */ ITEM_OBABA_DRINK,
@@ -166,7 +166,7 @@ typedef enum {
/* 0x2D */ ITEM_ROOM_KEY,
/* 0x2E */ ITEM_LETTER_MAMA,
/* 0x2F */ ITEM_LETTER_TO_KAFEI,
/* 0x30 */ ITEM_PENDANT_MEMORIES,
/* 0x30 */ ITEM_PENDANT_OF_MEMORIES,
/* 0x31 */ ITEM_TINGLE_MAP,
/* 0x32 */ ITEM_MASK_DEKU,
/* 0x33 */ ITEM_MASK_GORON,
@@ -247,7 +247,7 @@ typedef enum {
/* 0x80 */ ITEM_INVALID_5,
/* 0x81 */ ITEM_INVALID_6,
/* 0x82 */ ITEM_INVALID_7,
/* 0x83 */ ITEM_HEART,
/* 0x83 */ ITEM_RECOVERY_HEART,
/* 0x84 */ ITEM_RUPEE_GREEN,
/* 0x85 */ ITEM_RUPEE_BLUE,
/* 0x86 */ ITEM_RUPEE_10,
@@ -279,7 +279,7 @@ typedef enum {
/* 0xA0 */ ITEM_MILK,
/* 0xA1 */ ITEM_GOLD_DUST_2,
/* 0xA2 */ ITEM_HYLIAN_LOACH_2,
/* 0xA3 */ ITEM_SEA_HORSE_CAUGHT,
/* 0xA3 */ ITEM_SEAHORSE_CAUGHT,
/* 0xF0 */ ITEM_F0 = 0xF0,
/* 0xF1 */ ITEM_F1,
/* 0xF2 */ ITEM_F2,
@@ -304,11 +304,15 @@ typedef enum {
/* 0x0A */ GI_RECOVERY_HEART,
/* 0x0C */ GI_HEART_PIECE = 0x0C,
/* 0x0D */ GI_HEART_CONTAINER,
/* 0x0E */ GI_MAGIC_SMALL,
/* 0x0F */ GI_MAGIC_LARGE,
/* 0x11 */ GI_STRAY_FAIRY = 0x11,
/* 0x14 */ GI_BOMBS_1 = 0x14,
/* 0x15 */ GI_BOMBS_5,
/* 0x16 */ GI_BOMBS_10,
/* 0x19 */ GI_STICKS_1 = 0x19,
/* 0x17 */ GI_BOMBS_20,
/* 0x18 */ GI_BOMBS_30,
/* 0x19 */ GI_STICKS_1,
/* 0x1A */ GI_BOMBCHUS_10,
/* 0x1B */ GI_BOMB_BAG_20,
/* 0x1C */ GI_BOMB_BAG_30,
@@ -320,28 +324,58 @@ typedef enum {
/* 0x22 */ GI_QUIVER_30,
/* 0x23 */ GI_QUIVER_40,
/* 0x24 */ GI_QUIVER_50,
/* 0x25 */ GI_25 = 0x25,
/* 0x28 */ GI_NUTS_1 = 0x28,
/* 0x2A */ GI_NUTS_10 = 0x2A,
/* 0x25 */ GI_ARROW_FIRE,
/* 0x26 */ GI_ARROW_ICE,
/* 0x27 */ GI_ARROW_LIGHT,
/* 0x28 */ GI_NUTS_1,
/* 0x29 */ GI_NUTS_5,
/* 0x2A */ GI_NUTS_10,
/* 0x2E */ GI_BOMBCHUS_20 = 0x2E,
/* 0x32 */ GI_SHIELD_HERO = 0x32,
/* 0x33 */ GI_SHIELD_MIRROR,
/* 0x35 */ GI_MAGIC_BEANS = 0x35,
/* 0x34 */ GI_POWDER_KEG,
/* 0x35 */ GI_MAGIC_BEANS,
/* 0x36 */ GI_BOMBCHUS_1,
/* 0x3A */ GI_BOMBCHUS_5 = 0x3A,
/* 0x3C */ GI_KEY_SMALL = 0x3C,
/* 0x37 */ GI_SWORD_KOKIRI,
/* 0x38 */ GI_SWORD_RAZOR,
/* 0x39 */ GI_SWORD_GILDED,
/* 0x3A */ GI_BOMBCHUS_5,
/* 0x3B */ GI_SWORD_GREAT_FAIRY,
/* 0x3C */ GI_KEY_SMALL,
/* 0x3D */ GI_KEY_BOSS,
/* 0x3E */ GI_MAP,
/* 0x3F */ GI_COMPASS,
/* 0x41 */ GI_HOOKSHOT = 0x41,
/* 0x42 */ GI_LENS,
/* 0x43 */ GI_PICTO_BOX,
/* 0x4C */ GI_OCARINA = 0x4C,
/* 0x50 */ GI_50 = 0x50,
/* 0x52 */ GI_SCALE_GOLD = 0x52, // Assumed, used in En_Fishing
/* 0x59 */ GI_BOTTLE_POTION_RED = 0x59,
/* 0x50 */ GI_BOMBERS_NOTEBOOK = 0x50,
/* 0x52 */ GI_SKULL_TOKEN = 0x52,
/* 0x55 */ GI_REMAINS_ODOLWA = 0x55,
/* 0x56 */ GI_REMAINS_GOHT,
/* 0x57 */ GI_REMAINS_GYORG,
/* 0x58 */ GI_REMAINS_TWINMOLD,
/* 0x59 */ GI_POTION_RED_BOTTLE, // ITEM_LONGSHOT
/* 0x5A */ GI_BOTTLE,
/* 0x5B */ GI_POTION_RED,
/* 0x5C */ GI_POTION_GREEN,
/* 0x5D */ GI_POTION_BLUE,
/* 0x5E */ GI_FAIRY,
/* 0x60 */ GI_MILK_BOTTLE = 0x60,
/* 0x5F */ GI_DEKU_PRINCESS,
/* 0x60 */ GI_MILK_BOTTLE,
/* 0x61 */ GI_MILK_HALF,
/* 0x62 */ GI_FISH,
/* 0x63 */ GI_BUG,
/* 0x64 */ GI_BLUE_FIRE,
/* 0x65 */ GI_POE,
/* 0x66 */ GI_BIG_POE,
/* 0x67 */ GI_SPRING_WATER,
/* 0x68 */ GI_HOT_SPRING_WATER,
/* 0x69 */ GI_ZORA_EGG,
/* 0x6A */ GI_GOLD_DUST,
/* 0x6B */ GI_MUSHROOM,
/* 0x6E */ GI_SEAHORSE = 0x6E,
/* 0x6F */ GI_CHATEAU_BOTTLE,
/* 0x76 */ GI_ICE_TRAP = 0x76,
/* 0x78 */ GI_MASK_DEKU = 0x78,
/* 0x79 */ GI_MASK_GORON,
@@ -369,72 +403,153 @@ typedef enum {
/* 0x8F */ GI_MASK_KAFEIS_MASK,
/* 0x91 */ GI_CHATEAU = 0x91,
/* 0x92 */ GI_MILK,
/* 0x93 */ GI_GOLD_DUST,
/* 0x94 */ GI_EEL, // Unused bottled eel
/* 0x95 */ GI_SEAHORSE,
/* 0x93 */ GI_GOLD_DUST_2,
/* 0x94 */ GI_HYLIAN_LOACH, // Unused bottled eel
/* 0x95 */ GI_SEAHORSE_CAUGHT,
/* 0x96 */ GI_MOON_TEAR,
/* 0x97 */ GI_DEED_LAND,
/* 0x98 */ GI_DEED_SWAMP,
/* 0x99 */ GI_DEED_MOUNTAIN,
/* 0x9A */ GI_DEED_OCEAN,
/* 0x9B */ GI_SWORD_GREAT_FAIRY,
/* 0x9C */ GI_SWORD_KOKIRI,
/* 0x9D */ GI_SWORD_RAZOR,
/* 0x9E */ GI_SWORD_GILDED,
/* 0x9F */ GI_SHIELD_HERO_2, // Code that treats this as hero's shield is unused, so take with a grain of salt
/* 0xA1 */ GI_LETTER_TO_MAMA = 0xA1,
/* 0x9B */ GI_SWORD_GREAT_FAIRY_STOLEN,
/* 0x9C */ GI_SWORD_KOKIRI_STOLEN,
/* 0x9D */ GI_SWORD_RAZOR_STOLEN,
/* 0x9E */ GI_SWORD_GILDED_STOLEN,
/* 0x9F */ GI_SHIELD_HERO_STOLEN, // Code that treats this as hero's shield is unused, implied as intended to be stolen
/* 0xA0 */ GI_ROOM_KEY,
/* 0xA1 */ GI_LETTER_TO_MAMA,
/* 0xA9 */ GI_BOTTLE_STOLEN = 0xA9, // buy back stolen bottle
/* 0xAA */ GI_LETTER_TO_KAFEI,
/* 0xAB */ GI_PENDANT_OF_MEMORIES,
/* 0xBA */ GI_MAX = 0xBA
/* 0xB4 */ GI_TINGLE_MAP_CLOCK_TOWN = 0xB4,
/* 0xB5 */ GI_TINGLE_MAP_WOODFALL,
/* 0xB6 */ GI_TINGLE_MAP_SNOWHEAD,
/* 0xB7 */ GI_TINGLE_MAP_ROMANI_RANCH,
/* 0xB8 */ GI_TINGLE_MAP_GREAT_BAY,
/* 0xB9 */ GI_TINGLE_MAP_STONE_TOWER,
/* 0xBA */ GI_MAX
} GetItemID;
typedef enum {
/* 0x00 */ GID_BOTTLE,
/* 0x01 */ GID_01,
/* 0x02 */ GID_02,
/* 0x03 */ GID_03,
/* 0x0A */ GID_COMPASS = 0x0A,
/* 0x0E */ GID_0E = 0x0E,
/* 0x0F */ GID_0F,
/* 0x10 */ GID_MASK_ALL_NIGHT = 0x10,
/* 0x01 */ GID_KEY_SMALL,
/* 0x02 */ GID_MASK_KAMARO,
/* 0x03 */ GID_MASK_COUPLE,
/* 0x04 */ GID_04,
/* 0x05 */ GID_05,
/* 0x06 */ GID_06,
/* 0x07 */ GID_07,
/* 0x08 */ GID_RECOVERY_HEART,
/* 0x09 */ GID_KEY_BOSS,
/* 0x0A */ GID_COMPASS,
/* 0x0B */ GID_BOMBERS_NOTEBOOK,
/* 0x0C */ GID_MASK_STONE,
/* 0x0D */ GID_MASK_KAFEIS_MASK,
/* 0x0E */ GID_MASK_CIRCUS_LEADER,
/* 0x0F */ GID_MASK_BREMEN,
/* 0x10 */ GID_MASK_ALL_NIGHT,
/* 0x11 */ GID_NUTS,
/* 0x13 */ GID_13 = 0x13,
/* 0x17 */ GID_BOMB_BAG_20 = 0x17,
/* 0x12 */ GID_HEART_CONTAINER,
/* 0x13 */ GID_HEART_PIECE,
/* 0x14 */ GID_QUIVER_30,
/* 0x15 */ GID_QUIVER_40,
/* 0x16 */ GID_QUIVER_50,
/* 0x17 */ GID_BOMB_BAG_20,
/* 0x18 */ GID_BOMB_BAG_30,
/* 0x19 */ GID_BOMB_BAG_40,
/* 0x1A */ GID_STICK = 0x1A,
/* 0x1A */ GID_STICK,
/* 0x1B */ GID_DUNGEON_MAP,
/* 0x1E */ GID_BOMB = 0x1E,
/* 0x23 */ GID_ARROWS_SMALL = 0x23,
/* 0x1C */ GID_MAGIC_SMALL,
/* 0x1D */ GID_MAGIC_LARGE,
/* 0x1E */ GID_BOMB,
/* 0x1F */ GID_STONE_OF_AGONY,
/* 0x20 */ GID_WALLET_ADULT,
/* 0x21 */ GID_WALLET_GIANT,
/* 0x22 */ GID_MASK_DON_GERO,
/* 0x23 */ GID_ARROWS_SMALL,
/* 0x24 */ GID_ARROWS_MEDIUM,
/* 0x25 */ GID_ARROWS_LARGE,
/* 0x26 */ GID_BOMBCHU,
/* 0x27 */ GID_SHIELD_HERO,
/* 0x30 */ GID_POTION_GREEN = 0x30,
/* 0x28 */ GID_HOOKSHOT,
/* 0x29 */ GID_29,
/* 0x2A */ GID_OCARINA,
/* 0x2B */ GID_MILK,
/* 0x2C */ GID_MASK_KEATON,
/* 0x2D */ GID_TINGLE_MAP,
/* 0x2E */ GID_BOW,
/* 0x2F */ GID_LENS,
/* 0x30 */ GID_POTION_GREEN,
/* 0x31 */ GID_POTION_RED,
/* 0x32 */ GID_POTION_BLUE,
/* 0x33 */ GID_SHIELD_MIRROR,
/* 0x39 */ GID_39 = 0x39,
/* 0x3A */ GID_3A,
/* 0x34 */ GID_MAGIC_BEANS,
/* 0x35 */ GID_FISH,
/* 0x36 */ GID_LETTER_MAMA,
/* 0x37 */ GID_37,
/* 0x38 */ GID_SWORD_BGS,
/* 0x39 */ GID_MASK_SUN,
/* 0x3A */ GID_MASK_BLAST,
/* 0x3B */ GID_FAIRY,
/* 0x3E */ GID_3E = 0x3E,
/* 0x44 */ GID_44 = 0x44,
/* 0x45 */ GID_45,
/* 0x47 */ GID_47 = 0x47,
/* 0x4F */ GID_4F = 0x4F,
/* 0x50 */ GID_50,
/* 0x51 */ GID_51,
/* 0x53 */ GID_53 = 0x53,
/* 0x55 */ GID_SWORD_KOKIRI = 0x55,
/* 0x5B */ GID_MASK_DEKU = 0x5B,
/* 0x66 */ GID_SWORD_RAZOR = 0x66,
/* 0x3C */ GID_MASK_SCENTS,
/* 0x3D */ GID_MASK_CAPTAIN,
/* 0x3E */ GID_MASK_BUNNY,
/* 0x3F */ GID_MASK_TRUTH,
/* 0x40 */ GID_DEED_SWAMP,
/* 0x41 */ GID_DEED_MOUNTAIN,
/* 0x42 */ GID_RUPEE_HUGE,
/* 0x43 */ GID_DEED_OCEAN,
/* 0x44 */ GID_MASK_GORON,
/* 0x45 */ GID_MASK_ZORA,
/* 0x46 */ GID_46,
/* 0x47 */ GID_ARROW_FIRE,
/* 0x48 */ GID_ARROW_ICE,
/* 0x49 */ GID_ARROW_LIGHT,
/* 0x4A */ GID_SKULL_TOKEN,
/* 0x4B */ GID_BUG,
/* 0x4C */ GID_4C,
/* 0x4D */ GID_POE,
/* 0x4E */ GID_FAIRY_2,
/* 0x4F */ GID_RUPEE_GREEN,
/* 0x50 */ GID_RUPEE_BLUE,
/* 0x51 */ GID_RUPEE_RED,
/* 0x52 */ GID_BIG_POE,
/* 0x53 */ GID_RUPEE_PURPLE,
/* 0x54 */ GID_RUPEE_SILVER,
/* 0x55 */ GID_SWORD_KOKIRI,
/* 0x56 */ GID_SKULL_TOKEN_2,
/* 0x57 */ GID_57,
/* 0x58 */ GID_ZORA_EGG,
/* 0x59 */ GID_MOON_TEAR,
/* 0x5A */ GID_DEED_LAND,
/* 0x5B */ GID_MASK_DEKU,
/* 0x5C */ GID_REMAINS_ODOLWA,
/* 0x5D */ GID_POWDER_KEG,
/* 0x5E */ GID_GOLD_DUST,
/* 0x5F */ GID_SEAHORSE,
/* 0x60 */ GID_60,
/* 0x61 */ GID_HYLIAN_LOACH,
/* 0x62 */ GID_SEAHORSE_CAUGHT,
/* 0x63 */ GID_REMAINS_GOHT,
/* 0x64 */ GID_REMAINS_GYORG,
/* 0x65 */ GID_REMAINS_TWINMOLD,
/* 0x66 */ GID_SWORD_RAZOR,
/* 0x67 */ GID_SWORD_GILDED,
/* 0x68 */ GID_SWORD_GREAT_FAIRY,
/* 0x6A */ GID_MASK_GREAT_FAIRY = 0x6A,
/* 0x6B */ GID_6B,
/* 0x70 */ GID_70 = 0x70,
/* 0x71 */ GID_71
/* 0x69 */ GID_MASK_GARO,
/* 0x6A */ GID_MASK_GREAT_FAIRY,
/* 0x6B */ GID_MASK_GIBDO,
/* 0x6C */ GID_ROOM_KEY,
/* 0x6D */ GID_LETTER_TO_KAFEI,
/* 0x6E */ GID_PENDANT_OF_MEMORIES,
/* 0x6F */ GID_MUSHROOM,
/* 0x70 */ GID_MASK_ROMANI,
/* 0x71 */ GID_MASK_POSTMAN,
/* 0x72 */ GID_MASK_GIANT,
/* 0x73 */ GID_CHATEAU,
/* 0x74 */ GID_PICTO_BOX,
/* 0x75 */ GID_MASK_FIERCE_DEITY,
/* 0x76 */ GID_MAX
} GetItemDrawID;
// This enum may not be real, and actionparam is just used directly.
include/z64object.h
+1 -1
View File
@@ -207,7 +207,7 @@ typedef enum {
/* 0x0C3 */ OBJECT_GI_SHIELD_3,
/* 0x0C4 */ OBJECT_UNSET_C4,
/* 0x0C5 */ OBJECT_UNSET_C5,
/* 0x0C6 */ OBJECT_GI_MAGIC_BEANS,
/* 0x0C6 */ OBJECT_GI_BEAN,
/* 0x0C7 */ OBJECT_GI_FISH,
/* 0x0C8 */ OBJECT_UNSET_C8,
/* 0x0C9 */ OBJECT_UNSET_C9,
include/z64player.h
+2 -2
View File
@@ -98,7 +98,7 @@ typedef enum {
/* 0x19 */ PLAYER_AP_BOTTLE_ZORA_EGG,
/* 0x1A */ PLAYER_AP_BOTTLE_DEKU_PRINCESS,
/* 0x1B */ PLAYER_AP_BOTTLE_GOLD_DUST,
/* 0x1D */ PLAYER_AP_BOTTLE_SEA_HORSE = 0x1D,
/* 0x1D */ PLAYER_AP_BOTTLE_SEAHORSE = 0x1D,
/* 0x1E */ PLAYER_AP_BOTTLE_MUSHROOM,
/* 0x1F */ PLAYER_AP_BOTTLE_HYLIAN_LOACH,
/* 0x20 */ PLAYER_AP_BOTTLE_BUG,
@@ -120,7 +120,7 @@ typedef enum {
/* 0x30 */ PLAYER_AP_DEED_MOUNTAIN,
/* 0x31 */ PLAYER_AP_DEED_OCEAN,
/* 0x33 */ PLAYER_AP_LETTER_MAMA = 0x33,
/* 0x36 */ PLAYER_AP_PENDANT_MEMORIES = 0x36,
/* 0x36 */ PLAYER_AP_PENDANT_OF_MEMORIES = 0x36,
/* 0x3A */ PLAYER_AP_MASK_TRUTH = 0x3A,
/* 0x3B */ PLAYER_AP_MASK_KAFEIS_MASK,
/* 0x3C */ PLAYER_AP_MASK_ALL_NIGHT,