thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-17 02:40:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing Rod House map error

Browse source 
For some reason the Daycare and the Super Rod house use the exact same map interior pointers? This commit uncouples them so edits can be made to the Daycare while leaving that house unaltered.

(also have some small text fixes I made ages ago and never pushed lol)
This commit is contained in:
Martha Schilling 2023-06-30 14:51:46 +01:00
parent a3c81c549c
commit 97a99c3744
4 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/maps/songs.asm
View file

@ -192,7 +192,7 @@ MapSongBanks::
db MUSIC_CITIES1, 0 ; ROUTE_16_GATE_1F db MUSIC_CITIES1, 0 ; ROUTE_16_GATE_1F
db MUSIC_CITIES1, 0 ; ROUTE_16_GATE_2F db MUSIC_CITIES1, 0 ; ROUTE_16_GATE_2F
db MUSIC_CELADON, 0 ; ROUTE_16_FLY_HOUSE db MUSIC_CELADON, 0 ; ROUTE_16_FLY_HOUSE
db MUSIC_CITIES1, 0 ; ROUTE_12_SUPER_ROD_HOUSE db MUSIC_CITIES2, 0 ; ROUTE_12_SUPER_ROD_HOUSE
db MUSIC_CITIES1, 0 ; ROUTE_18_GATE_1F db MUSIC_CITIES1, 0 ; ROUTE_18_GATE_1F
db MUSIC_CITIES1, 0 ; ROUTE_18_GATE_2F db MUSIC_CITIES1, 0 ; ROUTE_18_GATE_2F
db MUSIC_DUNGEON2, 0 ; SEAFOAM_ISLANDS_1F db MUSIC_DUNGEON2, 0 ; SEAFOAM_ISLANDS_1F

3
maps.asm
View file

@ -694,7 +694,8 @@ INCLUDE "data/maps/headers/Route21.asm"
INCLUDE "data/maps/objects/Route21.asm" INCLUDE "data/maps/objects/Route21.asm"
Route21_Blocks: INCBIN "maps/Route21.blk" Route21_Blocks: INCBIN "maps/Route21.blk"
Route12SuperRodHouse_Blocks: Route12SuperRodHouse_Blocks: INCBIN "maps/Route12SuperRodHouse.blk"
Daycare_Blocks: INCBIN "maps/Daycare.blk" Daycare_Blocks: INCBIN "maps/Daycare.blk"
;FuchsiaGoodRodHouse_Blocks: INCBIN "maps/FuchsiaGoodRodHouse.blk" ;FuchsiaGoodRodHouse_Blocks: INCBIN "maps/FuchsiaGoodRodHouse.blk"

8
text/GameCorner.asm
View file

@ -14,14 +14,14 @@ _CeladonGameCornerText_48d22::
para "Do you need some" para "Do you need some"
line "game coins?" line "game coins?"
para "It's ¥8000 for" para "It's ¥1000 for 50"
line "500 coins. Would" line "coins. Would you"
cont "you like some?" cont "like some?"
done done
_CeladonGameCornerText_48d27:: _CeladonGameCornerText_48d27::
text "Thanks! Here are" text "Thanks! Here are"
line "your 500 coins!" line "your 50 coins!"
done done
_CeladonGameCornerText_48d2c:: _CeladonGameCornerText_48d2c::

9
text/SilphCo5F_2.asm
View file

@ -40,7 +40,7 @@ _SilphCo5Text10::
text "It's a #MON" text "It's a #MON"
line "REPORT!" line "REPORT!"
para "Over 160 #MON" para "Over 180 #MON"
line "techniques have" line "techniques have"
cont "been confirmed." cont "been confirmed."
done done
@ -49,7 +49,12 @@ _SilphCo5Text11::
text "It's a #MON" text "It's a #MON"
line "REPORT!" line "REPORT!"
para "4 #MON evolve" para "KADABRA evolves"
line "only when traded" line "only when traded"
cont "by link-cable." cont "by link-cable."
para "Further testing is" ; changed due to increased number of new trade evos
line "needed to discover"
cont "more species that"
cont "evolve this way."
done done