Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some static addresses in maps.

Browse Source
This commit is contained in:
yenatch
2014-04-30 05:40:22 -04:00
parent c456555f15
commit 5708cf7569
8 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
maps/BattleTower1F.asm
View File

@@ -308,6 +308,7 @@ MovementData_0x9e578: ; 0x9e578
MovementData_0x9e57a: ; 0x9e57a MovementData_0x9e57a: ; 0x9e57a
step_right step_right
step_right step_right
MovementData_0x9e57c: ; 0x9e57c
step_right step_right
step_right step_right
step_up step_up
@@ -319,8 +320,10 @@ MovementData_0x9e57a: ; 0x9e57a
MovementData_0x9e582: ; 0x9e582 MovementData_0x9e582: ; 0x9e582
step_left step_left
step_left step_left
MovementData_0x9e584: ; 0x9e584
step_left step_left
step_left step_left
MovementData_0x9e586: ; 0x9e586
step_left step_left
step_left step_left
step_up step_up

8
maps/BattleTowerHallway.asm
View File

@@ -55,17 +55,17 @@ UnknownScript_0x9f5dc: ; 0x9f5dc
; 0x9f603 ; 0x9f603
UnknownScript_0x9f603: ; 0x9f603 UnknownScript_0x9f603: ; 0x9f603
applymovement $2, $657c applymovement $2, MovementData_0x9e57c
2jump UnknownScript_0x9f61f 2jump UnknownScript_0x9f61f
; 0x9f60a ; 0x9f60a
UnknownScript_0x9f60a: ; 0x9f60a UnknownScript_0x9f60a: ; 0x9f60a
applymovement $2, $6586 applymovement $2, MovementData_0x9e586
2jump UnknownScript_0x9f61f 2jump UnknownScript_0x9f61f
; 0x9f611 ; 0x9f611
UnknownScript_0x9f611: ; 0x9f611 UnknownScript_0x9f611: ; 0x9f611
applymovement $2, $6584 applymovement $2, MovementData_0x9e584
2jump UnknownScript_0x9f61f 2jump UnknownScript_0x9f61f
; 0x9f618 ; 0x9f618
@@ -81,7 +81,7 @@ UnknownScript_0x9f61f: ; 0x9f61f
closetext closetext
loadmovesprites loadmovesprites
stopfollow stopfollow
applymovement $0, $6576 applymovement $0, MovementData_0x9e576
warpcheck warpcheck
end end
; 0x9f62f ; 0x9f62f

2
maps/DragonsDenB1F.asm
View File

@@ -542,7 +542,7 @@ DragonsDenB1F_MapEventHeader: ; 0x18cf73
person_event SPRITE_SILVER, 27, 24, $2, $22, 255, 255, $0, 0, SilverScript_0x18c97e, $06c6 person_event SPRITE_SILVER, 27, 24, $2, $22, 255, 255, $0, 0, SilverScript_0x18c97e, $06c6
person_event SPRITE_COOLTRAINER_M, 12, 24, $7, $0, 255, 255, $82, 4, TrainerCooltrainermDarin, $ffff person_event SPRITE_COOLTRAINER_M, 12, 24, $7, $0, 255, 255, $82, 4, TrainerCooltrainermDarin, $ffff
person_event SPRITE_COOLTRAINER_F, 12, 12, $6, $0, 255, 255, $82, 3, TrainerCooltrainerfCara, $ffff person_event SPRITE_COOLTRAINER_F, 12, 12, $6, $0, 255, 255, $82, 3, TrainerCooltrainerfCara, $ffff
person_event SPRITE_TWIN, 21, 8, $9, $0, 255, 255, $82, 1, $4932, $ffff person_event SPRITE_TWIN, 21, 8, $9, $0, 255, 255, $82, 1, TrainerTwinsLeaandpia1, $ffff
person_event SPRITE_TWIN, 22, 8, $9, $0, 255, 255, $82, 1, TrainerTwinsLeaandpia2, $ffff person_event SPRITE_TWIN, 22, 8, $9, $0, 255, 255, $82, 1, TrainerTwinsLeaandpia2, $ffff
person_event SPRITE_POKE_BALL, 8, 34, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c9a1, $07bf person_event SPRITE_POKE_BALL, 8, 34, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c9a1, $07bf
person_event SPRITE_POKE_BALL, 24, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c9a3, $07c0 person_event SPRITE_POKE_BALL, 24, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c9a3, $07c0

3
maps/ElmsLab.asm
View File

