foster/pokered
0
0
Fork 0
mirror of https://github.com/pret/pokered.git synced 2024-10-22 22:55:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use dimension constants in warp data and add map name consisntency

Browse source
This commit is contained in:
U-Fish-PC\Daniel 2014-04-05 10:47:23 -04:00
parent 8039c8db78
commit f8452ebeb8
14 changed files with 1037 additions and 1033 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
constants/map_constants.asm
View file

@ -85,7 +85,7 @@ POWER_PLANT EQU $53
ROUTE_11_GATE_1F EQU $54
DIGLETTS_CAVE_ENTRANCE EQU $55
ROUTE_11_GATE_2F EQU $56
ROUTE_12_GATE EQU $57
ROUTE_12_GATE_1F EQU $57
BILLS_HOUSE EQU $58
VERMILION_POKECENTER EQU $59
POKEMON_FAN_CLUB EQU $5A
@ -135,7 +135,7 @@ CELADON_POKECENTER EQU $85
CELADON_GYM EQU $86
GAME_CORNER EQU $87
CELADON_MART_5 EQU $88
CELADONPRIZE_ROOM EQU $89
CELADON_PRIZE_ROOM EQU $89
CELADON_DINER EQU $8A
CELADON_HOUSE EQU $8B
CELADON_HOTEL EQU $8C
@ -154,9 +154,9 @@ FUCHSIA_MART EQU $98
FUCHSIA_HOUSE_1 EQU $99
FUCHSIA_POKECENTER EQU $9A
FUCHSIA_HOUSE_2 EQU $9B
SAFARIZONEENTRANCE EQU $9C
SAFARI_ZONE_ENTRANCE EQU $9C
FUCHSIA_GYM EQU $9D
FUCHSIAMEETINGROOM EQU $9E
FUCHSIA_MEETING_ROOM EQU $9E
SEAFOAM_ISLANDS_2 EQU $9F
SEAFOAM_ISLANDS_3 EQU $A0
SEAFOAM_ISLANDS_4 EQU $A1
@ -175,7 +175,7 @@ CINNABAR_MART EQU $AC
INDIGO_PLATEAU_LOBBY EQU $AE
COPYCATS_HOUSE_1F EQU $AF
COPYCATS_HOUSE_2F EQU $B0
FIGHTINGDOJO EQU $B1
FIGHTING_DOJO EQU $B1
SAFFRON_GYM EQU $B2
SAFFRON_HOUSE_1 EQU $B3
SAFFRON_MART EQU $B4

44
constants/map_dimensions.asm
View file

