diff options
| -rw-r--r-- | maps/BrunosRoom.asm | 22 | ||||
| -rw-r--r-- | maps/KarensRoom.asm | 42 | ||||
| -rw-r--r-- | maps/KogasRoom.asm | 42 | ||||
| -rw-r--r-- | maps/WillsRoom.asm | 46 |
4 files changed, 76 insertions, 76 deletions
diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index 19e7dc46d..ba1e8c3c8 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -17,7 +17,7 @@ BrunosRoom_MapScriptHeader: dbw MAPCALLBACK_TILES, .BrunosRoomDoors .Trigger0: - priorityjump UnknownScript_0x1809ad + priorityjump .BrunosDoorLocksBehindYou end .Trigger1: @@ -34,7 +34,7 @@ BrunosRoom_MapScriptHeader: .OpenDoor: return -UnknownScript_0x1809ad: +.BrunosDoorLocksBehindYou: applymovement PLAYER, MovementData_0x1809f9 refreshscreen $86 playsound SFX_STRENGTH @@ -47,21 +47,21 @@ UnknownScript_0x1809ad: waitsfx end -BrunoScript_0x1809c5: +BrunoScript_Battle: faceplayer opentext checkevent EVENT_BEAT_ELITE_4_BRUNO iftrue UnknownScript_0x1809f3 - writetext UnknownText_0x1809fe + writetext BrunoScript_BrunoBeforeText waitbutton closetext - winlosstext UnknownText_0x180b23, 0 + winlosstext BrunoScript_BrunoBeatenText, 0 loadtrainer BRUNO, 1 startbattle reloadmapafterbattle setevent EVENT_BEAT_ELITE_4_BRUNO opentext - writetext UnknownText_0x180b3c + writetext BrunoScript_BrunoDefeatText waitbutton closetext playsound SFX_ENTER_DOOR @@ -73,7 +73,7 @@ BrunoScript_0x1809c5: end UnknownScript_0x1809f3: - writetext UnknownText_0x180b3c + writetext BrunoScript_BrunoDefeatText waitbutton closetext end @@ -85,7 +85,7 @@ MovementData_0x1809f9: step UP step_end -UnknownText_0x1809fe: +BrunoScript_BrunoBeforeText: text "I am BRUNO of the" line "ELITE FOUR." @@ -115,12 +115,12 @@ UnknownText_0x1809fe: para "Hoo hah!" done -UnknownText_0x180b23: +BrunoScript_BrunoBeatenText: text "Why? How could we" line "lose?" done -UnknownText_0x180b3c: +BrunoScript_BrunoDefeatText: text "Having lost, I" line "have no right to" cont "say anything…" @@ -148,4 +148,4 @@ BrunosRoom_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_BRUNO, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, BrunoScript_0x1809c5, -1 + person_event SPRITE_BRUNO, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, BrunoScript_Battle, -1 diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index 228dec1eb..6ab50b3fc 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -6,35 +6,35 @@ KarensRoom_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x180bbc, 0 - dw UnknownScript_0x180bc0, 0 + dw .Trigger0, 0 + dw .Trigger1, 0 .MapCallbacks: db 1 ; callbacks - dbw MAPCALLBACK_TILES, UnknownScript_0x180bc1 + dbw MAPCALLBACK_TILES, .KarensRoomDoors -UnknownScript_0x180bbc: - priorityjump UnknownScript_0x180bd6 +.Trigger0: + priorityjump .KarensDoorLocksBehindYou end -UnknownScript_0x180bc0: +.Trigger1: end -UnknownScript_0x180bc1: +.KarensRoomDoors: checkevent EVENT_KARENS_ROOM_ENTRANCE_CLOSED - iffalse UnknownScript_0x180bcb + iffalse .KeepDoorsClosed changeblock $4, $e, $2a -UnknownScript_0x180bcb: +.KeepDoorsClosed: checkevent EVENT_KARENS_ROOM_EXIT_OPEN - iffalse UnknownScript_0x180bd5 + iffalse .OpenDoors changeblock $4, $2, $16 -UnknownScript_0x180bd5: +.OpenDoors: return -UnknownScript_0x180bd6: +.KarensDoorLocksBehindYou: applymovement PLAYER, MovementData_0x180c22 refreshscreen $86 playsound SFX_STRENGTH @@ -47,21 +47,21 @@ UnknownScript_0x180bd6: waitsfx end -KarenScript_0x180bee: +KarenScript_Battle: faceplayer opentext checkevent EVENT_BEAT_ELITE_4_KAREN iftrue UnknownScript_0x180c1c - writetext UnknownText_0x180c27 + writetext KarenScript_KarenBeforeText waitbutton closetext - winlosstext UnknownText_0x180cf8, 0 + winlosstext KarenScript_KarenBeatenText, 0 loadtrainer KAREN, 1 startbattle reloadmapafterbattle setevent EVENT_BEAT_ELITE_4_KAREN opentext - writetext UnknownText_0x180d29 + writetext KarenScript_KarenDefeatText waitbutton closetext playsound SFX_ENTER_DOOR @@ -73,7 +73,7 @@ KarenScript_0x180bee: end UnknownScript_0x180c1c: - writetext UnknownText_0x180d29 + writetext KarenScript_KarenDefeatText waitbutton closetext end @@ -85,7 +85,7 @@ MovementData_0x180c22: step UP step_end -UnknownText_0x180c27: +KarenScript_KarenBeforeText: text "I am KAREN of the" line "ELITE FOUR." @@ -108,13 +108,13 @@ UnknownText_0x180c27: para "Let's go." done -UnknownText_0x180cf8: +KarenScript_KarenBeatenText: text "Well, aren't you" line "good. I like that" cont "in a trainer." done -UnknownText_0x180d29: +KarenScript_KarenDefeatText: text "Strong #MON." para "Weak #MON." @@ -156,4 +156,4 @@ KarensRoom_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_KAREN, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, KarenScript_0x180bee, -1 + person_event SPRITE_KAREN, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, KarenScript_Battle, -1 diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm index 0c6ca7eae..35fcb68b7 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -6,35 +6,35 @@ KogasRoom_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x180728, 0 - dw UnknownScript_0x18072c, 0 + dw .Trigger0, 0 + dw .Trigger1, 0 .MapCallbacks: db 1 ; callbacks - dbw MAPCALLBACK_TILES, UnknownScript_0x18072d + dbw MAPCALLBACK_TILES, .KogasRoomDoors -UnknownScript_0x180728: - priorityjump UnknownScript_0x180742 +.Trigger0: + priorityjump .KogasDoorLocksBehindYou end -UnknownScript_0x18072c: +.Trigger1: end -UnknownScript_0x18072d: +.KogasRoomDoors: checkevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED - iffalse UnknownScript_0x180737 + iffalse .KeepDoorsClosed changeblock $4, $e, $2a -UnknownScript_0x180737: +.KeepDoorsClosed: checkevent EVENT_KOGAS_ROOM_EXIT_OPEN - iffalse UnknownScript_0x180741 + iffalse .OpenDoors changeblock $4, $2, $16 -UnknownScript_0x180741: +.OpenDoors: return -UnknownScript_0x180742: +.KogasDoorLocksBehindYou: applymovement PLAYER, MovementData_0x18078e refreshscreen $86 playsound SFX_STRENGTH @@ -47,21 +47,21 @@ UnknownScript_0x180742: waitsfx end -KogaScript_0x18075a: +KogaScript_Battle: faceplayer opentext checkevent EVENT_BEAT_ELITE_4_KOGA iftrue UnknownScript_0x180788 - writetext UnknownText_0x180793 + writetext KogaScript_KogaBeforeText waitbutton closetext - winlosstext UnknownText_0x1808a9, 0 + winlosstext KogaScript_KogaBeatenText, 0 loadtrainer KOGA, 1 startbattle reloadmapafterbattle setevent EVENT_BEAT_ELITE_4_KOGA opentext - writetext UnknownText_0x1808ca + writetext KogaScript_KogaDefeatText waitbutton closetext playsound SFX_ENTER_DOOR @@ -73,7 +73,7 @@ KogaScript_0x18075a: end UnknownScript_0x180788: - writetext UnknownText_0x1808ca + writetext KogaScript_KogaDefeatText waitbutton closetext end @@ -85,7 +85,7 @@ MovementData_0x18078e: step UP step_end -UnknownText_0x180793: +KogaScript_KogaBeforeText: text "Fwahahahaha!" para "I am KOGA of the" @@ -114,13 +114,13 @@ UnknownText_0x180793: line "see soon enough!" done -UnknownText_0x1808a9: +KogaScript_KogaBeatenText: text "Ah!" line "You have proven" cont "your worth!" done -UnknownText_0x1808ca: +KogaScript_KogaDefeatText: text "I subjected you to" line "everything I could" cont "muster." @@ -153,4 +153,4 @@ KogasRoom_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_KOGA, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, KogaScript_0x18075a, -1 + person_event SPRITE_KOGA, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, KogaScript_Battle, -1 diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index cc3986c33..0c6c5e4d1 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -6,35 +6,35 @@ WillsRoom_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x1804c6, 0 - dw UnknownScript_0x1804ca, 0 + dw .Trigger0, 0 + dw .Trigger1, 0 .MapCallbacks: db 1 ; callbacks - dbw MAPCALLBACK_TILES, UnknownScript_0x1804cb + dbw MAPCALLBACK_TILES, .WillsRoomDoors -UnknownScript_0x1804c6: - priorityjump UnknownScript_0x1804e0 +.Trigger0: + priorityjump .WillsDoorLocksBehindYou end -UnknownScript_0x1804ca: +.Trigger1: end -UnknownScript_0x1804cb: +.WillsRoomDoors: checkevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED - iffalse UnknownScript_0x1804d5 + iffalse .KeepDoorClosed changeblock $4, $e, $2a -UnknownScript_0x1804d5: +.KeepDoorClosed: checkevent EVENT_WILLS_ROOM_EXIT_OPEN - iffalse UnknownScript_0x1804df + iffalse .OpenDoor changeblock $4, $2, $16 -UnknownScript_0x1804df: +.OpenDoor: return -UnknownScript_0x1804e0: +.WillsDoorLocksBehindYou: applymovement PLAYER, MovementData_0x18052c refreshscreen $86 playsound SFX_STRENGTH @@ -47,21 +47,21 @@ UnknownScript_0x1804e0: waitsfx end -WillScript_0x1804f8: +WillScript_Battle: faceplayer opentext checkevent EVENT_BEAT_ELITE_4_WILL - iftrue UnknownScript_0x180526 - writetext UnknownText_0x180531 + iftrue WillsRoom_0x180526 + writetext WillScript_WillBeforeText waitbutton closetext - winlosstext UnknownText_0x18062c, 0 + winlosstext WillScript_WillBeatenText, 0 loadtrainer WILL, 1 startbattle reloadmapafterbattle setevent EVENT_BEAT_ELITE_4_WILL opentext - writetext UnknownText_0x180644 + writetext WillScript_WillDefeatText waitbutton closetext playsound SFX_ENTER_DOOR @@ -72,8 +72,8 @@ WillScript_0x1804f8: waitsfx end -UnknownScript_0x180526: - writetext UnknownText_0x180644 +WillScript_0x180526: + writetext WillScript_WillDefeatText waitbutton closetext end @@ -85,7 +85,7 @@ MovementData_0x18052c: step UP step_end -UnknownText_0x180531: +WillScript_WillBeforeText: text "Welcome to #MON" line "LEAGUE, <PLAYER>." @@ -110,12 +110,12 @@ UnknownText_0x180531: line "option!" done -UnknownText_0x18062c: +WillScript_WillBeatenText: text "I… I can't…" line "believe it…" done -UnknownText_0x180644: +WillScript_WillDefeatText: text "Even though I was" line "defeated, I won't" cont "change my course." @@ -151,4 +151,4 @@ WillsRoom_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_WILL, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, WillScript_0x1804f8, -1 + person_event SPRITE_WILL, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, WillScript_Battle, -1 |