@@ -599,6 +599,7 @@ UnknownScript_0x78f12: ; 0x78f12
MeetCopScript: ; 0x78f16 MeetCopScript: ; 0x78f16
applymovement $0, MovementData_0x78f74 applymovement $0, MovementData_0x78f74
CopScript: ; 0x78f1a
spriteface $7, $2 spriteface $7, $2
loadfont loadfont
2writetext UnknownText_0x7a0f0 2writetext UnknownText_0x7a0f0
@@ -1552,6 +1553,6 @@ ElmsLab_MapEventHeader: ; 0x7a3de
person_event SPRITE_POKE_BALL, 7, 10, $1, $0, 255, 255, $0, 0, CyndaquilPokeBallScript, $0640 person_event SPRITE_POKE_BALL, 7, 10, $1, $0, 255, 255, $0, 0, CyndaquilPokeBallScript, $0640
person_event SPRITE_POKE_BALL, 7, 11, $1, $0, 255, 255, $0, 0, TotodilePokeBallScript, $0641 person_event SPRITE_POKE_BALL, 7, 11, $1, $0, 255, 255, $0, 0, TotodilePokeBallScript, $0641
person_event SPRITE_POKE_BALL, 7, 12, $1, $0, 255, 255, $0, 0, ChikoritaPokeBallScript, $0642 person_event SPRITE_POKE_BALL, 7, 12, $1, $0, 255, 255, $0, 0, ChikoritaPokeBallScript, $0642
person_event SPRITE_OFFICER, 7, 9, $7, $0, 255, 255, $90, 0, $4f1a, $0702 person_event SPRITE_OFFICER, 7, 9, $7, $0, 255, 255, $90, 0, CopScript, $0702
; 0x7a4cc ; 0x7a4cc

2
maps/GoldenrodPokeComCenter2FMobile.asm
View File

@@ -75,7 +75,7 @@ MapGoldenrodPokeComCenter2FMobileSignpost1Script: ; 0x62624
closetext closetext
UnknownScript_0x62629: ; 0x62629 UnknownScript_0x62629: ; 0x62629
reloadmappart reloadmappart
loadmenudata $664c loadmenudata MenuDataHeader_0x6264c
interpretmenu2 interpretmenu2
writebackup writebackup
if_equal $1, UnknownScript_0x6263a if_equal $1, UnknownScript_0x6263a

6
maps/LancesRoom.asm
View File

@@ -51,13 +51,13 @@ UnknownScript_0x180e53: ; 0x180e53
UnknownScript_0x180e6a: ; 0x180e6a UnknownScript_0x180e6a: ; 0x180e6a
special $006a special $006a
applymovement $0, MovementData_0x180f38 applymovement $0, MovementData_0x180f38
2jump UnknownScript_0x180e7b 2jump LanceScript_0x180e7b
; 0x180e74 ; 0x180e74
UnknownScript_0x180e74: ; 0x180e74 UnknownScript_0x180e74: ; 0x180e74
special $006a special $006a
applymovement $0, MovementData_0x180f3c applymovement $0, MovementData_0x180f3c
UnknownScript_0x180e7b: ; 0x180e7b LanceScript_0x180e7b: ; 0x180e7b
spriteface $2, $2 spriteface $2, $2
loadfont loadfont
2writetext UnknownText_0x180f67 2writetext UnknownText_0x180f67
@@ -385,7 +385,7 @@ LancesRoom_MapEventHeader: ; 0x1813f4
; people-events ; people-events
db 3 db 3
person_event SPRITE_LANCE, 7, 9, $6, $0, 255, 255, $0, 0, $4e7b, $ffff person_event SPRITE_LANCE, 7, 9, $6, $0, 255, 255, $0, 0, LanceScript_0x180e7b, $ffff
person_event SPRITE_TEACHER, 11, 8, $7, $0, 255, 255, $a0, 0, ObjectEvent, $075f person_event SPRITE_TEACHER, 11, 8, $7, $0, 255, 255, $a0, 0, ObjectEvent, $075f
person_event SPRITE_OAK, 11, 8, $7, $0, 255, 255, $0, 0, ObjectEvent, $075f person_event SPRITE_OAK, 11, 8, $7, $0, 255, 255, $0, 0, ObjectEvent, $075f
; 0x181445 ; 0x181445

4
maps/Route35NationalParkgate.asm
View File