@ -184,7 +184,7 @@ VIRIDIAN_GYM_WIDTH EQU $0a
DIGLETTS_CAVE_EXIT_HEIGHT EQU $04
DIGLETTS_CAVE_EXIT_WIDTH EQU $04
; ViridianForestexit_h map_id=47
; ViridianForestExit_h map_id=47
VIRIDIAN_FOREST_EXIT_HEIGHT EQU $04
VIRIDIAN_FOREST_EXIT_WIDTH EQU $05
@ -248,9 +248,9 @@ MT_MOON_3_WIDTH EQU $14
TRASHED_HOUSE_HEIGHT EQU $04
TRASHED_HOUSE_WIDTH EQU $04
; CeruleanHouse_h map_id=63
CERULEAN_HOUSE_HEIGHT EQU $04
CERULEAN_HOUSE_WIDTH EQU $04
; CeruleanHouse1_h map_id=63
CERULEAN_HOUSE_1_HEIGHT EQU $04
CERULEAN_HOUSE_1_WIDTH EQU $04
; CeruleanPokecenter_h map_id=64
CERULEAN_POKECENTER_HEIGHT EQU $04
@ -300,6 +300,10 @@ ROUTE_7_GATE_WIDTH EQU $03
PATH_ENTRANCE_ROUTE_7_HEIGHT EQU $04
PATH_ENTRANCE_ROUTE_7_WIDTH EQU $04
; UndergroundPathEntranceRoute7Copy_h map_id=78
PATH_ENTRANCE_ROUTE_7_COPY_HEIGHT EQU $04
PATH_ENTRANCE_ROUTE_7_COPY_WIDTH EQU $04
; Route8Gate_h map_id=79
ROUTE_8_GATE_HEIGHT EQU $04
ROUTE_8_GATE_WIDTH EQU $03
@ -333,8 +337,8 @@ ROUTE_11_GATE_2F_HEIGHT EQU $04
ROUTE_11_GATE_2F_WIDTH EQU $04
; Route12Gate_h map_id=87
ROUTE_12_GATE_HEIGHT EQU $04
ROUTE_12_GATE_WIDTH EQU $05
ROUTE_12_GATE_1F_HEIGHT EQU $04
ROUTE_12_GATE_1F_WIDTH EQU $05
; BillsHouse_h map_id=88
BILLS_HOUSE_HEIGHT EQU $04
@ -489,8 +493,8 @@ CELADON_MART_5_HEIGHT EQU $04
CELADON_MART_5_WIDTH EQU $0a
; CeladonPrizeRoom_h map_id=137
CELADONPRIZE_ROOM_HEIGHT EQU $04
CELADONPRIZE_ROOM_WIDTH EQU $05
CELADON_PRIZE_ROOM_HEIGHT EQU $04
CELADON_PRIZE_ROOM_WIDTH EQU $05
; CeladonDiner_h map_id=138
CELADON_DINER_HEIGHT EQU $04
@ -501,8 +505,8 @@ CELADON_HOUSE_HEIGHT EQU $04
CELADON_HOUSE_WIDTH EQU $04
; CeladonHotel_h map_id=140
CELADONHOTEL_HEIGHT EQU $04
CELADONHOTEL_WIDTH EQU $07
CELADON_HOTEL_HEIGHT EQU $04
CELADON_HOTEL_WIDTH EQU $07
; LavenderPokecenter_h map_id=141
LAVENDER_POKECENTER_HEIGHT EQU $04
@ -565,16 +569,16 @@ FUCHSIA_HOUSE_2_HEIGHT EQU $04
FUCHSIA_HOUSE_2_WIDTH EQU $05
; SafariZoneEntrance_h map_id=156
SAFARIZONEENTRANCE_HEIGHT EQU $03
SAFARIZONEENTRANCE_WIDTH EQU $04
SAFARI_ZONE_ENTRANCE_HEIGHT EQU $03
SAFARI_ZONE_ENTRANCE_WIDTH EQU $04
; FuchsiaGym_h map_id=157
FUCHSIA_GYM_HEIGHT EQU $09
FUCHSIA_GYM_WIDTH EQU $05
; FuchsiaMeetingRoom_h map_id=158
FUCHSIAMEETINGROOM_HEIGHT EQU $04
FUCHSIAMEETINGROOM_WIDTH EQU $07
FUCHSIA_MEETING_ROOM_HEIGHT EQU $04
FUCHSIA_MEETING_ROOM_WIDTH EQU $07
; SeafoamIslands2_h map_id=159
SEAFOAM_ISLANDS_2_HEIGHT EQU $09
@ -636,17 +640,17 @@ CINNABAR_MART_WIDTH EQU $04
INDIGO_PLATEAU_LOBBY_HEIGHT EQU $06
INDIGO_PLATEAU_LOBBY_WIDTH EQU $08
; CopycatsHouseF1_h map_id=175
; CopycatsHouse1F_h map_id=175
COPYCATS_HOUSE_1F_HEIGHT EQU $04
COPYCATS_HOUSE_1F_WIDTH EQU $04
; CopycatsHouseF2_h map_id=176
; CopycatsHouse1F_h map_id=176
COPYCATS_HOUSE_2F_HEIGHT EQU $04
COPYCATS_HOUSE_2F_WIDTH EQU $04
; FightingDojo_h map_id=177
FIGHTINGDOJO_HEIGHT EQU $06
FIGHTINGDOJO_WIDTH EQU $05
FIGHTING_DOJO_HEIGHT EQU $06
FIGHTING_DOJO_WIDTH EQU $05
; SaffronGym_h map_id=178
SAFFRON_GYM_HEIGHT EQU $09
@ -677,8 +681,8 @@ ROUTE_15_GATE_1F_HEIGHT EQU $05
ROUTE_15_GATE_1F_WIDTH EQU $04
; Route15GateUpstairs_h map_id=185
ROUTE_15_GATE_2F_HEIGHT EQU 4
ROUTE_15_GATE_2F_WIDTH EQU 4
ROUTE_15_GATE_2F_HEIGHT EQU $04
ROUTE_15_GATE_2F_WIDTH EQU $04
; Route16GateMap_h map_id=186
ROUTE_16_GATE_1F_HEIGHT EQU $07

1982
main.asm
View file

File diff suppressed because it is too large Load diff

0
maps/copycatshousef1.blk → maps/copycatshouse1f.blk
View file

0
maps/copycatshousef2.blk → maps/copycatshouse2f.blk
View file

0
maps/museumf1.blk → maps/museum1f.blk
View file

0
maps/museumf2.blk → maps/museum2f.blk
View file

0
maps/route16gatemap.blk → maps/route16gate.blk
View file

2
text/maps/cerulean_trade_house.asm
View file

@ -1,4 +1,4 @@
_CeruleanHouseText1:: ; 9888c (26:488c)
_CeruleanHouse1Text1:: ; 9888c (26:488c)
text "My husband likes"
line "trading #MON."

