diff --git a/assets/xml/objects/gameplay_keep.xml b/assets/xml/objects/gameplay_keep.xml index 2555cf68dc..0c90a35d5c 100644 --- a/assets/xml/objects/gameplay_keep.xml +++ b/assets/xml/objects/gameplay_keep.xml @@ -603,29 +603,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -638,17 +668,38 @@ + + + + + + + + + + + + + + + + + + + + + @@ -656,13 +707,28 @@ + + + + + + + + + + + + + + + @@ -670,30 +736,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -701,8 +809,20 @@ + + + + + + + + + + + + @@ -713,6 +833,9 @@ + + + @@ -723,6 +846,9 @@ + + + @@ -732,6 +858,9 @@ + + + @@ -758,6 +887,9 @@ + + + @@ -770,9 +902,18 @@ + + + + + + + + + @@ -782,6 +923,9 @@ + + + @@ -791,6 +935,9 @@ + + + @@ -800,6 +947,9 @@ + + + @@ -811,46 +961,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -858,47 +1050,119 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -913,6 +1177,9 @@ + + + @@ -925,6 +1192,9 @@ + + + @@ -948,15 +1218,33 @@ + + + + + + + + + + + + + + + + + + @@ -968,15 +1256,36 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/gameplay_keep_pal.xml b/assets/xml/objects/gameplay_keep_pal.xml index 90bf296c85..f290314d5c 100644 --- a/assets/xml/objects/gameplay_keep_pal.xml +++ b/assets/xml/objects/gameplay_keep_pal.xml @@ -603,29 +603,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -638,25 +668,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -664,30 +727,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -695,8 +800,20 @@ + + + + + + + + + + + + @@ -707,6 +824,9 @@ + + + @@ -717,6 +837,9 @@ + + + @@ -726,6 +849,9 @@ + + + @@ -752,6 +878,9 @@ + + + @@ -764,9 +893,18 @@ + + + + + + + + + @@ -776,6 +914,9 @@ + + + @@ -785,6 +926,9 @@ + + + @@ -794,6 +938,9 @@ + + + @@ -805,46 +952,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -852,36 +1041,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -889,6 +1129,9 @@ + + + @@ -901,6 +1144,9 @@ + + + @@ -914,15 +1160,33 @@ + + + + + + + + + + + + + + + + + + @@ -934,15 +1198,36 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ahg.xml b/assets/xml/objects/object_ahg.xml index 8147abb75f..19b8876390 100644 --- a/assets/xml/objects/object_ahg.xml +++ b/assets/xml/objects/object_ahg.xml @@ -35,6 +35,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -59,7 +106,13 @@ - + + + + + + + diff --git a/assets/xml/objects/object_bba.xml b/assets/xml/objects/object_bba.xml index f988d8fbe4..a0cc6812f7 100644 --- a/assets/xml/objects/object_bba.xml +++ b/assets/xml/objects/object_bba.xml @@ -30,6 +30,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_bdoor.xml b/assets/xml/objects/object_bdoor.xml index e15f0f6294..6addd6e4f5 100644 --- a/assets/xml/objects/object_bdoor.xml +++ b/assets/xml/objects/object_bdoor.xml @@ -4,9 +4,18 @@ - + + + + + + + + + + diff --git a/assets/xml/objects/object_bird.xml b/assets/xml/objects/object_bird.xml index c0b5cac3e4..2c184e87fc 100644 --- a/assets/xml/objects/object_bird.xml +++ b/assets/xml/objects/object_bird.xml @@ -4,14 +4,23 @@ + + + + + + + + + diff --git a/assets/xml/objects/object_bji.xml b/assets/xml/objects/object_bji.xml index 8dd89dd875..b658cfe7f8 100644 --- a/assets/xml/objects/object_bji.xml +++ b/assets/xml/objects/object_bji.xml @@ -33,6 +33,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -56,6 +103,9 @@ + + + diff --git a/assets/xml/objects/object_bl.xml b/assets/xml/objects/object_bl.xml index 1c2ef4ec63..6614aad836 100644 --- a/assets/xml/objects/object_bl.xml +++ b/assets/xml/objects/object_bl.xml @@ -5,6 +5,17 @@ + + + + + + + + + + + diff --git a/assets/xml/objects/object_bob.xml b/assets/xml/objects/object_bob.xml index ad59e56ea3..f3d0d55944 100644 --- a/assets/xml/objects/object_bob.xml +++ b/assets/xml/objects/object_bob.xml @@ -32,6 +32,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_boj.xml b/assets/xml/objects/object_boj.xml index d43332de00..e25054fe23 100644 --- a/assets/xml/objects/object_boj.xml +++ b/assets/xml/objects/object_boj.xml @@ -34,6 +34,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -62,6 +109,21 @@ + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_bw.xml b/assets/xml/objects/object_bw.xml index c2b76fd91e..8ee83090c7 100644 --- a/assets/xml/objects/object_bw.xml +++ b/assets/xml/objects/object_bw.xml @@ -3,11 +3,26 @@ - + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_cne.xml b/assets/xml/objects/object_cne.xml index ecf151d641..c35805885e 100644 --- a/assets/xml/objects/object_cne.xml +++ b/assets/xml/objects/object_cne.xml @@ -30,6 +30,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -52,6 +99,9 @@ + + + diff --git a/assets/xml/objects/object_cob.xml b/assets/xml/objects/object_cob.xml index b5047b4993..8135707021 100644 --- a/assets/xml/objects/object_cob.xml +++ b/assets/xml/objects/object_cob.xml @@ -8,6 +8,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_dekubaba.xml b/assets/xml/objects/object_dekubaba.xml index 7202a833fc..fa587f3403 100644 --- a/assets/xml/objects/object_dekubaba.xml +++ b/assets/xml/objects/object_dekubaba.xml @@ -4,12 +4,30 @@ - + + + + + + + + + + + + + + + + + + + @@ -32,6 +50,9 @@ + + + diff --git a/assets/xml/objects/object_fish.xml b/assets/xml/objects/object_fish.xml index 2ce27bac3a..c640a6bcd1 100644 --- a/assets/xml/objects/object_fish.xml +++ b/assets/xml/objects/object_fish.xml @@ -2,6 +2,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -40,30 +76,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -88,6 +175,9 @@ + + + @@ -108,17 +198,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -152,29 +284,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ganon.xml b/assets/xml/objects/object_ganon.xml index 412acb66e0..4eb7dabcdb 100644 --- a/assets/xml/objects/object_ganon.xml +++ b/assets/xml/objects/object_ganon.xml @@ -1,6 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -58,6 +123,22 @@ + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ganon2.xml b/assets/xml/objects/object_ganon2.xml index cebdf819b5..7391787e9c 100644 --- a/assets/xml/objects/object_ganon2.xml +++ b/assets/xml/objects/object_ganon2.xml @@ -13,6 +13,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -92,6 +199,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ganon2_pal.xml b/assets/xml/objects/object_ganon2_pal.xml index 93f3a05e5e..bed3b0aa9b 100644 --- a/assets/xml/objects/object_ganon2_pal.xml +++ b/assets/xml/objects/object_ganon2_pal.xml @@ -13,6 +13,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -92,6 +199,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ganon_pal.xml b/assets/xml/objects/object_ganon_pal.xml index c5dd938235..17317d878e 100644 --- a/assets/xml/objects/object_ganon_pal.xml +++ b/assets/xml/objects/object_ganon_pal.xml @@ -1,6 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -58,6 +123,22 @@ + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_gndd.xml b/assets/xml/objects/object_gndd.xml index 8bf5d770c4..103e9412da 100644 --- a/assets/xml/objects/object_gndd.xml +++ b/assets/xml/objects/object_gndd.xml @@ -17,12 +17,78 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -40,6 +106,9 @@ + + + diff --git a/assets/xml/objects/object_haka_door.xml b/assets/xml/objects/object_haka_door.xml index 1376d03569..ec8ca6a90a 100644 --- a/assets/xml/objects/object_haka_door.xml +++ b/assets/xml/objects/object_haka_door.xml @@ -1,12 +1,27 @@ + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_human.xml b/assets/xml/objects/object_human.xml index 05795cb332..fcf015b312 100644 --- a/assets/xml/objects/object_human.xml +++ b/assets/xml/objects/object_human.xml @@ -76,75 +76,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ice_objects.xml b/assets/xml/objects/object_ice_objects.xml index d21164bc15..0c4abb6964 100644 --- a/assets/xml/objects/object_ice_objects.xml +++ b/assets/xml/objects/object_ice_objects.xml @@ -1,15 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_jya_iron.xml b/assets/xml/objects/object_jya_iron.xml index c6f6773c6a..3cd24c715e 100644 --- a/assets/xml/objects/object_jya_iron.xml +++ b/assets/xml/objects/object_jya_iron.xml @@ -1,10 +1,25 @@ + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_km1.xml b/assets/xml/objects/object_km1.xml index 4d17119251..2db9a8d119 100644 --- a/assets/xml/objects/object_km1.xml +++ b/assets/xml/objects/object_km1.xml @@ -34,6 +34,9 @@ + + + diff --git a/assets/xml/objects/object_os.xml b/assets/xml/objects/object_os.xml index d98b3a0f52..48c69ae276 100644 --- a/assets/xml/objects/object_os.xml +++ b/assets/xml/objects/object_os.xml @@ -3,6 +3,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_po_composer.xml b/assets/xml/objects/object_po_composer.xml index 17c04fd18b..cb08b64b06 100644 --- a/assets/xml/objects/object_po_composer.xml +++ b/assets/xml/objects/object_po_composer.xml @@ -7,11 +7,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_po_field.xml b/assets/xml/objects/object_po_field.xml index 43e1066e3b..7900b787ac 100644 --- a/assets/xml/objects/object_po_field.xml +++ b/assets/xml/objects/object_po_field.xml @@ -9,12 +9,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_po_sisters.xml b/assets/xml/objects/object_po_sisters.xml index 7752843444..2ba750a2a2 100644 --- a/assets/xml/objects/object_po_sisters.xml +++ b/assets/xml/objects/object_po_sisters.xml @@ -7,22 +7,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_poh.xml b/assets/xml/objects/object_poh.xml index 33517945e8..b2dd07568d 100644 --- a/assets/xml/objects/object_poh.xml +++ b/assets/xml/objects/object_poh.xml @@ -7,8 +7,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ps.xml b/assets/xml/objects/object_ps.xml index 98f548db1b..e3a04685c6 100644 --- a/assets/xml/objects/object_ps.xml +++ b/assets/xml/objects/object_ps.xml @@ -2,6 +2,9 @@ + + + @@ -9,9 +12,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_rd.xml b/assets/xml/objects/object_rd.xml index 22c7d33738..a0243a7359 100644 --- a/assets/xml/objects/object_rd.xml +++ b/assets/xml/objects/object_rd.xml @@ -5,6 +5,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -72,6 +119,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_st.xml b/assets/xml/objects/object_st.xml index e374b4cb4a..d561363649 100644 --- a/assets/xml/objects/object_st.xml +++ b/assets/xml/objects/object_st.xml @@ -9,6 +9,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -36,6 +66,12 @@ + + + + + + diff --git a/assets/xml/objects/object_tk.xml b/assets/xml/objects/object_tk.xml index 5c9d0a0a6f..6ea256b875 100644 --- a/assets/xml/objects/object_tk.xml +++ b/assets/xml/objects/object_tk.xml @@ -10,11 +10,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_tp.xml b/assets/xml/objects/object_tp.xml index 8ea908825e..5809bac6d1 100644 --- a/assets/xml/objects/object_tp.xml +++ b/assets/xml/objects/object_tp.xml @@ -1,8 +1,17 @@ - + + + + + + + + + + diff --git a/assets/xml/objects/object_vali.xml b/assets/xml/objects/object_vali.xml index 2bab5efaa6..e2c8f88159 100644 --- a/assets/xml/objects/object_vali.xml +++ b/assets/xml/objects/object_vali.xml @@ -7,6 +7,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_warp1.xml b/assets/xml/objects/object_warp1.xml index 1497d7a108..cc684029b3 100644 --- a/assets/xml/objects/object_warp1.xml +++ b/assets/xml/objects/object_warp1.xml @@ -1,10 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c index c78fc5de87..41c7bf75d7 100644 --- a/src/code/z_kankyo.c +++ b/src/code/z_kankyo.c @@ -238,7 +238,7 @@ s16 sLightningFlashAlpha; s16 sSunDepthTestX; s16 sSunDepthTestY; -#pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \ +#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \ "ique-cn:128 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:192 pal-1.1:192" LightNode* sNGameOverLightNode;