@@ -143,9 +143,11 @@ UnknownScript_0x6a26c: ; 0x6a26c
UnknownScript_0x6a271: ; 0x6a271 UnknownScript_0x6a271: ; 0x6a271
checkcode $1 checkcode $1
if_less_than $6, $627d if_less_than $6, UnknownScript_0x6a27d
checkcode $10 checkcode $10
if_equal $0, UnknownScript_0x6a2b5 if_equal $0, UnknownScript_0x6a2b5
UnknownScript_0x6a27d: ; 6a27d
special $005a special $005a
if_equal $1, UnknownScript_0x6a2bb if_equal $1, UnknownScript_0x6a2bb
2writetext UnknownText_0x6a4c6 2writetext UnknownText_0x6a4c6

8
maps/second_map_headers.asm
View File

@@ -587,7 +587,7 @@ Route30_SecondMapHeader: ; 0x9500c
; NORTH to Route 31 ; NORTH to Route 31
db GROUP_ROUTE_31, MAP_ROUTE_31 ; connected map (group, id) db GROUP_ROUTE_31, MAP_ROUTE_31 ; connected map (group, id)
dw $7288 ; strip pointer dw (Route31_BlockData + ((ROUTE_31_HEIGHT - 3) * ROUTE_31_WIDTH) + 7) ; strip pointer
dw ($C703 + 253) ; strip destination dw ($C703 + 253) ; strip destination
db 13, ROUTE_31_WIDTH ; (connection strip length, connected map width) db 13, ROUTE_31_WIDTH ; (connection strip length, connected map width)
db ((ROUTE_31_HEIGHT * 2) - 1), 20 ; yoffset, xoffset db ((ROUTE_31_HEIGHT * 2) - 1), 20 ; yoffset, xoffset
@@ -1351,7 +1351,7 @@ Route1_SecondMapHeader: ; 0x9530c
; NORTH to Viridian City ; NORTH to Viridian City
db GROUP_VIRIDIAN_CITY, MAP_VIRIDIAN_CITY ; connected map (group, id) db GROUP_VIRIDIAN_CITY, MAP_VIRIDIAN_CITY ; connected map (group, id)
dw $6d9c ; strip pointer dw (ViridianCity_BlockData + ((VIRIDIAN_CITY_HEIGHT - 3) * VIRIDIAN_CITY_WIDTH) + 7) ; strip pointer
dw ($C703 + 253) ; strip destination dw ($C703 + 253) ; strip destination
db 13, VIRIDIAN_CITY_WIDTH ; (connection strip length, connected map width) db 13, VIRIDIAN_CITY_WIDTH ; (connection strip length, connected map width)
db ((VIRIDIAN_CITY_HEIGHT * 2) - 1), 20 ; yoffset, xoffset db ((VIRIDIAN_CITY_HEIGHT * 2) - 1), 20 ; yoffset, xoffset
@@ -1611,7 +1611,7 @@ Route18_SecondMapHeader: ; 0x95414
; WEST to Route 17 ; WEST to Route 17
db GROUP_ROUTE_17, MAP_ROUTE_17 ; connected map (group, id) db GROUP_ROUTE_17, MAP_ROUTE_17 ; connected map (group, id)
dw $7152 ; strip pointer dw (Route17_BlockData + ((ROUTE_17_HEIGHT - 10) * ROUTE_17_WIDTH) + 7) ; strip pointer
dw $c800 ; strip destination dw $c800 ; strip destination
db 10, ROUTE_17_WIDTH ; (connection strip length, connected map width) db 10, ROUTE_17_WIDTH ; (connection strip length, connected map width)
db 76, ((ROUTE_17_WIDTH * 2) - 1) ; yoffset, xoffset db 76, ((ROUTE_17_WIDTH * 2) - 1) ; yoffset, xoffset
@@ -2443,7 +2443,7 @@ Route10North_SecondMapHeader: ; 0x95768
; NORTH to Route 9 ; NORTH to Route 9
db GROUP_ROUTE_9, MAP_ROUTE_9 ; connected map (group, id) db GROUP_ROUTE_9, MAP_ROUTE_9 ; connected map (group, id)
dw $7eae ; strip pointer dw (Route9_BlockData + ((ROUTE_9_HEIGHT - 3) * ROUTE_9_WIDTH) + 17) ; strip pointer
dw ($C703 + 253) ; strip destination dw ($C703 + 253) ; strip destination
db 13, ROUTE_9_WIDTH ; (connection strip length, connected map width) db 13, ROUTE_9_WIDTH ; (connection strip length, connected map width)
db ((ROUTE_9_HEIGHT * 2) - 1), 40 ; yoffset, xoffset db ((ROUTE_9_HEIGHT * 2) - 1), 40 ; yoffset, xoffset