6
text/maps/copycats_house_1f.asm
View file

@ -1,11 +1,11 @@
_CopycatsHouseF1Text1:: ; a14f7 (28:54f7)
_CopycatsHouse1FText1:: ; a14f7 (28:54f7)
text "My daughter is so"
line "self-centered."
cont "She only has a"
cont "few friends."
done
_CopycatsHouseF1Text2:: ; a1535 (28:5535)
_CopycatsHouse1FText2:: ; a1535 (28:5535)
text "My daughter likes"
line "to mimic people."
@ -15,7 +15,7 @@ _CopycatsHouseF1Text2:: ; a1535 (28:5535)
cont "around here!"
done
_CopycatsHouseF1Text3:: ; a1596 (28:5596)
_CopycatsHouse1FText3:: ; a1596 (28:5596)
text "CHANSEY: Chaan!"
line "Sii!@@"

6
text/maps/copycats_house_2f.asm
View file

@ -58,7 +58,7 @@ _TM31NoRoomText:: ; a1733 (28:5733)
text "Don't you want"
line "this?@@"
_CopycatsHouseF2Text2:: ; a1749 (28:5749)
_CopycatsHouse2FText2:: ; a1749 (28:5749)
text "DODUO: Giiih!"
para "MIRROR MIRROR ON"
@ -67,13 +67,13 @@ _CopycatsHouseF2Text2:: ; a1749 (28:5749)
cont "OF ALL?"
done
_CopycatsHouseF2Text3:: ; a1792 (28:5792)
_CopycatsHouse2FText3:: ; a1792 (28:5792)
text "This is a rare"
line "#MON! Huh?"
cont "It's only a doll!"
done
_CopycatsHouseF2Text6:: ; a17be (28:57be)
_CopycatsHouse2FText6:: ; a17be (28:57be)
text "A game with MARIO"
line "wearing a bucket"
cont "on his head!"

14
text/maps/museum_2f.asm
View file

@ -1,11 +1,11 @@
_MuseumF2Text1:: ; 96841 (25:6841)
_Museum2FText1:: ; 96841 (25:6841)
text "MOON STONE?"
para "What's so special"
line "about it?"
done
_MuseumF2Text2:: ; 96869 (25:6869)
_Museum2FText2:: ; 96869 (25:6869)
text "July 20, 1969!"
para "The 1st lunar"
@ -15,12 +15,12 @@ _MuseumF2Text2:: ; 96869 (25:6869)
line "TV to watch it!"
done
_MuseumF2Text3:: ; 968b1 (25:68b1)
_Museum2FText3:: ; 968b1 (25:68b1)
text "We have a space"
line "exhibit now."
done
_MuseumF2Text4:: ; 968cf (25:68cf)
_Museum2FText4:: ; 968cf (25:68cf)
text "I want a PIKACHU!"
line "It's so cute!"
@ -28,17 +28,17 @@ _MuseumF2Text4:: ; 968cf (25:68cf)
line "to catch me one!"
done
_MuseumF2Text5:: ; 96911 (25:6911)
_Museum2FText5:: ; 96911 (25:6911)
text "Yeah, a PIKACHU"
line "soon, I promise!"
done
_MuseumF2Text6:: ; 96933 (25:6933)
_Museum2FText6:: ; 96933 (25:6933)
text "SPACE SHUTTLE"
line "COLUMBIA"
done
_MuseumF2Text7:: ; 9694b (25:694b)
_Museum2FText7:: ; 9694b (25:694b)
text "Meteorite that"
line "fell on MT.MOON."
cont "(MOON STONE?)"

2
text/maps/route_16_gate.asm
View file

@ -16,7 +16,7 @@ _UnnamedText_49781:: ; 8cd0e (23:4d0e)
line "up please!"
done
_Route16GateMapText2:: ; 8cd2a (23:4d2a)
_Route16GateText2:: ; 8cd2a (23:4d2a)
text "How'd you get in?"
line "Good effort!"
done

4
text/maps/viridian_forest_exit.asm
View file

@ -1,4 +1,4 @@
_ViridianForestexitText1:: ; 8a6fd (22:66fd)
_ViridianForestExitText1:: ; 8a6fd (22:66fd)
text "Many #MON live"
line "only in forests "
cont "and caves."
@ -8,7 +8,7 @@ _ViridianForestexitText1:: ; 8a6fd (22:66fd)
cont "different kinds!"
done
_ViridianForestexitText2:: ; 8a75d (22:675d)
_ViridianForestExitText2:: ; 8a75d (22:675d)
text "Have you noticed"
line "the bushes on the"
cont "roadside?"