etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-11-21 19:45:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some small cleanup, And re-add generating the coop.map to the Makefile. (#36)

Browse source
This commit is contained in:
Prince Frizzy 2022-03-19 00:31:04 -04:00 committed by GitHub
parent 509db70385
commit 579fa40524
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -1045,6 +1045,12 @@ endif
#all: $(ROM) #all: $(ROM)
all: $(EXE) all: $(EXE)
ifeq ($(WINDOWS_BUILD),1)
exemap: $(EXE)
$(V)$(OBJDUMP) -t $(EXE) > $(BUILD_DIR)/coop.map
all: exemap
endif
ifeq ($(COMPARE),1) ifeq ($(COMPARE),1)
@$(PRINT) "$(GREEN)Checking if ROM matches.. $(NO_COL)\n" @$(PRINT) "$(GREEN)Checking if ROM matches.. $(NO_COL)\n"
@$(SHA1SUM) --quiet -c $(TARGET).sha1 && $(PRINT) "$(TARGET): $(GREEN)OK$(NO_COL)\n" || ($(PRINT) "$(YELLOW)Building the ROM file has succeeded, but does not match the original ROM.\nThis is expected, and not an error, if you are making modifications.\nTo silence this message, use 'make COMPARE=0.' $(NO_COL)\n" && false) @$(SHA1SUM) --quiet -c $(TARGET).sha1 && $(PRINT) "$(TARGET): $(GREEN)OK$(NO_COL)\n" || ($(PRINT) "$(YELLOW)Building the ROM file has succeeded, but does not match the original ROM.\nThis is expected, and not an error, if you are making modifications.\nTo silence this message, use 'make COMPARE=0.' $(NO_COL)\n" && false)

63
src/game/behaviors/treasure_chest.inc.c
View file

@ -19,42 +19,43 @@ void bhv_treasure_chest_top_loop(void) {
struct Object* sp34 = o->parentObj->parentObj; struct Object* sp34 = o->parentObj->parentObj;
switch (o->oAction) { switch (o->oAction) {
case 0: case 0:
if (o->parentObj->oAction == 1) if (o->parentObj->oAction == 1) {
o->oAction = 1; o->oAction = 1;
break;
case 1:
if (o->oTimer == 0) {
if (sp34->oTreasureChestUnkFC == 0) {
spawn_object_relative(0, 0, -80, 120, o, MODEL_BUBBLE, bhvWaterAirBubble);
play_sound(SOUND_GENERAL_CLAM_SHELL1, o->header.gfx.cameraToObject);
} }
else { break;
play_sound(SOUND_GENERAL_OPEN_CHEST, o->header.gfx.cameraToObject);
case 1:
if (o->oTimer == 0) {
if (sp34->oTreasureChestUnkFC == 0) {
spawn_object_relative(0, 0, -80, 120, o, MODEL_BUBBLE, bhvWaterAirBubble);
play_sound(SOUND_GENERAL_CLAM_SHELL1, o->header.gfx.cameraToObject);
} else {
play_sound(SOUND_GENERAL_OPEN_CHEST, o->header.gfx.cameraToObject);
}
} }
}
o->oFaceAnglePitch += -0x200; o->oFaceAnglePitch += -0x200;
if (o->oFaceAnglePitch < -0x4000) { if (o->oFaceAnglePitch < -0x4000) {
o->oFaceAnglePitch = -0x4000; o->oFaceAnglePitch = -0x4000;
o->oAction++; o->oAction++;
if (o->parentObj->oBehParams2ndByte != 4) if (o->parentObj->oBehParams2ndByte != 4)
spawn_orange_number(o->parentObj->oBehParams2ndByte, 0, -40, 0); spawn_orange_number(o->parentObj->oBehParams2ndByte, 0, -40, 0);
} }
break; break;
case 2: case 2:
if (o->parentObj->oAction == 0) if (o->parentObj->oAction == 0) {
o->oAction = 3; o->oAction = 3;
break; }
break;
case 3: case 3:
o->oFaceAnglePitch += 0x800; o->oFaceAnglePitch += 0x800;
if (o->oFaceAnglePitch > 0) { if (o->oFaceAnglePitch > 0) {
o->oFaceAnglePitch = 0; o->oFaceAnglePitch = 0;
o->oAction = 0; o->oAction = 0;
} }
} }
} }