Skip to content

Commit

Permalink
fix hgss song order
Browse files Browse the repository at this point in the history
  • Loading branch information
@CyanSMP64
CyanSMP64 committed Jun 27, 2021
1 parent 578ef00 commit 7f25325
Show file tree
Hide file tree
Showing 2 changed files with 137 additions and 137 deletions.
268 changes: 134 additions & 134 deletions charmap.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1217,140 +1217,140 @@ HG_SEQ_GS_R_4_34 = F4 02
HG_SEQ_GS_E_RIVAL1 = F5 02
HG_SEQ_GS_VS_RIVAL = F6 02
HG_SEQ_GS_SHINKA = F7 02
HG_SEQ_ME_SHINKAOME = F8 02
HG_SEQ_GS_C_KOGANE = F9 02
HG_SEQ_GS_GYM = FA 02
HG_SEQ_GS_VS_GYMREADER = FB 02
HG_SEQ_GS_WIN3 = FC 02
HG_SEQ_ME_BADGE = FD 02
HG_SEQ_GS_RADIO_JINGLE = FE 02
HG_SEQ_GS_AIKOTOBA = FF 02
HG_SEQ_ME_WAZA = 00 03
HG_SEQ_GS_GAME = 01 03
HG_SEQ_GS_GAMEATARI = 02 03
HG_SEQ_ME_ACCE = 03 03
HG_SEQ_GS_WIFITOWER = 04 03
HG_SEQ_GS_BLD_GTC = 05 03
HG_SEQ_ME_HYOUKA3 = 06 03
HG_SEQ_PL_BICYCLE = 07 03
HG_SEQ_GS_EYE_J_SHOUJO = 08 03
HG_SEQ_ME_POKEGEAR_REGIST = 09 03
HG_SEQ_GS_D_KOUEN = 0A 03
HG_SEQ_ME_KINOMI = 0B 03
HG_SEQ_GS_C_ENJU = 0C 03
HG_SEQ_GS_KABURENJOU = 0D 03
HG_SEQ_GS_TO_YAKETA = 0E 03
HG_SEQ_GS_E_MINAKI = 0F 03
HG_SEQ_GS_OHKIDO_RABO = 10 03
HG_SEQ_ME_HYOUKA4 = 11 03
HG_SEQ_GS_R_6_38 = 12 03
HG_SEQ_GS_RADIO_MARCH = 13 03
HG_SEQ_GS_VS_RAIKOU = 14 03
HG_SEQ_GS_TO_TOUDAI = 15 03
HG_SEQ_GS_NAMINORI = 16 03
HG_SEQ_GS_C_TANBA = 17 03
HG_SEQ_ME_PT_SPECIAL = 18 03
HG_SEQ_GS_R_7_42 = 19 03
HG_SEQ_GS_KAIDENPA = 1A 03
HG_SEQ_GS_D_AJITO = 1B 03
HG_SEQ_GS_EYE_J_AYASHII = 1C 03
HG_SEQ_GS_E_RIVAL2 = 1D 03
HG_SEQ_GS_SENKYO = 1E 03
HG_SEQ_GS_D_KOORINONUKE = 1F 03
HG_SEQ_ME_WASURE = 20 03
HG_SEQ_GS_RYUUNOANA = 21 03
HG_SEQ_GS_IBUKI = 22 03
HG_SEQ_GS_VS_ENTEI = 23 03
HG_SEQ_GS_TO_SUZU = 24 03
HG_SEQ_GS_E_MAIKO_MAI = 25 03
HG_SEQ_GS_E_HOUOU = 26 03
HG_SEQ_GS_VS_HOUOU = 27 03
HG_SEQ_GS_R_1_26 = 28 03
HG_SEQ_GS_KOUSOKUSEN = 29 03
HG_SEQ_GS_C_KUCHIBA = 2A 03
HG_SEQ_GS_VS_GYMREADER_KANTO = 2B 03
HG_SEQ_GS_T_CHION = 2C 03
HG_SEQ_GS_D_IWAYAMA = 2D 03
HG_SEQ_GS_VS_NORAPOKE_KANTO = 2E 03
HG_SEQ_ME_HYOUKA5 = 2F 03
HG_SEQ_GS_C_HANADA = 30 03
HG_SEQ_GS_R_12_24 = 31 03
HG_SEQ_GS_E_LINEAR = 32 03
HG_SEQ_GS_RADIO_KOMORIUTA = 33 03
HG_SEQ_GS_VS_SUICUNE = 34 03
HG_SEQ_GS_C_TAMAMUSHI = 35 03
HG_SEQ_GS_R_10_11 = 36 03
HG_SEQ_GS_HUE = 37 03
HG_SEQ_GS_D_TOKIWANOMORI3 = 38 03
HG_SEQ_GS_EYE_K_SHOUNEN = 39 03
HG_SEQ_GS_C_YAMABUKI = 3A 03
HG_SEQ_GS_R_9_03 = 3B 03
HG_SEQ_GS_EYE_K_AYASHII = 3C 03
HG_SEQ_GS_OTSUKIMI_EVENT = 3D 03
HG_SEQ_GS_R_9_01 = 3E 03
HG_SEQ_GS_T_MASARA = 3F 03
HG_SEQ_GS_OHKIDO = 40 03
HG_SEQ_ME_HYOUKA6 = 41 03
HG_SEQ_GS_EYE_K_SHOUJO = 42 03
HG_SEQ_GS_VS_TRAINER_KANTO = 43 03
HG_SEQ_GS_T_GUREN = 44 03
HG_SEQ_GS_SAFARI_ROAD = 45 03
HG_SEQ_GS_SAFARI_HOUSE = 46 03
HG_SEQ_GS_SAFARI_FIELD = 47 03
HG_SEQ_GS_RADIO_VARIETY = 48 03
HG_SEQ_GS_TAIKAIMAE = 49 03
HG_SEQ_GS_TAIKAI = 4A 03
HG_SEQ_ME_MUSHITORI3 = 4B 03
HG_SEQ_ME_MUSHITORI2 = 4C 03
HG_SEQ_ME_MUSHITORI1 = 4D 03
HG_SEQ_GS_PT_ENTR = 4E 03
HG_SEQ_ME_PT_NEW = 4F 03
HG_SEQ_GS_PT_OPEN = 50 03
HG_SEQ_GS_PT_TITLE = 51 03
HG_SEQ_GS_PT_GAME = 52 03
HG_SEQ_ME_PT_RESULTG = 53 03
HG_SEQ_GS_PT_GAMEF = 54 03
HG_SEQ_GS_PT_RESULT = 55 03
HG_SEQ_GS_PT_END = 56 03
HG_SEQ_GS_PT_VICTORY = 57 03
HG_SEQ_GS_WIFI_PRESENT = 58 03
HG_SEQ_GS_BATTLETOWER2 = 59 03
HG_SEQ_GS_BATTLETOWER = 5A 03
HG_SEQ_ME_BPGET = 5B 03
HG_SEQ_GS_BF_FACTORY = 5C 03
HG_SEQ_GS_BF_STAGE = 5D 03
HG_SEQ_GS_BF_ROULETTE = 5E 03
HG_SEQ_ME_ROULETTE = 5F 03
HG_SEQ_GS_BF_CASTLE = 60 03
HG_SEQ_ME_CASTLE = 61 03
HG_SEQ_GS_BA_BRAIN = 62 03
HG_SEQ_GS_WINBRAIN = 63 03
HG_SEQ_GS_RADIO_TRAINER = 64 03
HG_SEQ_GS_GURUGURU = 65 03
HG_SEQ_GS_WIFI_ACCESS = 66 03
HG_SEQ_GS_WIFIUNION = 67 03
HG_SEQ_GS_WIFIGAME = 68 03
HG_SEQ_ME_MINIGAME = 69 03
HG_SEQ_GS_WIFIPARADE = 6A 03
HG_SEQ_GS_RADIO_R_101 = 6B 03
HG_SEQ_GS_RADIO_R_201 = 6C 03
HG_SEQ_GS_PHC = 6D 03
HG_SEQ_GS_E_G_PICHU = 6E 03
HG_SEQ_GS_EYE_MAIKO = 6F 03
HG_SEQ_GS_E_LUGIA = 70 03
HG_SEQ_GS_VS_LUGIA = 71 03
HG_SEQ_GS_D_CHAMPROAD = 72 03
HG_SEQ_GS_CHAMPROAD = 73 03
HG_SEQ_GS_VS_CHAMP = 74 03
HG_SEQ_GS_E_DENDOURIRI = 75 03
HG_SEQ_GS_ENDING = 76 03
HG_SEQ_GS_ENDING2 = 77 03
HG_SEQ_GS_VS_KODAI = 78 03
HG_SEQ_GS_D_SHINTO = 79 03
HG_SEQ_GS_E_ARCEUS = 7A 03
HG_SEQ_GS_KOUKAN = 7B 03
HG_SEQ_ME_CARDGAME1 = 7C 03
HG_SEQ_ME_CARDGAME2 = 7D 03
HG_SEQ_GS_KOUKAN = F8 02
HG_SEQ_ME_SHINKAOME = F9 02
HG_SEQ_GS_C_KOGANE = FA 02
HG_SEQ_GS_GYM = FB 02
HG_SEQ_GS_VS_GYMREADER = FC 02
HG_SEQ_GS_WIN3 = FD 02
HG_SEQ_ME_BADGE = FE 02
HG_SEQ_GS_RADIO_JINGLE = FF 02
HG_SEQ_GS_AIKOTOBA = 00 03
HG_SEQ_ME_WAZA = 01 03
HG_SEQ_GS_GAME = 02 03
HG_SEQ_GS_GAMEATARI = 03 03
HG_SEQ_ME_CARDGAME1 = 04 03
HG_SEQ_ME_CARDGAME2 = 05 03
HG_SEQ_ME_ACCE = 06 03
HG_SEQ_GS_WIFITOWER = 07 03
HG_SEQ_GS_BLD_GTC = 08 03
HG_SEQ_ME_HYOUKA3 = 09 03
HG_SEQ_PL_BICYCLE = 0A 03
HG_SEQ_GS_EYE_J_SHOUJO = 0B 03
HG_SEQ_ME_POKEGEAR_REGIST = 0C 03
HG_SEQ_GS_D_KOUEN = 0D 03
HG_SEQ_ME_KINOMI = 0E 03
HG_SEQ_GS_C_ENJU = 0F 03
HG_SEQ_GS_KABURENJOU = 10 03
HG_SEQ_GS_TO_YAKETA = 11 03
HG_SEQ_GS_E_MINAKI = 12 03
HG_SEQ_GS_OHKIDO_RABO = 13 03
HG_SEQ_ME_HYOUKA4 = 14 03
HG_SEQ_GS_R_6_38 = 15 03
HG_SEQ_GS_RADIO_MARCH = 16 03
HG_SEQ_GS_VS_RAIKOU = 17 03
HG_SEQ_GS_TO_TOUDAI = 18 03
HG_SEQ_GS_NAMINORI = 19 03
HG_SEQ_GS_C_TANBA = 1A 03
HG_SEQ_ME_PT_SPECIAL = 1B 03
HG_SEQ_GS_R_7_42 = 1C 03
HG_SEQ_GS_KAIDENPA = 1D 03
HG_SEQ_GS_D_AJITO = 1E 03
HG_SEQ_GS_EYE_J_AYASHII = 1F 03
HG_SEQ_GS_E_RIVAL2 = 20 03
HG_SEQ_GS_SENKYO = 21 03
HG_SEQ_GS_D_KOORINONUKE = 22 03
HG_SEQ_ME_WASURE = 23 03
HG_SEQ_GS_RYUUNOANA = 24 03
HG_SEQ_GS_IBUKI = 25 03
HG_SEQ_GS_VS_ENTEI = 26 03
HG_SEQ_GS_TO_SUZU = 27 03
HG_SEQ_GS_E_MAIKO_MAI = 28 03
HG_SEQ_GS_E_HOUOU = 29 03
HG_SEQ_GS_VS_HOUOU = 2A 03
HG_SEQ_GS_R_1_26 = 2B 03
HG_SEQ_GS_KOUSOKUSEN = 2C 03
HG_SEQ_GS_C_KUCHIBA = 2D 03
HG_SEQ_GS_VS_GYMREADER_KANTO = 2E 03
HG_SEQ_GS_T_CHION = 2F 03
HG_SEQ_GS_D_IWAYAMA = 30 03
HG_SEQ_GS_VS_NORAPOKE_KANTO = 31 03
HG_SEQ_ME_HYOUKA5 = 32 03
HG_SEQ_GS_C_HANADA = 33 03
HG_SEQ_GS_R_12_24 = 34 03
HG_SEQ_GS_E_LINEAR = 35 03
HG_SEQ_GS_RADIO_KOMORIUTA = 36 03
HG_SEQ_GS_VS_SUICUNE = 37 03
HG_SEQ_GS_C_TAMAMUSHI = 38 03
HG_SEQ_GS_R_10_11 = 39 03
HG_SEQ_GS_HUE = 3A 03
HG_SEQ_GS_D_TOKIWANOMORI3 = 3B 03
HG_SEQ_GS_EYE_K_SHOUNEN = 3C 03
HG_SEQ_GS_C_YAMABUKI = 3D 03
HG_SEQ_GS_R_9_03 = 3E 03
HG_SEQ_GS_EYE_K_AYASHII = 3F 03
HG_SEQ_GS_OTSUKIMI_EVENT = 40 03
HG_SEQ_GS_R_9_01 = 41 03
HG_SEQ_GS_T_MASARA = 42 03
HG_SEQ_GS_OHKIDO = 43 03
HG_SEQ_ME_HYOUKA6 = 44 03
HG_SEQ_GS_EYE_K_SHOUJO = 45 03
HG_SEQ_GS_VS_TRAINER_KANTO = 46 03
HG_SEQ_GS_T_GUREN = 47 03
HG_SEQ_GS_SAFARI_ROAD = 48 03
HG_SEQ_GS_SAFARI_HOUSE = 49 03
HG_SEQ_GS_SAFARI_FIELD = 4A 03
HG_SEQ_GS_RADIO_VARIETY = 4B 03
HG_SEQ_GS_TAIKAIMAE = 4C 03
HG_SEQ_GS_TAIKAI = 4D 03
HG_SEQ_ME_MUSHITORI3 = 4E 03
HG_SEQ_ME_MUSHITORI2 = 4F 03
HG_SEQ_ME_MUSHITORI1 = 50 03
HG_SEQ_GS_PT_ENTR = 51 03
HG_SEQ_ME_PT_NEW = 52 03
HG_SEQ_GS_PT_OPEN = 53 03
HG_SEQ_GS_PT_TITLE = 54 03
HG_SEQ_GS_PT_GAME = 55 03
HG_SEQ_ME_PT_RESULTG = 56 03
HG_SEQ_GS_PT_GAMEF = 57 03
HG_SEQ_GS_PT_RESULT = 58 03
HG_SEQ_GS_PT_END = 59 03
HG_SEQ_GS_PT_VICTORY = 5A 03
HG_SEQ_GS_WIFI_PRESENT = 5B 03
HG_SEQ_GS_BATTLETOWER2 = 5C 03
HG_SEQ_GS_BATTLETOWER = 5D 03
HG_SEQ_ME_BPGET = 5E 03
HG_SEQ_GS_BF_FACTORY = 5F 03
HG_SEQ_GS_BF_STAGE = 60 03
HG_SEQ_GS_BF_ROULETTE = 61 03
HG_SEQ_ME_ROULETTE = 62 03
HG_SEQ_GS_BF_CASTLE = 63 03
HG_SEQ_ME_CASTLE = 64 03
HG_SEQ_GS_BA_BRAIN = 65 03
HG_SEQ_GS_WINBRAIN = 66 03
HG_SEQ_GS_RADIO_TRAINER = 67 03
HG_SEQ_GS_GURUGURU = 68 03
HG_SEQ_GS_WIFI_ACCESS = 69 03
HG_SEQ_GS_WIFIUNION = 6A 03
HG_SEQ_GS_WIFIGAME = 6B 03
HG_SEQ_ME_MINIGAME = 6C 03
HG_SEQ_GS_WIFIPARADE = 6D 03
HG_SEQ_GS_RADIO_R_101 = 6E 03
HG_SEQ_GS_RADIO_R_201 = 6F 03
HG_SEQ_GS_PHC = 70 03
HG_SEQ_GS_E_G_PICHU = 71 03
HG_SEQ_GS_EYE_MAIKO = 72 03
HG_SEQ_GS_E_LUGIA = 73 03
HG_SEQ_GS_VS_LUGIA = 74 03
HG_SEQ_GS_D_CHAMPROAD = 75 03
HG_SEQ_GS_CHAMPROAD = 76 03
HG_SEQ_GS_VS_CHAMP = 77 03
HG_SEQ_GS_E_DENDOURIRI = 78 03
HG_SEQ_GS_ENDING = 79 03
HG_SEQ_GS_ENDING2 = 7A 03
HG_SEQ_GS_VS_KODAI = 7B 03
HG_SEQ_GS_D_SHINTO = 7C 03
HG_SEQ_GS_E_ARCEUS = 7D 03
HG_SEQ_ME_GONIN = 7E 03

