Skip to content

Commit

Permalink
travis: avoid mmutil segfault
Browse files Browse the repository at this point in the history
  • Loading branch information
PH111P committed Sep 3, 2020
1 parent 9f302cc commit 7e5881b
Show file tree
Hide file tree
Showing 4 changed files with 73 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ P-Emerald_2/audio/soundbank
P-Emerald_2/build/
P-Emerald_2/arm7/build/
P-Emerald_2/arm9/build/
P-Emerald_2/arm9/include/soundbank.h
#P-Emerald_2/arm9/include/soundbank.h

P-Emerald_2/emulator/

Expand Down
2 changes: 1 addition & 1 deletion P-Emerald_2/FSROOT
3 changes: 2 additions & 1 deletion P-Emerald_2/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ arm7/$(TARGET).elf: FORCE
$(MAKE) -C arm7

#-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -
arm9/$(TARGET).elf: FORCE soundbank ndstool
#arm9 / $( TARGET ).elf : FORCE soundbank ndstool
arm9/$(TARGET).elf: FORCE ndstool
$(MAKE) -C arm9

#-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -
Expand Down
69 changes: 69 additions & 0 deletions P-Emerald_2/arm9/include/soundbank.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
#define MOD_ABANDONED_SHIP 0
#define MOD_BATTLE_EX01 1
#define MOD_BATTLE_GYM_LEADER 2
#define MOD_BATTLE_MAY_BRENDAN 3
#define MOD_BATTLE_RAIKOU_ENTEI_SUICUNE 4
#define MOD_BATTLE_RAYQUAZA 5
#define MOD_BATTLE_TEAM_AM 6
#define MOD_BATTLE_TRAINER 7
#define MOD_BATTLE_WILD_ALT 8
#define MOD_BATTLE_WILD 9
#define MOD_CABLE_CAR 10
#define MOD_CAVE_FORESTS 11
#define MOD_CLIFFELTA_CITY 12
#define MOD_CYCLING 13
#define MOD_DESERT 14
#define MOD_DEWFORD_TOWN 15
#define MOD_DIVING 16
#define MOD_ENCOUNTER_BRENDAN 17
#define MOD_ENCOUNTER_MAY 18
#define MOD_ENCOUNTER_TEAM_AM 19
#define MOD_ENCOUNTER_TWINS 20
#define MOD_ENCOUNTER_YOUNGSTER 21
#define MOD_EVOLVING 22
#define MOD_EX01 23
#define MOD_EX02 24
#define MOD_EX03 25
#define MOD_FALLARBOR_TOWN 26
#define MOD_HELP_PROF_BIRCH 27
#define MOD_LILYCOVE_CITY 28
#define MOD_LILYCOVE_MUSEUM 29
#define MOD_LITTLEROOT_TOWN 30
#define MOD_MARINE_SCIENCE_MUSEUM 31
#define MOD_METEOR_FALLS 32
#define MOD_OLDALE_TOWN 33
#define MOD_OS_BADGE 34
#define MOD_OS_EVOLVED 35
#define MOD_OS_HEAL_PKMN 36
#define MOD_OS_LEVEL_UP 37
#define MOD_OS_PKMN_CAPTURE 38
#define MOD_OS_SYMBOL 39
#define MOD_PETALBURG_CITY 40
#define MOD_POKEMON_CENTER 41
#define MOD_POKEMON_GYM 42
#define MOD_POKEMON_MART 43
#define MOD_PROF_BIRCH_LAB 44
#define MOD_ROUTE_101 45
#define MOD_ROUTE_104 46
#define MOD_ROUTE_10 47
#define MOD_ROUTE_110 48
#define MOD_ROUTE_113 49
#define MOD_ROUTE_119 50
#define MOD_ROUTE_120 51
#define MOD_ROUTE_123 52
#define MOD_ROUTE_38 53
#define MOD_RUSTBORO_CITY 54
#define MOD_SEALED_CHAMBER 55
#define MOD_SHOAL_CAVE 56
#define MOD_SLATEPORT_CITY 57
#define MOD_SURFING 58
#define MOD_TEAM_AM_HIDEOUT 59
#define MOD_TRAINER_SCHOOL 60
#define MOD_TRICK_HOUSE 61
#define MOD_VICTORY_GYM_LEADER 62
#define MOD_VICTORY_TEAM_AM_GRUNT 63
#define MOD_VICTORY_TRAINER 64
#define MOD_VICTORY_WILD 65
#define MSL_NSONGS 66
#define MSL_NSAMPS 2384
#define MSL_BANKSIZE 2450

0 comments on commit 7e5881b

Please sign in to comment.