Skip to content

Commit

Permalink
Temporary commit to contain patched v0.4
Browse files Browse the repository at this point in the history
DO NOT MERGE THIS ONTO MASTER.
  • Loading branch information
Shitpost-Sunkern committed Mar 6, 2024
1 parent da6c213 commit 1d071eb
Show file tree
Hide file tree
Showing 963 changed files with 9,675,682 additions and 9,675,480 deletions.
2 changes: 1 addition & 1 deletion CONVERSION/Emote.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10 eating
10 eating
126 changes: 63 additions & 63 deletions CONVERSION/Item.txt
Original file line number Diff line number Diff line change
@@ -1,64 +1,64 @@
all_aim_orb orb_all_aim
apple food_apple
apple_cider cafe_apple_cider
aspear_berry berry_aspear
band_of_passage held_band_of_passage
black_gummi gummi_black
blast_seed seed_blast
blue_gummi gummi_blue
brown_gummi gummi_brown
cheri_berry berry_cheri
cheri_bomb cafe_cheri_bomb
cheri_scarf held_cheri_scarf
chesto_berry berry_chesto
cleanse_orb orb_cleanse
clear_gummi gummi_clear
defense_scarf held_defense_scarf
domi_blend cafe_domi_blend
escape_orb orb_escape
fill_in_orb orb_fill_in
foe_hold_orb orb_foe_hold
foe_seal_orb orb_foe_seal
gold_gummi gummi_gold
grass_gummi gummi_grass
gray_gummi gummi_gray
insomniascope held_insomniascope
invert_orb orb_invert
leppa_berry berry_leppa
lum_berry berry_lum
luminous_orb orb_luminous
magenta_gummi gummi_magenta
oran_berry berry_oran
orange_gummi gummi_orange
pecha_berry berry_pecha
pecha_scarf held_pecha_scarf
persim_band held_persim_band
persim_berry berry_persim
petrify_orb orb_petrify
pink_gummi gummi_pink
plain_seed seed_plain
power_band held_power_band
purple_gummi gummi_purple
rawst_berry berry_rawst
rawst_scarf held_rawst_scarf
red_gummi gummi_red
reunion_cape held_reunion_cape
reviver_seed seed_reviver
rollcall_orb orb_rollcall
royal_gummi gummi_royal
scanner_orb orb_scanner
silver_gummi gummi_silver
sky_gummi gummi_sky
sleep_seed seed_sleep
slumber_orb orb_slumber
special_band held_special_band
spurn_orb orb_spurn
synergy_scarf held_synergy_scarf
totter_orb orb_totter
trawl_orb orb_trawl
vile_seed seed_vile
warp_seed seed_warp
white_gummi gummi_white
wonder_gummi gummi_wonder
yellow_gummi gummi_yellow
all_aim_orb orb_all_aim
apple food_apple
apple_cider cafe_apple_cider
aspear_berry berry_aspear
band_of_passage held_band_of_passage
black_gummi gummi_black
blast_seed seed_blast
blue_gummi gummi_blue
brown_gummi gummi_brown
cheri_berry berry_cheri
cheri_bomb cafe_cheri_bomb
cheri_scarf held_cheri_scarf
chesto_berry berry_chesto
cleanse_orb orb_cleanse
clear_gummi gummi_clear
defense_scarf held_defense_scarf
domi_blend cafe_domi_blend
escape_orb orb_escape
fill_in_orb orb_fill_in
foe_hold_orb orb_foe_hold
foe_seal_orb orb_foe_seal
gold_gummi gummi_gold
grass_gummi gummi_grass
gray_gummi gummi_gray
insomniascope held_insomniascope
invert_orb orb_invert
leppa_berry berry_leppa
lum_berry berry_lum
luminous_orb orb_luminous
magenta_gummi gummi_magenta
oran_berry berry_oran
orange_gummi gummi_orange
pecha_berry berry_pecha
pecha_scarf held_pecha_scarf
persim_band held_persim_band
persim_berry berry_persim
petrify_orb orb_petrify
pink_gummi gummi_pink
plain_seed seed_plain
power_band held_power_band
purple_gummi gummi_purple
rawst_berry berry_rawst
rawst_scarf held_rawst_scarf
red_gummi gummi_red
reunion_cape held_reunion_cape
reviver_seed seed_reviver
rollcall_orb orb_rollcall
royal_gummi gummi_royal
scanner_orb orb_scanner
silver_gummi gummi_silver
sky_gummi gummi_sky
sleep_seed seed_sleep
slumber_orb orb_slumber
special_band held_special_band
spurn_orb orb_spurn
synergy_scarf held_synergy_scarf
totter_orb orb_totter
trawl_orb orb_trawl
vile_seed seed_vile
warp_seed seed_warp
white_gummi gummi_white
wonder_gummi gummi_wonder
yellow_gummi gummi_yellow
zinc_band held_zinc_band
4 changes: 2 additions & 2 deletions CONVERSION/MapStatus.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
50 darkness
51 dusk
50 darkness
51 dusk
12 changes: 6 additions & 6 deletions CONVERSION/Monster.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
37 vulpix
104 cubone
352 kecleon
531 audino
570 zorua
722 rowlet
37 vulpix
104 cubone
352 kecleon
531 audino
570 zorua
722 rowlet
24 changes: 12 additions & 12 deletions CONVERSION/Rank.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
0 unranked
1 normal
2 bronze
3 silver
4 gold
5 platinum
6 diamond
7 super
8 ultra
9 hyper
10 master
11 guildmaster
0 unranked
1 normal
2 bronze
3 silver
4 gold
5 platinum
6 diamond
7 super
8 ultra
9 hyper
10 master
11 guildmaster
4 changes: 2 additions & 2 deletions CONVERSION/Status.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
150 synergizing
151 critical_health
150 synergizing
151 critical_health
130 changes: 65 additions & 65 deletions CONVERSION/TODO - Item Conversions.txt
Original file line number Diff line number Diff line change
@@ -1,65 +1,65 @@
items were not renamed properly in the first conversion. I had modified a lot of existing items for example just to change the costs around, but those strings got converted without the proper formatting and also became separate items entirely. This conversion is intended to fix that...
all_aim_orb -> orb_all_aim /
apple -> food_apple /
apple_cider -> cafe_apple_cider /
aspear_berry -> berry_aspear /
band_of_passage -> held_band_of_passage /
black_gummi -> gummi_black /
blast_seed -> seed_blast /
blue_gummi -> gummi_blue /
brown_gummi -> gummi_brown /
cheri_berry -> berry_cheri /
cheri_bomb -> cafe_cheri_bomb /
cheri_scarf -> held_cheri_scarf /
chesto_berry -> berry_chesto /
cleanse_orb -> orb_cleanse /
clear_gummi -> gummi_clear /
defense_scarf -> held_defense_scarf /
domi_blend -> cafe_domi_blend /
escape_orb -> orb_escape /
fill_in_orb -> orb_fill_in /
foe_hold_orb -> orb_foe_hold/
foe_seal_orb -> orb_foe_seal/
gold_gummi -> gummi_gold /
grass_gummi -> gummi_grass /
gray_grummi -> gummi_gray /
insomniascope -> held_insomniascope /
invert_orb -> orb_invert /
leppa_berry -> berry_leppa /
lum_berry -> berry_lum /
luminous_orb -> orb_luminous /
magenta_gummi -> gummi_magenta /
oran_berry -> berry_oran/
orange_gummi -> gummi_orange /
pecha_berry -> berry_pecha /
pecha_scarf -> held_pecha_scarf /
persim_band -> held_persim_band /
persim_berry -> berry_persim /
petrify_orb -> orb_petrify /
pink_gummi -> gummi_pink /
plain_seed -> seed_plain /
power_band -> held_power_band/
purple_gummi -> gummi_purple/
rawst_berry -> berry_rawst/
rawst_scarf -> held_rawst_scarf /
red_gummi -> gummi_red /
reunion_cape -> held_reunion_cape /
reviver_seed -> seed_reviver /
rollcall_orb -> orb_rollcall/
royal_gummi -> gummi_royal/
scanner_orb -> orb_scanner/
silver_gummi -> gummi_silver/
sky_gummi -> gummi_sky/
sleep_seed -> seed_sleep/
slumber_orb -> orb_slumber/
special_band -> held_special_band /
spurn_orb -> orb_spurn/
synergy_scarf -> held_synergy_scarf
totter_orb -> orb_totter /
trawl_orb -> orb_trawl /
vile_seed -> seed_vile/
warp_seed -> seed_warp /
white_gummi -> gummi_white/
wonder_gummi -> gummi_wonder/
yellow_gummi -> gummi_yellow/
zinc_band -> held_zinc_band/
items were not renamed properly in the first conversion. I had modified a lot of existing items for example just to change the costs around, but those strings got converted without the proper formatting and also became separate items entirely. This conversion is intended to fix that...
all_aim_orb -> orb_all_aim /
apple -> food_apple /
apple_cider -> cafe_apple_cider /
aspear_berry -> berry_aspear /
band_of_passage -> held_band_of_passage /
black_gummi -> gummi_black /
blast_seed -> seed_blast /
blue_gummi -> gummi_blue /
brown_gummi -> gummi_brown /
cheri_berry -> berry_cheri /
cheri_bomb -> cafe_cheri_bomb /
cheri_scarf -> held_cheri_scarf /
chesto_berry -> berry_chesto /
cleanse_orb -> orb_cleanse /
clear_gummi -> gummi_clear /
defense_scarf -> held_defense_scarf /
domi_blend -> cafe_domi_blend /
escape_orb -> orb_escape /
fill_in_orb -> orb_fill_in /
foe_hold_orb -> orb_foe_hold/
foe_seal_orb -> orb_foe_seal/
gold_gummi -> gummi_gold /
grass_gummi -> gummi_grass /
gray_grummi -> gummi_gray /
insomniascope -> held_insomniascope /
invert_orb -> orb_invert /
leppa_berry -> berry_leppa /
lum_berry -> berry_lum /
luminous_orb -> orb_luminous /
magenta_gummi -> gummi_magenta /
oran_berry -> berry_oran/
orange_gummi -> gummi_orange /
pecha_berry -> berry_pecha /
pecha_scarf -> held_pecha_scarf /
persim_band -> held_persim_band /
persim_berry -> berry_persim /
petrify_orb -> orb_petrify /
pink_gummi -> gummi_pink /
plain_seed -> seed_plain /
power_band -> held_power_band/
purple_gummi -> gummi_purple/
rawst_berry -> berry_rawst/
rawst_scarf -> held_rawst_scarf /
red_gummi -> gummi_red /
reunion_cape -> held_reunion_cape /
reviver_seed -> seed_reviver /
rollcall_orb -> orb_rollcall/
royal_gummi -> gummi_royal/
scanner_orb -> orb_scanner/
silver_gummi -> gummi_silver/
sky_gummi -> gummi_sky/
sleep_seed -> seed_sleep/
slumber_orb -> orb_slumber/
special_band -> held_special_band /
spurn_orb -> orb_spurn/
synergy_scarf -> held_synergy_scarf
totter_orb -> orb_totter /
trawl_orb -> orb_trawl /
vile_seed -> seed_vile/
warp_seed -> seed_warp /
white_gummi -> gummi_white/
wonder_gummi -> gummi_wonder/
yellow_gummi -> gummi_yellow/
zinc_band -> held_zinc_band/
22 changes: 11 additions & 11 deletions CONVERSION/Zone.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
0 master_zone
1 backup_master_zone
50 relic_forest
51 beginner_lesson
52 normal_maze
53 illuminant_riverbed
54 grass_maze
55 fire_maze
56 water_maze
57 crooked_cavern
58 crooked_den
0 master_zone
1 backup_master_zone
50 relic_forest
51 beginner_lesson
52 normal_maze
53 illuminant_riverbed
54 grass_maze
55 fire_maze
56 water_maze
57 crooked_cavern
58 crooked_den
36 changes: 18 additions & 18 deletions Content/ContentParams.xml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<Sounds>
<Hunger>Battle/DUN_Hunger</Hunger>
<NullDmg>Battle/DUN_Miss_2</NullDmg>
<Cursed>Battle/DUN_Sticky</Cursed>
<Pickup>Battle/DUN_Pick_Up</Pickup>
<PickupFoe>Battle/DUN_Pick_Up_Foe</PickupFoe>
<Replace>Battle/EVT_CH02_Box_Open</Replace>
<Place>Battle/EVT_CH02_Item_Place</Place>
<Equip>Battle/DUN_Equip</Equip>
<Money>Battle/DUN_Money</Money>
<Leader>Battle/DUN_Leader_Change</Leader>
<Revive>Battle/EVT_Title_Intro</Revive>
</Sounds>
<TitleBG>Title_Screen_Background</TitleBG>
<TitleBGM>Top Menu Theme.ogg</TitleBGM>
<MonsterBGM>Monster House!.ogg</MonsterBGM>
<?xml version="1.0" encoding="utf-8"?>
<root>
<Sounds>
<Hunger>Battle/DUN_Hunger</Hunger>
<NullDmg>Battle/DUN_Miss_2</NullDmg>
<Cursed>Battle/DUN_Sticky</Cursed>
<Pickup>Battle/DUN_Pick_Up</Pickup>
<PickupFoe>Battle/DUN_Pick_Up_Foe</PickupFoe>
<Replace>Battle/EVT_CH02_Box_Open</Replace>
<Place>Battle/EVT_CH02_Item_Place</Place>
<Equip>Battle/DUN_Equip</Equip>
<Money>Battle/DUN_Money</Money>
<Leader>Battle/DUN_Leader_Change</Leader>
<Revive>Battle/EVT_Title_Intro</Revive>
</Sounds>
<TitleBG>Title_Screen_Background</TitleBG>
<TitleBGM>Top Menu Theme.ogg</TitleBGM>
<MonsterBGM>Monster House!.ogg</MonsterBGM>
</root>
Loading

0 comments on commit 1d071eb

Please sign in to comment.