Various SFX fixes (#237)

* Various SFX fixes

* Fix sfx references in z_en_zl2.c

include/sfx.h

@@ -1,248 +1,254 @@
 #ifndef SFX_H
 #define SFX_H
 
-#define NA_SE_PL_WALK_GROUND 0x0
-#define NA_SE_PL_WALK_SAND 0x1
-#define NA_SE_PL_WALK_CONCRETE 0x2
-#define NA_SE_PL_WALK_DIRT 0x3
-#define NA_SE_PL_WALK_WATER0 0x4
-#define NA_SE_PL_WALK_WATER1 0x5
-#define NA_SE_PL_WALK_WATER2 0x6
-#define NA_SE_PL_WALK_MAGMA 0x7
-#define NA_SE_PL_WALK_GRASS 0x8
-#define NA_SE_PL_WALK_IRON 0x9
-#define NA_SE_PL_WALK_LADDER 0xA
-#define NA_SE_PL_WALK_GLASS 0xB
-#define NA_SE_PL_WALK_WALL 0xC
-#define NA_SE_PL_WALK_HEAVYBOOTS 0xD
-#define NA_SE_PL_DUMMY_14 0xE
-#define NA_SE_PL_WALK_ICE 0xF
-#define NA_SE_PL_JUMP 0x10
-#define NA_SE_PL_JUMP_SAND 0x11
-#define NA_SE_PL_JUMP_CONCRETE 0x12
-#define NA_SE_PL_JUMP_DIRT 0x13
-#define NA_SE_PL_JUMP_WATER0 0x14
-#define NA_SE_PL_JUMP_WATER1 0x15
-#define NA_SE_PL_JUMP_WATER2 0x16
-#define NA_SE_PL_JUMP_MAGMA 0x17
-#define NA_SE_PL_JUMP_GRASS 0x18
-#define NA_SE_PL_JUMP_IRON 0x19
-#define NA_SE_PL_JUMP_LADDER 0x1A
-#define NA_SE_PL_JUMP_GLASS 0x1B
-#define NA_SE_PL_DUMMY28 0x1C
-#define NA_SE_PL_JUMP_HEAVYBOOTS 0x1D
-#define NA_SE_PL_DUMMY30 0x1E
-#define NA_SE_PL_JUMP_ICE 0x1F
-#define NA_SE_PL_LAND 0x20
-#define NA_SE_PL_LAND_SAND 0x21
-#define NA_SE_PL_LAND_CONCRETE 0x22
-#define NA_SE_PL_LAND_DIRT 0x23
-#define NA_SE_PL_LAND_WATER0 0x24
-#define NA_SE_PL_LAND_WATER1 0x25
-#define NA_SE_PL_LAND_WATER2 0x26
-#define NA_SE_PL_LAND_MAGMA 0x27
-#define NA_SE_PL_LAND_GRASS 0x28
-#define NA_SE_PL_LAND_IRON 0x29
-#define NA_SE_PL_LAND_LADDER 0x2A
-#define NA_SE_PL_LAND_GLASS 0x2B
-#define NA_SE_PL_DUMMY_44 0x2C
-#define NA_SE_PL_LAND_HEAVYBOOTS 0x2D
-#define NA_SE_PL_DUMMY_46 0x2E
-#define NA_SE_PL_LAND_ICE 0x2F
-#define NA_SE_PL_SLIPDOWN 0x30
-#define NA_SE_PL_CLIMB_CLIFF 0x31
-#define NA_SE_PL_SIT_ON_HORSE 0x32
-#define NA_SE_PL_GET_OFF_HORSE 0x33
-#define NA_SE_PL_TAKE_OUT_SHIELD 0x34
-#define NA_SE_PL_CHANGE_ARMS 0x35
-#define NA_SE_PL_CATCH_BOOMERANG 0x36
-#define NA_SE_PL_DUMMY_55 0x37
-#define NA_SE_PL_DUMMY_56 0x38
-#define NA_SE_PL_SWIM 0x39
-#define NA_SE_PL_THROW 0x3A
-#define NA_SE_PL_BODY_BOUND 0x3B
-#define NA_SE_PL_ROLL 0x3C
-#define NA_SE_PL_SKIP 0x3D
-#define NA_SE_PL_BODY_HIT 0x3E
-#define NA_SE_PL_DAMAGE 0x3F
-#define NA_SE_PL_SLIP 0x40
-#define NA_SE_PL_SLIP_SAND 0x41
-#define NA_SE_PL_SLIP_CONCRETE 0x42
-#define NA_SE_PL_SLIP_DIRT 0x43
-#define NA_SE_PL_SLIP_WATER0 0x44
-#define NA_SE_PL_SLIP_WATER1 0x45
-#define NA_SE_PL_SLIP_WATER2 0x46
-#define NA_SE_PL_SLIP_MAGMA 0x47
-#define NA_SE_PL_SLIP_GRASS 0x48
-#define NA_SE_PL_SLIP_IRON 0x49
-#define NA_SE_PL_SLIP_LADDER 0x4A
-#define NA_SE_PL_SLIP_GLASS 0x4B
-#define NA_SE_PL_DUMMY76 0x4C
-#define NA_SE_PL_SLIP_HEAVYBOOTS 0x4D
-#define NA_SE_PL_DUMMY78 0x4E
-#define NA_SE_PL_SLIP_ICE 0x4F
-#define NA_SE_PL_BOUND 0x50
-#define NA_SE_PL_BOUND_SAND 0x51
-#define NA_SE_PL_BOUND_CONCRETE 0x52
-#define NA_SE_PL_BOUND_DIRT 0x53
-#define NA_SE_PL_BOUND_WATER0 0x54
-#define NA_SE_PL_BOUND_WATER1 0x55
-#define NA_SE_PL_BOUND_WATER2 0x56
-#define NA_SE_PL_BOUND_MAGMA 0x57
-#define NA_SE_PL_BOUND_GRASS 0x58
-#define NA_SE_PL_BOUND_IRON 0x59
-#define NA_SE_PL_BOUND_LADDER 0x5A
-#define NA_SE_PL_BOUND_WOOD 0x5B
-#define NA_SE_PL_DUMMY_92 0x5C
-#define NA_SE_PL_BOUND_HEAVYBOOTS 0x5D
-#define NA_SE_PL_DUMMY_94 0x5E
-#define NA_SE_PL_BOUND_ICE 0x5F
-#define NA_SE_PL_DUMMY_96 0x60
-#define NA_SE_PL_DUMMY_97 0x61
-#define NA_SE_PL_DUMMY_98 0x62
-#define NA_SE_PL_FACE_UP 0x63
-#define NA_SE_PL_DIVE_BUBBLE 0x64
-#define NA_SE_PL_MOVE_BUBBLE 0x65
-#define NA_SE_PL_METALEFFECT_KID 0x66
-#define NA_SE_PL_METALEFFECT_ADULT 0x67
-#define NA_SE_PL_SPARK 0x68
-#define NA_SE_PL_PULL_UP_PLANT 0x69
-#define NA_SE_PL_PULL_UP_ROCK 0x6A
-#define NA_SE_PL_IN_BUBBLE 0x6B
-#define NA_SE_PL_PULL_UP_BIGROCK 0x6C
-#define NA_SE_PL_SWORD_CHARGE 0x6D
-#define NA_SE_PL_FREEZE 0x6E
-#define NA_SE_PL_PULL_UP_POT 0x6F
-#define NA_SE_PL_KNOCK 0x70
-#define NA_SE_PL_CALM_HIT 0x71
-#define NA_SE_PL_CALM_PAT 0x72
-#define NA_SE_PL_SUBMERGE 0x73
-#define NA_SE_PL_FREEZE_S 0x74
-#define NA_SE_PL_ICE_BROKEN 0x75
-#define NA_SE_PL_SLIP_ICE_LELEL 0x76
-#define NA_SE_PL_PUT_OUT_ITEM 0x77
-#define NA_SE_PL_PULL_UP_WOODBOX 0x78
-#define NA_SE_PL_MAGIC_FIRE 0x79
-#define NA_SE_PL_MAGIC_WIND_NORMAL 0x7A
-#define NA_SE_PL_MAGIC_WIND_WARP 0x7B
-#define NA_SE_PL_MAGIC_SOUL_NORMAL 0x7C
-#define NA_SE_PL_ARROW_CHARGE_FIRE 0x7D
-#define NA_SE_PL_ARROW_CHARGE_ICE 0x7E
-#define NA_SE_PL_ARROW_CHARGE_LIGHT 0x7F
-#define NA_SE_PL_DUMMY_128 0x80
-#define NA_SE_PL_DUMMY_129 0x81
-#define NA_SE_PL_DUMMY_130 0x82
-#define NA_SE_PL_PULL_UP_RUTO 0x83
-#define NA_SE_PL_DUMMY_132 0x84
-#define NA_SE_PL_DUMMY_133 0x85
-#define NA_SE_PL_DUMMY_134 0x86
-#define NA_SE_PL_DUMMY_135 0x87
-#define NA_SE_PL_DUMMY_136 0x88
-#define NA_SE_PL_DUMMY_137 0x89
-#define NA_SE_PL_DUMMY_138 0x8A
-#define NA_SE_PL_DUMMY_139 0x8B
-#define NA_SE_PL_DUMMY_140 0x8C
-#define NA_SE_PL_DUMMY_141 0x8D
-#define NA_SE_PL_DUMMY_142 0x8E
-#define NA_SE_PL_DUMMY_143 0x8F
-#define NA_SE_PL_DUMMY_144 0x90
-#define NA_SE_PL_DUMMY_145 0x91
-#define NA_SE_PL_DUMMY_146 0x92
-#define NA_SE_PL_DUMMY_147 0x93
-#define NA_SE_PL_DUMMY_148 0x94
-#define NA_SE_PL_DUMMY_149 0x95
-#define NA_SE_PL_DUMMY_150 0x96
-#define NA_SE_PL_DUMMY_151 0x97
-#define NA_SE_PL_DUMMY_152 0x98
-#define NA_SE_PL_DUMMY_153 0x99
-#define NA_SE_PL_DUMMY_154 0x9A
-#define NA_SE_PL_DUMMY_155 0x9B
-#define NA_SE_PL_DUMMY_156 0x9C
-#define NA_SE_PL_DUMMY_157 0x9D
-#define NA_SE_PL_DUMMY_158 0x9E
-#define NA_SE_PL_DUMMY_159 0x9F
-#define NA_SE_PL_DUMMY_160 0xA0
-#define NA_SE_PL_DUMMY_161 0xA1
-#define NA_SE_PL_DUMMY_162 0xA2
-#define NA_SE_PL_DUMMY_163 0xA3
-#define NA_SE_PL_DUMMY_164 0xA4
-#define NA_SE_PL_DUMMY_165 0xA5
-#define NA_SE_PL_DUMMY_166 0xA6
-#define NA_SE_PL_DUMMY_167 0xA7
-#define NA_SE_PL_DUMMY_168 0xA8
-#define NA_SE_PL_DUMMY_169 0xA9
-#define NA_SE_PL_DUMMY_170 0xAA
-#define NA_SE_PL_DUMMY_171 0xAB
-#define NA_SE_PL_DUMMY_172 0xAC
-#define NA_SE_PL_DUMMY_173 0xAD
-#define NA_SE_PL_DUMMY_174 0xAE
-#define NA_SE_PL_DUMMY_175 0xAF
-#define NA_SE_PL_CRAWL 0xB0
-#define NA_SE_PL_CRAWL_SAND 0xB1
-#define NA_SE_PL_CRAWL_CONCRETE 0xB2
-#define NA_SE_PL_CRAWL_DIRT 0xB3
-#define NA_SE_PL_CRAWL_WATER0 0xB4
-#define NA_SE_PL_DUMMY_181 0xB5
-#define NA_SE_PL_DUMMY_182 0xB6
-#define NA_SE_PL_DUMMY_183 0xB7
-#define NA_SE_PL_DUMMY_184 0xB8
-#define NA_SE_PL_DUMMY_185 0xB9
-#define NA_SE_PL_DUMMY_186 0xBA
-#define NA_SE_PL_CRAWL_WOOD 0xBB
-#define NA_SE_PL_CRAWL_ICE 0xBC
-#define NA_SE_PL_DUMMY_189 0xBD
-#define NA_SE_PL_DUMMY_190 0xBE
-#define NA_SE_PL_DUMMY_191 0xBF
-#define NA_SE_PL_MAGIC_SOUL_FLASH 0xC0
-#define NA_SE_PL_ROLL_DUST 0xC1
-#define NA_SE_PL_DUMMY_192 0xC2
-#define NA_SE_PL_MAGIC_SOUL_BALL 0xC3
-#define NA_SE_PL_SPIRAL_HEAL_BEAM 0xC4
-#define NA_SE_PL_BOUND_NOWEAPON 0xC5
-#define NA_SE_PL_PLANT_GROW_UP 0xC6
-#define NA_SE_PL_PLANT_TALLER 0xC7
-#define NA_SE_PL_MAGIC_WIND_VANISH 0xC8
-#define NA_SE_PL_HOBBERBOOTS_LV 0xC9
-#define NA_SE_PL_PLANT_MOVE 0xCA
-#define NA_SE_EV_WALL_MOVE_SP 0xCB
-#define NA_SE_PL_DUMMY_204 0xCC
-#define NA_SE_PL_DUMMY_205 0xCD
-#define NA_SE_PL_DUMMY_206 0xCE
-#define NA_SE_PL_DUMMY_207 0xCF
-#define NA_SE_PL_SLIP_LEVEL 0xD0
-#define NA_SE_PL_SLIP_SAND_LEVEL 0xD1
-#define NA_SE_PL_SLIP_CONCRETE_LEVEL 0xD2
-#define NA_SE_PL_SLIP_DIRT_LEVEL 0xD3
-#define NA_SE_PL_SLIP_WATER0_LEVEL 0xD4
-#define NA_SE_PL_SLIP_WATER1_LEVEL 0xD5
-#define NA_SE_PL_SLIP_WATER2_LEVEL 0xD6
-#define NA_SE_PL_SLIP_MAGMA_LEVEL 0xD7
-#define NA_SE_PL_SLIP_GRASS_LEVEL 0xD8
-#define NA_SE_PL_SLIP_IRON_LEVEL 0xD9
-#define NA_SE_PL_SLIP_GLASS_LEVEL 0xDA
-#define NA_SE_PL_SLIP_WOOD_LEVEL 0xDB
-#define NA_SE_PL_DUMMY_220 0xDC
-#define NA_SE_PL_DUMMY_221 0xDD
-#define NA_SE_PL_SLIP_HEAVYBOOTS_LEVEL 0xDE
-#define NA_SE_PL_SLIP_ICE_LEVEL 0xDF
-#define NA_SE_PL_JUMP_METAL 0xE0
-#define NA_SE_PL_LAND_METAL 0xE1
-#define NA_SE_PL_WALK_RUNNINGMAN 0xE2
-#define NA_SE_PL_WALK_ZELDA_DEMO 0xE3
-#define NA_SE_PL_YOBI_DATA02 0xE4
-#define NA_SE_PL_YOBI_DATA03 0xE5
-#define NA_SE_PL_YOBI_DATA04 0xE6
-#define NA_SE_PL_YOBI_DATA05 0xE7
-#define NA_SE_PL_YOBI_DATA06 0xE8
-#define NA_SE_PL_YOBI_DATA07 0xE9
-#define NA_SE_PL_YOBI_DATA08 0xEA
-#define NA_SE_PL_YOBI_DATA09 0xEB
-#define NA_SE_PL_YOBI_DATA10 0xEC
-#define NA_SE_PL_YOBI_DATA11 0xED
-#define NA_SE_PL_YOBI_DATA12 0xEE
-#define NA_SE_PL_YOBI_DATA13 0xEF
-#define NA_SE_PL_YOBI_DATA14 0xF0
-//------------ITEM------------
+#define SFX_FLAG 0x800
+
+// ------------ PLAYER ------------
+
+#define NA_SE_PL_WALK_GROUND 0x800
+#define NA_SE_PL_WALK_SAND 0x801
+#define NA_SE_PL_WALK_CONCRETE 0x802
+#define NA_SE_PL_WALK_DIRT 0x803
+#define NA_SE_PL_WALK_WATER0 0x804
+#define NA_SE_PL_WALK_WATER1 0x805
+#define NA_SE_PL_WALK_WATER2 0x806
+#define NA_SE_PL_WALK_MAGMA 0x807
+#define NA_SE_PL_WALK_GRASS 0x808
+#define NA_SE_PL_WALK_IRON 0x809
+#define NA_SE_PL_WALK_LADDER 0x80A
+#define NA_SE_PL_WALK_GLASS 0x80B
+#define NA_SE_PL_WALK_WALL 0x80C
+#define NA_SE_PL_WALK_HEAVYBOOTS 0x80D
+#define NA_SE_PL_DUMMY_14 0x80E
+#define NA_SE_PL_WALK_ICE 0x80F
+#define NA_SE_PL_JUMP 0x810
+#define NA_SE_PL_JUMP_SAND 0x811
+#define NA_SE_PL_JUMP_CONCRETE 0x812
+#define NA_SE_PL_JUMP_DIRT 0x813
+#define NA_SE_PL_JUMP_WATER0 0x814
+#define NA_SE_PL_JUMP_WATER1 0x815
+#define NA_SE_PL_JUMP_WATER2 0x816
+#define NA_SE_PL_JUMP_MAGMA 0x817
+#define NA_SE_PL_JUMP_GRASS 0x818
+#define NA_SE_PL_JUMP_IRON 0x819
+#define NA_SE_PL_JUMP_LADDER 0x81A
+#define NA_SE_PL_JUMP_GLASS 0x81B
+#define NA_SE_PL_DUMMY28 0x81C
+#define NA_SE_PL_JUMP_HEAVYBOOTS 0x81D
+#define NA_SE_PL_DUMMY30 0x81E
+#define NA_SE_PL_JUMP_ICE 0x81F
+#define NA_SE_PL_LAND 0x820
+#define NA_SE_PL_LAND_SAND 0x821
+#define NA_SE_PL_LAND_CONCRETE 0x822
+#define NA_SE_PL_LAND_DIRT 0x823
+#define NA_SE_PL_LAND_WATER0 0x824
+#define NA_SE_PL_LAND_WATER1 0x825
+#define NA_SE_PL_LAND_WATER2 0x826
+#define NA_SE_PL_LAND_MAGMA 0x827
+#define NA_SE_PL_LAND_GRASS 0x828
+#define NA_SE_PL_LAND_IRON 0x829
+#define NA_SE_PL_LAND_LADDER 0x82A
+#define NA_SE_PL_LAND_GLASS 0x82B
+#define NA_SE_PL_DUMMY_44 0x82C
+#define NA_SE_PL_LAND_HEAVYBOOTS 0x82D
+#define NA_SE_PL_DUMMY_46 0x82E
+#define NA_SE_PL_LAND_ICE 0x82F
+#define NA_SE_PL_SLIPDOWN 0x830
+#define NA_SE_PL_CLIMB_CLIFF 0x831
+#define NA_SE_PL_SIT_ON_HORSE 0x832
+#define NA_SE_PL_GET_OFF_HORSE 0x833
+#define NA_SE_PL_TAKE_OUT_SHIELD 0x834
+#define NA_SE_PL_CHANGE_ARMS 0x835
+#define NA_SE_PL_CATCH_BOOMERANG 0x836
+#define NA_SE_PL_DUMMY_55 0x837
+#define NA_SE_PL_DUMMY_56 0x838
+#define NA_SE_PL_SWIM 0x839
+#define NA_SE_PL_THROW 0x83A
+#define NA_SE_PL_BODY_BOUND 0x83B
+#define NA_SE_PL_ROLL 0x83C
+#define NA_SE_PL_SKIP 0x83D
+#define NA_SE_PL_BODY_HIT 0x83E
+#define NA_SE_PL_DAMAGE 0x83F
+#define NA_SE_PL_SLIP 0x840
+#define NA_SE_PL_SLIP_SAND 0x841
+#define NA_SE_PL_SLIP_CONCRETE 0x842
+#define NA_SE_PL_SLIP_DIRT 0x843
+#define NA_SE_PL_SLIP_WATER0 0x844
+#define NA_SE_PL_SLIP_WATER1 0x845
+#define NA_SE_PL_SLIP_WATER2 0x846
+#define NA_SE_PL_SLIP_MAGMA 0x847
+#define NA_SE_PL_SLIP_GRASS 0x848
+#define NA_SE_PL_SLIP_IRON 0x849
+#define NA_SE_PL_SLIP_LADDER 0x84A
+#define NA_SE_PL_SLIP_GLASS 0x84B
+#define NA_SE_PL_DUMMY76 0x84C
+#define NA_SE_PL_SLIP_HEAVYBOOTS 0x84D
+#define NA_SE_PL_DUMMY78 0x84E
+#define NA_SE_PL_SLIP_ICE 0x84F
+#define NA_SE_PL_BOUND 0x850
+#define NA_SE_PL_BOUND_SAND 0x851
+#define NA_SE_PL_BOUND_CONCRETE 0x852
+#define NA_SE_PL_BOUND_DIRT 0x853
+#define NA_SE_PL_BOUND_WATER0 0x854
+#define NA_SE_PL_BOUND_WATER1 0x855
+#define NA_SE_PL_BOUND_WATER2 0x856
+#define NA_SE_PL_BOUND_MAGMA 0x857
+#define NA_SE_PL_BOUND_GRASS 0x858
+#define NA_SE_PL_BOUND_IRON 0x859
+#define NA_SE_PL_BOUND_LADDER 0x85A
+#define NA_SE_PL_BOUND_WOOD 0x85B
+#define NA_SE_PL_DUMMY_92 0x85C
+#define NA_SE_PL_BOUND_HEAVYBOOTS 0x85D
+#define NA_SE_PL_DUMMY_94 0x85E
+#define NA_SE_PL_BOUND_ICE 0x85F
+#define NA_SE_PL_DUMMY_96 0x860
+#define NA_SE_PL_DUMMY_97 0x861
+#define NA_SE_PL_DUMMY_98 0x862
+#define NA_SE_PL_FACE_UP 0x863
+#define NA_SE_PL_DIVE_BUBBLE 0x864
+#define NA_SE_PL_MOVE_BUBBLE 0x865
+#define NA_SE_PL_METALEFFECT_KID 0x866
+#define NA_SE_PL_METALEFFECT_ADULT 0x867
+#define NA_SE_PL_SPARK 0x868
+#define NA_SE_PL_PULL_UP_PLANT 0x869
+#define NA_SE_PL_PULL_UP_ROCK 0x86A
+#define NA_SE_PL_IN_BUBBLE 0x86B
+#define NA_SE_PL_PULL_UP_BIGROCK 0x86C
+#define NA_SE_PL_SWORD_CHARGE 0x86D
+#define NA_SE_PL_FREEZE 0x86E
+#define NA_SE_PL_PULL_UP_POT 0x86F
+#define NA_SE_PL_KNOCK 0x870
+#define NA_SE_PL_CALM_HIT 0x871
+#define NA_SE_PL_CALM_PAT 0x872
+#define NA_SE_PL_SUBMERGE 0x873
+#define NA_SE_PL_FREEZE_S 0x874
+#define NA_SE_PL_ICE_BROKEN 0x875
+#define NA_SE_PL_SLIP_ICE_LELEL 0x876
+#define NA_SE_PL_PUT_OUT_ITEM 0x877
+#define NA_SE_PL_PULL_UP_WOODBOX 0x878
+#define NA_SE_PL_MAGIC_FIRE 0x879
+#define NA_SE_PL_MAGIC_WIND_NORMAL 0x87A
+#define NA_SE_PL_MAGIC_WIND_WARP 0x87B
+#define NA_SE_PL_MAGIC_SOUL_NORMAL 0x87C
+#define NA_SE_PL_ARROW_CHARGE_FIRE 0x87D
+#define NA_SE_PL_ARROW_CHARGE_ICE 0x87E
+#define NA_SE_PL_ARROW_CHARGE_LIGHT 0x87F
+#define NA_SE_PL_DUMMY_128 0x880
+#define NA_SE_PL_DUMMY_129 0x881
+#define NA_SE_PL_DUMMY_130 0x882
+#define NA_SE_PL_PULL_UP_RUTO 0x883
+#define NA_SE_PL_DUMMY_132 0x884
+#define NA_SE_PL_DUMMY_133 0x885
+#define NA_SE_PL_DUMMY_134 0x886
+#define NA_SE_PL_DUMMY_135 0x887
+#define NA_SE_PL_DUMMY_136 0x888
+#define NA_SE_PL_DUMMY_137 0x889
+#define NA_SE_PL_DUMMY_138 0x88A
+#define NA_SE_PL_DUMMY_139 0x88B
+#define NA_SE_PL_DUMMY_140 0x88C
+#define NA_SE_PL_DUMMY_141 0x88D
+#define NA_SE_PL_DUMMY_142 0x88E
+#define NA_SE_PL_DUMMY_143 0x88F
+#define NA_SE_PL_DUMMY_144 0x890
+#define NA_SE_PL_DUMMY_145 0x891
+#define NA_SE_PL_DUMMY_146 0x892
+#define NA_SE_PL_DUMMY_147 0x893
+#define NA_SE_PL_DUMMY_148 0x894
+#define NA_SE_PL_DUMMY_149 0x895
+#define NA_SE_PL_DUMMY_150 0x896
+#define NA_SE_PL_DUMMY_151 0x897
+#define NA_SE_PL_DUMMY_152 0x898
+#define NA_SE_PL_DUMMY_153 0x899
+#define NA_SE_PL_DUMMY_154 0x89A
+#define NA_SE_PL_DUMMY_155 0x89B
+#define NA_SE_PL_DUMMY_156 0x89C
+#define NA_SE_PL_DUMMY_157 0x89D
+#define NA_SE_PL_DUMMY_158 0x89E
+#define NA_SE_PL_DUMMY_159 0x89F
+#define NA_SE_PL_DUMMY_160 0x8A0
+#define NA_SE_PL_DUMMY_161 0x8A1
+#define NA_SE_PL_DUMMY_162 0x8A2
+#define NA_SE_PL_DUMMY_163 0x8A3
+#define NA_SE_PL_DUMMY_164 0x8A4
+#define NA_SE_PL_DUMMY_165 0x8A5
+#define NA_SE_PL_DUMMY_166 0x8A6
+#define NA_SE_PL_DUMMY_167 0x8A7
+#define NA_SE_PL_DUMMY_168 0x8A8
+#define NA_SE_PL_DUMMY_169 0x8A9
+#define NA_SE_PL_DUMMY_170 0x8AA
+#define NA_SE_PL_DUMMY_171 0x8AB
+#define NA_SE_PL_DUMMY_172 0x8AC
+#define NA_SE_PL_DUMMY_173 0x8AD
+#define NA_SE_PL_DUMMY_174 0x8AE
+#define NA_SE_PL_DUMMY_175 0x8AF
+#define NA_SE_PL_CRAWL 0x8B0
+#define NA_SE_PL_CRAWL_SAND 0x8B1
+#define NA_SE_PL_CRAWL_CONCRETE 0x8B2
+#define NA_SE_PL_CRAWL_DIRT 0x8B3
+#define NA_SE_PL_CRAWL_WATER0 0x8B4
+#define NA_SE_PL_DUMMY_181 0x8B5
+#define NA_SE_PL_DUMMY_182 0x8B6
+#define NA_SE_PL_DUMMY_183 0x8B7
+#define NA_SE_PL_DUMMY_184 0x8B8
+#define NA_SE_PL_DUMMY_185 0x8B9
+#define NA_SE_PL_DUMMY_186 0x8BA
+#define NA_SE_PL_CRAWL_WOOD 0x8BB
+#define NA_SE_PL_CRAWL_ICE 0x8BC
+#define NA_SE_PL_DUMMY_189 0x8BD
+#define NA_SE_PL_DUMMY_190 0x8BE
+#define NA_SE_PL_DUMMY_191 0x8BF
+#define NA_SE_PL_MAGIC_SOUL_FLASH 0x8C0
+#define NA_SE_PL_ROLL_DUST 0x8C1
+#define NA_SE_PL_DUMMY_192 0x8C2
+#define NA_SE_PL_MAGIC_SOUL_BALL 0x8C3
+#define NA_SE_PL_SPIRAL_HEAL_BEAM 0x8C4
+#define NA_SE_PL_BOUND_NOWEAPON 0x8C5
+#define NA_SE_PL_PLANT_GROW_UP 0x8C6
+#define NA_SE_PL_PLANT_TALLER 0x8C7
+#define NA_SE_PL_MAGIC_WIND_VANISH 0x8C8
+#define NA_SE_PL_HOBBERBOOTS_LV 0x8C9
+#define NA_SE_PL_PLANT_MOVE 0x8CA
+#define NA_SE_EV_WALL_MOVE_SP 0x8CB // EV sound inside PL?
+#define NA_SE_PL_DUMMY_204 0x8CC
+#define NA_SE_PL_DUMMY_205 0x8CD 0xCC
+#define NA_SE_PL_DUMMY_206 0x8CE
+#define NA_SE_PL_DUMMY_207 0x8CF
+#define NA_SE_PL_SLIP_LEVEL 0x8D0
+#define NA_SE_PL_SLIP_SAND_LEVEL 0x8D1
+#define NA_SE_PL_SLIP_CONCRETE_LEVEL 0x8D2
+#define NA_SE_PL_SLIP_DIRT_LEVEL 0x8D3
+#define NA_SE_PL_SLIP_WATER0_LEVEL 0x8D4
+#define NA_SE_PL_SLIP_WATER1_LEVEL 0x8D5
+#define NA_SE_PL_SLIP_WATER2_LEVEL 0x8D6
+#define NA_SE_PL_SLIP_MAGMA_LEVEL 0x8D7
+#define NA_SE_PL_SLIP_GRASS_LEVEL 0x8D8
+#define NA_SE_PL_SLIP_IRON_LEVEL 0x8D9
+#define NA_SE_PL_SLIP_GLASS_LEVEL 0x8DA
+#define NA_SE_PL_SLIP_WOOD_LEVEL 0x8DB
+#define NA_SE_PL_DUMMY_220 0x8DC
+#define NA_SE_PL_DUMMY_221 0x8DD
+#define NA_SE_PL_SLIP_HEAVYBOOTS_LEVEL 0x8DE
+#define NA_SE_PL_SLIP_ICE_LEVEL 0x8DF
+#define NA_SE_PL_JUMP_METAL 0x8E0
+#define NA_SE_PL_LAND_METAL 0x8E1
+#define NA_SE_PL_WALK_RUNNINGMAN 0x8E2
+#define NA_SE_PL_WALK_ZELDA_DEMO 0x8E3
+#define NA_SE_PL_YOBI_DATA02 0x8E4
+#define NA_SE_PL_YOBI_DATA03 0x8E5
+#define NA_SE_PL_YOBI_DATA04 0x8E6
+#define NA_SE_PL_YOBI_DATA05 0x8E7
+#define NA_SE_PL_YOBI_DATA06 0x8E8
+#define NA_SE_PL_YOBI_DATA07 0x8E9
+#define NA_SE_PL_YOBI_DATA08 0x8EA
+#define NA_SE_PL_YOBI_DATA09 0x8EB
+#define NA_SE_PL_YOBI_DATA10 0x8EC
+#define NA_SE_PL_YOBI_DATA11 0x8ED
+#define NA_SE_PL_YOBI_DATA12 0x8EE
+#define NA_SE_PL_YOBI_DATA13 0x8EF
+#define NA_SE_PL_YOBI_DATA14 0x8F0
+
+// ------------ ITEM ------------
+
 #define NA_SE_IT_SWORD_IMPACT 0x1800
 #define NA_SE_IT_SWORD_SWING 0x1801
 #define NA_SE_IT_SWORD_PUTAWAY 0x1802
@@ -324,7 +330,7 @@
 #define NA_SE_IT_MASTER_SWORD_SWING 0x184E
 #define NA_SE_IT_DUMMY5 0x184F
 #define NA_SE_IT_YOBI19 0x1850
-#define NA_SE_FISHING_REEL_SLOW2 0x1851
+#define NA_SE_FISHING_REEL_SLOW2 0x1851 // not IT?
 #define NA_SE_IT_SPIDERNET_HIT1 0x1852
 #define NA_SE_IT_LURE_LAND1 0x1853
 #define NA_SE_IT_HOOKSHOT_STICK_OBJ_WATER 0x1854
@@ -344,7 +350,9 @@
 #define NA_SE_IT_YOBI16 0x1862
 #define NA_SE_IT_YOBI17 0x1863
 #define NA_SE_IT_YOBI18 0x1864
-//------------ENVIRONMENT------------
+
+// ------------ ENVIRONMENT ------------
+
 #define NA_SE_EV_DOOR_OPEN 0x2800
 #define NA_SE_EV_DOOR_CLOSE 0x2801
 #define NA_SE_EV_EXPLOSION 0x2802
@@ -378,7 +386,7 @@
 #define NA_SE_EV_STONE_STATUE_OPEN 0x281E
 #define NA_SE_EV_TBOX_UNLOCK 0x281F
 #define NA_SE_EV_TBOX_OPEN 0x2820
-#define NA_SE_SY_TIMER 0x2821
+#define NA_SE_SY_TIMER 0x2821 // SY sound inside EV?
 #define NA_SE_EV_FLAME_IGNITION 0x2822
 #define NA_SE_EV_SPEAR_HIT 0x2823
 #define NA_SE_EV_ELEVATOR_MOVE 0x2824
@@ -481,7 +489,7 @@
 #define NA_SE_EV_WINDMILL_LEVEL 0x2885
 #define NA_SE_EV_GOTO_HEAVEN 0x2886
 #define NA_SE_EV_POT_BROKEN 0x2887
-#define NA_SE_PL_PUT_DOWN_POT 0x2888
+#define NA_SE_PL_PUT_DOWN_POT 0x2888 // PL sound inside EV?
 #define NA_SE_EV_DIVE_INTO_WATER 0x2889
 #define NA_SE_EV_JUMP_OUT_WATER 0x288A
 #define NA_SE_EV_GOD_FLYING 0x288B
@@ -626,7 +634,9 @@
 #define NA_SE_EV_YOBI23 0x2916
 #define NA_SE_EV_YOBI24 0x2917
 #define NA_SE_EV_YOBI25 0x2918
-//------------ENEMY------------
+
+// ------------ ENEMY ------------
+
 #define NA_SE_EN_FLOORMASTER_SLIDING 0x3034
 #define NA_SE_EN_FLOORMASTER_SM_STICK 0x3136
 #define NA_SE_EN_DODO_J_WALK 0x3800
@@ -1160,7 +1170,9 @@
 #define NA_SE_EN_YOBI28 0x3A12
 #define NA_SE_EN_YOBI29 0x3A13
 #define NA_SE_EN_YOBI30 0x3A14
-//------------SYSTEM------------
+
+// ------------ SYSTEM ------------
+
 #define NA_SE_SY_WIN_OPEN 0x4800
 #define NA_SE_SY_WIN_CLOSE 0x4801
 #define NA_SE_SY_CORRECT_CHIME 0x4802
@@ -1231,7 +1243,7 @@
 #define NA_SE_SY_KINSTA_MARK_APPEAR 0x4843
 #define NA_SE_SY_FIVE_COUNT_LUPY 0x4844
 #define NA_SE_SY_CARROT_RECOVER 0x4845
-#define NA_SE_EV_FAIVE_LUPY_COUNT 0x4846
+#define NA_SE_EV_FAIVE_LUPY_COUNT 0x4846 // EV sound inside SY?
 #define NA_SE_SY_DUMMY_71 0x4847
 #define NA_SE_SY_KANADE_ISHI 0x4848
 #define NA_SE_SY_NA_HELLO_2 0x4849
@@ -1252,7 +1264,9 @@
 #define NA_SE_SY_YOBI15 0x4858
 #define NA_SE_SY_YOBI16 0x4859
 #define NA_SE_SY_YOBI17 0x485A
-//------------OCARINA------------
+
+// ------------ OCARINA ------------
+
 #define NA_SE_OC_OCARINA 0x5800
 #define NA_SE_OC_ABYSS 0x5801
 #define NA_SE_OC_DOOR_OPEN 0x5802
@@ -1264,7 +1278,9 @@
 #define NA_SE_OC_HINT_MOVIE2_WHITE 0x5808
 #define NA_SE_OC_HINT_MOVIE_ZOOMIN 0x5809
 #define NA_SE_OC_HIBIKI_ISHI 0x580A
-//------------VOICE------------
+
+// ------------ VOICE ------------
+
 #define NA_SE_VO_LI_SWORD_N 0x6800
 #define NA_SE_VO_LI_SWORD_L 0x6801
 #define NA_SE_VO_LI_LASH 0x6802