Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-05-09 04:23:14 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'pret/master'

Browse Source
This commit is contained in:
cawtds 2026-03-22 16:21:11 +01:00
commit 77a1ddc8a4
320 changed files with 2821 additions and 14190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -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 > $@

2
README.md
View File

@ -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)

4
data/event_scripts.s
View File

@ -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

14
data/maps/BattleFrontier_BattleArenaBattleRoom/map.json
View File

@ -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,

2
data/maps/BattleFrontier_BattleArenaCorridor/map.json
View File

@ -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,

2
data/maps/BattleFrontier_BattleArenaLobby/map.json
View File

@ -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,

2
data/maps/BattleFrontier_BattlePalaceLobby/map.json
View File

@ -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,

2
data/maps/BattleFrontier_Lounge5/map.json
View File

@ -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,

4
data/maps/BattleFrontier_OutsideEast/map.json
View File

@ -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,

2
data/maps/CeladonCity_Condominiums_3F/map.json
View File

@ -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,

2
data/maps/CeladonCity_Condominiums_RoofRoom/map.json
View File

@ -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,

6
data/maps/CinnabarIsland_Gym/map.json
View File

@ -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,

2
data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json
View File

@ -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,

2
data/maps/IndigoPlateau_PokemonCenter_1F/map.json
View File

@ -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,

2
data/maps/MtEmber_Exterior/map.json
View File

@ -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,

12
data/maps/OneIsland_KindleRoad/map.json
View File

@ -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,

2
data/maps/OneIsland_KindleRoad_EmberSpa/map.json
View File

@ -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,

4
data/maps/OneIsland_PokemonCenter_1F/map.json
View File

@ -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"
}
],

6
data/maps/OneIsland_PokemonCenter_1F/scripts.inc
View File

@ -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

2
data/maps/PokemonMansion_2F/map.json
View File

@ -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,

2
data/maps/PokemonMansion_3F/map.json
View File

@ -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,

2
data/maps/PokemonMansion_B1F/map.json
View File

@ -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,

2
data/maps/RockTunnel_1F/map.json
View File

@ -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,

6
data/maps/RockTunnel_B1F/map.json
View File

@ -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,

4
data/maps/Route10/map.json
View File

@ -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,

4
data/maps/Route15/map.json
View File

@ -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,

4
data/maps/Route4/map.json
View File

@ -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,

4
data/maps/SaffronCity/map.json
View File

@ -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"
}
],

10
data/maps/SaffronCity_Dojo/map.json
View File

@ -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,

8
data/maps/SaffronCity_PokemonTrainerFanClub/map.json
View File

@ -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",

18
data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc
View File

@ -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

4
data/maps/SevenIsland_SevaultCanyon/map.json
View File

@ -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,

2
data/maps/SixIsland_RuinValley/map.json
View File

@ -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,

6
data/maps/TwoIsland/map.json
View File

@ -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",

4
data/maps/TwoIsland/scripts.inc
View File

@ -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

4
data/maps/VictoryRoad_2F/map.json
View File

@ -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,

6
data/maps/ViridianCity_Gym/map.json
View File

@ -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,

4
data/scripts/fame_checker.inc
View File

@ -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

1
firered_switch.sha1 Normal file
View File

@ -0,0 +1 @@
baa452d0b24629dd7782cfc07a8984085dde1311 pokefirered_switch.gba

11
graphics/cave_transition/enter.pal
View File

@ -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

11
graphics/cave_transition/exit.pal
View File

@ -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

0
graphics/object_events/pics/people/blackbelt.png → graphics/object_events/pics/people/black_belt.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 864 B

After

Width:  |  Height:  |  Size: 864 B

0
graphics/object_events/pics/people/battle_girl.png → graphics/object_events/pics/people/crush_girl.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 778 B

After

Width:  |  Height:  |  Size: 778 B

0
graphics/object_events/pics/people/super_nerd.png → graphics/object_events/pics/people/poke_maniac.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 826 B

After

Width:  |  Height:  |  Size: 826 B

9
include/AgbRfu_LinkManager.h
View File

@ -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

6
include/constants/event_objects.h
View File

@ -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

4
include/constants/flags.h
View File

@ -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

7
include/constants/union_room.h
View File

@ -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

2
include/gba/isagbprint.h
View File

@ -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()

1
include/link_rfu.h
View File

@ -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);

36
include/sloopsvc.h Normal file
View File

@ -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

3
ld_script_modern.ld
View File

@ -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/ :
{

1062
ld_script_rev10.ld Normal file
View File

File diff suppressed because it is too large Load Diff

1
leafgreen_switch.sha1 Normal file
View File

@ -0,0 +1 @@
62b9fc77549dbc67032eb6cbd0ea6ad3b825690f pokeleafgreen_switch.gba

110
sound/songs/midi/midi.cfg
View File

@ -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

BIN
sound/songs/midi/se_dex_page.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_dex_scroll.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_m_absorb.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_m_absorb_2.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_m_acid_armor.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_m_attract.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_m_attract2.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_m_barrier.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_m_baton_pass.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_m_belly_drum.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_m_bite.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_m_blizzard.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_m_blizzard2.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_m_bonemerang.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_m_brick_break.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_m_bubble.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_m_bubble2.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_m_bubble3.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_m_bubble_beam.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_m_bubble_beam2.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_m_charge.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_m_charm.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_m_confuse_ray.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_m_cosmic_power.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_m_crabhammer.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_m_detect.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_m_dig.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_m_dive.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_m_dizzy_punch.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_m_double_team.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_m_dragon_rage.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_m_earthquake.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_m_ember.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_m_encore.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_m_encore2.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_m_explosion.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_m_faint_attack.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_m_flame_wheel.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_m_flame_wheel2.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_m_flamethrower.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_m_flatter.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_m_giga_drain.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_m_grasswhistle.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_m_hail.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_m_harden.mid Normal file
View File

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More