Skip to content

Commit 56d5a30

Browse files
Mico27Mico27
committed
Change log:
- Fixed (for real this time) screen locking in 15-1 - Fixed beanstalk tiles leaving an extra tile in the tilemap VRAM which could be still accessed and softlock when climbing it (example sprouting the beanstalk in 4-2 and walk further on the top of the screen to reach the rogue tile) - Made some adjustments to stomping hitboxes for bigger enemies (Wario, Banzai Bill and Big Bertha)
1 parent 93372f0 commit 56d5a30

16 files changed

Lines changed: 101 additions & 100 deletions

File tree

‎assets/sprites/effects.png.gbsres‎

Lines changed: 1 addition & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -5307,19 +5307,6 @@
53075307
{
53085308
"id": "44fff4a8-cbc1-4eac-9062-950599686aa3",
53095309
"tiles": [
5310-
{
5311-
"id": "86bb89d7-cc7e-4758-a230-c8b1e43d172d",
5312-
"x": 0,
5313-
"y": 2,
5314-
"sliceX": 104,
5315-
"sliceY": 0,
5316-
"palette": 0,
5317-
"flipX": false,
5318-
"flipY": false,
5319-
"objPalette": "OBP0",
5320-
"paletteIndex": 4,
5321-
"priority": false
5322-
},
53235310
{
53245311
"id": "7f00d10a-c163-4d54-b077-a161c500851d",
53255312
"x": 0,
@@ -5338,19 +5325,6 @@
53385325
{
53395326
"id": "1dd37c6f-8c39-4368-9cd1-ecd7d7e76c06",
53405327
"tiles": [
5341-
{
5342-
"id": "b15a99b1-3164-4a36-8f24-9d4b4a059b9d",
5343-
"x": 0,
5344-
"y": 4,
5345-
"sliceX": 104,
5346-
"sliceY": 0,
5347-
"palette": 0,
5348-
"flipX": false,
5349-
"flipY": false,
5350-
"objPalette": "OBP0",
5351-
"paletteIndex": 4,
5352-
"priority": false
5353-
},
53545328
{
53555329
"id": "493283f1-5958-40b8-b5a7-9e974e5d340d",
53565330
"x": 0,
@@ -5369,19 +5343,6 @@
53695343
{
53705344
"id": "d271947d-a249-482f-a6e9-b967f56bbc5a",
53715345
"tiles": [
5372-
{
5373-
"id": "28a83a32-ed0b-40c6-acac-278db05d218a",
5374-
"x": 0,
5375-
"y": 6,
5376-
"sliceX": 104,
5377-
"sliceY": 0,
5378-
"palette": 0,
5379-
"flipX": false,
5380-
"flipY": false,
5381-
"objPalette": "OBP0",
5382-
"paletteIndex": 4,
5383-
"priority": false
5384-
},
53855346
{
53865347
"id": "06d61f01-7d4d-447f-987e-ffc909c7f85d",
53875348
"x": 0,
@@ -5400,19 +5361,6 @@
54005361
{
54015362
"id": "accd295b-c129-45d2-8763-92ccee250ddb",
54025363
"tiles": [
5403-
{
5404-
"id": "914adfa8-2078-4a12-9877-9887363cbb06",
5405-
"x": 0,
5406-
"y": 8,
5407-
"sliceX": 104,
5408-
"sliceY": 0,
5409-
"palette": 0,
5410-
"flipX": false,
5411-
"flipY": false,
5412-
"objPalette": "OBP0",
5413-
"paletteIndex": 4,
5414-
"priority": false
5415-
},
54165364
{
54175365
"id": "383488bf-01f3-4128-a4cb-8995ef8c37b6",
54185366
"x": 0,
@@ -5510,7 +5458,7 @@
55105458
{
55115459
"id": "2ef6ed99-04ec-4c95-9050-22b18373fa4a",
55125460
"x": 0,
5513-
"y": 8,
5461+
"y": 0,
55145462
"sliceX": 104,
55155463
"sliceY": 0,
55165464
"palette": 0,

‎plugins/actorBehaviorPlugin/engine/src/actor_behavior.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,6 @@ void actor_behavior_update(void) BANKED {
681681
actor_states[i] = 1;
682682
actor->pos.y = (actor->pos.y >> 7) << 7;
683683
actor->pos.x = (actor->pos.x >> 7) << 7;
684-
replace_meta_tile((actor->pos.x >> 7), (actor->pos.y >> 7) - 1, 151);
685684
}
686685
break;
687686
case 1: //Move up state
@@ -694,10 +693,11 @@ void actor_behavior_update(void) BANKED {
694693
actor->pos.y = actor->pos.y - 8;
695694
actor_counter_a[i] = actor_counter_a[i] + 1;
696695
if (actor_counter_a[i] > 15){
697-
actor_counter_a[i] = 0;
698-
replace_meta_tile((actor->pos.x >> 7), (actor->pos.y >> 7) - 1, 151);
699-
if (tile_at((actor->pos.x >> 7), (actor->pos.y >> 7) - 2) & COLLISION_BOTTOM) {
696+
actor_counter_a[i] = 0;
697+
if (tile_at((actor->pos.x >> 7), (actor->pos.y >> 7)) & COLLISION_BOTTOM) {
700698
actor_states[i] = 255;
699+
} else {
700+
replace_meta_tile((actor->pos.x >> 7), (actor->pos.y >> 7), 151);
701701
}
702702
}
703703
}

‎project/prefabs/actors/banzaibill.gbsres‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
"args": {
147147
"condition": {
148148
"type": "expression",
149-
"value": "$20$ == 1 || $01$ < ($28$ - 8)"
149+
"value": "$20$ == 1 || $01$ < ($28$ - 24)"
150150
},
151151
"__collapseElse": false,
152152
"__collapse": false

‎project/prefabs/actors/bigjumpingcheepcheep.gbsres‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
"args": {
147147
"condition": {
148148
"type": "expression",
149-
"value": "$20$ == 1 || $01$ < ($28$ - 8)"
149+
"value": "$20$ == 1 || $01$ < ($28$ - 16)"
150150
},
151151
"__collapseElse": false,
152152
"__collapse": false

‎project/prefabs/actors/wario.gbsres‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182
"args": {
183183
"condition": {
184184
"type": "expression",
185-
"value": "$20$ == 1 || $01$ < ($28$ - 8)"
185+
"value": "$20$ == 1 || $01$ < ($28$ - 16)"
186186
},
187187
"__collapseElse": false,
188188
"__collapse": false
@@ -643,7 +643,7 @@
643643
}
644644
},
645645
"__collapseElse": false,
646-
"__collapse": true
646+
"__collapse": false
647647
},
648648
"children": {
649649
"true": [

‎project/scenes/13-2/actors/cloudplatform_3.gbsres‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@
2222
"hit2Script": [],
2323
"hit3Script": [],
2424
"x": 90,
25-
"y": 12,
25+
"y": 10,
2626
"_index": 7
2727
}

‎project/scenes/15-1/triggers/trigger_10.gbsres‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"y": 0,
88
"symbol": "trigger_451",
99
"prefabScriptOverrides": {},
10-
"width": 1,
10+
"width": 5,
1111
"height": 18,
1212
"script": [
1313
{

‎project/scenes/15-1/triggers/trigger_13.gbsres‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"id": "f0f2a5b2-a5b2-4bc8-ac6f-008e0eded1c0",
44
"name": "",
55
"prefabId": "",
6-
"x": 100,
6+
"x": 102,
77
"y": 14,
88
"symbol": "trigger_349",
99
"prefabScriptOverrides": {},

‎project/scenes/15-1/triggers/trigger_3.gbsres‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,22 @@
5656
"type": "number",
5757
"value": 0
5858
},
59-
"speed": 2
59+
"speed": 2,
60+
"__collapse": true
6061
},
6162
"id": "50fb5d40-cae1-4ceb-8630-9bfae612ea5a"
63+
},
64+
{
65+
"command": "EVENT_SET_VALUE",
66+
"args": {
67+
"variable": "64",
68+
"value": {
69+
"type": "number",
70+
"value": 1
71+
},
72+
"__collapse": true
73+
},
74+
"id": "75fb62c7-bcbe-4f6d-add5-87ac3b4b065f"
6275
}
6376
],
6477
"false": []

‎project/scenes/15-1/triggers/trigger_4.gbsres‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"y": 0,
88
"symbol": "trigger_445",
99
"prefabScriptOverrides": {},
10-
"width": 1,
10+
"width": 5,
1111
"height": 18,
1212
"script": [
1313
{
@@ -41,14 +41,15 @@
4141
"type": "number",
4242
"value": 2
4343
},
44-
"__collapse": false
44+
"__collapse": true
4545
},
4646
"id": "94c00961-fed6-4c9c-a7f6-a6efd801ab8f"
4747
},
4848
{
4949
"command": "EVENT_GBVM_SCRIPT",
5050
"args": {
51-
"script": "VM_INVOKE b_vm_camera_move_to_player, _vm_camera_move_to_player, 0, 0"
51+
"script": "VM_INVOKE b_vm_camera_move_to_player, _vm_camera_move_to_player, 0, 0",
52+
"__collapse": true
5253
},
5354
"id": "83de3602-21d0-4e61-97aa-9cb695876a70"
5455
}

0 commit comments

Comments
 (0)