A_BUTTON = F8 00
Expand Down
6 changes: 3 additions & 3 deletions sound/song_table.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -761,6 +761,7 @@ gSongTable:: @ 86B49F0
song hg_seq_gs_e_rival1, 0, 0
song hg_seq_gs_vs_rival, 0, 0
song hg_seq_gs_shinka, 0, 0
song hg_seq_gs_koukan, 0, 0
song hg_seq_me_shinkaome, 2, 2
song hg_seq_gs_c_kogane, 0, 0
song hg_seq_gs_gym, 0, 0
Expand All @@ -772,6 +773,8 @@ gSongTable:: @ 86B49F0
song hg_seq_me_waza, 2, 2
song hg_seq_gs_game, 0, 0
song hg_seq_gs_gameatari, 0, 0
song hg_seq_me_cardgame1, 2, 2
song hg_seq_me_cardgame2, 2, 2
song hg_seq_me_acce, 2, 2
song hg_seq_gs_wifitower, 0, 0
song hg_seq_gs_bld_gtc, 0, 0
Expand Down Expand Up @@ -892,9 +895,6 @@ gSongTable:: @ 86B49F0
song hg_seq_gs_vs_kodai, 0, 0
song hg_seq_gs_d_shinto, 0, 0
song hg_seq_gs_e_arceus, 0, 0
song hg_seq_gs_koukan, 0, 0
song hg_seq_me_cardgame1, 2, 2
song hg_seq_me_cardgame2, 2, 2
song hg_seq_me_gonin, 2, 2

.align 2
Expand Down

0 comments on commit 7f25325

Please sign in to comment.