diff --git a/Makefile b/Makefile index 87258035a..d4349a3b1 100644 --- a/Makefile +++ b/Makefile @@ -535,9 +535,15 @@ endif $(OBJ_DIR)/sym_bss.ld: sym_bss.txt $(RAMSCRGEN) .bss $< ENGLISH > $@ +$(OBJ_DIR)/sym_bss_rev10.ld: sym_bss_rev10.txt + $(RAMSCRGEN) .bss $< ENGLISH > $@ + $(OBJ_DIR)/sym_common.ld: sym_common.txt $(C_OBJS) $(wildcard common_syms/*.txt) $(RAMSCRGEN) COMMON $< ENGLISH -c $(C_BUILDDIR),common_syms > $@ +$(OBJ_DIR)/sym_common_rev10.ld: sym_common_rev10.txt $(C_OBJS) $(wildcard common_syms/*.txt) + $(RAMSCRGEN) COMMON $< ENGLISH -c $(C_BUILDDIR),common_syms > $@ + $(OBJ_DIR)/sym_ewram.ld: sym_ewram.txt $(RAMSCRGEN) ewram_data $< ENGLISH > $@ diff --git a/README.md b/README.md index b699eeceb..a2354bc89 100644 --- a/README.md +++ b/README.md @@ -6,5 +6,5 @@ To set up the repository, see [INSTALL.md](https://github.com/rh-hideout/pokeeme - no-ql-and-hs - master without quest log and help system - dppt-hgss-music - based on master, adds DPPt and HGSS music # Credits -[rh-hideout/pokeemerald-expansion](https://github.com/rh-hideout/pokeemerald-expansion/wiki/Credits) +[rh-hideout/pokeemerald-expansion](https://github.com/rh-hideout/pokeemerald-expansion/wiki/Credits) [Sotomura/pokefirered-rtc](https://github.com/Sotomura/pokefirered/tree/pokefirered-rtc) diff --git a/data/event_scripts.s b/data/event_scripts.s index 1ce68df50..3d12abfc9 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1107,7 +1107,7 @@ EventScript_ResetAllMapFlags:: setflag FLAG_HIDE_CINNABAR_SEAGALLOP setflag FLAG_HIDE_CINNABAR_POKECENTER_BILL setflag FLAG_HIDE_LORELEI_IN_HER_HOUSE - setflag FLAG_HIDE_SAFFRON_FAN_CLUB_BLACKBELT + setflag FLAG_HIDE_SAFFRON_FAN_CLUB_BLACK_BELT setflag FLAG_HIDE_SAFFRON_FAN_CLUB_ROCKER setflag FLAG_HIDE_SAFFRON_FAN_CLUB_WOMAN setflag FLAG_HIDE_SAFFRON_FAN_CLUB_BEAUTY @@ -1115,7 +1115,7 @@ EventScript_ResetAllMapFlags:: setflag FLAG_HIDE_TWO_ISLAND_GAME_CORNER_BIKER setflag FLAG_HIDE_TWO_ISLAND_WOMAN setflag FLAG_HIDE_TWO_ISLAND_BEAUTY - setflag FLAG_HIDE_TWO_ISLAND_SUPER_NERD + setflag FLAG_HIDE_TWO_ISLAND_POKE_MANIAC setflag FLAG_HIDE_LOSTELLE_IN_HER_HOME setflag FLAG_HIDE_THREE_ISLAND_LONE_BIKER setflag FLAG_HIDE_FOUR_ISLAND_RIVAL diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/map.json b/data/maps/BattleFrontier_BattleArenaBattleRoom/map.json index 1397f6545..ff6e89fa3 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/map.json @@ -17,7 +17,7 @@ "object_events": [ { "local_id": "LOCALID_ARENA_BATTLE_BLACK_BELT_1", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 5, "y": 3, "elevation": 3, @@ -31,7 +31,7 @@ }, { "local_id": "LOCALID_ARENA_BATTLE_BLACK_BELT_2", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 10, "y": 3, "elevation": 3, @@ -45,7 +45,7 @@ }, { "local_id": "LOCALID_ARENA_BATTLE_BLACK_BELT_3", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 5, "y": 9, "elevation": 3, @@ -59,7 +59,7 @@ }, { "local_id": "LOCALID_ARENA_BATTLE_BLACK_BELT_4", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 10, "y": 9, "elevation": 3, @@ -73,7 +73,7 @@ }, { "local_id": "LOCALID_ARENA_BATTLE_ATTENDANT", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 4, "y": 5, "elevation": 3, @@ -86,7 +86,7 @@ "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 11, "y": 5, "elevation": 3, @@ -128,7 +128,7 @@ }, { "local_id": "LOCALID_ARENA_BATTLE_ANNOUNCER", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 7, "y": 4, "elevation": 3, diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/map.json b/data/maps/BattleFrontier_BattleArenaCorridor/map.json index b2fd9ceb1..d283019ce 100644 --- a/data/maps/BattleFrontier_BattleArenaCorridor/map.json +++ b/data/maps/BattleFrontier_BattleArenaCorridor/map.json @@ -17,7 +17,7 @@ "object_events": [ { "local_id": "LOCALID_ARENA_CORRIDOR_ATTENDANT", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 9, "y": 12, "elevation": 0, diff --git a/data/maps/BattleFrontier_BattleArenaLobby/map.json b/data/maps/BattleFrontier_BattleArenaLobby/map.json index aeaa92b3d..2b4ba513a 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/map.json +++ b/data/maps/BattleFrontier_BattleArenaLobby/map.json @@ -17,7 +17,7 @@ "object_events": [ { "local_id": "LOCALID_ARENA_ATTENDANT", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 7, "y": 7, "elevation": 0, diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/map.json b/data/maps/BattleFrontier_BattlePalaceLobby/map.json index 3fda9b374..5a033a22e 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/map.json +++ b/data/maps/BattleFrontier_BattlePalaceLobby/map.json @@ -30,7 +30,7 @@ "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 11, "y": 8, "elevation": 0, diff --git a/data/maps/BattleFrontier_Lounge5/map.json b/data/maps/BattleFrontier_Lounge5/map.json index dad4f8025..db428a241 100644 --- a/data/maps/BattleFrontier_Lounge5/map.json +++ b/data/maps/BattleFrontier_Lounge5/map.json @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 6, "y": 5, "elevation": 0, diff --git a/data/maps/BattleFrontier_OutsideEast/map.json b/data/maps/BattleFrontier_OutsideEast/map.json index cb01b8aa1..1cdb431b4 100644 --- a/data/maps/BattleFrontier_OutsideEast/map.json +++ b/data/maps/BattleFrontier_OutsideEast/map.json @@ -74,7 +74,7 @@ "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 37, "y": 32, "elevation": 0, @@ -283,7 +283,7 @@ "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 33, "y": 14, "elevation": 0, diff --git a/data/maps/CeladonCity_Condominiums_3F/map.json b/data/maps/CeladonCity_Condominiums_3F/map.json index 7b62fae53..cf128ed84 100644 --- a/data/maps/CeladonCity_Condominiums_3F/map.json +++ b/data/maps/CeladonCity_Condominiums_3F/map.json @@ -45,7 +45,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC", "x": 4, "y": 10, "elevation": 3, diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json index 20405357b..f080da01d 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json @@ -17,7 +17,7 @@ "object_events": [ { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 3, "y": 5, "elevation": 3, diff --git a/data/maps/CinnabarIsland_Gym/map.json b/data/maps/CinnabarIsland_Gym/map.json index ba4ec7d86..21d6325e3 100644 --- a/data/maps/CinnabarIsland_Gym/map.json +++ b/data/maps/CinnabarIsland_Gym/map.json @@ -18,7 +18,7 @@ { "local_id": "LOCALID_QUINN", "type": "object", - "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC", "x": 25, "y": 11, "elevation": 3, @@ -62,7 +62,7 @@ { "local_id": "LOCALID_RAMON", "type": "object", - "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC", "x": 16, "y": 11, "elevation": 3, @@ -92,7 +92,7 @@ { "local_id": "LOCALID_DUSTY", "type": "object", - "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC", "x": 4, "y": 19, "elevation": 3, diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json index 415475d3c..462c7c7dd 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json @@ -17,7 +17,7 @@ "object_events": [ { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC", "x": 5, "y": 4, "elevation": 3, diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json index 88f8487a9..de073e140 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json @@ -75,7 +75,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 23, "y": 13, "elevation": 3, diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json index 4598752e4..f8f88fb93 100644 --- a/data/maps/MtEmber_Exterior/map.json +++ b/data/maps/MtEmber_Exterior/map.json @@ -61,7 +61,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_CRUSH_GIRL", "x": 22, "y": 35, "elevation": 3, diff --git a/data/maps/OneIsland_KindleRoad/map.json b/data/maps/OneIsland_KindleRoad/map.json index 0c5ffea73..52a269f45 100644 --- a/data/maps/OneIsland_KindleRoad/map.json +++ b/data/maps/OneIsland_KindleRoad/map.json @@ -93,7 +93,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_CRUSH_GIRL", "x": 9, "y": 53, "elevation": 3, @@ -107,7 +107,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_CRUSH_GIRL", "x": 18, "y": 105, "elevation": 4, @@ -121,7 +121,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 16, "y": 64, "elevation": 3, @@ -135,7 +135,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 11, "y": 64, "elevation": 3, @@ -177,7 +177,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 8, "y": 68, "elevation": 3, @@ -191,7 +191,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_CRUSH_GIRL", "x": 9, "y": 68, "elevation": 3, diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json index a792a46b8..e04e56377 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json @@ -45,7 +45,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 6, "y": 8, "elevation": 3, diff --git a/data/maps/OneIsland_PokemonCenter_1F/map.json b/data/maps/OneIsland_PokemonCenter_1F/map.json index d5a27329a..713c9cae1 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/map.json +++ b/data/maps/OneIsland_PokemonCenter_1F/map.json @@ -90,7 +90,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_CRUSH_GIRL", "x": 7, "y": 4, "elevation": 3, @@ -99,7 +99,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "OneIsland_PokemonCenter_1F_EventScript_BattleGirl", + "script": "OneIsland_PokemonCenter_1F_EventScript_CrushGirl", "flag": "0" } ], diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index 7ee71de1a..0907948f5 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -379,15 +379,15 @@ OneIsland_PokemonCenter_1F_EventScript_Hiker:: msgbox OneIsland_PokemonCenter_1F_Text_EnormousVolcanoOnIsland, MSGBOX_NPC end -OneIsland_PokemonCenter_1F_EventScript_BattleGirl:: +OneIsland_PokemonCenter_1F_EventScript_CrushGirl:: lock faceplayer - goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, OneIsland_PokemonCenter_1F_EventScript_BattleGirlHoennLinked + goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, OneIsland_PokemonCenter_1F_EventScript_CrushGirlHoennLinked msgbox OneIsland_PokemonCenter_1F_Text_WishICouldTradeWithBoyfriend release end -OneIsland_PokemonCenter_1F_EventScript_BattleGirlHoennLinked:: +OneIsland_PokemonCenter_1F_EventScript_CrushGirlHoennLinked:: msgbox OneIsland_PokemonCenter_1F_Text_TradedWithFarAwayBoyfriend release end diff --git a/data/maps/PokemonMansion_2F/map.json b/data/maps/PokemonMansion_2F/map.json index 8fefed6a6..933d8bd84 100644 --- a/data/maps/PokemonMansion_2F/map.json +++ b/data/maps/PokemonMansion_2F/map.json @@ -17,7 +17,7 @@ "object_events": [ { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC", "x": 5, "y": 23, "elevation": 3, diff --git a/data/maps/PokemonMansion_3F/map.json b/data/maps/PokemonMansion_3F/map.json index 13c7ea294..259fe7df0 100644 --- a/data/maps/PokemonMansion_3F/map.json +++ b/data/maps/PokemonMansion_3F/map.json @@ -17,7 +17,7 @@ "object_events": [ { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC", "x": 7, "y": 13, "elevation": 3, diff --git a/data/maps/PokemonMansion_B1F/map.json b/data/maps/PokemonMansion_B1F/map.json index b68160cf6..57c0154d7 100644 --- a/data/maps/PokemonMansion_B1F/map.json +++ b/data/maps/PokemonMansion_B1F/map.json @@ -31,7 +31,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC", "x": 20, "y": 25, "elevation": 3, diff --git a/data/maps/RockTunnel_1F/map.json b/data/maps/RockTunnel_1F/map.json index 8c56778c2..02fa844fb 100644 --- a/data/maps/RockTunnel_1F/map.json +++ b/data/maps/RockTunnel_1F/map.json @@ -101,7 +101,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC", "x": 27, "y": 10, "elevation": 3, diff --git a/data/maps/RockTunnel_B1F/map.json b/data/maps/RockTunnel_B1F/map.json index b5dac6490..7aafaf7c3 100644 --- a/data/maps/RockTunnel_B1F/map.json +++ b/data/maps/RockTunnel_B1F/map.json @@ -17,7 +17,7 @@ "object_events": [ { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC", "x": 2, "y": 6, "elevation": 3, @@ -87,7 +87,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC", "x": 23, "y": 23, "elevation": 3, @@ -115,7 +115,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC", "x": 29, "y": 35, "elevation": 3, diff --git a/data/maps/Route10/map.json b/data/maps/Route10/map.json index 437843b2a..2c1ab159e 100644 --- a/data/maps/Route10/map.json +++ b/data/maps/Route10/map.json @@ -56,7 +56,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC", "x": 15, "y": 70, "elevation": 3, @@ -84,7 +84,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC", "x": 13, "y": 44, "elevation": 3, diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json index 2b33b5cc6..2380587e6 100644 --- a/data/maps/Route15/map.json +++ b/data/maps/Route15/map.json @@ -182,7 +182,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 39, "y": 7, "elevation": 3, @@ -196,7 +196,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_CRUSH_GIRL", "x": 40, "y": 7, "elevation": 3, diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json index 1e48e610c..684e465f2 100644 --- a/data/maps/Route4/map.json +++ b/data/maps/Route4/map.json @@ -84,7 +84,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 47, "y": 3, "elevation": 3, @@ -98,7 +98,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 50, "y": 3, "elevation": 3, diff --git a/data/maps/SaffronCity/map.json b/data/maps/SaffronCity/map.json index 8e6831a28..2c78e8722 100644 --- a/data/maps/SaffronCity/map.json +++ b/data/maps/SaffronCity/map.json @@ -235,7 +235,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_CRUSH_GIRL", "x": 47, "y": 24, "elevation": 3, @@ -244,7 +244,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SaffronCity_EventScript_BattleGirl", + "script": "SaffronCity_EventScript_CrushGirl", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" } ], diff --git a/data/maps/SaffronCity_Dojo/map.json b/data/maps/SaffronCity_Dojo/map.json index 1575a3c0b..95cd83275 100644 --- a/data/maps/SaffronCity_Dojo/map.json +++ b/data/maps/SaffronCity_Dojo/map.json @@ -17,7 +17,7 @@ "object_events": [ { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 11, "y": 10, "elevation": 3, @@ -31,7 +31,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 1, "y": 10, "elevation": 3, @@ -45,7 +45,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 11, "y": 8, "elevation": 3, @@ -59,7 +59,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 1, "y": 8, "elevation": 3, @@ -74,7 +74,7 @@ { "local_id": "LOCALID_KARATE_MASTER", "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 6, "y": 5, "elevation": 3, diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json index a1f3687f6..16f6334c9 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json @@ -18,7 +18,7 @@ { "local_id": "LOCALID_TRAINER_FAN_CLUB_BATTLE_GIRL", "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_CRUSH_GIRL", "x": 7, "y": 13, "elevation": 3, @@ -27,7 +27,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirl", + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_CrushGirl", "flag": "0" }, { @@ -123,7 +123,7 @@ { "local_id": "LOCALID_TRAINER_FAN_CLUB_BLACK_BELT", "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 5, "y": 11, "elevation": 3, @@ -133,7 +133,7 @@ "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_PokemonTrainerFanClub_EventScript_BlackBelt", - "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_BLACKBELT" + "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_BLACK_BELT" }, { "type": "object", diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc index 76b0ace0f..f714cf2c5 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc @@ -155,38 +155,38 @@ SaffronCity_PokemonTrainerFanClub_EventScript_SetMemberPosForFirstMeeting:: call SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember8ToFarTable end -SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirl:: +SaffronCity_PokemonTrainerFanClub_EventScript_CrushGirl:: lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER1 special Script_BufferFanClubTrainerName - goto_if_eq VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0, SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayerNotChampion + goto_if_eq VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0, SaffronCity_PokemonTrainerFanClub_EventScript_CrushGirlPlayerNotChampion specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer - goto_if_eq VAR_RESULT, TRUE, SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayersFan + goto_if_eq VAR_RESULT, TRUE, SaffronCity_PokemonTrainerFanClub_EventScript_CrushGirlPlayersFan specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub - goto_if_eq VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1), SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyNonFan + goto_if_eq VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1), SaffronCity_PokemonTrainerFanClub_EventScript_CrushGirlOnlyNonFan msgbox SaffronCity_PokemonTrainerFanClub_Text_WasYourFanNotAnymore release end -SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayersFan:: +SaffronCity_PokemonTrainerFanClub_EventScript_CrushGirlPlayersFan:: specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub - goto_if_eq VAR_RESULT, 1, SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyFan + goto_if_eq VAR_RESULT, 1, SaffronCity_PokemonTrainerFanClub_EventScript_CrushGirlOnlyFan msgbox SaffronCity_PokemonTrainerFanClub_Text_AlwaysCheerForYou release end -SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyFan:: +SaffronCity_PokemonTrainerFanClub_EventScript_CrushGirlOnlyFan:: msgbox SaffronCity_PokemonTrainerFanClub_Text_IllAlwaysBelieveInYou release end -SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyNonFan:: +SaffronCity_PokemonTrainerFanClub_EventScript_CrushGirlOnlyNonFan:: msgbox SaffronCity_PokemonTrainerFanClub_Text_EveryonesYourFanButICantBe release end -SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayerNotChampion:: +SaffronCity_PokemonTrainerFanClub_EventScript_CrushGirlPlayerNotChampion:: msgbox SaffronCity_PokemonTrainerFanClub_Text_TrainersCoolWhenBattling release end diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json index 5882a36f9..90ba5a0d7 100644 --- a/data/maps/SevenIsland_SevaultCanyon/map.json +++ b/data/maps/SevenIsland_SevaultCanyon/map.json @@ -28,7 +28,7 @@ "object_events": [ { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_CRUSH_GIRL", "x": 13, "y": 43, "elevation": 3, @@ -294,7 +294,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 8, "y": 26, "elevation": 3, diff --git a/data/maps/SixIsland_RuinValley/map.json b/data/maps/SixIsland_RuinValley/map.json index fe47b1c65..f58571521 100644 --- a/data/maps/SixIsland_RuinValley/map.json +++ b/data/maps/SixIsland_RuinValley/map.json @@ -94,7 +94,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC", "x": 21, "y": 29, "elevation": 5, diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json index 48e9162b0..681db3a9f 100644 --- a/data/maps/TwoIsland/map.json +++ b/data/maps/TwoIsland/map.json @@ -79,7 +79,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC", "x": 27, "y": 6, "elevation": 3, @@ -88,8 +88,8 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "TwoIsland_EventScript_SuperNerd", - "flag": "FLAG_HIDE_TWO_ISLAND_SUPER_NERD" + "script": "TwoIsland_EventScript_PokeManiac", + "flag": "FLAG_HIDE_TWO_ISLAND_POKE_MANIAC" }, { "type": "object", diff --git a/data/maps/TwoIsland/scripts.inc b/data/maps/TwoIsland/scripts.inc index 5e8a768d7..7d25acfe7 100644 --- a/data/maps/TwoIsland/scripts.inc +++ b/data/maps/TwoIsland/scripts.inc @@ -54,7 +54,7 @@ TwoIsland_EventScript_SetShopExpanded2:: TwoIsland_EventScript_SetShopExpanded3:: setvar VAR_MAP_SCENE_TWO_ISLAND, 4 - clearflag FLAG_HIDE_TWO_ISLAND_SUPER_NERD + clearflag FLAG_HIDE_TWO_ISLAND_POKE_MANIAC return TwoIsland_EventScript_Clerk:: @@ -192,7 +192,7 @@ TwoIsland_EventScript_Beauty:: release end -TwoIsland_EventScript_SuperNerd:: +TwoIsland_EventScript_PokeManiac:: msgbox TwoIsland_Text_BuyRareItemsHere, MSGBOX_NPC end diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json index 968726ccc..753eb93bb 100644 --- a/data/maps/VictoryRoad_2F/map.json +++ b/data/maps/VictoryRoad_2F/map.json @@ -17,7 +17,7 @@ "object_events": [ { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC", "x": 7, "y": 4, "elevation": 3, @@ -31,7 +31,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 20, "y": 11, "elevation": 4, diff --git a/data/maps/ViridianCity_Gym/map.json b/data/maps/ViridianCity_Gym/map.json index db4002398..916a821a0 100644 --- a/data/maps/ViridianCity_Gym/map.json +++ b/data/maps/ViridianCity_Gym/map.json @@ -17,7 +17,7 @@ "object_events": [ { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 10, "y": 2, "elevation": 3, @@ -45,7 +45,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 11, "y": 14, "elevation": 3, @@ -87,7 +87,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 3, "y": 11, "elevation": 3, diff --git a/data/scripts/fame_checker.inc b/data/scripts/fame_checker.inc index c15a88101..a84b23091 100644 --- a/data/scripts/fame_checker.inc +++ b/data/scripts/fame_checker.inc @@ -211,7 +211,7 @@ EventScript_LanceUnused:: release end -SaffronCity_EventScript_BattleGirlUnused:: +SaffronCity_EventScript_CrushGirlUnused:: lock faceplayer famechecker FAMECHECKER_LANCE, 1 @@ -219,7 +219,7 @@ SaffronCity_EventScript_BattleGirlUnused:: release end -SaffronCity_EventScript_BattleGirl:: +SaffronCity_EventScript_CrushGirl:: lock faceplayer famechecker FAMECHECKER_LANCE, 2 diff --git a/firered_switch.sha1 b/firered_switch.sha1 new file mode 100644 index 000000000..715fa7b9c --- /dev/null +++ b/firered_switch.sha1 @@ -0,0 +1 @@ +baa452d0b24629dd7782cfc07a8984085dde1311 pokefirered_switch.gba diff --git a/graphics/cave_transition/enter.pal b/graphics/cave_transition/enter.pal deleted file mode 100644 index fea15a176..000000000 --- a/graphics/cave_transition/enter.pal +++ /dev/null @@ -1,11 +0,0 @@ -JASC-PAL -0100 -8 -148 197 172 -16 16 16 -32 32 32 -49 49 49 -65 65 65 -82 82 82 -98 98 98 -115 115 115 diff --git a/graphics/cave_transition/exit.pal b/graphics/cave_transition/exit.pal deleted file mode 100644 index 09eb37624..000000000 --- a/graphics/cave_transition/exit.pal +++ /dev/null @@ -1,11 +0,0 @@ -JASC-PAL -0100 -8 -131 131 131 -148 148 148 -164 164 164 -180 180 180 -197 197 197 -213 213 213 -230 230 230 -255 255 255 diff --git a/graphics/object_events/pics/people/blackbelt.png b/graphics/object_events/pics/people/black_belt.png similarity index 100% rename from graphics/object_events/pics/people/blackbelt.png rename to graphics/object_events/pics/people/black_belt.png diff --git a/graphics/object_events/pics/people/battle_girl.png b/graphics/object_events/pics/people/crush_girl.png similarity index 100% rename from graphics/object_events/pics/people/battle_girl.png rename to graphics/object_events/pics/people/crush_girl.png diff --git a/graphics/object_events/pics/people/super_nerd.png b/graphics/object_events/pics/people/poke_maniac.png similarity index 100% rename from graphics/object_events/pics/people/super_nerd.png rename to graphics/object_events/pics/people/poke_maniac.png diff --git a/include/AgbRfu_LinkManager.h b/include/AgbRfu_LinkManager.h index 3b38b85fc..b3b1f43ee 100644 --- a/include/AgbRfu_LinkManager.h +++ b/include/AgbRfu_LinkManager.h @@ -23,8 +23,13 @@ #define PCSWITCH_FORCE_SP_START 0x09 // Period for which parent-child switching search specified +#if REVISION >= 0xA +#define PCSWITCH_ALL_PERIOD 180 // Entire cycle 180 frames +#define PCSWITCH_SP_PERIOD 65 // Child period 40 frames +#else #define PCSWITCH_ALL_PERIOD 180 // Entire cycle 180 frames #define PCSWITCH_SP_PERIOD 40 // Child period 40 frames +#endif // Error code returned by Link Manager API (rfu_LMAN_...return value of function) #define LMAN_ERROR_MANAGER_BUSY 1 // Link Manager is already running. @@ -200,6 +205,10 @@ u8 rfu_LMAN_setLinkRecovery(u8 enable_flag, u16 recovery_period); void rfu_LMAN_manager_entity(u32 rand); void rfu_LMAN_syncVBlank(void); u8 rfu_LMAN_initializeManager(void (*LMAN_callback_p)(u8, u8), void (*MSC_callback_p)(u16)); +#if REVISION >= 0xA +void rfu_LMAN_forceChangeSP(bool8 child); +#else void rfu_LMAN_forceChangeSP(void); +#endif #endif //GUARD_LINKMANAGER_H diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h index 99823861e..4b7917e9c 100644 --- a/include/constants/event_objects.h +++ b/include/constants/event_objects.h @@ -27,7 +27,7 @@ #define OBJ_EVENT_GFX_SITTING_BOY 21 #define OBJ_EVENT_GFX_LASS 22 #define OBJ_EVENT_GFX_WOMAN_1 23 -#define OBJ_EVENT_GFX_BATTLE_GIRL 24 +#define OBJ_EVENT_GFX_CRUSH_GIRL 24 #define OBJ_EVENT_GFX_MAN 25 #define OBJ_EVENT_GFX_ROCKER 26 #define OBJ_EVENT_GFX_FAT_MAN 27 @@ -55,9 +55,9 @@ #define OBJ_EVENT_GFX_ROCKET_M 49 #define OBJ_EVENT_GFX_ROCKET_F 50 #define OBJ_EVENT_GFX_GBA_KID 51 -#define OBJ_EVENT_GFX_SUPER_NERD 52 +#define OBJ_EVENT_GFX_POKE_MANIAC 52 #define OBJ_EVENT_GFX_BIKER 53 -#define OBJ_EVENT_GFX_BLACKBELT 54 +#define OBJ_EVENT_GFX_BLACK_BELT 54 #define OBJ_EVENT_GFX_SCIENTIST 55 #define OBJ_EVENT_GFX_HIKER 56 #define OBJ_EVENT_GFX_FISHER 57 diff --git a/include/constants/flags.h b/include/constants/flags.h index 2d3d8bde6..62caf31c5 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -121,7 +121,7 @@ #define FLAG_HIDE_UNION_ROOM_PLAYER_7 0x069 #define FLAG_HIDE_UNION_ROOM_PLAYER_8 0x06A #define FLAG_HIDE_CINNABAR_SEAGALLOP 0x06B -#define FLAG_HIDE_SAFFRON_FAN_CLUB_BLACKBELT 0x06C +#define FLAG_HIDE_SAFFRON_FAN_CLUB_BLACK_BELT 0x06C #define FLAG_HIDE_SAFFRON_FAN_CLUB_ROCKER 0x06D #define FLAG_HIDE_SAFFRON_FAN_CLUB_WOMAN 0x06E #define FLAG_HIDE_SAFFRON_FAN_CLUB_BEAUTY 0x06F @@ -138,7 +138,7 @@ #define FLAG_HIDE_LOSTELLE_IN_BERRY_FOREST 0x07A #define FLAG_HIDE_TWO_ISLAND_WOMAN 0x07B #define FLAG_HIDE_TWO_ISLAND_BEAUTY 0x07C -#define FLAG_HIDE_TWO_ISLAND_SUPER_NERD 0x07D +#define FLAG_HIDE_TWO_ISLAND_POKE_MANIAC 0x07D #define FLAG_HIDE_THREE_ISLAND_ANTIBIKERS 0x07E #define FLAG_0x07F 0x07F #define FLAG_HIDE_ROUTE_16_SNORLAX 0x080 diff --git a/include/constants/union_room.h b/include/constants/union_room.h index 94c8eef67..0b273f6b8 100644 --- a/include/constants/union_room.h +++ b/include/constants/union_room.h @@ -7,9 +7,10 @@ // exceed RFU_CHILD_MAX (4), for a total of 5 including the player. #define MAX_UNION_ROOM_LEADERS 8 -#define UNION_ROOM_SPAWN_NONE 0 -#define UNION_ROOM_SPAWN_IN 1 -#define UNION_ROOM_SPAWN_OUT 2 +#define UNION_ROOM_SPAWN_NONE 0 +#define UNION_ROOM_SPAWN_IN 1 +#define UNION_ROOM_SPAWN_OUT 2 +#define UNION_ROOM_SPAWN_OUT_SOON 3 // Equivalent to SPAWN_OUT in revision 10 - probably SPAWN_OUT means disconnected in a "connection reset" way? #define UNION_ROOM_MAX_LEVEL 30 diff --git a/include/gba/isagbprint.h b/include/gba/isagbprint.h index de14b289e..9c79e03e8 100644 --- a/include/gba/isagbprint.h +++ b/include/gba/isagbprint.h @@ -9,7 +9,7 @@ #define MGBA_LOG_INFO (3) #define MGBA_LOG_DEBUG (4) -#ifdef NDEBUG +#if defined(NDEBUG) && !(REVISION >= 0xA) #define DebugPrintf(pBuf, ...) #define DebugPrintfLevel(level, pBuf, ...) #define MgbaOpen() diff --git a/include/link_rfu.h b/include/link_rfu.h index 50a3827a5..9b5f61eee 100644 --- a/include/link_rfu.h +++ b/include/link_rfu.h @@ -294,6 +294,7 @@ bool32 WaitRfuState(bool32 force); bool32 HasTrainerLeftPartnersList(u16 trainerId, const u8 *trainerName); void SendRfuStatusToPartner(u8 status, u16 trainerId, const u8 *name); u32 WaitSendRfuStatusToPartner(u16 trainerId, const u8 *name); +s32 GetJoinGroupStatus(void); void SetHostRfuGameData(u8 activity, u32 partnerInfo, bool32 startedActivity); void InitializeRfuLinkManager_LinkLeader(u32 availSlots); void RequestDisconnectSlotByTrainerNameAndId(const u8 *trainerName, u16 trainerId); diff --git a/include/sloopsvc.h b/include/sloopsvc.h new file mode 100644 index 000000000..1ba777853 --- /dev/null +++ b/include/sloopsvc.h @@ -0,0 +1,36 @@ +#ifndef GUARD_SLOOPSVC_H +#define GUARD_SLOOPSVC_H + +#if REVISION >= 0xA + +#define SVC4B_EXIT_EARLY (1 << 0) +#define SVC4B_RESEED_RNG (1 << 1) + +void svc_40(void); +void svc_41(void); + +void svc_47(void); +void svc_42(void); +u32 svc_49(void); +void svc_45_rfu_link_status(void); +u32 svc_4a(void); +void svc_43(u16 pid); +void svc_44(void); +u32 svc_53(void); +u32 svc_51(void); +u32 svc_4b(void); +void svc_WriteSector(u8 sector, u8* data); +void svc_ReplaceSector(u8 sector, u8* data); +void svc_FinishSave(void); +u32 svc_CommsAllowedByParentalControls(void); +u32 svc_BadWordCheck(u8* str); +void svc_4f(u32 arg); +u32 svc_50(void); +void svc_SetSaveBlock2(struct SaveBlock2* saveBlock2); +void svc_stubbed(void); +void svc_SetStarter(u32 species); +void svc_SetActivity(u32 activity); +void svc_IncrementLinkError(void); + +#endif +#endif \ No newline at end of file diff --git a/ld_script_modern.ld b/ld_script_modern.ld index aed752df3..af1e2ab19 100644 --- a/ld_script_modern.ld +++ b/ld_script_modern.ld @@ -123,6 +123,9 @@ SECTIONS { .debug_loc 0 : { *(.debug_loc) } .debug_macinfo 0 : { *(.debug_macinfo) } + /* DWARF 5*/ + .debug_line_str 0 : { *(.debug_line_str) } + /* Discard everything not specifically mentioned above. */ /DISCARD/ : { diff --git a/ld_script_rev10.ld b/ld_script_rev10.ld new file mode 100644 index 000000000..4eb3bc2ee --- /dev/null +++ b/ld_script_rev10.ld @@ -0,0 +1,1062 @@ +gNumMusicPlayers = 4; +gMaxLines = 0; + +MEMORY +{ + EWRAM (rwx) : ORIGIN = 0x2000000, LENGTH = 256K + IWRAM (rwx) : ORIGIN = 0x3000000, LENGTH = 32K + ROM (rx) : ORIGIN = 0x8000000, LENGTH = 32M +} + +SECTIONS { + + ewram 0x2000000 (NOLOAD) : + ALIGN(4) + { + gHeap = .; + + . = 0x1C000; + + INCLUDE "sym_ewram_rev10.ld" + src/*.o(ewram_data); + + *libc.a:impure.o(.data); + *libc.a:locale.o(.data); + *libc.a:mallocr.o(.data); + } > EWRAM + + iwram 0x3000000 (NOLOAD) : + ALIGN(4) + { + /* .bss starts at 0x3000000 */ + INCLUDE "sym_bss_rev10.ld" + src/*.o(.bss); + data/*.o(.bss); + + /* .bss.code starts at 0x30028E0 */ + src/m4a.o(.bss.code); + + /* COMMON starts at 0x30030E0 */ + INCLUDE "sym_common_rev10.ld" + src/*.o(COMMON); + + *libc.a:sbrkr.o(COMMON); + end = .; + } > IWRAM + + /* BEGIN ROM DATA */ + . = 0x8000000; + + .text : + ALIGN(4) + { + src/rom_header.o(.text); + src/rom_header_gf.o(.text*); + src/crt0.o(.text); + src/main.o(.text); + src/gpu_regs.o(.text); + src/dma3_manager.o(.text); + src/bg.o(.text); + src/malloc.o(.text); + src/text_printer.o(.text); + src/window.o(.text); + src/blit.o(.text); + src/window_8bpp.o(.text); + src/librfu_stwi.o(.text); + src/librfu_rfu.o(.text); + src/text.o(.text); + src/sprite.o(.text); + src/sloopsvc.o(.text); + src/string_util.o(.text); + src/link.o(.text); + src/multiboot.o(.text); + src/main_menu.o(.text); + src/battle_controllers.o(.text); + src/decompress.o(.text); + src/battle_bg.o(.text); + src/battle_main.o(.text); + src/battle_util.o(.text); + src/battle_script_commands.o(.text); + src/battle_util2.o(.text); + src/battle_controller_player.o(.text); + src/battle_gfx_sfx_util.o(.text); + src/battle_controller_opponent.o(.text); + src/battle_ai_switch_items.o(.text); + src/battle_controller_link_opponent.o(.text); + src/pokemon.o(.text); + src/trig.o(.text); + src/random.o(.text); + src/util.o(.text); + src/blend_palette.o(.text); + src/daycare.o(.text); + src/battle_interface.o(.text); + src/battle_anim_smokescreen.o(.text); + src/pokeball.o(.text); + src/load_save.o(.text); + src/trade.o(.text); + src/trade_scene.o(.text); + src/play_time.o(.text); + src/new_game.o(.text); + src/overworld.o(.text); + src/fieldmap.o(.text); + src/metatile_behavior.o(.text); + src/field_camera.o(.text); + src/field_door.o(.text); + src/field_player_avatar.o(.text); + src/event_object_movement.o(.text); + src/field_message_box.o(.text); + src/event_object_lock.o(.text); + src/text_window_graphics.o(.text); + src/script.o(.text); + src/scrcmd.o(.text); + src/field_control_avatar.o(.text); + src/event_data.o(.text); + src/coord_event_weather.o(.text); + src/field_tasks.o(.text); + src/start_menu.o(.text); + src/tileset_anims.o(.text); + src/palette.o(.text); + src/sound.o(.text); + src/battle_anim.o(.text); + src/battle_anim_mons.o(.text); + src/task.o(.text); + src/reshow_battle_screen.o(.text); + src/battle_anim_status_effects.o(.text); + src/title_screen.o(.text); + src/reset_save_heap.o(.text); + src/field_weather.o(.text); + src/field_weather_util.o(.text); + src/field_weather_effects.o(.text); + src/field_fadetransition.o(.text); + src/field_screen_effect.o(.text); + src/battle_setup.o(.text); + src/cable_club.o(.text); + src/trainer_see.o(.text); + src/wild_encounter.o(.text); + src/field_effect.o(.text); + src/scanline_effect.o(.text); + src/option_menu.o(.text); + src/pokedex.o(.text); + src/trainer_card.o(.text); + src/pokemon_storage_system.o(.text); + src/pokemon_storage_system_menu.o(.text); + src/pokemon_storage_system_tasks.o(.text); + src/pokemon_storage_system_graphics.o(.text); + src/pokemon_storage_system_data.o(.text); + src/pokemon_storage_system_misc.o(.text); + src/pokemon_icon.o(.text); + src/script_movement.o(.text); + src/fldeff_cut.o(.text); + src/mail_data.o(.text); + src/map_name_popup.o(.text); + src/item_menu_icons.o(.text); + src/battle_anim_mon_movement.o(.text); + src/item.o(.text); + src/shop.o(.text); + src/special_field_anim.o(.text); + src/berry.o(.text); + src/script_menu.o(.text); + src/naming_screen.o(.text); + src/money.o(.text); + src/script_pokemon_util.o(.text); + src/field_poison.o(.text); + src/pokemon_size_record.o(.text); + src/pc_screen_effect.o(.text); + src/fldeff_poison.o(.text); + src/fldeff_berrytree.o(.text); + src/field_special_scene.o(.text); + src/safari_zone.o(.text); + src/item_use.o(.text); + src/battle_anim_effects_1.o(.text); + src/battle_anim_effects_2.o(.text); + src/battle_anim_water.o(.text); + src/battle_anim_fire.o(.text); + src/battle_anim_electric.o(.text); + src/battle_anim_ice.o(.text); + src/battle_anim_fight.o(.text); + src/battle_anim_poison.o(.text); + src/battle_anim_flying.o(.text); + src/battle_anim_psychic.o(.text); + src/battle_anim_bug.o(.text); + src/battle_anim_rock.o(.text); + src/battle_anim_ghost.o(.text); + src/battle_anim_dragon.o(.text); + src/battle_anim_dark.o(.text); + src/battle_anim_ground.o(.text); + src/battle_anim_normal.o(.text); + src/battle_anim_utility_funcs.o(.text); + src/battle_intro.o(.text); + src/bike.o(.text); + src/easy_chat.o(.text); + src/mon_markings.o(.text); + src/mail.o(.text); + src/menu_helpers.o(.text); + src/party_menu_specials.o(.text); + src/heal_location.o(.text); + src/region_map.o(.text); + src/image_processing_effects.o(.text); + src/battle_ai_script_commands.o(.text); + src/fldeff_rocksmash.o(.text); + src/fldeff_dig.o(.text); + src/fldeff_flash.o(.text); + src/post_battle_event_funcs.o(.text); + src/prof_pc.o(.text); + src/hof_pc.o(.text); + src/field_specials.o(.text); + src/battle_records.o(.text); + src/evolution_scene.o(.text); + src/coins.o(.text); + src/fldeff_strength.o(.text); + src/battle_transition.o(.text); + src/battle_controller_link_partner.o(.text); + src/battle_message.o(.text); + src/math_util.o(.text); + src/palette_util.o(.text); + src/cable_car_util.o(.text); + src/save.o(.text); + src/mystery_event_script.o(.text); + src/field_effect_helpers.o(.text); + src/battle_anim_sound_tasks.o(.text); + src/battle_controller_safari.o(.text); + src/fldeff_sweetscent.o(.text); + src/battle_anim_effects_3.o(.text); + src/learn_move.o(.text); + src/fldeff_softboiled.o(.text); + src/battle_tower.o(.text); + src/battle_controller_oak_old_man.o(.text); + src/player_pc.o(.text); + src/intro.o(.text); + src/battle_anim_special.o(.text); + src/hall_of_fame.o(.text); + src/credits.o(.text); + src/diploma.o(.text); + src/save_failed_screen.o(.text); + src/clear_save_data_screen.o(.text); + src/evolution_graphics.o(.text); + src/fldeff_teleport.o(.text); + src/new_menu_helpers.o(.text); + src/tilemap_util.o(.text); + src/save_menu_util.o(.text); + src/map_preview_screen.o(.text); + src/link_rfu_2.o(.text); + src/link_rfu_3.o(.text); + src/AgbRfu_LinkManager.o(.text); + src/easy_chat_2.o(.text); + src/easy_chat_3.o(.text); + src/pokedex_screen.o(.text); + src/list_menu.o(.text); + src/item_menu.o(.text); + src/save_location.o(.text); + src/bag.o(.text); + src/trainer_pokemon_sprites.o(.text); + src/vs_seeker.o(.text); + src/item_pc.o(.text); + src/mailbox_pc.o(.text); + src/menu.o(.text); + src/quest_log.o(.text); + src/help_message.o(.text); + src/trainer_fan_club.o(.text); + src/quest_log_events.o(.text); + src/union_room.o(.text); + src/union_room_player_avatar.o(.text); + src/union_room_battle.o(.text); + src/pokemon_special_anim.o(.text); + src/pokemon_special_anim_scene.o(.text); + src/party_menu.o(.text); + src/union_room_chat.o(.text); + src/union_room_chat_display.o(.text); + src/union_room_chat_objects.o(.text); + src/help_system.o(.text); + src/quest_log_battle.o(.text); + src/fame_checker.o(.text); + src/menu2.o(.text); + src/oak_speech.o(.text); + src/tm_case.o(.text); + src/menu_indicators.o(.text); + src/pokedex_area_markers.o(.text); + src/pokemon_summary_screen.o(.text); + src/help_system_util.o(.text); + src/wild_pokemon_area.o(.text); + src/dynamic_placeholder_text_util.o(.text); + src/berry_pouch.o(.text); + src/itemfinder.o(.text); + src/buy_menu_helpers.o(.text); + src/slot_machine.o(.text); + src/roamer.o(.text); + src/mystery_gift_menu.o(.text); + src/ereader_screen.o(.text); + src/mystery_gift.o(.text); + src/mystery_gift_link.o(.text); + src/mystery_gift_client.o(.text); + src/mystery_gift_server.o(.text); + src/mystery_gift_show_card.o(.text); + src/mystery_gift_show_news.o(.text); + src/wonder_news.o(.text); + src/seagallop.o(.text); + src/pokemon_jump.o(.text); + src/berry_crush.o(.text); + src/wireless_communication_status_screen.o(.text); + src/braille_text.o(.text); + src/text_window.o(.text); + src/quest_log_player.o(.text); + src/dodrio_berry_picking.o(.text); + src/battle_controller_pokedude.o(.text); + src/quest_log_objects.o(.text); + src/dodrio_berry_picking_comm.o(.text); + src/teachy_tv.o(.text); + src/ereader_helpers.o(.text); + src/digit_obj_util.o(.text); + src/ss_anne.o(.text); + src/cereader_tool.o(.text); + src/renewable_hidden_items.o(.text); + src/trainer_tower.o(.text); + src/berry_powder.o(.text); + src/minigame_countdown.o(.text); + src/berry_fix_program.o(.text); + } > ROM =0 + + script_data : + ALIGN(4) + { + data/event_scripts.o(script_data); + data/battle_anim_scripts.o(script_data); + data/battle_scripts_1.o(script_data); + data/field_effect_scripts.o(script_data); + data/battle_scripts_2.o(script_data); + data/battle_ai_scripts.o(script_data); + data/mystery_event_script_cmd_table.o(script_data); + } > ROM =0 + + lib_text : + ALIGN(4) + { + src/libgcnmultiboot.o(.text); + src/m4a_1.o(.text); + src/m4a.o(.text); + src/agb_flash.o(.text); + src/agb_flash_1m.o(.text); + src/agb_flash_mx.o(.text); + src/agb_flash_le.o(.text); + src/librfu_sio32id.o(.text); + src/librfu_intr.o(.text); + src/isagbprn.o(.text); + src/libagbsyscall.o(.text); + *libgcc.a:_call_via_rX.o(.text); + *libgcc.a:_divdi3.o(.text); + *libgcc.a:_divsi3.o(.text); + *libgcc.a:_dvmd_tls.o(.text); + *libgcc.a:_fixunsdfsi.o(.text); + *libgcc.a:_modsi3.o(.text); + *libgcc.a:_muldi3.o(.text); + *libgcc.a:_udivdi3.o(.text); + *libgcc.a:_udivsi3.o(.text); + *libgcc.a:_umodsi3.o(.text); + *libgcc.a:dp-bit.o(.text); + *libgcc.a:fp-bit.o(.text); + *libgcc.a:_lshrdi3.o(.text); + *libgcc.a:_negdi2.o(.text); + *libc.a:memcpy.o(.text); + *libc.a:memset.o(.text); + *libc.a:strcmp.o(.text); + *libc.a:strcpy.o(.text); + *libc.a:impure.o(.text); + *libc.a:vsprintf.o(.text); + *libc.a:vfprintf.o(.text); + *libc.a:wsetup.o(.text); + *libc.a:dtoa.o(.text); + *libc.a:fflush.o(.text); + *libc.a:findfp.o(.text); + *libc.a:freer.o(.text); + *libc.a:mtrim.o(.text); + *libc.a:fvwrite.o(.text); + *libc.a:fwalk.o(.text); + *libc.a:locale.o(.text); + *libc.a:makebuf.o(.text); + *libc.a:mallocr.o(.text); + *libc.a:mbtowc_r.o(.text); + *libc.a:memchr.o(.text); + *libc.a:memmove.o(.text); + *libc.a:mlock.o(.text); + *libc.a:mprec.o(.text); + *libc.a:s_isinf.o(.text); + *libc.a:s_isnan.o(.text); + *libc.a:sbrkr.o(.text); + *libc.a:stdio.o(.text); + *libc.a:strlen.o(.text); + *libc.a:syscalls.o(.text); + *libc.a:writer.o(.text); + *libc.a:callocr.o(.text); + *libc.a:closer.o(.text); + *libc.a:errno.o(.text); + *libc.a:fstatr.o(.text); + *libc.a:libcfunc.o(.text); + *libc.a:lseekr.o(.text); + *libc.a:readr.o(.text); + } > ROM =0 + + .rodata : + SUBALIGN(4) + { + src/main.o(.rodata); + src/bg.o(.rodata); + src/malloc.o(.rodata); + src/malloc.o(.rodata.str1.4); + src/text_printer.o(.rodata); + src/window.o(.rodata); + src/librfu_rfu.o(.rodata); + src/text.o(.rodata); + src/sprite.o(.rodata); + src/bg_regs.o(.rodata); + src/sloopsvc.o(.rodata); + src/string_util.o(.rodata); + src/link.o(.rodata); + src/main_menu.o(.rodata); + src/data.o(.rodata); + src/battle_bg.o(.rodata); + src/battle_main.o(.rodata); + src/battle_util.o(.rodata); + src/battle_script_commands.o(.rodata); + src/battle_controller_player.o(.rodata); + src/battle_anim_smokescreen.o(.rodata); + src/battle_controller_opponent.o(.rodata); + src/battle_controller_link_opponent.o(.rodata); + src/pokemon.o(.rodata); + src/trig.o(.rodata); + src/util.o(.rodata); + src/daycare.o(.rodata); + src/battle_gfx_sfx_util.o(.rodata); + src/battle_interface.o(.rodata); + src/pokeball.o(.rodata); + src/trade.o(.rodata); + src/trade_scene.o(.rodata); + src/overworld.o(.rodata); + src/tilesets.o(.rodata); + data/maps.o(.rodata); + src/fieldmap.o(.rodata); + src/metatile_behavior.o(.rodata); + src/field_door.o(.rodata); + src/field_player_avatar.o(.rodata); + src/event_object_movement.o(.rodata); + src/scrcmd.o(.rodata); + src/coord_event_weather.o(.rodata); + src/field_tasks.o(.rodata); + src/start_menu.o(.rodata); + src/tileset_anims.o(.rodata); + src/palette.o(.rodata); + src/sound.o(.rodata); + src/battle_anim.o(.rodata); + src/battle_anim_mons.o(.rodata); + data/map_events.o(.rodata); + src/battle_anim_status_effects.o(.rodata); + src/title_screen.o(.rodata); + src/field_weather.o(.rodata); + src/field_weather_util.o(.rodata); + src/field_weather_effects.o(.rodata); + src/field_screen_effect.o(.rodata); + src/battle_setup.o(.rodata); + src/cable_club.o(.rodata); + src/trainer_see.o(.rodata); + src/wild_encounter.o(.rodata); + src/field_effect.o(.rodata); + src/option_menu.o(.rodata); + src/trainer_card.o(.rodata); + src/pokemon_storage_system_menu.o(.rodata); + src/pokemon_storage_system_tasks.o(.rodata); + src/pokemon_storage_system_graphics.o(.rodata); + src/pokemon_storage_system_data.o(.rodata); + src/pokemon_storage_system_misc.o(.rodata); + src/pokemon_icon.o(.rodata); + src/fldeff_cut.o(.rodata); + src/map_name_popup.o(.rodata); + src/item_menu_icons.o(.rodata); + src/battle_anim_mon_movement.o(.rodata); + src/item.o(.rodata); + src/shop.o(.rodata); + src/special_field_anim.o(.rodata); + src/berry.o(.rodata); + src/script_menu.o(.rodata); + src/naming_screen.o(.rodata); + src/pokemon_size_record.o(.rodata); + src/item_use.o(.rodata); + src/battle_anim_effects_1.o(.rodata); + src/battle_anim_effects_2.o(.rodata); + src/battle_anim_water.o(.rodata); + src/battle_anim_fire.o(.rodata); + src/battle_anim_electric.o(.rodata); + src/battle_anim_ice.o(.rodata); + src/battle_anim_fight.o(.rodata); + src/battle_anim_poison.o(.rodata); + src/battle_anim_flying.o(.rodata); + src/battle_anim_psychic.o(.rodata); + src/battle_anim_bug.o(.rodata); + src/battle_anim_rock.o(.rodata); + src/battle_anim_ghost.o(.rodata); + src/battle_anim_dragon.o(.rodata); + src/battle_anim_dark.o(.rodata); + src/battle_anim_ground.o(.rodata); + src/battle_anim_normal.o(.rodata); + src/battle_anim_utility_funcs.o(.rodata); + src/battle_intro.o(.rodata); + src/bike.o(.rodata); + src/easy_chat.o(.rodata); + src/mon_markings.o(.rodata); + src/mail.o(.rodata); + src/heal_location.o(.rodata); + src/region_map.o(.rodata); + src/image_processing_effects.o(.rodata); + src/battle_ai_script_commands.o(.rodata); + src/fldeff_flash.o(.rodata); + src/field_specials.o(.rodata); + src/battle_records.o(.rodata); + src/evolution_scene.o(.rodata); + src/battle_transition.o(.rodata); + src/battle_controller_link_partner.o(.rodata); + src/battle_message.o(.rodata); + src/save.o(.rodata); + src/field_effect_helpers.o(.rodata); + src/battle_controller_safari.o(.rodata); + src/battle_anim_effects_3.o(.rodata); + src/learn_move.o(.rodata); + src/battle_tower.o(.rodata); + src/battle_controller_oak_old_man.o(.rodata); + src/player_pc.o(.rodata); + src/intro.o(.rodata); + src/battle_anim_special.o(.rodata); + src/hall_of_fame.o(.rodata); + src/credits.o(.rodata); + src/diploma.o(.rodata); + src/strings.o(.rodata); + src/save_failed_screen.o(.rodata); + src/clear_save_data_screen.o(.rodata); + src/evolution_graphics.o(.rodata); + src/new_menu_helpers.o(.rodata); + src/tilemap_util.o(.rodata); + src/map_preview_screen.o(.rodata); + src/link_rfu_2.o(.rodata); + src/link_rfu_3.o(.rodata); + src/easy_chat_2.o(.rodata); + src/easy_chat_3.o(.rodata); + src/pokedex_screen.o(.rodata); + src/list_menu.o(.rodata); + src/item_menu.o(.rodata); + src/save_location.o(.rodata); + src/bag.o(.rodata); + src/trainer_pokemon_sprites.o(.rodata); + src/vs_seeker.o(.rodata); + src/item_pc.o(.rodata); + src/mailbox_pc.o(.rodata); + src/decoration.o(.rodata); + src/menu.o(.rodata); + src/quest_log.o(.rodata); + src/help_message.o(.rodata); + src/trainer_fan_club.o(.rodata); + src/quest_log_events.o(.rodata); + src/union_room.o(.rodata); + src/union_room_player_avatar.o(.rodata); + src/union_room_battle.o(.rodata); + src/union_room_message.o(.rodata); + src/pokemon_special_anim.o(.rodata); + src/pokemon_special_anim_scene.o(.rodata); + src/party_menu.o(.rodata); + src/union_room_chat.o(.rodata); + src/union_room_chat_display.o(.rodata); + src/union_room_chat_objects.o(.rodata); + src/help_system.o(.rodata); + src/fame_checker.o(.rodata); + src/menu2.o(.rodata); + src/oak_speech.o(.rodata); + src/tm_case.o(.rodata); + src/menu_indicators.o(.rodata); + src/pokedex_area_markers.o(.rodata); + src/pokemon_summary_screen.o(.rodata); + src/help_system_util.o(.rodata); + src/wild_pokemon_area.o(.rodata); + src/dynamic_placeholder_text_util.o(.rodata); + src/berry_pouch.o(.rodata); + src/itemfinder.o(.rodata); + src/buy_menu_helpers.o(.rodata); + src/slot_machine.o(.rodata); + src/roamer.o(.rodata); + src/mystery_gift_menu.o(.rodata); + src/ereader_screen.o(.rodata); + src/mystery_gift.o(.rodata); + src/mystery_gift_link.o(.rodata); + src/mystery_gift_client.o(.rodata); + src/mystery_gift_server.o(.rodata); + src/mystery_gift_show_card.o(.rodata); + src/mystery_gift_show_news.o(.rodata); + src/mystery_gift_scripts.o(.rodata); + src/wonder_news.o(.rodata); + src/wonder_news.o(.rodata.str1.4); + src/seagallop.o(.rodata); + src/pokemon_jump.o(.rodata); + src/berry_crush.o(.rodata); + src/wireless_communication_status_screen.o(.rodata); + src/braille_text.o(.rodata); + src/text_window_graphics.o(.rodata); + src/quest_log_player.o(.rodata); + src/dodrio_berry_picking.o(.rodata); + src/battle_controller_pokedude.o(.rodata); + src/teachy_tv.o(.rodata); + src/digit_obj_util.o(.rodata); + src/ss_anne.o(.rodata); + src/cereader_tool.o(.rodata); + src/renewable_hidden_items.o(.rodata); + src/trainer_tower.o(.rodata); + src/minigame_countdown.o(.rodata); + src/berry_fix_program.o(.rodata); + src/keyboard_text.o(.rodata); + src/trainer_tower_sets.o(.rodata); + src/move_descriptions.o(.rodata); + + /* These should not be moved to C files */ + src/mystery_event_msg.o(.rodata); + data/mystery_event_msg.o(.rodata); + src/m4a_tables.o(.rodata); + data/sound_data.o(.rodata); + } > ROM =0 + + song_data : + ALIGN(4) + { + sound/songs/midi/mus_dummy.o(.rodata); + sound/songs/midi/se_use_item.o(.rodata); + sound/songs/midi/se_pc_login.o(.rodata); + sound/songs/midi/se_pc_off.o(.rodata); + sound/songs/midi/se_pc_on.o(.rodata); + sound/songs/midi/se_select.o(.rodata); + sound/songs/midi/se_win_open.o(.rodata); + sound/songs/midi/se_wall_hit.o(.rodata); + sound/songs/midi/se_rs_door.o(.rodata); + sound/songs/midi/se_exit.o(.rodata); + sound/songs/midi/se_ledge.o(.rodata); + sound/songs/midi/se_bike_bell.o(.rodata); + sound/songs/midi/se_not_effective.o(.rodata); + sound/songs/midi/se_effective.o(.rodata); + sound/songs/midi/se_super_effective.o(.rodata); + sound/songs/midi/se_ball_open.o(.rodata); + sound/songs/midi/se_faint.o(.rodata); + sound/songs/midi/se_flee.o(.rodata); + sound/songs/midi/se_sliding_door.o(.rodata); + sound/songs/midi/se_ship.o(.rodata); + sound/songs/midi/se_bang.o(.rodata); + sound/songs/midi/se_pin.o(.rodata); + sound/songs/midi/se_boo.o(.rodata); + sound/songs/midi/se_ball.o(.rodata); + sound/songs/midi/se_contest_place.o(.rodata); + sound/songs/midi/se_success.o(.rodata); + sound/songs/midi/se_failure.o(.rodata); + sound/songs/midi/se_exp.o(.rodata); + sound/songs/midi/se_bike_hop.o(.rodata); + sound/songs/midi/se_switch.o(.rodata); + sound/songs/midi/se_click.o(.rodata); + sound/songs/midi/se_fu_zaku.o(.rodata); + sound/songs/midi/se_contest_condition_lose.o(.rodata); + sound/songs/midi/se_lavaridge_fall_warp.o(.rodata); + sound/songs/midi/se_ice_stairs.o(.rodata); + sound/songs/midi/se_ice_break.o(.rodata); + sound/songs/midi/se_ice_crack.o(.rodata); + sound/songs/midi/se_fall.o(.rodata); + sound/songs/midi/se_unlock.o(.rodata); + sound/songs/midi/se_warp_in.o(.rodata); + sound/songs/midi/se_warp_out.o(.rodata); + sound/songs/midi/se_repel.o(.rodata); + sound/songs/midi/se_rotating_gate.o(.rodata); + sound/songs/midi/se_truck_move.o(.rodata); + sound/songs/midi/se_truck_stop.o(.rodata); + sound/songs/midi/se_truck_unload.o(.rodata); + sound/songs/midi/se_truck_door.o(.rodata); + sound/songs/midi/se_berry_blender.o(.rodata); + sound/songs/midi/se_save.o(.rodata); + sound/songs/midi/se_ball_bounce_1.o(.rodata); + sound/songs/midi/se_ball_bounce_2.o(.rodata); + sound/songs/midi/se_ball_bounce_3.o(.rodata); + sound/songs/midi/se_ball_bounce_4.o(.rodata); + sound/songs/midi/se_ball_trade.o(.rodata); + sound/songs/midi/se_ball_throw.o(.rodata); + sound/songs/midi/se_note_c.o(.rodata); + sound/songs/midi/se_note_d.o(.rodata); + sound/songs/midi/se_note_e.o(.rodata); + sound/songs/midi/se_note_f.o(.rodata); + sound/songs/midi/se_note_g.o(.rodata); + sound/songs/midi/se_note_a.o(.rodata); + sound/songs/midi/se_note_b.o(.rodata); + sound/songs/midi/se_note_c_high.o(.rodata); + sound/songs/midi/se_puddle.o(.rodata); + sound/songs/midi/se_bridge_walk.o(.rodata); + sound/songs/midi/se_itemfinder.o(.rodata); + sound/songs/midi/se_ding_dong.o(.rodata); + sound/songs/midi/se_balloon_red.o(.rodata); + sound/songs/midi/se_balloon_blue.o(.rodata); + sound/songs/midi/se_balloon_yellow.o(.rodata); + sound/songs/midi/se_breakable_door.o(.rodata); + sound/songs/midi/se_mud_ball.o(.rodata); + sound/songs/midi/se_field_poison.o(.rodata); + sound/songs/midi/se_escalator.o(.rodata); + sound/songs/midi/se_thunderstorm.o(.rodata); + sound/songs/midi/se_thunderstorm_stop.o(.rodata); + sound/songs/midi/se_downpour.o(.rodata); + sound/songs/midi/se_downpour_stop.o(.rodata); + sound/songs/midi/se_rain.o(.rodata); + sound/songs/midi/se_rain_stop.o(.rodata); + sound/songs/midi/se_thunder.o(.rodata); + sound/songs/midi/se_thunder2.o(.rodata); + sound/songs/midi/se_elevator.o(.rodata); + sound/songs/midi/se_low_health.o(.rodata); + sound/songs/midi/se_exp_max.o(.rodata); + sound/songs/midi/se_roulette_ball.o(.rodata); + sound/songs/midi/se_roulette_ball2.o(.rodata); + sound/songs/midi/se_taillow_wing_flap.o(.rodata); + sound/songs/midi/se_rs_shop.o(.rodata); + sound/songs/midi/se_contest_heart.o(.rodata); + sound/songs/midi/se_contest_curtain_rise.o(.rodata); + sound/songs/midi/se_contest_curtain_fall.o(.rodata); + sound/songs/midi/se_contest_icon_change.o(.rodata); + sound/songs/midi/se_contest_icon_clear.o(.rodata); + sound/songs/midi/se_contest_mons_turn.o(.rodata); + sound/songs/midi/se_shiny.o(.rodata); + sound/songs/midi/se_intro_blast.o(.rodata); + sound/songs/midi/se_mugshot.o(.rodata); + sound/songs/midi/se_applause.o(.rodata); + sound/songs/midi/se_vend.o(.rodata); + sound/songs/midi/se_orb.o(.rodata); + sound/songs/midi/se_dex_scroll.o(.rodata); + sound/songs/midi/se_dex_page.o(.rodata); + sound/songs/midi/se_pokenav_on.o(.rodata); + sound/songs/midi/se_pokenav_off.o(.rodata); + sound/songs/midi/se_dex_search.o(.rodata); + sound/songs/midi/se_egg_hatch.o(.rodata); + sound/songs/midi/se_ball_tray_enter.o(.rodata); + sound/songs/midi/se_ball_tray_ball.o(.rodata); + sound/songs/midi/se_ball_tray_exit.o(.rodata); + sound/songs/midi/se_glass_flute.o(.rodata); + sound/songs/midi/se_m_thunderbolt.o(.rodata); + sound/songs/midi/se_m_thunderbolt2.o(.rodata); + sound/songs/midi/se_m_harden.o(.rodata); + sound/songs/midi/se_m_nightmare.o(.rodata); + sound/songs/midi/se_m_vital_throw.o(.rodata); + sound/songs/midi/se_m_vital_throw2.o(.rodata); + sound/songs/midi/se_m_bubble.o(.rodata); + sound/songs/midi/se_m_bubble2.o(.rodata); + sound/songs/midi/se_m_bubble3.o(.rodata); + sound/songs/midi/se_m_rain_dance.o(.rodata); + sound/songs/midi/se_m_cut.o(.rodata); + sound/songs/midi/se_m_string_shot.o(.rodata); + sound/songs/midi/se_m_string_shot2.o(.rodata); + sound/songs/midi/se_m_rock_throw.o(.rodata); + sound/songs/midi/se_m_gust.o(.rodata); + sound/songs/midi/se_m_gust2.o(.rodata); + sound/songs/midi/se_m_double_slap.o(.rodata); + sound/songs/midi/se_m_double_team.o(.rodata); + sound/songs/midi/se_m_razor_wind.o(.rodata); + sound/songs/midi/se_m_icy_wind.o(.rodata); + sound/songs/midi/se_m_thunder_wave.o(.rodata); + sound/songs/midi/se_m_comet_punch.o(.rodata); + sound/songs/midi/se_m_mega_kick.o(.rodata); + sound/songs/midi/se_m_mega_kick2.o(.rodata); + sound/songs/midi/se_m_crabhammer.o(.rodata); + sound/songs/midi/se_m_jump_kick.o(.rodata); + sound/songs/midi/se_m_flame_wheel.o(.rodata); + sound/songs/midi/se_m_flame_wheel2.o(.rodata); + sound/songs/midi/se_m_flamethrower.o(.rodata); + sound/songs/midi/se_m_fire_punch.o(.rodata); + sound/songs/midi/se_m_toxic.o(.rodata); + sound/songs/midi/se_m_sacred_fire.o(.rodata); + sound/songs/midi/se_m_sacred_fire2.o(.rodata); + sound/songs/midi/se_m_ember.o(.rodata); + sound/songs/midi/se_m_take_down.o(.rodata); + sound/songs/midi/se_m_blizzard.o(.rodata); + sound/songs/midi/se_m_blizzard2.o(.rodata); + sound/songs/midi/se_m_scratch.o(.rodata); + sound/songs/midi/se_m_vicegrip.o(.rodata); + sound/songs/midi/se_m_wing_attack.o(.rodata); + sound/songs/midi/se_m_fly.o(.rodata); + sound/songs/midi/se_m_sand_attack.o(.rodata); + sound/songs/midi/se_m_razor_wind2.o(.rodata); + sound/songs/midi/se_m_bite.o(.rodata); + sound/songs/midi/se_m_headbutt.o(.rodata); + sound/songs/midi/se_m_surf.o(.rodata); + sound/songs/midi/se_m_hydro_pump.o(.rodata); + sound/songs/midi/se_m_whirlpool.o(.rodata); + sound/songs/midi/se_m_horn_attack.o(.rodata); + sound/songs/midi/se_m_tail_whip.o(.rodata); + sound/songs/midi/se_m_mist.o(.rodata); + sound/songs/midi/se_m_poison_powder.o(.rodata); + sound/songs/midi/se_m_bind.o(.rodata); + sound/songs/midi/se_m_dragon_rage.o(.rodata); + sound/songs/midi/se_m_sing.o(.rodata); + sound/songs/midi/se_m_perish_song.o(.rodata); + sound/songs/midi/se_m_pay_day.o(.rodata); + sound/songs/midi/se_m_dig.o(.rodata); + sound/songs/midi/se_m_dizzy_punch.o(.rodata); + sound/songs/midi/se_m_self_destruct.o(.rodata); + sound/songs/midi/se_m_explosion.o(.rodata); + sound/songs/midi/se_m_absorb_2.o(.rodata); + sound/songs/midi/se_m_absorb.o(.rodata); + sound/songs/midi/se_m_screech.o(.rodata); + sound/songs/midi/se_m_bubble_beam.o(.rodata); + sound/songs/midi/se_m_bubble_beam2.o(.rodata); + sound/songs/midi/se_m_supersonic.o(.rodata); + sound/songs/midi/se_m_belly_drum.o(.rodata); + sound/songs/midi/se_m_metronome.o(.rodata); + sound/songs/midi/se_m_bonemerang.o(.rodata); + sound/songs/midi/se_m_lick.o(.rodata); + sound/songs/midi/se_m_psybeam.o(.rodata); + sound/songs/midi/se_m_faint_attack.o(.rodata); + sound/songs/midi/se_m_swords_dance.o(.rodata); + sound/songs/midi/se_m_leer.o(.rodata); + sound/songs/midi/se_m_swagger.o(.rodata); + sound/songs/midi/se_m_swagger2.o(.rodata); + sound/songs/midi/se_m_heal_bell.o(.rodata); + sound/songs/midi/se_m_confuse_ray.o(.rodata); + sound/songs/midi/se_m_snore.o(.rodata); + sound/songs/midi/se_m_brick_break.o(.rodata); + sound/songs/midi/se_m_giga_drain.o(.rodata); + sound/songs/midi/se_m_psybeam2.o(.rodata); + sound/songs/midi/se_m_solar_beam.o(.rodata); + sound/songs/midi/se_m_petal_dance.o(.rodata); + sound/songs/midi/se_m_teleport.o(.rodata); + sound/songs/midi/se_m_minimize.o(.rodata); + sound/songs/midi/se_m_sketch.o(.rodata); + sound/songs/midi/se_m_swift.o(.rodata); + sound/songs/midi/se_m_reflect.o(.rodata); + sound/songs/midi/se_m_barrier.o(.rodata); + sound/songs/midi/se_m_detect.o(.rodata); + sound/songs/midi/se_m_lock_on.o(.rodata); + sound/songs/midi/se_m_moonlight.o(.rodata); + sound/songs/midi/se_m_charm.o(.rodata); + sound/songs/midi/se_m_charge.o(.rodata); + sound/songs/midi/se_m_strength.o(.rodata); + sound/songs/midi/se_m_hyper_beam.o(.rodata); + sound/songs/midi/se_m_waterfall.o(.rodata); + sound/songs/midi/se_m_reversal.o(.rodata); + sound/songs/midi/se_m_acid_armor.o(.rodata); + sound/songs/midi/se_m_sandstorm.o(.rodata); + sound/songs/midi/se_m_tri_attack.o(.rodata); + sound/songs/midi/se_m_tri_attack2.o(.rodata); + sound/songs/midi/se_m_encore.o(.rodata); + sound/songs/midi/se_m_encore2.o(.rodata); + sound/songs/midi/se_m_baton_pass.o(.rodata); + sound/songs/midi/se_m_milk_drink.o(.rodata); + sound/songs/midi/se_m_attract.o(.rodata); + sound/songs/midi/se_m_attract2.o(.rodata); + sound/songs/midi/se_m_morning_sun.o(.rodata); + sound/songs/midi/se_m_flatter.o(.rodata); + sound/songs/midi/se_m_sand_tomb.o(.rodata); + sound/songs/midi/se_m_grasswhistle.o(.rodata); + sound/songs/midi/se_m_spit_up.o(.rodata); + sound/songs/midi/se_m_dive.o(.rodata); + sound/songs/midi/se_m_earthquake.o(.rodata); + sound/songs/midi/se_m_twister.o(.rodata); + sound/songs/midi/se_m_sweet_scent.o(.rodata); + sound/songs/midi/se_m_yawn.o(.rodata); + sound/songs/midi/se_m_sky_uppercut.o(.rodata); + sound/songs/midi/se_m_stat_increase.o(.rodata); + sound/songs/midi/se_m_heat_wave.o(.rodata); + sound/songs/midi/se_m_uproar.o(.rodata); + sound/songs/midi/se_m_hail.o(.rodata); + sound/songs/midi/se_m_cosmic_power.o(.rodata); + sound/songs/midi/se_m_teeter_dance.o(.rodata); + sound/songs/midi/se_m_stat_decrease.o(.rodata); + sound/songs/midi/se_m_haze.o(.rodata); + sound/songs/midi/se_m_hyper_beam2.o(.rodata); + sound/songs/midi/se_door.o(.rodata); + sound/songs/midi/se_card_flip.o(.rodata); + sound/songs/midi/se_card_flipping.o(.rodata); + sound/songs/midi/se_card_open.o(.rodata); + sound/songs/midi/se_bag_cursor.o(.rodata); + sound/songs/midi/se_bag_pocket.o(.rodata); + sound/songs/midi/se_ball_click.o(.rodata); + sound/songs/midi/se_shop.o(.rodata); + sound/songs/midi/se_ss_anne_horn.o(.rodata); + sound/songs/midi/se_help_open.o(.rodata); + sound/songs/midi/se_help_close.o(.rodata); + sound/songs/midi/se_help_error.o(.rodata); + sound/songs/midi/se_deoxys_move.o(.rodata); + sound/songs/midi/se_poke_jump_success.o(.rodata); + sound/songs/midi/se_poke_jump_failure.o(.rodata); + sound/songs/midi/mus_heal.o(.rodata); + sound/songs/midi/mus_level_up.o(.rodata); + sound/songs/midi/mus_obtain_item.o(.rodata); + sound/songs/midi/mus_evolved.o(.rodata); + sound/songs/midi/mus_obtain_badge.o(.rodata); + sound/songs/midi/mus_obtain_tmhm.o(.rodata); + sound/songs/midi/mus_obtain_berry.o(.rodata); + sound/songs/midi/mus_evolution_intro.o(.rodata); + sound/songs/midi/mus_evolution.o(.rodata); + sound/songs/midi/mus_rs_vs_gym_leader.o(.rodata); + sound/songs/midi/mus_rs_vs_trainer.o(.rodata); + sound/songs/midi/mus_school.o(.rodata); + sound/songs/midi/mus_slots_jackpot.o(.rodata); + sound/songs/midi/mus_slots_win.o(.rodata); + sound/songs/midi/mus_move_deleted.o(.rodata); + sound/songs/midi/mus_too_bad.o(.rodata); + sound/songs/midi/mus_follow_me.o(.rodata); + sound/songs/midi/mus_game_corner.o(.rodata); + sound/songs/midi/mus_rocket_hideout.o(.rodata); + sound/songs/midi/mus_gym.o(.rodata); + sound/songs/midi/mus_jigglypuff.o(.rodata); + sound/songs/midi/mus_intro_fight.o(.rodata); + sound/songs/midi/mus_title.o(.rodata); + sound/songs/midi/mus_cinnabar.o(.rodata); + sound/songs/midi/mus_lavender.o(.rodata); + sound/songs/midi/mus_heal_unused.o(.rodata); + sound/songs/midi/mus_cycling.o(.rodata); + sound/songs/midi/mus_encounter_rocket.o(.rodata); + sound/songs/midi/mus_encounter_girl.o(.rodata); + sound/songs/midi/mus_encounter_boy.o(.rodata); + sound/songs/midi/mus_hall_of_fame.o(.rodata); + sound/songs/midi/mus_viridian_forest.o(.rodata); + sound/songs/midi/mus_mt_moon.o(.rodata); + sound/songs/midi/mus_poke_mansion.o(.rodata); + sound/songs/midi/mus_credits.o(.rodata); + sound/songs/midi/mus_route1.o(.rodata); + sound/songs/midi/mus_route24.o(.rodata); + sound/songs/midi/mus_route3.o(.rodata); + sound/songs/midi/mus_route11.o(.rodata); + sound/songs/midi/mus_victory_road.o(.rodata); + sound/songs/midi/mus_vs_gym_leader.o(.rodata); + sound/songs/midi/mus_vs_trainer.o(.rodata); + sound/songs/midi/mus_vs_wild.o(.rodata); + sound/songs/midi/mus_vs_champion.o(.rodata); + sound/songs/midi/mus_pallet.o(.rodata); + sound/songs/midi/mus_oak_lab.o(.rodata); + sound/songs/midi/mus_oak.o(.rodata); + sound/songs/midi/mus_poke_center.o(.rodata); + sound/songs/midi/mus_ss_anne.o(.rodata); + sound/songs/midi/mus_surf.o(.rodata); + sound/songs/midi/mus_poke_tower.o(.rodata); + sound/songs/midi/mus_silph.o(.rodata); + sound/songs/midi/mus_fuchsia.o(.rodata); + sound/songs/midi/mus_celadon.o(.rodata); + sound/songs/midi/mus_victory_trainer.o(.rodata); + sound/songs/midi/mus_victory_wild.o(.rodata); + sound/songs/midi/mus_victory_gym_leader.o(.rodata); + sound/songs/midi/mus_vermillion.o(.rodata); + sound/songs/midi/mus_pewter.o(.rodata); + sound/songs/midi/mus_encounter_rival.o(.rodata); + sound/songs/midi/mus_rival_exit.o(.rodata); + sound/songs/midi/mus_dex_rating.o(.rodata); + sound/songs/midi/mus_obtain_key_item.o(.rodata); + sound/songs/midi/mus_caught_intro.o(.rodata); + sound/songs/midi/mus_photo.o(.rodata); + sound/songs/midi/mus_game_freak.o(.rodata); + sound/songs/midi/mus_caught.o(.rodata); + sound/songs/midi/mus_new_game_instruct.o(.rodata); + sound/songs/midi/mus_new_game_intro.o(.rodata); + sound/songs/midi/mus_new_game_exit.o(.rodata); + sound/songs/midi/mus_poke_jump.o(.rodata); + sound/songs/midi/mus_union_room.o(.rodata); + sound/songs/midi/mus_net_center.o(.rodata); + sound/songs/midi/mus_mystery_gift.o(.rodata); + sound/songs/midi/mus_berry_pick.o(.rodata); + sound/songs/midi/mus_sevii_cave.o(.rodata); + sound/songs/midi/mus_teachy_tv_show.o(.rodata); + sound/songs/midi/mus_sevii_route.o(.rodata); + sound/songs/midi/mus_sevii_dungeon.o(.rodata); + sound/songs/midi/mus_sevii_123.o(.rodata); + sound/songs/midi/mus_sevii_45.o(.rodata); + sound/songs/midi/mus_sevii_67.o(.rodata); + sound/songs/midi/mus_poke_flute.o(.rodata); + sound/songs/midi/mus_vs_deoxys.o(.rodata); + sound/songs/midi/mus_vs_mewtwo.o(.rodata); + sound/songs/midi/mus_vs_legend.o(.rodata); + sound/songs/midi/mus_encounter_gym_leader.o(.rodata); + sound/songs/midi/mus_encounter_deoxys.o(.rodata); + sound/songs/midi/mus_trainer_tower.o(.rodata); + sound/songs/midi/mus_slow_pallet.o(.rodata); + sound/songs/midi/mus_teachy_tv_menu.o(.rodata); + } > ROM =0 + + lib_rodata : + SUBALIGN(4) + { + src/agb_flash.o(.rodata); + src/agb_flash_1m.o(.rodata); + src/agb_flash_mx.o(.rodata); + src/agb_flash_le.o(.rodata); + src/librfu_sio32id.o(.rodata); + src/isagbprn.o(.rodata); + *libgcc.a:_divdi3.o(.rodata); + *libgcc.a:_udivdi3.o(.rodata); + *libc.a:memcpy.o(.rodata); + *libc.a:memset.o(.rodata); + *libc.a:strcmp.o(.rodata); + *libc.a:strcpy.o(.rodata); + *libc.a:impure.o(.rodata); + *libc.a:vsprintf.o(.rodata); + *libc.a:vfprintf.o(.rodata); + *libc.a:wsetup.o(.rodata); + *libc.a:dtoa.o(.rodata); + *libc.a:fflush.o(.rodata); + *libc.a:findfp.o(.rodata); + *libc.a:freer.o(.rodata); + *libc.a:mtrim.o(.rodata); + *libc.a:fvwrite.o(.rodata); + *libc.a:fwalk.o(.rodata); + *libc.a:locale.o(.rodata); + *libc.a:makebuf.o(.rodata); + *libc.a:mallocr.o(.rodata); + *libc.a:mbtowc_r.o(.rodata); + *libc.a:memchr.o(.rodata); + *libc.a:memmove.o(.rodata); + *libc.a:mlock.o(.rodata); + *libc.a:mprec.o(.rodata); + *libc.a:s_isinf.o(.rodata); + *libc.a:s_isnan.o(.rodata); + *libc.a:sbrkr.o(.rodata); + *libc.a:stdio.o(.rodata); + *libc.a:strlen.o(.rodata); + *libc.a:syscalls.o(.rodata); + *libc.a:writer.o(.rodata); + *libc.a:callocr.o(.rodata); + *libc.a:closer.o(.rodata); + *libc.a:errno.o(.rodata); + *libc.a:fstatr.o(.rodata); + *libc.a:libcfunc.o(.rodata); + *libc.a:lseekr.o(.rodata); + *libc.a:readr.o(.rodata); + + . = ALIGN(4); + } > ROM =0 + + multiboot_data : + ALIGN(4) + { + data/multiboot_ereader.o(.rodata); + data/multiboot_berry_glitch_fix.o(.rodata); + data/multiboot_pokemon_colosseum.o(.rodata); + } > ROM =0 + + gfx_data 0x08D00000 : + ALIGN(4) + { + src/graphics.o(.rodata); + } > ROM =0 + + extra : + ALIGN(4) + { + src/*.o(.text); + src/*.o(.rodata); + data/*.o(.rodata); + } > ROM =0 + + + /* DWARF 2 sections */ + .debug_aranges 0 : { *(.debug_aranges) } + .debug_pubnames 0 : { *(.debug_pubnames) } + .debug_info 0 : { *(.debug_info) } + .debug_abbrev 0 : { *(.debug_abbrev) } + .debug_line 0 : { *(.debug_line) } + .debug_frame 0 : { *(.debug_frame) } + .debug_str 0 : { *(.debug_str) } + .debug_loc 0 : { *(.debug_loc) } + .debug_macinfo 0 : { *(.debug_macinfo) } + + /* Discard everything not specifically mentioned above. */ + /DISCARD/ : + { + *(*); + } +} diff --git a/leafgreen_switch.sha1 b/leafgreen_switch.sha1 new file mode 100644 index 000000000..2a857a694 --- /dev/null +++ b/leafgreen_switch.sha1 @@ -0,0 +1 @@ +62b9fc77549dbc67032eb6cbd0ea6ad3b825690f pokeleafgreen_switch.gba diff --git a/sound/songs/midi/midi.cfg b/sound/songs/midi/midi.cfg index 6f0b6a6dc..7cc61ef50 100644 --- a/sound/songs/midi/midi.cfg +++ b/sound/songs/midi/midi.cfg @@ -294,6 +294,8 @@ se_contest_icon_change.mid: -E -R50 -G_rs_sfx_2 -V110 -P5 se_contest_icon_clear.mid: -E -R50 -G_rs_sfx_2 -V090 -P5 se_contest_mons_turn.mid: -E -R50 -G_rs_sfx_2 -V090 -P5 se_contest_place.mid: -E -R50 -G_rs_sfx_1 -V110 -P4 +se_dex_page.mid: -E -R50 -G_rs_sfx_1 -P5 +se_dex_scroll.mid: -E -R50 -G_rs_sfx_1 -P5 se_dex_search.mid: -E -R50 -G_rs_sfx_1 -v100 -P5 se_ding_dong.mid: -E -R50 -G_rs_sfx_1 -V090 -P5 se_rs_door.mid: -E -R50 -G_rs_sfx_1 -V080 -P5 @@ -323,30 +325,136 @@ se_itemfinder.mid: -E -R50 -G_rs_sfx_1 -V090 -P5 se_lavaridge_fall_warp.mid: -E -R50 -G_rs_sfx_1 -P4 se_ledge.mid: -E -R50 -G_rs_sfx_1 -V100 -P4 se_low_health.mid: -E -R50 -G_rs_sfx_1 -V100 -P3 +se_m_absorb.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_absorb_2.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_acid_armor.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_attract.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_attract2.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_barrier.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_baton_pass.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_belly_drum.mid: -E -R50 -G_rs_sfx_2 -P4 se_m_bind.mid: -E -R50 -G_rs_sfx_2 -V100 -P4 +se_m_bite.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_blizzard.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_blizzard2.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_bonemerang.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_brick_break.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_bubble.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_bubble2.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_bubble3.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_bubble_beam.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_bubble_beam2.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_charge.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_charm.mid: -E -R50 -G_rs_sfx_2 -P4 se_m_comet_punch.mid: -E -R50 -G_rs_sfx_2 -V120 -P4 +se_m_confuse_ray.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_cosmic_power.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_crabhammer.mid: -E -R50 -G_rs_sfx_2 -P4 se_m_cut.mid: -E -R50 -G_rs_sfx_2 -V120 -P4 +se_m_detect.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_dig.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_dive.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_dizzy_punch.mid: -E -R50 -G_rs_sfx_2 -P4 se_m_double_slap.mid: -E -R50 -G_rs_sfx_2 -V110 -P4 +se_m_double_team.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_dragon_rage.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_earthquake.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_ember.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_encore.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_encore2.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_explosion.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_faint_attack.mid: -E -R50 -G_rs_sfx_2 -P4 se_m_fire_punch.mid: -E -R50 -G_rs_sfx_2 -V110 -P4 +se_m_flame_wheel.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_flame_wheel2.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_flamethrower.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_flatter.mid: -E -R50 -G_rs_sfx_2 -P4 se_m_fly.mid: -E -R50 -G_rs_sfx_2 -V110 -P4 +se_m_giga_drain.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_grasswhistle.mid: -E -R50 -G_rs_sfx_2 -P4 se_m_gust.mid: -E -R50 -G_rs_sfx_2 -V110 -P4 se_m_gust2.mid: -E -R50 -G_rs_sfx_2 -V110 -P4 +se_m_hail.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_harden.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_haze.mid: -E -R50 -G_rs_sfx_2 -P4 se_m_headbutt.mid: -E -R50 -G_rs_sfx_2 -V110 -P4 +se_m_heal_bell.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_heat_wave.mid: -E -R50 -G_rs_sfx_2 -P4 se_m_horn_attack.mid: -E -R50 -G_rs_sfx_2 -V110 -P4 +se_m_hydro_pump.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_hyper_beam.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_hyper_beam2.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_icy_wind.mid: -E -R50 -G_rs_sfx_2 -P4 se_m_jump_kick.mid: -E -R50 -G_rs_sfx_2 -V110 -P4 se_m_leer.mid: -E -R50 -G_rs_sfx_2 -V110 -P4 +se_m_lick.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_lock_on.mid: -E -R50 -G_rs_sfx_2 -P4 se_m_mega_kick.mid: -E -R50 -G_rs_sfx_2 -V090 -P4 se_m_mega_kick2.mid: -E -R50 -G_rs_sfx_2 -V110 -P4 +se_m_metronome.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_milk_drink.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_minimize.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_mist.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_moonlight.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_morning_sun.mid: -E -R50 -G_rs_sfx_2 -P5 +se_m_nightmare.mid: -E -R50 -G_rs_sfx_2 -P4 se_m_pay_day.mid: -E -R50 -G_rs_sfx_2 -V095 -P4 +se_m_perish_song.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_petal_dance.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_poison_powder.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_psybeam.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_psybeam2.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_rain_dance.mid: -E -R50 -G_rs_sfx_2 -P4 se_m_razor_wind.mid: -E -R50 -G_rs_sfx_2 -V110 -P4 se_m_razor_wind2.mid: -E -R50 -G_rs_sfx_2 -V090 -P4 +se_m_reflect.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_reversal.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_rock_throw.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_sacred_fire.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_sacred_fire2.mid: -E -R50 -G_rs_sfx_2 -P4 se_m_sand_attack.mid: -E -R50 -G_rs_sfx_2 -V110 -P4 +se_m_sand_tomb.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_sandstorm.mid: -E -R50 -G_rs_sfx_2 -P4 se_m_scratch.mid: -E -R50 -G_rs_sfx_2 -V110 -P4 +se_m_screech.mid: -E -R50 -G_rs_sfx_2 -V110 -P4 +se_m_self_destruct.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_sing.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_sketch.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_sky_uppercut.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_snore.mid: -E -R50 -G_rs_sfx_2 -V120 -P4 +se_m_solar_beam.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_spit_up.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_stat_decrease.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_stat_increase.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_strength.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_string_shot.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_string_shot2.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_supersonic.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_surf.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_swagger.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_swagger2.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_sweet_scent.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_swift.mid: -E -R50 -G_rs_sfx_2 -P4 se_m_swords_dance.mid: -E -R50 -G_rs_sfx_2 -V100 -P4 se_m_tail_whip.mid: -E -R50 -G_rs_sfx_2 -V110 -P4 se_m_take_down.mid: -E -R50 -G_rs_sfx_2 -V105 -P4 +se_m_teeter_dance.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_teleport.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_thunder_wave.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_thunderbolt.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_thunderbolt2.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_toxic.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_tri_attack.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_tri_attack2.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_twister.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_uproar.mid: -E -R50 -G_rs_sfx_2 -P4 se_m_vicegrip.mid: -E -R50 -G_rs_sfx_2 -V110 -P4 +se_m_vital_throw.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_vital_throw2.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_waterfall.mid: -E -R50 -G_rs_sfx_2 -P4 +se_m_whirlpool.mid: -E -R50 -G_rs_sfx_2 -P4 se_m_wing_attack.mid: -E -R50 -G_rs_sfx_2 -V105 -P4 +se_m_yawn.mid: -E -R50 -G_rs_sfx_2 -V110 -P4 se_mud_ball.mid: -E -R50 -G_rs_sfx_2 -V110 -P4 se_mugshot.mid: -E -R50 -G_rs_sfx_2 -V090 -P5 se_n.mid: -E -R50 -G_rs_sfx_2 -P4 @@ -416,5 +524,7 @@ se_u.mid: -E -R50 -G_rs_sfx_2 -P4 se_unlock.mid: -E -R50 -G_rs_sfx_2 -V100 -P4 se_use_item.mid: -E -R50 -G_rs_sfx_1 -V100 -P5 se_vend.mid: -E -R50 -G_rs_sfx_2 -V110 -P4 +se_wall_hit.mid: -E -R50 -G_rs_sfx_1 -P2 se_warp_in.mid: -E -R50 -G_rs_sfx_1 -V090 -P4 se_warp_out.mid: -E -R50 -G_rs_sfx_1 -V090 -P4 +se_win_open.mid: -E -R50 -G_rs_sfx_1 -P5 diff --git a/sound/songs/midi/se_dex_page.mid b/sound/songs/midi/se_dex_page.mid new file mode 100644 index 000000000..a1799c523 Binary files /dev/null and b/sound/songs/midi/se_dex_page.mid differ diff --git a/sound/songs/midi/se_dex_scroll.mid b/sound/songs/midi/se_dex_scroll.mid new file mode 100644 index 000000000..254b7c787 Binary files /dev/null and b/sound/songs/midi/se_dex_scroll.mid differ diff --git a/sound/songs/midi/se_m_absorb.mid b/sound/songs/midi/se_m_absorb.mid new file mode 100644 index 000000000..ae54fe2bc Binary files /dev/null and b/sound/songs/midi/se_m_absorb.mid differ diff --git a/sound/songs/midi/se_m_absorb_2.mid b/sound/songs/midi/se_m_absorb_2.mid new file mode 100644 index 000000000..dea60f498 Binary files /dev/null and b/sound/songs/midi/se_m_absorb_2.mid differ diff --git a/sound/songs/midi/se_m_acid_armor.mid b/sound/songs/midi/se_m_acid_armor.mid new file mode 100644 index 000000000..ca87cfee3 Binary files /dev/null and b/sound/songs/midi/se_m_acid_armor.mid differ diff --git a/sound/songs/midi/se_m_attract.mid b/sound/songs/midi/se_m_attract.mid new file mode 100644 index 000000000..5ab7879bc Binary files /dev/null and b/sound/songs/midi/se_m_attract.mid differ diff --git a/sound/songs/midi/se_m_attract2.mid b/sound/songs/midi/se_m_attract2.mid new file mode 100644 index 000000000..1adbb5122 Binary files /dev/null and b/sound/songs/midi/se_m_attract2.mid differ diff --git a/sound/songs/midi/se_m_barrier.mid b/sound/songs/midi/se_m_barrier.mid new file mode 100644 index 000000000..0270b4ae7 Binary files /dev/null and b/sound/songs/midi/se_m_barrier.mid differ diff --git a/sound/songs/midi/se_m_baton_pass.mid b/sound/songs/midi/se_m_baton_pass.mid new file mode 100644 index 000000000..321766b47 Binary files /dev/null and b/sound/songs/midi/se_m_baton_pass.mid differ diff --git a/sound/songs/midi/se_m_belly_drum.mid b/sound/songs/midi/se_m_belly_drum.mid new file mode 100644 index 000000000..b642ccfb9 Binary files /dev/null and b/sound/songs/midi/se_m_belly_drum.mid differ diff --git a/sound/songs/midi/se_m_bite.mid b/sound/songs/midi/se_m_bite.mid new file mode 100644 index 000000000..4fa8a049e Binary files /dev/null and b/sound/songs/midi/se_m_bite.mid differ diff --git a/sound/songs/midi/se_m_blizzard.mid b/sound/songs/midi/se_m_blizzard.mid new file mode 100644 index 000000000..c32cbb1c5 Binary files /dev/null and b/sound/songs/midi/se_m_blizzard.mid differ diff --git a/sound/songs/midi/se_m_blizzard2.mid b/sound/songs/midi/se_m_blizzard2.mid new file mode 100644 index 000000000..48b82ad1b Binary files /dev/null and b/sound/songs/midi/se_m_blizzard2.mid differ diff --git a/sound/songs/midi/se_m_bonemerang.mid b/sound/songs/midi/se_m_bonemerang.mid new file mode 100644 index 000000000..37727d64a Binary files /dev/null and b/sound/songs/midi/se_m_bonemerang.mid differ diff --git a/sound/songs/midi/se_m_brick_break.mid b/sound/songs/midi/se_m_brick_break.mid new file mode 100644 index 000000000..528482d13 Binary files /dev/null and b/sound/songs/midi/se_m_brick_break.mid differ diff --git a/sound/songs/midi/se_m_bubble.mid b/sound/songs/midi/se_m_bubble.mid new file mode 100644 index 000000000..bfd259e48 Binary files /dev/null and b/sound/songs/midi/se_m_bubble.mid differ diff --git a/sound/songs/midi/se_m_bubble2.mid b/sound/songs/midi/se_m_bubble2.mid new file mode 100644 index 000000000..38ba6b330 Binary files /dev/null and b/sound/songs/midi/se_m_bubble2.mid differ diff --git a/sound/songs/midi/se_m_bubble3.mid b/sound/songs/midi/se_m_bubble3.mid new file mode 100644 index 000000000..9d65ba218 Binary files /dev/null and b/sound/songs/midi/se_m_bubble3.mid differ diff --git a/sound/songs/midi/se_m_bubble_beam.mid b/sound/songs/midi/se_m_bubble_beam.mid new file mode 100644 index 000000000..d192866b7 Binary files /dev/null and b/sound/songs/midi/se_m_bubble_beam.mid differ diff --git a/sound/songs/midi/se_m_bubble_beam2.mid b/sound/songs/midi/se_m_bubble_beam2.mid new file mode 100644 index 000000000..8f2f6523e Binary files /dev/null and b/sound/songs/midi/se_m_bubble_beam2.mid differ diff --git a/sound/songs/midi/se_m_charge.mid b/sound/songs/midi/se_m_charge.mid new file mode 100644 index 000000000..4310f8820 Binary files /dev/null and b/sound/songs/midi/se_m_charge.mid differ diff --git a/sound/songs/midi/se_m_charm.mid b/sound/songs/midi/se_m_charm.mid new file mode 100644 index 000000000..0237d97ff Binary files /dev/null and b/sound/songs/midi/se_m_charm.mid differ diff --git a/sound/songs/midi/se_m_confuse_ray.mid b/sound/songs/midi/se_m_confuse_ray.mid new file mode 100644 index 000000000..4ad9b70d9 Binary files /dev/null and b/sound/songs/midi/se_m_confuse_ray.mid differ diff --git a/sound/songs/midi/se_m_cosmic_power.mid b/sound/songs/midi/se_m_cosmic_power.mid new file mode 100644 index 000000000..b75abd0e7 Binary files /dev/null and b/sound/songs/midi/se_m_cosmic_power.mid differ diff --git a/sound/songs/midi/se_m_crabhammer.mid b/sound/songs/midi/se_m_crabhammer.mid new file mode 100644 index 000000000..1f5231509 Binary files /dev/null and b/sound/songs/midi/se_m_crabhammer.mid differ diff --git a/sound/songs/midi/se_m_detect.mid b/sound/songs/midi/se_m_detect.mid new file mode 100644 index 000000000..946f76b36 Binary files /dev/null and b/sound/songs/midi/se_m_detect.mid differ diff --git a/sound/songs/midi/se_m_dig.mid b/sound/songs/midi/se_m_dig.mid new file mode 100644 index 000000000..10e273bd4 Binary files /dev/null and b/sound/songs/midi/se_m_dig.mid differ diff --git a/sound/songs/midi/se_m_dive.mid b/sound/songs/midi/se_m_dive.mid new file mode 100644 index 000000000..3b561ee7a Binary files /dev/null and b/sound/songs/midi/se_m_dive.mid differ diff --git a/sound/songs/midi/se_m_dizzy_punch.mid b/sound/songs/midi/se_m_dizzy_punch.mid new file mode 100644 index 000000000..efbb0bef6 Binary files /dev/null and b/sound/songs/midi/se_m_dizzy_punch.mid differ diff --git a/sound/songs/midi/se_m_double_team.mid b/sound/songs/midi/se_m_double_team.mid new file mode 100644 index 000000000..0a3c73dc5 Binary files /dev/null and b/sound/songs/midi/se_m_double_team.mid differ diff --git a/sound/songs/midi/se_m_dragon_rage.mid b/sound/songs/midi/se_m_dragon_rage.mid new file mode 100644 index 000000000..91b6137a1 Binary files /dev/null and b/sound/songs/midi/se_m_dragon_rage.mid differ diff --git a/sound/songs/midi/se_m_earthquake.mid b/sound/songs/midi/se_m_earthquake.mid new file mode 100644 index 000000000..5bba93d86 Binary files /dev/null and b/sound/songs/midi/se_m_earthquake.mid differ diff --git a/sound/songs/midi/se_m_ember.mid b/sound/songs/midi/se_m_ember.mid new file mode 100644 index 000000000..2c686616a Binary files /dev/null and b/sound/songs/midi/se_m_ember.mid differ diff --git a/sound/songs/midi/se_m_encore.mid b/sound/songs/midi/se_m_encore.mid new file mode 100644 index 000000000..f0c5597f4 Binary files /dev/null and b/sound/songs/midi/se_m_encore.mid differ diff --git a/sound/songs/midi/se_m_encore2.mid b/sound/songs/midi/se_m_encore2.mid new file mode 100644 index 000000000..a98882c8d Binary files /dev/null and b/sound/songs/midi/se_m_encore2.mid differ diff --git a/sound/songs/midi/se_m_explosion.mid b/sound/songs/midi/se_m_explosion.mid new file mode 100644 index 000000000..3d8fd5f00 Binary files /dev/null and b/sound/songs/midi/se_m_explosion.mid differ diff --git a/sound/songs/midi/se_m_faint_attack.mid b/sound/songs/midi/se_m_faint_attack.mid new file mode 100644 index 000000000..01c8a09b8 Binary files /dev/null and b/sound/songs/midi/se_m_faint_attack.mid differ diff --git a/sound/songs/midi/se_m_flame_wheel.mid b/sound/songs/midi/se_m_flame_wheel.mid new file mode 100644 index 000000000..741a5fb65 Binary files /dev/null and b/sound/songs/midi/se_m_flame_wheel.mid differ diff --git a/sound/songs/midi/se_m_flame_wheel2.mid b/sound/songs/midi/se_m_flame_wheel2.mid new file mode 100644 index 000000000..0e8082196 Binary files /dev/null and b/sound/songs/midi/se_m_flame_wheel2.mid differ diff --git a/sound/songs/midi/se_m_flamethrower.mid b/sound/songs/midi/se_m_flamethrower.mid new file mode 100644 index 000000000..bf5de7d65 Binary files /dev/null and b/sound/songs/midi/se_m_flamethrower.mid differ diff --git a/sound/songs/midi/se_m_flatter.mid b/sound/songs/midi/se_m_flatter.mid new file mode 100644 index 000000000..9c7940511 Binary files /dev/null and b/sound/songs/midi/se_m_flatter.mid differ diff --git a/sound/songs/midi/se_m_giga_drain.mid b/sound/songs/midi/se_m_giga_drain.mid new file mode 100644 index 000000000..f11c1d774 Binary files /dev/null and b/sound/songs/midi/se_m_giga_drain.mid differ diff --git a/sound/songs/midi/se_m_grasswhistle.mid b/sound/songs/midi/se_m_grasswhistle.mid new file mode 100644 index 000000000..bc5df6ca0 Binary files /dev/null and b/sound/songs/midi/se_m_grasswhistle.mid differ diff --git a/sound/songs/midi/se_m_hail.mid b/sound/songs/midi/se_m_hail.mid new file mode 100644 index 000000000..e0a5a0e00 Binary files /dev/null and b/sound/songs/midi/se_m_hail.mid differ diff --git a/sound/songs/midi/se_m_harden.mid b/sound/songs/midi/se_m_harden.mid new file mode 100644 index 000000000..b5796d8be Binary files /dev/null and b/sound/songs/midi/se_m_harden.mid differ diff --git a/sound/songs/midi/se_m_haze.mid b/sound/songs/midi/se_m_haze.mid new file mode 100644 index 000000000..85f815c0e Binary files /dev/null and b/sound/songs/midi/se_m_haze.mid differ diff --git a/sound/songs/midi/se_m_heal_bell.mid b/sound/songs/midi/se_m_heal_bell.mid new file mode 100644 index 000000000..09271d4a2 Binary files /dev/null and b/sound/songs/midi/se_m_heal_bell.mid differ diff --git a/sound/songs/midi/se_m_heat_wave.mid b/sound/songs/midi/se_m_heat_wave.mid new file mode 100644 index 000000000..d4fb8cf22 Binary files /dev/null and b/sound/songs/midi/se_m_heat_wave.mid differ diff --git a/sound/songs/midi/se_m_hydro_pump.mid b/sound/songs/midi/se_m_hydro_pump.mid new file mode 100644 index 000000000..00cda6cfe Binary files /dev/null and b/sound/songs/midi/se_m_hydro_pump.mid differ diff --git a/sound/songs/midi/se_m_hyper_beam.mid b/sound/songs/midi/se_m_hyper_beam.mid new file mode 100644 index 000000000..9597a911c Binary files /dev/null and b/sound/songs/midi/se_m_hyper_beam.mid differ diff --git a/sound/songs/midi/se_m_hyper_beam2.mid b/sound/songs/midi/se_m_hyper_beam2.mid new file mode 100644 index 000000000..04f9bf221 Binary files /dev/null and b/sound/songs/midi/se_m_hyper_beam2.mid differ diff --git a/sound/songs/midi/se_m_icy_wind.mid b/sound/songs/midi/se_m_icy_wind.mid new file mode 100644 index 000000000..a4afad71b Binary files /dev/null and b/sound/songs/midi/se_m_icy_wind.mid differ diff --git a/sound/songs/midi/se_m_lick.mid b/sound/songs/midi/se_m_lick.mid new file mode 100644 index 000000000..69436bd5c Binary files /dev/null and b/sound/songs/midi/se_m_lick.mid differ diff --git a/sound/songs/midi/se_m_lock_on.mid b/sound/songs/midi/se_m_lock_on.mid new file mode 100644 index 000000000..e17f78fb6 Binary files /dev/null and b/sound/songs/midi/se_m_lock_on.mid differ diff --git a/sound/songs/midi/se_m_metronome.mid b/sound/songs/midi/se_m_metronome.mid new file mode 100644 index 000000000..850a1d6fc Binary files /dev/null and b/sound/songs/midi/se_m_metronome.mid differ diff --git a/sound/songs/midi/se_m_milk_drink.mid b/sound/songs/midi/se_m_milk_drink.mid new file mode 100644 index 000000000..fc2ad0c02 Binary files /dev/null and b/sound/songs/midi/se_m_milk_drink.mid differ diff --git a/sound/songs/midi/se_m_minimize.mid b/sound/songs/midi/se_m_minimize.mid new file mode 100644 index 000000000..bca3aa2a8 Binary files /dev/null and b/sound/songs/midi/se_m_minimize.mid differ diff --git a/sound/songs/midi/se_m_mist.mid b/sound/songs/midi/se_m_mist.mid new file mode 100644 index 000000000..2d184451f Binary files /dev/null and b/sound/songs/midi/se_m_mist.mid differ diff --git a/sound/songs/midi/se_m_moonlight.mid b/sound/songs/midi/se_m_moonlight.mid new file mode 100644 index 000000000..ea5380310 Binary files /dev/null and b/sound/songs/midi/se_m_moonlight.mid differ diff --git a/sound/songs/midi/se_m_morning_sun.mid b/sound/songs/midi/se_m_morning_sun.mid new file mode 100644 index 000000000..2ac4d9786 Binary files /dev/null and b/sound/songs/midi/se_m_morning_sun.mid differ diff --git a/sound/songs/midi/se_m_nightmare.mid b/sound/songs/midi/se_m_nightmare.mid new file mode 100644 index 000000000..434a24f5a Binary files /dev/null and b/sound/songs/midi/se_m_nightmare.mid differ diff --git a/sound/songs/midi/se_m_perish_song.mid b/sound/songs/midi/se_m_perish_song.mid new file mode 100644 index 000000000..2adf5f39a Binary files /dev/null and b/sound/songs/midi/se_m_perish_song.mid differ diff --git a/sound/songs/midi/se_m_petal_dance.mid b/sound/songs/midi/se_m_petal_dance.mid new file mode 100644 index 000000000..fbf06a9bf Binary files /dev/null and b/sound/songs/midi/se_m_petal_dance.mid differ diff --git a/sound/songs/midi/se_m_poison_powder.mid b/sound/songs/midi/se_m_poison_powder.mid new file mode 100644 index 000000000..a1ad27fee Binary files /dev/null and b/sound/songs/midi/se_m_poison_powder.mid differ diff --git a/sound/songs/midi/se_m_psybeam.mid b/sound/songs/midi/se_m_psybeam.mid new file mode 100644 index 000000000..28df1b223 Binary files /dev/null and b/sound/songs/midi/se_m_psybeam.mid differ diff --git a/sound/songs/midi/se_m_psybeam2.mid b/sound/songs/midi/se_m_psybeam2.mid new file mode 100644 index 000000000..76f273d4c Binary files /dev/null and b/sound/songs/midi/se_m_psybeam2.mid differ diff --git a/sound/songs/midi/se_m_rain_dance.mid b/sound/songs/midi/se_m_rain_dance.mid new file mode 100644 index 000000000..86b2cb871 Binary files /dev/null and b/sound/songs/midi/se_m_rain_dance.mid differ diff --git a/sound/songs/midi/se_m_reflect.mid b/sound/songs/midi/se_m_reflect.mid new file mode 100644 index 000000000..1e8e29bb0 Binary files /dev/null and b/sound/songs/midi/se_m_reflect.mid differ diff --git a/sound/songs/midi/se_m_reversal.mid b/sound/songs/midi/se_m_reversal.mid new file mode 100644 index 000000000..6898925c1 Binary files /dev/null and b/sound/songs/midi/se_m_reversal.mid differ diff --git a/sound/songs/midi/se_m_rock_throw.mid b/sound/songs/midi/se_m_rock_throw.mid new file mode 100644 index 000000000..af0c6905a Binary files /dev/null and b/sound/songs/midi/se_m_rock_throw.mid differ diff --git a/sound/songs/midi/se_m_sacred_fire.mid b/sound/songs/midi/se_m_sacred_fire.mid new file mode 100644 index 000000000..436081798 Binary files /dev/null and b/sound/songs/midi/se_m_sacred_fire.mid differ diff --git a/sound/songs/midi/se_m_sacred_fire2.mid b/sound/songs/midi/se_m_sacred_fire2.mid new file mode 100644 index 000000000..54db24f80 Binary files /dev/null and b/sound/songs/midi/se_m_sacred_fire2.mid differ diff --git a/sound/songs/midi/se_m_sand_tomb.mid b/sound/songs/midi/se_m_sand_tomb.mid new file mode 100644 index 000000000..91509bc34 Binary files /dev/null and b/sound/songs/midi/se_m_sand_tomb.mid differ diff --git a/sound/songs/midi/se_m_sandstorm.mid b/sound/songs/midi/se_m_sandstorm.mid new file mode 100644 index 000000000..669b04658 Binary files /dev/null and b/sound/songs/midi/se_m_sandstorm.mid differ diff --git a/sound/songs/midi/se_m_screech.mid b/sound/songs/midi/se_m_screech.mid new file mode 100644 index 000000000..bf896ad6f Binary files /dev/null and b/sound/songs/midi/se_m_screech.mid differ diff --git a/sound/songs/midi/se_m_self_destruct.mid b/sound/songs/midi/se_m_self_destruct.mid new file mode 100644 index 000000000..504109dd1 Binary files /dev/null and b/sound/songs/midi/se_m_self_destruct.mid differ diff --git a/sound/songs/midi/se_m_sing.mid b/sound/songs/midi/se_m_sing.mid new file mode 100644 index 000000000..4cd08616e Binary files /dev/null and b/sound/songs/midi/se_m_sing.mid differ diff --git a/sound/songs/midi/se_m_sketch.mid b/sound/songs/midi/se_m_sketch.mid new file mode 100644 index 000000000..9c2654080 Binary files /dev/null and b/sound/songs/midi/se_m_sketch.mid differ diff --git a/sound/songs/midi/se_m_sky_uppercut.mid b/sound/songs/midi/se_m_sky_uppercut.mid new file mode 100644 index 000000000..a5c5a1d00 Binary files /dev/null and b/sound/songs/midi/se_m_sky_uppercut.mid differ diff --git a/sound/songs/midi/se_m_snore.mid b/sound/songs/midi/se_m_snore.mid new file mode 100644 index 000000000..bb2e49c82 Binary files /dev/null and b/sound/songs/midi/se_m_snore.mid differ diff --git a/sound/songs/midi/se_m_solar_beam.mid b/sound/songs/midi/se_m_solar_beam.mid new file mode 100644 index 000000000..1b948a8ee Binary files /dev/null and b/sound/songs/midi/se_m_solar_beam.mid differ diff --git a/sound/songs/midi/se_m_spit_up.mid b/sound/songs/midi/se_m_spit_up.mid new file mode 100644 index 000000000..9fed3c5e1 Binary files /dev/null and b/sound/songs/midi/se_m_spit_up.mid differ diff --git a/sound/songs/midi/se_m_stat_decrease.mid b/sound/songs/midi/se_m_stat_decrease.mid new file mode 100644 index 000000000..9cb5e83a6 Binary files /dev/null and b/sound/songs/midi/se_m_stat_decrease.mid differ diff --git a/sound/songs/midi/se_m_stat_increase.mid b/sound/songs/midi/se_m_stat_increase.mid new file mode 100644 index 000000000..e7875bea4 Binary files /dev/null and b/sound/songs/midi/se_m_stat_increase.mid differ diff --git a/sound/songs/midi/se_m_strength.mid b/sound/songs/midi/se_m_strength.mid new file mode 100644 index 000000000..2bd93cd50 Binary files /dev/null and b/sound/songs/midi/se_m_strength.mid differ diff --git a/sound/songs/midi/se_m_string_shot.mid b/sound/songs/midi/se_m_string_shot.mid new file mode 100644 index 000000000..bebbaeef8 Binary files /dev/null and b/sound/songs/midi/se_m_string_shot.mid differ diff --git a/sound/songs/midi/se_m_string_shot2.mid b/sound/songs/midi/se_m_string_shot2.mid new file mode 100644 index 000000000..b1ffaa871 Binary files /dev/null and b/sound/songs/midi/se_m_string_shot2.mid differ diff --git a/sound/songs/midi/se_m_supersonic.mid b/sound/songs/midi/se_m_supersonic.mid new file mode 100644 index 000000000..73ec2782e Binary files /dev/null and b/sound/songs/midi/se_m_supersonic.mid differ diff --git a/sound/songs/midi/se_m_surf.mid b/sound/songs/midi/se_m_surf.mid new file mode 100644 index 000000000..c1de5f212 Binary files /dev/null and b/sound/songs/midi/se_m_surf.mid differ diff --git a/sound/songs/midi/se_m_swagger.mid b/sound/songs/midi/se_m_swagger.mid new file mode 100644 index 000000000..bd5a220f2 Binary files /dev/null and b/sound/songs/midi/se_m_swagger.mid differ diff --git a/sound/songs/midi/se_m_swagger2.mid b/sound/songs/midi/se_m_swagger2.mid new file mode 100644 index 000000000..cd7119905 Binary files /dev/null and b/sound/songs/midi/se_m_swagger2.mid differ diff --git a/sound/songs/midi/se_m_sweet_scent.mid b/sound/songs/midi/se_m_sweet_scent.mid new file mode 100644 index 000000000..8896334d8 Binary files /dev/null and b/sound/songs/midi/se_m_sweet_scent.mid differ diff --git a/sound/songs/midi/se_m_swift.mid b/sound/songs/midi/se_m_swift.mid new file mode 100644 index 000000000..deaa005d3 Binary files /dev/null and b/sound/songs/midi/se_m_swift.mid differ diff --git a/sound/songs/midi/se_m_teeter_dance.mid b/sound/songs/midi/se_m_teeter_dance.mid new file mode 100644 index 000000000..a18c19127 Binary files /dev/null and b/sound/songs/midi/se_m_teeter_dance.mid differ diff --git a/sound/songs/midi/se_m_teleport.mid b/sound/songs/midi/se_m_teleport.mid new file mode 100644 index 000000000..c886fad83 Binary files /dev/null and b/sound/songs/midi/se_m_teleport.mid differ diff --git a/sound/songs/midi/se_m_thunder_wave.mid b/sound/songs/midi/se_m_thunder_wave.mid new file mode 100644 index 000000000..833c09810 Binary files /dev/null and b/sound/songs/midi/se_m_thunder_wave.mid differ diff --git a/sound/songs/midi/se_m_thunderbolt.mid b/sound/songs/midi/se_m_thunderbolt.mid new file mode 100644 index 000000000..dafc79b31 Binary files /dev/null and b/sound/songs/midi/se_m_thunderbolt.mid differ diff --git a/sound/songs/midi/se_m_thunderbolt2.mid b/sound/songs/midi/se_m_thunderbolt2.mid new file mode 100644 index 000000000..0e483f5e4 Binary files /dev/null and b/sound/songs/midi/se_m_thunderbolt2.mid differ diff --git a/sound/songs/midi/se_m_toxic.mid b/sound/songs/midi/se_m_toxic.mid new file mode 100644 index 000000000..27a7d2c7e Binary files /dev/null and b/sound/songs/midi/se_m_toxic.mid differ diff --git a/sound/songs/midi/se_m_tri_attack.mid b/sound/songs/midi/se_m_tri_attack.mid new file mode 100644 index 000000000..bdf1fe69c Binary files /dev/null and b/sound/songs/midi/se_m_tri_attack.mid differ diff --git a/sound/songs/midi/se_m_tri_attack2.mid b/sound/songs/midi/se_m_tri_attack2.mid new file mode 100644 index 000000000..3269e369d Binary files /dev/null and b/sound/songs/midi/se_m_tri_attack2.mid differ diff --git a/sound/songs/midi/se_m_twister.mid b/sound/songs/midi/se_m_twister.mid new file mode 100644 index 000000000..72e6ea3b5 Binary files /dev/null and b/sound/songs/midi/se_m_twister.mid differ diff --git a/sound/songs/midi/se_m_uproar.mid b/sound/songs/midi/se_m_uproar.mid new file mode 100644 index 000000000..e797289a0 Binary files /dev/null and b/sound/songs/midi/se_m_uproar.mid differ diff --git a/sound/songs/midi/se_m_vital_throw.mid b/sound/songs/midi/se_m_vital_throw.mid new file mode 100644 index 000000000..23c56a7f8 Binary files /dev/null and b/sound/songs/midi/se_m_vital_throw.mid differ diff --git a/sound/songs/midi/se_m_vital_throw2.mid b/sound/songs/midi/se_m_vital_throw2.mid new file mode 100644 index 000000000..d5c77149e Binary files /dev/null and b/sound/songs/midi/se_m_vital_throw2.mid differ diff --git a/sound/songs/midi/se_m_waterfall.mid b/sound/songs/midi/se_m_waterfall.mid new file mode 100644 index 000000000..9859f3e4d Binary files /dev/null and b/sound/songs/midi/se_m_waterfall.mid differ diff --git a/sound/songs/midi/se_m_whirlpool.mid b/sound/songs/midi/se_m_whirlpool.mid new file mode 100644 index 000000000..1fa7af764 Binary files /dev/null and b/sound/songs/midi/se_m_whirlpool.mid differ diff --git a/sound/songs/midi/se_m_yawn.mid b/sound/songs/midi/se_m_yawn.mid new file mode 100644 index 000000000..ebb630379 Binary files /dev/null and b/sound/songs/midi/se_m_yawn.mid differ diff --git a/sound/songs/midi/se_wall_hit.mid b/sound/songs/midi/se_wall_hit.mid new file mode 100644 index 000000000..8197a78a5 Binary files /dev/null and b/sound/songs/midi/se_wall_hit.mid differ diff --git a/sound/songs/midi/se_win_open.mid b/sound/songs/midi/se_win_open.mid new file mode 100644 index 000000000..a6a7c4ea0 Binary files /dev/null and b/sound/songs/midi/se_win_open.mid differ diff --git a/sound/songs/se_dex_page.s b/sound/songs/se_dex_page.s deleted file mode 100644 index 314d11d9f..000000000 --- a/sound/songs/se_dex_page.s +++ /dev/null @@ -1,54 +0,0 @@ - .include "MPlayDef.s" - - .equ se_dex_page_grp, voicegroup_rs_sfx_1 - .equ se_dex_page_pri, 5 - .equ se_dex_page_rev, reverb_set+50 - .equ se_dex_page_mvl, 127 - .equ se_dex_page_key, 0 - .equ se_dex_page_tbs, 1 - .equ se_dex_page_exg, 0 - .equ se_dex_page_cmp, 1 - - .section .rodata - .global se_dex_page - .align 2 - -@********************** Track 1 **********************@ - -se_dex_page_1: - .byte KEYSH , se_dex_page_key+0 - .byte TEMPO , 100*se_dex_page_tbs/2 - .byte VOICE , 4 - .byte BENDR , 12 - .byte XCMD , xIECV , 10 - .byte xIECL , 8 - .byte VOL , 90*se_dex_page_mvl/mxv - .byte BEND , c_v+4 - .byte N01 , Cn5 , v064 - .byte W01 - .byte Cn5 , v020 - .byte W01 - .byte Cn5 , v064 - .byte W01 - .byte Cn5 , v020 - .byte W01 - .byte Cn6 , v064 - .byte W02 - .byte Cn6 , v020 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_dex_page: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_dex_page_pri @ Priority - .byte se_dex_page_rev @ Reverb. - - .word se_dex_page_grp - - .word se_dex_page_1 - - .end diff --git a/sound/songs/se_dex_scroll.s b/sound/songs/se_dex_scroll.s deleted file mode 100644 index 6ea8f4783..000000000 --- a/sound/songs/se_dex_scroll.s +++ /dev/null @@ -1,46 +0,0 @@ - .include "MPlayDef.s" - - .equ se_dex_scroll_grp, voicegroup_rs_sfx_1 - .equ se_dex_scroll_pri, 5 - .equ se_dex_scroll_rev, reverb_set+50 - .equ se_dex_scroll_mvl, 127 - .equ se_dex_scroll_key, 0 - .equ se_dex_scroll_tbs, 1 - .equ se_dex_scroll_exg, 0 - .equ se_dex_scroll_cmp, 1 - - .section .rodata - .global se_dex_scroll - .align 2 - -@********************** Track 1 **********************@ - -se_dex_scroll_1: - .byte KEYSH , se_dex_scroll_key+0 - .byte TEMPO , 100*se_dex_scroll_tbs/2 - .byte VOICE , 4 - .byte BENDR , 12 - .byte XCMD , xIECV , 10 - .byte xIECL , 8 - .byte VOL , 40*se_dex_scroll_mvl/mxv - .byte BEND , c_v+4 - .byte N01 , Gn4 , v127 - .byte W01 - .byte Gn4 , v020 - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_dex_scroll: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_dex_scroll_pri @ Priority - .byte se_dex_scroll_rev @ Reverb. - - .word se_dex_scroll_grp - - .word se_dex_scroll_1 - - .end diff --git a/sound/songs/se_m_absorb.s b/sound/songs/se_m_absorb.s deleted file mode 100644 index 46b7e1fa2..000000000 --- a/sound/songs/se_m_absorb.s +++ /dev/null @@ -1,73 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_absorb_grp, voicegroup_rs_sfx_2 - .equ se_m_absorb_pri, 4 - .equ se_m_absorb_rev, reverb_set+50 - .equ se_m_absorb_mvl, 127 - .equ se_m_absorb_key, 0 - .equ se_m_absorb_tbs, 1 - .equ se_m_absorb_exg, 0 - .equ se_m_absorb_cmp, 1 - - .section .rodata - .global se_m_absorb - .align 2 - -@********************** Track 1 **********************@ - -se_m_absorb_1: - .byte KEYSH , se_m_absorb_key+0 - .byte TEMPO , 150*se_m_absorb_tbs/2 - .byte VOICE , 24 - .byte VOL , 110*se_m_absorb_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N01 , Cn6 , v127 - .byte W01 - .byte Gn6 , v112 - .byte W01 - .byte VOICE , 38 - .byte VOL , 58*se_m_absorb_mvl/mxv - .byte N08 , Gn4 - .byte W01 - .byte VOL , 68*se_m_absorb_mvl/mxv - .byte PAN , c_v+8 - .byte BEND , c_v-20 - .byte W01 - .byte VOL , 75*se_m_absorb_mvl/mxv - .byte PAN , c_v-8 - .byte BEND , c_v-48 - .byte W02 - .byte VOL , 83*se_m_absorb_mvl/mxv - .byte PAN , c_v+8 - .byte BEND , c_v-18 - .byte W01 - .byte VOL , 90*se_m_absorb_mvl/mxv - .byte PAN , c_v-8 - .byte BEND , c_v+10 - .byte W01 - .byte VOL , 101*se_m_absorb_mvl/mxv - .byte PAN , c_v+9 - .byte BEND , c_v+39 - .byte W01 - .byte VOL , 110*se_m_absorb_mvl/mxv - .byte PAN , c_v-8 - .byte BEND , c_v+63 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_absorb: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_absorb_pri @ Priority - .byte se_m_absorb_rev @ Reverb. - - .word se_m_absorb_grp - - .word se_m_absorb_1 - - .end diff --git a/sound/songs/se_m_absorb_2.s b/sound/songs/se_m_absorb_2.s deleted file mode 100644 index 54166d967..000000000 --- a/sound/songs/se_m_absorb_2.s +++ /dev/null @@ -1,155 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_absorb_2_grp, voicegroup_rs_sfx_2 - .equ se_m_absorb_2_pri, 4 - .equ se_m_absorb_2_rev, reverb_set+50 - .equ se_m_absorb_2_mvl, 127 - .equ se_m_absorb_2_key, 0 - .equ se_m_absorb_2_tbs, 1 - .equ se_m_absorb_2_exg, 0 - .equ se_m_absorb_2_cmp, 1 - - .section .rodata - .global se_m_absorb_2 - .align 2 - -@********************** Track 1 **********************@ - -se_m_absorb_2_1: - .byte KEYSH , se_m_absorb_2_key+0 - .byte TEMPO , 150*se_m_absorb_2_tbs/2 - .byte VOICE , 46 - .byte VOL , 110*se_m_absorb_2_mvl/mxv - .byte BENDR , 2 - .byte PAN , c_v+0 - .byte BEND , c_v+15 - .byte W01 - .byte N02 , Dn6 , v112 - .byte W02 - .byte Cs6 - .byte W03 - .byte PAN , c_v+8 - .byte N02 , An5 - .byte W02 - .byte Fs5 - .byte W01 - .byte W01 - .byte Dn5 - .byte W02 - .byte PAN , c_v-7 - .byte W01 - .byte N02 , Dn5 , v104 - .byte W02 - .byte Cs5 , v100 - .byte W03 - .byte PAN , c_v+0 - .byte N02 , An4 , v096 - .byte W02 - .byte Fs4 , v092 - .byte W01 - .byte W01 - .byte Dn4 , v088 - .byte W02 - .byte PAN , c_v+15 - .byte W01 - .byte N02 , Dn6 - .byte W02 - .byte Cs6 , v084 - .byte W03 - .byte An5 , v080 - .byte W02 - .byte Fs5 , v076 - .byte W01 - .byte W01 - .byte Dn5 , v072 - .byte W02 - .byte PAN , c_v-16 - .byte W01 - .byte N02 , Dn6 , v068 - .byte W02 - .byte Cs6 , v064 - .byte W03 - .byte An5 , v060 - .byte W02 - .byte Fs5 , v056 - .byte W01 - .byte W01 - .byte Dn5 , v052 - .byte W02 - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_absorb_2_2: - .byte KEYSH , se_m_absorb_2_key+0 - .byte VOICE , 53 - .byte BENDR , 2 - .byte VOL , 43*se_m_absorb_2_mvl/mxv - .byte BEND , c_v+15 - .byte N02 , An6 , v112 - .byte W02 - .byte Fs6 - .byte W01 - .byte W01 - .byte Dn6 - .byte W02 - .byte W01 - .byte Cs6 - .byte W02 - .byte An5 - .byte W03 - .byte N02 - .byte W02 - .byte Fs5 , v104 - .byte W01 - .byte W01 - .byte Dn5 , v100 - .byte W02 - .byte W01 - .byte Cs5 , v096 - .byte W02 - .byte An4 , v092 - .byte W03 - .byte An6 , v088 - .byte W02 - .byte Fs6 , v084 - .byte W01 - .byte W01 - .byte Dn6 , v080 - .byte W02 - .byte W01 - .byte Cs6 , v076 - .byte W02 - .byte An5 , v072 - .byte W03 - .byte An6 , v068 - .byte W02 - .byte Fs6 , v064 - .byte W01 - .byte W01 - .byte Dn6 , v060 - .byte W02 - .byte W01 - .byte Cs6 , v056 - .byte W02 - .byte An5 , v052 - .byte W03 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_absorb_2: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_absorb_2_pri @ Priority - .byte se_m_absorb_2_rev @ Reverb. - - .word se_m_absorb_2_grp - - .word se_m_absorb_2_1 - .word se_m_absorb_2_2 - - .end diff --git a/sound/songs/se_m_acid_armor.s b/sound/songs/se_m_acid_armor.s deleted file mode 100644 index 31f94275a..000000000 --- a/sound/songs/se_m_acid_armor.s +++ /dev/null @@ -1,202 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_acid_armor_grp, voicegroup_rs_sfx_2 - .equ se_m_acid_armor_pri, 4 - .equ se_m_acid_armor_rev, reverb_set+50 - .equ se_m_acid_armor_mvl, 127 - .equ se_m_acid_armor_key, 0 - .equ se_m_acid_armor_tbs, 1 - .equ se_m_acid_armor_exg, 0 - .equ se_m_acid_armor_cmp, 1 - - .section .rodata - .global se_m_acid_armor - .align 2 - -@********************** Track 1 **********************@ - -se_m_acid_armor_1: - .byte KEYSH , se_m_acid_armor_key+0 - .byte TEMPO , 150*se_m_acid_armor_tbs/2 - .byte VOICE , 31 - .byte VOL , 110*se_m_acid_armor_mvl/mxv - .byte BENDR , 24 - .byte PAN , c_v+0 - .byte BEND , c_v-37 - .byte N06 , Gn0 , v127 - .byte W01 - .byte BEND , c_v-16 - .byte W01 - .byte c_v+0 - .byte W01 - .byte c_v+27 - .byte W01 - .byte c_v+46 - .byte W02 - .byte VOICE , 23 - .byte PAN , c_v+11 - .byte N01 , Cn1 - .byte W01 - .byte PAN , c_v-10 - .byte N01 , Cn2 - .byte W01 - .byte VOICE , 31 - .byte PAN , c_v+6 - .byte BEND , c_v-37 - .byte N06 , Dn1 - .byte W01 - .byte BEND , c_v-16 - .byte W01 - .byte c_v+0 - .byte W02 - .byte c_v+27 - .byte W01 - .byte c_v+46 - .byte W01 - .byte VOICE , 23 - .byte PAN , c_v-1 - .byte N01 , Fn1 - .byte W01 - .byte PAN , c_v-10 - .byte N01 , Fn2 - .byte W01 - .byte VOICE , 31 - .byte PAN , c_v+0 - .byte BEND , c_v-37 - .byte N02 , Gn0 - .byte W02 - .byte BEND , c_v-16 - .byte W01 - .byte c_v+0 - .byte W01 - .byte PAN , c_v+5 - .byte BEND , c_v+27 - .byte N02 - .byte W01 - .byte BEND , c_v+46 - .byte W01 - .byte VOICE , 23 - .byte PAN , c_v+10 - .byte N01 , Cn1 - .byte W02 - .byte PAN , c_v-9 - .byte N01 , Cn2 - .byte W01 - .byte VOICE , 31 - .byte PAN , c_v+0 - .byte BEND , c_v-37 - .byte N06 , Dn1 - .byte W01 - .byte BEND , c_v-16 - .byte W01 - .byte c_v+0 - .byte W01 - .byte c_v+27 - .byte W02 - .byte c_v+46 - .byte W01 - .byte VOICE , 23 - .byte PAN , c_v+5 - .byte N01 , Cn1 - .byte W01 - .byte PAN , c_v-8 - .byte N01 , Cn2 - .byte W01 - .byte VOICE , 31 - .byte PAN , c_v+0 - .byte BEND , c_v-37 - .byte N06 , Gn0 , v112 - .byte W01 - .byte BEND , c_v-16 - .byte W02 - .byte c_v+0 - .byte W01 - .byte c_v+27 - .byte W01 - .byte c_v+46 - .byte W01 - .byte VOICE , 23 - .byte PAN , c_v+11 - .byte N01 , Cn1 , v100 - .byte W01 - .byte PAN , c_v-10 - .byte N01 , Cn2 , v096 - .byte W02 - .byte VOICE , 31 - .byte PAN , c_v+6 - .byte BEND , c_v-37 - .byte N06 , Dn1 - .byte W01 - .byte BEND , c_v-16 - .byte W01 - .byte c_v+0 - .byte W01 - .byte c_v+27 - .byte W01 - .byte c_v+46 - .byte W02 - .byte VOICE , 23 - .byte PAN , c_v-1 - .byte N01 , Fn1 , v084 - .byte W01 - .byte PAN , c_v-10 - .byte N01 , Fn2 - .byte W01 - .byte VOICE , 31 - .byte PAN , c_v+0 - .byte BEND , c_v-37 - .byte N02 , Gn0 , v080 - .byte W01 - .byte BEND , c_v-16 - .byte W01 - .byte c_v+0 - .byte W02 - .byte PAN , c_v+5 - .byte BEND , c_v+27 - .byte N02 , Gn0 , v072 - .byte W01 - .byte BEND , c_v+46 - .byte W01 - .byte VOICE , 23 - .byte PAN , c_v+10 - .byte N01 , Cn1 , v068 - .byte W01 - .byte PAN , c_v-9 - .byte N01 , Cn2 - .byte W01 - .byte VOICE , 31 - .byte PAN , c_v+0 - .byte BEND , c_v-37 - .byte N06 , Dn1 , v064 - .byte W02 - .byte BEND , c_v-16 - .byte W01 - .byte c_v+0 - .byte W01 - .byte c_v+27 - .byte W01 - .byte c_v+46 - .byte W01 - .byte VOICE , 23 - .byte PAN , c_v+5 - .byte N01 , Cn1 , v056 - .byte W02 - .byte PAN , c_v-8 - .byte N01 , Cn2 , v052 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_acid_armor: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_acid_armor_pri @ Priority - .byte se_m_acid_armor_rev @ Reverb. - - .word se_m_acid_armor_grp - - .word se_m_acid_armor_1 - - .end diff --git a/sound/songs/se_m_attract.s b/sound/songs/se_m_attract.s deleted file mode 100644 index ede9f4dd8..000000000 --- a/sound/songs/se_m_attract.s +++ /dev/null @@ -1,126 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_attract_grp, voicegroup_rs_sfx_2 - .equ se_m_attract_pri, 4 - .equ se_m_attract_rev, reverb_set+50 - .equ se_m_attract_mvl, 127 - .equ se_m_attract_key, 0 - .equ se_m_attract_tbs, 1 - .equ se_m_attract_exg, 0 - .equ se_m_attract_cmp, 1 - - .section .rodata - .global se_m_attract - .align 2 - -@********************** Track 1 **********************@ - -se_m_attract_1: - .byte KEYSH , se_m_attract_key+0 - .byte TEMPO , 210*se_m_attract_tbs/2 - .byte VOICE , 46 - .byte VOL , 95*se_m_attract_mvl/mxv - .byte BENDR , 2 - .byte PAN , c_v+0 - .byte BEND , c_v+15 - .byte W03 - .byte N06 , Cn6 , v116 - .byte W03 - .byte W03 - .byte En6 , v108 - .byte W03 - .byte W03 - .byte Cs5 , v100 - .byte W03 - .byte W03 - .byte Gs5 , v088 - .byte W03 - .byte W03 - .byte PAN , c_v-4 - .byte N06 , Cs6 , v080 - .byte W03 - .byte W03 - .byte PAN , c_v+0 - .byte N06 , Dn6 , v072 - .byte W03 - .byte W03 - .byte PAN , c_v+4 - .byte N06 , Fs6 , v060 - .byte W03 - .byte W03 - .byte PAN , c_v+0 - .byte N06 , Ds5 , v052 - .byte W03 - .byte W03 - .byte PAN , c_v-4 - .byte N06 , As5 , v040 - .byte W03 - .byte W03 - .byte PAN , c_v+0 - .byte W03 - .byte W03 - .byte c_v+4 - .byte W03 - .byte W03 - .byte c_v+0 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_attract_2: - .byte KEYSH , se_m_attract_key+0 - .byte VOICE , 53 - .byte BENDR , 2 - .byte VOL , 43*se_m_attract_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+15 - .byte N06 , Cn5 , v120 - .byte W03 - .byte W03 - .byte Gn5 , v112 - .byte W03 - .byte W03 - .byte Cn6 , v104 - .byte W03 - .byte W03 - .byte Cs6 , v092 - .byte W03 - .byte W03 - .byte Fn6 , v084 - .byte W03 - .byte W03 - .byte Dn5 , v076 - .byte W03 - .byte W03 - .byte An5 , v064 - .byte W03 - .byte W03 - .byte Dn6 , v056 - .byte W03 - .byte W03 - .byte Ds6 , v048 - .byte W03 - .byte W03 - .byte Gn6 , v036 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_attract: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_attract_pri @ Priority - .byte se_m_attract_rev @ Reverb. - - .word se_m_attract_grp - - .word se_m_attract_1 - .word se_m_attract_2 - - .end diff --git a/sound/songs/se_m_attract2.s b/sound/songs/se_m_attract2.s deleted file mode 100644 index ddcd23029..000000000 --- a/sound/songs/se_m_attract2.s +++ /dev/null @@ -1,127 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_attract2_grp, voicegroup_rs_sfx_2 - .equ se_m_attract2_pri, 4 - .equ se_m_attract2_rev, reverb_set+50 - .equ se_m_attract2_mvl, 127 - .equ se_m_attract2_key, 0 - .equ se_m_attract2_tbs, 1 - .equ se_m_attract2_exg, 0 - .equ se_m_attract2_cmp, 1 - - .section .rodata - .global se_m_attract2 - .align 2 - -@********************** Track 1 **********************@ - -se_m_attract2_1: - .byte KEYSH , se_m_attract2_key+0 - .byte TEMPO , 150*se_m_attract2_tbs/2 - .byte VOICE , 61 - .byte BENDR , 44 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_attract2_mvl/mxv - .byte MOD , 30 - .byte BEND , c_v+2 - .byte N54 , Dn4 , v080 - .byte W12 - .byte PAN , c_v-4 - .byte W12 - .byte c_v-10 - .byte W12 - .byte c_v-4 - .byte W12 - .byte c_v+0 - .byte W06 - .byte N54 , Cn4 - .byte W06 - .byte PAN , c_v+6 - .byte W12 - .byte c_v+9 - .byte W12 - .byte c_v+5 - .byte W12 - .byte c_v+0 - .byte W12 - .byte c_v-4 - .byte N54 , Dn4 - .byte W12 - .byte PAN , c_v-10 - .byte W12 - .byte c_v-4 - .byte W12 - .byte c_v+0 - .byte W12 - .byte c_v+6 - .byte W06 - .byte N54 , Cn4 - .byte W06 - .byte PAN , c_v+9 - .byte W12 - .byte c_v+5 - .byte W12 - .byte c_v+0 - .byte W12 - .byte c_v-4 - .byte W12 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_attract2_2: - .byte KEYSH , se_m_attract2_key+0 - .byte VOICE , 62 - .byte BENDR , 44 - .byte VOL , 110*se_m_attract2_mvl/mxv - .byte MOD , 30 - .byte PAN , c_v+1 - .byte BEND , c_v+1 - .byte N24 , Dn4 , v040 - .byte W24 - .byte W02 - .byte PAN , c_v+47 - .byte N24 , Dn4 , v032 - .byte W22 - .byte W06 - .byte PAN , c_v+0 - .byte N24 , Cn4 , v040 - .byte W18 - .byte W08 - .byte PAN , c_v-49 - .byte N24 , Cn4 , v032 - .byte W16 - .byte W12 - .byte PAN , c_v+1 - .byte N24 , Dn4 , v040 - .byte W12 - .byte W14 - .byte PAN , c_v+47 - .byte N24 , Dn4 , v032 - .byte W10 - .byte W18 - .byte PAN , c_v+0 - .byte N24 , Cn4 , v040 - .byte W06 - .byte W20 - .byte PAN , c_v-48 - .byte N24 , Cn4 , v032 - .byte W04 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_attract2: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_attract2_pri @ Priority - .byte se_m_attract2_rev @ Reverb. - - .word se_m_attract2_grp - - .word se_m_attract2_1 - .word se_m_attract2_2 - - .end diff --git a/sound/songs/se_m_barrier.s b/sound/songs/se_m_barrier.s deleted file mode 100644 index ebf6ddccb..000000000 --- a/sound/songs/se_m_barrier.s +++ /dev/null @@ -1,276 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_barrier_grp, voicegroup_rs_sfx_2 - .equ se_m_barrier_pri, 4 - .equ se_m_barrier_rev, reverb_set+50 - .equ se_m_barrier_mvl, 127 - .equ se_m_barrier_key, 0 - .equ se_m_barrier_tbs, 1 - .equ se_m_barrier_exg, 0 - .equ se_m_barrier_cmp, 1 - - .section .rodata - .global se_m_barrier - .align 2 - -@********************** Track 1 **********************@ - -se_m_barrier_1: - .byte KEYSH , se_m_barrier_key+0 - .byte TEMPO , 150*se_m_barrier_tbs/2 - .byte VOICE , 19 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 95*se_m_barrier_mvl/mxv - .byte BEND , c_v+3 - .byte N06 , Cn6 , v088 - .byte W01 - .byte VOL , 88*se_m_barrier_mvl/mxv - .byte BEND , c_v-8 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 56*se_m_barrier_mvl/mxv - .byte BEND , c_v-17 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 24*se_m_barrier_mvl/mxv - .byte BEND , c_v-34 - .byte W01 - .byte PAN , c_v+0 - .byte VOL , 11*se_m_barrier_mvl/mxv - .byte BEND , c_v-45 - .byte W02 - .byte VOL , 95*se_m_barrier_mvl/mxv - .byte BEND , c_v+0 - .byte N06 , Cn6 , v084 - .byte W01 - .byte VOL , 88*se_m_barrier_mvl/mxv - .byte BEND , c_v-11 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 56*se_m_barrier_mvl/mxv - .byte BEND , c_v-20 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 24*se_m_barrier_mvl/mxv - .byte BEND , c_v-37 - .byte W01 - .byte PAN , c_v+0 - .byte VOL , 11*se_m_barrier_mvl/mxv - .byte BEND , c_v-47 - .byte W02 - .byte VOL , 95*se_m_barrier_mvl/mxv - .byte BEND , c_v-1 - .byte N06 , Cn6 , v076 - .byte W01 - .byte VOL , 88*se_m_barrier_mvl/mxv - .byte BEND , c_v-11 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 56*se_m_barrier_mvl/mxv - .byte BEND , c_v-21 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 24*se_m_barrier_mvl/mxv - .byte BEND , c_v-38 - .byte W01 - .byte PAN , c_v+0 - .byte VOL , 11*se_m_barrier_mvl/mxv - .byte BEND , c_v-48 - .byte W02 - .byte VOL , 95*se_m_barrier_mvl/mxv - .byte BEND , c_v-1 - .byte N06 , Cn6 , v064 - .byte W01 - .byte VOL , 88*se_m_barrier_mvl/mxv - .byte BEND , c_v-11 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 56*se_m_barrier_mvl/mxv - .byte BEND , c_v-21 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 24*se_m_barrier_mvl/mxv - .byte BEND , c_v-38 - .byte W01 - .byte PAN , c_v+0 - .byte VOL , 11*se_m_barrier_mvl/mxv - .byte BEND , c_v-48 - .byte W02 - .byte VOL , 95*se_m_barrier_mvl/mxv - .byte BEND , c_v-2 - .byte N06 , Cn6 , v056 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 88*se_m_barrier_mvl/mxv - .byte BEND , c_v-12 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 56*se_m_barrier_mvl/mxv - .byte BEND , c_v-22 - .byte W01 - .byte PAN , c_v+8 - .byte VOL , 24*se_m_barrier_mvl/mxv - .byte BEND , c_v-39 - .byte W01 - .byte PAN , c_v-10 - .byte VOL , 11*se_m_barrier_mvl/mxv - .byte BEND , c_v-49 - .byte W02 - .byte PAN , c_v+0 - .byte VOL , 95*se_m_barrier_mvl/mxv - .byte BEND , c_v-2 - .byte N06 , Cn6 , v044 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 88*se_m_barrier_mvl/mxv - .byte BEND , c_v-12 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 56*se_m_barrier_mvl/mxv - .byte BEND , c_v-22 - .byte W01 - .byte PAN , c_v+8 - .byte VOL , 24*se_m_barrier_mvl/mxv - .byte BEND , c_v-39 - .byte W01 - .byte PAN , c_v-10 - .byte VOL , 11*se_m_barrier_mvl/mxv - .byte BEND , c_v-49 - .byte W02 - .byte VOL , 95*se_m_barrier_mvl/mxv - .byte BEND , c_v-2 - .byte N06 , Cn6 , v036 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 88*se_m_barrier_mvl/mxv - .byte BEND , c_v-13 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 56*se_m_barrier_mvl/mxv - .byte BEND , c_v-22 - .byte W01 - .byte PAN , c_v+8 - .byte VOL , 24*se_m_barrier_mvl/mxv - .byte BEND , c_v-39 - .byte W01 - .byte PAN , c_v-10 - .byte VOL , 11*se_m_barrier_mvl/mxv - .byte BEND , c_v-49 - .byte W02 - .byte PAN , c_v+0 - .byte VOL , 95*se_m_barrier_mvl/mxv - .byte BEND , c_v-2 - .byte N06 , Cn6 , v028 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 88*se_m_barrier_mvl/mxv - .byte BEND , c_v-13 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 56*se_m_barrier_mvl/mxv - .byte BEND , c_v-22 - .byte W01 - .byte PAN , c_v+8 - .byte VOL , 24*se_m_barrier_mvl/mxv - .byte BEND , c_v-39 - .byte W01 - .byte PAN , c_v-10 - .byte VOL , 11*se_m_barrier_mvl/mxv - .byte BEND , c_v-49 - .byte W02 - .byte W06 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_barrier_2: - .byte KEYSH , se_m_barrier_key+0 - .byte VOICE , 53 - .byte PAN , c_v+0 - .byte VOL , 95*se_m_barrier_mvl/mxv - .byte BEND , c_v-5 - .byte W02 - .byte N06 , An5 , v064 - .byte W02 - .byte VOL , 88*se_m_barrier_mvl/mxv - .byte W02 - .byte 56*se_m_barrier_mvl/mxv - .byte W01 - .byte 24*se_m_barrier_mvl/mxv - .byte W01 - .byte 95*se_m_barrier_mvl/mxv - .byte N06 , An5 , v056 - .byte W02 - .byte VOL , 88*se_m_barrier_mvl/mxv - .byte W02 -se_m_barrier_2_000: - .byte VOL , 56*se_m_barrier_mvl/mxv - .byte W01 - .byte 24*se_m_barrier_mvl/mxv - .byte W01 - .byte 95*se_m_barrier_mvl/mxv - .byte N06 , An5 , v052 - .byte W02 - .byte VOL , 88*se_m_barrier_mvl/mxv - .byte W02 - .byte PEND - .byte PATT - .word se_m_barrier_2_000 - .byte VOL , 56*se_m_barrier_mvl/mxv - .byte W01 - .byte 24*se_m_barrier_mvl/mxv - .byte W01 - .byte 95*se_m_barrier_mvl/mxv - .byte N06 , An5 , v048 - .byte W02 - .byte VOL , 88*se_m_barrier_mvl/mxv - .byte W02 - .byte 56*se_m_barrier_mvl/mxv - .byte W01 - .byte 24*se_m_barrier_mvl/mxv - .byte W01 - .byte 95*se_m_barrier_mvl/mxv - .byte N06 , An5 , v044 - .byte W02 - .byte VOL , 88*se_m_barrier_mvl/mxv - .byte W02 - .byte 56*se_m_barrier_mvl/mxv - .byte W01 - .byte 24*se_m_barrier_mvl/mxv - .byte W01 - .byte 95*se_m_barrier_mvl/mxv - .byte N06 , An5 , v040 - .byte W02 - .byte VOL , 88*se_m_barrier_mvl/mxv - .byte W02 - .byte 56*se_m_barrier_mvl/mxv - .byte W01 - .byte 24*se_m_barrier_mvl/mxv - .byte W01 - .byte 95*se_m_barrier_mvl/mxv - .byte N06 , An5 , v036 - .byte W02 - .byte VOL , 88*se_m_barrier_mvl/mxv - .byte W02 - .byte 56*se_m_barrier_mvl/mxv - .byte W01 - .byte 24*se_m_barrier_mvl/mxv - .byte W05 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_barrier: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_barrier_pri @ Priority - .byte se_m_barrier_rev @ Reverb. - - .word se_m_barrier_grp - - .word se_m_barrier_1 - .word se_m_barrier_2 - - .end diff --git a/sound/songs/se_m_baton_pass.s b/sound/songs/se_m_baton_pass.s deleted file mode 100644 index ec8ddd542..000000000 --- a/sound/songs/se_m_baton_pass.s +++ /dev/null @@ -1,169 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_baton_pass_grp, voicegroup_rs_sfx_2 - .equ se_m_baton_pass_pri, 4 - .equ se_m_baton_pass_rev, reverb_set+50 - .equ se_m_baton_pass_mvl, 127 - .equ se_m_baton_pass_key, 0 - .equ se_m_baton_pass_tbs, 1 - .equ se_m_baton_pass_exg, 0 - .equ se_m_baton_pass_cmp, 1 - - .section .rodata - .global se_m_baton_pass - .align 2 - -@********************** Track 1 **********************@ - -se_m_baton_pass_1: - .byte KEYSH , se_m_baton_pass_key+0 - .byte VOICE , 19 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 12*se_m_baton_pass_mvl/mxv - .byte BEND , c_v+49 - .byte N06 , Gn4 , v080 - .byte W01 - .byte VOL , 44*se_m_baton_pass_mvl/mxv - .byte BEND , c_v+22 - .byte W01 - .byte VOL , 62*se_m_baton_pass_mvl/mxv - .byte PAN , c_v+8 - .byte VOL , 75*se_m_baton_pass_mvl/mxv - .byte BEND , c_v+20 - .byte W01 - .byte VOL , 87*se_m_baton_pass_mvl/mxv - .byte BEND , c_v+33 - .byte W01 - .byte VOL , 96*se_m_baton_pass_mvl/mxv - .byte PAN , c_v-7 - .byte VOL , 100*se_m_baton_pass_mvl/mxv - .byte BEND , c_v+54 - .byte W01 - .byte c_v+63 - .byte W01 - .byte W02 - .byte PAN , c_v+0 - .byte N04 , Gn4 , v040 - .byte W01 - .byte W03 - .byte W03 - .byte VOICE , 45 - .byte MOD , 30 - .byte BENDR , 24 - .byte VOL , 54*se_m_baton_pass_mvl/mxv - .byte BEND , c_v+0 - .byte N06 , Gn3 , v108 - .byte W01 - .byte VOL , 70*se_m_baton_pass_mvl/mxv - .byte BEND , c_v+4 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 80*se_m_baton_pass_mvl/mxv - .byte BEND , c_v+9 - .byte W01 - .byte VOL , 100*se_m_baton_pass_mvl/mxv - .byte BEND , c_v+16 - .byte W01 - .byte c_v+24 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+2 - .byte N06 , An3 , v100 - .byte W01 - .byte BEND , c_v+7 - .byte W01 - .byte PAN , c_v-4 - .byte BEND , c_v+12 - .byte W01 - .byte c_v+18 - .byte W01 - .byte c_v+27 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+4 - .byte N06 , Bn3 , v060 - .byte W01 - .byte BEND , c_v+9 - .byte W01 - .byte PAN , c_v+6 - .byte BEND , c_v+14 - .byte W01 - .byte c_v+20 - .byte W01 - .byte c_v+29 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+6 - .byte N06 , Cn4 , v040 - .byte W01 - .byte BEND , c_v+11 - .byte W01 - .byte PAN , c_v-6 - .byte BEND , c_v+15 - .byte W01 - .byte c_v+22 - .byte W01 - .byte c_v+31 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+9 - .byte N06 , Dn4 , v020 - .byte W01 - .byte BEND , c_v+14 - .byte W01 - .byte PAN , c_v+8 - .byte BEND , c_v+18 - .byte W01 - .byte c_v+25 - .byte W01 - .byte c_v+34 - .byte W02 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_baton_pass_2: - .byte KEYSH , se_m_baton_pass_key+0 - .byte VOICE , 57 - .byte VOL , 59*se_m_baton_pass_mvl/mxv - .byte N06 , Gs4 , v052 - .byte W01 - .byte VOL , 72*se_m_baton_pass_mvl/mxv - .byte W01 - .byte 90*se_m_baton_pass_mvl/mxv - .byte W01 - .byte 100*se_m_baton_pass_mvl/mxv - .byte W03 - .byte W02 - .byte N04 , Gs4 , v024 - .byte W01 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_baton_pass: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_baton_pass_pri @ Priority - .byte se_m_baton_pass_rev @ Reverb. - - .word se_m_baton_pass_grp - - .word se_m_baton_pass_1 - .word se_m_baton_pass_2 - - .end diff --git a/sound/songs/se_m_belly_drum.s b/sound/songs/se_m_belly_drum.s deleted file mode 100644 index 5b5508ed4..000000000 --- a/sound/songs/se_m_belly_drum.s +++ /dev/null @@ -1,72 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_belly_drum_grp, voicegroup_rs_sfx_2 - .equ se_m_belly_drum_pri, 4 - .equ se_m_belly_drum_rev, reverb_set+50 - .equ se_m_belly_drum_mvl, 127 - .equ se_m_belly_drum_key, 0 - .equ se_m_belly_drum_tbs, 1 - .equ se_m_belly_drum_exg, 0 - .equ se_m_belly_drum_cmp, 1 - - .section .rodata - .global se_m_belly_drum - .align 2 - -@********************** Track 1 **********************@ - -se_m_belly_drum_1: - .byte KEYSH , se_m_belly_drum_key+0 - .byte TEMPO , 150*se_m_belly_drum_tbs/2 - .byte VOICE , 6 - .byte BENDR , 12 - .byte VOL , 115*se_m_belly_drum_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N19 , An2 , v127 - .byte W01 - .byte BEND , c_v-6 - .byte W01 - .byte c_v-10 - .byte W01 - .byte c_v-14 - .byte W01 - .byte c_v-12 - .byte W02 - .byte c_v-14 - .byte W01 - .byte c_v-18 - .byte W01 - .byte VOL , 108*se_m_belly_drum_mvl/mxv - .byte BEND , c_v-20 - .byte W01 - .byte c_v-22 - .byte W01 - .byte VOL , 94*se_m_belly_drum_mvl/mxv - .byte W03 - .byte 78*se_m_belly_drum_mvl/mxv - .byte W01 - .byte 62*se_m_belly_drum_mvl/mxv - .byte W01 - .byte 40*se_m_belly_drum_mvl/mxv - .byte W01 - .byte 27*se_m_belly_drum_mvl/mxv - .byte W02 - .byte 12*se_m_belly_drum_mvl/mxv - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_belly_drum: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_belly_drum_pri @ Priority - .byte se_m_belly_drum_rev @ Reverb. - - .word se_m_belly_drum_grp - - .word se_m_belly_drum_1 - - .end diff --git a/sound/songs/se_m_bite.s b/sound/songs/se_m_bite.s deleted file mode 100644 index c01e160c1..000000000 --- a/sound/songs/se_m_bite.s +++ /dev/null @@ -1,100 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_bite_grp, voicegroup_rs_sfx_2 - .equ se_m_bite_pri, 4 - .equ se_m_bite_rev, reverb_set+50 - .equ se_m_bite_mvl, 127 - .equ se_m_bite_key, 0 - .equ se_m_bite_tbs, 1 - .equ se_m_bite_exg, 0 - .equ se_m_bite_cmp, 1 - - .section .rodata - .global se_m_bite - .align 2 - -@********************** Track 1 **********************@ - -se_m_bite_1: - .byte KEYSH , se_m_bite_key+0 - .byte TEMPO , 220*se_m_bite_tbs/2 - .byte VOICE , 26 - .byte BENDR , 12 - .byte PAN , c_v+6 - .byte VOL , 110*se_m_bite_mvl/mxv - .byte BEND , c_v+0 - .byte N02 , Gn3 , v112 - .byte W02 - .byte Gs3 - .byte W01 - .byte PAN , c_v-7 - .byte W01 - .byte N02 , An3 - .byte W02 - .byte PAN , c_v+7 - .byte W02 - .byte c_v-8 - .byte W02 - .byte VOICE , 21 - .byte PAN , c_v+0 - .byte N01 , Cn5 , v116 - .byte W02 - .byte PAN , c_v+10 - .byte N01 , Cn4 , v108 - .byte W01 - .byte PAN , c_v-8 - .byte N01 , Gn4 , v104 - .byte W01 - .byte PAN , c_v+0 - .byte N01 , Gn3 , v096 - .byte W01 - .byte PAN , c_v+10 - .byte N01 , Cn4 , v088 - .byte W01 - .byte PAN , c_v-8 - .byte N01 , Cn3 , v080 - .byte W02 - .byte PAN , c_v+0 - .byte N01 , Gn3 , v072 - .byte W01 - .byte PAN , c_v+10 - .byte N01 , Gn2 , v064 - .byte W01 - .byte PAN , c_v-8 - .byte N01 , Cn3 , v056 - .byte W01 - .byte PAN , c_v+0 - .byte N01 , Gn2 , v048 - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_bite_2: - .byte KEYSH , se_m_bite_key+0 - .byte VOICE , 27 - .byte VOL , 110*se_m_bite_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte W10 - .byte N01 , Gn2 , v040 - .byte W08 - .byte N01 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_bite: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_bite_pri @ Priority - .byte se_m_bite_rev @ Reverb. - - .word se_m_bite_grp - - .word se_m_bite_1 - .word se_m_bite_2 - - .end diff --git a/sound/songs/se_m_blizzard.s b/sound/songs/se_m_blizzard.s deleted file mode 100644 index a274da221..000000000 --- a/sound/songs/se_m_blizzard.s +++ /dev/null @@ -1,103 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_blizzard_grp, voicegroup_rs_sfx_2 - .equ se_m_blizzard_pri, 4 - .equ se_m_blizzard_rev, reverb_set+50 - .equ se_m_blizzard_mvl, 127 - .equ se_m_blizzard_key, 0 - .equ se_m_blizzard_tbs, 1 - .equ se_m_blizzard_exg, 0 - .equ se_m_blizzard_cmp, 1 - - .section .rodata - .global se_m_blizzard - .align 2 - -@********************** Track 1 **********************@ - -se_m_blizzard_1: - .byte KEYSH , se_m_blizzard_key+0 - .byte TEMPO , 150*se_m_blizzard_tbs/2 - .byte VOICE , 22 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 64*se_m_blizzard_mvl/mxv - .byte BEND , c_v+0 - .byte N24 , Gn3 , v108 - .byte W03 - .byte VOL , 79*se_m_blizzard_mvl/mxv - .byte BEND , c_v+22 - .byte W02 - .byte c_v+8 - .byte W01 - .byte VOL , 84*se_m_blizzard_mvl/mxv - .byte PAN , c_v-4 - .byte W03 - .byte VOL , 91*se_m_blizzard_mvl/mxv - .byte BEND , c_v+0 - .byte W03 - .byte VOL , 100*se_m_blizzard_mvl/mxv - .byte PAN , c_v-8 - .byte W03 - .byte VOL , 110*se_m_blizzard_mvl/mxv - .byte W03 - .byte PAN , c_v-12 - .byte W06 -se_m_blizzard_1_B1: - .byte PAN , c_v-17 - .byte BEND , c_v+0 - .byte N48 , Gn3 , v108 - .byte W03 - .byte BEND , c_v-7 - .byte W03 - .byte PAN , c_v-9 - .byte BEND , c_v-12 - .byte W03 - .byte c_v-20 - .byte W03 - .byte PAN , c_v-3 - .byte W03 - .byte c_v+6 - .byte BEND , c_v-13 - .byte W03 - .byte PAN , c_v+10 - .byte W03 - .byte BEND , c_v-6 - .byte W03 - .byte PAN , c_v+16 - .byte W03 - .byte BEND , c_v+6 - .byte W03 - .byte PAN , c_v+13 - .byte BEND , c_v+11 - .byte W03 - .byte c_v+20 - .byte W03 - .byte PAN , c_v+8 - .byte W03 - .byte c_v+0 - .byte BEND , c_v+12 - .byte W03 - .byte PAN , c_v-8 - .byte BEND , c_v+7 - .byte W03 - .byte PAN , c_v-11 - .byte W03 - .byte GOTO - .word se_m_blizzard_1_B1 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_blizzard: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_blizzard_pri @ Priority - .byte se_m_blizzard_rev @ Reverb. - - .word se_m_blizzard_grp - - .word se_m_blizzard_1 - - .end diff --git a/sound/songs/se_m_blizzard2.s b/sound/songs/se_m_blizzard2.s deleted file mode 100644 index 2940d80d5..000000000 --- a/sound/songs/se_m_blizzard2.s +++ /dev/null @@ -1,72 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_blizzard2_grp, voicegroup_rs_sfx_2 - .equ se_m_blizzard2_pri, 4 - .equ se_m_blizzard2_rev, reverb_set+50 - .equ se_m_blizzard2_mvl, 127 - .equ se_m_blizzard2_key, 0 - .equ se_m_blizzard2_tbs, 1 - .equ se_m_blizzard2_exg, 0 - .equ se_m_blizzard2_cmp, 1 - - .section .rodata - .global se_m_blizzard2 - .align 2 - -@********************** Track 1 **********************@ - -se_m_blizzard2_1: - .byte KEYSH , se_m_blizzard2_key+0 - .byte TEMPO , 150*se_m_blizzard2_tbs/2 - .byte VOICE , 22 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_blizzard2_mvl/mxv - .byte BEND , c_v+0 - .byte N24 , Gn3 , v108 - .byte W02 - .byte PAN , c_v-19 - .byte W04 - .byte c_v+0 - .byte W01 - .byte VOL , 97*se_m_blizzard2_mvl/mxv - .byte W01 - .byte PAN , c_v+16 - .byte W01 - .byte VOL , 84*se_m_blizzard2_mvl/mxv - .byte W03 - .byte 76*se_m_blizzard2_mvl/mxv - .byte PAN , c_v+2 - .byte W02 - .byte VOL , 55*se_m_blizzard2_mvl/mxv - .byte PAN , c_v-8 - .byte W02 - .byte VOL , 39*se_m_blizzard2_mvl/mxv - .byte W02 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 25*se_m_blizzard2_mvl/mxv - .byte W01 - .byte PAN , c_v+8 - .byte W01 - .byte VOL , 13*se_m_blizzard2_mvl/mxv - .byte W03 - .byte 7*se_m_blizzard2_mvl/mxv - .byte PAN , c_v+0 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_blizzard2: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_blizzard2_pri @ Priority - .byte se_m_blizzard2_rev @ Reverb. - - .word se_m_blizzard2_grp - - .word se_m_blizzard2_1 - - .end diff --git a/sound/songs/se_m_bonemerang.s b/sound/songs/se_m_bonemerang.s deleted file mode 100644 index 16f170b76..000000000 --- a/sound/songs/se_m_bonemerang.s +++ /dev/null @@ -1,57 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_bonemerang_grp, voicegroup_rs_sfx_2 - .equ se_m_bonemerang_pri, 4 - .equ se_m_bonemerang_rev, reverb_set+50 - .equ se_m_bonemerang_mvl, 127 - .equ se_m_bonemerang_key, 0 - .equ se_m_bonemerang_tbs, 1 - .equ se_m_bonemerang_exg, 0 - .equ se_m_bonemerang_cmp, 1 - - .section .rodata - .global se_m_bonemerang - .align 2 - -@********************** Track 1 **********************@ - -se_m_bonemerang_1: - .byte KEYSH , se_m_bonemerang_key+0 - .byte TEMPO , 150*se_m_bonemerang_tbs/2 - .byte VOICE , 24 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_bonemerang_mvl/mxv - .byte BEND , c_v+0 - .byte N01 , Cn5 , v127 - .byte W01 - .byte PAN , c_v+10 - .byte N01 , Cn6 - .byte W01 - .byte PAN , c_v+0 - .byte N01 , Cn5 - .byte W04 - .byte N01 - .byte W01 - .byte PAN , c_v-11 - .byte N01 , Cn6 - .byte W01 - .byte PAN , c_v+0 - .byte N01 , Cn5 - .byte W04 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_bonemerang: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_bonemerang_pri @ Priority - .byte se_m_bonemerang_rev @ Reverb. - - .word se_m_bonemerang_grp - - .word se_m_bonemerang_1 - - .end diff --git a/sound/songs/se_m_brick_break.s b/sound/songs/se_m_brick_break.s deleted file mode 100644 index 2270fc24b..000000000 --- a/sound/songs/se_m_brick_break.s +++ /dev/null @@ -1,100 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_brick_break_grp, voicegroup_rs_sfx_2 - .equ se_m_brick_break_pri, 4 - .equ se_m_brick_break_rev, reverb_set+50 - .equ se_m_brick_break_mvl, 127 - .equ se_m_brick_break_key, 0 - .equ se_m_brick_break_tbs, 1 - .equ se_m_brick_break_exg, 0 - .equ se_m_brick_break_cmp, 1 - - .section .rodata - .global se_m_brick_break - .align 2 - -@********************** Track 1 **********************@ - -se_m_brick_break_1: - .byte KEYSH , se_m_brick_break_key+0 - .byte TEMPO , 150*se_m_brick_break_tbs/2 - .byte VOICE , 41 - .byte VOL , 110*se_m_brick_break_mvl/mxv - .byte PAN , c_v+0 - .byte N01 , Cn4 , v127 - .byte W01 - .byte N03 , Cn5 - .byte W01 - .byte PAN , c_v+5 - .byte W01 - .byte c_v-6 - .byte W01 - .byte VOICE , 3 - .byte PAN , c_v+0 - .byte N01 , Gs4 , v112 - .byte W02 - .byte W03 - .byte PAN , c_v+7 - .byte N01 , Dn5 , v096 - .byte W03 - .byte W02 - .byte PAN , c_v+0 - .byte N01 , Gs4 , v084 - .byte W04 - .byte W01 - .byte PAN , c_v-8 - .byte N01 , Dn5 , v068 - .byte W05 - .byte PAN , c_v+7 - .byte N01 , Gs4 , v052 - .byte W04 - .byte PAN , c_v-8 - .byte N01 , Dn5 , v032 - .byte W02 - .byte W06 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_brick_break_2: - .byte KEYSH , se_m_brick_break_key+0 - .byte VOICE , 4 - .byte VOL , 110*se_m_brick_break_mvl/mxv - .byte PAN , c_v+0 - .byte N01 , Cn3 , v064 - .byte W01 - .byte N03 , Gn3 - .byte W05 - .byte W01 - .byte N02 , En4 , v040 - .byte W05 - .byte Gn3 - .byte W04 - .byte En4 , v032 - .byte W02 - .byte W03 - .byte Gn3 - .byte W03 - .byte W02 - .byte En4 , v020 - .byte W04 - .byte W01 - .byte Gn3 - .byte W05 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_brick_break: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_brick_break_pri @ Priority - .byte se_m_brick_break_rev @ Reverb. - - .word se_m_brick_break_grp - - .word se_m_brick_break_1 - .word se_m_brick_break_2 - - .end diff --git a/sound/songs/se_m_bubble.s b/sound/songs/se_m_bubble.s deleted file mode 100644 index 9c7fb6fad..000000000 --- a/sound/songs/se_m_bubble.s +++ /dev/null @@ -1,57 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_bubble_grp, voicegroup_rs_sfx_2 - .equ se_m_bubble_pri, 4 - .equ se_m_bubble_rev, reverb_set+50 - .equ se_m_bubble_mvl, 127 - .equ se_m_bubble_key, 0 - .equ se_m_bubble_tbs, 1 - .equ se_m_bubble_exg, 0 - .equ se_m_bubble_cmp, 1 - - .section .rodata - .global se_m_bubble - .align 2 - -@********************** Track 1 **********************@ - -se_m_bubble_1: - .byte KEYSH , se_m_bubble_key+0 - .byte TEMPO , 220*se_m_bubble_tbs/2 - .byte VOICE , 23 - .byte VOL , 95*se_m_bubble_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N09 , Cn3 , v127 - .byte W03 - .byte PAN , c_v-16 - .byte BEND , c_v+6 - .byte W01 - .byte c_v+16 - .byte W02 - .byte PAN , c_v+16 - .byte BEND , c_v+37 - .byte W01 - .byte c_v+48 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v-1 - .byte N03 , En3 - .byte W15 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_bubble: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_bubble_pri @ Priority - .byte se_m_bubble_rev @ Reverb. - - .word se_m_bubble_grp - - .word se_m_bubble_1 - - .end diff --git a/sound/songs/se_m_bubble2.s b/sound/songs/se_m_bubble2.s deleted file mode 100644 index 1b009672b..000000000 --- a/sound/songs/se_m_bubble2.s +++ /dev/null @@ -1,60 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_bubble2_grp, voicegroup_rs_sfx_2 - .equ se_m_bubble2_pri, 4 - .equ se_m_bubble2_rev, reverb_set+50 - .equ se_m_bubble2_mvl, 127 - .equ se_m_bubble2_key, 0 - .equ se_m_bubble2_tbs, 1 - .equ se_m_bubble2_exg, 0 - .equ se_m_bubble2_cmp, 1 - - .section .rodata - .global se_m_bubble2 - .align 2 - -@********************** Track 1 **********************@ - -se_m_bubble2_1: - .byte KEYSH , se_m_bubble2_key+0 - .byte TEMPO , 220*se_m_bubble2_tbs/2 - .byte VOICE , 24 - .byte VOL , 110*se_m_bubble2_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte W03 - .byte N09 , Gn4 , v127 - .byte W02 - .byte BEND , c_v+31 - .byte W02 - .byte c_v-34 - .byte W17 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_bubble2_2: - .byte KEYSH , se_m_bubble2_key+0 - .byte VOICE , 4 - .byte VOL , 110*se_m_bubble2_mvl/mxv - .byte PAN , c_v+0 - .byte N01 , Cn4 , v044 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_bubble2: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_bubble2_pri @ Priority - .byte se_m_bubble2_rev @ Reverb. - - .word se_m_bubble2_grp - - .word se_m_bubble2_1 - .word se_m_bubble2_2 - - .end diff --git a/sound/songs/se_m_bubble3.s b/sound/songs/se_m_bubble3.s deleted file mode 100644 index ea4c1e6fd..000000000 --- a/sound/songs/se_m_bubble3.s +++ /dev/null @@ -1,62 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_bubble3_grp, voicegroup_rs_sfx_2 - .equ se_m_bubble3_pri, 4 - .equ se_m_bubble3_rev, reverb_set+50 - .equ se_m_bubble3_mvl, 127 - .equ se_m_bubble3_key, 0 - .equ se_m_bubble3_tbs, 1 - .equ se_m_bubble3_exg, 0 - .equ se_m_bubble3_cmp, 1 - - .section .rodata - .global se_m_bubble3 - .align 2 - -@********************** Track 1 **********************@ - -se_m_bubble3_1: - .byte KEYSH , se_m_bubble3_key+0 - .byte TEMPO , 220*se_m_bubble3_tbs/2 - .byte VOICE , 23 - .byte VOL , 95*se_m_bubble3_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N12 , Gn2 , v127 - .byte W06 - .byte PAN , c_v-17 - .byte BEND , c_v+6 - .byte W01 - .byte c_v+16 - .byte W02 - .byte PAN , c_v+16 - .byte BEND , c_v+25 - .byte W01 - .byte c_v+31 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v-1 - .byte W03 - .byte N06 - .byte W03 - .byte BEND , c_v+6 - .byte W01 - .byte c_v+13 - .byte W05 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_bubble3: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_bubble3_pri @ Priority - .byte se_m_bubble3_rev @ Reverb. - - .word se_m_bubble3_grp - - .word se_m_bubble3_1 - - .end diff --git a/sound/songs/se_m_bubble_beam.s b/sound/songs/se_m_bubble_beam.s deleted file mode 100644 index b1eac882b..000000000 --- a/sound/songs/se_m_bubble_beam.s +++ /dev/null @@ -1,173 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_bubble_beam_grp, voicegroup_rs_sfx_2 - .equ se_m_bubble_beam_pri, 4 - .equ se_m_bubble_beam_rev, reverb_set+50 - .equ se_m_bubble_beam_mvl, 127 - .equ se_m_bubble_beam_key, 0 - .equ se_m_bubble_beam_tbs, 1 - .equ se_m_bubble_beam_exg, 0 - .equ se_m_bubble_beam_cmp, 1 - - .section .rodata - .global se_m_bubble_beam - .align 2 - -@********************** Track 1 **********************@ - -se_m_bubble_beam_1: - .byte KEYSH , se_m_bubble_beam_key+0 - .byte TEMPO , 150*se_m_bubble_beam_tbs/2 - .byte VOICE , 9 - .byte BENDR , 2 - .byte PAN , c_v+0 - .byte VOL , 24*se_m_bubble_beam_mvl/mxv - .byte BEND , c_v-17 - .byte N78 , Bn4 , v080 - .byte W01 - .byte VOL , 32*se_m_bubble_beam_mvl/mxv - .byte PAN , c_v+6 - .byte W01 - .byte VOL , 38*se_m_bubble_beam_mvl/mxv - .byte PAN , c_v-7 - .byte W01 - .byte VOL , 48*se_m_bubble_beam_mvl/mxv - .byte PAN , c_v+9 - .byte W01 - .byte VOL , 66*se_m_bubble_beam_mvl/mxv - .byte PAN , c_v-13 - .byte W02 - .byte VOL , 78*se_m_bubble_beam_mvl/mxv - .byte PAN , c_v+6 - .byte W01 - .byte VOL , 94*se_m_bubble_beam_mvl/mxv - .byte PAN , c_v-6 - .byte W01 - .byte VOL , 110*se_m_bubble_beam_mvl/mxv - .byte PAN , c_v+0 - .byte W01 - .byte c_v+6 - .byte W01 - .byte c_v-7 - .byte W02 -se_m_bubble_beam_1_000: - .byte PAN , c_v+9 - .byte W01 - .byte c_v-13 - .byte W01 - .byte c_v+6 - .byte W01 - .byte c_v-6 - .byte W01 - .byte c_v+0 - .byte W02 - .byte PEND -se_m_bubble_beam_1_001: - .byte PAN , c_v+6 - .byte W01 - .byte c_v-7 - .byte W01 - .byte c_v+9 - .byte W01 - .byte c_v-13 - .byte W01 - .byte c_v+6 - .byte W02 - .byte PEND - .byte c_v-6 - .byte W01 - .byte c_v+0 - .byte W01 - .byte c_v+6 - .byte W01 - .byte c_v-7 - .byte W01 - .byte c_v+9 - .byte W02 - .byte c_v-13 - .byte W01 - .byte c_v+6 - .byte W01 - .byte c_v-6 - .byte W01 - .byte c_v+0 - .byte W01 - .byte c_v+6 - .byte W02 - .byte c_v-7 - .byte W01 - .byte c_v+9 - .byte W01 - .byte c_v-13 - .byte W01 - .byte c_v+6 - .byte W01 - .byte c_v-6 - .byte W02 - .byte c_v+0 - .byte W01 - .byte c_v+6 - .byte W01 - .byte c_v-7 - .byte W01 - .byte c_v+9 - .byte W01 - .byte c_v-13 - .byte W02 - .byte c_v+6 - .byte W01 - .byte c_v-6 - .byte W01 - .byte c_v+0 - .byte W01 - .byte c_v+6 - .byte W01 - .byte c_v-7 - .byte W02 - .byte PATT - .word se_m_bubble_beam_1_000 - .byte PATT - .word se_m_bubble_beam_1_001 - .byte PAN , c_v-6 - .byte W01 - .byte c_v+0 - .byte W01 - .byte c_v+6 - .byte W01 - .byte VOL , 103*se_m_bubble_beam_mvl/mxv - .byte PAN , c_v-7 - .byte W01 - .byte VOL , 91*se_m_bubble_beam_mvl/mxv - .byte PAN , c_v+9 - .byte W02 - .byte VOL , 72*se_m_bubble_beam_mvl/mxv - .byte PAN , c_v-13 - .byte W01 - .byte VOL , 58*se_m_bubble_beam_mvl/mxv - .byte PAN , c_v+6 - .byte W01 - .byte VOL , 38*se_m_bubble_beam_mvl/mxv - .byte PAN , c_v-6 - .byte W01 - .byte VOL , 15*se_m_bubble_beam_mvl/mxv - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 7*se_m_bubble_beam_mvl/mxv - .byte PAN , c_v+6 - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_bubble_beam: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_bubble_beam_pri @ Priority - .byte se_m_bubble_beam_rev @ Reverb. - - .word se_m_bubble_beam_grp - - .word se_m_bubble_beam_1 - - .end diff --git a/sound/songs/se_m_bubble_beam2.s b/sound/songs/se_m_bubble_beam2.s deleted file mode 100644 index 970ef0289..000000000 --- a/sound/songs/se_m_bubble_beam2.s +++ /dev/null @@ -1,131 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_bubble_beam2_grp, voicegroup_rs_sfx_2 - .equ se_m_bubble_beam2_pri, 4 - .equ se_m_bubble_beam2_rev, reverb_set+50 - .equ se_m_bubble_beam2_mvl, 127 - .equ se_m_bubble_beam2_key, 0 - .equ se_m_bubble_beam2_tbs, 1 - .equ se_m_bubble_beam2_exg, 0 - .equ se_m_bubble_beam2_cmp, 1 - - .section .rodata - .global se_m_bubble_beam2 - .align 2 - -@********************** Track 1 **********************@ - -se_m_bubble_beam2_1: - .byte KEYSH , se_m_bubble_beam2_key+0 - .byte TEMPO , 150*se_m_bubble_beam2_tbs/2 - .byte VOICE , 9 - .byte BENDR , 2 - .byte PAN , c_v+0 - .byte VOL , 26*se_m_bubble_beam2_mvl/mxv - .byte BEND , c_v-23 - .byte N09 , Dn5 , v127 - .byte W01 - .byte VOL , 34*se_m_bubble_beam2_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v-20 - .byte W01 - .byte VOL , 42*se_m_bubble_beam2_mvl/mxv - .byte PAN , c_v-7 - .byte BEND , c_v-16 - .byte W01 - .byte VOL , 52*se_m_bubble_beam2_mvl/mxv - .byte PAN , c_v+9 - .byte W01 - .byte VOL , 72*se_m_bubble_beam2_mvl/mxv - .byte PAN , c_v-13 - .byte BEND , c_v-18 - .byte W02 - .byte VOL , 85*se_m_bubble_beam2_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v-21 - .byte W01 - .byte VOL , 102*se_m_bubble_beam2_mvl/mxv - .byte PAN , c_v-6 - .byte BEND , c_v-23 - .byte W01 - .byte VOL , 120*se_m_bubble_beam2_mvl/mxv - .byte BEND , c_v-24 - .byte W02 - .byte VOL , 26*se_m_bubble_beam2_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-23 - .byte N09 , Dn5 , v100 - .byte W02 - .byte VOL , 34*se_m_bubble_beam2_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v-20 - .byte W01 - .byte VOL , 42*se_m_bubble_beam2_mvl/mxv - .byte PAN , c_v-7 - .byte BEND , c_v-16 - .byte W01 - .byte VOL , 52*se_m_bubble_beam2_mvl/mxv - .byte PAN , c_v+9 - .byte W01 - .byte VOL , 72*se_m_bubble_beam2_mvl/mxv - .byte PAN , c_v-13 - .byte BEND , c_v-18 - .byte W01 - .byte VOL , 85*se_m_bubble_beam2_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v-21 - .byte W02 - .byte VOL , 102*se_m_bubble_beam2_mvl/mxv - .byte PAN , c_v-6 - .byte BEND , c_v-23 - .byte W01 - .byte VOL , 120*se_m_bubble_beam2_mvl/mxv - .byte BEND , c_v-24 - .byte W02 - .byte VOL , 26*se_m_bubble_beam2_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-23 - .byte N09 , Dn5 , v080 - .byte W01 - .byte VOL , 34*se_m_bubble_beam2_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v-20 - .byte W02 - .byte VOL , 42*se_m_bubble_beam2_mvl/mxv - .byte PAN , c_v-7 - .byte BEND , c_v-16 - .byte W01 - .byte VOL , 52*se_m_bubble_beam2_mvl/mxv - .byte PAN , c_v+9 - .byte W01 - .byte VOL , 72*se_m_bubble_beam2_mvl/mxv - .byte PAN , c_v-13 - .byte BEND , c_v-18 - .byte W01 - .byte VOL , 85*se_m_bubble_beam2_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v-21 - .byte W01 - .byte VOL , 102*se_m_bubble_beam2_mvl/mxv - .byte PAN , c_v-6 - .byte BEND , c_v-23 - .byte W02 - .byte VOL , 120*se_m_bubble_beam2_mvl/mxv - .byte BEND , c_v-24 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_bubble_beam2: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_bubble_beam2_pri @ Priority - .byte se_m_bubble_beam2_rev @ Reverb. - - .word se_m_bubble_beam2_grp - - .word se_m_bubble_beam2_1 - - .end diff --git a/sound/songs/se_m_charge.s b/sound/songs/se_m_charge.s deleted file mode 100644 index 1ad07164f..000000000 --- a/sound/songs/se_m_charge.s +++ /dev/null @@ -1,186 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_charge_grp, voicegroup_rs_sfx_2 - .equ se_m_charge_pri, 4 - .equ se_m_charge_rev, reverb_set+50 - .equ se_m_charge_mvl, 127 - .equ se_m_charge_key, 0 - .equ se_m_charge_tbs, 1 - .equ se_m_charge_exg, 0 - .equ se_m_charge_cmp, 1 - - .section .rodata - .global se_m_charge - .align 2 - -@********************** Track 1 **********************@ - -se_m_charge_1: - .byte KEYSH , se_m_charge_key+0 - .byte TEMPO , 150*se_m_charge_tbs/2 - .byte VOICE , 18 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 34*se_m_charge_mvl/mxv - .byte BEND , c_v+0 - .byte N66 , Cn5 , v127 - .byte W01 - .byte PAN , c_v-2 - .byte W01 - .byte VOL , 43*se_m_charge_mvl/mxv - .byte PAN , c_v+0 - .byte W01 - .byte c_v+2 - .byte BEND , c_v-2 - .byte W01 - .byte VOL , 58*se_m_charge_mvl/mxv - .byte PAN , c_v+0 - .byte W02 - .byte c_v-2 - .byte W01 - .byte VOL , 70*se_m_charge_mvl/mxv - .byte PAN , c_v-4 - .byte BEND , c_v-4 - .byte W01 - .byte PAN , c_v-2 - .byte W01 - .byte VOL , 76*se_m_charge_mvl/mxv - .byte PAN , c_v+0 - .byte W01 - .byte c_v+2 - .byte BEND , c_v-6 - .byte W02 - .byte VOL , 90*se_m_charge_mvl/mxv - .byte PAN , c_v+4 - .byte W01 - .byte c_v+2 - .byte W01 - .byte c_v+0 - .byte BEND , c_v-8 - .byte W01 - .byte PAN , c_v+0 - .byte W01 - .byte c_v-2 - .byte W02 - .byte c_v+0 - .byte BEND , c_v-13 - .byte W01 - .byte PAN , c_v+2 - .byte W01 - .byte c_v+0 - .byte W01 - .byte c_v-2 - .byte BEND , c_v-15 - .byte W01 - .byte PAN , c_v-4 - .byte W02 - .byte c_v-2 - .byte W01 - .byte c_v+0 - .byte BEND , c_v-19 - .byte W01 - .byte PAN , c_v+2 - .byte W01 - .byte c_v+4 - .byte BEND , c_v-22 - .byte W01 - .byte PAN , c_v+2 - .byte W02 - .byte c_v+0 - .byte BEND , c_v-19 - .byte W01 - .byte PAN , c_v+0 - .byte W01 - .byte c_v-2 - .byte BEND , c_v-17 - .byte W01 - .byte PAN , c_v+0 - .byte W01 - .byte c_v+2 - .byte W02 - .byte c_v+0 - .byte BEND , c_v-19 - .byte W01 - .byte PAN , c_v-2 - .byte W01 - .byte c_v-4 - .byte W01 - .byte c_v-2 - .byte BEND , c_v-22 - .byte W01 - .byte PAN , c_v+0 - .byte W02 - .byte c_v+2 - .byte BEND , c_v-28 - .byte W01 - .byte PAN , c_v+4 - .byte BEND , c_v-24 - .byte W01 - .byte PAN , c_v+2 - .byte W01 - .byte VOL , 84*se_m_charge_mvl/mxv - .byte PAN , c_v+0 - .byte W01 - .byte c_v+0 - .byte W02 - .byte c_v-2 - .byte W01 - .byte VOL , 78*se_m_charge_mvl/mxv - .byte PAN , c_v+0 - .byte W01 - .byte c_v+2 - .byte BEND , c_v-27 - .byte W01 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 70*se_m_charge_mvl/mxv - .byte PAN , c_v-2 - .byte W02 - .byte c_v-4 - .byte W01 - .byte VOL , 55*se_m_charge_mvl/mxv - .byte PAN , c_v-2 - .byte BEND , c_v-29 - .byte W01 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 46*se_m_charge_mvl/mxv - .byte PAN , c_v+2 - .byte W01 - .byte c_v+4 - .byte BEND , c_v-31 - .byte W02 - .byte VOL , 36*se_m_charge_mvl/mxv - .byte PAN , c_v+2 - .byte W01 - .byte c_v+0 - .byte W01 - .byte VOL , 24*se_m_charge_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-36 - .byte W01 - .byte PAN , c_v-2 - .byte W01 - .byte VOL , 13*se_m_charge_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-42 - .byte W02 - .byte VOL , 5*se_m_charge_mvl/mxv - .byte PAN , c_v+2 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_charge: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_charge_pri @ Priority - .byte se_m_charge_rev @ Reverb. - - .word se_m_charge_grp - - .word se_m_charge_1 - - .end diff --git a/sound/songs/se_m_charm.s b/sound/songs/se_m_charm.s deleted file mode 100644 index 9d27f1445..000000000 --- a/sound/songs/se_m_charm.s +++ /dev/null @@ -1,96 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_charm_grp, voicegroup_rs_sfx_2 - .equ se_m_charm_pri, 4 - .equ se_m_charm_rev, reverb_set+50 - .equ se_m_charm_mvl, 127 - .equ se_m_charm_key, 0 - .equ se_m_charm_tbs, 1 - .equ se_m_charm_exg, 0 - .equ se_m_charm_cmp, 1 - - .section .rodata - .global se_m_charm - .align 2 - -@********************** Track 1 **********************@ - -se_m_charm_1: - .byte KEYSH , se_m_charm_key+0 - .byte TEMPO , 150*se_m_charm_tbs/2 - .byte VOICE , 37 - .byte BENDR , 24 - .byte PAN , c_v+0 - .byte VOL , 25*se_m_charm_mvl/mxv - .byte BEND , c_v+11 - .byte N02 , Fn4 , v127 - .byte W01 - .byte VOL , 42*se_m_charm_mvl/mxv - .byte PAN , c_v+4 - .byte BEND , c_v+5 - .byte W01 - .byte VOL , 62*se_m_charm_mvl/mxv - .byte PAN , c_v-4 - .byte BEND , c_v+0 - .byte N15 - .byte W01 - .byte VOL , 77*se_m_charm_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+5 - .byte W01 - .byte VOL , 84*se_m_charm_mvl/mxv - .byte PAN , c_v+4 - .byte BEND , c_v+12 - .byte W02 - .byte VOL , 96*se_m_charm_mvl/mxv - .byte PAN , c_v-4 - .byte BEND , c_v+20 - .byte W01 - .byte VOL , 100*se_m_charm_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+25 - .byte W01 - .byte PAN , c_v+4 - .byte BEND , c_v+30 - .byte W01 - .byte PAN , c_v-4 - .byte BEND , c_v+34 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+40 - .byte W02 - .byte VOL , 94*se_m_charm_mvl/mxv - .byte PAN , c_v+4 - .byte W01 - .byte VOL , 85*se_m_charm_mvl/mxv - .byte PAN , c_v-4 - .byte BEND , c_v+37 - .byte W01 - .byte VOL , 66*se_m_charm_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+36 - .byte W01 - .byte VOL , 49*se_m_charm_mvl/mxv - .byte PAN , c_v+4 - .byte BEND , c_v+34 - .byte W01 - .byte VOL , 32*se_m_charm_mvl/mxv - .byte PAN , c_v-4 - .byte BEND , c_v+32 - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_charm: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_charm_pri @ Priority - .byte se_m_charm_rev @ Reverb. - - .word se_m_charm_grp - - .word se_m_charm_1 - - .end diff --git a/sound/songs/se_m_confuse_ray.s b/sound/songs/se_m_confuse_ray.s deleted file mode 100644 index e856fe495..000000000 --- a/sound/songs/se_m_confuse_ray.s +++ /dev/null @@ -1,117 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_confuse_ray_grp, voicegroup_rs_sfx_2 - .equ se_m_confuse_ray_pri, 4 - .equ se_m_confuse_ray_rev, reverb_set+50 - .equ se_m_confuse_ray_mvl, 127 - .equ se_m_confuse_ray_key, 0 - .equ se_m_confuse_ray_tbs, 1 - .equ se_m_confuse_ray_exg, 0 - .equ se_m_confuse_ray_cmp, 1 - - .section .rodata - .global se_m_confuse_ray - .align 2 - -@********************** Track 1 **********************@ - -se_m_confuse_ray_1: - .byte KEYSH , se_m_confuse_ray_key+0 - .byte TEMPO , 220*se_m_confuse_ray_tbs/2 - .byte VOICE , 52 - .byte VOL , 127*se_m_confuse_ray_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N03 , As3 , v120 - .byte W01 - .byte BEND , c_v-8 - .byte W01 - .byte c_v-16 - .byte W01 - .byte c_v-1 - .byte N12 , As2 , v127 - .byte W03 - .byte PAN , c_v+4 - .byte BEND , c_v+8 - .byte W02 - .byte PAN , c_v-4 - .byte BEND , c_v+11 - .byte W01 - .byte c_v+18 - .byte W01 - .byte PAN , c_v+10 - .byte BEND , c_v+28 - .byte W02 - .byte c_v+35 - .byte W01 - .byte PAN , c_v-10 - .byte W02 - .byte c_v+0 - .byte BEND , c_v+0 - .byte N03 , As3 , v108 - .byte W01 - .byte BEND , c_v-8 - .byte W02 - .byte c_v-17 - .byte W01 - .byte c_v-1 - .byte N12 , As2 - .byte W02 - .byte PAN , c_v+4 - .byte BEND , c_v+8 - .byte W03 - .byte PAN , c_v-4 - .byte BEND , c_v+11 - .byte W01 - .byte c_v+18 - .byte W01 - .byte PAN , c_v+10 - .byte BEND , c_v+28 - .byte W01 - .byte c_v+35 - .byte W01 - .byte PAN , c_v-10 - .byte W03 - .byte c_v+0 - .byte BEND , c_v+0 - .byte N03 , As3 , v072 - .byte W01 - .byte BEND , c_v-8 - .byte W01 - .byte c_v-16 - .byte W01 - .byte c_v-1 - .byte N12 , As2 - .byte W03 - .byte PAN , c_v+4 - .byte BEND , c_v+8 - .byte W02 - .byte PAN , c_v-4 - .byte BEND , c_v+11 - .byte W01 - .byte c_v+18 - .byte W02 - .byte PAN , c_v+10 - .byte BEND , c_v+28 - .byte W01 - .byte c_v+35 - .byte W01 - .byte PAN , c_v-10 - .byte W04 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_confuse_ray: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_confuse_ray_pri @ Priority - .byte se_m_confuse_ray_rev @ Reverb. - - .word se_m_confuse_ray_grp - - .word se_m_confuse_ray_1 - - .end diff --git a/sound/songs/se_m_cosmic_power.s b/sound/songs/se_m_cosmic_power.s deleted file mode 100644 index 3779ea968..000000000 --- a/sound/songs/se_m_cosmic_power.s +++ /dev/null @@ -1,208 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_cosmic_power_grp, voicegroup_rs_sfx_2 - .equ se_m_cosmic_power_pri, 4 - .equ se_m_cosmic_power_rev, reverb_set+50 - .equ se_m_cosmic_power_mvl, 127 - .equ se_m_cosmic_power_key, 0 - .equ se_m_cosmic_power_tbs, 1 - .equ se_m_cosmic_power_exg, 0 - .equ se_m_cosmic_power_cmp, 1 - - .section .rodata - .global se_m_cosmic_power - .align 2 - -@********************** Track 1 **********************@ - -se_m_cosmic_power_1: - .byte KEYSH , se_m_cosmic_power_key+0 - .byte TEMPO , 150*se_m_cosmic_power_tbs/2 - .byte VOICE , 46 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_cosmic_power_mvl/mxv - .byte BEND , c_v-4 - .byte N09 , As5 , v112 - .byte W06 - .byte W03 - .byte PAN , c_v-5 - .byte N08 , Cn5 - .byte W03 - .byte W06 - .byte PAN , c_v-9 - .byte N10 , Gn5 - .byte W06 - .byte W04 - .byte PAN , c_v-5 - .byte N09 , Fn6 - .byte W02 - .byte W06 - .byte W02 - .byte PAN , c_v+0 - .byte N09 , An5 - .byte W04 - .byte W06 - .byte PAN , c_v+4 - .byte N09 , As5 - .byte W06 - .byte W03 - .byte PAN , c_v+9 - .byte N08 , Cn5 , v108 - .byte W03 - .byte W06 - .byte PAN , c_v+4 - .byte N10 , Gn5 , v104 - .byte W06 - .byte W04 - .byte PAN , c_v+0 - .byte N09 , Fn6 , v096 - .byte W02 - .byte W06 - .byte W02 - .byte PAN , c_v-5 - .byte N09 , An5 , v092 - .byte W04 - .byte W04 - .byte PAN , c_v-9 - .byte W02 - .byte N09 , As5 , v084 - .byte W06 - .byte W03 - .byte PAN , c_v-5 - .byte N08 , Cn5 , v080 - .byte W03 - .byte W06 - .byte N10 , Gn5 , v072 - .byte W01 - .byte PAN , c_v+0 - .byte W05 - .byte W04 - .byte c_v+4 - .byte N09 , Fn6 , v068 - .byte W02 - .byte W06 - .byte W02 - .byte PAN , c_v+9 - .byte N09 , An5 , v060 - .byte W04 - .byte W04 - .byte PAN , c_v+4 - .byte W02 - .byte N09 , As5 , v056 - .byte W06 - .byte W03 - .byte PAN , c_v+0 - .byte N08 , Cn5 , v052 - .byte W03 - .byte W06 - .byte N10 , Gn5 , v044 - .byte W01 - .byte PAN , c_v-5 - .byte W05 - .byte W03 - .byte c_v-9 - .byte W01 - .byte N09 , Fn6 , v040 - .byte W02 - .byte W06 - .byte W02 - .byte PAN , c_v-5 - .byte N09 , An5 , v032 - .byte W04 - .byte W06 - .byte PAN , c_v+0 - .byte W06 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_cosmic_power_2: - .byte KEYSH , se_m_cosmic_power_key+0 - .byte VOICE , 53 - .byte XCMD , xIECV , 9 - .byte xIECL , 8 - .byte VOL , 43*se_m_cosmic_power_mvl/mxv - .byte BEND , c_v-2 - .byte W04 - .byte N08 , Fn5 , v112 - .byte W02 - .byte W06 - .byte W01 - .byte N10 , Ds5 - .byte W05 - .byte W06 - .byte N09 , As6 - .byte W06 - .byte W03 - .byte Cn6 - .byte W03 - .byte W06 - .byte N10 , Fn5 - .byte W06 - .byte W04 - .byte N08 - .byte W02 - .byte W06 - .byte W01 - .byte N10 , Ds5 , v104 - .byte W05 - .byte W06 - .byte N09 , As6 , v100 - .byte W06 - .byte W03 - .byte Cn6 , v092 - .byte W03 - .byte W06 - .byte N10 , Fn5 , v088 - .byte W06 - .byte W04 - .byte N08 , Fn5 , v080 - .byte W02 - .byte W06 - .byte W01 - .byte N10 , Ds5 , v076 - .byte W05 - .byte W06 - .byte N09 , As6 , v072 - .byte W06 - .byte W03 - .byte Cn6 , v064 - .byte W03 - .byte W06 - .byte N10 , Fn5 , v060 - .byte W06 - .byte W04 - .byte N08 , Fn5 , v052 - .byte W02 - .byte W06 - .byte W01 - .byte N10 , Ds5 , v048 - .byte W05 - .byte W06 - .byte N09 , As6 , v040 - .byte W06 - .byte W03 - .byte Cn6 , v036 - .byte W03 - .byte W06 - .byte N12 , Fn5 , v032 - .byte W06 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_cosmic_power: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_cosmic_power_pri @ Priority - .byte se_m_cosmic_power_rev @ Reverb. - - .word se_m_cosmic_power_grp - - .word se_m_cosmic_power_1 - .word se_m_cosmic_power_2 - - .end diff --git a/sound/songs/se_m_crabhammer.s b/sound/songs/se_m_crabhammer.s deleted file mode 100644 index c629edc99..000000000 --- a/sound/songs/se_m_crabhammer.s +++ /dev/null @@ -1,58 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_crabhammer_grp, voicegroup_rs_sfx_2 - .equ se_m_crabhammer_pri, 4 - .equ se_m_crabhammer_rev, reverb_set+50 - .equ se_m_crabhammer_mvl, 127 - .equ se_m_crabhammer_key, 0 - .equ se_m_crabhammer_tbs, 1 - .equ se_m_crabhammer_exg, 0 - .equ se_m_crabhammer_cmp, 1 - - .section .rodata - .global se_m_crabhammer - .align 2 - -@********************** Track 1 **********************@ - -se_m_crabhammer_1: - .byte KEYSH , se_m_crabhammer_key+0 - .byte TEMPO , 150*se_m_crabhammer_tbs/2 - .byte VOICE , 23 - .byte VOL , 100*se_m_crabhammer_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+2 - .byte N02 , Dn3 , v127 - .byte W01 - .byte PAN , c_v-10 - .byte BEND , c_v+4 - .byte W02 - .byte PAN , c_v+8 - .byte BEND , c_v+6 - .byte N02 , Dn3 , v084 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+9 - .byte W02 - .byte c_v-1 - .byte W02 - .byte c_v+32 - .byte N02 , Dn3 , v056 - .byte W16 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_crabhammer: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_crabhammer_pri @ Priority - .byte se_m_crabhammer_rev @ Reverb. - - .word se_m_crabhammer_grp - - .word se_m_crabhammer_1 - - .end diff --git a/sound/songs/se_m_detect.s b/sound/songs/se_m_detect.s deleted file mode 100644 index 82196bb2d..000000000 --- a/sound/songs/se_m_detect.s +++ /dev/null @@ -1,95 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_detect_grp, voicegroup_rs_sfx_2 - .equ se_m_detect_pri, 4 - .equ se_m_detect_rev, reverb_set+50 - .equ se_m_detect_mvl, 127 - .equ se_m_detect_key, 0 - .equ se_m_detect_tbs, 1 - .equ se_m_detect_exg, 0 - .equ se_m_detect_cmp, 1 - - .section .rodata - .global se_m_detect - .align 2 - -@********************** Track 1 **********************@ - -se_m_detect_1: - .byte KEYSH , se_m_detect_key+0 - .byte TEMPO , 220*se_m_detect_tbs/2 - .byte VOICE , 54 - .byte VOL , 100*se_m_detect_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+1 - .byte N03 , As5 , v127 - .byte W01 - .byte PAN , c_v+2 - .byte BEND , c_v+2 - .byte W01 - .byte c_v+4 - .byte W01 - .byte c_v+1 - .byte N06 , Bn5 - .byte W01 - .byte PAN , c_v+0 - .byte W02 - .byte W03 - .byte BEND , c_v+1 - .byte N03 , As5 , v104 - .byte W01 - .byte PAN , c_v-2 - .byte BEND , c_v+2 - .byte W02 - .byte c_v+4 - .byte W01 - .byte c_v+1 - .byte N06 , Bn5 - .byte W01 - .byte PAN , c_v+0 - .byte W04 - .byte W01 - .byte BEND , c_v+1 - .byte N03 , As5 , v080 - .byte W01 - .byte PAN , c_v+4 - .byte BEND , c_v+2 - .byte W01 - .byte c_v+4 - .byte W01 - .byte c_v+1 - .byte N06 , Bn5 - .byte W02 - .byte PAN , c_v+0 - .byte W04 - .byte BEND , c_v+1 - .byte N03 , As5 , v048 - .byte W02 - .byte PAN , c_v-5 - .byte BEND , c_v+2 - .byte W01 - .byte c_v+4 - .byte W01 - .byte c_v+1 - .byte N06 , Bn5 - .byte W01 - .byte PAN , c_v+0 - .byte W03 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_detect: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_detect_pri @ Priority - .byte se_m_detect_rev @ Reverb. - - .word se_m_detect_grp - - .word se_m_detect_1 - - .end diff --git a/sound/songs/se_m_dig.s b/sound/songs/se_m_dig.s deleted file mode 100644 index be16d77ac..000000000 --- a/sound/songs/se_m_dig.s +++ /dev/null @@ -1,66 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_dig_grp, voicegroup_rs_sfx_2 - .equ se_m_dig_pri, 4 - .equ se_m_dig_rev, reverb_set+50 - .equ se_m_dig_mvl, 127 - .equ se_m_dig_key, 0 - .equ se_m_dig_tbs, 1 - .equ se_m_dig_exg, 0 - .equ se_m_dig_cmp, 1 - - .section .rodata - .global se_m_dig - .align 2 - -@********************** Track 1 **********************@ - -se_m_dig_1: - .byte KEYSH , se_m_dig_key+0 - .byte TEMPO , 150*se_m_dig_tbs/2 - .byte VOICE , 36 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 115*se_m_dig_mvl/mxv - .byte BEND , c_v+0 - .byte N01 , Cn2 , v112 - .byte W01 - .byte VOICE , 26 - .byte N02 , Cn3 , v127 - .byte W01 - .byte PAN , c_v+5 - .byte BEND , c_v+4 - .byte W01 - .byte c_v+16 - .byte N03 - .byte W01 - .byte PAN , c_v-8 - .byte BEND , c_v+28 - .byte W02 - .byte c_v+45 - .byte W01 - .byte VOICE , 36 - .byte PAN , c_v+12 - .byte BEND , c_v+0 - .byte N02 , Cn3 , v056 - .byte W02 - .byte W03 - .byte PAN , c_v-12 - .byte N02 , Cn3 , v036 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_dig: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_dig_pri @ Priority - .byte se_m_dig_rev @ Reverb. - - .word se_m_dig_grp - - .word se_m_dig_1 - - .end diff --git a/sound/songs/se_m_dive.s b/sound/songs/se_m_dive.s deleted file mode 100644 index 879c41eef..000000000 --- a/sound/songs/se_m_dive.s +++ /dev/null @@ -1,123 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_dive_grp, voicegroup_rs_sfx_2 - .equ se_m_dive_pri, 4 - .equ se_m_dive_rev, reverb_set+50 - .equ se_m_dive_mvl, 127 - .equ se_m_dive_key, 0 - .equ se_m_dive_tbs, 1 - .equ se_m_dive_exg, 0 - .equ se_m_dive_cmp, 1 - - .section .rodata - .global se_m_dive - .align 2 - -@********************** Track 1 **********************@ - -se_m_dive_1: - .byte KEYSH , se_m_dive_key+0 - .byte TEMPO , 150*se_m_dive_tbs/2 - .byte VOICE , 36 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 105*se_m_dive_mvl/mxv - .byte BEND , c_v-18 - .byte N06 , Fn2 , v127 - .byte W03 - .byte PAN , c_v+3 - .byte BEND , c_v-16 - .byte W04 - .byte PAN , c_v+6 - .byte BEND , c_v-14 - .byte N04 - .byte W03 - .byte PAN , c_v+3 - .byte BEND , c_v-11 - .byte W02 - .byte N36 , Gn3 , v092 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v-8 - .byte W04 - .byte PAN , c_v-3 - .byte BEND , c_v-5 - .byte W02 - .byte VOL , 100*se_m_dive_mvl/mxv - .byte W01 - .byte PAN , c_v-6 - .byte BEND , c_v-2 - .byte W03 - .byte VOL , 94*se_m_dive_mvl/mxv - .byte W01 - .byte PAN , c_v-3 - .byte BEND , c_v+1 - .byte W02 - .byte VOL , 84*se_m_dive_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+4 - .byte W04 - .byte PAN , c_v+3 - .byte VOL , 72*se_m_dive_mvl/mxv - .byte BEND , c_v+2 - .byte W04 - .byte PAN , c_v+6 - .byte VOL , 57*se_m_dive_mvl/mxv - .byte BEND , c_v-3 - .byte W03 - .byte PAN , c_v+3 - .byte VOL , 37*se_m_dive_mvl/mxv - .byte BEND , c_v-7 - .byte W03 - .byte VOL , 20*se_m_dive_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v-11 - .byte W01 - .byte VOL , 7*se_m_dive_mvl/mxv - .byte W02 - .byte PAN , c_v-3 - .byte BEND , c_v-16 - .byte W02 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_dive_2: - .byte KEYSH , se_m_dive_key+0 - .byte VOICE , 25 - .byte VOL , 105*se_m_dive_mvl/mxv - .byte N06 , An2 , v040 - .byte W06 - .byte Gn2 - .byte W06 - .byte Gs3 , v044 - .byte W07 - .byte Gs3 , v036 - .byte W05 - .byte W02 - .byte Gs3 , v028 - .byte W07 - .byte Gs3 , v020 - .byte W03 - .byte W04 - .byte Gs3 , v012 - .byte W08 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_dive: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_dive_pri @ Priority - .byte se_m_dive_rev @ Reverb. - - .word se_m_dive_grp - - .word se_m_dive_1 - .word se_m_dive_2 - - .end diff --git a/sound/songs/se_m_dizzy_punch.s b/sound/songs/se_m_dizzy_punch.s deleted file mode 100644 index ccd2a6c95..000000000 --- a/sound/songs/se_m_dizzy_punch.s +++ /dev/null @@ -1,79 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_dizzy_punch_grp, voicegroup_rs_sfx_2 - .equ se_m_dizzy_punch_pri, 4 - .equ se_m_dizzy_punch_rev, reverb_set+50 - .equ se_m_dizzy_punch_mvl, 127 - .equ se_m_dizzy_punch_key, 0 - .equ se_m_dizzy_punch_tbs, 1 - .equ se_m_dizzy_punch_exg, 0 - .equ se_m_dizzy_punch_cmp, 1 - - .section .rodata - .global se_m_dizzy_punch - .align 2 - -@********************** Track 1 **********************@ - -se_m_dizzy_punch_1: - .byte KEYSH , se_m_dizzy_punch_key+0 - .byte TEMPO , 150*se_m_dizzy_punch_tbs/2 - .byte VOICE , 19 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 5*se_m_dizzy_punch_mvl/mxv - .byte BEND , c_v+0 - .byte N07 , Bn5 , v080 - .byte W01 - .byte VOL , 55*se_m_dizzy_punch_mvl/mxv - .byte PAN , c_v+11 - .byte BEND , c_v+3 - .byte W01 - .byte VOL , 67*se_m_dizzy_punch_mvl/mxv - .byte PAN , c_v+22 - .byte BEND , c_v+0 - .byte W01 - .byte VOL , 90*se_m_dizzy_punch_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-6 - .byte W01 - .byte PAN , c_v-12 - .byte BEND , c_v-14 - .byte W02 - .byte VOL , 4*se_m_dizzy_punch_mvl/mxv - .byte PAN , c_v-22 - .byte BEND , c_v-23 - .byte W01 - .byte PAN , c_v-13 - .byte BEND , c_v+0 - .byte N04 , Cn6 - .byte W01 - .byte VOL , 66*se_m_dizzy_punch_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+1 - .byte W01 - .byte VOL , 90*se_m_dizzy_punch_mvl/mxv - .byte PAN , c_v+11 - .byte BEND , c_v+3 - .byte W01 - .byte VOL , 4*se_m_dizzy_punch_mvl/mxv - .byte PAN , c_v+21 - .byte BEND , c_v+5 - .byte W14 - .byte VOL , 90*se_m_dizzy_punch_mvl/mxv - .byte FINE - -@******************************************************@ - .align 2 - -se_m_dizzy_punch: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_dizzy_punch_pri @ Priority - .byte se_m_dizzy_punch_rev @ Reverb. - - .word se_m_dizzy_punch_grp - - .word se_m_dizzy_punch_1 - - .end diff --git a/sound/songs/se_m_double_team.s b/sound/songs/se_m_double_team.s deleted file mode 100644 index 3efab79b0..000000000 --- a/sound/songs/se_m_double_team.s +++ /dev/null @@ -1,71 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_double_team_grp, voicegroup_rs_sfx_2 - .equ se_m_double_team_pri, 4 - .equ se_m_double_team_rev, reverb_set+50 - .equ se_m_double_team_mvl, 127 - .equ se_m_double_team_key, 0 - .equ se_m_double_team_tbs, 1 - .equ se_m_double_team_exg, 0 - .equ se_m_double_team_cmp, 1 - - .section .rodata - .global se_m_double_team - .align 2 - -@********************** Track 1 **********************@ - -se_m_double_team_1: - .byte KEYSH , se_m_double_team_key+0 - .byte TEMPO , 150*se_m_double_team_tbs/2 - .byte VOICE , 22 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_double_team_mvl/mxv - .byte BEND , c_v-18 - .byte N19 , Dn3 , v108 - .byte W02 - .byte BEND , c_v-7 - .byte W01 - .byte VOL , 101*se_m_double_team_mvl/mxv - .byte W01 - .byte PAN , c_v-9 - .byte BEND , c_v+8 - .byte W02 - .byte VOL , 84*se_m_double_team_mvl/mxv - .byte BEND , c_v+4 - .byte W02 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 64*se_m_double_team_mvl/mxv - .byte BEND , c_v-13 - .byte W01 - .byte PAN , c_v+8 - .byte W02 - .byte VOL , 45*se_m_double_team_mvl/mxv - .byte BEND , c_v-31 - .byte W02 - .byte VOL , 32*se_m_double_team_mvl/mxv - .byte PAN , c_v+0 - .byte W01 - .byte VOICE , 2 - .byte W01 - .byte VOL , 13*se_m_double_team_mvl/mxv - .byte BEND , c_v-52 - .byte W08 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_double_team: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_double_team_pri @ Priority - .byte se_m_double_team_rev @ Reverb. - - .word se_m_double_team_grp - - .word se_m_double_team_1 - - .end diff --git a/sound/songs/se_m_dragon_rage.s b/sound/songs/se_m_dragon_rage.s deleted file mode 100644 index 3a0675c03..000000000 --- a/sound/songs/se_m_dragon_rage.s +++ /dev/null @@ -1,150 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_dragon_rage_grp, voicegroup_rs_sfx_2 - .equ se_m_dragon_rage_pri, 4 - .equ se_m_dragon_rage_rev, reverb_set+50 - .equ se_m_dragon_rage_mvl, 127 - .equ se_m_dragon_rage_key, 0 - .equ se_m_dragon_rage_tbs, 1 - .equ se_m_dragon_rage_exg, 0 - .equ se_m_dragon_rage_cmp, 1 - - .section .rodata - .global se_m_dragon_rage - .align 2 - -@********************** Track 1 **********************@ - -se_m_dragon_rage_1: - .byte KEYSH , se_m_dragon_rage_key+0 - .byte TEMPO , 150*se_m_dragon_rage_tbs/2 - .byte VOICE , 29 - .byte BENDR , 12 - .byte PAN , c_v+5 - .byte VOL , 21*se_m_dragon_rage_mvl/mxv - .byte BEND , c_v+0 - .byte N10 , An2 , v127 - .byte W02 - .byte VOL , 47*se_m_dragon_rage_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 88*se_m_dragon_rage_mvl/mxv - .byte W02 - .byte PAN , c_v-5 - .byte W01 - .byte VOL , 120*se_m_dragon_rage_mvl/mxv - .byte W02 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 21*se_m_dragon_rage_mvl/mxv - .byte BEND , c_v+10 - .byte N10 , Bn2 - .byte W02 - .byte PAN , c_v+5 - .byte W01 - .byte VOL , 47*se_m_dragon_rage_mvl/mxv - .byte W02 - .byte PAN , c_v+0 - .byte VOL , 88*se_m_dragon_rage_mvl/mxv - .byte W03 - .byte PAN , c_v-5 - .byte VOL , 120*se_m_dragon_rage_mvl/mxv - .byte W03 - .byte PAN , c_v-2 - .byte VOL , 21*se_m_dragon_rage_mvl/mxv - .byte BEND , c_v+18 - .byte N10 , Cs3 - .byte W03 - .byte PAN , c_v+5 - .byte VOL , 47*se_m_dragon_rage_mvl/mxv - .byte W02 - .byte 88*se_m_dragon_rage_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 120*se_m_dragon_rage_mvl/mxv - .byte W02 - .byte PAN , c_v-5 - .byte W02 - .byte VOL , 20*se_m_dragon_rage_mvl/mxv - .byte BEND , c_v+29 - .byte N10 , Dn3 - .byte W01 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 47*se_m_dragon_rage_mvl/mxv - .byte W02 - .byte PAN , c_v+5 - .byte W01 - .byte VOL , 88*se_m_dragon_rage_mvl/mxv - .byte W02 - .byte PAN , c_v+0 - .byte VOL , 120*se_m_dragon_rage_mvl/mxv - .byte W03 - .byte PAN , c_v-5 - .byte W01 - .byte VOL , 21*se_m_dragon_rage_mvl/mxv - .byte BEND , c_v+37 - .byte N10 , En3 - .byte W02 - .byte PAN , c_v-2 - .byte VOL , 46*se_m_dragon_rage_mvl/mxv - .byte W03 - .byte PAN , c_v+5 - .byte VOL , 102*se_m_dragon_rage_mvl/mxv - .byte W02 - .byte 120*se_m_dragon_rage_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte W03 - .byte c_v-5 - .byte VOL , 20*se_m_dragon_rage_mvl/mxv - .byte BEND , c_v+42 - .byte N20 , Fs3 - .byte W02 - .byte VOL , 47*se_m_dragon_rage_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 88*se_m_dragon_rage_mvl/mxv - .byte W02 - .byte PAN , c_v+5 - .byte W01 - .byte VOL , 120*se_m_dragon_rage_mvl/mxv - .byte W02 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 99*se_m_dragon_rage_mvl/mxv - .byte BEND , c_v+50 - .byte W02 - .byte PAN , c_v-5 - .byte W01 - .byte VOL , 74*se_m_dragon_rage_mvl/mxv - .byte W01 - .byte BEND , c_v+56 - .byte W01 - .byte PAN , c_v-2 - .byte VOL , 53*se_m_dragon_rage_mvl/mxv - .byte W03 - .byte 34*se_m_dragon_rage_mvl/mxv - .byte BEND , c_v+63 - .byte W01 - .byte VOL , 15*se_m_dragon_rage_mvl/mxv - .byte W23 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_dragon_rage: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_dragon_rage_pri @ Priority - .byte se_m_dragon_rage_rev @ Reverb. - - .word se_m_dragon_rage_grp - - .word se_m_dragon_rage_1 - - .end diff --git a/sound/songs/se_m_earthquake.s b/sound/songs/se_m_earthquake.s deleted file mode 100644 index 76c40d88c..000000000 --- a/sound/songs/se_m_earthquake.s +++ /dev/null @@ -1,326 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_earthquake_grp, voicegroup_rs_sfx_2 - .equ se_m_earthquake_pri, 4 - .equ se_m_earthquake_rev, reverb_set+50 - .equ se_m_earthquake_mvl, 127 - .equ se_m_earthquake_key, 0 - .equ se_m_earthquake_tbs, 1 - .equ se_m_earthquake_exg, 0 - .equ se_m_earthquake_cmp, 1 - - .section .rodata - .global se_m_earthquake - .align 2 - -@********************** Track 1 **********************@ - -se_m_earthquake_1: - .byte KEYSH , se_m_earthquake_key+0 - .byte TEMPO , 150*se_m_earthquake_tbs/2 - .byte VOICE , 26 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_earthquake_mvl/mxv - .byte BEND , c_v+0 - .byte N03 , Cs2 , v127 - .byte W03 - .byte PAN , c_v+6 - .byte N03 , Cn2 , v120 - .byte W03 - .byte W01 - .byte PAN , c_v-6 - .byte N03 , Bn1 , v116 - .byte W03 - .byte PAN , c_v+11 - .byte N03 , Cn2 , v112 - .byte W02 -se_m_earthquake_1_000: - .byte W02 - .byte PAN , c_v-11 - .byte N03 , Cs2 , v108 - .byte W04 - .byte PEND -se_m_earthquake_1_001: - .byte PAN , c_v+0 - .byte N03 , Cn2 , v100 - .byte W03 - .byte PAN , c_v+6 - .byte N03 , Cs2 , v116 - .byte W03 - .byte PEND -se_m_earthquake_1_002: - .byte W01 - .byte PAN , c_v-6 - .byte N03 , Cn2 , v112 - .byte W03 - .byte PAN , c_v+11 - .byte N03 , Cs2 , v108 - .byte W02 - .byte PEND -se_m_earthquake_1_003: - .byte W02 - .byte PAN , c_v-11 - .byte N03 , Cn2 , v100 - .byte W04 - .byte PEND -se_m_earthquake_1_004: - .byte PAN , c_v+0 - .byte N03 , Cs2 , v116 - .byte W03 - .byte PAN , c_v+6 - .byte N03 , Cn2 , v112 - .byte W03 - .byte PEND -se_m_earthquake_1_005: - .byte W01 - .byte PAN , c_v-6 - .byte N03 , Cs2 , v108 - .byte W03 - .byte PAN , c_v+11 - .byte N03 , Cn2 , v100 - .byte W02 - .byte PEND -se_m_earthquake_1_006: - .byte W02 - .byte PAN , c_v-11 - .byte N03 , Cs2 , v116 - .byte W04 - .byte PEND - .byte PAN , c_v+0 - .byte N03 , Cn2 , v112 - .byte W03 - .byte PAN , c_v+6 - .byte N03 , Cs2 , v108 - .byte W03 - .byte W01 - .byte PAN , c_v-6 - .byte N03 , Cn2 , v100 - .byte W03 - .byte PAN , c_v+11 - .byte N03 , Cs2 , v116 - .byte W02 - .byte W02 - .byte PAN , c_v-11 - .byte N03 , Cn2 , v112 - .byte W04 -se_m_earthquake_1_007: - .byte PAN , c_v+0 - .byte N03 , Cs2 , v108 - .byte W03 - .byte PAN , c_v+6 - .byte N03 , Cn2 , v100 - .byte W03 - .byte PEND -se_m_earthquake_1_008: - .byte W01 - .byte PAN , c_v-6 - .byte N03 , Cs2 , v116 - .byte W03 - .byte PAN , c_v+11 - .byte N03 , Cn2 , v112 - .byte W02 - .byte PEND - .byte PATT - .word se_m_earthquake_1_000 - .byte PATT - .word se_m_earthquake_1_001 - .byte PATT - .word se_m_earthquake_1_002 - .byte PATT - .word se_m_earthquake_1_003 - .byte PATT - .word se_m_earthquake_1_007 - .byte PATT - .word se_m_earthquake_1_008 - .byte PATT - .word se_m_earthquake_1_000 - .byte PATT - .word se_m_earthquake_1_001 - .byte PATT - .word se_m_earthquake_1_002 - .byte PATT - .word se_m_earthquake_1_003 - .byte PATT - .word se_m_earthquake_1_004 - .byte PATT - .word se_m_earthquake_1_005 - .byte PATT - .word se_m_earthquake_1_006 - .byte VOL , 106*se_m_earthquake_mvl/mxv - .byte PAN , c_v+0 - .byte N03 , Cn2 , v112 - .byte W03 - .byte VOL , 103*se_m_earthquake_mvl/mxv - .byte PAN , c_v+6 - .byte N03 , Cs2 , v108 - .byte W03 - .byte W01 - .byte VOL , 97*se_m_earthquake_mvl/mxv - .byte PAN , c_v-6 - .byte N03 , Cn2 , v100 - .byte W03 - .byte VOL , 89*se_m_earthquake_mvl/mxv - .byte PAN , c_v+11 - .byte N03 , Cs2 , v116 - .byte W02 - .byte W02 - .byte VOL , 85*se_m_earthquake_mvl/mxv - .byte PAN , c_v-11 - .byte N03 , Cn2 , v112 - .byte W04 - .byte VOL , 78*se_m_earthquake_mvl/mxv - .byte PAN , c_v+0 - .byte N03 , Cs2 , v108 - .byte W03 - .byte VOL , 72*se_m_earthquake_mvl/mxv - .byte PAN , c_v+6 - .byte N03 , Cn2 , v100 - .byte W03 - .byte W01 - .byte VOL , 66*se_m_earthquake_mvl/mxv - .byte PAN , c_v-6 - .byte N03 , Cs2 , v116 - .byte W03 - .byte VOL , 58*se_m_earthquake_mvl/mxv - .byte PAN , c_v+11 - .byte N03 , Cn2 , v112 - .byte W02 - .byte W02 - .byte VOL , 46*se_m_earthquake_mvl/mxv - .byte PAN , c_v-11 - .byte N03 , Cs2 , v108 - .byte W04 - .byte VOL , 30*se_m_earthquake_mvl/mxv - .byte PAN , c_v+0 - .byte N03 , Cn2 , v100 - .byte W03 - .byte VOL , 12*se_m_earthquake_mvl/mxv - .byte PAN , c_v+6 - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_earthquake_2: - .byte KEYSH , se_m_earthquake_key+0 - .byte VOICE , 5 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_earthquake_mvl/mxv - .byte N02 , Fn2 , v072 - .byte W02 - .byte N01 - .byte W01 - .byte N02 , Gn2 - .byte W03 - .byte N01 , Gs2 , v060 - .byte W06 - .byte VOICE , 27 - .byte N06 , Bn1 , v080 - .byte W06 -se_m_earthquake_2_000: - .byte PAN , c_v+0 - .byte N06 , Bn1 , v080 - .byte W06 - .byte PEND - .byte N06 - .byte W06 - .byte N06 - .byte W06 - .byte PATT - .word se_m_earthquake_2_000 - .byte N06 , Bn1 , v080 - .byte W06 - .byte N06 - .byte W06 - .byte PATT - .word se_m_earthquake_2_000 - .byte N06 , Bn1 , v080 - .byte W06 - .byte N06 - .byte W06 - .byte PATT - .word se_m_earthquake_2_000 - .byte N06 , Bn1 , v080 - .byte W06 - .byte N06 - .byte W06 - .byte PATT - .word se_m_earthquake_2_000 - .byte N06 , Bn1 , v080 - .byte W06 - .byte N06 - .byte W06 - .byte PATT - .word se_m_earthquake_2_000 - .byte N06 , Bn1 , v080 - .byte W06 - .byte N06 - .byte W06 - .byte PATT - .word se_m_earthquake_2_000 - .byte N06 , Bn1 , v080 - .byte W06 - .byte N06 - .byte W06 - .byte PATT - .word se_m_earthquake_2_000 - .byte N06 , Bn1 , v080 - .byte W06 - .byte N06 - .byte W06 - .byte VOL , 106*se_m_earthquake_mvl/mxv - .byte PAN , c_v+0 - .byte N06 - .byte W03 - .byte VOL , 103*se_m_earthquake_mvl/mxv - .byte W03 - .byte N06 - .byte W01 - .byte VOL , 97*se_m_earthquake_mvl/mxv - .byte W03 - .byte 89*se_m_earthquake_mvl/mxv - .byte W02 - .byte N06 - .byte W02 - .byte VOL , 85*se_m_earthquake_mvl/mxv - .byte W04 - .byte 78*se_m_earthquake_mvl/mxv - .byte PAN , c_v+0 - .byte N06 - .byte W03 - .byte VOL , 72*se_m_earthquake_mvl/mxv - .byte W03 - .byte N06 - .byte W01 - .byte VOL , 66*se_m_earthquake_mvl/mxv - .byte W03 - .byte 58*se_m_earthquake_mvl/mxv - .byte W02 - .byte N06 - .byte W02 - .byte VOL , 46*se_m_earthquake_mvl/mxv - .byte W04 - .byte 30*se_m_earthquake_mvl/mxv - .byte PAN , c_v+0 - .byte N06 - .byte W03 - .byte VOL , 12*se_m_earthquake_mvl/mxv - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_earthquake: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_earthquake_pri @ Priority - .byte se_m_earthquake_rev @ Reverb. - - .word se_m_earthquake_grp - - .word se_m_earthquake_1 - .word se_m_earthquake_2 - - .end diff --git a/sound/songs/se_m_ember.s b/sound/songs/se_m_ember.s deleted file mode 100644 index 010ffaaf1..000000000 --- a/sound/songs/se_m_ember.s +++ /dev/null @@ -1,61 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_ember_grp, voicegroup_rs_sfx_2 - .equ se_m_ember_pri, 4 - .equ se_m_ember_rev, reverb_set+50 - .equ se_m_ember_mvl, 127 - .equ se_m_ember_key, 0 - .equ se_m_ember_tbs, 1 - .equ se_m_ember_exg, 0 - .equ se_m_ember_cmp, 1 - - .section .rodata - .global se_m_ember - .align 2 - -@********************** Track 1 **********************@ - -se_m_ember_1: - .byte KEYSH , se_m_ember_key+0 - .byte TEMPO , 150*se_m_ember_tbs/2 - .byte VOICE , 29 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 61*se_m_ember_mvl/mxv - .byte BEND , c_v+8 - .byte N10 , Gn3 , v127 - .byte W01 - .byte VOL , 84*se_m_ember_mvl/mxv - .byte W01 - .byte 97*se_m_ember_mvl/mxv - .byte BEND , c_v+16 - .byte W01 - .byte VOL , 110*se_m_ember_mvl/mxv - .byte W01 - .byte BEND , c_v+7 - .byte W02 - .byte c_v-12 - .byte W01 - .byte VOL , 89*se_m_ember_mvl/mxv - .byte W01 - .byte 64*se_m_ember_mvl/mxv - .byte BEND , c_v-42 - .byte W01 - .byte VOL , 34*se_m_ember_mvl/mxv - .byte W15 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_ember: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_ember_pri @ Priority - .byte se_m_ember_rev @ Reverb. - - .word se_m_ember_grp - - .word se_m_ember_1 - - .end diff --git a/sound/songs/se_m_encore.s b/sound/songs/se_m_encore.s deleted file mode 100644 index 0f212febb..000000000 --- a/sound/songs/se_m_encore.s +++ /dev/null @@ -1,58 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_encore_grp, voicegroup_rs_sfx_2 - .equ se_m_encore_pri, 4 - .equ se_m_encore_rev, reverb_set+50 - .equ se_m_encore_mvl, 127 - .equ se_m_encore_key, 0 - .equ se_m_encore_tbs, 1 - .equ se_m_encore_exg, 0 - .equ se_m_encore_cmp, 1 - - .section .rodata - .global se_m_encore - .align 2 - -@********************** Track 1 **********************@ - -se_m_encore_1: - .byte KEYSH , se_m_encore_key+0 - .byte TEMPO , 150*se_m_encore_tbs/2 - .byte VOICE , 59 - .byte BENDR , 12 - .byte VOL , 110*se_m_encore_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N06 , En3 , v127 - .byte W01 - .byte PAN , c_v+8 - .byte W01 - .byte c_v-9 - .byte W01 - .byte c_v+14 - .byte W01 - .byte c_v-10 - .byte W02 - .byte c_v+0 - .byte N03 , An3 , v048 - .byte W01 - .byte PAN , c_v+16 - .byte W01 - .byte c_v-16 - .byte W04 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_encore: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_encore_pri @ Priority - .byte se_m_encore_rev @ Reverb. - - .word se_m_encore_grp - - .word se_m_encore_1 - - .end diff --git a/sound/songs/se_m_encore2.s b/sound/songs/se_m_encore2.s deleted file mode 100644 index 86ebb5585..000000000 --- a/sound/songs/se_m_encore2.s +++ /dev/null @@ -1,173 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_encore2_grp, voicegroup_rs_sfx_2 - .equ se_m_encore2_pri, 4 - .equ se_m_encore2_rev, reverb_set+50 - .equ se_m_encore2_mvl, 127 - .equ se_m_encore2_key, 0 - .equ se_m_encore2_tbs, 1 - .equ se_m_encore2_exg, 0 - .equ se_m_encore2_cmp, 1 - - .section .rodata - .global se_m_encore2 - .align 2 - -@********************** Track 1 **********************@ - -se_m_encore2_1: - .byte KEYSH , se_m_encore2_key+0 - .byte TEMPO , 150*se_m_encore2_tbs/2 - .byte VOICE , 60 - .byte BENDR , 12 - .byte VOL , 25*se_m_encore2_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte TIE , Cn3 , v127 - .byte W01 - .byte PAN , c_v+2 - .byte W01 - .byte c_v+5 - .byte W01 - .byte VOL , 34*se_m_encore2_mvl/mxv - .byte W01 - .byte PAN , c_v+2 - .byte W02 - .byte c_v+0 - .byte W01 - .byte VOL , 46*se_m_encore2_mvl/mxv - .byte PAN , c_v-2 - .byte W01 - .byte c_v-4 - .byte W02 - .byte VOL , 56*se_m_encore2_mvl/mxv - .byte PAN , c_v-2 - .byte W02 - .byte c_v+0 - .byte W01 - .byte c_v+2 - .byte W01 - .byte c_v+5 - .byte W01 - .byte VOL , 70*se_m_encore2_mvl/mxv - .byte W01 - .byte PAN , c_v+2 - .byte W02 - .byte c_v+0 - .byte W01 - .byte VOL , 80*se_m_encore2_mvl/mxv - .byte PAN , c_v-2 - .byte W01 - .byte c_v-4 - .byte W02 - .byte VOL , 88*se_m_encore2_mvl/mxv - .byte PAN , c_v-2 - .byte W02 - .byte c_v+0 - .byte W01 - .byte c_v+2 - .byte W01 - .byte VOL , 96*se_m_encore2_mvl/mxv - .byte PAN , c_v+5 - .byte W02 - .byte c_v+2 - .byte W02 - .byte VOL , 100*se_m_encore2_mvl/mxv - .byte PAN , c_v+0 - .byte W01 - .byte c_v-2 - .byte W01 - .byte c_v-4 - .byte W02 - .byte c_v-2 - .byte W02 -se_m_encore2_1_000: - .byte PAN , c_v+0 - .byte W01 - .byte c_v+2 - .byte W01 - .byte c_v+5 - .byte W02 - .byte c_v+2 - .byte W02 - .byte c_v+0 - .byte W01 - .byte c_v-2 - .byte W01 - .byte c_v-4 - .byte W02 - .byte c_v-2 - .byte W02 - .byte PEND - .byte PATT - .word se_m_encore2_1_000 - .byte PATT - .word se_m_encore2_1_000 - .byte PATT - .word se_m_encore2_1_000 - .byte PATT - .word se_m_encore2_1_000 - .byte PATT - .word se_m_encore2_1_000 - .byte PATT - .word se_m_encore2_1_000 - .byte VOL , 96*se_m_encore2_mvl/mxv - .byte PAN , c_v+0 - .byte W01 - .byte c_v+2 - .byte W01 - .byte c_v+5 - .byte W01 - .byte VOL , 92*se_m_encore2_mvl/mxv - .byte W01 - .byte PAN , c_v+2 - .byte W02 - .byte c_v+0 - .byte W01 - .byte VOL , 84*se_m_encore2_mvl/mxv - .byte PAN , c_v-2 - .byte W01 - .byte c_v-4 - .byte W02 - .byte VOL , 72*se_m_encore2_mvl/mxv - .byte PAN , c_v-2 - .byte W02 - .byte c_v+0 - .byte W01 - .byte c_v+2 - .byte W01 - .byte VOL , 63*se_m_encore2_mvl/mxv - .byte PAN , c_v+5 - .byte W02 - .byte VOL , 52*se_m_encore2_mvl/mxv - .byte PAN , c_v+2 - .byte W02 - .byte c_v+0 - .byte W01 - .byte VOL , 37*se_m_encore2_mvl/mxv - .byte PAN , c_v-2 - .byte W01 - .byte c_v-4 - .byte W01 - .byte VOL , 22*se_m_encore2_mvl/mxv - .byte W01 - .byte 12*se_m_encore2_mvl/mxv - .byte PAN , c_v-2 - .byte W02 - .byte EOT , Cn3 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_encore2: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_encore2_pri @ Priority - .byte se_m_encore2_rev @ Reverb. - - .word se_m_encore2_grp - - .word se_m_encore2_1 - - .end diff --git a/sound/songs/se_m_explosion.s b/sound/songs/se_m_explosion.s deleted file mode 100644 index b0f98c6f4..000000000 --- a/sound/songs/se_m_explosion.s +++ /dev/null @@ -1,118 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_explosion_grp, voicegroup_rs_sfx_2 - .equ se_m_explosion_pri, 4 - .equ se_m_explosion_rev, reverb_set+50 - .equ se_m_explosion_mvl, 127 - .equ se_m_explosion_key, 0 - .equ se_m_explosion_tbs, 1 - .equ se_m_explosion_exg, 0 - .equ se_m_explosion_cmp, 1 - - .section .rodata - .global se_m_explosion - .align 2 - -@********************** Track 1 **********************@ - -se_m_explosion_1: - .byte KEYSH , se_m_explosion_key+0 - .byte TEMPO , 150*se_m_explosion_tbs/2 - .byte VOICE , 41 - .byte VOL , 125*se_m_explosion_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N01 , Ds3 , v127 - .byte W01 - .byte As2 - .byte W02 - .byte PAN , c_v-8 - .byte N02 , Gn3 - .byte W01 - .byte PAN , c_v+7 - .byte W03 - .byte c_v+0 - .byte N01 , Ds3 - .byte W01 - .byte As2 - .byte W02 - .byte N54 , Fn3 - .byte W11 - .byte BEND , c_v+3 - .byte W03 - .byte W02 - .byte PAN , c_v+6 - .byte BEND , c_v+7 - .byte W04 - .byte PAN , c_v+0 - .byte W01 - .byte BEND , c_v+10 - .byte W02 - .byte PAN , c_v-8 - .byte W01 - .byte BEND , c_v+16 - .byte W03 - .byte PAN , c_v+0 - .byte W01 - .byte BEND , c_v+20 - .byte W02 - .byte PAN , c_v+7 - .byte W02 - .byte BEND , c_v+25 - .byte W02 - .byte PAN , c_v+0 - .byte W04 - .byte c_v-8 - .byte BEND , c_v+20 - .byte W03 - .byte PAN , c_v+6 - .byte W01 - .byte BEND , c_v+10 - .byte W03 - .byte PAN , c_v-8 - .byte W02 - .byte BEND , c_v+3 - .byte W01 - .byte PAN , c_v+7 - .byte W04 - .byte c_v-8 - .byte W10 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_explosion_2: - .byte KEYSH , se_m_explosion_key+0 - .byte VOICE , 4 - .byte VOL , 125*se_m_explosion_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+1 - .byte N02 , Cn3 , v052 - .byte W01 - .byte VOL , 74*se_m_explosion_mvl/mxv - .byte W06 - .byte 125*se_m_explosion_mvl/mxv - .byte N02 - .byte W01 - .byte VOL , 74*se_m_explosion_mvl/mxv - .byte W16 - .byte W24 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_explosion: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_explosion_pri @ Priority - .byte se_m_explosion_rev @ Reverb. - - .word se_m_explosion_grp - - .word se_m_explosion_1 - .word se_m_explosion_2 - - .end diff --git a/sound/songs/se_m_faint_attack.s b/sound/songs/se_m_faint_attack.s deleted file mode 100644 index 2011e58b4..000000000 --- a/sound/songs/se_m_faint_attack.s +++ /dev/null @@ -1,89 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_faint_attack_grp, voicegroup_rs_sfx_2 - .equ se_m_faint_attack_pri, 4 - .equ se_m_faint_attack_rev, reverb_set+50 - .equ se_m_faint_attack_mvl, 127 - .equ se_m_faint_attack_key, 0 - .equ se_m_faint_attack_tbs, 1 - .equ se_m_faint_attack_exg, 0 - .equ se_m_faint_attack_cmp, 1 - - .section .rodata - .global se_m_faint_attack - .align 2 - -@********************** Track 1 **********************@ - -se_m_faint_attack_1: - .byte KEYSH , se_m_faint_attack_key+0 - .byte TEMPO , 150*se_m_faint_attack_tbs/2 - .byte VOICE , 45 - .byte VOL , 100*se_m_faint_attack_mvl/mxv - .byte BENDR , 2 - .byte PAN , c_v+0 - .byte BEND , c_v-5 - .byte N06 , Cn3 , v112 - .byte W01 - .byte BEND , c_v+10 - .byte W01 - .byte c_v+37 - .byte W01 - .byte c_v+55 - .byte W03 - .byte PAN , c_v-9 - .byte BEND , c_v-5 - .byte N06 , Cs3 , v096 - .byte W01 - .byte BEND , c_v+10 - .byte W01 - .byte c_v+37 - .byte W01 - .byte c_v+55 - .byte W03 - .byte PAN , c_v+7 - .byte BEND , c_v-5 - .byte N06 , Dn3 , v080 - .byte W01 - .byte BEND , c_v+10 - .byte W01 - .byte c_v+37 - .byte W01 - .byte c_v+55 - .byte W03 - .byte PAN , c_v-14 - .byte BEND , c_v-5 - .byte N06 , Ds3 , v060 - .byte W01 - .byte BEND , c_v+10 - .byte W01 - .byte c_v+37 - .byte W01 - .byte c_v+55 - .byte W03 - .byte PAN , c_v+14 - .byte BEND , c_v-5 - .byte N06 , En3 , v040 - .byte W01 - .byte BEND , c_v+10 - .byte W01 - .byte c_v+37 - .byte W01 - .byte c_v+55 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_faint_attack: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_faint_attack_pri @ Priority - .byte se_m_faint_attack_rev @ Reverb. - - .word se_m_faint_attack_grp - - .word se_m_faint_attack_1 - - .end diff --git a/sound/songs/se_m_flame_wheel.s b/sound/songs/se_m_flame_wheel.s deleted file mode 100644 index f722ae320..000000000 --- a/sound/songs/se_m_flame_wheel.s +++ /dev/null @@ -1,124 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_flame_wheel_grp, voicegroup_rs_sfx_2 - .equ se_m_flame_wheel_pri, 4 - .equ se_m_flame_wheel_rev, reverb_set+50 - .equ se_m_flame_wheel_mvl, 127 - .equ se_m_flame_wheel_key, 0 - .equ se_m_flame_wheel_tbs, 1 - .equ se_m_flame_wheel_exg, 0 - .equ se_m_flame_wheel_cmp, 1 - - .section .rodata - .global se_m_flame_wheel - .align 2 - -@********************** Track 1 **********************@ - -se_m_flame_wheel_1: - .byte KEYSH , se_m_flame_wheel_key+0 - .byte TEMPO , 150*se_m_flame_wheel_tbs/2 - .byte VOICE , 29 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 22*se_m_flame_wheel_mvl/mxv - .byte BEND , c_v+0 - .byte N30 , Dn4 , v127 - .byte W01 - .byte VOL , 49*se_m_flame_wheel_mvl/mxv - .byte W01 - .byte 71*se_m_flame_wheel_mvl/mxv - .byte W01 - .byte 95*se_m_flame_wheel_mvl/mxv - .byte BEND , c_v+8 - .byte W01 - .byte VOL , 110*se_m_flame_wheel_mvl/mxv - .byte W02 - .byte PAN , c_v+5 - .byte BEND , c_v+16 - .byte W01 - .byte VOL , 95*se_m_flame_wheel_mvl/mxv - .byte W02 - .byte 88*se_m_flame_wheel_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+7 - .byte W01 - .byte VOL , 93*se_m_flame_wheel_mvl/mxv - .byte W02 - .byte 110*se_m_flame_wheel_mvl/mxv - .byte PAN , c_v-5 - .byte BEND , c_v+0 - .byte W02 - .byte VOL , 86*se_m_flame_wheel_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v-9 - .byte W01 - .byte VOL , 63*se_m_flame_wheel_mvl/mxv - .byte W02 - .byte 37*se_m_flame_wheel_mvl/mxv - .byte BEND , c_v-24 - .byte W03 - .byte VOL , 13*se_m_flame_wheel_mvl/mxv - .byte BEND , c_v-46 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_flame_wheel_2: - .byte KEYSH , se_m_flame_wheel_key+0 - .byte VOICE , 27 - .byte PAN , c_v+0 - .byte VOL , 22*se_m_flame_wheel_mvl/mxv - .byte N30 , Gn2 , v032 - .byte W01 - .byte VOL , 49*se_m_flame_wheel_mvl/mxv - .byte W01 - .byte 71*se_m_flame_wheel_mvl/mxv - .byte W01 - .byte 95*se_m_flame_wheel_mvl/mxv - .byte W01 - .byte 110*se_m_flame_wheel_mvl/mxv - .byte W02 - .byte W01 - .byte 95*se_m_flame_wheel_mvl/mxv - .byte W02 - .byte 88*se_m_flame_wheel_mvl/mxv - .byte W01 - .byte 93*se_m_flame_wheel_mvl/mxv - .byte W02 - .byte 110*se_m_flame_wheel_mvl/mxv - .byte W02 - .byte 86*se_m_flame_wheel_mvl/mxv - .byte W01 - .byte W01 - .byte 63*se_m_flame_wheel_mvl/mxv - .byte W02 - .byte 37*se_m_flame_wheel_mvl/mxv - .byte W03 - .byte 13*se_m_flame_wheel_mvl/mxv - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_flame_wheel: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_flame_wheel_pri @ Priority - .byte se_m_flame_wheel_rev @ Reverb. - - .word se_m_flame_wheel_grp - - .word se_m_flame_wheel_1 - .word se_m_flame_wheel_2 - - .end diff --git a/sound/songs/se_m_flame_wheel2.s b/sound/songs/se_m_flame_wheel2.s deleted file mode 100644 index 09413e52a..000000000 --- a/sound/songs/se_m_flame_wheel2.s +++ /dev/null @@ -1,99 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_flame_wheel2_grp, voicegroup_rs_sfx_2 - .equ se_m_flame_wheel2_pri, 4 - .equ se_m_flame_wheel2_rev, reverb_set+50 - .equ se_m_flame_wheel2_mvl, 127 - .equ se_m_flame_wheel2_key, 0 - .equ se_m_flame_wheel2_tbs, 1 - .equ se_m_flame_wheel2_exg, 0 - .equ se_m_flame_wheel2_cmp, 1 - - .section .rodata - .global se_m_flame_wheel2 - .align 2 - -@********************** Track 1 **********************@ - -se_m_flame_wheel2_1: - .byte KEYSH , se_m_flame_wheel2_key+0 - .byte TEMPO , 150*se_m_flame_wheel2_tbs/2 - .byte VOICE , 29 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_flame_wheel2_mvl/mxv - .byte BEND , c_v+0 - .byte N48 , Cn4 , v127 - .byte W06 - .byte PAN , c_v+4 - .byte W03 - .byte BEND , c_v+2 - .byte W03 - .byte PAN , c_v+10 - .byte W03 - .byte BEND , c_v+5 - .byte W03 - .byte VOL , 98*se_m_flame_wheel2_mvl/mxv - .byte PAN , c_v+4 - .byte W03 - .byte BEND , c_v+3 - .byte W03 - .byte VOL , 88*se_m_flame_wheel2_mvl/mxv - .byte PAN , c_v+0 - .byte W03 - .byte BEND , c_v-5 - .byte W03 - .byte VOL , 68*se_m_flame_wheel2_mvl/mxv - .byte PAN , c_v-5 - .byte W03 - .byte c_v+7 - .byte BEND , c_v-9 - .byte W03 - .byte VOL , 44*se_m_flame_wheel2_mvl/mxv - .byte PAN , c_v+0 - .byte W03 - .byte BEND , c_v-15 - .byte W03 - .byte VOL , 13*se_m_flame_wheel2_mvl/mxv - .byte BEND , c_v-24 - .byte W03 - .byte c_v-40 - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_flame_wheel2_2: - .byte KEYSH , se_m_flame_wheel2_key+0 - .byte VOICE , 27 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_flame_wheel2_mvl/mxv - .byte N48 , Gn2 , v032 - .byte W18 - .byte VOL , 98*se_m_flame_wheel2_mvl/mxv - .byte W06 - .byte 88*se_m_flame_wheel2_mvl/mxv - .byte W06 - .byte 68*se_m_flame_wheel2_mvl/mxv - .byte W06 - .byte 44*se_m_flame_wheel2_mvl/mxv - .byte W06 - .byte 13*se_m_flame_wheel2_mvl/mxv - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_flame_wheel2: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_flame_wheel2_pri @ Priority - .byte se_m_flame_wheel2_rev @ Reverb. - - .word se_m_flame_wheel2_grp - - .word se_m_flame_wheel2_1 - .word se_m_flame_wheel2_2 - - .end diff --git a/sound/songs/se_m_flamethrower.s b/sound/songs/se_m_flamethrower.s deleted file mode 100644 index 0536ae19f..000000000 --- a/sound/songs/se_m_flamethrower.s +++ /dev/null @@ -1,175 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_flamethrower_grp, voicegroup_rs_sfx_2 - .equ se_m_flamethrower_pri, 4 - .equ se_m_flamethrower_rev, reverb_set+50 - .equ se_m_flamethrower_mvl, 127 - .equ se_m_flamethrower_key, 0 - .equ se_m_flamethrower_tbs, 1 - .equ se_m_flamethrower_exg, 0 - .equ se_m_flamethrower_cmp, 1 - - .section .rodata - .global se_m_flamethrower - .align 2 - -@********************** Track 1 **********************@ - -se_m_flamethrower_1: - .byte KEYSH , se_m_flamethrower_key+0 - .byte TEMPO , 150*se_m_flamethrower_tbs/2 - .byte VOICE , 29 - .byte BENDR , 12 - .byte VOL , 110*se_m_flamethrower_mvl/mxv - .byte PAN , c_v+4 - .byte BEND , c_v+50 - .byte TIE , Cn3 , v127 - .byte W01 - .byte BEND , c_v+32 - .byte W02 - .byte PAN , c_v-5 - .byte BEND , c_v+16 - .byte W02 - .byte c_v-8 - .byte W02 - .byte PAN , c_v+8 - .byte BEND , c_v-15 - .byte W02 - .byte c_v-10 - .byte W01 - .byte PAN , c_v-9 - .byte W02 - .byte BEND , c_v+0 - .byte W02 - .byte PAN , c_v+4 - .byte BEND , c_v+2 - .byte W04 - .byte PAN , c_v-5 - .byte BEND , c_v+10 - .byte W03 - .byte PAN , c_v+0 - .byte BEND , c_v+16 - .byte W03 - .byte PAN , c_v+4 - .byte W01 - .byte BEND , c_v+21 - .byte W02 - .byte PAN , c_v-5 - .byte W04 - .byte c_v+8 - .byte W03 - .byte c_v-9 - .byte W04 - .byte c_v+4 - .byte W04 - .byte c_v-5 - .byte W03 - .byte c_v+0 - .byte W03 -se_m_flamethrower_1_000: - .byte PAN , c_v+4 - .byte W03 - .byte c_v-5 - .byte W04 - .byte c_v+8 - .byte W03 - .byte c_v-9 - .byte W04 - .byte c_v+4 - .byte W04 - .byte c_v-5 - .byte W03 - .byte c_v+0 - .byte W03 - .byte PEND - .byte PATT - .word se_m_flamethrower_1_000 - .byte PATT - .word se_m_flamethrower_1_000 - .byte PATT - .word se_m_flamethrower_1_000 - .byte PAN , c_v+4 - .byte W03 - .byte c_v-5 - .byte W03 - .byte VOL , 103*se_m_flamethrower_mvl/mxv - .byte W01 - .byte PAN , c_v+8 - .byte W03 - .byte VOL , 96*se_m_flamethrower_mvl/mxv - .byte PAN , c_v-9 - .byte W04 - .byte c_v+4 - .byte W02 - .byte VOL , 88*se_m_flamethrower_mvl/mxv - .byte W02 - .byte PAN , c_v-5 - .byte W03 - .byte c_v+0 - .byte W01 - .byte VOL , 73*se_m_flamethrower_mvl/mxv - .byte W02 - .byte PAN , c_v+4 - .byte W03 - .byte VOL , 62*se_m_flamethrower_mvl/mxv - .byte PAN , c_v-5 - .byte W04 - .byte c_v+8 - .byte W01 - .byte VOL , 47*se_m_flamethrower_mvl/mxv - .byte W02 - .byte PAN , c_v-9 - .byte W03 - .byte VOL , 27*se_m_flamethrower_mvl/mxv - .byte W01 - .byte PAN , c_v+4 - .byte W04 - .byte VOL , 10*se_m_flamethrower_mvl/mxv - .byte PAN , c_v-5 - .byte W03 - .byte c_v+0 - .byte W03 - .byte EOT , Cn3 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_flamethrower_2: - .byte KEYSH , se_m_flamethrower_key+0 - .byte VOICE , 27 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_flamethrower_mvl/mxv - .byte N24 , Fn2 , v060 - .byte W10 - .byte VOL , 99*se_m_flamethrower_mvl/mxv - .byte W05 - .byte 82*se_m_flamethrower_mvl/mxv - .byte W04 - .byte 54*se_m_flamethrower_mvl/mxv - .byte W02 - .byte 25*se_m_flamethrower_mvl/mxv - .byte W03 - .byte W24 - .byte W24 - .byte W24 - .byte W24 - .byte W24 - .byte W24 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_flamethrower: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_flamethrower_pri @ Priority - .byte se_m_flamethrower_rev @ Reverb. - - .word se_m_flamethrower_grp - - .word se_m_flamethrower_1 - .word se_m_flamethrower_2 - - .end diff --git a/sound/songs/se_m_flatter.s b/sound/songs/se_m_flatter.s deleted file mode 100644 index b6484bbf4..000000000 --- a/sound/songs/se_m_flatter.s +++ /dev/null @@ -1,67 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_flatter_grp, voicegroup_rs_sfx_2 - .equ se_m_flatter_pri, 4 - .equ se_m_flatter_rev, reverb_set+50 - .equ se_m_flatter_mvl, 127 - .equ se_m_flatter_key, 0 - .equ se_m_flatter_tbs, 1 - .equ se_m_flatter_exg, 0 - .equ se_m_flatter_cmp, 1 - - .section .rodata - .global se_m_flatter - .align 2 - -@********************** Track 1 **********************@ - -se_m_flatter_1: - .byte KEYSH , se_m_flatter_key+0 - .byte TEMPO , 150*se_m_flatter_tbs/2 - .byte VOICE , 41 - .byte VOL , 100*se_m_flatter_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N01 , Dn5 , v127 - .byte W01 - .byte Gn4 - .byte W01 - .byte N09 , En5 - .byte W02 - .byte PAN , c_v+6 - .byte W02 - .byte VOL , 92*se_m_flatter_mvl/mxv - .byte PAN , c_v-8 - .byte W01 - .byte VOL , 83*se_m_flatter_mvl/mxv - .byte PAN , c_v+6 - .byte W01 - .byte VOL , 71*se_m_flatter_mvl/mxv - .byte PAN , c_v-8 - .byte BEND , c_v-4 - .byte W01 - .byte VOL , 46*se_m_flatter_mvl/mxv - .byte PAN , c_v+11 - .byte BEND , c_v-8 - .byte W01 - .byte VOL , 22*se_m_flatter_mvl/mxv - .byte PAN , c_v-12 - .byte BEND , c_v-15 - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_flatter: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_flatter_pri @ Priority - .byte se_m_flatter_rev @ Reverb. - - .word se_m_flatter_grp - - .word se_m_flatter_1 - - .end diff --git a/sound/songs/se_m_giga_drain.s b/sound/songs/se_m_giga_drain.s deleted file mode 100644 index de8f95175..000000000 --- a/sound/songs/se_m_giga_drain.s +++ /dev/null @@ -1,81 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_giga_drain_grp, voicegroup_rs_sfx_2 - .equ se_m_giga_drain_pri, 4 - .equ se_m_giga_drain_rev, reverb_set+50 - .equ se_m_giga_drain_mvl, 127 - .equ se_m_giga_drain_key, 0 - .equ se_m_giga_drain_tbs, 1 - .equ se_m_giga_drain_exg, 0 - .equ se_m_giga_drain_cmp, 1 - - .section .rodata - .global se_m_giga_drain - .align 2 - -@********************** Track 1 **********************@ - -se_m_giga_drain_1: - .byte KEYSH , se_m_giga_drain_key+0 - .byte TEMPO , 150*se_m_giga_drain_tbs/2 - .byte VOICE , 36 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_giga_drain_mvl/mxv - .byte BEND , c_v+0 - .byte N03 , Gn2 , v127 - .byte W02 - .byte PAN , c_v+3 - .byte BEND , c_v+2 - .byte W01 - .byte VOICE , 23 - .byte N02 , Cn3 , v104 - .byte W01 - .byte PAN , c_v-3 - .byte BEND , c_v+5 - .byte W02 - .byte VOICE , 36 - .byte N02 , Cn2 , v127 - .byte W01 - .byte PAN , c_v+7 - .byte W01 - .byte VOICE , 23 - .byte BEND , c_v+4 - .byte N06 , Cn3 , v104 - .byte W01 - .byte PAN , c_v-6 - .byte BEND , c_v+0 - .byte W01 - .byte c_v-5 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v-12 - .byte W01 - .byte c_v-23 - .byte W01 - .byte VOICE , 36 - .byte BEND , c_v+0 - .byte N03 , An2 , v100 - .byte W04 - .byte PAN , c_v+5 - .byte N03 , Bn2 , v076 - .byte W03 - .byte PAN , c_v-6 - .byte N02 , Cs3 , v040 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_giga_drain: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_giga_drain_pri @ Priority - .byte se_m_giga_drain_rev @ Reverb. - - .word se_m_giga_drain_grp - - .word se_m_giga_drain_1 - - .end diff --git a/sound/songs/se_m_grasswhistle.s b/sound/songs/se_m_grasswhistle.s deleted file mode 100644 index 384908fd8..000000000 --- a/sound/songs/se_m_grasswhistle.s +++ /dev/null @@ -1,130 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_grasswhistle_grp, voicegroup_rs_sfx_2 - .equ se_m_grasswhistle_pri, 4 - .equ se_m_grasswhistle_rev, reverb_set+50 - .equ se_m_grasswhistle_mvl, 127 - .equ se_m_grasswhistle_key, 0 - .equ se_m_grasswhistle_tbs, 1 - .equ se_m_grasswhistle_exg, 0 - .equ se_m_grasswhistle_cmp, 1 - - .section .rodata - .global se_m_grasswhistle - .align 2 - -@********************** Track 1 **********************@ - -se_m_grasswhistle_1: - .byte KEYSH , se_m_grasswhistle_key+0 - .byte TEMPO , 100*se_m_grasswhistle_tbs/2 - .byte VOICE , 64 - .byte BENDR , 2 - .byte LFOS , 40 - .byte PAN , c_v+0 - .byte VOL , 70*se_m_grasswhistle_mvl/mxv - .byte BEND , c_v-16 - .byte N21 , Gn5 , v112 - .byte W03 - .byte BEND , c_v-8 - .byte W03 - .byte c_v+0 - .byte W03 - .byte MOD , 10 - .byte W03 - .byte W09 - .byte 0 - .byte W03 - .byte N09 , An5 - .byte W12 - .byte En5 - .byte W12 - .byte BEND , c_v-14 - .byte N66 , Gn5 - .byte W06 - .byte BEND , c_v-8 - .byte W06 - .byte c_v-4 - .byte W06 - .byte c_v+0 - .byte W06 - .byte MOD , 10 - .byte W12 - .byte W12 - .byte W06 - .byte VOL , 61*se_m_grasswhistle_mvl/mxv - .byte W06 - .byte 51*se_m_grasswhistle_mvl/mxv - .byte W06 - .byte 36*se_m_grasswhistle_mvl/mxv - .byte W06 - .byte 18*se_m_grasswhistle_mvl/mxv - .byte W12 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_grasswhistle_2: - .byte KEYSH , se_m_grasswhistle_key+0 - .byte VOICE , 64 - .byte BENDR , 2 - .byte LFOS , 40 - .byte VOL , 70*se_m_grasswhistle_mvl/mxv - .byte W12 - .byte PAN , c_v+12 - .byte BEND , c_v-16 - .byte N21 , Gn5 , v072 - .byte W03 - .byte BEND , c_v-8 - .byte W03 - .byte c_v+0 - .byte W03 - .byte MOD , 10 - .byte W03 - .byte W09 - .byte 0 - .byte W03 - .byte PAN , c_v-12 - .byte N09 , An5 - .byte W12 - .byte PAN , c_v+14 - .byte N09 , En5 - .byte W12 - .byte PAN , c_v-15 - .byte BEND , c_v-14 - .byte N66 , Gn5 - .byte W06 - .byte BEND , c_v-8 - .byte W06 - .byte c_v-4 - .byte W06 - .byte c_v+0 - .byte W06 - .byte MOD , 10 - .byte W12 - .byte W06 - .byte VOL , 61*se_m_grasswhistle_mvl/mxv - .byte W06 - .byte 51*se_m_grasswhistle_mvl/mxv - .byte W06 - .byte 36*se_m_grasswhistle_mvl/mxv - .byte W06 - .byte 18*se_m_grasswhistle_mvl/mxv - .byte W12 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_grasswhistle: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_grasswhistle_pri @ Priority - .byte se_m_grasswhistle_rev @ Reverb. - - .word se_m_grasswhistle_grp - - .word se_m_grasswhistle_1 - .word se_m_grasswhistle_2 - - .end diff --git a/sound/songs/se_m_hail.s b/sound/songs/se_m_hail.s deleted file mode 100644 index 46b25141b..000000000 --- a/sound/songs/se_m_hail.s +++ /dev/null @@ -1,98 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_hail_grp, voicegroup_rs_sfx_2 - .equ se_m_hail_pri, 4 - .equ se_m_hail_rev, reverb_set+50 - .equ se_m_hail_mvl, 127 - .equ se_m_hail_key, 0 - .equ se_m_hail_tbs, 1 - .equ se_m_hail_exg, 0 - .equ se_m_hail_cmp, 1 - - .section .rodata - .global se_m_hail - .align 2 - -@********************** Track 1 **********************@ - -se_m_hail_1: - .byte KEYSH , se_m_hail_key+0 - .byte TEMPO , 150*se_m_hail_tbs/2 - .byte VOICE , 3 - .byte VOL , 100*se_m_hail_mvl/mxv - .byte PAN , c_v+0 - .byte N01 , Fn4 , v112 - .byte W04 - .byte PAN , c_v+6 - .byte N02 , Ds5 , v040 - .byte W02 - .byte W02 - .byte PAN , c_v-5 - .byte N01 , Gn4 , v112 - .byte W01 - .byte PAN , c_v+0 - .byte N01 , Ds5 - .byte W03 - .byte W01 - .byte PAN , c_v+6 - .byte N02 , Ds5 , v020 - .byte W03 - .byte PAN , c_v-5 - .byte N01 , Gn4 , v064 - .byte W02 - .byte PAN , c_v+0 - .byte N01 , Ds5 - .byte W03 - .byte PAN , c_v+11 - .byte N02 , Ds5 , v020 - .byte W03 - .byte W01 - .byte PAN , c_v-13 - .byte N01 , Gn4 , v064 - .byte W01 - .byte PAN , c_v+0 - .byte N01 , Ds5 - .byte W04 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_hail_2: - .byte KEYSH , se_m_hail_key+0 - .byte VOICE , 4 - .byte VOL , 100*se_m_hail_mvl/mxv - .byte PAN , c_v+0 - .byte N01 , Dn4 , v040 - .byte W04 - .byte Bn3 - .byte W02 - .byte W03 - .byte Dn4 - .byte W03 - .byte W01 - .byte Bn3 , v032 - .byte W05 - .byte Dn4 - .byte W03 - .byte Bn3 , v012 - .byte W03 - .byte W02 - .byte Dn4 - .byte W04 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_hail: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_hail_pri @ Priority - .byte se_m_hail_rev @ Reverb. - - .word se_m_hail_grp - - .word se_m_hail_1 - .word se_m_hail_2 - - .end diff --git a/sound/songs/se_m_harden.s b/sound/songs/se_m_harden.s deleted file mode 100644 index 2171a3e06..000000000 --- a/sound/songs/se_m_harden.s +++ /dev/null @@ -1,74 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_harden_grp, voicegroup_rs_sfx_2 - .equ se_m_harden_pri, 4 - .equ se_m_harden_rev, reverb_set+50 - .equ se_m_harden_mvl, 127 - .equ se_m_harden_key, 0 - .equ se_m_harden_tbs, 1 - .equ se_m_harden_exg, 0 - .equ se_m_harden_cmp, 1 - - .section .rodata - .global se_m_harden - .align 2 - -@********************** Track 1 **********************@ - -se_m_harden_1: - .byte KEYSH , se_m_harden_key+0 - .byte TEMPO , 150*se_m_harden_tbs/2 - .byte VOICE , 28 - .byte VOL , 100*se_m_harden_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+16 - .byte N03 , Gs3 , v080 - .byte W01 - .byte BEND , c_v+38 - .byte W01 - .byte c_v+62 - .byte W02 - .byte N17 , Gs4 , v096 - .byte W03 - .byte PAN , c_v+6 - .byte W02 - .byte c_v+0 - .byte W03 - .byte c_v-8 - .byte W02 - .byte c_v+0 - .byte W02 - .byte c_v+6 - .byte W03 - .byte c_v+0 - .byte W05 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_harden_2: - .byte KEYSH , se_m_harden_key+0 - .byte VOICE , 4 - .byte VOL , 100*se_m_harden_mvl/mxv - .byte PAN , c_v+0 - .byte N01 , En4 , v060 - .byte W04 - .byte N17 , Gs4 , v096 - .byte W20 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_harden: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_harden_pri @ Priority - .byte se_m_harden_rev @ Reverb. - - .word se_m_harden_grp - - .word se_m_harden_1 - .word se_m_harden_2 - - .end diff --git a/sound/songs/se_m_haze.s b/sound/songs/se_m_haze.s deleted file mode 100644 index fb134ff04..000000000 --- a/sound/songs/se_m_haze.s +++ /dev/null @@ -1,250 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_haze_grp, voicegroup_rs_sfx_2 - .equ se_m_haze_pri, 4 - .equ se_m_haze_rev, reverb_set+50 - .equ se_m_haze_mvl, 127 - .equ se_m_haze_key, 0 - .equ se_m_haze_tbs, 1 - .equ se_m_haze_exg, 0 - .equ se_m_haze_cmp, 1 - - .section .rodata - .global se_m_haze - .align 2 - -@********************** Track 1 **********************@ - -se_m_haze_1: - .byte KEYSH , se_m_haze_key+0 - .byte TEMPO , 190*se_m_haze_tbs/2 - .byte VOICE , 45 - .byte BENDR , 8 - .byte PAN , c_v-47 - .byte VOL , 10*se_m_haze_mvl/mxv - .byte MOD , 30 - .byte BEND , c_v+1 - .byte TIE , As2 , v100 - .byte W03 - .byte VOL , 14*se_m_haze_mvl/mxv - .byte W03 - .byte 22*se_m_haze_mvl/mxv - .byte PAN , c_v-45 - .byte W02 - .byte VOL , 31*se_m_haze_mvl/mxv - .byte W02 - .byte 39*se_m_haze_mvl/mxv - .byte W02 - .byte PAN , c_v-43 - .byte W02 - .byte VOL , 45*se_m_haze_mvl/mxv - .byte W02 - .byte 50*se_m_haze_mvl/mxv - .byte W02 - .byte PAN , c_v-41 - .byte W01 - .byte VOL , 61*se_m_haze_mvl/mxv - .byte W02 - .byte 66*se_m_haze_mvl/mxv - .byte W03 - .byte PAN , c_v-39 - .byte VOL , 73*se_m_haze_mvl/mxv - .byte W02 - .byte 78*se_m_haze_mvl/mxv - .byte W04 - .byte 84*se_m_haze_mvl/mxv - .byte PAN , c_v-37 - .byte W03 - .byte VOL , 91*se_m_haze_mvl/mxv - .byte W03 - .byte 98*se_m_haze_mvl/mxv - .byte PAN , c_v-35 - .byte W02 - .byte VOL , 104*se_m_haze_mvl/mxv - .byte W04 - .byte 110*se_m_haze_mvl/mxv - .byte PAN , c_v-32 - .byte W06 - .byte c_v-28 - .byte W06 - .byte c_v-25 - .byte VOL , 106*se_m_haze_mvl/mxv - .byte W04 - .byte 104*se_m_haze_mvl/mxv - .byte W02 - .byte PAN , c_v-23 - .byte W03 - .byte VOL , 101*se_m_haze_mvl/mxv - .byte W03 - .byte PAN , c_v-20 - .byte W03 - .byte VOL , 97*se_m_haze_mvl/mxv - .byte W03 - .byte PAN , c_v-17 - .byte W02 - .byte VOL , 91*se_m_haze_mvl/mxv - .byte W04 - .byte PAN , c_v-13 - .byte W03 - .byte VOL , 88*se_m_haze_mvl/mxv - .byte W03 - .byte PAN , c_v-10 - .byte W03 - .byte VOL , 81*se_m_haze_mvl/mxv - .byte W03 - .byte PAN , c_v-7 - .byte W04 - .byte VOL , 75*se_m_haze_mvl/mxv - .byte W02 - .byte PAN , c_v-3 - .byte W02 - .byte VOL , 74*se_m_haze_mvl/mxv - .byte W02 - .byte 76*se_m_haze_mvl/mxv - .byte W02 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 79*se_m_haze_mvl/mxv - .byte W02 - .byte 83*se_m_haze_mvl/mxv - .byte W03 - .byte W01 - .byte 86*se_m_haze_mvl/mxv - .byte W02 - .byte PAN , c_v+2 - .byte VOL , 90*se_m_haze_mvl/mxv - .byte W03 - .byte 95*se_m_haze_mvl/mxv - .byte W03 - .byte 98*se_m_haze_mvl/mxv - .byte W03 - .byte PAN , c_v+7 - .byte VOL , 102*se_m_haze_mvl/mxv - .byte W02 - .byte 104*se_m_haze_mvl/mxv - .byte W04 - .byte PAN , c_v+10 - .byte VOL , 110*se_m_haze_mvl/mxv - .byte W06 - .byte PAN , c_v+14 - .byte W06 - .byte c_v+16 - .byte W02 - .byte VOL , 106*se_m_haze_mvl/mxv - .byte W04 - .byte PAN , c_v+19 - .byte W01 - .byte VOL , 100*se_m_haze_mvl/mxv - .byte W05 - .byte PAN , c_v+22 - .byte VOL , 94*se_m_haze_mvl/mxv - .byte W06 - .byte PAN , c_v+25 - .byte VOL , 88*se_m_haze_mvl/mxv - .byte W04 - .byte 83*se_m_haze_mvl/mxv - .byte W02 - .byte PAN , c_v+27 - .byte W06 - .byte c_v+29 - .byte VOL , 75*se_m_haze_mvl/mxv - .byte W06 - .byte PAN , c_v+32 - .byte VOL , 64*se_m_haze_mvl/mxv - .byte W06 - .byte PAN , c_v+34 - .byte W01 - .byte VOL , 55*se_m_haze_mvl/mxv - .byte W05 - .byte PAN , c_v+38 - .byte W01 - .byte VOL , 47*se_m_haze_mvl/mxv - .byte W05 - .byte PAN , c_v+41 - .byte W01 - .byte VOL , 41*se_m_haze_mvl/mxv - .byte W05 - .byte PAN , c_v+44 - .byte VOL , 32*se_m_haze_mvl/mxv - .byte W03 - .byte 25*se_m_haze_mvl/mxv - .byte W03 - .byte PAN , c_v+47 - .byte W01 - .byte VOL , 12*se_m_haze_mvl/mxv - .byte W03 - .byte 6*se_m_haze_mvl/mxv - .byte W02 - .byte EOT - .byte FINE - -@********************** Track 2 **********************@ - -se_m_haze_2: - .byte KEYSH , se_m_haze_key+0 - .byte VOICE , 70 - .byte BENDR , 8 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_haze_mvl/mxv - .byte BEND , c_v+0 - .byte N24 , Fn4 , v020 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte Fs4 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte Gn4 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte Gs4 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte Gn4 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte Fs4 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte Fn4 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte En4 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte N18 , Ds4 - .byte W06 - .byte W06 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_haze: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_haze_pri @ Priority - .byte se_m_haze_rev @ Reverb. - - .word se_m_haze_grp - - .word se_m_haze_1 - .word se_m_haze_2 - - .end diff --git a/sound/songs/se_m_heal_bell.s b/sound/songs/se_m_heal_bell.s deleted file mode 100644 index 407af374f..000000000 --- a/sound/songs/se_m_heal_bell.s +++ /dev/null @@ -1,83 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_heal_bell_grp, voicegroup_rs_sfx_2 - .equ se_m_heal_bell_pri, 4 - .equ se_m_heal_bell_rev, reverb_set+50 - .equ se_m_heal_bell_mvl, 127 - .equ se_m_heal_bell_key, 0 - .equ se_m_heal_bell_tbs, 1 - .equ se_m_heal_bell_exg, 0 - .equ se_m_heal_bell_cmp, 1 - - .section .rodata - .global se_m_heal_bell - .align 2 - -@********************** Track 1 **********************@ - -se_m_heal_bell_1: - .byte KEYSH , se_m_heal_bell_key+0 - .byte TEMPO , 150*se_m_heal_bell_tbs/2 - .byte VOICE , 51 - .byte BENDR , 2 - .byte PAN , c_v+0 - .byte VOL , 90*se_m_heal_bell_mvl/mxv - .byte BEND , c_v+4 - .byte N03 , As5 , v100 - .byte W01 - .byte PAN , c_v-13 - .byte W01 - .byte c_v+11 - .byte W01 - .byte c_v+1 - .byte N01 , An5 - .byte W01 - .byte MOD , 7 - .byte N18 , Bn5 - .byte W02 - .byte PAN , c_v+11 - .byte W01 - .byte MOD , 0 - .byte PAN , c_v-14 - .byte W01 - .byte c_v+11 - .byte W01 - .byte c_v-13 - .byte W01 - .byte c_v+11 - .byte W02 - .byte c_v-14 - .byte W01 - .byte c_v+11 - .byte W01 - .byte c_v-13 - .byte W01 - .byte c_v+11 - .byte W01 - .byte MOD , 7 - .byte PAN , c_v-14 - .byte W02 - .byte c_v+11 - .byte W01 - .byte c_v-14 - .byte W01 - .byte c_v+11 - .byte W01 - .byte c_v-13 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_heal_bell: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_heal_bell_pri @ Priority - .byte se_m_heal_bell_rev @ Reverb. - - .word se_m_heal_bell_grp - - .word se_m_heal_bell_1 - - .end diff --git a/sound/songs/se_m_heat_wave.s b/sound/songs/se_m_heat_wave.s deleted file mode 100644 index 5430cd4ca..000000000 --- a/sound/songs/se_m_heat_wave.s +++ /dev/null @@ -1,206 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_heat_wave_grp, voicegroup_rs_sfx_2 - .equ se_m_heat_wave_pri, 4 - .equ se_m_heat_wave_rev, reverb_set+50 - .equ se_m_heat_wave_mvl, 127 - .equ se_m_heat_wave_key, 0 - .equ se_m_heat_wave_tbs, 1 - .equ se_m_heat_wave_exg, 0 - .equ se_m_heat_wave_cmp, 1 - - .section .rodata - .global se_m_heat_wave - .align 2 - -@********************** Track 1 **********************@ - -se_m_heat_wave_1: - .byte KEYSH , se_m_heat_wave_key+0 - .byte TEMPO , 150*se_m_heat_wave_tbs/2 - .byte VOICE , 29 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 23*se_m_heat_wave_mvl/mxv - .byte BEND , c_v+0 - .byte TIE , Fn4 , v127 - .byte W01 - .byte VOL , 51*se_m_heat_wave_mvl/mxv - .byte W01 - .byte 75*se_m_heat_wave_mvl/mxv - .byte W01 - .byte 99*se_m_heat_wave_mvl/mxv - .byte BEND , c_v+8 - .byte W01 - .byte VOL , 115*se_m_heat_wave_mvl/mxv - .byte W02 - .byte PAN , c_v+6 - .byte BEND , c_v+16 - .byte W01 - .byte VOL , 99*se_m_heat_wave_mvl/mxv - .byte W02 - .byte 92*se_m_heat_wave_mvl/mxv - .byte BEND , c_v+7 - .byte W01 - .byte VOL , 97*se_m_heat_wave_mvl/mxv - .byte W02 - .byte 105*se_m_heat_wave_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte W03 - .byte VOL , 110*se_m_heat_wave_mvl/mxv - .byte BEND , c_v-9 - .byte W03 - .byte PAN , c_v-8 - .byte BEND , c_v-24 - .byte W03 - .byte VOL , 115*se_m_heat_wave_mvl/mxv - .byte BEND , c_v-38 - .byte W03 - .byte PAN , c_v+0 - .byte BEND , c_v-41 - .byte W04 - .byte c_v-45 - .byte W02 - .byte PAN , c_v+6 - .byte W02 - .byte BEND , c_v-39 - .byte W04 - .byte PAN , c_v+0 - .byte W03 - .byte BEND , c_v-35 - .byte W03 - .byte PAN , c_v-8 - .byte W03 - .byte BEND , c_v-30 - .byte W03 - .byte PAN , c_v+0 - .byte W03 - .byte BEND , c_v-26 - .byte W03 - .byte PAN , c_v+6 - .byte W01 - .byte BEND , c_v-22 - .byte W05 - .byte PAN , c_v+0 - .byte BEND , c_v-18 - .byte W04 - .byte c_v-13 - .byte W02 - .byte PAN , c_v-8 - .byte W06 - .byte c_v+0 - .byte W06 - .byte c_v+6 - .byte W03 - .byte BEND , c_v-7 - .byte W03 - .byte PAN , c_v+0 - .byte W04 - .byte BEND , c_v-3 - .byte W02 - .byte PAN , c_v-8 - .byte VOL , 113*se_m_heat_wave_mvl/mxv - .byte W04 - .byte 110*se_m_heat_wave_mvl/mxv - .byte W02 - .byte PAN , c_v+0 - .byte W02 - .byte BEND , c_v-7 - .byte W02 - .byte VOL , 105*se_m_heat_wave_mvl/mxv - .byte W02 - .byte PAN , c_v+6 - .byte W03 - .byte VOL , 98*se_m_heat_wave_mvl/mxv - .byte BEND , c_v-11 - .byte W03 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 91*se_m_heat_wave_mvl/mxv - .byte W03 - .byte 81*se_m_heat_wave_mvl/mxv - .byte BEND , c_v-15 - .byte W02 - .byte PAN , c_v-8 - .byte W02 - .byte VOL , 74*se_m_heat_wave_mvl/mxv - .byte W01 - .byte BEND , c_v-22 - .byte W03 - .byte PAN , c_v+0 - .byte VOL , 63*se_m_heat_wave_mvl/mxv - .byte W01 - .byte BEND , c_v-30 - .byte W01 - .byte VOL , 50*se_m_heat_wave_mvl/mxv - .byte W02 - .byte 40*se_m_heat_wave_mvl/mxv - .byte BEND , c_v-39 - .byte W02 - .byte PAN , c_v+6 - .byte W01 - .byte VOL , 28*se_m_heat_wave_mvl/mxv - .byte BEND , c_v-52 - .byte W02 - .byte VOL , 17*se_m_heat_wave_mvl/mxv - .byte W03 - .byte EOT - .byte FINE - -@********************** Track 2 **********************@ - -se_m_heat_wave_2: - .byte KEYSH , se_m_heat_wave_key+0 - .byte VOICE , 27 - .byte PAN , c_v+0 - .byte VOL , 23*se_m_heat_wave_mvl/mxv - .byte N30 , Gn2 , v032 - .byte W01 - .byte VOL , 51*se_m_heat_wave_mvl/mxv - .byte W01 - .byte 75*se_m_heat_wave_mvl/mxv - .byte W01 - .byte 99*se_m_heat_wave_mvl/mxv - .byte W01 - .byte 115*se_m_heat_wave_mvl/mxv - .byte W03 - .byte 99*se_m_heat_wave_mvl/mxv - .byte W02 - .byte 92*se_m_heat_wave_mvl/mxv - .byte W01 - .byte 97*se_m_heat_wave_mvl/mxv - .byte W02 - .byte 115*se_m_heat_wave_mvl/mxv - .byte W12 - .byte PAN , c_v+0 - .byte W12 - .byte W12 - .byte c_v+0 - .byte W12 - .byte W12 - .byte c_v+0 - .byte W12 - .byte W12 - .byte c_v+0 - .byte W12 - .byte W12 - .byte c_v+0 - .byte W12 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_heat_wave: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_heat_wave_pri @ Priority - .byte se_m_heat_wave_rev @ Reverb. - - .word se_m_heat_wave_grp - - .word se_m_heat_wave_1 - .word se_m_heat_wave_2 - - .end diff --git a/sound/songs/se_m_hydro_pump.s b/sound/songs/se_m_hydro_pump.s deleted file mode 100644 index 93f8459ec..000000000 --- a/sound/songs/se_m_hydro_pump.s +++ /dev/null @@ -1,124 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_hydro_pump_grp, voicegroup_rs_sfx_2 - .equ se_m_hydro_pump_pri, 4 - .equ se_m_hydro_pump_rev, reverb_set+50 - .equ se_m_hydro_pump_mvl, 127 - .equ se_m_hydro_pump_key, 0 - .equ se_m_hydro_pump_tbs, 1 - .equ se_m_hydro_pump_exg, 0 - .equ se_m_hydro_pump_cmp, 1 - - .section .rodata - .global se_m_hydro_pump - .align 2 - -@********************** Track 1 **********************@ - -se_m_hydro_pump_1: - .byte KEYSH , se_m_hydro_pump_key+0 - .byte TEMPO , 150*se_m_hydro_pump_tbs/2 - .byte VOICE , 36 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 115*se_m_hydro_pump_mvl/mxv - .byte BEND , c_v+0 - .byte TIE , Gn2 , v127 - .byte W06 - .byte PAN , c_v-4 - .byte W06 - .byte c_v-10 - .byte W06 - .byte c_v-5 - .byte W06 - .byte c_v+0 - .byte W06 - .byte c_v+4 - .byte W06 - .byte c_v+11 - .byte W06 - .byte c_v+4 - .byte W06 - .byte c_v+0 - .byte W06 - .byte c_v-4 - .byte W06 - .byte c_v-10 - .byte W06 - .byte c_v-5 - .byte W06 - .byte c_v+0 - .byte W06 - .byte c_v+4 - .byte W06 - .byte c_v+11 - .byte W02 - .byte VOL , 103*se_m_hydro_pump_mvl/mxv - .byte W04 - .byte PAN , c_v+4 - .byte W01 - .byte VOL , 85*se_m_hydro_pump_mvl/mxv - .byte W05 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 71*se_m_hydro_pump_mvl/mxv - .byte W05 - .byte 52*se_m_hydro_pump_mvl/mxv - .byte PAN , c_v-4 - .byte W04 - .byte VOL , 32*se_m_hydro_pump_mvl/mxv - .byte W02 - .byte PAN , c_v-10 - .byte W03 - .byte VOL , 11*se_m_hydro_pump_mvl/mxv - .byte W03 - .byte PAN , c_v-5 - .byte W01 - .byte VOL , 6*se_m_hydro_pump_mvl/mxv - .byte W05 - .byte EOT - .byte FINE - -@********************** Track 2 **********************@ - -se_m_hydro_pump_2: - .byte KEYSH , se_m_hydro_pump_key+0 - .byte VOL , 58*se_m_hydro_pump_mvl/mxv - .byte N14 , Gn3 , v080 - .byte W01 - .byte VOICE , 25 - .byte VOL , 76*se_m_hydro_pump_mvl/mxv - .byte W01 - .byte 89*se_m_hydro_pump_mvl/mxv - .byte W01 - .byte 100*se_m_hydro_pump_mvl/mxv - .byte W01 - .byte 115*se_m_hydro_pump_mvl/mxv - .byte W06 - .byte 90*se_m_hydro_pump_mvl/mxv - .byte W02 - .byte 76*se_m_hydro_pump_mvl/mxv - .byte W01 - .byte 58*se_m_hydro_pump_mvl/mxv - .byte W11 - .byte W24 - .byte W24 - .byte W24 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_hydro_pump: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_hydro_pump_pri @ Priority - .byte se_m_hydro_pump_rev @ Reverb. - - .word se_m_hydro_pump_grp - - .word se_m_hydro_pump_1 - .word se_m_hydro_pump_2 - - .end diff --git a/sound/songs/se_m_hyper_beam.s b/sound/songs/se_m_hyper_beam.s deleted file mode 100644 index 34e49ac46..000000000 --- a/sound/songs/se_m_hyper_beam.s +++ /dev/null @@ -1,84 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_hyper_beam_grp, voicegroup_rs_sfx_2 - .equ se_m_hyper_beam_pri, 4 - .equ se_m_hyper_beam_rev, reverb_set+50 - .equ se_m_hyper_beam_mvl, 127 - .equ se_m_hyper_beam_key, 0 - .equ se_m_hyper_beam_tbs, 1 - .equ se_m_hyper_beam_exg, 0 - .equ se_m_hyper_beam_cmp, 1 - - .section .rodata - .global se_m_hyper_beam - .align 2 - -@********************** Track 1 **********************@ - -se_m_hyper_beam_1: - .byte KEYSH , se_m_hyper_beam_key+0 - .byte TEMPO , 150*se_m_hyper_beam_tbs/2 - .byte VOICE , 18 - .byte VOL , 110*se_m_hyper_beam_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N02 , En3 , v127 - .byte W03 - .byte N01 , As3 - .byte W03 - .byte N02 , Gn3 - .byte W03 - .byte N01 , Cs4 - .byte W03 - .byte PAN , c_v+7 - .byte N02 , En3 , v072 - .byte W03 - .byte N01 , As3 - .byte W03 - .byte PAN , c_v-7 - .byte N02 , Gn3 , v040 - .byte W03 - .byte N01 , Cs4 - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_hyper_beam_2: - .byte KEYSH , se_m_hyper_beam_key+0 - .byte VOICE , 5 - .byte VOL , 110*se_m_hyper_beam_mvl/mxv - .byte N01 , Cn3 , v040 - .byte W02 - .byte N01 - .byte W04 - .byte N01 - .byte W02 - .byte N01 - .byte W04 -se_m_hyper_beam_2_000: - .byte N01 , Cn3 , v020 - .byte W02 - .byte N01 - .byte W04 - .byte PEND - .byte PATT - .word se_m_hyper_beam_2_000 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_hyper_beam: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_hyper_beam_pri @ Priority - .byte se_m_hyper_beam_rev @ Reverb. - - .word se_m_hyper_beam_grp - - .word se_m_hyper_beam_1 - .word se_m_hyper_beam_2 - - .end diff --git a/sound/songs/se_m_hyper_beam2.s b/sound/songs/se_m_hyper_beam2.s deleted file mode 100644 index 0fffa797c..000000000 --- a/sound/songs/se_m_hyper_beam2.s +++ /dev/null @@ -1,115 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_hyper_beam2_grp, voicegroup_rs_sfx_2 - .equ se_m_hyper_beam2_pri, 4 - .equ se_m_hyper_beam2_rev, reverb_set+50 - .equ se_m_hyper_beam2_mvl, 127 - .equ se_m_hyper_beam2_key, 0 - .equ se_m_hyper_beam2_tbs, 1 - .equ se_m_hyper_beam2_exg, 0 - .equ se_m_hyper_beam2_cmp, 1 - - .section .rodata - .global se_m_hyper_beam2 - .align 2 - -@********************** Track 1 **********************@ - -se_m_hyper_beam2_1: - .byte KEYSH , se_m_hyper_beam2_key+0 - .byte TEMPO , 150*se_m_hyper_beam2_tbs/2 - .byte VOICE , 45 - .byte VOL , 110*se_m_hyper_beam2_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N03 , Gn3 , v092 - .byte W01 - .byte BEND , c_v+11 - .byte W01 - .byte c_v+28 - .byte W01 - .byte c_v+0 - .byte N02 , Cs4 - .byte W01 - .byte BEND , c_v+30 - .byte W02 - .byte c_v+0 - .byte N03 , As3 - .byte W01 - .byte BEND , c_v+11 - .byte W01 - .byte c_v+28 - .byte W01 - .byte c_v+0 - .byte N02 , En4 - .byte W01 - .byte BEND , c_v+30 - .byte W02 - .byte PAN , c_v+7 - .byte BEND , c_v+0 - .byte N03 , Gn3 , v040 - .byte W01 - .byte BEND , c_v+11 - .byte W01 - .byte c_v+28 - .byte W01 - .byte c_v+0 - .byte N02 , Cs4 - .byte W01 - .byte BEND , c_v+30 - .byte W02 - .byte PAN , c_v-7 - .byte BEND , c_v+0 - .byte N03 , As3 , v016 - .byte W01 - .byte BEND , c_v+11 - .byte W01 - .byte c_v+28 - .byte W01 - .byte c_v+0 - .byte N02 , En4 - .byte W01 - .byte BEND , c_v+30 - .byte W02 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_hyper_beam2_2: - .byte KEYSH , se_m_hyper_beam2_key+0 - .byte VOICE , 5 - .byte VOL , 110*se_m_hyper_beam2_mvl/mxv - .byte N01 , Cn3 , v032 - .byte W02 - .byte N01 - .byte W04 - .byte N01 - .byte W02 - .byte N01 - .byte W04 -se_m_hyper_beam2_2_000: - .byte N01 , Cn3 , v020 - .byte W02 - .byte N01 - .byte W04 - .byte PEND - .byte PATT - .word se_m_hyper_beam2_2_000 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_hyper_beam2: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_hyper_beam2_pri @ Priority - .byte se_m_hyper_beam2_rev @ Reverb. - - .word se_m_hyper_beam2_grp - - .word se_m_hyper_beam2_1 - .word se_m_hyper_beam2_2 - - .end diff --git a/sound/songs/se_m_icy_wind.s b/sound/songs/se_m_icy_wind.s deleted file mode 100644 index dff7f5948..000000000 --- a/sound/songs/se_m_icy_wind.s +++ /dev/null @@ -1,72 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_icy_wind_grp, voicegroup_rs_sfx_2 - .equ se_m_icy_wind_pri, 4 - .equ se_m_icy_wind_rev, reverb_set+50 - .equ se_m_icy_wind_mvl, 127 - .equ se_m_icy_wind_key, 0 - .equ se_m_icy_wind_tbs, 1 - .equ se_m_icy_wind_exg, 0 - .equ se_m_icy_wind_cmp, 1 - - .section .rodata - .global se_m_icy_wind - .align 2 - -@********************** Track 1 **********************@ - -se_m_icy_wind_1: - .byte KEYSH , se_m_icy_wind_key+0 - .byte TEMPO , 150*se_m_icy_wind_tbs/2 - .byte VOICE , 3 - .byte VOL , 100*se_m_icy_wind_mvl/mxv - .byte PAN , c_v+0 - .byte N01 , Ds4 , v112 - .byte W04 - .byte PAN , c_v+6 - .byte N01 , Bn4 , v040 - .byte W04 - .byte PAN , c_v-5 - .byte N01 , Ds4 , v112 - .byte W01 - .byte PAN , c_v+0 - .byte N01 , Bn4 - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_icy_wind_2: - .byte KEYSH , se_m_icy_wind_key+0 - .byte VOICE , 5 - .byte VOL , 100*se_m_icy_wind_mvl/mxv - .byte PAN , c_v+0 - .byte N01 , Dn4 , v040 - .byte W04 - .byte Bn3 - .byte W02 - .byte PAN , c_v-7 - .byte W02 - .byte c_v+9 - .byte W01 - .byte N01 , Dn4 - .byte W01 - .byte PAN , c_v-7 - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_icy_wind: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_icy_wind_pri @ Priority - .byte se_m_icy_wind_rev @ Reverb. - - .word se_m_icy_wind_grp - - .word se_m_icy_wind_1 - .word se_m_icy_wind_2 - - .end diff --git a/sound/songs/se_m_lick.s b/sound/songs/se_m_lick.s deleted file mode 100644 index 34f9cbfbb..000000000 --- a/sound/songs/se_m_lick.s +++ /dev/null @@ -1,129 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_lick_grp, voicegroup_rs_sfx_2 - .equ se_m_lick_pri, 4 - .equ se_m_lick_rev, reverb_set+50 - .equ se_m_lick_mvl, 127 - .equ se_m_lick_key, 0 - .equ se_m_lick_tbs, 1 - .equ se_m_lick_exg, 0 - .equ se_m_lick_cmp, 1 - - .section .rodata - .global se_m_lick - .align 2 - -@********************** Track 1 **********************@ - -se_m_lick_1: - .byte KEYSH , se_m_lick_key+0 - .byte TEMPO , 150*se_m_lick_tbs/2 - .byte VOICE , 31 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_lick_mvl/mxv - .byte BEND , c_v-5 - .byte N32 , Cn3 , v127 - .byte W01 - .byte PAN , c_v+4 - .byte BEND , c_v-9 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v-13 - .byte W01 - .byte PAN , c_v-4 - .byte BEND , c_v-20 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v-25 - .byte W02 - .byte PAN , c_v+4 - .byte BEND , c_v-39 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v-6 - .byte W01 - .byte PAN , c_v-4 - .byte BEND , c_v-3 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+6 - .byte W01 - .byte PAN , c_v+4 - .byte BEND , c_v+3 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+9 - .byte W01 - .byte PAN , c_v-4 - .byte BEND , c_v+6 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+12 - .byte W01 - .byte PAN , c_v+4 - .byte BEND , c_v+8 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+16 - .byte W02 - .byte PAN , c_v-4 - .byte VOL , 102*se_m_lick_mvl/mxv - .byte BEND , c_v+12 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+16 - .byte W01 - .byte PAN , c_v+4 - .byte VOL , 97*se_m_lick_mvl/mxv - .byte BEND , c_v+18 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+14 - .byte W01 - .byte PAN , c_v-4 - .byte VOL , 92*se_m_lick_mvl/mxv - .byte BEND , c_v+18 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+20 - .byte W01 - .byte PAN , c_v+4 - .byte VOL , 88*se_m_lick_mvl/mxv - .byte BEND , c_v+17 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+12 - .byte W01 - .byte PAN , c_v-4 - .byte VOL , 81*se_m_lick_mvl/mxv - .byte BEND , c_v+16 - .byte W01 - .byte PAN , c_v+0 - .byte VOL , 64*se_m_lick_mvl/mxv - .byte BEND , c_v+12 - .byte W02 - .byte PAN , c_v+4 - .byte VOL , 49*se_m_lick_mvl/mxv - .byte BEND , c_v+14 - .byte W01 - .byte PAN , c_v+0 - .byte VOL , 25*se_m_lick_mvl/mxv - .byte BEND , c_v+11 - .byte W05 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_lick: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_lick_pri @ Priority - .byte se_m_lick_rev @ Reverb. - - .word se_m_lick_grp - - .word se_m_lick_1 - - .end diff --git a/sound/songs/se_m_lock_on.s b/sound/songs/se_m_lock_on.s deleted file mode 100644 index c95eafb3b..000000000 --- a/sound/songs/se_m_lock_on.s +++ /dev/null @@ -1,69 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_lock_on_grp, voicegroup_rs_sfx_2 - .equ se_m_lock_on_pri, 4 - .equ se_m_lock_on_rev, reverb_set+50 - .equ se_m_lock_on_mvl, 127 - .equ se_m_lock_on_key, 0 - .equ se_m_lock_on_tbs, 1 - .equ se_m_lock_on_exg, 0 - .equ se_m_lock_on_cmp, 1 - - .section .rodata - .global se_m_lock_on - .align 2 - -@********************** Track 1 **********************@ - -se_m_lock_on_1: - .byte KEYSH , se_m_lock_on_key+0 - .byte TEMPO , 150*se_m_lock_on_tbs/2 - .byte VOICE , 40 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_lock_on_mvl/mxv - .byte BEND , c_v+0 - .byte N01 , Cn4 , v100 - .byte W01 - .byte Gn3 , v064 - .byte W01 - .byte N03 , Bn3 , v100 - .byte W01 - .byte PAN , c_v+6 - .byte BEND , c_v+6 - .byte W01 - .byte PAN , c_v-5 - .byte BEND , c_v-6 - .byte W02 - .byte PAN , c_v+6 - .byte BEND , c_v+6 - .byte N01 , Cn4 - .byte W01 - .byte Gn3 , v064 - .byte W02 - .byte PAN , c_v-5 - .byte BEND , c_v-6 - .byte N01 , Bn3 , v100 - .byte W01 - .byte Gn3 , v064 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N06 , Bn3 , v100 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_lock_on: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_lock_on_pri @ Priority - .byte se_m_lock_on_rev @ Reverb. - - .word se_m_lock_on_grp - - .word se_m_lock_on_1 - - .end diff --git a/sound/songs/se_m_metronome.s b/sound/songs/se_m_metronome.s deleted file mode 100644 index de8899b16..000000000 --- a/sound/songs/se_m_metronome.s +++ /dev/null @@ -1,79 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_metronome_grp, voicegroup_rs_sfx_2 - .equ se_m_metronome_pri, 4 - .equ se_m_metronome_rev, reverb_set+50 - .equ se_m_metronome_mvl, 127 - .equ se_m_metronome_key, 0 - .equ se_m_metronome_tbs, 1 - .equ se_m_metronome_exg, 0 - .equ se_m_metronome_cmp, 1 - - .section .rodata - .global se_m_metronome - .align 2 - -@********************** Track 1 **********************@ - -se_m_metronome_1: - .byte KEYSH , se_m_metronome_key+0 - .byte TEMPO , 150*se_m_metronome_tbs/2 - .byte VOICE , 37 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 115*se_m_metronome_mvl/mxv - .byte BEND , c_v+0 - .byte N15 , En3 , v127 - .byte W01 - .byte PAN , c_v+4 - .byte BEND , c_v-4 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v-7 - .byte W01 - .byte PAN , c_v-4 - .byte BEND , c_v-11 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v-5 - .byte W02 - .byte PAN , c_v+4 - .byte BEND , c_v+0 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+3 - .byte W01 - .byte PAN , c_v-4 - .byte BEND , c_v+6 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+9 - .byte W01 - .byte PAN , c_v+4 - .byte BEND , c_v+14 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+20 - .byte W01 - .byte PAN , c_v-4 - .byte BEND , c_v+25 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+46 - .byte W10 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_metronome: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_metronome_pri @ Priority - .byte se_m_metronome_rev @ Reverb. - - .word se_m_metronome_grp - - .word se_m_metronome_1 - - .end diff --git a/sound/songs/se_m_milk_drink.s b/sound/songs/se_m_milk_drink.s deleted file mode 100644 index 6380ee398..000000000 --- a/sound/songs/se_m_milk_drink.s +++ /dev/null @@ -1,129 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_milk_drink_grp, voicegroup_rs_sfx_2 - .equ se_m_milk_drink_pri, 4 - .equ se_m_milk_drink_rev, reverb_set+50 - .equ se_m_milk_drink_mvl, 127 - .equ se_m_milk_drink_key, 0 - .equ se_m_milk_drink_tbs, 1 - .equ se_m_milk_drink_exg, 0 - .equ se_m_milk_drink_cmp, 1 - - .section .rodata - .global se_m_milk_drink - .align 2 - -@********************** Track 1 **********************@ - -se_m_milk_drink_1: - .byte KEYSH , se_m_milk_drink_key+0 - .byte TEMPO , 180*se_m_milk_drink_tbs/2 - .byte VOICE , 16 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 100*se_m_milk_drink_mvl/mxv - .byte BEND , c_v+0 - .byte N06 , An6 , v100 - .byte W01 - .byte BEND , c_v-11 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 90*se_m_milk_drink_mvl/mxv - .byte BEND , c_v-20 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 77*se_m_milk_drink_mvl/mxv - .byte BEND , c_v-37 - .byte W01 - .byte PAN , c_v+0 - .byte VOL , 37*se_m_milk_drink_mvl/mxv - .byte BEND , c_v-47 - .byte W02 - .byte N02 , An6 , v056 - .byte W01 - .byte PAN , c_v+5 - .byte W01 - .byte c_v-6 - .byte VOL , 100*se_m_milk_drink_mvl/mxv - .byte BEND , c_v+0 - .byte N06 , An6 , v100 - .byte W01 - .byte PAN , c_v+8 - .byte BEND , c_v-11 - .byte W01 - .byte PAN , c_v-10 - .byte VOL , 90*se_m_milk_drink_mvl/mxv - .byte BEND , c_v-20 - .byte W02 - .byte PAN , c_v+1 - .byte VOL , 77*se_m_milk_drink_mvl/mxv - .byte BEND , c_v-37 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 37*se_m_milk_drink_mvl/mxv - .byte BEND , c_v-47 - .byte W01 - .byte PAN , c_v-6 - .byte N02 , An6 , v056 - .byte W01 - .byte PAN , c_v+8 - .byte W01 - .byte c_v-10 - .byte VOL , 100*se_m_milk_drink_mvl/mxv - .byte BEND , c_v+0 - .byte N06 , An6 , v072 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v-11 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 90*se_m_milk_drink_mvl/mxv - .byte BEND , c_v-20 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 77*se_m_milk_drink_mvl/mxv - .byte BEND , c_v-37 - .byte W01 - .byte PAN , c_v+8 - .byte VOL , 37*se_m_milk_drink_mvl/mxv - .byte BEND , c_v-47 - .byte W01 - .byte PAN , c_v-10 - .byte W02 - .byte W06 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_milk_drink_2: - .byte KEYSH , se_m_milk_drink_key+0 - .byte VOICE , 53 - .byte VOL , 100*se_m_milk_drink_mvl/mxv - .byte W02 - .byte N06 , Fs6 , v040 - .byte W04 - .byte W04 - .byte N06 - .byte W02 - .byte W06 - .byte W01 - .byte Fs6 , v032 - .byte W05 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_milk_drink: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_milk_drink_pri @ Priority - .byte se_m_milk_drink_rev @ Reverb. - - .word se_m_milk_drink_grp - - .word se_m_milk_drink_1 - .word se_m_milk_drink_2 - - .end diff --git a/sound/songs/se_m_minimize.s b/sound/songs/se_m_minimize.s deleted file mode 100644 index 32dd545a0..000000000 --- a/sound/songs/se_m_minimize.s +++ /dev/null @@ -1,165 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_minimize_grp, voicegroup_rs_sfx_2 - .equ se_m_minimize_pri, 4 - .equ se_m_minimize_rev, reverb_set+50 - .equ se_m_minimize_mvl, 127 - .equ se_m_minimize_key, 0 - .equ se_m_minimize_tbs, 1 - .equ se_m_minimize_exg, 0 - .equ se_m_minimize_cmp, 1 - - .section .rodata - .global se_m_minimize - .align 2 - -@********************** Track 1 **********************@ - -se_m_minimize_1: - .byte KEYSH , se_m_minimize_key+0 - .byte TEMPO , 150*se_m_minimize_tbs/2 - .byte VOICE , 45 - .byte BENDR , 24 - .byte PAN , c_v+0 - .byte VOL , 32*se_m_minimize_mvl/mxv - .byte MOD , 30 - .byte BEND , c_v+39 - .byte N06 , Dn4 , v127 - .byte W01 - .byte BEND , c_v+31 - .byte W01 - .byte VOL , 49*se_m_minimize_mvl/mxv - .byte PAN , c_v+5 - .byte BEND , c_v+23 - .byte W01 - .byte c_v+15 - .byte W01 - .byte VOL , 61*se_m_minimize_mvl/mxv - .byte BEND , c_v+8 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+35 - .byte N06 , Cn4 , v116 - .byte W01 - .byte VOL , 71*se_m_minimize_mvl/mxv - .byte BEND , c_v+27 - .byte W01 - .byte PAN , c_v-4 - .byte BEND , c_v+19 - .byte W01 - .byte VOL , 81*se_m_minimize_mvl/mxv - .byte BEND , c_v+12 - .byte W01 - .byte c_v+5 - .byte W02 - .byte VOL , 95*se_m_minimize_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+32 - .byte N06 , Bn3 , v112 - .byte W01 - .byte BEND , c_v+24 - .byte W01 - .byte PAN , c_v+6 - .byte BEND , c_v+16 - .byte W01 - .byte c_v+8 - .byte W01 - .byte c_v+1 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+28 - .byte N06 , An3 - .byte W01 - .byte BEND , c_v+20 - .byte W01 - .byte PAN , c_v-6 - .byte BEND , c_v+12 - .byte W01 - .byte c_v+5 - .byte W01 - .byte c_v-2 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+24 - .byte N06 , Gn3 , v108 - .byte W01 - .byte BEND , c_v+16 - .byte W01 - .byte PAN , c_v+8 - .byte BEND , c_v+9 - .byte W01 - .byte c_v+1 - .byte W01 - .byte c_v-6 - .byte W02 - .byte VOL , 82*se_m_minimize_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+21 - .byte N06 , Fn3 , v100 - .byte W01 - .byte BEND , c_v+13 - .byte W01 - .byte VOL , 71*se_m_minimize_mvl/mxv - .byte PAN , c_v-8 - .byte BEND , c_v+5 - .byte W01 - .byte c_v-2 - .byte W01 - .byte VOL , 61*se_m_minimize_mvl/mxv - .byte BEND , c_v-10 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+17 - .byte N06 , En3 , v060 - .byte W01 - .byte BEND , c_v+9 - .byte W01 - .byte PAN , c_v+8 - .byte BEND , c_v+2 - .byte W01 - .byte c_v-6 - .byte W01 - .byte c_v-13 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+14 - .byte N06 , Dn3 , v040 - .byte W01 - .byte BEND , c_v+6 - .byte W01 - .byte PAN , c_v-8 - .byte BEND , c_v-2 - .byte W01 - .byte c_v-10 - .byte W01 - .byte c_v-17 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+12 - .byte N06 , Cn3 , v020 - .byte W01 - .byte BEND , c_v+4 - .byte W01 - .byte PAN , c_v+8 - .byte BEND , c_v-4 - .byte W01 - .byte c_v-11 - .byte W01 - .byte c_v-18 - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_minimize: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_minimize_pri @ Priority - .byte se_m_minimize_rev @ Reverb. - - .word se_m_minimize_grp - - .word se_m_minimize_1 - - .end diff --git a/sound/songs/se_m_mist.s b/sound/songs/se_m_mist.s deleted file mode 100644 index 7975b50cc..000000000 --- a/sound/songs/se_m_mist.s +++ /dev/null @@ -1,94 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_mist_grp, voicegroup_rs_sfx_2 - .equ se_m_mist_pri, 4 - .equ se_m_mist_rev, reverb_set+50 - .equ se_m_mist_mvl, 127 - .equ se_m_mist_key, 0 - .equ se_m_mist_tbs, 1 - .equ se_m_mist_exg, 0 - .equ se_m_mist_cmp, 1 - - .section .rodata - .global se_m_mist - .align 2 - -@********************** Track 1 **********************@ - -se_m_mist_1: - .byte KEYSH , se_m_mist_key+0 - .byte TEMPO , 150*se_m_mist_tbs/2 - .byte VOICE , 36 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 7*se_m_mist_mvl/mxv - .byte BEND , c_v+1 - .byte N18 , Cn5 , v052 - .byte W01 - .byte VOL , 20*se_m_mist_mvl/mxv - .byte PAN , c_v+16 - .byte BEND , c_v-8 - .byte W01 - .byte VOL , 41*se_m_mist_mvl/mxv - .byte PAN , c_v-14 - .byte BEND , c_v-16 - .byte W01 - .byte VOL , 70*se_m_mist_mvl/mxv - .byte PAN , c_v+16 - .byte BEND , c_v-8 - .byte W01 - .byte VOL , 93*se_m_mist_mvl/mxv - .byte PAN , c_v-14 - .byte BEND , c_v+0 - .byte W02 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_mist_mvl/mxv - .byte BEND , c_v+8 - .byte W01 - .byte PAN , c_v+16 - .byte BEND , c_v+16 - .byte W01 - .byte PAN , c_v-14 - .byte W01 - .byte VOL , 98*se_m_mist_mvl/mxv - .byte PAN , c_v+16 - .byte BEND , c_v+10 - .byte W01 - .byte VOL , 85*se_m_mist_mvl/mxv - .byte PAN , c_v-14 - .byte BEND , c_v+4 - .byte W02 - .byte VOL , 69*se_m_mist_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-7 - .byte W01 - .byte VOL , 51*se_m_mist_mvl/mxv - .byte PAN , c_v+16 - .byte BEND , c_v-22 - .byte W01 - .byte PAN , c_v-14 - .byte VOL , 38*se_m_mist_mvl/mxv - .byte BEND , c_v-28 - .byte W01 - .byte VOL , 17*se_m_mist_mvl/mxv - .byte BEND , c_v-32 - .byte W01 - .byte VOL , 4*se_m_mist_mvl/mxv - .byte BEND , c_v-38 - .byte W08 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_mist: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_mist_pri @ Priority - .byte se_m_mist_rev @ Reverb. - - .word se_m_mist_grp - - .word se_m_mist_1 - - .end diff --git a/sound/songs/se_m_moonlight.s b/sound/songs/se_m_moonlight.s deleted file mode 100644 index 35329544e..000000000 --- a/sound/songs/se_m_moonlight.s +++ /dev/null @@ -1,218 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_moonlight_grp, voicegroup_rs_sfx_2 - .equ se_m_moonlight_pri, 4 - .equ se_m_moonlight_rev, reverb_set+50 - .equ se_m_moonlight_mvl, 127 - .equ se_m_moonlight_key, 0 - .equ se_m_moonlight_tbs, 1 - .equ se_m_moonlight_exg, 0 - .equ se_m_moonlight_cmp, 1 - - .section .rodata - .global se_m_moonlight - .align 2 - -@********************** Track 1 **********************@ - -se_m_moonlight_1: - .byte KEYSH , se_m_moonlight_key+0 - .byte TEMPO , 150*se_m_moonlight_tbs/2 - .byte VOICE , 46 - .byte VOL , 100*se_m_moonlight_mvl/mxv - .byte BENDR , 4 - .byte PAN , c_v+0 - .byte MOD , 6 - .byte BEND , c_v+3 - .byte N01 , Ds6 , v092 - .byte W01 - .byte Dn6 - .byte W01 - .byte Gn5 - .byte W01 - .byte N20 , Gn6 , v100 - .byte W21 -se_m_moonlight_1_000: - .byte N01 , Ds6 , v056 - .byte W01 - .byte Dn6 - .byte W01 - .byte Gn5 - .byte W01 - .byte N20 , Gn6 , v064 - .byte W03 - .byte PAN , c_v+6 - .byte W04 - .byte c_v-4 - .byte W05 - .byte c_v+6 - .byte W05 - .byte c_v-4 - .byte W04 - .byte PEND -se_m_moonlight_1_001: - .byte PAN , c_v+0 - .byte N01 , Gs5 , v092 - .byte W01 - .byte Gn5 - .byte W01 - .byte Cn5 - .byte W01 - .byte N20 , Cn6 , v100 - .byte W21 - .byte PEND -se_m_moonlight_1_002: - .byte PAN , c_v+16 - .byte N01 , Gs5 , v056 - .byte W01 - .byte Gn5 - .byte W01 - .byte Cn5 - .byte W01 - .byte N20 , Cn6 , v064 - .byte W21 - .byte PEND -se_m_moonlight_1_003: - .byte PAN , c_v-16 - .byte N01 , Gs5 , v040 - .byte W01 - .byte Gn5 - .byte W01 - .byte Cn5 - .byte W01 - .byte N20 , Cn6 - .byte W21 - .byte PEND -se_m_moonlight_1_004: - .byte PAN , c_v+32 - .byte N01 , Gs5 , v020 - .byte W01 - .byte Gn5 - .byte W01 - .byte Cn5 - .byte W01 - .byte PAN , c_v-32 - .byte N20 , Cn6 - .byte W21 - .byte PEND - .byte PAN , c_v+0 - .byte N01 , Ds6 , v092 - .byte W01 - .byte Dn6 - .byte W01 - .byte Gn5 - .byte W01 - .byte N20 , Gn6 , v100 - .byte W21 - .byte PATT - .word se_m_moonlight_1_000 - .byte PATT - .word se_m_moonlight_1_001 - .byte PATT - .word se_m_moonlight_1_002 - .byte PATT - .word se_m_moonlight_1_003 - .byte PATT - .word se_m_moonlight_1_004 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_moonlight_2: - .byte KEYSH , se_m_moonlight_key+0 - .byte VOICE , 55 - .byte PAN , c_v+0 - .byte VOL , 39*se_m_moonlight_mvl/mxv - .byte BEND , c_v-4 - .byte W10 - .byte N01 , Ds6 , v112 - .byte W02 - .byte Dn6 - .byte W01 - .byte Gn5 - .byte W01 - .byte N04 , Gn6 - .byte W05 - .byte Gn6 , v096 - .byte W05 -se_m_moonlight_2_000: - .byte PAN , c_v+50 - .byte N04 , Gn6 , v080 - .byte W04 - .byte PAN , c_v-48 - .byte N04 , Gn6 , v064 - .byte W05 - .byte PAN , c_v+50 - .byte N04 , Gn6 , v048 - .byte W05 - .byte PAN , c_v-49 - .byte N04 , Gn6 , v032 - .byte W10 - .byte PEND -se_m_moonlight_2_001: - .byte PAN , c_v+0 - .byte W10 - .byte N01 , Gs5 , v112 - .byte W02 - .byte Gn5 - .byte W01 - .byte Cn5 - .byte W01 - .byte N04 , Cn6 - .byte W05 - .byte Cn6 , v096 - .byte W05 - .byte PEND -se_m_moonlight_2_002: - .byte PAN , c_v+50 - .byte N04 , Cn6 , v080 - .byte W04 - .byte PAN , c_v-48 - .byte N04 , Cn6 , v064 - .byte W05 - .byte PAN , c_v+50 - .byte N04 , Cn6 , v048 - .byte W05 - .byte PAN , c_v-49 - .byte N04 , Cn6 , v032 - .byte W10 - .byte PEND - .byte W24 - .byte W24 - .byte PAN , c_v+0 - .byte W10 - .byte N01 , Ds6 , v112 - .byte W02 - .byte Dn6 - .byte W01 - .byte Gn5 - .byte W01 - .byte N04 , Gn6 - .byte W05 - .byte Gn6 , v096 - .byte W05 - .byte PATT - .word se_m_moonlight_2_000 - .byte PATT - .word se_m_moonlight_2_001 - .byte PATT - .word se_m_moonlight_2_002 - .byte W24 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_moonlight: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_moonlight_pri @ Priority - .byte se_m_moonlight_rev @ Reverb. - - .word se_m_moonlight_grp - - .word se_m_moonlight_1 - .word se_m_moonlight_2 - - .end diff --git a/sound/songs/se_m_morning_sun.s b/sound/songs/se_m_morning_sun.s deleted file mode 100644 index a1196f6fe..000000000 --- a/sound/songs/se_m_morning_sun.s +++ /dev/null @@ -1,135 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_morning_sun_grp, voicegroup_rs_sfx_2 - .equ se_m_morning_sun_pri, 5 - .equ se_m_morning_sun_rev, reverb_set+50 - .equ se_m_morning_sun_mvl, 127 - .equ se_m_morning_sun_key, 0 - .equ se_m_morning_sun_tbs, 1 - .equ se_m_morning_sun_exg, 0 - .equ se_m_morning_sun_cmp, 1 - - .section .rodata - .global se_m_morning_sun - .align 2 - -@********************** Track 1 **********************@ - -se_m_morning_sun_1: - .byte KEYSH , se_m_morning_sun_key+0 - .byte TEMPO , 150*se_m_morning_sun_tbs/2 - .byte VOICE , 46 - .byte VOL , 95*se_m_morning_sun_mvl/mxv - .byte BENDR , 2 - .byte PAN , c_v+0 - .byte BEND , c_v+15 - .byte W03 - .byte N06 , Ds6 , v112 - .byte W03 - .byte W03 - .byte En5 , v104 - .byte W03 - .byte W03 - .byte Ds6 , v096 - .byte W03 - .byte W03 - .byte En5 , v088 - .byte W03 - .byte W03 - .byte PAN , c_v-4 - .byte N06 , Ds6 , v080 - .byte W03 - .byte W03 - .byte PAN , c_v+0 - .byte N06 , En5 , v072 - .byte W03 - .byte W03 - .byte PAN , c_v+4 - .byte N06 , Ds6 , v064 - .byte W03 - .byte W03 - .byte PAN , c_v+0 - .byte N06 , En5 , v056 - .byte W03 - .byte W03 - .byte PAN , c_v-4 - .byte N06 , Ds6 , v044 - .byte W03 - .byte W03 - .byte PAN , c_v+0 - .byte N06 , En5 , v036 - .byte W03 - .byte W03 - .byte PAN , c_v+4 - .byte N06 , Ds6 , v028 - .byte W03 - .byte W03 - .byte PAN , c_v+0 - .byte N06 , En5 , v020 - .byte W03 - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_morning_sun_2: - .byte KEYSH , se_m_morning_sun_key+0 - .byte VOICE , 53 - .byte BENDR , 2 - .byte VOL , 43*se_m_morning_sun_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+15 - .byte N06 , Gs6 , v108 - .byte W03 - .byte W03 - .byte Bn5 - .byte W03 - .byte W03 - .byte Gs6 , v100 - .byte W03 - .byte W03 - .byte Bn5 , v092 - .byte W03 - .byte W03 - .byte Gs6 , v084 - .byte W03 - .byte W03 - .byte Bn5 , v076 - .byte W03 - .byte W03 - .byte Gs6 , v068 - .byte W03 - .byte W03 - .byte Bn5 , v060 - .byte W03 - .byte W03 - .byte Gs6 , v052 - .byte W03 - .byte W03 - .byte Bn5 , v040 - .byte W03 - .byte W03 - .byte Gs6 , v032 - .byte W03 - .byte W03 - .byte Bn5 , v024 - .byte W03 - .byte W03 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_morning_sun: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_morning_sun_pri @ Priority - .byte se_m_morning_sun_rev @ Reverb. - - .word se_m_morning_sun_grp - - .word se_m_morning_sun_1 - .word se_m_morning_sun_2 - - .end diff --git a/sound/songs/se_m_nightmare.s b/sound/songs/se_m_nightmare.s deleted file mode 100644 index 61e7cde1e..000000000 --- a/sound/songs/se_m_nightmare.s +++ /dev/null @@ -1,146 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_nightmare_grp, voicegroup_rs_sfx_2 - .equ se_m_nightmare_pri, 4 - .equ se_m_nightmare_rev, reverb_set+50 - .equ se_m_nightmare_mvl, 127 - .equ se_m_nightmare_key, 0 - .equ se_m_nightmare_tbs, 1 - .equ se_m_nightmare_exg, 0 - .equ se_m_nightmare_cmp, 1 - - .section .rodata - .global se_m_nightmare - .align 2 - -@********************** Track 1 **********************@ - -se_m_nightmare_1: - .byte KEYSH , se_m_nightmare_key+0 - .byte TEMPO , 220*se_m_nightmare_tbs/2 - .byte VOICE , 3 - .byte VOL , 110*se_m_nightmare_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte W06 - .byte N03 , Gn2 , v092 - .byte W06 - .byte PAN , c_v-16 - .byte N03 , Gn2 , v088 - .byte W09 - .byte PAN , c_v-1 - .byte N03 , Fs3 , v104 - .byte W03 - .byte W03 - .byte PAN , c_v+16 - .byte N03 , Fs3 , v088 - .byte W06 - .byte PAN , c_v+0 - .byte N03 , Ds3 - .byte W06 - .byte PAN , c_v-16 - .byte N03 - .byte W09 - .byte PAN , c_v-1 - .byte N03 , An2 , v096 - .byte W06 - .byte PAN , c_v+17 - .byte N03 , An2 , v088 - .byte W09 - .byte PAN , c_v-1 - .byte N03 , Gs3 , v104 - .byte W06 - .byte PAN , c_v-16 - .byte N03 , Gs3 , v088 - .byte W03 - .byte W03 - .byte PAN , c_v-1 - .byte N03 , Fn3 - .byte W06 - .byte PAN , c_v+16 - .byte N03 - .byte W15 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_nightmare_2: - .byte KEYSH , se_m_nightmare_key+0 - .byte VOICE , 20 - .byte XCMD , xIECV , 10 - .byte xIECL , 8 - .byte VOL , 110*se_m_nightmare_mvl/mxv - .byte PAN , c_v-7 - .byte BEND , c_v+55 - .byte N03 , Cn2 , v100 - .byte W06 - .byte PAN , c_v+6 - .byte BEND , c_v+36 - .byte N03 - .byte W06 - .byte PAN , c_v-7 - .byte BEND , c_v+17 - .byte N03 - .byte W06 - .byte PAN , c_v+6 - .byte BEND , c_v+2 - .byte N03 - .byte W06 - .byte PAN , c_v-7 - .byte BEND , c_v-8 - .byte N03 - .byte W06 - .byte PAN , c_v+6 - .byte BEND , c_v+12 - .byte N03 - .byte W06 - .byte PAN , c_v-7 - .byte BEND , c_v+6 - .byte N03 - .byte W06 - .byte PAN , c_v+6 - .byte BEND , c_v+0 - .byte N03 - .byte W06 - .byte PAN , c_v-7 - .byte BEND , c_v-6 - .byte N03 - .byte W06 - .byte PAN , c_v+6 - .byte BEND , c_v-19 - .byte N03 - .byte W06 - .byte PAN , c_v-7 - .byte BEND , c_v-31 - .byte N03 - .byte W06 - .byte PAN , c_v+6 - .byte BEND , c_v-44 - .byte N03 - .byte W06 - .byte PAN , c_v-7 - .byte BEND , c_v-55 - .byte N03 - .byte W06 - .byte PAN , c_v+6 - .byte BEND , c_v-64 - .byte N03 - .byte W18 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_nightmare: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_nightmare_pri @ Priority - .byte se_m_nightmare_rev @ Reverb. - - .word se_m_nightmare_grp - - .word se_m_nightmare_1 - .word se_m_nightmare_2 - - .end diff --git a/sound/songs/se_m_perish_song.s b/sound/songs/se_m_perish_song.s deleted file mode 100644 index 85614227e..000000000 --- a/sound/songs/se_m_perish_song.s +++ /dev/null @@ -1,221 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_perish_song_grp, voicegroup_rs_sfx_2 - .equ se_m_perish_song_pri, 4 - .equ se_m_perish_song_rev, reverb_set+50 - .equ se_m_perish_song_mvl, 127 - .equ se_m_perish_song_key, 0 - .equ se_m_perish_song_tbs, 1 - .equ se_m_perish_song_exg, 0 - .equ se_m_perish_song_cmp, 1 - - .section .rodata - .global se_m_perish_song - .align 2 - -@********************** Track 1 **********************@ - -se_m_perish_song_1: - .byte KEYSH , se_m_perish_song_key+0 - .byte TEMPO , 100*se_m_perish_song_tbs/2 - .byte VOICE , 73 - .byte BENDR , 12 - .byte LFOS , 40 - .byte PAN , c_v+7 - .byte VOL , 25*se_m_perish_song_mvl/mxv - .byte BEND , c_v+0 - .byte W03 - .byte VOL , 29*se_m_perish_song_mvl/mxv - .byte W03 - .byte 33*se_m_perish_song_mvl/mxv - .byte N48 , An3 , v112 - .byte W03 - .byte VOL , 40*se_m_perish_song_mvl/mxv - .byte W01 - .byte PAN , c_v+4 - .byte W02 -se_m_perish_song_1_000: - .byte VOL , 45*se_m_perish_song_mvl/mxv - .byte MOD , 8 - .byte W03 - .byte VOL , 51*se_m_perish_song_mvl/mxv - .byte W03 - .byte PEND -se_m_perish_song_1_001: - .byte VOL , 56*se_m_perish_song_mvl/mxv - .byte PAN , c_v+0 - .byte W03 - .byte VOL , 62*se_m_perish_song_mvl/mxv - .byte W03 - .byte PEND -se_m_perish_song_1_002: - .byte VOL , 72*se_m_perish_song_mvl/mxv - .byte PAN , c_v-4 - .byte W03 - .byte VOL , 81*se_m_perish_song_mvl/mxv - .byte W03 - .byte PEND -se_m_perish_song_1_003: - .byte VOL , 92*se_m_perish_song_mvl/mxv - .byte PAN , c_v-8 - .byte W03 - .byte VOL , 100*se_m_perish_song_mvl/mxv - .byte W03 - .byte PEND - .byte PAN , c_v-4 - .byte W06 - .byte VOL , 82*se_m_perish_song_mvl/mxv - .byte PAN , c_v+0 - .byte W03 - .byte VOL , 52*se_m_perish_song_mvl/mxv - .byte W03 - .byte 25*se_m_perish_song_mvl/mxv - .byte MOD , 0 - .byte PAN , c_v+4 - .byte W03 - .byte VOL , 29*se_m_perish_song_mvl/mxv - .byte W01 - .byte PAN , c_v+7 - .byte W02 - .byte VOL , 33*se_m_perish_song_mvl/mxv - .byte N72 , Gs3 , v112 - .byte W03 - .byte VOL , 40*se_m_perish_song_mvl/mxv - .byte W01 - .byte PAN , c_v+4 - .byte W02 - .byte PATT - .word se_m_perish_song_1_000 - .byte PATT - .word se_m_perish_song_1_001 - .byte PATT - .word se_m_perish_song_1_002 - .byte PATT - .word se_m_perish_song_1_003 - .byte PAN , c_v-4 - .byte W06 - .byte c_v+0 - .byte W06 - .byte c_v+4 - .byte W03 - .byte VOL , 87*se_m_perish_song_mvl/mxv - .byte W03 - .byte 75*se_m_perish_song_mvl/mxv - .byte PAN , c_v+7 - .byte W03 - .byte VOL , 62*se_m_perish_song_mvl/mxv - .byte W03 - .byte 48*se_m_perish_song_mvl/mxv - .byte PAN , c_v+4 - .byte W03 - .byte VOL , 33*se_m_perish_song_mvl/mxv - .byte W03 - .byte 25*se_m_perish_song_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte W02 - .byte VOL , 10*se_m_perish_song_mvl/mxv - .byte W03 - .byte W01 - .byte PAN , c_v-4 - .byte W05 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_perish_song_2: - .byte KEYSH , se_m_perish_song_key+0 - .byte VOICE , 73 - .byte VOL , 25*se_m_perish_song_mvl/mxv - .byte PAN , c_v-17 - .byte N48 , Cn4 , v100 - .byte W03 - .byte VOL , 29*se_m_perish_song_mvl/mxv - .byte W03 - .byte 33*se_m_perish_song_mvl/mxv - .byte W03 - .byte 40*se_m_perish_song_mvl/mxv - .byte W03 -se_m_perish_song_2_000: - .byte VOL , 45*se_m_perish_song_mvl/mxv - .byte MOD , 8 - .byte W03 - .byte VOL , 51*se_m_perish_song_mvl/mxv - .byte W03 - .byte PEND - .byte 56*se_m_perish_song_mvl/mxv - .byte W03 - .byte 62*se_m_perish_song_mvl/mxv - .byte W03 - .byte 72*se_m_perish_song_mvl/mxv - .byte W03 - .byte 81*se_m_perish_song_mvl/mxv - .byte W03 - .byte 92*se_m_perish_song_mvl/mxv - .byte W03 - .byte 100*se_m_perish_song_mvl/mxv - .byte W03 - .byte W06 - .byte 82*se_m_perish_song_mvl/mxv - .byte W03 - .byte 52*se_m_perish_song_mvl/mxv - .byte W03 - .byte 25*se_m_perish_song_mvl/mxv - .byte MOD , 0 - .byte N72 , Bn3 , v100 - .byte W03 - .byte VOL , 29*se_m_perish_song_mvl/mxv - .byte W03 - .byte 33*se_m_perish_song_mvl/mxv - .byte W03 - .byte 40*se_m_perish_song_mvl/mxv - .byte W03 - .byte PATT - .word se_m_perish_song_2_000 - .byte VOL , 56*se_m_perish_song_mvl/mxv - .byte W03 - .byte 62*se_m_perish_song_mvl/mxv - .byte W03 - .byte 72*se_m_perish_song_mvl/mxv - .byte W03 - .byte 81*se_m_perish_song_mvl/mxv - .byte W03 - .byte 92*se_m_perish_song_mvl/mxv - .byte W03 - .byte 100*se_m_perish_song_mvl/mxv - .byte W03 - .byte W06 - .byte W06 - .byte W03 - .byte 87*se_m_perish_song_mvl/mxv - .byte W03 - .byte 75*se_m_perish_song_mvl/mxv - .byte W03 - .byte 62*se_m_perish_song_mvl/mxv - .byte W03 - .byte 48*se_m_perish_song_mvl/mxv - .byte W03 - .byte 33*se_m_perish_song_mvl/mxv - .byte W03 - .byte 25*se_m_perish_song_mvl/mxv - .byte W03 - .byte 10*se_m_perish_song_mvl/mxv - .byte W03 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_perish_song: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_perish_song_pri @ Priority - .byte se_m_perish_song_rev @ Reverb. - - .word se_m_perish_song_grp - - .word se_m_perish_song_1 - .word se_m_perish_song_2 - - .end diff --git a/sound/songs/se_m_petal_dance.s b/sound/songs/se_m_petal_dance.s deleted file mode 100644 index 6d4e015a7..000000000 --- a/sound/songs/se_m_petal_dance.s +++ /dev/null @@ -1,205 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_petal_dance_grp, voicegroup_rs_sfx_2 - .equ se_m_petal_dance_pri, 4 - .equ se_m_petal_dance_rev, reverb_set+50 - .equ se_m_petal_dance_mvl, 127 - .equ se_m_petal_dance_key, 0 - .equ se_m_petal_dance_tbs, 1 - .equ se_m_petal_dance_exg, 0 - .equ se_m_petal_dance_cmp, 1 - - .section .rodata - .global se_m_petal_dance - .align 2 - -@********************** Track 1 **********************@ - -se_m_petal_dance_1: - .byte KEYSH , se_m_petal_dance_key+0 - .byte TEMPO , 150*se_m_petal_dance_tbs/2 - .byte VOICE , 46 - .byte VOL , 95*se_m_petal_dance_mvl/mxv - .byte BENDR , 2 - .byte PAN , c_v+0 - .byte BEND , c_v+15 - .byte W03 - .byte N06 , Dn6 , v112 - .byte W03 - .byte W03 - .byte An5 , v104 - .byte W03 - .byte W03 - .byte Dn6 , v100 - .byte W03 - .byte W03 - .byte An5 - .byte W03 - .byte W03 - .byte PAN , c_v-4 - .byte N06 , Dn6 , v096 - .byte W03 - .byte W03 - .byte PAN , c_v+0 - .byte N06 , An5 , v092 - .byte W03 - .byte W03 - .byte PAN , c_v+4 - .byte N06 , Dn6 , v088 - .byte W03 - .byte W03 - .byte PAN , c_v+0 - .byte N06 , An5 , v084 - .byte W03 - .byte W03 - .byte PAN , c_v-4 - .byte N06 , Dn6 , v080 - .byte W03 - .byte W03 - .byte PAN , c_v+0 - .byte N06 , An5 , v076 - .byte W03 - .byte W03 - .byte PAN , c_v+4 - .byte N06 , Dn6 - .byte W03 - .byte W03 - .byte PAN , c_v+0 - .byte N06 , An5 , v072 - .byte W03 - .byte W03 - .byte PAN , c_v-4 - .byte N06 , Dn6 , v068 - .byte W03 - .byte W03 - .byte PAN , c_v+0 - .byte N06 , An5 , v064 - .byte W03 - .byte W03 - .byte PAN , c_v+4 - .byte N06 , Dn6 , v060 - .byte W03 - .byte W03 - .byte PAN , c_v+0 - .byte N06 , An5 , v056 - .byte W03 - .byte W03 - .byte PAN , c_v-8 - .byte N06 , Dn6 , v052 - .byte W03 - .byte W03 - .byte PAN , c_v+0 - .byte N06 , An5 , v048 - .byte W03 - .byte W03 - .byte PAN , c_v+8 - .byte N06 , Dn6 , v044 - .byte W03 - .byte W03 - .byte PAN , c_v+0 - .byte N06 , An5 , v040 - .byte W03 - .byte W03 - .byte PAN , c_v-8 - .byte N06 , Dn6 , v036 - .byte W03 - .byte W03 - .byte PAN , c_v+0 - .byte N06 , An5 , v032 - .byte W03 - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_petal_dance_2: - .byte KEYSH , se_m_petal_dance_key+0 - .byte VOICE , 53 - .byte BENDR , 2 - .byte VOL , 43*se_m_petal_dance_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+15 - .byte N06 , En6 , v108 - .byte W03 - .byte W03 - .byte Bn5 , v104 - .byte W03 - .byte W03 - .byte En6 , v100 - .byte W03 - .byte W03 - .byte Bn5 , v096 - .byte W03 - .byte W03 - .byte En6 , v092 - .byte W03 - .byte W03 - .byte Bn5 , v088 - .byte W03 - .byte W03 - .byte En6 - .byte W03 - .byte W03 - .byte Bn5 , v084 - .byte W03 - .byte W03 - .byte En6 , v080 - .byte W03 - .byte W03 - .byte Bn5 , v076 - .byte W03 - .byte W03 - .byte En6 , v072 - .byte W03 - .byte W03 - .byte Bn5 , v068 - .byte W03 - .byte W03 - .byte En6 , v064 - .byte W03 - .byte W03 - .byte Bn5 - .byte W03 - .byte W03 - .byte En6 , v060 - .byte W03 - .byte W03 - .byte Bn5 , v056 - .byte W03 - .byte W03 - .byte En6 , v052 - .byte W03 - .byte W03 - .byte Bn5 , v048 - .byte W03 - .byte W03 - .byte En6 , v044 - .byte W03 - .byte W03 - .byte Bn5 , v040 - .byte W03 - .byte W03 - .byte En6 , v036 - .byte W03 - .byte W03 - .byte Bn5 , v032 - .byte W03 - .byte W03 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_petal_dance: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_petal_dance_pri @ Priority - .byte se_m_petal_dance_rev @ Reverb. - - .word se_m_petal_dance_grp - - .word se_m_petal_dance_1 - .word se_m_petal_dance_2 - - .end diff --git a/sound/songs/se_m_poison_powder.s b/sound/songs/se_m_poison_powder.s deleted file mode 100644 index f9fcd6dc9..000000000 --- a/sound/songs/se_m_poison_powder.s +++ /dev/null @@ -1,58 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_poison_powder_grp, voicegroup_rs_sfx_2 - .equ se_m_poison_powder_pri, 4 - .equ se_m_poison_powder_rev, reverb_set+50 - .equ se_m_poison_powder_mvl, 127 - .equ se_m_poison_powder_key, 0 - .equ se_m_poison_powder_tbs, 1 - .equ se_m_poison_powder_exg, 0 - .equ se_m_poison_powder_cmp, 1 - - .section .rodata - .global se_m_poison_powder - .align 2 - -@********************** Track 1 **********************@ - -se_m_poison_powder_1: - .byte KEYSH , se_m_poison_powder_key+0 - .byte TEMPO , 150*se_m_poison_powder_tbs/2 - .byte VOICE , 18 - .byte BENDR , 12 - .byte VOL , 55*se_m_poison_powder_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+1 - .byte N01 , Cn6 , v100 - .byte W01 - .byte VOL , 110*se_m_poison_powder_mvl/mxv - .byte W01 - .byte VOICE , 36 - .byte VOL , 55*se_m_poison_powder_mvl/mxv - .byte N02 , Gn6 , v080 - .byte W01 - .byte VOL , 110*se_m_poison_powder_mvl/mxv - .byte W04 - .byte PAN , c_v+20 - .byte N01 , Gn6 , v024 - .byte W03 - .byte Gn6 , v016 - .byte W02 - .byte PAN , c_v-21 - .byte W12 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_poison_powder: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_poison_powder_pri @ Priority - .byte se_m_poison_powder_rev @ Reverb. - - .word se_m_poison_powder_grp - - .word se_m_poison_powder_1 - - .end diff --git a/sound/songs/se_m_psybeam.s b/sound/songs/se_m_psybeam.s deleted file mode 100644 index 416a8a939..000000000 --- a/sound/songs/se_m_psybeam.s +++ /dev/null @@ -1,144 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_psybeam_grp, voicegroup_rs_sfx_2 - .equ se_m_psybeam_pri, 4 - .equ se_m_psybeam_rev, reverb_set+50 - .equ se_m_psybeam_mvl, 127 - .equ se_m_psybeam_key, 0 - .equ se_m_psybeam_tbs, 1 - .equ se_m_psybeam_exg, 0 - .equ se_m_psybeam_cmp, 1 - - .section .rodata - .global se_m_psybeam - .align 2 - -@********************** Track 1 **********************@ - -se_m_psybeam_1: - .byte KEYSH , se_m_psybeam_key+0 - .byte TEMPO , 190*se_m_psybeam_tbs/2 - .byte VOICE , 45 - .byte BENDR , 8 - .byte PAN , c_v+0 - .byte VOL , 38*se_m_psybeam_mvl/mxv - .byte MOD , 30 - .byte BEND , c_v+1 - .byte N42 , As2 , v120 - .byte W01 - .byte PAN , c_v+3 - .byte W01 - .byte c_v+5 - .byte VOL , 57*se_m_psybeam_mvl/mxv - .byte W01 - .byte PAN , c_v+9 - .byte W01 - .byte VOL , 71*se_m_psybeam_mvl/mxv - .byte W02 - .byte PAN , c_v+5 - .byte W01 - .byte c_v+1 - .byte VOL , 82*se_m_psybeam_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte W01 - .byte c_v-3 - .byte VOL , 94*se_m_psybeam_mvl/mxv - .byte W01 - .byte PAN , c_v-6 - .byte W02 - .byte c_v-10 - .byte VOL , 110*se_m_psybeam_mvl/mxv - .byte W02 - .byte PAN , c_v-6 - .byte W01 - .byte c_v-3 - .byte W01 - .byte c_v+0 - .byte W02 - .byte W06 - .byte c_v+3 - .byte W01 - .byte c_v+5 - .byte W01 - .byte c_v+9 - .byte W02 - .byte c_v+5 - .byte W02 - .byte c_v+1 - .byte VOL , 95*se_m_psybeam_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte W01 - .byte c_v-3 - .byte VOL , 83*se_m_psybeam_mvl/mxv - .byte W01 - .byte PAN , c_v-6 - .byte W01 - .byte c_v-10 - .byte VOL , 71*se_m_psybeam_mvl/mxv - .byte W02 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 56*se_m_psybeam_mvl/mxv - .byte W01 - .byte PAN , c_v-3 - .byte W01 - .byte VOL , 38*se_m_psybeam_mvl/mxv - .byte W03 - .byte PAN , c_v+0 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_psybeam_2: - .byte KEYSH , se_m_psybeam_key+0 - .byte VOICE , 47 - .byte BENDR , 8 - .byte PAN , c_v+0 - .byte VOL , 38*se_m_psybeam_mvl/mxv - .byte MOD , 30 - .byte BEND , c_v+1 - .byte N42 , As1 , v040 - .byte W02 - .byte VOL , 57*se_m_psybeam_mvl/mxv - .byte W02 - .byte 71*se_m_psybeam_mvl/mxv - .byte W02 - .byte W01 - .byte 82*se_m_psybeam_mvl/mxv - .byte W02 - .byte 94*se_m_psybeam_mvl/mxv - .byte W03 - .byte 110*se_m_psybeam_mvl/mxv - .byte W06 - .byte W06 - .byte W06 - .byte 95*se_m_psybeam_mvl/mxv - .byte W02 - .byte 83*se_m_psybeam_mvl/mxv - .byte W02 - .byte 71*se_m_psybeam_mvl/mxv - .byte W02 - .byte W01 - .byte 56*se_m_psybeam_mvl/mxv - .byte W02 - .byte 38*se_m_psybeam_mvl/mxv - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_psybeam: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_psybeam_pri @ Priority - .byte se_m_psybeam_rev @ Reverb. - - .word se_m_psybeam_grp - - .word se_m_psybeam_1 - .word se_m_psybeam_2 - - .end diff --git a/sound/songs/se_m_psybeam2.s b/sound/songs/se_m_psybeam2.s deleted file mode 100644 index 2cce6098b..000000000 --- a/sound/songs/se_m_psybeam2.s +++ /dev/null @@ -1,216 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_psybeam2_grp, voicegroup_rs_sfx_2 - .equ se_m_psybeam2_pri, 4 - .equ se_m_psybeam2_rev, reverb_set+50 - .equ se_m_psybeam2_mvl, 127 - .equ se_m_psybeam2_key, 0 - .equ se_m_psybeam2_tbs, 1 - .equ se_m_psybeam2_exg, 0 - .equ se_m_psybeam2_cmp, 1 - - .section .rodata - .global se_m_psybeam2 - .align 2 - -@********************** Track 1 **********************@ - -se_m_psybeam2_1: - .byte KEYSH , se_m_psybeam2_key+0 - .byte TEMPO , 190*se_m_psybeam2_tbs/2 - .byte VOICE , 45 - .byte BENDR , 8 - .byte VOL , 36*se_m_psybeam2_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-44 - .byte N12 , Gs2 , v127 - .byte W01 - .byte VOL , 52*se_m_psybeam2_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v-20 - .byte W01 - .byte VOL , 67*se_m_psybeam2_mvl/mxv - .byte PAN , c_v-6 - .byte BEND , c_v+17 - .byte W01 - .byte VOL , 78*se_m_psybeam2_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+27 - .byte W01 - .byte VOL , 105*se_m_psybeam2_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v+44 - .byte W02 - .byte PAN , c_v-6 - .byte BEND , c_v+63 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+44 - .byte W01 - .byte VOL , 86*se_m_psybeam2_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v+28 - .byte W01 - .byte VOL , 55*se_m_psybeam2_mvl/mxv - .byte PAN , c_v-6 - .byte BEND , c_v+17 - .byte W01 - .byte VOL , 33*se_m_psybeam2_mvl/mxv - .byte BEND , c_v+5 - .byte W02 - .byte VOICE , 37 - .byte VOL , 105*se_m_psybeam2_mvl/mxv - .byte N02 , Gs3 , v080 - .byte W01 - .byte BEND , c_v+16 - .byte W01 - .byte VOICE , 45 - .byte VOL , 36*se_m_psybeam2_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-44 - .byte N12 , As2 , v127 - .byte W01 - .byte VOL , 52*se_m_psybeam2_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v-20 - .byte W01 - .byte VOL , 67*se_m_psybeam2_mvl/mxv - .byte PAN , c_v-6 - .byte BEND , c_v+17 - .byte W02 - .byte VOL , 78*se_m_psybeam2_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+27 - .byte W01 - .byte VOL , 105*se_m_psybeam2_mvl/mxv - .byte PAN , c_v+11 - .byte BEND , c_v+44 - .byte W01 - .byte PAN , c_v-11 - .byte BEND , c_v+63 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+44 - .byte W01 - .byte VOL , 86*se_m_psybeam2_mvl/mxv - .byte PAN , c_v+11 - .byte BEND , c_v+28 - .byte W02 - .byte VOL , 55*se_m_psybeam2_mvl/mxv - .byte PAN , c_v-11 - .byte BEND , c_v+17 - .byte W01 - .byte VOL , 33*se_m_psybeam2_mvl/mxv - .byte BEND , c_v+5 - .byte W01 - .byte VOICE , 37 - .byte VOL , 105*se_m_psybeam2_mvl/mxv - .byte N02 , As3 , v056 - .byte W01 - .byte BEND , c_v+16 - .byte W01 - .byte VOICE , 45 - .byte VOL , 36*se_m_psybeam2_mvl/mxv - .byte BEND , c_v-44 - .byte N12 , Gs2 , v080 - .byte W02 - .byte VOL , 52*se_m_psybeam2_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-20 - .byte W01 - .byte VOL , 67*se_m_psybeam2_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v+17 - .byte W01 - .byte VOL , 78*se_m_psybeam2_mvl/mxv - .byte PAN , c_v-6 - .byte BEND , c_v+27 - .byte W01 - .byte VOL , 105*se_m_psybeam2_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+44 - .byte W01 - .byte PAN , c_v+6 - .byte BEND , c_v+63 - .byte W02 - .byte PAN , c_v-6 - .byte BEND , c_v+44 - .byte W01 - .byte VOL , 86*se_m_psybeam2_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+28 - .byte W01 - .byte VOL , 55*se_m_psybeam2_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v+17 - .byte W01 - .byte VOL , 33*se_m_psybeam2_mvl/mxv - .byte PAN , c_v-6 - .byte BEND , c_v+5 - .byte W01 - .byte VOICE , 37 - .byte VOL , 105*se_m_psybeam2_mvl/mxv - .byte N02 , Gs3 , v024 - .byte W02 - .byte BEND , c_v+16 - .byte W01 - .byte VOICE , 45 - .byte VOL , 36*se_m_psybeam2_mvl/mxv - .byte BEND , c_v-44 - .byte N12 , As2 , v040 - .byte W01 - .byte VOL , 52*se_m_psybeam2_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-20 - .byte W01 - .byte VOL , 67*se_m_psybeam2_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v+17 - .byte W01 - .byte VOL , 78*se_m_psybeam2_mvl/mxv - .byte PAN , c_v-6 - .byte BEND , c_v+27 - .byte W02 - .byte VOL , 105*se_m_psybeam2_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+44 - .byte W01 - .byte PAN , c_v+11 - .byte BEND , c_v+63 - .byte W01 - .byte PAN , c_v-11 - .byte BEND , c_v+44 - .byte W01 - .byte VOL , 86*se_m_psybeam2_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+28 - .byte W01 - .byte VOL , 55*se_m_psybeam2_mvl/mxv - .byte PAN , c_v+11 - .byte BEND , c_v+17 - .byte W02 - .byte VOL , 33*se_m_psybeam2_mvl/mxv - .byte BEND , c_v+5 - .byte W01 - .byte VOICE , 37 - .byte VOL , 105*se_m_psybeam2_mvl/mxv - .byte N02 , As3 , v016 - .byte W01 - .byte BEND , c_v+16 - .byte W04 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_psybeam2: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_psybeam2_pri @ Priority - .byte se_m_psybeam2_rev @ Reverb. - - .word se_m_psybeam2_grp - - .word se_m_psybeam2_1 - - .end diff --git a/sound/songs/se_m_rain_dance.s b/sound/songs/se_m_rain_dance.s deleted file mode 100644 index 7e5b2d009..000000000 --- a/sound/songs/se_m_rain_dance.s +++ /dev/null @@ -1,116 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_rain_dance_grp, voicegroup_rs_sfx_2 - .equ se_m_rain_dance_pri, 4 - .equ se_m_rain_dance_rev, reverb_set+50 - .equ se_m_rain_dance_mvl, 127 - .equ se_m_rain_dance_key, 0 - .equ se_m_rain_dance_tbs, 1 - .equ se_m_rain_dance_exg, 0 - .equ se_m_rain_dance_cmp, 1 - - .section .rodata - .global se_m_rain_dance - .align 2 - -@********************** Track 1 **********************@ - -se_m_rain_dance_1: - .byte KEYSH , se_m_rain_dance_key+0 - .byte TEMPO , 220*se_m_rain_dance_tbs/2 - .byte VOICE , 36 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 20*se_m_rain_dance_mvl/mxv - .byte BEND , c_v+0 - .byte TIE , Gn3 , v064 - .byte W03 - .byte VOL , 37*se_m_rain_dance_mvl/mxv - .byte W03 - .byte 53*se_m_rain_dance_mvl/mxv - .byte W03 - .byte 60*se_m_rain_dance_mvl/mxv - .byte W03 - .byte 71*se_m_rain_dance_mvl/mxv - .byte W03 - .byte 81*se_m_rain_dance_mvl/mxv - .byte W03 - .byte 93*se_m_rain_dance_mvl/mxv - .byte W03 - .byte 110*se_m_rain_dance_mvl/mxv - .byte W03 - .byte PAN , c_v+3 - .byte W06 - .byte c_v+11 - .byte W12 - .byte c_v+20 - .byte W06 - .byte c_v+25 - .byte W12 - .byte c_v+14 - .byte W06 - .byte c_v+8 - .byte W06 - .byte W06 - .byte c_v-3 - .byte W12 - .byte c_v-16 - .byte W06 - .byte W06 - .byte c_v-26 - .byte W12 - .byte c_v-16 - .byte W06 - .byte VOL , 104*se_m_rain_dance_mvl/mxv - .byte PAN , c_v-5 - .byte W03 - .byte VOL , 101*se_m_rain_dance_mvl/mxv - .byte W03 - .byte 98*se_m_rain_dance_mvl/mxv - .byte PAN , c_v+6 - .byte W03 - .byte VOL , 93*se_m_rain_dance_mvl/mxv - .byte W03 - .byte 90*se_m_rain_dance_mvl/mxv - .byte PAN , c_v+14 - .byte W03 - .byte VOL , 86*se_m_rain_dance_mvl/mxv - .byte W03 - .byte 83*se_m_rain_dance_mvl/mxv - .byte W03 - .byte 77*se_m_rain_dance_mvl/mxv - .byte W03 - .byte 73*se_m_rain_dance_mvl/mxv - .byte PAN , c_v+24 - .byte W03 - .byte VOL , 66*se_m_rain_dance_mvl/mxv - .byte W03 - .byte 58*se_m_rain_dance_mvl/mxv - .byte W03 - .byte 44*se_m_rain_dance_mvl/mxv - .byte W03 - .byte 32*se_m_rain_dance_mvl/mxv - .byte PAN , c_v+15 - .byte W03 - .byte VOL , 16*se_m_rain_dance_mvl/mxv - .byte W03 - .byte 1*se_m_rain_dance_mvl/mxv - .byte PAN , c_v+4 - .byte W06 - .byte EOT - .byte FINE - -@******************************************************@ - .align 2 - -se_m_rain_dance: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_rain_dance_pri @ Priority - .byte se_m_rain_dance_rev @ Reverb. - - .word se_m_rain_dance_grp - - .word se_m_rain_dance_1 - - .end diff --git a/sound/songs/se_m_reflect.s b/sound/songs/se_m_reflect.s deleted file mode 100644 index d5649ab36..000000000 --- a/sound/songs/se_m_reflect.s +++ /dev/null @@ -1,267 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_reflect_grp, voicegroup_rs_sfx_2 - .equ se_m_reflect_pri, 4 - .equ se_m_reflect_rev, reverb_set+50 - .equ se_m_reflect_mvl, 127 - .equ se_m_reflect_key, 0 - .equ se_m_reflect_tbs, 1 - .equ se_m_reflect_exg, 0 - .equ se_m_reflect_cmp, 1 - - .section .rodata - .global se_m_reflect - .align 2 - -@********************** Track 1 **********************@ - -se_m_reflect_1: - .byte KEYSH , se_m_reflect_key+0 - .byte TEMPO , 150*se_m_reflect_tbs/2 - .byte VOICE , 19 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 90*se_m_reflect_mvl/mxv - .byte BEND , c_v+6 - .byte N06 , Gn6 , v080 - .byte W01 - .byte BEND , c_v-4 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 74*se_m_reflect_mvl/mxv - .byte BEND , c_v-14 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 60*se_m_reflect_mvl/mxv - .byte BEND , c_v-31 - .byte W01 - .byte PAN , c_v+0 - .byte VOL , 20*se_m_reflect_mvl/mxv - .byte BEND , c_v-41 - .byte W02 - .byte VOL , 90*se_m_reflect_mvl/mxv - .byte BEND , c_v+0 - .byte N06 , Gn6 , v072 - .byte W01 - .byte BEND , c_v-11 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 74*se_m_reflect_mvl/mxv - .byte BEND , c_v-20 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 60*se_m_reflect_mvl/mxv - .byte BEND , c_v-37 - .byte W01 - .byte PAN , c_v+0 - .byte VOL , 20*se_m_reflect_mvl/mxv - .byte BEND , c_v-47 - .byte W02 - .byte VOL , 90*se_m_reflect_mvl/mxv - .byte BEND , c_v-1 - .byte N06 , Gn6 , v068 - .byte W01 - .byte BEND , c_v-11 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 74*se_m_reflect_mvl/mxv - .byte BEND , c_v-21 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 60*se_m_reflect_mvl/mxv - .byte BEND , c_v-38 - .byte W01 - .byte PAN , c_v+0 - .byte VOL , 20*se_m_reflect_mvl/mxv - .byte BEND , c_v-48 - .byte W02 - .byte VOL , 90*se_m_reflect_mvl/mxv - .byte BEND , c_v-1 - .byte N06 , Gn6 , v060 - .byte W01 - .byte BEND , c_v-11 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 74*se_m_reflect_mvl/mxv - .byte BEND , c_v-21 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 60*se_m_reflect_mvl/mxv - .byte BEND , c_v-38 - .byte W01 - .byte PAN , c_v+0 - .byte VOL , 20*se_m_reflect_mvl/mxv - .byte BEND , c_v-48 - .byte W02 - .byte VOL , 90*se_m_reflect_mvl/mxv - .byte BEND , c_v-2 - .byte N06 , Gn6 , v052 - .byte W01 - .byte PAN , c_v+5 - .byte BEND , c_v-12 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 74*se_m_reflect_mvl/mxv - .byte BEND , c_v-22 - .byte W01 - .byte PAN , c_v+8 - .byte VOL , 60*se_m_reflect_mvl/mxv - .byte BEND , c_v-39 - .byte W01 - .byte PAN , c_v-10 - .byte VOL , 20*se_m_reflect_mvl/mxv - .byte BEND , c_v-49 - .byte W02 - .byte PAN , c_v+0 - .byte VOL , 90*se_m_reflect_mvl/mxv - .byte BEND , c_v-2 - .byte N06 , Gn6 , v048 - .byte W01 - .byte PAN , c_v+5 - .byte BEND , c_v-12 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 74*se_m_reflect_mvl/mxv - .byte BEND , c_v-22 - .byte W01 - .byte PAN , c_v+8 - .byte VOL , 60*se_m_reflect_mvl/mxv - .byte BEND , c_v-39 - .byte W01 - .byte PAN , c_v-10 - .byte VOL , 20*se_m_reflect_mvl/mxv - .byte BEND , c_v-49 - .byte W02 - .byte VOL , 90*se_m_reflect_mvl/mxv - .byte BEND , c_v-2 - .byte N06 , Gn6 , v040 - .byte W01 - .byte PAN , c_v+5 - .byte BEND , c_v-13 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 74*se_m_reflect_mvl/mxv - .byte BEND , c_v-22 - .byte W01 - .byte PAN , c_v+8 - .byte VOL , 60*se_m_reflect_mvl/mxv - .byte BEND , c_v-39 - .byte W01 - .byte PAN , c_v-10 - .byte VOL , 20*se_m_reflect_mvl/mxv - .byte BEND , c_v-49 - .byte W02 - .byte PAN , c_v+0 - .byte VOL , 90*se_m_reflect_mvl/mxv - .byte BEND , c_v-2 - .byte N06 , Gn6 , v032 - .byte W01 - .byte PAN , c_v+5 - .byte BEND , c_v-13 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 74*se_m_reflect_mvl/mxv - .byte BEND , c_v-22 - .byte W01 - .byte PAN , c_v+8 - .byte VOL , 60*se_m_reflect_mvl/mxv - .byte BEND , c_v-39 - .byte W01 - .byte PAN , c_v-10 - .byte VOL , 20*se_m_reflect_mvl/mxv - .byte BEND , c_v-49 - .byte W02 - .byte W06 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_reflect_2: - .byte KEYSH , se_m_reflect_key+0 - .byte VOICE , 53 - .byte PAN , c_v+0 - .byte VOL , 90*se_m_reflect_mvl/mxv - .byte W02 - .byte N06 , En6 , v064 - .byte W02 - .byte VOL , 74*se_m_reflect_mvl/mxv - .byte W02 - .byte 60*se_m_reflect_mvl/mxv - .byte W01 - .byte 20*se_m_reflect_mvl/mxv - .byte W01 - .byte 90*se_m_reflect_mvl/mxv - .byte N06 , En6 , v056 - .byte W02 - .byte VOL , 74*se_m_reflect_mvl/mxv - .byte W02 -se_m_reflect_2_000: - .byte VOL , 60*se_m_reflect_mvl/mxv - .byte W01 - .byte 20*se_m_reflect_mvl/mxv - .byte W01 - .byte 90*se_m_reflect_mvl/mxv - .byte N06 , En6 , v052 - .byte W02 - .byte VOL , 74*se_m_reflect_mvl/mxv - .byte W02 - .byte PEND - .byte PATT - .word se_m_reflect_2_000 - .byte VOL , 60*se_m_reflect_mvl/mxv - .byte W01 - .byte 20*se_m_reflect_mvl/mxv - .byte W01 - .byte 90*se_m_reflect_mvl/mxv - .byte N06 , En6 , v048 - .byte W02 - .byte VOL , 74*se_m_reflect_mvl/mxv - .byte W02 - .byte 60*se_m_reflect_mvl/mxv - .byte W01 - .byte 20*se_m_reflect_mvl/mxv - .byte W01 - .byte 90*se_m_reflect_mvl/mxv - .byte N06 , En6 , v044 - .byte W02 - .byte VOL , 74*se_m_reflect_mvl/mxv - .byte W02 - .byte 60*se_m_reflect_mvl/mxv - .byte W01 - .byte 20*se_m_reflect_mvl/mxv - .byte W01 - .byte 90*se_m_reflect_mvl/mxv - .byte N06 , En6 , v040 - .byte W02 - .byte VOL , 74*se_m_reflect_mvl/mxv - .byte W02 - .byte 60*se_m_reflect_mvl/mxv - .byte W01 - .byte 20*se_m_reflect_mvl/mxv - .byte W01 - .byte 90*se_m_reflect_mvl/mxv - .byte N06 , En6 , v036 - .byte W02 - .byte VOL , 74*se_m_reflect_mvl/mxv - .byte W02 - .byte 60*se_m_reflect_mvl/mxv - .byte W01 - .byte 20*se_m_reflect_mvl/mxv - .byte W05 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_reflect: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_reflect_pri @ Priority - .byte se_m_reflect_rev @ Reverb. - - .word se_m_reflect_grp - - .word se_m_reflect_1 - .word se_m_reflect_2 - - .end diff --git a/sound/songs/se_m_reversal.s b/sound/songs/se_m_reversal.s deleted file mode 100644 index 56ed6d057..000000000 --- a/sound/songs/se_m_reversal.s +++ /dev/null @@ -1,336 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_reversal_grp, voicegroup_rs_sfx_2 - .equ se_m_reversal_pri, 4 - .equ se_m_reversal_rev, reverb_set+50 - .equ se_m_reversal_mvl, 127 - .equ se_m_reversal_key, 0 - .equ se_m_reversal_tbs, 1 - .equ se_m_reversal_exg, 0 - .equ se_m_reversal_cmp, 1 - - .section .rodata - .global se_m_reversal - .align 2 - -@********************** Track 1 **********************@ - -se_m_reversal_1: - .byte KEYSH , se_m_reversal_key+0 - .byte TEMPO , 150*se_m_reversal_tbs/2 - .byte VOICE , 19 - .byte BENDR , 24 - .byte VOL , 100*se_m_reversal_mvl/mxv - .byte PAN , c_v+0 - .byte VOL , 100*se_m_reversal_mvl/mxv - .byte N03 , Cn5 , v092 - .byte W01 - .byte VOL , 72*se_m_reversal_mvl/mxv - .byte W01 - .byte 40*se_m_reversal_mvl/mxv - .byte BEND , c_v+31 - .byte W01 - .byte VOICE , 22 - .byte PAN , c_v-10 - .byte BEND , c_v+0 - .byte N01 , Gn4 , v127 - .byte W01 - .byte VOICE , 19 - .byte VOL , 100*se_m_reversal_mvl/mxv - .byte PAN , c_v-1 - .byte BEND , c_v-33 - .byte N03 , Cs5 , v092 - .byte W02 - .byte VOL , 72*se_m_reversal_mvl/mxv - .byte W01 - .byte 40*se_m_reversal_mvl/mxv - .byte BEND , c_v+31 - .byte W01 - .byte VOICE , 22 - .byte PAN , c_v+10 - .byte BEND , c_v+0 - .byte N01 , Gs4 , v127 - .byte W01 - .byte VOICE , 19 - .byte VOL , 100*se_m_reversal_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-33 - .byte N03 , Dn5 , v092 - .byte W01 - .byte VOL , 72*se_m_reversal_mvl/mxv - .byte W02 - .byte 40*se_m_reversal_mvl/mxv - .byte BEND , c_v+31 - .byte W01 - .byte VOICE , 22 - .byte PAN , c_v-14 - .byte BEND , c_v+0 - .byte N01 , An4 , v127 - .byte W01 - .byte VOICE , 19 - .byte VOL , 100*se_m_reversal_mvl/mxv - .byte PAN , c_v-1 - .byte BEND , c_v-33 - .byte N03 , Ds5 , v092 - .byte W01 - .byte VOL , 72*se_m_reversal_mvl/mxv - .byte W01 - .byte 40*se_m_reversal_mvl/mxv - .byte BEND , c_v+31 - .byte W02 - .byte VOICE , 22 - .byte PAN , c_v+14 - .byte BEND , c_v+0 - .byte N01 , As4 , v127 - .byte W01 - .byte VOICE , 19 - .byte VOL , 100*se_m_reversal_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-33 - .byte N03 , En5 , v092 - .byte W01 - .byte VOL , 72*se_m_reversal_mvl/mxv - .byte W01 - .byte 40*se_m_reversal_mvl/mxv - .byte BEND , c_v+31 - .byte W01 - .byte VOICE , 22 - .byte PAN , c_v-18 - .byte BEND , c_v+0 - .byte N01 , Bn4 , v127 - .byte W02 - .byte VOICE , 19 - .byte VOL , 100*se_m_reversal_mvl/mxv - .byte PAN , c_v-1 - .byte BEND , c_v-33 - .byte N03 , Fn5 , v092 - .byte W01 - .byte VOL , 72*se_m_reversal_mvl/mxv - .byte W01 - .byte 40*se_m_reversal_mvl/mxv - .byte BEND , c_v+31 - .byte W01 - .byte VOICE , 22 - .byte PAN , c_v+18 - .byte BEND , c_v+0 - .byte N01 , Cn5 , v127 - .byte W01 - .byte VOICE , 19 - .byte VOL , 100*se_m_reversal_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-33 - .byte N03 , Fs5 , v092 - .byte W02 - .byte VOL , 72*se_m_reversal_mvl/mxv - .byte W01 - .byte 40*se_m_reversal_mvl/mxv - .byte BEND , c_v+31 - .byte W01 - .byte VOICE , 22 - .byte PAN , c_v-14 - .byte BEND , c_v+0 - .byte N01 , Cs5 , v127 - .byte W01 - .byte VOICE , 19 - .byte VOL , 100*se_m_reversal_mvl/mxv - .byte PAN , c_v-1 - .byte BEND , c_v-33 - .byte N03 , Gn5 , v092 - .byte W01 - .byte VOL , 72*se_m_reversal_mvl/mxv - .byte W02 - .byte 40*se_m_reversal_mvl/mxv - .byte BEND , c_v+31 - .byte W01 - .byte VOICE , 22 - .byte PAN , c_v+14 - .byte BEND , c_v+0 - .byte N01 , Dn5 , v127 - .byte W01 - .byte VOICE , 19 - .byte VOL , 100*se_m_reversal_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-33 - .byte N03 , Gs5 , v092 - .byte W01 - .byte VOL , 72*se_m_reversal_mvl/mxv - .byte W01 - .byte 40*se_m_reversal_mvl/mxv - .byte BEND , c_v+31 - .byte W02 - .byte VOICE , 22 - .byte PAN , c_v-10 - .byte BEND , c_v+0 - .byte N01 , Ds5 , v127 - .byte W01 - .byte VOICE , 19 - .byte VOL , 100*se_m_reversal_mvl/mxv - .byte PAN , c_v-1 - .byte BEND , c_v-33 - .byte N03 , An5 , v092 - .byte W01 - .byte VOL , 72*se_m_reversal_mvl/mxv - .byte W01 - .byte 40*se_m_reversal_mvl/mxv - .byte BEND , c_v+31 - .byte W01 - .byte VOICE , 22 - .byte PAN , c_v+10 - .byte BEND , c_v+0 - .byte N01 , En5 , v127 - .byte W02 - .byte VOICE , 19 - .byte VOL , 100*se_m_reversal_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-33 - .byte N03 , As5 , v092 - .byte W01 - .byte VOL , 72*se_m_reversal_mvl/mxv - .byte W01 - .byte 40*se_m_reversal_mvl/mxv - .byte BEND , c_v+31 - .byte W01 - .byte VOICE , 22 - .byte PAN , c_v-10 - .byte BEND , c_v+0 - .byte N01 , Fn5 , v127 - .byte W01 - .byte VOICE , 19 - .byte VOL , 100*se_m_reversal_mvl/mxv - .byte PAN , c_v-1 - .byte BEND , c_v-33 - .byte N03 , Bn5 , v092 - .byte W02 - .byte VOL , 72*se_m_reversal_mvl/mxv - .byte W01 - .byte 40*se_m_reversal_mvl/mxv - .byte BEND , c_v+31 - .byte W01 - .byte VOICE , 22 - .byte PAN , c_v+10 - .byte BEND , c_v+0 - .byte N01 , Fs5 , v127 - .byte W01 - .byte BEND , c_v-33 - .byte W03 - .byte W06 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_reversal_2: - .byte KEYSH , se_m_reversal_key+0 - .byte VOICE , 17 - .byte VOL , 100*se_m_reversal_mvl/mxv - .byte W02 - .byte BEND , c_v+31 - .byte N03 , Cn5 , v040 - .byte W01 - .byte BEND , c_v+0 - .byte W01 - .byte c_v-33 - .byte W02 - .byte W01 - .byte c_v+31 - .byte N03 , Cs5 - .byte W01 - .byte BEND , c_v+0 - .byte W01 - .byte c_v-33 - .byte W03 - .byte c_v+31 - .byte N03 , Dn5 - .byte W01 - .byte BEND , c_v+0 - .byte W01 - .byte c_v-33 - .byte W02 - .byte c_v+31 - .byte N03 , Ds5 - .byte W02 - .byte BEND , c_v+0 - .byte W01 - .byte c_v-33 - .byte W02 - .byte c_v+31 - .byte N03 , En5 - .byte W01 - .byte BEND , c_v+0 - .byte W02 - .byte c_v-33 - .byte W02 - .byte c_v+31 - .byte N03 , Fn5 - .byte W01 - .byte BEND , c_v+0 - .byte W01 - .byte c_v-33 - .byte W02 - .byte W01 - .byte c_v+31 - .byte N03 , Fs5 - .byte W01 - .byte BEND , c_v+0 - .byte W01 - .byte c_v-33 - .byte W03 - .byte c_v+31 - .byte N03 , Gn5 - .byte W01 - .byte BEND , c_v+0 - .byte W01 - .byte c_v-33 - .byte W02 - .byte c_v+31 - .byte N03 , Gs5 - .byte W02 - .byte BEND , c_v+0 - .byte W01 - .byte c_v-33 - .byte W02 - .byte c_v+31 - .byte N03 , An5 - .byte W01 - .byte BEND , c_v+0 - .byte W02 - .byte c_v-33 - .byte W02 - .byte c_v+31 - .byte N03 , As5 - .byte W01 - .byte BEND , c_v+0 - .byte W01 - .byte c_v-33 - .byte W02 - .byte W01 - .byte c_v+31 - .byte N03 , Bn5 - .byte W01 - .byte BEND , c_v+0 - .byte W01 - .byte c_v-33 - .byte W03 - .byte c_v+31 - .byte N03 , Bn5 , v020 - .byte W01 - .byte BEND , c_v+0 - .byte W01 - .byte c_v-33 - .byte W04 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_reversal: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_reversal_pri @ Priority - .byte se_m_reversal_rev @ Reverb. - - .word se_m_reversal_grp - - .word se_m_reversal_1 - .word se_m_reversal_2 - - .end diff --git a/sound/songs/se_m_rock_throw.s b/sound/songs/se_m_rock_throw.s deleted file mode 100644 index 74ae936b7..000000000 --- a/sound/songs/se_m_rock_throw.s +++ /dev/null @@ -1,65 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_rock_throw_grp, voicegroup_rs_sfx_2 - .equ se_m_rock_throw_pri, 4 - .equ se_m_rock_throw_rev, reverb_set+50 - .equ se_m_rock_throw_mvl, 127 - .equ se_m_rock_throw_key, 0 - .equ se_m_rock_throw_tbs, 1 - .equ se_m_rock_throw_exg, 0 - .equ se_m_rock_throw_cmp, 1 - - .section .rodata - .global se_m_rock_throw - .align 2 - -@********************** Track 1 **********************@ - -se_m_rock_throw_1: - .byte KEYSH , se_m_rock_throw_key+0 - .byte TEMPO , 150*se_m_rock_throw_tbs/2 - .byte VOICE , 26 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 105*se_m_rock_throw_mvl/mxv - .byte BEND , c_v+0 - .byte N06 , En3 , v127 - .byte W03 - .byte PAN , c_v-8 - .byte BEND , c_v-34 - .byte W03 - .byte PAN , c_v+7 - .byte N03 , Gn3 , v100 - .byte W03 - .byte PAN , c_v-15 - .byte BEND , c_v+4 - .byte N06 , En3 , v127 - .byte W03 - .byte PAN , c_v+16 - .byte BEND , c_v-13 - .byte W03 - .byte PAN , c_v-1 - .byte BEND , c_v+0 - .byte N06 , Cn3 , v084 - .byte W06 - .byte BEND , c_v-20 - .byte N06 , En3 , v068 - .byte W03 - .byte BEND , c_v-41 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_rock_throw: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_rock_throw_pri @ Priority - .byte se_m_rock_throw_rev @ Reverb. - - .word se_m_rock_throw_grp - - .word se_m_rock_throw_1 - - .end diff --git a/sound/songs/se_m_sacred_fire.s b/sound/songs/se_m_sacred_fire.s deleted file mode 100644 index 58a40c9bf..000000000 --- a/sound/songs/se_m_sacred_fire.s +++ /dev/null @@ -1,105 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_sacred_fire_grp, voicegroup_rs_sfx_2 - .equ se_m_sacred_fire_pri, 4 - .equ se_m_sacred_fire_rev, reverb_set+50 - .equ se_m_sacred_fire_mvl, 127 - .equ se_m_sacred_fire_key, 0 - .equ se_m_sacred_fire_tbs, 1 - .equ se_m_sacred_fire_exg, 0 - .equ se_m_sacred_fire_cmp, 1 - - .section .rodata - .global se_m_sacred_fire - .align 2 - -@********************** Track 1 **********************@ - -se_m_sacred_fire_1: - .byte KEYSH , se_m_sacred_fire_key+0 - .byte TEMPO , 150*se_m_sacred_fire_tbs/2 - .byte VOICE , 29 - .byte BENDR , 12 - .byte VOL , 110*se_m_sacred_fire_mvl/mxv - .byte PAN , c_v+5 - .byte BEND , c_v+0 - .byte N04 , Cn3 , v127 - .byte W03 - .byte PAN , c_v+0 - .byte W01 - .byte N18 , Gn4 - .byte W02 - .byte PAN , c_v-5 - .byte W01 - .byte VOL , 98*se_m_sacred_fire_mvl/mxv - .byte BEND , c_v+2 - .byte W02 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 83*se_m_sacred_fire_mvl/mxv - .byte BEND , c_v+6 - .byte W02 - .byte PAN , c_v+5 - .byte W01 - .byte BEND , c_v+9 - .byte W01 - .byte VOL , 63*se_m_sacred_fire_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte W01 - .byte BEND , c_v+13 - .byte W02 - .byte VOL , 44*se_m_sacred_fire_mvl/mxv - .byte PAN , c_v-5 - .byte W02 - .byte VOL , 28*se_m_sacred_fire_mvl/mxv - .byte BEND , c_v+20 - .byte W01 - .byte PAN , c_v-2 - .byte W01 - .byte VOL , 12*se_m_sacred_fire_mvl/mxv - .byte W02 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_sacred_fire_2: - .byte KEYSH , se_m_sacred_fire_key+0 - .byte VOICE , 27 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_sacred_fire_mvl/mxv - .byte N01 , Gn2 , v032 - .byte W02 - .byte N01 - .byte W02 - .byte N18 - .byte W03 - .byte VOL , 98*se_m_sacred_fire_mvl/mxv - .byte W03 - .byte 83*se_m_sacred_fire_mvl/mxv - .byte W04 - .byte 63*se_m_sacred_fire_mvl/mxv - .byte W04 - .byte 44*se_m_sacred_fire_mvl/mxv - .byte W02 - .byte 28*se_m_sacred_fire_mvl/mxv - .byte W02 - .byte 12*se_m_sacred_fire_mvl/mxv - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_sacred_fire: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_sacred_fire_pri @ Priority - .byte se_m_sacred_fire_rev @ Reverb. - - .word se_m_sacred_fire_grp - - .word se_m_sacred_fire_1 - .word se_m_sacred_fire_2 - - .end diff --git a/sound/songs/se_m_sacred_fire2.s b/sound/songs/se_m_sacred_fire2.s deleted file mode 100644 index 41582debd..000000000 --- a/sound/songs/se_m_sacred_fire2.s +++ /dev/null @@ -1,180 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_sacred_fire2_grp, voicegroup_rs_sfx_2 - .equ se_m_sacred_fire2_pri, 4 - .equ se_m_sacred_fire2_rev, reverb_set+50 - .equ se_m_sacred_fire2_mvl, 127 - .equ se_m_sacred_fire2_key, 0 - .equ se_m_sacred_fire2_tbs, 1 - .equ se_m_sacred_fire2_exg, 0 - .equ se_m_sacred_fire2_cmp, 1 - - .section .rodata - .global se_m_sacred_fire2 - .align 2 - -@********************** Track 1 **********************@ - -se_m_sacred_fire2_1: - .byte KEYSH , se_m_sacred_fire2_key+0 - .byte TEMPO , 150*se_m_sacred_fire2_tbs/2 - .byte VOICE , 29 - .byte BENDR , 12 - .byte VOL , 22*se_m_sacred_fire2_mvl/mxv - .byte PAN , c_v+5 - .byte BEND , c_v+0 - .byte N96 , Gn3 , v127 - .byte W01 - .byte VOL , 49*se_m_sacred_fire2_mvl/mxv - .byte W01 - .byte 71*se_m_sacred_fire2_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte VOL , 95*se_m_sacred_fire2_mvl/mxv - .byte BEND , c_v+8 - .byte W01 - .byte VOL , 110*se_m_sacred_fire2_mvl/mxv - .byte W02 - .byte PAN , c_v-5 - .byte BEND , c_v+16 - .byte W03 - .byte VOL , 97*se_m_sacred_fire2_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+7 - .byte W03 - .byte PAN , c_v+5 - .byte BEND , c_v+0 - .byte W01 - .byte VOL , 84*se_m_sacred_fire2_mvl/mxv - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v-9 - .byte W03 - .byte VOL , 76*se_m_sacred_fire2_mvl/mxv - .byte PAN , c_v-5 - .byte BEND , c_v-24 - .byte W03 - .byte PAN , c_v-2 - .byte BEND , c_v-46 - .byte W03 - .byte VOL , 84*se_m_sacred_fire2_mvl/mxv - .byte PAN , c_v+5 - .byte W03 - .byte c_v+0 - .byte W01 - .byte VOL , 92*se_m_sacred_fire2_mvl/mxv - .byte W02 - .byte PAN , c_v-5 - .byte W01 - .byte BEND , c_v-32 - .byte W02 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 86*se_m_sacred_fire2_mvl/mxv - .byte W02 - .byte PAN , c_v+5 - .byte W02 - .byte BEND , c_v-18 - .byte W01 - .byte VOL , 78*se_m_sacred_fire2_mvl/mxv - .byte PAN , c_v+0 - .byte W03 - .byte c_v-5 - .byte W02 - .byte VOL , 71*se_m_sacred_fire2_mvl/mxv - .byte W01 - .byte PAN , c_v-2 - .byte W03 - .byte c_v+5 - .byte W03 - .byte c_v+0 - .byte VOL , 78*se_m_sacred_fire2_mvl/mxv - .byte W03 - .byte PAN , c_v-5 - .byte W02 - .byte VOL , 86*se_m_sacred_fire2_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte W03 - .byte c_v+5 - .byte W02 - .byte VOL , 90*se_m_sacred_fire2_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte W03 - .byte c_v-5 - .byte W03 - .byte c_v-2 - .byte W01 - .byte VOL , 80*se_m_sacred_fire2_mvl/mxv - .byte W02 - .byte PAN , c_v+5 - .byte W03 - .byte c_v+0 - .byte W01 - .byte VOL , 86*se_m_sacred_fire2_mvl/mxv - .byte W02 - .byte PAN , c_v-5 - .byte W03 - .byte c_v+0 - .byte VOL , 83*se_m_sacred_fire2_mvl/mxv - .byte W03 - .byte PAN , c_v+5 - .byte VOL , 63*se_m_sacred_fire2_mvl/mxv - .byte W03 - .byte 37*se_m_sacred_fire2_mvl/mxv - .byte PAN , c_v+0 - .byte W03 - .byte c_v-5 - .byte VOL , 13*se_m_sacred_fire2_mvl/mxv - .byte W03 - .byte PAN , c_v-2 - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_sacred_fire2_2: - .byte KEYSH , se_m_sacred_fire2_key+0 - .byte VOICE , 27 - .byte VOL , 22*se_m_sacred_fire2_mvl/mxv - .byte N96 , Gn2 , v032 - .byte W01 - .byte VOL , 49*se_m_sacred_fire2_mvl/mxv - .byte W01 - .byte 71*se_m_sacred_fire2_mvl/mxv - .byte W01 - .byte 95*se_m_sacred_fire2_mvl/mxv - .byte W01 - .byte 110*se_m_sacred_fire2_mvl/mxv - .byte W05 - .byte 97*se_m_sacred_fire2_mvl/mxv - .byte W15 - .byte W24 - .byte W24 - .byte W09 - .byte 83*se_m_sacred_fire2_mvl/mxv - .byte W03 - .byte 63*se_m_sacred_fire2_mvl/mxv - .byte W03 - .byte 37*se_m_sacred_fire2_mvl/mxv - .byte W03 - .byte 13*se_m_sacred_fire2_mvl/mxv - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_sacred_fire2: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_sacred_fire2_pri @ Priority - .byte se_m_sacred_fire2_rev @ Reverb. - - .word se_m_sacred_fire2_grp - - .word se_m_sacred_fire2_1 - .word se_m_sacred_fire2_2 - - .end diff --git a/sound/songs/se_m_sand_tomb.s b/sound/songs/se_m_sand_tomb.s deleted file mode 100644 index e52a76d10..000000000 --- a/sound/songs/se_m_sand_tomb.s +++ /dev/null @@ -1,197 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_sand_tomb_grp, voicegroup_rs_sfx_2 - .equ se_m_sand_tomb_pri, 4 - .equ se_m_sand_tomb_rev, reverb_set+50 - .equ se_m_sand_tomb_mvl, 127 - .equ se_m_sand_tomb_key, 0 - .equ se_m_sand_tomb_tbs, 1 - .equ se_m_sand_tomb_exg, 0 - .equ se_m_sand_tomb_cmp, 1 - - .section .rodata - .global se_m_sand_tomb - .align 2 - -@********************** Track 1 **********************@ - -se_m_sand_tomb_1: - .byte KEYSH , se_m_sand_tomb_key+0 - .byte TEMPO , 150*se_m_sand_tomb_tbs/2 - .byte VOICE , 22 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 64*se_m_sand_tomb_mvl/mxv - .byte BEND , c_v+0 - .byte N96 , En2 , v127 - .byte W03 - .byte VOL , 79*se_m_sand_tomb_mvl/mxv - .byte BEND , c_v+22 - .byte W02 - .byte c_v+8 - .byte W01 - .byte VOL , 84*se_m_sand_tomb_mvl/mxv - .byte PAN , c_v-4 - .byte W03 - .byte VOL , 91*se_m_sand_tomb_mvl/mxv - .byte BEND , c_v+0 - .byte W03 - .byte VOL , 100*se_m_sand_tomb_mvl/mxv - .byte PAN , c_v-8 - .byte W03 - .byte VOL , 110*se_m_sand_tomb_mvl/mxv - .byte W03 - .byte PAN , c_v-12 - .byte W06 - .byte c_v-17 - .byte BEND , c_v+0 - .byte W03 - .byte c_v-7 - .byte W03 - .byte PAN , c_v-9 - .byte BEND , c_v-12 - .byte W03 - .byte c_v-20 - .byte W03 - .byte PAN , c_v-3 - .byte W03 - .byte c_v+6 - .byte BEND , c_v-13 - .byte W03 - .byte PAN , c_v+10 - .byte W03 - .byte BEND , c_v-6 - .byte W03 - .byte PAN , c_v+16 - .byte W03 - .byte BEND , c_v+6 - .byte W03 - .byte PAN , c_v+13 - .byte BEND , c_v+11 - .byte W03 - .byte c_v+20 - .byte W03 - .byte PAN , c_v+8 - .byte W03 - .byte c_v+0 - .byte BEND , c_v+12 - .byte W03 - .byte PAN , c_v-8 - .byte BEND , c_v+7 - .byte W03 - .byte PAN , c_v-11 - .byte W03 - .byte c_v-17 - .byte VOL , 98*se_m_sand_tomb_mvl/mxv - .byte BEND , c_v+0 - .byte W03 - .byte VOL , 90*se_m_sand_tomb_mvl/mxv - .byte BEND , c_v-7 - .byte W03 - .byte PAN , c_v-9 - .byte BEND , c_v-12 - .byte W01 - .byte VOL , 80*se_m_sand_tomb_mvl/mxv - .byte W02 - .byte BEND , c_v-20 - .byte W01 - .byte VOL , 71*se_m_sand_tomb_mvl/mxv - .byte W02 - .byte PAN , c_v-3 - .byte W02 - .byte VOL , 58*se_m_sand_tomb_mvl/mxv - .byte W01 - .byte PAN , c_v+6 - .byte BEND , c_v-13 - .byte W03 - .byte PAN , c_v+10 - .byte VOL , 45*se_m_sand_tomb_mvl/mxv - .byte W02 - .byte 27*se_m_sand_tomb_mvl/mxv - .byte W01 - .byte BEND , c_v-6 - .byte W01 - .byte VOL , 11*se_m_sand_tomb_mvl/mxv - .byte W02 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_sand_tomb_2: - .byte KEYSH , se_m_sand_tomb_key+0 - .byte VOICE , 57 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_sand_tomb_mvl/mxv - .byte N03 , Cn3 , v100 - .byte W03 - .byte En3 , v080 - .byte W04 - .byte Dn3 - .byte W03 - .byte Cn3 , v100 - .byte W04 - .byte En3 , v080 - .byte W04 - .byte Dn3 - .byte W03 - .byte Cn3 , v100 - .byte W03 - .byte W01 - .byte En3 , v080 - .byte W03 - .byte Dn3 - .byte W04 - .byte Cn3 , v100 - .byte W04 - .byte En3 , v080 - .byte W03 - .byte Dn3 - .byte W04 - .byte Cn3 , v100 - .byte W03 - .byte En3 , v080 - .byte W02 - .byte W02 - .byte Dn3 - .byte W04 - .byte Cn3 , v100 - .byte W03 - .byte En3 , v080 - .byte W04 - .byte Dn3 - .byte W03 - .byte Cn3 , v100 - .byte W04 - .byte En3 , v080 - .byte W04 - .byte Dn3 - .byte W03 - .byte Cn3 , v092 - .byte W04 - .byte En3 , v060 - .byte W03 - .byte Dn3 , v052 - .byte W04 - .byte Cn3 , v060 - .byte W04 - .byte En3 , v032 - .byte W03 - .byte N02 , Dn3 , v020 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_sand_tomb: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_sand_tomb_pri @ Priority - .byte se_m_sand_tomb_rev @ Reverb. - - .word se_m_sand_tomb_grp - - .word se_m_sand_tomb_1 - .word se_m_sand_tomb_2 - - .end diff --git a/sound/songs/se_m_sandstorm.s b/sound/songs/se_m_sandstorm.s deleted file mode 100644 index e4e81dcc6..000000000 --- a/sound/songs/se_m_sandstorm.s +++ /dev/null @@ -1,290 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_sandstorm_grp, voicegroup_rs_sfx_2 - .equ se_m_sandstorm_pri, 4 - .equ se_m_sandstorm_rev, reverb_set+50 - .equ se_m_sandstorm_mvl, 127 - .equ se_m_sandstorm_key, 0 - .equ se_m_sandstorm_tbs, 1 - .equ se_m_sandstorm_exg, 0 - .equ se_m_sandstorm_cmp, 1 - - .section .rodata - .global se_m_sandstorm - .align 2 - -@********************** Track 1 **********************@ - -se_m_sandstorm_1: - .byte KEYSH , se_m_sandstorm_key+0 - .byte TEMPO , 200*se_m_sandstorm_tbs/2 - .byte VOICE , 2 - .byte BENDR , 12 - .byte PAN , c_v-48 - .byte VOL , 11*se_m_sandstorm_mvl/mxv - .byte BEND , c_v+0 - .byte TIE , En3 , v127 - .byte W03 - .byte VOL , 17*se_m_sandstorm_mvl/mxv - .byte BEND , c_v+22 - .byte W02 - .byte c_v+8 - .byte W01 - .byte VOL , 24*se_m_sandstorm_mvl/mxv - .byte W03 - .byte 32*se_m_sandstorm_mvl/mxv - .byte BEND , c_v+0 - .byte W03 - .byte VOL , 52*se_m_sandstorm_mvl/mxv - .byte W03 - .byte 65*se_m_sandstorm_mvl/mxv - .byte W03 - .byte 76*se_m_sandstorm_mvl/mxv - .byte W02 - .byte 88*se_m_sandstorm_mvl/mxv - .byte PAN , c_v-43 - .byte W02 - .byte VOL , 98*se_m_sandstorm_mvl/mxv - .byte W02 - .byte BEND , c_v+0 - .byte W02 - .byte VOL , 111*se_m_sandstorm_mvl/mxv - .byte W01 - .byte BEND , c_v-7 - .byte W01 - .byte VOL , 127*se_m_sandstorm_mvl/mxv - .byte W02 - .byte BEND , c_v-12 - .byte W02 - .byte PAN , c_v-38 - .byte W01 - .byte BEND , c_v-20 - .byte W06 - .byte c_v-13 - .byte W05 - .byte PAN , c_v-31 - .byte W01 - .byte BEND , c_v-6 - .byte W03 - .byte W03 - .byte c_v+6 - .byte W03 - .byte c_v+11 - .byte W03 - .byte c_v+20 - .byte W01 - .byte PAN , c_v-21 - .byte W05 - .byte BEND , c_v+12 - .byte W03 - .byte c_v+7 - .byte W06 - .byte PAN , c_v-16 - .byte BEND , c_v+0 - .byte W03 - .byte c_v-7 - .byte W03 - .byte c_v-12 - .byte W03 - .byte c_v-20 - .byte W06 - .byte PAN , c_v-7 - .byte BEND , c_v-13 - .byte W06 - .byte c_v-6 - .byte W03 - .byte c_v+0 - .byte W03 - .byte PAN , c_v+2 - .byte BEND , c_v+22 - .byte W02 - .byte c_v+8 - .byte W04 - .byte c_v+0 - .byte W05 - .byte PAN , c_v+10 - .byte W10 - .byte BEND , c_v+0 - .byte W01 - .byte PAN , c_v+16 - .byte W02 - .byte BEND , c_v-7 - .byte W03 - .byte c_v-12 - .byte W03 - .byte PAN , c_v+24 - .byte BEND , c_v-20 - .byte W06 - .byte c_v-13 - .byte W05 - .byte PAN , c_v+32 - .byte W01 - .byte BEND , c_v-6 - .byte W03 - .byte W03 - .byte c_v+6 - .byte W03 - .byte c_v+11 - .byte W03 - .byte c_v+20 - .byte W01 - .byte PAN , c_v+40 - .byte W05 - .byte BEND , c_v+12 - .byte W03 - .byte c_v+7 - .byte W04 - .byte VOL , 114*se_m_sandstorm_mvl/mxv - .byte W02 - .byte BEND , c_v+0 - .byte W01 - .byte PAN , c_v+48 - .byte W01 - .byte VOL , 104*se_m_sandstorm_mvl/mxv - .byte W01 - .byte BEND , c_v-7 - .byte W03 - .byte VOL , 93*se_m_sandstorm_mvl/mxv - .byte BEND , c_v-12 - .byte W03 - .byte VOL , 82*se_m_sandstorm_mvl/mxv - .byte BEND , c_v-20 - .byte W04 - .byte VOL , 67*se_m_sandstorm_mvl/mxv - .byte W02 - .byte BEND , c_v-13 - .byte W01 - .byte VOL , 52*se_m_sandstorm_mvl/mxv - .byte W03 - .byte 32*se_m_sandstorm_mvl/mxv - .byte W02 - .byte 13*se_m_sandstorm_mvl/mxv - .byte BEND , c_v-6 - .byte W03 - .byte EOT - .byte FINE - -@********************** Track 2 **********************@ - -se_m_sandstorm_2: - .byte KEYSH , se_m_sandstorm_key+0 - .byte VOICE , 57 - .byte PAN , c_v+0 - .byte VOL , 60*se_m_sandstorm_mvl/mxv - .byte N03 , Cn3 , v100 - .byte W03 - .byte En3 , v080 - .byte W04 - .byte Dn3 - .byte W03 - .byte Cn3 , v100 - .byte W04 - .byte En3 , v080 - .byte W04 - .byte Dn3 - .byte W03 - .byte Cn3 , v100 - .byte W03 -se_m_sandstorm_2_000: - .byte W01 - .byte N03 , En3 , v080 - .byte W03 - .byte Dn3 - .byte W04 - .byte Cn3 , v100 - .byte W04 - .byte En3 , v080 - .byte W03 - .byte Dn3 - .byte W04 - .byte Cn3 , v100 - .byte W03 - .byte En3 , v080 - .byte W02 - .byte PEND - .byte W02 - .byte Dn3 - .byte W04 - .byte Cn3 , v100 - .byte W03 - .byte En3 , v080 - .byte W04 - .byte Dn3 - .byte W03 - .byte Cn3 , v100 - .byte W04 - .byte En3 , v080 - .byte W04 - .byte Cn3 , v100 - .byte W03 - .byte En3 , v080 - .byte W04 - .byte Dn3 - .byte W03 - .byte Cn3 , v100 - .byte W04 - .byte En3 , v080 - .byte W04 - .byte Dn3 - .byte W03 - .byte Cn3 , v100 - .byte W03 - .byte PATT - .word se_m_sandstorm_2_000 - .byte W02 - .byte N03 , Cn3 , v076 - .byte W04 - .byte En3 , v064 - .byte W03 - .byte Dn3 , v060 - .byte W04 - .byte Cn3 , v076 - .byte W03 - .byte En3 , v052 - .byte W04 - .byte Dn3 , v048 - .byte W04 - .byte Cn3 , v068 - .byte W03 - .byte En3 , v044 - .byte W04 - .byte Dn3 , v040 - .byte W03 - .byte Cn3 , v056 - .byte W04 - .byte En3 , v032 - .byte W04 - .byte Dn3 - .byte W03 - .byte Cn3 , v048 - .byte W03 - .byte W01 - .byte En3 , v024 - .byte W03 - .byte Dn3 , v020 - .byte W04 - .byte Cn3 , v036 - .byte W04 - .byte En3 , v016 - .byte W03 - .byte Dn3 , v012 - .byte W04 - .byte Cn3 , v028 - .byte W05 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_sandstorm: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_sandstorm_pri @ Priority - .byte se_m_sandstorm_rev @ Reverb. - - .word se_m_sandstorm_grp - - .word se_m_sandstorm_1 - .word se_m_sandstorm_2 - - .end diff --git a/sound/songs/se_m_screech.s b/sound/songs/se_m_screech.s deleted file mode 100644 index c28d8d2bb..000000000 --- a/sound/songs/se_m_screech.s +++ /dev/null @@ -1,112 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_screech_grp, voicegroup_rs_sfx_2 - .equ se_m_screech_pri, 4 - .equ se_m_screech_rev, reverb_set+50 - .equ se_m_screech_mvl, 127 - .equ se_m_screech_key, 0 - .equ se_m_screech_tbs, 1 - .equ se_m_screech_exg, 0 - .equ se_m_screech_cmp, 1 - - .section .rodata - .global se_m_screech - .align 2 - -@********************** Track 1 **********************@ - -se_m_screech_1: - .byte VOL , 110*se_m_screech_mvl/mxv - .byte KEYSH , se_m_screech_key+0 - .byte TEMPO , 150*se_m_screech_tbs/2 - .byte VOICE , 44 - .byte BENDR , 2 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N21 , Fs5 , v112 - .byte W01 - .byte PAN , c_v-5 - .byte W01 - .byte c_v-10 - .byte VOL , 15*se_m_screech_mvl/mxv - .byte W01 - .byte PAN , c_v-4 - .byte VOL , 41*se_m_screech_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte VOL , 69*se_m_screech_mvl/mxv - .byte W02 - .byte PAN , c_v+4 - .byte W01 - .byte c_v+10 - .byte VOL , 84*se_m_screech_mvl/mxv - .byte W01 - .byte PAN , c_v+4 - .byte W01 - .byte VOL , 97*se_m_screech_mvl/mxv - .byte PAN , c_v+0 - .byte W01 - .byte c_v-5 - .byte W02 - .byte VOL , 110*se_m_screech_mvl/mxv - .byte PAN , c_v-10 - .byte W01 - .byte c_v-4 - .byte W01 - .byte c_v+0 - .byte W01 - .byte c_v+4 - .byte W01 - .byte c_v+10 - .byte W02 - .byte VOL , 100*se_m_screech_mvl/mxv - .byte PAN , c_v+4 - .byte W01 - .byte VOL , 84*se_m_screech_mvl/mxv - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 55*se_m_screech_mvl/mxv - .byte W02 - .byte BEND , c_v+0 - .byte W02 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_screech_2: - .byte VOL , 110*se_m_screech_mvl/mxv - .byte KEYSH , se_m_screech_key+0 - .byte VOICE , 42 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N21 , Fn6 , v064 - .byte W06 - .byte PAN , c_v+0 - .byte W03 - .byte c_v+0 - .byte W03 - .byte W03 - .byte c_v+0 - .byte W03 - .byte W01 - .byte c_v+0 - .byte W03 - .byte BEND , c_v+0 - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_screech: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_screech_pri @ Priority - .byte se_m_screech_rev @ Reverb. - - .word se_m_screech_grp - - .word se_m_screech_1 - .word se_m_screech_2 - - .end diff --git a/sound/songs/se_m_self_destruct.s b/sound/songs/se_m_self_destruct.s deleted file mode 100644 index 0ed13b83d..000000000 --- a/sound/songs/se_m_self_destruct.s +++ /dev/null @@ -1,74 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_self_destruct_grp, voicegroup_rs_sfx_2 - .equ se_m_self_destruct_pri, 4 - .equ se_m_self_destruct_rev, reverb_set+50 - .equ se_m_self_destruct_mvl, 127 - .equ se_m_self_destruct_key, 0 - .equ se_m_self_destruct_tbs, 1 - .equ se_m_self_destruct_exg, 0 - .equ se_m_self_destruct_cmp, 1 - - .section .rodata - .global se_m_self_destruct - .align 2 - -@********************** Track 1 **********************@ - -se_m_self_destruct_1: - .byte KEYSH , se_m_self_destruct_key+0 - .byte TEMPO , 150*se_m_self_destruct_tbs/2 - .byte VOICE , 41 - .byte VOL , 115*se_m_self_destruct_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N01 , Gn3 , v127 - .byte W01 - .byte Cn3 - .byte W01 - .byte N24 , An3 - .byte W06 - .byte PAN , c_v+6 - .byte W04 - .byte c_v+0 - .byte W01 - .byte VOL , 102*se_m_self_destruct_mvl/mxv - .byte W02 - .byte PAN , c_v-8 - .byte VOL , 88*se_m_self_destruct_mvl/mxv - .byte W03 - .byte 78*se_m_self_destruct_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 67*se_m_self_destruct_mvl/mxv - .byte W01 - .byte BEND , c_v-2 - .byte W01 - .byte PAN , c_v+7 - .byte VOL , 45*se_m_self_destruct_mvl/mxv - .byte W02 - .byte BEND , c_v-8 - .byte W01 - .byte VOL , 13*se_m_self_destruct_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v-15 - .byte W22 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_self_destruct: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_self_destruct_pri @ Priority - .byte se_m_self_destruct_rev @ Reverb. - - .word se_m_self_destruct_grp - - .word se_m_self_destruct_1 - - .end diff --git a/sound/songs/se_m_sing.s b/sound/songs/se_m_sing.s deleted file mode 100644 index 349f6839c..000000000 --- a/sound/songs/se_m_sing.s +++ /dev/null @@ -1,198 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_sing_grp, voicegroup_rs_sfx_2 - .equ se_m_sing_pri, 4 - .equ se_m_sing_rev, reverb_set+50 - .equ se_m_sing_mvl, 127 - .equ se_m_sing_key, 0 - .equ se_m_sing_tbs, 1 - .equ se_m_sing_exg, 0 - .equ se_m_sing_cmp, 1 - - .section .rodata - .global se_m_sing - .align 2 - -@********************** Track 1 **********************@ - -se_m_sing_1: - .byte KEYSH , se_m_sing_key+0 - .byte TEMPO , 100*se_m_sing_tbs/2 - .byte VOICE , 73 - .byte BENDR , 12 - .byte LFOS , 40 - .byte PAN , c_v+0 - .byte VOL , 95*se_m_sing_mvl/mxv - .byte BEND , c_v+0 - .byte N44 , Gn4 , v112 - .byte W06 - .byte W06 - .byte W03 - .byte MOD , 7 - .byte W03 - .byte W03 - .byte VOL , 83*se_m_sing_mvl/mxv - .byte W03 - .byte W03 - .byte 69*se_m_sing_mvl/mxv - .byte W03 - .byte W03 - .byte 50*se_m_sing_mvl/mxv - .byte W03 - .byte W03 - .byte 24*se_m_sing_mvl/mxv - .byte W03 - .byte W03 - .byte MOD , 0 - .byte W03 - .byte VOL , 95*se_m_sing_mvl/mxv - .byte N21 , Fn5 - .byte W06 - .byte W06 -se_m_sing_1_000: - .byte VOL , 86*se_m_sing_mvl/mxv - .byte MOD , 7 - .byte W03 - .byte VOL , 75*se_m_sing_mvl/mxv - .byte W03 - .byte PEND -se_m_sing_1_001: - .byte VOL , 55*se_m_sing_mvl/mxv - .byte W03 - .byte 26*se_m_sing_mvl/mxv - .byte MOD , 0 - .byte W03 - .byte PEND - .byte VOL , 95*se_m_sing_mvl/mxv - .byte N21 , Ds5 , v112 - .byte W06 - .byte W06 - .byte PATT - .word se_m_sing_1_000 - .byte PATT - .word se_m_sing_1_001 - .byte VOL , 95*se_m_sing_mvl/mxv - .byte N66 , Gn4 , v112 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte MOD , 7 - .byte W06 - .byte W06 - .byte W06 - .byte VOL , 83*se_m_sing_mvl/mxv - .byte W06 - .byte 69*se_m_sing_mvl/mxv - .byte W06 - .byte 50*se_m_sing_mvl/mxv - .byte W06 - .byte 24*se_m_sing_mvl/mxv - .byte W06 - .byte MOD , 0 - .byte W06 - .byte W06 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_sing_2: - .byte KEYSH , se_m_sing_key+0 - .byte VOICE , 73 - .byte LFOS , 40 - .byte VOL , 95*se_m_sing_mvl/mxv - .byte BEND , c_v+9 - .byte W06 - .byte W06 - .byte PAN , c_v+12 - .byte N44 , Gn4 , v060 - .byte W06 - .byte W06 - .byte W03 - .byte MOD , 7 - .byte W03 - .byte W03 - .byte VOL , 83*se_m_sing_mvl/mxv - .byte W03 - .byte W03 - .byte 69*se_m_sing_mvl/mxv - .byte W03 - .byte W03 - .byte 50*se_m_sing_mvl/mxv - .byte W03 - .byte W03 - .byte 24*se_m_sing_mvl/mxv - .byte W03 - .byte W03 - .byte MOD , 0 - .byte W03 - .byte VOL , 95*se_m_sing_mvl/mxv - .byte PAN , c_v-12 - .byte N21 , Fn5 - .byte W06 - .byte W06 -se_m_sing_2_000: - .byte VOL , 86*se_m_sing_mvl/mxv - .byte MOD , 7 - .byte W03 - .byte VOL , 75*se_m_sing_mvl/mxv - .byte W03 - .byte PEND -se_m_sing_2_001: - .byte VOL , 55*se_m_sing_mvl/mxv - .byte W03 - .byte 26*se_m_sing_mvl/mxv - .byte MOD , 0 - .byte W03 - .byte PEND - .byte VOL , 95*se_m_sing_mvl/mxv - .byte PAN , c_v+12 - .byte N21 , Ds5 , v060 - .byte W06 - .byte W06 - .byte PATT - .word se_m_sing_2_000 - .byte PATT - .word se_m_sing_2_001 - .byte VOL , 95*se_m_sing_mvl/mxv - .byte PAN , c_v-12 - .byte N66 , Gn4 , v060 - .byte W06 - .byte W06 - .byte PAN , c_v-8 - .byte W06 - .byte W06 - .byte MOD , 7 - .byte PAN , c_v+0 - .byte W06 - .byte W06 - .byte c_v+7 - .byte W06 - .byte VOL , 83*se_m_sing_mvl/mxv - .byte W06 - .byte 69*se_m_sing_mvl/mxv - .byte PAN , c_v+15 - .byte W06 - .byte VOL , 50*se_m_sing_mvl/mxv - .byte W06 - .byte 24*se_m_sing_mvl/mxv - .byte PAN , c_v+8 - .byte W06 - .byte MOD , 0 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_sing: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_sing_pri @ Priority - .byte se_m_sing_rev @ Reverb. - - .word se_m_sing_grp - - .word se_m_sing_1 - .word se_m_sing_2 - - .end diff --git a/sound/songs/se_m_sketch.s b/sound/songs/se_m_sketch.s deleted file mode 100644 index 579a30874..000000000 --- a/sound/songs/se_m_sketch.s +++ /dev/null @@ -1,68 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_sketch_grp, voicegroup_rs_sfx_2 - .equ se_m_sketch_pri, 4 - .equ se_m_sketch_rev, reverb_set+50 - .equ se_m_sketch_mvl, 127 - .equ se_m_sketch_key, 0 - .equ se_m_sketch_tbs, 1 - .equ se_m_sketch_exg, 0 - .equ se_m_sketch_cmp, 1 - - .section .rodata - .global se_m_sketch - .align 2 - -@********************** Track 1 **********************@ - -se_m_sketch_1: - .byte KEYSH , se_m_sketch_key+0 - .byte TEMPO , 180*se_m_sketch_tbs/2 - .byte VOICE , 38 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_sketch_mvl/mxv - .byte BEND , c_v+0 - .byte N02 , Gn4 , v127 - .byte W01 - .byte VOL , 74*se_m_sketch_mvl/mxv - .byte BEND , c_v-11 - .byte W01 - .byte VOICE , 31 - .byte VOL , 40*se_m_sketch_mvl/mxv - .byte BEND , c_v-1 - .byte N03 , Cs5 - .byte W01 - .byte VOL , 64*se_m_sketch_mvl/mxv - .byte PAN , c_v-6 - .byte BEND , c_v-12 - .byte W01 - .byte VOL , 86*se_m_sketch_mvl/mxv - .byte PAN , c_v+4 - .byte BEND , c_v-16 - .byte W02 - .byte VOL , 110*se_m_sketch_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N02 , As5 - .byte W01 - .byte BEND , c_v+12 - .byte W01 - .byte VOL , 0*se_m_sketch_mvl/mxv - .byte W04 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_sketch: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_sketch_pri @ Priority - .byte se_m_sketch_rev @ Reverb. - - .word se_m_sketch_grp - - .word se_m_sketch_1 - - .end diff --git a/sound/songs/se_m_sky_uppercut.s b/sound/songs/se_m_sky_uppercut.s deleted file mode 100644 index 6a28b5bcd..000000000 --- a/sound/songs/se_m_sky_uppercut.s +++ /dev/null @@ -1,103 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_sky_uppercut_grp, voicegroup_rs_sfx_2 - .equ se_m_sky_uppercut_pri, 4 - .equ se_m_sky_uppercut_rev, reverb_set+50 - .equ se_m_sky_uppercut_mvl, 127 - .equ se_m_sky_uppercut_key, 0 - .equ se_m_sky_uppercut_tbs, 1 - .equ se_m_sky_uppercut_exg, 0 - .equ se_m_sky_uppercut_cmp, 1 - - .section .rodata - .global se_m_sky_uppercut - .align 2 - -@********************** Track 1 **********************@ - -se_m_sky_uppercut_1: - .byte KEYSH , se_m_sky_uppercut_key+0 - .byte TEMPO , 220*se_m_sky_uppercut_tbs/2 - .byte VOICE , 41 - .byte VOL , 110*se_m_sky_uppercut_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+6 - .byte BEND , c_v+0 - .byte N02 , Cn4 , v127 - .byte W03 - .byte VOL , 104*se_m_sky_uppercut_mvl/mxv - .byte W03 - .byte 93*se_m_sky_uppercut_mvl/mxv - .byte PAN , c_v-6 - .byte N02 , Cn5 - .byte W03 - .byte VOL , 110*se_m_sky_uppercut_mvl/mxv - .byte W01 - .byte VOICE , 22 - .byte PAN , c_v+0 - .byte N24 , Cn4 , v060 - .byte W02 - .byte W02 - .byte BEND , c_v+0 - .byte W04 - .byte c_v+1 - .byte W03 - .byte c_v+1 - .byte W01 - .byte VOL , 105*se_m_sky_uppercut_mvl/mxv - .byte W02 - .byte BEND , c_v+0 - .byte W01 - .byte VOL , 103*se_m_sky_uppercut_mvl/mxv - .byte W02 - .byte 91*se_m_sky_uppercut_mvl/mxv - .byte BEND , c_v+0 - .byte W03 - .byte VOL , 77*se_m_sky_uppercut_mvl/mxv - .byte BEND , c_v-1 - .byte W02 - .byte VOL , 61*se_m_sky_uppercut_mvl/mxv - .byte BEND , c_v-2 - .byte W01 - .byte VOL , 38*se_m_sky_uppercut_mvl/mxv - .byte W01 - .byte 15*se_m_sky_uppercut_mvl/mxv - .byte BEND , c_v-3 - .byte W02 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_sky_uppercut_2: - .byte KEYSH , se_m_sky_uppercut_key+0 - .byte VOICE , 4 - .byte VOL , 110*se_m_sky_uppercut_mvl/mxv - .byte N02 , Cn3 , v060 - .byte W03 - .byte Gn2 - .byte W03 - .byte Gs4 - .byte W04 - .byte Gs4 , v020 - .byte W02 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_sky_uppercut: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_sky_uppercut_pri @ Priority - .byte se_m_sky_uppercut_rev @ Reverb. - - .word se_m_sky_uppercut_grp - - .word se_m_sky_uppercut_1 - .word se_m_sky_uppercut_2 - - .end diff --git a/sound/songs/se_m_snore.s b/sound/songs/se_m_snore.s deleted file mode 100644 index 5774355f2..000000000 --- a/sound/songs/se_m_snore.s +++ /dev/null @@ -1,105 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_snore_grp, voicegroup_rs_sfx_2 - .equ se_m_snore_pri, 4 - .equ se_m_snore_rev, reverb_set+50 - .equ se_m_snore_mvl, 127 - .equ se_m_snore_key, 0 - .equ se_m_snore_tbs, 1 - .equ se_m_snore_exg, 0 - .equ se_m_snore_cmp, 1 - - .section .rodata - .global se_m_snore - .align 2 - -@********************** Track 1 **********************@ - -se_m_snore_1: - .byte KEYSH , se_m_snore_key+0 - .byte TEMPO , 220*se_m_snore_tbs/2 - .byte VOICE , 38 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 27*se_m_snore_mvl/mxv - .byte BEND , c_v+0 - .byte N10 , An1 , v127 - .byte W01 - .byte VOL , 75*se_m_snore_mvl/mxv - .byte W01 - .byte 120*se_m_snore_mvl/mxv - .byte W04 - .byte W02 - .byte 75*se_m_snore_mvl/mxv - .byte W01 - .byte 28*se_m_snore_mvl/mxv - .byte W03 - .byte VOICE , 36 - .byte VOL , 83*se_m_snore_mvl/mxv - .byte N18 , En2 , v112 - .byte W02 - .byte VOL , 87*se_m_snore_mvl/mxv - .byte W02 - .byte 91*se_m_snore_mvl/mxv - .byte W02 - .byte W01 - .byte 97*se_m_snore_mvl/mxv - .byte W02 - .byte 102*se_m_snore_mvl/mxv - .byte W01 - .byte 109*se_m_snore_mvl/mxv - .byte W02 - .byte 113*se_m_snore_mvl/mxv - .byte W01 - .byte 120*se_m_snore_mvl/mxv - .byte W05 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_snore_2: - .byte VOL , 120*se_m_snore_mvl/mxv - .byte KEYSH , se_m_snore_key+0 - .byte VOICE , 27 - .byte N01 , En2 , v052 - .byte W02 - .byte Dn2 - .byte W02 - .byte En2 - .byte W02 - .byte W01 - .byte Dn2 - .byte W02 - .byte En2 - .byte W03 - .byte W01 - .byte En2 , v064 - .byte W02 - .byte Gs2 - .byte W03 - .byte Dn3 - .byte W02 - .byte En2 - .byte W02 - .byte Gs2 - .byte W02 - .byte W01 - .byte Dn3 - .byte W05 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_snore: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_snore_pri @ Priority - .byte se_m_snore_rev @ Reverb. - - .word se_m_snore_grp - - .word se_m_snore_1 - .word se_m_snore_2 - - .end diff --git a/sound/songs/se_m_solar_beam.s b/sound/songs/se_m_solar_beam.s deleted file mode 100644 index 0ef97c6be..000000000 --- a/sound/songs/se_m_solar_beam.s +++ /dev/null @@ -1,164 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_solar_beam_grp, voicegroup_rs_sfx_2 - .equ se_m_solar_beam_pri, 4 - .equ se_m_solar_beam_rev, reverb_set+50 - .equ se_m_solar_beam_mvl, 127 - .equ se_m_solar_beam_key, 0 - .equ se_m_solar_beam_tbs, 1 - .equ se_m_solar_beam_exg, 0 - .equ se_m_solar_beam_cmp, 1 - - .section .rodata - .global se_m_solar_beam - .align 2 - -@********************** Track 1 **********************@ - -se_m_solar_beam_1: - .byte KEYSH , se_m_solar_beam_key+0 - .byte TEMPO , 150*se_m_solar_beam_tbs/2 - .byte VOICE , 36 - .byte BENDR , 24 - .byte VOL , 25*se_m_solar_beam_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+63 - .byte TIE , Cn4 , v112 - .byte W04 - .byte VOL , 40*se_m_solar_beam_mvl/mxv - .byte W02 - .byte PAN , c_v-4 - .byte BEND , c_v+52 - .byte W03 - .byte VOL , 55*se_m_solar_beam_mvl/mxv - .byte W03 - .byte PAN , c_v-10 - .byte BEND , c_v+41 - .byte W03 - .byte VOL , 80*se_m_solar_beam_mvl/mxv - .byte W03 - .byte PAN , c_v-5 - .byte BEND , c_v+30 - .byte W06 - .byte PAN , c_v+0 - .byte BEND , c_v+22 - .byte W01 - .byte VOL , 100*se_m_solar_beam_mvl/mxv - .byte W05 - .byte PAN , c_v+4 - .byte BEND , c_v+63 - .byte W06 - .byte PAN , c_v+11 - .byte BEND , c_v+52 - .byte W06 - .byte PAN , c_v+4 - .byte BEND , c_v+41 - .byte W04 - .byte c_v+33 - .byte W02 - .byte PAN , c_v+0 - .byte W03 - .byte BEND , c_v+25 - .byte W03 - .byte PAN , c_v-4 - .byte W03 - .byte BEND , c_v+22 - .byte W03 - .byte PAN , c_v-10 - .byte W06 - .byte c_v-5 - .byte BEND , c_v+17 - .byte W06 - .byte PAN , c_v+0 - .byte BEND , c_v+9 - .byte W06 - .byte PAN , c_v+4 - .byte W02 - .byte BEND , c_v+4 - .byte W04 - .byte PAN , c_v+11 - .byte W06 - .byte c_v+4 - .byte BEND , c_v+0 - .byte W06 - .byte PAN , c_v+0 - .byte W06 - .byte c_v-4 - .byte W02 - .byte BEND , c_v-3 - .byte W04 - .byte PAN , c_v-10 - .byte W06 - .byte c_v-5 - .byte W04 - .byte BEND , c_v-5 - .byte W02 - .byte PAN , c_v+0 - .byte W06 - .byte c_v+4 - .byte W02 - .byte BEND , c_v-7 - .byte W04 - .byte PAN , c_v+11 - .byte W06 - .byte c_v+4 - .byte W01 - .byte BEND , c_v-10 - .byte W05 - .byte PAN , c_v+0 - .byte W03 - .byte BEND , c_v-13 - .byte W03 - .byte PAN , c_v-4 - .byte W06 - .byte c_v-10 - .byte BEND , c_v-18 - .byte W03 - .byte VOL , 89*se_m_solar_beam_mvl/mxv - .byte W03 - .byte PAN , c_v-5 - .byte W02 - .byte VOL , 74*se_m_solar_beam_mvl/mxv - .byte BEND , c_v-25 - .byte W04 - .byte PAN , c_v+0 - .byte W02 - .byte VOL , 62*se_m_solar_beam_mvl/mxv - .byte W01 - .byte BEND , c_v-32 - .byte W03 - .byte PAN , c_v+4 - .byte W01 - .byte VOL , 45*se_m_solar_beam_mvl/mxv - .byte W01 - .byte BEND , c_v-40 - .byte W04 - .byte VOL , 28*se_m_solar_beam_mvl/mxv - .byte PAN , c_v+11 - .byte BEND , c_v-49 - .byte W03 - .byte c_v-64 - .byte W01 - .byte VOL , 10*se_m_solar_beam_mvl/mxv - .byte W02 - .byte PAN , c_v+4 - .byte W02 - .byte VOL , 5*se_m_solar_beam_mvl/mxv - .byte W04 - .byte EOT - .byte FINE - -@******************************************************@ - .align 2 - -se_m_solar_beam: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_solar_beam_pri @ Priority - .byte se_m_solar_beam_rev @ Reverb. - - .word se_m_solar_beam_grp - - .word se_m_solar_beam_1 - - .end diff --git a/sound/songs/se_m_spit_up.s b/sound/songs/se_m_spit_up.s deleted file mode 100644 index 20fe0697d..000000000 --- a/sound/songs/se_m_spit_up.s +++ /dev/null @@ -1,88 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_spit_up_grp, voicegroup_rs_sfx_2 - .equ se_m_spit_up_pri, 4 - .equ se_m_spit_up_rev, reverb_set+50 - .equ se_m_spit_up_mvl, 127 - .equ se_m_spit_up_key, 0 - .equ se_m_spit_up_tbs, 1 - .equ se_m_spit_up_exg, 0 - .equ se_m_spit_up_cmp, 1 - - .section .rodata - .global se_m_spit_up - .align 2 - -@********************** Track 1 **********************@ - -se_m_spit_up_1: - .byte KEYSH , se_m_spit_up_key+0 - .byte TEMPO , 150*se_m_spit_up_tbs/2 - .byte VOICE , 65 - .byte BENDR , 12 - .byte VOL , 110*se_m_spit_up_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N03 , Gn3 , v112 - .byte W01 - .byte PAN , c_v-7 - .byte BEND , c_v-17 - .byte W01 - .byte PAN , c_v+8 - .byte BEND , c_v-36 - .byte W01 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N03 , Gn4 - .byte W02 - .byte PAN , c_v-7 - .byte BEND , c_v+15 - .byte W01 - .byte PAN , c_v+8 - .byte BEND , c_v+28 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N03 , Gn4 , v064 - .byte W01 - .byte PAN , c_v-7 - .byte BEND , c_v+15 - .byte W02 - .byte PAN , c_v+8 - .byte BEND , c_v+28 - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_spit_up_2: - .byte KEYSH , se_m_spit_up_key+0 - .byte VOICE , 57 - .byte VOL , 110*se_m_spit_up_mvl/mxv - .byte N03 , En3 , v052 - .byte W03 - .byte W01 - .byte N03 - .byte W02 - .byte W03 - .byte En3 , v032 - .byte W03 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_spit_up: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_spit_up_pri @ Priority - .byte se_m_spit_up_rev @ Reverb. - - .word se_m_spit_up_grp - - .word se_m_spit_up_1 - .word se_m_spit_up_2 - - .end diff --git a/sound/songs/se_m_stat_decrease.s b/sound/songs/se_m_stat_decrease.s deleted file mode 100644 index 8f242be04..000000000 --- a/sound/songs/se_m_stat_decrease.s +++ /dev/null @@ -1,271 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_stat_decrease_grp, voicegroup_rs_sfx_2 - .equ se_m_stat_decrease_pri, 4 - .equ se_m_stat_decrease_rev, reverb_set+50 - .equ se_m_stat_decrease_mvl, 127 - .equ se_m_stat_decrease_key, 0 - .equ se_m_stat_decrease_tbs, 1 - .equ se_m_stat_decrease_exg, 0 - .equ se_m_stat_decrease_cmp, 1 - - .section .rodata - .global se_m_stat_decrease - .align 2 - -@********************** Track 1 **********************@ - -se_m_stat_decrease_1: - .byte KEYSH , se_m_stat_decrease_key+0 - .byte TEMPO , 170*se_m_stat_decrease_tbs/2 - .byte VOICE , 67 - .byte VOL , 70*se_m_stat_decrease_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+42 - .byte N02 , Cs6 , v076 - .byte W01 - .byte BEND , c_v+31 - .byte W01 - .byte c_v+24 - .byte W01 - .byte PAN , c_v+6 - .byte BEND , c_v+16 - .byte N02 , Cs5 - .byte W01 - .byte BEND , c_v+12 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+8 - .byte N02 , Fs5 - .byte W01 - .byte BEND , c_v+5 - .byte W01 - .byte c_v+2 - .byte W01 - .byte PAN , c_v-6 - .byte BEND , c_v+0 - .byte N02 , Fs4 - .byte W03 - .byte PAN , c_v+0 - .byte BEND , c_v+42 - .byte N02 , Cn6 - .byte W01 - .byte BEND , c_v+31 - .byte W01 - .byte c_v+24 - .byte W01 - .byte PAN , c_v+6 - .byte BEND , c_v+16 - .byte N02 , Cn5 - .byte W01 - .byte BEND , c_v+12 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+8 - .byte N02 , Fn5 - .byte W01 - .byte BEND , c_v+5 - .byte W01 - .byte c_v+2 - .byte W01 - .byte PAN , c_v-6 - .byte BEND , c_v+0 - .byte N02 , Fn4 - .byte W03 - .byte PAN , c_v+0 - .byte BEND , c_v+42 - .byte N02 , Bn5 - .byte W01 - .byte BEND , c_v+31 - .byte W01 - .byte c_v+24 - .byte W01 - .byte PAN , c_v+6 - .byte BEND , c_v+16 - .byte N02 , Bn4 - .byte W01 - .byte BEND , c_v+12 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+8 - .byte N02 , En5 - .byte W01 - .byte BEND , c_v+5 - .byte W01 - .byte c_v+2 - .byte W01 - .byte PAN , c_v-6 - .byte BEND , c_v+0 - .byte N02 , En4 - .byte W03 - .byte PAN , c_v+0 - .byte BEND , c_v+42 - .byte N02 , As5 - .byte W01 - .byte BEND , c_v+31 - .byte W01 - .byte c_v+24 - .byte W01 - .byte PAN , c_v+6 - .byte BEND , c_v+16 - .byte N02 , As4 - .byte W01 - .byte BEND , c_v+12 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+8 - .byte N02 , Ds5 - .byte W01 - .byte BEND , c_v+5 - .byte W01 - .byte c_v+2 - .byte W01 - .byte PAN , c_v-6 - .byte BEND , c_v+0 - .byte N02 , Ds4 - .byte W03 - .byte PAN , c_v+0 - .byte BEND , c_v+42 - .byte N02 , An5 - .byte W01 - .byte BEND , c_v+31 - .byte W01 - .byte c_v+24 - .byte W01 - .byte PAN , c_v+6 - .byte BEND , c_v+16 - .byte N02 , An4 - .byte W01 - .byte BEND , c_v+12 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+8 - .byte N02 , Cs5 , v056 - .byte W01 - .byte BEND , c_v+5 - .byte W01 - .byte c_v+2 - .byte W01 - .byte PAN , c_v-12 - .byte BEND , c_v+0 - .byte N02 , Cs4 - .byte W03 - .byte PAN , c_v+0 - .byte BEND , c_v+42 - .byte N02 , An5 - .byte W01 - .byte BEND , c_v+31 - .byte W01 - .byte c_v+24 - .byte W01 - .byte PAN , c_v+12 - .byte BEND , c_v+16 - .byte N02 , An4 - .byte W01 - .byte BEND , c_v+12 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+8 - .byte N02 , Cs5 , v032 - .byte W01 - .byte BEND , c_v+5 - .byte W01 - .byte c_v+2 - .byte W01 - .byte PAN , c_v-16 - .byte BEND , c_v+0 - .byte N02 , Cs4 - .byte W03 - .byte PAN , c_v+0 - .byte BEND , c_v+42 - .byte N02 , An5 - .byte W01 - .byte BEND , c_v+31 - .byte W01 - .byte c_v+24 - .byte W01 - .byte PAN , c_v+16 - .byte BEND , c_v+16 - .byte N02 , An4 - .byte W01 - .byte BEND , c_v+12 - .byte W02 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_stat_decrease_2: - .byte KEYSH , se_m_stat_decrease_key+0 - .byte VOICE , 55 - .byte XCMD , xIECV , 10 - .byte xIECL , 8 - .byte VOL , 70*se_m_stat_decrease_mvl/mxv - .byte N02 , As3 , v052 - .byte W03 - .byte N02 - .byte W03 - .byte W01 - .byte An3 - .byte W03 - .byte N02 - .byte W02 - .byte W02 - .byte Gs3 - .byte W04 - .byte N02 - .byte W03 - .byte Gn3 - .byte W03 - .byte W01 - .byte N02 - .byte W03 - .byte Fs3 - .byte W02 - .byte W02 - .byte N02 - .byte W04 - .byte Fn3 - .byte W03 - .byte N02 - .byte W03 - .byte W01 - .byte En3 - .byte W03 - .byte N02 - .byte W02 - .byte W02 - .byte Ds3 - .byte W04 - .byte Ds3 , v032 - .byte W03 - .byte Dn3 - .byte W03 - .byte W01 - .byte N02 - .byte W03 - .byte Cs3 , v020 - .byte W02 - .byte W02 - .byte N02 - .byte W04 - .byte Cn3 , v012 - .byte W03 - .byte N02 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_stat_decrease: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_stat_decrease_pri @ Priority - .byte se_m_stat_decrease_rev @ Reverb. - - .word se_m_stat_decrease_grp - - .word se_m_stat_decrease_1 - .word se_m_stat_decrease_2 - - .end diff --git a/sound/songs/se_m_stat_increase.s b/sound/songs/se_m_stat_increase.s deleted file mode 100644 index d5d6b5e91..000000000 --- a/sound/songs/se_m_stat_increase.s +++ /dev/null @@ -1,283 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_stat_increase_grp, voicegroup_rs_sfx_2 - .equ se_m_stat_increase_pri, 4 - .equ se_m_stat_increase_rev, reverb_set+50 - .equ se_m_stat_increase_mvl, 127 - .equ se_m_stat_increase_key, 0 - .equ se_m_stat_increase_tbs, 1 - .equ se_m_stat_increase_exg, 0 - .equ se_m_stat_increase_cmp, 1 - - .section .rodata - .global se_m_stat_increase - .align 2 - -@********************** Track 1 **********************@ - -se_m_stat_increase_1: - .byte KEYSH , se_m_stat_increase_key+0 - .byte TEMPO , 170*se_m_stat_increase_tbs/2 - .byte VOICE , 67 - .byte VOL , 70*se_m_stat_increase_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N02 , An5 , v076 - .byte W01 - .byte BEND , c_v+0 - .byte W01 - .byte c_v+2 - .byte W01 - .byte PAN , c_v+6 - .byte BEND , c_v+5 - .byte N02 , An4 - .byte W01 - .byte BEND , c_v+8 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+12 - .byte N02 , Dn5 - .byte W01 - .byte BEND , c_v+16 - .byte W01 - .byte c_v+23 - .byte W01 - .byte PAN , c_v-6 - .byte BEND , c_v+32 - .byte N02 , Dn4 - .byte W01 - .byte BEND , c_v+42 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N02 , As5 - .byte W01 - .byte BEND , c_v+0 - .byte W01 - .byte c_v+2 - .byte W01 - .byte PAN , c_v+6 - .byte BEND , c_v+5 - .byte N02 , As4 - .byte W01 - .byte BEND , c_v+8 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+12 - .byte N02 , Ds5 - .byte W01 - .byte BEND , c_v+16 - .byte W01 - .byte c_v+23 - .byte W01 - .byte PAN , c_v-6 - .byte BEND , c_v+32 - .byte N02 , Ds4 - .byte W01 - .byte BEND , c_v+42 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N02 , Bn5 - .byte W01 - .byte BEND , c_v+0 - .byte W01 - .byte c_v+2 - .byte W01 - .byte PAN , c_v+6 - .byte BEND , c_v+5 - .byte N02 , Bn4 - .byte W01 - .byte BEND , c_v+8 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+12 - .byte N02 , En5 - .byte W01 - .byte BEND , c_v+16 - .byte W01 - .byte c_v+23 - .byte W01 - .byte PAN , c_v-6 - .byte BEND , c_v+32 - .byte N02 , En4 - .byte W01 - .byte BEND , c_v+42 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N02 , Cn6 - .byte W01 - .byte BEND , c_v+0 - .byte W01 - .byte c_v+2 - .byte W01 - .byte PAN , c_v+6 - .byte BEND , c_v+5 - .byte N02 , Cn5 - .byte W01 - .byte BEND , c_v+8 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+12 - .byte N02 , Fn5 - .byte W01 - .byte BEND , c_v+16 - .byte W01 - .byte c_v+23 - .byte W01 - .byte PAN , c_v-6 - .byte BEND , c_v+32 - .byte N02 , Fn4 - .byte W01 - .byte BEND , c_v+42 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N02 , Cs6 - .byte W01 - .byte BEND , c_v+0 - .byte W01 - .byte c_v+2 - .byte W01 - .byte PAN , c_v+6 - .byte BEND , c_v+5 - .byte N02 , Cs5 - .byte W01 - .byte BEND , c_v+8 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+12 - .byte N02 , Fn5 , v056 - .byte W01 - .byte BEND , c_v+16 - .byte W01 - .byte c_v+23 - .byte W01 - .byte PAN , c_v-12 - .byte BEND , c_v+32 - .byte N02 , Fn4 - .byte W01 - .byte BEND , c_v+42 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N02 , Cs6 - .byte W01 - .byte BEND , c_v+0 - .byte W01 - .byte c_v+2 - .byte W01 - .byte PAN , c_v+12 - .byte BEND , c_v+5 - .byte N02 , Cs5 - .byte W01 - .byte BEND , c_v+8 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+12 - .byte N02 , Fn5 , v032 - .byte W01 - .byte BEND , c_v+16 - .byte W01 - .byte c_v+23 - .byte W01 - .byte PAN , c_v-16 - .byte BEND , c_v+32 - .byte N02 , Fn4 - .byte W01 - .byte BEND , c_v+42 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N02 , Cs6 - .byte W01 - .byte BEND , c_v+0 - .byte W01 - .byte c_v+2 - .byte W01 - .byte PAN , c_v+16 - .byte BEND , c_v+5 - .byte N02 , Cs5 - .byte W01 - .byte BEND , c_v+8 - .byte W02 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_stat_increase_2: - .byte KEYSH , se_m_stat_increase_key+0 - .byte VOICE , 55 - .byte XCMD , xIECV , 10 - .byte xIECL , 8 - .byte VOL , 70*se_m_stat_increase_mvl/mxv - .byte N02 , Cn3 , v052 - .byte W03 - .byte N02 - .byte W03 - .byte W01 - .byte Cs3 - .byte W03 - .byte N02 - .byte W02 - .byte W02 - .byte Dn3 - .byte W04 - .byte N02 - .byte W03 - .byte Ds3 - .byte W03 - .byte W01 - .byte N02 - .byte W03 - .byte En3 - .byte W02 - .byte W02 - .byte N02 - .byte W04 - .byte Fn3 - .byte W03 - .byte N02 - .byte W03 - .byte W01 - .byte Fs3 - .byte W03 - .byte N02 - .byte W02 - .byte W02 - .byte Gn3 - .byte W04 - .byte Gn3 , v032 - .byte W03 - .byte Gs3 - .byte W03 - .byte W01 - .byte N02 - .byte W03 - .byte An3 , v020 - .byte W02 - .byte W02 - .byte N02 - .byte W04 - .byte As3 , v012 - .byte W03 - .byte N02 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_stat_increase: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_stat_increase_pri @ Priority - .byte se_m_stat_increase_rev @ Reverb. - - .word se_m_stat_increase_grp - - .word se_m_stat_increase_1 - .word se_m_stat_increase_2 - - .end diff --git a/sound/songs/se_m_strength.s b/sound/songs/se_m_strength.s deleted file mode 100644 index 974a9f976..000000000 --- a/sound/songs/se_m_strength.s +++ /dev/null @@ -1,84 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_strength_grp, voicegroup_rs_sfx_2 - .equ se_m_strength_pri, 4 - .equ se_m_strength_rev, reverb_set+50 - .equ se_m_strength_mvl, 127 - .equ se_m_strength_key, 0 - .equ se_m_strength_tbs, 1 - .equ se_m_strength_exg, 0 - .equ se_m_strength_cmp, 1 - - .section .rodata - .global se_m_strength - .align 2 - -@********************** Track 1 **********************@ - -se_m_strength_1: - .byte KEYSH , se_m_strength_key+0 - .byte TEMPO , 150*se_m_strength_tbs/2 - .byte VOICE , 26 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_strength_mvl/mxv - .byte BEND , c_v+0 - .byte N03 , Gn2 , v127 - .byte W03 - .byte PAN , c_v+6 - .byte N03 , Fs2 , v120 - .byte W04 - .byte PAN , c_v-6 - .byte N03 , Fn2 , v116 - .byte W03 - .byte PAN , c_v+11 - .byte N03 , En2 , v112 - .byte W04 - .byte PAN , c_v-11 - .byte N03 , Ds2 , v108 - .byte W04 - .byte PAN , c_v+0 - .byte N03 , Dn2 , v100 - .byte W06 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_strength_2: - .byte KEYSH , se_m_strength_key+0 - .byte VOICE , 5 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_strength_mvl/mxv - .byte N02 , Fn2 , v072 - .byte W02 - .byte N01 - .byte W01 - .byte N02 , Gn2 - .byte W03 - .byte N01 , Gs2 , v060 - .byte W01 - .byte N02 , Cn3 , v040 - .byte W03 - .byte Cn3 , v032 - .byte W04 - .byte N01 , Cn3 , v028 - .byte W04 - .byte Cn3 , v020 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_strength: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_strength_pri @ Priority - .byte se_m_strength_rev @ Reverb. - - .word se_m_strength_grp - - .word se_m_strength_1 - .word se_m_strength_2 - - .end diff --git a/sound/songs/se_m_string_shot.s b/sound/songs/se_m_string_shot.s deleted file mode 100644 index ed0701953..000000000 --- a/sound/songs/se_m_string_shot.s +++ /dev/null @@ -1,80 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_string_shot_grp, voicegroup_rs_sfx_2 - .equ se_m_string_shot_pri, 4 - .equ se_m_string_shot_rev, reverb_set+50 - .equ se_m_string_shot_mvl, 127 - .equ se_m_string_shot_key, 0 - .equ se_m_string_shot_tbs, 1 - .equ se_m_string_shot_exg, 0 - .equ se_m_string_shot_cmp, 1 - - .section .rodata - .global se_m_string_shot - .align 2 - -@********************** Track 1 **********************@ - -se_m_string_shot_1: - .byte KEYSH , se_m_string_shot_key+0 - .byte TEMPO , 250*se_m_string_shot_tbs/2 - .byte VOICE , 22 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_string_shot_mvl/mxv - .byte BEND , c_v+0 - .byte N48 , Fn4 , v108 - .byte W03 - .byte PAN , c_v+5 - .byte BEND , c_v+6 - .byte W03 - .byte PAN , c_v+15 - .byte BEND , c_v+12 - .byte W03 - .byte PAN , c_v+6 - .byte BEND , c_v+21 - .byte W02 - .byte c_v+8 - .byte W01 - .byte PAN , c_v-1 - .byte W03 - .byte c_v-9 - .byte BEND , c_v-8 - .byte W03 - .byte PAN , c_v-15 - .byte BEND , c_v-14 - .byte W03 - .byte PAN , c_v-9 - .byte BEND , c_v-8 - .byte W03 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte W06 - .byte VOL , 90*se_m_string_shot_mvl/mxv - .byte W03 - .byte 71*se_m_string_shot_mvl/mxv - .byte W03 - .byte 58*se_m_string_shot_mvl/mxv - .byte W03 - .byte 41*se_m_string_shot_mvl/mxv - .byte W03 - .byte 27*se_m_string_shot_mvl/mxv - .byte W03 - .byte 7*se_m_string_shot_mvl/mxv - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_string_shot: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_string_shot_pri @ Priority - .byte se_m_string_shot_rev @ Reverb. - - .word se_m_string_shot_grp - - .word se_m_string_shot_1 - - .end diff --git a/sound/songs/se_m_string_shot2.s b/sound/songs/se_m_string_shot2.s deleted file mode 100644 index ac17f52cc..000000000 --- a/sound/songs/se_m_string_shot2.s +++ /dev/null @@ -1,134 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_string_shot2_grp, voicegroup_rs_sfx_2 - .equ se_m_string_shot2_pri, 4 - .equ se_m_string_shot2_rev, reverb_set+50 - .equ se_m_string_shot2_mvl, 127 - .equ se_m_string_shot2_key, 0 - .equ se_m_string_shot2_tbs, 1 - .equ se_m_string_shot2_exg, 0 - .equ se_m_string_shot2_cmp, 1 - - .section .rodata - .global se_m_string_shot2 - .align 2 - -@********************** Track 1 **********************@ - -se_m_string_shot2_1: - .byte KEYSH , se_m_string_shot2_key+0 - .byte TEMPO , 250*se_m_string_shot2_tbs/2 - .byte VOICE , 10 - .byte BENDR , 12 - .byte VOL , 105*se_m_string_shot2_mvl/mxv - .byte PAN , c_v-1 - .byte BEND , c_v+0 - .byte N09 , En4 , v112 - .byte W03 - .byte BEND , c_v+6 - .byte W03 - .byte c_v+12 - .byte W05 - .byte c_v+8 - .byte W01 - .byte PAN , c_v+16 - .byte N09 , Gn4 - .byte W03 - .byte BEND , c_v-8 - .byte W03 - .byte c_v-14 - .byte W06 - .byte PAN , c_v+0 - .byte BEND , c_v-11 - .byte N09 , En4 - .byte W03 - .byte BEND , c_v-5 - .byte W03 - .byte c_v+1 - .byte W05 - .byte c_v-3 - .byte W01 - .byte PAN , c_v-16 - .byte N09 , Gn4 - .byte W03 - .byte BEND , c_v-19 - .byte W03 - .byte c_v-25 - .byte W06 - .byte PAN , c_v+0 - .byte BEND , c_v-19 - .byte N09 , En4 - .byte W03 - .byte BEND , c_v-13 - .byte W03 - .byte c_v-6 - .byte W05 - .byte c_v-10 - .byte W01 - .byte PAN , c_v+16 - .byte N09 , Gn4 , v096 - .byte W03 - .byte BEND , c_v-27 - .byte W03 - .byte c_v-32 - .byte W06 - .byte PAN , c_v+0 - .byte BEND , c_v-32 - .byte N09 , En4 , v084 - .byte W03 - .byte BEND , c_v-26 - .byte W03 - .byte c_v-19 - .byte W05 - .byte c_v-23 - .byte W01 - .byte PAN , c_v-16 - .byte N09 , Gn4 , v060 - .byte W03 - .byte BEND , c_v-40 - .byte W03 - .byte c_v-45 - .byte W06 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_string_shot2_2: - .byte KEYSH , se_m_string_shot2_key+0 - .byte VOICE , 5 - .byte VOL , 105*se_m_string_shot2_mvl/mxv - .byte PAN , c_v+9 - .byte N09 , Cn3 , v052 - .byte W12 - .byte PAN , c_v-7 - .byte N09 , Gn2 - .byte W12 -se_m_string_shot2_2_000: - .byte PAN , c_v+9 - .byte N09 , Cn3 , v052 - .byte W12 - .byte PAN , c_v-6 - .byte N09 , Gn2 - .byte W12 - .byte PEND - .byte PATT - .word se_m_string_shot2_2_000 - .byte PATT - .word se_m_string_shot2_2_000 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_string_shot2: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_string_shot2_pri @ Priority - .byte se_m_string_shot2_rev @ Reverb. - - .word se_m_string_shot2_grp - - .word se_m_string_shot2_1 - .word se_m_string_shot2_2 - - .end diff --git a/sound/songs/se_m_supersonic.s b/sound/songs/se_m_supersonic.s deleted file mode 100644 index 3029597d1..000000000 --- a/sound/songs/se_m_supersonic.s +++ /dev/null @@ -1,161 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_supersonic_grp, voicegroup_rs_sfx_2 - .equ se_m_supersonic_pri, 4 - .equ se_m_supersonic_rev, reverb_set+50 - .equ se_m_supersonic_mvl, 127 - .equ se_m_supersonic_key, 0 - .equ se_m_supersonic_tbs, 1 - .equ se_m_supersonic_exg, 0 - .equ se_m_supersonic_cmp, 1 - - .section .rodata - .global se_m_supersonic - .align 2 - -@********************** Track 1 **********************@ - -se_m_supersonic_1: - .byte KEYSH , se_m_supersonic_key+0 - .byte TEMPO , 150*se_m_supersonic_tbs/2 - .byte VOICE , 43 - .byte BENDR , 2 - .byte PAN , c_v+0 - .byte VOL , 61*se_m_supersonic_mvl/mxv - .byte BEND , c_v-4 - .byte N07 , Gs4 , v127 - .byte W01 - .byte PAN , c_v+6 - .byte VOL , 75*se_m_supersonic_mvl/mxv - .byte BEND , c_v-1 - .byte W01 - .byte PAN , c_v-7 - .byte VOL , 93*se_m_supersonic_mvl/mxv - .byte BEND , c_v+2 - .byte W01 - .byte PAN , c_v+9 - .byte VOL , 110*se_m_supersonic_mvl/mxv - .byte BEND , c_v+4 - .byte W01 - .byte PAN , c_v-12 - .byte BEND , c_v+7 - .byte W02 - .byte W02 - .byte VOL , 0*se_m_supersonic_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-4 - .byte N32 - .byte W01 - .byte PAN , c_v+6 - .byte BEND , c_v-1 - .byte W01 - .byte PAN , c_v-7 - .byte VOL , 36*se_m_supersonic_mvl/mxv - .byte BEND , c_v+2 - .byte W02 - .byte PAN , c_v+9 - .byte VOL , 67*se_m_supersonic_mvl/mxv - .byte BEND , c_v-1 - .byte W01 - .byte PAN , c_v-13 - .byte VOL , 84*se_m_supersonic_mvl/mxv - .byte BEND , c_v-4 - .byte W01 - .byte PAN , c_v+6 - .byte BEND , c_v-6 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 92*se_m_supersonic_mvl/mxv - .byte BEND , c_v-8 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v-7 - .byte W02 - .byte PAN , c_v+6 - .byte VOL , 99*se_m_supersonic_mvl/mxv - .byte BEND , c_v-4 - .byte W01 - .byte PAN , c_v-7 - .byte BEND , c_v-1 - .byte W01 - .byte VOL , 105*se_m_supersonic_mvl/mxv - .byte PAN , c_v+9 - .byte BEND , c_v+2 - .byte W01 - .byte VOL , 110*se_m_supersonic_mvl/mxv - .byte PAN , c_v-13 - .byte BEND , c_v-1 - .byte W01 - .byte PAN , c_v-1 - .byte BEND , c_v-4 - .byte W02 - .byte VOL , 46*se_m_supersonic_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-1 - .byte W01 - .byte PAN , c_v+6 - .byte BEND , c_v+2 - .byte W01 - .byte VOL , 67*se_m_supersonic_mvl/mxv - .byte PAN , c_v-7 - .byte BEND , c_v-1 - .byte W01 - .byte PAN , c_v+9 - .byte BEND , c_v-4 - .byte W01 - .byte VOL , 84*se_m_supersonic_mvl/mxv - .byte PAN , c_v-13 - .byte BEND , c_v-6 - .byte W02 - .byte VOL , 100*se_m_supersonic_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v-8 - .byte W01 - .byte VOL , 110*se_m_supersonic_mvl/mxv - .byte PAN , c_v-6 - .byte BEND , c_v-7 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v-4 - .byte W01 - .byte PAN , c_v+6 - .byte BEND , c_v-1 - .byte W01 - .byte VOL , 101*se_m_supersonic_mvl/mxv - .byte PAN , c_v-7 - .byte BEND , c_v+2 - .byte W02 - .byte VOL , 85*se_m_supersonic_mvl/mxv - .byte PAN , c_v+9 - .byte BEND , c_v-1 - .byte W01 - .byte VOL , 75*se_m_supersonic_mvl/mxv - .byte PAN , c_v-13 - .byte BEND , c_v-4 - .byte W01 - .byte VOL , 48*se_m_supersonic_mvl/mxv - .byte PAN , c_v-1 - .byte BEND , c_v-6 - .byte W01 - .byte VOL , 24*se_m_supersonic_mvl/mxv - .byte BEND , c_v-8 - .byte W01 - .byte VOL , 6*se_m_supersonic_mvl/mxv - .byte BEND , c_v-7 - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_supersonic: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_supersonic_pri @ Priority - .byte se_m_supersonic_rev @ Reverb. - - .word se_m_supersonic_grp - - .word se_m_supersonic_1 - - .end diff --git a/sound/songs/se_m_surf.s b/sound/songs/se_m_surf.s deleted file mode 100644 index 1b3fc5cb9..000000000 --- a/sound/songs/se_m_surf.s +++ /dev/null @@ -1,109 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_surf_grp, voicegroup_rs_sfx_2 - .equ se_m_surf_pri, 4 - .equ se_m_surf_rev, reverb_set+50 - .equ se_m_surf_mvl, 127 - .equ se_m_surf_key, 0 - .equ se_m_surf_tbs, 1 - .equ se_m_surf_exg, 0 - .equ se_m_surf_cmp, 1 - - .section .rodata - .global se_m_surf - .align 2 - -@********************** Track 1 **********************@ - -se_m_surf_1: - .byte KEYSH , se_m_surf_key+0 - .byte TEMPO , 150*se_m_surf_tbs/2 - .byte VOICE , 36 - .byte BENDR , 12 - .byte VOL , 27*se_m_surf_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N96 , Cn3 , v112 - .byte W04 - .byte VOL , 45*se_m_surf_mvl/mxv - .byte W02 - .byte PAN , c_v-4 - .byte W02 - .byte BEND , c_v+4 - .byte W01 - .byte VOL , 60*se_m_surf_mvl/mxv - .byte W03 - .byte PAN , c_v-10 - .byte W02 - .byte BEND , c_v+9 - .byte W01 - .byte VOL , 88*se_m_surf_mvl/mxv - .byte W03 - .byte PAN , c_v-5 - .byte W02 - .byte BEND , c_v+14 - .byte W04 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 110*se_m_surf_mvl/mxv - .byte W02 - .byte BEND , c_v+19 - .byte W03 - .byte PAN , c_v+4 - .byte W02 - .byte BEND , c_v+24 - .byte W04 - .byte PAN , c_v+11 - .byte W06 - .byte c_v+4 - .byte W06 - .byte c_v+0 - .byte W06 - .byte c_v-4 - .byte W02 - .byte BEND , c_v+19 - .byte W04 - .byte PAN , c_v-10 - .byte W01 - .byte VOL , 98*se_m_surf_mvl/mxv - .byte W05 - .byte 81*se_m_surf_mvl/mxv - .byte PAN , c_v-5 - .byte BEND , c_v+12 - .byte W06 - .byte VOL , 68*se_m_surf_mvl/mxv - .byte PAN , c_v+0 - .byte W03 - .byte BEND , c_v+17 - .byte W01 - .byte VOL , 50*se_m_surf_mvl/mxv - .byte W02 - .byte PAN , c_v+4 - .byte W03 - .byte VOL , 31*se_m_surf_mvl/mxv - .byte W03 - .byte PAN , c_v+11 - .byte BEND , c_v+22 - .byte W02 - .byte VOL , 11*se_m_surf_mvl/mxv - .byte W04 - .byte 6*se_m_surf_mvl/mxv - .byte PAN , c_v+4 - .byte BEND , c_v+30 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_surf: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_surf_pri @ Priority - .byte se_m_surf_rev @ Reverb. - - .word se_m_surf_grp - - .word se_m_surf_1 - - .end diff --git a/sound/songs/se_m_swagger.s b/sound/songs/se_m_swagger.s deleted file mode 100644 index e673444ee..000000000 --- a/sound/songs/se_m_swagger.s +++ /dev/null @@ -1,77 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_swagger_grp, voicegroup_rs_sfx_2 - .equ se_m_swagger_pri, 4 - .equ se_m_swagger_rev, reverb_set+50 - .equ se_m_swagger_mvl, 127 - .equ se_m_swagger_key, 0 - .equ se_m_swagger_tbs, 1 - .equ se_m_swagger_exg, 0 - .equ se_m_swagger_cmp, 1 - - .section .rodata - .global se_m_swagger - .align 2 - -@********************** Track 1 **********************@ - -se_m_swagger_1: - .byte KEYSH , se_m_swagger_key+0 - .byte TEMPO , 190*se_m_swagger_tbs/2 - .byte VOICE , 2 - .byte BENDR , 8 - .byte PAN , c_v+0 - .byte VOL , 28*se_m_swagger_mvl/mxv - .byte BEND , c_v+0 - .byte N15 , An1 , v127 - .byte W01 - .byte VOL , 60*se_m_swagger_mvl/mxv - .byte W01 - .byte 111*se_m_swagger_mvl/mxv - .byte W01 - .byte 120*se_m_swagger_mvl/mxv - .byte W01 - .byte BEND , c_v-3 - .byte W02 - .byte PAN , c_v+5 - .byte BEND , c_v-6 - .byte W01 - .byte PAN , c_v-4 - .byte BEND , c_v-8 - .byte W01 - .byte VOL , 109*se_m_swagger_mvl/mxv - .byte PAN , c_v+9 - .byte BEND , c_v-10 - .byte W01 - .byte PAN , c_v-9 - .byte BEND , c_v-14 - .byte W01 - .byte VOL , 95*se_m_swagger_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-19 - .byte W02 - .byte VOL , 71*se_m_swagger_mvl/mxv - .byte BEND , c_v-29 - .byte W01 - .byte VOL , 41*se_m_swagger_mvl/mxv - .byte BEND , c_v-38 - .byte W01 - .byte VOL , 15*se_m_swagger_mvl/mxv - .byte BEND , c_v-52 - .byte W04 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_swagger: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_swagger_pri @ Priority - .byte se_m_swagger_rev @ Reverb. - - .word se_m_swagger_grp - - .word se_m_swagger_1 - - .end diff --git a/sound/songs/se_m_swagger2.s b/sound/songs/se_m_swagger2.s deleted file mode 100644 index 9e799ec33..000000000 --- a/sound/songs/se_m_swagger2.s +++ /dev/null @@ -1,56 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_swagger2_grp, voicegroup_rs_sfx_2 - .equ se_m_swagger2_pri, 4 - .equ se_m_swagger2_rev, reverb_set+50 - .equ se_m_swagger2_mvl, 127 - .equ se_m_swagger2_key, 0 - .equ se_m_swagger2_tbs, 1 - .equ se_m_swagger2_exg, 0 - .equ se_m_swagger2_cmp, 1 - - .section .rodata - .global se_m_swagger2 - .align 2 - -@********************** Track 1 **********************@ - -se_m_swagger2_1: - .byte KEYSH , se_m_swagger2_key+0 - .byte TEMPO , 150*se_m_swagger2_tbs/2 - .byte VOICE , 56 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 65*se_m_swagger2_mvl/mxv - .byte BEND , c_v+8 - .byte N01 , Cs6 , v112 - .byte W01 - .byte BEND , c_v+0 - .byte N01 , Dn6 , v100 - .byte W01 - .byte Dn6 , v060 - .byte W04 - .byte BEND , c_v-8 - .byte N01 , Ds6 , v112 - .byte W01 - .byte BEND , c_v+0 - .byte N01 , En6 , v100 - .byte W01 - .byte En6 , v060 - .byte W04 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_swagger2: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_swagger2_pri @ Priority - .byte se_m_swagger2_rev @ Reverb. - - .word se_m_swagger2_grp - - .word se_m_swagger2_1 - - .end diff --git a/sound/songs/se_m_sweet_scent.s b/sound/songs/se_m_sweet_scent.s deleted file mode 100644 index 1099ba3c0..000000000 --- a/sound/songs/se_m_sweet_scent.s +++ /dev/null @@ -1,192 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_sweet_scent_grp, voicegroup_rs_sfx_2 - .equ se_m_sweet_scent_pri, 4 - .equ se_m_sweet_scent_rev, reverb_set+50 - .equ se_m_sweet_scent_mvl, 127 - .equ se_m_sweet_scent_key, 0 - .equ se_m_sweet_scent_tbs, 1 - .equ se_m_sweet_scent_exg, 0 - .equ se_m_sweet_scent_cmp, 1 - - .section .rodata - .global se_m_sweet_scent - .align 2 - -@********************** Track 1 **********************@ - -se_m_sweet_scent_1: - .byte KEYSH , se_m_sweet_scent_key+0 - .byte TEMPO , 150*se_m_sweet_scent_tbs/2 - .byte VOICE , 61 - .byte BENDR , 44 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_sweet_scent_mvl/mxv - .byte BEND , c_v+2 - .byte N36 , En3 , v096 - .byte W12 - .byte PAN , c_v-4 - .byte BEND , c_v+2 - .byte W12 - .byte PAN , c_v-10 - .byte BEND , c_v+4 - .byte W12 - .byte PAN , c_v-4 - .byte BEND , c_v+5 - .byte N36 , Fn3 - .byte W12 - .byte PAN , c_v+0 - .byte BEND , c_v+6 - .byte W12 - .byte PAN , c_v+6 - .byte BEND , c_v+7 - .byte W12 - .byte PAN , c_v+9 - .byte BEND , c_v+8 - .byte N36 , En3 , v088 - .byte W12 - .byte PAN , c_v+5 - .byte BEND , c_v+8 - .byte W12 - .byte PAN , c_v+0 - .byte BEND , c_v+9 - .byte W12 - .byte PAN , c_v-4 - .byte BEND , c_v+10 - .byte N60 , Fs3 , v056 - .byte W12 - .byte PAN , c_v-10 - .byte BEND , c_v+11 - .byte W12 - .byte PAN , c_v-4 - .byte BEND , c_v+12 - .byte W04 - .byte VOL , 103*se_m_sweet_scent_mvl/mxv - .byte W04 - .byte 97*se_m_sweet_scent_mvl/mxv - .byte W04 - .byte PAN , c_v+0 - .byte BEND , c_v+12 - .byte W01 - .byte VOL , 91*se_m_sweet_scent_mvl/mxv - .byte W05 - .byte 81*se_m_sweet_scent_mvl/mxv - .byte W03 - .byte 72*se_m_sweet_scent_mvl/mxv - .byte W03 - .byte PAN , c_v+6 - .byte BEND , c_v+13 - .byte W01 - .byte VOL , 62*se_m_sweet_scent_mvl/mxv - .byte W02 - .byte 51*se_m_sweet_scent_mvl/mxv - .byte W03 - .byte 39*se_m_sweet_scent_mvl/mxv - .byte W02 - .byte 24*se_m_sweet_scent_mvl/mxv - .byte W02 - .byte 12*se_m_sweet_scent_mvl/mxv - .byte W02 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_sweet_scent_2: - .byte KEYSH , se_m_sweet_scent_key+0 - .byte VOICE , 22 - .byte BENDR , 44 - .byte PAN , c_v+1 - .byte VOL , 38*se_m_sweet_scent_mvl/mxv - .byte BEND , c_v+1 - .byte TIE , Gn3 , v100 - .byte W03 - .byte VOL , 50*se_m_sweet_scent_mvl/mxv - .byte W04 - .byte 62*se_m_sweet_scent_mvl/mxv - .byte W02 - .byte BEND , c_v-1 - .byte W01 - .byte VOL , 65*se_m_sweet_scent_mvl/mxv - .byte W04 - .byte 74*se_m_sweet_scent_mvl/mxv - .byte W04 - .byte 78*se_m_sweet_scent_mvl/mxv - .byte BEND , c_v-2 - .byte W03 - .byte VOL , 86*se_m_sweet_scent_mvl/mxv - .byte W03 - .byte 95*se_m_sweet_scent_mvl/mxv - .byte W03 - .byte 105*se_m_sweet_scent_mvl/mxv - .byte W01 - .byte BEND , c_v-4 - .byte W03 - .byte VOL , 110*se_m_sweet_scent_mvl/mxv - .byte W13 - .byte BEND , c_v-2 - .byte W04 - .byte W10 - .byte c_v-1 - .byte W10 - .byte c_v+0 - .byte W04 - .byte W03 - .byte c_v+1 - .byte W10 - .byte c_v+1 - .byte W11 - .byte W02 - .byte c_v+2 - .byte W14 - .byte c_v+3 - .byte W08 - .byte VOL , 105*se_m_sweet_scent_mvl/mxv - .byte W03 - .byte 101*se_m_sweet_scent_mvl/mxv - .byte W05 - .byte 96*se_m_sweet_scent_mvl/mxv - .byte W04 - .byte BEND , c_v+2 - .byte W01 - .byte VOL , 91*se_m_sweet_scent_mvl/mxv - .byte W03 - .byte 86*se_m_sweet_scent_mvl/mxv - .byte W05 - .byte 78*se_m_sweet_scent_mvl/mxv - .byte W03 - .byte W02 - .byte 68*se_m_sweet_scent_mvl/mxv - .byte W01 - .byte BEND , c_v+1 - .byte W04 - .byte VOL , 58*se_m_sweet_scent_mvl/mxv - .byte W03 - .byte 48*se_m_sweet_scent_mvl/mxv - .byte W04 - .byte 37*se_m_sweet_scent_mvl/mxv - .byte BEND , c_v+0 - .byte W04 - .byte VOL , 23*se_m_sweet_scent_mvl/mxv - .byte W01 - .byte BEND , c_v-1 - .byte W02 - .byte VOL , 12*se_m_sweet_scent_mvl/mxv - .byte W03 - .byte EOT - .byte FINE - -@******************************************************@ - .align 2 - -se_m_sweet_scent: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_sweet_scent_pri @ Priority - .byte se_m_sweet_scent_rev @ Reverb. - - .word se_m_sweet_scent_grp - - .word se_m_sweet_scent_1 - .word se_m_sweet_scent_2 - - .end diff --git a/sound/songs/se_m_swift.s b/sound/songs/se_m_swift.s deleted file mode 100644 index 2c01cfcf4..000000000 --- a/sound/songs/se_m_swift.s +++ /dev/null @@ -1,111 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_swift_grp, voicegroup_rs_sfx_2 - .equ se_m_swift_pri, 4 - .equ se_m_swift_rev, reverb_set+50 - .equ se_m_swift_mvl, 127 - .equ se_m_swift_key, 0 - .equ se_m_swift_tbs, 1 - .equ se_m_swift_exg, 0 - .equ se_m_swift_cmp, 1 - - .section .rodata - .global se_m_swift - .align 2 - -@********************** Track 1 **********************@ - -se_m_swift_1: - .byte KEYSH , se_m_swift_key+0 - .byte TEMPO , 180*se_m_swift_tbs/2 - .byte VOICE , 16 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 100*se_m_swift_mvl/mxv - .byte BEND , c_v+0 - .byte N06 , Ds6 , v100 - .byte W01 - .byte BEND , c_v-11 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 90*se_m_swift_mvl/mxv - .byte BEND , c_v-20 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 77*se_m_swift_mvl/mxv - .byte BEND , c_v-37 - .byte W01 - .byte PAN , c_v+0 - .byte VOL , 37*se_m_swift_mvl/mxv - .byte BEND , c_v-47 - .byte W02 - .byte VOL , 100*se_m_swift_mvl/mxv - .byte BEND , c_v+0 - .byte N06 - .byte W01 - .byte PAN , c_v+5 - .byte BEND , c_v-11 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 90*se_m_swift_mvl/mxv - .byte BEND , c_v-20 - .byte W01 - .byte PAN , c_v+8 - .byte VOL , 77*se_m_swift_mvl/mxv - .byte BEND , c_v-37 - .byte W01 - .byte PAN , c_v-10 - .byte VOL , 37*se_m_swift_mvl/mxv - .byte BEND , c_v-47 - .byte W02 - .byte VOL , 100*se_m_swift_mvl/mxv - .byte BEND , c_v+0 - .byte N06 , Ds6 , v056 - .byte W01 - .byte PAN , c_v+5 - .byte BEND , c_v-11 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 90*se_m_swift_mvl/mxv - .byte BEND , c_v-20 - .byte W01 - .byte PAN , c_v+8 - .byte VOL , 77*se_m_swift_mvl/mxv - .byte BEND , c_v-37 - .byte W01 - .byte PAN , c_v-10 - .byte VOL , 37*se_m_swift_mvl/mxv - .byte BEND , c_v-47 - .byte W02 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_swift_2: - .byte KEYSH , se_m_swift_key+0 - .byte VOICE , 53 - .byte VOL , 100*se_m_swift_mvl/mxv - .byte W02 - .byte N06 , Cn6 , v040 - .byte W04 - .byte W02 - .byte N04 , Cn6 , v032 - .byte W04 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_swift: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_swift_pri @ Priority - .byte se_m_swift_rev @ Reverb. - - .word se_m_swift_grp - - .word se_m_swift_1 - .word se_m_swift_2 - - .end diff --git a/sound/songs/se_m_teeter_dance.s b/sound/songs/se_m_teeter_dance.s deleted file mode 100644 index 04a1e61e0..000000000 --- a/sound/songs/se_m_teeter_dance.s +++ /dev/null @@ -1,121 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_teeter_dance_grp, voicegroup_rs_sfx_2 - .equ se_m_teeter_dance_pri, 4 - .equ se_m_teeter_dance_rev, reverb_set+50 - .equ se_m_teeter_dance_mvl, 127 - .equ se_m_teeter_dance_key, 0 - .equ se_m_teeter_dance_tbs, 1 - .equ se_m_teeter_dance_exg, 0 - .equ se_m_teeter_dance_cmp, 1 - - .section .rodata - .global se_m_teeter_dance - .align 2 - -@********************** Track 1 **********************@ - -se_m_teeter_dance_1: - .byte KEYSH , se_m_teeter_dance_key+0 - .byte TEMPO , 170*se_m_teeter_dance_tbs/2 - .byte VOICE , 37 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_teeter_dance_mvl/mxv - .byte BEND , c_v-4 - .byte N03 , Gn4 , v100 - .byte W06 - .byte PAN , c_v+16 - .byte N03 , Gn4 , v056 - .byte W03 - .byte PAN , c_v+0 - .byte N03 , An5 , v100 - .byte W03 - .byte W03 - .byte PAN , c_v-15 - .byte N03 , An5 , v056 - .byte W03 - .byte PAN , c_v+0 - .byte N03 , Cn6 , v100 - .byte W06 - .byte PAN , c_v+16 - .byte N03 , Cn6 , v056 - .byte W03 - .byte PAN , c_v+0 - .byte N03 , Gn4 , v072 - .byte W03 - .byte W03 - .byte PAN , c_v-16 - .byte N03 , Gn4 , v028 - .byte W03 - .byte PAN , c_v+0 - .byte N03 , An5 , v072 - .byte W06 - .byte PAN , c_v+16 - .byte N03 , An5 , v028 - .byte W03 - .byte PAN , c_v+0 - .byte N03 , Cn6 , v072 - .byte W03 - .byte W03 - .byte PAN , c_v-16 - .byte N03 , Cn6 , v028 - .byte W03 - .byte W06 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_teeter_dance_2: - .byte KEYSH , se_m_teeter_dance_key+0 - .byte VOICE , 47 - .byte XCMD , xIECV , 10 - .byte xIECL , 8 - .byte MOD , 20 - .byte VOL , 44*se_m_teeter_dance_mvl/mxv - .byte BEND , c_v-2 - .byte W03 - .byte N03 , Gn3 , v112 - .byte W03 - .byte W03 - .byte Gn3 , v068 - .byte W03 - .byte An4 , v112 - .byte W06 - .byte An4 , v068 - .byte W03 - .byte Cn5 , v112 - .byte W03 - .byte W03 - .byte Cn5 , v068 - .byte W03 - .byte Gn3 , v080 - .byte W06 - .byte Gn3 , v036 - .byte W03 - .byte An4 , v080 - .byte W03 - .byte W03 - .byte An4 , v036 - .byte W03 - .byte Cn5 , v080 - .byte W06 - .byte Cn5 , v036 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_teeter_dance: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_teeter_dance_pri @ Priority - .byte se_m_teeter_dance_rev @ Reverb. - - .word se_m_teeter_dance_grp - - .word se_m_teeter_dance_1 - .word se_m_teeter_dance_2 - - .end diff --git a/sound/songs/se_m_teleport.s b/sound/songs/se_m_teleport.s deleted file mode 100644 index 8a4f676ba..000000000 --- a/sound/songs/se_m_teleport.s +++ /dev/null @@ -1,165 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_teleport_grp, voicegroup_rs_sfx_2 - .equ se_m_teleport_pri, 4 - .equ se_m_teleport_rev, reverb_set+50 - .equ se_m_teleport_mvl, 127 - .equ se_m_teleport_key, 0 - .equ se_m_teleport_tbs, 1 - .equ se_m_teleport_exg, 0 - .equ se_m_teleport_cmp, 1 - - .section .rodata - .global se_m_teleport - .align 2 - -@********************** Track 1 **********************@ - -se_m_teleport_1: - .byte KEYSH , se_m_teleport_key+0 - .byte TEMPO , 150*se_m_teleport_tbs/2 - .byte VOICE , 45 - .byte BENDR , 24 - .byte PAN , c_v+0 - .byte VOL , 32*se_m_teleport_mvl/mxv - .byte MOD , 30 - .byte BEND , c_v+0 - .byte N06 , Cn3 , v127 - .byte W01 - .byte BEND , c_v+4 - .byte W01 - .byte VOL , 49*se_m_teleport_mvl/mxv - .byte PAN , c_v+5 - .byte BEND , c_v+9 - .byte W01 - .byte c_v+16 - .byte W01 - .byte VOL , 61*se_m_teleport_mvl/mxv - .byte BEND , c_v+24 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+2 - .byte N06 , Dn3 , v116 - .byte W01 - .byte VOL , 71*se_m_teleport_mvl/mxv - .byte BEND , c_v+7 - .byte W01 - .byte PAN , c_v-4 - .byte BEND , c_v+12 - .byte W01 - .byte VOL , 81*se_m_teleport_mvl/mxv - .byte BEND , c_v+18 - .byte W01 - .byte c_v+27 - .byte W02 - .byte VOL , 95*se_m_teleport_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+4 - .byte N06 , En3 , v112 - .byte W01 - .byte BEND , c_v+9 - .byte W01 - .byte PAN , c_v+6 - .byte BEND , c_v+14 - .byte W01 - .byte c_v+20 - .byte W01 - .byte c_v+29 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+6 - .byte N06 , Fn3 - .byte W01 - .byte BEND , c_v+11 - .byte W01 - .byte PAN , c_v-6 - .byte BEND , c_v+15 - .byte W01 - .byte c_v+22 - .byte W01 - .byte c_v+31 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+9 - .byte N06 , Gn3 , v108 - .byte W01 - .byte BEND , c_v+14 - .byte W01 - .byte PAN , c_v+8 - .byte BEND , c_v+18 - .byte W01 - .byte c_v+25 - .byte W01 - .byte c_v+34 - .byte W02 - .byte VOL , 82*se_m_teleport_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+14 - .byte N06 , An3 , v100 - .byte W01 - .byte BEND , c_v+18 - .byte W01 - .byte VOL , 71*se_m_teleport_mvl/mxv - .byte PAN , c_v-8 - .byte BEND , c_v+23 - .byte W01 - .byte c_v+30 - .byte W01 - .byte VOL , 61*se_m_teleport_mvl/mxv - .byte BEND , c_v+38 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+14 - .byte N06 , Bn3 , v060 - .byte W01 - .byte BEND , c_v+18 - .byte W01 - .byte PAN , c_v+8 - .byte BEND , c_v+23 - .byte W01 - .byte c_v+30 - .byte W01 - .byte c_v+38 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+14 - .byte N06 , Cn4 , v040 - .byte W01 - .byte BEND , c_v+18 - .byte W01 - .byte PAN , c_v-8 - .byte BEND , c_v+23 - .byte W01 - .byte c_v+30 - .byte W01 - .byte c_v+38 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+14 - .byte N06 , Dn4 , v020 - .byte W01 - .byte BEND , c_v+18 - .byte W01 - .byte PAN , c_v+8 - .byte BEND , c_v+23 - .byte W01 - .byte c_v+30 - .byte W01 - .byte c_v+38 - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_teleport: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_teleport_pri @ Priority - .byte se_m_teleport_rev @ Reverb. - - .word se_m_teleport_grp - - .word se_m_teleport_1 - - .end diff --git a/sound/songs/se_m_thunder_wave.s b/sound/songs/se_m_thunder_wave.s deleted file mode 100644 index 6d0a585e3..000000000 --- a/sound/songs/se_m_thunder_wave.s +++ /dev/null @@ -1,106 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_thunder_wave_grp, voicegroup_rs_sfx_2 - .equ se_m_thunder_wave_pri, 4 - .equ se_m_thunder_wave_rev, reverb_set+50 - .equ se_m_thunder_wave_mvl, 127 - .equ se_m_thunder_wave_key, 0 - .equ se_m_thunder_wave_tbs, 1 - .equ se_m_thunder_wave_exg, 0 - .equ se_m_thunder_wave_cmp, 1 - - .section .rodata - .global se_m_thunder_wave - .align 2 - -@********************** Track 1 **********************@ - -se_m_thunder_wave_1: - .byte KEYSH , se_m_thunder_wave_key+0 - .byte TEMPO , 150*se_m_thunder_wave_tbs/2 - .byte VOICE , 18 - .byte VOL , 110*se_m_thunder_wave_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+32 - .byte N06 , Gn3 , v127 - .byte W02 - .byte PAN , c_v-8 - .byte W01 - .byte BEND , c_v+0 - .byte W03 - .byte PAN , c_v+0 - .byte BEND , c_v+32 - .byte N04 , Cn3 - .byte W02 - .byte PAN , c_v+9 - .byte W01 - .byte BEND , c_v-12 - .byte W03 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N01 , Gn3 - .byte W02 - .byte Bn2 - .byte W02 - .byte N13 , Gn3 - .byte W02 - .byte VOL , 96*se_m_thunder_wave_mvl/mxv - .byte W01 - .byte 85*se_m_thunder_wave_mvl/mxv - .byte W01 - .byte BEND , c_v-23 - .byte W01 - .byte VOL , 66*se_m_thunder_wave_mvl/mxv - .byte W01 - .byte BEND , c_v-40 - .byte W01 - .byte VOL , 36*se_m_thunder_wave_mvl/mxv - .byte W01 - .byte BEND , c_v-54 - .byte W02 - .byte VOL , 12*se_m_thunder_wave_mvl/mxv - .byte W01 - .byte BEND , c_v-64 - .byte W21 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_thunder_wave_2: - .byte KEYSH , se_m_thunder_wave_key+0 - .byte VOICE , 5 - .byte VOL , 110*se_m_thunder_wave_mvl/mxv - .byte PAN , c_v-7 - .byte N02 , En3 , v052 - .byte W04 - .byte PAN , c_v+10 - .byte N02 , En3 , v044 - .byte W04 - .byte PAN , c_v-7 - .byte N02 , En3 , v036 - .byte W04 - .byte PAN , c_v+10 - .byte N02 , En3 , v028 - .byte W04 - .byte PAN , c_v-7 - .byte N02 , En3 , v020 - .byte W08 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_thunder_wave: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_thunder_wave_pri @ Priority - .byte se_m_thunder_wave_rev @ Reverb. - - .word se_m_thunder_wave_grp - - .word se_m_thunder_wave_1 - .word se_m_thunder_wave_2 - - .end diff --git a/sound/songs/se_m_thunderbolt.s b/sound/songs/se_m_thunderbolt.s deleted file mode 100644 index 7b1868fbe..000000000 --- a/sound/songs/se_m_thunderbolt.s +++ /dev/null @@ -1,117 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_thunderbolt_grp, voicegroup_rs_sfx_2 - .equ se_m_thunderbolt_pri, 4 - .equ se_m_thunderbolt_rev, reverb_set+50 - .equ se_m_thunderbolt_mvl, 127 - .equ se_m_thunderbolt_key, 0 - .equ se_m_thunderbolt_tbs, 1 - .equ se_m_thunderbolt_exg, 0 - .equ se_m_thunderbolt_cmp, 1 - - .section .rodata - .global se_m_thunderbolt - .align 2 - -@********************** Track 1 **********************@ - -se_m_thunderbolt_1: - .byte KEYSH , se_m_thunderbolt_key+0 - .byte TEMPO , 220*se_m_thunderbolt_tbs/2 - .byte VOICE , 18 - .byte VOL , 120*se_m_thunderbolt_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+32 - .byte N06 , Dn3 , v127 - .byte W02 - .byte PAN , c_v-8 - .byte W01 - .byte BEND , c_v+0 - .byte W01 - .byte PAN , c_v-16 - .byte W02 - .byte c_v+0 - .byte BEND , c_v+32 - .byte N06 , Dn2 , v104 - .byte W02 - .byte PAN , c_v+9 - .byte W01 - .byte BEND , c_v-12 - .byte W01 - .byte PAN , c_v+16 - .byte W02 - .byte c_v+0 - .byte BEND , c_v+0 - .byte N21 , Dn3 , v127 - .byte W03 - .byte PAN , c_v-8 - .byte W03 - .byte c_v-15 - .byte W01 - .byte BEND , c_v-13 - .byte W02 - .byte PAN , c_v-7 - .byte W01 - .byte BEND , c_v-23 - .byte W02 - .byte VOL , 100*se_m_thunderbolt_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-40 - .byte W01 - .byte VOL , 86*se_m_thunderbolt_mvl/mxv - .byte W01 - .byte BEND , c_v-54 - .byte W01 - .byte PAN , c_v+10 - .byte VOL , 68*se_m_thunderbolt_mvl/mxv - .byte W02 - .byte 37*se_m_thunderbolt_mvl/mxv - .byte BEND , c_v-64 - .byte W01 - .byte PAN , c_v+16 - .byte W02 - .byte VOL , 17*se_m_thunderbolt_mvl/mxv - .byte W01 - .byte PAN , c_v+10 - .byte W15 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_thunderbolt_2: - .byte KEYSH , se_m_thunderbolt_key+0 - .byte VOICE , 5 - .byte VOL , 120*se_m_thunderbolt_mvl/mxv - .byte PAN , c_v-7 - .byte N02 , En3 , v048 - .byte W05 - .byte PAN , c_v+10 - .byte N02 , En3 , v040 - .byte W06 - .byte PAN , c_v-7 - .byte N02 , En3 , v032 - .byte W07 - .byte PAN , c_v+10 - .byte N02 , En3 , v024 - .byte W06 - .byte PAN , c_v-7 - .byte N02 , En3 , v016 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_thunderbolt: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_thunderbolt_pri @ Priority - .byte se_m_thunderbolt_rev @ Reverb. - - .word se_m_thunderbolt_grp - - .word se_m_thunderbolt_1 - .word se_m_thunderbolt_2 - - .end diff --git a/sound/songs/se_m_thunderbolt2.s b/sound/songs/se_m_thunderbolt2.s deleted file mode 100644 index 9725b58f5..000000000 --- a/sound/songs/se_m_thunderbolt2.s +++ /dev/null @@ -1,85 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_thunderbolt2_grp, voicegroup_rs_sfx_2 - .equ se_m_thunderbolt2_pri, 4 - .equ se_m_thunderbolt2_rev, reverb_set+50 - .equ se_m_thunderbolt2_mvl, 127 - .equ se_m_thunderbolt2_key, 0 - .equ se_m_thunderbolt2_tbs, 1 - .equ se_m_thunderbolt2_exg, 0 - .equ se_m_thunderbolt2_cmp, 1 - - .section .rodata - .global se_m_thunderbolt2 - .align 2 - -@********************** Track 1 **********************@ - -se_m_thunderbolt2_1: - .byte KEYSH , se_m_thunderbolt2_key+0 - .byte TEMPO , 220*se_m_thunderbolt2_tbs/2 - .byte VOICE , 18 - .byte VOL , 100*se_m_thunderbolt2_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N03 , Cn4 , v088 - .byte W06 - .byte PAN , c_v-9 - .byte N03 , Cn4 , v080 - .byte W06 - .byte PAN , c_v+9 - .byte N03 , Cn4 , v072 - .byte W06 - .byte PAN , c_v-16 - .byte N03 , Cn4 , v064 - .byte W06 - .byte PAN , c_v+16 - .byte N03 , Cn4 , v060 - .byte W06 - .byte PAN , c_v-16 - .byte N03 , Cn4 , v052 - .byte W18 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_thunderbolt2_2: - .byte KEYSH , se_m_thunderbolt2_key+0 - .byte VOICE , 5 - .byte VOL , 100*se_m_thunderbolt2_mvl/mxv - .byte PAN , c_v+9 - .byte N02 , Gn3 , v072 - .byte W06 - .byte PAN , c_v-7 - .byte N02 , Gn3 , v068 - .byte W06 - .byte PAN , c_v+9 - .byte N02 , Gn3 , v064 - .byte W06 - .byte PAN , c_v-7 - .byte N02 , Gn3 , v060 - .byte W06 - .byte PAN , c_v+9 - .byte N02 , Gn3 , v056 - .byte W06 - .byte PAN , c_v-7 - .byte N02 , Gn3 , v048 - .byte W18 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_thunderbolt2: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_thunderbolt2_pri @ Priority - .byte se_m_thunderbolt2_rev @ Reverb. - - .word se_m_thunderbolt2_grp - - .word se_m_thunderbolt2_1 - .word se_m_thunderbolt2_2 - - .end diff --git a/sound/songs/se_m_toxic.s b/sound/songs/se_m_toxic.s deleted file mode 100644 index 3008bc031..000000000 --- a/sound/songs/se_m_toxic.s +++ /dev/null @@ -1,87 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_toxic_grp, voicegroup_rs_sfx_2 - .equ se_m_toxic_pri, 4 - .equ se_m_toxic_rev, reverb_set+50 - .equ se_m_toxic_mvl, 127 - .equ se_m_toxic_key, 0 - .equ se_m_toxic_tbs, 1 - .equ se_m_toxic_exg, 0 - .equ se_m_toxic_cmp, 1 - - .section .rodata - .global se_m_toxic - .align 2 - -@********************** Track 1 **********************@ - -se_m_toxic_1: - .byte KEYSH , se_m_toxic_key+0 - .byte TEMPO , 150*se_m_toxic_tbs/2 - .byte VOICE , 31 - .byte VOL , 110*se_m_toxic_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N02 , Dn2 , v127 - .byte W01 - .byte BEND , c_v+32 - .byte W01 - .byte VOICE , 23 - .byte BEND , c_v+0 - .byte N02 , Gn1 , v112 - .byte W01 - .byte PAN , c_v+8 - .byte BEND , c_v+63 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N02 , Cn2 - .byte W02 - .byte PAN , c_v-7 - .byte BEND , c_v+16 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte W01 - .byte N01 - .byte W01 - .byte PAN , c_v+8 - .byte N01 , Cn3 - .byte W01 - .byte VOICE , 31 - .byte PAN , c_v-16 - .byte N01 , Dn2 - .byte W02 - .byte VOICE , 23 - .byte PAN , c_v+0 - .byte N01 , Cn2 - .byte W01 - .byte VOICE , 31 - .byte PAN , c_v+16 - .byte N01 , Dn2 , v096 - .byte W01 - .byte VOICE , 23 - .byte PAN , c_v-8 - .byte BEND , c_v+16 - .byte N01 , Cn3 - .byte W02 - .byte PAN , c_v+8 - .byte N01 , Cn2 - .byte W08 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_toxic: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_toxic_pri @ Priority - .byte se_m_toxic_rev @ Reverb. - - .word se_m_toxic_grp - - .word se_m_toxic_1 - - .end diff --git a/sound/songs/se_m_tri_attack.s b/sound/songs/se_m_tri_attack.s deleted file mode 100644 index 2a0bd1d4f..000000000 --- a/sound/songs/se_m_tri_attack.s +++ /dev/null @@ -1,99 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_tri_attack_grp, voicegroup_rs_sfx_2 - .equ se_m_tri_attack_pri, 4 - .equ se_m_tri_attack_rev, reverb_set+50 - .equ se_m_tri_attack_mvl, 127 - .equ se_m_tri_attack_key, 0 - .equ se_m_tri_attack_tbs, 1 - .equ se_m_tri_attack_exg, 0 - .equ se_m_tri_attack_cmp, 1 - - .section .rodata - .global se_m_tri_attack - .align 2 - -@********************** Track 1 **********************@ - -se_m_tri_attack_1: - .byte KEYSH , se_m_tri_attack_key+0 - .byte TEMPO , 220*se_m_tri_attack_tbs/2 - .byte VOICE , 58 - .byte BENDR , 24 - .byte PAN , c_v+0 - .byte VOL , 19*se_m_tri_attack_mvl/mxv - .byte BEND , c_v-32 - .byte N16 , Gn1 , v127 - .byte W01 - .byte VOL , 43*se_m_tri_attack_mvl/mxv - .byte BEND , c_v-20 - .byte W01 - .byte VOL , 72*se_m_tri_attack_mvl/mxv - .byte BEND , c_v-8 - .byte W01 - .byte VOL , 92*se_m_tri_attack_mvl/mxv - .byte BEND , c_v+7 - .byte W01 - .byte VOL , 109*se_m_tri_attack_mvl/mxv - .byte BEND , c_v+19 - .byte W02 - .byte c_v+28 - .byte W01 - .byte c_v+40 - .byte W01 - .byte c_v+28 - .byte W01 - .byte VOL , 102*se_m_tri_attack_mvl/mxv - .byte BEND , c_v+19 - .byte W01 - .byte VOL , 88*se_m_tri_attack_mvl/mxv - .byte BEND , c_v+5 - .byte W02 - .byte VOL , 69*se_m_tri_attack_mvl/mxv - .byte BEND , c_v-9 - .byte W01 - .byte VOL , 37*se_m_tri_attack_mvl/mxv - .byte BEND , c_v-20 - .byte W01 - .byte VOL , 17*se_m_tri_attack_mvl/mxv - .byte BEND , c_v-34 - .byte W10 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_tri_attack_2: - .byte KEYSH , se_m_tri_attack_key+0 - .byte VOICE , 4 - .byte VOL , 110*se_m_tri_attack_mvl/mxv - .byte N02 , Gs3 , v032 - .byte W02 - .byte Gn3 - .byte W02 - .byte Fn3 - .byte W03 - .byte En3 - .byte W02 - .byte Dn3 - .byte W03 - .byte Cn3 - .byte W02 - .byte Gs2 - .byte W10 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_tri_attack: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_tri_attack_pri @ Priority - .byte se_m_tri_attack_rev @ Reverb. - - .word se_m_tri_attack_grp - - .word se_m_tri_attack_1 - .word se_m_tri_attack_2 - - .end diff --git a/sound/songs/se_m_tri_attack2.s b/sound/songs/se_m_tri_attack2.s deleted file mode 100644 index a54ee3df0..000000000 --- a/sound/songs/se_m_tri_attack2.s +++ /dev/null @@ -1,124 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_tri_attack2_grp, voicegroup_rs_sfx_2 - .equ se_m_tri_attack2_pri, 4 - .equ se_m_tri_attack2_rev, reverb_set+50 - .equ se_m_tri_attack2_mvl, 127 - .equ se_m_tri_attack2_key, 0 - .equ se_m_tri_attack2_tbs, 1 - .equ se_m_tri_attack2_exg, 0 - .equ se_m_tri_attack2_cmp, 1 - - .section .rodata - .global se_m_tri_attack2 - .align 2 - -@********************** Track 1 **********************@ - -se_m_tri_attack2_1: - .byte KEYSH , se_m_tri_attack2_key+0 - .byte TEMPO , 220*se_m_tri_attack2_tbs/2 - .byte VOICE , 18 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_tri_attack2_mvl/mxv - .byte BEND , c_v+0 - .byte N09 , An3 , v127 - .byte W03 - .byte BEND , c_v+21 - .byte W03 - .byte c_v+0 - .byte W03 - .byte c_v+6 - .byte N15 , An3 , v120 - .byte W03 - .byte BEND , c_v+2 - .byte W01 - .byte PAN , c_v+10 - .byte W02 - .byte BEND , c_v-9 - .byte W03 - .byte PAN , c_v-9 - .byte BEND , c_v-29 - .byte W06 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N09 , Cn3 , v127 - .byte W06 - .byte BEND , c_v-8 - .byte W03 - .byte c_v-15 - .byte N60 , Cs3 , v124 - .byte W03 - .byte BEND , c_v-4 - .byte W03 - .byte PAN , c_v+10 - .byte W06 - .byte c_v+0 - .byte BEND , c_v-8 - .byte W03 - .byte W03 - .byte PAN , c_v-9 - .byte W03 - .byte BEND , c_v-13 - .byte W03 - .byte PAN , c_v+0 - .byte BEND , c_v-22 - .byte W06 - .byte VOL , 103*se_m_tri_attack2_mvl/mxv - .byte PAN , c_v+10 - .byte W03 - .byte BEND , c_v-32 - .byte W03 - .byte PAN , c_v+0 - .byte W03 - .byte VOL , 95*se_m_tri_attack2_mvl/mxv - .byte BEND , c_v-38 - .byte W03 - .byte PAN , c_v-9 - .byte W05 - .byte BEND , c_v-45 - .byte W01 - .byte VOL , 66*se_m_tri_attack2_mvl/mxv - .byte PAN , c_v+0 - .byte W05 - .byte c_v+10 - .byte W01 - .byte BEND , c_v-52 - .byte W03 - .byte VOL , 21*se_m_tri_attack2_mvl/mxv - .byte W02 - .byte PAN , c_v+0 - .byte W04 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_tri_attack2_2: - .byte KEYSH , se_m_tri_attack2_key+0 - .byte VOICE , 4 - .byte VOL , 110*se_m_tri_attack2_mvl/mxv - .byte N06 , Cn3 , v060 - .byte W09 - .byte N15 - .byte W15 - .byte W24 - .byte W24 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_tri_attack2: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_tri_attack2_pri @ Priority - .byte se_m_tri_attack2_rev @ Reverb. - - .word se_m_tri_attack2_grp - - .word se_m_tri_attack2_1 - .word se_m_tri_attack2_2 - - .end diff --git a/sound/songs/se_m_twister.s b/sound/songs/se_m_twister.s deleted file mode 100644 index a739c89c4..000000000 --- a/sound/songs/se_m_twister.s +++ /dev/null @@ -1,210 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_twister_grp, voicegroup_rs_sfx_2 - .equ se_m_twister_pri, 4 - .equ se_m_twister_rev, reverb_set+50 - .equ se_m_twister_mvl, 127 - .equ se_m_twister_key, 0 - .equ se_m_twister_tbs, 1 - .equ se_m_twister_exg, 0 - .equ se_m_twister_cmp, 1 - - .section .rodata - .global se_m_twister - .align 2 - -@********************** Track 1 **********************@ - -se_m_twister_1: - .byte KEYSH , se_m_twister_key+0 - .byte TEMPO , 150*se_m_twister_tbs/2 - .byte VOICE , 22 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 67*se_m_twister_mvl/mxv - .byte BEND , c_v+0 - .byte TIE , Dn2 , v127 - .byte W03 - .byte VOL , 83*se_m_twister_mvl/mxv - .byte BEND , c_v+22 - .byte W03 - .byte VOL , 88*se_m_twister_mvl/mxv - .byte PAN , c_v-4 - .byte W03 - .byte VOL , 95*se_m_twister_mvl/mxv - .byte W02 - .byte BEND , c_v+8 - .byte W01 - .byte VOL , 105*se_m_twister_mvl/mxv - .byte PAN , c_v-8 - .byte W03 - .byte VOL , 115*se_m_twister_mvl/mxv - .byte W02 - .byte BEND , c_v+0 - .byte W01 - .byte PAN , c_v-12 - .byte W06 - .byte c_v-17 - .byte BEND , c_v+0 - .byte W03 - .byte c_v-7 - .byte W03 - .byte PAN , c_v-9 - .byte W06 - .byte c_v-3 - .byte W01 - .byte BEND , c_v-12 - .byte W02 - .byte PAN , c_v+6 - .byte W03 - .byte c_v+10 - .byte W06 - .byte c_v+16 - .byte W01 - .byte BEND , c_v-20 - .byte W05 - .byte PAN , c_v+13 - .byte W06 - .byte c_v+8 - .byte W03 - .byte c_v+0 - .byte W01 - .byte BEND , c_v-13 - .byte W02 - .byte PAN , c_v-8 - .byte W03 - .byte c_v-11 - .byte W03 - .byte c_v-17 - .byte W01 - .byte BEND , c_v-6 - .byte W05 - .byte PAN , c_v-9 - .byte W06 - .byte c_v-3 - .byte W03 - .byte c_v+6 - .byte W03 - .byte c_v+10 - .byte W01 - .byte BEND , c_v+6 - .byte W05 - .byte PAN , c_v+16 - .byte W06 - .byte c_v+13 - .byte W06 - .byte c_v+8 - .byte W03 - .byte c_v+0 - .byte BEND , c_v+11 - .byte W03 - .byte PAN , c_v-8 - .byte W03 - .byte c_v-11 - .byte VOL , 103*se_m_twister_mvl/mxv - .byte W03 - .byte PAN , c_v-17 - .byte W01 - .byte BEND , c_v+20 - .byte W05 - .byte PAN , c_v-9 - .byte W01 - .byte VOL , 97*se_m_twister_mvl/mxv - .byte W05 - .byte PAN , c_v-3 - .byte W01 - .byte BEND , c_v+12 - .byte W02 - .byte PAN , c_v+6 - .byte VOL , 88*se_m_twister_mvl/mxv - .byte W03 - .byte PAN , c_v+10 - .byte W02 - .byte BEND , c_v+7 - .byte W02 - .byte VOL , 79*se_m_twister_mvl/mxv - .byte W02 - .byte PAN , c_v+16 - .byte W04 - .byte VOL , 62*se_m_twister_mvl/mxv - .byte BEND , c_v+0 - .byte W02 - .byte PAN , c_v+13 - .byte W04 - .byte VOL , 45*se_m_twister_mvl/mxv - .byte W02 - .byte PAN , c_v+8 - .byte W01 - .byte BEND , c_v-7 - .byte W01 - .byte VOL , 33*se_m_twister_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte W03 - .byte c_v-8 - .byte W01 - .byte VOL , 18*se_m_twister_mvl/mxv - .byte W02 - .byte PAN , c_v-11 - .byte W03 - .byte EOT - .byte FINE - -@********************** Track 2 **********************@ - -se_m_twister_2: - .byte KEYSH , se_m_twister_key+0 - .byte VOICE , 25 - .byte VOL , 67*se_m_twister_mvl/mxv - .byte TIE , Gs4 , v012 - .byte W03 - .byte VOL , 83*se_m_twister_mvl/mxv - .byte W03 - .byte 88*se_m_twister_mvl/mxv - .byte W03 - .byte 95*se_m_twister_mvl/mxv - .byte W03 - .byte 105*se_m_twister_mvl/mxv - .byte W03 - .byte 115*se_m_twister_mvl/mxv - .byte W09 - .byte W24 - .byte W24 - .byte W24 - .byte W21 - .byte 103*se_m_twister_mvl/mxv - .byte W03 - .byte W07 - .byte 97*se_m_twister_mvl/mxv - .byte W08 - .byte 88*se_m_twister_mvl/mxv - .byte W07 - .byte 79*se_m_twister_mvl/mxv - .byte W02 - .byte W04 - .byte 62*se_m_twister_mvl/mxv - .byte W06 - .byte 45*se_m_twister_mvl/mxv - .byte W04 - .byte 33*se_m_twister_mvl/mxv - .byte W05 - .byte 18*se_m_twister_mvl/mxv - .byte W05 - .byte EOT - .byte FINE - -@******************************************************@ - .align 2 - -se_m_twister: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_twister_pri @ Priority - .byte se_m_twister_rev @ Reverb. - - .word se_m_twister_grp - - .word se_m_twister_1 - .word se_m_twister_2 - - .end diff --git a/sound/songs/se_m_uproar.s b/sound/songs/se_m_uproar.s deleted file mode 100644 index 2bf7804d5..000000000 --- a/sound/songs/se_m_uproar.s +++ /dev/null @@ -1,86 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_uproar_grp, voicegroup_rs_sfx_2 - .equ se_m_uproar_pri, 4 - .equ se_m_uproar_rev, reverb_set+50 - .equ se_m_uproar_mvl, 127 - .equ se_m_uproar_key, 0 - .equ se_m_uproar_tbs, 1 - .equ se_m_uproar_exg, 0 - .equ se_m_uproar_cmp, 1 - - .section .rodata - .global se_m_uproar - .align 2 - -@********************** Track 1 **********************@ - -se_m_uproar_1: - .byte KEYSH , se_m_uproar_key+0 - .byte TEMPO , 150*se_m_uproar_tbs/2 - .byte VOICE , 60 - .byte BENDR , 12 - .byte VOL , 25*se_m_uproar_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N24 , Gs2 , v127 - .byte W01 - .byte PAN , c_v+2 - .byte VOL , 51*se_m_uproar_mvl/mxv - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 74*se_m_uproar_mvl/mxv - .byte W01 - .byte 89*se_m_uproar_mvl/mxv - .byte BEND , c_v+1 - .byte W01 - .byte PAN , c_v+2 - .byte VOL , 100*se_m_uproar_mvl/mxv - .byte W02 - .byte PAN , c_v+0 - .byte W01 - .byte c_v-2 - .byte BEND , c_v+4 - .byte W01 - .byte PAN , c_v-4 - .byte W02 - .byte c_v-2 - .byte BEND , c_v+5 - .byte W02 - .byte PAN , c_v+0 - .byte W01 - .byte c_v+2 - .byte W01 - .byte c_v+5 - .byte W02 - .byte c_v+2 - .byte W02 - .byte c_v+0 - .byte W01 - .byte VOL , 85*se_m_uproar_mvl/mxv - .byte PAN , c_v-2 - .byte W01 - .byte c_v-4 - .byte VOL , 62*se_m_uproar_mvl/mxv - .byte W01 - .byte 33*se_m_uproar_mvl/mxv - .byte W01 - .byte PAN , c_v-2 - .byte VOL , 11*se_m_uproar_mvl/mxv - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_uproar: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_uproar_pri @ Priority - .byte se_m_uproar_rev @ Reverb. - - .word se_m_uproar_grp - - .word se_m_uproar_1 - - .end diff --git a/sound/songs/se_m_vital_throw.s b/sound/songs/se_m_vital_throw.s deleted file mode 100644 index aebda904f..000000000 --- a/sound/songs/se_m_vital_throw.s +++ /dev/null @@ -1,75 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_vital_throw_grp, voicegroup_rs_sfx_2 - .equ se_m_vital_throw_pri, 4 - .equ se_m_vital_throw_rev, reverb_set+50 - .equ se_m_vital_throw_mvl, 127 - .equ se_m_vital_throw_key, 0 - .equ se_m_vital_throw_tbs, 1 - .equ se_m_vital_throw_exg, 0 - .equ se_m_vital_throw_cmp, 1 - - .section .rodata - .global se_m_vital_throw - .align 2 - -@********************** Track 1 **********************@ - -se_m_vital_throw_1: - .byte KEYSH , se_m_vital_throw_key+0 - .byte TEMPO , 220*se_m_vital_throw_tbs/2 - .byte VOICE , 22 - .byte VOL , 110*se_m_vital_throw_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+16 - .byte BEND , c_v+46 - .byte N09 , Cn3 , v127 - .byte W03 - .byte VOL , 104*se_m_vital_throw_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+23 - .byte W03 - .byte VOL , 93*se_m_vital_throw_mvl/mxv - .byte PAN , c_v-16 - .byte BEND , c_v-15 - .byte W03 - .byte VOICE , 21 - .byte VOL , 110*se_m_vital_throw_mvl/mxv - .byte BEND , c_v+0 - .byte N03 , Gn4 - .byte W06 - .byte PAN , c_v+16 - .byte N03 , Cn5 - .byte W09 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_vital_throw_2: - .byte KEYSH , se_m_vital_throw_key+0 - .byte VOICE , 4 - .byte VOL , 110*se_m_vital_throw_mvl/mxv - .byte W09 - .byte PAN , c_v+8 - .byte N03 , Cn3 , v052 - .byte W06 - .byte PAN , c_v-7 - .byte N03 - .byte W09 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_vital_throw: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_vital_throw_pri @ Priority - .byte se_m_vital_throw_rev @ Reverb. - - .word se_m_vital_throw_grp - - .word se_m_vital_throw_1 - .word se_m_vital_throw_2 - - .end diff --git a/sound/songs/se_m_vital_throw2.s b/sound/songs/se_m_vital_throw2.s deleted file mode 100644 index 34a758c6e..000000000 --- a/sound/songs/se_m_vital_throw2.s +++ /dev/null @@ -1,108 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_vital_throw2_grp, voicegroup_rs_sfx_2 - .equ se_m_vital_throw2_pri, 4 - .equ se_m_vital_throw2_rev, reverb_set+50 - .equ se_m_vital_throw2_mvl, 127 - .equ se_m_vital_throw2_key, 0 - .equ se_m_vital_throw2_tbs, 1 - .equ se_m_vital_throw2_exg, 0 - .equ se_m_vital_throw2_cmp, 1 - - .section .rodata - .global se_m_vital_throw2 - .align 2 - -@********************** Track 1 **********************@ - -se_m_vital_throw2_1: - .byte KEYSH , se_m_vital_throw2_key+0 - .byte TEMPO , 220*se_m_vital_throw2_tbs/2 - .byte VOICE , 6 - .byte VOL , 110*se_m_vital_throw2_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N06 , Cn3 , v127 - .byte W01 - .byte BEND , c_v-9 - .byte W01 - .byte c_v-21 - .byte W01 - .byte PAN , c_v-6 - .byte BEND , c_v-40 - .byte W01 - .byte c_v-64 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N06 , En3 - .byte W01 - .byte BEND , c_v-9 - .byte W01 - .byte c_v-21 - .byte W01 - .byte PAN , c_v+7 - .byte BEND , c_v-40 - .byte W01 - .byte c_v-64 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N09 , An2 - .byte W01 - .byte BEND , c_v-9 - .byte W01 - .byte c_v-19 - .byte W01 - .byte c_v-29 - .byte W01 - .byte VOL , 86*se_m_vital_throw2_mvl/mxv - .byte BEND , c_v-39 - .byte W02 - .byte VOL , 69*se_m_vital_throw2_mvl/mxv - .byte BEND , c_v-45 - .byte W01 - .byte VOL , 53*se_m_vital_throw2_mvl/mxv - .byte BEND , c_v-56 - .byte W01 - .byte VOL , 20*se_m_vital_throw2_mvl/mxv - .byte BEND , c_v-64 - .byte W04 - .byte c_v-64 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_vital_throw2_2: - .byte KEYSH , se_m_vital_throw2_key+0 - .byte VOICE , 5 - .byte XCMD , xIECV , 10 - .byte xIECL , 8 - .byte VOL , 110*se_m_vital_throw2_mvl/mxv - .byte PAN , c_v+9 - .byte N03 , Gs2 , v052 - .byte W06 - .byte PAN , c_v-7 - .byte N03 - .byte W06 - .byte PAN , c_v+0 - .byte N03 - .byte W12 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_vital_throw2: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_vital_throw2_pri @ Priority - .byte se_m_vital_throw2_rev @ Reverb. - - .word se_m_vital_throw2_grp - - .word se_m_vital_throw2_1 - .word se_m_vital_throw2_2 - - .end diff --git a/sound/songs/se_m_waterfall.s b/sound/songs/se_m_waterfall.s deleted file mode 100644 index ad91010e7..000000000 --- a/sound/songs/se_m_waterfall.s +++ /dev/null @@ -1,137 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_waterfall_grp, voicegroup_rs_sfx_2 - .equ se_m_waterfall_pri, 4 - .equ se_m_waterfall_rev, reverb_set+50 - .equ se_m_waterfall_mvl, 127 - .equ se_m_waterfall_key, 0 - .equ se_m_waterfall_tbs, 1 - .equ se_m_waterfall_exg, 0 - .equ se_m_waterfall_cmp, 1 - - .section .rodata - .global se_m_waterfall - .align 2 - -@********************** Track 1 **********************@ - -se_m_waterfall_1: - .byte KEYSH , se_m_waterfall_key+0 - .byte TEMPO , 150*se_m_waterfall_tbs/2 - .byte VOICE , 36 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 115*se_m_waterfall_mvl/mxv - .byte BEND , c_v-18 - .byte N60 , Gn2 , v127 - .byte W03 - .byte PAN , c_v+3 - .byte BEND , c_v-16 - .byte W04 - .byte PAN , c_v+6 - .byte BEND , c_v-14 - .byte W03 - .byte PAN , c_v+3 - .byte BEND , c_v-11 - .byte W02 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v-8 - .byte W04 - .byte PAN , c_v-3 - .byte BEND , c_v-5 - .byte W03 - .byte PAN , c_v-6 - .byte BEND , c_v-2 - .byte W03 - .byte W01 - .byte PAN , c_v-3 - .byte BEND , c_v+1 - .byte W03 - .byte PAN , c_v+0 - .byte BEND , c_v+4 - .byte W04 - .byte PAN , c_v+3 - .byte BEND , c_v+7 - .byte W02 - .byte VOL , 109*se_m_waterfall_mvl/mxv - .byte W02 - .byte PAN , c_v+6 - .byte BEND , c_v+10 - .byte W02 - .byte VOL , 103*se_m_waterfall_mvl/mxv - .byte W01 - .byte PAN , c_v+3 - .byte BEND , c_v+13 - .byte W03 - .byte VOL , 92*se_m_waterfall_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+16 - .byte W03 - .byte VOL , 79*se_m_waterfall_mvl/mxv - .byte PAN , c_v-3 - .byte BEND , c_v+18 - .byte W02 - .byte W02 - .byte VOL , 62*se_m_waterfall_mvl/mxv - .byte PAN , c_v-6 - .byte BEND , c_v+21 - .byte W04 - .byte VOL , 40*se_m_waterfall_mvl/mxv - .byte PAN , c_v-3 - .byte BEND , c_v+26 - .byte W02 - .byte VOL , 22*se_m_waterfall_mvl/mxv - .byte BEND , c_v+33 - .byte W01 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 8*se_m_waterfall_mvl/mxv - .byte BEND , c_v+43 - .byte W02 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_waterfall_2: - .byte KEYSH , se_m_waterfall_key+0 - .byte VOICE , 25 - .byte VOL , 115*se_m_waterfall_mvl/mxv - .byte N06 , Cn3 , v040 - .byte W06 - .byte Gn2 - .byte W06 -se_m_waterfall_2_000: - .byte N06 , Cn3 , v040 - .byte W06 - .byte Gn2 - .byte W06 - .byte PEND - .byte PATT - .word se_m_waterfall_2_000 - .byte N06 , Cn3 , v032 - .byte W06 - .byte Gn2 - .byte W06 - .byte Cn3 , v012 - .byte W06 - .byte Gn2 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_waterfall: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_waterfall_pri @ Priority - .byte se_m_waterfall_rev @ Reverb. - - .word se_m_waterfall_grp - - .word se_m_waterfall_1 - .word se_m_waterfall_2 - - .end diff --git a/sound/songs/se_m_whirlpool.s b/sound/songs/se_m_whirlpool.s deleted file mode 100644 index 67563395c..000000000 --- a/sound/songs/se_m_whirlpool.s +++ /dev/null @@ -1,125 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_whirlpool_grp, voicegroup_rs_sfx_2 - .equ se_m_whirlpool_pri, 4 - .equ se_m_whirlpool_rev, reverb_set+50 - .equ se_m_whirlpool_mvl, 127 - .equ se_m_whirlpool_key, 0 - .equ se_m_whirlpool_tbs, 1 - .equ se_m_whirlpool_exg, 0 - .equ se_m_whirlpool_cmp, 1 - - .section .rodata - .global se_m_whirlpool - .align 2 - -@********************** Track 1 **********************@ - -se_m_whirlpool_1: - .byte KEYSH , se_m_whirlpool_key+0 - .byte TEMPO , 150*se_m_whirlpool_tbs/2 - .byte VOICE , 36 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 115*se_m_whirlpool_mvl/mxv - .byte BEND , c_v-18 - .byte TIE , Dn2 , v127 - .byte W03 - .byte BEND , c_v-12 - .byte W03 - .byte PAN , c_v-5 - .byte W02 - .byte BEND , c_v-8 - .byte W04 - .byte PAN , c_v-10 - .byte W01 - .byte BEND , c_v-3 - .byte W03 - .byte c_v+2 - .byte W02 - .byte PAN , c_v-13 - .byte W04 - .byte BEND , c_v+5 - .byte W02 - .byte PAN , c_v-16 - .byte W04 - .byte BEND , c_v+14 - .byte W02 - .byte PAN , c_v-14 - .byte W06 - .byte c_v-9 - .byte BEND , c_v+18 - .byte W06 - .byte PAN , c_v-6 - .byte W01 - .byte BEND , c_v+24 - .byte W05 - .byte PAN , c_v+0 - .byte W06 - .byte c_v+3 - .byte W06 - .byte c_v+7 - .byte W06 - .byte c_v+11 - .byte BEND , c_v+17 - .byte W06 - .byte PAN , c_v+16 - .byte BEND , c_v+10 - .byte W06 - .byte PAN , c_v+11 - .byte W01 - .byte BEND , c_v+5 - .byte W05 - .byte PAN , c_v+6 - .byte W02 - .byte VOL , 103*se_m_whirlpool_mvl/mxv - .byte W01 - .byte BEND , c_v+0 - .byte W03 - .byte PAN , c_v+4 - .byte W01 - .byte VOL , 85*se_m_whirlpool_mvl/mxv - .byte W01 - .byte BEND , c_v-5 - .byte W04 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 71*se_m_whirlpool_mvl/mxv - .byte W02 - .byte BEND , c_v-8 - .byte W03 - .byte VOL , 52*se_m_whirlpool_mvl/mxv - .byte PAN , c_v-4 - .byte W03 - .byte BEND , c_v-12 - .byte W01 - .byte VOL , 32*se_m_whirlpool_mvl/mxv - .byte W02 - .byte PAN , c_v-10 - .byte W03 - .byte VOL , 11*se_m_whirlpool_mvl/mxv - .byte BEND , c_v-19 - .byte W03 - .byte PAN , c_v-15 - .byte W01 - .byte VOL , 6*se_m_whirlpool_mvl/mxv - .byte W01 - .byte BEND , c_v-28 - .byte W04 - .byte EOT - .byte FINE - -@******************************************************@ - .align 2 - -se_m_whirlpool: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_whirlpool_pri @ Priority - .byte se_m_whirlpool_rev @ Reverb. - - .word se_m_whirlpool_grp - - .word se_m_whirlpool_1 - - .end diff --git a/sound/songs/se_m_yawn.s b/sound/songs/se_m_yawn.s deleted file mode 100644 index fdd6012a2..000000000 --- a/sound/songs/se_m_yawn.s +++ /dev/null @@ -1,127 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_yawn_grp, voicegroup_rs_sfx_2 - .equ se_m_yawn_pri, 4 - .equ se_m_yawn_rev, reverb_set+50 - .equ se_m_yawn_mvl, 127 - .equ se_m_yawn_key, 0 - .equ se_m_yawn_tbs, 1 - .equ se_m_yawn_exg, 0 - .equ se_m_yawn_cmp, 1 - - .section .rodata - .global se_m_yawn - .align 2 - -@********************** Track 1 **********************@ - -se_m_yawn_1: - .byte VOL , 110*se_m_yawn_mvl/mxv - .byte KEYSH , se_m_yawn_key+0 - .byte TEMPO , 150*se_m_yawn_tbs/2 - .byte VOICE , 61 - .byte BENDR , 44 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N48 , Cn4 , v108 - .byte W02 - .byte BEND , c_v-1 - .byte W01 - .byte c_v+0 - .byte W03 - .byte c_v+0 - .byte W01 - .byte c_v+0 - .byte W02 - .byte c_v+0 - .byte W01 - .byte c_v+0 - .byte W02 - .byte PAN , c_v-4 - .byte W01 - .byte BEND , c_v+0 - .byte W01 - .byte c_v+1 - .byte W02 - .byte c_v+1 - .byte W02 - .byte c_v+1 - .byte W02 - .byte c_v+1 - .byte W01 - .byte c_v+1 - .byte W03 - .byte PAN , c_v-10 - .byte BEND , c_v+1 - .byte W01 - .byte c_v+2 - .byte W02 - .byte c_v+2 - .byte W03 - .byte c_v+1 - .byte W02 - .byte c_v+2 - .byte W01 - .byte c_v+1 - .byte W03 - .byte PAN , c_v-4 - .byte BEND , c_v+1 - .byte W01 - .byte c_v+1 - .byte W02 - .byte c_v+1 - .byte W01 - .byte c_v+0 - .byte W02 - .byte c_v+0 - .byte W01 - .byte c_v-1 - .byte W01 - .byte c_v-1 - .byte W01 - .byte c_v-3 - .byte W01 - .byte c_v-3 - .byte W02 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_yawn_2: - .byte KEYSH , se_m_yawn_key+0 - .byte VOICE , 66 - .byte BENDR , 44 - .byte PAN , c_v+1 - .byte VOL , 110*se_m_yawn_mvl/mxv - .byte N48 , Dn3 , v020 - .byte W24 - .byte W03 - .byte VOL , 103*se_m_yawn_mvl/mxv - .byte W04 - .byte 96*se_m_yawn_mvl/mxv - .byte W03 - .byte 83*se_m_yawn_mvl/mxv - .byte W04 - .byte 67*se_m_yawn_mvl/mxv - .byte W04 - .byte 49*se_m_yawn_mvl/mxv - .byte W03 - .byte 23*se_m_yawn_mvl/mxv - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_yawn: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_yawn_pri @ Priority - .byte se_m_yawn_rev @ Reverb. - - .word se_m_yawn_grp - - .word se_m_yawn_1 - .word se_m_yawn_2 - - .end diff --git a/sound/songs/se_wall_hit.s b/sound/songs/se_wall_hit.s deleted file mode 100644 index 385da0373..000000000 --- a/sound/songs/se_wall_hit.s +++ /dev/null @@ -1,41 +0,0 @@ - .include "MPlayDef.s" - - .equ se_wall_hit_grp, voicegroup_rs_sfx_1 - .equ se_wall_hit_pri, 2 - .equ se_wall_hit_rev, reverb_set+50 - .equ se_wall_hit_mvl, 127 - .equ se_wall_hit_key, 0 - .equ se_wall_hit_tbs, 1 - .equ se_wall_hit_exg, 0 - .equ se_wall_hit_cmp, 1 - - .section .rodata - .global se_wall_hit - .align 2 - -@********************** Track 1 **********************@ - -se_wall_hit_1: - .byte KEYSH , se_wall_hit_key+0 - .byte TEMPO , 220*se_wall_hit_tbs/2 - .byte VOICE , 89 - .byte VOL , 80*se_wall_hit_mvl/mxv - .byte BEND , c_v+0 - .byte N18 , Gn1 , v127 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_wall_hit: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_wall_hit_pri @ Priority - .byte se_wall_hit_rev @ Reverb. - - .word se_wall_hit_grp - - .word se_wall_hit_1 - - .end diff --git a/sound/songs/se_win_open.s b/sound/songs/se_win_open.s deleted file mode 100644 index 07fb4fadd..000000000 --- a/sound/songs/se_win_open.s +++ /dev/null @@ -1,42 +0,0 @@ - .include "MPlayDef.s" - - .equ se_win_open_grp, voicegroup_rs_sfx_1 - .equ se_win_open_pri, 5 - .equ se_win_open_rev, reverb_set+50 - .equ se_win_open_mvl, 127 - .equ se_win_open_key, 0 - .equ se_win_open_tbs, 1 - .equ se_win_open_exg, 0 - .equ se_win_open_cmp, 1 - - .section .rodata - .global se_win_open - .align 2 - -@********************** Track 1 **********************@ - -se_win_open_1: - .byte KEYSH , se_win_open_key+0 - .byte TEMPO , 220*se_win_open_tbs/2 - .byte VOICE , 127 - .byte VOL , 110*se_win_open_mvl/mxv - .byte N03 , Ds3 , v127 - .byte W03 - .byte N15 , Gn4 - .byte W21 - .byte FINE - -@******************************************************@ - .align 2 - -se_win_open: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_win_open_pri @ Priority - .byte se_win_open_rev @ Reverb. - - .word se_win_open_grp - - .word se_win_open_1 - - .end diff --git a/spritesheet_rules.mk b/spritesheet_rules.mk index f58ca8683..e428cc10a 100644 --- a/spritesheet_rules.mk +++ b/spritesheet_rules.mk @@ -24,7 +24,7 @@ $(OBJEVENTGFXDIR)/people/agatha.4bpp: %.4bpp: %.png $(OBJEVENTGFXDIR)/people/balding_man.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(OBJEVENTGFXDIR)/people/battle_girl.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/crush_girl.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 $(OBJEVENTGFXDIR)/people/beauty.4bpp: %.4bpp: %.png @@ -36,7 +36,7 @@ $(OBJEVENTGFXDIR)/people/biker.4bpp: %.4bpp: %.png $(OBJEVENTGFXDIR)/people/bill.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(OBJEVENTGFXDIR)/people/blackbelt.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/black_belt.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 $(OBJEVENTGFXDIR)/people/blaine.4bpp: %.4bpp: %.png @@ -243,7 +243,7 @@ $(OBJEVENTGFXDIR)/people/scientist.4bpp: %.4bpp: %.png $(OBJEVENTGFXDIR)/people/sitting_boy.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(OBJEVENTGFXDIR)/people/super_nerd.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/poke_maniac.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 $(OBJEVENTGFXDIR)/people/swimmer_f_land.4bpp: %.4bpp: %.png diff --git a/src/AgbRfu_LinkManager.c b/src/AgbRfu_LinkManager.c index b53b69c48..1dfb8f7de 100644 --- a/src/AgbRfu_LinkManager.c +++ b/src/AgbRfu_LinkManager.c @@ -178,6 +178,9 @@ u8 rfu_LMAN_establishConnection(u8 parent_child, u16 connect_period, u16 name_ac } lman.parent_child = parent_child; lman.connect_period = connect_period; +#if REVISION >= 0xA + lman.connect_period_initial = 0; +#endif lman.nameAcceptTimer.count_max = name_accept_period; lman.acceptable_serialNo_list = acceptable_serialNo_list; return 0; @@ -224,6 +227,9 @@ u8 rfu_LMAN_CHILD_connectParent(u16 parentId, u16 connect_period) } lman.work = parentId; lman.connect_period = connect_period; +#if REVISION >= 0xA + lman.connect_period_initial = 0; +#endif if (lman.pcswitch_flag != 0) { lman.pcswitch_flag = PCSWITCH_CP; @@ -562,6 +568,9 @@ static void rfu_LMAN_settingPCSWITCH(u32 rand) lman.parent_child = MODE_PARENT; lman.state = LMAN_STATE_START_SEARCH_CHILD; lman.connect_period = lman.pcswitch_period_bak; +#if REVISION >= 0xA + lman.connect_period_initial = 0; +#endif if (lman.connect_period) { lman.pcswitch_flag = PCSWITCH_3RD_SC; @@ -575,8 +584,14 @@ static void rfu_LMAN_settingPCSWITCH(u32 rand) { lman.parent_child = MODE_PARENT; lman.state = LMAN_STATE_START_SEARCH_CHILD; +#if REVISION >= 0xA + lman.connect_period = rand % 285; + lman.pcswitch_period_bak = 285 - lman.connect_period; + lman.connect_period_initial = 0; +#else lman.connect_period = rand % 140; lman.pcswitch_period_bak = 140 - lman.connect_period; +#endif if (lman.connect_period) { lman.pcswitch_flag = PCSWITCH_1ST_SC; @@ -590,6 +605,9 @@ static void rfu_LMAN_settingPCSWITCH(u32 rand) { lman.parent_child = MODE_CHILD; lman.connect_period = PCSWITCH_SP_PERIOD; +#if REVISION >= 0xA + lman.connect_period_initial = 0; +#endif lman.pcswitch_flag = PCSWITCH_2ND_SP; lman.state = LMAN_STATE_START_SEARCH_PARENT; } @@ -634,11 +652,27 @@ static void rfu_LMAN_REQ_callback(u16 reqCommandId, u16 reqResult) } break; case ID_SC_POLL_REQ: +#if REVISION >= 0xA + if (lman.connect_period) + { + if (svc_49() != 0 && lman.connect_period_initial < 300) + { + if (lman.connect_period > 1) lman.connect_period--; + else lman.connect_period_initial++; + } + else if (--lman.connect_period == 0) + { + lman.state = LMAN_STATE_END_SEARCH_CHILD; + lman.next_state = LMAN_STATE_WAIT_RECV_CHILD_NAME; + } + } +#else if (lman.connect_period && --lman.connect_period == 0) { lman.state = LMAN_STATE_END_SEARCH_CHILD; lman.next_state = LMAN_STATE_WAIT_RECV_CHILD_NAME; } +#endif break; case ID_SC_END_REQ: if (reqResult == 0) @@ -681,11 +715,27 @@ static void rfu_LMAN_REQ_callback(u16 reqCommandId, u16 reqResult) lman.fastSearchParent_flag = FSP_ON; } } +#if REVISION >= 0xA + if (lman.connect_period) + { + if (svc_4a() != 0 && lman.connect_period_initial < 300) + { + if (lman.connect_period > 1) lman.connect_period--; + else lman.connect_period_initial++; + } + else if (--lman.connect_period == 0) + { + lman.state = LMAN_STATE_END_SEARCH_PARENT; + lman.next_state = LMAN_STATE_READY; + } + } +#else if (lman.connect_period && --lman.connect_period == 0) { lman.state = LMAN_STATE_END_SEARCH_PARENT; lman.next_state = LMAN_STATE_READY; } +#endif break; case ID_SP_END_REQ: if (reqResult == 0) @@ -1304,15 +1354,30 @@ static void UNUSED rfu_LMAN_setLMANCallback(void (*func)(u8, u8)) u8 rfu_LMAN_setLinkRecovery(u8 enable_flag, u16 recovery_period) { +#if REVISION >= 0xA + u16 imeNew = 0; +#endif u16 imeBak; +#if REVISION >= 0xA + + imeBak = REG_IME; + REG_IME = imeNew; + + lman.linkRecovery_enable = FALSE; + lman.linkRecoveryTimer.count_max = recovery_period; +#else + if (lman.linkRecovery_enable && enable_flag == 0 && lman.linkRecoveryTimer.active) { return LMAN_ERROR_NOW_LINK_RECOVERY; } + imeBak = REG_IME; REG_IME = 0; + lman.linkRecovery_enable = enable_flag; lman.linkRecoveryTimer.count_max = recovery_period; +#endif REG_IME = imeBak; return 0; } @@ -1369,7 +1434,11 @@ void rfu_LMAN_requestChangeAgbClockMaster(void) } } +#if REVISION >= 0xA +void rfu_LMAN_forceChangeSP(bool8 child) +#else void rfu_LMAN_forceChangeSP(void) +#endif { if (lman.pcswitch_flag) { @@ -1389,10 +1458,22 @@ void rfu_LMAN_forceChangeSP(void) break; case LMAN_STATE_START_SEARCH_PARENT: case LMAN_STATE_POLL_SEARCH_PARENT: +#if REVISION >= 0xA + if (!child) break; +#endif lman.connect_period = PCSWITCH_SP_PERIOD; +#if REVISION >= 0xA + lman.connect_period_initial = 0; +#endif break; case LMAN_STATE_END_SEARCH_PARENT: +#if REVISION >= 0xA + if (!child) break; +#endif lman.connect_period = PCSWITCH_SP_PERIOD; +#if REVISION >= 0xA + lman.connect_period_initial = 0; +#endif lman.state = LMAN_STATE_POLL_SEARCH_PARENT; break; } diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 094a63321..baa367c99 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -1236,7 +1236,10 @@ static void SetLinkBattleEndCallbacks(enum BattlerId battler) // Despite handling link battles separately, this is only ever used by link battles void SetBattleEndCallbacks(enum BattlerId battler) { +#if REVISION >= 0xA +#else if (!gPaletteFade.active) +#endif { if (gBattleTypeFlags & BATTLE_TYPE_LINK) { diff --git a/src/battle_pike.c b/src/battle_pike.c index 50b89be7d..d5194d635 100644 --- a/src/battle_pike.c +++ b/src/battle_pike.c @@ -303,7 +303,7 @@ static const struct PikeRoomNPC sNPCTable[] = .speechId3 = 1 }, { - .graphicsId = OBJ_EVENT_GFX_BLACKBELT, + .graphicsId = OBJ_EVENT_GFX_BLACK_BELT, .speechId1 = 22, .speechId2 = 23, .speechId3 = 27 diff --git a/src/battle_tower.c b/src/battle_tower.c index a1d7aa707..b5b957f72 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -133,7 +133,7 @@ const u16 gTowerMaleTrainerGfxIds[30] = OBJ_EVENT_GFX_RICH_BOY, OBJ_EVENT_GFX_MANIAC, OBJ_EVENT_GFX_RUNNING_TRIATHLETE_M, - OBJ_EVENT_GFX_BLACKBELT, + OBJ_EVENT_GFX_BLACK_BELT, OBJ_EVENT_GFX_MAN_5, OBJ_EVENT_GFX_MAN_5, OBJ_EVENT_GFX_CAMPER, diff --git a/src/cable_club.c b/src/cable_club.c index eb23db248..5cb535878 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -709,6 +709,9 @@ static void Task_StartWirelessCableClubBattle(u8 taskId) tState = 5; break; case 5: +#if REVISION >= 0xA + if (!IsLinkTaskFinished()) break; +#endif SetLinkStandbyCallback(); tState = 6; break; @@ -911,6 +914,9 @@ static void Task_StartWirelessTrade(u8 taskId) tState++; break; case 2: +#if REVISION >= 0xA + if (!IsLinkTaskFinished()) break; +#endif gSelectedTradeMonPositions[TRADE_PLAYER] = 0; gSelectedTradeMonPositions[TRADE_PARTNER] = 0; m4aMPlayAllStop(); @@ -980,7 +986,11 @@ bool32 GetSeeingLinkPlayerCardMsg(u8 linkPlayerIndex) void Task_WaitForLinkPlayerConnection(u8 taskId) { struct Task *task = &gTasks[taskId]; +#if REVISION >= 0xA + if (++task->tTimer > 480) +#else if (++task->tTimer > 300) +#endif { CloseLink(); SetMainCallback2(CB2_LinkError); diff --git a/src/data/object_events/object_event_graphics.h b/src/data/object_events/object_event_graphics.h index 8491d5e23..90addf4d8 100644 --- a/src/data/object_events/object_event_graphics.h +++ b/src/data/object_events/object_event_graphics.h @@ -66,7 +66,7 @@ const u16 gObjectEventPic_Boy[] = INCBIN_U16("graphics/object_events/pics/people const u16 gObjectEventPic_Woman1[] = INCBIN_U16("graphics/object_events/pics/people/woman_1.4bpp"); const u16 gObjectEventPic_Woman3[] = INCBIN_U16("graphics/object_events/pics/people/woman_3.4bpp"); const u16 gObjectEventPic_BugCatcher[] = INCBIN_U16("graphics/object_events/pics/people/bug_catcher.4bpp"); -const u16 gObjectEventPic_BattleGirl[] = INCBIN_U16("graphics/object_events/pics/people/battle_girl.4bpp"); +const u16 gObjectEventPic_CrushGirl[] = INCBIN_U16("graphics/object_events/pics/people/crush_girl.4bpp"); const u16 gObjectEventPic_RichBoy[] = INCBIN_U16("graphics/object_events/pics/people/rich_boy.4bpp"); const u16 gObjectEventPic_FatMan[] = INCBIN_U16("graphics/object_events/pics/people/fat_man.4bpp"); const u16 gObjectEventPic_BaldingMan[] = INCBIN_U16("graphics/object_events/pics/people/balding_man.4bpp"); @@ -84,14 +84,14 @@ const u16 gObjectEventPic_Picnicker[] = INCBIN_U16("graphics/object_events/pics/ const u16 gObjectEventPic_CooltrainerM[] = INCBIN_U16("graphics/object_events/pics/people/cooltrainer_m.4bpp"); const u16 gObjectEventPic_CooltrainerF[] = INCBIN_U16("graphics/object_events/pics/people/cooltrainer_f.4bpp"); const u16 gObjectEventPic_PsyduckOld[] = INCBIN_U16("graphics/object_events/pics/pokemon/psyduck.4bpp"); -const u16 gObjectEventPic_SuperNerd[] = INCBIN_U16("graphics/object_events/pics/people/super_nerd.4bpp"); +const u16 gObjectEventPic_PokeManiac[] = INCBIN_U16("graphics/object_events/pics/people/poke_maniac.4bpp"); const u16 gObjectEventPic_Channeler[] = INCBIN_U16("graphics/object_events/pics/people/channeler.4bpp"); const u16 gObjectEventPic_RocketF[] = INCBIN_U16("graphics/object_events/pics/people/rocket_f.4bpp"); const u16 gObjectEventPic_SwimmerMWater[] = INCBIN_U16("graphics/object_events/pics/people/swimmer_m_water.4bpp"); const u16 gObjectEventPic_SwimmerFWater[] = INCBIN_U16("graphics/object_events/pics/people/swimmer_f_water.4bpp"); const u16 gObjectEventPic_SwimmerMLand[] = INCBIN_U16("graphics/object_events/pics/people/swimmer_m_land.4bpp"); const u16 gObjectEventPic_SwimmerFLand[] = INCBIN_U16("graphics/object_events/pics/people/swimmer_f_land.4bpp"); -const u16 gObjectEventPic_Blackbelt[] = INCBIN_U16("graphics/object_events/pics/people/blackbelt.4bpp"); +const u16 gObjectEventPic_BlackBelt[] = INCBIN_U16("graphics/object_events/pics/people/black_belt.4bpp"); const u16 gObjectEventPic_Scientist[] = INCBIN_U16("graphics/object_events/pics/people/scientist.4bpp"); const u16 gObjectEventPic_Gentleman[] = INCBIN_U16("graphics/object_events/pics/people/gentleman.4bpp"); const u16 gObjectEventPic_Sailor[] = INCBIN_U16("graphics/object_events/pics/people/sailor.4bpp"); diff --git a/src/data/object_events/object_event_graphics_info.h b/src/data/object_events/object_event_graphics_info.h index 010a0e285..d6c7bae33 100644 --- a/src/data/object_events/object_event_graphics_info.h +++ b/src/data/object_events/object_event_graphics_info.h @@ -283,7 +283,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy = { .affineAnims = gDummySpriteAffineAnimTable, }; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BattleGirl = { +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CrushGirl = { .tileTag = TAG_NONE, .paletteTag = OBJ_EVENT_PAL_TAG_NPC_WHITE, .reflectionPaletteTag = OBJ_EVENT_PAL_TAG_NONE, @@ -298,7 +298,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BattleGirl = { .oam = &gObjectEventBaseOam_16x32, .subspriteTables = sOamTables_16x32, .anims = sAnimTable_Standard, - .images = sPicTable_BattleGirl, + .images = sPicTable_CrushGirl, .affineAnims = gDummySpriteAffineAnimTable, }; @@ -606,7 +606,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CooltrainerF = { .affineAnims = gDummySpriteAffineAnimTable, }; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SuperNerd = { +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PokeManiac = { .tileTag = TAG_NONE, .paletteTag = OBJ_EVENT_PAL_TAG_NPC_PINK, .reflectionPaletteTag = OBJ_EVENT_PAL_TAG_NONE, @@ -621,7 +621,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SuperNerd = { .oam = &gObjectEventBaseOam_16x32, .subspriteTables = sOamTables_16x32, .anims = sAnimTable_Standard, - .images = sPicTable_SuperNerd, + .images = sPicTable_PokeManiac, .affineAnims = gDummySpriteAffineAnimTable, }; @@ -739,7 +739,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerFLand = { .affineAnims = gDummySpriteAffineAnimTable, }; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Blackbelt = { +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BlackBelt = { .tileTag = TAG_NONE, .paletteTag = OBJ_EVENT_PAL_TAG_NPC_WHITE, .reflectionPaletteTag = OBJ_EVENT_PAL_TAG_NONE, @@ -754,7 +754,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Blackbelt = { .oam = &gObjectEventBaseOam_16x32, .subspriteTables = sOamTables_16x32, .anims = sAnimTable_Standard, - .images = sPicTable_Blackbelt, + .images = sPicTable_BlackBelt, .affineAnims = gDummySpriteAffineAnimTable, }; diff --git a/src/data/object_events/object_event_graphics_info_pointers.h b/src/data/object_events/object_event_graphics_info_pointers.h index 2b831e11d..0c34fad60 100644 --- a/src/data/object_events/object_event_graphics_info_pointers.h +++ b/src/data/object_events/object_event_graphics_info_pointers.h @@ -22,7 +22,7 @@ extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BugCatcher; extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SittingBoy; extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lass; extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman1; -extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BattleGirl; +extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CrushGirl; extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RichBoy; extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man; extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Rocker; @@ -51,9 +51,9 @@ extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WorkerF; extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RocketM; extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RocketF; extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GBAKid; -extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SuperNerd; +extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PokeManiac; extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Biker; -extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Blackbelt; +extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BlackBelt; extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scientist; extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Hiker; extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fisher; @@ -220,7 +220,7 @@ const struct ObjectEventGraphicsInfo *const gObjectEventGraphicsInfoPointers[NUM [OBJ_EVENT_GFX_SITTING_BOY] = &gObjectEventGraphicsInfo_SittingBoy, [OBJ_EVENT_GFX_LASS] = &gObjectEventGraphicsInfo_Lass, [OBJ_EVENT_GFX_WOMAN_1] = &gObjectEventGraphicsInfo_Woman1, - [OBJ_EVENT_GFX_BATTLE_GIRL] = &gObjectEventGraphicsInfo_BattleGirl, + [OBJ_EVENT_GFX_CRUSH_GIRL] = &gObjectEventGraphicsInfo_CrushGirl, [OBJ_EVENT_GFX_MAN] = &gObjectEventGraphicsInfo_Man, [OBJ_EVENT_GFX_ROCKER] = &gObjectEventGraphicsInfo_Rocker, [OBJ_EVENT_GFX_FAT_MAN] = &gObjectEventGraphicsInfo_FatMan, @@ -248,9 +248,9 @@ const struct ObjectEventGraphicsInfo *const gObjectEventGraphicsInfoPointers[NUM [OBJ_EVENT_GFX_ROCKET_M] = &gObjectEventGraphicsInfo_RocketM, [OBJ_EVENT_GFX_ROCKET_F] = &gObjectEventGraphicsInfo_RocketF, [OBJ_EVENT_GFX_GBA_KID] = &gObjectEventGraphicsInfo_GBAKid, - [OBJ_EVENT_GFX_SUPER_NERD] = &gObjectEventGraphicsInfo_SuperNerd, + [OBJ_EVENT_GFX_POKE_MANIAC] = &gObjectEventGraphicsInfo_PokeManiac, [OBJ_EVENT_GFX_BIKER] = &gObjectEventGraphicsInfo_Biker, - [OBJ_EVENT_GFX_BLACKBELT] = &gObjectEventGraphicsInfo_Blackbelt, + [OBJ_EVENT_GFX_BLACK_BELT] = &gObjectEventGraphicsInfo_BlackBelt, [OBJ_EVENT_GFX_SCIENTIST] = &gObjectEventGraphicsInfo_Scientist, [OBJ_EVENT_GFX_HIKER] = &gObjectEventGraphicsInfo_Hiker, [OBJ_EVENT_GFX_FISHER] = &gObjectEventGraphicsInfo_Fisher, diff --git a/src/data/object_events/object_event_pic_tables.h b/src/data/object_events/object_event_pic_tables.h index 2bbe312b3..bc72bc7fe 100644 --- a/src/data/object_events/object_event_pic_tables.h +++ b/src/data/object_events/object_event_pic_tables.h @@ -266,17 +266,17 @@ static const struct SpriteFrameImage sPicTable_Woman3[] = { overworld_frame(gObjectEventPic_Woman3, 2, 4, 8), }; -static const struct SpriteFrameImage sPicTable_BattleGirl[] = { - overworld_frame(gObjectEventPic_BattleGirl, 2, 4, 0), - overworld_frame(gObjectEventPic_BattleGirl, 2, 4, 1), - overworld_frame(gObjectEventPic_BattleGirl, 2, 4, 2), - overworld_frame(gObjectEventPic_BattleGirl, 2, 4, 3), - overworld_frame(gObjectEventPic_BattleGirl, 2, 4, 4), - overworld_frame(gObjectEventPic_BattleGirl, 2, 4, 5), - overworld_frame(gObjectEventPic_BattleGirl, 2, 4, 6), - overworld_frame(gObjectEventPic_BattleGirl, 2, 4, 7), - overworld_frame(gObjectEventPic_BattleGirl, 2, 4, 8), - overworld_frame(gObjectEventPic_BattleGirl, 2, 4, 9), +static const struct SpriteFrameImage sPicTable_CrushGirl[] = { + overworld_frame(gObjectEventPic_CrushGirl, 2, 4, 0), + overworld_frame(gObjectEventPic_CrushGirl, 2, 4, 1), + overworld_frame(gObjectEventPic_CrushGirl, 2, 4, 2), + overworld_frame(gObjectEventPic_CrushGirl, 2, 4, 3), + overworld_frame(gObjectEventPic_CrushGirl, 2, 4, 4), + overworld_frame(gObjectEventPic_CrushGirl, 2, 4, 5), + overworld_frame(gObjectEventPic_CrushGirl, 2, 4, 6), + overworld_frame(gObjectEventPic_CrushGirl, 2, 4, 7), + overworld_frame(gObjectEventPic_CrushGirl, 2, 4, 8), + overworld_frame(gObjectEventPic_CrushGirl, 2, 4, 9), }; static const struct SpriteFrameImage sPicTable_RichBoy[] = { @@ -507,17 +507,17 @@ static const struct SpriteFrameImage sPicTable_Boy[] = { overworld_frame(gObjectEventPic_Boy, 2, 4, 9), }; -static const struct SpriteFrameImage sPicTable_SuperNerd[] = { - overworld_frame(gObjectEventPic_SuperNerd, 2, 4, 0), - overworld_frame(gObjectEventPic_SuperNerd, 2, 4, 1), - overworld_frame(gObjectEventPic_SuperNerd, 2, 4, 2), - overworld_frame(gObjectEventPic_SuperNerd, 2, 4, 3), - overworld_frame(gObjectEventPic_SuperNerd, 2, 4, 4), - overworld_frame(gObjectEventPic_SuperNerd, 2, 4, 5), - overworld_frame(gObjectEventPic_SuperNerd, 2, 4, 6), - overworld_frame(gObjectEventPic_SuperNerd, 2, 4, 7), - overworld_frame(gObjectEventPic_SuperNerd, 2, 4, 8), - overworld_frame(gObjectEventPic_SuperNerd, 2, 4, 9), +static const struct SpriteFrameImage sPicTable_PokeManiac[] = { + overworld_frame(gObjectEventPic_PokeManiac, 2, 4, 0), + overworld_frame(gObjectEventPic_PokeManiac, 2, 4, 1), + overworld_frame(gObjectEventPic_PokeManiac, 2, 4, 2), + overworld_frame(gObjectEventPic_PokeManiac, 2, 4, 3), + overworld_frame(gObjectEventPic_PokeManiac, 2, 4, 4), + overworld_frame(gObjectEventPic_PokeManiac, 2, 4, 5), + overworld_frame(gObjectEventPic_PokeManiac, 2, 4, 6), + overworld_frame(gObjectEventPic_PokeManiac, 2, 4, 7), + overworld_frame(gObjectEventPic_PokeManiac, 2, 4, 8), + overworld_frame(gObjectEventPic_PokeManiac, 2, 4, 9), }; static const struct SpriteFrameImage sPicTable_Channeler[] = { @@ -597,17 +597,17 @@ static const struct SpriteFrameImage sPicTable_SwimmerFLand[] = { overworld_frame(gObjectEventPic_SwimmerFLand, 2, 4, 9), }; -static const struct SpriteFrameImage sPicTable_Blackbelt[] = { - overworld_frame(gObjectEventPic_Blackbelt, 2, 4, 0), - overworld_frame(gObjectEventPic_Blackbelt, 2, 4, 1), - overworld_frame(gObjectEventPic_Blackbelt, 2, 4, 2), - overworld_frame(gObjectEventPic_Blackbelt, 2, 4, 3), - overworld_frame(gObjectEventPic_Blackbelt, 2, 4, 4), - overworld_frame(gObjectEventPic_Blackbelt, 2, 4, 5), - overworld_frame(gObjectEventPic_Blackbelt, 2, 4, 6), - overworld_frame(gObjectEventPic_Blackbelt, 2, 4, 7), - overworld_frame(gObjectEventPic_Blackbelt, 2, 4, 8), - overworld_frame(gObjectEventPic_Blackbelt, 2, 4, 9), +static const struct SpriteFrameImage sPicTable_BlackBelt[] = { + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 0), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 1), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 2), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 3), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 4), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 5), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 6), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 7), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 8), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 9), }; static const struct SpriteFrameImage sPicTable_Scientist[] = { diff --git a/src/dynamic_placeholder_text_util.c b/src/dynamic_placeholder_text_util.c index bb300b240..869eefb95 100644 --- a/src/dynamic_placeholder_text_util.c +++ b/src/dynamic_placeholder_text_util.c @@ -22,7 +22,7 @@ static const u8 sTextColorTable[] = [OBJ_EVENT_GFX_YOUNGSTER / 2] = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_BOY [OBJ_EVENT_GFX_BUG_CATCHER / 2] = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_SITTING_BOY [OBJ_EVENT_GFX_LASS / 2] = COLORS(NPC_TEXT_COLOR_FEMALE, NPC_TEXT_COLOR_FEMALE), // OBJ_EVENT_GFX_WOMAN_1 - [OBJ_EVENT_GFX_BATTLE_GIRL / 2] = COLORS(NPC_TEXT_COLOR_FEMALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_MAN + [OBJ_EVENT_GFX_CRUSH_GIRL / 2] = COLORS(NPC_TEXT_COLOR_FEMALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_MAN [OBJ_EVENT_GFX_ROCKER / 2] = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_FAT_MAN [OBJ_EVENT_GFX_WOMAN_2 / 2] = COLORS(NPC_TEXT_COLOR_FEMALE, NPC_TEXT_COLOR_FEMALE), // OBJ_EVENT_GFX_BEAUTY [OBJ_EVENT_GFX_BALDING_MAN / 2] = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_FEMALE), // OBJ_EVENT_GFX_WOMAN_3 @@ -36,8 +36,8 @@ static const u8 sTextColorTable[] = [OBJ_EVENT_GFX_SWIMMER_F_LAND / 2] = COLORS(NPC_TEXT_COLOR_FEMALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_WORKER_M [OBJ_EVENT_GFX_WORKER_F / 2] = COLORS(NPC_TEXT_COLOR_FEMALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_ROCKET_M [OBJ_EVENT_GFX_ROCKET_F / 2] = COLORS(NPC_TEXT_COLOR_FEMALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_GBA_KID - [OBJ_EVENT_GFX_SUPER_NERD / 2] = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_BIKER - [OBJ_EVENT_GFX_BLACKBELT / 2] = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_SCIENTIST + [OBJ_EVENT_GFX_POKE_MANIAC / 2] = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_BIKER + [OBJ_EVENT_GFX_BLACK_BELT / 2] = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_SCIENTIST [OBJ_EVENT_GFX_HIKER / 2] = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_FISHER [OBJ_EVENT_GFX_CHANNELER / 2] = COLORS(NPC_TEXT_COLOR_FEMALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_CHEF [OBJ_EVENT_GFX_POLICEMAN / 2] = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_GENTLEMAN @@ -90,15 +90,9 @@ static const u8 sTextColorTable[] = void DynamicPlaceholderTextUtil_Reset(void) { - const u8 **ptr = sStringPointers; - u8 *fillval = NULL; - const u8 **ptr2 = ptr + (ARRAY_COUNT(sStringPointers) - 1); - - do - { - *ptr2-- = fillval; - } - while ((intptr_t)ptr2 >= (intptr_t)ptr); + int i; + for (i = 0; i < (int)ARRAY_COUNT(sStringPointers); i++) + sStringPointers[i] = NULL; } void DynamicPlaceholderTextUtil_SetPlaceholderPtr(u8 idx, const u8 *ptr) diff --git a/src/fame_checker.c b/src/fame_checker.c index 6a0c8478b..5cf7ae761 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -339,20 +339,20 @@ static const u8 sFameCheckerArrayNpcGraphicsIds[] = { OBJ_EVENT_GFX_BRUNO, OBJ_EVENT_GFX_BRUNO, OBJ_EVENT_GFX_CLIPBOARD, - OBJ_EVENT_GFX_BLACKBELT, + OBJ_EVENT_GFX_BLACK_BELT, OBJ_EVENT_GFX_BEAUTY, - OBJ_EVENT_GFX_BLACKBELT, + OBJ_EVENT_GFX_BLACK_BELT, // AGATHA OBJ_EVENT_GFX_AGATHA, - OBJ_EVENT_GFX_BLACKBELT, - OBJ_EVENT_GFX_BLACKBELT, + OBJ_EVENT_GFX_BLACK_BELT, + OBJ_EVENT_GFX_BLACK_BELT, OBJ_EVENT_GFX_CLIPBOARD, OBJ_EVENT_GFX_AGATHA, OBJ_EVENT_GFX_OLD_WOMAN, // LANCE OBJ_EVENT_GFX_LANCE, OBJ_EVENT_GFX_LANCE, - OBJ_EVENT_GFX_BATTLE_GIRL, + OBJ_EVENT_GFX_CRUSH_GIRL, OBJ_EVENT_GFX_WOMAN_1, OBJ_EVENT_GFX_CLIPBOARD, OBJ_EVENT_GFX_COOLTRAINER_M, diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c index eb76857e5..0f45a09f7 100644 --- a/src/field_fadetransition.c +++ b/src/field_fadetransition.c @@ -199,6 +199,9 @@ static void Task_ReturnToFieldRecordMixing(u8 taskId) switch (task->data[0]) { case 0: +#if REVISION >= 0xA + if (!IsLinkTaskFinished()) break; +#endif SetLinkStandbyCallback(); task->data[0]++; break; diff --git a/src/fldeff_flash.c b/src/fldeff_flash.c index 96ac3fa3c..7104e448f 100644 --- a/src/fldeff_flash.c +++ b/src/fldeff_flash.c @@ -162,8 +162,7 @@ static const struct FlashStruct sTransitionTypes[] = { static const u16 sCaveTransitionPalette_White[] = INCBIN_U16("graphics/cave_transition/white.gbapal"); static const u16 sCaveTransitionPalette_Black[] = INCBIN_U16("graphics/cave_transition/black.gbapal"); -static const u16 sCaveTransitionPalette_Enter[] = INCBIN_U16("graphics/cave_transition/enter.gbapal"); -static const u16 sCaveTransitionPalette_Exit[] = INCBIN_U16("graphics/cave_transition/exit.gbapal"); +static const u16 sCaveTransitionPalette[] = INCBIN_U16("graphics/cave_transition/tiles.gbapal"); static const u32 sCaveTransitionTilemap[] = INCBIN_U32("graphics/cave_transition/tilemap.bin.smolTM"); static const u32 sCaveTransitionTiles[] = INCBIN_U32("graphics/cave_transition/tiles.4bpp.smol"); @@ -307,7 +306,7 @@ static void Task_FlashTransition_Exit_1(u8 taskId) DecompressDataWithHeaderVram(sCaveTransitionTiles, (void *)BG_CHAR_ADDR(3)); DecompressDataWithHeaderVram(sCaveTransitionTilemap, (void *)BG_SCREEN_ADDR(31)); LoadPalette(sCaveTransitionPalette_White, BG_PLTT_ID(14), sizeof(sCaveTransitionPalette_White)); - LoadPalette(sCaveTransitionPalette_Exit, BG_PLTT_ID(14), sizeof(sCaveTransitionPalette_Exit)); + LoadPalette(&sCaveTransitionPalette[8], BG_PLTT_ID(14), PLTT_SIZEOF(8)); SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD); SetGpuReg(REG_OFFSET_BLDALPHA, 0); SetGpuReg(REG_OFFSET_BLDY, 0); @@ -341,7 +340,7 @@ static void Task_FlashTransition_Exit_3(u8 taskId) if (count < 8) { gTasks[taskId].data[2]++; - LoadPalette(&sCaveTransitionPalette_Exit[count], BG_PLTT_ID(14), sizeof(sCaveTransitionPalette_Exit) - PLTT_SIZEOF(count)); + LoadPalette(&sCaveTransitionPalette[count + 8], BG_PLTT_ID(14), PLTT_SIZEOF(8) - PLTT_SIZEOF(count)); } else { @@ -394,7 +393,7 @@ static void Task_FlashTransition_Enter_2(u8 taskId) { gTasks[taskId].data[2]++; gTasks[taskId].data[2]++; - LoadPalette(&sCaveTransitionPalette_Enter[15 - count], BG_PLTT_ID(14), PLTT_SIZEOF(count + 1)); + LoadPalette(&sCaveTransitionPalette[15 - count], BG_PLTT_ID(14), PLTT_SIZEOF(count + 1)); } else { diff --git a/src/fldeff_poison.c b/src/fldeff_poison.c index 1bc73c490..c66f24625 100644 --- a/src/fldeff_poison.c +++ b/src/fldeff_poison.c @@ -11,7 +11,11 @@ static void Task_FieldPoisonEffect(u8 taskId) switch (data[0]) { case 0: +#if REVISION >= 0xA + data[1] += 2; +#else data[1] += 1; +#endif if (data[1] > 4) data[0]++; break; diff --git a/src/intro.c b/src/intro.c index ee52e14b8..66822946e 100644 --- a/src/intro.c +++ b/src/intro.c @@ -926,7 +926,12 @@ static bool8 SetUpCopyrightScreen(void) SetGpuReg(REG_OFFSET_BLDCNT, 0); SetGpuReg(REG_OFFSET_BLDALPHA, 0); SetGpuReg(REG_OFFSET_BLDY, 0); +// "Fade from white" instead is just pure black in Revision 10. +#if REVISION >= 0xA + ((vu16*)PLTT)[0] = RGB_BLACK; +#else ((vu16*)PLTT)[0] = RGB_WHITE; +#endif SetGpuReg(REG_OFFSET_DISPCNT, 0); SetGpuReg(REG_OFFSET_BG0HOFS, 0); SetGpuReg(REG_OFFSET_BG0VOFS, 0); @@ -939,7 +944,11 @@ static bool8 SetUpCopyrightScreen(void) ResetTasks(); ResetSpriteData(); FreeAllSpritePalettes(); +#if REVISION >= 0xA + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); +#else BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_WHITEALPHA); +#endif SetGpuReg(REG_OFFSET_BG0CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_16COLOR | BGCNT_SCREENBASE(7)); EnableInterrupts(INTR_FLAG_VBLANK); SetVBlankCallback(VBlankCB_Copyright); diff --git a/src/libisagbprn.c b/src/libisagbprn.c index a7c6efff8..64fba7875 100644 --- a/src/libisagbprn.c +++ b/src/libisagbprn.c @@ -31,7 +31,8 @@ struct AGBPrintStruct typedef void (*LPFN_PRINT_FLUSH)(void); -#ifndef NDEBUG +// Revision 10 still has this code present, despite only the init function ever being used. +#if !defined(NDEBUG) || REVISION >= 0xA // AGBPrint print functions #if (LOG_HANDLER == LOG_HANDLER_AGB_PRINT) diff --git a/src/librfu_rfu.c b/src/librfu_rfu.c index 0097ac349..80978564a 100644 --- a/src/librfu_rfu.c +++ b/src/librfu_rfu.c @@ -1,5 +1,6 @@ #include #include "librfu.h" +#include "sloopsvc.h" // If expanding the length of the player name and wireless link functionality is // desired, ensure that the name string is limited in size when it's copied from the @@ -389,6 +390,9 @@ void rfu_REQ_stopMode(void) REG_SIOCNT = SIO_MULTI_MODE; rfu_STC_REQ_callback(ID_STOP_MODE_REQ, 0); } +#if REVISION >= 0xA + svc_44(); +#endif } } @@ -469,6 +473,9 @@ void rfu_REQ_configGameData(u8 mbootFlag, u16 serialNo, const u8 *gname, const u packet[14] = 0; STWI_set_Callback_M(rfu_CB_configGameData); STWI_send_GameConfigREQ(packet, uname); +#if REVISION >= 0xA + svc_47(); +#endif } static void rfu_CB_configGameData(u8 reqCommand, u16 reqResult) @@ -527,6 +534,9 @@ void rfu_REQ_startSearchChild(void) } STWI_set_Callback_M(rfu_CB_startSearchChild); STWI_send_SC_StartREQ(); +#if REVISION >= 0xA + svc_42(); +#endif } static void rfu_CB_startSearchChild(u8 reqCommand, u16 reqResult) @@ -636,7 +646,11 @@ static void rfu_STC_readChildList(void) gRfuStatic->cidBak[bm_slot_id] = gRfuLinkStatus->partner[bm_slot_id].id; } #else +#if REVISION >= 0xA + gRfuStatic->lsFixedCount[bm_slot_id] = 0x3C; +#else gRfuStatic->lsFixedCount[bm_slot_id] = 0xF0; +#endif gRfuLinkStatus->strength[bm_slot_id] = 16; gRfuLinkStatus->connSlotFlag |= 1 << bm_slot_id; ++gRfuLinkStatus->connCount; @@ -655,6 +669,9 @@ void rfu_REQ_startSearchParent(void) { STWI_set_Callback_M(rfu_CB_startSearchParent); STWI_send_SP_StartREQ(); +#if REVISION >= 0xA + svc_45_rfu_link_status(); +#endif } static void rfu_CB_startSearchParent(u8 reqCommand, u16 reqResult) @@ -709,8 +726,13 @@ static void rfu_STC_readParentCandidateList(void) } if (my_check_sum == check_sum) { +#if REVISION >= 0xA + target = &gRfuLinkStatus->partner[gRfuLinkStatus->findParentCount]; + packet_p -= 28; +#else packet_p -= 28; target = &gRfuLinkStatus->partner[gRfuLinkStatus->findParentCount]; +#endif target->id = *(u16 *)packet_p; packet_p += 2; target->slot = *packet_p; @@ -729,6 +751,9 @@ static void rfu_STC_readParentCandidateList(void) ++gRfuLinkStatus->findParentCount; } } +#if REVISION >= 0xA + svc_45_rfu_link_status(); +#endif } void rfu_REQ_startConnectParent(u16 pid) @@ -744,6 +769,9 @@ void rfu_REQ_startConnectParent(u16 pid) gRfuStatic->tryPid = pid; STWI_set_Callback_M(rfu_STC_REQ_callback); STWI_send_CP_StartREQ(pid); +#if REVISION >= 0xA + svc_43(pid); +#endif } else { diff --git a/src/link_rfu_2.c b/src/link_rfu_2.c index 67cb1c9cb..51f393bcd 100644 --- a/src/link_rfu_2.c +++ b/src/link_rfu_2.c @@ -73,14 +73,25 @@ struct RfuDebug static EWRAM_DATA INIT_PARAM sRfuReqConfig = {}; static EWRAM_DATA struct RfuDebug sRfuDebug = {}; +#if REVISION >= 0xA +#else static u32 sRfuAPIBuffer[RFU_API_BUFF_SIZE_RAM / 4]; +#endif static u8 sResendBlock8[CMD_LENGTH * 2]; static u16 sResendBlock16[CMD_LENGTH]; +#if REVISION >= 0xA +COMMON_DATA u32 sRfuAPIBuffer[RFU_API_BUFF_SIZE_RAM / 4] = {0}; +#endif COMMON_DATA struct RfuGameData gHostRfuGameData = {0}; COMMON_DATA struct RfuManager gRfu = {0}; COMMON_DATA u8 gHostRfuUsername[PLAYER_NAME_LENGTH + 1] = {0}; +#if REVISION >= 0xA +u16 ReadU16(const void* ptr); +#else +static u16 ReadU16(const void *ptr); +#endif static void InitChildRecvBuffers(void); static void InitParentSendData(void); static void MscCallback_Child(u16 REQ_commandID); @@ -94,7 +105,6 @@ static void SendNextBlock(void); static void SendLastBlock(void); static void CallRfuFunc(void); static void UpdateChildStatuses(void); -static s32 GetJoinGroupStatus(void); static void Task_PlayerExchange(u8 taskId); static void ClearSelectedLinkPlayerIds(u16 disconnectMask); static void ValidateAndReceivePokemonSioInfo(void *recvBuffer); @@ -120,8 +130,13 @@ static const INIT_PARAM sRfuReqConfigTemplate = { .userName = gHostRfuUsername, .fastSearchParent_flag = TRUE, .linkRecovery_enable = FALSE, +#if REVISION >= 0xA + .linkRecovery_period = 720, + .NI_failCounter_limit = 480 +#else .linkRecovery_period = 600, .NI_failCounter_limit = 300 +#endif }; static const u8 sAvailSlots[] = { @@ -319,7 +334,11 @@ static void Task_ParentSearchForChildren(u8 taskId) case RFUSTATE_INIT_END: break; case RFUSTATE_PARENT_CONNECT: +#if REVISION >= 0xA + rfu_LMAN_establishConnection(gRfu.parentChild, 0, 360, (u16 *)sAcceptedSerialNos); +#else rfu_LMAN_establishConnection(gRfu.parentChild, 0, 240, (u16 *)sAcceptedSerialNos); +#endif gRfu.state = RFUSTATE_PARENT_CONNECT_END; gTasks[taskId].data[1] = 6; break; @@ -406,7 +425,11 @@ static void Task_ChildSearchForParent(u8 taskId) case RFUSTATE_INIT_END: break; case RFUSTATE_CHILD_CONNECT: +#if REVISION >= 0xA + rfu_LMAN_establishConnection(gRfu.parentChild, 0, 360, (u16 *)sAcceptedSerialNos); +#else rfu_LMAN_establishConnection(gRfu.parentChild, 0, 240, (u16 *)sAcceptedSerialNos); +#endif gRfu.state = RFUSTATE_CHILD_CONNECT_END; gTasks[taskId].data[1] = 7; break; @@ -493,7 +516,11 @@ static void Task_UnionRoomListen(u8 taskId) case RFUSTATE_INIT_END: break; case RFUSTATE_UR_CONNECT: +#if REVISION >= 0xA + rfu_LMAN_establishConnection(MODE_P_C_SWITCH, 0, 360, (u16 *)sAcceptedSerialNos); +#else rfu_LMAN_establishConnection(MODE_P_C_SWITCH, 0, 240, (u16 *)sAcceptedSerialNos); +#endif rfu_LMAN_setMSCCallback(MscCallback_Child); gRfu.state = RFUSTATE_UR_CONNECT_END; break; @@ -534,7 +561,11 @@ static void Task_UnionRoomListen(u8 taskId) void LinkRfu_CreateConnectionAsParent(void) { +#if REVISION >= 0xA + rfu_LMAN_establishConnection(MODE_PARENT, 0, 360, (u16 *)sAcceptedSerialNos); +#else rfu_LMAN_establishConnection(MODE_PARENT, 0, 240, (u16 *)sAcceptedSerialNos); +#endif } void LinkRfu_StopManagerBeforeEnteringChat(void) @@ -542,6 +573,14 @@ void LinkRfu_StopManagerBeforeEnteringChat(void) rfu_LMAN_stopManager(FALSE); } +#if REVISION >= 0xA +void LinkRfu_ForceChangeSpParent(void) +{ + if (gRfu.parentId != 0) return; + rfu_LMAN_forceChangeSP(FALSE); +} +#endif + // Argument is provided by the RFU and is unused. static void MscCallback_Child(u16 REQ_commandID) { @@ -578,6 +617,9 @@ void LinkRfu_Shutdown(void) return; rfu_LMAN_powerDownRFU(); +#if REVISION >= 0xA + svc_44(); +#endif if (gRfu.parentChild == MODE_PARENT) { // Stop parent searching for children @@ -631,7 +673,11 @@ static bool8 CanTryReconnectParent(void) static bool32 TryReconnectParent(void) { +#if REVISION >= 0xA + if (gRfu.state == RFUSTATE_CHILD_CONNECT_END && !rfu_LMAN_CHILD_connectParent(gRfuLinkStatus->partner[gRfu.reconnectParentId].id, 360)) +#else if (gRfu.state == RFUSTATE_CHILD_CONNECT_END && !rfu_LMAN_CHILD_connectParent(gRfuLinkStatus->partner[gRfu.reconnectParentId].id, 240)) +#endif { gRfu.state = RFUSTATE_RECONNECTED; return TRUE; @@ -825,14 +871,25 @@ static bool32 RfuMain2_Parent(void) { if (gRfu.childRecvBuffer[i][1]) { +#if REVISION >= 0xA + u8* childRecvBuffer = gRfu.childRecvBuffer[i]; + u8 newChildRecvId = childRecvBuffer[0] / 32; + u8* oldChildRecvId = &gRfu.childRecvIds[i]; + if (*oldChildRecvId != 0xFF && newChildRecvId != ((*oldChildRecvId + 1) & 7)) +#else if (gRfu.childRecvIds[i] != 0xFF && (gRfu.childRecvBuffer[i][0] >> 5) != ((gRfu.childRecvIds[i] + 1) & 7)) +#endif { if (++gRfu.numChildRecvErrors[i] > 4) RfuSetErrorParams(F_RFU_ERROR_8 | F_RFU_ERROR_1); } else { +#if REVISION >= 0xA + gRfu.childRecvIds[i] = newChildRecvId; +#else gRfu.childRecvIds[i] = gRfu.childRecvBuffer[i][0] / 32; +#endif gRfu.numChildRecvErrors[i] = 0; gRfu.childRecvBuffer[i][0] &= 0x1f; r0 = gRfu.linkPlayerIdx[i]; @@ -1388,6 +1445,9 @@ static void TryDisconnectRfu(void) { rfu_LMAN_requestChangeAgbClockMaster(); gRfu.disconnectMode = RFU_DISCONNECT_NORMAL; +#if REVISION >= 0xA + svc_44(); +#endif } else gRfu.callback = DisconnectRfu; @@ -1398,6 +1458,9 @@ void LinkRfu_FatalError(void) rfu_LMAN_requestChangeAgbClockMaster(); gRfu.disconnectMode = RFU_DISCONNECT_ERROR; gRfu.disconnectSlots = gRfuLinkStatus->connSlotFlag | gRfuLinkStatus->linkLossSlotFlag; +#if REVISION >= 0xA + svc_44(); +#endif } // RFU equivalent of LinkCB_WaitCloseLink @@ -1549,7 +1612,11 @@ u8 Rfu_SetLinkRecovery(bool32 enable) { if (!enable) return rfu_LMAN_setLinkRecovery(FALSE, 0); +#if REVISION >= 0xA + rfu_LMAN_setLinkRecovery(TRUE, 720); +#else rfu_LMAN_setLinkRecovery(TRUE, 600); +#endif return 0; } @@ -1588,8 +1655,11 @@ static bool8 CheckForLeavingGroupMembers(void) bool8 memberLeft = FALSE; for (i = 0; i < RFU_CHILD_MAX; i++) { +#if REVISION >= 0xA +#else if (gRfu.partnerSendStatuses[i] < RFU_STATUS_JOIN_GROUP_OK || gRfu.partnerSendStatuses[i] > RFU_STATUS_JOIN_GROUP_NO) +#endif { if (gRfuSlotStatusNI[i]->recv.state == SLOT_STATE_RECV_SUCCESS || gRfuSlotStatusNI[i]->recv.state == SLOT_STATE_RECV_SUCCESS_AND_SENDSIDE_UNKNOWN) @@ -1598,7 +1668,11 @@ static bool8 CheckForLeavingGroupMembers(void) { gRfu.partnerSendStatuses[i] = RFU_STATUS_LEAVE_GROUP; gRfu.partnerRecvStatuses[i] = RFU_STATUS_CHILD_LEAVE_READY; +#if REVISION >= 0xA + rfu_clearSlot(TYPE_NI_SEND | TYPE_NI_RECV, i); +#else rfu_clearSlot(TYPE_NI_RECV, i); +#endif rfu_NI_setSendData(1 << i, 8, &gRfu.partnerSendStatuses[i], 1); memberLeft = TRUE; } @@ -1626,6 +1700,12 @@ bool32 RfuTryDisconnectLeavingChildren(void) childrenLeaving |= (1 << i); gRfu.partnerRecvStatuses[i] = RFU_STATUS_OK; } +#if REVISION >= 0xA + if (((gRfuLinkStatus->connSlotFlag >> i) & 1) == 0) + { + gRfu.partnerRecvStatuses[i] = RFU_STATUS_OK; + } +#endif } // Disconnect any leaving children @@ -1667,6 +1747,9 @@ void SendLeaveGroupNotice(void) { gRfu.sendStatus = RFU_STATUS_LEAVE_GROUP_NOTICE; rfu_clearSlot(TYPE_NI_SEND, gRfu.childSlot); +#if REVISION >= 0xA + gRfuLinkStatus->remainLLFrameSizeChild[gRfu.childSlot] = 16; +#endif rfu_NI_setSendData(1 << gRfu.childSlot, 8, &gRfu.sendStatus, 1); } @@ -1697,7 +1780,7 @@ static void UpdateChildStatuses(void) } } -static s32 GetJoinGroupStatus(void) +s32 GetJoinGroupStatus(void) { s32 status = RFU_STATUS_OK; if (gRfu.sendStatus == RFU_STATUS_LEAVE_GROUP_NOTICE) @@ -1791,7 +1874,11 @@ static void Task_PlayerExchange(u8 taskId) DestroyTask(taskId); gReceivedRemoteLinkPlayers = TRUE; gRfu.playerExchangeActive = FALSE; +#if REVISION >= 0xA + rfu_LMAN_setLinkRecovery(1, 720); +#else rfu_LMAN_setLinkRecovery(1, 600); +#endif if (gRfu.newChildQueue) { for (i = 0; i < RFU_CHILD_MAX; i++) @@ -2019,6 +2106,12 @@ bool32 RfuMain1(void) { bool32 retval = FALSE; gRfu.parentId = 0; +#if REVISION >= 0xA + if ((svc_4b() & SVC4B_RESEED_RNG) != 0) + { + SeedRng(ReadU16( & GetHostRfuGameData()->compatibility.playerTrainerId )); + } +#endif rfu_LMAN_manager_entity(Random()); if (!gRfu.isShuttingDown) { @@ -2512,6 +2605,13 @@ u8 RfuGetStatus(void) return gRfu.status; } +#if REVISION >= 0xA +u16 RfuGetErrorInfo(void) +{ + return gRfu.errorInfo; +} +#endif + bool32 RfuHasErrored(void) { u32 status = RfuGetStatus(); @@ -2629,15 +2729,23 @@ void InitializeRfuLinkManager_EnterUnionRoom(void) rfu_LMAN_initializeManager(LinkManagerCB_UnionRoom, NULL); sRfuReqConfig = sRfuReqConfigTemplate; sRfuReqConfig.linkRecovery_enable = 0; +#if REVISION >= 0xA + sRfuReqConfig.linkRecovery_period = 720; +#else sRfuReqConfig.linkRecovery_period = 600; +#endif gRfu.searchTaskId = CreateTask(Task_UnionRoomListen, 1); } +#if REVISION >= 0xA +// (what used to be) ReadAsU16 from union_room.c is used instead. +#else static u16 ReadU16(const void *ptr) { const u8 *ptr_ = ptr; return (ptr_[1] << 8) | (ptr_[0]); } +#endif /* * ================================================================ @@ -2777,7 +2885,11 @@ static void Task_RfuReconnectWithParent(u8 taskId) tTime++; } +#if REVISION >= 0xA + if (tTime > 360) +#else if (tTime > 240) +#endif { // Timeout error RfuSetStatus(RFU_STATUS_CONNECTION_ERROR, F_RFU_ERROR_5 | F_RFU_ERROR_6 | F_RFU_ERROR_7); @@ -2799,6 +2911,13 @@ void CreateTask_RfuReconnectWithParent(const u8 *name, u16 trainerId) data[8] = trainerId; } +#if REVISION >= 0xA +void DestroyTask_RfuReconnectWithParent(void) +{ + DestroyTask(FindTaskIdByFunc(Task_RfuReconnectWithParent)); +} +#endif + static bool32 IsPartnerActivityIncompatible(s16 activity, struct RfuGameData *partner) { if (GetHostRfuGameData()->activity == (ACTIVITY_CHAT | IN_UNION_ROOM)) @@ -2843,7 +2962,11 @@ static void Task_TryConnectToUnionRoomParent(u8 taskId) if (gRfu.status == RFU_STATUS_NEW_CHILD_DETECTED) DestroyTask(taskId); +#if REVISION >= 0xA + if (++gTasks[taskId].data[0] > 480) +#else if (++gTasks[taskId].data[0] > 300) +#endif { // Timeout error RfuSetStatus(RFU_STATUS_CONNECTION_ERROR, F_RFU_ERROR_5 | F_RFU_ERROR_6 | F_RFU_ERROR_7); @@ -2861,7 +2984,11 @@ static void Task_TryConnectToUnionRoomParent(u8 taskId) // Parent found, try to connect if (!IsPartnerActivityIncompatible(gTasks[taskId].data[1], (struct RfuGameData *)&gRfuLinkStatus->partner[id].gname)) { +#if REVISION >= 0xA + if (gRfuLinkStatus->partner[id].slot != 0xFF && !rfu_LMAN_CHILD_connectParent(gRfuLinkStatus->partner[id].id, 150)) +#else if (gRfuLinkStatus->partner[id].slot != 0xFF && !rfu_LMAN_CHILD_connectParent(gRfuLinkStatus->partner[id].id, 90)) +#endif { // Succesfully connected to parent gRfu.state = RFUSTATE_CONNECTED; @@ -2886,7 +3013,11 @@ void TryConnectToUnionRoomParent(const u8 *name, struct RfuGameData *parent, u8 gRfu.status = RFU_STATUS_OK; StringCopy(gRfu.parent.uname, name); memcpy(gRfu.parent.gname, parent, RFU_GAME_NAME_LENGTH); +#if REVISION >= 0xA + rfu_LMAN_forceChangeSP(TRUE); +#else rfu_LMAN_forceChangeSP(); +#endif taskId = CreateTask(Task_TryConnectToUnionRoomParent, 2); gTasks[taskId].tActivity = activity; listenTaskId = FindTaskIdByFunc(Task_UnionRoomListen); @@ -3001,6 +3132,27 @@ u32 GetRfuRecvQueueLength(void) return gRfu.recvQueue.count; } +#if REVISION >= 0xA +static inline void RfuReloadCommon(void) { + m4aMPlayStop(&gMPlayInfo_SE1); + m4aMPlayStop(&gMPlayInfo_SE2); + m4aMPlayStop(&gMPlayInfo_SE3); + StopMapMusic(); + gMain.callback1 = NULL; + HelpSystem_Enable(); +} + +void RfuReloadSave(void) { + RfuReloadCommon(); + ReloadSave(); +} + +void RfuSoftReset(void) { + RfuReloadCommon(); + DoSoftReset(); +} +#endif + static void Task_Idle(u8 taskId) { diff --git a/src/load_save.c b/src/load_save.c index a28182f50..969374faf 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -96,7 +96,7 @@ void MoveSaveBlocks_ResetHeap(void) gMain.vblankCallback = NULL; gMain.hblankCallback = NULL; gTrainerTowerVBlankCounter = NULL; - + saveBlock2Copy = (struct SaveBlock2 *)(gHeap); saveBlock1Copy = (struct SaveBlock1 *)(gHeap + sizeof(struct SaveBlock2)); pokemonStorageCopy = (struct PokemonStorage *)(gHeap + sizeof(struct SaveBlock2) + sizeof(struct SaveBlock1)); @@ -187,7 +187,7 @@ void SaveObjectEvents(void) gSaveBlock1Ptr->objectEvents[i].graphicsId = (graphicsId >> 8) | (graphicsId << 8); gSaveBlock1Ptr->objectEvents[i].spriteId = 127; // magic number // To avoid crash on vanilla, save follower as inactive - if (gObjectEvents[i].localId == OBJ_EVENT_ID_FOLLOWER) + if (gObjectEvents[i].localId == OBJ_EVENT_ID_FOLLOWER) gSaveBlock1Ptr->objectEvents[i].active = FALSE; } } diff --git a/src/main.c b/src/main.c index 58e6d7c67..651c74caf 100644 --- a/src/main.c +++ b/src/main.c @@ -193,6 +193,9 @@ static void InitMainCallbacks(void) gSaveBlock2Ptr = &gSaveblock2.block; gPokemonStoragePtr = &gPokemonStorage.block; gQuestLogPlaybackState = QL_PLAYBACK_STATE_STOPPED; +#if REVISION >= 0xA + svc_SetSaveBlock2(&gSaveBlock2); +#endif } static void CallCallbacks(void) diff --git a/src/menu.c b/src/menu.c index f583ea33b..814dd140e 100644 --- a/src/menu.c +++ b/src/menu.c @@ -1303,8 +1303,14 @@ void ResetBgPositions(void) void DestroyYesNoMenu(void) { +#if REVISION >= 0xA + if (sYesNoWindowId == 0xFF) return; +#endif ClearStdWindowAndFrameToTransparent(sYesNoWindowId, TRUE); RemoveWindow(sYesNoWindowId); +#if REVISION >= 0xA + sYesNoWindowId = 0xFF; +#endif } void MultichoiceGrid_PrintItems(u8 windowId, u8 fontId, u8 itemWidth, u8 itemHeight, u8 cols, u8 rows, const struct MenuAction *strs) diff --git a/src/mystery_gift_menu.c b/src/mystery_gift_menu.c index 105f1dbd7..c16440636 100644 --- a/src/mystery_gift_menu.c +++ b/src/mystery_gift_menu.c @@ -31,7 +31,7 @@ EWRAM_DATA u8 sDownArrowCounterAndYCoordIdx[8] = {}; EWRAM_DATA bool8 gGiftIsFromEReader = FALSE; static void CreateMysteryGiftTask(void); -static void Task_MysteryGift(u8 taskId); +void Task_MysteryGift(u8 taskId); extern void CreateEReaderTask(void); static const u16 sTextboxBorder_Pal[] = INCBIN_U16("graphics/interface/mystery_gift_textbox_border.gbapal"); @@ -1086,7 +1086,7 @@ static void CreateMysteryGiftTask(void) data->clientMsg = AllocZeroed(CLIENT_MAX_MSG_SIZE); } -static void Task_MysteryGift(u8 taskId) +void Task_MysteryGift(u8 taskId) { struct MysteryGiftTaskData * data = (void *)gTasks[taskId].data; bool32 successMsg, input; diff --git a/src/naming_screen.c b/src/naming_screen.c index 575e68feb..eccdfce81 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -686,7 +686,15 @@ static bool8 MainState_MoveToOKButton(void) static bool8 MainState_PressedOKButton(void) { +#if REVISION >= 0xA + // If the input text matched against the Switch bad words list, do not use it. + if (!svc_BadWordCheck(sNamingScreen->textBuffer)) + { + SaveInputText(); + } +#else SaveInputText(); +#endif SetInputState(INPUT_STATE_DISABLED); SetCursorFlashing(FALSE); TryStartButtonFlash(BUTTON_COUNT, FALSE, TRUE); diff --git a/src/overworld.c b/src/overworld.c index 301e81b34..4383e60bd 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -1735,6 +1735,13 @@ static bool8 RunFieldCallback(void) return TRUE; } +#if REVISION >= 0xA +void ClearFieldCallback(void) +{ + gFieldCallback = NULL; +} +#endif + void CB2_NewGame(void) { FieldClearVBlankHBlankCallbacks(); diff --git a/src/post_battle_event_funcs.c b/src/post_battle_event_funcs.c index cab6d3afe..5679375eb 100644 --- a/src/post_battle_event_funcs.c +++ b/src/post_battle_event_funcs.c @@ -5,7 +5,9 @@ #include "overworld.h" #include "hall_of_fame.h" #include "load_save.h" +#include "item.h" #include "constants/heal_locations.h" +#include "constants/items.h" bool8 EnterHallOfFame(void) { @@ -46,6 +48,20 @@ bool8 EnterHallOfFame(void) { IncrementGameStat(GAME_STAT_RECEIVED_RIBBONS); FlagSet(FLAG_SYS_RIBBON_GET); +#if REVISION >= 0xA + // The player has entered the Hall of Fame for the first time. + // (At least, this is probably what was intended, except giving at least one Champion Ribbon does not imply first Hall of Fame entry) + // Give the event tickets, and the flags for obtaining them, if required. + if (!CheckBagHasItem(ITEM_AURORA_TICKET, 1)) + { + AddBagItem(ITEM_AURORA_TICKET, 1); + FlagSet(FLAG_ENABLE_SHIP_BIRTH_ISLAND); + FlagSet(FLAG_RECEIVED_AURORA_TICKET); + AddBagItem(ITEM_MYSTIC_TICKET, 1); + FlagSet(FLAG_ENABLE_SHIP_NAVEL_ROCK); + FlagSet(FLAG_RECEIVED_MYSTIC_TICKET); + } +#endif } SetMainCallback2(CB2_DoHallOfFameScreen); return FALSE; diff --git a/src/save.c b/src/save.c index 496c4d048..8efd27d58 100644 --- a/src/save.c +++ b/src/save.c @@ -980,6 +980,9 @@ void Task_LinkFullSave(u8 taskId) gTasks[taskId].data[0] = 1; break; case 1: +#if REVISION >= 0xA + if (!IsLinkTaskFinished()) break; +#endif SetLinkStandbyCallback(); gTasks[taskId].data[0] = 2; break; @@ -1013,6 +1016,9 @@ void Task_LinkFullSave(u8 taskId) gTasks[taskId].data[0] = 7; break; case 7: +#if REVISION >= 0xA + if (!IsLinkTaskFinished()) break; +#endif ClearContinueGameWarpStatus2(); SetLinkStandbyCallback(); gTasks[taskId].data[0] = 8; @@ -1021,10 +1027,16 @@ void Task_LinkFullSave(u8 taskId) if (IsLinkTaskFinished()) { LinkFullSave_SetLastSectorSignature(); +#if REVISION >= 0xA + svc_FinishSave(); +#endif gTasks[taskId].data[0] = 9; } break; case 9: +#if REVISION >= 0xA + if (!IsLinkTaskFinished()) break; +#endif SetLinkStandbyCallback(); gTasks[taskId].data[0] = 10; break; diff --git a/src/scanline_effect.c b/src/scanline_effect.c index 847e3e36f..9918f8ac0 100644 --- a/src/scanline_effect.c +++ b/src/scanline_effect.c @@ -107,16 +107,16 @@ void ScanlineEffect_InitHBlankDmaTransfer(void) static void CopyValue16Bit(void) { - u16 *dest = (u16 *)gScanlineEffect.dmaDest; - u16 *src = (u16 *)&gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer]; + vu16 *dest = (vu16 *)gScanlineEffect.dmaDest; + vu16 *src = (vu16 *)&gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer]; *dest = *src; } static void CopyValue32Bit(void) { - u32 *dest = (u32 *)gScanlineEffect.dmaDest; - u32 *src = (u32 *)&gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer]; + vu32 *dest = (vu32 *)gScanlineEffect.dmaDest; + vu32 *src = (vu32 *)&gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer]; *dest = *src; } diff --git a/src/scrcmd.c b/src/scrcmd.c index 0c5ff4406..6c28da2f2 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -55,6 +55,7 @@ #include "constants/maps.h" #include "constants/menu.h" #include "constants/sound.h" +#include "sloopsvc.h" typedef void (*NativeFunc)(struct ScriptContext *ctx); diff --git a/src/sloopsvc.c b/src/sloopsvc.c new file mode 100644 index 000000000..384ed252f --- /dev/null +++ b/src/sloopsvc.c @@ -0,0 +1,294 @@ +#include "global.h" +#include "librfu.h" +#include "link_rfu.h" +#include "link.h" +#include "sloopsvc.h" + +#if REVISION >= 0xA + +typedef struct _SloopSvc47Params { + // BUGBUG: gHostRfuGameData certainly didn't change size, ResetHostRfuGameData still zeroes 13 bytes + u8 HostRfuGameData[0x10]; + u8 HostRfuUsername[RFU_USER_NAME_LENGTH]; +} SloopSvc47Params; + +static u8 sBadWordAsciiString[256]; + +COMMON_DATA SloopSvc47Params gSvc47Params = {0}; +COMMON_DATA struct RfuLinkStatus *gSloopRfuLinkStatus = NULL; + +// Syscall functions for the extra syscalls handled by the Sloop emulator. +#define SLOOP_SVC_CLOBBERS "r0", "r1", "r2", "r3", "memory" + +// Unreferenced. Sets a flag to true (default true) (svc_41 sets it to false) +void svc_40(void) { + asm volatile("swi 0x40"); +} + +// Unreferenced. Sets a flag to false (default true) (svc_40 sets it to true) +void svc_41(void) { + asm volatile("swi 0x41"); +} + +// Called by rfu_REQ_configGameData. +void svc_47(void) { + u8* params = gSvc47Params.HostRfuGameData; + memcpy(params, &gHostRfuGameData, sizeof(gSvc47Params.HostRfuGameData)); + memcpy(¶ms[sizeof(gSvc47Params.HostRfuGameData)], gHostRfuUsername, sizeof(gSvc47Params.HostRfuUsername)); + asm volatile( + "movs r0, %0 \n" + "swi 0x47 \n" + : + : "l"(params) + : SLOOP_SVC_CLOBBERS + ); + gSloopRfuLinkStatus = gRfuLinkStatus; +} + +// Called by rfu_REQ_startSearchChild. +void svc_42(void) { + asm volatile("swi 0x42"); +} + +// Called from rfu_LMAN_manager_entity. +u32 svc_49(void) { + u32 ret; + asm volatile( + "swi 0x49 \n" + "movs %0, r0 \n" + : "=l"(ret) + : + : SLOOP_SVC_CLOBBERS + ); + return ret; +} + +// Called by rfu_REQ_startSearchParent and rfu_STC_readParentCandidateList. +void svc_45_rfu_link_status(void) { + asm volatile( + "movs r0, %0 \n" + "swi 0x45 \n" + : + : "l"(gRfuLinkStatus) + : SLOOP_SVC_CLOBBERS + ); +} + +// Called by rfu_LMAN_REQ_callback +u32 svc_4a(void) { + u32 ret; + asm volatile( + "swi 0x4a \n" + "movs %0, r0 \n" + : "=l"(ret) + : + : SLOOP_SVC_CLOBBERS + ); + return ret; +} + +// Called by rfu_REQ_startConnectParent +void svc_43(u16 pid) { + asm volatile( + "movs r0, %0 \n" + "swi 0x43 \n" + : + : "l"(pid) + : SLOOP_SVC_CLOBBERS + ); +} + +// Called by rfu_REQ_stopMode, ... +void svc_44(void) { + asm volatile("swi 0x44"); +} + +// Called by Task_WirelessCommunicationScreen +u32 svc_53(void) { + u32 ret; + asm volatile( + "swi 0x53 \n" + "movs %0, r0 \n" + : "=l"(ret) + : + : SLOOP_SVC_CLOBBERS + ); + return ret; +} + +// Called by HandleLinkConnection +u32 svc_51(void) { + u32 ret; + asm volatile( + "swi 0x51 \n" + "movs %0, r0 \n" + : "=l"(ret) + : + : SLOOP_SVC_CLOBBERS + ); + return ret; +} + +// Called by RfuMain1 and SpawnGroupLeaderAndMembers. +// SpawnGroupLeaderAndMembers will exit early in the SpawnGroupLeader case if retval has bit 0 unset. +// RfuMain1 will reseed the RNG by gHostRfuGameData->compatibility.playerTrainerId if retval has bit 1 set. +u32 svc_4b(void) { + u32 ret; + asm volatile( + "swi 0x4b \n" + "movs %0, r0 \n" + : "=l"(ret) + : + : SLOOP_SVC_CLOBBERS + ); + return ret; +} + +// Called by TryWriteSector. +void svc_WriteSector(u8 sector, u8* data) { + asm volatile( + "movs r0, %0 \n" + "movs r1, %1 \n" + "swi 0x48 \n" + : + : "l"(sector), "l"(data) + : SLOOP_SVC_CLOBBERS + ); +} + +// Called by HandleReplaceSector. +void svc_ReplaceSector(u8 sector, u8* data) { + asm volatile( + "movs r0, %0 \n" + "movs r1, %1 \n" + "swi 0x56 \n" + : + : "l"(sector), "l"(data) + : SLOOP_SVC_CLOBBERS + ); +} + +// Called by various save-related functions. +// This writes the save out (handler calls a function using fopen/fwrite/fclose) +void svc_FinishSave(void) { + asm volatile("swi 0x4c"); +} + +// Called by Task_RunUnionRoom and ListMenuHandler_AllItemsAvailable. +// This handler calls functions from the parental controls library. +// ListMenuHandler_AllItemsAvailable returns -2 if this returns zero. +// The Task_RunUnionRoom case auto-declines if this returns zero. +// Probably returns zero if "free communication" is denied by parental control settings. +u32 svc_CommsAllowedByParentalControls(void) { + u32 ret; + asm volatile( + "swi 0x54 \n" + "movs %0, r0 \n" + : "=l"(ret) + : + : SLOOP_SVC_CLOBBERS + ); + return ret; +} + +static inline u32 call_svc_BadWordCheck(u8* string, int arg2) { + u32 ret; + asm volatile( + "movs r0, %1\n" + "movs r1, %2\n" + "swi 0x4d\n" + "movs %0, r0\n" + : "=l" (ret) + : "l" (string), "l" (arg2) + : SLOOP_SVC_CLOBBERS + ); + return ret; +} +// Called by naming screen MainState_PressedOKButton, +// ChatEntryRoutine_SendMessage and union room RegisterTextAtRow. +// This does the bad word checks. +// The text buffer passed in is sanitised, and zero returned if sanitisation occured(?)/badwords present(?) +u32 svc_BadWordCheck(u8* str) { + u32 ret; + PkmnStrToASCII((u8*)sBadWordAsciiString, str); + ret = call_svc_BadWordCheck((u8*)sBadWordAsciiString, 0); + ASCIIToPkmnStr(str, (u8*)sBadWordAsciiString); + return ret; +} + +// Called by various cases of Task_TryJoinLinkGroup and Task_TryBecomeLinkLeader. +void svc_4f(u32 arg) { + asm volatile( + "movs r0, %0 \n" + "swi 0x4f \n" + : + : "l"(arg) + : SLOOP_SVC_CLOBBERS + ); +} + +// Called by a wrapper function called by Task_TryBecomeLinkLeader. +// The wrapper function is equivalent to "return !svc_50();" +// Return value is ORed with gReceivedRemoteLinkPlayers. +u32 svc_50(void) { + u32 ret; + asm volatile( + "swi 0x50 \n" + "movs %0, r0 \n" + : "=l"(ret) + : + : SLOOP_SVC_CLOBBERS + ); + return ret; +} + +// Called by InitMainCallbacks and MoveSaveBlocks_ResetHeap. +// Lets the emulator know where SaveBlock2 is located in memory. +// Emulator appears to use this to get saveBlock2->optionsButtonMode to check against L_EQUALS_A. +void svc_SetSaveBlock2(struct SaveBlock2* saveBlock2) { + asm volatile( + "movs r0, %0 \n" + "swi 0x55 \n" + : + : "l"(saveBlock2) + : SLOOP_SVC_CLOBBERS + ); +} + +// Called by AgbMain, as its first action before RegisterRamReset. +void svc_stubbed(void) { + // No operation. +} + +// Called by ScrCmd_givemon when the party is empty. +// This lets the emulator know what starter was picked (saved in play report / telemetry data) +void svc_SetStarter(u32 species) { + asm volatile( + "movs r0, %0 \n" + "swi 0x57 \n" + : + : "l"(species) + : SLOOP_SVC_CLOBBERS + ); +} + +// Called by Task_StartActivity +// This lets the emulator know the current union room activity. +void svc_SetActivity(u32 activity) { + asm volatile( + "movs r0, %0 \n" + "swi 0x61 \n" + : + : "l"(activity) + : SLOOP_SVC_CLOBBERS + ); +} + +// Called by CB2_PrintErrorMessage. +// This causes the emulator to increment some variable (link error counter, probably). +void svc_IncrementLinkError(void) { + asm volatile("swi 0x62"); +} + + +#endif \ No newline at end of file diff --git a/src/start_menu.c b/src/start_menu.c index 6b0d56e0b..bb7c853c1 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -47,6 +47,7 @@ #include "constants/battle_frontier.h" #include "constants/songs.h" #include "constants/field_weather.h" +#include "sloopsvc.h" enum StartMenuOption { diff --git a/src/task.c b/src/task.c index b188cbbcb..9812197d2 100644 --- a/src/task.c +++ b/src/task.c @@ -83,6 +83,10 @@ static void InsertTask(u8 newTaskId) void DestroyTask(u8 taskId) { +#if REVISION >= 0xA + // Bounds check on the task ID. + if (taskId >= NUM_TASKS) return; +#endif if (gTasks[taskId].isActive) { gTasks[taskId].isActive = FALSE; diff --git a/src/trade.c b/src/trade.c index 8d1cba81a..2bbf64b92 100644 --- a/src/trade.c +++ b/src/trade.c @@ -2100,7 +2100,11 @@ static void CB_HandleTradeCanceled(void) static void CB_InitExitCanceledTrade(void) { +#if REVISION >= 0xA + if (IsLinkTaskFinished() && !gPaletteFade.active) +#else if (!gPaletteFade.active) +#endif { if (gWirelessCommType) SetLinkStandbyCallback(); diff --git a/src/trade_scene.c b/src/trade_scene.c index 0977373f9..c0548c043 100644 --- a/src/trade_scene.c +++ b/src/trade_scene.c @@ -2647,25 +2647,37 @@ static void CB2_SaveAndEndTrade(void) MysteryGift_TryIncrementStat(CARD_STAT_NUM_TRADES, gLinkPlayers[GetMultiplayerId() ^ 1].trainerId); SetContinueGameWarpStatusToDynamicWarp(); LinkFullSave_Init(); +#if REVISION >= 0xA + // No need to wait for a save when the emulator does it fast and synchronously + gMain.state = 52; +#else gMain.state++; +#endif sTradeAnim->timer = 0; break; +#if REVISION >= 0xA +#else case 51: if (++sTradeAnim->timer == 5) gMain.state++; break; +#endif case 52: if (LinkFullSave_WriteSector()) { ClearContinueGameWarpStatus2(); gMain.state = 4; } +#if REVISION >= 0xA + // Save delay is gone, just write the next sector if save isn't finished +#else else { // Save isn't finished, delay again sTradeAnim->timer = 0; gMain.state = 51; } +#endif break; case 4: LinkFullSave_ReplaceLastSector(); @@ -2693,6 +2705,26 @@ static void CB2_SaveAndEndTrade(void) sTradeAnim->timer--; } break; +#if REVISION >= 0xA + case 42: + if (IsLinkTaskFinished()) + { + gMain.state = 43; + } + break; + case 43: + SetLinkStandbyCallback(); + gMain.state = 44; + break; + case 44: + if (IsLinkTaskFinished()) + { + LinkFullSave_SetLastSectorSignature(); + svc_FinishSave(); + gMain.state = 5; + } + break; +#else case 42: if (IsLinkTaskFinished()) { @@ -2700,6 +2732,7 @@ static void CB2_SaveAndEndTrade(void) gMain.state = 5; } break; +#endif case 5: if (++sTradeAnim->timer > 60) { diff --git a/src/trainer_fan_club.c b/src/trainer_fan_club.c index 3b7a57826..98a805f13 100644 --- a/src/trainer_fan_club.c +++ b/src/trainer_fan_club.c @@ -68,7 +68,7 @@ static void UpdateTrainerFanClubGameClear(struct TrainerFanClub *fanClub) SetPlayerGotFirstFans(fanClub); SetInitialFansOfPlayer(fanClub); VarSet(VAR_FANCLUB_LOSE_FAN_TIMER, gSaveBlock2Ptr->playTimeHours); - FlagClear(FLAG_HIDE_SAFFRON_FAN_CLUB_BLACKBELT); + FlagClear(FLAG_HIDE_SAFFRON_FAN_CLUB_BLACK_BELT); FlagClear(FLAG_HIDE_SAFFRON_FAN_CLUB_ROCKER); FlagClear(FLAG_HIDE_SAFFRON_FAN_CLUB_WOMAN); FlagClear(FLAG_HIDE_SAFFRON_FAN_CLUB_BEAUTY); diff --git a/src/trainer_tower.c b/src/trainer_tower.c index eb46ddc96..da4ace28a 100644 --- a/src/trainer_tower.c +++ b/src/trainer_tower.c @@ -112,17 +112,17 @@ static const struct SinglesTrainerInfo sSingleBattleTrainerInfo[] = { {OBJ_EVENT_GFX_TUBER_M_LAND, FACILITY_CLASS_RS_TUBER_M, MALE}, {OBJ_EVENT_GFX_COOLTRAINER_M, FACILITY_CLASS_RS_COOLTRAINER_M, MALE}, {OBJ_EVENT_GFX_COOLTRAINER_F, FACILITY_CLASS_RS_COOLTRAINER_F, FEMALE}, - {OBJ_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_HEX_MANIAC, MALE}, + {OBJ_EVENT_GFX_POKE_MANIAC, FACILITY_CLASS_HEX_MANIAC, MALE}, {OBJ_EVENT_GFX_WOMAN_2, FACILITY_CLASS_RS_LADY, FEMALE}, {OBJ_EVENT_GFX_BEAUTY, FACILITY_CLASS_RS_BEAUTY, FEMALE}, {OBJ_EVENT_GFX_BOY, FACILITY_CLASS_RICH_BOY, MALE}, - {OBJ_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_RS_POKEMANIAC, MALE}, + {OBJ_EVENT_GFX_POKE_MANIAC, FACILITY_CLASS_RS_POKEMANIAC, MALE}, {OBJ_EVENT_GFX_SWIMMER_M_LAND, FACILITY_CLASS_RS_SWIMMER_M, MALE}, - {OBJ_EVENT_GFX_BLACKBELT, FACILITY_CLASS_RS_BLACK_BELT, MALE}, + {OBJ_EVENT_GFX_BLACK_BELT, FACILITY_CLASS_RS_BLACK_BELT, MALE}, {OBJ_EVENT_GFX_ROCKER, FACILITY_CLASS_GUITARIST, MALE}, {OBJ_EVENT_GFX_ROCKER, FACILITY_CLASS_KINDLER, MALE}, {OBJ_EVENT_GFX_CAMPER, FACILITY_CLASS_RS_CAMPER, MALE}, - {OBJ_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_BUG_MANIAC, MALE}, + {OBJ_EVENT_GFX_POKE_MANIAC, FACILITY_CLASS_BUG_MANIAC, MALE}, {OBJ_EVENT_GFX_BOY, FACILITY_CLASS_RS_PSYCHIC_M, MALE}, {OBJ_EVENT_GFX_WOMAN_1, FACILITY_CLASS_RS_PSYCHIC_F, FEMALE}, {OBJ_EVENT_GFX_GENTLEMAN, FACILITY_CLASS_RS_GENTLEMAN, MALE}, @@ -137,7 +137,7 @@ static const struct SinglesTrainerInfo sSingleBattleTrainerInfo[] = { {OBJ_EVENT_GFX_COOLTRAINER_M, FACILITY_CLASS_DRAGON_TAMER, MALE}, {OBJ_EVENT_GFX_ROCKER, FACILITY_CLASS_RS_BIRD_KEEPER, MALE}, {OBJ_EVENT_GFX_LITTLE_BOY, FACILITY_CLASS_NINJA_BOY, MALE}, - {OBJ_EVENT_GFX_BATTLE_GIRL, FACILITY_CLASS_BATTLE_GIRL, FEMALE}, + {OBJ_EVENT_GFX_CRUSH_GIRL, FACILITY_CLASS_BATTLE_GIRL, FEMALE}, {OBJ_EVENT_GFX_BEAUTY, FACILITY_CLASS_PARASOL_LADY, FEMALE}, {OBJ_EVENT_GFX_SWIMMER_F_LAND, FACILITY_CLASS_RS_SWIMMER_F, FEMALE}, {OBJ_EVENT_GFX_PICNICKER, FACILITY_CLASS_RS_PICNICKER, FEMALE}, @@ -156,11 +156,11 @@ static const struct SinglesTrainerInfo sSingleBattleTrainerInfo[] = { {OBJ_EVENT_GFX_SAILOR, FACILITY_CLASS_SAILOR, MALE}, {OBJ_EVENT_GFX_CAMPER, FACILITY_CLASS_CAMPER, MALE}, {OBJ_EVENT_GFX_PICNICKER, FACILITY_CLASS_PICNICKER, FEMALE}, - {OBJ_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_POKEMANIAC, MALE}, - {OBJ_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_SUPER_NERD, MALE}, + {OBJ_EVENT_GFX_POKE_MANIAC, FACILITY_CLASS_POKEMANIAC, MALE}, + {OBJ_EVENT_GFX_POKE_MANIAC, FACILITY_CLASS_SUPER_NERD, MALE}, {OBJ_EVENT_GFX_HIKER, FACILITY_CLASS_HIKER, MALE}, {OBJ_EVENT_GFX_BIKER, FACILITY_CLASS_BIKER, MALE}, - {OBJ_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_BURGLAR, MALE}, + {OBJ_EVENT_GFX_POKE_MANIAC, FACILITY_CLASS_BURGLAR, MALE}, {OBJ_EVENT_GFX_BALDING_MAN, FACILITY_CLASS_ENGINEER, MALE}, {OBJ_EVENT_GFX_FISHER, FACILITY_CLASS_FISHERMAN, MALE}, {OBJ_EVENT_GFX_SWIMMER_M_LAND, FACILITY_CLASS_SWIMMER_M, MALE}, @@ -173,14 +173,14 @@ static const struct SinglesTrainerInfo sSingleBattleTrainerInfo[] = { {OBJ_EVENT_GFX_ROCKER, FACILITY_CLASS_JUGGLER, MALE}, {OBJ_EVENT_GFX_MAN, FACILITY_CLASS_TAMER, MALE}, {OBJ_EVENT_GFX_ROCKER, FACILITY_CLASS_BIRD_KEEPER, MALE}, - {OBJ_EVENT_GFX_BLACKBELT, FACILITY_CLASS_BLACK_BELT, MALE}, + {OBJ_EVENT_GFX_BLACK_BELT, FACILITY_CLASS_BLACK_BELT, MALE}, {OBJ_EVENT_GFX_SCIENTIST, FACILITY_CLASS_SCIENTIST, MALE}, {OBJ_EVENT_GFX_COOLTRAINER_M, FACILITY_CLASS_COOLTRAINER_M, MALE}, {OBJ_EVENT_GFX_COOLTRAINER_F, FACILITY_CLASS_COOLTRAINER_F, FEMALE}, {OBJ_EVENT_GFX_GENTLEMAN, FACILITY_CLASS_GENTLEMAN, MALE}, {OBJ_EVENT_GFX_CHANNELER, FACILITY_CLASS_CHANNELER, FEMALE}, {OBJ_EVENT_GFX_WOMAN_1, FACILITY_CLASS_PSYCHIC_F, FEMALE}, - {OBJ_EVENT_GFX_BATTLE_GIRL, FACILITY_CLASS_CRUSH_GIRL, FEMALE}, + {OBJ_EVENT_GFX_CRUSH_GIRL, FACILITY_CLASS_CRUSH_GIRL, FEMALE}, {OBJ_EVENT_GFX_TUBER_F, FACILITY_CLASS_TUBER_F, FEMALE}, {OBJ_EVENT_GFX_TUBER_M_LAND, FACILITY_CLASS_TUBER_M, MALE}, {OBJ_EVENT_GFX_WOMAN_2, FACILITY_CLASS_PKMN_BREEDER_F, FEMALE}, @@ -202,7 +202,7 @@ static const struct DoublesTrainerInfo sDoubleBattleTrainerInfo[] = { {OBJ_EVENT_GFX_LITTLE_GIRL, OBJ_EVENT_GFX_LITTLE_GIRL, FACILITY_CLASS_TWINS, FEMALE, FEMALE}, {OBJ_EVENT_GFX_COOLTRAINER_M, OBJ_EVENT_GFX_COOLTRAINER_F, FACILITY_CLASS_COOL_COUPLE, MALE, FEMALE}, {OBJ_EVENT_GFX_BEAUTY, OBJ_EVENT_GFX_MAN, FACILITY_CLASS_YOUNG_COUPLE, FEMALE, MALE}, - {OBJ_EVENT_GFX_BATTLE_GIRL, OBJ_EVENT_GFX_BLACKBELT, FACILITY_CLASS_CRUSH_KIN, FEMALE, MALE}, + {OBJ_EVENT_GFX_CRUSH_GIRL, OBJ_EVENT_GFX_BLACK_BELT, FACILITY_CLASS_CRUSH_KIN, FEMALE, MALE}, {OBJ_EVENT_GFX_SWIMMER_F_LAND, OBJ_EVENT_GFX_TUBER_M_LAND, FACILITY_CLASS_SIS_AND_BRO, FEMALE, MALE} }; diff --git a/src/union_room.c b/src/union_room.c index b87883b48..189a3541a 100644 --- a/src/union_room.c +++ b/src/union_room.c @@ -52,6 +52,7 @@ #include "constants/songs.h" #include "constants/trainer_card.h" #include "constants/union_room.h" +#include "sloopsvc.h" // States for Task_RunUnionRoom enum { @@ -147,7 +148,11 @@ enum { LL_STATE_FAILED, LL_STATE_TRY_START_ACTIVITY = 26, LL_STATE_MEMBER_DISCONNECTED = 29, - LL_STATE_CANCEL_WITH_MSG + LL_STATE_CANCEL_WITH_MSG, +#if REVISION >= 0xA + LL_STATE_CONFIRM_MEMBERS_SLOOP, + LL_STATE_DISCONNECT_CHILD_SLOOP +#endif }; // States for Task_TryJoinLinkGroup @@ -208,9 +213,19 @@ EWRAM_DATA u16 gUnionRoomOfferedSpecies = SPECIES_NONE; EWRAM_DATA u8 gUnionRoomRequestedMonType = TYPE_NONE; static EWRAM_DATA struct UnionRoomTrade sUnionRoomTrade = {}; +#if REVISION >= 0xA +COMMON_DATA struct WirelessLink_Leader * sLeader = NULL; +COMMON_DATA struct WirelessLink_URoom * sURoom = NULL; +COMMON_DATA struct WirelessLink_Group * sGroup = NULL; +#else static struct WirelessLink_Leader * sLeader; static struct WirelessLink_Group * sGroup; static struct WirelessLink_URoom * sURoom; +#endif + +#if REVISION >= 0xA +static void Leader_DisconnectOnState(struct WirelessLink_Leader * data, u8 state); +#endif static void Task_TryBecomeLinkLeader(u8); static void Leader_DestroyResources(struct WirelessLink_Leader *); @@ -230,7 +245,12 @@ static void Task_SendMysteryGift(u8); static void Task_CardOrNewsWithFriend(u8); static void Task_CardOrNewsOverWireless(u8); static void Task_RunUnionRoom(u8); +#if REVISION >= 0xA +u16 ReadU16(const u8 *); +#define ReadAsU16(x) ReadU16(x) +#else static u16 ReadAsU16(const u8 *); +#endif static void ReceiveUnionRoomActivityPacket(struct WirelessLink_URoom *); static bool32 HandleContactFromOtherPlayer(struct WirelessLink_URoom *); static void Task_InitUnionRoom(u8); @@ -429,6 +449,9 @@ static void Task_TryBecomeLinkLeader(u8 taskId) CopyBgTilemapBufferToVram(0); data->playerCount = 1; data->state = LL_STATE_GET_AWAITING_PLAYERS_TEXT; +#if REVISION >= 0xA + svc_4f(0); +#endif break; case LL_STATE_GET_AWAITING_PLAYERS_TEXT: StringCopy(gStringVar1, sLinkGroupActivityNameTexts[sPlayerCurrActivity]); @@ -446,19 +469,28 @@ static void Task_TryBecomeLinkLeader(u8 taskId) PrintNumPlayersWaitingForMsg(data->nPlayerModeWindowId, sPlayerActivityGroupSize, data->playerCount); data->state = LL_STATE_PRINT_AWAITING_PLAYERS; +#if REVISION >= 0xA + Leader_SetStateIfMemberListChanged(data, LL_STATE_ACCEPT_NEW_MEMBER_PROMPT, LL_STATE_MEMBER_LEFT); +#endif break; case LL_STATE_PRINT_AWAITING_PLAYERS: if (PrintOnTextbox(&data->textState, gStringVar4)) data->state = LL_STATE_AWAIT_PLAYERS; break; case LL_STATE_AWAIT_PLAYERS: +#if REVISION >= 0xA +#else Leader_SetStateIfMemberListChanged(data, LL_STATE_ACCEPT_NEW_MEMBER_PROMPT, LL_STATE_MEMBER_LEFT); +#endif if (JOY_NEW(B_BUTTON)) { if (data->playerCount == 1) data->state = LL_STATE_SHUTDOWN_AND_FAIL; +#if REVISION >= 0xA +#else else if (GROUP_MIN2(sPlayerActivityGroupSize) != 0) data->state = LL_STATE_CANCEL_WITH_MSG; +#endif else data->state = LL_STATE_CANCEL_PROMPT; } @@ -469,30 +501,54 @@ static void Task_TryBecomeLinkLeader(u8 taskId) && JOY_NEW(START_BUTTON)) { data->state = LL_STATE_MEMBERS_OK_PROMPT; +#if REVISION >= 0xA +#else LinkRfu_StopManagerAndFinalizeSlots(); +#endif } +#if REVISION >= 0xA + if (data->state == LL_STATE_AWAIT_PLAYERS) + { + Leader_SetStateIfMemberListChanged(data, LL_STATE_ACCEPT_NEW_MEMBER_PROMPT, LL_STATE_MEMBER_LEFT); + } + Leader_DisconnectOnState(data, LL_STATE_AWAIT_PLAYERS); +#else if (data->state == LL_STATE_AWAIT_PLAYERS && RfuTryDisconnectLeavingChildren()) { // At least 1 group member has left or is trying to leave data->state = LL_STATE_WAIT_DISCONNECT_CHILD; } +#endif break; case LL_STATE_WAIT_DISCONNECT_CHILD: // Resume after ensuring all members trying to leave have left if (!RfuTryDisconnectLeavingChildren()) { data->state = LL_STATE_AWAIT_PLAYERS; +#if REVISION >= 0xA +#else data->playerCount = LeaderPrunePlayerList(data->playerList); +#endif } break; case LL_STATE_MEMBER_LEFT: +#if REVISION >= 0xA + id = (GROUP_MAX(sPlayerActivityGroupSize) != 2) ? 1 : 0; +#else id = (GROUP_MAX(sPlayerCurrActivity) == 2) ? 1 : 0; +#endif if (PrintOnTextbox(&data->textState, gTexts_UR_PlayerUnavailable[id])) { +#if REVISION >= 0xA +#else data->playerCount = LeaderPrunePlayerList(data->playerList); RedrawListMenu(data->listTaskId); +#endif data->state = LL_STATE_GET_AWAITING_PLAYERS_TEXT; } +#if REVISION >= 0xA + Leader_DisconnectOnState(data, LL_STATE_MEMBER_LEFT); +#endif break; case LL_STATE_MEMBER_DISCONNECTED: id = (GROUP_MAX(sPlayerActivityGroupSize) == 2) ? 0 : 1; @@ -502,6 +558,9 @@ static void Task_TryBecomeLinkLeader(u8 taskId) case LL_STATE_ACCEPT_NEW_MEMBER_PROMPT: if (PrintOnTextbox(&data->textState, gStringVar4)) data->state = LL_STATE_ACCEPT_NEW_MEMBER_PROMPT_HANDLE_INPUT; +#if REVISION >= 0xA + Leader_DisconnectOnState(data, LL_STATE_ACCEPT_NEW_MEMBER_PROMPT); +#endif break; case LL_STATE_ACCEPT_NEW_MEMBER_PROMPT_HANDLE_INPUT: switch (UnionRoomHandleYesNo(&data->textState, HasTrainerLeftPartnersList( @@ -525,6 +584,9 @@ static void Task_TryBecomeLinkLeader(u8 taskId) data->state = LL_STATE_WAIT_DISCONNECT_CHILD; break; } +#if REVISION >= 0xA + Leader_DisconnectOnState(data, LL_STATE_ACCEPT_NEW_MEMBER_PROMPT_HANDLE_INPUT); +#endif break; case LL_STATE_UPDATE_AFTER_JOIN_REQUEST: val = WaitSendRfuStatusToPartner(ReadAsU16(data->playerList->players[data->playerCount].rfu.data.compatibility.playerTrainerId), data->playerList->players[data->playerCount].rfu.name); @@ -549,7 +611,10 @@ static void Task_TryBecomeLinkLeader(u8 taskId) data->state = LL_STATE_ACCEPTED_FINAL_MEMBER; } +#if REVISION >= 0xA +#else LinkRfu_StopManagerAndFinalizeSlots(); +#endif PrintNumPlayersWaitingForMsg(data->nPlayerModeWindowId, sPlayerActivityGroupSize, data->playerCount); } else @@ -561,7 +626,11 @@ static void Task_TryBecomeLinkLeader(u8 taskId) { RequestDisconnectSlotByTrainerNameAndId(data->playerList->players[data->playerCount].rfu.name, ReadAsU16(data->playerList->players[data->playerCount].rfu.data.compatibility.playerTrainerId)); data->playerList->players[data->playerCount].groupScheduledAnim = UNION_ROOM_SPAWN_NONE; +#if REVISION >= 0xA + data->playerCount = LeaderPrunePlayerList(data->playerList); +#else LeaderPrunePlayerList(data->playerList); +#endif RedrawListMenu(data->listTaskId); data->state = LL_STATE_GET_AWAITING_PLAYERS_TEXT; } @@ -577,59 +646,159 @@ static void Task_TryBecomeLinkLeader(u8 taskId) break; case LL_STATE_ACCEPTED_FINAL_MEMBER: if (PrintOnTextbox(&data->textState, gStringVar4)) + { +#if REVISION >= 0xA + data->state = LL_STATE_CONFIRM_MEMBERS_SLOOP; + svc_4f(1); + data->delayTimerAfterOk = 0; +#else data->state = LL_STATE_WAIT_AND_CONFIRM_MEMBERS; +#endif + } +#if REVISION >= 0xA + Leader_DisconnectOnState(data, LL_STATE_ACCEPTED_FINAL_MEMBER); +#endif break; +#if REVISION >= 0xA +#else case LL_STATE_WAIT_AND_CONFIRM_MEMBERS: if (++data->delayTimerAfterOk > 120) data->state = LL_STATE_CONFIRMED_MEMBERS; break; +#endif case LL_STATE_MEMBERS_OK_PROMPT: if (PrintOnTextbox(&data->textState, gText_UR_AreTheseMembersOK)) data->state = LL_STATE_MEMBERS_OK_PROMPT_HANDLE_INPUT; +#if REVISION >= 0xA + Leader_DisconnectOnState(data, LL_STATE_MEMBERS_OK_PROMPT); +#endif break; case LL_STATE_MEMBERS_OK_PROMPT_HANDLE_INPUT: switch (UnionRoomHandleYesNo(&data->textState, FALSE)) { case 0: // YES +#if REVISION >= 0xA + data->state = LL_STATE_CONFIRM_MEMBERS_SLOOP; + svc_4f(1); + data->delayTimerAfterOk = 0; +#else data->state = LL_STATE_CONFIRMED_MEMBERS; +#endif break; case 1: // NO case MENU_B_PRESSED: +#if REVISION >= 0xA + data->state = LL_STATE_CANCEL_PROMPT; +#else if (GROUP_MIN2(sPlayerActivityGroupSize) != 0) data->state = LL_STATE_CANCEL_WITH_MSG; else data->state = LL_STATE_CANCEL_PROMPT; +#endif break; } +#if REVISION >= 0xA + Leader_DisconnectOnState(data, LL_STATE_MEMBERS_OK_PROMPT_HANDLE_INPUT); +#endif break; +#if REVISION >= 0xA + case LL_STATE_CONFIRM_MEMBERS_SLOOP: + switch (LeaderUpdateGroupMembership(data->playerList)) + { + case UNION_ROOM_SPAWN_IN: + data->joinRequestAnswer = RFU_STATUS_CONNECTION_ERROR; + SendRfuStatusToPartner(RFU_STATUS_CONNECTION_ERROR, ReadAsU16(data->playerList->players[data->playerCount].rfu.data.compatibility.playerTrainerId), data->playerList->players[data->playerCount].rfu.name); + data->state = LL_STATE_DISCONNECT_CHILD_SLOOP; + return; + case UNION_ROOM_SPAWN_OUT: + RfuSetStatus(RFU_STATUS_OK, 0); + data->playerCount = LeaderPrunePlayerList(data->playerList); + RedrawListMenu(data->listTaskId); + svc_4f(0); + data->state = LL_STATE_MEMBER_LEFT; + return; + case UNION_ROOM_SPAWN_OUT_SOON: + RfuSetStatus(RFU_STATUS_OK, 0); + data->playerCount = LeaderPrunePlayerList(data->playerList); + RedrawListMenu(data->listTaskId); + return; + } + if (++data->delayTimerAfterOk > 40) + { + data->state = LL_STATE_FINAL_MEMBER_CHECK; + LinkRfu_StopManagerAndFinalizeSlots(); + } + Leader_DisconnectOnState(data, LL_STATE_CONFIRM_MEMBERS_SLOOP); + break; + case LL_STATE_DISCONNECT_CHILD_SLOOP: + val = WaitSendRfuStatusToPartner(ReadAsU16(data->playerList->players[data->playerCount].rfu.data.compatibility.playerTrainerId), data->playerList->players[data->playerCount].rfu.name); + if (val == 1) + { + // Send complete + RequestDisconnectSlotByTrainerNameAndId(data->playerList->players[data->playerCount].rfu.name, ReadAsU16(data->playerList->players[data->playerCount].rfu.data.compatibility.playerTrainerId)); + data->playerList->players[data->playerCount].groupScheduledAnim = UNION_ROOM_SPAWN_NONE; + data->playerCount = LeaderPrunePlayerList(data->playerList); + RedrawListMenu(data->listTaskId); + } else if (val == 2) + { + // Disconnect + RfuSetStatus(RFU_STATUS_OK, 0); + } else break; + data->state = LL_STATE_CONFIRM_MEMBERS_SLOOP; + break; +#endif case LL_STATE_CANCEL_PROMPT: if (PrintOnTextbox(&data->textState, gText_UR_CancelModeWithTheseMembers)) data->state = LL_STATE_CANCEL_PROMPT_HANDLE_INPUT; +#if REVISION >= 0xA + Leader_DisconnectOnState(data, LL_STATE_CANCEL_PROMPT); +#endif break; case LL_STATE_CANCEL_PROMPT_HANDLE_INPUT: switch (UnionRoomHandleYesNo(&data->textState, FALSE)) { case 0: // YES +#if REVISION >= 0xA + data->state = LL_STATE_CANCEL_WITH_MSG; +#else data->state = LL_STATE_SHUTDOWN_AND_FAIL; +#endif break; case 1: // NO case MENU_B_PRESSED: +#if REVISION >= 0xA + if (GROUP_MIN2(sPlayerActivityGroupSize) == 0 && data->playerCount == GROUP_MAX(sPlayerActivityGroupSize)) + data->state = LL_STATE_MEMBERS_OK_PROMPT; +#else if (GROUP_MIN2(sPlayerActivityGroupSize) != 0) data->state = LL_STATE_MEMBERS_OK_PROMPT; else if (data->playerCount == GROUP_MAX(sPlayerActivityGroupSize)) data->state = LL_STATE_MEMBERS_OK_PROMPT; +#endif else data->state = LL_STATE_GET_AWAITING_PLAYERS_TEXT; break; } +#if REVISION >= 0xA + Leader_DisconnectOnState(data, LL_STATE_CANCEL_PROMPT_HANDLE_INPUT); +#endif break; +#if REVISION >= 0xA +#else case LL_STATE_CONFIRMED_MEMBERS: if (!Leader_SetStateIfMemberListChanged(data, LL_STATE_ACCEPT_NEW_MEMBER_PROMPT, LL_STATE_SHUTDOWN_AND_FAIL)) data->state = LL_STATE_FINAL_MEMBER_CHECK; break; +#endif case LL_STATE_FINAL_MEMBER_CHECK: if (LmanAcceptSlotFlagIsNotZero()) { +#if REVISION >= 0xA + if (RfuGetStatus() == RFU_STATUS_CONNECTION_ERROR && RfuGetErrorInfo() == LMAN_MSG_LINK_LOSS_DETECTED_AND_DISCONNECTED) + { + RfuSetStatus(RFU_STATUS_OK, 0); + } +#endif if (WaitRfuState(FALSE)) { data->state = LL_STATE_TRY_START_ACTIVITY; @@ -783,6 +952,18 @@ static void GetGroupLeaderSentAnOKMessage(u8 *dst, u8 caseId) } } +#if REVISION >= 0xA +static void Leader_DisconnectOnState(struct WirelessLink_Leader * data, u8 state) +{ + if (data->state != state) return; + if (!RfuTryDisconnectLeavingChildren()) return; + data->state = LL_STATE_WAIT_DISCONNECT_CHILD; + DestroyYesNoMenu(); + svc_4f(0); + data->textState = 0; +} +#endif + static bool8 Leader_SetStateIfMemberListChanged(struct WirelessLink_Leader * data, u32 joinedState, u32 droppedState) { switch (LeaderUpdateGroupMembership(data->playerList)) @@ -793,11 +974,23 @@ static bool8 Leader_SetStateIfMemberListChanged(struct WirelessLink_Leader * dat CopyAndTranslatePlayerName(gStringVar2, data->playerList->players[data->playerCount]); Leader_GetAcceptNewMemberPrompt(gStringVar4, sPlayerCurrActivity); data->state = joinedState; +#if REVISION >= 0xA + svc_4f(0); +#endif break; case UNION_ROOM_SPAWN_OUT: +#if REVISION >= 0xA + case UNION_ROOM_SPAWN_OUT_SOON: +#endif RfuSetStatus(RFU_STATUS_OK, 0); +#if REVISION >= 0xA + data->playerCount = LeaderPrunePlayerList(data->playerList); +#endif RedrawListMenu(data->listTaskId); data->state = droppedState; +#if REVISION >= 0xA + svc_4f(0); +#endif return TRUE; } @@ -826,9 +1019,13 @@ static void ItemPrintFunc_PossibleGroupMembers(u8 windowId, u32 id, u8 y) static u8 LeaderUpdateGroupMembership(struct RfuPlayerList * list) { struct WirelessLink_Leader * data = sWirelessLinkMain.leader; - u8 ret = UNION_ROOM_SPAWN_NONE; - u8 i; +#if REVISION >= 0xA s32 id; +#else + u8 ret = UNION_ROOM_SPAWN_NONE; + s32 id; +#endif + u8 i; for (i = 1; i < MAX_RFU_PLAYERS; i++) { @@ -846,7 +1043,10 @@ static u8 LeaderUpdateGroupMembership(struct RfuPlayerList * list) { // No new incoming player data->playerList->players[i].groupScheduledAnim = UNION_ROOM_SPAWN_OUT; +#if REVISION >= 0xA +#else ret = UNION_ROOM_SPAWN_OUT; +#endif } } } @@ -854,6 +1054,31 @@ static u8 LeaderUpdateGroupMembership(struct RfuPlayerList * list) for (id = 0; id < RFU_CHILD_MAX; id++) TryAddIncomingPlayerToList(data->playerList->players, &data->incomingPlayerList->players[id], MAX_RFU_PLAYERS); +#if REVISION >= 0xA + id = 1; + { + struct RfuPlayerList* playerList = data->playerList; + // spawning out, and countdown = 0 => SPAWN_OUT + for (; id < MAX_RFU_PLAYERS; id++) + { + if (playerList->players[id].groupScheduledAnim == UNION_ROOM_SPAWN_OUT && playerList->players[id].newPlayerCountdown == 0) + return UNION_ROOM_SPAWN_OUT; + } + // spawning out, and countdown != 0 => SPAWN_OUT_SOON + for (id = 1; id < MAX_RFU_PLAYERS; id++) + { + if (playerList->players[id].groupScheduledAnim == UNION_ROOM_SPAWN_OUT && playerList->players[id].newPlayerCountdown != 0) + return UNION_ROOM_SPAWN_OUT_SOON; + } + // spawning in, and countdown != 0 => SPAWN_IN + for (id = 0; id < MAX_RFU_PLAYERS; id++) + { + if (playerList->players[id].groupScheduledAnim == UNION_ROOM_SPAWN_IN && playerList->players[id].newPlayerCountdown != 0) + return UNION_ROOM_SPAWN_IN; + } + } + return UNION_ROOM_SPAWN_NONE; +#else if (ret != UNION_ROOM_SPAWN_OUT) { for (id = 0; id < MAX_RFU_PLAYERS; id++) @@ -864,6 +1089,7 @@ static u8 LeaderUpdateGroupMembership(struct RfuPlayerList * list) } return ret; +#endif } static u8 LeaderPrunePlayerList(struct RfuPlayerList * list) @@ -924,9 +1150,20 @@ void TryJoinLinkGroup(void) gSpecialVar_Result = LINKUP_ONGOING; } +#if REVISION >= 0xA +static u8 svc_50_wrapper() { + return svc_50() == TRUE; +} +#endif + static void Task_TryJoinLinkGroup(u8 taskId) { s32 id; +#if REVISION >= 0xA + u8 RfuStatus; + bool8 RfuStatusIsGroup; + u8 handleYN; +#endif struct WirelessLink_Group * data = sWirelessLinkMain.group; switch (data->state) @@ -1102,35 +1339,92 @@ static void Task_TryJoinLinkGroup(u8 taskId) break; } +#if REVISION >= 0xA +#else if (RfuGetStatus() == RFU_STATUS_OK && JOY_NEW(B_BUTTON)) data->state = LG_STATE_ASK_LEAVE_GROUP; +#endif break; case LG_STATE_ASK_LEAVE_GROUP: if (PrintOnTextbox(&data->textState, gText_UR_QuitBeingMember)) data->state = LG_STATE_ASK_LEAVE_GROUP_HANDLE_INPUT; break; case LG_STATE_ASK_LEAVE_GROUP_HANDLE_INPUT: +#if REVISION >= 0xA + RfuStatus = RfuGetStatus(); + RfuStatusIsGroup = (RfuStatus == RFU_STATUS_JOIN_GROUP_OK || RfuStatus == RFU_STATUS_WAIT_ACK_JOIN_GROUP || RfuStatus == RFU_STATUS_ACK_JOIN_GROUP); + handleYN = gReceivedRemoteLinkPlayers | svc_50_wrapper(); + switch (UnionRoomHandleYesNo(&data->textState, handleYN)) +#else switch (UnionRoomHandleYesNo(&data->textState, RfuGetStatus())) +#endif { case 0: // YES - SendLeaveGroupNotice(); - data->state = LG_STATE_WAIT_LEAVE_GROUP; +#if REVISION >= 0xA + if (RfuStatusIsGroup) +#endif + { + SendLeaveGroupNotice(); + data->state = LG_STATE_WAIT_LEAVE_GROUP; +#if REVISION >= 0xA + data->delayBeforePrint = 0; +#endif + } +#if REVISION >= 0xA + else + { + data->state = LG_STATE_CANCEL_CHOOSE_LEADER; + } +#endif RedrawListMenu(data->listTaskId); break; case 1: // NO case MENU_B_PRESSED: - data->state = LG_STATE_ASK_JOIN_GROUP; +#if REVISION >= 0xA + if (RfuStatusIsGroup) + { + data->state = LG_STATE_MAIN; + if (RfuStatus >= RFU_STATUS_WAIT_ACK_JOIN_GROUP) + { + data->delayBeforePrint = -15; + RfuSetStatus(RFU_STATUS_WAIT_ACK_JOIN_GROUP, 0); + } + } + else +#endif + { + data->state = LG_STATE_ASK_JOIN_GROUP; + } RedrawListMenu(data->listTaskId); break; case -3: data->state = LG_STATE_MAIN; +#if REVISION >= 0xA + if (RfuStatus == RFU_STATUS_WAIT_ACK_JOIN_GROUP) + RfuSetStatus(RFU_STATUS_ACK_JOIN_GROUP, 0); +#endif RedrawListMenu(data->listTaskId); break; } break; case LG_STATE_WAIT_LEAVE_GROUP: +#if REVISION >= 0xA + switch (GetJoinGroupStatus()) + { + case RFU_STATUS_LEAVE_GROUP: + data->state = LG_STATE_DISCONNECTED; + break; + case RFU_STATUS_JOIN_GROUP_NO: + data->state = LG_STATE_CANCEL_CHOOSE_LEADER; + break; + } + if (data->delayBeforePrint > 240) + data->state = LG_STATE_CANCEL_CHOOSE_LEADER; + ++data->delayBeforePrint; +#else if (RfuGetStatus()) data->state = LG_STATE_MAIN; +#endif break; case LG_STATE_CANCEL_CHOOSE_LEADER: // next: LG_STATE_CANCELED case LG_STATE_RFU_ERROR: // next: LG_STATE_RFU_ERROR_SHUTDOWN @@ -1183,6 +1477,9 @@ static void Task_TryJoinLinkGroup(u8 taskId) } break; case LG_STATE_SHUTDOWN: +#if REVISION >= 0xA + DestroyTask_RfuReconnectWithParent(); +#endif DestroyTask(taskId); JoinGroup_EnableScriptContexts(); LinkRfu_Shutdown(); @@ -1585,6 +1882,10 @@ static void Task_StartActivity(u8 taskId) break; } +#if REVISION >= 0xA + svc_SetActivity(sPlayerCurrActivity); +#endif + switch (sPlayerCurrActivity) { case ACTIVITY_BATTLE_SINGLE | IN_UNION_ROOM: @@ -1703,7 +2004,11 @@ static void Task_RunScriptAndFadeToActivity(u8 taskId) } break; case 2: +#if REVISION >= 0xA + if (IsLinkTaskFinished() && !gPaletteFade.active) +#else if (!gPaletteFade.active) +#endif { SetLinkStandbyCallback(); data[0]++; @@ -2303,7 +2608,11 @@ void RunUnionRoom(void) ListMenuLoadStdPalAt(BG_PLTT_ID(13), 1); } +#if REVISION >= 0xA +u16 ReadU16(const u8 *ptr) +#else static u16 ReadAsU16(const u8 *ptr) +#endif { return (ptr[1] << 8) | (ptr[0]); } @@ -2323,6 +2632,9 @@ static void ScheduleFieldMessageAndExit(const u8 *src) struct WirelessLink_URoom * uroom = sWirelessLinkMain.uRoom; uroom->state = UR_STATE_PRINT_AND_EXIT; +#if REVISION >= 0xA + uroom->textState = 0; +#endif if (src != gStringVar4) StringExpandPlaceholders(gStringVar4, src); } @@ -2521,21 +2833,37 @@ static void Task_RunUnionRoom(u8 taskId) break; case UR_STATE_TRY_COMMUNICATING: UR_RunTextPrinters(); +#if REVISION >= 0xA + LinkRfu_ForceChangeSpParent(); +#endif switch (RfuGetStatus()) { case RFU_STATUS_NEW_CHILD_DETECTED: HandleCancelActivity(TRUE); uroom->state = UR_STATE_MAIN; +#if REVISION >= 0xA + return; +#else break; +#endif case RFU_STATUS_FATAL_ERROR: case RFU_STATUS_CONNECTION_ERROR: if (IsUnionRoomListenTaskActive() == TRUE) ScheduleFieldMessageAndExit(gText_UR_TrainerAppearsBusy); else + { ScheduleFieldMessageWithFollowupState(UR_STATE_CANCEL_ACTIVITY_LINK_ERROR, gText_UR_TrainerAppearsBusy); +#if REVISION >= 0xA + gReceivedRemoteLinkPlayers = FALSE; +#endif + } sPlayerCurrActivity = IN_UNION_ROOM; +#if REVISION >= 0xA + return; +#else break; +#endif } if (gReceivedRemoteLinkPlayers) @@ -2546,6 +2874,14 @@ static void Task_RunUnionRoom(u8 taskId) } break; case UR_STATE_COMMUNICATING_WAIT_FOR_DATA: +#if REVISION >= 0xA + if (!gReceivedRemoteLinkPlayers || RfuHasErrored()) + { + DestroyTask(FindTaskIdByFunc(Task_ExchangeCards)); + uroom->state = UR_STATE_TRAINER_APPEARS_BUSY; + break; + } +#endif if (!FuncIsActiveTask(Task_ExchangeCards)) { if (sPlayerCurrActivity == (ACTIVITY_TRADE | IN_UNION_ROOM)) @@ -2636,7 +2972,10 @@ static void Task_RunUnionRoom(u8 taskId) case UR_STATE_WAIT_FOR_RESPONSE_TO_REQUEST: if (!gReceivedRemoteLinkPlayers) { +#if REVISION >= 0xA +#else StringCopy(gStringVar4, gText_UR_TrainerBattleBusy); +#endif uroom->state = UR_STATE_TRAINER_APPEARS_BUSY; } else @@ -2668,6 +3007,9 @@ static void Task_RunUnionRoom(u8 taskId) ScheduleFieldMessageWithFollowupState(UR_STATE_HANDLE_DO_SOMETHING_PROMPT_INPUT, gTexts_UR_HiDoSomething[id][playerGender]); break; case UR_STATE_PRINT_CARD_INFO: +#if REVISION >= 0xA + svc_SetActivity(IN_UNION_ROOM | ACTIVITY_CARD); +#endif if (PrintOnTextbox(&uroom->textState, gStringVar4)) { uroom->state = UR_STATE_WAIT_FINISH_READING_CARD; @@ -2696,6 +3038,15 @@ static void Task_RunUnionRoom(u8 taskId) switch (UnionRoomHandleYesNo(&uroom->textState, FALSE)) { case 0: // YES +#if REVISION >= 0xA + // If not allowed by parental controls, act as if user chose No. + if (!svc_CommsAllowedByParentalControls()) + { + playerGender = GetUnionRoomPlayerGender(taskData[1], uroom->playerList); + ScheduleFieldMessageAndExit(gTexts_UR_DeclineChat[playerGender]); + break; + } +#endif CopyBgTilemapBufferToVram(0); sPlayerCurrActivity = ACTIVITY_CHAT | IN_UNION_ROOM; UpdateGameData_SetActivity(ACTIVITY_CHAT | IN_UNION_ROOM, 0, TRUE); @@ -2748,7 +3099,15 @@ static void Task_RunUnionRoom(u8 taskId) if (IsUnionRoomListenTaskActive() == TRUE) ScheduleFieldMessageAndExit(gTexts_UR_ChatDeclined[playerGender]); else + { ScheduleFieldMessageWithFollowupState(UR_STATE_CANCEL_ACTIVITY_LINK_ERROR, gTexts_UR_ChatDeclined[playerGender]); +#if REVISION >= 0xA + gReceivedRemoteLinkPlayers = FALSE; +#endif + } +#if REVISION >= 0xA + break; +#endif } if (gReceivedRemoteLinkPlayers) uroom->state = UR_STATE_START_ACTIVITY_FREE_UROOM; @@ -2803,6 +3162,19 @@ static void Task_RunUnionRoom(u8 taskId) switch (UnionRoomHandleYesNo(&uroom->textState, FALSE)) { case 0: // ACCEPT +#if REVISION >= 0xA + // If this is union room chat: + // Tell the emulator to check if Switch parental controls allow free communication. + // If it is not allowed, then act as if the user selected to deny the request. + if (sPlayerCurrActivity == (IN_UNION_ROOM | ACTIVITY_CHAT) && !svc_CommsAllowedByParentalControls()) + { + uroom->playerSendBuffer[0] = ACTIVITY_DECLINE | IN_UNION_ROOM; + Rfu_SendPacket(uroom->playerSendBuffer); + uroom->state = UR_STATE_DECLINE_ACTIVITY_REQUEST; + GetYouDeclinedTheOfferMessage(gStringVar4, sPlayerCurrActivity); + break; + } +#endif uroom->playerSendBuffer[0] = ACTIVITY_ACCEPT | IN_UNION_ROOM; if (sPlayerCurrActivity == (ACTIVITY_CHAT | IN_UNION_ROOM)) UpdateGameData_SetActivity(sPlayerCurrActivity | IN_UNION_ROOM, GetLinkPlayerInfoFlags(1), FALSE); @@ -3155,6 +3527,9 @@ void InitUnionRoom(void) struct WirelessLink_URoom * data; sUnionRoomPlayerName[0] = EOS; +#if REVISION >= 0xA + // The rest of this function is stubbed out, as if QL_IS_PLAYBACK_STATE is always true. +#else if (QL_IS_PLAYBACK_STATE) return; CreateTask(Task_InitUnionRoom, 0); @@ -3166,6 +3541,7 @@ void InitUnionRoom(void) data->unknown = 0; data->unreadPlayerId = 0; sUnionRoomPlayerName[0] = EOS; +#endif } static void Task_InitUnionRoom(u8 taskId) @@ -3307,9 +3683,13 @@ static u8 HandlePlayerListUpdate(void) } else if (data->playerList->players[j].groupScheduledAnim != UNION_ROOM_SPAWN_OUT) { - // Person may have disconnected. Give them 10 seconds. + // Person may have disconnected. Give them 10 seconds. (15 seconds in rev 10) data->playerList->players[j].timeoutCounter++; +#if REVISION >= 0xA + if (data->playerList->players[j].timeoutCounter >= 900) +#else if (data->playerList->players[j].timeoutCounter >= 600) +#endif { data->playerList->players[j].groupScheduledAnim = UNION_ROOM_SPAWN_OUT; retVal = PLIST_RECENT_UPDATE; @@ -3317,9 +3697,13 @@ static u8 HandlePlayerListUpdate(void) } else if (data->playerList->players[j].groupScheduledAnim == UNION_ROOM_SPAWN_OUT) { - // Person dropped. Wait 15 seconds, then remove them. + // Person dropped. Wait 15 seconds (20 seconds in rev 10), then remove them. data->playerList->players[j].timeoutCounter++; +#if REVISION >= 0xA + if (data->playerList->players[j].timeoutCounter >= 1200) +#else if (data->playerList->players[j].timeoutCounter >= 900) +#endif { ClearRfuPlayerList(&data->playerList->players[j], 1); } @@ -3563,6 +3947,14 @@ static s32 ListMenuHandler_AllItemsAvailable(u8 *state, u8 *windowId, u8 *listMe ClearStdWindowAndFrame(*windowId, TRUE); RemoveWindow(*windowId); *state = 0; +#if REVISION >= 0xA + // If this is the union room chat, and Switch parental controls disallow free communication, + // always act as if Cancel was pressed. + if ((input & 0xFF) == (ACTIVITY_CHAT | IN_UNION_ROOM) && !svc_CommsAllowedByParentalControls()) + { + return LIST_CANCEL; + } +#endif return input; } else if (JOY_NEW(B_BUTTON)) diff --git a/src/union_room_battle.c b/src/union_room_battle.c index ece23bc18..f205e7f40 100644 --- a/src/union_room_battle.c +++ b/src/union_room_battle.c @@ -181,16 +181,32 @@ void CB2_UnionRoomBattle(void) case 50: if (!UpdatePaletteFade()) { +#if REVISION >= 0xA +#else SetLinkStandbyCallback(); +#endif gMain.state++; } break; case 51: if (IsLinkTaskFinished()) { +#if REVISION >= 0xA + SetLinkStandbyCallback(); + gMain.state++; +#else + SetMainCallback2(SetUpPartiesAndStartBattle); +#endif + } + break; +#if REVISION >= 0xA + case 52: + if (IsLinkTaskFinished()) + { SetMainCallback2(SetUpPartiesAndStartBattle); } break; +#endif case 6: if (!gReceivedRemoteLinkPlayers) { diff --git a/src/union_room_chat.c b/src/union_room_chat.c index e52c410dd..464df9913 100644 --- a/src/union_room_chat.c +++ b/src/union_room_chat.c @@ -19,6 +19,7 @@ #include "union_room_chat_display.h" #include "union_room_chat.h" #include "constants/songs.h" +#include "sloopsvc.h" #define MESSAGE_BUFFER_NCHAR 15 @@ -813,6 +814,9 @@ static void ChatEntryRoutine_SendMessage(void) switch (sWork->routineState) { case 0: +#if REVISION >= 0xA + svc_BadWordCheck(sWork->messageEntryBuffer); +#endif if (!gReceivedRemoteLinkPlayers) { GoToRoutine(CHATNETRYROUTINE_HANDLE_INPUT); @@ -1169,6 +1173,9 @@ static void RegisterTextAtRow(void) { u8 *src = UnionRoomChat_GetEndOfMessageEntryBuffer(); StringCopy(sWork->registeredTexts[sWork->currentRow], src); +#if REVISION >= 0xA + svc_BadWordCheck(sWork->registeredTexts[sWork->currentRow]); +#endif sWork->changedRegisteredTexts = TRUE; } diff --git a/src/union_room_player_avatar.c b/src/union_room_player_avatar.c index 5a007705b..c67a9e636 100644 --- a/src/union_room_player_avatar.c +++ b/src/union_room_player_avatar.c @@ -9,6 +9,7 @@ #include "constants/event_object_movement.h" #include "constants/union_room.h" #include "constants/event_objects.h" +#include "sloopsvc.h" #define UR_SPRITE_START_ID (MAX_SPRITES - MAX_UNION_ROOM_LEADERS) @@ -32,7 +33,7 @@ static void SetUnionRoomObjectFacingDirection(s32 member, s32 leaderId, u8 direc static const u8 sUnionRoomObjGfxIds[GENDER_COUNT][NUM_UNION_ROOM_CLASSES + 2] = { [MALE] = { OBJ_EVENT_GFX_COOLTRAINER_M, - OBJ_EVENT_GFX_BLACKBELT, + OBJ_EVENT_GFX_BLACK_BELT, OBJ_EVENT_GFX_CAMPER, OBJ_EVENT_GFX_YOUNGSTER, OBJ_EVENT_GFX_BOY, @@ -46,7 +47,7 @@ static const u8 sUnionRoomObjGfxIds[GENDER_COUNT][NUM_UNION_ROOM_CLASSES + 2] = OBJ_EVENT_GFX_PICNICKER, OBJ_EVENT_GFX_LASS, OBJ_EVENT_GFX_WOMAN_1, - OBJ_EVENT_GFX_BATTLE_GIRL, + OBJ_EVENT_GFX_CRUSH_GIRL, OBJ_EVENT_GFX_WOMAN_2, OBJ_EVENT_GFX_BEAUTY } @@ -513,6 +514,14 @@ static void SpawnGroupLeaderAndMembers(u32 leaderId, struct RfuGameData * gameDa { case ACTIVITY_NONE | IN_UNION_ROOM: case ACTIVITY_PLYRTALK | IN_UNION_ROOM: +#if REVISION >= 0xA + if ((svc_4b() & SVC4B_EXIT_EARLY) != 0) + { + DespawnGroupLeader(leaderId); + AssembleGroup(leaderId, gameData); + break; + } +#endif SpawnGroupLeader(leaderId, gameData->playerGender, gameData->compatibility.playerTrainerId[0]); for (i = 0; i < MAX_RFU_PLAYERS; i++) DespawnGroupMember(leaderId, i); diff --git a/src/vs_seeker.c b/src/vs_seeker.c index c6e70cb32..3e51aaa31 100644 --- a/src/vs_seeker.c +++ b/src/vs_seeker.c @@ -2040,7 +2040,7 @@ static u8 GetRunningBehaviorFromGraphicsId(u16 graphicsId) case OBJ_EVENT_GFX_BUG_CATCHER: case OBJ_EVENT_GFX_LASS: case OBJ_EVENT_GFX_WOMAN_1: - case OBJ_EVENT_GFX_BATTLE_GIRL: + case OBJ_EVENT_GFX_CRUSH_GIRL: case OBJ_EVENT_GFX_MAN: case OBJ_EVENT_GFX_ROCKER: case OBJ_EVENT_GFX_WOMAN_2: @@ -2053,7 +2053,7 @@ static u8 GetRunningBehaviorFromGraphicsId(u16 graphicsId) case OBJ_EVENT_GFX_COOLTRAINER_F: case OBJ_EVENT_GFX_SWIMMER_M_LAND: case OBJ_EVENT_GFX_SWIMMER_F_LAND: - case OBJ_EVENT_GFX_BLACKBELT: + case OBJ_EVENT_GFX_BLACK_BELT: case OBJ_EVENT_GFX_HIKER: case OBJ_EVENT_GFX_SAILOR: return MOVEMENT_TYPE_RAISE_HAND_AND_JUMP; diff --git a/src/wireless_communication_status_screen.c b/src/wireless_communication_status_screen.c index 287011b98..3f38dd132 100644 --- a/src/wireless_communication_status_screen.c +++ b/src/wireless_communication_status_screen.c @@ -17,6 +17,7 @@ #include "union_room.h" #include "constants/songs.h" #include "constants/union_room.h" +#include "sloopsvc.h" enum { COLOR_NONE, @@ -51,8 +52,8 @@ static struct u8 filler[10]; } * sStatusScreen; +void Task_WirelessCommunicationScreen(u8 taskId); static void CB2_InitWirelessCommunicationScreen(void); -static void Task_WirelessCommunicationScreen(u8 taskId); static void WCSS_AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 * str, u8 x, u8 y, u8 palIdx); static bool32 UpdateCommunicationCounts(u32 * counts, u32 * lastCounts, u32 * activities, u8 taskId); @@ -144,7 +145,7 @@ static const u8 *const sHeaderTexts[NUM_GROUPTYPES + 1] = { // Activity, group type, number of players // 0 players means the number of players can change and should be counted dynamically // GROUPTYPE_TOTAL have no unique group and are simply counted in the total of "people communicating". -// A handful use NUM_GROUPTYPES, which is invalid, and are changed to GROUPTYPE_TOTAL in Emerald. +// A handful use NUM_GROUPTYPES, which is invalid, and are changed to GROUPTYPE_TOTAL in Emerald (and Revision 10) // UB: GROUPTYPE_NONE (-1) can potentially be used as an index into a u8[4] in CountPlayersInGroupAndGetActivity. static const u8 sActivityGroupInfo[][3] = { {ACTIVITY_BATTLE_SINGLE, GROUPTYPE_BATTLE, 2}, @@ -153,13 +154,23 @@ static const u8 sActivityGroupInfo[][3] = { {ACTIVITY_TRADE, GROUPTYPE_TRADE, 2}, {ACTIVITY_WONDER_CARD, GROUPTYPE_TOTAL, 2}, {ACTIVITY_WONDER_NEWS, GROUPTYPE_TOTAL, 2}, +#if REVISION >= 0xA + {ACTIVITY_POKEMON_JUMP, GROUPTYPE_TOTAL, 0}, + {ACTIVITY_BERRY_CRUSH, GROUPTYPE_TOTAL, 0}, + {ACTIVITY_BERRY_PICK, GROUPTYPE_TOTAL, 0}, +#else {ACTIVITY_POKEMON_JUMP, NUM_GROUPTYPES, 0}, {ACTIVITY_BERRY_CRUSH, NUM_GROUPTYPES, 0}, {ACTIVITY_BERRY_PICK, NUM_GROUPTYPES, 0}, +#endif {ACTIVITY_SEARCH, GROUPTYPE_NONE, 0}, {ACTIVITY_SPIN_TRADE, GROUPTYPE_TRADE, 0}, {ACTIVITY_ITEM_TRADE, GROUPTYPE_NONE, 0}, +#if REVISION >= 0xA + {ACTIVITY_RECORD_CORNER, GROUPTYPE_TOTAL, 0}, +#else {ACTIVITY_RECORD_CORNER, NUM_GROUPTYPES, 0}, +#endif {ACTIVITY_BERRY_BLENDER, GROUPTYPE_NONE, 0}, {ACTIVITY_NONE | IN_UNION_ROOM, GROUPTYPE_UNION, 1}, {ACTIVITY_BATTLE_SINGLE | IN_UNION_ROOM, GROUPTYPE_UNION, 2}, @@ -290,7 +301,7 @@ static void PrintHeaderTexts(void) #define tState data[0] -static void Task_WirelessCommunicationScreen(u8 taskId) +void Task_WirelessCommunicationScreen(u8 taskId) { s32 i; switch (gTasks[taskId].tState) @@ -325,7 +336,11 @@ static void Task_WirelessCommunicationScreen(u8 taskId) PutWindowTilemap(2); CopyWindowToVram(2, COPYWIN_FULL); } +#if REVISION >= 0xA + if (JOY_NEW(A_BUTTON) || JOY_NEW(B_BUTTON) || svc_53()) +#else if (JOY_NEW(A_BUTTON) || JOY_NEW(B_BUTTON)) +#endif { PlaySE(SE_SELECT); gTasks[sStatusScreen->rfuTaskId].data[15] = 0xFF; @@ -384,6 +399,40 @@ static void WCSS_AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 * static u32 CountPlayersInGroupAndGetActivity(struct RfuPlayer * player, u32 * groupCounts) { +#if REVISION >= 0xA + u32 activity = player->rfu.data.activity; + if (player->groupScheduledAnim == UNION_ROOM_SPAWN_IN) + { + + u32 i = 0; + const u8 * group_info = &sActivityGroupInfo[0][0]; + const u8 * group_players = &group_info[2]; + const u8 * group_activity = group_info; + s32 offset = 0; + for (; i < ARRAY_COUNT(sActivityGroupInfo); i++) + { + const u8 * group_type = &group_info[1]; + u8 type = ((u8*)offset)[(u32)group_type]; // needed to match, but nobody would write this??? + if (type < MAX_LINK_PLAYERS && activity == *group_activity) + { + u8 k = *group_players; + if (k == 0) + { + s32 j; + for (j = 0; j < RFU_CHILD_MAX; j++) + if (player->rfu.data.partnerInfo[j] != 0) k++; + k++; + } + groupCounts[type] += k; + break; + } + group_players += sizeof(sActivityGroupInfo[0]); + group_activity += sizeof(sActivityGroupInfo[0]); + offset += (u8)sizeof(sActivityGroupInfo[0]); + } + + } +#else u32 activity = player->rfu.data.activity; s32 i, j, k; @@ -417,11 +466,13 @@ static u32 CountPlayersInGroupAndGetActivity(struct RfuPlayer * player, u32 * gr } } - return activity; - #undef group_activity #undef group_type #undef group_players +#endif + + return activity; + } static bool32 HaveCountsChanged(const u32 * curCounts, const u32 * prevCounts) @@ -454,6 +505,9 @@ static bool32 UpdateCommunicationCounts(u32 * groupCounts, u32 * prevGroupCounts } } +#if REVISION >= 0xA + if (HaveCountsChanged(groupCountBuffer, prevGroupCounts)) +#else if (!HaveCountsChanged(groupCountBuffer, prevGroupCounts)) { if (activitiesUpdated == TRUE) @@ -473,4 +527,5 @@ static bool32 UpdateCommunicationCounts(u32 * groupCounts, u32 * prevGroupCounts #endif ; return TRUE; +#endif } diff --git a/sym_bss_rev10.txt b/sym_bss_rev10.txt new file mode 100644 index 000000000..1a90ebb38 --- /dev/null +++ b/sym_bss_rev10.txt @@ -0,0 +1,38 @@ + .include "src/gpu_regs.o" + .include "src/dma3_manager.o" + .include "src/bg.o" + .include "src/malloc.o" + .include "src/text_printer.o" + .include "src/librfu_stwi.o" + .include "src/librfu_rfu.o" + .include "src/sprite.o" + .include "src/sloopsvc.o" + .include "src/link.o" + .include "src/multiboot.o" + .include "src/daycare.o" + .include "src/trade.o" + .include "src/play_time.o" + .include "src/overworld.o" + .include "src/field_camera.o" + .include "src/script.o" + .include "src/start_menu.o" + .include "src/tileset_anims.o" + .include "src/sound.o" + .include "src/field_effect.o" + .include "src/pokemon_storage_system_misc.o" + .include "src/easy_chat.o" + .include "src/link_rfu_2.o" + .include "src/link_rfu_3.o" + .include "src/quest_log.o" + .include "src/union_room.o" + .include "src/pokemon_special_anim_scene.o" + .include "src/wireless_communication_status_screen.o" + .include "src/dodrio_berry_picking.o" + .include "src/ereader_helpers.o" + .include "src/digit_obj_util.o" + .include "src/m4a_1.o" + .include "data/sound_data.o" + .include "src/agb_flash.o" + .include "*libgcc.a:dp-bit.o" + .include "*libgcc.a:fp-bit.o" + .include "*libc.a:syscalls.o" diff --git a/sym_common_rev10.txt b/sym_common_rev10.txt new file mode 100644 index 000000000..ce4a446c3 --- /dev/null +++ b/sym_common_rev10.txt @@ -0,0 +1,56 @@ + .include "main.o" + .include "bg.o" + .include "text_printer.o" + .align 4 + .include "window.o" + .include "librfu_stwi.o" + .align 4 + .include "librfu_rfu.o" + .include "text.o" + .include "sprite.o" + .align 4 + .include "sloopsvc.o" + .include "link.o" + .align 4 + .include "battle_main.o" + .include "random.o" + .include "load_save.o" + .include "overworld.o" + .align 4 + .include "fieldmap.o" + .align 4 + .include "field_camera.o" + .include "scrcmd.o" + .include "field_control_avatar.o" + .include "event_data.o" + .include "sound.o" + .include "task.o" + .include "cable_club.o" + .include "image_processing_effects.o" + .include "field_specials.o" + .include "evolution_scene.o" + .include "save.o" + .include "battle_anim_special.o" + .include "save_failed_screen.o" + .align 4 + .include "link_rfu_2.o" + .align 4 + .include "AgbRfu_LinkManager.o" + .align 4 + .include "list_menu.o" + .include "quest_log.o" + .include "union_room.o" + .include "party_menu.o" + .include "help_system.o" + .align 4 + .include "fame_checker.o" + .include "help_system_util.o" + .align 4 + .include "ereader_screen.o" + .align 4 + .include "battle_controller_pokedude.o" + .align 4 + .include "berry_fix_program.o" + .include "m4a.o" + .include "agb_flash.o" + .include "librfu_sio32id.o" diff --git a/sym_ewram_rev10.txt b/sym_ewram_rev10.txt new file mode 100644 index 000000000..cee4e8281 --- /dev/null +++ b/sym_ewram_rev10.txt @@ -0,0 +1,137 @@ + .include "src/main.o" + .include "src/malloc.o" + .include "src/text_printer.o" + .include "src/window.o" + .include "src/window_8bpp.o" + .include "src/sprite.o" + .include "src/string_util.o" + .include "src/link.o" + .space 8 + .include "src/battle_controllers.o" + .include "src/battle_main.o" + .include "src/pokemon.o" + .include "src/daycare.o" + .include "src/load_save.o" + .include "src/trade.o" + .include "src/trade_scene.o" + .include "src/new_game.o" + .include "src/overworld.o" + .include "src/fieldmap.o" + .include "src/field_camera.o" + .include "src/field_player_avatar.o" + .include "src/event_object_movement.o" + .include "src/field_message_box.o" + .include "src/script.o" + .include "src/scrcmd.o" + .include "src/event_data.o" + .include "src/start_menu.o" + .include "src/tileset_anims.o" + .include "src/palette.o" + .include "src/sound.o" + .include "src/battle_anim.o" + .include "src/battle_anim_mons.o" + .include "src/title_screen.o" + .include "src/field_weather.o" + .include "src/battle_setup.o" + .include "src/wild_encounter.o" + .include "src/field_effect.o" + .include "src/scanline_effect.o" + .include "src/option_menu.o" + .include "src/trainer_card.o" + .include "src/pokemon_storage_system_menu.o" + .include "src/pokemon_storage_system_tasks.o" + .include "src/pokemon_storage_system_data.o" + .include "src/pokemon_storage_system_misc.o" + .include "src/script_movement.o" + .include "src/fldeff_cut.o" + .include "src/item_menu_icons.o" + .include "src/item.o" + .include "src/shop.o" + .include "src/special_field_anim.o" + .include "src/script_menu.o" + .include "src/naming_screen.o" + .include "src/money.o" + .include "src/safari_zone.o" + .include "src/item_use.o" + .include "src/battle_anim_effects_1.o" + .include "src/battle_anim_dragon.o" + .include "src/battle_anim_utility_funcs.o" + .include "src/battle_intro.o" + .include "src/easy_chat.o" + .include "src/mon_markings.o" + .include "src/mail.o" + .include "src/menu_helpers.o" + .include "src/region_map.o" + .include "src/battle_ai_script_commands.o" + .include "src/fldeff_rocksmash.o" + .include "src/field_specials.o" + .include "src/battle_records.o" + .include "src/evolution_scene.o" + .include "src/coins.o" + .include "src/battle_transition.o" + .include "src/battle_message.o" + .include "src/save.o" + .include "src/mystery_event_script.o" + .include "src/fldeff_sweetscent.o" + .include "src/learn_move.o" + .include "src/battle_tower.o" + .include "src/player_pc.o" + .include "src/intro.o" + .include "src/hall_of_fame.o" + .include "src/credits.o" + .include "src/diploma.o" + .include "src/save_failed_screen.o" + .include "src/clear_save_data_screen.o" + .include "src/new_menu_helpers.o" + .include "src/tilemap_util.o" + .include "src/map_preview_screen.o" + .include "src/link_rfu_2.o" + .include "src/link_rfu_3.o" + .include "src/easy_chat_2.o" + .include "src/easy_chat_3.o" + .include "src/pokedex_screen.o" + .include "src/list_menu.o" + .include "src/item_menu.o" + .include "src/bag.o" + .include "src/trainer_pokemon_sprites.o" + .include "src/vs_seeker.o" + .include "src/item_pc.o" + .include "src/mailbox_pc.o" + .include "src/menu.o" + .include "src/quest_log.o" + .include "src/help_message.o" + .include "src/quest_log_events.o" + .include "src/union_room.o" + .include "src/union_room_player_avatar.o" + .include "src/union_room_battle.o" + .include "src/pokemon_special_anim.o" + .include "src/party_menu.o" + .include "src/union_room_chat.o" + .include "src/union_room_chat_display.o" + .include "src/union_room_chat_objects.o" + .include "src/help_system.o" + .include "src/fame_checker.o" + .include "src/oak_speech.o" + .include "src/tm_case.o" + .include "src/menu_indicators.o" + .include "src/pokemon_summary_screen.o" + .include "src/help_system_util.o" + .include "src/dynamic_placeholder_text_util.o" + .include "src/berry_pouch.o" + .include "src/slot_machine.o" + .include "src/roamer.o" + .include "src/mystery_gift_menu.o" + .include "src/mystery_gift.o" + .include "src/mystery_gift_link.o" + .include "src/mystery_gift_client.o" + .include "src/mystery_gift_server.o" + .include "src/mystery_gift_show_card.o" + .include "src/mystery_gift_show_news.o" + .include "src/seagallop.o" + .include "src/pokemon_jump.o" + .include "src/berry_crush.o" + .include "src/dodrio_berry_picking.o" + .include "src/teachy_tv.o" + .include "src/digit_obj_util.o" + .include "src/trainer_tower.o" + .include "src/berry_powder.o"