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

Import Data

Browse Source
This commit is contained in:
engineer124
2022-04-19 19:59:37 +10:00
parent ad42edb034
commit f07dc046f7
49 changed files with 1138 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/tutorial/advanced_control_flow.md
+9 -9
View File
@@ -199,7 +199,7 @@ void func_809527F8(EnMs *this, GlobalContext *globalCtx) {
}
func_8019F208();
Actor_PickUp((Actor *) this, globalCtx, 0x35, 90.0f, 10.0f);
func_801159EC(-0xA);
Rupees_ChangeBy(-0xA);
this->actionFunc = func_809529AC;
}
}
@@ -291,7 +291,7 @@ block_13:
block_15:
func_8019F208();
Actor_PickUp((Actor *) this, globalCtx, 0x35, 90.0f, 10.0f);
func_801159EC(-0xA);
Rupees_ChangeBy(-0xA);
this->actionFunc = func_809529AC;
return;
block_16:
@@ -391,7 +391,7 @@ block_11:
func_8019F208();
Actor_PickUp((Actor *) this, globalCtx, 0x35, 90.0f, 10.0f);
func_801159EC(-0xA);
Rupees_ChangeBy(-0xA);
this->actionFunc = func_809529AC;
return;
block_16:
@@ -461,7 +461,7 @@ block_11:
func_8019F208();
Actor_PickUp((Actor *) this, globalCtx, 0x35, 90.0f, 10.0f);
func_801159EC(-0xA);
Rupees_ChangeBy(-0xA);
this->actionFunc = func_809529AC;
return;
block_16:
@@ -510,7 +510,7 @@ So let us rewrite the entire second half as a switch:
func_8019F208();
Actor_PickUp((Actor *) this, globalCtx, 0x35, 90.0f, 10.0f);
func_801159EC(-0xA);
Rupees_ChangeBy(-0xA);
this->actionFunc = func_809529AC;
return;
break;
@@ -541,7 +541,7 @@ There's a couple of other obvious things here:
} else {
func_8019F208();
Actor_PickUp((Actor *) this, globalCtx, 0x35, 90.0f, 10.0f);
func_801159EC(-0xA);
Rupees_ChangeBy(-0xA);
this->actionFunc = func_809529AC;
}
break;
@@ -606,7 +606,7 @@ block_7:
} else {
func_8019F208();
Actor_PickUp((Actor *) this, globalCtx, 0x35, 90.0f, 10.0f);
func_801159EC(-0xA);
Rupees_ChangeBy(-0xA);
this->actionFunc = func_809529AC;
}
break;
@@ -670,7 +670,7 @@ void func_809527F8(EnMs *this, GlobalContext *globalCtx) {
} else {
func_8019F208();
Actor_PickUp((Actor *) this, globalCtx, 0x35, 90.0f, 10.0f);
func_801159EC(-0xA);
Rupees_ChangeBy(-0xA);
this->actionFunc = func_809529AC;
}
break;
@@ -722,7 +722,7 @@ void func_809527F8(EnMs *this, GlobalContext *globalCtx) {
} else {
func_8019F208();
Actor_PickUp((Actor *) this, globalCtx, 0x35, 90.0f, 10.0f);
func_801159EC(-0xA);
Rupees_ChangeBy(-0xA);
this->actionFunc = func_809529AC;
}
break;
include/color.h
+6
View File
@@ -35,6 +35,12 @@ typedef struct {
u32 r, g, b, a;
} Color_RGBAu32;
typedef struct {
/* 0x0 */ s16 r;
/* 0x1 */ s16 g;
/* 0x2 */ s16 b;
} Color_RGB16; // size = 0x6
typedef union {
struct {
u16 r : 5;
include/functions.h
+19 -19
View File
@@ -1910,32 +1910,32 @@ void Interface_ChangeAlpha(u16 param_1);
// void func_80111CB4(void);
// void func_801129E4(void);
void func_80112AFC(GlobalContext* globalCtx);
void func_80112B40(GlobalContext* globalCtx, u8 arg1);
// void func_80112BE4(void);
void Interface_LoadItemIconImpl(GlobalContext* globalCtx, u8 arg1);
// void Interface_LoadItemIcon(void);
// void func_80112C0C(void);
u32 Item_Give(GlobalContext* globalCtx, u8 param_2);
// void func_801143CC(void);
UNK_TYPE func_80114978(UNK_TYPE arg0);
void func_801149A0(s32 itemId, s16 slotId);
// void func_80114A9C(void);
// void func_80114B84(void);
// void func_80114CA0(void);
s32 Interface_HasEmptyBottle(void);
s32 Interface_HasItemInBottle(u8 itemId);
// void func_80114FD0(void);
// void func_80115130(void);
// void func_801152B8(void);
u8 Item_Give(GlobalContext* globalCtx, u8 item);
// void Item_CheckObtainabilityImpl(void);
UNK_TYPE Item_CheckObtainability(UNK_TYPE arg0);
void Inventory_DeleteItem(s32 itemId, s16 slotId);
// void Inventory_UnequipItem(void);
// void Inventory_ReplaceItem(void);
// void Inventory_UpdateDeitySwordEquip(void);
s32 Inventory_HasEmptyBottle(void);
s32 Inventory_HasItemInBottle(u8 itemId);
// void Inventory_UpdateBottleItem(void);
// void Inventory_ConsumeFairy(void);
// void Inventory_UpdateItem(void);
// void func_801153C8(void);
// void func_80115428(void);
void func_8011552C(GlobalContext* globalCtx, s16 arg1);
// void func_801155B4(void);
// void func_80115764(void);
void func_80115844(GlobalContext* globalCtx, s16 param_2);
s32 func_80115908(GlobalContext* globalCtx, u8 param_2);
void func_801159c0(s16 param_1);
void func_801159EC(s16 arg0);
void func_80115A14(s16 arg0, s16 arg1);
void Parameter_AddMagic(GlobalContext* globalCtx, s16 arg1);
s32 Health_ChangeBy(GlobalContext* globalCtx, u8 param_2);
void Health_GiveHearts(s16 param_1);
void Rupees_ChangeBy(s16 arg0);
void Inventory_ChangeAmmo(s16 arg0, s16 arg1);
void Interface_AddMagic(GlobalContext* globalCtx, s16 arg1);
void func_80115D5C(GameState* gamestate);
// void func_80115DB4(void);
// void func_80116088(void);
include/macros.h
+19 -8
View File
@@ -81,21 +81,32 @@
#define C_SLOT_EQUIP(form, button) (gSaveContext.save.equips.cButtonSlots[form][button])
#define CHECK_QUEST_ITEM(item) (GET_SAVE_INVENTORY_QUEST_ITEMS & gBitFlags[item])
#define SET_QUEST_ITEM(item) (gSaveContext.save.inventory.questItems = (GET_SAVE_INVENTORY_QUEST_ITEMS | gBitFlags[item]))
#define REMOVE_QUEST_ITEM(item) (gSaveContext.save.inventory.questItems = (GET_SAVE_INVENTORY_QUEST_ITEMS & (-1 - gBitFlags[item])))
#define CHECK_DUNGEON_ITEM(item, dungeonIndex) (gSaveContext.save.inventory.dungeonItems[(void)0, dungeonIndex] & gBitFlags[item])
#define SET_DUNGEON_ITEM(item, dungeonIndex) (gSaveContext.save.inventory.dungeonItems[(void)0, dungeonIndex] |= (u8)gBitFlags[item])
#define DUNGEON_KEY_COUNT(dungeonIndex) (gSaveContext.save.inventory.dungeonKeys[(void)0, dungeonIndex])
#define GET_CUR_FORM_BTN_ITEM(btn) ((u8)((btn) == EQUIP_SLOT_B ? BUTTON_ITEM_EQUIP(CUR_FORM, btn) : BUTTON_ITEM_EQUIP(0, btn)))
#define GET_CUR_FORM_BTN_SLOT(btn) ((u8)((btn) == EQUIP_SLOT_B ? C_SLOT_EQUIP(CUR_FORM, btn) : C_SLOT_EQUIP(0, btn)))
#define SET_CUR_FORM_BTN_ITEM(btn, item) \
do { \
if ((btn) == EQUIP_SLOT_B) { \
BUTTON_ITEM_EQUIP(CUR_FORM, (btn)) = (item); \
} else { \
BUTTON_ITEM_EQUIP(0, (btn)) = (item); \
} \
} while (0)
#define SET_CUR_FORM_BTN_ITEM(btn, item) \
if ((btn) == EQUIP_SLOT_B) { \
BUTTON_ITEM_EQUIP(CUR_FORM, (btn)) = (item); \
} else { \
BUTTON_ITEM_EQUIP(0, (btn)) = (item); \
} \
(void)0
#define SET_CUR_FORM_BTN_SLOT(btn, item) \
if ((btn) == EQUIP_SLOT_B) { \
C_SLOT_EQUIP(CUR_FORM, (btn)) = (item); \
} else { \
C_SLOT_EQUIP(0, (btn)) = (item); \
} \
(void)0
#define STOLEN_ITEM_NONE (0)
include/z64item.h
+6 -3
View File
@@ -41,9 +41,12 @@ typedef enum {
/* 0x0F */ QUEST_SONG_SOARING,
/* 0x10 */ QUEST_SONG_STORMS,
/* 0x11 */ QUEST_SONG_SUN,
/* 0x12 */ QUEST_BOMBERS_NOTEBOOK,
/* 0x12 */ QUEST_BOMBERS_NOTEBOOK, // Obtained Bombers Notebook
/* 0x13 */ QUEST_SKULL_TOKEN,
/* 0x18 */ QUEST_SONG_LULLABY_INTRO = 0x18,
/* 0x19 */ QUEST_UNK_19 // Related to PictoBox
/* 0x19 */ QUEST_PICTOBOX, // Photo taken from PictoBox
/* 0x1C */ QUEST_HEART_PIECE = 0x1C,
/* 0x1E */ QUEST_HEART_CONTAINER = 0x1E
} QuestItem;
typedef enum {
@@ -109,7 +112,7 @@ typedef enum {
/* 0x07 */ ITEM_BOMBCHU,
/* 0x08 */ ITEM_STICK,
/* 0x09 */ ITEM_NUT,
/* 0x0A */ ITEM_MAGIC_BEANS,
/* 0x0A */ ITEM_BEAN,
/* 0x0B */ ITEM_SLINGSHOT,
/* 0x0C */ ITEM_POWDER_KEG,
/* 0x0D */ ITEM_PICTO_BOX,
spec
-2
View File
@@ -500,8 +500,6 @@ beginseg
include "build/src/code/z_olib.o"
pad_text
include "build/src/code/z_parameter.o"
include "build/data/code/z_parameter.data.o"
include "build/data/code/z_parameter.bss.o"
include "build/src/code/z_path.o"
include "build/src/code/z_pause.o"
include "build/src/code/z_player_lib.o"
src/boot_O2_g3/yaz0.c
-1
View File
@@ -1,4 +1,3 @@
#include "prevent_bss_reordering.h"
#include "global.h"
u8 sYaz0DataBuffer[0x400];
src/code/code_8012EC80.c
+3 -3
View File
@@ -107,7 +107,7 @@ void* gItemIcons[] = {
0x08007000, // ITEM_BOMBCHU
0x08008000, // ITEM_STICK
0x08009000, // ITEM_NUT
0x0800A000, // ITEM_MAGIC_BEANS
0x0800A000, // ITEM_BEAN
0x0800B000, // ITEM_SLINGSHOT
0x0800C000, // ITEM_POWDER_KEG
0x0800D000, // ITEM_PICTO_BOX
@@ -242,7 +242,7 @@ u8 gItemSlots[] = {
SLOT_BOMBCHU, // ITEM_BOMBCHU
SLOT_STICK, // ITEM_STICK
SLOT_NUT, // ITEM_NUT
SLOT_MAGIC_BEANS, // ITEM_MAGIC_BEANS
SLOT_MAGIC_BEANS, // ITEM_BEAN
SLOT_TRADE_KEY_MAMA, // ITEM_SLINGSHOT
SLOT_POWDER_KEG, // ITEM_POWDER_KEG
SLOT_PICTO_BOX, // ITEM_PICTO_BOX
@@ -322,7 +322,7 @@ s16 gItemPrices[] = {
0, // ITEM_BOMBCHU
0, // ITEM_STICK
0, // ITEM_NUT
0, // ITEM_MAGIC_BEANS
0, // ITEM_BEAN
0, // ITEM_SLINGSHOT
0, // ITEM_POWDER_KEG
0, // ITEM_PICTO_BOX
src/code/z_en_item00.c
+2 -2
View File
@@ -224,7 +224,7 @@ void EnItem00_Init(Actor* thisx, GlobalContext* globalCtx) {
break;
case ITEM00_FLEXIBLE:
case ITEM00_BIG_FAIRY:
func_80115908(globalCtx, 0x70);
Health_ChangeBy(globalCtx, 0x70);
break;
case ITEM00_BOMBS_A:
case ITEM00_BOMBS_B:
@@ -537,7 +537,7 @@ void EnItem00_Update(Actor* thisx, GlobalContext* globalCtx) {
break;
case ITEM00_FLEXIBLE:
case ITEM00_BIG_FAIRY:
func_80115908(globalCtx, 0x70);
Health_ChangeBy(globalCtx, 0x70);
break;
case ITEM00_BOMBS_A:
case ITEM00_BOMBS_B:
src/code/z_parameter.c
+877 -19
View File
File diff suppressed because it is too large Load Diff
src/code/z_sram_NES.c
+11 -11
View File
@@ -149,9 +149,9 @@ s32 D_801C6798[] = {
};
u8 D_801C67B0[24] = {
ITEM_NONE, ITEM_BOW, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_BOMB, ITEM_BOMBCHU,
ITEM_STICK, ITEM_NUT, ITEM_MAGIC_BEANS, ITEM_NONE, ITEM_POWDER_KEG, ITEM_PICTO_BOX, ITEM_NONE, ITEM_NONE,
ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE,
ITEM_NONE, ITEM_BOW, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_BOMB, ITEM_BOMBCHU,
ITEM_STICK, ITEM_NUT, ITEM_BEAN, ITEM_NONE, ITEM_POWDER_KEG, ITEM_PICTO_BOX, ITEM_NONE, ITEM_NONE,
ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE,
};
s32 D_801C67C8[] = { 0, 0x40, 0x80, 0xC0, 0x100, 0x180, 0x200, 0x280 };
@@ -276,7 +276,7 @@ void Sram_SaveEndOfCycle(GlobalContext* globalCtx) {
}
if (gSaveContext.save.weekEventReg[84] & 0x20) {
func_801149A0(ITEM_MASK_FIERCE_DEITY, SLOT(ITEM_MASK_FIERCE_DEITY));
Inventory_DeleteItem(ITEM_MASK_FIERCE_DEITY, SLOT(ITEM_MASK_FIERCE_DEITY));
}
for (i = 0; i < ARRAY_COUNT(D_801C66D0); i++) {
@@ -346,7 +346,7 @@ void Sram_SaveEndOfCycle(GlobalContext* globalCtx) {
for (j = 1; j < 4; j++) {
if (GET_CUR_FORM_BTN_ITEM(j) == gSaveContext.save.inventory.items[i]) {
SET_CUR_FORM_BTN_ITEM(j, ITEM_BOTTLE);
func_80112B40(globalCtx, j);
Interface_LoadItemIconImpl(globalCtx, j);
}
}
gSaveContext.save.inventory.items[i] = ITEM_BOTTLE;
@@ -354,7 +354,7 @@ void Sram_SaveEndOfCycle(GlobalContext* globalCtx) {
}
}
REMOVE_QUEST_ITEM(QUEST_UNK_19);
REMOVE_QUEST_ITEM(QUEST_PICTOBOX);
if (gSaveContext.save.playerData.health < 0x30) {
gSaveContext.save.playerData.health = 0x30;
@@ -408,14 +408,14 @@ void Sram_SaveEndOfCycle(GlobalContext* globalCtx) {
SET_STOLEN_ITEM_2(STOLEN_ITEM_NONE);
// ??
func_801149A0(ITEM_OCARINA_FAIRY, SLOT_TRADE_DEED);
func_801149A0(ITEM_SLINGSHOT, SLOT_TRADE_KEY_MAMA);
func_801149A0(ITEM_LONGSHOT, SLOT_TRADE_COUPLE);
Inventory_DeleteItem(ITEM_OCARINA_FAIRY, SLOT_TRADE_DEED);
Inventory_DeleteItem(ITEM_SLINGSHOT, SLOT_TRADE_KEY_MAMA);
Inventory_DeleteItem(ITEM_LONGSHOT, SLOT_TRADE_COUPLE);
for (j = 1; j < 4; j++) {
if (GET_CUR_FORM_BTN_ITEM(j) >= ITEM_MOON_TEAR && GET_CUR_FORM_BTN_ITEM(j) <= ITEM_PENDANT_MEMORIES) {
SET_CUR_FORM_BTN_ITEM(j, ITEM_NONE);
func_80112B40(globalCtx, j);
Interface_LoadItemIconImpl(globalCtx, j);
}
}
@@ -718,7 +718,7 @@ Inventory sSaveDebugInventory = {
ITEM_BOMBCHU,
ITEM_STICK,
ITEM_NUT,
ITEM_MAGIC_BEANS,
ITEM_BEAN,
ITEM_ROOM_KEY,
ITEM_POWDER_KEG,
ITEM_PICTO_BOX,
src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c
+6 -6
View File
@@ -230,7 +230,7 @@ s32 func_80BECFBC(EnAkindonuts* this) {
return 0x9A;
case 3:
func_801149A0(ITEM_DEED_OCEAN, SLOT(ITEM_DEED_OCEAN));
Inventory_DeleteItem(ITEM_DEED_OCEAN, SLOT(ITEM_DEED_OCEAN));
return 0x7;
}
return 0;
@@ -296,7 +296,7 @@ s32 func_80BED140(GlobalContext* globalCtx) {
}
s32 func_80BED208(EnAkindonuts* this) {
if (INV_CONTENT(ITEM_MAGIC_BEANS) != 10U) {
if (INV_CONTENT(ITEM_BEAN) != 10U) {
return 0;
}
@@ -304,7 +304,7 @@ s32 func_80BED208(EnAkindonuts* this) {
return 1;
}
if (AMMO(ITEM_MAGIC_BEANS) >= 20) {
if (AMMO(ITEM_BEAN) >= 20) {
return 2;
}
@@ -332,7 +332,7 @@ s32 func_80BED27C(EnAkindonuts* this) {
}
s32 func_80BED2FC(EnAkindonuts* this) {
if (!Interface_HasEmptyBottle()) {
if (!Inventory_HasEmptyBottle()) {
return 2;
}
@@ -346,7 +346,7 @@ s32 func_80BED2FC(EnAkindonuts* this) {
}
s32 func_80BED35C(EnAkindonuts* this) {
if (!Interface_HasEmptyBottle()) {
if (!Inventory_HasEmptyBottle()) {
return 2;
}
@@ -1326,7 +1326,7 @@ void func_80BEF360(EnAkindonuts* this, GlobalContext* globalCtx) {
if (this->unk_32C & 0x40) {
if (Actor_HasParent(&this->actor, globalCtx)) {
this->actor.parent = NULL;
func_801159EC(this->unk_364);
Rupees_ChangeBy(this->unk_364);
this->unk_32C &= ~0x40;
this->actionFunc = func_80BEF450;
} else {
src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c
+4 -4
View File
@@ -394,7 +394,7 @@ void func_809C16DC(EnAob01* this, GlobalContext* globalCtx) {
case 0x3529:
if (this->unk_2D2 & 2) {
this->unk_2D2 &= ~2;
func_801159EC(-this->unk_434);
Rupees_ChangeBy(-this->unk_434);
func_800B7298(globalCtx, NULL, 7);
globalCtx->msgCtx.msgMode = 0x43;
globalCtx->msgCtx.unk12023 = 4;
@@ -710,7 +710,7 @@ void func_809C28B8(EnAob01* this, GlobalContext* globalCtx) {
this->unk_210 = 0x352A;
this->unk_2D2 |= 0x80;
this->unk_434 *= 3;
func_801159EC(this->unk_434);
Rupees_ChangeBy(this->unk_434);
globalCtx->msgCtx.bankRupees = this->unk_434;
break;
@@ -718,7 +718,7 @@ void func_809C28B8(EnAob01* this, GlobalContext* globalCtx) {
this->unk_210 = 0x352B;
this->unk_2D2 |= 0x80;
this->unk_434 *= 2;
func_801159EC(this->unk_434);
Rupees_ChangeBy(this->unk_434);
globalCtx->msgCtx.bankRupees = this->unk_434;
break;
@@ -726,7 +726,7 @@ void func_809C28B8(EnAob01* this, GlobalContext* globalCtx) {
case 4:
case 5:
this->unk_210 = 0x352C;
func_801159EC(this->unk_434);
Rupees_ChangeBy(this->unk_434);
break;
default:
src/overlays/actors/ovl_En_Cow/z_en_cow.c
+2 -2
View File
@@ -234,7 +234,7 @@ void EnCow_GiveMilk(EnCow* this, GlobalContext* globalCtx) {
void EnCow_CheckForEmptyBottle(EnCow* this, GlobalContext* globalCtx) {
if ((Message_GetState(&globalCtx->msgCtx) == 5) && Message_ShouldAdvance(globalCtx)) {
if (Interface_HasEmptyBottle()) {
if (Inventory_HasEmptyBottle()) {
func_80151938(globalCtx, 0x32C9); // Text to give milk.
this->actionFunc = EnCow_GiveMilk;
} else {
@@ -291,7 +291,7 @@ void EnCow_Idle(EnCow* this, GlobalContext* globalCtx) {
if (func_801A5100() == 4) {
if (!(gSaveContext.save.weekEventReg[87] & 1)) {
gSaveContext.save.weekEventReg[87] |= 1;
if (Interface_HasEmptyBottle()) {
if (Inventory_HasEmptyBottle()) {
this->actor.textId = 0x32C9; // Text to give milk.
} else {
this->actor.textId = 0x32CA; // Text if you don't have an empty bottle.
src/overlays/actors/ovl_En_Dnp/z_en_dnp.c
+1 -1
View File
@@ -365,7 +365,7 @@ void EnDnp_Init(Actor* thisx, GlobalContext* globalCtx) {
this->actor.world.rot.x = this->actor.shape.rot.x;
this->actor.cutscene = 0x10;
this->actionFunc = func_80B3D47C;
} else if (((ENDNP_GET_7(&this->actor) == ENDNP_GET_7_0) && !Interface_HasItemInBottle(ITEM_DEKU_PRINCESS) &&
} else if (((ENDNP_GET_7(&this->actor) == ENDNP_GET_7_0) && !Inventory_HasItemInBottle(ITEM_DEKU_PRINCESS) &&
!(gSaveContext.save.weekEventReg[23] & 0x20)) ||
((ENDNP_GET_7(&this->actor) == ENDNP_GET_7_2) && (gSaveContext.save.weekEventReg[23] & 0x20))) {
Actor_SetScale(&this->actor, 0.0085f);
src/overlays/actors/ovl_En_Dnq/z_en_dnq.c
+1 -1
View File
@@ -342,7 +342,7 @@ void func_80A52DC8(EnDnq* this, GlobalContext* globalCtx) {
if (!(gSaveContext.save.weekEventReg[23] & 0x20)) {
this->unk_390 = 70.0f;
if (Interface_HasItemInBottle(ITEM_DEKU_PRINCESS) && !Play_InCsMode(globalCtx) &&
if (Inventory_HasItemInBottle(ITEM_DEKU_PRINCESS) && !Play_InCsMode(globalCtx) &&
(Message_GetState(&globalCtx->msgCtx) == 0) && (ActorCutscene_GetCurrentIndex() == -1)) {
if ((DECR(this->unk_384) == 0) && (gSaveContext.save.weekEventReg[29] & 0x40)) {
Message_StartTextbox(globalCtx, 0x969, NULL);
src/overlays/actors/ovl_En_Elf/z_en_elf.c
+2 -2
View File
@@ -673,9 +673,9 @@ void func_8088DD34(EnElf* this, GlobalContext* globalCtx) {
if ((this->fairyFlags & 0x1000) && (heightDiff > 0.0f) && (heightDiff < 60.0f) &&
!func_8088C804(&this->actor.world.pos, &refActor->actor.world.pos, 10.0f)) {
func_80115908(globalCtx, 0x80);
Health_ChangeBy(globalCtx, 0x80);
if (this->fairyFlags & 0x200) {
Parameter_AddMagic(globalCtx, ((void)0, gSaveContext.unk_3F30) +
Interface_AddMagic(globalCtx, ((void)0, gSaveContext.unk_3F30) +
(gSaveContext.save.playerData.doubleMagic * 0x30) + 0x30);
}
gSaveContext.jinxTimer = 0;
src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c
+1 -1
View File
@@ -481,7 +481,7 @@ void func_80A3A610(EnElfgrp* this, GlobalContext* globalCtx) {
Player* player = GET_PLAYER(globalCtx);
if (this->unk_144 == 60) {
Parameter_AddMagic(globalCtx,
Interface_AddMagic(globalCtx,
((void)0, gSaveContext.unk_3F30) + (gSaveContext.save.playerData.doubleMagic * 0x30) + 0x30);
gSaveContext.healthAccumulator = 320;
}
src/overlays/actors/ovl_En_Elforg/z_en_elforg.c
+1 -1
View File
@@ -440,7 +440,7 @@ void EnElforg_FreeFloating(EnElforg* this, GlobalContext* globalCtx) {
if (!Player_InCsMode(&globalCtx->state)) {
if ((this->actor.xzDistToPlayer < 30.0f) && (scaledYDistance < 12.0f) && (scaledYDistance > -68.0f)) {
EnElforg_SetupFairyCollected(this, globalCtx);
func_80115908(globalCtx, 48);
Health_ChangeBy(globalCtx, 48);
switch (STRAY_FAIRY_TYPE(&this->actor)) {
case STRAY_FAIRY_TYPE_COLLECTIBLE:
Flags_SetCollectible(globalCtx, STRAY_FAIRY_FLAG(&this->actor));
src/overlays/actors/ovl_En_Fishing/z_en_fishing.c
+2 -2
View File
@@ -1130,7 +1130,7 @@ void EnFishing_UpdateEffects(FishingEffect* effect, GlobalContext* globalCtx) {
if ((effect->unk_2C >= 100) && (Message_GetState(&globalCtx->msgCtx) == 5)) {
if (Message_ShouldAdvance(globalCtx) || Message_GetState(&globalCtx->msgCtx) == 0) {
func_801477B4(globalCtx);
func_801159EC(-50);
Rupees_ChangeBy(-50);
effect->unk_2C = -1;
}
}
@@ -4729,7 +4729,7 @@ void EnFishing_HandleOwnerDialog(EnFishing* this, GlobalContext* globalCtx) {
switch (globalCtx->msgCtx.choiceIndex) {
case 0:
if (gSaveContext.save.playerData.rupees >= 20) {
func_801159EC(-20);
Rupees_ChangeBy(-20);
if (func_8013EE04() == 0) {
this->actor.textId = 0x407C;
} else {

Some files were not shown because too many files have changed in this diff Show More