Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity
pokecrystal/maps/BattleTowerBattleRoom.asm

160 lines
3.2 KiB
NASM
Raw Normal View History

Trim address comments from maps.
2015-07-10 08:45:35 +00:00
BattleTowerBattleRoom_MapScriptHeader:
Added labels to different parts of the map script and event headers
2015-07-21 04:02:21 +00:00
.MapTriggers:
Split map scripts, text, events from main.asm The commit we deserve
2013-02-17 06:54:07 +00:00
db 2
; triggers
dw UnknownScript_0x9f419, $0000
dw UnknownScript_0x9f420, $0000
Added labels to different parts of the map script and event headers
2015-07-21 04:02:21 +00:00
.MapCallbacks:
Split map scripts, text, events from main.asm The commit we deserve
2013-02-17 06:54:07 +00:00
db 0
Trim address comments from maps.
2015-07-10 08:45:35 +00:00
UnknownScript_0x9f419:
Split map scripts, text, events from main.asm The commit we deserve
2013-02-17 06:54:07 +00:00
disappear $2
priorityjump UnknownScript_0x9f421
dotrigger $1
Trim address comments from maps.
2015-07-10 08:45:35 +00:00
UnknownScript_0x9f420:
Split map scripts, text, events from main.asm The commit we deserve
2013-02-17 06:54:07 +00:00
end
Trim address comments from maps.
2015-07-10 08:45:35 +00:00
UnknownScript_0x9f421:
Split map scripts, text, events from main.asm The commit we deserve
2013-02-17 06:54:07 +00:00
applymovement $0, MovementData_0x9e58c
Trim address comments from maps.
2015-07-10 08:45:35 +00:00
UnknownScript_0x9f425:
Split map scripts, text, events from main.asm The commit we deserve
2013-02-17 06:54:07 +00:00
writebyte $2
Use labels for script specials instead of constants/static values.
2015-02-11 23:03:42 +00:00
special Function170b44
Split map scripts, text, events from main.asm The commit we deserve
2013-02-17 06:54:07 +00:00
appear $2
warpsound
waitbutton
applymovement $2, MovementData_0x9e592
loadfont
more 3pt macro labels; shorten 3pt macros to take just a label static addresses should be avoided anyway
2013-12-02 19:18:03 +00:00
storetext 1
keeptextopen
loadmovesprites
Use labels for script specials instead of constants/static values.
2015-02-11 23:03:42 +00:00
special Function170215
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 07:51:52 +00:00
special FadeBlackBGMap
more 3pt macro labels; shorten 3pt macros to take just a label static addresses should be avoided anyway
2013-12-02 19:18:03 +00:00
reloadmap
Split map scripts, text, events from main.asm The commit we deserve
2013-02-17 06:54:07 +00:00
if_not_equal $0, UnknownScript_0x9f4c2
Blind wram in maps.
2015-02-10 23:37:24 +00:00
copybytetovar wcf64
Split map scripts, text, events from main.asm The commit we deserve
2013-02-17 06:54:07 +00:00
if_equal $7, UnknownScript_0x9f4d9
applymovement $2, MovementData_0x9e597
warpsound
disappear $2
applymovement $3, MovementData_0x9e59c
applymovement $0, MovementData_0x9e5a7
loadfont
Stop using the preprocessor.
2015-01-20 08:01:23 +00:00
writetext UnknownText_0x9ee92
Split map scripts, text, events from main.asm The commit we deserve
2013-02-17 06:54:07 +00:00
closetext
loadmovesprites
Music and sound effect constants in map events.
2014-04-30 10:04:35 +00:00
playmusic MUSIC_HEAL
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 07:51:52 +00:00
special FadeBlackBGMap
special LoadMapPalettes
Split map scripts, text, events from main.asm The commit we deserve
2013-02-17 06:54:07 +00:00
pause 60
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 07:51:52 +00:00
special FadeInBGMap
Use labels for script specials instead of constants/static values.
2015-02-11 23:03:42 +00:00
special RestartMapMusic
Split map scripts, text, events from main.asm The commit we deserve
2013-02-17 06:54:07 +00:00
loadfont
Stop using the preprocessor.
2015-01-20 08:01:23 +00:00
writetext UnknownText_0x9eebc
Split map scripts, text, events from main.asm The commit we deserve
2013-02-17 06:54:07 +00:00
yesorno
iffalse UnknownScript_0x9f483
Trim address comments from maps.
2015-07-10 08:45:35 +00:00
UnknownScript_0x9f477:
Split map scripts, text, events from main.asm The commit we deserve
2013-02-17 06:54:07 +00:00
loadmovesprites
applymovement $0, MovementData_0x9e5a9
applymovement $3, MovementData_0x9e5a1
Stop using the preprocessor.
2015-01-20 08:01:23 +00:00
jump UnknownScript_0x9f425
Split map scripts, text, events from main.asm The commit we deserve
2013-02-17 06:54:07 +00:00
Trim address comments from maps.
2015-07-10 08:45:35 +00:00
UnknownScript_0x9f483:
Stop using the preprocessor.
2015-01-20 08:01:23 +00:00
writetext UnknownText_0x9ef5e
Split map scripts, text, events from main.asm The commit we deserve
2013-02-17 06:54:07 +00:00
yesorno
iffalse UnknownScript_0x9f4a3
writebyte $7
Use labels for script specials instead of constants/static values.
2015-02-11 23:03:42 +00:00
special Function170687
Split map scripts, text, events from main.asm The commit we deserve
2013-02-17 06:54:07 +00:00
writebyte $1f
Use labels for script specials instead of constants/static values.
2015-02-11 23:03:42 +00:00
special Function170687
Split map scripts, text, events from main.asm The commit we deserve
2013-02-17 06:54:07 +00:00
writebyte $3
Use labels for script specials instead of constants/static values.
2015-02-11 23:03:42 +00:00
special Function170687
Music and sound effect constants in map events.
2014-04-30 10:04:35 +00:00
playsound SFX_SAVE
Split map scripts, text, events from main.asm The commit we deserve
2013-02-17 06:54:07 +00:00
waitbutton
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 07:51:52 +00:00
special FadeBlackBGMap
Use labels for script specials instead of constants/static values.
2015-02-11 23:03:42 +00:00
special Reset
Trim address comments from maps.
2015-07-10 08:45:35 +00:00
UnknownScript_0x9f4a3:
Stop using the preprocessor.
2015-01-20 08:01:23 +00:00
writetext UnknownText_0x9efbf
Split map scripts, text, events from main.asm The commit we deserve
2013-02-17 06:54:07 +00:00
yesorno
iffalse UnknownScript_0x9f477
writebyte $4
Use labels for script specials instead of constants/static values.
2015-02-11 23:03:42 +00:00
special Function170687
Split map scripts, text, events from main.asm The commit we deserve
2013-02-17 06:54:07 +00:00
writebyte $6
Use labels for script specials instead of constants/static values.
2015-02-11 23:03:42 +00:00
special Function170687
Split map scripts, text, events from main.asm The commit we deserve
2013-02-17 06:54:07 +00:00
loadmovesprites
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 07:51:52 +00:00
special FadeBlackBGMap
Split map scripts, text, events from main.asm The commit we deserve
2013-02-17 06:54:07 +00:00
warpfacing $1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F, $7, $7
loadfont
Stop using the preprocessor.
2015-01-20 08:01:23 +00:00
jump UnknownScript_0x9e4b0
Split map scripts, text, events from main.asm The commit we deserve
2013-02-17 06:54:07 +00:00
Trim address comments from maps.
2015-07-10 08:45:35 +00:00
UnknownScript_0x9f4c2:
Split map scripts, text, events from main.asm The commit we deserve
2013-02-17 06:54:07 +00:00
pause 60
Named more specials, fixed a missing EOL
2015-07-20 22:59:26 +00:00
special Special_BattleTowerFade
Split map scripts, text, events from main.asm The commit we deserve
2013-02-17 06:54:07 +00:00
warpfacing $1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F, $7, $7
writebyte $4
Use labels for script specials instead of constants/static values.
2015-02-11 23:03:42 +00:00
special Function170687
Split map scripts, text, events from main.asm The commit we deserve
2013-02-17 06:54:07 +00:00
loadfont
Stop using the preprocessor.
2015-01-20 08:01:23 +00:00
writetext UnknownText_0x9ea49
Split map scripts, text, events from main.asm The commit we deserve
2013-02-17 06:54:07 +00:00
closetext
loadmovesprites
end
Trim address comments from maps.
2015-07-10 08:45:35 +00:00
UnknownScript_0x9f4d9:
Split map scripts, text, events from main.asm The commit we deserve
2013-02-17 06:54:07 +00:00
pause 60
Named more specials, fixed a missing EOL
2015-07-20 22:59:26 +00:00
special Special_BattleTowerFade
Split map scripts, text, events from main.asm The commit we deserve
2013-02-17 06:54:07 +00:00
warpfacing $1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F, $7, $7
Trim address comments from maps.
2015-07-10 08:45:35 +00:00
BattleTowerBattleRoomScript_0x9f4e4:
Split map scripts, text, events from main.asm The commit we deserve
2013-02-17 06:54:07 +00:00
loadfont
Stop using the preprocessor.
2015-01-20 08:01:23 +00:00
writetext UnknownText_0x9eaef
jump UnknownScript_0x9e47a
Split map scripts, text, events from main.asm The commit we deserve
2013-02-17 06:54:07 +00:00
Trim address comments from maps.
2015-07-10 08:45:35 +00:00
UnknownScript_0x9f4eb:
Split map scripts, text, events from main.asm The commit we deserve
2013-02-17 06:54:07 +00:00
writebyte $4
Use labels for script specials instead of constants/static values.
2015-02-11 23:03:42 +00:00
special Function170687
Split map scripts, text, events from main.asm The commit we deserve
2013-02-17 06:54:07 +00:00
loadfont
Stop using the preprocessor.
2015-01-20 08:01:23 +00:00
writetext UnknownText_0x9f0c1
Split map scripts, text, events from main.asm The commit we deserve
2013-02-17 06:54:07 +00:00
closetext
loadmovesprites
end
Trim address comments from maps.
2015-07-10 08:45:35 +00:00
UnknownScript_0x9f4f7:
Split map scripts, text, events from main.asm The commit we deserve
2013-02-17 06:54:07 +00:00
writebyte $4
Use labels for script specials instead of constants/static values.
2015-02-11 23:03:42 +00:00
special Function170687
Split map scripts, text, events from main.asm The commit we deserve
2013-02-17 06:54:07 +00:00
writebyte $6
Use labels for script specials instead of constants/static values.
2015-02-11 23:03:42 +00:00
special Function170687
Split map scripts, text, events from main.asm The commit we deserve
2013-02-17 06:54:07 +00:00
loadfont
Stop using the preprocessor.
2015-01-20 08:01:23 +00:00
writetext UnknownText_0x9ea49
writetext UnknownText_0x9ec09
Split map scripts, text, events from main.asm The commit we deserve
2013-02-17 06:54:07 +00:00
closetext
loadmovesprites
end
remove incbins in BattleTower
2013-05-01 17:29:45 +00:00
Trim address comments from maps.
2015-07-10 08:45:35 +00:00
UnknownText_0x9f50b:
Text macros in maps/. Looks fine at a glance.
2014-03-06 05:29:44 +00:00
text "You'll be returned"
line "after you SAVE."
done
remove incbins in BattleTower
2013-05-01 17:29:45 +00:00
Split map scripts, text, events from main.asm The commit we deserve
2013-02-17 06:54:07 +00:00
Trim address comments from maps.
2015-07-10 08:45:35 +00:00
BattleTowerBattleRoom_MapEventHeader:
Split map scripts, text, events from main.asm The commit we deserve
2013-02-17 06:54:07 +00:00
; filler
db 0, 0
Added labels to different parts of the map script and event headers
2015-07-21 04:02:21 +00:00
.Warps:
Split map scripts, text, events from main.asm The commit we deserve
2013-02-17 06:54:07 +00:00
db 2
warp_def $7, $3, 4, GROUP_BATTLE_TOWER_HALLWAY, MAP_BATTLE_TOWER_HALLWAY
warp_def $7, $4, 4, GROUP_BATTLE_TOWER_HALLWAY, MAP_BATTLE_TOWER_HALLWAY
Added labels to different parts of the map script and event headers
2015-07-21 04:02:21 +00:00
.XYTriggers:
Split map scripts, text, events from main.asm The commit we deserve
2013-02-17 06:54:07 +00:00
db 0
Added labels to different parts of the map script and event headers
2015-07-21 04:02:21 +00:00
.Signposts:
Split map scripts, text, events from main.asm The commit we deserve
2013-02-17 06:54:07 +00:00
db 0
Added labels to different parts of the map script and event headers
2015-07-21 04:02:21 +00:00
.PersonEvents:
Split map scripts, text, events from main.asm The commit we deserve
2013-02-17 06:54:07 +00:00
db 2
Finished the decoration attributes table Interpretation of the Decoration Attributes table is complete. Other changes include some more event flag and function naming, as well as a minor tweak to the person_events of every map.
2015-07-19 08:58:31 +00:00
person_event SPRITE_YOUNGSTER, 4, 8, OW_UP | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER
person_event SPRITE_RECEPTIONIST, 10, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ObjectEvent, -1