From 7b71a12ed1a11b29997877419cf609ed3e6afd99 Mon Sep 17 00:00:00 2001 From: yenatch Date: Mon, 29 Dec 2014 22:08:10 -0800 Subject: [PATCH 1/9] Rename some graphics to avoid collisions later. chris.5x7.2bpp and chris.7x7.2bpp would probably both end up as chris.png. --- gfx/misc/{chris.5x7.2bpp => chris_card.5x7.2bpp} | Bin gfx/misc/{kris.5x7.2bpp => kris_card.5x7.2bpp} | Bin main.asm | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename gfx/misc/{chris.5x7.2bpp => chris_card.5x7.2bpp} (100%) rename gfx/misc/{kris.5x7.2bpp => kris_card.5x7.2bpp} (100%) diff --git a/gfx/misc/chris.5x7.2bpp b/gfx/misc/chris_card.5x7.2bpp similarity index 100% rename from gfx/misc/chris.5x7.2bpp rename to gfx/misc/chris_card.5x7.2bpp diff --git a/gfx/misc/kris.5x7.2bpp b/gfx/misc/kris_card.5x7.2bpp similarity index 100% rename from gfx/misc/kris.5x7.2bpp rename to gfx/misc/kris_card.5x7.2bpp diff --git a/main.asm b/main.asm index e1c565d1e..4ad45599d 100644 --- a/main.asm +++ b/main.asm @@ -66179,11 +66179,11 @@ Function8833e: ; 8833e ; 88365 (22:4365) ChrisCardPic: ; 88365 -INCBIN "gfx/misc/chris.5x7.2bpp" +INCBIN "gfx/misc/chris_card.5x7.2bpp" ; 88595 KrisCardPic: ; 88595 -INCBIN "gfx/misc/kris.5x7.2bpp" +INCBIN "gfx/misc/kris_card.5x7.2bpp" ; 887c5 CardGFX: ; 887c5 From 7b87e67a8939eb6e11e114c485443ca18528bfea Mon Sep 17 00:00:00 2001 From: yenatch Date: Thu, 1 Jan 2015 20:59:08 -0800 Subject: [PATCH 2/9] More labels in code and some mobile datatracking. --- engine/color.asm | 5 +- engine/credits.asm | 4 +- macros.asm | 5 + main.asm | 483 +++++++++++++++++++++++++++++++++++++++--- misc/crystal_misc.asm | 10 +- 5 files changed, 474 insertions(+), 33 deletions(-) diff --git a/engine/color.asm b/engine/color.asm index fbbc45144..2dd282e79 100644 --- a/engine/color.asm +++ b/engine/color.asm @@ -190,7 +190,7 @@ Function8b4d: ; 8b4d ld a, [hSGB] and a ret z - ld hl, $5c26 + ld hl, PalPacket_9c26 jp Function9809 .asm_8b5c @@ -206,7 +206,7 @@ Function8b67: ; 8b67 ld a, [hSGB] and a ret z - ld hl, $5c36 + ld hl, PalPacket_9c36 jp Function9809 .asm_8b76 @@ -2155,6 +2155,7 @@ Palettes_b469: ; b469 RGB 31, 07, 01 RGB 00, 00, 00 +Palette_b471:: RGB 28, 31, 16 RGB 31, 19, 10 RGB 10, 09, 31 diff --git a/engine/credits.asm b/engine/credits.asm index 4620dd7e2..e2b820e68 100644 --- a/engine/credits.asm +++ b/engine/credits.asm @@ -258,8 +258,8 @@ Function109926: ; 109926 ld a, [$cf63] and $f ld e, a - ld d, $0 - ld hl, $5937 + ld d, 0 + ld hl, Jumptable_109937 add hl, de add hl, de ld a, [hli] diff --git a/macros.asm b/macros.asm index 89cf62c63..50c0e2c25 100644 --- a/macros.asm +++ b/macros.asm @@ -39,6 +39,11 @@ dbbw: MACRO dw \3 ENDM +dbwww: MACRO + db \1 + dw \2, \3, \4 + ENDM + dn: MACRO db (\1) << 4 + (\2) ENDM diff --git a/main.asm b/main.asm index 4ad45599d..d48cbafb4 100644 --- a/main.asm +++ b/main.asm @@ -34743,7 +34743,7 @@ Function268b5: ; 268b5 ; 268bd Function268bd: ; 268bd - ld hl, $68c5 + ld hl, Unknown_268c5 ld c, 1 jp Function2689b ; 268c5 @@ -34983,7 +34983,7 @@ Function26a02: ; 26a02 ld de, $0002 add hl, de ld a, [hl] - ld hl, $6a12 + ld hl, Jumptable_26a12 rst JumpTable ret ; 26a12 @@ -69122,7 +69122,7 @@ Function8a17b: ; 8a17b (22:617b) ld hl, MenuDataHeader_0x8a19a ld a, [$d030] call Function89d5e - ld hl, $61b0 + ld hl, Function8a1b0 call Function89d75 jr nc, .asm_8a198 ld a, $0 @@ -69164,12 +69164,15 @@ Function8a1b0: ; 8a1b0 Strings_8a1cc: ; 8a1cc db "めいし", $25, "せいりと へんしゅうを" - next "おこないます@" + next "おこないます" + db "@" db "めいしフ,ルダー", $25, "めいしと" - next "あんしょうばんごう", $1f, "けします@" + next "あんしょうばんごう", $1f, "けします" + db "@" - db "まえ", $25, "がめん", $1d, "もどります@" + db "まえ", $25, "がめん", $1d, "もどります" + db "@" ; 8a20d @@ -87091,7 +87094,7 @@ Functionb8bdc: ; b8bdc (2e:4bdc) jr nc, .asm_b8bed callab Functionc422 .asm_b8bed - ld hl, $4c7e + ld hl, UnknownText_0xb8c7e ld a, $1e jp Functionb9221 @@ -99154,7 +99157,7 @@ Functionfbb32: ; fbb32 call CalcMagikarpLength call Functionfbbdb callba Function105f33 - ld hl, $7ba9 + ld hl, UnknownText_0xfbba9 call PrintText ld hl, Buffer1 ld de, $dfe8 @@ -102474,7 +102477,7 @@ Function100d22: ; 100d22 ; 100d67 Function100d67: ; 100d67 - ld hl, $4d88 + ld hl, MenuDataHeader_100d88 call Function1d3c xor a ld [hBGMapMode], a @@ -102489,8 +102492,20 @@ Function100d67: ; 100d67 ret ; 100d88 -INCBIN "baserom.gbc",$100d88,$100da5 - $100d88 +MenuDataHeader_100d88: ; 100d88 + db 0 ; flags + db 11, 11 ; start coords + db 17, 19 ; end coords + dw MenuData2_100d90 + db 1 ; default option +MenuData2_100d90: ; 100d90 + db $c0 ; flags + db 3 + db "いれかえる@" + db "つよさをみる@" + db "キャンセル@" +; 100da5 Function100da5: ; 100da5 ld hl, $cd2a @@ -102532,7 +102547,7 @@ Function100dc0: ; 100dc0 ; 100dd2 Function100dd2: ; 100dd2 - ld a, $1e + ld a, 30 ld [OverworldDelay], a ret ; 100dd8 @@ -102561,15 +102576,15 @@ Function100dd8: ; 100dd8 Function100dfd: ; 100dfd ld a, [OverworldDelay] ld c, a - ld a, $1e + ld a, 30 sub c ld c, a - ld b, $3 + ld b, 3 push bc callba Function10062d pop bc jr c, .asm_100e2b - ld b, $1 + ld b, 1 call Function10079c jr c, .asm_100e2b call Function1009f3 @@ -102589,15 +102604,15 @@ Function100dfd: ; 100dfd Function100e2d: ; 100e2d ld a, [OverworldDelay] ld c, a - ld a, $1e + ld a, 30 sub c ld c, a - ld b, $3 + ld b, 3 push bc callba Function10062d pop bc jr c, .asm_100e61 - ld b, $1 + ld b, 1 call Function10079c jr c, .asm_100e61 call Function1009f3 @@ -102711,7 +102726,426 @@ Function100ed4: ; 100ed4 ret ; 100edf -INCBIN "baserom.gbc",$100edf,$1011f1 - $100edf +Function100edf: ; 100edf + ld hl, Unknown_100fc0 + ld c, 1 + jr asm_100f02 + +Function100ee6: ; 100ee6 + ld hl, Unknown_100fc0 + ld c, 2 + jr asm_100f02 + +Function100eed: ; 100eed + ld hl, Unknown_100feb + ld c, 1 + jr asm_100f02 + +Function100ef4: ; 100ef4 + ld hl, Unknown_100ff3 + ld c, 1 + jr asm_100f02 + +Function100efb: ; 100efb + ld hl, Unknown_10102c + ld c, 1 + jr asm_100f02 + +asm_100f02: + ld a, c + ld [StringBuffer2], a + ld a, e + ld [$d087], a + ld a, d + ld [$d088], a + xor a + ld [$d08a], a + ld [$d08b], a +.asm_100f15 + ld a, [hl] + cp $ff + jr z, .asm_100f34 + ld [$d089], a + push hl + inc hl + ld a, [hli] + ld e, a + ld a, [hli] + ld d, a + ld a, [hli] + ld c, a + ld a, [hli] + ld b, a + ld a, [hli] + ld h, [hl] + ld l, a + call Function100f3d + pop hl + ld de, $0007 + add hl, de + jr .asm_100f15 + +.asm_100f34 + ld a, [$d08a] + ld c, a + ld a, [$d08b] + ld b, a + ret +; 100f3d + +Function100f3d: ; 100f3d + ld a, [StringBuffer2] + cp $2 + jr z, .asm_100f61 + cp $1 + jr z, .asm_100f77 + cp $3 + jr z, .asm_100f4d + ret + +.asm_100f4d + ld a, [$d087] + ld l, a + ld a, [$d088] + ld h, a + call Function100f8d + ld a, l + ld [$d087], a + ld a, h + ld [$d088], a + ret + +.asm_100f61 + ld d, h + ld e, l + ld a, [$d087] + ld l, a + ld a, [$d088] + ld h, a + call Function100f8d + ld a, l + ld [$d087], a + ld a, h + ld [$d088], a + ret + +.asm_100f77 + ld h, d + ld l, e + ld a, [$d087] + ld e, a + ld a, [$d088] + ld d, a + call Function100f8d + ld a, e + ld [$d087], a + ld a, d + ld [$d088], a + ret +; 100f8d + +Function100f8d: ; 100f8d + push hl + ld a, [$d08a] + ld l, a + ld a, [$d08b] + ld h, a + add hl, bc + ld a, l + ld [$d08a], a + ld a, h + ld [$d08b], a + pop hl + ld a, [$d089] + bit 7, a + res 7, a + jr z, .asm_100fb6 + and a + jr nz, .asm_100fb0 + call CopyBytes + ret + +.asm_100fb0 + and $7f + call FarCopyWRAM + ret + +.asm_100fb6 + call GetSRAMBank + call CopyBytes + call CloseSRAM + ret +; 100fc0 + +Unknown_100fc0: ; 100fc0 + dbwww $80, PlayerName, NAME_LENGTH, $d26b + dbwww $80, PartyCount, 1 + PARTY_LENGTH + 1, OTPartyCount + dbwww $80, PlayerID, 2, $d276 + dbwww $80, PartyMons, $30 * PARTY_LENGTH, OTPartyMons + dbwww $80, PartyMonOT, NAME_LENGTH * PARTY_LENGTH, OTPartyMonOT + dbwww $80, PartyMonNicknames, PKMN_NAME_LENGTH * PARTY_LENGTH, OTPartyMonNicknames + db -1 + +Unknown_100feb: ; 100feb + dbwww $00, $a600, $2f * PARTY_LENGTH, NULL + db -1 + +Unknown_100ff3: ; 100ff3 + dbwww $80, $dc41, 1, NULL + dbwww $80, PlayerName, NAME_LENGTH, NULL + dbwww $80, PlayerName, NAME_LENGTH, NULL + dbwww $80, PlayerID, 2, NULL + dbwww $80, $d84a, 2, NULL + dbwww $80, PlayerGender, 1, NULL + dbwww $04, $a603, 8, NULL + dbwww $04, $a007, $30, NULL + db -1 + +Unknown_10102c: ; 10102c + dbwww $80, $d26b, 11, NULL + dbwww $80, $d276, 2, NULL + dbwww $80, OTPartyMonNicknames, PKMN_NAME_LENGTH * PARTY_LENGTH, NULL + dbwww $80, OTPartyMonOT, NAME_LENGTH * PARTY_LENGTH, NULL + dbwww $80, OTPartyMons, $30 * PARTY_LENGTH, NULL + db -1 +; 10104f + +Function101050: ; 101050 + call Function10107d + ld a, [OTPartyCount] + ld hl, $c608 + ld hl, $c608 + ld bc, $01b3 + call Function1010de + ld hl, $c7bb + ld [hl], e + inc hl + ld [hl], d + ld a, $7 + call GetSRAMBank + ld hl, $c608 + ld de, $a001 + ld bc, $01b5 + call CopyBytes + call CloseSRAM + ret +; 10107d + +Function10107d: ; 10107d + xor a + ld hl, $c608 + ld bc, $01b5 + call ByteFill + ld hl, $d26b + ld de, $c608 + ld bc, $000b + call CopyBytes + ld hl, $d271 + ld a, [hli] + ld [$c613], a + ld a, [hl] + ld [$c614], a + ld hl, OTPartyMonNicknames + ld de, $c615 + ld bc, $000b + call Function1010cd + ld hl, OTPartyMonOT + ld de, $c657 + ld bc, $000b + call Function1010cd + ld hl, OTPartyMon1Species + ld de, $c699 + ld bc, $0030 + call Function1010cd + ld a, $50 + ld [$c7b9], a + ld a, $33 + ld [$c7ba], a + ret +; 1010cd + +Function1010cd: ; 1010cd + push hl + ld hl, 0 + ld a, [OTPartyCount] + call AddNTimes + ld b, h + ld c, l + pop hl + call CopyBytes + ret +; 1010de + +Function1010de: ; 1010de + push hl + push bc + ld de, 0 +.asm_1010e3 + ld a, [hli] + add e + ld e, a + ld a, d + adc 0 + ld d, a + dec bc + ld a, b + or c + jr nz, .asm_1010e3 + pop bc + pop hl + ret +; 1010f2 + +Function1010f2: ; 1010f2 + xor a + ld hl, StringBuffer2 + ld bc, $0009 + call ByteFill + ld hl, $dc5c + ld de, PartyCount + call Function101145 + ld hl, $dc5c + ld de, PartyMon1Species + call Function10117c + ld hl, $dc5c + ld de, PartyMonOT + call Function101181 + ld hl, $dc5c + ld de, PartyMonNicknames + call Function101181 + ld hl, $cd75 + ld de, OTPartyCount + call Function101145 + ld hl, $cd75 + ld de, OTPartyMon1Species + call Function10117c + ld hl, $cd75 + ld de, OTPartyMonOT + call Function101181 + ld hl, $cd75 + ld de, OTPartyMonNicknames + call Function101181 + ret +; 101145 + +Function101145: ; 101145 + push de + ld bc, $d08c + xor a +.asm_10114a + push af + call Function101168 + ld [bc], a + inc bc + pop af + inc a + cp $3 + jr nz, .asm_10114a + pop de + ld a, $3 + ld [de], a + inc de + ld hl, $d08c + ld bc, $0003 + call CopyBytes + ld a, $ff + ld [de], a + ret +; 101168 + +Function101168: ; 101168 + push hl + add l + ld l, a + ld a, h + adc $0 + ld h, a + ld a, [hl] + pop hl + push de + inc de + add e + ld e, a + ld a, d + adc $0 + ld d, a + ld a, [de] + pop de + ret +; 10117c + +Function10117c: ; 10117c + ld bc, $0030 + jr asm_101184 + +Function101181: ; 101181 + ld bc, $000b + +asm_101184: + ld a, $c608 % $100 + ld [StringBuffer2], a + ld a, $c608 / $100 + ld [$d087], a + ld a, c + ld [$d088], a + ld a, b + ld [$d089], a + ld a, e + ld [$d08a], a + ld a, d + ld [$d08b], a + ld a, $3 +.asm_1011a0 + push af + ld a, [hli] + push hl + push af + call Function1011df + call Function1011e8 + pop af + call AddNTimes + ld a, [StringBuffer2] + ld e, a + ld a, [$d087] + ld d, a + call CopyBytes + ld a, e + ld [StringBuffer2], a + ld a, d + ld [$d087], a + pop hl + pop af + dec a + jr nz, .asm_1011a0 + call Function1011e8 + ld a, 3 + ld hl, 0 + call AddNTimes + ld b, h + ld c, l + call Function1011df + ld d, h + ld e, l + ld hl, $c608 + call CopyBytes + ret +; 1011df + +Function1011df: ; 1011df + ld a, [$d08a] + ld l, a + ld a, [$d08b] + ld h, a + ret +; 1011e8 + +Function1011e8: ; 1011e8 + ld a, [$d088] + ld c, a + ld a, [$d089] + ld b, a + ret +; 1011f1 Function1011f1: ; 1011f1 ld a, $4 @@ -102744,16 +103178,16 @@ Function101220: ; 101220 ; 101225 Function101225: ; 101225 - ld d, $1 - ld e, $40 - ld bc, $5297 + ld d, 1 + ld e, BANK(Unknown_101297) + ld bc, Unknown_101297 call Function100000 jr Function10123d Function101231: ; 101231 - ld d, $2 - ld e, $40 - ld bc, $5297 + ld d, 2 + ld e, BANK(Unknown_101297) + ld bc, Unknown_101297 call Function100000 jr Function10123d @@ -102827,6 +103261,7 @@ Function10127e: ; 10127e ret ; 101297 +Unknown_101297: ; 101297 INCBIN "baserom.gbc",$101297,$1013aa - $101297 Function1013aa: ; 1013aa diff --git a/misc/crystal_misc.asm b/misc/crystal_misc.asm index 88a22043d..9774e5b63 100644 --- a/misc/crystal_misc.asm +++ b/misc/crystal_misc.asm @@ -740,22 +740,22 @@ Function17abcf: ; 17abcf (5e:6bcf) push af ld a, $5 ld [rSVBK], a ; $ff00+$70 - ld hl, $6c55 + ld hl, Palette_17ac55 ld de, Unkn1Pals ; $d000 ld bc, $30 call CopyBytes - ld hl, $6c95 + ld hl, Palette_17ac95 ld de, Unkn2Pals ld bc, $40 call CopyBytes - ld hl, $74b5 + ld hl, GFX_17afa5 + $510 ld de, $d048 ld bc, $10 call CopyBytes - ld hl, $7471 + ld hl, Palette_b471 ld de, $d058 ld bc, $8 - ld a, $2 + ld a, BANK(Palette_b471) call FarCopyBytes pop af ld [rSVBK], a ; $ff00+$70 From 355aeb0a2f4c4c3a26ee76bc51fd258156873f63 Mon Sep 17 00:00:00 2001 From: yenatch Date: Thu, 1 Jan 2015 21:29:23 -0800 Subject: [PATCH 3/9] Tripped over a mobile jumptable. --- main.asm | 4372 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 4355 insertions(+), 17 deletions(-) diff --git a/main.asm b/main.asm index d48cbafb4..b6e64ab71 100644 --- a/main.asm +++ b/main.asm @@ -103179,15 +103179,15 @@ Function101220: ; 101220 Function101225: ; 101225 ld d, 1 - ld e, BANK(Unknown_101297) - ld bc, Unknown_101297 + ld e, BANK(Jumptable_101297) + ld bc, Jumptable_101297 call Function100000 jr Function10123d Function101231: ; 101231 ld d, 2 - ld e, BANK(Unknown_101297) - ld bc, Unknown_101297 + ld e, BANK(Jumptable_101297) + ld bc, Jumptable_101297 call Function100000 jr Function10123d @@ -103261,8 +103261,154 @@ Function10127e: ; 10127e ret ; 101297 -Unknown_101297: ; 101297 -INCBIN "baserom.gbc",$101297,$1013aa - $101297 +Jumptable_101297: ; 101297 + dw Function101a97 + dw Function101ab4 + dw Function101475 + dw Function101b0f + dw Function101438 + dw Function101b2b + dw Function101b59 + dw Function101475 + dw Function101b70 + dw Function101438 + dw Function101b8f + dw Function101d7b + dw Function101d95 + dw Function101475 + dw Function101db2 + dw Function101e4f + dw Function101475 + dw Function101e64 + dw Function101e4f + dw Function101475 + dw Function101e64 + dw Function101d95 + dw Function101475 + dw Function101db2 + dw Function101dd0 + dw Function101de3 + dw Function101e39 + dw Function101e09 + dw Function101e4f + dw Function101475 + dw Function101e64 + dw Function101d95 + dw Function101475 + dw Function101db2 + dw Function101e09 + dw Function101e31 + dw Function101bc8 + dw Function101438 + dw Function101be5 + dw Function101ac6 + dw Function101ab4 + dw Function101475 + dw Function101c11 + dw Function1014f4 + dw Function101cc8 + dw Function1014e2 + dw Function1014e2 + dw Function101d10 + dw Function101d2a + dw Function101d2a + dw Function101507 + dw Function10156d + dw Function101557 + dw Function10158a + dw Function101c42 + dw Function101aed + dw Function101ab4 + dw Function101475 + dw Function101c2b + dw Function1014f4 + dw Function101cdf + dw Function1014e2 + dw Function1014e2 + dw Function101d1e + dw Function101d2a + dw Function101d2a + dw Function101507 + dw Function10156d + dw Function101544 + dw Function10158a + dw Function101c42 + dw Function101c50 + dw Function1014ce + dw Function101cf6 + dw Function101826 + dw Function1017e4 + dw Function1017f1 + dw Function1018a8 + dw Function1018d6 + dw Function1017e4 + dw Function1017f1 + dw Function1018e1 + dw Function1015df + dw Function10167d + dw Function10168a + dw Function10162a + dw Function1015be + dw Function10167d + dw Function10168a + dw Function10161f + dw Function10159d + dw Function10167d + dw Function10168a + dw Function101600 + dw Function101d03 + dw Function101d6b + dw Function10159d + dw Function1014ce + dw Function10168e + dw Function101600 + dw Function101913 + dw Function10194b + dw Function10196d + dw Function1017e4 + dw Function1017f5 + dw Function1019ab + dw Function101537 + dw Function101571 + dw Function101c92 + dw Function10152a + dw Function101571 + dw Function101a4f + dw Function101cbc + dw Function101c62 + dw Function101537 + dw Function101571 + dw Function101c92 + dw Function10152a + dw Function101571 + dw Function101ca0 + dw Function101475 + dw Function101cbc +; 10138b + +Function10138b: ; 10138b + callba Function8adcc + ld c, $0 + jr c, .asm_101396 + inc c + +.asm_101396 + sla c + ld a, [$cd2f] + and a + jr z, .asm_10139f + inc c + +.asm_10139f + sla c + ld a, [$cd21] + cp $1 + jr z, .asm_1013a9 + inc c + +.asm_1013a9 + ret +; 1013aa Function1013aa: ; 1013aa call WhiteBGMap @@ -103274,14 +103420,78 @@ Function1013aa: ; 1013aa ret ; 1013c0 -INCBIN "baserom.gbc",$1013c0,$1013d6 - $1013c0 +Function1013c0: ; 1013c0 + callba Function8000 + callba Function106462 + callba Function106464 + call Function2b5c + ret +; 1013d6 Function1013d6: ; 1013d6 callba Function104000 ret ; 1013dd -INCBIN "baserom.gbc",$1013dd,$10142c - $1013dd +Function1013dd: ; 1013dd + call Function3238 + ret +; 1013e1 + +INCBIN "baserom.gbc", $1013e1, $1013f5 - $1013e1 + +Function1013f5: ; 1013f5 + ld a, [hli] + ld [de], a + inc de + ld c, a +.asm_1013f9 + ld a, [hli] + ld [de], a + inc de + dec c + jr nz, .asm_1013f9 + ret +; 101400 + +INCBIN "baserom.gbc", $101400, $101406 - $101400 + +Function101406: ; 101406 + ld c, a + ld b, $0 +.asm_101409 + ld a, [de] + inc de + cp [hl] + jr nz, .asm_101416 + inc hl + dec bc + ld a, b + or c + jr nz, .asm_101409 + and a + ret + +.asm_101416 + scf + ret +; 101418 + +Function101418: ; 101418 + call GetJoypad + ld a, [hJoyDown] + and $5 + cp $5 + jr z, .asm_101425 + xor a + ret + +.asm_101425 + ld a, $f7 + ld [$cd2b], a + scf + ret +; 10142c Function10142c: ; 10142c ld a, $1 @@ -103290,7 +103500,1517 @@ Function10142c: ; 10142c ret ; 101438 -INCBIN "baserom.gbc",$101438,$101ee4 - $101438 +Function101438: ; 101438 + ld hl, $cd29 + set 6, [hl] + ld a, [$cd26] + ld hl, Jumptable_101457 + rst JumpTable + ld a, [$cd26] + bit 7, a + ret z + ld a, $0 + ld [$cd26], a + ld a, [$cd25] + inc a + ld [$cd25], a + ret +; 101457 + +Jumptable_101457: ; 101457 + dw Function10145b + dw Function101467 +; 10145b + +Function10145b: ; 10145b + ld a, $3c + ld [$cd42], a + ld a, [$cd26] + inc a + ld [$cd26], a + +Function101467: ; 101467 + ld hl, $cd42 + dec [hl] + ret nz + ld a, [$cd26] + set 7, a + ld [$cd26], a + ret +; 101475 + +Function101475: ; 101475 + ld hl, $cd29 + set 6, [hl] + ld a, [$cd26] + ld hl, Jumptable_101494 + rst JumpTable + ld a, [$cd26] + bit 7, a + ret z + ld a, $0 + ld [$cd26], a + ld a, [$cd25] + inc a + ld [$cd25], a + ret +; 101494 + +Jumptable_101494: ; 101494 + dw Function10149a + dw Function1014a6 + dw Function1014b7 +; 10149a + +Function10149a: ; 10149a + ld a, $28 + ld [$cd42], a + ld a, [$cd26] + inc a + ld [$cd26], a + +Function1014a6: ; 1014a6 + ld hl, $cd42 + dec [hl] + ret nz + ld a, $50 + ld [$cd42], a + ld a, [$cd26] + inc a + ld [$cd26], a + +Function1014b7: ; 1014b7 + call GetJoypad + ld a, [hJoyPressed] + and $3 + jr nz, .asm_1014c5 + ld hl, $cd42 + dec [hl] + ret nz + +.asm_1014c5 + ld a, [$cd26] + set 7, a + ld [$cd26], a + ret +; 1014ce + +Function1014ce: ; 1014ce + callba Function100720 + callba Function100641 + ld a, [$cd25] + inc a + ld [$cd25], a + ret +; 1014e2 + +Function1014e2: ; 1014e2 + ld hl, $cd29 + set 6, [hl] + ld a, $0 + ld [$cd26], a + ld a, [$cd25] + inc a + ld [$cd25], a + ret +; 1014f4 + +Function1014f4: ; 1014f4 + callba Function100082 + ld hl, $cd29 + set 6, [hl] + ld a, [$cd25] + inc a + ld [$cd25], a + ret +; 101507 + +Function101507: ; 101507 + ld de, $cd30 + ld hl, $0040 + ld bc, $0040 + ld a, $2 + call Function3e32 + ld a, [$cd25] + inc a + ld [$cd25], a + ret +; 10151d + +INCBIN "baserom.gbc", $10151d, $10152a - $10151d + +Function10152a: ; 10152a + ld a, $36 + call Function3e32 + ld a, [$cd25] + inc a + ld [$cd25], a + ret +; 101537 + +Function101537: ; 101537 + ld a, $a + call Function3e32 + ld a, [$cd25] + inc a + ld [$cd25], a + ret +; 101544 + +Function101544: ; 101544 + callba Function100641 + ld a, $12 + call Function3e32 + ld a, [$cd25] + inc a + ld [$cd25], a + ret +; 101557 + +Function101557: ; 101557 + callba Function100641 + ld hl, $cd53 + ld a, $8 + call Function3e32 + ld a, [$cd25] + inc a + ld [$cd25], a + ret +; 10156d + +Function10156d: ; 10156d + call Function101418 + ret c + +Function101571: ; 101571 + callba Function10032e + ret c + ret z + ld a, e + cp $1 + jr z, .asm_101582 + ld [$cd2b], a + ret + +.asm_101582 + ld a, [$cd25] + inc a + ld [$cd25], a + ret +; 10158a + +Function10158a: ; 10158a + callba Function10064c + ld a, [$cd44] + cp $a + jr c, Function10156d + ld a, $fb + ld [$cd2b], a + ret +; 10159d + +Function10159d: ; 10159d + ld de, $c608 + callba Function100edf + ld de, $c608 + ld a, $5 + ld hl, $d800 + call Function10174c + ld a, $0 + ld [$cd26], a + ld a, [$cd25] + inc a + ld [$cd25], a + ret +; 1015be + +Function1015be: ; 1015be + ld de, $c608 + callba Function100eed + ld de, $c608 + ld a, $5 + ld hl, $d800 + call Function10174c + ld a, $0 + ld [$cd26], a + ld a, [$cd25] + inc a + ld [$cd25], a + ret +; 1015df + +Function1015df: ; 1015df + ld de, $c608 + callba Function100ef4 + ld de, $c608 + ld a, $5 + ld hl, $d800 + call Function10174c + ld a, $0 + ld [$cd26], a + ld a, [$cd25] + inc a + ld [$cd25], a + ret +; 101600 + +Function101600: ; 101600 + ld hl, $d800 + ld de, $c608 + ld bc, $01e0 + ld a, $5 + call FarCopyWRAM + ld de, $c608 + callba Function100ee6 + ld a, [$cd25] + inc a + ld [$cd25], a + ret +; 10161f + +Function10161f: ; 10161f + call Function101649 + ld a, [$cd25] + inc a + ld [$cd25], a + ret +; 10162a + +Function10162a: ; 10162a + call Function101663 + ld a, [$cd25] + inc a + ld [$cd25], a + ret +; 101635 + +Function101635: ; 101635 + ld de, $c608 + ld bc, $01e0 + call FarCopyWRAM + ret +; 10163f + +Function10163f: ; 10163f + ld hl, $c608 + ld bc, $01e0 + call FarCopyWRAM + ret +; 101649 + +Function101649: ; 101649 + ld a, $5 + ld hl, $d800 + call Function101635 + ld a, $5 + ld de, $da00 + call Function10163f + ret +; 10165a + +Function10165a: ; 10165a + ld a, $5 + ld hl, $da00 + call Function101635 + ret +; 101663 + +Function101663: ; 101663 + ld a, $5 + ld hl, $d800 + call Function101635 + ld a, $5 + ld de, $dc00 + call Function10163f + ret +; 101674 + +INCBIN "baserom.gbc", $101674, $10167d - $101674 + +Function10167d: ; 10167d + ld a, $0 + ld [$cd26], a + ld a, [$cd25] + inc a + ld [$cd25], a + ret +; 10168a + +Function10168a: ; 10168a + call Function101418 + ret c + +Function10168e: ; 10168e + ld b, $0 + ld c, $1 + callba Function10079c + ret c + ld c, $1 + ld b, $3 + callba Function10062d + ret c + ld a, [$cd26] + ld hl, Jumptable_1016c3 + rst JumpTable + ld hl, $cd29 + set 6, [hl] + ld a, [$cd26] + bit 7, a + ret z + ld a, $0 + ld [$cd26], a + ld a, [$cd25] + inc a + ld [$cd25], a + ret +; 1016c3 + +Jumptable_1016c3: ; 1016c3 + dw Function1016cf + dw Function1016de + dw Function1016f8 + dw Function101705 + dw Function101719 + dw Function101724 +; 1016cf + +Function1016cf: ; 1016cf + ld hl, $cd3a + inc [hl] + call Function10176f + ld a, [$cd26] + inc a + ld [$cd26], a + ret +; 1016de + +Function1016de: ; 1016de + call Function10177b + jr nc, .asm_1016eb + ld a, [$cd26] + inc a + ld [$cd26], a + ret + +.asm_1016eb + ld a, $ff + ld [$cd39], a + ld a, [$cd26] + inc a + ld [$cd26], a + ret +; 1016f8 + +Function1016f8: ; 1016f8 + ld a, $0 + ld [$cd27], a + ld a, [$cd26] + inc a + ld [$cd26], a + ret +; 101705 + +Function101705: ; 101705 + callba Function100382 + ld a, [$cd27] + bit 7, a + ret z + ld a, [$cd26] + inc a + ld [$cd26], a + ret +; 101719 + +Function101719: ; 101719 + call Function1017c7 + ld a, [$cd26] + inc a + ld [$cd26], a + ret +; 101724 + +Function101724: ; 101724 + ld a, [$cd39] + cp $ff + jr z, .asm_101731 + ld a, $0 + ld [$cd26], a + ret + +.asm_101731 + ld a, [$cd26] + set 7, a + ld [$cd26], a + ret +; 10173a + +INCBIN "baserom.gbc", $10173a, $10173b - $10173a + +Function10173b: ; 10173b + push bc + push af + ld a, [hli] + ld h, [hl] + ld l, a + ld a, [$573a] + ld c, a + ld b, $0 + pop af + call AddNTimes + pop bc + ret +; 10174c + +Function10174c: ; 10174c + ld [$cd3d], a + ld a, l + ld [$cd3e], a + ld a, h + ld [$cd3f], a + ld a, e + ld [$cd3b], a + ld a, d + ld [$cd3c], a + ld a, c + ld [$cd40], a + ld a, b + ld [$cd41], a + xor a + ld [$cd39], a + ld [$cd3a], a + ret +; 10176f + +Function10176f: ; 10176f + ld hl, $ccb4 + ld bc, $0054 + ld a, $11 + call ByteFill + ret +; 10177b + +Function10177b: ; 10177b + ld a, [$573a] + ld c, a + ld b, $0 + ld a, [$cd3a] + ld hl, NULL + call AddNTimes + ld e, l + ld d, h + ld hl, $cd40 + ld a, [hli] + ld h, [hl] + ld l, a + ld a, l + sub e + ld l, a + ld a, h + sbc d + ld h, a + jr c, .asm_1017a0 + add hl, bc + call Function1017b0 + scf + ret + +.asm_1017a0 + ld a, $ff + ld [$cd39], a + add hl, bc + ld a, h + or l + ret z + ld c, l + ld b, h + call Function1017b0 + xor a + ret +; 1017b0 + +Function1017b0: ; 1017b0 + ld a, c + ld [$ccb4], a + push bc + ld a, [$cd3a] + dec a + ld hl, $cd3b + call Function10173b + pop bc + ld de, $ccb5 + call CopyBytes + ret +; 1017c7 + +Function1017c7: ; 1017c7 + ld a, [$cc60] + ld c, a + ld b, $0 + ld a, [$cd3a] + dec a + ld hl, $cd3e + call Function10173b + ld e, l + ld d, h + ld hl, $cc61 + ld a, [$cd3d] + call FarCopyWRAM + and a + ret +; 1017e4 + +Function1017e4: ; 1017e4 + ld a, $0 + ld [$cd27], a + ld a, [$cd25] + inc a + ld [$cd25], a + ret +; 1017f1 + +Function1017f1: ; 1017f1 + call Function101418 + ret c + +Function1017f5: ; 1017f5 + ld b, $0 + ld c, $1 + callba Function10079c + ret c + ld c, $1 + ld b, $3 + callba Function10062d + ret c + callba Function100382 + ld a, [$cd27] + bit 7, a + jr nz, .asm_10181e + ld hl, $cd29 + set 6, [hl] + ret + +.asm_10181e + ld a, [$cd25] + inc a + ld [$cd25], a + ret +; 101826 + +Function101826: ; 101826 + ld a, [$cd21] + cp $2 + jr z, .asm_101833 + cp $1 + jr z, .asm_101844 + jr .asm_101869 + +.asm_101833 + ld hl, $586f + ld de, $ccb4 + call Function1013f5 + ld a, [$cd25] + inc a + ld [$cd25], a + ret + +.asm_101844 + callba Function103654 + ld a, c + ld hl, $5882 + cp $1 + jr z, .asm_10185b + ld hl, $5895 + cp $2 + jr z, .asm_10185b + jr .asm_101869 + +.asm_10185b + ld de, $ccb4 + call Function1013f5 + ld a, [$cd25] + inc a + ld [$cd25], a + ret + +.asm_101869 + ld a, $fe + ld [$cd2b], a + ret +; 10186f + +INCBIN "baserom.gbc", $10186f, $1018a8 - $10186f + +Function1018a8: ; 1018a8 + ld hl, $ccb5 + ld de, $cc61 + ld a, $4 + call Function101406 + jr c, .asm_1018d0 + ld hl, $ccb9 + ld de, $cc65 + ld a, $6 + call Function101406 + jr c, .asm_1018ca + ld a, [$cd25] + inc a + ld [$cd25], a + ret + +.asm_1018ca + ld a, $f6 + ld [$cd2b], a + ret + +.asm_1018d0 + ld a, $f5 + ld [$cd2b], a + ret +; 1018d6 + +Function1018d6: ; 1018d6 + call Function1018ec + ld a, [$cd25] + inc a + ld [$cd25], a + ret +; 1018e1 + +Function1018e1: ; 1018e1 + call Function1018fb + ld a, [$cd25] + inc a + ld [$cd25], a + ret +; 1018ec + +Function1018ec: ; 1018ec + ld a, $a + ld hl, $ccb4 + ld [hli], a + ld c, a +.asm_1018f3 + call Random + ld [hli], a + dec c + jr nz, .asm_1018f3 + ret +; 1018fb + +Function1018fb: ; 1018fb + ld a, [$cd2f] + and a + jr z, .asm_101906 + ld hl, $cc61 + jr .asm_101909 + +.asm_101906 + ld hl, $ccb5 + +.asm_101909 + ld de, LinkBattleRNs + ld bc, $000a + call CopyBytes + ret +; 101913 + +Function101913: ; 101913 + ld hl, $cd2a + set 0, [hl] + xor a + ld [$c30d], a + ld hl, $cd29 + res 4, [hl] + xor a + ld [$c305], a + ld hl, $cd29 + res 7, [hl] + ld a, $90 + ld [hWY], a + ld a, [$cd21] + cp $1 + jr z, .asm_10193f + cp $2 + jr z, .asm_101945 + ld a, $71 + ld [$cd25], a + ret + +.asm_10193f + ld a, $66 + ld [$cd25], a + ret + +.asm_101945 + ld a, $65 + ld [$cd25], a + ret +; 10194b + +Function10194b: ; 10194b + call Function2ed3 + call ClearSprites + callba Function1021f9 + ld hl, $cd29 + bit 3, [hl] + jr nz, .asm_101967 + call Function1013c0 + ld a, $71 + ld [$cd25], a + ret + +.asm_101967 + ld a, $60 + ld [$cd25], a + ret +; 10196d + +Function10196d: ; 10196d + callba Function8000 + callba Function10060d + ld hl, $cd29 + set 5, [hl] + ld hl, $cd2a + set 6, [hl] + ld a, $6 + ld [$ccb4], a + ld hl, $dc5c + ld de, $ccb5 + ld bc, $0003 + call CopyBytes + ld hl, $cd6c + ld a, [hli] + ld [$ccb8], a + ld a, [hli] + ld [$ccb9], a + ld a, [hl] + ld [$ccba], a + ld a, [$cd25] + inc a + ld [$cd25], a + ret +; 1019ab + +Function1019ab: ; 1019ab + call Function101a75 + callba Function100754 + xor a + ld [$dc5f], a + ld [$dc60], a + callba Function8000 + call SpeechTextBox + callba Function100846 + ld c, $78 + call DelayFrames + callba ClearTileMap + call Function1019ee + call Function101a21 + ld a, [$cd2b] + cp $fc + jr nz, .asm_1019e6 + xor a + ld [$cd2b], a + +.asm_1019e6 + ld a, [$cd25] + inc a + ld [$cd25], a + ret +; 1019ee + +Function1019ee: ; 1019ee + ld a, [rSVBK] + push af + ld a, $5 + ld [rSVBK], a + ld bc, $dc0d + ld de, Plant + callba Function4e929 + pop af + ld [rSVBK], a + ld a, c + ld [OtherTrainerClass], a + ld hl, $d26b + ld de, $c656 + ld bc, $000b + call CopyBytes + ld a, [$cd2f] + and a + ld a, $2 + jr z, .asm_101a1e + ld a, $1 + +.asm_101a1e + ld [$ffcb], a + ret +; 101a21 + +Function101a21: ; 101a21 + ld hl, Options + ld a, [hl] + push af + and $20 + or $1 + ld [hl], a + ld a, $1 + ld [$c2d7], a + callba Function3f4dd + callba BattleCore + callba Function3f759 + xor a + ld [$c2d7], a + ld a, $ff + ld [$ffcb], a + pop af + ld [Options], a + ret +; 101a4f + +Function101a4f: ; 101a4f + ld a, $1 + ld [$c2d7], a + callba Function3f77c + xor a + ld [$c2d7], a + callba Function3f6d0 + callba Function1500c + call Function1013c0 + ld a, [$cd25] + inc a + ld [$cd25], a + ret +; 101a75 + +Function101a75: ; 101a75 + ld hl, $cc61 + ld de, $cd75 + ld bc, $0003 + call CopyBytes + ld de, $cc64 + callba Function100772 + callba Function101050 + callba Function1010f2 + ret +; 101a97 + +Function101a97: ; 101a97 + callba Function115d99 + ld hl, $cd29 + set 7, [hl] + ld c, $2 + call Function10142c + ld hl, $cd29 + set 6, [hl] + ld a, [$cd25] + inc a + ld [$cd25], a + ret +; 101ab4 + +Function101ab4: ; 101ab4 + ld e, $1 + call Function101ee4 + ld hl, $cd29 + set 5, [hl] + ld a, [$cd25] + inc a + ld [$cd25], a + ret +; 101ac6 + +Function101ac6: ; 101ac6 + callba Function115d99 + ld hl, $cd29 + set 7, [hl] + ld c, $2 + call Function10142c + ld hl, $cd29 + set 6, [hl] + xor a + ld [$cd2f], a + ld de, $dc42 + call Function102068 + ld a, [$cd25] + inc a + ld [$cd25], a + ret +; 101aed + +Function101aed: ; 101aed + callba Function115d99 + ld hl, $cd29 + set 7, [hl] + ld c, $2 + call Function10142c + ld hl, $cd29 + set 6, [hl] + ld a, $1 + ld [$cd2f], a + ld a, [$cd25] + inc a + ld [$cd25], a + ret +; 101b0f + +Function101b0f: ; 101b0f + ld c, $0 + call Function10142c + ld e, $3 + call Function101ee4 + ld hl, $cd29 + set 5, [hl] + ld a, [$cd25] + inc a + ld [$cd25], a + ld a, $0 + ld [$cd26], a + ret +; 101b2b + +Function101b2b: ; 101b2b + callba Function100579 + ld hl, $cd29 + set 2, [hl] + ld a, [$cd26] + bit 7, a + ret z + call Function1013dd + ld a, $0 + ld [$cd26], a + ld a, [$cfa9] + cp $1 + jr z, .asm_101b51 + ld a, $2 + ld [$cd2b], a + ret + +.asm_101b51 + ld a, [$cd25] + inc a + ld [$cd25], a + ret +; 101b59 + +Function101b59: ; 101b59 + ld c, $2 + call Function10142c + ld e, $2 + call Function101ee4 + ld hl, $cd29 + set 5, [hl] + ld a, [$cd25] + inc a + ld [$cd25], a + ret +; 101b70 + +Function101b70: ; 101b70 + ld c, $2 + call Function10142c + ld e, $4 + call Function101ee4 + ld hl, $cd29 + set 5, [hl] + call Function1ad2 + ld a, [$cd25] + inc a + ld [$cd25], a + ld a, $0 + ld [$cd26], a + ret +; 101b8f + +Function101b8f: ; 101b8f + callba Function1005c3 + ld hl, $cd29 + set 2, [hl] + ld a, [$cd26] + bit 7, a + ret z + call Function1013dd + ld a, $0 + ld [$cd26], a + ld a, [$cfa9] + cp $1 + jr z, .asm_101bbc + ld a, $1 + ld [$cd2f], a + ld a, [$cd25] + inc a + ld [$cd25], a + ret + +.asm_101bbc + xor a + ld [$cd2f], a + ld a, [$cd25] + inc a + ld [$cd25], a + ret +; 101bc8 + +Function101bc8: ; 101bc8 + ld c, $2 + call Function10142c + ld e, $8 + call Function101ee4 + call Function102048 + call Function1013dd + ld a, $0 + ld [$cd26], a + ld a, [$cd25] + inc a + ld [$cd25], a + ret +; 101be5 + +Function101be5: ; 101be5 + callba Function100579 + ld hl, $cd29 + set 2, [hl] + ld a, [$cd26] + bit 7, a + ret z + call Function1013dd + ld a, $0 + ld [$cd26], a + ld a, [$cfa9] + cp $1 + jr nz, .asm_101c0b + ld a, $2a + ld [$cd25], a + ret + +.asm_101c0b + ld a, $2 + ld [$cd2b], a + ret +; 101c11 + +Function101c11: ; 101c11 + ld a, $1 + ld [$dc5f], a + ld e, $9 + call Function101ee4 + call Function102048 + ld hl, $cd29 + set 5, [hl] + ld a, [$cd25] + inc a + ld [$cd25], a + ret +; 101c2b + +Function101c2b: ; 101c2b + ld a, $2 + ld [$dc5f], a + ld e, $7 + call Function101ee4 + ld hl, $cd29 + set 5, [hl] + ld a, [$cd25] + inc a + ld [$cd25], a + ret +; 101c42 + +Function101c42: ; 101c42 + ld hl, $cd2a + set 1, [hl] + call Function100665 + ld a, $47 + ld [$cd25], a + ret +; 101c50 + +Function101c50: ; 101c50 + ld e, $a + call Function101ee4 + ld hl, $cd29 + set 2, [hl] + ld a, [$cd25] + inc a + ld [$cd25], a + ret +; 101c62 + +Function101c62: ; 101c62 + callba Function115d99 + ld hl, $cd29 + set 7, [hl] + ld c, $1 + call Function10142c + xor a + ld [$c30d], a + ld hl, $cd29 + res 4, [hl] + ld e, $b + call Function101ee4 + ld hl, $cd29 + set 5, [hl] + ld a, [$cd25] + inc a + ld [$cd25], a + ld a, $0 + ld [$cd26], a + ret +; 101c92 + +Function101c92: ; 101c92 + callba Function100675 + ld a, [$cd25] + inc a + ld [$cd25], a + ret +; 101ca0 + +Function101ca0: ; 101ca0 + ld c, $2 + call Function10142c + ld e, $c + call Function101ee4 + ld hl, $cd29 + set 5, [hl] + ld a, [$cd25] + inc a + ld [$cd25], a + ld a, $0 + ld [$cd26], a + ret +; 101cbc + +Function101cbc: ; 101cbc + ld a, $1 + ld [$cd2b], a + ret +; 101cc2 + +INCBIN "baserom.gbc", $101cc2, $101cc8 - $101cc2 + +Function101cc8: ; 101cc8 + ld a, $1 + ld [$c314], a + ld a, $1 + ld [$c30d], a + ld hl, $cd29 + set 4, [hl] + ld a, [$cd25] + inc a + ld [$cd25], a + ret +; 101cdf + +Function101cdf: ; 101cdf + ld a, $6 + ld [$c314], a + ld a, $1 + ld [$c30d], a + ld hl, $cd29 + set 4, [hl] + ld a, [$cd25] + inc a + ld [$cd25], a + ret +; 101cf6 + +Function101cf6: ; 101cf6 + ld a, $b + ld [$c315], a + ld a, [$cd25] + inc a + ld [$cd25], a + ret +; 101d03 + +Function101d03: ; 101d03 + ld a, $e + ld [$c315], a + ld a, [$cd25] + inc a + ld [$cd25], a + ret +; 101d10 + +Function101d10: ; 101d10 + ld c, $1 + call Function10142c + ld a, [$cd25] + inc a + ld [$cd25], a + jr Function101d2a + +Function101d1e: ; 101d1e + ld c, $3 + call Function10142c + ld a, [$cd25] + inc a + ld [$cd25], a + +Function101d2a: ; 101d2a + call Function101418 + ret c + ld hl, $cd29 + set 6, [hl] + ld a, [$cd26] + ld hl, Jumptable_101d4d + rst JumpTable + ld a, [$cd26] + bit 7, a + ret z + ld a, $0 + ld [$cd26], a + ld a, [$cd25] + inc a + ld [$cd25], a + ret +; 101d4d + +Jumptable_101d4d: ; 101d4d + dw Function101d51 + dw Function101d5d +; 101d51 + +Function101d51: ; 101d51 + ld a, $3c + ld [$cd42], a + ld a, [$cd26] + inc a + ld [$cd26], a + +Function101d5d: ; 101d5d + ld hl, $cd42 + dec [hl] + ret nz + ld a, [$cd26] + set 7, a + ld [$cd26], a + ret +; 101d6b + +Function101d6b: ; 101d6b + ld a, [$c30d] + and a + ret nz + ld hl, $cd29 + res 4, [hl] + ld a, $64 + ld [$cd25], a + ret +; 101d7b + +Function101d7b: ; 101d7b + callba Function10138b + ld b, $0 + ld hl, $5d8d + add hl, bc + ld c, [hl] + ld a, c + ld [$cd25], a + ret +; 101d8d + +INCBIN "baserom.gbc", $101d8d, $101d95 - $101d8d + +Function101d95: ; 101d95 + call Function101ee2 + call Function1d6e + ld e, $e + call Function101ee4 + ld hl, $cd29 + set 5, [hl] + ld a, [$cd25] + inc a + ld [$cd25], a + ld a, $0 + ld [$cd26], a + ret +; 101db2 + +Function101db2: ; 101db2 + callba Function103302 + call Function1c07 + ld hl, $cd29 + set 5, [hl] + jr c, .asm_101dca + ld a, [$cd25] + inc a + ld [$cd25], a + ret + +.asm_101dca + ld a, $2 + ld [$cd2b], a + ret +; 101dd0 + +Function101dd0: ; 101dd0 + ld hl, $dc41 + bit 1, [hl] + jr nz, .asm_101ddd + ld a, $19 + ld [$cd25], a + ret + +.asm_101ddd + ld a, $1b + ld [$cd25], a + ret +; 101de3 + +Function101de3: ; 101de3 + call Function101ecc + call Function101ead + jr c, .asm_101df3 + ld a, [$cd25] + inc a + ld [$cd25], a + ret + +.asm_101df3 + call Function101e98 + jr c, .asm_101e00 + ld a, [$cd25] + inc a + ld [$cd25], a + ret + +.asm_101e00 + call Function101ed3 + ld a, $2 + ld [$cd2b], a + ret +; 101e09 + +Function101e09: ; 101e09 + call Function101ead + jr c, .asm_101e16 + ld a, [$cd25] + inc a + ld [$cd25], a + ret + +.asm_101e16 + call Function101ecc + call Function101e98 + push af + call Function101ed3 + pop af + jr c, .asm_101e2b + ld a, [$cd25] + inc a + ld [$cd25], a + ret + +.asm_101e2b + ld a, $2 + ld [$cd2b], a + ret +; 101e31 + +Function101e31: ; 101e31 + ld a, $3a + ld [$cd25], a + jp Function101c2b +; 101e39 + +Function101e39: ; 101e39 + call Function1020bf + push af + call Function101ed3 + pop af + jr c, .asm_101e49 + ld a, $2a + ld [$cd25], a + ret + +.asm_101e49 + ld a, $2 + ld [$cd2b], a + ret +; 101e4f + +Function101e4f: ; 101e4f + ld e, $6 + call Function101ee4 + call Function1013d6 + ld a, [$cd25] + inc a + ld [$cd25], a + ld a, $0 + ld [$cd26], a + ret +; 101e64 + +Function101e64: ; 101e64 + call Function101ecc + call Function1020a8 + push af + call Function101ed3 + pop af + jr c, .asm_101e77 + ld a, $24 + ld [$cd25], a + ret + +.asm_101e77 + ld hl, $cd29 + set 5, [hl] + ld a, $2 + ld [$cd2b], a + ret +; 101e82 + +INCBIN "baserom.gbc", $101e82, $101e98 - $101e82 + +Function101e98: ; 101e98 + call ClearSprites + callba Function8adb3 + ret c + ld hl, GameTimerPause + set 7, [hl] + ld hl, $dc41 + set 4, [hl] + ret +; 101ead + +Function101ead: ; 101ead + ld hl, GameTimerPause + bit 7, [hl] + jr nz, .asm_101ec8 + ld hl, $dc41 + bit 2, [hl] + jr z, .asm_101eca + ld a, [$cd2f] + and a + jr nz, .asm_101ec8 + ld hl, $dc41 + bit 1, [hl] + jr z, .asm_101eca + +.asm_101ec8 + xor a + ret + +.asm_101eca + scf + ret +; 101ecc + +Function101ecc: ; 101ecc + call Function101ee2 + call FadeToMenu + ret +; 101ed3 + +Function101ed3: ; 101ed3 + call Function1013aa + callba Function115d99 + ld hl, $cd29 + set 7, [hl] + ret +; 101ee2 + +Function101ee2: ; 101ee2 + ld e, $0 Function101ee4: ; 101ee4 ld d, $0 @@ -103319,7 +105039,76 @@ Function10202c: ; 10202c ret ; 102048 -INCBIN "baserom.gbc",$102048,$10209c - $102048 +Function102048: ; 102048 + call Function10204c + ret +; 10204c + +Function10204c: ; 10204c + ld hl, $c4cb + ld c, $10 + ld de, $cd53 +.asm_102054 + ld a, [de] + inc de + and a + jr z, .asm_102067 + sub $30 + jr c, .asm_102067 + cp $a + jr nc, .asm_102067 + add $f6 + ld [hli], a + dec c + jr nz, .asm_102054 + +.asm_102067 + ret +; 102068 + +Function102068: ; 102068 + ld hl, $cd53 + ld c, $8 +.asm_10206d + ld a, [de] + call Function102080 + jr c, .asm_10207f + ld a, [de] + swap a + call Function102080 + jr c, .asm_10207f + inc de + dec c + jr nz, .asm_10206d + +.asm_10207f + ret +; 102080 + +Function102080: ; 102080 + and $f + cp $f + jr z, .asm_10208a + add $30 + ld [hli], a + ret + +.asm_10208a + ld [hl], $0 + scf + ret +; 10208e + +Function10208e: ; 10208e + push de + ld h, d + ld l, e + ld de, $dc42 + ld bc, $0008 + call CopyBytes + pop de + ret +; 10209c Function10209c: ; 10209c ld a, $ff @@ -103329,7 +105118,42 @@ Function10209c: ; 10209c ret ; 1020a8 -INCBIN "baserom.gbc",$1020a8,$1020ea - $1020a8 +Function1020a8: ; 1020a8 + call Function10209c + ld c, $1 + ld de, $dc42 + callba Function17a68f + ret c + call Function10208e + call Function102068 + xor a + ret +; 1020bf + +Function1020bf: ; 1020bf + call ClearSprites + callba Function8aba9 + ld a, c + and a + jr z, .asm_1020e8 + dec a + ld hl, $a04c + ld bc, $0025 + call AddNTimes + ld d, h + ld e, l + ld a, $4 + call GetSRAMBank + call Function10208e + call Function102068 + call CloseSRAM + xor a + ret + +.asm_1020e8 + scf + ret +; 1020ea Function1020ea: ; 1020ea ld hl, $dc41 @@ -103471,7 +105295,2384 @@ Function1021e0: ; 1021e0 ret ; 1021ea -INCBIN "baserom.gbc",$1021ea,$103612 - $1021ea +INCBIN "baserom.gbc", $1021ea, $1021f9 - $1021ea + +Function1021f9: ; 1021f9 + call Function102233 + ld a, $0 + ld [$cd49], a + ld hl, $cd29 + bit 3, [hl] + res 3, [hl] + jr z, .asm_10220f + ld a, $1 + ld [$cd49], a + +.asm_10220f + call Function1022ca + ld a, [$cd49] + ld hl, Jumptable_1022f5 + rst JumpTable + call Function102241 + call Function1022d0 + jr c, .asm_102231 + ld a, [$cd49] + bit 7, a + jr z, .asm_10220f + xor a + ld hl, $cd29 + bit 3, [hl] + ret z + scf + ret + +.asm_102231 + xor a + ret +; 102233 + +Function102233: ; 102233 + ld hl, $cd49 + ld bc, $000a + xor a + call ByteFill + call Function10304f + ret +; 102241 + +Function102241: ; 102241 + call Function10226a + call Function102274 + call Function10224b + ret +; 10224b + +Function10224b: ; 10224b + ld hl, $cd4b + bit 1, [hl] + jr nz, .asm_10225e + bit 2, [hl] + jr nz, .asm_10225e + call DelayFrame + call DelayFrame + xor a + ret + +.asm_10225e + res 1, [hl] + res 2, [hl] + callba Function104099 + scf + ret +; 10226a + +Function10226a: ; 10226a + ld hl, $cd4b + bit 0, [hl] + ret z + call Function10305d + ret +; 102274 + +Function102274: ; 102274 + ld hl, $cd4b + bit 3, [hl] + ret z + res 3, [hl] + ld de, $0008 + call PlaySFX + ret +; 102283 + +Function102283: ; 102283 + ld a, $1 + ld [AttrMapEnd], a + ld hl, $cd4b + set 0, [hl] + ret +; 10228e + +Function10228e: ; 10228e + xor a + ld [AttrMapEnd], a + ld hl, $cd4b + res 0, [hl] + ret +; 102298 + +Function102298: ; 102298 + ld a, e + cp $2 + ret nz + ld hl, $cd4b + bit 6, [hl] + jr z, .asm_1022b6 + ld hl, $cd4b + bit 7, [hl] + ld hl, $cd4b + set 7, [hl] + ret nz + ld de, $0027 + call PlaySFX + jr .asm_1022c1 + +.asm_1022b6 + ld hl, $cd4b + bit 7, [hl] + ld hl, $cd4b + res 7, [hl] + ret z + +.asm_1022c1 + call Function10304f + ld a, $1 + ld [AttrMapEnd], a + ret +; 1022ca + +Function1022ca: ; 1022ca + ld a, $1e + ld [OverworldDelay], a + ret +; 1022d0 + +Function1022d0: ; 1022d0 + callba Function10032e + ld a, [$cd2b] + and a + jr nz, .asm_1022f3 + call Function102298 + ld a, [OverworldDelay] + ld c, a + ld a, $1e + sub c + ld c, a + ld b, $3 + callba Function10062d + jr c, .asm_1022f3 + xor a + ret + +.asm_1022f3 + scf + ret +; 1022f5 + +Jumptable_1022f5: ; 1022f5 + dw Function10234b + dw Function102361 + dw Function10236e + dw Function102387 + dw Function1023a1 + dw Function1025c7 + dw Function1025dc + dw Function1024f6 + dw Function10250c + dw Function1024a8 + dw Function102591 + dw Function1024a8 + dw Function1025b0 + dw Function1025bd + dw Function102814 + dw Function10283c + dw Function102862 + dw Function10286f + dw Function1024a8 + dw Function1028a5 + dw Function1028ab + dw Function1023b5 + dw Function1023c6 + dw Function1024af + dw Function102416 + dw Function102423 + dw Function10244b + dw Function1024af + dw Function10246a + dw Function102652 + dw Function10266b + dw Function1025e9 + dw Function1025ff + dw Function102738 + dw Function102754 + dw Function1026b7 + dw Function1026c8 + dw Function1028bf + dw Function1028c6 + dw Function1028d3 + dw Function1028da + dw Function1024a8 + dw Function10248d +; 10234b + +Function10234b: ; 10234b + call Function102d9a + call Function102dd3 + call Function102dec + ld hl, $cd4b + set 1, [hl] + ld a, [$cd49] + inc a + ld [$cd49], a + ret +; 102361 + +Function102361: ; 102361 + ld a, $cc + call Function1028e8 + ld a, [$cd49] + inc a + ld [$cd49], a + ret +; 10236e + +Function10236e: ; 10236e + call Function1028fc + ret nc + ld a, [$cd51] + cp $cc + jr z, .asm_10237f + ld a, $f2 + ld [$cd2b], a + ret + +.asm_10237f + ld a, [$cd49] + inc a + ld [$cd49], a + ret +; 102387 + +Function102387: ; 102387 + ld hl, $cd4b + set 6, [hl] + xor a + ld [$dc5f], a + ld de, MUSIC_ROUTE_30 + call PlayMusic + call Function102d9a + call Function102dd3 + ld a, $1 + ld [$cfa9], a + +Function1023a1: ; 1023a1 + call Function102283 + call Function102db7 + call Function102dec + ld hl, $cd4b + set 1, [hl] + ld a, $1d + ld [$cd49], a + ret +; 1023b5 + +Function1023b5: ; 1023b5 + call Function10228e + call Function102a3b + call Function102b12 + ld a, [$cd49] + inc a + ld [$cd49], a + ret +; 1023c6 + +Function1023c6: ; 1023c6 + call Function102c48 + call Function102c87 + ld a, [$cd4c] + dec a + ld [CurPartyMon], a + xor a + ld [$d10b], a + callba Functione039 + ld hl, PartyCount + inc [hl] + ld a, [hli] + ld c, a + ld b, $0 + add hl, bc + ld [hl], $ff + ld a, [PartyCount] + ld [$cd4c], a + call Function102c07 + call Function102d48 + call Function102b32 + call Function102f50 + ld hl, $cd4b + set 1, [hl] + ld a, $14 + ld [$cd4e], a + ld a, $0 + ld [$cd4f], a + ld a, $0 + ld [$cd4a], a + ld a, [$cd49] + inc a + ld [$cd49], a + ret +; 102416 + +Function102416: ; 102416 + ld a, $aa + call Function1028e8 + ld a, [$cd49] + inc a + ld [$cd49], a + ret +; 102423 + +Function102423: ; 102423 + call Function102921 + ret nc + callba Function14a58 + callba Function1060af + callba Function106187 + ld hl, $cd4b + set 1, [hl] + ld a, $0 + ld [$cd4a], a + ld a, [$cd49] + inc a + ld [$cd49], a + ret +; 10244b + +Function10244b: ; 10244b + call Function102f32 + ld hl, $cd4b + set 1, [hl] + ld a, $19 + ld [$cd4e], a + ld a, $0 + ld [$cd4f], a + ld a, $0 + ld [$cd4a], a + ld a, [$cd49] + inc a + ld [$cd49], a + ret +; 10246a + +Function10246a: ; 10246a + call Function102d9a + ld hl, $cd29 + set 3, [hl] + call Function102e07 + ld hl, $cd4b + set 1, [hl] + ld a, $2a + ld [$cd49], a + ret +; 102480 + +INCBIN "baserom.gbc", $102480, $10248d - $102480 + +Function10248d: ; 10248d + ld a, [$cd49] + set 7, a + ld [$cd49], a + ret +; 102496 + +INCBIN "baserom.gbc", $102496, $1024a8 - $102496 + +Function1024a8: ; 1024a8 + callba Function1009f3 + ret c + +Function1024af: ; 1024af + call GetJoypad + ld a, [$cd4a] + ld hl, Jumptable_1024ba + rst JumpTable + ret +; 1024ba + +Jumptable_1024ba: ; 1024ba + dw Function1024c0 + dw Function1024cb + dw Function1024de +; 1024c0 + +Function1024c0: ; 1024c0 + ld hl, $cd4e + inc [hl] + ld a, [$cd4a] + inc a + ld [$cd4a], a + +Function1024cb: ; 1024cb + ld hl, $cd4e + dec [hl] + ret nz + ld a, [$cd4f] + inc a + ld [$cd4e], a + ld a, [$cd4a] + inc a + ld [$cd4a], a + +Function1024de: ; 1024de + ld hl, $cd4e + dec [hl] + jr z, .asm_1024e9 + ld a, [hJoyPressed] + and $3 + ret z + +.asm_1024e9 + ld a, $0 + ld [$cd4a], a + ld a, [$cd49] + inc a + ld [$cd49], a + ret +; 1024f6 + +Function1024f6: ; 1024f6 + call Function1bee + ld hl, $cd4b + set 1, [hl] + ld a, [$cd4c] + call Function1028e8 + ld a, [$cd49] + inc a + ld [$cd49], a + ret +; 10250c + +Function10250c: ; 10250c + call Function1028fc + ret nc + ld a, [$cd51] + cp $f + jr z, .asm_10254b + and a + jr z, .asm_102572 + cp $aa + jr z, .asm_102572 + cp $7 + jr nc, .asm_102572 + ld [$cd4d], a + dec a + ld [$d003], a + ld a, [$cd4c] + dec a + ld [DefaultFlypoint], a + call Function102b9c + call Function102bdc + jr c, .asm_10256d + callba Functionfb5dd + jr c, .asm_102568 + ld hl, $cd4b + set 1, [hl] + ld a, $e + ld [$cd49], a + ret + +.asm_10254b + call Function103021 + ld hl, $cd4b + set 1, [hl] + ld a, $0 + ld [$cd4a], a + ld a, $1e + ld [$cd4e], a + ld a, $1e + ld [$cd4f], a + ld a, $29 + ld [$cd49], a + ret + +.asm_102568 + call Function102ff5 + jr .asm_102577 + +.asm_10256d + call Function102f85 + jr .asm_102577 + +.asm_102572 + call Function102fce + jr .asm_102577 + +.asm_102577 + ld hl, $cd4b + set 1, [hl] + ld a, $0 + ld [$cd4a], a + ld a, $1e + ld [$cd4e], a + ld a, $3c + ld [$cd4f], a + ld a, $9 + ld [$cd49], a + ret +; 102591 + +Function102591: ; 102591 + call Function102ee7 + ld hl, $cd4b + set 1, [hl] + ld a, $0 + ld [$cd4a], a + ld a, $1e + ld [$cd4e], a + ld a, $3c + ld [$cd4f], a + ld a, [$cd49] + inc a + ld [$cd49], a + ret +; 1025b0 + +Function1025b0: ; 1025b0 + ld a, $9 + call Function1028e8 + ld a, [$cd49] + inc a + ld [$cd49], a + ret +; 1025bd + +Function1025bd: ; 1025bd + call Function1028fc + ret nc + ld a, $4 + ld [$cd49], a + ret +; 1025c7 + +Function1025c7: ; 1025c7 + call Function102f6d + ld hl, $cd4b + set 1, [hl] + ld a, $f + call Function1028e8 + ld a, [$cd49] + inc a + ld [$cd49], a + ret +; 1025dc + +Function1025dc: ; 1025dc + call Function1028fc + ret nc + ld a, [$cd49] + set 7, a + ld [$cd49], a + ret +; 1025e9 + +Function1025e9: ; 1025e9 + nop + ld hl, $cd4b + set 6, [hl] + call Function102b4e + ld hl, $cd4b + set 1, [hl] + ld a, [$cd49] + inc a + ld [$cd49], a + ret +; 1025ff + +Function1025ff: ; 1025ff + ld hl, $cd4b + set 2, [hl] + callba Function1009f3 + ret c + callba Function241ba + ld a, [$cfa8] + and c + ret z + bit 0, c + jr nz, .asm_102623 + bit 6, c + jr nz, .asm_10262e + bit 7, c + jr nz, .asm_102646 + ret + +.asm_102623 + ld hl, $cd4b + set 3, [hl] + ld a, $27 + ld [$cd49], a + ret + +.asm_10262e + ld a, [$cfa9] + ld b, a + ld a, [OTPartyCount] + cp b + ret nz + call Function1bf7 + ld a, [PartyCount] + ld [$cfa9], a + ld a, $1d + ld [$cd49], a + ret + +.asm_102646 + ld a, [$cfa9] + cp $1 + ret nz + ld a, $23 + ld [$cd49], a + ret +; 102652 + +Function102652: ; 102652 + nop + ld hl, $cd4b + set 6, [hl] + nop + call Function102b7b + nop + ld hl, $cd4b + set 1, [hl] + nop + ld a, [$cd49] + inc a + ld [$cd49], a + ret +; 10266b + +Function10266b: ; 10266b + ld hl, $cd4b + set 2, [hl] + callba Function1009f3 + ret c + callba Function241ba + ld a, [$cfa8] + and c + ret z + bit 0, c + jr nz, .asm_10268f + bit 7, c + jr nz, .asm_10269a + bit 6, c + jr nz, .asm_1026a8 + ret + +.asm_10268f + ld hl, $cd4b + set 3, [hl] + ld a, $21 + ld [$cd49], a + ret + +.asm_10269a + ld a, [$cfa9] + dec a + ret nz + call Function1bf7 + ld a, $1f + ld [$cd49], a + ret + +.asm_1026a8 + ld a, [$cfa9] + ld b, a + ld a, [PartyCount] + cp b + ret nz + ld a, $23 + ld [$cd49], a + ret +; 1026b7 + +Function1026b7: ; 1026b7 + ld hl, $cd4b + set 6, [hl] + ld a, [$cd49] + inc a + ld [$cd49], a + ld a, $0 + ld [$cd4a], a + +Function1026c8: ; 1026c8 + call GetJoypad + callba Function1009f3 + ret c + ld a, [$cd4a] + ld hl, Jumptable_1026da + rst JumpTable + ret +; 1026da + +Jumptable_1026da: ; 1026da + dw Function1026de + dw Function1026f3 +; 1026de + +Function1026de: ; 1026de + call Function1bf7 + ld hl, $c5fd + ld [hl], $ed + ld a, [$cd4a] + inc a + ld [$cd4a], a + ld hl, $cd4b + set 1, [hl] + ret +; 1026f3 + +Function1026f3: ; 1026f3 + ld a, [hJoyPressed] + bit 0, a + jr nz, .asm_102723 + bit 6, a + jr nz, .asm_102712 + bit 7, a + jr nz, .asm_102702 + ret + +.asm_102702 + ld hl, $c5fd + ld [hl], $7f + ld a, $1 + ld [$cfa9], a + ld a, $1d + ld [$cd49], a + ret + +.asm_102712 + ld hl, $c5fd + ld [hl], $7f + ld a, [OTPartyCount] + ld [$cfa9], a + ld a, $1f + ld [$cd49], a + ret + +.asm_102723 + ld hl, $c5fd + ld [hl], $ec + ld hl, $cd4b + set 3, [hl] + ld hl, $cd4b + set 2, [hl] + ld a, $5 + ld [$cd49], a + ret +; 102738 + +Function102738: ; 102738 + ld hl, $cd4b + set 6, [hl] + call Function1bee + call Function1027eb + ld hl, $cd4b + set 1, [hl] + ld a, [$cd49] + inc a + ld [$cd49], a + ld a, $0 + ld [$cd4a], a + +Function102754: ; 102754 + call GetJoypad + callba Function1009f3 + ret c + ld a, [$cd4a] + ld hl, Jumptable_102766 + rst JumpTable + ret +; 102766 + +Jumptable_102766: ; 102766 + dw Function102770 + dw Function102775 + dw Function10278c + dw Function1027a0 + dw Function1027b7 +; 102770 + +Function102770: ; 102770 + ld a, $1 + ld [$cd4a], a + +Function102775: ; 102775 + ld hl, $c5e1 + ld [hl], $ed + ld hl, $c5eb + ld [hl], $7f + ld hl, $cd4b + set 2, [hl] + ld a, [$cd4a] + inc a + ld [$cd4a], a + ret +; 10278c + +Function10278c: ; 10278c + ld a, [hJoyPressed] + bit 0, a + jr nz, asm_1027c6 + bit 1, a + jr nz, asm_1027e2 + bit 4, a + jr nz, .asm_10279b + ret + +.asm_10279b + ld a, $3 + ld [$cd4a], a + +Function1027a0: ; 1027a0 + ld hl, $c5e1 + ld [hl], $7f + ld hl, $c5eb + ld [hl], $ed + ld hl, $cd4b + set 2, [hl] + ld a, [$cd4a] + inc a + ld [$cd4a], a + ret + +Function1027b7: ; 1027b7 + ld a, [hJoyPressed] + bit 0, a + jr nz, asm_1027d1 + bit 1, a + jr nz, asm_1027e2 + bit 5, a + jr nz, Function102770 + ret + +asm_1027c6: + ld hl, $cd4b + set 3, [hl] + ld a, $25 + ld [$cd49], a + ret + +asm_1027d1: + ld hl, $cd4b + set 3, [hl] + ld a, [$cfa9] + ld [$cd4c], a + ld a, $7 + ld [$cd49], a + ret + +asm_1027e2: + call Function102db7 + ld a, $1d + ld [$cd49], a + ret +; 1027eb + +Function1027eb: ; 1027eb + ld hl, $c5b8 + ld b, $2 + ld c, $12 + ld d, h + ld e, l + callba Function16d61d + ld de, $6804 + ld hl, $c5e2 + call PlaceString + ret +; 102804 + +INCBIN "baserom.gbc", $102804, $102814 - $102804 + +Function102814: ; 102814 + ld a, [$cfa9] + ld [$cd52], a + ld a, [$cd4c] + dec a + ld [DefaultFlypoint], a + ld a, [$cd4d] + dec a + ld [$d003], a + call Function102ea8 + ld a, [$cd49] + inc a + ld [$cd49], a + ld a, $0 + ld [$cd4a], a + ld hl, $cd4b + set 1, [hl] + +Function10283c: ; 10283c + ld hl, $cd4b + set 2, [hl] + call Function1029c3 + ret z + jr c, .asm_102852 + ld a, $10 + ld [$cd49], a + ld hl, $cd4b + set 1, [hl] + ret + +.asm_102852 + ld a, $14 + ld [$cd49], a + ld hl, $cd4b + set 3, [hl] + ld hl, $cd4b + set 1, [hl] + ret +; 102862 + +Function102862: ; 102862 + ld a, $8 + call Function1028e8 + ld a, [$cd49] + inc a + ld [$cd49], a + ret +; 10286f + +Function10286f: ; 10286f + call Function1028fc + ret nc + ld a, [$cd52] + ld [$cfa9], a + ld a, [$cd51] + cp $8 + jr nz, .asm_102886 + ld a, $15 + ld [$cd49], a + ret + +.asm_102886 + call Function102ee7 + ld hl, $cd4b + set 1, [hl] + ld a, $1e + ld [$cd4e], a + ld a, $3c + ld [$cd4f], a + ld a, $0 + ld [$cd4a], a + ld a, [$cd49] + inc a + ld [$cd49], a + ret +; 1028a5 + +Function1028a5: ; 1028a5 + ld a, $4 + ld [$cd49], a + ret +; 1028ab + +Function1028ab: ; 1028ab + ld a, [$cd52] + ld [$cfa9], a + call Function102f15 + ld hl, $cd4b + set 1, [hl] + ld a, $c + ld [$cd49], a + ret +; 1028bf + +Function1028bf: ; 1028bf + ld a, [$cd49] + inc a + ld [$cd49], a + +Function1028c6: ; 1028c6 + xor a + ld [MonType], a + call Function102bac + ld a, $1d + ld [$cd49], a + ret +; 1028d3 + +Function1028d3: ; 1028d3 + ld a, [$cd49] + inc a + ld [$cd49], a + +Function1028da: ; 1028da + ld a, $1 + ld [MonType], a + call Function102bac + ld a, $1f + ld [$cd49], a + ret +; 1028e8 + +Function1028e8: ; 1028e8 + ld hl, $cd4b + res 6, [hl] + ld [$cd50], a + callba Function100641 + ld a, $0 + ld [$cd4a], a + ret +; 1028fc + +Function1028fc: ; 1028fc + call GetJoypad + callba Function1009f3 + jr nc, .asm_102909 + and a + ret + +.asm_102909 + ld a, [$cd4a] + ld hl, Jumptable_102917 + rst JumpTable + ret nc + ld a, $0 + ld [$cd4a], a + ret +; 102917 + +Jumptable_102917: ; 102917 + dw Function102933 + dw Function10294f + dw Function10295d + dw Function10296e + dw Function102996 +; 102921 + +Function102921: ; 102921 + ld a, [$cd4a] + ld hl, Jumptable_10292f + rst JumpTable + ret nc + ld a, $0 + ld [$cd4a], a + ret +; 10292f + +Jumptable_10292f: ; 10292f + dw Function10295d + dw Function102984 +; 102933 + +Function102933: ; 102933 + ld hl, $69bb + call LoadMenuDataHeader + call Function102e07 + ld a, $32 + ld [TextDelayFrames], a + ld hl, $cd4b + set 1, [hl] + ld a, [$cd4a] + inc a + ld [$cd4a], a + and a + ret +; 10294f + +Function10294f: ; 10294f + ld a, [TextDelayFrames] + and a + ret nz + ld a, [$cd4a] + inc a + ld [$cd4a], a + and a + ret +; 10295d + +Function10295d: ; 10295d + call Function10299e + ld a, $0 + ld [$cd27], a + ld a, [$cd4a] + inc a + ld [$cd4a], a + and a + ret +; 10296e + +Function10296e: ; 10296e + callba Function100382 + and a + ld a, [$cd27] + bit 7, a + ret z + ld a, [$cd4a] + inc a + ld [$cd4a], a + and a + ret +; 102984 + +Function102984: ; 102984 + callba Function100382 + and a + ld a, [$cd27] + bit 7, a + ret z + call Function1029af + scf + ret +; 102996 + +Function102996: ; 102996 + call Function1029af + call Function1c07 + scf + ret +; 10299e + +Function10299e: ; 10299e + ld a, $1 + ld [$ccb4], a + ld a, [$cd50] + ld [$ccb5], a + ld a, $aa + ld [$cd51], a + ret +; 1029af + +Function1029af: ; 1029af + ld hl, $cd4b + res 7, [hl] + ld a, [$cc61] + ld [$cd51], a + ret +; 1029bb + +INCBIN "baserom.gbc", $1029bb, $1029c3 - $1029bb + +Function1029c3: ; 1029c3 + ld a, [$cd4a] + ld hl, Jumptable_1029cb + rst JumpTable + ret +; 1029cb + +Jumptable_1029cb: ; 1029cb + dw Function1029cf + dw Function1029fe +; 1029cf + +Function1029cf: ; 1029cf + call Function1d6e + ld hl, $c536 + ld b, $3 + ld c, $8 + ld d, h + ld e, l + callba Function16d61d + ld de, $6a26 + ld hl, $c54c + call PlaceString + ld hl, $cd4b + set 1, [hl] + ld de, $6a33 + call Function1bb1 + ld a, [$cd4a] + inc a + ld [$cd4a], a + xor a + ret +; 1029fe + +Function1029fe: ; 1029fe + callba Function1009f3 + ret c + callba Function241ba + ld a, c + ld hl, $cfa8 + and [hl] + ret z + push af + call Function1c07 + pop af + ld a, [$cfa9] + cp $1 + jr nz, .asm_102a21 + ld a, $1 + and a + ret + +.asm_102a21 + ld a, $1 + and a + scf + ret +; 102a26 + +INCBIN "baserom.gbc", $102a26, $102a3b - $102a26 + +Function102a3b: ; 102a3b + ld a, [$cd30] + ld [$c74e], a + ld hl, PlayerName + ld de, $c6e7 + ld bc, $000b + call CopyBytes + ld a, [$cd4c] + dec a + ld c, a + ld b, $0 + ld hl, PartySpecies + add hl, bc + ld a, [hl] + ld [$c6d0], a + ld a, [$cd4c] + dec a + ld hl, PartyMonOT + call SkipNames + ld de, $c6f2 + ld bc, $000b + call CopyBytes + ld a, [$cd4c] + dec a + ld hl, PartyMon1ID + call GetPartyLocation + ld a, [hli] + ld [$c6ff], a + ld a, [hl] + ld [$c700], a + ld a, [$cd4c] + dec a + ld hl, PartyMon1DVs + call GetPartyLocation + ld a, [hli] + ld [$c6fd], a + ld a, [hl] + ld [$c6fe], a + ld a, [$cd4c] + dec a + ld hl, PartyMon1Species + call GetPartyLocation + ld b, h + ld c, l + callba GetCaughtGender + ld a, c + ld [$c701], a + ld hl, $d26b + ld de, $c719 + ld bc, $000b + call CopyBytes + ld a, [$cd4d] + dec a + ld c, a + ld b, $0 + ld hl, OTPartySpecies + add hl, bc + ld a, [hl] + ld [$c702], a + ld a, [$cd4d] + dec a + ld hl, OTPartyMonOT + call SkipNames + ld de, $c724 + ld bc, $000b + call CopyBytes + ld a, [$cd4d] + dec a + ld hl, OTPartyMon1ID + call GetPartyLocation + ld a, [hli] + ld [$c731], a + ld a, [hl] + ld [$c732], a + ld a, [$cd4d] + dec a + ld hl, OTPartyMon1DVs + call GetPartyLocation + ld a, [hli] + ld [$c72f], a + ld a, [hl] + ld [$c730], a + ld a, [$cd4d] + dec a + ld hl, OTPartyMon1Species + call GetPartyLocation + ld b, h + ld c, l + callba GetCaughtGender + ld a, c + ld [$c733], a + ret +; 102b12 + +Function102b12: ; 102b12 + ld c, $64 + call DelayFrames + call Function102d9a + call Functione58 + ld a, [$cd2f] + and a + jr nz, .asm_102b2b + callba Function108026 + jr .asm_102b31 + +.asm_102b2b + callba Function10802a + +.asm_102b31 + ret +; 102b32 + +Function102b32: ; 102b32 + ld a, [$cd4c] + dec a + ld [CurPartyMon], a + ld a, $1 + ld [$d1e9], a + callba Function421d8 + call Function102d9a + call Function102dd3 + call Function102dec + ret +; 102b4e + +Function102b4e: ; 102b4e + ld a, $1 + ld [MonType], a + ld a, [$cfa9] + push af + ld de, $6b73 + call Function1bb1 + pop af + ld [$cfa9], a + ld a, [OTPartyCount] + ld [$cfa3], a + ret +; 102b68 + +INCBIN "baserom.gbc", $102b68, $102b7b - $102b68 + +Function102b7b: ; 102b7b + xor a + ld [MonType], a + ld a, [$cfa9] + push af + ld de, $6b94 + call Function1bb1 + pop af + ld [$cfa9], a + ld a, [PartyCount] + ld [$cfa3], a + ret +; 102b94 + +INCBIN "baserom.gbc", $102b94, $102b9c - $102b94 + +Function102b9c: ; 102b9c + ld a, [$cd4d] + dec a + ld hl, $c55a + ld bc, $0014 + call AddNTimes + ld [hl], $ec + ret +; 102bac + +Function102bac: ; 102bac + ld a, [$cfa9] + dec a + ld [CurPartyMon], a + call LowVolume + call ClearSprites + callba Function4dc8f + ld a, [CurPartyMon] + inc a + ld [$cfa9], a + call Function102d9a + call ClearPalettes + call DelayFrame + call MaxVolume + call Function102dd3 + call Function102dec + call Function102db7 + ret +; 102bdc + +Function102bdc: ; 102bdc + ld a, [$cd4d] + dec a + ld hl, OTPartyMon1Species + call GetPartyLocation + push hl + ld a, [$cd4d] + ld c, a + ld b, $0 + ld hl, OTPartyCount + add hl, bc + ld a, [hl] + pop hl + cp $fd + jr z, .asm_102bfa + cp [hl] + jr nz, .asm_102c05 + +.asm_102bfa + ld bc, $001f + add hl, bc + ld a, [hl] + cp $65 + jr nc, .asm_102c05 + and a + ret + +.asm_102c05 + scf + ret +; 102c07 + +Function102c07: ; 102c07 + call Function102c14 + call Function102c3b + call Function102c21 + call Function102c2e + ret +; 102c14 + +Function102c14: ; 102c14 + ld hl, PartySpecies + ld de, OTPartySpecies + ld bc, $0001 + call Function102c71 + ret +; 102c21 + +Function102c21: ; 102c21 + ld hl, PartyMonNicknames + ld de, OTPartyMonNicknames + ld bc, $000b + call Function102c71 + ret +; 102c2e + +Function102c2e: ; 102c2e + ld hl, PartyMonOT + ld de, OTPartyMonOT + ld bc, $000b + call Function102c71 + ret +; 102c3b + +Function102c3b: ; 102c3b + ld hl, PartyMon1Species + ld de, OTPartyMon1Species + ld bc, $0030 + call Function102c71 + ret +; 102c48 + +Function102c48: ; 102c48 + callba Function10165a + ld a, $0 + call GetSRAMBank + ld hl, $a600 + ld de, $c608 + ld bc, $002f + call Function102c71 + call CloseSRAM + ld hl, $c608 + ld de, $da00 + ld bc, $01e0 + ld a, $5 + call FarCopyWRAM + ret +; 102c71 + +Function102c71: ; 102c71 + ld a, [$cd4c] + dec a + call AddNTimes + push hl + ld h, d + ld l, e + ld a, [$cd4d] + dec a + call AddNTimes + pop de + call SwapBytes + ret +; 102c87 + +Function102c87: ; 102c87 + ld a, [$cf63] + push af + ld a, [$cf64] + push af + ld a, [$cd4c] + ld [$cf63], a + ld a, [PartyCount] + ld [$cf64], a + ld a, $0 + ld hl, $a600 + ld de, $c608 + ld bc, $011a + call Function102d3e + call Function102cee + ld a, $0 + ld hl, $c608 + ld de, $a600 + ld bc, $011a + call Function102d3e + ld a, [$cd4d] + ld [$cf63], a + ld a, [OTPartyCount] + ld [$cf64], a + ld a, $5 + ld hl, $da00 + ld de, $c608 + ld bc, $011a + call FarCopyWRAM + call Function102cee + ld a, $5 + ld hl, $c608 + ld de, $da00 + ld bc, $011a + call FarCopyWRAM + pop af + ld [$cf64], a + pop af + ld [$cf63], a + ret +; 102cee + +Function102cee: ; 102cee + ld a, [$cf63] + dec a + call Function102d34 + ld de, DefaultFlypoint + ld bc, $002f + call CopyBytes + ld a, [$cf63] + ld c, a + ld a, $6 + sub c + ret z + ld bc, $002f + ld hl, NULL + call AddNTimes + push hl + ld a, [$cf63] + dec a + call Function102d34 + ld d, h + ld e, l + ld hl, $002f + add hl, de + pop bc + call CopyBytes + ld a, [$cf64] + dec a + call Function102d34 + ld d, h + ld e, l + ld hl, DefaultFlypoint + ld bc, $002f + call CopyBytes + ret +; 102d34 + +Function102d34: ; 102d34 + ld hl, $c608 + ld bc, $002f + call AddNTimes + ret +; 102d3e + +Function102d3e: ; 102d3e + call GetSRAMBank + call CopyBytes + call CloseSRAM + ret +; 102d48 + +Function102d48: ; 102d48 + ld a, [$cd4c] + ld e, a + ld d, $0 + ld hl, PartyCount + add hl, de + ld a, [hl] + ld [$d265], a + cp $fd + jr z, .asm_102d6d + dec a + call SetSeenAndCaughtMon + ld a, [$cd4c] + dec a + ld bc, $0030 + ld hl, PartyMon1Happiness + call AddNTimes + ld [hl], $46 + +.asm_102d6d + ld a, [$d265] + cp $c9 + jr nz, .asm_102d98 + ld a, [$cd4c] + dec a + ld bc, $0030 + ld hl, PartyMon1DVs + call AddNTimes + ld a, $2d + call Predef + callba Functionfba18 + ld a, [$def4] + and a + jr nz, .asm_102d98 + ld a, [UnownLetter] + ld [$def4], a + +.asm_102d98 + and a + ret +; 102d9a + +Function102d9a: ; 102d9a + ld a, $7f + ld hl, SpritesEnd + ld bc, $0168 + call ByteFill + ld a, $7 + ld hl, AttrMap + ld bc, $0168 + call ByteFill + callba Function104000 + ret +; 102db7 + +Function102db7: ; 102db7 + call Function102e4f + call Function102e3e + ld hl, $cd4b + set 1, [hl] + ret +; 102dc3 + +Function102dc3: ; 102dc3 + ld hl, $c590 + ld b, $4 + ld c, $12 + ld d, h + ld e, l + callba Function16d61d + ret +; 102dd3 + +Function102dd3: ; 102dd3 + call DisableLCD + ld de, $72a2 + ld hl, VTiles0 + ld bc, $4004 + call Get2bpp + callba Function16d421 + call EnableLCD + ret +; 102dec + +Function102dec: ; 102dec + ld hl, $72e2 + ld de, Unkn2Pals + ld bc, $0020 + ld a, $5 + call FarCopyWRAM + callba Function49742 + call Function32f9 + call DelayFrame + ret +; 102e07 + +Function102e07: ; 102e07 + ld hl, $c56b + ld b, $1 + ld c, $b + ld a, [IsInBattle] + and a + jr z, .asm_102e19 + call TextBox + jr .asm_102e28 + +.asm_102e19 + ld hl, $c56b + ld b, $1 + ld c, $b + ld d, h + ld e, l + callba Function16d61d + +.asm_102e28 + ld de, $6e32 + ld hl, $c580 + call PlaceString + ret +; 102e32 + +INCBIN "baserom.gbc", $102e32, $102e3e - $102e32 + +Function102e3e: ; 102e3e + ld de, $6e48 + ld hl, $c5fe + call PlaceString + ret +; 102e48 + +INCBIN "baserom.gbc", $102e48, $102e4f - $102e48 + +Function102e4f: ; 102e4f + callba Function16d42e + callba Function49797 + ld de, PlayerName + ld hl, $c4a4 + call PlaceString + ld a, $14 + ld [bc], a + ld de, $d26b + ld hl, $c544 + call PlaceString + ld a, $14 + ld [bc], a + ld hl, $c4bb + ld de, PartySpecies + call Function102e86 + ld hl, $c55b + ld de, OTPartySpecies + call Function102e86 + ret +; 102e86 + +Function102e86: ; 102e86 + ld c, $0 +.asm_102e88 + ld a, [de] + cp $ff + ret z + ld [$d265], a + push bc + push hl + push de + push hl + ld a, c + ld [hDividend], a + call GetPokemonName + pop hl + call PlaceString + pop de + inc de + pop hl + ld bc, $0014 + add hl, bc + pop bc + inc c + jr .asm_102e88 +; 102ea8 + +Function102ea8: ; 102ea8 + call Function102dc3 + ld a, [$cd4c] + dec a + ld c, a + ld b, $0 + ld hl, PartySpecies + add hl, bc + ld a, [hl] + ld [$d265], a + call GetPokemonName + ld hl, StringBuffer1 + ld de, StringBuffer2 + ld bc, $000b + call CopyBytes + ld a, [$cd4d] + dec a + ld c, a + ld b, $0 + ld hl, OTPartySpecies + add hl, bc + ld a, [hl] + ld [$d265], a + call GetPokemonName + ld hl, $6ee2 + call PrintTextBoxText + ret +; 102ee2 + +INCBIN "baserom.gbc", $102ee2, $102ee7 - $102ee2 + +Function102ee7: ; 102ee7 + call Function102dc3 + ld de, $6ef4 + ld hl, $c5b9 + call PlaceString + ret +; 102ef4 + +INCBIN "baserom.gbc", $102ef4, $102f15 - $102ef4 + +Function102f15: ; 102f15 + call Function102dc3 + ld de, $6f22 + ld hl, $c5b9 + call PlaceString + ret +; 102f22 + +INCBIN "baserom.gbc", $102f22, $102f32 - $102f22 + +Function102f32: ; 102f32 + call Function102dc3 + ld de, $6f3f + ld hl, $c5b9 + call PlaceString + ret +; 102f3f + +INCBIN "baserom.gbc", $102f3f, $102f50 - $102f3f + +Function102f50: ; 102f50 + call Function102dc3 + ld de, $6f5d + ld hl, $c5b9 + call PlaceString + ret +; 102f5d + +INCBIN "baserom.gbc", $102f5d, $102f6d - $102f5d + +Function102f6d: ; 102f6d + call Function102dc3 + ld de, $6f7a + ld hl, $c5b9 + call PlaceString + ret +; 102f7a + +INCBIN "baserom.gbc", $102f7a, $102f85 - $102f7a + +Function102f85: ; 102f85 + ld a, [$d003] + ld c, a + ld b, $0 + ld hl, OTPartySpecies + add hl, bc + ld a, [hl] + ld [$d265], a + call GetPokemonName + call Function102dc3 + ld de, $6fb2 + ld hl, $c5b9 + call PlaceString + ld de, StringBuffer1 + ld hl, $c5c5 + call PlaceString + ld de, $6fcc + call PlaceString + ret +; 102fb2 + +INCBIN "baserom.gbc", $102fb2, $102fce - $102fb2 + +Function102fce: ; 102fce + call Function102dc3 + ld de, $6fdb + ld hl, $c5b9 + call PlaceString + ret +; 102fdb + +INCBIN "baserom.gbc", $102fdb, $102ff5 - $102fdb + +Function102ff5: ; 102ff5 + call Function102dc3 + ld de, $7002 + ld hl, $c5b9 + call PlaceString + ret +; 103002 + +INCBIN "baserom.gbc", $103002, $103021 - $103002 + +Function103021: ; 103021 + call Function102dc3 + ld de, $702e + ld hl, $c5b9 + call PlaceString + ret +; 10302e + +INCBIN "baserom.gbc", $10302e, $10304f - $10302e + +Function10304f: ; 10304f + xor a + ld [AttrMapEnd], a + ld [$cf42], a + ld [$cf44], a + ld [$cf45], a + ret +; 10305d + +Function10305d: ; 10305d + nop + ld a, [AttrMapEnd] + and a + ret z + call Function10307f + ret c + call Function103094 + call Function10306e + ret +; 10306e + +Function10306e: ; 10306e + ld a, $1 + ld [hOAMUpdate], a + call ClearSprites + ld de, Sprites + call Function1030cd + xor a + ld [hOAMUpdate], a + ret +; 10307f + +Function10307f: ; 10307f + ld c, $2 + ld hl, $cd4b + bit 7, [hl] + jr z, .asm_10308a + ld c, $1 + +.asm_10308a + ld hl, $cf45 + inc [hl] + ld a, [hl] + cp c + ret c + xor a + ld [hl], a + ret +; 103094 + +Function103094: ; 103094 + ld hl, $cd4b + bit 7, [hl] + jr nz, .asm_1030c0 + ld a, [$cf42] + bit 7, a + jr nz, .asm_1030b2 + ld a, [$cf44] + inc a + ld [$cf44], a + cp $2c + ret nz + ld hl, $cf42 + set 7, [hl] + ret + +.asm_1030b2 + ld a, [$cf44] + dec a + ld [$cf44], a + ret nz + ld hl, $cf42 + res 7, [hl] + ret + +.asm_1030c0 + ld hl, $cf44 + ld a, [hl] + and a + jr z, .asm_1030ca + dec a + ld [hl], a + ret nz + +.asm_1030ca + ld [hl], $2c + ret +; 1030cd + +Function1030cd: ; 1030cd + ld a, [$cf44] + ld l, a + ld h, $0 + add hl, hl + add hl, hl + add hl, hl + ld bc, $7112 + add hl, bc + ld b, $30 + ld c, $8 +.asm_1030de + push hl + ld hl, $cd4b + bit 7, [hl] + pop hl + ld a, $0 + jr z, .asm_1030eb + ld a, $5 + +.asm_1030eb + add [hl] + inc hl + push hl + add a + add a + add $7a + ld l, a + ld a, $72 + adc $0 + ld h, a + ld a, b + add [hl] + inc hl + ld [de], a + inc de + ld a, $a + add [hl] + inc hl + ld [de], a + inc de + ld a, [hli] + ld [de], a + inc de + ld a, [hli] + ld [de], a + inc de + pop hl + ld a, b + add $8 + ld b, a + dec c + jr nz, .asm_1030de + ret +; 103112 + +INCBIN "baserom.gbc", $103112, $103302 - $103112 + +Function103302: ; 103302 + call Function103309 + call Function103362 + ret +; 103309 + +Function103309: ; 103309 + xor a + ld [hBGMapMode], a + ld hl, Buffer1 + ld bc, $000a + xor a + call ByteFill + ld a, $4 + call GetSRAMBank + ld a, [$dc41] + ld [$a60c], a + ld [Buffer1], a + call CloseSRAM + call Function1035c6 + ld a, [hli] + ld e, a + ld a, [hli] + ld d, a + ld a, [hli] + ld c, a + ld a, [hli] + ld b, a + ld a, [hli] + ld [$d1ef], a + ld a, [hli] + ld [$d1ec], a + ld a, [hli] + ld [$d1ed], a + ld h, d + ld l, e + call Function3eea + ld hl, $d1ec + ld a, [hli] + ld h, [hl] + ld l, a + ld a, [hl] + ld [$d1ee], a + call Function1034be + call Function1ad2 + callba Function104000 + ld a, $1 + ld [$d1f0], a + call Function10339a + ret +; 103362 + +Function103362: ; 103362 +.asm_103362 + ld a, [$d1f0] + ld [$d1f1], a + call Function1033af + call Function10339a + call Function10342c + callba Function10402d + ld a, [Buffer2] + bit 7, a + jr z, .asm_103362 + ld hl, Buffer2 + bit 6, [hl] + jr z, .asm_103398 + ld a, $4 + call GetSRAMBank + ld a, [Buffer1] + ld [$a60c], a + ld [$dc41], a + call CloseSRAM + xor a + ret + +.asm_103398 + scf + ret +; 10339a + +Function10339a: ; 10339a + ld a, [$d1f0] + ld [$d1f2], a + ld c, a + ld b, $0 + ld hl, $d1ec + ld a, [hli] + ld h, [hl] + ld l, a + add hl, bc + ld a, [hl] + ld [$d1f3], a + ret +; 1033af + +Function1033af: ; 1033af + call GetJoypad + ld a, [hJoyPressed] + bit 5, a + jr nz, .asm_103412 + bit 4, a + jr nz, .asm_103412 + bit 1, a + jr nz, .asm_1033f1 + bit 0, a + jr nz, .asm_1033fa + bit 6, a + jr nz, .asm_1033cd + bit 7, a + jr nz, .asm_1033de + ret + +.asm_1033cd + ld a, [$d1f0] + dec a + ld [$d1f0], a + cp $1 + ret nc + ld a, [$d1ee] + ld [$d1f0], a + ret + +.asm_1033de + ld a, [$d1f0] + inc a + ld [$d1f0], a + ld c, a + ld a, [$d1ee] + cp c + ret nc + ld a, $1 + ld [$d1f0], a + ret + +.asm_1033f1 + call PlayClickSFX + ld hl, Buffer2 + set 7, [hl] + ret + +.asm_1033fa + ld a, [$d1f3] + cp $3 + jr nz, .asm_103412 + ld de, $0022 + call PlaySFX + ld hl, Buffer2 + set 7, [hl] + ld hl, Buffer2 + set 6, [hl] + ret + +.asm_103412 + ld a, [$d1f3] + cp $3 + ret z + ld de, $0011 + call PlaySFX + ld bc, $0008 + call Function10350f + ld a, [Buffer1] + xor e + ld [Buffer1], a + ret +; 10342c + +Function10342c: ; 10342c + ld a, [$d1f0] + ld [$d1f2], a + call Function103490 + call Function10343c + call Function1034a7 + ret +; 10343c + +Function10343c: ; 10343c + ld a, [$d1f3] + cp $2 + jr nz, .asm_103452 + ld bc, $0001 + call Function1034f7 + ld c, $12 + ld b, $1 + call Function1034e0 + jr .asm_10345f + +.asm_103452 + ld bc, $ffed + call Function1034f7 + ld c, $12 + ld b, $2 + call Function1034e0 + +.asm_10345f + ld bc, NULL + call Function10350f + ld bc, $0001 + call Function103487 + ld bc, $0008 + call Function10350f + ld a, [Buffer1] + and e + ld bc, $0002 + jr z, .asm_10347d + ld bc, $0004 + +.asm_10347d + call Function10350f + ld bc, $000b + call Function103487 + ret +; 103487 + +Function103487: ; 103487 + push de + call Function1034f7 + pop de + call PlaceString + ret +; 103490 + +Function103490: ; 103490 + ld hl, $c5cc + ld c, $14 + ld b, $3 + call Function1034e0 + ld bc, $0006 + call Function10350f + ld hl, $c5e1 + call PlaceString + ret +; 1034a7 + +Function1034a7: ; 1034a7 + ld a, [$d1f1] + ld [$d1f2], a + ld bc, $000a + call Function1034f7 + ld [hl], $7f + ld bc, $000a + call Function1034f1 + ld [hl], $ed + ret +; 1034be + +Function1034be: ; 1034be + ld a, $1 + ld [$d1f2], a + ld hl, $d1ec + ld a, [hli] + ld h, [hl] + ld l, a + ld a, [hli] +.asm_1034ca + push af + ld a, [hli] + push hl + ld [$d1f3], a + call Function10343c + ld hl, $d1f2 + inc [hl] + pop hl + pop af + dec a + jr nz, .asm_1034ca + call Function103490 + ret +; 1034e0 + +Function1034e0: ; 1034e0 + push bc + push hl + call ClearBox + pop hl + ld bc, $0939 + add hl, bc + pop bc + ld a, $6 + call Functionfb8 + ret +; 1034f1 + +Function1034f1: ; 1034f1 + ld a, [$d1f0] + ld [$d1f2], a + +Function1034f7: ; 10134f7 + ld hl, SpritesEnd + add hl, bc + ld a, [$d1ef] + ld bc, $0014 + call AddNTimes + ld a, [$d1f2] + dec a + ld bc, $0028 + call AddNTimes + ret +; 10350f + +Function10350f: ; 10350f + ld a, [$d1f3] + push bc + ld hl, $7522 + ld bc, $0009 + call AddNTimes + pop bc + add hl, bc + ld a, [hli] + ld d, [hl] + ld e, a + ret +; 103522 + +INCBIN "baserom.gbc", $103522, $1035c6 - $103522 + +Function1035c6: ; 1035c6 + callba Function10138b + ld b, $0 + ld hl, $75d7 + add hl, bc + add hl, bc + ld a, [hli] + ld h, [hl] + ld l, a + ret +; 1035d7 + +INCBIN "baserom.gbc", $1035d7, $103612 - $1035d7 Function103612: ; 103612 ld hl, $7640 @@ -103500,7 +107701,23 @@ Function103612: ; 103612 ret ; 103640 -INCBIN "baserom.gbc",$103640,$10366e - $103640 +INCBIN "baserom.gbc", $103640, $103654 - $103640 + +Function103654: ; 103654 + callba Function10632f + bit 7, c + jr nz, .asm_103666 + ld hl, $cd2a + res 5, [hl] + ld c, $2 + ret + +.asm_103666 + ld hl, $cd2a + set 5, [hl] + ld c, $1 + ret +; 10366e Function10366e: ; 10366e callba Function10632f @@ -107669,7 +111886,22 @@ Function108016: ; 108016 jp Function108089 ; 108021 -INCBIN "baserom.gbc", $108021, $10804d - $108021 +INCBIN "baserom.gbc", $108021, $108026 - $108021 + +Function108026: ; 108026 + ld a, $0 + jr asm_10802c + +Function10802a: ; 10802a + ld a, $1 + +asm_10802c: + ld [$cf65], a + ld de, $4035 + jp Function10805b +; 108035 + +INCBIN "baserom.gbc", $108035, $10804d - $108035 Function10804d: ; 10804d ld a, $0 @@ -107678,7 +111910,37 @@ Function10804d: ; 10804d jp Function108089 ; 108058 -INCBIN "baserom.gbc", $108058, $108089 - $108058 +INCBIN "baserom.gbc", $108058, $10805b - $108058 + +Function10805b: ; 10805b + ld hl, $c734 + ld [hl], e + inc hl + ld [hl], d + ld a, [$ffde] + push af + xor a + ld [$ffde], a + ld hl, VramState + ld a, [hl] + push af + res 0, [hl] + ld hl, Options + ld a, [hl] + push af + set 4, [hl] + call Function1080b7 +.asm_108078 + call Function10824b + jr nc, .asm_108078 + pop af + ld [Options], a + pop af + ld [VramState], a + pop af + ld [$ffde], a + ret +; 108089 Function108089: ; 108089 ld hl, BattleEnded @@ -107710,7 +111972,68 @@ Function108089: ; 108089 ret ; 1080b7 -INCBIN "baserom.gbc",$1080b7,$108157 - $1080b7 +Function1080b7: ; 1080b7 + xor a + ld [$cf63], a + call WhiteBGMap + call ClearSprites + call ClearTileMap + call DisableLCD + call Function1081ad + call Function1081ca + call Functione51 + call Functione58 + ld a, $1 + ld [rVBK], a + ld hl, $4da7 + ld de, VTiles2 + call Decompress + ld a, $0 + ld [rVBK], a + ld hl, $4d27 + ld de, $8200 + call Decompress + call EnableLCD + xor a + ld [hSCX], a + ld [hSCY], a + ld a, $7 + ld [hWX], a + ld a, $90 + ld [hWY], a + callba Function8cf53 + call DelayFrame + ld de, $5adb + ld hl, VTiles0 + ld bc, $0a06 + call Request2bpp + ld de, $5b3b + ld hl, $8060 + ld bc, $0a0c + call Request2bpp + xor a + ld hl, $c300 + ld [hli], a + ld [hl], $0 + ld a, [$c6d0] + ld hl, $c6fd + ld de, $8300 + call Function1081e9 + ld a, [$c702] + ld hl, $c72f + ld de, $9310 + call Function1081e9 + ld a, [$c6d0] + ld de, $c6d1 + call Function108239 + ld a, [$c702] + ld de, $c703 + call Function108239 + xor a + call Function108b98 + call Function108af4 + ret +; 108157 Function108157: ; 108157 xor a @@ -107781,7 +112104,22 @@ Function1081ca: ; 1081ca ret ; 1081e9 -INCBIN "baserom.gbc",$1081e9,$108239 - $1081e9 +Function1081e9: ; 1081e9 + push de + push af + ld a, $2d + call Predef + pop af + ld [CurPartySpecies], a + ld [CurSpecies], a + call GetBaseData + pop de + ld a, $3c + call Predef + ret +; 108201 + +INCBIN "baserom.gbc", $108201, $108239 - $108201 Function108239: ; 108239 push de From e45e685bf3c8ea2661b773dfafff90bd2a9cbf17 Mon Sep 17 00:00:00 2001 From: yenatch Date: Thu, 1 Jan 2015 21:32:26 -0800 Subject: [PATCH 4/9] Glossed over a couple predefs. --- main.asm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/main.asm b/main.asm index b6e64ab71..9b04ef595 100644 --- a/main.asm +++ b/main.asm @@ -106912,8 +106912,7 @@ Function102d48: ; 102d48 ld bc, $0030 ld hl, PartyMon1DVs call AddNTimes - ld a, $2d - call Predef + predef GetUnownLetter callba Functionfba18 ld a, [$def4] and a @@ -112107,15 +112106,13 @@ Function1081ca: ; 1081ca Function1081e9: ; 1081e9 push de push af - ld a, $2d - call Predef + predef GetUnownLetter pop af ld [CurPartySpecies], a ld [CurSpecies], a call GetBaseData pop de - ld a, $3c - call Predef + predef GetFrontpic ret ; 108201 @@ -115875,8 +115872,7 @@ Function11b6b4: ; 11b6b4 ld hl, $c617 ld de, $c631 ld b, $1 - ld a, $c - call Predef + predef Functione167 ld de, $c631 ld hl, $c62f ld a, [de] From 1aa28c7712cb23401f8c8af30e78672588743d87 Mon Sep 17 00:00:00 2001 From: yenatch Date: Thu, 1 Jan 2015 21:44:01 -0800 Subject: [PATCH 5/9] Some mobile pseudoconstant. --- main.asm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/main.asm b/main.asm index 9b04ef595..a639e0b16 100644 --- a/main.asm +++ b/main.asm @@ -103944,7 +103944,8 @@ Function101724: ; 101724 ret ; 10173a -INCBIN "baserom.gbc", $10173a, $10173b - $10173a +Unknown_10173a: + db $50 Function10173b: ; 10173b push bc @@ -103952,7 +103953,7 @@ Function10173b: ; 10173b ld a, [hli] ld h, [hl] ld l, a - ld a, [$573a] + ld a, [Unknown_10173a] ld c, a ld b, $0 pop af @@ -103990,11 +103991,11 @@ Function10176f: ; 10176f ; 10177b Function10177b: ; 10177b - ld a, [$573a] + ld a, [Unknown_10173a] ld c, a ld b, $0 ld a, [$cd3a] - ld hl, NULL + ld hl, $0000 call AddNTimes ld e, l ld d, h @@ -106847,7 +106848,7 @@ Function102cee: ; 102cee sub c ret z ld bc, $002f - ld hl, NULL + ld hl, $0000 call AddNTimes push hl ld a, [$cf63] @@ -107538,7 +107539,7 @@ Function10343c: ; 10343c call Function1034e0 .asm_10345f - ld bc, NULL + ld bc, $0000 call Function10350f ld bc, $0001 call Function103487 From 3fe3cd1a46be17dd3f94b605ff7385a55358dd74 Mon Sep 17 00:00:00 2001 From: yenatch Date: Mon, 19 Jan 2015 21:31:29 -0800 Subject: [PATCH 6/9] hVBlank --- battle/anim_commands.asm | 4 +- engine/credits.asm | 6 +- home/vblank.asm | 382 +++++++++++++++------------------------ hram.asm | 2 + main.asm | 74 ++++---- 5 files changed, 185 insertions(+), 283 deletions(-) diff --git a/battle/anim_commands.asm b/battle/anim_commands.asm index 6e5a931eb..f9c841274 100644 --- a/battle/anim_commands.asm +++ b/battle/anim_commands.asm @@ -35,7 +35,7 @@ _PlayBattleAnim: ; cc0e4 ld c, 3 .asm_cc0ff - ld hl, $ff9e + ld hl, hVBlank ld a, [hl] push af @@ -43,7 +43,7 @@ _PlayBattleAnim: ; cc0e4 call Functioncc11c pop af - ld [$ff9e], a + ld [hVBlank], a ld a, $1 ld [hBGMapMode], a diff --git a/engine/credits.asm b/engine/credits.asm index e2b820e68..7504898ca 100644 --- a/engine/credits.asm +++ b/engine/credits.asm @@ -188,10 +188,10 @@ Function109847:: ; 109847 call GetCreditsPalette call Function32f9 - ld a, [$ff9e] + ld a, [hVBlank] push af ld a, $5 - ld [$ff9e], a + ld [hVBlank], a ld a, $1 ld [$ffaa], a xor a @@ -215,7 +215,7 @@ Function109847:: ; 109847 ld [hLCDStatCustom], a ld [hBGMapAddress], a pop af - ld [$ff9e], a + ld [hVBlank], a pop af ld [rSVBK], a ret diff --git a/home/vblank.asm b/home/vblank.asm index 54a99bc99..38dc02800 100644 --- a/home/vblank.asm +++ b/home/vblank.asm @@ -12,27 +12,23 @@ VBlank:: ; 283 push bc push de push hl - -; get vblank type - ld a, [$ff9e] - and $7 - -; get fn pointer + + ld a, [hVBlank] + and 7 + ld e, a - ld d, $0 + ld d, 0 ld hl, .VBlanks add hl, de add hl, de ld a, [hli] ld h, [hl] ld l, a - -; down to business + call _hl_ - -; since this is called once per frame + call GameTimer - + pop hl pop de pop bc @@ -41,14 +37,14 @@ VBlank:: ; 283 ; 2a1 .VBlanks ; 2a1 - dw VBlank0 ; 0 - dw VBlank1 ; 1 - dw VBlank2 ; 2 - dw VBlank3 ; 3 - dw VBlank4 ; 4 - dw VBlank5 ; 5 - dw VBlank6 ; 6 - dw VBlank0 ; 7 + dw VBlank0 + dw VBlank1 + dw VBlank2 + dw VBlank3 + dw VBlank4 + dw VBlank5 + dw VBlank6 + dw VBlank0 ; just in case ; 2b1 @@ -66,117 +62,91 @@ VBlank0:: ; 2b1 ; joypad ; sound -; inc frame counter + ; inc frame counter ld hl, $ff9b inc [hl] - -; advance rng + + ; advance random variables ld a, [rDIV] ld b, a ld a, [hRandomAdd] adc b ld [hRandomAdd], a - + ld a, [rDIV] ld b, a ld a, [hRandomSub] sbc b ld [hRandomSub], a - -; save bank - ld a, [hROMBank] ; current bank - ld [$ff8a], a - -; scroll x + + ld a, [hROMBank] + ld [hROMBankBackup], a + ld a, [hSCX] ld [rSCX], a -; scroll y ld a, [hSCY] ld [rSCY], a -; window y ld a, [hWY] ld [rWY], a -; window x + 7 ld a, [hWX] ld [rWX], a - -; some time management is in order -; only have time for one of these during vblank - -; bg map buffer has priority + + ; There's only time to call one of these in one vblank. + ; Calls are in order of priority. + call UpdateBGMapBuffer - jr c, .doneframeaction - -; then pals + jr c, .done call UpdatePalsIfCGB - jr c, .doneframeaction - -; dma transfer + jr c, .done call DMATransfer - jr c, .doneframeaction - -; bg map + jr c, .done call UpdateBGMap - -; these have their own timing checks + + ; These have their own timing checks. + call Serve2bppRequest call Serve1bppRequest call AnimateTileset - -.doneframeaction -; oam update off? + +.done + ld a, [hOAMUpdate] and a - jr nz, .vblankoccurred - -; update oam by dma transfer + jr nz, .done_oam call hPushOAM -; @PushOAM: -; ld a, Sprites >> 8 -; ld [rDMA], a -; ld a, $28 -; .loop -; dec a -; jr nz, .loop -; ret +.done_oam -; vblank-sensitive operations are done - -.vblankoccurred -; tell other fns vblank happened + ; vblank-sensitive operations are done + xor a ld [VBlankOccurred], a - -; dec OverworldDelay until 0 + ld a, [OverworldDelay] and a - jr z, .textdelay + jr z, .ok dec a ld [OverworldDelay], a - -.textdelay -; dec text delay counter until 0 +.ok + ld a, [TextDelayFrames] and a - jr z, .joypad + jr z, .ok2 dec a ld [TextDelayFrames], a - -.joypad +.ok2 + call Joypad - -; update sound + ld a, BANK(_UpdateSound) - rst Bankswitch ; bankswitch + rst Bankswitch call _UpdateSound - ld a, [$ff8a] - rst Bankswitch ; restore bank - -; + ld a, [hROMBankBackup] + rst Bankswitch + ld a, [hSeconds] ld [$ffe3], a - + ret ; 325 @@ -184,20 +154,16 @@ VBlank0:: ; 2b1 VBlank2:: ; 325 ; sound only -; save bank ld a, [hROMBank] - ld [$ff8a], a - -; update sound + ld [hROMBankBackup], a + ld a, BANK(_UpdateSound) - rst Bankswitch ; bankswitch - call _UpdateSound - -; restore bank - ld a, [$ff8a] rst Bankswitch - -; tell other fns vblank happened + call _UpdateSound + + ld a, [hROMBankBackup] + rst Bankswitch + xor a ld [VBlankOccurred], a ret @@ -212,77 +178,60 @@ VBlank1:: ; 337 ; oam ; sound / lcd stat -; save bank ld a, [hROMBank] - ld [$ff8a], a - -; scroll x + ld [hROMBankBackup], a + ld a, [hSCX] ld [rSCX], a - -; scroll y ld a, [hSCY] ld [rSCY], a - -; time-sensitive fns + call UpdatePals - jr c, .vblankoccurred - -; these have their own timing checks + jr c, .done + call UpdateBGMap call Serve2bppRequest@VBlank -; update oam by dma transfer + call hPushOAM -; @PushOAM: -; ld a, Sprites >> 8 -; ld [rDMA], a -; ld a, $28 -; .loop -; dec a -; jr nz, .loop -; ret - -.vblankoccurred -; tell other fns vblank happened +.done + xor a ld [VBlankOccurred], a - -; get requested ints + + ; get requested ints ld a, [rIF] ld b, a -; discard requested ints + ; discard requested ints xor a ld [rIF], a -; enable lcd stat + ; enable lcd stat ld a, %10 ; lcd stat ld [rIE], a -; rerequest serial int if applicable (still disabled) -; request lcd stat + ; rerequest serial int if applicable (still disabled) + ; request lcd stat ld a, b and %1000 ; serial or %10 ; lcd stat ld [rIF], a - + ei -; update sound ld a, BANK(_UpdateSound) - rst Bankswitch ; bankswitch + rst Bankswitch call _UpdateSound -; restore bank - ld a, [$ff8a] + ld a, [hROMBankBackup] rst Bankswitch di - -; get requested ints + + ; get requested ints ld a, [rIF] ld b, a -; discard requested ints + ; discard requested ints xor a ld [rIF], a -; enable ints besides joypad + ; enable ints besides joypad ld a, %1111 ; serial timer lcdstat vblank ld [rIE], a -; rerequest ints + ; rerequest ints ld a, b ld [rIF], a ret @@ -292,21 +241,18 @@ VBlank1:: ; 337 UpdatePals:: ; 37f ; update pals for either dmg or cgb -; check cgb ld a, [hCGB] and a jp nz, UpdateCGBPals - -; update gb pals + + ; update gb pals ld a, [$cfc7] ld [rBGP], a - ld a, [$cfc8] ld [rOBP0], a - ld a, [$cfc9] ld [rOBP1], a - + and a ret ; 396 @@ -320,77 +266,58 @@ VBlank3:: ; 396 ; oam ; sound / lcd stat -; save bank ld a, [hROMBank] - ld [$ff8a], a - -; scroll x + ld [hROMBankBackup], a + ld a, [hSCX] ld [rSCX], a -; scroll y ld a, [hSCY] ld [rSCY], a - -; any pals to update? + ld a, [hCGBPalUpdate] and a call nz, ForceUpdateCGBPals - jr c, .vblankoccurred -; else + jr c, .done + call UpdateBGMap call Serve2bppRequest@VBlank - -; update oam by dma transfer + call hPushOAM -; @PushOAM: -; ld a, Sprites >> 8 -; ld [rDMA], a -; ld a, $28 -; .loop -; dec a -; jr nz, .loop -; ret - -.vblankoccurred -; tell other fns vblank happened +.done + xor a ld [VBlankOccurred], a - -; save int flag + ld a, [rIF] push af -; reset ints xor a ld [rIF], a -; force lcdstat int during sound update ld a, %10 ; lcd stat ld [rIE], a ld [rIF], a - + ei -; update sound ld a, BANK(_UpdateSound) - rst Bankswitch ; bankswitch + rst Bankswitch call _UpdateSound -; restore bank - ld a, [$ff8a] + ld a, [hROMBankBackup] rst Bankswitch di - -; request lcdstat + + ; request lcdstat ld a, [rIF] ld b, a -; and any other ints + ; and any other ints pop af or b ld b, a -; reset ints + ; reset ints xor a ld [rIF], a -; enable ints besides joypad + ; enable ints besides joypad ld a, %1111 ; serial timer lcdstat vblank ld [rIE], a -; request ints + ; request ints ld a, b ld [rIF], a ret @@ -405,40 +332,26 @@ VBlank4:: ; 3df ; serial ; sound -; save bank ld a, [hROMBank] - ld [$ff8a], a - + ld [hROMBankBackup], a + call UpdateBGMap call Serve2bppRequest - -; update oam by dma transfer + call hPushOAM -; @PushOAM: -; ld a, Sprites >> 8 -; ld [rDMA], a -; ld a, $28 -; .loop -; dec a -; jr nz, .loop -; ret - -; update joypad + call Joypad - -; tell other fns vblank happened + xor a ld [VBlankOccurred], a - -; handshake + call AskSerial - -; update sound + ld a, BANK(_UpdateSound) - rst Bankswitch ; bankswitch + rst Bankswitch call _UpdateSound -; restore bank - ld a, [$ff8a] + + ld a, [hROMBankBackup] rst Bankswitch ret ; 400 @@ -452,52 +365,42 @@ VBlank5:: ; 400 ; joypad ; -; save bank ld a, [hROMBank] - ld [$ff8a], a - -; scroll x + ld [hROMBankBackup], a + ld a, [hSCX] ld [rSCX], a - -; if we can update pals, skip this part + call UpdatePalsIfCGB - jr c, .vblankoccurred - + jr c, .done + call UpdateBGMap call Serve2bppRequest - -.vblankoccurred -; tell other fns vblank happened +.done + xor a ld [VBlankOccurred], a - -; joypad + call Joypad - -; discard requested ints + xor a ld [rIF], a -; enable lcd stat ld a, %10 ; lcd stat ld [rIE], a -; request lcd stat + ; request lcd stat ld [rIF], a - + ei -; update sound ld a, BANK(_UpdateSound) - rst Bankswitch ; bankswitch + rst Bankswitch call _UpdateSound -; restore bank - ld a, [$ff8a] + ld a, [hROMBankBackup] rst Bankswitch di - -; discard requested ints + xor a ld [rIF], a -; enable ints besides joypad + ; enable ints besides joypad ld a, %1111 ; serial timer lcdstat vblank ld [rIE], a ret @@ -510,32 +413,29 @@ VBlank6:: ; 436 ; dma transfer ; sound -; save bank ld a, [hROMBank] - ld [$ff8a], a - -; inc frame counter + ld [hROMBankBackup], a + + ; inc frame counter ld hl, $ff9b inc [hl] - + call UpdateCGBPals - jr c, .vblankoccurred - + jr c, .done + call Serve2bppRequest call Serve1bppRequest call DMATransfer - -.vblankoccurred -; tell other fns vblank happened +.done + xor a ld [VBlankOccurred], a - -; update sound + ld a, BANK(_UpdateSound) - rst Bankswitch ; bankswitch + rst Bankswitch call _UpdateSound -; restore bank - ld a, [$ff8a] + + ld a, [hROMBankBackup] rst Bankswitch ret ; 45a diff --git a/hram.asm b/hram.asm index 675702c68..a13d36164 100644 --- a/hram.asm +++ b/hram.asm @@ -1,5 +1,6 @@ hPushOAM EQU $ff80 +hROMBankBackup EQU $ff8a hBuffer EQU $ff8b hRTCDayHi EQU $ff8d @@ -15,6 +16,7 @@ hMinutes EQU $ff96 hSeconds EQU $ff98 hROMBank EQU $ff9d +hVBlank EQU $ff9e hJoypadReleased EQU $ffa2 hJoypadPressed EQU $ffa3 diff --git a/main.asm b/main.asm index a639e0b16..adc96d411 100644 --- a/main.asm +++ b/main.asm @@ -36515,7 +36515,7 @@ Function283b2: ; 283b2 xor a ld [hld], a ld [hl], a - ld [$ff9e], a + ld [hVBlank], a push de hlcoord 0, 12 ld b, $4 @@ -39695,7 +39695,7 @@ Function29c7b: ; 29c7b ld c, $28 call DelayFrames xor a - ld [$ff9e], a + ld [hVBlank], a inc a ld [InLinkBattle], a ret @@ -39744,7 +39744,7 @@ Function29c92: ; 29c92 xor a ld [hli], a ld [hl], a - ld [$ff9e], a + ld [hVBlank], a ld [InLinkBattle], a ret ; 29ce8 @@ -39860,12 +39860,12 @@ Function29d92: ; 29d92 ld [hl], a call WaitBGMap ld a, $2 - ld [$ff9e], a + ld [hVBlank], a call DelayFrame call DelayFrame call Function29e0c xor a - ld [$ff9e], a + ld [hVBlank], a ld a, [ScriptVar] and a ret nz @@ -39882,7 +39882,7 @@ Function29dba: ; 29dba ld [hl], a call WaitBGMap ld a, $2 - ld [$ff9e], a + ld [hVBlank], a call DelayFrame call DelayFrame call Function29e0c @@ -39916,7 +39916,7 @@ Function29dba: ; 29dba .asm_29e08 xor a - ld [$ff9e], a + ld [hVBlank], a ret ; 29e0c @@ -40019,7 +40019,7 @@ Function29e82: ; 29e82 inc a ld [InLinkBattle], a xor a - ld [$ff9e], a + ld [hVBlank], a ld a, $1 ld [ScriptVar], a ret @@ -40037,7 +40037,7 @@ Function29eaf: ; 29eaf callab Function28000 call Function2ee4 xor a - ld [$ff9e], a + ld [hVBlank], a ret ; 29ec4 @@ -40048,7 +40048,7 @@ Function29ec4: ; 29ec4 callab Function28000 call Function2ee4 xor a - ld [$ff9e], a + ld [hVBlank], a ret ; 29ed9 @@ -40059,7 +40059,7 @@ Function29ed9: ; 29ed9 callab Function28000 call Function2ee4 xor a - ld [$ff9e], a + ld [hVBlank], a ret ; 29eee @@ -40096,7 +40096,7 @@ Function29f17: ; 29f17 ld [$cf56], a ld [$cf57], a ld a, $2 - ld [$ff9e], a + ld [hVBlank], a call DelayFrame call DelayFrame .asm_29f29 @@ -40114,7 +40114,7 @@ Function29f17: ; 29f17 .asm_29f40 xor a - ld [$ff9e], a + ld [hVBlank], a ld a, b and $f ret @@ -64171,7 +64171,7 @@ Function8442c: ; 8442c ld a, $e4 call DmgToCgbBGPals call DelayFrame - ld hl, $ff9e + ld hl, hVBlank ld a, [hl] push af ld [hl], $4 @@ -64196,7 +64196,7 @@ Function8442c: ; 8442c .asm_8449d pop af - ld [$ff9e], a + ld [hVBlank], a call Function84411 xor a ld [rIF], a @@ -64237,7 +64237,7 @@ Function844bc: ; 844bc (21:44bc) ld [rIF], a ; $ff00+$f ld a, $9 ld [rIE], a ; $ff00+$ff - ld hl, $ff9e + ld hl, hVBlank ld a, [hl] push af ld [hl], $4 @@ -64279,7 +64279,7 @@ Function844bc: ; 844bc (21:44bc) call Function84559 .asm_84545 pop af - ld [$ff9e], a + ld [hVBlank], a call Function84411 xor a ld [rIF], a ; $ff00+$f @@ -64307,7 +64307,7 @@ Function84560: ; 84560 ld [rIF], a ld a, $9 ld [rIE], a - ld hl, $ff9e + ld hl, hVBlank ld a, [hl] push af ld [hl], $4 @@ -64343,7 +64343,7 @@ Function84560: ; 84560 .asm_845c0 pop af - ld [$ff9e], a + ld [hVBlank], a call Function84411 call Function30b4 xor a @@ -64377,7 +64377,7 @@ Function845db: ; 845db ld [hBGMapMode], a ld a, $13 call Function84419 - ld hl, $ff9e + ld hl, hVBlank ld a, [hl] push af ld [hl], $4 @@ -64385,7 +64385,7 @@ Function845db: ; 845db ld [$cf65], a call Function843f0 pop af - ld [$ff9e], a + ld [hVBlank], a call Function84411 call Function84735 xor a @@ -64414,7 +64414,7 @@ Function8461a: ; 8461a callba Function1dc381 ld a, $10 call Function84419 - ld hl, $ff9e + ld hl, hVBlank ld a, [hl] push af ld [hl], $4 @@ -64438,7 +64438,7 @@ Function8461a: ; 8461a .asm_84671 pop af - ld [$ff9e], a + ld [hVBlank], a call Function84411 call Function84735 xor a @@ -64464,7 +64464,7 @@ Function84688: ; 84688 ld [rIF], a ld a, $9 ld [rIE], a - ld hl, $ff9e + ld hl, hVBlank ld a, [hl] push af ld [hl], $4 @@ -64492,7 +64492,7 @@ Function84688: ; 84688 .asm_846e2 pop af - ld [$ff9e], a + ld [hVBlank], a call Function84411 xor a ld [rIF], a @@ -73282,7 +73282,7 @@ Function8c20f: ; 8c20f ld a, [rOBP1] ld [$cfc9], a call DelayFrame - ld hl, $ff9e + ld hl, hVBlank ld a, [hl] push af ld [hl], $1 @@ -73317,7 +73317,7 @@ Function8c20f: ; 8c20f ld a, $1 ld [rSVBK], a pop af - ld [$ff9e], a + ld [hVBlank], a call DelayFrame ret ; 8c26d @@ -74572,7 +74572,7 @@ Function8cc04: ; 8cc04 ld a, [hSCY] push af call Function8ccc9 - ld hl, $ff9e + ld hl, hVBlank ld a, [hl] push af ld [hl], $1 @@ -74595,7 +74595,7 @@ Function8cc04: ; 8cc04 .asm_8cc6b pop af - ld [$ff9e], a + ld [hVBlank], a call WhiteBGMap xor a ld [hLCDStatCustom], a @@ -96304,7 +96304,7 @@ Functione48ac: ; e48ac ld [rSVBK], a ld a, [$ffaa] push af - ld a, [$ff9e] + ld a, [hVBlank] push af call Functione4901 @@ -96337,7 +96337,7 @@ Functione48bc: ; e48bc ld a, $90 ld [hWY], a pop af - ld [$ff9e], a + ld [hVBlank], a pop af ld [$ffaa], a pop af @@ -96347,7 +96347,7 @@ Functione48bc: ; e48bc Functione4901: ; e4901 xor a - ld [$ff9e], a + ld [hVBlank], a ld a, $1 ld [$ffaa], a xor a @@ -100510,7 +100510,7 @@ Function1000a4: ; 1000a4 ld [$ffc9], a ld [$ffe9], a xor a - ld [$ff9e], a + ld [hVBlank], a call NormalSpeed xor a ld [rIF], a @@ -101857,20 +101857,20 @@ Function1008a6: ; 1008a6 Function1008e0: ; 1008e0 ld a, [hBGMapMode] ld b, a - ld a, [$ff9e] + ld a, [hVBlank] ld c, a push bc xor a ld [hBGMapMode], a ld a, $3 - ld [$ff9e], a + ld [hVBlank], a call Function100970 call Function100902 call Function100989 call DelayFrame pop bc ld a, c - ld [$ff9e], a + ld [hVBlank], a ld a, b ld [hBGMapMode], a ret @@ -114136,7 +114136,7 @@ Function118452: ; 118452 xor a ld [$ffc9], a ld [$ffe9], a - ld [$ff9e], a + ld [hVBlank], a call NormalSpeed xor a ld [rIF], a From d8cf44a87e4da0e53ab44c487b865817b496a048 Mon Sep 17 00:00:00 2001 From: yenatch Date: Mon, 19 Jan 2015 21:31:56 -0800 Subject: [PATCH 7/9] wow --- main.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.asm b/main.asm index adc96d411..5cf391841 100644 --- a/main.asm +++ b/main.asm @@ -13616,7 +13616,7 @@ Functione134: ; e134 ld a, $1f call GetPartyParamLocation ld a, [hl] - ld [$001f], a + ld [$001f], a ; wow ld a, $0 call GetPartyParamLocation ld a, [hl] From 8583cc4724144e255d61a2c7ed7dd70036bcdb6e Mon Sep 17 00:00:00 2001 From: yenatch Date: Tue, 20 Jan 2015 00:01:23 -0800 Subject: [PATCH 8/9] Stop using the preprocessor. --- Makefile | 10 +- engine/buena_scripts.asm | 88 +- engine/events.asm | 18 +- engine/fruit_trees.asm | 22 +- engine/more_phone_scripts.asm | 832 ++++++------- engine/phone_scripts.asm | 1128 +++++++++--------- engine/scripting.asm | 4 +- engine/std_scripts.asm | 548 ++++----- lib/mobile/main.asm | 64 +- macros.asm | 21 + macros/charmap.asm | 275 +++++ macros/event.asm | 876 ++++++++++++++ macros/map.asm | 40 + macros/move_anim.asm | 244 ++++ macros/move_effect.asm | 708 +++++++++++ macros/movement.asm | 286 +++++ macros/sound.asm | 198 +++ macros/text.asm | 65 + main.asm | 279 +++-- maps/AzaleaGym.asm | 26 +- maps/AzaleaTown.asm | 30 +- maps/BattleTower1F.asm | 68 +- maps/BattleTowerBattleRoom.asm | 24 +- maps/BattleTowerHallway.asm | 16 +- maps/BillsHouse.asm | 86 +- maps/BlackthornCity.asm | 20 +- maps/BlackthornDragonSpeechHouse.asm | 2 +- maps/BlackthornGym1F.asm | 28 +- maps/BlackthornGym2F.asm | 14 +- maps/BluesHouse.asm | 18 +- maps/BrunosRoom.asm | 6 +- maps/BurnedTower1F.asm | 14 +- maps/BurnedTowerB1F.asm | 4 +- maps/CeladonCafe.asm | 28 +- maps/CeladonCity.asm | 2 +- maps/CeladonDeptStore3F.asm | 4 +- maps/CeladonDeptStore6F.asm | 20 +- maps/CeladonGameCorner.asm | 20 +- maps/CeladonGameCornerPrizeRoom.asm | 56 +- maps/CeladonGym.asm | 18 +- maps/CeladonMansion1F.asm | 6 +- maps/CeladonMansion3F.asm | 16 +- maps/CeladonMansionRoofHouse.asm | 8 +- maps/CeladonPokeCenter1F.asm | 8 +- maps/CeruleanCity.asm | 22 +- maps/CeruleanGym.asm | 26 +- maps/CeruleanPoliceStation.asm | 2 +- maps/CeruleanTradeSpeechHouse.asm | 4 +- maps/CharcoalKiln.asm | 14 +- maps/CherrygroveCity.asm | 50 +- maps/CherrygroveEvolutionSpeechHouse.asm | 4 +- maps/CherrygroveMart.asm | 4 +- maps/CherrygrovePokeCenter1F.asm | 4 +- maps/CianwoodCity.asm | 14 +- maps/CianwoodCityPhotoStudio.asm | 6 +- maps/CianwoodGym.asm | 24 +- maps/CianwoodPharmacy.asm | 6 +- maps/CianwoodPokeCenter1F.asm | 4 +- maps/CinnabarIsland.asm | 2 +- maps/Colosseum.asm | 2 +- maps/CopycatsHouse1F.asm | 6 +- maps/CopycatsHouse2F.asm | 48 +- maps/DanceTheatre.asm | 26 +- maps/DarkCaveBlackthornEntrance.asm | 4 +- maps/DayCare.asm | 10 +- maps/DragonShrine.asm | 60 +- maps/DragonsDenB1F.asm | 32 +- maps/EarlsPokemonAcademy.asm | 44 +- maps/EcruteakCity.asm | 8 +- maps/EcruteakGym.asm | 26 +- maps/EcruteakHouse.asm | 16 +- maps/EcruteakItemfinderHouse.asm | 14 +- maps/EcruteakPokeCenter1F.asm | 6 +- maps/ElmsLab.asm | 144 +-- maps/FastShip1F.asm | 18 +- maps/FastShipB1F.asm | 30 +- maps/FastShipCabins.asm | 44 +- maps/FastShipCabins_NNW_NNE_NE.asm | 16 +- maps/FastShipCabins_SE_SSE_CaptainsCabin.asm | 44 +- maps/FastShipCabins_SW_SSW_NW.asm | 18 +- maps/FuchsiaGym.asm | 30 +- maps/FuchsiaPokeCenter1F.asm | 4 +- maps/GoldenrodBikeShop.asm | 10 +- maps/GoldenrodBillsHouse.asm | 30 +- maps/GoldenrodCity.asm | 46 +- maps/GoldenrodDeptStore4F.asm | 2 +- maps/GoldenrodDeptStore5F.asm | 20 +- maps/GoldenrodDeptStore6F.asm | 20 +- maps/GoldenrodDeptStoreB1F.asm | 6 +- maps/GoldenrodDeptStoreRoof.asm | 6 +- maps/GoldenrodFlowerShop.asm | 10 +- maps/GoldenrodGameCorner.asm | 68 +- maps/GoldenrodGym.asm | 30 +- maps/GoldenrodHappinessRater.asm | 16 +- maps/GoldenrodMagnetTrainStation.asm | 12 +- maps/GoldenrodPokeCenter1F.asm | 22 +- maps/GoldenrodPokeComCenter2FMobile.asm | 24 +- maps/HallOfFame.asm | 2 +- maps/IcePathB1F.asm | 12 +- maps/IlexForest.asm | 48 +- maps/IndigoPlateauPokeCenter1F.asm | 20 +- maps/KarensRoom.asm | 6 +- maps/KogasRoom.asm | 6 +- maps/KrissHouse1F.asm | 54 +- maps/KrissHouse2F.asm | 10 +- maps/KrissNeighborsHouse.asm | 10 +- maps/KurtsHouse.asm | 92 +- maps/LakeofRage.asm | 40 +- maps/LakeofRageHiddenPowerHouse.asm | 6 +- maps/LakeofRageMagikarpHouse.asm | 20 +- maps/LancesRoom.asm | 16 +- maps/LavRadioTower1F.asm | 12 +- maps/LavenderPokeCenter1F.asm | 4 +- maps/MahoganyGym.asm | 26 +- maps/MahoganyMart1F.asm | 14 +- maps/MahoganyRedGyaradosSpeechHouse.asm | 4 +- maps/MahoganyTown.asm | 20 +- maps/ManiasHouse.asm | 26 +- maps/MobileBattleRoom.asm | 6 +- maps/MobileTradeRoomMobile.asm | 2 +- maps/MountMoon.asm | 10 +- maps/MountMortar1FInside.asm | 4 +- maps/MountMortar2FInside.asm | 2 +- maps/MountMortarB1F.asm | 10 +- maps/MrFujisHouse.asm | 6 +- maps/MrPokemonsHouse.asm | 34 +- maps/MrPsychicsHouse.asm | 4 +- maps/NationalPark.asm | 46 +- maps/NationalParkBugContest.asm | 20 +- maps/NewBarkTown.asm | 24 +- maps/OaksLab.asm | 20 +- maps/OlivineCafe.asm | 4 +- maps/OlivineCity.asm | 8 +- maps/OlivineGoodRodHouse.asm | 10 +- maps/OlivineGym.asm | 18 +- maps/OlivineHouseBeta.asm | 2 +- maps/OlivineLighthouse2F.asm | 22 +- maps/OlivineLighthouse3F.asm | 6 +- maps/OlivineLighthouse4F.asm | 4 +- maps/OlivineLighthouse5F.asm | 4 +- maps/OlivineLighthouse6F.asm | 26 +- maps/OlivinePort.asm | 46 +- maps/PewterCity.asm | 4 +- maps/PewterGym.asm | 14 +- maps/PewterNidoranSpeechHouse.asm | 2 +- maps/PewterPokeCenter1F.asm | 2 +- maps/PokeCenter2F.asm | 148 +-- maps/PokemonFanClub.asm | 26 +- maps/PowerPlant.asm | 38 +- maps/RadioTower1F.asm | 58 +- maps/RadioTower2F.asm | 62 +- maps/RadioTower3F.asm | 26 +- maps/RadioTower4F.asm | 18 +- maps/RadioTower5F.asm | 22 +- maps/RedsHouse1F.asm | 4 +- maps/Route1.asm | 4 +- maps/Route10PokeCenter1F.asm | 4 +- maps/Route10South.asm | 4 +- maps/Route11.asm | 8 +- maps/Route12.asm | 8 +- maps/Route12SuperRodHouse.asm | 8 +- maps/Route13.asm | 10 +- maps/Route14.asm | 6 +- maps/Route15.asm | 12 +- maps/Route16Gate.asm | 2 +- maps/Route17.asm | 8 +- maps/Route1718Gate.asm | 2 +- maps/Route18.asm | 4 +- maps/Route19.asm | 16 +- maps/Route19FuchsiaGate.asm | 4 +- maps/Route2.asm | 6 +- maps/Route20.asm | 6 +- maps/Route21.asm | 6 +- maps/Route24.asm | 6 +- maps/Route25.asm | 24 +- maps/Route26.asm | 36 +- maps/Route26DayofWeekSiblingsHouse.asm | 6 +- maps/Route26HealSpeechHouse.asm | 4 +- maps/Route27.asm | 48 +- maps/Route27SandstormHouse.asm | 10 +- maps/Route28FamousSpeechHouse.asm | 6 +- maps/Route29.asm | 34 +- maps/Route2NuggetSpeechHouse.asm | 4 +- maps/Route3.asm | 8 +- maps/Route30.asm | 34 +- maps/Route30BerrySpeechHouse.asm | 4 +- maps/Route31.asm | 44 +- maps/Route32.asm | 80 +- maps/Route32PokeCenter1F.asm | 10 +- maps/Route33.asm | 16 +- maps/Route34.asm | 68 +- maps/Route34IlexForestGate.asm | 10 +- maps/Route35.asm | 46 +- maps/Route35Goldenrodgate.asm | 20 +- maps/Route35NationalParkgate.asm | 42 +- maps/Route36.asm | 52 +- maps/Route36NationalParkgate.asm | 90 +- maps/Route37.asm | 20 +- maps/Route38.asm | 42 +- maps/Route39.asm | 34 +- maps/Route39Barn.asm | 34 +- maps/Route39Farmhouse.asm | 20 +- maps/Route4.asm | 6 +- maps/Route40.asm | 18 +- maps/Route41.asm | 20 +- maps/Route42.asm | 24 +- maps/Route43.asm | 44 +- maps/Route43Gate.asm | 28 +- maps/Route43MahoganyGate.asm | 4 +- maps/Route44.asm | 56 +- maps/Route45.asm | 60 +- maps/Route46.asm | 26 +- maps/Route5CleanseTagSpeechHouse.asm | 4 +- maps/Route6.asm | 4 +- maps/Route6SaffronGate.asm | 4 +- maps/Route7SaffronGate.asm | 4 +- maps/Route8.asm | 10 +- maps/Route9.asm | 12 +- maps/RuinsofAlphAerodactylChamber.asm | 6 +- maps/RuinsofAlphHoOhChamber.asm | 6 +- maps/RuinsofAlphInnerChamber.asm | 2 +- maps/RuinsofAlphKabutoChamber.asm | 14 +- maps/RuinsofAlphOmanyteChamber.asm | 6 +- maps/RuinsofAlphOutside.asm | 22 +- maps/RuinsofAlphResearchCenter.asm | 32 +- maps/SafariZoneWardensHome.asm | 4 +- maps/SaffronCity.asm | 12 +- maps/SaffronGym.asm | 20 +- maps/SaffronPokeCenter1F.asm | 4 +- maps/SaffronTrainStation.asm | 16 +- maps/SeafoamGym.asm | 12 +- maps/SilphCo1F.asm | 4 +- maps/SilverCaveRoom3.asm | 4 +- maps/SlowpokeWellB1F.asm | 16 +- maps/SlowpokeWellB2F.asm | 4 +- maps/SproutTower1F.asm | 2 +- maps/SproutTower2F.asm | 4 +- maps/SproutTower3F.asm | 20 +- maps/TeamRocketBaseB1F.asm | 120 +- maps/TeamRocketBaseB2F.asm | 52 +- maps/TeamRocketBaseB3F.asm | 26 +- maps/TimeCapsule.asm | 2 +- maps/TinTower1F.asm | 12 +- maps/TinTowerRoof.asm | 4 +- maps/TradeCenter.asm | 2 +- maps/TrainerHouseB1F.asm | 16 +- maps/UndergroundPathSwitchRoomEntrances.asm | 194 +-- maps/UndergroundWarehouse.asm | 12 +- maps/UnionCave1F.asm | 10 +- maps/UnionCaveB1F.asm | 8 +- maps/UnionCaveB2F.asm | 6 +- maps/VermilionCity.asm | 18 +- maps/VermilionGym.asm | 18 +- maps/VermilionPokeCenter1F.asm | 4 +- maps/VermilionPort.asm | 38 +- maps/VictoryRoad.asm | 14 +- maps/VictoryRoadGate.asm | 8 +- maps/VioletCity.asm | 10 +- maps/VioletGym.asm | 20 +- maps/VioletNicknameSpeechHouse.asm | 2 +- maps/VioletPokeCenter1F.asm | 14 +- maps/ViridianCity.asm | 14 +- maps/ViridianGym.asm | 12 +- maps/ViridianNicknameSpeechHouse.asm | 4 +- maps/ViridianPokeCenter1F.asm | 4 +- maps/WarehouseEntrance.asm | 78 +- maps/WhirlIslandLugiaChamber.asm | 4 +- maps/WillsRoom.asm | 6 +- maps/WiseTriosRoom.asm | 12 +- 269 files changed, 6786 insertions(+), 4078 deletions(-) create mode 100644 macros/charmap.asm create mode 100644 macros/event.asm create mode 100644 macros/map.asm create mode 100644 macros/move_anim.asm create mode 100644 macros/move_effect.asm create mode 100644 macros/movement.asm create mode 100644 macros/sound.asm create mode 100644 macros/text.asm diff --git a/Makefile b/Makefile index ce6e87cb1..d65dfb866 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,6 @@ PYTHON := python poketools := extras/pokemontools gfx := $(PYTHON) $(poketools)/gfx.py includes := $(PYTHON) $(poketools)/scan_includes.py -pre := $(PYTHON) prequeue.py crystal_obj := \ @@ -48,14 +47,11 @@ baserom.gbc: ; %.asm: ; -%.tx: %.asm ; $(eval txq += $<) @rm -f $@ - -$(all_obj): $$*.tx $$(patsubst %.asm, %.tx, $$($$*_dep)) - @$(pre) $(txq); $(eval txq :=) +$(all_obj): $$*.asm $$($$*_dep) @$(gfx) 2bpp $(2bppq); $(eval 2bppq :=) @$(gfx) 1bpp $(1bppq); $(eval 1bppq :=) - @$(gfx) lz $(lzq); $(eval lzq :=) - rgbasm -o $@ $*.tx + @$(gfx) lz $(lzq); $(eval lzq :=) + rgbasm -o $@ $< pokecrystal.gbc: $(crystal_obj) rgblink -n $*.sym -m $*.map -o $@ $^ diff --git a/engine/buena_scripts.asm b/engine/buena_scripts.asm index a65966c4a..fe87dd46b 100644 --- a/engine/buena_scripts.asm +++ b/engine/buena_scripts.asm @@ -3,36 +3,36 @@ UnknownScript_0xa0b14: iftrue UnknownScript_0xa0b73 checkcode $a if_greater_than $11, UnknownScript_0xa0b4b - 2call UnknownScript_0xa0b32 - 2jump UnknownScript_0xa0c0e + scall UnknownScript_0xa0b32 + jump UnknownScript_0xa0c0e UnknownScript_0xa0b26: checkflag ENGINE_BIKE_SHOP_CALL_ENABLED iftrue UnknownScript_0xa0b73 - 2call UnknownScript_0xa0b4f - 2jump UnknownScript_0xa0b77 + scall UnknownScript_0xa0b4f + jump UnknownScript_0xa0b77 UnknownScript_0xa0b32: checktime $1 iftrue UnknownScript_0xa0b41 checktime $2 iftrue UnknownScript_0xa0b46 - 2writetext UnknownText_0xa0d42 + writetext UnknownText_0xa0d42 keeptextopen end UnknownScript_0xa0b41: - 2writetext UnknownText_0xa0c28 + writetext UnknownText_0xa0c28 keeptextopen end UnknownScript_0xa0b46: - 2writetext UnknownText_0xa0c72 + writetext UnknownText_0xa0c72 keeptextopen end UnknownScript_0xa0b4b: - 2writetext UnknownText_0xa0caf + writetext UnknownText_0xa0caf end UnknownScript_0xa0b4f: @@ -42,34 +42,34 @@ UnknownScript_0xa0b4f: iftrue UnknownScript_0xa0b64 checktime $2 iftrue UnknownScript_0xa0b69 - 2writetext UnknownText_0xa0e29 + writetext UnknownText_0xa0e29 keeptextopen end UnknownScript_0xa0b64: - 2writetext UnknownText_0xa0d96 + writetext UnknownText_0xa0d96 keeptextopen end UnknownScript_0xa0b69: - 2writetext UnknownText_0xa0dcf + writetext UnknownText_0xa0dcf keeptextopen end UnknownScript_0xa0b6e: - 2writetext UnknownText_0xa0e01 + writetext UnknownText_0xa0e01 keeptextopen end UnknownScript_0xa0b73: - 2writetext UnknownText_0xa0e5e + writetext UnknownText_0xa0e5e end UnknownScript_0xa0b77: checkevent $0044 iftrue UnknownScript_0xa0b82 random $b - 2jump UnknownScript_0xa0b84 + jump UnknownScript_0xa0b84 UnknownScript_0xa0b82: random $e @@ -91,59 +91,59 @@ UnknownScript_0xa0b84: if_equal $d, UnknownScript_0xa0c0a UnknownScript_0xa0bbc: - 2writetext UnknownText_0xa0efb - 2jump UnknownScript_0xa0c0d + writetext UnknownText_0xa0efb + jump UnknownScript_0xa0c0d UnknownScript_0xa0bc2: - 2writetext UnknownText_0xa0fcf - 2jump UnknownScript_0xa0c0d + writetext UnknownText_0xa0fcf + jump UnknownScript_0xa0c0d UnknownScript_0xa0bc8: - 2writetext UnknownText_0xa109d - 2jump UnknownScript_0xa0c0d + writetext UnknownText_0xa109d + jump UnknownScript_0xa0c0d UnknownScript_0xa0bce: - 2writetext UnknownText_0xa1143 - 2jump UnknownScript_0xa0c0d + writetext UnknownText_0xa1143 + jump UnknownScript_0xa0c0d UnknownScript_0xa0bd4: - 2writetext UnknownText_0xa1244 - 2jump UnknownScript_0xa0c0d + writetext UnknownText_0xa1244 + jump UnknownScript_0xa0c0d UnknownScript_0xa0bda: - 2writetext UnknownText_0xa1318 - 2jump UnknownScript_0xa0c0d + writetext UnknownText_0xa1318 + jump UnknownScript_0xa0c0d UnknownScript_0xa0be0: - 2writetext UnknownText_0xa13d8 - 2jump UnknownScript_0xa0c0d + writetext UnknownText_0xa13d8 + jump UnknownScript_0xa0c0d UnknownScript_0xa0be6: - 2writetext UnknownText_0xa1488 - 2jump UnknownScript_0xa0c0d + writetext UnknownText_0xa1488 + jump UnknownScript_0xa0c0d UnknownScript_0xa0bec: - 2writetext UnknownText_0xa15de - 2jump UnknownScript_0xa0c0d + writetext UnknownText_0xa15de + jump UnknownScript_0xa0c0d UnknownScript_0xa0bf2: - 2writetext UnknownText_0xa1717 - 2jump UnknownScript_0xa0c0d + writetext UnknownText_0xa1717 + jump UnknownScript_0xa0c0d UnknownScript_0xa0bf8: - 2writetext UnknownText_0xa183d - 2jump UnknownScript_0xa0c0d + writetext UnknownText_0xa183d + jump UnknownScript_0xa0c0d UnknownScript_0xa0bfe: - 2writetext UnknownText_0xa19b1 - 2jump UnknownScript_0xa0c0d + writetext UnknownText_0xa19b1 + jump UnknownScript_0xa0c0d UnknownScript_0xa0c04: - 2writetext UnknownText_0xa1ac0 - 2jump UnknownScript_0xa0c0d + writetext UnknownText_0xa1ac0 + jump UnknownScript_0xa0c0d UnknownScript_0xa0c0a: - 2writetext UnknownText_0xa1bed + writetext UnknownText_0xa1bed UnknownScript_0xa0c0d: end @@ -155,14 +155,14 @@ UnknownScript_0xa0c0e: if_equal $2, UnknownScript_0xa0c24 UnknownScript_0xa0c1c: - 2writetext UnknownText_0xa1c88 + writetext UnknownText_0xa1c88 end UnknownScript_0xa0c20: - 2writetext UnknownText_0xa1d5f + writetext UnknownText_0xa1d5f end UnknownScript_0xa0c24: - 2writetext UnknownText_0xa1e2f + writetext UnknownText_0xa1e2f end ; a0c28 diff --git a/engine/events.asm b/engine/events.asm index ea7b996aa..708707eb7 100644 --- a/engine/events.asm +++ b/engine/events.asm @@ -929,13 +929,13 @@ CheckMenuOW: ; 96b30 StartMenuScript: ; 96b58 - 3callasm StartMenu - 2jump StartMenuCallback + callasm StartMenu + jump StartMenuCallback ; 96b5f SelectMenuScript: ; 96b5f - 3callasm SelectMenu - 2jump SelectMenuCallback + callasm SelectMenu + jump SelectMenuCallback ; 96b66 StartMenuCallback: @@ -947,11 +947,11 @@ SelectMenuCallback: ; 96b66 ; 96b72 .Script ; 96b72 - 2ptjump $d0e8 + ptjump $d0e8 ; 96b75 .Asm ; 96b75 - 2ptcallasm $d0e8 + ptcallasm $d0e8 end ; 96b79 @@ -1081,7 +1081,7 @@ UnknownScript_0x96c2e: ; 96c2e ; 96c2f UnknownScript_0x96c2f: ; 96c2f - 3callasm Function16f5e + callasm Function16f5e end ; 96c34 @@ -1096,7 +1096,7 @@ FallIntoMapScript: ; 96c38 playsound SFX_KINESIS applymovement $0, MovementData_0x96c48 playsound SFX_STRENGTH - 2call UnknownScript_0x96c4a + scall UnknownScript_0x96c4a end ; 96c48 @@ -1116,7 +1116,7 @@ UnknownScript_0x96c4d: ; 96c4d UnknownScript_0x96c4f: ; 96c4f deactivatefacing $3 - 3callasm Function96706 + callasm Function96706 end ; 96c56 diff --git a/engine/fruit_trees.asm b/engine/fruit_trees.asm index 202f077e6..34f2fd4d6 100644 --- a/engine/fruit_trees.asm +++ b/engine/fruit_trees.asm @@ -1,32 +1,32 @@ FruitTreeScript:: ; 44000 - 3callasm GetCurTreeFruit + callasm GetCurTreeFruit loadfont copybytetovar CurFruit itemtotext $0, $0 - 2writetext FruitBearingTreeText + writetext FruitBearingTreeText keeptextopen - 3callasm TryResetFruitTrees - 3callasm CheckFruitTree + callasm TryResetFruitTrees + callasm CheckFruitTree iffalse .fruit - 2writetext NothingHereText + writetext NothingHereText closetext - 2jump .end + jump .end .fruit - 2writetext HeyItsFruitText + writetext HeyItsFruitText copybytetovar CurFruit giveitem $ff, 1 iffalse .packisfull keeptextopen - 2writetext ObtainedFruitText - 3callasm PickedFruitTree + writetext ObtainedFruitText + callasm PickedFruitTree specialsound itemnotify - 2jump .end + jump .end .packisfull keeptextopen - 2writetext FruitPackIsFullText + writetext FruitPackIsFullText closetext .end diff --git a/engine/more_phone_scripts.asm b/engine/more_phone_scripts.asm index e9874b473..55b5f98c3 100644 --- a/engine/more_phone_scripts.asm +++ b/engine/more_phone_scripts.asm @@ -1,58 +1,58 @@ UnknownScript_0xa0000: special $005d - 3call UnknownScript_0xbde3f + farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xa0013 - 3call UnknownScript_0xbe51e - 3jump UnknownScript_0xa003e + farscall UnknownScript_0xbe51e + farjump UnknownScript_0xa003e UnknownScript_0xa0013: - 3jump UnknownScript_0xa002e + farjump UnknownScript_0xa002e UnknownScript_0xa0017: special $005d - 3call UnknownScript_0xbde3f + farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xa002a - 3call UnknownScript_0xbe5d0 - 3jump UnknownScript_0xa0055 + farscall UnknownScript_0xbe5d0 + farjump UnknownScript_0xa0055 UnknownScript_0xa002a: - 3jump UnknownScript_0xa0036 + farjump UnknownScript_0xa0036 UnknownScript_0xa002e: - 3call UnknownScript_0xa007c - 3jump UnknownScript_0xa003e + farscall UnknownScript_0xa007c + farjump UnknownScript_0xa003e UnknownScript_0xa0036: - 3call UnknownScript_0xa0128 - 3jump UnknownScript_0xa0055 + farscall UnknownScript_0xa0128 + farjump UnknownScript_0xa0055 UnknownScript_0xa003e: special $005c - 3call UnknownScript_0xbde3f + farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xa0051 - 3call UnknownScript_0xa017a - 3jump UnknownScript_0xa0484 + farscall UnknownScript_0xa017a + farjump UnknownScript_0xa0484 UnknownScript_0xa0051: - 3jump UnknownScript_0xa006c + farjump UnknownScript_0xa006c UnknownScript_0xa0055: special $005c - 3call UnknownScript_0xbde3f + farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xa0068 - 3call UnknownScript_0xa0226 - 3jump UnknownScript_0xa053a + farscall UnknownScript_0xa0226 + farjump UnknownScript_0xa053a UnknownScript_0xa0068: - 3jump UnknownScript_0xa0074 + farjump UnknownScript_0xa0074 UnknownScript_0xa006c: - 3call UnknownScript_0xa0278 - 3jump UnknownScript_0xa0484 + farscall UnknownScript_0xa0278 + farjump UnknownScript_0xa0484 UnknownScript_0xa0074: - 3call UnknownScript_0xa0324 - 3jump UnknownScript_0xa053a + farscall UnknownScript_0xa0324 + farjump UnknownScript_0xa053a UnknownScript_0xa007c: checkcode $17 @@ -75,87 +75,87 @@ UnknownScript_0xa007c: if_equal $23, UnknownScript_0xa0122 UnknownScript_0xa00c2: - 3writetext UnknownText_0x1740c0 + farwritetext UnknownText_0x1740c0 keeptextopen end UnknownScript_0xa00c8: - 3writetext UnknownText_0x174a24 + farwritetext UnknownText_0x174a24 keeptextopen end UnknownScript_0xa00ce: - 3writetext UnknownText_0x174f2f + farwritetext UnknownText_0x174f2f keeptextopen end UnknownScript_0xa00d4: - 3writetext UnknownText_0x175530 + farwritetext UnknownText_0x175530 keeptextopen end UnknownScript_0xa00da: - 3writetext UnknownText_0x1757d4 + farwritetext UnknownText_0x1757d4 keeptextopen end UnknownScript_0xa00e0: - 3writetext UnknownText_0x175bc4 + farwritetext UnknownText_0x175bc4 keeptextopen end UnknownScript_0xa00e6: - 3writetext UnknownText_0x176a2f + farwritetext UnknownText_0x176a2f keeptextopen end UnknownScript_0xa00ec: - 3writetext UnknownText_0x176e5d + farwritetext UnknownText_0x176e5d keeptextopen end UnknownScript_0xa00f2: - 3writetext UnknownText_0x649dc + farwritetext UnknownText_0x649dc keeptextopen end UnknownScript_0xa00f8: - 3writetext UnknownText_0x64cbd + farwritetext UnknownText_0x64cbd keeptextopen end UnknownScript_0xa00fe: - 3writetext UnknownText_0x65271 + farwritetext UnknownText_0x65271 keeptextopen end UnknownScript_0xa0104: - 3writetext UnknownText_0x65ab2 + farwritetext UnknownText_0x65ab2 keeptextopen end UnknownScript_0xa010a: - 3writetext UnknownText_0x65de4 + farwritetext UnknownText_0x65de4 keeptextopen end UnknownScript_0xa0110: - 3writetext UnknownText_0x660be + farwritetext UnknownText_0x660be keeptextopen end UnknownScript_0xa0116: - 3writetext UnknownText_0x66980 + farwritetext UnknownText_0x66980 keeptextopen end UnknownScript_0xa011c: - 3writetext UnknownText_0x66afc + farwritetext UnknownText_0x66afc keeptextopen end UnknownScript_0xa0122: - 3writetext UnknownText_0x66f9f + farwritetext UnknownText_0x66f9f keeptextopen end @@ -171,42 +171,42 @@ UnknownScript_0xa0128: if_equal $24, UnknownScript_0xa0174 UnknownScript_0xa014a: - 3writetext UnknownText_0x174688 + farwritetext UnknownText_0x174688 keeptextopen end UnknownScript_0xa0150: - 3writetext UnknownText_0x174c7f + farwritetext UnknownText_0x174c7f keeptextopen end UnknownScript_0xa0156: - 3writetext UnknownText_0x1752f5 + farwritetext UnknownText_0x1752f5 keeptextopen end UnknownScript_0xa015c: - 3writetext UnknownText_0x175fda + farwritetext UnknownText_0x175fda keeptextopen end UnknownScript_0xa0162: - 3writetext UnknownText_0x1771fd + farwritetext UnknownText_0x1771fd keeptextopen end UnknownScript_0xa0168: - 3writetext UnknownText_0x64f74 + farwritetext UnknownText_0x64f74 keeptextopen end UnknownScript_0xa016e: - 3writetext UnknownText_0x665ad + farwritetext UnknownText_0x665ad keeptextopen end UnknownScript_0xa0174: - 3writetext UnknownText_0x6717a + farwritetext UnknownText_0x6717a keeptextopen end @@ -231,87 +231,87 @@ UnknownScript_0xa017a: if_equal $23, UnknownScript_0xa0220 UnknownScript_0xa01c0: - 3writetext UnknownText_0x174106 + farwritetext UnknownText_0x174106 keeptextopen end UnknownScript_0xa01c6: - 3writetext UnknownText_0x174a80 + farwritetext UnknownText_0x174a80 keeptextopen end UnknownScript_0xa01cc: - 3writetext UnknownText_0x174f90 + farwritetext UnknownText_0x174f90 keeptextopen end UnknownScript_0xa01d2: - 3writetext UnknownText_0x175591 + farwritetext UnknownText_0x175591 keeptextopen end UnknownScript_0xa01d8: - 3writetext UnknownText_0x175869 + farwritetext UnknownText_0x175869 keeptextopen end UnknownScript_0xa01de: - 3writetext UnknownText_0x175c24 + farwritetext UnknownText_0x175c24 keeptextopen end UnknownScript_0xa01e4: - 3writetext UnknownText_0x176aef + farwritetext UnknownText_0x176aef keeptextopen end UnknownScript_0xa01ea: - 3writetext UnknownText_0x176e9c + farwritetext UnknownText_0x176e9c keeptextopen end UnknownScript_0xa01f0: - 3writetext UnknownText_0x64a13 + farwritetext UnknownText_0x64a13 keeptextopen end UnknownScript_0xa01f6: - 3writetext UnknownText_0x64cf3 + farwritetext UnknownText_0x64cf3 keeptextopen end UnknownScript_0xa01fc: - 3writetext UnknownText_0x65318 + farwritetext UnknownText_0x65318 keeptextopen end UnknownScript_0xa0202: - 3writetext UnknownText_0x65b29 + farwritetext UnknownText_0x65b29 keeptextopen end UnknownScript_0xa0208: - 3writetext UnknownText_0x65e42 + farwritetext UnknownText_0x65e42 keeptextopen end UnknownScript_0xa020e: - 3writetext UnknownText_0x6613c + farwritetext UnknownText_0x6613c keeptextopen end UnknownScript_0xa0214: - 3writetext UnknownText_0x669b2 + farwritetext UnknownText_0x669b2 keeptextopen end UnknownScript_0xa021a: - 3writetext UnknownText_0x66b3e + farwritetext UnknownText_0x66b3e keeptextopen end UnknownScript_0xa0220: - 3writetext UnknownText_0x66fc0 + farwritetext UnknownText_0x66fc0 keeptextopen end @@ -327,42 +327,42 @@ UnknownScript_0xa0226: if_equal $24, UnknownScript_0xa0272 UnknownScript_0xa0248: - 3writetext UnknownText_0x1746c3 + farwritetext UnknownText_0x1746c3 keeptextopen end UnknownScript_0xa024e: - 3writetext UnknownText_0x174cf6 + farwritetext UnknownText_0x174cf6 keeptextopen end UnknownScript_0xa0254: - 3writetext UnknownText_0x17536b + farwritetext UnknownText_0x17536b keeptextopen end UnknownScript_0xa025a: - 3writetext UnknownText_0x17602d + farwritetext UnknownText_0x17602d keeptextopen end UnknownScript_0xa0260: - 3writetext UnknownText_0x177237 + farwritetext UnknownText_0x177237 keeptextopen end UnknownScript_0xa0266: - 3writetext UnknownText_0x64fb2 + farwritetext UnknownText_0x64fb2 keeptextopen end UnknownScript_0xa026c: - 3writetext UnknownText_0x66605 + farwritetext UnknownText_0x66605 keeptextopen end UnknownScript_0xa0272: - 3writetext UnknownText_0x671a4 + farwritetext UnknownText_0x671a4 keeptextopen end @@ -387,87 +387,87 @@ UnknownScript_0xa0278: if_equal $23, UnknownScript_0xa031e UnknownScript_0xa02be: - 3writetext UnknownText_0x174165 + farwritetext UnknownText_0x174165 keeptextopen end UnknownScript_0xa02c4: - 3writetext UnknownText_0x174b2d + farwritetext UnknownText_0x174b2d keeptextopen end UnknownScript_0xa02ca: - 3writetext UnknownText_0x174ffd + farwritetext UnknownText_0x174ffd keeptextopen end UnknownScript_0xa02d0: - 3writetext UnknownText_0x175611 + farwritetext UnknownText_0x175611 keeptextopen end UnknownScript_0xa02d6: - 3writetext UnknownText_0x1758e4 + farwritetext UnknownText_0x1758e4 keeptextopen end UnknownScript_0xa02dc: - 3writetext UnknownText_0x175c9f + farwritetext UnknownText_0x175c9f keeptextopen end UnknownScript_0xa02e2: - 3writetext UnknownText_0x176b45 + farwritetext UnknownText_0x176b45 keeptextopen end UnknownScript_0xa02e8: - 3writetext UnknownText_0x176eee + farwritetext UnknownText_0x176eee keeptextopen end UnknownScript_0xa02ee: - 3writetext UnknownText_0x64a71 + farwritetext UnknownText_0x64a71 keeptextopen end UnknownScript_0xa02f4: - 3writetext UnknownText_0x64d4f + farwritetext UnknownText_0x64d4f keeptextopen end UnknownScript_0xa02fa: - 3writetext UnknownText_0x65399 + farwritetext UnknownText_0x65399 keeptextopen end UnknownScript_0xa0300: - 3writetext UnknownText_0x65bc8 + farwritetext UnknownText_0x65bc8 keeptextopen end UnknownScript_0xa0306: - 3writetext UnknownText_0x65eac + farwritetext UnknownText_0x65eac keeptextopen end UnknownScript_0xa030c: - 3writetext UnknownText_0x6618c + farwritetext UnknownText_0x6618c keeptextopen end UnknownScript_0xa0312: - 3writetext UnknownText_0x669ed + farwritetext UnknownText_0x669ed keeptextopen end UnknownScript_0xa0318: - 3writetext UnknownText_0x66b8f + farwritetext UnknownText_0x66b8f keeptextopen end UnknownScript_0xa031e: - 3writetext UnknownText_0x67001 + farwritetext UnknownText_0x67001 keeptextopen end @@ -483,52 +483,52 @@ UnknownScript_0xa0324: if_equal $24, UnknownScript_0xa0370 UnknownScript_0xa0346: - 3writetext UnknownText_0x174734 + farwritetext UnknownText_0x174734 keeptextopen end UnknownScript_0xa034c: - 3writetext UnknownText_0x174d86 + farwritetext UnknownText_0x174d86 keeptextopen end UnknownScript_0xa0352: - 3writetext UnknownText_0x1753c5 + farwritetext UnknownText_0x1753c5 keeptextopen end UnknownScript_0xa0358: - 3writetext UnknownText_0x176095 + farwritetext UnknownText_0x176095 keeptextopen end UnknownScript_0xa035e: - 3writetext UnknownText_0x177297 + farwritetext UnknownText_0x177297 keeptextopen end UnknownScript_0xa0364: - 3writetext UnknownText_0x6501c + farwritetext UnknownText_0x6501c keeptextopen end UnknownScript_0xa036a: - 3writetext UnknownText_0x66688 + farwritetext UnknownText_0x66688 keeptextopen end UnknownScript_0xa0370: - 3writetext UnknownText_0x671eb + farwritetext UnknownText_0x671eb keeptextopen end UnknownScript_0xa0376: - 3call UnknownScript_0xa0386 - 3jump UnknownScript_0xa0484 + farscall UnknownScript_0xa0386 + farjump UnknownScript_0xa0484 UnknownScript_0xa037e: - 3call UnknownScript_0xa0432 - 3jump UnknownScript_0xa053a + farscall UnknownScript_0xa0432 + farjump UnknownScript_0xa053a UnknownScript_0xa0386: checkcode $17 @@ -551,87 +551,87 @@ UnknownScript_0xa0386: if_equal $23, UnknownScript_0xa042c UnknownScript_0xa03cc: - 3writetext UnknownText_0x1741e1 + farwritetext UnknownText_0x1741e1 keeptextopen end UnknownScript_0xa03d2: - 3writetext UnknownText_0x1748ea + farwritetext UnknownText_0x1748ea keeptextopen end UnknownScript_0xa03d8: - 3writetext UnknownText_0x174bc5 + farwritetext UnknownText_0x174bc5 keeptextopen end UnknownScript_0xa03de: - 3writetext UnknownText_0x17507d + farwritetext UnknownText_0x17507d keeptextopen end UnknownScript_0xa03e4: - 3writetext UnknownText_0x175693 + farwritetext UnknownText_0x175693 keeptextopen end UnknownScript_0xa03ea: - 3writetext UnknownText_0x175976 + farwritetext UnknownText_0x175976 keeptextopen end UnknownScript_0xa03f0: - 3writetext UnknownText_0x175d40 + farwritetext UnknownText_0x175d40 keeptextopen end UnknownScript_0xa03f6: - 3writetext UnknownText_0x176bee + farwritetext UnknownText_0x176bee keeptextopen end UnknownScript_0xa03fc: - 3writetext UnknownText_0x176f60 + farwritetext UnknownText_0x176f60 keeptextopen end UnknownScript_0xa0402: - 3writetext UnknownText_0x64ada + farwritetext UnknownText_0x64ada keeptextopen end UnknownScript_0xa0408: - 3writetext UnknownText_0x64da4 + farwritetext UnknownText_0x64da4 keeptextopen end UnknownScript_0xa040e: - 3writetext UnknownText_0x65419 + farwritetext UnknownText_0x65419 keeptextopen end UnknownScript_0xa0414: - 3writetext UnknownText_0x65f17 + farwritetext UnknownText_0x65f17 keeptextopen end UnknownScript_0xa041a: - 3writetext UnknownText_0x66214 + farwritetext UnknownText_0x66214 keeptextopen end UnknownScript_0xa0420: - 3writetext UnknownText_0x66a3a + farwritetext UnknownText_0x66a3a keeptextopen end UnknownScript_0xa0426: - 3writetext UnknownText_0x66bf3 + farwritetext UnknownText_0x66bf3 keeptextopen end UnknownScript_0xa042c: - 3writetext UnknownText_0x67096 + farwritetext UnknownText_0x67096 keeptextopen end @@ -646,46 +646,46 @@ UnknownScript_0xa0432: if_equal $24, UnknownScript_0xa0474 UnknownScript_0xa0450: - 3writetext UnknownText_0x174e4e + farwritetext UnknownText_0x174e4e keeptextopen end UnknownScript_0xa0456: - 3writetext UnknownText_0x17543a + farwritetext UnknownText_0x17543a keeptextopen end UnknownScript_0xa045c: - 3writetext UnknownText_0x17610a + farwritetext UnknownText_0x17610a keeptextopen end UnknownScript_0xa0462: - 3writetext UnknownText_0x1772e2 + farwritetext UnknownText_0x1772e2 keeptextopen end UnknownScript_0xa0468: - 3writetext UnknownText_0x65091 + farwritetext UnknownText_0x65091 keeptextopen end UnknownScript_0xa046e: - 3writetext UnknownText_0x66730 + farwritetext UnknownText_0x66730 keeptextopen end UnknownScript_0xa0474: - 3writetext UnknownText_0x6722e + farwritetext UnknownText_0x6722e keeptextopen end UnknownScript_0xa047a: - 3writetext UnknownText_0x1761a7 + farwritetext UnknownText_0x1761a7 end UnknownScript_0xa047f: - 3writetext UnknownText_0x66796 + farwritetext UnknownText_0x66796 end UnknownScript_0xa0484: @@ -712,83 +712,83 @@ UnknownScript_0xa0484: if_equal $23, UnknownScript_0xa0535 UnknownScript_0xa04d6: - 3writetext UnknownText_0x174251 + farwritetext UnknownText_0x174251 end UnknownScript_0xa04db: - 3writetext UnknownText_0x174962 + farwritetext UnknownText_0x174962 end UnknownScript_0xa04e0: - 3writetext UnknownText_0x174c0e + farwritetext UnknownText_0x174c0e end UnknownScript_0xa04e5: - 3writetext UnknownText_0x175106 + farwritetext UnknownText_0x175106 end UnknownScript_0xa04ea: - 3writetext UnknownText_0x17570a + farwritetext UnknownText_0x17570a end UnknownScript_0xa04ef: - 3writetext UnknownText_0x1759e7 + farwritetext UnknownText_0x1759e7 end UnknownScript_0xa04f4: - 3writetext UnknownText_0x175db7 + farwritetext UnknownText_0x175db7 end UnknownScript_0xa04f9: - 3writetext UnknownText_0x176c47 + farwritetext UnknownText_0x176c47 end UnknownScript_0xa04fe: - 3writetext UnknownText_0x176fdb + farwritetext UnknownText_0x176fdb end UnknownScript_0xa0503: - 3writetext UnknownText_0x64000 + farwritetext UnknownText_0x64000 end UnknownScript_0xa0508: - 3writetext UnknownText_0x64b48 + farwritetext UnknownText_0x64b48 end UnknownScript_0xa050d: - 3writetext UnknownText_0x64e1f + farwritetext UnknownText_0x64e1f end UnknownScript_0xa0512: - 3writetext UnknownText_0x65471 + farwritetext UnknownText_0x65471 end UnknownScript_0xa0517: - 3writetext UnknownText_0x65c4e + farwritetext UnknownText_0x65c4e end UnknownScript_0xa051c: - 3writetext UnknownText_0x65f6e + farwritetext UnknownText_0x65f6e end UnknownScript_0xa0521: - 3writetext UnknownText_0x662a9 + farwritetext UnknownText_0x662a9 end UnknownScript_0xa0526: - 3writetext UnknownText_0x66a93 + farwritetext UnknownText_0x66a93 end UnknownScript_0xa052b: - 3writetext UnknownText_0x66c58 + farwritetext UnknownText_0x66c58 end UnknownScript_0xa0530: - 3writetext UnknownText_0x66dab + farwritetext UnknownText_0x66dab end UnknownScript_0xa0535: - 3writetext UnknownText_0x670eb + farwritetext UnknownText_0x670eb end UnknownScript_0xa053a: @@ -803,52 +803,52 @@ UnknownScript_0xa053a: if_equal $24, UnknownScript_0xa057f UnknownScript_0xa055c: - 3writetext UnknownText_0x1747ac + farwritetext UnknownText_0x1747ac end UnknownScript_0xa0561: - 3writetext UnknownText_0x174eb7 + farwritetext UnknownText_0x174eb7 end UnknownScript_0xa0566: - 3writetext UnknownText_0x175488 + farwritetext UnknownText_0x175488 end UnknownScript_0xa056b: - 3writetext UnknownText_0x17620a + farwritetext UnknownText_0x17620a end UnknownScript_0xa0570: - 3writetext UnknownText_0x177361 + farwritetext UnknownText_0x177361 end UnknownScript_0xa0575: - 3writetext UnknownText_0x650e2 + farwritetext UnknownText_0x650e2 end UnknownScript_0xa057a: - 3writetext UnknownText_0x667f7 + farwritetext UnknownText_0x667f7 end UnknownScript_0xa057f: - 3writetext UnknownText_0x67281 + farwritetext UnknownText_0x67281 end UnknownScript_0xa0584: - 2call UnknownScript_0xa05a0 + scall UnknownScript_0xa05a0 iffalse UnknownScript_0xa058e - 3jump UnknownScript_0xa0000 + farjump UnknownScript_0xa0000 UnknownScript_0xa058e: - 3jump UnknownScript_0xa0484 + farjump UnknownScript_0xa0484 UnknownScript_0xa0592: - 2call UnknownScript_0xa05a0 + scall UnknownScript_0xa05a0 iffalse UnknownScript_0xa059c - 3jump UnknownScript_0xa0017 + farjump UnknownScript_0xa0017 UnknownScript_0xa059c: - 3jump UnknownScript_0xa053a + farjump UnknownScript_0xa053a UnknownScript_0xa05a0: special $005b @@ -860,39 +860,39 @@ UnknownScript_0xa05a4: if_equal $1c, UnknownScript_0xa05b6 UnknownScript_0xa05ae: - 3writetext UnknownText_0x1759f7 + farwritetext UnknownText_0x1759f7 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa05b6: - 3writetext UnknownText_0x65c66 + farwritetext UnknownText_0x65c66 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa05be: - 3writetext UnknownText_0x64032 + farwritetext UnknownText_0x64032 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa05c6: - 3writetext UnknownText_0x177378 + farwritetext UnknownText_0x177378 keeptextopen - 2jump UnknownScript_0xa053a + jump UnknownScript_0xa053a UnknownScript_0xa05ce: - 3writetext UnknownText_0x64b5f + farwritetext UnknownText_0x64b5f keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa05d6: - 3writetext UnknownText_0x175dd9 + farwritetext UnknownText_0x175dd9 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa05de: - 3writetext UnknownText_0x176c61 + farwritetext UnknownText_0x176c61 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa05e6: checkcode $17 @@ -904,27 +904,27 @@ UnknownScript_0xa05e6: if_equal $21, UnknownScript_0xa0619 UnknownScript_0xa0600: - 3writetext UnknownText_0x175116 + farwritetext UnknownText_0x175116 end UnknownScript_0xa0605: - 3writetext UnknownText_0x175a60 + farwritetext UnknownText_0x175a60 end UnknownScript_0xa060a: - 3writetext UnknownText_0x64e2f + farwritetext UnknownText_0x64e2f end UnknownScript_0xa060f: - 3writetext UnknownText_0x65cf9 + farwritetext UnknownText_0x65cf9 end UnknownScript_0xa0614: - 3writetext UnknownText_0x65f88 + farwritetext UnknownText_0x65f88 end UnknownScript_0xa0619: - 3writetext UnknownText_0x66c6b + farwritetext UnknownText_0x66c6b end UnknownScript_0xa061e: @@ -935,30 +935,30 @@ UnknownScript_0xa061e: if_equal $1f, UnknownScript_0xa063f UnknownScript_0xa0630: - 3writetext UnknownText_0x1747cc + farwritetext UnknownText_0x1747cc end UnknownScript_0xa0635: - 3writetext UnknownText_0x1773e7 + farwritetext UnknownText_0x1773e7 end UnknownScript_0xa063a: - 3writetext UnknownText_0x650ec + farwritetext UnknownText_0x650ec end UnknownScript_0xa063f: - 3writetext UnknownText_0x66801 + farwritetext UnknownText_0x66801 end UnknownScript_0xa0644: - 3writetext UnknownText_0x176feb + farwritetext UnknownText_0x176feb keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa064c: - 3writetext UnknownText_0x66dc5 + farwritetext UnknownText_0x66dc5 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa0654: random $b @@ -975,59 +975,59 @@ UnknownScript_0xa0654: if_equal $a, UnknownScript_0xa06d2 UnknownScript_0xa0682: - 3writetext UnknownText_0x174261 + farwritetext UnknownText_0x174261 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa068a: - 3writetext UnknownText_0x17429d + farwritetext UnknownText_0x17429d keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa0692: - 3writetext UnknownText_0x1742ee + farwritetext UnknownText_0x1742ee keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa069a: - 3writetext UnknownText_0x174340 + farwritetext UnknownText_0x174340 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa06a2: - 3writetext UnknownText_0x174391 + farwritetext UnknownText_0x174391 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa06aa: - 3writetext UnknownText_0x1743e3 + farwritetext UnknownText_0x1743e3 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa06b2: - 3writetext UnknownText_0x174433 + farwritetext UnknownText_0x174433 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa06ba: - 3writetext UnknownText_0x174485 + farwritetext UnknownText_0x174485 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa06c2: - 3writetext UnknownText_0x1744d6 + farwritetext UnknownText_0x1744d6 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa06ca: - 3writetext UnknownText_0x174522 + farwritetext UnknownText_0x174522 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa06d2: - 3writetext UnknownText_0x174571 + farwritetext UnknownText_0x174571 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa06da: random $a @@ -1043,54 +1043,54 @@ UnknownScript_0xa06da: if_equal $9, UnknownScript_0xa074c UnknownScript_0xa0704: - 3writetext UnknownText_0x176223 + farwritetext UnknownText_0x176223 keeptextopen - 2jump UnknownScript_0xa053a + jump UnknownScript_0xa053a UnknownScript_0xa070c: - 3writetext UnknownText_0x1762c3 + farwritetext UnknownText_0x1762c3 keeptextopen - 2jump UnknownScript_0xa053a + jump UnknownScript_0xa053a UnknownScript_0xa0714: - 3writetext UnknownText_0x17638a + farwritetext UnknownText_0x17638a keeptextopen - 2jump UnknownScript_0xa053a + jump UnknownScript_0xa053a UnknownScript_0xa071c: - 3writetext UnknownText_0x176424 + farwritetext UnknownText_0x176424 keeptextopen - 2jump UnknownScript_0xa053a + jump UnknownScript_0xa053a UnknownScript_0xa0724: - 3writetext UnknownText_0x1764eb + farwritetext UnknownText_0x1764eb keeptextopen - 2jump UnknownScript_0xa053a + jump UnknownScript_0xa053a UnknownScript_0xa072c: - 3writetext UnknownText_0x176599 + farwritetext UnknownText_0x176599 keeptextopen - 2jump UnknownScript_0xa053a + jump UnknownScript_0xa053a UnknownScript_0xa0734: - 3writetext UnknownText_0x1766ac + farwritetext UnknownText_0x1766ac keeptextopen - 2jump UnknownScript_0xa053a + jump UnknownScript_0xa053a UnknownScript_0xa073c: - 3writetext UnknownText_0x17674f + farwritetext UnknownText_0x17674f keeptextopen - 2jump UnknownScript_0xa053a + jump UnknownScript_0xa053a UnknownScript_0xa0744: - 3writetext UnknownText_0x176816 + farwritetext UnknownText_0x176816 keeptextopen - 2jump UnknownScript_0xa053a + jump UnknownScript_0xa053a UnknownScript_0xa074c: - 3writetext UnknownText_0x17686d + farwritetext UnknownText_0x17686d keeptextopen - 2jump UnknownScript_0xa053a + jump UnknownScript_0xa053a UnknownScript_0xa0754: random $a @@ -1106,54 +1106,54 @@ UnknownScript_0xa0754: if_equal $9, UnknownScript_0xa07c6 UnknownScript_0xa077e: - 3writetext UnknownText_0x65481 + farwritetext UnknownText_0x65481 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa0786: - 3writetext UnknownText_0x654ea + farwritetext UnknownText_0x654ea keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa078e: - 3writetext UnknownText_0x65555 + farwritetext UnknownText_0x65555 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa0796: - 3writetext UnknownText_0x655c7 + farwritetext UnknownText_0x655c7 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa079e: - 3writetext UnknownText_0x65628 + farwritetext UnknownText_0x65628 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa07a6: - 3writetext UnknownText_0x6569b + farwritetext UnknownText_0x6569b keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa07ae: - 3writetext UnknownText_0x6574a + farwritetext UnknownText_0x6574a keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa07b6: - 3writetext UnknownText_0x65810 + farwritetext UnknownText_0x65810 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa07be: - 3writetext UnknownText_0x658c6 + farwritetext UnknownText_0x658c6 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa07c6: - 3writetext UnknownText_0x65969 + farwritetext UnknownText_0x65969 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa07ce: random $a @@ -1169,54 +1169,54 @@ UnknownScript_0xa07ce: if_equal $9, UnknownScript_0xa0840 UnknownScript_0xa07f8: - 3writetext UnknownText_0x662bc + farwritetext UnknownText_0x662bc keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa0800: - 3writetext UnknownText_0x662fc + farwritetext UnknownText_0x662fc keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa0808: - 3writetext UnknownText_0x66335 + farwritetext UnknownText_0x66335 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa0810: - 3writetext UnknownText_0x66366 + farwritetext UnknownText_0x66366 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa0818: - 3writetext UnknownText_0x663a1 + farwritetext UnknownText_0x663a1 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa0820: - 3writetext UnknownText_0x663e6 + farwritetext UnknownText_0x663e6 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa0828: - 3writetext UnknownText_0x66421 + farwritetext UnknownText_0x66421 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa0830: - 3writetext UnknownText_0x6645f + farwritetext UnknownText_0x6645f keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa0838: - 3writetext UnknownText_0x6649b + farwritetext UnknownText_0x6649b keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa0840: - 3writetext UnknownText_0x664dd + farwritetext UnknownText_0x664dd keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa0848: checkevent $074f @@ -1243,199 +1243,199 @@ UnknownScript_0xa0848: iftrue UnknownScript_0xa08e8 checkflag ENGINE_PLAINBADGE iftrue UnknownScript_0xa0898 - 3writetext UnknownText_0x646a3 + farwritetext UnknownText_0x646a3 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa0898: - 3writetext UnknownText_0x64099 + farwritetext UnknownText_0x64099 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa08a0: - 3writetext UnknownText_0x640e6 + farwritetext UnknownText_0x640e6 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa08a8: - 3writetext UnknownText_0x6416d + farwritetext UnknownText_0x6416d keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa08b0: - 3writetext UnknownText_0x641e8 + farwritetext UnknownText_0x641e8 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa08b8: - 3writetext UnknownText_0x64247 + farwritetext UnknownText_0x64247 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa08c0: - 3writetext UnknownText_0x642bb + farwritetext UnknownText_0x642bb keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa08c8: - 3writetext UnknownText_0x643d4 + farwritetext UnknownText_0x643d4 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa08d0: - 3writetext UnknownText_0x64448 + farwritetext UnknownText_0x64448 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa08d8: - 3writetext UnknownText_0x6455b + farwritetext UnknownText_0x6455b keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa08e0: - 3writetext UnknownText_0x645ff + farwritetext UnknownText_0x645ff keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa08e8: - 3writetext UnknownText_0x646df + farwritetext UnknownText_0x646df keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa08f0: - 3writetext UnknownText_0x647d8 + farwritetext UnknownText_0x647d8 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa08f8: - 3writetext UnknownText_0x1745c2 + farwritetext UnknownText_0x1745c2 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa0900: - 3writetext UnknownText_0x17485b + farwritetext UnknownText_0x17485b keeptextopen - 2jump UnknownScript_0xa053a + jump UnknownScript_0xa053a UnknownScript_0xa0908: - 3writetext UnknownText_0x17496b + farwritetext UnknownText_0x17496b keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa0910: - 3writetext UnknownText_0x174c29 + farwritetext UnknownText_0x174c29 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa0918: - 3writetext UnknownText_0x174ec5 + farwritetext UnknownText_0x174ec5 keeptextopen - 2jump UnknownScript_0xa053a + jump UnknownScript_0xa053a UnknownScript_0xa0920: - 3writetext UnknownText_0x17519b + farwritetext UnknownText_0x17519b keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa0928: - 3writetext UnknownText_0x17549b + farwritetext UnknownText_0x17549b keeptextopen - 2jump UnknownScript_0xa053a + jump UnknownScript_0xa053a UnknownScript_0xa0930: - 3writetext UnknownText_0x17571d + farwritetext UnknownText_0x17571d keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa0938: - 3writetext UnknownText_0x175abe + farwritetext UnknownText_0x175abe keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa0940: - 3writetext UnknownText_0x175eaf + farwritetext UnknownText_0x175eaf keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa0948: - 3writetext UnknownText_0x1768b0 + farwritetext UnknownText_0x1768b0 keeptextopen - 2jump UnknownScript_0xa053a + jump UnknownScript_0xa053a UnknownScript_0xa0950: - 3writetext UnknownText_0x176d32 + farwritetext UnknownText_0x176d32 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa0958: - 3writetext UnknownText_0x1770fb + farwritetext UnknownText_0x1770fb keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa0960: - 3writetext UnknownText_0x177465 + farwritetext UnknownText_0x177465 keeptextopen - 2jump UnknownScript_0xa053a + jump UnknownScript_0xa053a UnknownScript_0xa0968: - 3writetext UnknownText_0x64bc6 + farwritetext UnknownText_0x64bc6 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa0970: - 3writetext UnknownText_0x64e90 + farwritetext UnknownText_0x64e90 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa0978: - 3writetext UnknownText_0x65161 + farwritetext UnknownText_0x65161 keeptextopen - 2jump UnknownScript_0xa053a + jump UnknownScript_0xa053a UnknownScript_0xa0980: - 3writetext UnknownText_0x65a23 + farwritetext UnknownText_0x65a23 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa0988: - 3writetext UnknownText_0x65d5c + farwritetext UnknownText_0x65d5c keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa0990: - 3writetext UnknownText_0x65ff2 + farwritetext UnknownText_0x65ff2 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa0998: - 3writetext UnknownText_0x6651e + farwritetext UnknownText_0x6651e keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa09a0: - 3writetext UnknownText_0x66882 + farwritetext UnknownText_0x66882 keeptextopen - 2jump UnknownScript_0xa053a + jump UnknownScript_0xa053a UnknownScript_0xa09a8: - 3writetext UnknownText_0x66aa5 + farwritetext UnknownText_0x66aa5 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa09b0: - 3writetext UnknownText_0x66ca7 + farwritetext UnknownText_0x66ca7 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa09b8: - 3writetext UnknownText_0x67106 + farwritetext UnknownText_0x67106 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa09c0: - 3writetext UnknownText_0x67294 + farwritetext UnknownText_0x67294 keeptextopen - 2jump UnknownScript_0xa053a + jump UnknownScript_0xa053a UnknownScript_0xa09c8: random $3 @@ -1444,32 +1444,32 @@ UnknownScript_0xa09c8: if_equal $2, UnknownScript_0xa09e6 UnknownScript_0xa09d6: - 3writetext UnknownText_0x64846 + farwritetext UnknownText_0x64846 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa09de: - 3writetext UnknownText_0x64881 + farwritetext UnknownText_0x64881 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa09e6: - 3writetext UnknownText_0x648dc + farwritetext UnknownText_0x648dc keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa09ee: checkcode $1a if_equal $2, UnknownScript_0xa0a00 if_equal $1, UnknownScript_0xa0a08 - 3writetext UnknownText_0x66e17 + farwritetext UnknownText_0x66e17 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa0a00: - 3writetext UnknownText_0x66e67 + farwritetext UnknownText_0x66e67 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa0a08: checktime $1 @@ -1477,184 +1477,184 @@ UnknownScript_0xa0a08: checktime $4 iftrue UnknownScript_0xa0a25 setevent $026a - 3writetext UnknownText_0x66f11 + farwritetext UnknownText_0x66f11 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa0a1d: - 3writetext UnknownText_0x66ed3 + farwritetext UnknownText_0x66ed3 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa0a25: - 3writetext UnknownText_0x66f52 + farwritetext UnknownText_0x66f52 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa0a2d: - 3writetext UnknownText_0x174638 + farwritetext UnknownText_0x174638 end UnknownScript_0xa0a32: - 3writetext UnknownText_0x1749c7 + farwritetext UnknownText_0x1749c7 end UnknownScript_0xa0a37: - 3writetext UnknownText_0x174c49 + farwritetext UnknownText_0x174c49 end UnknownScript_0xa0a3c: - 3writetext UnknownText_0x174ee2 + farwritetext UnknownText_0x174ee2 end UnknownScript_0xa0a41: - 3writetext UnknownText_0x17520a + farwritetext UnknownText_0x17520a end UnknownScript_0xa0a46: - 3writetext UnknownText_0x1754e5 + farwritetext UnknownText_0x1754e5 end UnknownScript_0xa0a4b: - 3writetext UnknownText_0x175786 + farwritetext UnknownText_0x175786 end UnknownScript_0xa0a50: - 3writetext UnknownText_0x175b1e + farwritetext UnknownText_0x175b1e end UnknownScript_0xa0a55: - 3writetext UnknownText_0x175f11 + farwritetext UnknownText_0x175f11 end UnknownScript_0xa0a5a: - 3writetext UnknownText_0x1769da + farwritetext UnknownText_0x1769da end UnknownScript_0xa0a5f: - 3writetext UnknownText_0x176d85 + farwritetext UnknownText_0x176d85 end UnknownScript_0xa0a64: - 3writetext UnknownText_0x177138 + farwritetext UnknownText_0x177138 end UnknownScript_0xa0a69: - 3writetext UnknownText_0x1774c1 + farwritetext UnknownText_0x1774c1 end UnknownScript_0xa0a6e: - 3writetext UnknownText_0x64c13 + farwritetext UnknownText_0x64c13 end UnknownScript_0xa0a73: - 3writetext UnknownText_0x64ed4 + farwritetext UnknownText_0x64ed4 end UnknownScript_0xa0a78: - 3writetext UnknownText_0x651bf + farwritetext UnknownText_0x651bf end UnknownScript_0xa0a7d: - 3writetext UnknownText_0x65a63 + farwritetext UnknownText_0x65a63 end UnknownScript_0xa0a82: - 3writetext UnknownText_0x66043 + farwritetext UnknownText_0x66043 end UnknownScript_0xa0a87: - 3writetext UnknownText_0x66579 + farwritetext UnknownText_0x66579 end UnknownScript_0xa0a8c: - 3writetext UnknownText_0x668a3 + farwritetext UnknownText_0x668a3 end UnknownScript_0xa0a91: - 3writetext UnknownText_0x66ad1 + farwritetext UnknownText_0x66ad1 end UnknownScript_0xa0a96: - 3writetext UnknownText_0x66cf7 + farwritetext UnknownText_0x66cf7 end UnknownScript_0xa0a9b: - 3writetext UnknownText_0x6712a + farwritetext UnknownText_0x6712a end UnknownScript_0xa0aa0: - 3writetext UnknownText_0x672d5 + farwritetext UnknownText_0x672d5 end UnknownScript_0xa0aa5: - 3writetext UnknownText_0x174895 + farwritetext UnknownText_0x174895 keeptextopen - 2jump UnknownScript_0xa053a + jump UnknownScript_0xa053a UnknownScript_0xa0aad: - 3writetext UnknownText_0x17529c + farwritetext UnknownText_0x17529c keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa0ab5: - 3writetext UnknownText_0x175b6d + farwritetext UnknownText_0x175b6d keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa0abd: - 3writetext UnknownText_0x17750e + farwritetext UnknownText_0x17750e keeptextopen - 2jump UnknownScript_0xa053a + jump UnknownScript_0xa053a UnknownScript_0xa0ac5: - 3writetext UnknownText_0x64f1a + farwritetext UnknownText_0x64f1a keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa0acd: - 3writetext UnknownText_0x6520f + farwritetext UnknownText_0x6520f keeptextopen - 2jump UnknownScript_0xa053a + jump UnknownScript_0xa053a UnknownScript_0xa0ad5: - 3writetext UnknownText_0x65da6 + farwritetext UnknownText_0x65da6 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa0add: - 3writetext UnknownText_0x66087 + farwritetext UnknownText_0x66087 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa0ae5: - 3writetext UnknownText_0x6691d + farwritetext UnknownText_0x6691d keeptextopen - 2jump UnknownScript_0xa053a + jump UnknownScript_0xa053a UnknownScript_0xa0aed: - 3writetext UnknownText_0x66d45 + farwritetext UnknownText_0x66d45 keeptextopen - 2jump UnknownScript_0xa0484 + jump UnknownScript_0xa0484 UnknownScript_0xa0af5: - 3writetext UnknownText_0x175f70 + farwritetext UnknownText_0x175f70 end UnknownScript_0xa0afa: - 3writetext UnknownText_0x176dd1 + farwritetext UnknownText_0x176dd1 end UnknownScript_0xa0aff: - 3writetext UnknownText_0x64c5a + farwritetext UnknownText_0x64c5a end UnknownScript_0xa0b04: - 3writetext UnknownText_0x17717c + farwritetext UnknownText_0x17717c end UnknownScript_0xa0b09: - 3writetext UnknownText_0x174000 + farwritetext UnknownText_0x174000 clearflag ENGINE_14 specialphonecall $0000 end diff --git a/engine/phone_scripts.asm b/engine/phone_scripts.asm index 419c232b5..d73a28362 100644 --- a/engine/phone_scripts.asm +++ b/engine/phone_scripts.asm @@ -1,5 +1,5 @@ UnusedPhoneScript: ; 0xbcea5 - 3writetext UnusedPhoneText + farwritetext UnusedPhoneText end MomPhoneScript: ; 0xbceaa @@ -11,23 +11,23 @@ MomPhoneScript: ; 0xbceaa iftrue MomPhoneNoGymQuestScript checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue MomPhoneNoPokedexScript - 2jump MomPhoneNoPokemonScript + jump MomPhoneNoPokemonScript .bcec5 ; 0xbcec5 checkevent $0007 iftrue MomPhoneHangUpScript - 3writetext MomPhoneGreetingText + farwritetext MomPhoneGreetingText keeptextopen mapnametotext $0 checkcode $f if_equal $1, UnknownScript_0xbcee7 if_equal $2, UnknownScript_0xbcf27 - 2jump UnknownScript_0xbcf2f + jump UnknownScript_0xbcf2f UnknownScript_0xbcedf: ; 0xbcedf - 3writetext UnknownText_0x1b4021 + farwritetext UnknownText_0x1b4021 keeptextopen - 2jump UnknownScript_0xbcf37 + jump UnknownScript_0xbcf37 UnknownScript_0xbcee7: ; 0xbcee7 checkcode $c @@ -36,154 +36,154 @@ UnknownScript_0xbcee7: ; 0xbcee7 if_equal GROUP_VIOLET_CITY, .violet if_equal GROUP_AZALEA_TOWN, .azalea if_equal GROUP_GOLDENROD_CITY, .goldenrod - 3writetext MomPhoneGenericAreaText + farwritetext MomPhoneGenericAreaText keeptextopen - 2jump UnknownScript_0xbcf37 + jump UnknownScript_0xbcf37 .newbark ; 0xbcf05 - 3writetext MomPhoneNewBarkText + farwritetext MomPhoneNewBarkText keeptextopen - 2jump UnknownScript_0xbcf37 + jump UnknownScript_0xbcf37 .cherrygrove ; 0xbcf0d - 3writetext MomPhoneCherrygroveText + farwritetext MomPhoneCherrygroveText keeptextopen - 2jump UnknownScript_0xbcf37 + jump UnknownScript_0xbcf37 .violet ; 0xbcf15 displaylocation SPROUT_TOWER, 1 - 2jump UnknownScript_0xbcedf + jump UnknownScript_0xbcedf .azalea ; 0xbcf1b displaylocation SLOWPOKE_WELL, 1 - 2jump UnknownScript_0xbcedf + jump UnknownScript_0xbcedf .goldenrod ; 0xbcf21 displaylocation RADIO_TOWER, 1 - 2jump UnknownScript_0xbcedf + jump UnknownScript_0xbcedf UnknownScript_0xbcf27: ; 0xbcf27 - 3writetext UnknownText_0x1b411c + farwritetext UnknownText_0x1b411c keeptextopen - 2jump UnknownScript_0xbcf37 + jump UnknownScript_0xbcf37 UnknownScript_0xbcf2f: ; 0xbcf2f - 3writetext UnknownText_0x1b4150 + farwritetext UnknownText_0x1b4150 keeptextopen - 2jump UnknownScript_0xbcf37 + jump UnknownScript_0xbcf37 UnknownScript_0xbcf37: ; 0xbcf37 checkflag ENGINE_MOM_SAVING_MONEY iffalse UnknownScript_0xbcf49 checkmoney $1, 0 if_equal $0, UnknownScript_0xbcf55 - 2jump UnknownScript_0xbcf63 + jump UnknownScript_0xbcf63 UnknownScript_0xbcf49: ; 0xbcf49 checkmoney $1, 0 if_equal $0, UnknownScript_0xbcf79 - 2jump UnknownScript_0xbcf6e + jump UnknownScript_0xbcf6e UnknownScript_0xbcf55: ; 0xbcf55 readmoney $1, $0 - 3writetext UnknownText_0x1b41a7 + farwritetext UnknownText_0x1b41a7 yesorno iftrue MomPhoneSaveMoneyScript - 2jump MomPhoneWontSaveMoneyScript + jump MomPhoneWontSaveMoneyScript UnknownScript_0xbcf63: ; 0xbcf63 - 3writetext UnknownText_0x1b41ea + farwritetext UnknownText_0x1b41ea yesorno iftrue MomPhoneSaveMoneyScript - 2jump MomPhoneWontSaveMoneyScript + jump MomPhoneWontSaveMoneyScript UnknownScript_0xbcf6e: ; 0xbcf6e - 3writetext UnknownText_0x1b420d + farwritetext UnknownText_0x1b420d yesorno iftrue MomPhoneSaveMoneyScript - 2jump MomPhoneWontSaveMoneyScript + jump MomPhoneWontSaveMoneyScript UnknownScript_0xbcf79: ; 0xbcf79 readmoney $1, $0 - 3writetext UnknownText_0x1b4249 + farwritetext UnknownText_0x1b4249 yesorno iftrue MomPhoneSaveMoneyScript - 2jump MomPhoneWontSaveMoneyScript + jump MomPhoneWontSaveMoneyScript MomPhoneSaveMoneyScript: ; 0xbcf87 setflag ENGINE_MOM_SAVING_MONEY - 3writetext UnknownText_0x1b4289 + farwritetext UnknownText_0x1b4289 keeptextopen - 2jump MomPhoneHangUpScript + jump MomPhoneHangUpScript MomPhoneWontSaveMoneyScript: ; 0xbcf92 clearflag ENGINE_MOM_SAVING_MONEY - 3writetext MomPhoneWontSaveMoneyText + farwritetext MomPhoneWontSaveMoneyText keeptextopen - 2jump MomPhoneHangUpScript + jump MomPhoneHangUpScript MomPhoneHangUpScript: ; 0xbcf9d - 3writetext MomPhoneHangUpText + farwritetext MomPhoneHangUpText end MomPhoneNoPokemonScript: ; 0xbcfa2 - 3writetext MomPhoneNoPokemonText + farwritetext MomPhoneNoPokemonText end MomPhoneNoPokedexScript: ; 0xbcfa7 - 3writetext MomPhoneNoPokedexText + farwritetext MomPhoneNoPokedexText end MomPhoneNoGymQuestScript: ; 0xbcfac - 3writetext MomPhoneNoGymQuestText + farwritetext MomPhoneNoGymQuestText end MomPhoneLectureScript: ; 0xbcfb1 setevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST setflag ENGINE_DST specialphonecall $0000 - 3writetext MomPhoneLectureText + farwritetext MomPhoneLectureText yesorno iftrue MomPhoneSaveMoneyScript - 2jump MomPhoneWontSaveMoneyScript + jump MomPhoneWontSaveMoneyScript BillPhoneScript1: ; 0xbcfc5 checktime $2 iftrue .daygreet checktime $4 iftrue .nitegreet - 3writetext BillPhoneMornGreetingText + farwritetext BillPhoneMornGreetingText keeptextopen - 2jump .main + jump .main .daygreet ; 0xbcfd7 - 3writetext BillPhoneDayGreetingText + farwritetext BillPhoneDayGreetingText keeptextopen - 2jump .main + jump .main .nitegreet ; 0xbcfdf - 3writetext BillPhoneNiteGreetingText + farwritetext BillPhoneNiteGreetingText keeptextopen - 2jump .main + jump .main .main ; 0xbcfe7 - 3writetext BillPhoneGeneriText + farwritetext BillPhoneGeneriText keeptextopen checkcode $10 RAM2MEM $0 if_equal $0, .full if_less_than $6, .nearlyfull - 3writetext BillPhoneNotFullText + farwritetext BillPhoneNotFullText end .nearlyfull ; 0xbcffd - 3writetext BillPhoneNearlyFullText + farwritetext BillPhoneNearlyFullText end .full ; 0xbd002 - 3writetext BillPhoneFullText + farwritetext BillPhoneFullText end BillPhoneScript2: ; 0xbd007 - 3writetext BillPhoneNewlyFullText + farwritetext BillPhoneNewlyFullText closetext end @@ -207,46 +207,46 @@ ElmPhoneScript1: ; 0xbd00d iftrue .stolen checkevent EVENT_GOT_MYSTERY_EGG_FROM_MR_POKEMON iftrue .sawmrpokemon - 3writetext ElmPhoneStartText + farwritetext ElmPhoneStartText end .sawmrpokemon ; 0xbd048 - 3writetext ElmPhoneSawMrPokemonText + farwritetext ElmPhoneSawMrPokemonText end .stolen ; 0xbd04d - 3writetext ElmPhonePokemonStolenText + farwritetext ElmPhonePokemonStolenText end .checkingegg ; 0xbd052 - 3writetext ElmPhoneCheckingEggText + farwritetext ElmPhoneCheckingEggText end .assistant ; 0xbd057 - 3writetext ElmPhoneAssistantText + farwritetext ElmPhoneAssistantText end .eggunhatched ; 0xbd05c - 3writetext ElmPhoneEggUnhatchedText + farwritetext ElmPhoneEggUnhatchedText end .egghatched ; 0xbd061 - 3writetext ElmPhoneEggHatchedText + farwritetext ElmPhoneEggHatchedText setevent EVENT_TOLD_ELM_ABOUT_TOGEPI_OVER_THE_PHONE end .discovery ; 0xbd069 random $2 if_equal $0, .nextdiscovery - 3writetext ElmPhoneDiscovery1Text + farwritetext ElmPhoneDiscovery1Text end .nextdiscovery ; 0xbd074 - 3writetext ElmPhoneDiscovery2Text + farwritetext ElmPhoneDiscovery2Text end .pokerus ; 0xbd079 - 3writetext ElmPhonePokerusText + farwritetext ElmPhonePokerusText specialphonecall $0000 end @@ -257,35 +257,35 @@ ElmPhoneScript2: ; 0xbd081 if_equal $4, .rocket if_equal $5, .gift if_equal $8, .gift - 3writetext ElmPhonePokerusText + farwritetext ElmPhonePokerusText specialphonecall $0000 end .disaster ; 0xbd09f - 3writetext ElmPhoneDisasterText + farwritetext ElmPhoneDisasterText specialphonecall $0000 setevent EVENT_ELM_CALLED_ABOUT_STOLEN_POKEMON end .assistant ; 0xbd0aa - 3writetext ElmPhoneEggAssistantText + farwritetext ElmPhoneEggAssistantText specialphonecall $0000 clearevent EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER setevent EVENT_ELMS_AIDE_IN_LAB end .rocket ; 0xbd0b8 - 3writetext ElmPhoneRocketText + farwritetext ElmPhoneRocketText specialphonecall $0000 end .gift ; 0xbd0c0 - 3writetext ElmPhoneGiftText + farwritetext ElmPhoneGiftText specialphonecall $0000 end .unused ; 0xbd0c8 - 3writetext ElmPhoneUnusedText + farwritetext ElmPhoneUnusedText specialphonecall $0000 end ; bd0d0 @@ -295,7 +295,7 @@ UnknownScript_0xbd0d0: trainertotext SCHOOLBOY, 1, $0 checkflag ENGINE_JACK iftrue UnknownScript_0xbd0f3 - 3call UnknownScript_0xbde4e + farscall UnknownScript_0xbde4e checkflag ENGINE_87 iftrue UnknownScript_0xbd0ef checkcode $b @@ -304,28 +304,28 @@ UnknownScript_0xbd0d0: iftrue UnknownScript_0xbd12a UnknownScript_0xbd0ef: - 3jump UnknownScript_0xa08f8 + farjump UnknownScript_0xa08f8 UnknownScript_0xbd0f3: displaylocation NATIONAL_PARK, $2 - 3jump UnknownScript_0xa0a2d + farjump UnknownScript_0xa0a2d UnknownScript_0xbd0fa: trainertotext SCHOOLBOY, 1, $0 - 3call UnknownScript_0xbe1b6 - 3call UnknownScript_0xbde3f + farscall UnknownScript_0xbe1b6 + farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xbd13b checkflag ENGINE_JACK iftrue UnknownScript_0xbd11e checkflag ENGINE_87 iftrue UnknownScript_0xbd11e - 3call UnknownScript_0xbde3f + farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xbd12d UnknownScript_0xbd11e: - 3call UnknownScript_0xbde42 + farscall UnknownScript_0xbde42 if_equal $0, UnknownScript_0xbd137 - 3jump UnknownScript_0xa0000 + farjump UnknownScript_0xa0000 UnknownScript_0xbd12a: setflag ENGINE_87 @@ -333,46 +333,46 @@ UnknownScript_0xbd12a: UnknownScript_0xbd12d: displaylocation NATIONAL_PARK, $2 setflag ENGINE_JACK - 3jump UnknownScript_0xa0376 + farjump UnknownScript_0xa0376 UnknownScript_0xbd137: - 3jump UnknownScript_0xa0584 + farjump UnknownScript_0xa0584 UnknownScript_0xbd13b: - 3jump UnknownScript_0xa0654 + farjump UnknownScript_0xa0654 UnknownScript_0xbd13f: trainertotext POKEFANF, 1, $0 - 3call UnknownScript_0xbe0b6 + farscall UnknownScript_0xbe0b6 checkflag ENGINE_BEVERLY_HAS_NUGGET iftrue UnknownScript_0xbd151 - 3jump UnknownScript_0xa0900 + farjump UnknownScript_0xa0900 UnknownScript_0xbd151: displaylocation NATIONAL_PARK, $2 - 3jump UnknownScript_0xa0aa5 + farjump UnknownScript_0xa0aa5 UnknownScript_0xbd158: trainertotext POKEFANF, 1, $0 - 3call UnknownScript_0xbe41e + farscall UnknownScript_0xbe41e checkflag ENGINE_BEVERLY_HAS_NUGGET iftrue UnknownScript_0xbd16e - 3call UnknownScript_0xbde45 + farscall UnknownScript_0xbde45 if_equal $0, UnknownScript_0xbd172 UnknownScript_0xbd16e: - 3jump UnknownScript_0xa0017 + farjump UnknownScript_0xa0017 UnknownScript_0xbd172: setflag ENGINE_BEVERLY_HAS_NUGGET displaylocation NATIONAL_PARK, $2 - 3jump UnknownScript_0xa061e + farjump UnknownScript_0xa061e UnknownScript_0xbd17c: trainertotext SAILOR, 2, $0 checkflag ENGINE_HUEY iftrue UnknownScript_0xbd1a2 - 3call UnknownScript_0xbde4e + farscall UnknownScript_0xbde4e checkflag ENGINE_88 iftrue UnknownScript_0xbd19b checkcode $b @@ -382,25 +382,25 @@ UnknownScript_0xbd17c: UnknownScript_0xbd19b: special $005d - 3jump UnknownScript_0xa0908 + farjump UnknownScript_0xa0908 UnknownScript_0xbd1a2: displaylocation LIGHTHOUSE, $2 - 3jump UnknownScript_0xa0a32 + farjump UnknownScript_0xa0a32 UnknownScript_0xbd1a9: trainertotext SAILOR, 2, $0 - 3call UnknownScript_0xbe1b6 + farscall UnknownScript_0xbe1b6 checkflag ENGINE_HUEY iftrue UnknownScript_0xbd1c9 checkflag ENGINE_88 iftrue UnknownScript_0xbd1c9 - 3call UnknownScript_0xbde42 + farscall UnknownScript_0xbde42 if_equal $0, UnknownScript_0xbd1d0 if_equal $1, UnknownScript_0xbd1d0 UnknownScript_0xbd1c9: - 3jump UnknownScript_0xbe622 + farjump UnknownScript_0xbe622 UnknownScript_0xbd1cd: setflag ENGINE_88 @@ -408,13 +408,13 @@ UnknownScript_0xbd1cd: UnknownScript_0xbd1d0: displaylocation LIGHTHOUSE, $2 setflag ENGINE_HUEY - 3jump UnknownScript_0xa0376 + farjump UnknownScript_0xa0376 UnknownScript_0xbd1da: trainertotext COOLTRAINERM, 10, $0 checkflag ENGINE_GAVEN iftrue UnknownScript_0xbd1fd - 3call UnknownScript_0xbde4e + farscall UnknownScript_0xbde4e checkflag ENGINE_89 iftrue UnknownScript_0xbd1f9 checkcode $b @@ -423,26 +423,26 @@ UnknownScript_0xbd1da: iftrue UnknownScript_0xbd22c UnknownScript_0xbd1f9: - 3jump UnknownScript_0xa0910 + farjump UnknownScript_0xa0910 UnknownScript_0xbd1fd: displaylocation ROUTE_26, $2 - 3jump UnknownScript_0xa0a37 + farjump UnknownScript_0xa0a37 UnknownScript_0xbd204: trainertotext COOLTRAINERM, 10, $0 - 3call UnknownScript_0xbe1b6 + farscall UnknownScript_0xbe1b6 checkflag ENGINE_GAVEN iftrue UnknownScript_0xbd220 checkflag ENGINE_89 iftrue UnknownScript_0xbd220 - 3call UnknownScript_0xbde3f + farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xbd22f UnknownScript_0xbd220: - 3call UnknownScript_0xbde42 + farscall UnknownScript_0xbde42 if_equal $0, UnknownScript_0xbd239 - 3jump UnknownScript_0xa0000 + farjump UnknownScript_0xa0000 UnknownScript_0xbd22c: setflag ENGINE_89 @@ -450,16 +450,16 @@ UnknownScript_0xbd22c: UnknownScript_0xbd22f: displaylocation ROUTE_26, $2 setflag ENGINE_GAVEN - 3jump UnknownScript_0xa0376 + farjump UnknownScript_0xa0376 UnknownScript_0xbd239: - 3jump UnknownScript_0xa0584 + farjump UnknownScript_0xa0584 UnknownScript_0xbd23d: trainertotext COOLTRAINERF, 9, $0 checkflag ENGINE_BETH iftrue UnknownScript_0xbd260 - 3call UnknownScript_0xbe0b6 + farscall UnknownScript_0xbe0b6 checkflag ENGINE_8A iftrue UnknownScript_0xbd25c checkcode $b @@ -468,24 +468,24 @@ UnknownScript_0xbd23d: iftrue UnknownScript_0xbd287 UnknownScript_0xbd25c: - 3jump UnknownScript_0xa0918 + farjump UnknownScript_0xa0918 UnknownScript_0xbd260: displaylocation ROUTE_26, $2 - 3jump UnknownScript_0xa0a3c + farjump UnknownScript_0xa0a3c UnknownScript_0xbd267: trainertotext COOLTRAINERF, 9, $0 - 3call UnknownScript_0xbe41e + farscall UnknownScript_0xbe41e checkflag ENGINE_BETH iftrue UnknownScript_0xbd283 checkflag ENGINE_8A iftrue UnknownScript_0xbd283 - 3call UnknownScript_0xbde3f + farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xbd28a UnknownScript_0xbd283: - 3jump UnknownScript_0xa0017 + farjump UnknownScript_0xa0017 UnknownScript_0xbd287: setflag ENGINE_8A @@ -493,13 +493,13 @@ UnknownScript_0xbd287: UnknownScript_0xbd28a: displaylocation ROUTE_26, $2 setflag ENGINE_BETH - 3jump UnknownScript_0xa037e + farjump UnknownScript_0xa037e UnknownScript_0xbd294: trainertotext BIRD_KEEPER, 14, $0 checkflag ENGINE_JOSE iftrue UnknownScript_0xbd2bd - 3call UnknownScript_0xbde4e + farscall UnknownScript_0xbde4e checkflag ENGINE_8B iftrue UnknownScript_0xbd2b9 checkflag ENGINE_JOSE_HAS_STAR_PIECE @@ -510,34 +510,34 @@ UnknownScript_0xbd294: iftrue UnknownScript_0xbd301 UnknownScript_0xbd2b9: - 3jump UnknownScript_0xa0920 + farjump UnknownScript_0xa0920 UnknownScript_0xbd2bd: displaylocation ROUTE_27, $2 - 3jump UnknownScript_0xa0a41 + farjump UnknownScript_0xa0a41 UnknownScript_0xbd2c4: displaylocation ROUTE_27, $2 - 3jump UnknownScript_0xa0a41 + farjump UnknownScript_0xa0a41 UnknownScript_0xbd2cb: trainertotext BIRD_KEEPER, 14, $0 - 3call UnknownScript_0xbe1b6 + farscall UnknownScript_0xbe1b6 checkflag ENGINE_JOSE iftrue UnknownScript_0xbd2f5 checkflag ENGINE_8B iftrue UnknownScript_0xbd2f5 checkflag ENGINE_JOSE_HAS_STAR_PIECE iftrue UnknownScript_0xbd2f5 - 3call UnknownScript_0xbde42 + farscall UnknownScript_0xbde42 if_equal $0, UnknownScript_0xbd304 - 3call UnknownScript_0xbde42 + farscall UnknownScript_0xbde42 if_equal $0, UnknownScript_0xbd312 UnknownScript_0xbd2f5: - 3call UnknownScript_0xbde42 + farscall UnknownScript_0xbde42 if_equal $0, UnknownScript_0xbd30e - 3jump UnknownScript_0xa0000 + farjump UnknownScript_0xa0000 UnknownScript_0xbd301: setflag ENGINE_8B @@ -545,21 +545,21 @@ UnknownScript_0xbd301: UnknownScript_0xbd304: displaylocation ROUTE_27, $2 setflag ENGINE_JOSE - 3jump UnknownScript_0xa0376 + farjump UnknownScript_0xa0376 UnknownScript_0xbd30e: - 3jump UnknownScript_0xa0584 + farjump UnknownScript_0xa0584 UnknownScript_0xbd312: setflag ENGINE_JOSE_HAS_STAR_PIECE displaylocation ROUTE_27, $2 - 3jump UnknownScript_0xa05e6 + farjump UnknownScript_0xa05e6 UnknownScript_0xbd31c: trainertotext COOLTRAINERF, 10, $0 checkflag ENGINE_REENA iftrue UnknownScript_0xbd33f - 3call UnknownScript_0xbe0b6 + farscall UnknownScript_0xbe0b6 checkflag ENGINE_8C iftrue UnknownScript_0xbd33b checkcode $b @@ -568,24 +568,24 @@ UnknownScript_0xbd31c: iftrue UnknownScript_0xbd366 UnknownScript_0xbd33b: - 3jump UnknownScript_0xa0928 + farjump UnknownScript_0xa0928 UnknownScript_0xbd33f: displaylocation ROUTE_27, $2 - 3jump UnknownScript_0xa0a46 + farjump UnknownScript_0xa0a46 UnknownScript_0xbd346: trainertotext COOLTRAINERF, 10, $0 - 3call UnknownScript_0xbe41e + farscall UnknownScript_0xbe41e checkflag ENGINE_REENA iftrue UnknownScript_0xbd362 checkflag ENGINE_8C iftrue UnknownScript_0xbd362 - 3call UnknownScript_0xbde3f + farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xbd369 UnknownScript_0xbd362: - 3jump UnknownScript_0xa0017 + farjump UnknownScript_0xa0017 UnknownScript_0xbd366: setflag ENGINE_8C @@ -593,13 +593,13 @@ UnknownScript_0xbd366: UnknownScript_0xbd369: displaylocation ROUTE_27, $2 setflag ENGINE_REENA - 3jump UnknownScript_0xa037e + farjump UnknownScript_0xa037e UnknownScript_0xbd373: trainertotext YOUNGSTER, 1, $0 checkflag ENGINE_JOEY iftrue UnknownScript_0xbd399 - 3call UnknownScript_0xbde4e + farscall UnknownScript_0xbde4e checkflag ENGINE_8D iftrue UnknownScript_0xbd392 checkcode $b @@ -609,25 +609,25 @@ UnknownScript_0xbd373: UnknownScript_0xbd392: special $005d - 3jump UnknownScript_0xa0930 + farjump UnknownScript_0xa0930 UnknownScript_0xbd399: displaylocation ROUTE_30, $2 - 3jump UnknownScript_0xa0a4b + farjump UnknownScript_0xa0a4b UnknownScript_0xbd3a0: trainertotext YOUNGSTER, 1, $0 - 3call UnknownScript_0xbe1b6 + farscall UnknownScript_0xbe1b6 checkflag ENGINE_JOEY iftrue UnknownScript_0xbd3c0 checkflag ENGINE_8D iftrue UnknownScript_0xbd3c0 - 3call UnknownScript_0xbde42 + farscall UnknownScript_0xbde42 if_equal $0, UnknownScript_0xbd3c7 if_equal $1, UnknownScript_0xbd3c7 UnknownScript_0xbd3c0: - 3jump UnknownScript_0xa0000 + farjump UnknownScript_0xa0000 UnknownScript_0xbd3c4: setflag ENGINE_8D @@ -635,13 +635,13 @@ UnknownScript_0xbd3c4: UnknownScript_0xbd3c7: displaylocation ROUTE_30, $2 setflag ENGINE_JOEY - 3jump UnknownScript_0xa0376 + farjump UnknownScript_0xa0376 UnknownScript_0xbd3d1: trainertotext BUG_CATCHER, 4, $0 checkflag ENGINE_WADE iftrue UnknownScript_0xbd41a - 3call UnknownScript_0xbde4e + farscall UnknownScript_0xbde4e checkflag ENGINE_8E iftrue UnknownScript_0xbd3f6 checkflag ENGINE_WADE_HAS_ITEM @@ -652,7 +652,7 @@ UnknownScript_0xbd3d1: iftrue UnknownScript_0xbd484 UnknownScript_0xbd3f6: - 3call UnknownScript_0xbde3f + farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xbd412 checkflag ENGINE_51 iftrue UnknownScript_0xbd412 @@ -662,23 +662,23 @@ UnknownScript_0xbd3f6: if_equal $6, UnknownScript_0xbd416 UnknownScript_0xbd412: - 3jump UnknownScript_0xa0938 + farjump UnknownScript_0xa0938 UnknownScript_0xbd416: - 3jump UnknownScript_0xa05a4 + farjump UnknownScript_0xa05a4 UnknownScript_0xbd41a: displaylocation ROUTE_31, $2 - 3jump UnknownScript_0xa0a50 + farjump UnknownScript_0xa0a50 UnknownScript_0xbd421: displaylocation ROUTE_31, $2 - 3jump UnknownScript_0xa0ab5 + farjump UnknownScript_0xa0ab5 UnknownScript_0xbd428: trainertotext BUG_CATCHER, 4, $0 - 3call UnknownScript_0xbe1b6 - 3call UnknownScript_0xbde3f + farscall UnknownScript_0xbe1b6 + farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xbd44c checkflag ENGINE_51 iftrue UnknownScript_0xbd44c @@ -694,20 +694,20 @@ UnknownScript_0xbd44c: iftrue UnknownScript_0xbd474 checkflag ENGINE_WADE_HAS_ITEM iftrue UnknownScript_0xbd474 - 3call UnknownScript_0xbde3f + farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xbd495 checkflag ENGINE_FLYPOINT_GOLDENROD iffalse UnknownScript_0xbd474 - 3call UnknownScript_0xbde3f + farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xbd487 UnknownScript_0xbd474: - 3call UnknownScript_0xbde42 + farscall UnknownScript_0xbde42 if_equal $0, UnknownScript_0xbd491 - 3jump UnknownScript_0xa0000 + farjump UnknownScript_0xa0000 UnknownScript_0xbd480: - 3jump UnknownScript_0xa05a4 + farjump UnknownScript_0xa05a4 UnknownScript_0xbd484: setflag ENGINE_8E @@ -715,10 +715,10 @@ UnknownScript_0xbd484: UnknownScript_0xbd487: displaylocation ROUTE_31, $2 setflag ENGINE_WADE - 3jump UnknownScript_0xa0376 + farjump UnknownScript_0xa0376 UnknownScript_0xbd491: - 3jump UnknownScript_0xa0584 + farjump UnknownScript_0xa0584 UnknownScript_0xbd495: setflag ENGINE_WADE_HAS_ITEM @@ -735,27 +735,27 @@ UnknownScript_0xbd495: UnknownScript_0xbd4b9: setevent EVENT_WADE_HAS_BERRY - 2jump UnknownScript_0xbd4ce + jump UnknownScript_0xbd4ce UnknownScript_0xbd4bf: setevent EVENT_WADE_HAS_PSNCUREBERRY - 2jump UnknownScript_0xbd4ce + jump UnknownScript_0xbd4ce UnknownScript_0xbd4c5: setevent EVENT_WADE_HAS_PRZCUREBERRY - 2jump UnknownScript_0xbd4ce + jump UnknownScript_0xbd4ce UnknownScript_0xbd4cb: setevent EVENT_WADE_HAS_BITTER_BERRY UnknownScript_0xbd4ce: - 3jump UnknownScript_0xa05e6 + farjump UnknownScript_0xa05e6 UnknownScript_0xbd4d2: trainertotext FISHER, 2, $0 checkflag ENGINE_RALPH iftrue UnknownScript_0xbd4fb - 3call UnknownScript_0xbde4e + farscall UnknownScript_0xbde4e checkflag ENGINE_8F iftrue UnknownScript_0xbd4f1 checkcode $b @@ -766,32 +766,32 @@ UnknownScript_0xbd4d2: UnknownScript_0xbd4f1: checkflag ENGINE_SPECIAL_WILDDATA iftrue UnknownScript_0xbd502 - 3jump UnknownScript_0xa0940 + farjump UnknownScript_0xa0940 UnknownScript_0xbd4fb: displaylocation ROUTE_32, $2 - 3jump UnknownScript_0xa0a55 + farjump UnknownScript_0xa0a55 UnknownScript_0xbd502: displaylocation ROUTE_32, $2 - 3jump UnknownScript_0xa0af5 + farjump UnknownScript_0xa0af5 UnknownScript_0xbd509: trainertotext FISHER, 2, $0 - 3call UnknownScript_0xbe1b6 + farscall UnknownScript_0xbe1b6 checkflag ENGINE_FLYPOINT_GOLDENROD iffalse UnknownScript_0xbd52b checkflag ENGINE_RALPH iftrue UnknownScript_0xbd52b checkflag ENGINE_8F iftrue UnknownScript_0xbd52b - 3call UnknownScript_0xbde3f + farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xbd53a UnknownScript_0xbd52b: - 3call UnknownScript_0xbde48 + farscall UnknownScript_0xbde48 if_equal $0, UnknownScript_0xbd544 - 3jump UnknownScript_0xa0000 + farjump UnknownScript_0xa0000 UnknownScript_0xbd537: setflag ENGINE_8F @@ -799,7 +799,7 @@ UnknownScript_0xbd537: UnknownScript_0xbd53a: displaylocation ROUTE_32, $2 setflag ENGINE_RALPH - 3jump UnknownScript_0xa0376 + farjump UnknownScript_0xa0376 UnknownScript_0xbd544: checkflag ENGINE_SPECIAL_WILDDATA @@ -809,16 +809,16 @@ UnknownScript_0xbd544: displaylocation ROUTE_32, $2 writebyte $1 special $0048 - 3jump UnknownScript_0xa05d6 + farjump UnknownScript_0xa05d6 UnknownScript_0xbd55c: - 3jump UnknownScript_0xa0000 + farjump UnknownScript_0xa0000 UnknownScript_0xbd560: trainertotext PICNICKER, 1, $0 checkflag ENGINE_LIZ iftrue UnknownScript_0xbd586 - 3call UnknownScript_0xbe0b6 + farscall UnknownScript_0xbe0b6 checkflag ENGINE_90 iftrue UnknownScript_0xbd57f checkcode $b @@ -828,32 +828,32 @@ UnknownScript_0xbd560: UnknownScript_0xbd57f: special $005d - 3jump UnknownScript_0xa0948 + farjump UnknownScript_0xa0948 UnknownScript_0xbd586: displaylocation ROUTE_32, $2 - 3jump UnknownScript_0xa0a5a + farjump UnknownScript_0xa0a5a UnknownScript_0xbd58d: trainertotext PICNICKER, 1, $0 - 3call UnknownScript_0xbde45 + farscall UnknownScript_0xbde45 if_equal $0, UnknownScript_0xbd5d0 - 3call UnknownScript_0xbe41e + farscall UnknownScript_0xbe41e checkflag ENGINE_LIZ iftrue UnknownScript_0xbd5a9 checkflag ENGINE_90 iftrue UnknownScript_0xbd5a9 UnknownScript_0xbd5a9: - 3call UnknownScript_0xbde3f + farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xbd5d4 checkflag ENGINE_FLYPOINT_GOLDENROD iffalse UnknownScript_0xbd5bf - 3call UnknownScript_0xbde3f + farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xbd5c6 UnknownScript_0xbd5bf: - 3jump UnknownScript_0xa0017 + farjump UnknownScript_0xa0017 UnknownScript_0xbd5c3: setflag ENGINE_90 @@ -861,10 +861,10 @@ UnknownScript_0xbd5c3: UnknownScript_0xbd5c6: displaylocation ROUTE_32, $2 setflag ENGINE_LIZ - 3jump UnknownScript_0xa037e + farjump UnknownScript_0xa037e UnknownScript_0xbd5d0: - 3jump UnknownScript_0xa047a + farjump UnknownScript_0xa047a UnknownScript_0xbd5d4: random $9 @@ -880,48 +880,48 @@ UnknownScript_0xbd5d4: UnknownScript_0xbd5fa: trainerclassname $1b, $1 - 2jump UnknownScript_0xbd630 + jump UnknownScript_0xbd630 UnknownScript_0xbd600: trainerclassname $1d, $1 - 2jump UnknownScript_0xbd630 + jump UnknownScript_0xbd630 UnknownScript_0xbd606: trainerclassname $1f, $1 - 2jump UnknownScript_0xbd630 + jump UnknownScript_0xbd630 UnknownScript_0xbd60c: trainerclassname $22, $1 - 2jump UnknownScript_0xbd630 + jump UnknownScript_0xbd630 UnknownScript_0xbd612: trainerclassname $27, $1 - 2jump UnknownScript_0xbd630 + jump UnknownScript_0xbd630 UnknownScript_0xbd618: trainerclassname $3c, $1 - 2jump UnknownScript_0xbd630 + jump UnknownScript_0xbd630 UnknownScript_0xbd61e: trainerclassname $21, $1 - 2jump UnknownScript_0xbd630 + jump UnknownScript_0xbd630 UnknownScript_0xbd624: trainerclassname $39, $1 - 2jump UnknownScript_0xbd630 + jump UnknownScript_0xbd630 UnknownScript_0xbd62a: trainerclassname $3b, $1 - 2jump UnknownScript_0xbd630 + jump UnknownScript_0xbd630 UnknownScript_0xbd630: - 3jump UnknownScript_0xa06da + farjump UnknownScript_0xa06da UnknownScript_0xbd634: trainertotext HIKER, 5, $0 checkflag ENGINE_ANTHONY iftrue UnknownScript_0xbd65d - 3call UnknownScript_0xbde4e + farscall UnknownScript_0xbde4e checkflag ENGINE_91 iftrue UnknownScript_0xbd653 checkcode $b @@ -932,32 +932,32 @@ UnknownScript_0xbd634: UnknownScript_0xbd653: checkflag ENGINE_DUNSPARCE_SWARM iftrue UnknownScript_0xbd664 - 3jump UnknownScript_0xa0950 + farjump UnknownScript_0xa0950 UnknownScript_0xbd65d: displaylocation ROUTE_33, $2 - 3jump UnknownScript_0xa0a5f + farjump UnknownScript_0xa0a5f UnknownScript_0xbd664: displaylocation ROUTE_33, $2 - 3jump UnknownScript_0xa0afa + farjump UnknownScript_0xa0afa UnknownScript_0xbd66b: trainertotext HIKER, 5, $0 - 3call UnknownScript_0xbe1b6 + farscall UnknownScript_0xbe1b6 checkflag ENGINE_FLYPOINT_GOLDENROD iffalse UnknownScript_0xbd68d checkflag ENGINE_ANTHONY iftrue UnknownScript_0xbd68d checkflag ENGINE_91 iftrue UnknownScript_0xbd68d - 3call UnknownScript_0xbde3f + farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xbd69c UnknownScript_0xbd68d: - 3call UnknownScript_0xbde48 + farscall UnknownScript_0xbde48 if_equal $0, UnknownScript_0xbd6a6 - 3jump UnknownScript_0xa0000 + farjump UnknownScript_0xa0000 UnknownScript_0xbd699: setflag ENGINE_91 @@ -965,7 +965,7 @@ UnknownScript_0xbd699: UnknownScript_0xbd69c: displaylocation ROUTE_33, $2 setflag ENGINE_ANTHONY - 3jump UnknownScript_0xa0376 + farjump UnknownScript_0xa0376 UnknownScript_0xbd6a6: checkflag ENGINE_DUNSPARCE_SWARM @@ -974,16 +974,16 @@ UnknownScript_0xbd6a6: pokenamemem DUNSPARCE, $1 loadwilddata $0, GROUP_DARK_CAVE_VIOLET_ENTRANCE, MAP_DARK_CAVE_VIOLET_ENTRANCE displaylocation DARK_CAVE, $2 - 3jump UnknownScript_0xa05de + farjump UnknownScript_0xa05de UnknownScript_0xbd6bd: - 3jump UnknownScript_0xa0000 + farjump UnknownScript_0xa0000 UnknownScript_0xbd6c1: trainertotext CAMPER, 2, $0 checkflag ENGINE_TODD iftrue UnknownScript_0xbd6ea - 3call UnknownScript_0xbde4e + farscall UnknownScript_0xbde4e checkflag ENGINE_92 iftrue UnknownScript_0xbd6e0 checkcode $b @@ -994,35 +994,35 @@ UnknownScript_0xbd6c1: UnknownScript_0xbd6e0: checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON iftrue UnknownScript_0xbd6f1 - 3jump UnknownScript_0xa0958 + farjump UnknownScript_0xa0958 UnknownScript_0xbd6ea: displaylocation ROUTE_34, $2 - 3jump UnknownScript_0xa0a64 + farjump UnknownScript_0xa0a64 UnknownScript_0xbd6f1: - 3jump UnknownScript_0xa0b04 + farjump UnknownScript_0xa0b04 UnknownScript_0xbd6f5: trainertotext CAMPER, 2, $0 - 3call UnknownScript_0xbe1b6 + farscall UnknownScript_0xbe1b6 checkflag ENGINE_TODD iftrue UnknownScript_0xbd717 checkflag ENGINE_92 iftrue UnknownScript_0xbd717 checkflag ENGINE_FLYPOINT_GOLDENROD iffalse UnknownScript_0xbd71f - 3call UnknownScript_0xbde3f + farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xbd72e UnknownScript_0xbd717: - 3call UnknownScript_0xbde3f + farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xbd73c UnknownScript_0xbd71f: - 3call UnknownScript_0xbde42 + farscall UnknownScript_0xbde42 if_equal $0, UnknownScript_0xbd738 - 3jump UnknownScript_0xa0000 + farjump UnknownScript_0xa0000 UnknownScript_0xbd72b: setflag ENGINE_92 @@ -1030,20 +1030,20 @@ UnknownScript_0xbd72b: UnknownScript_0xbd72e: displaylocation ROUTE_34, $2 setflag ENGINE_TODD - 3jump UnknownScript_0xa0376 + farjump UnknownScript_0xa0376 UnknownScript_0xbd738: - 3jump UnknownScript_0xa0584 + farjump UnknownScript_0xa0584 UnknownScript_0xbd73c: setflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON - 3jump UnknownScript_0xa0644 + farjump UnknownScript_0xa0644 UnknownScript_0xbd743: trainertotext PICNICKER, 2, $0 checkflag ENGINE_GINA iftrue UnknownScript_0xbd776 - 3call UnknownScript_0xbe0b6 + farscall UnknownScript_0xbe0b6 checkflag ENGINE_93 iftrue UnknownScript_0xbd768 checkflag ENGINE_GINA_HAS_LEAF_STONE @@ -1056,22 +1056,22 @@ UnknownScript_0xbd743: UnknownScript_0xbd768: checkflag ENGINE_BIKE_SHOP_CALL_ENABLED iftrue UnknownScript_0xbd772 - 3jump UnknownScript_0xa0960 + farjump UnknownScript_0xa0960 UnknownScript_0xbd772: - 3jump UnknownScript_0xa05c6 + farjump UnknownScript_0xa05c6 UnknownScript_0xbd776: displaylocation ROUTE_34, $2 - 3jump UnknownScript_0xa0a69 + farjump UnknownScript_0xa0a69 UnknownScript_0xbd77d: displaylocation ROUTE_34, $2 - 3jump UnknownScript_0xa0abd + farjump UnknownScript_0xa0abd UnknownScript_0xbd784: trainertotext PICNICKER, 2, $0 - 3call UnknownScript_0xbe41e + farscall UnknownScript_0xbe41e checkflag ENGINE_BIKE_SHOP_CALL_ENABLED iftrue UnknownScript_0xbd7d9 checkflag ENGINE_GINA @@ -1082,19 +1082,19 @@ UnknownScript_0xbd784: iftrue UnknownScript_0xbd7c8 checkevent $0100 iftrue UnknownScript_0xbd7b2 - 3call UnknownScript_0xbde3f + farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xbd7dd UnknownScript_0xbd7b2: - 3call UnknownScript_0xbde4b + farscall UnknownScript_0xbde4b if_equal $0, UnknownScript_0xbd7dd checkflag ENGINE_FLYPOINT_GOLDENROD iffalse UnknownScript_0xbd7c8 - 3call UnknownScript_0xbde42 + farscall UnknownScript_0xbde42 if_equal $0, UnknownScript_0xbd7cf UnknownScript_0xbd7c8: - 3jump UnknownScript_0xa0017 + farjump UnknownScript_0xa0017 UnknownScript_0xbd7cc: setflag ENGINE_93 @@ -1102,41 +1102,41 @@ UnknownScript_0xbd7cc: UnknownScript_0xbd7cf: displaylocation ROUTE_34, $2 setflag ENGINE_GINA - 3jump UnknownScript_0xa037e + farjump UnknownScript_0xa037e UnknownScript_0xbd7d9: - 3jump UnknownScript_0xa05c6 + farjump UnknownScript_0xa05c6 UnknownScript_0xbd7dd: setflag ENGINE_GINA_HAS_LEAF_STONE displaylocation ROUTE_34, $2 - 3jump UnknownScript_0xa061e + farjump UnknownScript_0xa061e UnknownScript_0xbd7e7: trainertotext JUGGLER, 1, $0 - 3call UnknownScript_0xbde4e + farscall UnknownScript_0xbde4e checkflag ENGINE_BIKE_SHOP_CALL_ENABLED iftrue UnknownScript_0xbd7f9 - 3jump UnknownScript_0xa09c8 + farjump UnknownScript_0xa09c8 UnknownScript_0xbd7f9: - 3jump UnknownScript_0xa05be + farjump UnknownScript_0xa05be UnknownScript_0xbd7fd: trainertotext JUGGLER, 1, $0 - 3call UnknownScript_0xbe1b6 + farscall UnknownScript_0xbe1b6 checkflag ENGINE_BIKE_SHOP_CALL_ENABLED iftrue UnknownScript_0xbd80f - 3jump UnknownScript_0xa0848 + farjump UnknownScript_0xa0848 UnknownScript_0xbd80f: - 3jump UnknownScript_0xa05be + farjump UnknownScript_0xa05be UnknownScript_0xbd813: trainertotext BUG_CATCHER, 8, $0 checkflag ENGINE_ARNIE iftrue UnknownScript_0xbd83c - 3call UnknownScript_0xbde4e + farscall UnknownScript_0xbde4e checkflag ENGINE_94 iftrue UnknownScript_0xbd832 checkcode $b @@ -1147,32 +1147,32 @@ UnknownScript_0xbd813: UnknownScript_0xbd832: checkflag ENGINE_YANMA_SWARM iftrue UnknownScript_0xbd843 - 3jump UnknownScript_0xa0968 + farjump UnknownScript_0xa0968 UnknownScript_0xbd83c: displaylocation ROUTE_35, $2 - 3jump UnknownScript_0xa0a6e + farjump UnknownScript_0xa0a6e UnknownScript_0xbd843: displaylocation ROUTE_35, $2 - 3jump UnknownScript_0xa0aff + farjump UnknownScript_0xa0aff UnknownScript_0xbd84a: trainertotext BUG_CATCHER, 8, $0 - 3call UnknownScript_0xbe1b6 + farscall UnknownScript_0xbe1b6 checkflag ENGINE_ARNIE iftrue UnknownScript_0xbd866 checkflag ENGINE_94 iftrue UnknownScript_0xbd866 - 3call UnknownScript_0xbde3f + farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xbd87d UnknownScript_0xbd866: - 3call UnknownScript_0xbde48 + farscall UnknownScript_0xbde48 if_equal $0, UnknownScript_0xbd887 - 3call UnknownScript_0xbde42 + farscall UnknownScript_0xbde42 if_equal $0, UnknownScript_0xbd89e - 3jump UnknownScript_0xa0000 + farjump UnknownScript_0xa0000 UnknownScript_0xbd87a: setflag ENGINE_94 @@ -1180,7 +1180,7 @@ UnknownScript_0xbd87a: UnknownScript_0xbd87d: displaylocation ROUTE_35, $2 setflag ENGINE_ARNIE - 3jump UnknownScript_0xa0376 + farjump UnknownScript_0xa0376 UnknownScript_0xbd887: checkflag ENGINE_YANMA_SWARM @@ -1189,19 +1189,19 @@ UnknownScript_0xbd887: pokenamemem YANMA, $1 loadwilddata $1, GROUP_ROUTE_35, MAP_ROUTE_35 displaylocation ROUTE_35, $2 - 3jump UnknownScript_0xa05ce + farjump UnknownScript_0xa05ce UnknownScript_0xbd89e: - 3jump UnknownScript_0xa0584 + farjump UnknownScript_0xa0584 UnknownScript_0xbd8a2: - 3jump UnknownScript_0xa0000 + farjump UnknownScript_0xa0000 UnknownScript_0xbd8a6: trainertotext SCHOOLBOY, 3, $0 checkflag ENGINE_ALAN iftrue UnknownScript_0xbd8cf - 3call UnknownScript_0xbde4e + farscall UnknownScript_0xbde4e checkflag ENGINE_95 iftrue UnknownScript_0xbd8cb checkflag ENGINE_ALAN_HAS_FIRE_STONE @@ -1212,38 +1212,38 @@ UnknownScript_0xbd8a6: iftrue UnknownScript_0xbd919 UnknownScript_0xbd8cb: - 3jump UnknownScript_0xa0970 + farjump UnknownScript_0xa0970 UnknownScript_0xbd8cf: displaylocation ROUTE_36, $2 - 3jump UnknownScript_0xa0a73 + farjump UnknownScript_0xa0a73 UnknownScript_0xbd8d6: displaylocation ROUTE_36, $2 - 3jump UnknownScript_0xa0ac5 + farjump UnknownScript_0xa0ac5 UnknownScript_0xbd8dd: trainertotext SCHOOLBOY, 3, $0 - 3call UnknownScript_0xbe1b6 + farscall UnknownScript_0xbe1b6 checkflag ENGINE_ALAN iftrue $5915 checkflag ENGINE_95 iftrue $5915 checkflag ENGINE_ALAN_HAS_FIRE_STONE iftrue $5915 - 3call UnknownScript_0xbde42 + farscall UnknownScript_0xbde42 if_equal $0, UnknownScript_0xbd91c checkevent $0101 iftrue UnknownScript_0xbd90d - 3call UnknownScript_0xbde3f + farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xbd926 UnknownScript_0xbd90d: - 3call UnknownScript_0xbde4b + farscall UnknownScript_0xbde4b if_equal $0, UnknownScript_0xbd926 UnknownScript_0xbd915: - 3jump UnknownScript_0xa0000 + farjump UnknownScript_0xa0000 UnknownScript_0xbd919: setflag ENGINE_95 @@ -1251,18 +1251,18 @@ UnknownScript_0xbd919: UnknownScript_0xbd91c: displaylocation ROUTE_36, $2 setflag ENGINE_ALAN - 3jump UnknownScript_0xa0376 + farjump UnknownScript_0xa0376 UnknownScript_0xbd926: setflag ENGINE_ALAN_HAS_FIRE_STONE displaylocation ROUTE_36, $2 - 3jump UnknownScript_0xa05e6 + farjump UnknownScript_0xa05e6 UnknownScript_0xbd930: trainertotext LASS, 10, $0 checkflag ENGINE_DANA iftrue UnknownScript_0xbd959 - 3call UnknownScript_0xbe0b6 + farscall UnknownScript_0xbe0b6 checkflag ENGINE_96 iftrue UnknownScript_0xbd955 checkflag ENGINE_LIZ_HAS_THUNDERSTONE @@ -1273,40 +1273,40 @@ UnknownScript_0xbd930: iftrue UnknownScript_0xbd9ab UnknownScript_0xbd955: - 3jump UnknownScript_0xa0978 + farjump UnknownScript_0xa0978 UnknownScript_0xbd959: displaylocation ROUTE_38, $2 - 3jump UnknownScript_0xa0a78 + farjump UnknownScript_0xa0a78 UnknownScript_0xbd960: displaylocation ROUTE_38, $2 - 3jump UnknownScript_0xa0acd + farjump UnknownScript_0xa0acd UnknownScript_0xbd967: trainertotext LASS, 10, $0 - 3call UnknownScript_0xbe41e + farscall UnknownScript_0xbe41e checkflag ENGINE_DANA iftrue $599f checkflag ENGINE_96 iftrue $599f checkflag ENGINE_LIZ_HAS_THUNDERSTONE iftrue $599f - 3call UnknownScript_0xbde42 + farscall UnknownScript_0xbde42 if_equal $0, UnknownScript_0xbd9ae checkevent $0102 iftrue UnknownScript_0xbd997 - 3call UnknownScript_0xbde3f + farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xbd9bc UnknownScript_0xbd997: - 3call UnknownScript_0xbde4b + farscall UnknownScript_0xbde4b if_equal $0, UnknownScript_0xbd9bc UnknownScript_0xbd99f: - 3call UnknownScript_0xbde42 + farscall UnknownScript_0xbde42 if_equal $0, UnknownScript_0xbd9b8 - 3jump UnknownScript_0xa0017 + farjump UnknownScript_0xa0017 UnknownScript_0xbd9ab: setflag ENGINE_96 @@ -1314,21 +1314,21 @@ UnknownScript_0xbd9ab: UnknownScript_0xbd9ae: displaylocation ROUTE_38, $2 setflag ENGINE_DANA - 3jump UnknownScript_0xa037e + farjump UnknownScript_0xa037e UnknownScript_0xbd9b8: - 3jump UnknownScript_0xa0592 + farjump UnknownScript_0xa0592 UnknownScript_0xbd9bc: setflag ENGINE_LIZ_HAS_THUNDERSTONE displaylocation ROUTE_38, $2 - 3jump UnknownScript_0xa061e + farjump UnknownScript_0xa061e UnknownScript_0xbd9c6: trainertotext SCHOOLBOY, 10, $0 checkflag ENGINE_CHAD iftrue UnknownScript_0xbd9e9 - 3call UnknownScript_0xbde4e + farscall UnknownScript_0xbde4e checkflag ENGINE_97 iftrue UnknownScript_0xbd9e5 checkcode $b @@ -1337,28 +1337,28 @@ UnknownScript_0xbd9c6: iftrue UnknownScript_0xbda20 UnknownScript_0xbd9e5: - 3jump UnknownScript_0xa0980 + farjump UnknownScript_0xa0980 UnknownScript_0xbd9e9: displaylocation ROUTE_38, $2 - 3jump UnknownScript_0xa0a7d + farjump UnknownScript_0xa0a7d UnknownScript_0xbd9f0: trainertotext SCHOOLBOY, 10, $0 - 3call UnknownScript_0xbe1b6 - 3call UnknownScript_0xbde3f + farscall UnknownScript_0xbe1b6 + farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xbda31 checkflag ENGINE_CHAD iftrue UnknownScript_0xbda14 checkflag ENGINE_97 iftrue UnknownScript_0xbda14 - 3call UnknownScript_0xbde3f + farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xbda23 UnknownScript_0xbda14: - 3call UnknownScript_0xbde42 + farscall UnknownScript_0xbde42 if_equal $0, UnknownScript_0xbda2d - 3jump UnknownScript_0xa0000 + farjump UnknownScript_0xa0000 UnknownScript_0xbda20: setflag ENGINE_97 @@ -1366,20 +1366,20 @@ UnknownScript_0xbda20: UnknownScript_0xbda23: displaylocation ROUTE_38, $2 setflag ENGINE_CHAD - 3jump UnknownScript_0xa0376 + farjump UnknownScript_0xa0376 UnknownScript_0xbda2d: - 3jump UnknownScript_0xa0584 + farjump UnknownScript_0xa0584 UnknownScript_0xbda31: - 3jump UnknownScript_0xa0754 + farjump UnknownScript_0xa0754 UnknownScript_0xbda35: trainertotext POKEFANM, 2, $0 - 3call UnknownScript_0xbde4e + farscall UnknownScript_0xbde4e checkflag ENGINE_DEREK_HAS_NUGGET iftrue UnknownScript_0xbda67 - 3call UnknownScript_0xbde3f + farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xbda5f checkflag ENGINE_51 iftrue UnknownScript_0xbda5f @@ -1389,19 +1389,19 @@ UnknownScript_0xbda35: if_equal $6, UnknownScript_0xbda63 UnknownScript_0xbda5f: - 3jump UnknownScript_0xa0988 + farjump UnknownScript_0xa0988 UnknownScript_0xbda63: - 3jump UnknownScript_0xa05a4 + farjump UnknownScript_0xa05a4 UnknownScript_0xbda67: displaylocation ROUTE_39, $2 - 3jump UnknownScript_0xa0ad5 + farjump UnknownScript_0xa0ad5 UnknownScript_0xbda6e: trainertotext POKEFANM, 2, $0 - 3call UnknownScript_0xbe1b6 - 3call UnknownScript_0xbde3f + farscall UnknownScript_0xbe1b6 + farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xbda92 checkflag ENGINE_51 iftrue UnknownScript_0xbda92 @@ -1411,23 +1411,23 @@ UnknownScript_0xbda6e: if_equal $6, UnknownScript_0xbda9e UnknownScript_0xbda92: - 3call UnknownScript_0xbde45 + farscall UnknownScript_0xbde45 if_equal $0, UnknownScript_0xbdaa2 - 3jump UnknownScript_0xa0000 + farjump UnknownScript_0xa0000 UnknownScript_0xbda9e: - 3jump UnknownScript_0xa05a4 + farjump UnknownScript_0xa05a4 UnknownScript_0xbdaa2: setflag ENGINE_DEREK_HAS_NUGGET displaylocation ROUTE_39, $2 - 3jump UnknownScript_0xa05e6 + farjump UnknownScript_0xa05e6 UnknownScript_0xbdaac: trainertotext FISHER, 7, $0 checkflag ENGINE_TULLY iftrue UnknownScript_0xbdad5 - 3call UnknownScript_0xbde4e + farscall UnknownScript_0xbde4e checkflag ENGINE_98 iftrue UnknownScript_0xbdad1 checkflag ENGINE_TULLY_HAS_WATER_STONE @@ -1438,38 +1438,38 @@ UnknownScript_0xbdaac: iftrue UnknownScript_0xbdb1f UnknownScript_0xbdad1: - 3jump UnknownScript_0xa0990 + farjump UnknownScript_0xa0990 UnknownScript_0xbdad5: displaylocation ROUTE_42, $2 - 3jump UnknownScript_0xa0a82 + farjump UnknownScript_0xa0a82 UnknownScript_0xbdadc: displaylocation ROUTE_42, $2 - 3jump UnknownScript_0xa0add + farjump UnknownScript_0xa0add UnknownScript_0xbdae3: trainertotext FISHER, 7, $0 - 3call UnknownScript_0xbe1b6 + farscall UnknownScript_0xbe1b6 checkflag ENGINE_TULLY iftrue $5b1b checkflag ENGINE_98 iftrue $5b1b checkflag ENGINE_TULLY_HAS_WATER_STONE iftrue $5b1b - 3call UnknownScript_0xbde42 + farscall UnknownScript_0xbde42 if_equal $0, UnknownScript_0xbdb22 checkevent $0103 iftrue UnknownScript_0xbdb13 - 3call UnknownScript_0xbde3f + farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xbdb2c UnknownScript_0xbdb13: - 3call UnknownScript_0xbde4b + farscall UnknownScript_0xbde4b if_equal $0, UnknownScript_0xbdb2c UnknownScript_0xbdb1b: - 3jump UnknownScript_0xa0000 + farjump UnknownScript_0xa0000 UnknownScript_0xbdb1f: setflag ENGINE_98 @@ -1477,18 +1477,18 @@ UnknownScript_0xbdb1f: UnknownScript_0xbdb22: displaylocation ROUTE_42, $2 setflag ENGINE_TULLY - 3jump UnknownScript_0xa0376 + farjump UnknownScript_0xa0376 UnknownScript_0xbdb2c: setflag ENGINE_TULLY_HAS_WATER_STONE displaylocation ROUTE_42, $2 - 3jump UnknownScript_0xa05e6 + farjump UnknownScript_0xa05e6 UnknownScript_0xbdb36: trainertotext POKEMANIAC, 6, $0 checkflag ENGINE_BRENT iftrue UnknownScript_0xbdb59 - 3call UnknownScript_0xbde4e + farscall UnknownScript_0xbde4e checkflag ENGINE_99 iftrue UnknownScript_0xbdb55 checkcode $b @@ -1497,26 +1497,26 @@ UnknownScript_0xbdb36: iftrue UnknownScript_0xbdb88 UnknownScript_0xbdb55: - 3jump UnknownScript_0xa0998 + farjump UnknownScript_0xa0998 UnknownScript_0xbdb59: displaylocation ROUTE_43, $2 - 3jump UnknownScript_0xa0a87 + farjump UnknownScript_0xa0a87 UnknownScript_0xbdb60: trainertotext POKEMANIAC, 6, $0 - 3call UnknownScript_0xbe1b6 - 3call UnknownScript_0xbde3f + farscall UnknownScript_0xbe1b6 + farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xbdb95 checkflag ENGINE_BRENT iftrue UnknownScript_0xbdb84 checkflag ENGINE_99 iftrue UnknownScript_0xbdb84 - 3call UnknownScript_0xbde3f + farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xbdb8b UnknownScript_0xbdb84: - 3jump UnknownScript_0xa0000 + farjump UnknownScript_0xa0000 UnknownScript_0xbdb88: setflag ENGINE_99 @@ -1524,16 +1524,16 @@ UnknownScript_0xbdb88: UnknownScript_0xbdb8b: displaylocation ROUTE_43, $2 setflag ENGINE_BRENT - 3jump UnknownScript_0xa0376 + farjump UnknownScript_0xa0376 UnknownScript_0xbdb95: - 3jump UnknownScript_0xa07ce + farjump UnknownScript_0xa07ce UnknownScript_0xbdb99: trainertotext PICNICKER, 20, $0 checkflag ENGINE_TIFFANY iftrue UnknownScript_0xbdbc2 - 3call UnknownScript_0xbe0b6 + farscall UnknownScript_0xbe0b6 checkflag ENGINE_9A iftrue UnknownScript_0xbdbbe checkflag ENGINE_TIFFANY_HAS_PINK_BOW @@ -1544,40 +1544,40 @@ UnknownScript_0xbdb99: iftrue UnknownScript_0xbdc14 UnknownScript_0xbdbbe: - 3jump UnknownScript_0xa09a0 + farjump UnknownScript_0xa09a0 UnknownScript_0xbdbc2: displaylocation ROUTE_43, $2 - 3jump UnknownScript_0xa0a8c + farjump UnknownScript_0xa0a8c UnknownScript_0xbdbc9: displaylocation ROUTE_43, $2 - 3jump UnknownScript_0xa0ae5 + farjump UnknownScript_0xa0ae5 UnknownScript_0xbdbd0: trainertotext PICNICKER, 20, $0 - 3call UnknownScript_0xbde45 + farscall UnknownScript_0xbde45 if_equal $0, UnknownScript_0xbdc21 - 3call UnknownScript_0xbe41e + farscall UnknownScript_0xbe41e checkflag ENGINE_TIFFANY iftrue $5c10 checkflag ENGINE_9A iftrue $5c10 checkflag ENGINE_TIFFANY_HAS_PINK_BOW iftrue $5c10 - 3call UnknownScript_0xbde42 + farscall UnknownScript_0xbde42 if_equal $0, UnknownScript_0xbdc17 checkevent $0104 iftrue UnknownScript_0xbdc08 - 3call UnknownScript_0xbde3f + farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xbdc69 UnknownScript_0xbdc08: - 3call UnknownScript_0xbde4b + farscall UnknownScript_0xbde4b if_equal $0, UnknownScript_0xbdc69 UnknownScript_0xbdc10: - 3jump UnknownScript_0xa0017 + farjump UnknownScript_0xa0017 UnknownScript_0xbdc14: setflag ENGINE_9A @@ -1585,7 +1585,7 @@ UnknownScript_0xbdc14: UnknownScript_0xbdc17: displaylocation ROUTE_43, $2 setflag ENGINE_TIFFANY - 3jump UnknownScript_0xa037e + farjump UnknownScript_0xa037e UnknownScript_0xbdc21: random $6 @@ -1598,41 +1598,41 @@ UnknownScript_0xbdc21: UnknownScript_0xbdc3b: stringtotext String_be643, $1 - 2jump UnknownScript_0xbdc65 + jump UnknownScript_0xbdc65 UnknownScript_0xbdc42: stringtotext String_be64b, $1 - 2jump UnknownScript_0xbdc65 + jump UnknownScript_0xbdc65 UnknownScript_0xbdc49: stringtotext String_be653, $1 - 2jump UnknownScript_0xbdc65 + jump UnknownScript_0xbdc65 UnknownScript_0xbdc50: stringtotext String_be657, $1 - 2jump UnknownScript_0xbdc65 + jump UnknownScript_0xbdc65 UnknownScript_0xbdc57: stringtotext String_be65b, $1 - 2jump UnknownScript_0xbdc65 + jump UnknownScript_0xbdc65 UnknownScript_0xbdc5e: stringtotext String_be662, $1 - 2jump UnknownScript_0xbdc65 + jump UnknownScript_0xbdc65 UnknownScript_0xbdc65: - 3jump UnknownScript_0xa047f + farjump UnknownScript_0xa047f UnknownScript_0xbdc69: setflag ENGINE_TIFFANY_HAS_PINK_BOW displaylocation ROUTE_43, $2 - 3jump UnknownScript_0xa061e + farjump UnknownScript_0xa061e UnknownScript_0xbdc73: trainertotext BIRD_KEEPER, 7, $0 checkflag ENGINE_VANCE iftrue UnknownScript_0xbdc96 - 3call UnknownScript_0xbde4e + farscall UnknownScript_0xbde4e checkflag ENGINE_9B iftrue UnknownScript_0xbdc92 checkcode $b @@ -1641,25 +1641,25 @@ UnknownScript_0xbdc73: iftrue UnknownScript_0xbdcc1 UnknownScript_0xbdc92: - 3jump UnknownScript_0xa09a8 + farjump UnknownScript_0xa09a8 UnknownScript_0xbdc96: displaylocation ROUTE_44, $2 - 3jump UnknownScript_0xa0a91 + farjump UnknownScript_0xa0a91 UnknownScript_0xbdc9d: trainertotext BIRD_KEEPER, 7, $0 - 3call UnknownScript_0xbe1b6 + farscall UnknownScript_0xbe1b6 checkflag ENGINE_VANCE iftrue UnknownScript_0xbdcbd checkflag ENGINE_9B iftrue UnknownScript_0xbdcbd - 3call UnknownScript_0xbde42 + farscall UnknownScript_0xbde42 if_equal $0, UnknownScript_0xbdcc4 if_equal $1, UnknownScript_0xbdcc4 UnknownScript_0xbdcbd: - 3jump UnknownScript_0xa0000 + farjump UnknownScript_0xa0000 UnknownScript_0xbdcc1: setflag ENGINE_9B @@ -1667,13 +1667,13 @@ UnknownScript_0xbdcc1: UnknownScript_0xbdcc4: displaylocation ROUTE_44, $2 setflag ENGINE_VANCE - 3jump UnknownScript_0xa0376 + farjump UnknownScript_0xa0376 UnknownScript_0xbdcce: trainertotext FISHER, 10, $0 checkflag ENGINE_WILTON iftrue UnknownScript_0xbdcf7 - 3call UnknownScript_0xbde4e + farscall UnknownScript_0xbde4e checkflag ENGINE_9C iftrue UnknownScript_0xbdcf3 checkflag ENGINE_WILTON_HAS_ITEM @@ -1684,32 +1684,32 @@ UnknownScript_0xbdcce: iftrue UnknownScript_0xbdd33 UnknownScript_0xbdcf3: - 3jump UnknownScript_0xa09b0 + farjump UnknownScript_0xa09b0 UnknownScript_0xbdcf7: displaylocation ROUTE_44, $2 - 3jump UnknownScript_0xa0a96 + farjump UnknownScript_0xa0a96 UnknownScript_0xbdcfe: displaylocation ROUTE_44, $2 - 3jump UnknownScript_0xa0aed + farjump UnknownScript_0xa0aed UnknownScript_0xbdd05: trainertotext FISHER, 10, $0 - 3call UnknownScript_0xbe1b6 + farscall UnknownScript_0xbe1b6 checkflag ENGINE_WILTON iftrue UnknownScript_0xbdd2f checkflag ENGINE_9C iftrue UnknownScript_0xbdd2f checkflag ENGINE_WILTON_HAS_ITEM iftrue UnknownScript_0xbdd2f - 3call UnknownScript_0xbde3f + farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xbdd36 - 3call UnknownScript_0xbde3f + farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xbdd40 UnknownScript_0xbdd2f: - 3jump UnknownScript_0xa0000 + farjump UnknownScript_0xa0000 UnknownScript_0xbdd33: setflag ENGINE_9C @@ -1717,7 +1717,7 @@ UnknownScript_0xbdd33: UnknownScript_0xbdd36: displaylocation ROUTE_44, $2 setflag ENGINE_WILTON - 3jump UnknownScript_0xa0376 + farjump UnknownScript_0xa0376 UnknownScript_0xbdd40: setflag ENGINE_WILTON_HAS_ITEM @@ -1729,37 +1729,37 @@ UnknownScript_0xbdd40: if_equal $0, UnknownScript_0xbdd5e random $3 if_equal $0, UnknownScript_0xbdd64 - 2jump UnknownScript_0xbdd6a + jump UnknownScript_0xbdd6a UnknownScript_0xbdd5e: setevent EVENT_WILTON_HAS_ULTRA_BALL - 2jump UnknownScript_0xbdd6d + jump UnknownScript_0xbdd6d UnknownScript_0xbdd64: setevent EVENT_WILTON_HAS_GREAT_BALL - 2jump UnknownScript_0xbdd6d + jump UnknownScript_0xbdd6d UnknownScript_0xbdd6a: setevent EVENT_WILTON_HAS_POKE_BALL UnknownScript_0xbdd6d: - 3jump UnknownScript_0xa05e6 + farjump UnknownScript_0xa05e6 UnknownScript_0xbdd71: trainertotext BLACKBELT_T, 8, $0 - 3call UnknownScript_0xbde4e - 3jump UnknownScript_0xa09ee + farscall UnknownScript_0xbde4e + farjump UnknownScript_0xa09ee UnknownScript_0xbdd7d: trainertotext BLACKBELT_T, 8, $0 - 3call UnknownScript_0xbe1b6 - 3jump UnknownScript_0xa064c + farscall UnknownScript_0xbe1b6 + farjump UnknownScript_0xa064c UnknownScript_0xbdd89: trainertotext HIKER, 9, $0 checkflag ENGINE_PARRY iftrue UnknownScript_0xbddac - 3call UnknownScript_0xbde4e + farscall UnknownScript_0xbde4e checkflag ENGINE_9D iftrue UnknownScript_0xbdda8 checkcode $b @@ -1768,25 +1768,25 @@ UnknownScript_0xbdd89: iftrue UnknownScript_0xbddd7 UnknownScript_0xbdda8: - 3jump UnknownScript_0xa09b8 + farjump UnknownScript_0xa09b8 UnknownScript_0xbddac: displaylocation ROUTE_45, $2 - 3jump UnknownScript_0xa0a9b + farjump UnknownScript_0xa0a9b UnknownScript_0xbddb3: trainertotext HIKER, 9, $0 - 3call UnknownScript_0xbe1b6 + farscall UnknownScript_0xbe1b6 checkflag ENGINE_PARRY iftrue UnknownScript_0xbddd3 checkflag ENGINE_9D iftrue UnknownScript_0xbddd3 - 3call UnknownScript_0xbde3f + farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xbddda if_equal $1, UnknownScript_0xbddda UnknownScript_0xbddd3: - 3jump UnknownScript_0xa0000 + farjump UnknownScript_0xa0000 UnknownScript_0xbddd7: setflag ENGINE_9D @@ -1794,13 +1794,13 @@ UnknownScript_0xbddd7: UnknownScript_0xbddda: displaylocation ROUTE_45, $2 setflag ENGINE_PARRY - 3jump UnknownScript_0xa0376 + farjump UnknownScript_0xa0376 UnknownScript_0xbdde4: trainertotext PICNICKER, 10, $0 checkflag ENGINE_ERIN iftrue UnknownScript_0xbde07 - 3call UnknownScript_0xbe0b6 + farscall UnknownScript_0xbe0b6 checkflag ENGINE_9E iftrue UnknownScript_0xbde03 checkcode $b @@ -1809,25 +1809,25 @@ UnknownScript_0xbdde4: iftrue UnknownScript_0xbde32 UnknownScript_0xbde03: - 3jump UnknownScript_0xa09c0 + farjump UnknownScript_0xa09c0 UnknownScript_0xbde07: displaylocation ROUTE_46, $2 - 3jump UnknownScript_0xa0aa0 + farjump UnknownScript_0xa0aa0 UnknownScript_0xbde0e: trainertotext PICNICKER, 10, $0 - 3call UnknownScript_0xbe41e + farscall UnknownScript_0xbe41e checkflag ENGINE_ERIN iftrue UnknownScript_0xbde2e checkflag ENGINE_9E iftrue UnknownScript_0xbde2e - 3call UnknownScript_0xbde42 + farscall UnknownScript_0xbde42 if_equal $0, UnknownScript_0xbde35 if_equal $1, UnknownScript_0xbde35 UnknownScript_0xbde2e: - 3jump UnknownScript_0xa0017 + farjump UnknownScript_0xa0017 UnknownScript_0xbde32: setflag ENGINE_9E @@ -1835,7 +1835,7 @@ UnknownScript_0xbde32: UnknownScript_0xbde35: displaylocation ROUTE_46, $2 setflag ENGINE_ERIN - 3jump UnknownScript_0xa037e + farjump UnknownScript_0xa037e UnknownScript_0xbde3f: random $2 @@ -1885,102 +1885,102 @@ UnknownScript_0xbde4e: if_equal $23, UnknownScript_0xbdf1c UnknownScript_0xbdeaa: - 3writetext UnknownText_0x1b4dc5 + farwritetext UnknownText_0x1b4dc5 keeptextopen end UnknownScript_0xbdeb0: - 3writetext UnknownText_0x1b5073 + farwritetext UnknownText_0x1b5073 keeptextopen end UnknownScript_0xbdeb6: - 3writetext UnknownText_0x1b5270 + farwritetext UnknownText_0x1b5270 keeptextopen end UnknownScript_0xbdebc: - 3writetext UnknownText_0x1b55ae + farwritetext UnknownText_0x1b55ae keeptextopen end UnknownScript_0xbdec2: - 3writetext UnknownText_0x1b589a + farwritetext UnknownText_0x1b589a keeptextopen end UnknownScript_0xbdec8: - 3writetext UnknownText_0x1b5a3b + farwritetext UnknownText_0x1b5a3b keeptextopen end UnknownScript_0xbdece: - 3writetext UnknownText_0x1b5c10 + farwritetext UnknownText_0x1b5c10 keeptextopen end UnknownScript_0xbded4: - 3writetext UnknownText_0x1b5f7a + farwritetext UnknownText_0x1b5f7a keeptextopen end UnknownScript_0xbdeda: - 3writetext UnknownText_0x1b60f5 + farwritetext UnknownText_0x1b60f5 keeptextopen end UnknownScript_0xbdee0: - 3writetext UnknownText_0x1b638c + farwritetext UnknownText_0x1b638c keeptextopen end UnknownScript_0xbdee6: - 3writetext UnknownText_0x1b6454 + farwritetext UnknownText_0x1b6454 keeptextopen end UnknownScript_0xbdeec: - 3writetext UnknownText_0x1b659d + farwritetext UnknownText_0x1b659d keeptextopen end UnknownScript_0xbdef2: - 3writetext UnknownText_0x1b67e2 + farwritetext UnknownText_0x1b67e2 keeptextopen end UnknownScript_0xbdef8: - 3writetext UnknownText_0x1b69a8 + farwritetext UnknownText_0x1b69a8 keeptextopen end UnknownScript_0xbdefe: - 3writetext UnknownText_0x1b6b39 + farwritetext UnknownText_0x1b6b39 keeptextopen end UnknownScript_0xbdf04: - 3writetext UnknownText_0x1b6c96 + farwritetext UnknownText_0x1b6c96 keeptextopen end UnknownScript_0xbdf0a: - 3writetext UnknownText_0x1b7019 + farwritetext UnknownText_0x1b7019 keeptextopen end UnknownScript_0xbdf10: - 3writetext UnknownText_0x1b71d5 + farwritetext UnknownText_0x1b71d5 keeptextopen end UnknownScript_0xbdf16: - 3writetext UnknownText_0x1b730b + farwritetext UnknownText_0x1b730b keeptextopen end UnknownScript_0xbdf1c: - 3writetext UnknownText_0x1b73c7 + farwritetext UnknownText_0x1b73c7 keeptextopen end @@ -2008,102 +2008,102 @@ UnknownScript_0xbdf22: if_equal $23, UnknownScript_0xbdfe6 UnknownScript_0xbdf74: - 3writetext UnknownText_0x1b4ded + farwritetext UnknownText_0x1b4ded keeptextopen end UnknownScript_0xbdf7a: - 3writetext UnknownText_0x1b509b + farwritetext UnknownText_0x1b509b keeptextopen end UnknownScript_0xbdf80: - 3writetext UnknownText_0x1b52a5 + farwritetext UnknownText_0x1b52a5 keeptextopen end UnknownScript_0xbdf86: - 3writetext UnknownText_0x1b55da + farwritetext UnknownText_0x1b55da keeptextopen end UnknownScript_0xbdf8c: - 3writetext UnknownText_0x1b58c2 + farwritetext UnknownText_0x1b58c2 keeptextopen end UnknownScript_0xbdf92: - 3writetext UnknownText_0x1b5a74 + farwritetext UnknownText_0x1b5a74 keeptextopen end UnknownScript_0xbdf98: - 3writetext UnknownText_0x1b5c63 + farwritetext UnknownText_0x1b5c63 keeptextopen end UnknownScript_0xbdf9e: - 3writetext UnknownText_0x1b5f9e + farwritetext UnknownText_0x1b5f9e keeptextopen end UnknownScript_0xbdfa4: - 3writetext UnknownText_0x1b611b + farwritetext UnknownText_0x1b611b keeptextopen end UnknownScript_0xbdfaa: - 3writetext UnknownText_0x1b63a8 + farwritetext UnknownText_0x1b63a8 keeptextopen end UnknownScript_0xbdfb0: - 3writetext UnknownText_0x1b647e + farwritetext UnknownText_0x1b647e keeptextopen end UnknownScript_0xbdfb6: - 3writetext UnknownText_0x1b65c7 + farwritetext UnknownText_0x1b65c7 keeptextopen end UnknownScript_0xbdfbc: - 3writetext UnknownText_0x1b680e + farwritetext UnknownText_0x1b680e keeptextopen end UnknownScript_0xbdfc2: - 3writetext UnknownText_0x1b69d2 + farwritetext UnknownText_0x1b69d2 keeptextopen end UnknownScript_0xbdfc8: - 3writetext UnknownText_0x1b6b65 + farwritetext UnknownText_0x1b6b65 keeptextopen end UnknownScript_0xbdfce: - 3writetext UnknownText_0x1b6cc6 + farwritetext UnknownText_0x1b6cc6 keeptextopen end UnknownScript_0xbdfd4: - 3writetext UnknownText_0x1b7057 + farwritetext UnknownText_0x1b7057 keeptextopen end UnknownScript_0xbdfda: - 3writetext UnknownText_0x1b71fc + farwritetext UnknownText_0x1b71fc keeptextopen end UnknownScript_0xbdfe0: - 3writetext UnknownText_0x1b7331 + farwritetext UnknownText_0x1b7331 keeptextopen end UnknownScript_0xbdfe6: - 3writetext UnknownText_0x1b73ef + farwritetext UnknownText_0x1b73ef keeptextopen end @@ -2131,102 +2131,102 @@ UnknownScript_0xbdfec: if_equal $23, UnknownScript_0xbe0b0 UnknownScript_0xbe03e: - 3writetext UnknownText_0x1b4e16 + farwritetext UnknownText_0x1b4e16 keeptextopen end UnknownScript_0xbe044: - 3writetext UnknownText_0x1b50c2 + farwritetext UnknownText_0x1b50c2 keeptextopen end UnknownScript_0xbe04a: - 3writetext UnknownText_0x1b52cc + farwritetext UnknownText_0x1b52cc keeptextopen end UnknownScript_0xbe050: - 3writetext UnknownText_0x1b55fc + farwritetext UnknownText_0x1b55fc keeptextopen end UnknownScript_0xbe056: - 3writetext UnknownText_0x1b58ea + farwritetext UnknownText_0x1b58ea keeptextopen end UnknownScript_0xbe05c: - 3writetext UnknownText_0x1b5a9f + farwritetext UnknownText_0x1b5a9f keeptextopen end UnknownScript_0xbe062: - 3writetext UnknownText_0x1b5cb6 + farwritetext UnknownText_0x1b5cb6 keeptextopen end UnknownScript_0xbe068: - 3writetext UnknownText_0x1b5fc9 + farwritetext UnknownText_0x1b5fc9 keeptextopen end UnknownScript_0xbe06e: - 3writetext UnknownText_0x1b6149 + farwritetext UnknownText_0x1b6149 keeptextopen end UnknownScript_0xbe074: - 3writetext UnknownText_0x1b63c4 + farwritetext UnknownText_0x1b63c4 keeptextopen end UnknownScript_0xbe07a: - 3writetext UnknownText_0x1b64a8 + farwritetext UnknownText_0x1b64a8 keeptextopen end UnknownScript_0xbe080: - 3writetext UnknownText_0x1b65e3 + farwritetext UnknownText_0x1b65e3 keeptextopen end UnknownScript_0xbe086: - 3writetext UnknownText_0x1b6836 + farwritetext UnknownText_0x1b6836 keeptextopen end UnknownScript_0xbe08c: - 3writetext UnknownText_0x1b69f8 + farwritetext UnknownText_0x1b69f8 keeptextopen end UnknownScript_0xbe092: - 3writetext UnknownText_0x1b6b92 + farwritetext UnknownText_0x1b6b92 keeptextopen end UnknownScript_0xbe098: - 3writetext UnknownText_0x1b6cf6 + farwritetext UnknownText_0x1b6cf6 keeptextopen end UnknownScript_0xbe09e: - 3writetext UnknownText_0x1b7092 + farwritetext UnknownText_0x1b7092 keeptextopen end UnknownScript_0xbe0a4: - 3writetext UnknownText_0x1b722a + farwritetext UnknownText_0x1b722a keeptextopen end UnknownScript_0xbe0aa: - 3writetext UnknownText_0x1b7357 + farwritetext UnknownText_0x1b7357 keeptextopen end UnknownScript_0xbe0b0: - 3writetext UnknownText_0x1b7417 + farwritetext UnknownText_0x1b7417 keeptextopen end @@ -2246,42 +2246,42 @@ UnknownScript_0xbe0b6: if_equal $24, UnknownScript_0xbe10c UnknownScript_0xbe0e2: - 3writetext UnknownText_0x1b4f21 + farwritetext UnknownText_0x1b4f21 keeptextopen end UnknownScript_0xbe0e8: - 3writetext UnknownText_0x1b53f7 + farwritetext UnknownText_0x1b53f7 keeptextopen end UnknownScript_0xbe0ee: - 3writetext UnknownText_0x1b5702 + farwritetext UnknownText_0x1b5702 keeptextopen end UnknownScript_0xbe0f4: - 3writetext UnknownText_0x1b5d9f + farwritetext UnknownText_0x1b5d9f keeptextopen end UnknownScript_0xbe0fa: - 3writetext UnknownText_0x1b626a + farwritetext UnknownText_0x1b626a keeptextopen end UnknownScript_0xbe100: - 3writetext UnknownText_0x1b66c8 + farwritetext UnknownText_0x1b66c8 keeptextopen end UnknownScript_0xbe106: - 3writetext UnknownText_0x1b6e7c + farwritetext UnknownText_0x1b6e7c keeptextopen end UnknownScript_0xbe10c: - 3writetext UnknownText_0x1b751a + farwritetext UnknownText_0x1b751a keeptextopen end @@ -2297,42 +2297,42 @@ UnknownScript_0xbe112: if_equal $24, UnknownScript_0xbe15e UnknownScript_0xbe134: - 3writetext UnknownText_0x1b4f4d + farwritetext UnknownText_0x1b4f4d keeptextopen end UnknownScript_0xbe13a: - 3writetext UnknownText_0x1b5424 + farwritetext UnknownText_0x1b5424 keeptextopen end UnknownScript_0xbe140: - 3writetext UnknownText_0x1b572e + farwritetext UnknownText_0x1b572e keeptextopen end UnknownScript_0xbe146: - 3writetext UnknownText_0x1b5dcc + farwritetext UnknownText_0x1b5dcc keeptextopen end UnknownScript_0xbe14c: - 3writetext UnknownText_0x1b6296 + farwritetext UnknownText_0x1b6296 keeptextopen end UnknownScript_0xbe152: - 3writetext UnknownText_0x1b66ec + farwritetext UnknownText_0x1b66ec keeptextopen end UnknownScript_0xbe158: - 3writetext UnknownText_0x1b6ea6 + farwritetext UnknownText_0x1b6ea6 keeptextopen end UnknownScript_0xbe15e: - 3writetext UnknownText_0x1b7548 + farwritetext UnknownText_0x1b7548 keeptextopen end @@ -2348,42 +2348,42 @@ UnknownScript_0xbe164: if_equal $24, UnknownScript_0xbe1b0 UnknownScript_0xbe186: - 3writetext UnknownText_0x1b4f75 + farwritetext UnknownText_0x1b4f75 keeptextopen end UnknownScript_0xbe18c: - 3writetext UnknownText_0x1b5446 + farwritetext UnknownText_0x1b5446 keeptextopen end UnknownScript_0xbe192: - 3writetext UnknownText_0x1b575a + farwritetext UnknownText_0x1b575a keeptextopen end UnknownScript_0xbe198: - 3writetext UnknownText_0x1b5df8 + farwritetext UnknownText_0x1b5df8 keeptextopen end UnknownScript_0xbe19e: - 3writetext UnknownText_0x1b62c5 + farwritetext UnknownText_0x1b62c5 keeptextopen end UnknownScript_0xbe1a4: - 3writetext UnknownText_0x1b6713 + farwritetext UnknownText_0x1b6713 keeptextopen end UnknownScript_0xbe1aa: - 3writetext UnknownText_0x1b6ec9 + farwritetext UnknownText_0x1b6ec9 keeptextopen end UnknownScript_0xbe1b0: - 3writetext UnknownText_0x1b756f + farwritetext UnknownText_0x1b756f keeptextopen end @@ -2415,102 +2415,102 @@ UnknownScript_0xbe1b6: if_equal $23, UnknownScript_0xbe284 UnknownScript_0xbe212: - 3writetext UnknownText_0x1b4e3e + farwritetext UnknownText_0x1b4e3e keeptextopen end UnknownScript_0xbe218: - 3writetext UnknownText_0x1b50e9 + farwritetext UnknownText_0x1b50e9 keeptextopen end UnknownScript_0xbe21e: - 3writetext UnknownText_0x1b5301 + farwritetext UnknownText_0x1b5301 keeptextopen end UnknownScript_0xbe224: - 3writetext UnknownText_0x1b5628 + farwritetext UnknownText_0x1b5628 keeptextopen end UnknownScript_0xbe22a: - 3writetext UnknownText_0x1b5912 + farwritetext UnknownText_0x1b5912 keeptextopen end UnknownScript_0xbe230: - 3writetext UnknownText_0x1b5ad8 + farwritetext UnknownText_0x1b5ad8 keeptextopen end UnknownScript_0xbe236: - 3writetext UnknownText_0x1b5d09 + farwritetext UnknownText_0x1b5d09 keeptextopen end UnknownScript_0xbe23c: - 3writetext UnknownText_0x1b5ff6 + farwritetext UnknownText_0x1b5ff6 keeptextopen end UnknownScript_0xbe242: - 3writetext UnknownText_0x1b616e + farwritetext UnknownText_0x1b616e keeptextopen end UnknownScript_0xbe248: - 3writetext UnknownText_0x1b63e3 + farwritetext UnknownText_0x1b63e3 keeptextopen end UnknownScript_0xbe24e: - 3writetext UnknownText_0x1b64d2 + farwritetext UnknownText_0x1b64d2 keeptextopen end UnknownScript_0xbe254: - 3writetext UnknownText_0x1b660d + farwritetext UnknownText_0x1b660d keeptextopen end UnknownScript_0xbe25a: - 3writetext UnknownText_0x1b6862 + farwritetext UnknownText_0x1b6862 keeptextopen end UnknownScript_0xbe260: - 3writetext UnknownText_0x1b6a22 + farwritetext UnknownText_0x1b6a22 keeptextopen end UnknownScript_0xbe266: - 3writetext UnknownText_0x1b6bb9 + farwritetext UnknownText_0x1b6bb9 keeptextopen end UnknownScript_0xbe26c: - 3writetext UnknownText_0x1b6d26 + farwritetext UnknownText_0x1b6d26 keeptextopen end UnknownScript_0xbe272: - 3writetext UnknownText_0x1b70e7 + farwritetext UnknownText_0x1b70e7 keeptextopen end UnknownScript_0xbe278: - 3writetext UnknownText_0x1b725c + farwritetext UnknownText_0x1b725c keeptextopen end UnknownScript_0xbe27e: - 3writetext UnknownText_0x1b737f + farwritetext UnknownText_0x1b737f keeptextopen end UnknownScript_0xbe284: - 3writetext UnknownText_0x1b743f + farwritetext UnknownText_0x1b743f keeptextopen end @@ -2538,102 +2538,102 @@ UnknownScript_0xbe28a: if_equal $23, UnknownScript_0xbe34e UnknownScript_0xbe2dc: - 3writetext UnknownText_0x1b4e72 + farwritetext UnknownText_0x1b4e72 keeptextopen end UnknownScript_0xbe2e2: - 3writetext UnknownText_0x1b511a + farwritetext UnknownText_0x1b511a keeptextopen end UnknownScript_0xbe2e8: - 3writetext UnknownText_0x1b5335 + farwritetext UnknownText_0x1b5335 keeptextopen end UnknownScript_0xbe2ee: - 3writetext UnknownText_0x1b564c + farwritetext UnknownText_0x1b564c keeptextopen end UnknownScript_0xbe2f4: - 3writetext UnknownText_0x1b5948 + farwritetext UnknownText_0x1b5948 keeptextopen end UnknownScript_0xbe2fa: - 3writetext UnknownText_0x1b5b0b + farwritetext UnknownText_0x1b5b0b keeptextopen end UnknownScript_0xbe300: - 3writetext UnknownText_0x1b5d21 + farwritetext UnknownText_0x1b5d21 keeptextopen end UnknownScript_0xbe306: - 3writetext UnknownText_0x1b6017 + farwritetext UnknownText_0x1b6017 keeptextopen end UnknownScript_0xbe30c: - 3writetext UnknownText_0x1b618f + farwritetext UnknownText_0x1b618f keeptextopen end UnknownScript_0xbe312: - 3writetext UnknownText_0x1b6407 + farwritetext UnknownText_0x1b6407 keeptextopen end UnknownScript_0xbe318: - 3writetext UnknownText_0x1b6506 + farwritetext UnknownText_0x1b6506 keeptextopen end UnknownScript_0xbe31e: - 3writetext UnknownText_0x1b6624 + farwritetext UnknownText_0x1b6624 keeptextopen end UnknownScript_0xbe324: - 3writetext UnknownText_0x1b6890 + farwritetext UnknownText_0x1b6890 keeptextopen end UnknownScript_0xbe32a: - 3writetext UnknownText_0x1b6a56 + farwritetext UnknownText_0x1b6a56 keeptextopen end UnknownScript_0xbe330: - 3writetext UnknownText_0x1b6bef + farwritetext UnknownText_0x1b6bef keeptextopen end UnknownScript_0xbe336: - 3writetext UnknownText_0x1b6d57 + farwritetext UnknownText_0x1b6d57 keeptextopen end UnknownScript_0xbe33c: - 3writetext UnknownText_0x1b7112 + farwritetext UnknownText_0x1b7112 keeptextopen end UnknownScript_0xbe342: - 3writetext UnknownText_0x1b7283 + farwritetext UnknownText_0x1b7283 keeptextopen end UnknownScript_0xbe348: - 3writetext UnknownText_0x1b7397 + farwritetext UnknownText_0x1b7397 keeptextopen end UnknownScript_0xbe34e: - 3writetext UnknownText_0x1b746f + farwritetext UnknownText_0x1b746f keeptextopen end @@ -2661,102 +2661,102 @@ UnknownScript_0xbe354: if_equal $23, UnknownScript_0xbe418 UnknownScript_0xbe3a6: - 3writetext UnknownText_0x1b4e9e + farwritetext UnknownText_0x1b4e9e keeptextopen end UnknownScript_0xbe3ac: - 3writetext UnknownText_0x1b5154 + farwritetext UnknownText_0x1b5154 keeptextopen end UnknownScript_0xbe3b2: - 3writetext UnknownText_0x1b535f + farwritetext UnknownText_0x1b535f keeptextopen end UnknownScript_0xbe3b8: - 3writetext UnknownText_0x1b5670 + farwritetext UnknownText_0x1b5670 keeptextopen end UnknownScript_0xbe3be: - 3writetext UnknownText_0x1b597c + farwritetext UnknownText_0x1b597c keeptextopen end UnknownScript_0xbe3c4: - 3writetext UnknownText_0x1b5b37 + farwritetext UnknownText_0x1b5b37 keeptextopen end UnknownScript_0xbe3ca: - 3writetext UnknownText_0x1b5d39 + farwritetext UnknownText_0x1b5d39 keeptextopen end UnknownScript_0xbe3d0: - 3writetext UnknownText_0x1b6041 + farwritetext UnknownText_0x1b6041 keeptextopen end UnknownScript_0xbe3d6: - 3writetext UnknownText_0x1b61bd + farwritetext UnknownText_0x1b61bd keeptextopen end UnknownScript_0xbe3dc: - 3writetext UnknownText_0x1b642c + farwritetext UnknownText_0x1b642c keeptextopen end UnknownScript_0xbe3e2: - 3writetext UnknownText_0x1b6539 + farwritetext UnknownText_0x1b6539 keeptextopen end UnknownScript_0xbe3e8: - 3writetext UnknownText_0x1b663b + farwritetext UnknownText_0x1b663b keeptextopen end UnknownScript_0xbe3ee: - 3writetext UnknownText_0x1b68ba + farwritetext UnknownText_0x1b68ba keeptextopen end UnknownScript_0xbe3f4: - 3writetext UnknownText_0x1b6a8b + farwritetext UnknownText_0x1b6a8b keeptextopen end UnknownScript_0xbe3fa: - 3writetext UnknownText_0x1b6c23 + farwritetext UnknownText_0x1b6c23 keeptextopen end UnknownScript_0xbe400: - 3writetext UnknownText_0x1b6d88 + farwritetext UnknownText_0x1b6d88 keeptextopen end UnknownScript_0xbe406: - 3writetext UnknownText_0x1b7132 + farwritetext UnknownText_0x1b7132 keeptextopen end UnknownScript_0xbe40c: - 3writetext UnknownText_0x1b72a5 + farwritetext UnknownText_0x1b72a5 keeptextopen end UnknownScript_0xbe412: - 3writetext UnknownText_0x1b73af + farwritetext UnknownText_0x1b73af keeptextopen end UnknownScript_0xbe418: - 3writetext UnknownText_0x1b749b + farwritetext UnknownText_0x1b749b keeptextopen end @@ -2776,42 +2776,42 @@ UnknownScript_0xbe41e: if_equal $24, UnknownScript_0xbe474 UnknownScript_0xbe44a: - 3writetext UnknownText_0x1b4fa1 + farwritetext UnknownText_0x1b4fa1 keeptextopen end UnknownScript_0xbe450: - 3writetext UnknownText_0x1b5472 + farwritetext UnknownText_0x1b5472 keeptextopen end UnknownScript_0xbe456: - 3writetext UnknownText_0x1b5786 + farwritetext UnknownText_0x1b5786 keeptextopen end UnknownScript_0xbe45c: - 3writetext UnknownText_0x1b5e25 + farwritetext UnknownText_0x1b5e25 keeptextopen end UnknownScript_0xbe462: - 3writetext UnknownText_0x1b62f1 + farwritetext UnknownText_0x1b62f1 keeptextopen end UnknownScript_0xbe468: - 3writetext UnknownText_0x1b6738 + farwritetext UnknownText_0x1b6738 keeptextopen end UnknownScript_0xbe46e: - 3writetext UnknownText_0x1b6ef3 + farwritetext UnknownText_0x1b6ef3 keeptextopen end UnknownScript_0xbe474: - 3writetext UnknownText_0x1b758f + farwritetext UnknownText_0x1b758f keeptextopen end @@ -2827,42 +2827,42 @@ UnknownScript_0xbe47a: if_equal $24, UnknownScript_0xbe4c6 UnknownScript_0xbe49c: - 3writetext UnknownText_0x1b4fda + farwritetext UnknownText_0x1b4fda keeptextopen end UnknownScript_0xbe4a2: - 3writetext UnknownText_0x1b54a6 + farwritetext UnknownText_0x1b54a6 keeptextopen end UnknownScript_0xbe4a8: - 3writetext UnknownText_0x1b57b7 + farwritetext UnknownText_0x1b57b7 keeptextopen end UnknownScript_0xbe4ae: - 3writetext UnknownText_0x1b5e59 + farwritetext UnknownText_0x1b5e59 keeptextopen end UnknownScript_0xbe4b4: - 3writetext UnknownText_0x1b630e + farwritetext UnknownText_0x1b630e keeptextopen end UnknownScript_0xbe4ba: - 3writetext UnknownText_0x1b6757 + farwritetext UnknownText_0x1b6757 keeptextopen end UnknownScript_0xbe4c0: - 3writetext UnknownText_0x1b6f1c + farwritetext UnknownText_0x1b6f1c keeptextopen end UnknownScript_0xbe4c6: - 3writetext UnknownText_0x1b75ac + farwritetext UnknownText_0x1b75ac keeptextopen end @@ -2878,42 +2878,42 @@ UnknownScript_0xbe4cc: if_equal $24, UnknownScript_0xbe518 UnknownScript_0xbe4ee: - 3writetext UnknownText_0x1b5004 + farwritetext UnknownText_0x1b5004 keeptextopen end UnknownScript_0xbe4f4: - 3writetext UnknownText_0x1b54d4 + farwritetext UnknownText_0x1b54d4 keeptextopen end UnknownScript_0xbe4fa: - 3writetext UnknownText_0x1b57e8 + farwritetext UnknownText_0x1b57e8 keeptextopen end UnknownScript_0xbe500: - 3writetext UnknownText_0x1b5e8e + farwritetext UnknownText_0x1b5e8e keeptextopen end UnknownScript_0xbe506: - 3writetext UnknownText_0x1b6331 + farwritetext UnknownText_0x1b6331 keeptextopen end UnknownScript_0xbe50c: - 3writetext UnknownText_0x1b6776 + farwritetext UnknownText_0x1b6776 keeptextopen end UnknownScript_0xbe512: - 3writetext UnknownText_0x1b6f37 + farwritetext UnknownText_0x1b6f37 keeptextopen end UnknownScript_0xbe518: - 3writetext UnknownText_0x1b75c9 + farwritetext UnknownText_0x1b75c9 keeptextopen end @@ -2938,92 +2938,92 @@ UnknownScript_0xbe51e: if_equal $23, UnknownScript_0xbe5ca UnknownScript_0xbe564: - 3writetext UnknownText_0x1b4ecd + farwritetext UnknownText_0x1b4ecd keeptextopen end UnknownScript_0xbe56a: - 3writetext UnknownText_0x1b518b + farwritetext UnknownText_0x1b518b keeptextopen end UnknownScript_0xbe570: - 3writetext UnknownText_0x1b5393 + farwritetext UnknownText_0x1b5393 keeptextopen end UnknownScript_0xbe576: - 3writetext UnknownText_0x1b5694 + farwritetext UnknownText_0x1b5694 keeptextopen end UnknownScript_0xbe57c: - 3writetext UnknownText_0x1b59b2 + farwritetext UnknownText_0x1b59b2 keeptextopen end UnknownScript_0xbe582: - 3writetext UnknownText_0x1b5b68 + farwritetext UnknownText_0x1b5b68 keeptextopen end UnknownScript_0xbe588: - 3writetext UnknownText_0x1b5d51 + farwritetext UnknownText_0x1b5d51 keeptextopen end UnknownScript_0xbe58e: - 3writetext UnknownText_0x1b606f + farwritetext UnknownText_0x1b606f keeptextopen end UnknownScript_0xbe594: - 3writetext UnknownText_0x1b61f2 + farwritetext UnknownText_0x1b61f2 keeptextopen end UnknownScript_0xbe59a: - 3writetext UnknownText_0x1b656c + farwritetext UnknownText_0x1b656c keeptextopen end UnknownScript_0xbe5a0: - 3writetext UnknownText_0x1b6652 + farwritetext UnknownText_0x1b6652 keeptextopen end UnknownScript_0xbe5a6: - 3writetext UnknownText_0x1b68e8 + farwritetext UnknownText_0x1b68e8 keeptextopen end UnknownScript_0xbe5ac: - 3writetext UnknownText_0x1b6ac2 + farwritetext UnknownText_0x1b6ac2 keeptextopen end UnknownScript_0xbe5b2: - 3writetext UnknownText_0x1b6c56 + farwritetext UnknownText_0x1b6c56 keeptextopen end UnknownScript_0xbe5b8: - 3writetext UnknownText_0x1b6db9 + farwritetext UnknownText_0x1b6db9 keeptextopen end UnknownScript_0xbe5be: - 3writetext UnknownText_0x1b7161 + farwritetext UnknownText_0x1b7161 keeptextopen end UnknownScript_0xbe5c4: - 3writetext UnknownText_0x1b72d0 + farwritetext UnknownText_0x1b72d0 keeptextopen end UnknownScript_0xbe5ca: - 3writetext UnknownText_0x1b74c8 + farwritetext UnknownText_0x1b74c8 keeptextopen end @@ -3039,60 +3039,60 @@ UnknownScript_0xbe5d0: if_equal $24, UnknownScript_0xbe61c UnknownScript_0xbe5f2: - 3writetext UnknownText_0x1b502b + farwritetext UnknownText_0x1b502b keeptextopen end UnknownScript_0xbe5f8: - 3writetext UnknownText_0x1b5510 + farwritetext UnknownText_0x1b5510 keeptextopen end UnknownScript_0xbe5fe: - 3writetext UnknownText_0x1b5819 + farwritetext UnknownText_0x1b5819 keeptextopen end UnknownScript_0xbe604: - 3writetext UnknownText_0x1b5ebe + farwritetext UnknownText_0x1b5ebe keeptextopen end UnknownScript_0xbe60a: - 3writetext UnknownText_0x1b6352 + farwritetext UnknownText_0x1b6352 keeptextopen end UnknownScript_0xbe610: - 3writetext UnknownText_0x1b6795 + farwritetext UnknownText_0x1b6795 keeptextopen end UnknownScript_0xbe616: - 3writetext UnknownText_0x1b6f60 + farwritetext UnknownText_0x1b6f60 keeptextopen end UnknownScript_0xbe61c: - 3writetext UnknownText_0x1b75e5 + farwritetext UnknownText_0x1b75e5 keeptextopen end UnknownScript_0xbe622: special $005d - 3call UnknownScript_0xbde3f + farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xbe636 - 3writetext UnknownText_0x1b518b + farwritetext UnknownText_0x1b518b keeptextopen - 3jump UnknownScript_0xa0484 + farjump UnknownScript_0xa0484 UnknownScript_0xbe636: - 3jump UnknownScript_0xbe63a + farjump UnknownScript_0xbe63a UnknownScript_0xbe63a: - 3writetext UnknownText_0x1b522b + farwritetext UnknownText_0x1b522b keeptextopen - 3jump UnknownScript_0xa0484 + farjump UnknownScript_0xa0484 ; be643 @@ -3110,18 +3110,18 @@ UnknownScript_0xbe66a:: ; 0xbe66a iftrue UnknownScript_0xbe698 loadtrainerdata playrammusic - 2jump UnknownScript_0xbe68a + jump UnknownScript_0xbe68a ; 0xbe675 UnknownScript_0xbe675:: ; 0xbe675 loadtrainerdata playrammusic showemote $0, $fe, 30 - 3callasm Function831e + callasm Function831e applymovement2 $d007 writepersonxy $fe faceperson $0, $fe - 2jump UnknownScript_0xbe68a + jump UnknownScript_0xbe68a ; 0xbe68a UnknownScript_0xbe68a: ; 0xbe68a diff --git a/engine/scripting.asm b/engine/scripting.asm index 2b334a54f..5f41469c2 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -572,8 +572,8 @@ Function96f76: ; 96f76 ; 96f77 GiveItemScript: ; 96f77 - 3callasm Function96f76 - 2writetext ReceivedItemText + callasm Function96f76 + writetext ReceivedItemText iffalse .Full waitbutton specialsound diff --git a/engine/std_scripts.asm b/engine/std_scripts.asm index 66f3f2226..b6fd9f686 100644 --- a/engine/std_scripts.asm +++ b/engine/std_scripts.asm @@ -68,59 +68,59 @@ PokeCenterNurseScript: ; bc09c checktime $4 iftrue .nite ; If somehow it's not a time of day at all, we skip the introduction - 2jump .heal + jump .heal .morn ; Different text if we're in the com center checkevent $032a iftrue .morn_comcenter ; Good morning! Welcome to ... - 3writetext UnknownText_0x1b0000 + farwritetext UnknownText_0x1b0000 keeptextopen - 2jump .heal + jump .heal .morn_comcenter ; Good morning! This is the ... - 3writetext UnknownText_0x1b008a + farwritetext UnknownText_0x1b008a keeptextopen - 2jump .heal + jump .heal .day ; Different text if we're in the com center checkevent $032a iftrue .day_comcenter ; Hello! Welcome to ... - 3writetext UnknownText_0x1b002b + farwritetext UnknownText_0x1b002b keeptextopen - 2jump .heal + jump .heal .day_comcenter ; Hello! This is the ... - 3writetext UnknownText_0x1b00d6 + farwritetext UnknownText_0x1b00d6 keeptextopen - 2jump .heal + jump .heal .nite ; Different text if we're in the com center checkevent $032a iftrue .nite_comcenter ; Good evening! You're out late. ... - 3writetext UnknownText_0x1b004f + farwritetext UnknownText_0x1b004f keeptextopen - 2jump .heal + jump .heal .nite_comcenter ; Good to see you working so late. ... - 3writetext UnknownText_0x1b011b + farwritetext UnknownText_0x1b011b keeptextopen - 2jump .heal + jump .heal .heal ; If we come back, don't welcome us to the com center again clearevent $032a ; Ask if you want to heal - 3writetext UnknownText_0x1b017a + farwritetext UnknownText_0x1b017a yesorno iffalse .end ; Go ahead and heal - 3writetext UnknownText_0x1b01bd + farwritetext UnknownText_0x1b01bd pause 20 special $009d ; Turn to the machine @@ -145,11 +145,11 @@ PokeCenterNurseScript: ; bc09c iftrue .pokerus .done ; Thank you for waiting. ... - 3writetext UnknownText_0x1b01d7 + farwritetext UnknownText_0x1b01d7 pause 20 .end ; We hope to see you again. - 3writetext UnknownText_0x1b020b + farwritetext UnknownText_0x1b020b ; Curtsy spriteface $fe, $1 pause 10 @@ -167,13 +167,13 @@ PokeCenterNurseScript: ; bc09c checkevent $032a iftrue .pokerus_comcenter ; Your Pokemon appear to be infected ... - 3writetext UnknownText_0x1b0241 + farwritetext UnknownText_0x1b0241 closetext loadmovesprites - 2jump .endpokerus + jump .endpokerus .pokerus_comcenter ; Your Pokemon appear to be infected ... - 3writetext UnknownText_0x1b02d6 + farwritetext UnknownText_0x1b02d6 closetext loadmovesprites .endpokerus @@ -185,32 +185,32 @@ PokeCenterNurseScript: ; bc09c ; bc162 UnknownScript_0xbc162: ; 0xbc162 - 3jumptext UnknownText_0x1b035a + farjumptext UnknownText_0x1b035a ; 0xbc166 UnknownScript_0xbc166: ; 0xbc166 - 3jumptext UnknownText_0x1b0378 + farjumptext UnknownText_0x1b0378 ; 0xbc16a UnknownScript_0xbc16a: ; 0xbc16a - 3jumptext UnknownText_0x1b03a3 + farjumptext UnknownText_0x1b03a3 ; 0xbc16e UnknownScript_0xbc16e: ; 0xbc16e - 3jumptext UnknownText_0x1b03d9 + farjumptext UnknownText_0x1b03d9 ; 0xbc172 UnknownScript_0xbc172: ; 0xbc172 - 3jumptext UnknownText_0x1b0448 + farjumptext UnknownText_0x1b0448 ; 0xbc176 UnknownScript_0xbc176: ; 0xbc176 - 3jumptext UnknownText_0x1b0472 + farjumptext UnknownText_0x1b0472 ; 0xbc17a UnknownScript_0xbc17a: ; 0xbc17a loadfont - 3writetext UnknownText_0x1b048d + farwritetext UnknownText_0x1b048d closetext special $0026 loadmovesprites @@ -218,19 +218,19 @@ UnknownScript_0xbc17a: ; 0xbc17a ; 0xbc185 UnknownScript_0xbc185: ; 0xbc185 - 3jumptext UnknownText_0x1b04a0 + farjumptext UnknownText_0x1b04a0 ; 0xbc189 UnknownScript_0xbc189: ; 0xbc189 loadfont - 3writetext UnknownText_0x1b04be + farwritetext UnknownText_0x1b04be closetext loadmovesprites end ; 0xbc191 UnknownScript_0xbc191: ; 0xbc191 - 3jumptext UnknownText_0x1b04c9 + farjumptext UnknownText_0x1b04c9 ; 0xbc195 UnknownScript_0xbc195: ; 0xbc195 @@ -250,7 +250,7 @@ UnknownScript_0xbc19d: ; 0xbc19d ; 0xbc1a5 UnknownScript_0xbc1a5: ; 0xbc1a5 - 3jumptext UnknownText_0x1b0526 + farjumptext UnknownText_0x1b0526 ; 0xbc1a9 UnknownScript_0xbc1a9: ; 0xbc1a9 @@ -268,19 +268,19 @@ UnknownScript_0xbc1af: ; 0xbc1af ; 0xbc1b8 UnknownScript_0xbc1b8: ; 0xbc1b8 - 3jump UnknownScript_0xcd4b + farjump UnknownScript_0xcd4b ; 0xbc1bc UnknownScript_0xbc1bc: ; 0xbc1bc - 3jump AskRockSmashScript + farjump AskRockSmashScript ; 0xbc1c0 UnknownScript_0xbc1c0: ; 0xbc1c0 - 3jumptext UnknownText_0x1b057f + farjumptext UnknownText_0x1b057f ; 0xbc1c4 UnknownScript_0xbc1c4: ; 0xbc1c4 - 3jumptext UnknownText_0x1b059c + farjumptext UnknownText_0x1b059c ; 0xbc1c8 UnknownScript_0xbc1c8: ; 0xbc1c8 @@ -372,7 +372,7 @@ UnknownScript_0xbc242: ; 0xbc242 UnknownScript_0xbc25c: ; 0xbc25c special $0034 - 2call UnknownScript_0xbc380 + scall UnknownScript_0xbc380 setevent $0747 clearevent $0748 setevent $02d2 @@ -387,40 +387,40 @@ UnknownScript_0xbc274: ; bc274 clearevent $0315 clearevent $0316 loadfont - 3writetext UnknownText_0x1b05bf + farwritetext UnknownText_0x1b05bf closetext special $0014 RAM2MEM $0 if_equal $1, UnknownScript_0xbc31e if_equal $2, UnknownScript_0xbc332 if_equal $3, UnknownScript_0xbc343 - 3writetext UnknownText_0x1b0681 + farwritetext UnknownText_0x1b0681 keeptextopen waitbutton verbosegiveitem BERRY, 1 iffalse UnknownScript_0xbc375 UnknownScript_0xbc2a9: - 3writetext UnknownText_0x1b06b7 + farwritetext UnknownText_0x1b06b7 keeptextopen - 2jump UnknownScript_0xbc2b6 + jump UnknownScript_0xbc2b6 ; 0xbc2b1 UnknownScript_0xbc2b1: ; 0xbc2b1 - 3writetext UnknownText_0x1b065b + farwritetext UnknownText_0x1b065b keeptextopen UnknownScript_0xbc2b6: checkevent $0308 iffalse UnknownScript_0xbc2c4 - 3writetext UnknownText_0x1b06d9 + farwritetext UnknownText_0x1b06d9 closetext special $0017 UnknownScript_0xbc2c4: special $0015 if_equal $0, UnknownScript_0xbc2d4 if_equal $2, UnknownScript_0xbc2d4 - 3writetext UnknownText_0x1b070d + farwritetext UnknownText_0x1b070d closetext UnknownScript_0xbc2d4: loadmovesprites @@ -454,57 +454,57 @@ UnknownScript_0xbc2d4: UnknownScript_0xbc31e: ; 0xbc31e setevent $0000 itemtotext SUN_STONE, $1 - 3writetext UnknownText_0x1b0621 + farwritetext UnknownText_0x1b0621 closetext verbosegiveitem SUN_STONE, 1 iffalse UnknownScript_0xbc354 - 2jump UnknownScript_0xbc2b1 + jump UnknownScript_0xbc2b1 ; 0xbc332 UnknownScript_0xbc332: ; 0xbc332 itemtotext EVERSTONE, $1 - 3writetext UnknownText_0x1b0621 + farwritetext UnknownText_0x1b0621 closetext verbosegiveitem EVERSTONE, 1 iffalse UnknownScript_0xbc35f - 2jump UnknownScript_0xbc2b1 + jump UnknownScript_0xbc2b1 ; 0xbc343 UnknownScript_0xbc343: ; 0xbc343 itemtotext GOLD_BERRY, $1 - 3writetext UnknownText_0x1b0621 + farwritetext UnknownText_0x1b0621 closetext verbosegiveitem GOLD_BERRY, 1 iffalse UnknownScript_0xbc36a - 2jump UnknownScript_0xbc2b1 + jump UnknownScript_0xbc2b1 ; 0xbc354 UnknownScript_0xbc354: ; 0xbc354 - 3writetext UnknownText_0x1b08cc + farwritetext UnknownText_0x1b08cc keeptextopen setevent $0313 - 2jump UnknownScript_0xbc2b1 + jump UnknownScript_0xbc2b1 ; 0xbc35f UnknownScript_0xbc35f: ; 0xbc35f - 3writetext UnknownText_0x1b08cc + farwritetext UnknownText_0x1b08cc keeptextopen setevent $0314 - 2jump UnknownScript_0xbc2b1 + jump UnknownScript_0xbc2b1 ; 0xbc36a UnknownScript_0xbc36a: ; 0xbc36a - 3writetext UnknownText_0x1b08cc + farwritetext UnknownText_0x1b08cc keeptextopen setevent $0315 - 2jump UnknownScript_0xbc2b1 + jump UnknownScript_0xbc2b1 ; 0xbc375 UnknownScript_0xbc375: ; 0xbc375 - 3writetext UnknownText_0x1b08cc + farwritetext UnknownText_0x1b08cc keeptextopen setevent $0316 - 2jump UnknownScript_0xbc2a9 + jump UnknownScript_0xbc2a9 ; 0xbc380 UnknownScript_0xbc380: ; 0xbc380 @@ -716,102 +716,102 @@ UnknownScript_0xbc574: ; 0xbc574 if_equal $23, UnknownScript_0xbc628 UnknownScript_0xbc5c9: ; bc5c9 - 3writetext UnknownText_0x1b09fe + farwritetext UnknownText_0x1b09fe end ; 0xbc5ce UnknownScript_0xbc5ce: ; 0xbc5ce - 3writetext UnknownText_0x1b0d9f + farwritetext UnknownText_0x1b0d9f end ; 0xbc5d3 UnknownScript_0xbc5d3: ; 0xbc5d3 - 3writetext UnknownText_0x1b102e + farwritetext UnknownText_0x1b102e end ; 0xbc5d8 UnknownScript_0xbc5d8: ; 0xbc5d8 - 3writetext UnknownText_0x1b142d + farwritetext UnknownText_0x1b142d end ; 0xbc5dd UnknownScript_0xbc5dd: ; 0xbc5dd - 3writetext UnknownText_0x1b1800 + farwritetext UnknownText_0x1b1800 end ; 0xbc5e2 UnknownScript_0xbc5e2: ; 0xbc5e2 - 3writetext UnknownText_0x1b1a71 + farwritetext UnknownText_0x1b1a71 end ; 0xbc5e7 UnknownScript_0xbc5e7: ; 0xbc5e7 - 3writetext UnknownText_0x1b1cd5 + farwritetext UnknownText_0x1b1cd5 end ; 0xbc5ec UnknownScript_0xbc5ec: ; 0xbc5ec - 3writetext UnknownText_0xa4000 + farwritetext UnknownText_0xa4000 end ; 0xbc5f1 UnknownScript_0xbc5f1: ; 0xbc5f1 - 3writetext UnknownText_0xa41c0 + farwritetext UnknownText_0xa41c0 end ; 0xbc5f6 UnknownScript_0xbc5f6: ; 0xbc5f6 - 3writetext UnknownText_0xa4642 + farwritetext UnknownText_0xa4642 end ; 0xbc5fb UnknownScript_0xbc5fb: ; 0xbc5fb - 3writetext UnknownText_0xa4829 + farwritetext UnknownText_0xa4829 end ; 0xbc600 UnknownScript_0xbc600: ; 0xbc600 - 3writetext UnknownText_0xa4a31 + farwritetext UnknownText_0xa4a31 end ; 0xbc605 UnknownScript_0xbc605: ; 0xbc605 - 3writetext UnknownText_0xa4ed4 + farwritetext UnknownText_0xa4ed4 end ; 0xbc60a UnknownScript_0xbc60a: ; 0xbc60a - 3writetext UnknownText_0xa50d5 + farwritetext UnknownText_0xa50d5 end ; 0xbc60f UnknownScript_0xbc60f: ; 0xbc60f - 3writetext UnknownText_0xa52e2 + farwritetext UnknownText_0xa52e2 end ; 0xbc614 UnknownScript_0xbc614: ; 0xbc614 - 3writetext UnknownText_0xa5545 + farwritetext UnknownText_0xa5545 end ; 0xbc619 UnknownScript_0xbc619: ; 0xbc619 - 3writetext UnknownText_0xa5937 + farwritetext UnknownText_0xa5937 end ; 0xbc61e UnknownScript_0xbc61e: ; 0xbc61e - 3writetext UnknownText_0xa5bc4 + farwritetext UnknownText_0xa5bc4 end ; 0xbc623 UnknownScript_0xbc623: ; 0xbc623 - 3writetext UnknownText_0xa5dc6 + farwritetext UnknownText_0xa5dc6 end ; 0xbc628 UnknownScript_0xbc628: ; 0xbc628 - 3writetext UnknownText_0xa600c + farwritetext UnknownText_0xa600c end ; 0xbc62d @@ -840,107 +840,107 @@ UnknownScript_0xbc62d: ; 0xbc62d if_equal $23, UnknownScript_0xbc6e1 UnknownScript_0xbc682: ; bc682 - 3writetext UnknownText_0x1b0a82 + farwritetext UnknownText_0x1b0a82 end ; 0xbc687 UnknownScript_0xbc687: ; 0xbc687 - 3writetext UnknownText_0x1b0e2c + farwritetext UnknownText_0x1b0e2c end ; 0xbc68c UnknownScript_0xbc68c: ; 0xbc68c - 3writetext UnknownText_0x1b10d3 + farwritetext UnknownText_0x1b10d3 end ; 0xbc691 UnknownScript_0xbc691: ; 0xbc691 - 3writetext UnknownText_0x1b14e4 + farwritetext UnknownText_0x1b14e4 end ; 0xbc696 UnknownScript_0xbc696: ; 0xbc696 - 3writetext UnknownText_0x1b187b + farwritetext UnknownText_0x1b187b end ; 0xbc69b UnknownScript_0xbc69b: ; 0xbc69b - 3writetext UnknownText_0x1b1b1d + farwritetext UnknownText_0x1b1b1d end ; 0xbc6a0 UnknownScript_0xbc6a0: ; 0xbc6a0 - 3writetext UnknownText_0x1b1d85 + farwritetext UnknownText_0x1b1d85 end ; 0xbc6a5 UnknownScript_0xbc6a5: ; 0xbc6a5 - 3writetext UnknownText_0xa40a9 + farwritetext UnknownText_0xa40a9 end ; 0xbc6aa UnknownScript_0xbc6aa: ; 0xbc6aa - 3writetext UnknownText_0xa426a + farwritetext UnknownText_0xa426a end ; 0xbc6af UnknownScript_0xbc6af: ; 0xbc6af - 3writetext UnknownText_0xa470b + farwritetext UnknownText_0xa470b end ; 0xbc6b4 UnknownScript_0xbc6b4: ; 0xbc6b4 - 3writetext UnknownText_0xa48fc + farwritetext UnknownText_0xa48fc end ; 0xbc6b9 UnknownScript_0xbc6b9: ; 0xbc6b9 - 3writetext UnknownText_0xa4b03 + farwritetext UnknownText_0xa4b03 end ; 0xbc6be UnknownScript_0xbc6be: ; 0xbc6be - 3writetext UnknownText_0xa4fc8 + farwritetext UnknownText_0xa4fc8 end ; 0xbc6c3 UnknownScript_0xbc6c3: ; 0xbc6c3 - 3writetext UnknownText_0xa5175 + farwritetext UnknownText_0xa5175 end ; 0xbc6c8 UnknownScript_0xbc6c8: ; 0xbc6c8 - 3writetext UnknownText_0xa5383 + farwritetext UnknownText_0xa5383 end ; 0xbc6cd UnknownScript_0xbc6cd: ; 0xbc6cd - 3writetext UnknownText_0xa5621 + farwritetext UnknownText_0xa5621 end ; 0xbc6d2 UnknownScript_0xbc6d2: ; 0xbc6d2 - 3writetext UnknownText_0xa59bc + farwritetext UnknownText_0xa59bc end ; 0xbc6d7 UnknownScript_0xbc6d7: ; 0xbc6d7 - 3writetext UnknownText_0xa5c4b + farwritetext UnknownText_0xa5c4b end ; 0xbc6dc UnknownScript_0xbc6dc: ; 0xbc6dc - 3writetext UnknownText_0xa5e63 + farwritetext UnknownText_0xa5e63 end ; 0xbc6e1 UnknownScript_0xbc6e1: ; 0xbc6e1 - 3writetext UnknownText_0xa6076 + farwritetext UnknownText_0xa6076 end ; 0xbc6e6 UnknownScript_0xbc6e6: ; 0xbc6e6 - 3writetext UnknownText_0x1b09c4 + farwritetext UnknownText_0x1b09c4 playsound SFX_REGISTER_PHONE_NUMBER waitbutton keeptextopen @@ -971,140 +971,140 @@ UnknownScript_0xbc6f0: ; 0xbc6f0 if_equal $23, UnknownScript_0xbc7c7 UnknownScript_0xbc742: - 3writetext UnknownText_0x1b0adb + farwritetext UnknownText_0x1b0adb closetext loadmovesprites end ; 0xbc749 UnknownScript_0xbc749: ; 0xbc749 - 3writetext UnknownText_0x1b0e89 + farwritetext UnknownText_0x1b0e89 closetext loadmovesprites end ; 0xbc750 UnknownScript_0xbc750: ; 0xbc750 - 3writetext UnknownText_0x1b1136 + farwritetext UnknownText_0x1b1136 closetext loadmovesprites end ; 0xbc757 UnknownScript_0xbc757: ; 0xbc757 - 3writetext UnknownText_0x1b1553 + farwritetext UnknownText_0x1b1553 closetext loadmovesprites end ; 0xbc75e UnknownScript_0xbc75e: ; 0xbc75e - 3writetext UnknownText_0x1b18d7 + farwritetext UnknownText_0x1b18d7 closetext loadmovesprites end ; 0xbc765 UnknownScript_0xbc765: ; 0xbc765 - 3writetext UnknownText_0x1b1b8e + farwritetext UnknownText_0x1b1b8e closetext loadmovesprites end ; 0xbc76c UnknownScript_0xbc76c: ; 0xbc76c - 3writetext UnknownText_0x1b1db9 + farwritetext UnknownText_0x1b1db9 closetext loadmovesprites end ; 0xbc773 UnknownScript_0xbc773: ; 0xbc773 - 3writetext UnknownText_0xa40f8 + farwritetext UnknownText_0xa40f8 closetext loadmovesprites end ; 0xbc77a UnknownScript_0xbc77a: ; 0xbc77a - 3writetext UnknownText_0xa42ab + farwritetext UnknownText_0xa42ab closetext loadmovesprites end ; 0xbc781 UnknownScript_0xbc781: ; 0xbc781 - 3writetext UnknownText_0xa4730 + farwritetext UnknownText_0xa4730 closetext loadmovesprites end ; 0xbc788 UnknownScript_0xbc788: ; 0xbc788 - 3writetext UnknownText_0xa494d + farwritetext UnknownText_0xa494d closetext loadmovesprites end ; 0xbc78f UnknownScript_0xbc78f: ; 0xbc78f - 3writetext UnknownText_0xa4b47 + farwritetext UnknownText_0xa4b47 closetext loadmovesprites end ; 0xbc796 UnknownScript_0xbc796: ; 0xbc796 - 3writetext UnknownText_0xa502e + farwritetext UnknownText_0xa502e closetext loadmovesprites end ; 0xbc79d UnknownScript_0xbc79d: ; 0xbc79d - 3writetext UnknownText_0xa51ac + farwritetext UnknownText_0xa51ac closetext loadmovesprites end ; 0xbc7a4 UnknownScript_0xbc7a4: ; 0xbc7a4 - 3writetext UnknownText_0xa53de + farwritetext UnknownText_0xa53de closetext loadmovesprites end ; 0xbc7ab UnknownScript_0xbc7ab: ; 0xbc7ab - 3writetext UnknownText_0xa5666 + farwritetext UnknownText_0xa5666 closetext loadmovesprites end ; 0xbc7b2 UnknownScript_0xbc7b2: ; 0xbc7b2 - 3writetext UnknownText_0xa5a28 + farwritetext UnknownText_0xa5a28 closetext loadmovesprites end ; 0xbc7b9 UnknownScript_0xbc7b9: ; 0xbc7b9 - 3writetext UnknownText_0xa5c8e + farwritetext UnknownText_0xa5c8e closetext loadmovesprites end ; 0xbc7c0 UnknownScript_0xbc7c0: ; 0xbc7c0 - 3writetext UnknownText_0xa5ea8 + farwritetext UnknownText_0xa5ea8 closetext loadmovesprites end ; 0xbc7c7 UnknownScript_0xbc7c7: ; 0xbc7c7 - 3writetext UnknownText_0xa60b5 + farwritetext UnknownText_0xa60b5 closetext loadmovesprites end @@ -1134,140 +1134,140 @@ UnknownScript_0xbc7ce: ; 0xbc7ce if_equal $23, UnknownScript_0xbc8a5 UnknownScript_0xbc820: - 3writetext UnknownText_0x1b0afd + farwritetext UnknownText_0x1b0afd closetext loadmovesprites end ; 0xbc827 UnknownScript_0xbc827: ; 0xbc827 - 3writetext UnknownText_0x1b0ea2 + farwritetext UnknownText_0x1b0ea2 closetext loadmovesprites end ; 0xbc82e UnknownScript_0xbc82e: ; 0xbc82e - 3writetext UnknownText_0x1b117b + farwritetext UnknownText_0x1b117b closetext loadmovesprites end ; 0xbc835 UnknownScript_0xbc835: ; 0xbc835 - 3writetext UnknownText_0x1b1584 + farwritetext UnknownText_0x1b1584 closetext loadmovesprites end ; 0xbc83c UnknownScript_0xbc83c: ; 0xbc83c - 3writetext UnknownText_0x1b1908 + farwritetext UnknownText_0x1b1908 closetext loadmovesprites end ; 0xbc843 UnknownScript_0xbc843: ; 0xbc843 - 3writetext UnknownText_0x1b1bd2 + farwritetext UnknownText_0x1b1bd2 closetext loadmovesprites end ; 0xbc84a UnknownScript_0xbc84a: ; 0xbc84a - 3writetext UnknownText_0x1b1df4 + farwritetext UnknownText_0x1b1df4 closetext loadmovesprites end ; 0xbc851 UnknownScript_0xbc851: ; 0xbc851 - 3writetext UnknownText_0xa4126 + farwritetext UnknownText_0xa4126 closetext loadmovesprites end ; 0xbc858 UnknownScript_0xbc858: ; 0xbc858 - 3writetext UnknownText_0xa42f2 + farwritetext UnknownText_0xa42f2 closetext loadmovesprites end ; 0xbc85f UnknownScript_0xbc85f: ; 0xbc85f - 3writetext UnknownText_0xa4794 + farwritetext UnknownText_0xa4794 closetext loadmovesprites end ; 0xbc866 UnknownScript_0xbc866: ; 0xbc866 - 3writetext UnknownText_0xa498a + farwritetext UnknownText_0xa498a closetext loadmovesprites end ; 0xbc86d UnknownScript_0xbc86d: ; 0xbc86d - 3writetext UnknownText_0xa4b87 + farwritetext UnknownText_0xa4b87 closetext loadmovesprites end ; 0xbc874 UnknownScript_0xbc874: ; 0xbc874 - 3writetext UnknownText_0xa505f + farwritetext UnknownText_0xa505f closetext loadmovesprites end ; 0xbc87b UnknownScript_0xbc87b: ; 0xbc87b - 3writetext UnknownText_0xa51ee + farwritetext UnknownText_0xa51ee closetext loadmovesprites end ; 0xbc882 UnknownScript_0xbc882: ; 0xbc882 - 3writetext UnknownText_0xa5412 + farwritetext UnknownText_0xa5412 closetext loadmovesprites end ; 0xbc889 UnknownScript_0xbc889: ; 0xbc889 - 3writetext UnknownText_0xa56b6 + farwritetext UnknownText_0xa56b6 closetext loadmovesprites end ; 0xbc890 UnknownScript_0xbc890: ; 0xbc890 - 3writetext UnknownText_0xa5a5a + farwritetext UnknownText_0xa5a5a closetext loadmovesprites end ; 0xbc897 UnknownScript_0xbc897: ; 0xbc897 - 3writetext UnknownText_0xa5cc5 + farwritetext UnknownText_0xa5cc5 closetext loadmovesprites end ; 0xbc89e UnknownScript_0xbc89e: ; 0xbc89e - 3writetext UnknownText_0xa5ed6 + farwritetext UnknownText_0xa5ed6 closetext loadmovesprites end ; 0xbc8a5 UnknownScript_0xbc8a5: ; 0xbc8a5 - 3writetext UnknownText_0xa60e2 + farwritetext UnknownText_0xa60e2 closetext loadmovesprites end @@ -1297,140 +1297,140 @@ UnknownScript_0xbc8ac: ; 0xbc8ac if_equal $23, UnknownScript_0xbc983 UnknownScript_0xbc8fe: - 3writetext UnknownText_0x1b0b42 + farwritetext UnknownText_0x1b0b42 closetext loadmovesprites end ; 0xbc905 UnknownScript_0xbc905: ; 0xbc905 - 3writetext UnknownText_0x1b0ebc + farwritetext UnknownText_0x1b0ebc closetext loadmovesprites end ; 0xbc90c UnknownScript_0xbc90c: ; 0xbc90c - 3writetext UnknownText_0x1b11c4 + farwritetext UnknownText_0x1b11c4 closetext loadmovesprites end ; 0xbc913 UnknownScript_0xbc913: ; 0xbc913 - 3writetext UnknownText_0x1b15b6 + farwritetext UnknownText_0x1b15b6 closetext loadmovesprites end ; 0xbc91a UnknownScript_0xbc91a: ; 0xbc91a - 3writetext UnknownText_0x1b1936 + farwritetext UnknownText_0x1b1936 closetext loadmovesprites end ; 0xbc921 UnknownScript_0xbc921: ; 0xbc921 - 3writetext UnknownText_0x1b1c06 + farwritetext UnknownText_0x1b1c06 closetext loadmovesprites end ; 0xbc928 UnknownScript_0xbc928: ; 0xbc928 - 3writetext UnknownText_0x1b1e50 + farwritetext UnknownText_0x1b1e50 closetext loadmovesprites end ; 0xbc92f UnknownScript_0xbc92f: ; 0xbc92f - 3writetext UnknownText_0xa4158 + farwritetext UnknownText_0xa4158 closetext loadmovesprites end ; 0xbc936 UnknownScript_0xbc936: ; 0xbc936 - 3writetext UnknownText_0xa434a + farwritetext UnknownText_0xa434a closetext loadmovesprites end ; 0xbc93d UnknownScript_0xbc93d: ; 0xbc93d - 3writetext UnknownText_0xa47eb + farwritetext UnknownText_0xa47eb closetext loadmovesprites end ; 0xbc944 UnknownScript_0xbc944: ; 0xbc944 - 3writetext UnknownText_0xa49bd + farwritetext UnknownText_0xa49bd closetext loadmovesprites end ; 0xbc94b UnknownScript_0xbc94b: ; 0xbc94b - 3writetext UnknownText_0xa4bcd + farwritetext UnknownText_0xa4bcd closetext loadmovesprites end ; 0xbc952 UnknownScript_0xbc952: ; 0xbc952 - 3writetext UnknownText_0xa508c + farwritetext UnknownText_0xa508c closetext loadmovesprites end ; 0xbc959 UnknownScript_0xbc959: ; 0xbc959 - 3writetext UnknownText_0xa5216 + farwritetext UnknownText_0xa5216 closetext loadmovesprites end ; 0xbc960 UnknownScript_0xbc960: ; 0xbc960 - 3writetext UnknownText_0xa5446 + farwritetext UnknownText_0xa5446 closetext loadmovesprites end ; 0xbc967 UnknownScript_0xbc967: ; 0xbc967 - 3writetext UnknownText_0xa56e2 + farwritetext UnknownText_0xa56e2 closetext loadmovesprites end ; 0xbc96e UnknownScript_0xbc96e: ; 0xbc96e - 3writetext UnknownText_0xa5aa6 + farwritetext UnknownText_0xa5aa6 closetext loadmovesprites end ; 0xbc975 UnknownScript_0xbc975: ; 0xbc975 - 3writetext UnknownText_0xa5cfa + farwritetext UnknownText_0xa5cfa closetext loadmovesprites end ; 0xbc97c UnknownScript_0xbc97c: ; 0xbc97c - 3writetext UnknownText_0xa5f06 + farwritetext UnknownText_0xa5f06 closetext loadmovesprites end ; 0xbc983 UnknownScript_0xbc983: ; 0xbc983 - 3writetext UnknownText_0xa6144 + farwritetext UnknownText_0xa6144 closetext loadmovesprites end @@ -1457,119 +1457,119 @@ UnknownScript_0xbc98a: ; 0xbc98a if_equal $23, UnknownScript_0xbca40 UnknownScript_0xbc9d0: - 3writetext UnknownText_0x1b0b75 + farwritetext UnknownText_0x1b0b75 closetext loadmovesprites end ; 0xbc9d7 UnknownScript_0xbc9d7: ; 0xbc9d7 - 3writetext UnknownText_0x1b0edc + farwritetext UnknownText_0x1b0edc closetext loadmovesprites end ; 0xbc9de UnknownScript_0xbc9de: ; 0xbc9de - 3writetext UnknownText_0x1b11fe + farwritetext UnknownText_0x1b11fe closetext loadmovesprites end ; 0xbc9e5 UnknownScript_0xbc9e5: ; 0xbc9e5 - 3writetext UnknownText_0x1b15d5 + farwritetext UnknownText_0x1b15d5 closetext loadmovesprites end ; 0xbc9ec UnknownScript_0xbc9ec: ; 0xbc9ec - 3writetext UnknownText_0x1b1954 + farwritetext UnknownText_0x1b1954 closetext loadmovesprites end ; 0xbc9f3 UnknownScript_0xbc9f3: ; 0xbc9f3 - 3writetext UnknownText_0x1b1c32 + farwritetext UnknownText_0x1b1c32 closetext loadmovesprites end ; 0xbc9fa UnknownScript_0xbc9fa: ; 0xbc9fa - 3writetext UnknownText_0x1b1e98 + farwritetext UnknownText_0x1b1e98 closetext loadmovesprites end ; 0xbca01 UnknownScript_0xbca01: ; 0xbca01 - 3writetext UnknownText_0xa418d + farwritetext UnknownText_0xa418d closetext loadmovesprites end ; 0xbca08 UnknownScript_0xbca08: ; 0xbca08 - 3writetext UnknownText_0xa4382 + farwritetext UnknownText_0xa4382 closetext loadmovesprites end ; 0xbca0f UnknownScript_0xbca0f: ; 0xbca0f - 3writetext UnknownText_0xa49fc + farwritetext UnknownText_0xa49fc closetext loadmovesprites end ; 0xbca16 UnknownScript_0xbca16: ; 0xbca16 - 3writetext UnknownText_0xa4bec + farwritetext UnknownText_0xa4bec closetext loadmovesprites end ; 0xbca1d UnknownScript_0xbca1d: ; 0xbca1d - 3writetext UnknownText_0xa50b1 + farwritetext UnknownText_0xa50b1 closetext loadmovesprites end ; 0xbca24 UnknownScript_0xbca24: ; 0xbca24 - 3writetext UnknownText_0xa548c + farwritetext UnknownText_0xa548c closetext loadmovesprites end ; 0xbca2b UnknownScript_0xbca2b: ; 0xbca2b - 3writetext UnknownText_0xa571e + farwritetext UnknownText_0xa571e closetext loadmovesprites end ; 0xbca32 UnknownScript_0xbca32: ; 0xbca32 - 3writetext UnknownText_0xa5ada + farwritetext UnknownText_0xa5ada closetext loadmovesprites end ; 0xbca39 UnknownScript_0xbca39: ; 0xbca39 - 3writetext UnknownText_0xa5d1d + farwritetext UnknownText_0xa5d1d closetext loadmovesprites end ; 0xbca40 UnknownScript_0xbca40: ; 0xbca40 - 3writetext UnknownText_0xa6175 + farwritetext UnknownText_0xa6175 closetext loadmovesprites end @@ -1586,43 +1586,43 @@ UnknownScript_0xbca47: ; 0xbca47 if_equal $22, UnknownScript_0xbca89 UnknownScript_0xbca65: - 3writetext UnknownText_0x1b1607 + farwritetext UnknownText_0x1b1607 keeptextopen end ; 0xbca6b UnknownScript_0xbca6b: ; 0xbca6b - 3writetext UnknownText_0x1b1c57 + farwritetext UnknownText_0x1b1c57 keeptextopen end ; 0xbca71 UnknownScript_0xbca71: ; 0xbca71 - 3writetext UnknownText_0xa4c24 + farwritetext UnknownText_0xa4c24 keeptextopen end ; 0xbca77 UnknownScript_0xbca77: ; 0xbca77 - 3writetext UnknownText_0xa523a + farwritetext UnknownText_0xa523a keeptextopen end ; 0xbca7d UnknownScript_0xbca7d: ; 0xbca7d - 3writetext UnknownText_0xa54e3 + farwritetext UnknownText_0xa54e3 keeptextopen end ; 0xbca83 UnknownScript_0xbca83: ; 0xbca83 - 3writetext UnknownText_0xa5d4d + farwritetext UnknownText_0xa5d4d keeptextopen end ; 0xbca89 UnknownScript_0xbca89: ; 0xbca89 - 3writetext UnknownText_0xa5f37 + farwritetext UnknownText_0xa5f37 keeptextopen end ; 0xbca8f @@ -1642,77 +1642,77 @@ UnknownScript_0xbca8f: ; 0xbca8f if_equal $23, UnknownScript_0xbcb03 UnknownScript_0xbcabd: - 3writetext UnknownText_0x1b0eff + farwritetext UnknownText_0x1b0eff closetext loadmovesprites end ; 0xbcac4 UnknownScript_0xbcac4: ; 0xbcac4 - 3writetext UnknownText_0x1b164d + farwritetext UnknownText_0x1b164d closetext loadmovesprites end ; 0xbcacb UnknownScript_0xbcacb: ; 0xbcacb - 3writetext UnknownText_0x1b1978 + farwritetext UnknownText_0x1b1978 closetext loadmovesprites end ; 0xbcad2 UnknownScript_0xbcad2: ; 0xbcad2 - 3writetext UnknownText_0x1b1c91 + farwritetext UnknownText_0x1b1c91 closetext loadmovesprites end ; 0xbcad9 UnknownScript_0xbcad9: ; 0xbcad9 - 3writetext UnknownText_0xa4c47 + farwritetext UnknownText_0xa4c47 closetext loadmovesprites end ; 0xbcae0 UnknownScript_0xbcae0: ; 0xbcae0 - 3writetext UnknownText_0xa52a0 + farwritetext UnknownText_0xa52a0 closetext loadmovesprites end ; 0xbcae7 UnknownScript_0xbcae7: ; 0xbcae7 - 3writetext UnknownText_0xa5513 + farwritetext UnknownText_0xa5513 closetext loadmovesprites end ; 0xbcaee UnknownScript_0xbcaee: ; 0xbcaee - 3writetext UnknownText_0xa5aff + farwritetext UnknownText_0xa5aff closetext loadmovesprites end ; 0xbcaf5 UnknownScript_0xbcaf5: ; 0xbcaf5 - 3writetext UnknownText_0xa5d9a + farwritetext UnknownText_0xa5d9a closetext loadmovesprites end ; 0xbcafc UnknownScript_0xbcafc: ; 0xbcafc - 3writetext UnknownText_0xa5faa + farwritetext UnknownText_0xa5faa closetext loadmovesprites end ; 0xbcb03 UnknownScript_0xbcb03: ; 0xbcb03 - 3writetext UnknownText_0xa61c9 + farwritetext UnknownText_0xa61c9 closetext loadmovesprites end @@ -1727,25 +1727,25 @@ UnknownScript_0xbcb0a: ; 0xbcb0a if_equal $23, UnknownScript_0xbcb2f UnknownScript_0xbcb1d: - 3writetext UnknownText_0x1b0f2f + farwritetext UnknownText_0x1b0f2f keeptextopen end ; 0xbcb23 UnknownScript_0xbcb23: ; 0xbcb23 - 3writetext UnknownText_0x1b19be + farwritetext UnknownText_0x1b19be keeptextopen end ; 0xbcb29 UnknownScript_0xbcb29: ; 0xbcb29 - 3writetext UnknownText_0xa5b3f + farwritetext UnknownText_0xa5b3f keeptextopen end ; 0xbcb2f UnknownScript_0xbcb2f: ; 0xbcb2f - 3writetext UnknownText_0xa6200 + farwritetext UnknownText_0xa6200 keeptextopen end ; 0xbcb35 @@ -1762,42 +1762,42 @@ UnknownScript_0xbcb35: ; 0xbcb35 if_equal $24, UnknownScript_0xbcb7a UnknownScript_0xbcb57: - 3writetext UnknownText_0x1b0bb6 + farwritetext UnknownText_0x1b0bb6 end ; 0xbcb5c UnknownScript_0xbcb5c: ; 0xbcb5c - 3writetext UnknownText_0x1b1239 + farwritetext UnknownText_0x1b1239 end ; 0xbcb61 UnknownScript_0xbcb61: ; 0xbcb61 - 3writetext UnknownText_0x1b1690 + farwritetext UnknownText_0x1b1690 end ; 0xbcb66 UnknownScript_0xbcb66: ; 0xbcb66 - 3writetext UnknownText_0x1b1ebe + farwritetext UnknownText_0x1b1ebe end ; 0xbcb6b UnknownScript_0xbcb6b: ; 0xbcb6b - 3writetext UnknownText_0xa4405 + farwritetext UnknownText_0xa4405 end ; 0xbcb70 UnknownScript_0xbcb70: ; 0xbcb70 - 3writetext UnknownText_0xa4c8c + farwritetext UnknownText_0xa4c8c end ; 0xbcb75 UnknownScript_0xbcb75: ; 0xbcb75 - 3writetext UnknownText_0xa574a + farwritetext UnknownText_0xa574a end ; 0xbcb7a UnknownScript_0xbcb7a: ; 0xbcb7a - 3writetext UnknownText_0xa6295 + farwritetext UnknownText_0xa6295 end ; 0xbcb7f @@ -1813,47 +1813,47 @@ UnknownScript_0xbcb7f: ; 0xbcb7f if_equal $24, UnknownScript_0xbcbc4 UnknownScript_0xbcba1: - 3writetext UnknownText_0x1b0c37 + farwritetext UnknownText_0x1b0c37 end ; 0xbcba6 UnknownScript_0xbcba6: ; 0xbcba6 - 3writetext UnknownText_0x1b1314 + farwritetext UnknownText_0x1b1314 end ; 0xbcbab UnknownScript_0xbcbab: ; 0xbcbab - 3writetext UnknownText_0x1b1710 + farwritetext UnknownText_0x1b1710 end ; 0xbcbb0 UnknownScript_0xbcbb0: ; 0xbcbb0 - 3writetext UnknownText_0x1b1f4e + farwritetext UnknownText_0x1b1f4e end ; 0xbcbb5 UnknownScript_0xbcbb5: ; 0xbcbb5 - 3writetext UnknownText_0xa44db + farwritetext UnknownText_0xa44db end ; 0xbcbba UnknownScript_0xbcbba: ; 0xbcbba - 3writetext UnknownText_0xa4d36 + farwritetext UnknownText_0xa4d36 end ; 0xbcbbf UnknownScript_0xbcbbf: ; 0xbcbbf - 3writetext UnknownText_0xa57e3 + farwritetext UnknownText_0xa57e3 end ; 0xbcbc4 UnknownScript_0xbcbc4: ; 0xbcbc4 - 3writetext UnknownText_0xa6316 + farwritetext UnknownText_0xa6316 end ; 0xbcbc9 UnknownScript_0xbcbc9: ; 0xbcbc9 - 3writetext UnknownText_0x1b09e1 + farwritetext UnknownText_0x1b09e1 playsound SFX_REGISTER_PHONE_NUMBER waitbutton keeptextopen @@ -1872,56 +1872,56 @@ UnknownScript_0xbcbd3: ; 0xbcbd3 if_equal $24, UnknownScript_0xbcc26 UnknownScript_0xbcbf5: - 3writetext UnknownText_0x1b0c9b + farwritetext UnknownText_0x1b0c9b closetext loadmovesprites end ; 0xbcbfc UnknownScript_0xbcbfc: ; 0xbcbfc - 3writetext UnknownText_0x1b1392 + farwritetext UnknownText_0x1b1392 closetext loadmovesprites end ; 0xbcc03 UnknownScript_0xbcc03: ; 0xbcc03 - 3writetext UnknownText_0x1b1755 + farwritetext UnknownText_0x1b1755 closetext loadmovesprites end ; 0xbcc0a UnknownScript_0xbcc0a: ; 0xbcc0a - 3writetext UnknownText_0x1b1faa + farwritetext UnknownText_0x1b1faa closetext loadmovesprites end ; 0xbcc11 UnknownScript_0xbcc11: ; 0xbcc11 - 3writetext UnknownText_0xa451d + farwritetext UnknownText_0xa451d closetext loadmovesprites end ; 0xbcc18 UnknownScript_0xbcc18: ; 0xbcc18 - 3writetext UnknownText_0xa4d72 + farwritetext UnknownText_0xa4d72 closetext loadmovesprites end ; 0xbcc1f UnknownScript_0xbcc1f: ; 0xbcc1f - 3writetext UnknownText_0xa5820 + farwritetext UnknownText_0xa5820 closetext loadmovesprites end ; 0xbcc26 UnknownScript_0xbcc26: ; 0xbcc26 - 3writetext UnknownText_0xa6359 + farwritetext UnknownText_0xa6359 closetext loadmovesprites end @@ -1939,56 +1939,56 @@ UnknownScript_0xbcc2d: ; 0xbcc2d if_equal $24, UnknownScript_0xbcc80 UnknownScript_0xbcc4f: - 3writetext UnknownText_0x1b0ce0 + farwritetext UnknownText_0x1b0ce0 closetext loadmovesprites end ; 0xbcc56 UnknownScript_0xbcc56: ; 0xbcc56 - 3writetext UnknownText_0x1b13af + farwritetext UnknownText_0x1b13af closetext loadmovesprites end ; 0xbcc5d UnknownScript_0xbcc5d: ; 0xbcc5d - 3writetext UnknownText_0x1b178a + farwritetext UnknownText_0x1b178a closetext loadmovesprites end ; 0xbcc64 UnknownScript_0xbcc64: ; 0xbcc64 - 3writetext UnknownText_0x1b1fdd + farwritetext UnknownText_0x1b1fdd closetext loadmovesprites end ; 0xbcc6b UnknownScript_0xbcc6b: ; 0xbcc6b - 3writetext UnknownText_0xa4542 + farwritetext UnknownText_0xa4542 closetext loadmovesprites end ; 0xbcc72 UnknownScript_0xbcc72: ; 0xbcc72 - 3writetext UnknownText_0xa4dcd + farwritetext UnknownText_0xa4dcd closetext loadmovesprites end ; 0xbcc79 UnknownScript_0xbcc79: ; 0xbcc79 - 3writetext UnknownText_0xa5842 + farwritetext UnknownText_0xa5842 closetext loadmovesprites end ; 0xbcc80 UnknownScript_0xbcc80: ; 0xbcc80 - 3writetext UnknownText_0xa638c + farwritetext UnknownText_0xa638c closetext loadmovesprites end @@ -2006,56 +2006,56 @@ UnknownScript_0xbcc87: ; 0xbcc87 if_equal $24, UnknownScript_0xbccda UnknownScript_0xbcca9: - 3writetext UnknownText_0x1b0d0b + farwritetext UnknownText_0x1b0d0b closetext loadmovesprites end ; 0xbccb0 UnknownScript_0xbccb0: ; 0xbccb0 - 3writetext UnknownText_0x1b13e4 + farwritetext UnknownText_0x1b13e4 closetext loadmovesprites end ; 0xbccb7 UnknownScript_0xbccb7: ; 0xbccb7 - 3writetext UnknownText_0x1b17ba + farwritetext UnknownText_0x1b17ba closetext loadmovesprites end ; 0xbccbe UnknownScript_0xbccbe: ; 0xbccbe - 3writetext UnknownText_0x1b1ffa + farwritetext UnknownText_0x1b1ffa closetext loadmovesprites end ; 0xbccc5 UnknownScript_0xbccc5: ; 0xbccc5 - 3writetext UnknownText_0xa4573 + farwritetext UnknownText_0xa4573 closetext loadmovesprites end ; 0xbcccc UnknownScript_0xbcccc: ; 0xbcccc - 3writetext UnknownText_0xa4e01 + farwritetext UnknownText_0xa4e01 closetext loadmovesprites end ; 0xbccd3 UnknownScript_0xbccd3: ; 0xbccd3 - 3writetext UnknownText_0xa5881 + farwritetext UnknownText_0xa5881 closetext loadmovesprites end ; 0xbccda UnknownScript_0xbccda: ; 0xbccda - 3writetext UnknownText_0xa63cc + farwritetext UnknownText_0xa63cc closetext loadmovesprites end @@ -2072,49 +2072,49 @@ UnknownScript_0xbcce1: ; 0xbcce1 if_equal $24, UnknownScript_0xbcd29 UnknownScript_0xbccff: - 3writetext UnknownText_0x1b1409 + farwritetext UnknownText_0x1b1409 closetext loadmovesprites end ; 0xbcd06 UnknownScript_0xbcd06: ; 0xbcd06 - 3writetext UnknownText_0x1b17de + farwritetext UnknownText_0x1b17de closetext loadmovesprites end ; 0xbcd0d UnknownScript_0xbcd0d: ; 0xbcd0d - 3writetext UnknownText_0x1b201f + farwritetext UnknownText_0x1b201f closetext loadmovesprites end ; 0xbcd14 UnknownScript_0xbcd14: ; 0xbcd14 - 3writetext UnknownText_0xa4595 + farwritetext UnknownText_0xa4595 closetext loadmovesprites end ; 0xbcd1b UnknownScript_0xbcd1b: ; 0xbcd1b - 3writetext UnknownText_0xa4e21 + farwritetext UnknownText_0xa4e21 closetext loadmovesprites end ; 0xbcd22 UnknownScript_0xbcd22: ; 0xbcd22 - 3writetext UnknownText_0xa58a3 + farwritetext UnknownText_0xa58a3 closetext loadmovesprites end ; 0xbcd29 UnknownScript_0xbcd29: ; 0xbcd29 - 3writetext UnknownText_0xa63f1 + farwritetext UnknownText_0xa63f1 closetext loadmovesprites end @@ -2128,25 +2128,25 @@ UnknownScript_0xbcd30: ; 0xbcd30 if_equal $1f, UnknownScript_0xbcd54 UnknownScript_0xbcd42: - 3writetext UnknownText_0x1b0d2c + farwritetext UnknownText_0x1b0d2c keeptextopen end ; 0xbcd48 UnknownScript_0xbcd48: ; 0xbcd48 - 3writetext UnknownText_0xa45c9 + farwritetext UnknownText_0xa45c9 keeptextopen end ; 0xbcd4e UnknownScript_0xbcd4e: ; 0xbcd4e - 3writetext UnknownText_0xa4e4c + farwritetext UnknownText_0xa4e4c keeptextopen end ; 0xbcd54 UnknownScript_0xbcd54: ; 0xbcd54 - 3writetext UnknownText_0xa58d5 + farwritetext UnknownText_0xa58d5 keeptextopen end ; 0xbcd5a @@ -2160,35 +2160,35 @@ UnknownScript_0xbcd5a: ; 0xbcd5a if_equal $24, UnknownScript_0xbcd8c UnknownScript_0xbcd70: - 3writetext UnknownText_0x1b0d69 + farwritetext UnknownText_0x1b0d69 closetext loadmovesprites end ; 0xbcd77 UnknownScript_0xbcd77: ; 0xbcd77 - 3writetext UnknownText_0xa4603 + farwritetext UnknownText_0xa4603 closetext loadmovesprites end ; 0xbcd7e UnknownScript_0xbcd7e: ; 0xbcd7e - 3writetext UnknownText_0xa4e8f + farwritetext UnknownText_0xa4e8f closetext loadmovesprites end ; 0xbcd85 UnknownScript_0xbcd85: ; 0xbcd85 - 3writetext UnknownText_0xa5914 + farwritetext UnknownText_0xa5914 closetext loadmovesprites end ; 0xbcd8c UnknownScript_0xbcd8c: ; 0xbcd8c - 3writetext UnknownText_0xa6411 + farwritetext UnknownText_0xa6411 closetext loadmovesprites end @@ -2199,7 +2199,7 @@ UnknownScript_0xbcd93: ; 0xbcd93 if_equal $24, .ok .ok loadfont - 3writetext UnknownText_0xa6454 + farwritetext UnknownText_0xa6454 keeptextopen end ; 0xbcda0 @@ -2207,7 +2207,7 @@ UnknownScript_0xbcd93: ; 0xbcd93 UnknownScript_0xbcda0: ; 0xbcda0 mapnametotext $0 loadfont - 3writetext UnknownText_0x1b074e + farwritetext UnknownText_0x1b074e closetext loadmovesprites end @@ -2216,9 +2216,9 @@ UnknownScript_0xbcda0: ; 0xbcda0 UnknownScript_0xbcdaa: ; 0xbcdaa mapnametotext $0 loadfont - 3writetext UnknownText_0x1b074e + farwritetext UnknownText_0x1b074e keeptextopen - 3writetext UnknownText_0x1b075c + farwritetext UnknownText_0x1b075c closetext loadmovesprites end @@ -2226,7 +2226,7 @@ UnknownScript_0xbcdaa: ; 0xbcdaa UnknownScript_0xbcdb9: ; 0xbcdb9 waitbutton - 3writetext UnknownText_0x1b0648 + farwritetext UnknownText_0x1b0648 playsound SFX_ITEM waitbutton end @@ -2234,7 +2234,7 @@ UnknownScript_0xbcdb9: ; 0xbcdb9 UnknownScript_0xbcdc3: ; 0xbcdc3 waitbutton - 3writetext UnknownText_0x1b0648 + farwritetext UnknownText_0x1b0648 playsound SFX_GET_EGG_FROM_DAYCARE_LADY waitbutton end @@ -2243,18 +2243,18 @@ UnknownScript_0xbcdc3: ; 0xbcdc3 UnknownScript_0xbcdcd: ; 0xbcdcd faceplayer loadfont - 3writetext UnknownText_0x1b077f + farwritetext UnknownText_0x1b077f keeptextopen checkitem COIN_CASE iftrue UnknownScript_0xbcde0 - 3writetext UnknownText_0x1b079c + farwritetext UnknownText_0x1b079c closetext loadmovesprites end ; 0xbcde0 UnknownScript_0xbcde0: ; 0xbcde0 - 3writetext UnknownText_0x1b07e3 + farwritetext UnknownText_0x1b07e3 UnknownScript_0xbcde4: ; 0xbcde4 special $0050 @@ -2263,7 +2263,7 @@ UnknownScript_0xbcde4: ; 0xbcde4 writebackup if_equal $1, UnknownScript_0xbcdf7 if_equal $2, UnknownScript_0xbce1b - 2jump UnknownScript_0xbce4d + jump UnknownScript_0xbce4d ; 0xbcdf7 UnknownScript_0xbcdf7: ; 0xbcdf7 @@ -2275,9 +2275,9 @@ UnknownScript_0xbcdf7: ; 0xbcdf7 takemoney $0, 1000 waitbutton playsound SFX_TRANSACTION - 3writetext UnknownText_0x1b0830 + farwritetext UnknownText_0x1b0830 closetext - 2jump UnknownScript_0xbcde4 + jump UnknownScript_0xbcde4 ; 0xbce1b UnknownScript_0xbce1b: ; 0xbce1b @@ -2289,27 +2289,27 @@ UnknownScript_0xbce1b: ; 0xbce1b takemoney $0, 10000 waitbutton playsound SFX_TRANSACTION - 3writetext UnknownText_0x1b084f + farwritetext UnknownText_0x1b084f closetext - 2jump UnknownScript_0xbcde4 + jump UnknownScript_0xbcde4 ; 0xbce3f UnknownScript_0xbce3f: ; 0xbce3f - 3writetext UnknownText_0x1b086f + farwritetext UnknownText_0x1b086f closetext loadmovesprites end ; 0xbce46 UnknownScript_0xbce46: ; 0xbce46 - 3writetext UnknownText_0x1b088c + farwritetext UnknownText_0x1b088c closetext loadmovesprites end ; 0xbce4d UnknownScript_0xbce4d: ; 0xbce4d - 3writetext UnknownText_0x1b08ad + farwritetext UnknownText_0x1b08ad closetext loadmovesprites end @@ -2339,21 +2339,21 @@ UnknownScript_0xbce7f: ; 0xbce7f special $0059 if_less_than 50, UnknownScript_0xbce9a if_less_than 150, UnknownScript_0xbce93 - 3writetext UnknownText_0x1b092a + farwritetext UnknownText_0x1b092a closetext loadmovesprites end ; 0xbce93 UnknownScript_0xbce93: ; 0xbce93 - 3writetext UnknownText_0x1b0954 + farwritetext UnknownText_0x1b0954 closetext loadmovesprites end ; 0xbce9a UnknownScript_0xbce9a: ; 0xbce9a - 3writetext UnknownText_0x1b0989 + farwritetext UnknownText_0x1b0989 closetext loadmovesprites end diff --git a/lib/mobile/main.asm b/lib/mobile/main.asm index 25fac02ec..5b4840876 100644 --- a/lib/mobile/main.asm +++ b/lib/mobile/main.asm @@ -2368,23 +2368,23 @@ Function110f07: ; 110f07 ; 110fad URIPrefix: ; 0x110fad - ascii "http://" + db "http://" URIPrefixEnd HTTPDownloadURL: ; 0x110fb4 - ascii "gameboy.datacenter.ne.jp/cgb/download" + db "gameboy.datacenter.ne.jp/cgb/download" HTTPDownloadURLEnd HTTPUploadURL: ; 0x110fd9 - ascii "gameboy.datacenter.ne.jp/cgb/upload" + db "gameboy.datacenter.ne.jp/cgb/upload" HTTPUploadURLEnd HTTPUtilityURL: ; 0x110ffc - ascii "gameboy.datacenter.ne.jp/cgb/utility" + db "gameboy.datacenter.ne.jp/cgb/utility" HTTPUtilityURLEnd HTTPRankingURL: ; 0x111020 - ascii "gameboy.datacenter.ne.jp/cgb/ranking" + db "gameboy.datacenter.ne.jp/cgb/ranking" HTTPRankingURLEnd Function111044: ; 111044 @@ -4920,41 +4920,41 @@ Unknown_112089: ; 112089 INCBIN "baserom.gbc", $112089, $11209e - $112089 Unknown_11209e: - ascii "HELO ", $0 + db "HELO ", 0 Unknown_1120a4: - ascii "MAIL FROM:<", $0 + db "MAIL FROM:<", 0 Unknown_1120b0: - ascii "RCPT TO:<", $0 + db "RCPT TO:<", 0 Unknown_1120ba: - ascii "DATA", $d, "\n", $0 + db "DATA", $d, "\n", 0 Unknown_1120c1: - ascii "QUIT", $d, "\n", $0 + db "QUIT", $d, "\n", 0 Unknown_1120c8: - ascii "USER ", $0 + db "USER ", 0 Unknown_1120ce: - ascii "PASS ", $0 + db "PASS ", 0 Unknown_1120d4: - ascii "STAT", $d, "\n", $0 + db "STAT", $d, "\n", 0 Unknown_1120db: - ascii "LIST 00000", $d, "\n", $0 + db "LIST 00000", $d, "\n", 0 Unknown_1120e8: - ascii "RETR 00000", $d, "\n", $0 + db "RETR 00000", $d, "\n", 0 Unknown_1120f5: - ascii "DELE 00000", $d, "\n", $0 + db "DELE 00000", $d, "\n", 0 Unknown_112102: - ascii "TOP 00000 0", $d, "\n", $0 + db "TOP 00000 0", $d, "\n", 0 Unknown_112110: - ascii "GET ", $0 + db "GET ", 0 Unknown_112115: - ascii " HTTP/1.0", $d, "\n", $0 + db " HTTP/1.0", $d, "\n", 0 Unknown_112121: - ascii "User-Agent: CGB-", $0 + db "User-Agent: CGB-", 0 Unknown_112132: - ascii $d, "\n", $d, "\n", $0 + db $d, "\n", $d, "\n", 0 Unknown_112137: - ascii "POST ", $0 + db "POST ", 0 Unknown_11213d: - ascii "Content-Length: ", $0 + db "Content-Length: ", 0 ; 11214e Function11214e: ; 11214e (44:614e) @@ -7308,7 +7308,7 @@ Function112fd5: ; 112fd5 ; 113001 Unknown_113001: ; 113001 - ascii "date: ", $0 + db "date: ", 0 ; 113008 Function113008: ; 113008 @@ -7802,17 +7802,17 @@ Function11329d: ; 11329d ; 1132a6 Unknown_1132a6: - ascii "Gb-Status: ", $0 + db "Gb-Status: ", 0 Unknown_1132b2: - ascii "Gb-Auth-ID: ", $0 + db "Gb-Auth-ID: ", 0 Unknown_1132bf: - ascii "WWW-Authenticate: GB00 name=", $22, $0 + db "WWW-Authenticate: GB00 name=", $22, 0 Unknown_1132dd: - ascii "Content-Type: application/x-cgb", $d, "\n", $0 + db "Content-Type: application/x-cgb", $d, "\n", 0 Unknown_1132ff: - ascii "URI-header: ", $0 + db "URI-header: ", 0 Unknown_11330c: - ascii "Location: ", $0 + db "Location: ", 0 ; 113317 Function113317: ; 113317 @@ -7865,7 +7865,7 @@ Function113317: ; 113317 ; 113372 Unknown_113372: ; 113372 - ascii "Content-Length: 0", $d, "\n", $0 + db "Content-Length: 0", $d, "\n", 0 ; 113386 Function113386: ; 113386 @@ -9017,7 +9017,7 @@ Function113a40: ; 113a40 ; 113a55 Unknown_113a55: ; 113a55 - ascii "Authorization: GB00 name=", $22, $0 + db "Authorization: GB00 name=", $22, 0 ; 113a70 INCBIN "baserom.gbc", $113a70, $113b70 - $113a70 diff --git a/macros.asm b/macros.asm index 50c0e2c25..7d934866a 100644 --- a/macros.asm +++ b/macros.asm @@ -1,3 +1,12 @@ +INCLUDE "macros/event.asm" +INCLUDE "macros/sound.asm" +INCLUDE "macros/text.asm" +INCLUDE "macros/charmap.asm" +INCLUDE "macros/move_effect.asm" +INCLUDE "macros/move_anim.asm" +INCLUDE "macros/movement.asm" +INCLUDE "macros/map.asm" + text EQUS "db $00," ; Start writing text. next EQUS "db $4e," ; Move a line down. @@ -108,6 +117,18 @@ note: MACRO db (\1) << 4 + ((\2) - 1) ENDM +sound: macro + db \1 ; duration + db \2 ; intensity + dw \3 ; frequency + endm + +noise: macro + db \1 ; duration + db \2 ; intensity + db \3 ; frequency + endm + ; pitch __ EQU 0 C_ EQU 1 diff --git a/macros/charmap.asm b/macros/charmap.asm new file mode 100644 index 000000000..0478f68ab --- /dev/null +++ b/macros/charmap.asm @@ -0,0 +1,275 @@ + charmap "@", $50 + + charmap "#", $54 + charmap "№", $74 + charmap "…", $75 + charmap "┌", $79 + charmap "─", $7a + charmap "┐", $7b + charmap "│", $7c + charmap "└", $7d + charmap "┘", $7e + charmap " ", $7f + + charmap "A", $80 + charmap "B", $81 + charmap "C", $82 + charmap "D", $83 + charmap "E", $84 + charmap "F", $85 + charmap "G", $86 + charmap "H", $87 + charmap "I", $88 + charmap "J", $89 + charmap "K", $8a + charmap "L", $8b + charmap "M", $8c + charmap "N", $8d + charmap "O", $8e + charmap "P", $8f + charmap "Q", $90 + charmap "R", $91 + charmap "S", $92 + charmap "T", $93 + charmap "U", $94 + charmap "V", $95 + charmap "W", $96 + charmap "X", $97 + charmap "Y", $98 + charmap "Z", $99 + + charmap "(", $9a + charmap ")", $9b + charmap ":", $9c + charmap ";", $9d + charmap "[", $9e + charmap "]", $9f + + charmap "a", $a0 + charmap "b", $a1 + charmap "c", $a2 + charmap "d", $a3 + charmap "e", $a4 + charmap "f", $a5 + charmap "g", $a6 + charmap "h", $a7 + charmap "i", $a8 + charmap "j", $a9 + charmap "k", $aa + charmap "l", $ab + charmap "m", $ac + charmap "n", $ad + charmap "o", $ae + charmap "p", $af + charmap "q", $b0 + charmap "r", $b1 + charmap "s", $b2 + charmap "t", $b3 + charmap "u", $b4 + charmap "v", $b5 + charmap "w", $b6 + charmap "x", $b7 + charmap "y", $b8 + charmap "z", $b9 + + charmap "Ä", $c0 + charmap "Ö", $c1 + charmap "Ü", $c2 + charmap "ä", $c3 + charmap "ö", $c4 + charmap "ü", $c5 + + charmap "'d", $d0 + charmap "'l", $d1 + charmap "'m", $d2 + charmap "'r", $d3 + charmap "'s", $d4 + charmap "'t", $d5 + charmap "'v", $d6 + + charmap "'", $e0 + charmap "-", $e3 + + charmap "?", $e6 + charmap "!", $e7 + charmap ".", $e8 + charmap "&", $e9 + + charmap "é", $ea + charmap "→", $eb + charmap "▷", $ec + charmap "▶", $ed + charmap "▼", $ee + charmap "♂", $ef + charmap "¥", $f0 + charmap "×", $f1 + charmap "/", $f3 + charmap ",", $f4 + charmap "♀", $f5 + + charmap "0", $f6 + charmap "1", $f7 + charmap "2", $f8 + charmap "3", $f9 + charmap "4", $fa + charmap "5", $fb + charmap "6", $fc + charmap "7", $fd + charmap "8", $fe + charmap "9", $ff + + charmap "ガ", $5 + charmap "ギ", $6 + charmap "グ", $7 + charmap "ゲ", $8 + charmap "ゴ", $9 + charmap "ザ", $a + charmap "ジ", $b + charmap "ズ", $c + charmap "ゼ", $d + charmap "ゾ", $e + charmap "ダ", $f + charmap "ヂ", $10 + charmap "ヅ", $11 + charmap "デ", $12 + charmap "ド", $13 + + charmap "バ", $19 + charmap "ビ", $1a + charmap "ブ", $1b + charmap "ボ", $1c + + charmap "が", $26 + charmap "ぎ", $27 + charmap "ぐ", $28 + charmap "げ", $29 + charmap "ご", $2a + charmap "ざ", $2b + charmap "じ", $2c + charmap "ず", $2d + charmap "ぜ", $2e + charmap "ぞ", $2f + charmap "だ", $30 + charmap "ぢ", $31 + charmap "づ", $32 + charmap "で", $33 + charmap "ど", $34 + + charmap "ば", $3a + charmap "び", $3b + charmap "ぶ", $3c + charmap "べ", $3d + charmap "ぼ", $3e + + charmap "パ", $40 + charmap "ピ", $41 + charmap "プ", $42 + charmap "ポ", $43 + charmap "ぱ", $44 + charmap "ぴ", $45 + charmap "ぷ", $46 + charmap "ぺ", $47 + charmap "ぽ", $48 + + charmap "ア", $80 + charmap "イ", $81 + charmap "ウ", $82 + charmap "エ", $83 + charmap "ォ", $84 + charmap "カ", $85 + charmap "キ", $86 + charmap "ク", $87 + charmap "ケ", $88 + charmap "コ", $89 + charmap "サ", $8a + charmap "シ", $8b + charmap "ス", $8c + charmap "セ", $8d + charmap "ソ", $8e + charmap "タ", $8f + charmap "チ", $90 + charmap "ツ", $91 + charmap "テ", $92 + charmap "ト", $93 + charmap "ナ", $94 + charmap "ニ", $95 + charmap "ヌ", $96 + charmap "ネ", $97 + charmap "ノ", $98 + charmap "ハ", $99 + charmap "ヒ", $9a + charmap "フ", $9b + charmap "ホ", $9c + charmap "マ", $9d + charmap "ミ", $9e + charmap "ム", $9f + charmap "メ", $a0 + charmap "モ", $a1 + charmap "ヤ", $a2 + charmap "ユ", $a3 + charmap "ヨ", $a4 + charmap "ラ", $a5 + charmap "ル", $a6 + charmap "レ", $a7 + charmap "ロ", $a8 + charmap "ワ", $a9 + charmap "ヲ", $aa + charmap "ン", $ab + charmap "ッ", $ac + charmap "ャ", $ad + charmap "ュ", $ae + charmap "ョ", $af + charmap "ィ", $b0 + charmap "あ", $b1 + charmap "い", $b2 + charmap "う", $b3 + charmap "え", $b4 + charmap "お", $b5 + charmap "か", $b6 + charmap "き", $b7 + charmap "く", $b8 + charmap "け", $b9 + charmap "こ", $ba + charmap "さ", $bb + charmap "し", $bc + charmap "す", $bd + charmap "せ", $be + charmap "そ", $bf + charmap "た", $c0 + charmap "ち", $c1 + charmap "つ", $c2 + charmap "て", $c3 + charmap "と", $c4 + charmap "な", $c5 + charmap "に", $c6 + charmap "ぬ", $c7 + charmap "ね", $c8 + charmap "の", $c9 + charmap "は", $ca + charmap "ひ", $cb + charmap "ふ", $cc + charmap "へ", $cd + charmap "ほ", $ce + charmap "ま", $cf + charmap "み", $d0 + charmap "む", $d1 + charmap "め", $d2 + charmap "も", $d3 + charmap "や", $d4 + charmap "ゆ", $d5 + charmap "よ", $d6 + charmap "ら", $d7 + charmap "り", $d8 + charmap "る", $d9 + charmap "れ", $da + charmap "ろ", $db + charmap "わ", $dc + charmap "を", $dd + charmap "ん", $de + charmap "っ", $df + charmap "ゃ", $e0 + charmap "ゅ", $e1 + charmap "ょ", $e2 + charmap "ー", $e3 + + charmap "ァ", $e9 diff --git a/macros/event.asm b/macros/event.asm new file mode 100644 index 000000000..82468c2a8 --- /dev/null +++ b/macros/event.asm @@ -0,0 +1,876 @@ +scall: macro + db $00 + dw \1 ; pointer + endm + +farscall: macro + db $01 + db BANK(\1) + dw \1 + endm + +ptcall: macro + db $02 + dw \1 ; pointer + endm + +jump: macro + db $03 + dw \1 ; pointer + endm + +farjump: macro + db $04 + db BANK(\1) + dw \1 + endm + +ptjump: macro + db $05 + dw \1 ; pointer + endm + +if_equal: macro + db $06 + db \1 ; byte + dw \2 ; pointer + endm + +if_not_equal: macro + db $07 + db \1 ; byte + dw \2 ; pointer + endm + +iffalse: macro + db $08 + dw \1 ; pointer + endm + +iftrue: macro + db $09 + dw \1 ; pointer + endm + +if_greater_than: macro + db $0a + db \1 ; byte + dw \2 ; pointer + endm + +if_less_than: macro + db $0b + db \1 ; byte + dw \2 ; pointer + endm + +jumpstd: macro + db $0c + dw \1 ; predefined_script + endm + +callstd: macro + db $0d + dw \1 ; predefined_script + endm + +callasm: macro + db $0e + db BANK(\1) + dw \1 + endm + +special: macro + db $0f + dw \1 ; predefined_script + endm + +ptcallasm: macro + db $10 + dw \1 ; asm + endm + +checkmaptriggers: macro + db $11 + db \1 ; map_group + db \2 ; map_id + endm + +domaptrigger: macro + db $12 + db \1 ; map_group + db \2 ; map_id + db \3 ; trigger_id + endm + +checktriggers: macro + db $13 + endm + +dotrigger: macro + db $14 + db \1 ; trigger_id + endm + +writebyte: macro + db $15 + db \1 ; value + endm + +addvar: macro + db $16 + db \1 ; value + endm + +random: macro + db $17 + db \1 ; input + endm + +checkver: macro + db $18 + endm + +copybytetovar: macro + db $19 + dw \1 ; address + endm + +copyvartobyte: macro + db $1a + dw \1 ; address + endm + +loadvar: macro + db $1b + dw \1 ; address + db \2 ; value + endm + +checkcode: macro + db $1c + db \1 ; variable_id + endm + +writevarcode: macro + db $1d + db \1 ; variable_id + endm + +writecode: macro + db $1e + db \1 ; variable_id + db \2 ; value + endm + +giveitem: macro + db $1f + db \1 ; item + db \2 ; quantity + endm + +takeitem: macro + db $20 + db \1 ; item + db \2 ; quantity + endm + +checkitem: macro + db $21 + db \1 ; item + endm + +givemoney: macro + db $22 + db \1 ; account + dt \2 ; money + endm + +takemoney: macro + db $23 + db \1 ; account + dt \2 ; money + endm + +checkmoney: macro + db $24 + db \1 ; account + dt \2 ; money + endm + +givecoins: macro + db $25 + dw \1 ; coins + endm + +takecoins: macro + db $26 + dw \1 ; coins + endm + +checkcoins: macro + db $27 + dw \1 ; coins + endm + +addcellnum: macro + db $28 + db \1 ; person + endm + +delcellnum: macro + db $29 + db \1 ; person + endm + +checkcellnum: macro + db $2a + db \1 ; person + endm + +checktime: macro + db $2b + db \1 ; time + endm + +checkpoke: macro + db $2c + db \1 ; pkmn + endm + +givepoke: macro + db $2d + db \1 ; pokemon + db \2 ; level + db \3 ; item + db \4 ; trainer + if \4 + dw \5 ; trainer_name_pointer + dw \6 ; pkmn_nickname + endc + endm + +giveegg: macro + db $2e + db \1 ; pkmn + db \2 ; level + endm + +givepokeitem: macro + db $2f + dw \1 ; pointer + endm + +checkpokeitem: macro + db $30 + dw \1 ; pointer + endm + +checkevent: macro + db $31 + dw \1 ; event_flag + endm + +clearevent: macro + db $32 + dw \1 ; event_flag + endm + +setevent: macro + db $33 + dw \1 ; event_flag + endm + +checkflag: macro + db $34 + dw \1 ; engine_flag + endm + +clearflag: macro + db $35 + dw \1 ; engine_flag + endm + +setflag: macro + db $36 + dw \1 ; engine_flag + endm + +wildon: macro + db $37 + endm + +wildoff: macro + db $38 + endm + +xycompare: macro + db $39 + dw \1 ; pointer + endm + +warpmod: macro + db $3a + db \1 ; warp_id + db \2 ; map_group + db \3 ; map_id + endm + +blackoutmod: macro + db $3b + db \1 ; map_group + db \2 ; map_id + endm + +warp: macro + db $3c + db \1 ; map_group + db \2 ; map_id + db \3 ; x + db \4 ; y + endm + +readmoney: macro + db $3d + db \1 ; account + db \2 ; memory + endm + +readcoins: macro + db $3e + db \1 ; memory + endm + +RAM2MEM: macro + db $3f + db \1 ; memory + endm + +pokenamemem: macro + db $40 + db \1 ; pokemon + db \2 ; memory + endm + +itemtotext: macro + db $41 + db \1 ; item + db \2 ; memory + endm + +mapnametotext: macro + db $42 + db \1 ; memory + endm + +trainertotext: macro + db $43 + db \1 ; trainer_id + db \2 ; trainer_group + db \3 ; memory + endm + +stringtotext: macro + db $44 + dw \1 ; text_pointer + db \2 ; memory + endm + +itemnotify: macro + db $45 + endm + +pocketisfull: macro + db $46 + endm + +loadfont: macro + db $47 + endm + +refreshscreen: macro + db $48 + db \1 ; dummy + endm + +loadmovesprites: macro + db $49 + endm + +loadbytec1ce: macro + db $4a + db \1 ; byte + endm + +farwritetext: macro + db $4b + db BANK(\1) + dw \1 + endm + +writetext: macro + db $4c + dw \1 ; text_pointer + endm + +repeattext: macro + db $4d + db \1 ; byte + db \2 ; byte + endm + +yesorno: macro + db $4e + endm + +loadmenudata: macro + db $4f + dw \1 ; data + endm + +writebackup: macro + db $50 + endm + +jumptextfaceplayer: macro + db $51 + dw \1 ; text_pointer + endm + +farjumptext: macro + db $52 + db BANK(\1) + dw \1 + endm + +jumptext: macro + db $53 + dw \1 ; text_pointer + endm + +closetext: macro + db $54 + endm + +keeptextopen: macro + db $55 + endm + +pokepic: macro + db $56 + db \1 ; pokemon + endm + +pokepicyesorno: macro + db $57 + endm + +interpretmenu: macro + db $58 + endm + +interpretmenu2: macro + db $59 + endm + +loadpikachudata: macro + db $5a + endm + +battlecheck: macro + db $5b + endm + +loadtrainerdata: macro + db $5c + endm + +loadpokedata: macro + db $5d + db \1 ; pokemon + db \2 ; level + endm + +loadtrainer: macro + db $5e + db \1 ; trainer_group + db \2 ; trainer_id + endm + +startbattle: macro + db $5f + endm + +returnafterbattle: macro + db $60 + endm + +catchtutorial: macro + db $61 + db \1 ; byte + endm + +trainertext: macro + db $62 + db \1 ; which_text + endm + +trainerstatus: macro + db $63 + db \1 ; action + endm + +winlosstext: macro + db $64 + dw \1 ; win_text_pointer + dw \2 ; loss_text_pointer + endm + +scripttalkafter: macro + db $65 + endm + +talkaftercancel: macro + db $66 + endm + +talkaftercheck: macro + db $67 + endm + +setlasttalked: macro + db $68 + db \1 ; person + endm + +applymovement: macro + db $69 + db \1 ; person + dw \2 ; data + endm + +applymovement2: macro + db $6a + dw \1 ; data + endm + +faceplayer: macro + db $6b + endm + +faceperson: macro + db $6c + db \1 ; person1 + db \2 ; person2 + endm + +variablesprite: macro + db $6d + db \1 ; byte + db \2 ; sprite + endm + +disappear: macro + db $6e + db \1 ; person + endm + +appear: macro + db $6f + db \1 ; person + endm + +follow: macro + db $70 + db \1 ; person2 + db \2 ; person1 + endm + +stopfollow: macro + db $71 + endm + +moveperson: macro + db $72 + db \1 ; person + db \2 ; x + db \3 ; y + endm + +writepersonxy: macro + db $73 + db \1 ; person + endm + +loademote: macro + db $74 + db \1 ; bubble + endm + +showemote: macro + db $75 + db \1 ; bubble + db \2 ; person + db \3 ; time + endm + +spriteface: macro + db $76 + db \1 ; person + db \2 ; facing + endm + +follownotexact: macro + db $77 + db \1 ; person2 + db \2 ; person1 + endm + +earthquake: macro + db $78 + db \1 ; param + endm + +changemap: macro + db $79 + dw \1 ; map_data_pointer + endm + +changeblock: macro + db $7a + db \1 ; x + db \2 ; y + db \3 ; block + endm + +reloadmap: macro + db $7b + endm + +reloadmappart: macro + db $7c + endm + +writecmdqueue: macro + db $7d + dw \1 ; queue_pointer + endm + +delcmdqueue: macro + db $7e + db \1 ; byte + endm + +playmusic: macro + db $7f + dw \1 ; music_pointer + endm + +playrammusic: macro + db $80 + endm + +musicfadeout: macro + db $81 + dw \1 ; music + db \2 ; fadetime + endm + +playmapmusic: macro + db $82 + endm + +reloadmapmusic: macro + db $83 + endm + +cry: macro + db $84 + dw \1 ; cry_id + endm + +playsound: macro + db $85 + dw \1 ; sound_pointer + endm + +waitbutton: macro + db $86 + endm + +warpsound: macro + db $87 + endm + +specialsound: macro + db $88 + endm + +passtoengine: macro + db $89 + db \1 ; data_pointer + endm + +newloadmap: macro + db $8a + db \1 ; which_method + endm + +pause: macro + db $8b + db \1 ; length + endm + +deactivatefacing: macro + db $8c + db \1 ; time + endm + +priorityjump: macro + db $8d + dw \1 ; pointer + endm + +warpcheck: macro + db $8e + endm + +ptpriorityjump: macro + db $8f + dw \1 ; pointer + endm + +return: macro + db $90 + endm + +end: macro + db $91 + endm + +reloadandreturn: macro + db $92 + db \1 ; which_method + endm + +resetfuncs: macro + db $93 + endm + +pokemart: macro + db $94 + db \1 ; dialog_id + dw \2 ; mart_id + endm + +elevator: macro + db $95 + dw \1 ; floor_list_pointer + endm + +trade: macro + db $96 + db \1 ; trade_id + endm + +askforphonenumber: macro + db $97 + db \1 ; number + endm + +phonecall: macro + db $98 + dw \1 ; caller_name + endm + +hangup: macro + db $99 + endm + +describedecoration: macro + db $9a + db \1 ; byte + endm + +fruittree: macro + db $9b + db \1 ; tree_id + endm + +specialphonecall: macro + db $9c + dw \1 ; call_id + endm + +checkphonecall: macro + db $9d + endm + +verbosegiveitem: macro + db $9e + db \1 ; item + db \2 ; quantity + endm + +verbosegiveitem2: macro + db $9f + db \1 ; item + db \2 ; var + endm + +loadwilddata: macro + db $a0 + db \1 ; flag + db \2 ; map_group + db \3 ; map_id + endm + +halloffame: macro + db $a1 + endm + +credits: macro + db $a2 + endm + +warpfacing: macro + db $a3 + db \1 ; facing + db \2 ; map_group + db \3 ; map_id + db \4 ; x + db \5 ; y + endm + +storetext: macro + db $a4 + db \1 ; memory + endm + +displaylocation: macro + db $a5 + db \1 ; id + db \2 ; memory + endm + +trainerclassname: macro + db $a6 + db \1 ; id + db \2 ; memory + endm + +name: macro + db $a7 + db \1 ; type + db \2 ; id + db \3 ; mempry + endm + +wait: macro + db $a8 + db \1 ; duration + endm + +unknown0xa9: macro + db $a9 + endm diff --git a/macros/map.asm b/macros/map.asm new file mode 100644 index 000000000..297646a79 --- /dev/null +++ b/macros/map.asm @@ -0,0 +1,40 @@ +person_event: macro + db \1 ; sprite + db \2 ; y + db \3 ; x + db \4 ; facing + db \5 ; movement + db \6 ; clock_hour + db \7 ; clock_daytime + db \8 ; color_function + db \9 ; sight_range + shift + dw \9 ; pointer + shift + dw \9 ; event flag + endm + +signpost: macro + db \1 ; y + db \2 ; x + db \3 ; function + dw \4 ; pointer + endm + +xy_trigger: macro + db \1 ; number + db \2 ; y + db \3 ; x + db \4 ; unknown1 + dw \5 ; script + db \6 ; unknown2 + db \7 ; unknown3 + endm + +warp_def: macro + db \1 ; y + db \2 ; x + db \3 ; warp_to + db \4 ; map group + db \5 ; map number + endm diff --git a/macros/move_anim.asm b/macros/move_anim.asm new file mode 100644 index 000000000..962324bc6 --- /dev/null +++ b/macros/move_anim.asm @@ -0,0 +1,244 @@ +anim_wait: macro +if \1 >= $d0 + flip out +endc + db \1 + endm + +anim_obj: macro + db $d0 + db \1 ; obj + db \2 ; x + db \3 ; y + db \4 ; param + endm + +anim_1gfx: macro + db $d1 + db \1 ; gfx1 + endm + +anim_2gfx: macro + db $d2 + db \1 ; gfx1 + db \2 ; gfx2 + endm + +anim_3gfx: macro + db $d3 + db \1 ; gfx1 + db \2 ; gfx2 + db \3 ; gfx3 + endm + +anim_4gfx: macro + db $d4 + db \1 ; gfx1 + db \2 ; gfx2 + db \3 ; gfx3 + db \4 ; gfx4 + endm + +anim_5gfx: macro + db $d5 + db \1 ; gfx1 + db \2 ; gfx2 + db \3 ; gfx3 + db \4 ; gfx4 + db \5 ; gfx5 + endm + +anim_incobj: macro + db $d6 + db \1 ; id + endm + +anim_setobj: macro + db $d7 + db \1 ; id + db \2 ; obj + endm + +anim_incbgeffect: macro + db $d8 + db \1 ; effect + endm + +anim_enemyfeetobj: macro + db $d9 + endm + +anim_playerheadobj: macro + db $da + endm + +anim_checkpokeball: macro + db $db + endm + +anim_transform: macro + db $dc + endm + +anim_raisesub: macro + db $dd + endm + +anim_dropsub: macro + db $de + endm + +anim_resetobp0: macro + db $df + endm + +anim_sound: macro + db $e0 + db \1 ; tracks + db \2 ; id + endm + +anim_cry: macro + db $e1 + db \1 ; pitch + endm + +anim_minimizeopp: macro + db $e2 + endm + +anim_oamon: macro + db $e3 + endm + +anim_oamoff: macro + db $e4 + endm + +anim_clearobjs: macro + db $e5 + endm + +anim_beatup: macro + db $e6 + endm + +anim_0xe7: macro + db $e7 + endm + +anim_updateactorpic: macro + db $e8 + endm + +anim_minimize: macro + db $e9 + endm + +anim_0xea: macro + db $ea + endm + +anim_0xeb: macro + db $eb + endm + +anim_0xec: macro + db $ec + endm + +anim_0xed: macro + db $ed + endm + +anim_jumpand: macro + db $ee + db \1 ; value + dw \2 ; address + endm + +anim_jumpuntil: macro + db $ef + dw \1 ; address + endm + +anim_bgeffect: macro + db $f0 + db \1 ; effect + db \2 ; unknown + db \3 ; unknown + db \4 ; unknown + endm + +anim_bgp: macro + db $f1 + db \1 ; colors + endm + +anim_obp0: macro + db $f2 + db \1 ; colors + endm + +anim_obp1: macro + db $f3 + db \1 ; colors + endm + +anim_clearsprites: macro + db $f4 + endm + +anim_0xf5: macro + db $f5 + endm + +anim_0xf6: macro + db $f6 + endm + +anim_0xf7: macro + db $f7 + endm + +anim_jumpif: macro + db $f8 + db \1 ; value + dw \2 ; address + endm + +anim_setvar: macro + db $f9 + db \1 ; value + endm + +anim_incvar: macro + db $fa + endm + +anim_jumpvar: macro + db $fb + db \1 ; value + dw \2 ; address + endm + +anim_jump: macro + db $fc + dw \1 ; address + endm + +anim_loop: macro + db $fd + db \1 ; count + dw \2 ; address + endm + +anim_call: macro + db $fe + dw \1 ; address + endm + +anim_ret: macro + db $ff + endm + diff --git a/macros/move_effect.asm b/macros/move_effect.asm new file mode 100644 index 000000000..66e419db2 --- /dev/null +++ b/macros/move_effect.asm @@ -0,0 +1,708 @@ +checkturn: macro + db $01 + endm + +checkobedience: macro + db $02 + endm + +usedmovetext: macro + db $03 + endm + +doturn: macro + db $04 + endm + +critical: macro + db $05 + endm + +damagestats: macro + db $06 + endm + +stab: macro + db $07 + endm + +damagevariation: macro + db $08 + endm + +checkhit: macro + db $09 + endm + +effect0x0a: macro + db $0a + endm + +effect0x0b: macro + db $0b + endm + +effect0x0c: macro + db $0c + endm + +resulttext: macro + db $0d + endm + +checkfaint: macro + db $0e + endm + +criticaltext: macro + db $0f + endm + +supereffectivetext: macro + db $10 + endm + +checkdestinybond: macro + db $11 + endm + +buildopponentrage: macro + db $12 + endm + +poisontarget: macro + db $13 + endm + +sleeptarget: macro + db $14 + endm + +draintarget: macro + db $15 + endm + +eatdream: macro + db $16 + endm + +burntarget: macro + db $17 + endm + +freezetarget: macro + db $18 + endm + +paralyzetarget: macro + db $19 + endm + +selfdestruct: macro + db $1a + endm + +mirrormove: macro + db $1b + endm + +statup: macro + db $1c + endm + +statdown: macro + db $1d + endm + +payday: macro + db $1e + endm + +conversion: macro + db $1f + endm + +resetstats: macro + db $20 + endm + +storeenergy: macro + db $21 + endm + +unleashenergy: macro + db $22 + endm + +forceswitch: macro + db $23 + endm + +endloop: macro + db $24 + endm + +flinchtarget: macro + db $25 + endm + +ohko: macro + db $26 + endm + +recoil: macro + db $27 + endm + +mist: macro + db $28 + endm + +focusenergy: macro + db $29 + endm + +confuse: macro + db $2a + endm + +confusetarget: macro + db $2b + endm + +heal: macro + db $2c + endm + +transform: macro + db $2d + endm + +screen: macro + db $2e + endm + +poison: macro + db $2f + endm + +paralyze: macro + db $30 + endm + +substitute: macro + db $31 + endm + +rechargenextturn: macro + db $32 + endm + +mimic: macro + db $33 + endm + +metronome: macro + db $34 + endm + +leechseed: macro + db $35 + endm + +splash: macro + db $36 + endm + +disable: macro + db $37 + endm + +cleartext: macro + db $38 + endm + +charge: macro + db $39 + endm + +checkcharge: macro + db $3a + endm + +traptarget: macro + db $3b + endm + +effect0x3c: macro + db $3c + endm + +rampage: macro + db $3d + endm + +checkrampage: macro + db $3e + endm + +constantdamage: macro + db $3f + endm + +counter: macro + db $40 + endm + +encore: macro + db $41 + endm + +painsplit: macro + db $42 + endm + +snore: macro + db $43 + endm + +conversion2: macro + db $44 + endm + +lockon: macro + db $45 + endm + +sketch: macro + db $46 + endm + +defrostopponent: macro + db $47 + endm + +sleeptalk: macro + db $48 + endm + +destinybond: macro + db $49 + endm + +spite: macro + db $4a + endm + +falseswipe: macro + db $4b + endm + +healbell: macro + db $4c + endm + +kingsrock: macro + db $4d + endm + +triplekick: macro + db $4e + endm + +kickcounter: macro + db $4f + endm + +thief: macro + db $50 + endm + +arenatrap: macro + db $51 + endm + +nightmare: macro + db $52 + endm + +defrost: macro + db $53 + endm + +curse: macro + db $54 + endm + +protect: macro + db $55 + endm + +spikes: macro + db $56 + endm + +foresight: macro + db $57 + endm + +perishsong: macro + db $58 + endm + +startsandstorm: macro + db $59 + endm + +endure: macro + db $5a + endm + +checkcurl: macro + db $5b + endm + +rolloutpower: macro + db $5c + endm + +effect0x5d: macro + db $5d + endm + +furycutter: macro + db $5e + endm + +attract: macro + db $5f + endm + +happinesspower: macro + db $60 + endm + +present: macro + db $61 + endm + +damagecalc: macro + db $62 + endm + +frustrationpower: macro + db $63 + endm + +safeguard: macro + db $64 + endm + +checksafeguard: macro + db $65 + endm + +getmagnitude: macro + db $66 + endm + +batonpass: macro + db $67 + endm + +pursuit: macro + db $68 + endm + +clearhazards: macro + db $69 + endm + +healmorn: macro + db $6a + endm + +healday: macro + db $6b + endm + +healnite: macro + db $6c + endm + +hiddenpower: macro + db $6d + endm + +startrain: macro + db $6e + endm + +startsun: macro + db $6f + endm + +attackup: macro + db $70 + endm + +defenseup: macro + db $71 + endm + +speedup: macro + db $72 + endm + +specialattackup: macro + db $73 + endm + +specialdefenseup: macro + db $74 + endm + +accuracyup: macro + db $75 + endm + +evasionup: macro + db $76 + endm + +attackup2: macro + db $77 + endm + +defenseup2: macro + db $78 + endm + +speedup2: macro + db $79 + endm + +specialattackup2: macro + db $7a + endm + +specialdefenseup2: macro + db $7b + endm + +accuracyup2: macro + db $7c + endm + +evasionup2: macro + db $7d + endm + +attackdown: macro + db $7e + endm + +defensedown: macro + db $7f + endm + +speeddown: macro + db $80 + endm + +specialattackdown: macro + db $81 + endm + +specialdefensedown: macro + db $82 + endm + +accuracydown: macro + db $83 + endm + +evasiondown: macro + db $84 + endm + +attackdown2: macro + db $85 + endm + +defensedown2: macro + db $86 + endm + +speeddown2: macro + db $87 + endm + +specialattackdown2: macro + db $88 + endm + +specialdefensedown2: macro + db $89 + endm + +accuracydown2: macro + db $8a + endm + +evasiondown2: macro + db $8b + endm + +statmessageuser: macro + db $8c + endm + +statmessagetarget: macro + db $8d + endm + +statupfailtext: macro + db $8e + endm + +statdownfailtext: macro + db $8f + endm + +effectchance: macro + db $90 + endm + +effect0x91: macro + db $91 + endm + +effect0x92: macro + db $92 + endm + +switchturn: macro + db $93 + endm + +fakeout: macro + db $94 + endm + +bellydrum: macro + db $95 + endm + +psychup: macro + db $96 + endm + +rage: macro + db $97 + endm + +doubleflyingdamage: macro + db $98 + endm + +doubleundergrounddamage: macro + db $99 + endm + +mirrorcoat: macro + db $9a + endm + +checkfuturesight: macro + db $9b + endm + +futuresight: macro + db $9c + endm + +doubleminimizedamage: macro + db $9d + endm + +skipsuncharge: macro + db $9e + endm + +thunderaccuracy: macro + db $9f + endm + +teleport: macro + db $a0 + endm + +beatup: macro + db $a1 + endm + +ragedamage: macro + db $a2 + endm + +effect0xa3: macro + db $a3 + endm + +allstatsup: macro + db $a4 + endm + +effect0xa5: macro + db $a5 + endm + +effect0xa6: macro + db $a6 + endm + +effect0xa7: macro + db $a7 + endm + +effect0xa8: macro + db $a8 + endm + +clearmissdamage: macro + db $a9 + endm + +movedelay: macro + db $aa + endm + +hittarget: macro + db $ab + endm + +tristatuschance: macro + db $ac + endm + +supereffectivelooptext: macro + db $ad + endm + +startloop: macro + db $ae + endm + +curl: macro + db $af + endm + +endturn: macro + db $fe + endm + +endmove: macro + db $ff + endm + diff --git a/macros/movement.asm b/macros/movement.asm new file mode 100644 index 000000000..a78d532da --- /dev/null +++ b/macros/movement.asm @@ -0,0 +1,286 @@ +turn_head_down: macro + db $00 + endm + +turn_head_up: macro + db $01 + endm + +turn_head_left: macro + db $02 + endm + +turn_head_right: macro + db $03 + endm + +half_step_down: macro + db $04 + endm + +half_step_up: macro + db $05 + endm + +half_step_left: macro + db $06 + endm + +half_step_right: macro + db $07 + endm + +slow_step_down: macro + db $08 + endm + +slow_step_up: macro + db $09 + endm + +slow_step_left: macro + db $0a + endm + +slow_step_right: macro + db $0b + endm + +step_down: macro + db $0c + endm + +step_up: macro + db $0d + endm + +step_left: macro + db $0e + endm + +step_right: macro + db $0f + endm + +big_step_down: macro + db $10 + endm + +big_step_up: macro + db $11 + endm + +big_step_left: macro + db $12 + endm + +big_step_right: macro + db $13 + endm + +slow_slide_step_down: macro + db $14 + endm + +slow_slide_step_up: macro + db $15 + endm + +slow_slide_step_left: macro + db $16 + endm + +slow_slide_step_right: macro + db $17 + endm + +slide_step_down: macro + db $18 + endm + +slide_step_up: macro + db $19 + endm + +slide_step_left: macro + db $1a + endm + +slide_step_right: macro + db $1b + endm + +fast_slide_step_down: macro + db $1c + endm + +fast_slide_step_up: macro + db $1d + endm + +fast_slide_step_left: macro + db $1e + endm + +fast_slide_step_right: macro + db $1f + endm + +turn_away_down: macro + db $20 + endm + +turn_away_up: macro + db $21 + endm + +turn_away_left: macro + db $22 + endm + +turn_away_right: macro + db $23 + endm + +turn_in_down: macro + db $24 + endm + +turn_in_up: macro + db $25 + endm + +turn_in_left: macro + db $26 + endm + +turn_in_right: macro + db $27 + endm + +turn_waterfall_down: macro + db $28 + endm + +turn_waterfall_up: macro + db $29 + endm + +turn_waterfall_left: macro + db $2a + endm + +turn_waterfall_right: macro + db $2b + endm + +slow_jump_step_down: macro + db $2c + endm + +slow_jump_step_up: macro + db $2d + endm + +slow_jump_step_left: macro + db $2e + endm + +slow_jump_step_right: macro + db $2f + endm + +jump_step_down: macro + db $30 + endm + +jump_step_up: macro + db $31 + endm + +jump_step_left: macro + db $32 + endm + +jump_step_right: macro + db $33 + endm + +fast_jump_step_down: macro + db $34 + endm + +fast_jump_step_up: macro + db $35 + endm + +fast_jump_step_left: macro + db $36 + endm + +fast_jump_step_right: macro + db $37 + endm + +remove_fixed_facing: macro + db $3a + endm + +fix_facing: macro + db $3b + endm + +hide_person: macro + db $3d + endm + +show_person: macro + db $3e + endm + +accelerate_last: macro + db $45 + endm + +step_sleep: macro + db $46 + db \1 ; duration + endm + +step_end: macro + db $47 + endm + +remove_person: macro + db $49 + endm + +teleport_from: macro + db $4c + endm + +teleport_to: macro + db $4d + endm + +skyfall: macro + db $4e + endm + +step_wait5: macro + db $4f + endm + +hide_emote: macro + db $53 + endm + +show_emote: macro + db $54 + endm + +step_shake: macro + db $55 + db \1 ; displacement + endm + diff --git a/macros/sound.asm b/macros/sound.asm new file mode 100644 index 000000000..38c72f1cf --- /dev/null +++ b/macros/sound.asm @@ -0,0 +1,198 @@ +octave: macro + db $d8 - (\1) + endm + +notetype: macro + db $d8 + db \1 ; note_length + if _NARG >= 2 + db \2 ; intensity + endc + endm + +forceoctave: macro + db $d9 + db \1 ; octave + endm + +tempo: macro + db $da + bigdw \1 ; tempo + endm + +dutycycle: macro + db $db + db \1 ; duty_cycle + endm + +intensity: macro + db $dc + db \1 ; intensity + endm + +soundinput: macro + db $dd + db \1 ; input + endm + +unknownmusic0xde: macro + db $de + db \1 ; unknown + endm + +togglesfx: macro + db $df + endm + +unknownmusic0xe0: macro + db $e0 + db \1 ; unknown + db \2 ; unknown + endm + +vibrato: macro + db $e1 + db \1 ; delay + db \2 ; extent + endm + +unknownmusic0xe2: macro + db $e2 + db \1 ; unknown + endm + +togglenoise: macro + db $e3 + db \1 ; id + endm + +panning: macro + db $e4 + db \1 ; tracks + endm + +volume: macro + db $e5 + db \1 ; volume + endm + +tone: macro + db $e6 + bigdw \1 ; tone + endm + +unknownmusic0xe7: macro + db $e7 + db \1 ; unknown + endm + +unknownmusic0xe8: macro + db $e8 + db \1 ; unknown + endm + +globaltempo: macro + db $e9 + bigdw \1 ; value + endm + +restartchannel: macro + db $ea + dw \1 ; address + endm + +newsong: macro + db $eb + bigdw \1 ; id + endm + +sfxpriorityon: macro + db $ec + endm + +sfxpriorityoff: macro + db $ed + endm + +unknownmusic0xee: macro + db $ee + dw \1 ; address + endm + +stereopanning: macro + db $ef + db \1 ; tracks + endm + +sfxtogglenoise: macro + db $f0 + db \1 ; id + endm + +music0xf1: macro + db $f1 + endm + +music0xf2: macro + db $f2 + endm + +music0xf3: macro + db $f3 + endm + +music0xf4: macro + db $f4 + endm + +music0xf5: macro + db $f5 + endm + +music0xf6: macro + db $f6 + endm + +music0xf7: macro + db $f7 + endm + +music0xf8: macro + db $f8 + endm + +unknownmusic0xf9: macro + db $f9 + endm + +setcondition: macro + db $fa + db \1 ; condition + endm + +jumpif: macro + db $fb + db \1 ; condition + dw \2 ; address + endm + +jumpchannel: macro + db $fc + dw \1 ; address + endm + +loopchannel: macro + db $fd + db \1 ; count + dw \2 ; address + endm + +callchannel: macro + db $fe + dw \1 ; address + endm + +endchannel: macro + db $ff + endm + diff --git a/macros/text.asm b/macros/text.asm new file mode 100644 index 000000000..ae49d8fbb --- /dev/null +++ b/macros/text.asm @@ -0,0 +1,65 @@ +text_from_ram: macro + db 1 + dw \1 + endm + +text_dunno1: macro + db 5 + endm + +text_waitbutton: macro + db 6 + endm + +text_dunno2: macro + db 7 + endm + +start_asm: macro + db 8 + endm + +deciram: macro + db 9 + dw \1 + db \2 + endm + +interpret_data: macro + db 10 + endm + +sound0: macro + db 11 + endm + +limited_interpret_data: macro + db 12 + db \1 + endm + +sound0x0F: macro + db $f + endm + +sound0x02: macro + db $10 + endm + +sound0x0A: macro + db $11 + endm + +sound0x2C: macro + db $13 + endm + +current_day: macro + db $15 + endm + +text_jump: macro + db $16 + dw \1 + db BANK(\1) + endm diff --git a/main.asm b/main.asm index 5cf391841..107fcced0 100644 --- a/main.asm +++ b/main.asm @@ -9148,10 +9148,10 @@ UnknownScript_0xc7fe: ; c7fe special $0035 UnknownScript_0xc802: ; 0xc802 - 3callasm GetPartyNick - 2writetext UnknownText_0xc7c4 + callasm GetPartyNick + writetext UnknownText_0xc7c4 reloadmappart - 3callasm Functionc810 + callasm Functionc810 loadmovesprites end ; 0xc810 @@ -9303,8 +9303,8 @@ Functionc8e0: ; c8e0 UnknownScript_0xc8e6: ; 0xc8e6 reloadmappart special $0035 - 2writetext UnknownText_0xc8f3 - 3callasm Function8c7e1 + writetext UnknownText_0xc8f3 + callasm Function8c7e1 loadmovesprites end ; 0xc8f3 @@ -9404,11 +9404,11 @@ UnknownScript_0xc983: ; c983 special $0035 UsedSurfScript: ; c986 - 2writetext UsedSurfText ; "used SURF!" + writetext UsedSurfText ; "used SURF!" closetext loadmovesprites - 3callasm Functionc9a2 ; empty function + callasm Functionc9a2 ; empty function copybytetovar Buffer2 writevarcode VAR_MOVEMENT @@ -9546,7 +9546,7 @@ TrySurfOW:: ; c9e7 AskSurfScript: ; ca2c loadfont - 2writetext AskSurfText + writetext AskSurfText yesorno iftrue UsedSurfScript loadmovesprites @@ -9634,17 +9634,17 @@ Functionca9d: ; ca9d UnknownScript_0xcaa3: ; 0xcaa3 reloadmappart - 3callasm HideSprites + callasm HideSprites special $0035 - 3callasm Function8caed - 3call UnknownScript_0x122c1 + callasm Function8caed + farscall UnknownScript_0x122c1 special $0000 - 3callasm Function154f1 + callasm Function154f1 writecode $8, $0 newloadmap $fc - 3callasm Function8cb33 + callasm Function8cb33 special $003b - 3callasm Functioncacb + callasm Functioncacb end ; 0xcacb @@ -9703,14 +9703,14 @@ UnknownScript_0xcb1c: ; 0xcb1c special $0035 UnknownScript_0xcb20: ; 0xcb20 - 3callasm GetPartyNick - 2writetext UnknownText_0xcb51 + callasm GetPartyNick + writetext UnknownText_0xcb51 closetext loadmovesprites playsound SFX_BUBBLEBEAM .loop applymovement $0, WaterfallStep - 3callasm Functioncb38 + callasm Functioncb38 iffalse .loop end ; 0xcb38 @@ -9771,7 +9771,7 @@ UnknownText_0xcb81: ; 0xcb81 UnknownScript_0xcb86: ; 0xcb86 loadfont - 2writetext UnknownText_0xcb90 + writetext UnknownText_0xcb90 yesorno iftrue UnknownScript_0xcb20 loadmovesprites @@ -9892,21 +9892,21 @@ UnknownText_0xcc26: ; 0xcc26 UnknownScript_0xcc2b: ; 0xcc2b reloadmappart special $0035 - 2writetext UnknownText_0xcc21 - 2jump UnknownScript_0xcc3c + writetext UnknownText_0xcc21 + jump UnknownScript_0xcc3c ; 0xcc35 UnknownScript_0xcc35: ; 0xcc35 reloadmappart special $0035 - 2writetext UnknownText_0xcc1c + writetext UnknownText_0xcc1c UnknownScript_0xcc3c: ; 0xcc3c closetext loadmovesprites playsound SFX_WARP_TO applymovement $0, MovementData_0xcc59 - 3call UnknownScript_0x122c1 + farscall UnknownScript_0x122c1 special $0000 writecode $8, $0 newloadmap $f5 @@ -9998,13 +9998,13 @@ UnknownText_0xccb6: ; 0xccb6 UnknownScript_0xccbb: ; 0xccbb reloadmappart special $0035 - 2writetext UnknownText_0xccb1 + writetext UnknownText_0xccb1 pause 60 reloadmappart loadmovesprites playsound SFX_WARP_TO applymovement $0, MovementData_0xcce1 - 3call UnknownScript_0x122c1 + farscall UnknownScript_0x122c1 special $0000 writecode $8, $0 newloadmap $f4 @@ -10085,12 +10085,12 @@ UnknownScript_0xcd29: ; 0xcd29 special $0035 UnknownScript_0xcd2d: ; 0xcd2d - 3callasm Functioncd12 - 2writetext UnknownText_0xcd41 + callasm Functioncd12 + writetext UnknownText_0xcd41 copybytetovar $d1ef cry $0000 pause 3 - 2writetext UnknownText_0xcd46 + writetext UnknownText_0xcd46 loadmovesprites end ; 0xcd41 @@ -10106,10 +10106,10 @@ UnknownText_0xcd46: ; 0xcd46 ; 0xcd4b UnknownScript_0xcd4b: ; 0xcd4b - 3callasm Functioncd78 + callasm Functioncd78 iffalse UnknownScript_0xcd5f if_equal $1, UnknownScript_0xcd59 - 2jump UnknownScript_0xcd5c + jump UnknownScript_0xcd5c ; 0xcd59 UnknownScript_0xcd59: ; 0xcd59 @@ -10122,7 +10122,7 @@ UnknownScript_0xcd5c: ; 0xcd5c UnknownScript_0xcd5f: ; 0xcd5f loadfont - 2writetext UnknownText_0xcd69 + writetext UnknownText_0xcd69 yesorno iftrue UnknownScript_0xcd2d loadmovesprites @@ -10265,10 +10265,10 @@ UnknownScript_0xce0b: ; 0xce0b special $0035 UnknownScript_0xce0f: ; 0xce0f - 3callasm GetPartyNick - 2writetext UnknownText_0xcdd9 + callasm GetPartyNick + writetext UnknownText_0xcdd9 reloadmappart - 3callasm Functionce1d + callasm Functionce1d loadmovesprites end ; 0xce1d @@ -10325,7 +10325,7 @@ UnknownText_0xce69: ; 0xce69 UnknownScript_0xce6e: ; 0xce6e loadfont - 2writetext UnknownText_0xce78 + writetext UnknownText_0xce78 yesorno iftrue UnknownScript_0xce0f loadmovesprites @@ -10378,13 +10378,13 @@ HeadbuttFromMenuScript: ; 0xcea7 special $0035 HeadbuttScript: ; 0xceab - 3callasm GetPartyNick - 2writetext UnknownText_0xce9d + callasm GetPartyNick + writetext UnknownText_0xce9d reloadmappart - 3callasm ShakeHeadbuttTree + callasm ShakeHeadbuttTree - 3callasm TreeMonEncounter + callasm TreeMonEncounter iffalse .no_battle loadmovesprites battlecheck @@ -10393,7 +10393,7 @@ HeadbuttScript: ; 0xceab end .no_battle - 2writetext UnknownText_0xcea2 + writetext UnknownText_0xcea2 closetext loadmovesprites end @@ -10417,7 +10417,7 @@ TryHeadbuttOW:: ; cec9 AskHeadbuttScript: ; 0xcedc loadfont - 2writetext UnknownText_0xcee6 + writetext UnknownText_0xcee6 yesorno iftrue HeadbuttScript loadmovesprites @@ -10484,8 +10484,8 @@ RockSmashFromMenuScript: ; 0xcf2e special $0035 RockSmashScript: ; cf32 - 3callasm GetPartyNick - 2writetext UnknownText_0xcf58 + callasm GetPartyNick + writetext UnknownText_0xcf58 loadmovesprites special $003b playsound SFX_STRENGTH @@ -10493,7 +10493,7 @@ RockSmashScript: ; cf32 applymovement2 MovementData_0xcf55 disappear $fe - 3callasm RockMonEncounter + callasm RockMonEncounter copybytetovar $d22e iffalse .done battlecheck @@ -10513,11 +10513,11 @@ UnknownText_0xcf58: ; 0xcf58 ; 0xcf5d AskRockSmashScript: ; 0xcf5d - 3callasm HasRockSmash + callasm HasRockSmash if_equal 1, .no loadfont - 2writetext UnknownText_0xcf77 + writetext UnknownText_0xcf77 yesorno iftrue RockSmashScript loadmovesprites @@ -10652,28 +10652,28 @@ Functiond010: ; d010 ; d01e UnknownScript_0xd01e: ; 0xd01e - 2call UnknownScript_0xd07c - 2writetext UnknownText_0xd0a9 - 2jump UnknownScript_0xd02d + scall UnknownScript_0xd07c + writetext UnknownText_0xd0a9 + jump UnknownScript_0xd02d ; 0xd027 UnknownScript_0xd027: ; 0xd027 - 2call UnknownScript_0xd07c - 2writetext UnknownText_0xd0a9 + scall UnknownScript_0xd07c + writetext UnknownText_0xd0a9 UnknownScript_0xd02d: ; 0xd02d loademote $8 - 3callasm Functiond095 + callasm Functiond095 loadmovesprites end ; 0xd035 UnknownScript_0xd035: ; 0xd035 - 2call UnknownScript_0xd07c - 3callasm Functiond06c + scall UnknownScript_0xd07c + callasm Functiond06c iffalse UnknownScript_0xd046 applymovement $0, MovementData_0xd062 - 2jump UnknownScript_0xd04a + jump UnknownScript_0xd04a ; 0xd046 UnknownScript_0xd046: ; 0xd046 @@ -10682,8 +10682,8 @@ UnknownScript_0xd046: ; 0xd046 UnknownScript_0xd04a: ; 0xd04a pause 40 applymovement $0, MovementData_0xd069 - 2writetext UnknownText_0xd0a4 - 3callasm Functiond095 + writetext UnknownText_0xd0a4 + callasm Functiond095 loadmovesprites battlecheck startbattle @@ -10734,7 +10734,7 @@ UnknownScript_0xd07c: ; 0xd07c loadvar $ffd4, $0 special $0035 loademote $9 - 3callasm Functionb84b3 + callasm Functionb84b3 loademote $0 applymovement $0, MovementData_0xd093 pause 40 @@ -10868,7 +10868,7 @@ UnknownScript_0xd13e: ; 0xd13e reloadmappart special $0035 writecode $8, $1 - 2writetext UnknownText_0xd17c + writetext UnknownText_0xd17c closetext loadmovesprites special $0038 @@ -10888,7 +10888,7 @@ UnknownScript_0xd158: ; 0xd158 reloadmappart special $0035 writecode $8, $0 - 2writetext UnknownText_0xd181 + writetext UnknownText_0xd181 closetext UnknownScript_0xd163: @@ -10900,11 +10900,11 @@ UnknownScript_0xd163: UnknownScript_0xd16b: ; 0xd16b writecode $8, $0 - 2jump UnknownScript_0xd163 + jump UnknownScript_0xd163 ; 0xd171 UnknownScript_0xd171: ; 0xd171 - 2writetext UnknownText_0xd177 + writetext UnknownText_0xd177 closetext loadmovesprites end @@ -10954,10 +10954,10 @@ TryCutOW:: ; d186 AskCutScript: ; 0xd1a9 loadfont - 2writetext UnknownText_0xd1c8 + writetext UnknownText_0xd1c8 yesorno iffalse .script_d1b8 - 3callasm Functiond1ba + callasm Functiond1ba iftrue UnknownScript_0xc802 .script_d1b8 loadmovesprites @@ -18387,11 +18387,11 @@ UnknownScript_0x122c1: ; 0x122c1 ; 0x122ce UnknownScript_0x122ce:: ; 0x122ce - 3callasm Function122f8 + callasm Function122f8 iffalse UnknownScript_0x122e3 disappear $fe loadfont - 2writetext UnknownText_0x122ee + writetext UnknownText_0x122ee playsound SFX_ITEM pause 60 itemnotify @@ -18401,9 +18401,9 @@ UnknownScript_0x122ce:: ; 0x122ce UnknownScript_0x122e3: ; 0x122e3 loadfont - 2writetext UnknownText_0x122ee + writetext UnknownText_0x122ee closetext - 2writetext UnknownText_0x122f3 + writetext UnknownText_0x122f3 closetext loadmovesprites end @@ -18701,25 +18701,25 @@ Function124a3: ; 124a3 ; 124c1 UnknownScript_0x124c1:: ; 0x124c1 - 3callasm Function1250a - 2jump UnknownScript_0x124ce + callasm Function1250a + jump UnknownScript_0x124ce ; 0x124c8 UnknownScript_0x124c8:: ; 0x124c8 refreshscreen $0 - 3callasm Function124fa + callasm Function124fa UnknownScript_0x124ce: ; 0x124ce - 2writetext UnknownText_0x124f5 + writetext UnknownText_0x124f5 closetext special $002e pause 40 special $001b checkflag $0011 iftrue .script_64f2 - 3callasm HalveMoney - 3callasm Function12527 - 3call UnknownScript_0x122c1 + callasm HalveMoney + callasm Function12527 + farscall UnknownScript_0x122c1 special $0000 newloadmap $f1 resetfuncs @@ -18888,8 +18888,8 @@ Function12599: ; 12599 UnknownScript_0x125ad: ; 0x125ad reloadmappart special $0035 - 3callasm Function12599 - 2writetext UnknownText_0x125c3 + callasm Function12599 + writetext UnknownText_0x125c3 loadmovesprites end ; 0x125ba @@ -18897,7 +18897,7 @@ UnknownScript_0x125ad: ; 0x125ad UnknownScript_0x125ba: ; 0x125ba reloadmappart special $0035 - 2writetext UnknownText_0x125c8 + writetext UnknownText_0x125c8 loadmovesprites end ; 0x125c3 @@ -21356,15 +21356,15 @@ UnknownScript_0x135eb:: ; 0x135eb UnknownScript_0x135f8:: ; 0x135f8 playsound SFX_ELEVATOR_END loadfont - 2writetext UnknownText_0x1360f + writetext UnknownText_0x1360f closetext - 2jump UnknownScript_0x1360b + jump UnknownScript_0x1360b ; 0x13603 UnknownScript_0x13603: ; 0x13603 playsound SFX_ELEVATOR_END loadfont - 2writetext UnknownText_0x13614 + writetext UnknownText_0x13614 closetext UnknownScript_0x1360b: ; 0x1360b @@ -21386,7 +21386,7 @@ UnknownText_0x13614: ; 0x13614 UnknownScript_0x13619:: ; 0x13619 loadfont - 2writetext UnknownText_0x13620 + writetext UnknownText_0x13620 closetext loadmovesprites end @@ -21402,18 +21402,18 @@ UnknownScript_0x13625:: ; 0x13625 loadfont copybytetovar Unkn2Pals itemtotext $0, $0 - 2writetext UnknownText_0x13645 + writetext UnknownText_0x13645 giveitem $ff, $1 iffalse UnknownScript_0x1363e - 3callasm Function1364f + callasm Function1364f specialsound itemnotify - 2jump UnknownScript_0x13643 + jump UnknownScript_0x13643 ; 0x1363e UnknownScript_0x1363e: ; 0x1363e keeptextopen - 2writetext UnknownText_0x1364a + writetext UnknownText_0x1364a closetext UnknownScript_0x13643: ; 13643 @@ -21478,11 +21478,11 @@ Function1365b:: ; 1365b dbw $97, $0009 ; tv dbw $9d, $0008 ; window dbw $9f, $0005 ; incense burner - dbw $ff ; end + db $ff ; end ; 1369a UnknownScript_0x1369a: ; 0x1369a - 2jump $d03f + jump $d03f ; 0x1369d @@ -35685,7 +35685,7 @@ Unknown_26f84: ; 26f84 UnknownScript_0x26f91: ; 0x26f91 loadfont - 2writetext UnknownText_0x26f9b + writetext UnknownText_0x26f9b closetext special $0026 loadmovesprites @@ -58763,16 +58763,16 @@ Function50658: ; 50658 ; 50669 UnknownScript_0x50669: ; 50669 - 3callasm Function50658 + callasm Function50658 loadfont - 3callasm Function5067b + callasm Function5067b iffalse UnknownScript_0x50677 loadmovesprites end ; 50677 UnknownScript_0x50677: ; 50677 - 3jump UnknownScript_0x124c8 + farjump UnknownScript_0x124c8 ; 5067b Function5067b: ; 5067b @@ -58826,10 +58826,10 @@ Function506bc: ; 506bc UnknownScript_0x506c8: ; 0x506c8 reloadmappart special $0035 - 3callasm GetPartyNick - 2writetext UnknownText_0x50726 + callasm GetPartyNick + writetext UnknownText_0x50726 closetext - 3callasm Function506ef + callasm Function506ef iffalse UnknownScript_0x506e9 checkflag $0011 iftrue UnknownScript_0x506e5 @@ -58840,11 +58840,11 @@ UnknownScript_0x506c8: ; 0x506c8 ; 0x506e5 UnknownScript_0x506e5: ; 0x506e5 - 3jump UnknownScript_0x135eb + farjump UnknownScript_0x135eb ; 0x506e9 UnknownScript_0x506e9: ; 0x506e9 - 2writetext UnknownText_0x5072b + writetext UnknownText_0x5072b closetext loadmovesprites end @@ -58903,9 +58903,9 @@ _Squirtbottle: ; 50730 UnknownScript_0x5073c: ; 0x5073c reloadmappart special $0035 - 3callasm Function50753 + callasm Function50753 iffalse UnknownScript_0x5074b - 3jump WateredWeirdTreeScript + farjump WateredWeirdTreeScript ; 0x5074b UnknownScript_0x5074b: ; 0x5074b @@ -58981,7 +58981,7 @@ _CardKey: ; 50779 UnknownScript_0x507af: ; 0x507af loadmovesprites - 3jump MapRadioTower3FSignpost2Script + farjump MapRadioTower3FSignpost2Script ; 0x507b4 @@ -59016,7 +59016,7 @@ _BasementKey: ; 507b4 UnknownScript_0x507e1: ; 0x507e1 loadmovesprites - 3jump MapWarehouseEntranceSignpost0Script + farjump MapWarehouseEntranceSignpost0Script ; 0x507e6 @@ -59080,7 +59080,7 @@ UnknownScript_0x50821: ; 0x50821 special $002e special $0031 waitbutton - 2writetext UnknownText_0x50845 + writetext UnknownText_0x50845 playsound SFX_CAUGHT_MON waitbutton closetext @@ -78605,7 +78605,7 @@ Function90136:: ; 90136 (24:4136) UnknownScript_0x90173: ; 0x90173 pause 30 - 2jump UnknownScript_0x90241 + jump UnknownScript_0x90241 ; 0x90178 Function90178: ; 90178 (24:4178) @@ -78698,12 +78698,12 @@ Function90199: ; 90199 (24:4199) ; 90205 (24:4205) UnknownScript_0x90205: ; 0x90205 - 2ptcall $d002 + ptcall $d002 return ; 0x90209 UnknownScript_0x90209: ; 0x90209 - 2call UnknownScript_0x90657 + scall UnknownScript_0x90657 return ; 0x9020d @@ -78734,7 +78734,7 @@ Unknown_90233: ; 90233 db 0, 0 dbw BANK(UnknownScript_0x90238), UnknownScript_0x90238 UnknownScript_0x90238: - 2writetext UnknownText_0x9023c + writetext UnknownText_0x9023c end UnknownText_0x9023c: text_jump UnknownText_0x1c5565 @@ -78743,18 +78743,18 @@ UnknownText_0x9023c: UnknownScript_0x90241: ; 0x90241 refreshscreen $0 - 3callasm Function9026f - 2ptcall $d048 + callasm Function9026f + ptcall $d048 closetext - 3callasm Function902eb + callasm Function902eb loadmovesprites - 3callasm Function113e5 + callasm Function113e5 end ; 0x90255 UnknownScript_0x90255:: ; 0x90255 - 3callasm Function9025c - 2jump UnknownScript_0x90241 + callasm Function9025c + jump UnknownScript_0x90241 ; 0x9025c Function9025c: ; 9025c @@ -78763,9 +78763,9 @@ Function9025c: ; 9025c ; 90261 UnknownScript_0x90261: ; 0x90261 - 3callasm Function9026a + callasm Function9026a pause 30 - 2jump UnknownScript_0x90241 + jump UnknownScript_0x90241 ; 0x9026a Function9026a: ; 9026a @@ -79150,7 +79150,7 @@ Unknown_90627: ; 90627 ; 90657 UnknownScript_0x90657: ; 0x90657 - 2writetext UnknownText_0x9065b + writetext UnknownText_0x9065b end ; 0x9065b @@ -79161,7 +79161,7 @@ UnknownText_0x9065b: ; 0x9065b ; 0x90660 UnknownScript_0x90660: ; 0x90660 - 2writetext UnknownText_0x90664 + writetext UnknownText_0x90664 end ; 0x90664 @@ -79172,7 +79172,7 @@ UnknownText_0x90664: ; 0x90664 ; 0x90669 UnknownScript_0x90669: ; 0x90669 - 2writetext UnknownText_0x9066d + writetext UnknownText_0x9066d end ; 0x9066d @@ -100156,8 +100156,8 @@ Functionfcfec:: ; fcfec ; fd00f UnknownScript_0xfd00f: ; 0xfd00f - 3callasm Functionfd017 - 3jump UnknownScript_0x90241 + callasm Functionfd017 + farjump UnknownScript_0x90241 ; 0xfd017 Functionfd017: ; fd017 @@ -100303,18 +100303,18 @@ Functionfd0eb: ; fd0eb (3f:50eb) ; fd0fd (3f:50fd) UnknownScript_0xfd0fd: ; 0xfd0fd - 2writetext UnknownText_0xfd1b1 - 2writetext UnknownText_0xfd1b6 - 2writetext UnknownText_0xfd1bb - 2writetext UnknownText_0xfd1c0 + writetext UnknownText_0xfd1b1 + writetext UnknownText_0xfd1b6 + writetext UnknownText_0xfd1bb + writetext UnknownText_0xfd1c0 end ; 0xfd10a UnknownScript_0xfd10a: ; 0xfd10a - 2writetext UnknownText_0xfd1b1 - 2writetext UnknownText_0xfd1c5 - 2writetext UnknownText_0xfd1bb - 2writetext UnknownText_0xfd1ca + writetext UnknownText_0xfd1b1 + writetext UnknownText_0xfd1c5 + writetext UnknownText_0xfd1bb + writetext UnknownText_0xfd1ca end ; 0xfd117 @@ -113822,6 +113822,11 @@ Function117cdd: ; 0x117cdd SECTION "bank46", ROMX, BANK[$46] +; This section should be part of a dedicated mobile object. +; Until then, undo the existing charmap. + + charmap " ", $20 ; revert to ascii + Function118000: ; 118000 ld a, $1 ld [$cd38], a @@ -114532,29 +114537,23 @@ Function118b24: ; 118b24 (46:4b24) INCBIN "baserom.gbc",$118b42,$118ba5 - $118b42 ExchangeDownloadURL: ; 0x118ba5 - ascii "http://gameboy.datacenter.ne.jp/cgb/download?name=/01/CGB-BXTJ/exchange/index.txt" - -db $0 + db "http://gameboy.datacenter.ne.jp/cgb/download?name=/01/CGB-BXTJ/exchange/index.txt", 0 BattleDownloadURL: ; 0x118bf7 - ascii "http://gameboy.datacenter.ne.jp/cgb/download?name=/01/CGB-BXTJ/battle/index.txt" - -db $0 + db "http://gameboy.datacenter.ne.jp/cgb/download?name=/01/CGB-BXTJ/battle/index.txt", 0 NewsDownloadURL: ; 0x118c47 - ascii "http://gameboy.datacenter.ne.jp/cgb/download?name=/01/CGB-BXTJ/news/index.txt" - -db $0 + db "http://gameboy.datacenter.ne.jp/cgb/download?name=/01/CGB-BXTJ/news/index.txt", 0 MenuDownloadURL: ; 0x118c95 - ascii "http://gameboy.datacenter.ne.jp/cgb/download?name=/01/CGB-BXTJ/POKESTA/menu.cgb" - -db $0 + db "http://gameboy.datacenter.ne.jp/cgb/download?name=/01/CGB-BXTJ/POKESTA/menu.cgb", 0 IndexDownloadURL: ; 0x118ce4 - ascii "http://gameboy.datacenter.ne.jp/cgb/download?name=/01/CGB-BXTJ/tamago/index.txt" + db "http://gameboy.datacenter.ne.jp/cgb/download?name=/01/CGB-BXTJ/tamago/index.txt", 0 -db $0 + +SECTION "bank46_2", ROMX, BANK[$46] +; A hack to use ascii above. INCBIN "baserom.gbc",$118d35,$118e39 - $118d35 diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index 1181cc37e..511d52473 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -11,7 +11,7 @@ BugsyScript_0x18ec1e: ; 0x18ec1e loadfont checkevent EVENT_BEAT_BUGSY iftrue UnknownScript_0x18ec48 - 2writetext UnknownText_0x18ed0b + writetext UnknownText_0x18ed0b closetext loadmovesprites winlosstext UnknownText_0x18edae, $0000 @@ -20,12 +20,12 @@ BugsyScript_0x18ec1e: ; 0x18ec1e returnafterbattle setevent EVENT_BEAT_BUGSY loadfont - 2writetext UnknownText_0x18ee14 + writetext UnknownText_0x18ee14 playsound SFX_GET_BADGE waitbutton setflag $001c checkcode $7 - 2call UnknownScript_0x18ec73 + scall UnknownScript_0x18ec73 UnknownScript_0x18ec48: ; 0x18ec48 checkevent EVENT_GOT_TM49_FURY_CUTTER iftrue UnknownScript_0x18ec6d @@ -33,19 +33,19 @@ UnknownScript_0x18ec48: ; 0x18ec48 setevent EVENT_BEAT_BUG_CATCHER_BENNY setevent EVENT_BEAT_BUG_CATCHER_AL setevent EVENT_BEAT_BUG_CATCHER_JOSH - 2writetext UnknownText_0x18ee2b + writetext UnknownText_0x18ee2b keeptextopen verbosegiveitem TM_49, 1 iffalse UnknownScript_0x18ec71 setevent EVENT_GOT_TM49_FURY_CUTTER - 2writetext UnknownText_0x18eefa + writetext UnknownText_0x18eefa closetext loadmovesprites end ; 0x18ec6d UnknownScript_0x18ec6d: ; 0x18ec6d - 2writetext UnknownText_0x18ef98 + writetext UnknownText_0x18ef98 closetext UnknownScript_0x18ec71: ; 0x18ec71 loadmovesprites @@ -89,7 +89,7 @@ TrainerTwinsAmyandmay1: ; 0x18ec82 TwinsAmyandmay1Script: ; 0x18ec8e talkaftercancel loadfont - 2writetext UnknownText_0x18f1fc + writetext UnknownText_0x18f1fc closetext loadmovesprites end @@ -118,7 +118,7 @@ TrainerTwinsAmyandmay2: ; 0x18ec96 TwinsAmyandmay2Script: ; 0x18eca2 talkaftercancel loadfont - 2writetext UnknownText_0x18f269 + writetext UnknownText_0x18f269 closetext loadmovesprites end @@ -147,7 +147,7 @@ TrainerBug_catcherBug_catcher_benny: ; 0x18ecaa Bug_catcherBug_catcher_bennyScript: ; 0x18ecb6 talkaftercancel loadfont - 2writetext UnknownText_0x18f053 + writetext UnknownText_0x18f053 closetext loadmovesprites end @@ -176,7 +176,7 @@ TrainerBug_catcherAl: ; 0x18ecbe Bug_catcherAlScript: ; 0x18ecca talkaftercancel loadfont - 2writetext UnknownText_0x18f0d3 + writetext UnknownText_0x18f0d3 closetext loadmovesprites end @@ -205,7 +205,7 @@ TrainerBug_catcherJosh: ; 0x18ecd2 Bug_catcherJoshScript: ; 0x18ecde talkaftercancel loadfont - 2writetext UnknownText_0x18f17e + writetext UnknownText_0x18f17e closetext loadmovesprites end @@ -216,14 +216,14 @@ AzaleaGymGuyScript: ; 0x18ece6 checkevent EVENT_BEAT_BUGSY iftrue .AzaleaGymGuyWinScript loadfont - 2writetext AzaleaGymGuyText + writetext AzaleaGymGuyText closetext loadmovesprites end .AzaleaGymGuyWinScript loadfont - 2writetext AzaleaGymGuyWinText + writetext AzaleaGymGuyWinText closetext loadmovesprites end diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index 4000f9d61..101d0ff3d 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -41,7 +41,7 @@ UnknownScript_0x198018: ; 0x198018 appear $b applymovement $b, MovementData_0x198134 spriteface $0, $0 - 2jump UnknownScript_0x198049 + jump UnknownScript_0x198049 ; 0x198034 UnknownScript_0x198034: ; 0x198034 @@ -55,7 +55,7 @@ UnknownScript_0x198034: ; 0x198034 UnknownScript_0x198049: ; 0x198049 playmusic MUSIC_RIVAL_ENCOUNTER loadfont - 2writetext UnknownText_0x19814d + writetext UnknownText_0x19814d closetext loadmovesprites setevent $06bf @@ -69,7 +69,7 @@ UnknownScript_0x198049: ; 0x198049 startbattle reloadmapmusic returnafterbattle - 2jump UnknownScript_0x198091 + jump UnknownScript_0x198091 ; 0x198071 UnknownScript_0x198071: ; 0x198071 @@ -79,7 +79,7 @@ UnknownScript_0x198071: ; 0x198071 startbattle reloadmapmusic returnafterbattle - 2jump UnknownScript_0x198091 + jump UnknownScript_0x198091 ; 0x198081 UnknownScript_0x198081: ; 0x198081 @@ -89,13 +89,13 @@ UnknownScript_0x198081: ; 0x198081 startbattle reloadmapmusic returnafterbattle - 2jump UnknownScript_0x198091 + jump UnknownScript_0x198091 ; 0x198091 UnknownScript_0x198091: ; 0x198091 playmusic MUSIC_RIVAL_AFTER loadfont - 2writetext UnknownText_0x198233 + writetext UnknownText_0x198233 closetext loadmovesprites spriteface $0, $2 @@ -121,14 +121,14 @@ GrampsScript_0x1980b1: ; 0x1980b1 loadfont checkevent EVENT_CLEARED_SLOWPOKE_WELL iftrue UnknownScript_0x1980bf - 2writetext UnknownText_0x19841b + writetext UnknownText_0x19841b closetext loadmovesprites end ; 0x1980bf UnknownScript_0x1980bf: ; 0x1980bf - 2writetext UnknownText_0x198473 + writetext UnknownText_0x198473 closetext loadmovesprites end @@ -144,9 +144,9 @@ YoungsterScript_0x1980c8: ; 0x1980c8 SlowpokeScript_0x1980cb: ; 0x1980cb loadfont - 2writetext UnknownText_0x1985b0 + writetext UnknownText_0x1985b0 pause 60 - 2writetext UnknownText_0x1985c3 + writetext UnknownText_0x1985c3 cry SLOWPOKE closetext loadmovesprites @@ -157,7 +157,7 @@ WoosterScript: ; 0x1980da ; unused faceplayer loadfont - 2writetext WoosterText + writetext WoosterText cry QUAGSIRE closetext loadmovesprites @@ -167,12 +167,12 @@ WoosterScript: ; 0x1980da UnknownScript_0x1980e5: ; 0x1980e5 applymovement $0, MovementData_0x198148 loadfont - 2writetext UnknownText_0x1985df + writetext UnknownText_0x1985df keeptextopen spriteface $d, $3 - 2writetext UnknownText_0x19860b + writetext UnknownText_0x19860b keeptextopen - 2writetext UnknownText_0x198628 + writetext UnknownText_0x198628 closetext verbosegiveitem GS_BALL, 1 spriteface $d, $2 @@ -187,7 +187,7 @@ UnknownScript_0x1980e5: ; 0x1980e5 KurtOutsideScript_0x19810c: ; 0x19810c faceplayer loadfont - 2writetext UnknownText_0x198628 + writetext UnknownText_0x198628 closetext spriteface $d, $2 loadmovesprites diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index b229feef6..a44f6228f 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -21,7 +21,7 @@ UnknownScript_0x9e39d: ; 0x9e39d if_equal $3, UnknownScript_0x9e3d1 if_equal $4, UnknownScript_0x9e3d1 loadfont - 2writetext UnknownText_0x9f037 + writetext UnknownText_0x9f037 closetext loadmovesprites priorityjump UnknownScript_0x9e44e @@ -45,10 +45,10 @@ UnknownScript_0x9e3d3: ; 0x9e3d3 MapBattleTower1FSignpost0Script: ; 0x9e3d4 loadfont - 2writetext UnknownText_0x9ed3c + writetext UnknownText_0x9ed3c yesorno iffalse UnknownScript_0x9e3e0 - 2writetext UnknownText_0x9ed72 + writetext UnknownText_0x9ed72 closetext UnknownScript_0x9e3e0: ; 0x9e3e0 loadmovesprites @@ -60,21 +60,21 @@ ReceptionistScript_0x9e3e2: ; 0x9e3e2 special $0086 if_equal $3, BattleTowerBattleRoomScript_0x9f4e4 loadfont - 2writetext UnknownText_0x9e5ab + writetext UnknownText_0x9e5ab keeptextopen writebyte $0 special $0086 if_not_equal $0, UnknownScript_0x9e3fc - 2jump UnknownScript_0x9e49e + jump UnknownScript_0x9e49e ; 0x9e3fc UnknownScript_0x9e3fc: ; 0x9e3fc - 2writetext UnknownText_0x9e5ea + writetext UnknownText_0x9e5ea writebyte $1 special $0088 if_equal $1, UnknownScript_0x9e40f if_equal $2, UnknownScript_0x9e4a5 - 2jump UnknownScript_0x9e4b0 + jump UnknownScript_0x9e4b0 ; 0x9e40f UnknownScript_0x9e40f: ; 0x9e40f @@ -82,7 +82,7 @@ UnknownScript_0x9e40f: ; 0x9e40f special $0086 special $007c if_not_equal $0, UnknownScript_0x9e4bb - 2writetext UnknownText_0x9ef1f + writetext UnknownText_0x9ef1f yesorno iffalse UnknownScript_0x9e3fc dotrigger $0 @@ -96,12 +96,12 @@ UnknownScript_0x9e40f: ; 0x9e40f if_not_equal $0, UnknownScript_0x9e550 writebyte $11 special $0086 - 2writetext UnknownText_0x9e60a + writetext UnknownText_0x9e60a closetext loadmovesprites writebyte $1e special $0086 - 2jump UnknownScript_0x9e454 + jump UnknownScript_0x9e454 ; 0x9e44e UnknownScript_0x9e44e: ; 0x9e44e @@ -133,7 +133,7 @@ UnknownScript_0x9e47a: ; 0x9e47a if_equal $12, UnknownScript_0x9e498 itemtotext $0, $1 giveitem $ff, $5 - 2writetext UnknownText_0x9eb7e + writetext UnknownText_0x9eb7e writebyte $1d special $0086 loadmovesprites @@ -141,26 +141,26 @@ UnknownScript_0x9e47a: ; 0x9e47a ; 0x9e498 UnknownScript_0x9e498: ; 0x9e498 - 2writetext UnknownText_0x9eb94 + writetext UnknownText_0x9eb94 closetext loadmovesprites end ; 0x9e49e UnknownScript_0x9e49e: ; 0x9e49e - 2writetext UnknownText_0x9ec3d + writetext UnknownText_0x9ec3d yesorno iffalse UnknownScript_0x9e4a8 UnknownScript_0x9e4a5: ; 0x9e4a5 - 2writetext UnknownText_0x9e886 + writetext UnknownText_0x9e886 UnknownScript_0x9e4a8: ; 0x9e4a8 writebyte $1 special $0086 - 2jump UnknownScript_0x9e3fc + jump UnknownScript_0x9e3fc ; 0x9e4b0 UnknownScript_0x9e4b0: ; 0x9e4b0 - 2writetext UnknownText_0x9ec09 + writetext UnknownText_0x9ec09 closetext loadmovesprites end @@ -180,7 +180,7 @@ UnknownScript_0x9e4bb: ; 0x9e4bb UnknownScript_0x9e4be: ; 0x9e4be - 2writetext UnknownText_0x9ef1f + writetext UnknownText_0x9ef1f yesorno iffalse UnknownScript_0x9e3fc special $0004 @@ -190,9 +190,9 @@ UnknownScript_0x9e4be: ; 0x9e4be special $0075 if_equal $a, UnknownScript_0x9e3fc if_not_equal $0, UnknownScript_0x9e550 - 2writetext UnknownText_0x9e9eb + writetext UnknownText_0x9e9eb spriteface $2, $2 - 2writetext UnknownText_0x9ea1b + writetext UnknownText_0x9ea1b closetext spriteface $2, $0 loadmovesprites @@ -211,16 +211,16 @@ UnknownScript_0x9e4ea: ; 0x9e4ea writebyte $5 special $0086 if_equal $0, UnknownScript_0x9e512 - 2writetext UnknownText_0x9ecb0 - 2jump UnknownScript_0x9e515 + writetext UnknownText_0x9ecb0 + jump UnknownScript_0x9e515 ; 0x9e512 UnknownScript_0x9e512: ; 0x9e512 - 2writetext UnknownText_0x9ec6d + writetext UnknownText_0x9ec6d UnknownScript_0x9e515: ; 0x9e515 yesorno iffalse UnknownScript_0x9e3fc - 2writetext UnknownText_0x9ef79 + writetext UnknownText_0x9ef79 yesorno iffalse UnknownScript_0x9e3fc dotrigger $0 @@ -231,27 +231,27 @@ UnknownScript_0x9e515: ; 0x9e515 special $0086 writebyte $12 special $0086 - 2writetext UnknownText_0x9e60a + writetext UnknownText_0x9e60a closetext - 2jump UnknownScript_0x9e44e + jump UnknownScript_0x9e44e ; 0x9e53b UnknownScript_0x9e53b: ; 0x9e53b - 2writetext UnknownText_0x9f076 + writetext UnknownText_0x9f076 closetext - 2jump UnknownScript_0x9e4b0 + jump UnknownScript_0x9e4b0 ; 0x9e542 UnknownScript_0x9e542: ; 0x9e542 - 2writetext UnknownText_0x9f1e5 + writetext UnknownText_0x9f1e5 closetext - 2jump UnknownScript_0x9e3fc + jump UnknownScript_0x9e3fc ; 0x9e549 UnknownScript_0x9e549: ; 0x9e549 - 2writetext UnknownText_0x9f217 + writetext UnknownText_0x9f217 closetext - 2jump UnknownScript_0x9e3fc + jump UnknownScript_0x9e3fc ; 0x9e550 UnknownScript_0x9e550: ; 0x9e550 @@ -262,15 +262,15 @@ UnknownScript_0x9e550: ; 0x9e550 UnknownScript_0x9e555: ; 0x9e555 loadfont - 2writetext UnknownText_0x9ee18 + writetext UnknownText_0x9ee18 closetext - 2jump UnknownScript_0x9e4b0 + jump UnknownScript_0x9e4b0 ; 0x9e55d YoungsterScript_0x9e55d: ; 0x9e55d faceplayer loadfont - 2writetext UnknownText_0x9f264 + writetext UnknownText_0x9f264 closetext loadmovesprites spriteface $3, $3 diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index 8668d9856..9d3604fb3 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -45,7 +45,7 @@ UnknownScript_0x9f425: ; 0x9f425 applymovement $3, MovementData_0x9e59c applymovement $0, MovementData_0x9e5a7 loadfont - 2writetext UnknownText_0x9ee92 + writetext UnknownText_0x9ee92 closetext loadmovesprites playmusic MUSIC_HEAL @@ -55,18 +55,18 @@ UnknownScript_0x9f425: ; 0x9f425 special $0031 special $003d loadfont - 2writetext UnknownText_0x9eebc + writetext UnknownText_0x9eebc yesorno iffalse UnknownScript_0x9f483 UnknownScript_0x9f477: ; 0x9f477 loadmovesprites applymovement $0, MovementData_0x9e5a9 applymovement $3, MovementData_0x9e5a1 - 2jump UnknownScript_0x9f425 + jump UnknownScript_0x9f425 ; 0x9f483 UnknownScript_0x9f483: ; 0x9f483 - 2writetext UnknownText_0x9ef5e + writetext UnknownText_0x9ef5e yesorno iffalse UnknownScript_0x9f4a3 writebyte $7 @@ -80,7 +80,7 @@ UnknownScript_0x9f483: ; 0x9f483 special $002e special $007e UnknownScript_0x9f4a3: ; 0x9f4a3 - 2writetext UnknownText_0x9efbf + writetext UnknownText_0x9efbf yesorno iffalse UnknownScript_0x9f477 writebyte $4 @@ -91,7 +91,7 @@ UnknownScript_0x9f4a3: ; 0x9f4a3 special $002e warpfacing $1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F, $7, $7 loadfont - 2jump UnknownScript_0x9e4b0 + jump UnknownScript_0x9e4b0 ; 0x9f4c2 UnknownScript_0x9f4c2: ; 0x9f4c2 @@ -101,7 +101,7 @@ UnknownScript_0x9f4c2: ; 0x9f4c2 writebyte $4 special $0086 loadfont - 2writetext UnknownText_0x9ea49 + writetext UnknownText_0x9ea49 closetext loadmovesprites end @@ -113,15 +113,15 @@ UnknownScript_0x9f4d9: ; 0x9f4d9 warpfacing $1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F, $7, $7 BattleTowerBattleRoomScript_0x9f4e4: ; 0x9f4e4 loadfont - 2writetext UnknownText_0x9eaef - 2jump UnknownScript_0x9e47a + writetext UnknownText_0x9eaef + jump UnknownScript_0x9e47a ; 0x9f4eb UnknownScript_0x9f4eb: ; 0x9f4eb writebyte $4 special $0086 loadfont - 2writetext UnknownText_0x9f0c1 + writetext UnknownText_0x9f0c1 closetext loadmovesprites end @@ -133,8 +133,8 @@ UnknownScript_0x9f4f7: ; 0x9f4f7 writebyte $6 special $0086 loadfont - 2writetext UnknownText_0x9ea49 - 2writetext UnknownText_0x9ec09 + writetext UnknownText_0x9ea49 + writetext UnknownText_0x9ec09 closetext loadmovesprites end diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index c9c2f4f85..7532d745a 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -21,8 +21,8 @@ UnknownScript_0x9f5c0: ; 0x9f5c0 UnknownScript_0x9f5c1: ; 0x9f5c1 follow $2, $0 - 3callasm Function_0x9f5cb - 2jump UnknownScript_0x9f5dc + callasm Function_0x9f5cb + jump UnknownScript_0x9f5dc ; 0x9f5cb @@ -51,33 +51,33 @@ UnknownScript_0x9f5dc: ; 0x9f5dc if_equal $9, UnknownScript_0x9f618 if_equal $a, UnknownScript_0x9f618 applymovement $2, MovementData_0x9e57a - 2jump UnknownScript_0x9f61f + jump UnknownScript_0x9f61f ; 0x9f603 UnknownScript_0x9f603: ; 0x9f603 applymovement $2, MovementData_0x9e57c - 2jump UnknownScript_0x9f61f + jump UnknownScript_0x9f61f ; 0x9f60a UnknownScript_0x9f60a: ; 0x9f60a applymovement $2, MovementData_0x9e586 - 2jump UnknownScript_0x9f61f + jump UnknownScript_0x9f61f ; 0x9f611 UnknownScript_0x9f611: ; 0x9f611 applymovement $2, MovementData_0x9e584 - 2jump UnknownScript_0x9f61f + jump UnknownScript_0x9f61f ; 0x9f618 UnknownScript_0x9f618: ; 0x9f618 applymovement $2, MovementData_0x9e582 - 2jump UnknownScript_0x9f61f + jump UnknownScript_0x9f61f ; 0x9f61f UnknownScript_0x9f61f: ; 0x9f61f faceperson $0, $2 loadfont - 2writetext UnknownText_0x9ec26 + writetext UnknownText_0x9ec26 closetext loadmovesprites stopfollow diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm index 0171ebd3f..e1b0ec7a9 100644 --- a/maps/BillsHouse.asm +++ b/maps/BillsHouse.asm @@ -15,7 +15,7 @@ GrampsScript_0x189538: ; 0x189538 iftrue UnknownScript_0x1896c0 checkevent EVENT_MET_BILLS_GRANDPA iftrue UnknownScript_0x189553 - 2writetext UnknownText_0x1896ce + writetext UnknownText_0x1896ce keeptextopen setevent EVENT_MET_BILLS_GRANDPA UnknownScript_0x189553: ; 0x189553 @@ -29,101 +29,101 @@ UnknownScript_0x189553: ; 0x189553 iftrue UnknownScript_0x189652 checkevent EVENT_SHOWED_LICKITUNG_TO_BILLS_GRANDPA iftrue UnknownScript_0x18963b - 2writetext UnknownText_0x1898c0 + writetext UnknownText_0x1898c0 keeptextopen - 2writetext UnknownText_0x189732 + writetext UnknownText_0x189732 yesorno iffalse UnknownScript_0x1896aa - 2call UnknownScript_0x1896a5 + scall UnknownScript_0x1896a5 special $004d iffalse UnknownScript_0x1896aa if_not_equal LICKITUNG, UnknownScript_0x1896c6 - 2call UnknownScript_0x1896b0 + scall UnknownScript_0x1896b0 setevent EVENT_SHOWED_LICKITUNG_TO_BILLS_GRANDPA - 2jump UnknownScript_0x18963b + jump UnknownScript_0x18963b ; 0x189592 UnknownScript_0x189592: ; 0x189592 - 2writetext UnknownText_0x1898ff + writetext UnknownText_0x1898ff keeptextopen - 2writetext UnknownText_0x189732 + writetext UnknownText_0x189732 yesorno iffalse UnknownScript_0x1896aa - 2call UnknownScript_0x1896a5 + scall UnknownScript_0x1896a5 special $004d iffalse UnknownScript_0x1896aa if_not_equal ODDISH, UnknownScript_0x1896c6 - 2call UnknownScript_0x1896b0 + scall UnknownScript_0x1896b0 setevent EVENT_SHOWED_ODDISH_TO_BILLS_GRANDPA - 2jump UnknownScript_0x189652 + jump UnknownScript_0x189652 ; 0x1895b3 UnknownScript_0x1895b3: ; 0x1895b3 - 2writetext UnknownText_0x189953 + writetext UnknownText_0x189953 keeptextopen - 2writetext UnknownText_0x189732 + writetext UnknownText_0x189732 yesorno iffalse UnknownScript_0x1896aa - 2call UnknownScript_0x1896a5 + scall UnknownScript_0x1896a5 special $004d iffalse UnknownScript_0x1896aa if_not_equal STARYU, UnknownScript_0x1896c6 - 2call UnknownScript_0x1896b0 + scall UnknownScript_0x1896b0 setevent EVENT_SHOWED_STARYU_TO_BILLS_GRANDPA - 2jump UnknownScript_0x189669 + jump UnknownScript_0x189669 ; 0x1895d4 UnknownScript_0x1895d4: ; 0x1895d4 checkver iftrue UnknownScript_0x1895f9 - 2writetext UnknownText_0x1899fe + writetext UnknownText_0x1899fe keeptextopen - 2writetext UnknownText_0x189732 + writetext UnknownText_0x189732 yesorno iffalse UnknownScript_0x1896aa - 2call UnknownScript_0x1896a5 + scall UnknownScript_0x1896a5 special $004d iffalse UnknownScript_0x1896aa if_not_equal GROWLITHE, UnknownScript_0x1896c6 - 2call UnknownScript_0x1896b0 + scall UnknownScript_0x1896b0 setevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA - 2jump UnknownScript_0x189680 + jump UnknownScript_0x189680 ; 0x1895f9 UnknownScript_0x1895f9: ; 0x1895f9 - 2writetext UnknownText_0x189a57 + writetext UnknownText_0x189a57 keeptextopen - 2writetext UnknownText_0x189732 + writetext UnknownText_0x189732 yesorno iffalse UnknownScript_0x1896aa - 2call UnknownScript_0x1896a5 + scall UnknownScript_0x1896a5 special $004d iffalse UnknownScript_0x1896aa if_not_equal VULPIX, UnknownScript_0x1896c6 - 2call UnknownScript_0x1896b0 + scall UnknownScript_0x1896b0 setevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA - 2jump UnknownScript_0x189680 + jump UnknownScript_0x189680 ; 0x18961a UnknownScript_0x18961a: ; 0x18961a - 2writetext UnknownText_0x189ab1 + writetext UnknownText_0x189ab1 keeptextopen - 2writetext UnknownText_0x189732 + writetext UnknownText_0x189732 yesorno iffalse UnknownScript_0x1896aa - 2call UnknownScript_0x1896a5 + scall UnknownScript_0x1896a5 special $004d iffalse UnknownScript_0x1896aa if_not_equal PICHU, UnknownScript_0x1896c6 - 2call UnknownScript_0x1896b0 + scall UnknownScript_0x1896b0 setevent EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA - 2jump UnknownScript_0x189697 + jump UnknownScript_0x189697 ; 0x18963b UnknownScript_0x18963b: ; 0x18963b checkevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA iftrue UnknownScript_0x189592 - 2call UnknownScript_0x1896b5 + scall UnknownScript_0x1896b5 verbosegiveitem EVERSTONE, 1 iffalse UnknownScript_0x1896cc setevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA @@ -135,7 +135,7 @@ UnknownScript_0x18963b: ; 0x18963b UnknownScript_0x189652: ; 0x189652 checkevent EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA iftrue UnknownScript_0x1895b3 - 2call UnknownScript_0x1896b5 + scall UnknownScript_0x1896b5 verbosegiveitem LEAF_STONE, 1 iffalse UnknownScript_0x1896cc setevent EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA @@ -147,7 +147,7 @@ UnknownScript_0x189652: ; 0x189652 UnknownScript_0x189669: ; 0x189669 checkevent EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA iftrue UnknownScript_0x1895d4 - 2call UnknownScript_0x1896b5 + scall UnknownScript_0x1896b5 verbosegiveitem WATER_STONE, 1 iffalse UnknownScript_0x1896cc setevent EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA @@ -159,7 +159,7 @@ UnknownScript_0x189669: ; 0x189669 UnknownScript_0x189680: ; 0x189680 checkevent EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA iftrue UnknownScript_0x18961a - 2call UnknownScript_0x1896b5 + scall UnknownScript_0x1896b5 verbosegiveitem FIRE_STONE, 1 iffalse UnknownScript_0x1896cc setevent EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA @@ -169,7 +169,7 @@ UnknownScript_0x189680: ; 0x189680 ; 0x189697 UnknownScript_0x189697: ; 0x189697 - 2call UnknownScript_0x1896b5 + scall UnknownScript_0x1896b5 verbosegiveitem THUNDERSTONE, 1 iffalse UnknownScript_0x1896cc setevent EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA @@ -178,46 +178,46 @@ UnknownScript_0x189697: ; 0x189697 ; 0x1896a5 UnknownScript_0x1896a5: ; 0x1896a5 - 2writetext UnknownText_0x189760 + writetext UnknownText_0x189760 keeptextopen end ; 0x1896aa UnknownScript_0x1896aa: ; 0x1896aa - 2writetext UnknownText_0x189784 + writetext UnknownText_0x189784 closetext loadmovesprites end ; 0x1896b0 UnknownScript_0x1896b0: ; 0x1896b0 - 2writetext UnknownText_0x1897a6 + writetext UnknownText_0x1897a6 keeptextopen end ; 0x1896b5 UnknownScript_0x1896b5: ; 0x1896b5 - 2writetext UnknownText_0x1897e1 + writetext UnknownText_0x1897e1 keeptextopen end ; 0x1896ba UnknownScript_0x1896ba: ; 0x1896ba - 2writetext UnknownText_0x18980e + writetext UnknownText_0x18980e closetext loadmovesprites end ; 0x1896c0 UnknownScript_0x1896c0: ; 0x1896c0 - 2writetext UnknownText_0x18982a + writetext UnknownText_0x18982a closetext loadmovesprites end ; 0x1896c6 UnknownScript_0x1896c6: ; 0x1896c6 - 2writetext UnknownText_0x189891 + writetext UnknownText_0x189891 closetext loadmovesprites end diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index e2a28527d..bac02795d 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -33,21 +33,21 @@ SuperNerdScript_0x1a46e8: ; 0x1a46e8 iftrue UnknownScript_0x1a4702 checkevent EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x1a46fc - 2writetext UnknownText_0x1a477a + writetext UnknownText_0x1a477a closetext loadmovesprites end ; 0x1a46fc UnknownScript_0x1a46fc: ; 0x1a46fc - 2writetext UnknownText_0x1a47f3 + writetext UnknownText_0x1a47f3 closetext loadmovesprites end ; 0x1a4702 UnknownScript_0x1a4702: ; 0x1a4702 - 2writetext UnknownText_0x1a4865 + writetext UnknownText_0x1a4865 closetext loadmovesprites end @@ -66,14 +66,14 @@ BlackBeltScript_0x1a470e: ; 0x1a470e loadfont checkevent EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x1a471c - 2writetext UnknownText_0x1a494a + writetext UnknownText_0x1a494a closetext loadmovesprites end ; 0x1a471c UnknownScript_0x1a471c: ; 0x1a471c - 2writetext UnknownText_0x1a4983 + writetext UnknownText_0x1a4983 closetext loadmovesprites end @@ -100,29 +100,29 @@ SantosScript: if_not_equal SATURDAY, SantosNotSaturdayScript checkevent EVENT_MET_SANTOS_OF_SATURDAY iftrue .MetSantos - 2writetext MeetSantosText + writetext MeetSantosText keeptextopen setevent EVENT_MET_SANTOS_OF_SATURDAY .MetSantos - 2writetext SantosGivesGiftText + writetext SantosGivesGiftText keeptextopen verbosegiveitem SPELL_TAG, 1 iffalse SantosDoneScript setevent EVENT_GOT_SPELL_TAG_FROM_SANTOS - 2writetext SantosGaveGiftText + writetext SantosGaveGiftText closetext loadmovesprites end SantosSaturdayScript: - 2writetext SantosSaturdayText + writetext SantosSaturdayText closetext SantosDoneScript: loadmovesprites end SantosNotSaturdayScript: - 2writetext SantosNotSaturdayText + writetext SantosNotSaturdayText closetext loadmovesprites end diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm index 9630529a0..2b6047b2f 100644 --- a/maps/BlackthornDragonSpeechHouse.asm +++ b/maps/BlackthornDragonSpeechHouse.asm @@ -12,7 +12,7 @@ GrannyScript_0x195949: ; 0x195949 EkansScript_0x19594c: ; 0x19594c loadfont - 2writetext UnknownText_0x1959ee + writetext UnknownText_0x1959ee cry DRATINI closetext loadmovesprites diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index f10f1f2f3..b3f9e61fc 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -33,7 +33,7 @@ ClairScript_0x194e24: ; 0x194e24 iftrue UnknownScript_0x194e69 checkevent EVENT_BEAT_CLAIR iftrue UnknownScript_0x194e63 - 2writetext UnknownText_0x194efa + writetext UnknownText_0x194efa closetext loadmovesprites winlosstext UnknownText_0x194fd6, $0000 @@ -42,7 +42,7 @@ ClairScript_0x194e24: ; 0x194e24 returnafterbattle setevent EVENT_BEAT_CLAIR loadfont - 2writetext UnknownText_0x19500e + writetext UnknownText_0x19500e closetext loadmovesprites setevent EVENT_BEAT_COOLTRAINERM_PAUL @@ -57,7 +57,7 @@ ClairScript_0x194e24: ; 0x194e24 ; 0x194e63 UnknownScript_0x194e63: ; 0x194e63 - 2writetext UnknownText_0x195162 + writetext UnknownText_0x195162 closetext loadmovesprites end @@ -66,30 +66,30 @@ UnknownScript_0x194e63: ; 0x194e63 UnknownScript_0x194e69: ; 0x194e69 checkevent EVENT_GOT_TM24_DRAGONBREATH iftrue UnknownScript_0x194e94 - 2writetext UnknownText_0x195196 + writetext UnknownText_0x195196 keeptextopen giveitem TM_24, $1 iffalse UnknownScript_0x194e8e itemtotext TM_24, $0 - 2writetext UnknownText_0x1951bf + writetext UnknownText_0x1951bf playsound SFX_ITEM waitbutton itemnotify setevent EVENT_GOT_TM24_DRAGONBREATH - 2writetext UnknownText_0x1951d1 + writetext UnknownText_0x1951d1 keeptextopen - 2jump UnknownScript_0x194e94 + jump UnknownScript_0x194e94 ; 0x194e8e UnknownScript_0x194e8e: ; 0x194e8e - 2writetext UnknownText_0x19524f + writetext UnknownText_0x19524f closetext loadmovesprites end ; 0x194e94 UnknownScript_0x194e94: ; 0x194e94 - 2writetext UnknownText_0x195272 + writetext UnknownText_0x195272 closetext loadmovesprites end @@ -118,7 +118,7 @@ TrainerCooltrainermPaul: ; 0x194e9a CooltrainermPaulScript: ; 0x194ea6 talkaftercancel loadfont - 2writetext UnknownText_0x1953f1 + writetext UnknownText_0x1953f1 closetext loadmovesprites end @@ -147,7 +147,7 @@ TrainerCooltrainermMike: ; 0x194eae CooltrainermMikeScript: ; 0x194eba talkaftercancel loadfont - 2writetext UnknownText_0x195467 + writetext UnknownText_0x195467 closetext loadmovesprites end @@ -176,7 +176,7 @@ TrainerCooltrainerfLola: ; 0x194ec2 CooltrainerfLolaScript: ; 0x194ece talkaftercancel loadfont - 2writetext UnknownText_0x195516 + writetext UnknownText_0x195516 closetext loadmovesprites end @@ -187,13 +187,13 @@ BlackthornGymGuyScript: ; 0x194ed6 loadfont checkevent EVENT_BEAT_CLAIR iftrue .BlackthornGymGuyWinScript - 2writetext BlackthornGymGuyText + writetext BlackthornGymGuyText closetext loadmovesprites end .BlackthornGymGuyWinScript - 2writetext BlackthornGymGuyWinText + writetext BlackthornGymGuyWinText closetext loadmovesprites end diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index a941e9c6a..77618b808 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -35,24 +35,24 @@ StoneTable_0x195730: ; 0x195730 UnknownScript_0x19573d: ; 0x19573d disappear 4 - 2jump UnknownScript_0x19574c + jump UnknownScript_0x19574c ; 0x195742 UnknownScript_0x195742: ; 0x195742 disappear 5 - 2jump UnknownScript_0x19574c + jump UnknownScript_0x19574c ; 0x195747 UnknownScript_0x195747: ; 0x195747 disappear 6 - 2jump UnknownScript_0x19574c + jump UnknownScript_0x19574c ; 0x19574c UnknownScript_0x19574c: ; 0x19574c pause 30 - 2call UnknownScript_0x195758 + scall UnknownScript_0x195758 loadfont - 2writetext UnknownText_0x1958a5 + writetext UnknownText_0x1958a5 closetext loadmovesprites end @@ -92,7 +92,7 @@ TrainerCooltrainermCody: ; 0x195761 CooltrainermCodyScript: ; 0x19576d talkaftercancel loadfont - 2writetext UnknownText_0x1957d5 + writetext UnknownText_0x1957d5 closetext loadmovesprites end @@ -121,7 +121,7 @@ TrainerCooltrainerfFran: ; 0x195775 CooltrainerfFranScript: ; 0x195781 talkaftercancel loadfont - 2writetext UnknownText_0x195883 + writetext UnknownText_0x195883 closetext loadmovesprites end diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index dee311fdf..3d64d322c 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -11,7 +11,7 @@ DaisyScript_0x19b0d0: ; 0x19b0d0 loadfont checkcode $a if_equal $f, UnknownScript_0x19b0de - 2writetext UnknownText_0x19b130 + writetext UnknownText_0x19b130 closetext loadmovesprites end @@ -20,16 +20,16 @@ DaisyScript_0x19b0d0: ; 0x19b0d0 UnknownScript_0x19b0de: ; 0x19b0de checkflag $005c iftrue UnknownScript_0x19b11e - 2writetext UnknownText_0x19b1b6 + writetext UnknownText_0x19b1b6 yesorno iffalse UnknownScript_0x19b124 - 2writetext UnknownText_0x19b244 + writetext UnknownText_0x19b244 closetext special $0063 if_equal $0, UnknownScript_0x19b124 if_equal $1, UnknownScript_0x19b12a setflag $005c - 2writetext UnknownText_0x19b266 + writetext UnknownText_0x19b266 closetext loadmovesprites special $002e @@ -38,31 +38,31 @@ UnknownScript_0x19b0de: ; 0x19b0de special $0031 special $003d loadfont - 2writetext UnknownText_0x19b296 + writetext UnknownText_0x19b296 special $0064 keeptextopen - 2writetext UnknownText_0x19b2aa + writetext UnknownText_0x19b2aa closetext loadmovesprites end ; 0x19b11e UnknownScript_0x19b11e: ; 0x19b11e - 2writetext UnknownText_0x19b2fa + writetext UnknownText_0x19b2fa closetext loadmovesprites end ; 0x19b124 UnknownScript_0x19b124: ; 0x19b124 - 2writetext UnknownText_0x19b334 + writetext UnknownText_0x19b334 closetext loadmovesprites end ; 0x19b12a UnknownScript_0x19b12a: ; 0x19b12a - 2writetext UnknownText_0x19b377 + writetext UnknownText_0x19b377 closetext loadmovesprites end diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index a3ef29365..9101547f0 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -54,7 +54,7 @@ BrunoScript_0x1809c5: ; 0x1809c5 loadfont checkevent $05ba iftrue UnknownScript_0x1809f3 - 2writetext UnknownText_0x1809fe + writetext UnknownText_0x1809fe closetext loadmovesprites winlosstext UnknownText_0x180b23, $0000 @@ -63,7 +63,7 @@ BrunoScript_0x1809c5: ; 0x1809c5 returnafterbattle setevent $05ba loadfont - 2writetext UnknownText_0x180b3c + writetext UnknownText_0x180b3c closetext loadmovesprites playsound SFX_ENTER_DOOR @@ -76,7 +76,7 @@ BrunoScript_0x1809c5: ; 0x1809c5 ; 0x1809f3 UnknownScript_0x1809f3: ; 0x1809f3 - 2writetext UnknownText_0x180b3c + writetext UnknownText_0x180b3c closetext loadmovesprites end diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index 34346b3d3..50325c41d 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -45,7 +45,7 @@ UnknownScript_0x185c0d: ; 0x185c0d showemote $0, $3, 15 applymovement $3, MovementData_0x185cd3 loadfont - 2writetext UnknownText_0x185ecc + writetext UnknownText_0x185ecc closetext loadmovesprites moveperson $3, $9, $e @@ -63,7 +63,7 @@ UnknownScript_0x185c25: ; 0x185c25 applymovement $4, MovementData_0x185ccf playmusic MUSIC_RIVAL_ENCOUNTER loadfont - 2writetext UnknownText_0x185cd9 + writetext UnknownText_0x185cd9 closetext loadmovesprites checkevent EVENT_GOT_TOTODILE_FROM_ELM @@ -76,7 +76,7 @@ UnknownScript_0x185c25: ; 0x185c25 startbattle reloadmapmusic returnafterbattle - 2jump UnknownScript_0x185c80 + jump UnknownScript_0x185c80 ; 0x185c60 UnknownScript_0x185c60: ; 0x185c60 @@ -86,7 +86,7 @@ UnknownScript_0x185c60: ; 0x185c60 startbattle reloadmapmusic returnafterbattle - 2jump UnknownScript_0x185c80 + jump UnknownScript_0x185c80 ; 0x185c70 UnknownScript_0x185c70: ; 0x185c70 @@ -96,13 +96,13 @@ UnknownScript_0x185c70: ; 0x185c70 startbattle reloadmapmusic returnafterbattle - 2jump UnknownScript_0x185c80 + jump UnknownScript_0x185c80 ; 0x185c80 UnknownScript_0x185c80: ; 0x185c80 playmusic MUSIC_RIVAL_AFTER loadfont - 2writetext UnknownText_0x185de2 + writetext UnknownText_0x185de2 closetext loadmovesprites dotrigger $2 @@ -120,7 +120,7 @@ UnknownScript_0x185c80: ; 0x185c80 playsound SFX_KINESIS showemote $0, $4, 20 loadfont - 2writetext UnknownText_0x185e75 + writetext UnknownText_0x185e75 closetext loadmovesprites setevent $0332 diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 686996354..026d494a6 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -101,13 +101,13 @@ UnknownScript_0x18616b: ; 0x18616b SuperNerdScript_0x186212: ; 0x186212 faceplayer loadfont - 2writetext UnknownText_0x18626a + writetext UnknownText_0x18626a closetext loadmovesprites checkcode $9 if_equal $1, UnknownScript_0x186226 applymovement $a, MovementData_0x186263 - 2jump UnknownScript_0x18622a + jump UnknownScript_0x18622a ; 0x186226 UnknownScript_0x186226: ; 0x186226 diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index 50a9a6376..3c30e8df5 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -9,7 +9,7 @@ CeladonCafe_MapScriptHeader: ; 0x73047 SuperNerdScript_0x73049: ; 0x73049 faceplayer loadfont - 2writetext UnknownText_0x730de + writetext UnknownText_0x730de closetext loadmovesprites end @@ -17,12 +17,12 @@ SuperNerdScript_0x73049: ; 0x73049 FisherScript_0x73051: ; 0x73051 loadfont - 2writetext UnknownText_0x73129 + writetext UnknownText_0x73129 closetext loadmovesprites faceplayer loadfont - 2writetext UnknownText_0x7313a + writetext UnknownText_0x7313a closetext loadmovesprites spriteface $3, $2 @@ -31,12 +31,12 @@ FisherScript_0x73051: ; 0x73051 FisherScript_0x73062: ; 0x73062 loadfont - 2writetext UnknownText_0x7316a + writetext UnknownText_0x7316a closetext loadmovesprites faceplayer loadfont - 2writetext UnknownText_0x73178 + writetext UnknownText_0x73178 closetext loadmovesprites spriteface $4, $3 @@ -45,12 +45,12 @@ FisherScript_0x73062: ; 0x73062 FisherScript_0x73073: ; 0x73073 loadfont - 2writetext UnknownText_0x731ae + writetext UnknownText_0x731ae closetext loadmovesprites faceplayer loadfont - 2writetext UnknownText_0x731bd + writetext UnknownText_0x731bd closetext loadmovesprites spriteface $5, $3 @@ -61,12 +61,12 @@ TeacherScript_0x73084: ; 0x73084 checkitem COIN_CASE iftrue UnknownScript_0x7309a loadfont - 2writetext UnknownText_0x73201 + writetext UnknownText_0x73201 closetext loadmovesprites faceplayer loadfont - 2writetext UnknownText_0x73212 + writetext UnknownText_0x73212 closetext loadmovesprites spriteface $6, $2 @@ -75,12 +75,12 @@ TeacherScript_0x73084: ; 0x73084 UnknownScript_0x7309a: ; 0x7309a loadfont - 2writetext UnknownText_0x73254 + writetext UnknownText_0x73254 closetext loadmovesprites spriteface $6, $3 loadfont - 2writetext UnknownText_0x73278 + writetext UnknownText_0x73278 closetext loadmovesprites spriteface $6, $2 @@ -98,7 +98,7 @@ MapCeladonCafeSignpost1Script: ; 0x730b0 iffalse UnknownScript_0x730cd loadfont itemtotext LEFTOVERS, $0 - 2writetext UnknownText_0x732e7 + writetext UnknownText_0x732e7 playsound SFX_ITEM waitbutton itemnotify @@ -110,9 +110,9 @@ MapCeladonCafeSignpost1Script: ; 0x730b0 UnknownScript_0x730cd: ; 0x730cd loadfont itemtotext LEFTOVERS, $0 - 2writetext UnknownText_0x732e7 + writetext UnknownText_0x732e7 keeptextopen - 2writetext UnknownText_0x732f7 + writetext UnknownText_0x732f7 closetext loadmovesprites end diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index 3096e1d71..27623e8ea 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -21,7 +21,7 @@ FisherScript_0x1a9f43: ; 0x1a9f43 PoliwagScript_0x1a9f46: ; 0x1a9f46 loadfont - 2writetext UnknownText_0x1a9fcb + writetext UnknownText_0x1a9fcb cry POLIWRATH closetext loadmovesprites diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm index 2320b5847..be4a3b5bf 100644 --- a/maps/CeladonDeptStore3F.asm +++ b/maps/CeladonDeptStore3F.asm @@ -21,7 +21,7 @@ YoungsterScript_0x70d31: ; 0x70d31 GameboyKidScript_0x70d34: ; 0x70d34 faceplayer loadfont - 2writetext UnknownText_0x70d86 + writetext UnknownText_0x70d86 closetext loadmovesprites spriteface $4, $0 @@ -31,7 +31,7 @@ GameboyKidScript_0x70d34: ; 0x70d34 GameboyKidScript_0x70d3f: ; 0x70d3f faceplayer loadfont - 2writetext UnknownText_0x70dc7 + writetext UnknownText_0x70dc7 closetext loadmovesprites spriteface $5, $0 diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index e1625c26c..ad817566d 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -25,7 +25,7 @@ YoungsterScript_0x7117d: ; 0x7117d MapCeladonDeptStore6FSignpost5Script: ; 0x71180 loadfont - 2writetext UnknownText_0x71250 + writetext UnknownText_0x71250 UnknownScript_0x71184: ; 0x71184 special $0051 loadmenudata MenuDataHeader_0x71203 @@ -45,7 +45,7 @@ UnknownScript_0x7119a: ; 0x7119a iffalse UnknownScript_0x711fc takemoney $0, 200 itemtotext FRESH_WATER, $0 - 2jump UnknownScript_0x711e8 + jump UnknownScript_0x711e8 ; 0x711b4 UnknownScript_0x711b4: ; 0x711b4 @@ -55,7 +55,7 @@ UnknownScript_0x711b4: ; 0x711b4 iffalse UnknownScript_0x711fc takemoney $0, 300 itemtotext SODA_POP, $0 - 2jump UnknownScript_0x711e8 + jump UnknownScript_0x711e8 ; 0x711ce UnknownScript_0x711ce: ; 0x711ce @@ -65,28 +65,28 @@ UnknownScript_0x711ce: ; 0x711ce iffalse UnknownScript_0x711fc takemoney $0, 350 itemtotext LEMONADE, $0 - 2jump UnknownScript_0x711e8 + jump UnknownScript_0x711e8 ; 0x711e8 UnknownScript_0x711e8: ; 0x711e8 pause 10 playsound SFX_ENTER_DOOR - 2writetext UnknownText_0x71274 + writetext UnknownText_0x71274 keeptextopen itemnotify - 2jump UnknownScript_0x71184 + jump UnknownScript_0x71184 ; 0x711f5 UnknownScript_0x711f5: ; 0x711f5 - 2writetext UnknownText_0x7128e + writetext UnknownText_0x7128e closetext - 2jump UnknownScript_0x71184 + jump UnknownScript_0x71184 ; 0x711fc UnknownScript_0x711fc: ; 0x711fc - 2writetext UnknownText_0x712a7 + writetext UnknownText_0x712a7 closetext - 2jump UnknownScript_0x71184 + jump UnknownScript_0x71184 ; 0x71203 diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index a9c4be559..a490e2c2a 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -17,7 +17,7 @@ ReceptionistScript_0x72120: ; 0x72120 PokefanMScript_0x72123: ; 0x72123 faceplayer loadfont - 2writetext UnknownText_0x72215 + writetext UnknownText_0x72215 closetext loadmovesprites spriteface $4, $2 @@ -27,7 +27,7 @@ PokefanMScript_0x72123: ; 0x72123 TeacherScript_0x7212e: ; 0x7212e faceplayer loadfont - 2writetext UnknownText_0x72242 + writetext UnknownText_0x72242 closetext loadmovesprites spriteface $5, $3 @@ -37,7 +37,7 @@ TeacherScript_0x7212e: ; 0x7212e FishingGuruScript_0x72139: ; 0x72139 faceplayer loadfont - 2writetext UnknownText_0x72295 + writetext UnknownText_0x72295 closetext loadmovesprites spriteface $6, $3 @@ -49,18 +49,18 @@ FisherScript_0x72144: ; 0x72144 loadfont checkevent EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON iftrue .UnknownScript_0x72169 - 2writetext UnknownText_0x722dc + writetext UnknownText_0x722dc keeptextopen checkitem COIN_CASE iffalse UnknownScript_0x7217b checkcoins 9998 if_equal $0, UnknownScript_0x72184 stringtotext .coinname, $1 - 2call .UnknownScript_0x72172 + scall .UnknownScript_0x72172 givecoins 18 setevent EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON .UnknownScript_0x72169 ; 0x72169 - 2writetext UnknownText_0x72345 + writetext UnknownText_0x72345 closetext loadmovesprites spriteface $fe, $2 @@ -77,7 +77,7 @@ FisherScript_0x72144: ; 0x72144 ; 0x7217b UnknownScript_0x7217b: ; 0x7217b - 2writetext UnknownText_0x7238a + writetext UnknownText_0x7238a closetext loadmovesprites spriteface $fe, $2 @@ -85,7 +85,7 @@ UnknownScript_0x7217b: ; 0x7217b ; 0x72184 UnknownScript_0x72184: ; 0x72184 - 2writetext UnknownText_0x723d9 + writetext UnknownText_0x723d9 closetext loadmovesprites spriteface $fe, $2 @@ -99,7 +99,7 @@ CeladonGymGuyScript: ; 0x7218d GrampsScript_0x72190: ; 0x72190 faceplayer loadfont - 2writetext UnknownText_0x724ad + writetext UnknownText_0x724ad closetext loadmovesprites spriteface $a, $2 @@ -145,7 +145,7 @@ MapCeladonGameCornerSignpost32Script: ; 0x721c0 MapCeladonGameCornerSignpost9Script: ; 0x721c3 loadfont - 2writetext UnknownText_0x72567 + writetext UnknownText_0x72567 closetext special $002b loadmovesprites diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index 25a8162fa..ac84d1931 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -17,11 +17,11 @@ PharmacistScript_0x726ec: ; 0x726ec MapCeladonGameCornerPrizeRoomSignpost0Script: ; 0x726ef faceplayer loadfont - 2writetext UnknownText_0x7293e + writetext UnknownText_0x7293e closetext checkitem COIN_CASE iffalse UnknownScript_0x7278a - 2writetext UnknownText_0x72974 + writetext UnknownText_0x72974 UnknownScript_0x726fd: ; 0x726fd special $004f loadmenudata MenuDataHeader_0x72790 @@ -30,47 +30,47 @@ UnknownScript_0x726fd: ; 0x726fd if_equal $1, UnknownScript_0x72714 if_equal $2, UnknownScript_0x72730 if_equal $3, UnknownScript_0x7274c - 2jump UnknownScript_0x72784 + jump UnknownScript_0x72784 ; 0x72714 UnknownScript_0x72714: ; 0x72714 checkcoins 1500 if_equal $2, UnknownScript_0x72778 itemtotext TM_32, $0 - 2call UnknownScript_0x72768 + scall UnknownScript_0x72768 iffalse UnknownScript_0x72784 giveitem TM_32, $1 iffalse UnknownScript_0x7277e takecoins 1500 - 2jump UnknownScript_0x7276d + jump UnknownScript_0x7276d ; 0x72730 UnknownScript_0x72730: ; 0x72730 checkcoins 3500 if_equal $2, UnknownScript_0x72778 itemtotext TM_29, $0 - 2call UnknownScript_0x72768 + scall UnknownScript_0x72768 iffalse UnknownScript_0x72784 giveitem TM_29, $1 iffalse UnknownScript_0x7277e takecoins 3500 - 2jump UnknownScript_0x7276d + jump UnknownScript_0x7276d ; 0x7274c UnknownScript_0x7274c: ; 0x7274c checkcoins 7500 if_equal $2, UnknownScript_0x72778 itemtotext TM_15, $0 - 2call UnknownScript_0x72768 + scall UnknownScript_0x72768 iffalse UnknownScript_0x72784 giveitem TM_15, $1 iffalse UnknownScript_0x7277e takecoins 7500 - 2jump UnknownScript_0x7276d + jump UnknownScript_0x7276d ; 0x72768 UnknownScript_0x72768: ; 0x72768 - 2writetext UnknownText_0x72991 + writetext UnknownText_0x72991 yesorno end ; 0x7276d @@ -78,34 +78,34 @@ UnknownScript_0x72768: ; 0x72768 UnknownScript_0x7276d: ; 0x7276d waitbutton playsound SFX_TRANSACTION - 2writetext UnknownText_0x729ad + writetext UnknownText_0x729ad closetext - 2jump UnknownScript_0x726fd + jump UnknownScript_0x726fd ; 0x72778 UnknownScript_0x72778: ; 0x72778 - 2writetext UnknownText_0x729bb + writetext UnknownText_0x729bb closetext loadmovesprites end ; 0x7277e UnknownScript_0x7277e: ; 0x7277e - 2writetext UnknownText_0x729d8 + writetext UnknownText_0x729d8 closetext loadmovesprites end ; 0x72784 UnknownScript_0x72784: ; 0x72784 - 2writetext UnknownText_0x729f2 + writetext UnknownText_0x729f2 closetext loadmovesprites end ; 0x7278a UnknownScript_0x7278a: ; 0x7278a - 2writetext UnknownText_0x72a14 + writetext UnknownText_0x72a14 closetext loadmovesprites end @@ -133,12 +133,12 @@ MenuData2_0x72798: ; 0x72798 MapCeladonGameCornerPrizeRoomSignpost1Script: ; 0x727c8 faceplayer loadfont - 2writetext UnknownText_0x7293e + writetext UnknownText_0x7293e closetext checkitem COIN_CASE iffalse UnknownScript_0x7278a UnknownScript_0x727d3: ; 0x727d3 - 2writetext UnknownText_0x72974 + writetext UnknownText_0x72974 special $004f loadmenudata MenuDataHeader_0x72877 interpretmenu2 @@ -146,7 +146,7 @@ UnknownScript_0x727d3: ; 0x727d3 if_equal $1, UnknownScript_0x727ed if_equal $2, UnknownScript_0x7281b if_equal $3, UnknownScript_0x72849 - 2jump UnknownScript_0x72784 + jump UnknownScript_0x72784 ; 0x727ed UnknownScript_0x727ed: ; 0x727ed @@ -155,17 +155,17 @@ UnknownScript_0x727ed: ; 0x727ed checkcode $1 if_equal $6, UnknownScript_0x7277e pokenamemem PIKACHU, $0 - 2call UnknownScript_0x72768 + scall UnknownScript_0x72768 iffalse UnknownScript_0x72784 waitbutton playsound SFX_TRANSACTION - 2writetext UnknownText_0x729ad + writetext UnknownText_0x729ad closetext writebyte PIKACHU special $0039 givepoke PIKACHU, 25, 0, 0 takecoins 2222 - 2jump UnknownScript_0x727d3 + jump UnknownScript_0x727d3 ; 0x7281b UnknownScript_0x7281b: ; 0x7281b @@ -174,17 +174,17 @@ UnknownScript_0x7281b: ; 0x7281b checkcode $1 if_equal $6, UnknownScript_0x7277e pokenamemem PORYGON, $0 - 2call UnknownScript_0x72768 + scall UnknownScript_0x72768 iffalse UnknownScript_0x72784 waitbutton playsound SFX_TRANSACTION - 2writetext UnknownText_0x729ad + writetext UnknownText_0x729ad closetext writebyte PORYGON special $0039 givepoke PORYGON, 15, 0, 0 takecoins 5555 - 2jump UnknownScript_0x727d3 + jump UnknownScript_0x727d3 ; 0x72849 UnknownScript_0x72849: ; 0x72849 @@ -193,17 +193,17 @@ UnknownScript_0x72849: ; 0x72849 checkcode $1 if_equal $6, UnknownScript_0x7277e pokenamemem LARVITAR, $0 - 2call UnknownScript_0x72768 + scall UnknownScript_0x72768 iffalse UnknownScript_0x72784 waitbutton playsound SFX_TRANSACTION - 2writetext UnknownText_0x729ad + writetext UnknownText_0x729ad closetext writebyte LARVITAR special $0039 givepoke LARVITAR, 40, 0, 0 takecoins 8888 - 2jump UnknownScript_0x727d3 + jump UnknownScript_0x727d3 ; 0x72877 diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 34ccccc83..0c1456fdc 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -11,7 +11,7 @@ ErikaScript_0x72a6a: ; 0x72a6a loadfont checkflag $0026 iftrue UnknownScript_0x72a9b - 2writetext UnknownText_0x72b28 + writetext UnknownText_0x72b28 closetext loadmovesprites winlosstext UnknownText_0x72c3e, $0000 @@ -24,20 +24,20 @@ ErikaScript_0x72a6a: ; 0x72a6a setevent EVENT_BEAT_BEAUTY_JULIA setevent EVENT_BEAT_TWINS_JO_AND_ZOE loadfont - 2writetext UnknownText_0x72c96 + writetext UnknownText_0x72c96 playsound SFX_GET_BADGE waitbutton setflag $0026 UnknownScript_0x72a9b: ; 0x72a9b checkevent EVENT_GOT_TM19_GIGA_DRAIN iftrue UnknownScript_0x72aae - 2writetext UnknownText_0x72cb0 + writetext UnknownText_0x72cb0 keeptextopen verbosegiveitem TM_19, 1 iffalse UnknownScript_0x72aae setevent EVENT_GOT_TM19_GIGA_DRAIN UnknownScript_0x72aae: ; 0x72aae - 2writetext UnknownText_0x72d8f + writetext UnknownText_0x72d8f closetext loadmovesprites end @@ -66,7 +66,7 @@ TrainerLassMichelle: ; 0x72ab4 LassMichelleScript: ; 0x72ac0 talkaftercancel loadfont - 2writetext UnknownText_0x72e30 + writetext UnknownText_0x72e30 closetext loadmovesprites end @@ -95,7 +95,7 @@ TrainerPicnickerTanya: ; 0x72ac8 PicnickerTanyaScript: ; 0x72ad4 talkaftercancel loadfont - 2writetext UnknownText_0x72e8e + writetext UnknownText_0x72e8e closetext loadmovesprites end @@ -124,7 +124,7 @@ TrainerBeautyJulia: ; 0x72adc BeautyJuliaScript: ; 0x72ae8 talkaftercancel loadfont - 2writetext UnknownText_0x72f01 + writetext UnknownText_0x72f01 closetext loadmovesprites end @@ -153,7 +153,7 @@ TrainerTwinsJoandzoe1: ; 0x72af0 TwinsJoandzoe1Script: ; 0x72afc talkaftercancel loadfont - 2writetext UnknownText_0x72f70 + writetext UnknownText_0x72f70 closetext loadmovesprites end @@ -182,7 +182,7 @@ TrainerTwinsJoandzoe2: ; 0x72b04 TwinsJoandzoe2Script: ; 0x72b10 talkaftercancel loadfont - 2writetext UnknownText_0x72fc0 + writetext UnknownText_0x72fc0 closetext loadmovesprites end diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm index ee4871ce5..6f529443d 100644 --- a/maps/CeladonMansion1F.asm +++ b/maps/CeladonMansion1F.asm @@ -12,7 +12,7 @@ GrannyScript_0x713ef: ; 0x713ef GrowlitheScript_0x713f2: ; 0x713f2 loadfont - 2writetext UnknownText_0x71470 + writetext UnknownText_0x71470 cry MEOWTH closetext loadmovesprites @@ -21,7 +21,7 @@ GrowlitheScript_0x713f2: ; 0x713f2 ClefairyScript_0x713fc: ; 0x713fc loadfont - 2writetext UnknownText_0x7147f + writetext UnknownText_0x7147f cry CLEFAIRY closetext loadmovesprites @@ -30,7 +30,7 @@ ClefairyScript_0x713fc: ; 0x713fc GrowlitheScript_0x71406: ; 0x71406 loadfont - 2writetext UnknownText_0x71496 + writetext UnknownText_0x71496 cry NIDORAN_F closetext loadmovesprites diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm index 95f44697f..763e2bd3b 100644 --- a/maps/CeladonMansion3F.asm +++ b/maps/CeladonMansion3F.asm @@ -9,7 +9,7 @@ CeladonMansion3F_MapScriptHeader: ; 0x7166e CooltrainerMScript_0x71670: ; 0x71670 faceplayer loadfont - 2writetext UnknownText_0x716ce + writetext UnknownText_0x716ce checkcode $5 if_greater_than $f8, UnknownScript_0x7167e closetext @@ -19,13 +19,13 @@ CooltrainerMScript_0x71670: ; 0x71670 UnknownScript_0x7167e: ; 0x7167e keeptextopen - 2writetext UnknownText_0x71725 + writetext UnknownText_0x71725 playsound SFX_DEX_FANFARE_230_PLUS waitbutton - 2writetext UnknownText_0x71760 + writetext UnknownText_0x71760 keeptextopen special $006b - 2writetext UnknownText_0x71763 + writetext UnknownText_0x71763 closetext loadmovesprites setevent EVENT_ENABLE_DIPLOMA_PRINTING @@ -37,14 +37,14 @@ GymGuyScript_0x71696: ; 0x71696 loadfont checkevent EVENT_ENABLE_DIPLOMA_PRINTING iftrue UnknownScript_0x716a4 - 2writetext UnknownText_0x717b4 + writetext UnknownText_0x717b4 closetext loadmovesprites end ; 0x716a4 UnknownScript_0x716a4: ; 0x716a4 - 2writetext UnknownText_0x717d8 + writetext UnknownText_0x717d8 yesorno iffalse UnknownScript_0x716b0 special $006c @@ -53,14 +53,14 @@ UnknownScript_0x716a4: ; 0x716a4 ; 0x716b0 UnknownScript_0x716b0: ; 0x716b0 - 2writetext UnknownText_0x71830 + writetext UnknownText_0x71830 closetext loadmovesprites end ; 0x716b6 UnknownScript_0x716b6: ; 0x716b6 - 2writetext UnknownText_0x71863 + writetext UnknownText_0x71863 closetext loadmovesprites end diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm index 9db66389c..5408a3c2a 100644 --- a/maps/CeladonMansionRoofHouse.asm +++ b/maps/CeladonMansionRoofHouse.asm @@ -11,24 +11,24 @@ PharmacistScript_0x71afd: ; 0x71afd loadfont checkevent EVENT_GOT_TM03_CURSE iftrue UnknownScript_0x71b21 - 2writetext UnknownText_0x71b27 + writetext UnknownText_0x71b27 keeptextopen checktime $4 iftrue UnknownScript_0x71b14 - 2writetext UnknownText_0x71b4a + writetext UnknownText_0x71b4a closetext loadmovesprites end ; 0x71b14 UnknownScript_0x71b14: ; 0x71b14 - 2writetext UnknownText_0x71ba3 + writetext UnknownText_0x71ba3 keeptextopen verbosegiveitem TM_03, 1 iffalse UnknownScript_0x71b25 setevent EVENT_GOT_TM03_CURSE UnknownScript_0x71b21: ; 0x71b21 - 2writetext UnknownText_0x71db3 + writetext UnknownText_0x71db3 closetext UnknownScript_0x71b25: ; 0x71b25 loadmovesprites diff --git a/maps/CeladonPokeCenter1F.asm b/maps/CeladonPokeCenter1F.asm index ff964082d..82810b6f5 100644 --- a/maps/CeladonPokeCenter1F.asm +++ b/maps/CeladonPokeCenter1F.asm @@ -25,14 +25,14 @@ PharmacistScript_0x71e2b: ; 0x71e2b SuperNerdScript_0x71e2e: ; 0x71e2e faceplayer loadfont - 2writetext UnknownText_0x71f22 + writetext UnknownText_0x71f22 keeptextopen writebyte SUICUNE special $0097 iffalse UnknownScript_0x71e46 special $0096 iftrue UnknownScript_0x71e48 - 2writetext UnknownText_0x7201a + writetext UnknownText_0x7201a closetext UnknownScript_0x71e46: ; 0x71e46 loadmovesprites @@ -40,13 +40,13 @@ UnknownScript_0x71e46: ; 0x71e46 ; 0x71e48 UnknownScript_0x71e48: ; 0x71e48 - 2writetext UnknownText_0x71f65 + writetext UnknownText_0x71f65 closetext loadmovesprites checkcode $9 if_equal $1, UnknownScript_0x71e5a applymovement $6, MovementData_0x71e6b - 2jump UnknownScript_0x71e5e + jump UnknownScript_0x71e5e ; 0x71e5a UnknownScript_0x71e5a: ; 0x71e5a diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index 374a57679..23f3cbfca 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -20,14 +20,14 @@ CooltrainerMScript_0x184009: ; 0x184009 loadfont checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x184017 - 2writetext UnknownText_0x1840bc + writetext UnknownText_0x1840bc closetext loadmovesprites end ; 0x184017 UnknownScript_0x184017: ; 0x184017 - 2writetext UnknownText_0x184144 + writetext UnknownText_0x184144 closetext loadmovesprites end @@ -39,7 +39,7 @@ SuperNerdScript_0x18401d: ; 0x18401d SlowpokeScript_0x184020: ; 0x184020 loadfont - 2writetext UnknownText_0x1841e9 + writetext UnknownText_0x1841e9 cry SLOWBRO closetext loadmovesprites @@ -49,21 +49,21 @@ SlowpokeScript_0x184020: ; 0x184020 CooltrainerFScript_0x18402a: ; 0x18402a faceplayer loadfont - 2writetext UnknownText_0x1841fa + writetext UnknownText_0x1841fa closetext loadmovesprites spriteface $5, $2 loadfont - 2writetext UnknownText_0x184229 + writetext UnknownText_0x184229 closetext loadmovesprites loadfont - 2writetext UnknownText_0x1841e9 + writetext UnknownText_0x1841e9 cry SLOWBRO closetext loadmovesprites loadfont - 2writetext UnknownText_0x18424b + writetext UnknownText_0x18424b closetext loadmovesprites end @@ -77,14 +77,14 @@ FisherScript_0x18404a: ; 0x18404a checkevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM iftrue UnknownScript_0x18405e UnknownScript_0x184058: ; 0x184058 - 2writetext UnknownText_0x18424e + writetext UnknownText_0x18424e closetext loadmovesprites end ; 0x18405e UnknownScript_0x18405e: ; 0x18405e - 2writetext UnknownText_0x184275 + writetext UnknownText_0x184275 closetext loadmovesprites end @@ -93,7 +93,7 @@ UnknownScript_0x18405e: ; 0x18405e YoungsterScript_0x184064: ; 0x184064 faceplayer loadfont - 2writetext UnknownText_0x1842a9 + writetext UnknownText_0x1842a9 closetext loadmovesprites checkevent $00fa @@ -122,7 +122,7 @@ UnknownScript_0x184072: ; 0x184072 showemote $0, $7, 15 spriteface $7, $2 loadfont - 2writetext UnknownText_0x1842ee + writetext UnknownText_0x1842ee closetext loadmovesprites end diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index d1f2ddb5f..41729d9cc 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -25,18 +25,18 @@ UnknownScript_0x1883de: ; 0x1883de applymovement $2, MovementData_0x1884eb playmusic MUSIC_ROCKET_ENCOUNTER loadfont - 2writetext UnknownText_0x1884fb + writetext UnknownText_0x1884fb closetext loadmovesprites showemote $0, $2, 15 applymovement $2, MovementData_0x1884f7 loadfont - 2writetext UnknownText_0x188574 + writetext UnknownText_0x188574 closetext loadmovesprites applymovement $2, MovementData_0x1884f5 loadfont - 2writetext UnknownText_0x1885a5 + writetext UnknownText_0x1885a5 closetext loadmovesprites applymovement $2, MovementData_0x1884e8 @@ -61,7 +61,7 @@ MistyScript_0x188432: ; 0x188432 loadfont checkflag $0024 iftrue UnknownScript_0x188460 - 2writetext UnknownText_0x188674 + writetext UnknownText_0x188674 closetext loadmovesprites winlosstext UnknownText_0x18870c, $0000 @@ -73,12 +73,12 @@ MistyScript_0x188432: ; 0x188432 setevent EVENT_BEAT_SWIMMERF_BRIANA setevent EVENT_BEAT_SWIMMERM_PARKER loadfont - 2writetext UnknownText_0x188768 + writetext UnknownText_0x188768 playsound SFX_GET_BADGE waitbutton setflag $0024 UnknownScript_0x188460: ; 0x188460 - 2writetext UnknownText_0x188782 + writetext UnknownText_0x188782 closetext loadmovesprites end @@ -107,7 +107,7 @@ TrainerSwimmerfDiana: ; 0x188466 SwimmerfDianaScript: ; 0x188472 talkaftercancel loadfont - 2writetext UnknownText_0x188856 + writetext UnknownText_0x188856 closetext loadmovesprites end @@ -136,7 +136,7 @@ TrainerSwimmerfBriana: ; 0x18847a SwimmerfBrianaScript: ; 0x188486 talkaftercancel loadfont - 2writetext UnknownText_0x1888c0 + writetext UnknownText_0x1888c0 closetext loadmovesprites end @@ -165,7 +165,7 @@ TrainerSwimmermParker: ; 0x18848e SwimmermParkerScript: ; 0x18849a talkaftercancel loadfont - 2writetext UnknownText_0x188943 + writetext UnknownText_0x188943 closetext loadmovesprites end @@ -176,13 +176,13 @@ CeruleanGymGuyScript: ; 0x1884a2 loadfont checkevent EVENT_BEAT_MISTY iftrue .CeruleanGymGuyWinScript - 2writetext CeruleanGymGuyText + writetext CeruleanGymGuyText closetext loadmovesprites end .CeruleanGymGuyWinScript - 2writetext CeruleanGymGuyWinText + writetext CeruleanGymGuyWinText closetext loadmovesprites end @@ -198,7 +198,7 @@ MapCeruleanGymSignpost1Script: ; 0x1884b9 checkevent $076f iffalse UnknownScript_0x1884d3 loadfont - 2writetext UnknownText_0x188610 + writetext UnknownText_0x188610 closetext loadmovesprites end @@ -208,7 +208,7 @@ MapCeruleanGymSignpost2Script: ; 0x1884c6 checkevent $076f iffalse UnknownScript_0x1884d3 loadfont - 2writetext UnknownText_0x188642 + writetext UnknownText_0x188642 closetext loadmovesprites end diff --git a/maps/CeruleanPoliceStation.asm b/maps/CeruleanPoliceStation.asm index 4c0242b2b..530600e51 100644 --- a/maps/CeruleanPoliceStation.asm +++ b/maps/CeruleanPoliceStation.asm @@ -16,7 +16,7 @@ PokefanFScript_0x18804d: ; 0x18804d DiglettScript_0x188050: ; 0x188050 loadfont - 2writetext UnknownText_0x1880e7 + writetext UnknownText_0x1880e7 cry DIGLETT closetext loadmovesprites diff --git a/maps/CeruleanTradeSpeechHouse.asm b/maps/CeruleanTradeSpeechHouse.asm index db5b5ea51..3ad42c785 100644 --- a/maps/CeruleanTradeSpeechHouse.asm +++ b/maps/CeruleanTradeSpeechHouse.asm @@ -16,7 +16,7 @@ GrampsScript_0x188136: ; 0x188136 RhydonScript_0x188139: ; 0x188139 loadfont - 2writetext UnknownText_0x18819c + writetext UnknownText_0x18819c cry KANGASKHAN closetext loadmovesprites @@ -25,7 +25,7 @@ RhydonScript_0x188139: ; 0x188139 ZubatScript_0x188143: ; 0x188143 loadfont - 2writetext UnknownText_0x1881b5 + writetext UnknownText_0x1881b5 cry ZUBAT closetext loadmovesprites diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm index dc726235f..5df7072ab 100644 --- a/maps/CharcoalKiln.asm +++ b/maps/CharcoalKiln.asm @@ -13,21 +13,21 @@ BlackBeltScript_0x18dd1a: ; 0x18dd1a iftrue UnknownScript_0x18dd34 checkevent EVENT_CLEARED_SLOWPOKE_WELL iftrue UnknownScript_0x18dd2e - 2writetext UnknownText_0x18dd74 + writetext UnknownText_0x18dd74 closetext loadmovesprites end ; 0x18dd2e UnknownScript_0x18dd2e: ; 0x18dd2e - 2writetext UnknownText_0x18ddfd + writetext UnknownText_0x18ddfd closetext loadmovesprites end ; 0x18dd34 UnknownScript_0x18dd34: ; 0x18dd34 - 2writetext UnknownText_0x18de73 + writetext UnknownText_0x18de73 closetext loadmovesprites end @@ -40,14 +40,14 @@ YoungsterScript_0x18dd3a: ; 0x18dd3a iftrue UnknownScript_0x18dd5d checkevent EVENT_GOT_HM01_CUT iftrue UnknownScript_0x18dd4e - 2writetext UnknownText_0x18dee0 + writetext UnknownText_0x18dee0 closetext loadmovesprites end ; 0x18dd4e UnknownScript_0x18dd4e: ; 0x18dd4e - 2writetext UnknownText_0x18df25 + writetext UnknownText_0x18df25 keeptextopen verbosegiveitem CHARCOAL, 1 iffalse UnknownScript_0x18dd61 @@ -57,7 +57,7 @@ UnknownScript_0x18dd4e: ; 0x18dd4e ; 0x18dd5d UnknownScript_0x18dd5d: ; 0x18dd5d - 2writetext UnknownText_0x18df93 + writetext UnknownText_0x18df93 closetext UnknownScript_0x18dd61: ; 0x18dd61 loadmovesprites @@ -67,7 +67,7 @@ UnknownScript_0x18dd61: ; 0x18dd61 MoltresScript_0x18dd63: ; 0x18dd63 faceplayer loadfont - 2writetext UnknownText_0x18dfe5 + writetext UnknownText_0x18dfe5 cry FARFETCH_D closetext loadmovesprites diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index cdcacbd1b..7c35745a4 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -30,39 +30,39 @@ UnknownScript_0x19c00f: ; 0x19c00f GrampsScript_0x19c013: ; 0x19c013 faceplayer loadfont - 2writetext UnknownText_0x19c1e3 + writetext UnknownText_0x19c1e3 yesorno iffalse UnknownScript_0x19c0a4 - 2jump UnknownScript_0x19c01f + jump UnknownScript_0x19c01f ; 0x19c01f UnknownScript_0x19c01f: ; 0x19c01f - 2writetext UnknownText_0x19c26f + writetext UnknownText_0x19c26f closetext loadmovesprites playmusic MUSIC_SHOW_ME_AROUND follow $2, $0 applymovement $2, MovementData_0x19c195 loadfont - 2writetext UnknownText_0x19c285 + writetext UnknownText_0x19c285 closetext loadmovesprites applymovement $2, MovementData_0x19c19b spriteface $0, $1 loadfont - 2writetext UnknownText_0x19c304 + writetext UnknownText_0x19c304 closetext loadmovesprites applymovement $2, MovementData_0x19c1a3 spriteface $0, $1 loadfont - 2writetext UnknownText_0x19c359 + writetext UnknownText_0x19c359 closetext loadmovesprites applymovement $2, MovementData_0x19c1ac spriteface $0, $2 loadfont - 2writetext UnknownText_0x19c3a7 + writetext UnknownText_0x19c3a7 closetext loadmovesprites applymovement $2, MovementData_0x19c1b6 @@ -71,14 +71,14 @@ UnknownScript_0x19c01f: ; 0x19c01f spriteface $2, $2 spriteface $0, $3 loadfont - 2writetext UnknownText_0x19c3ec + writetext UnknownText_0x19c3ec keeptextopen stringtotext .mapcardname, $1 - 2call .UnknownScript_0x19c097 + scall .UnknownScript_0x19c097 setflag $0001 - 2writetext UnknownText_0x19c438 + writetext UnknownText_0x19c438 keeptextopen - 2writetext UnknownText_0x19c451 + writetext UnknownText_0x19c451 closetext loadmovesprites stopfollow @@ -100,7 +100,7 @@ UnknownScript_0x19c01f: ; 0x19c01f ; 0x19c0a4 UnknownScript_0x19c0a4: ; 0x19c0a4 - 2writetext UnknownText_0x19c49f + writetext UnknownText_0x19c49f closetext loadmovesprites end @@ -120,7 +120,7 @@ UnknownScript_0x19c0ae: ; 0x19c0ae spriteface $0, $3 playmusic MUSIC_RIVAL_ENCOUNTER loadfont - 2writetext UnknownText_0x19c4e2 + writetext UnknownText_0x19c4e2 closetext loadmovesprites checkevent EVENT_GOT_TOTODILE_FROM_ELM @@ -135,7 +135,7 @@ UnknownScript_0x19c0ae: ; 0x19c0ae reloadmapmusic reloadmap iftrue UnknownScript_0x19c11a - 2jump UnknownScript_0x19c126 + jump UnknownScript_0x19c126 ; 0x19c0ee UnknownScript_0x19c0ee: ; 0x19c0ee @@ -147,7 +147,7 @@ UnknownScript_0x19c0ee: ; 0x19c0ee reloadmapmusic reloadmap iftrue UnknownScript_0x19c11a - 2jump UnknownScript_0x19c126 + jump UnknownScript_0x19c126 ; 0x19c104 UnknownScript_0x19c104: ; 0x19c104 @@ -159,22 +159,22 @@ UnknownScript_0x19c104: ; 0x19c104 reloadmapmusic reloadmap iftrue UnknownScript_0x19c11a - 2jump UnknownScript_0x19c126 + jump UnknownScript_0x19c126 ; 0x19c11a UnknownScript_0x19c11a: ; 0x19c11a playmusic MUSIC_RIVAL_AFTER loadfont - 2writetext UnknownText_0x19c608 + writetext UnknownText_0x19c608 closetext loadmovesprites - 2jump UnknownScript_0x19c12f + jump UnknownScript_0x19c12f ; 0x19c126 UnknownScript_0x19c126: ; 0x19c126 playmusic MUSIC_RIVAL_AFTER loadfont - 2writetext UnknownText_0x19c59e + writetext UnknownText_0x19c59e closetext loadmovesprites UnknownScript_0x19c12f: ; 0x19c12f @@ -194,14 +194,14 @@ TeacherScript_0x19c146: ; 0x19c146 loadfont checkflag $0001 iftrue UnknownScript_0x19c154 - 2writetext UnknownText_0x19c650 + writetext UnknownText_0x19c650 closetext loadmovesprites end ; 0x19c154 UnknownScript_0x19c154: ; 0x19c154 - 2writetext UnknownText_0x19c6a8 + writetext UnknownText_0x19c6a8 closetext loadmovesprites end @@ -212,14 +212,14 @@ YoungsterScript_0x19c15a: ; 0x19c15a loadfont checkflag $000b iftrue UnknownScript_0x19c168 - 2writetext UnknownText_0x19c6d6 + writetext UnknownText_0x19c6d6 closetext loadmovesprites end ; 0x19c168 UnknownScript_0x19c168: ; 0x19c168 - 2writetext UnknownText_0x19c701 + writetext UnknownText_0x19c701 closetext loadmovesprites end @@ -230,13 +230,13 @@ FisherScript_0x19c16e: ; 0x19c16e loadfont checkevent EVENT_GOT_MYSTIC_WATER_IN_CHERRYGROVE iftrue UnknownScript_0x19c183 - 2writetext UnknownText_0x19c766 + writetext UnknownText_0x19c766 keeptextopen verbosegiveitem MYSTIC_WATER, 1 iffalse UnknownScript_0x19c187 setevent EVENT_GOT_MYSTIC_WATER_IN_CHERRYGROVE UnknownScript_0x19c183: ; 0x19c183 - 2writetext UnknownText_0x19c7c1 + writetext UnknownText_0x19c7c1 closetext UnknownScript_0x19c187: ; 0x19c187 loadmovesprites diff --git a/maps/CherrygroveEvolutionSpeechHouse.asm b/maps/CherrygroveEvolutionSpeechHouse.asm index 43aecc557..a40236ab3 100644 --- a/maps/CherrygroveEvolutionSpeechHouse.asm +++ b/maps/CherrygroveEvolutionSpeechHouse.asm @@ -8,7 +8,7 @@ CherrygroveEvolutionSpeechHouse_MapScriptHeader: ; 0x196cb0 YoungsterScript_0x196cb2: ; 0x196cb2 loadfont - 2writetext UnknownText_0x196cc3 + writetext UnknownText_0x196cc3 closetext loadmovesprites end @@ -16,7 +16,7 @@ YoungsterScript_0x196cb2: ; 0x196cb2 LassScript_0x196cb9: ; 0x196cb9 loadfont - 2writetext UnknownText_0x196cfc + writetext UnknownText_0x196cfc closetext loadmovesprites end diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm index fa3cb147f..72edd8524 100644 --- a/maps/CherrygroveMart.asm +++ b/maps/CherrygroveMart.asm @@ -26,14 +26,14 @@ CooltrainerMScript_0x19681d: ; 0x19681d loadfont checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM iftrue UnknownScript_0x19682b - 2writetext UnknownText_0x196834 + writetext UnknownText_0x196834 closetext loadmovesprites end ; 0x19682b UnknownScript_0x19682b: ; 0x19682b - 2writetext UnknownText_0x196873 + writetext UnknownText_0x196873 closetext loadmovesprites end diff --git a/maps/CherrygrovePokeCenter1F.asm b/maps/CherrygrovePokeCenter1F.asm index 8691f0103..a88a9cba6 100644 --- a/maps/CherrygrovePokeCenter1F.asm +++ b/maps/CherrygrovePokeCenter1F.asm @@ -23,14 +23,14 @@ TeacherScript_0x196976: ; 0x196976 loadfont checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM iftrue UnknownScript_0x196984 - 2writetext UnknownText_0x1969f1 + writetext UnknownText_0x1969f1 closetext loadmovesprites end ; 0x196984 UnknownScript_0x196984: ; 0x196984 - 2writetext UnknownText_0x196a46 + writetext UnknownText_0x196a46 closetext loadmovesprites end diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 1339de71b..9565e7f0f 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -54,7 +54,7 @@ UnknownScript_0x1a001e: ; 0x1a001e appear $c applymovement $c, MovementData_0x1a00e7 loadfont - 2writetext UnknownText_0x1a0433 + writetext UnknownText_0x1a0433 closetext loadmovesprites winlosstext UnknownText_0x1a05a1, $0000 @@ -65,7 +65,7 @@ UnknownScript_0x1a001e: ; 0x1a001e returnafterbattle playmusic MUSIC_MYSTICALMAN_ENCOUNTER loadfont - 2writetext UnknownText_0x1a05c3 + writetext UnknownText_0x1a05c3 closetext loadmovesprites applymovement $c, MovementData_0x1a00ec @@ -83,26 +83,26 @@ PokefanFScript_0x1a0084: ; 0x1a0084 loadfont checkevent EVENT_GOT_HM02_FLY iftrue UnknownScript_0x1a00ad - 2writetext UnknownText_0x1a00f1 + writetext UnknownText_0x1a00f1 keeptextopen checkevent EVENT_BEAT_CHUCK iftrue UnknownScript_0x1a009c - 2writetext UnknownText_0x1a0163 + writetext UnknownText_0x1a0163 closetext loadmovesprites end ; 0x1a009c UnknownScript_0x1a009c: ; 0x1a009c - 2writetext UnknownText_0x1a01e3 + writetext UnknownText_0x1a01e3 keeptextopen verbosegiveitem HM_02, 1 iffalse UnknownScript_0x1a00b1 setevent EVENT_GOT_HM02_FLY - 2writetext UnknownText_0x1a021d + writetext UnknownText_0x1a021d keeptextopen UnknownScript_0x1a00ad: ; 0x1a00ad - 2writetext UnknownText_0x1a0277 + writetext UnknownText_0x1a0277 closetext UnknownScript_0x1a00b1: ; 0x1a00b1 loadmovesprites diff --git a/maps/CianwoodCityPhotoStudio.asm b/maps/CianwoodCityPhotoStudio.asm index b17457b7a..da3457fc0 100644 --- a/maps/CianwoodCityPhotoStudio.asm +++ b/maps/CianwoodCityPhotoStudio.asm @@ -9,10 +9,10 @@ CianwoodCityPhotoStudio_MapScriptHeader: ; 0x9e0de FishingGuruScript_0x9e0e0: ; 0x9e0e0 faceplayer loadfont - 2writetext UnknownText_0x9e0f9 + writetext UnknownText_0x9e0f9 yesorno iffalse UnknownScript_0x9e0f3 - 2writetext UnknownText_0x9e142 + writetext UnknownText_0x9e142 closetext special $0068 closetext @@ -21,7 +21,7 @@ FishingGuruScript_0x9e0e0: ; 0x9e0e0 ; 0x9e0f3 UnknownScript_0x9e0f3: ; 0x9e0f3 - 2writetext UnknownText_0x9e156 + writetext UnknownText_0x9e156 closetext loadmovesprites end diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index 6b271d51d..38f63f49f 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -11,12 +11,12 @@ ChuckScript_0x9d60f: ; 0x9d60f loadfont checkevent EVENT_BEAT_CHUCK iftrue UnknownScript_0x9d656 - 2writetext UnknownText_0x9d6f9 + writetext UnknownText_0x9d6f9 closetext loadmovesprites spriteface $2, $3 loadfont - 2writetext UnknownText_0x9d76f + writetext UnknownText_0x9d76f closetext loadmovesprites applymovement $7, MovementData_0x9d6f3 @@ -26,7 +26,7 @@ ChuckScript_0x9d60f: ; 0x9d60f pause 30 faceplayer loadfont - 2writetext UnknownText_0x9d78a + writetext UnknownText_0x9d78a closetext loadmovesprites winlosstext UnknownText_0x9d7f6, $0000 @@ -35,12 +35,12 @@ ChuckScript_0x9d60f: ; 0x9d60f returnafterbattle setevent EVENT_BEAT_CHUCK loadfont - 2writetext UnknownText_0x9d835 + writetext UnknownText_0x9d835 playsound SFX_GET_BADGE waitbutton setflag $0020 checkcode $7 - 2call UnknownScript_0x9d681 + scall UnknownScript_0x9d681 UnknownScript_0x9d656: ; 0x9d656 checkevent EVENT_GOT_TM01_DYNAMICPUNCH iftrue UnknownScript_0x9d67b @@ -48,19 +48,19 @@ UnknownScript_0x9d656: ; 0x9d656 setevent EVENT_BEAT_BLACKBELT_LAO setevent EVENT_BEAT_BLACKBELT_NOB setevent EVENT_BEAT_BLACKBELT_LUNG - 2writetext UnknownText_0x9d84d + writetext UnknownText_0x9d84d keeptextopen verbosegiveitem TM_01, 1 iffalse UnknownScript_0x9d67f setevent EVENT_GOT_TM01_DYNAMICPUNCH - 2writetext UnknownText_0x9d8da + writetext UnknownText_0x9d8da closetext loadmovesprites end ; 0x9d67b UnknownScript_0x9d67b: ; 0x9d67b - 2writetext UnknownText_0x9d930 + writetext UnknownText_0x9d930 closetext UnknownScript_0x9d67f: ; 0x9d67f loadmovesprites @@ -104,7 +104,7 @@ TrainerBlackbeltYoshi: ; 0x9d690 BlackbeltYoshiScript: ; 0x9d69c talkaftercancel loadfont - 2writetext UnknownText_0x9d9fa + writetext UnknownText_0x9d9fa closetext loadmovesprites end @@ -133,7 +133,7 @@ TrainerBlackbeltLao: ; 0x9d6a4 BlackbeltLaoScript: ; 0x9d6b0 talkaftercancel loadfont - 2writetext UnknownText_0x9da61 + writetext UnknownText_0x9da61 closetext loadmovesprites end @@ -162,7 +162,7 @@ TrainerBlackbeltNob: ; 0x9d6b8 BlackbeltNobScript: ; 0x9d6c4 talkaftercancel loadfont - 2writetext UnknownText_0x9dac0 + writetext UnknownText_0x9dac0 closetext loadmovesprites end @@ -191,7 +191,7 @@ TrainerBlackbeltLung: ; 0x9d6cc BlackbeltLungScript: ; 0x9d6d8 talkaftercancel loadfont - 2writetext UnknownText_0x9db14 + writetext UnknownText_0x9db14 closetext loadmovesprites end diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm index a16097af8..2b014c571 100644 --- a/maps/CianwoodPharmacy.asm +++ b/maps/CianwoodPharmacy.asm @@ -20,15 +20,15 @@ PharmacistScript_0x9df9e: ; 0x9df9e iftrue UnknownScript_0x9dfc4 checkevent $0037 iffalse UnknownScript_0x9dfc4 - 2writetext UnknownText_0x9dfcd + writetext UnknownText_0x9dfcd keeptextopen giveitem SECRETPOTION, $1 - 2writetext UnknownText_0x9e056 + writetext UnknownText_0x9e056 playsound SFX_KEY_ITEM waitbutton itemnotify setevent EVENT_GOT_SECRETPOTION_FROM_PHARMACY - 2writetext UnknownText_0x9e070 + writetext UnknownText_0x9e070 closetext loadmovesprites end diff --git a/maps/CianwoodPokeCenter1F.asm b/maps/CianwoodPokeCenter1F.asm index 70f6e880c..dbdcfbc3b 100644 --- a/maps/CianwoodPokeCenter1F.asm +++ b/maps/CianwoodPokeCenter1F.asm @@ -19,14 +19,14 @@ CianwoodGymGuyScript: ; 0x9dbd5 checkevent EVENT_BEAT_CHUCK iftrue .CianwoodGymGuyWinScript loadfont - 2writetext CianwoodGymGuyText + writetext CianwoodGymGuyText closetext loadmovesprites end .CianwoodGymGuyWinScript loadfont - 2writetext CianwoodGymGuyWinText + writetext CianwoodGymGuyWinText closetext loadmovesprites end diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index 3d9ea00ed..5ff8bbeb2 100644 --- a/maps/CinnabarIsland.asm +++ b/maps/CinnabarIsland.asm @@ -18,7 +18,7 @@ UnknownScript_0x1ac9ac: ; 0x1ac9ac BlueScript_0x1ac9b0: ; 0x1ac9b0 faceplayer loadfont - 2writetext UnknownText_0x1ac9d2 + writetext UnknownText_0x1ac9d2 closetext loadmovesprites playsound SFX_WARP_TO diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index 290e08c30..71e3c803d 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -63,7 +63,7 @@ MapColosseumSignpost1Script: ; 0x193493 ChrisScript_0x193499: ; 0x193499 loadfont - 2writetext UnknownText_0x1934a0 + writetext UnknownText_0x1934a0 closetext loadmovesprites end diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm index bcec360fb..19874e184 100644 --- a/maps/CopycatsHouse1F.asm +++ b/maps/CopycatsHouse1F.asm @@ -15,14 +15,14 @@ PokefanFScript_0x18ad16: ; 0x18ad16 loadfont checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x18ad24 - 2writetext UnknownText_0x18ad95 + writetext UnknownText_0x18ad95 closetext loadmovesprites end ; 0x18ad24 UnknownScript_0x18ad24: ; 0x18ad24 - 2writetext UnknownText_0x18add3 + writetext UnknownText_0x18add3 closetext loadmovesprites end @@ -30,7 +30,7 @@ UnknownScript_0x18ad24: ; 0x18ad24 ClefairyScript_0x18ad2a: ; 0x18ad2a loadfont - 2writetext UnknownText_0x18ae4b + writetext UnknownText_0x18ae4b cry BLISSEY closetext loadmovesprites diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index 5d8e85b39..1573f51db 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -15,7 +15,7 @@ UnknownScript_0x18ae9f: ; 0x18ae9f iftrue UnknownScript_0x18aeac disappear $7 appear $2 - 2jump UnknownScript_0x18aeb0 + jump UnknownScript_0x18aeb0 ; 0x18aeac UnknownScript_0x18aeac: ; 0x18aeac @@ -38,7 +38,7 @@ CopycatScript_0x18aeb1: ; 0x18aeb1 applymovement $2, MovementData_0x18afd0 faceplayer variablesprite $b, $1 - 2jump UnknownScript_0x18aedc + jump UnknownScript_0x18aedc ; 0x18aed4 UnknownScript_0x18aed4: ; 0x18aed4 @@ -52,19 +52,19 @@ UnknownScript_0x18aedc: ; 0x18aedc loadfont checkflag $0063 iftrue UnknownScript_0x18aef2 - 2writetext UnknownText_0x18afda - 2jump UnknownScript_0x18aef5 + writetext UnknownText_0x18afda + jump UnknownScript_0x18aef5 ; 0x18aef2 UnknownScript_0x18aef2: ; 0x18aef2 - 2writetext UnknownText_0x18b316 + writetext UnknownText_0x18b316 UnknownScript_0x18aef5: ; 0x18aef5 closetext loadmovesprites checkflag $0063 iftrue UnknownScript_0x18af04 applymovement $2, MovementData_0x18afd0 - 2jump UnknownScript_0x18af08 + jump UnknownScript_0x18af08 ; 0x18af04 UnknownScript_0x18af04: ; 0x18af04 @@ -74,7 +74,7 @@ UnknownScript_0x18af08: ; 0x18af08 variablesprite $b, $28 special $005e loadfont - 2writetext UnknownText_0x18b028 + writetext UnknownText_0x18b028 closetext loadmovesprites end @@ -84,19 +84,19 @@ UnknownScript_0x18af16: ; 0x18af16 loadfont checkflag $0063 iftrue UnknownScript_0x18af23 - 2writetext UnknownText_0x18b064 - 2jump UnknownScript_0x18af26 + writetext UnknownText_0x18b064 + jump UnknownScript_0x18af26 ; 0x18af23 UnknownScript_0x18af23: ; 0x18af23 - 2writetext UnknownText_0x18b366 + writetext UnknownText_0x18b366 UnknownScript_0x18af26: ; 0x18af26 closetext loadmovesprites checkflag $0063 iftrue UnknownScript_0x18af35 applymovement $2, MovementData_0x18afd0 - 2jump UnknownScript_0x18af39 + jump UnknownScript_0x18af39 ; 0x18af35 UnknownScript_0x18af35: ; 0x18af35 @@ -106,7 +106,7 @@ UnknownScript_0x18af39: ; 0x18af39 variablesprite $b, $28 special $005e loadfont - 2writetext UnknownText_0x18b116 + writetext UnknownText_0x18b116 closetext loadmovesprites setevent EVENT_MET_COPYCAT_FOUND_OUT_ABOUT_LOST_ITEM @@ -115,23 +115,23 @@ UnknownScript_0x18af39: ; 0x18af39 UnknownScript_0x18af4a: ; 0x18af4a loadfont - 2writetext UnknownText_0x18b17f + writetext UnknownText_0x18b17f keeptextopen takeitem LOST_ITEM, 1 setevent EVENT_RETURNED_LOST_ITEM_TO_COPYCAT clearevent $0773 - 2jump UnknownScript_0x18af5c + jump UnknownScript_0x18af5c ; 0x18af5b UnknownScript_0x18af5b: ; 0x18af5b loadfont UnknownScript_0x18af5c: ; 0x18af5c - 2writetext UnknownText_0x18b1e2 + writetext UnknownText_0x18b1e2 keeptextopen verbosegiveitem PASS, 1 iffalse UnknownScript_0x18afba setevent EVENT_GOT_PASS_FROM_COPYCAT - 2writetext UnknownText_0x18b214 + writetext UnknownText_0x18b214 closetext loadmovesprites end @@ -143,7 +143,7 @@ UnknownScript_0x18af6f: ; 0x18af6f applymovement $2, MovementData_0x18afd0 faceplayer variablesprite $b, $1 - 2jump UnknownScript_0x18af88 + jump UnknownScript_0x18af88 ; 0x18af80 UnknownScript_0x18af80: ; 0x18af80 @@ -155,19 +155,19 @@ UnknownScript_0x18af88: ; 0x18af88 loadfont checkflag $0063 iftrue UnknownScript_0x18af98 - 2writetext UnknownText_0x18b298 - 2jump UnknownScript_0x18af9b + writetext UnknownText_0x18b298 + jump UnknownScript_0x18af9b ; 0x18af98 UnknownScript_0x18af98: ; 0x18af98 - 2writetext UnknownText_0x18b415 + writetext UnknownText_0x18b415 UnknownScript_0x18af9b: ; 0x18af9b closetext loadmovesprites checkflag $0063 iftrue UnknownScript_0x18afaa applymovement $2, MovementData_0x18afd0 - 2jump UnknownScript_0x18afae + jump UnknownScript_0x18afae ; 0x18afaa UnknownScript_0x18afaa: ; 0x18afaa @@ -177,7 +177,7 @@ UnknownScript_0x18afae: ; 0x18afae variablesprite $b, $28 special $005e loadfont - 2writetext UnknownText_0x18b2f5 + writetext UnknownText_0x18b2f5 closetext UnknownScript_0x18afba: ; 0x18afba loadmovesprites @@ -186,10 +186,10 @@ UnknownScript_0x18afba: ; 0x18afba MoltresScript_0x18afbc: ; 0x18afbc loadfont - 2writetext UnknownText_0x18b476 + writetext UnknownText_0x18b476 cry DODRIO keeptextopen - 2writetext UnknownText_0x18b489 + writetext UnknownText_0x18b489 closetext loadmovesprites end diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm index e24da853f..eb2ca6311 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -29,7 +29,7 @@ TrainerKimono_girlNaoko2: ; 0x99462 Kimono_girlNaoko2Script: ; 0x9946e talkaftercancel loadfont - 2writetext UnknownText_0x99579 + writetext UnknownText_0x99579 closetext loadmovesprites end @@ -58,7 +58,7 @@ TrainerKimono_girlSayo: ; 0x99476 Kimono_girlSayoScript: ; 0x99482 talkaftercancel loadfont - 2writetext UnknownText_0x9960b + writetext UnknownText_0x9960b closetext loadmovesprites end @@ -87,7 +87,7 @@ TrainerKimono_girlZuki: ; 0x9948a Kimono_girlZukiScript: ; 0x99496 talkaftercancel loadfont - 2writetext UnknownText_0x99688 + writetext UnknownText_0x99688 closetext loadmovesprites end @@ -116,7 +116,7 @@ TrainerKimono_girlKuni: ; 0x9949e Kimono_girlKuniScript: ; 0x994aa talkaftercancel loadfont - 2writetext UnknownText_0x99714 + writetext UnknownText_0x99714 closetext loadmovesprites end @@ -145,7 +145,7 @@ TrainerKimono_girlMiki: ; 0x994b2 Kimono_girlMikiScript: ; 0x994be talkaftercancel loadfont - 2writetext UnknownText_0x997a8 + writetext UnknownText_0x997a8 closetext loadmovesprites end @@ -154,7 +154,7 @@ Kimono_girlMikiScript: ; 0x994be GentlemanScript_0x994c6: ; 0x994c6 faceplayer loadfont - 2writetext UnknownText_0x9980a + writetext UnknownText_0x9980a keeptextopen checkevent EVENT_GOT_HM03_SURF iftrue UnknownScript_0x99515 @@ -168,38 +168,38 @@ GentlemanScript_0x994c6: ; 0x994c6 iffalse UnknownScript_0x994f3 checkevent EVENT_BEAT_KIMONO_GIRL_MIKI iffalse UnknownScript_0x994f3 - 2jump UnknownScript_0x99505 + jump UnknownScript_0x99505 ; 0x994f3 UnknownScript_0x994f3: ; 0x994f3 checkflag $0063 iftrue UnknownScript_0x994ff - 2writetext UnknownText_0x99891 + writetext UnknownText_0x99891 closetext loadmovesprites end ; 0x994ff UnknownScript_0x994ff: ; 0x994ff - 2writetext UnknownText_0x998d4 + writetext UnknownText_0x998d4 closetext loadmovesprites end ; 0x99505 UnknownScript_0x99505: ; 0x99505 - 2writetext UnknownText_0x9991a + writetext UnknownText_0x9991a keeptextopen verbosegiveitem HM_03, 1 setevent EVENT_GOT_HM03_SURF - 2writetext UnknownText_0x9999b + writetext UnknownText_0x9999b closetext loadmovesprites end ; 0x99515 UnknownScript_0x99515: ; 0x99515 - 2writetext UnknownText_0x999d5 + writetext UnknownText_0x999d5 closetext loadmovesprites end @@ -207,7 +207,7 @@ UnknownScript_0x99515: ; 0x99515 RhydonScript_0x9951b: ; 0x9951b loadfont - 2writetext UnknownText_0x99a0a + writetext UnknownText_0x99a0a cry RHYDON closetext loadmovesprites diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm index 2fa05a7b4..a3a3a794f 100644 --- a/maps/DarkCaveBlackthornEntrance.asm +++ b/maps/DarkCaveBlackthornEntrance.asm @@ -11,13 +11,13 @@ PharmacistScript_0x18c720: ; 0x18c720 loadfont checkevent EVENT_GOT_BLACKGLASSES_IN_DARK_CAVE iftrue UnknownScript_0x18c735 - 2writetext UnknownText_0x18c73f + writetext UnknownText_0x18c73f keeptextopen verbosegiveitem BLACKGLASSES, 1 iffalse UnknownScript_0x18c739 setevent EVENT_GOT_BLACKGLASSES_IN_DARK_CAVE UnknownScript_0x18c735: ; 0x18c735 - 2writetext UnknownText_0x18c80c + writetext UnknownText_0x18c80c closetext UnknownScript_0x18c739: ; 0x18c739 loadmovesprites diff --git a/maps/DayCare.asm b/maps/DayCare.asm index 0e1cc2441..104308d39 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -29,17 +29,17 @@ GrampsScript_0x62f8f: ; 0x62f8f loadfont checkevent EVENT_GOT_ODD_EGG iftrue UnknownScript_0x62fbd - 2writetext UnknownText_0x630ce + writetext UnknownText_0x630ce keeptextopen loadmovesprites checkcode $1 if_equal $6, UnknownScript_0x62fb6 special $007d loadfont - 2writetext UnknownText_0x631ae + writetext UnknownText_0x631ae playsound SFX_KEY_ITEM waitbutton - 2writetext UnknownText_0x631c3 + writetext UnknownText_0x631c3 closetext loadmovesprites setevent EVENT_GOT_ODD_EGG @@ -48,7 +48,7 @@ GrampsScript_0x62f8f: ; 0x62f8f UnknownScript_0x62fb6: ; 0x62fb6 loadfont - 2writetext UnknownText_0x63237 + writetext UnknownText_0x63237 closetext loadmovesprites end @@ -73,7 +73,7 @@ GrannyScript_0x62fc3: ; 0x62fc3 ; 0x62fd1 UnknownScript_0x62fd1: ; 0x62fd1 - 2writetext UnknownText_0x62fda + writetext UnknownText_0x62fda closetext loadmovesprites end diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index 942f72705..3c6e93777 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -23,11 +23,11 @@ UnknownScript_0x18d023: ; 0x18d023 applymovement $0, MovementData_0x18d2bf applymovement $2, MovementData_0x18d2c7 loadfont - 2writetext UnknownText_0x18d2ea + writetext UnknownText_0x18d2ea keeptextopen UnknownScript_0x18d030: ; 0x18d030 setevent $0001 - 2writetext UnknownText_0x18d3bc + writetext UnknownText_0x18d3bc keeptextopen loadmenudata MenuDataHeader_0x18d215 interpretmenu2 @@ -40,7 +40,7 @@ UnknownScript_0x18d030: ; 0x18d030 UnknownScript_0x18d049: ; 0x18d049 setevent $0002 - 2writetext UnknownText_0x18d3d3 + writetext UnknownText_0x18d3d3 keeptextopen loadmenudata MenuDataHeader_0x18d234 interpretmenu2 @@ -50,7 +50,7 @@ UnknownScript_0x18d049: ; 0x18d049 if_equal $3, UnknownScript_0x18d0cb UnknownScript_0x18d061: ; 0x18d061 setevent $0003 - 2writetext UnknownText_0x18d3f3 + writetext UnknownText_0x18d3f3 keeptextopen loadmenudata MenuDataHeader_0x18d258 interpretmenu2 @@ -60,7 +60,7 @@ UnknownScript_0x18d061: ; 0x18d061 if_equal $3, UnknownScript_0x18d0a9 UnknownScript_0x18d079: ; 0x18d079 setevent $0004 - 2writetext UnknownText_0x18d420 + writetext UnknownText_0x18d420 keeptextopen loadmenudata MenuDataHeader_0x18d283 interpretmenu2 @@ -70,7 +70,7 @@ UnknownScript_0x18d079: ; 0x18d079 if_equal $3, UnknownScript_0x18d0a9 UnknownScript_0x18d091: ; 0x18d091 setevent $0005 - 2writetext UnknownText_0x18d44a + writetext UnknownText_0x18d44a keeptextopen loadmenudata MenuDataHeader_0x18d2a5 interpretmenu2 @@ -81,7 +81,7 @@ UnknownScript_0x18d091: ; 0x18d091 UnknownScript_0x18d0a9: ; 0x18d0a9 checkevent $0005 iftrue UnknownScript_0x18d100 - 2writetext UnknownText_0x18d82d + writetext UnknownText_0x18d82d keeptextopen checkevent $0004 iftrue UnknownScript_0x18d091 @@ -95,12 +95,12 @@ UnknownScript_0x18d0cb: ; 0x18d0cb loadmovesprites spriteface $2, $2 loadfont - 2writetext UnknownText_0x18d7f6 + writetext UnknownText_0x18d7f6 closetext loadmovesprites spriteface $2, $0 loadfont - 2writetext UnknownText_0x18d816 + writetext UnknownText_0x18d816 closetext loadmovesprites setevent $00c1 @@ -116,7 +116,7 @@ UnknownScript_0x18d0cb: ; 0x18d0cb checkevent $0001 iftrue UnknownScript_0x18d030 UnknownScript_0x18d100: ; 0x18d100 - 2writetext UnknownText_0x18d47c + writetext UnknownText_0x18d47c closetext loadmovesprites playsound SFX_ENTER_DOOR @@ -131,34 +131,34 @@ UnknownScript_0x18d100: ; 0x18d100 spriteface $0, $2 spriteface $2, $2 loadfont - 2writetext UnknownText_0x18d916 + writetext UnknownText_0x18d916 closetext loadmovesprites special $006a applymovement $5, MovementData_0x18d2da loadfont - 2writetext UnknownText_0x18d974 + writetext UnknownText_0x18d974 closetext loadmovesprites applymovement $5, MovementData_0x18d2dd loadfont - 2writetext UnknownText_0x18d983 + writetext UnknownText_0x18d983 closetext loadmovesprites applymovement $2, MovementData_0x18d2c9 spriteface $5, $1 loadfont - 2writetext UnknownText_0x18d520 + writetext UnknownText_0x18d520 closetext loadmovesprites showemote $0, $5, 15 loadfont - 2writetext UnknownText_0x18d9ae + writetext UnknownText_0x18d9ae closetext loadmovesprites applymovement $5, MovementData_0x18d2e0 loadfont - 2writetext UnknownText_0x18d9bf + writetext UnknownText_0x18d9bf closetext setflag $0022 playsound SFX_GET_BADGE @@ -167,9 +167,9 @@ UnknownScript_0x18d100: ; 0x18d100 specialphonecall $8 dotrigger $1 domaptrigger GROUP_DRAGONS_DEN_B1F, MAP_DRAGONS_DEN_B1F, $1 - 2writetext UnknownText_0x18d9f2 + writetext UnknownText_0x18d9f2 keeptextopen - 2writetext UnknownText_0x18da0b + writetext UnknownText_0x18da0b closetext loadmovesprites applymovement $2, MovementData_0x18d2ce @@ -177,11 +177,11 @@ UnknownScript_0x18d100: ; 0x18d100 applymovement $2, MovementData_0x18d2d1 spriteface $0, $1 loadfont - 2writetext UnknownText_0x18d5a3 + writetext UnknownText_0x18d5a3 closetext loadmovesprites loadfont - 2writetext UnknownText_0x18dab4 + writetext UnknownText_0x18dab4 closetext loadmovesprites applymovement $5, MovementData_0x18d2e3 @@ -203,18 +203,18 @@ ElderScript_0x18d1a5: ; 0x18d1a5 iffalse UnknownScript_0x18d1c5 checkevent EVENT_BEAT_RIVAL_IN_MT_MOON iftrue UnknownScript_0x18d1f3 - 2writetext UnknownText_0x18d724 + writetext UnknownText_0x18d724 closetext loadmovesprites end ; 0x18d1c5 UnknownScript_0x18d1c5: ; 0x18d1c5 - 2writetext UnknownText_0x18d604 + writetext UnknownText_0x18d604 closetext checkcode $1 if_equal $6, UnknownScript_0x18d1ed - 2writetext UnknownText_0x18d697 + writetext UnknownText_0x18d697 playsound SFX_CAUGHT_MON waitbutton givepoke DRATINI, 15, 0, 0 @@ -222,35 +222,35 @@ UnknownScript_0x18d1c5: ; 0x18d1c5 special $0094 setevent $00bd setevent $0006 - 2writetext UnknownText_0x18d6ca + writetext UnknownText_0x18d6ca closetext loadmovesprites end ; 0x18d1ed UnknownScript_0x18d1ed: ; 0x18d1ed - 2writetext UnknownText_0x18d6ac + writetext UnknownText_0x18d6ac closetext loadmovesprites end ; 0x18d1f3 UnknownScript_0x18d1f3: ; 0x18d1f3 - 2writetext UnknownText_0x18d782 + writetext UnknownText_0x18d782 closetext loadmovesprites end ; 0x18d1f9 UnknownScript_0x18d1f9: ; 0x18d1f9 - 2writetext UnknownText_0x18d5e5 + writetext UnknownText_0x18d5e5 closetext loadmovesprites end ; 0x18d1ff UnknownScript_0x18d1ff: ; 0x18d1ff - 2writetext UnknownText_0x18d6ca + writetext UnknownText_0x18d6ca closetext loadmovesprites end @@ -259,7 +259,7 @@ UnknownScript_0x18d1ff: ; 0x18d1ff ElderScript_0x18d205: ; 0x18d205 faceplayer loadfont - 2writetext UnknownText_0x18d840 + writetext UnknownText_0x18d840 closetext loadmovesprites end @@ -268,7 +268,7 @@ ElderScript_0x18d205: ; 0x18d205 ElderScript_0x18d20d: ; 0x18d20d faceplayer loadfont - 2writetext UnknownText_0x18d8b1 + writetext UnknownText_0x18d8b1 closetext loadmovesprites end diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index c84ed1813..826205a64 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -45,7 +45,7 @@ UnknownScript_0x18c8b5: ; 0x18c8b5 UnknownScript_0x18c8b8: ; 0x18c8b8 appear $3 loadfont - 2writetext UnknownText_0x18c9b8 + writetext UnknownText_0x18c9b8 pause 30 loadmovesprites showemote $0, $0, 15 @@ -53,26 +53,26 @@ UnknownScript_0x18c8b8: ; 0x18c8b8 playmusic MUSIC_CLAIR applymovement $3, MovementData_0x18c9ae loadfont - 2writetext UnknownText_0x18c9bf + writetext UnknownText_0x18c9bf keeptextopen giveitem TM_24, $1 iffalse UnknownScript_0x18c8f4 itemtotext TM_24, $0 - 2writetext UnknownText_0x18c9fb + writetext UnknownText_0x18c9fb playsound SFX_ITEM waitbutton itemnotify setevent EVENT_GOT_TM24_DRAGONBREATH - 2writetext UnknownText_0x18ca0d + writetext UnknownText_0x18ca0d keeptextopen - 2writetext UnknownText_0x18caf1 + writetext UnknownText_0x18caf1 closetext loadmovesprites - 2jump UnknownScript_0x18c8f9 + jump UnknownScript_0x18c8f9 ; 0x18c8f4 UnknownScript_0x18c8f4: ; 0x18c8f4 - 2writetext UnknownText_0x18ca8b + writetext UnknownText_0x18ca8b closetext loadmovesprites UnknownScript_0x18c8f9: ; 0x18c8f9 @@ -108,7 +108,7 @@ TrainerCooltrainermDarin: ; 0x18c90a CooltrainermDarinScript: ; 0x18c916 talkaftercancel loadfont - 2writetext UnknownText_0x18cd82 + writetext UnknownText_0x18cd82 closetext loadmovesprites end @@ -137,7 +137,7 @@ TrainerCooltrainerfCara: ; 0x18c91e CooltrainerfCaraScript: ; 0x18c92a talkaftercancel loadfont - 2writetext UnknownText_0x18ce11 + writetext UnknownText_0x18ce11 closetext loadmovesprites end @@ -166,7 +166,7 @@ TrainerTwinsLeaandpia1: ; 0x18c932 TwinsLeaandpia1Script: ; 0x18c93e talkaftercancel loadfont - 2writetext UnknownText_0x18ced3 + writetext UnknownText_0x18ced3 closetext loadmovesprites end @@ -195,7 +195,7 @@ TrainerTwinsLeaandpia2: ; 0x18c946 TwinsLeaandpia2Script: ; 0x18c952 talkaftercancel loadfont - 2writetext UnknownText_0x18cf0f + writetext UnknownText_0x18cf0f closetext loadmovesprites end @@ -207,7 +207,7 @@ PokeBallScript_0x18c95a: ; 0x18c95a disappear $2 loadfont itemtotext DRAGON_FANG, $0 - 2writetext UnknownText_0x18cf41 + writetext UnknownText_0x18cf41 playsound SFX_ITEM waitbutton itemnotify @@ -218,9 +218,9 @@ PokeBallScript_0x18c95a: ; 0x18c95a UnknownScript_0x18c970: ; 0x18c970 loadfont itemtotext DRAGON_FANG, $0 - 2writetext UnknownText_0x18cf41 + writetext UnknownText_0x18cf41 keeptextopen - 2writetext UnknownText_0x18cf51 + writetext UnknownText_0x18cf51 closetext loadmovesprites end @@ -232,7 +232,7 @@ SilverScript_0x18c97e: ; 0x18c97e loadfont checkevent $0000 iftrue UnknownScript_0x18c995 - 2writetext UnknownText_0x18cc83 + writetext UnknownText_0x18cc83 closetext loadmovesprites setevent $0000 @@ -241,7 +241,7 @@ SilverScript_0x18c97e: ; 0x18c97e ; 0x18c995 UnknownScript_0x18c995: ; 0x18c995 - 2writetext UnknownText_0x18cd2d + writetext UnknownText_0x18cd2d closetext loadmovesprites special $003d diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index 74d4fb49c..4707f4184 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -10,24 +10,24 @@ FisherScript_0x68a5c: ; 0x68a5c applymovement $2, MovementData_0x68b2d faceplayer loadfont - 2writetext UnknownText_0x68b3b + writetext UnknownText_0x68b3b yesorno iffalse UnknownScript_0x68a70 - 2writetext UnknownText_0x68bbd + writetext UnknownText_0x68bbd yesorno iffalse UnknownScript_0x68a7d UnknownScript_0x68a70: ; 0x68a70 - 2writetext UnknownText_0x68c51 + writetext UnknownText_0x68c51 yesorno iffalse UnknownScript_0x68a7d - 2writetext UnknownText_0x68c7b + writetext UnknownText_0x68c7b closetext loadmovesprites end ; 0x68a7d UnknownScript_0x68a7d: ; 0x68a7d - 2writetext UnknownText_0x68d31 + writetext UnknownText_0x68d31 closetext loadmovesprites end @@ -40,7 +40,7 @@ YoungsterScript_0x68a83: ; 0x68a83 GameboyKidScript_0x68a86: ; 0x68a86 faceplayer loadfont - 2writetext UnknownText_0x68dda + writetext UnknownText_0x68dda closetext loadmovesprites spriteface $4, $0 @@ -50,7 +50,7 @@ GameboyKidScript_0x68a86: ; 0x68a86 GameboyKidScript_0x68a91: ; 0x68a91 faceplayer loadfont - 2writetext UnknownText_0x68e07 + writetext UnknownText_0x68e07 closetext loadmovesprites spriteface $5, $0 @@ -63,7 +63,7 @@ YoungsterScript_0x68a9c: ; 0x68a9c MapEarlsPokemonAcademySignpost3Script: ; 0x68a9f loadfont - 2writetext UnknownText_0x68eb2 + writetext UnknownText_0x68eb2 UnknownScript_0x68aa3: ; 0x68aa3 loadmenudata MenuDataHeader_0x68ae1 interpretmenu @@ -78,33 +78,33 @@ UnknownScript_0x68aa3: ; 0x68aa3 ; 0x68abe UnknownScript_0x68abe: ; 0x68abe - 2writetext UnknownText_0x68efe + writetext UnknownText_0x68efe closetext - 2jump UnknownScript_0x68aa3 + jump UnknownScript_0x68aa3 ; 0x68ac5 UnknownScript_0x68ac5: ; 0x68ac5 - 2writetext UnknownText_0x68f80 + writetext UnknownText_0x68f80 closetext - 2jump UnknownScript_0x68aa3 + jump UnknownScript_0x68aa3 ; 0x68acc UnknownScript_0x68acc: ; 0x68acc - 2writetext UnknownText_0x68fe2 + writetext UnknownText_0x68fe2 closetext - 2jump UnknownScript_0x68aa3 + jump UnknownScript_0x68aa3 ; 0x68ad3 UnknownScript_0x68ad3: ; 0x68ad3 - 2writetext UnknownText_0x69055 + writetext UnknownText_0x69055 closetext - 2jump UnknownScript_0x68aa3 + jump UnknownScript_0x68aa3 ; 0x68ada UnknownScript_0x68ada: ; 0x68ada - 2writetext UnknownText_0x690cb + writetext UnknownText_0x690cb closetext - 2jump UnknownScript_0x68aa3 + jump UnknownScript_0x68aa3 ; 0x68ae1 @@ -136,16 +136,16 @@ UnknownText_0x68af2: ; 0x68af2 PokedexScript_0x68b0b: ; 0x68b0b loadfont - 2writetext UnknownText_0x69136 + writetext UnknownText_0x69136 yesorno iffalse UnknownScript_0x68b25 - 2writetext UnknownText_0x69197 + writetext UnknownText_0x69197 yesorno iffalse UnknownScript_0x68b25 - 2writetext UnknownText_0x69207 + writetext UnknownText_0x69207 yesorno iffalse UnknownScript_0x68b25 - 2writetext UnknownText_0x69287 + writetext UnknownText_0x69287 closetext UnknownScript_0x68b25: ; 0x68b25 loadmovesprites diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index 416856158..b55ad3494 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -36,14 +36,14 @@ LassScript_0x1a4015: ; 0x1a4015 loadfont checkevent EVENT_RELEASED_THE_BEASTS iftrue UnknownScript_0x1a4023 - 2writetext UnknownText_0x1a421a + writetext UnknownText_0x1a421a closetext loadmovesprites end ; 0x1a4023 UnknownScript_0x1a4023: ; 0x1a4023 - 2writetext UnknownText_0x1a4269 + writetext UnknownText_0x1a4269 closetext loadmovesprites end @@ -54,14 +54,14 @@ FisherScript_0x1a4029: ; 0x1a4029 loadfont checkevent EVENT_JASMINE_RETURNED_TO_GYM iftrue UnknownScript_0x1a4037 - 2writetext UnknownText_0x1a42ac + writetext UnknownText_0x1a42ac closetext loadmovesprites end ; 0x1a4037 UnknownScript_0x1a4037: ; 0x1a4037 - 2writetext UnknownText_0x1a4325 + writetext UnknownText_0x1a4325 closetext loadmovesprites end diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index 26010678a..5d0e69fd5 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -24,7 +24,7 @@ MortyScript_0x99d58: ; 0x99d58 loadfont checkevent EVENT_BEAT_MORTY iftrue UnknownScript_0x99d8c - 2writetext UnknownText_0x99e65 + writetext UnknownText_0x99e65 closetext loadmovesprites winlosstext UnknownText_0x9a00a, $0000 @@ -33,12 +33,12 @@ MortyScript_0x99d58: ; 0x99d58 returnafterbattle setevent EVENT_BEAT_MORTY loadfont - 2writetext UnknownText_0x9a043 + writetext UnknownText_0x9a043 playsound SFX_GET_BADGE waitbutton setflag $001e checkcode $7 - 2call UnknownScript_0x99db7 + scall UnknownScript_0x99db7 domaptrigger GROUP_ECRUTEAK_HOUSE, MAP_ECRUTEAK_HOUSE, $1 setevent $0766 setevent $0767 @@ -49,19 +49,19 @@ UnknownScript_0x99d8c: ; 0x99d8c setevent EVENT_BEAT_SAGE_PING setevent EVENT_BEAT_MEDIUM_MARTHA setevent EVENT_BEAT_MEDIUM_GRACE - 2writetext UnknownText_0x9a059 + writetext UnknownText_0x9a059 keeptextopen verbosegiveitem TM_30, 1 iffalse UnknownScript_0x99db5 setevent EVENT_GOT_TM30_SHADOW_BALL - 2writetext UnknownText_0x9a0ec + writetext UnknownText_0x9a0ec closetext loadmovesprites end ; 0x99db1 UnknownScript_0x99db1: ; 0x99db1 - 2writetext UnknownText_0x9a145 + writetext UnknownText_0x9a145 closetext UnknownScript_0x99db5: ; 0x99db5 loadmovesprites @@ -86,7 +86,7 @@ UnknownScript_0x99dc6: ; 0x99dc6 applymovement $0, MovementData_0x99e5d applymovement $8, MovementData_0x99e63 loadfont - 2writetext UnknownText_0x9a49c + writetext UnknownText_0x9a49c closetext loadmovesprites follow $0, $8 @@ -122,7 +122,7 @@ TrainerSageJeffrey: ; 0x99de9 SageJeffreyScript: ; 0x99df5 talkaftercancel loadfont - 2writetext UnknownText_0x9a263 + writetext UnknownText_0x9a263 closetext loadmovesprites end @@ -151,7 +151,7 @@ TrainerSagePing: ; 0x99dfd SagePingScript: ; 0x99e09 talkaftercancel loadfont - 2writetext UnknownText_0x9a2b7 + writetext UnknownText_0x9a2b7 closetext loadmovesprites end @@ -180,7 +180,7 @@ TrainerMediumMartha: ; 0x99e11 MediumMarthaScript: ; 0x99e1d talkaftercancel loadfont - 2writetext UnknownText_0x9a318 + writetext UnknownText_0x9a318 closetext loadmovesprites end @@ -209,7 +209,7 @@ TrainerMediumGrace: ; 0x99e25 MediumGraceScript: ; 0x99e31 talkaftercancel loadfont - 2writetext UnknownText_0x9a38a + writetext UnknownText_0x9a38a closetext loadmovesprites end @@ -220,13 +220,13 @@ EcruteakGymGuyScript: ; 0x99e39 loadfont checkevent EVENT_BEAT_MORTY iftrue .EcruteakGymGuyWinScript - 2writetext EcruteakGymGuyText + writetext EcruteakGymGuyText closetext loadmovesprites end .EcruteakGymGuyWinScript - 2writetext EcruteakGymGuyWinText + writetext EcruteakGymGuyWinText closetext loadmovesprites end diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakHouse.asm index c5787ae6f..75339c82a 100644 --- a/maps/EcruteakHouse.asm +++ b/maps/EcruteakHouse.asm @@ -81,14 +81,14 @@ SageScript_0x98062: ; 0x98062 iftrue UnknownScript_0x9807c checkflag $001e iftrue UnknownScript_0x98076 - 2writetext UnknownText_0x980d1 + writetext UnknownText_0x980d1 closetext loadmovesprites end ; 0x98076 UnknownScript_0x98076: ; 0x98076 - 2writetext UnknownText_0x98131 + writetext UnknownText_0x98131 closetext loadmovesprites end @@ -101,14 +101,14 @@ UnknownScript_0x9807c: ; 0x9807c iftrue UnknownScript_0x980aa checkitem CLEAR_BELL iftrue UnknownScript_0x98093 - 2writetext UnknownText_0x981a4 + writetext UnknownText_0x981a4 closetext loadmovesprites end ; 0x98093 UnknownScript_0x98093: ; 0x98093 - 2writetext UnknownText_0x98250 + writetext UnknownText_0x98250 closetext loadmovesprites dotrigger $1 @@ -119,14 +119,14 @@ UnknownScript_0x98093: ; 0x98093 ; 0x980a4 UnknownScript_0x980a4: ; 0x980a4 - 2writetext UnknownText_0x9837e + writetext UnknownText_0x9837e closetext loadmovesprites end ; 0x980aa UnknownScript_0x980aa: ; 0x980aa - 2writetext UnknownText_0x98391 + writetext UnknownText_0x98391 closetext loadmovesprites end @@ -137,14 +137,14 @@ SageScript_0x980b0: ; 0x980b0 loadfont checkevent EVENT_GOT_CLEAR_BELL iftrue UnknownScript_0x980be - 2writetext UnknownText_0x9840b + writetext UnknownText_0x9840b closetext loadmovesprites end ; 0x980be UnknownScript_0x980be: ; 0x980be - 2writetext UnknownText_0x9846f + writetext UnknownText_0x9846f closetext loadmovesprites end diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm index 79054bd75..3c79bfeac 100644 --- a/maps/EcruteakItemfinderHouse.asm +++ b/maps/EcruteakItemfinderHouse.asm @@ -11,22 +11,22 @@ CooltrainerMScript_0x9a5fb: ; 0x9a5fb loadfont checkevent EVENT_GOT_ITEMFINDER iftrue UnknownScript_0x9a614 - 2writetext UnknownText_0x9a63c + writetext UnknownText_0x9a63c yesorno iffalse UnknownScript_0x9a61a - 2writetext UnknownText_0x9a6b5 + writetext UnknownText_0x9a6b5 keeptextopen verbosegiveitem ITEMFINDER, 1 setevent EVENT_GOT_ITEMFINDER UnknownScript_0x9a614: ; 0x9a614 - 2writetext UnknownText_0x9a70e + writetext UnknownText_0x9a70e closetext loadmovesprites end ; 0x9a61a UnknownScript_0x9a61a: ; 0x9a61a - 2writetext UnknownText_0x9a805 + writetext UnknownText_0x9a805 closetext loadmovesprites end @@ -34,7 +34,7 @@ UnknownScript_0x9a61a: ; 0x9a61a PokedexScript_0x9a620: ; 0x9a620 loadfont - 2writetext UnknownText_0x9a826 + writetext UnknownText_0x9a826 yesorno iftrue UnknownScript_0x9a62a loadmovesprites @@ -42,7 +42,7 @@ PokedexScript_0x9a620: ; 0x9a620 ; 0x9a62a UnknownScript_0x9a62a: ; 0x9a62a - 2writetext UnknownText_0x9a84c + writetext UnknownText_0x9a84c yesorno iftrue UnknownScript_0x9a633 loadmovesprites @@ -50,7 +50,7 @@ UnknownScript_0x9a62a: ; 0x9a62a ; 0x9a633 UnknownScript_0x9a633: ; 0x9a633 - 2writetext UnknownText_0x9a902 + writetext UnknownText_0x9a902 closetext loadmovesprites end diff --git a/maps/EcruteakPokeCenter1F.asm b/maps/EcruteakPokeCenter1F.asm index 4d393bb6b..633c01723 100644 --- a/maps/EcruteakPokeCenter1F.asm +++ b/maps/EcruteakPokeCenter1F.asm @@ -37,13 +37,13 @@ UnknownScript_0x98e64: ; 0x98e64 spriteface $6, $0 pause 10 loadfont - 2writetext UnknownText_0x98ed8 + writetext UnknownText_0x98ed8 keeptextopen - 2jump UnknownScript_0x98e95 + jump UnknownScript_0x98e95 ; 0x98e95 UnknownScript_0x98e95: ; 0x98e95 - 2writetext UnknownText_0x98f22 + writetext UnknownText_0x98f22 closetext loadmovesprites spriteface $0, $0 diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index af2135a6b..12a8da3fd 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -56,18 +56,18 @@ UnknownScript_0x78b8c: ; 0x78b8c showemote $0, $2, 15 spriteface $2, $3 loadfont - 2writetext UnknownText_0x78fb6 + writetext UnknownText_0x78fb6 UnknownScript_0x78b9b: ; 0x78b9b yesorno iftrue UnknownScript_0x78ba5 - 2writetext UnknownText_0x7911a - 2jump UnknownScript_0x78b9b + writetext UnknownText_0x7911a + jump UnknownScript_0x78b9b ; 0x78ba5 UnknownScript_0x78ba5: ; 0x78ba5 - 2writetext UnknownText_0x790fa + writetext UnknownText_0x790fa keeptextopen - 2writetext UnknownText_0x7913a + writetext UnknownText_0x7913a closetext loadmovesprites playsound SFX_GLASS_TING @@ -75,12 +75,12 @@ UnknownScript_0x78ba5: ; 0x78ba5 showemote $0, $2, 10 spriteface $2, $0 loadfont - 2writetext UnknownText_0x791ae + writetext UnknownText_0x791ae closetext loadmovesprites loadfont spriteface $2, $3 - 2writetext UnknownText_0x791df + writetext UnknownText_0x791df closetext loadmovesprites applymovement $2, MovementData_0x78fa0 @@ -88,7 +88,7 @@ UnknownScript_0x78ba5: ; 0x78ba5 applymovement $2, MovementData_0x78fa2 spriteface $0, $3 loadfont - 2writetext UnknownText_0x792ff + writetext UnknownText_0x792ff closetext dotrigger $1 loadmovesprites @@ -120,7 +120,7 @@ UnknownScript_0x78bfa: ; 0x78bfa writebyte TOGETIC special $0043 iftrue ShowElmTogepiScript - 2writetext UnknownText_0x79a40 + writetext UnknownText_0x79a40 closetext loadmovesprites end @@ -133,7 +133,7 @@ UnknownScript_0x78c22: ; 0x78c22 writebyte TOGETIC special $0043 iftrue ShowElmTogepiScript - 2jump UnknownScript_0x78c41 + jump UnknownScript_0x78c41 ; 0x78c35 UnknownScript_0x78c35: ; 0x78c35 @@ -152,7 +152,7 @@ UnknownScript_0x78c41: ; 0x78c41 iftrue ElmAfterTheftScript checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue ElmDescribesMrPokemonScript - 2writetext UnknownText_0x79375 + writetext UnknownText_0x79375 closetext loadmovesprites end @@ -161,7 +161,7 @@ UnknownScript_0x78c41: ; 0x78c41 LabTryToLeaveScript: ; 0x78c65 spriteface $2, $0 loadfont - 2writetext LabWhereGoingText + writetext LabWhereGoingText closetext loadmovesprites applymovement $0, MovementData_0x78f70 @@ -178,16 +178,16 @@ CyndaquilPokeBallScript: ; 0x78c73 closetext pokepicyesorno loadfont - 2writetext TakeCyndaquilText + writetext TakeCyndaquilText yesorno iffalse DidntChooseStarterScript disappear $4 setevent EVENT_GOT_CYNDAQUIL_FROM_ELM - 2writetext ChoseStarterText + writetext ChoseStarterText keeptextopen waitbutton pokenamemem CYNDAQUIL, $0 - 2writetext ReceivedStarterText + writetext ReceivedStarterText playsound SFX_CAUGHT_MON waitbutton keeptextopen @@ -196,7 +196,7 @@ CyndaquilPokeBallScript: ; 0x78c73 checkcode $9 if_equal $3, ElmDirectionsScript applymovement $0, AfterCyndaquilMovement - 2jump ElmDirectionsScript + jump ElmDirectionsScript ; 0x78cb5 TotodilePokeBallScript: ; 0x78cb5 @@ -209,23 +209,23 @@ TotodilePokeBallScript: ; 0x78cb5 closetext pokepicyesorno loadfont - 2writetext TakeTotodileText + writetext TakeTotodileText yesorno iffalse DidntChooseStarterScript disappear $5 setevent EVENT_GOT_TOTODILE_FROM_ELM - 2writetext ChoseStarterText + writetext ChoseStarterText keeptextopen waitbutton pokenamemem TOTODILE, $0 - 2writetext ReceivedStarterText + writetext ReceivedStarterText playsound SFX_CAUGHT_MON waitbutton keeptextopen givepoke TOTODILE, 5, BERRY, 0 loadmovesprites applymovement $0, AfterTotodileMovement - 2jump ElmDirectionsScript + jump ElmDirectionsScript ; 0x78cf1 ChikoritaPokeBallScript: ; 0x78cf1 @@ -238,27 +238,27 @@ ChikoritaPokeBallScript: ; 0x78cf1 closetext pokepicyesorno loadfont - 2writetext TakeChikoritaText + writetext TakeChikoritaText yesorno iffalse DidntChooseStarterScript disappear $6 setevent EVENT_GOT_CHIKORITA_FROM_ELM - 2writetext ChoseStarterText + writetext ChoseStarterText keeptextopen waitbutton pokenamemem CHIKORITA, $0 - 2writetext ReceivedStarterText + writetext ReceivedStarterText playsound SFX_CAUGHT_MON waitbutton keeptextopen givepoke CHIKORITA, 5, BERRY, 0 loadmovesprites applymovement $0, AfterChikoritaMovement - 2jump ElmDirectionsScript + jump ElmDirectionsScript ; 0x78d2d DidntChooseStarterScript: ; 0x78d2d - 2writetext DidntChooseStarterText + writetext DidntChooseStarterText closetext loadmovesprites end @@ -267,24 +267,24 @@ DidntChooseStarterScript: ; 0x78d2d ElmDirectionsScript: ; 0x78d33 spriteface $0, $1 loadfont - 2writetext ElmDirectionsText1 + writetext ElmDirectionsText1 closetext loadmovesprites addcellnum $4 loadfont - 2writetext GotElmsNumberText + writetext GotElmsNumberText playsound SFX_REGISTER_PHONE_NUMBER waitbutton closetext loadmovesprites spriteface $2, $2 loadfont - 2writetext ElmDirectionsText2 + writetext ElmDirectionsText2 closetext loadmovesprites spriteface $2, $0 loadfont - 2writetext ElmDirectionsText3 + writetext ElmDirectionsText3 closetext loadmovesprites setevent EVENT_GOT_A_POKEMON_FROM_ELM @@ -295,7 +295,7 @@ ElmDirectionsScript: ; 0x78d33 ; 0x78d67 ElmDescribesMrPokemonScript: ; 0x78d67 - 2writetext ElmDescribesMrPokemonText + writetext ElmDescribesMrPokemonText closetext loadmovesprites end @@ -303,7 +303,7 @@ ElmDescribesMrPokemonScript: ; 0x78d67 LookAtElmPokeBallScript: ; 0x78d6d loadfont - 2writetext ElmPokeBallText + writetext ElmPokeBallText closetext loadmovesprites end @@ -313,14 +313,14 @@ MapElmsLabSignpost0Script: ; 0x78d74 loadfont checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue UnknownScript_0x78d81 - 2writetext UnknownText_0x79690 + writetext UnknownText_0x79690 closetext loadmovesprites end ; 0x78d81 UnknownScript_0x78d81: ; 0x78d81 - 2writetext UnknownText_0x796aa + writetext UnknownText_0x796aa yesorno iftrue UnknownScript_0x78d8a loadmovesprites @@ -346,27 +346,27 @@ ElmAfterTheftDoneScript: ; 0x78d9f ; 0x78da2 ElmAfterTheftScript: ; 0x78da2 - 2writetext ElmAfterTheftText1 + writetext ElmAfterTheftText1 checkitem MYSTERY_EGG iffalse ElmAfterTheftDoneScript keeptextopen - 2writetext ElmAfterTheftText2 + writetext ElmAfterTheftText2 closetext takeitem MYSTERY_EGG, 1 - 2call ElmJumpBackScript1 - 2writetext ElmAfterTheftText3 + scall ElmJumpBackScript1 + writetext ElmAfterTheftText3 closetext - 2call ElmJumpBackScript2 - 2writetext ElmAfterTheftText4 + scall ElmJumpBackScript2 + writetext ElmAfterTheftText4 keeptextopen - 2writetext ElmAfterTheftText5 + writetext ElmAfterTheftText5 keeptextopen setevent EVENT_GAVE_MYSTERY_EGG_TO_ELM setflag $0010 domaptrigger GROUP_ROUTE_29, MAP_ROUTE_29, $1 clearevent $0715 setevent $0714 - 2writetext ElmAfterTheftText6 + writetext ElmAfterTheftText6 closetext loadmovesprites dotrigger $6 @@ -374,43 +374,43 @@ ElmAfterTheftScript: ; 0x78da2 ; 0x78ddc ElmStudyingEggScript: ; 0x78ddc - 2writetext ElmStudyingEggText + writetext ElmStudyingEggText closetext loadmovesprites end ; 0x78de2 ElmAideHasEggScript: ; 0x78de2 - 2writetext ElmAideHasEggText + writetext ElmAideHasEggText closetext loadmovesprites end ; 0x78de8 ElmWaitingEggHatchScript: ; 0x78de8 - 2writetext ElmWaitingEggHatchText + writetext ElmWaitingEggHatchText closetext loadmovesprites end ; 0x78dee ShowElmTogepiScript: ; 0x78dee - 2writetext ShowElmTogepiText1 + writetext ShowElmTogepiText1 closetext loadmovesprites showemote $0, $2, 15 setevent EVENT_SHOWED_TOGEPI_TO_ELM loadfont - 2writetext ShowElmTogepiText2 + writetext ShowElmTogepiText2 keeptextopen - 2writetext ShowElmTogepiText3 + writetext ShowElmTogepiText3 keeptextopen UnknownScript_0x78e03: ; 0x78e03 - 2writetext ElmGiveEverstoneText1 + writetext ElmGiveEverstoneText1 keeptextopen verbosegiveitem EVERSTONE, 1 iffalse UnknownScript_0x78e1a - 2writetext ElmGiveEverstoneText2 + writetext ElmGiveEverstoneText2 closetext loadmovesprites setevent EVENT_GOT_EVERSTONE_FROM_ELM @@ -418,7 +418,7 @@ UnknownScript_0x78e03: ; 0x78e03 ; 0x78e16 UnknownScript_0x78e16: ; 0x78e16 - 2writetext UnknownText_0x79c37 + writetext UnknownText_0x79c37 closetext UnknownScript_0x78e1a: ; 0x78e1a loadmovesprites @@ -426,12 +426,12 @@ UnknownScript_0x78e1a: ; 0x78e1a ; 0x78e1c ElmGiveMasterBallScript: ; 0x78e1c - 2writetext ElmGiveMasterBallText1 + writetext ElmGiveMasterBallText1 keeptextopen verbosegiveitem MASTER_BALL, 1 iffalse .notdone setevent EVENT_GOT_MASTER_BALL_FROM_ELM - 2writetext ElmGiveMasterBallText2 + writetext ElmGiveMasterBallText2 closetext .notdone loadmovesprites @@ -439,11 +439,11 @@ ElmGiveMasterBallScript: ; 0x78e1c ; 0x78e2f ElmGiveTicketScript: ; 0x78e2f - 2writetext ElmGiveTicketText1 + writetext ElmGiveTicketText1 keeptextopen verbosegiveitem S_S_TICKET, 1 setevent EVENT_GOT_SS_TICKET_FROM_ELM - 2writetext ElmGiveTicketText2 + writetext ElmGiveTicketText2 closetext loadmovesprites end @@ -496,7 +496,7 @@ UnknownScript_0x78e79: ; 0x78e79 UnknownScript_0x78e7f: ; 0x78e7f applymovement $3, MovementData_0x78f7e spriteface $0, $0 - 2call UnknownScript_0x78e9d + scall UnknownScript_0x78e9d applymovement $3, MovementData_0x78f87 end ; 0x78e8e @@ -504,17 +504,17 @@ UnknownScript_0x78e7f: ; 0x78e7f UnknownScript_0x78e8e: ; 0x78e8e applymovement $3, MovementData_0x78f82 spriteface $0, $0 - 2call UnknownScript_0x78e9d + scall UnknownScript_0x78e9d applymovement $3, MovementData_0x78f8b end ; 0x78e9d UnknownScript_0x78e9d: ; 0x78e9d loadfont - 2writetext UnknownText_0x79f38 + writetext UnknownText_0x79f38 keeptextopen verbosegiveitem POTION, 1 - 2writetext UnknownText_0x79f65 + writetext UnknownText_0x79f65 closetext loadmovesprites dotrigger $2 @@ -524,7 +524,7 @@ UnknownScript_0x78e9d: ; 0x78e9d UnknownScript_0x78ead: ; 0x78ead applymovement $3, MovementData_0x78f7e spriteface $0, $0 - 2call UnknownScript_0x78ecb + scall UnknownScript_0x78ecb applymovement $3, MovementData_0x78f87 end ; 0x78ebc @@ -532,19 +532,19 @@ UnknownScript_0x78ead: ; 0x78ead UnknownScript_0x78ebc: ; 0x78ebc applymovement $3, MovementData_0x78f82 spriteface $0, $0 - 2call UnknownScript_0x78ecb + scall UnknownScript_0x78ecb applymovement $3, MovementData_0x78f8b end ; 0x78ecb UnknownScript_0x78ecb: ; 0x78ecb loadfont - 2writetext UnknownText_0x7a078 + writetext UnknownText_0x7a078 keeptextopen itemtotext POKE_BALL, $1 - 2call UnknownScript_0x78ee2 + scall UnknownScript_0x78ee2 giveitem POKE_BALL, $5 - 2writetext UnknownText_0x7a09a + writetext UnknownText_0x7a09a keeptextopen itemnotify loadmovesprites @@ -566,28 +566,28 @@ ElmsAideScript: ; 0x78ee6 iftrue UnknownScript_0x78f06 checkevent EVENT_GOT_MYSTERY_EGG_FROM_MR_POKEMON iftrue UnknownScript_0x78f00 - 2writetext UnknownText_0x79f65 + writetext UnknownText_0x79f65 closetext loadmovesprites end ; 0x78f00 UnknownScript_0x78f00: ; 0x78f00 - 2writetext UnknownText_0x79f95 + writetext UnknownText_0x79f95 closetext loadmovesprites end ; 0x78f06 UnknownScript_0x78f06: ; 0x78f06 - 2writetext UnknownText_0x7a09a + writetext UnknownText_0x7a09a closetext loadmovesprites end ; 0x78f0c UnknownScript_0x78f0c: ; 0x78f0c - 2writetext UnknownText_0x79c65 + writetext UnknownText_0x79c65 closetext loadmovesprites end @@ -602,10 +602,10 @@ MeetCopScript: ; 0x78f16 CopScript: ; 0x78f1a spriteface $7, $2 loadfont - 2writetext UnknownText_0x7a0f0 + writetext UnknownText_0x7a0f0 keeptextopen special $0024 - 2writetext UnknownText_0x7a1c0 + writetext UnknownText_0x7a1c0 closetext loadmovesprites applymovement $7, MovementData_0x78f78 @@ -620,18 +620,18 @@ MapElmsLabSignpost14Script: ; 0x78f33 iftrue UnknownScript_0x78f49 checkevent EVENT_ELM_CALLED_ABOUT_STOLEN_POKEMON iftrue UnknownScript_0x78f43 - 2jump UnknownScript_0x78f49 + jump UnknownScript_0x78f49 ; 0x78f43 UnknownScript_0x78f43: ; 0x78f43 - 2writetext UnknownText_0x7a231 + writetext UnknownText_0x7a231 closetext loadmovesprites end ; 0x78f49 UnknownScript_0x78f49: ; 0x78f49 - 2writetext UnknownText_0x7a1fd + writetext UnknownText_0x7a1fd closetext loadmovesprites end diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index c2821f41f..7d0896ddb 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -51,14 +51,14 @@ SailorScript_0x75160: ; 0x75160 iftrue UnknownScript_0x7517a checkevent $002f iftrue UnknownScript_0x75174 - 2writetext UnknownText_0x7523b + writetext UnknownText_0x7523b closetext loadmovesprites end ; 0x75174 UnknownScript_0x75174: ; 0x75174 - 2writetext UnknownText_0x7529b + writetext UnknownText_0x7529b closetext loadmovesprites end @@ -67,10 +67,10 @@ UnknownScript_0x75174: ; 0x75174 UnknownScript_0x7517a: ; 0x7517a checkevent $002f iftrue UnknownScript_0x7519c - 2writetext UnknownText_0x754be + writetext UnknownText_0x754be closetext loadmovesprites - 2call UnknownScript_0x751b8 + scall UnknownScript_0x751b8 playsound SFX_EXIT_BUILDING special $002e waitbutton @@ -81,10 +81,10 @@ UnknownScript_0x7517a: ; 0x7517a ; 0x7519c UnknownScript_0x7519c: ; 0x7519c - 2writetext UnknownText_0x7548d + writetext UnknownText_0x7548d closetext loadmovesprites - 2call UnknownScript_0x751b8 + scall UnknownScript_0x751b8 playsound SFX_EXIT_BUILDING special $002e waitbutton @@ -113,14 +113,14 @@ SailorScript_0x751d0: ; 0x751d0 loadfont checkevent $0030 iftrue UnknownScript_0x751de - 2writetext UnknownText_0x752f9 + writetext UnknownText_0x752f9 closetext loadmovesprites end ; 0x751de UnknownScript_0x751de: ; 0x751de - 2writetext UnknownText_0x7534f + writetext UnknownText_0x7534f closetext loadmovesprites end @@ -141,7 +141,7 @@ UnknownScript_0x751eb: ; 0x751eb applymovement $0, MovementData_0x7522e applymovement $5, MovementData_0x75220 loadfont - 2writetext UnknownText_0x75412 + writetext UnknownText_0x75412 closetext loadmovesprites spriteface $0, $3 diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index 5840a2252..4942bb957 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -53,7 +53,7 @@ SailorScript_0x76767: ; 0x76767 iftrue UnknownScript_0x7678d checkevent $0034 iftrue UnknownScript_0x76787 - 2writetext UnknownText_0x7687b + writetext UnknownText_0x7687b closetext loadmovesprites setevent $0034 @@ -62,14 +62,14 @@ SailorScript_0x76767: ; 0x76767 ; 0x76787 UnknownScript_0x76787: ; 0x76787 - 2writetext UnknownText_0x76907 + writetext UnknownText_0x76907 closetext loadmovesprites end ; 0x7678d UnknownScript_0x7678d: ; 0x7678d - 2writetext UnknownText_0x7692e + writetext UnknownText_0x7692e checkevent $0032 iffalse UnknownScript_0x76799 closetext @@ -79,14 +79,14 @@ UnknownScript_0x7678d: ; 0x7678d UnknownScript_0x76799: ; 0x76799 keeptextopen - 2writetext UnknownText_0x7696d + writetext UnknownText_0x7696d closetext loadmovesprites end ; 0x767a0 UnknownScript_0x767a0: ; 0x767a0 - 2writetext UnknownText_0x7699d + writetext UnknownText_0x7699d closetext loadmovesprites end @@ -115,7 +115,7 @@ TrainerSailorJeff: ; 0x767a6 SailorJeffScript: ; 0x767b2 talkaftercancel loadfont - 2writetext UnknownText_0x76a38 + writetext UnknownText_0x76a38 closetext loadmovesprites end @@ -144,7 +144,7 @@ TrainerPicnickerDebra: ; 0x767ba PicnickerDebraScript: ; 0x767c6 talkaftercancel loadfont - 2writetext UnknownText_0x76a99 + writetext UnknownText_0x76a99 closetext loadmovesprites end @@ -173,7 +173,7 @@ TrainerJugglerFritz: ; 0x767ce JugglerFritzScript: ; 0x767da talkaftercancel loadfont - 2writetext UnknownText_0x76b02 + writetext UnknownText_0x76b02 closetext loadmovesprites end @@ -202,7 +202,7 @@ TrainerSailorGarrett: ; 0x767e2 SailorGarrettScript: ; 0x767ee talkaftercancel loadfont - 2writetext UnknownText_0x76b7a + writetext UnknownText_0x76b7a closetext loadmovesprites end @@ -231,7 +231,7 @@ TrainerFisherJonah: ; 0x767f6 FisherJonahScript: ; 0x76802 talkaftercancel loadfont - 2writetext UnknownText_0x76c22 + writetext UnknownText_0x76c22 closetext loadmovesprites end @@ -260,7 +260,7 @@ TrainerBlackbeltWai: ; 0x7680a BlackbeltWaiScript: ; 0x76816 talkaftercancel loadfont - 2writetext UnknownText_0x76c9e + writetext UnknownText_0x76c9e closetext loadmovesprites end @@ -289,7 +289,7 @@ TrainerSailorKenneth: ; 0x7681e SailorKennethScript: ; 0x7682a talkaftercancel loadfont - 2writetext UnknownText_0x76d5f + writetext UnknownText_0x76d5f closetext loadmovesprites end @@ -318,7 +318,7 @@ TrainerTeacherShirley: ; 0x76832 TeacherShirleyScript: ; 0x7683e talkaftercancel loadfont - 2writetext UnknownText_0x76de1 + writetext UnknownText_0x76de1 closetext loadmovesprites end @@ -347,7 +347,7 @@ TrainerSchoolboyNate: ; 0x76846 SchoolboyNateScript: ; 0x76852 talkaftercancel loadfont - 2writetext UnknownText_0x76e3d + writetext UnknownText_0x76e3d closetext loadmovesprites end @@ -376,7 +376,7 @@ TrainerSchoolboyRicky: ; 0x7685a SchoolboyRickyScript: ; 0x76866 talkaftercancel loadfont - 2writetext UnknownText_0x76eb6 + writetext UnknownText_0x76eb6 closetext loadmovesprites end diff --git a/maps/FastShipCabins.asm b/maps/FastShipCabins.asm index b8776e0af..d6a24950f 100644 --- a/maps/FastShipCabins.asm +++ b/maps/FastShipCabins.asm @@ -15,14 +15,14 @@ CaptainScript_0x75ea7: ; 0x75ea7 loadfont checkevent $0030 iftrue UnknownScript_0x75eb5 - 2writetext UnknownText_0x76012 + writetext UnknownText_0x76012 closetext loadmovesprites end ; 0x75eb5 UnknownScript_0x75eb5: ; 0x75eb5 - 2writetext UnknownText_0x76064 + writetext UnknownText_0x76064 closetext loadmovesprites end @@ -31,12 +31,12 @@ UnknownScript_0x75eb5: ; 0x75eb5 TwinScript_0x75ebb: ; 0x75ebb spriteface $5, $3 loadfont - 2writetext UnknownText_0x761e0 + writetext UnknownText_0x761e0 closetext loadmovesprites faceplayer loadfont - 2writetext UnknownText_0x7621f + writetext UnknownText_0x7621f closetext loadmovesprites special $0030 @@ -55,26 +55,26 @@ TwinScript_0x75ebb: ; 0x75ebb checkflag $0063 iftrue UnknownScript_0x75f03 loadfont - 2writetext UnknownText_0x76284 + writetext UnknownText_0x76284 closetext loadmovesprites - 2jump UnknownScript_0x75f09 + jump UnknownScript_0x75f09 ; 0x75f03 UnknownScript_0x75f03: ; 0x75f03 loadfont - 2writetext UnknownText_0x762c6 + writetext UnknownText_0x762c6 closetext loadmovesprites UnknownScript_0x75f09: ; 0x75f09 spriteface $5, $0 applymovement $3, MovementData_0x76010 loadfont - 2writetext UnknownText_0x76143 + writetext UnknownText_0x76143 keeptextopen setevent $072b domaptrigger GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F, $0 - 2jump UnknownScript_0x75f37 + jump UnknownScript_0x75f37 ; 0x75f1f GentlemanScript_0x75f1f: ; 0x75f1f @@ -84,7 +84,7 @@ GentlemanScript_0x75f1f: ; 0x75f1f iftrue UnknownScript_0x75f67 checkevent $0732 iftrue UnknownScript_0x75f58 - 2writetext UnknownText_0x760ae + writetext UnknownText_0x760ae closetext loadmovesprites domaptrigger GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F, $0 @@ -92,7 +92,7 @@ GentlemanScript_0x75f1f: ; 0x75f1f ; 0x75f37 UnknownScript_0x75f37: ; 0x75f37 - 2writetext UnknownText_0x7619b + writetext UnknownText_0x7619b keeptextopen verbosegiveitem METAL_COAT, 1 iffalse UnknownScript_0x75f44 @@ -103,7 +103,7 @@ UnknownScript_0x75f44: ; 0x75f44 playsound SFX_ELEVATOR_END pause 30 loadfont - 2writetext UnknownText_0x76645 + writetext UnknownText_0x76645 closetext setevent $0031 setevent $0032 @@ -112,7 +112,7 @@ UnknownScript_0x75f44: ; 0x75f44 ; 0x75f58 UnknownScript_0x75f58: ; 0x75f58 - 2writetext UnknownText_0x7619b + writetext UnknownText_0x7619b keeptextopen verbosegiveitem METAL_COAT, 1 iffalse UnknownScript_0x75f65 @@ -123,7 +123,7 @@ UnknownScript_0x75f65: ; 0x75f65 ; 0x75f67 UnknownScript_0x75f67: ; 0x75f67 - 2writetext UnknownText_0x761be + writetext UnknownText_0x761be closetext loadmovesprites end @@ -132,7 +132,7 @@ UnknownScript_0x75f67: ; 0x75f67 TwinScript_0x75f6d: ; 0x75f6d faceplayer loadfont - 2writetext UnknownText_0x7630d + writetext UnknownText_0x7630d closetext loadmovesprites end @@ -161,7 +161,7 @@ TrainerPokefanmColin: ; 0x75f75 PokefanmColinScript: ; 0x75f81 talkaftercancel loadfont - 2writetext UnknownText_0x7635b + writetext UnknownText_0x7635b closetext loadmovesprites end @@ -190,7 +190,7 @@ TrainerTwinsMegandpeg1: ; 0x75f89 TwinsMegandpeg1Script: ; 0x75f95 talkaftercancel loadfont - 2writetext UnknownText_0x763c2 + writetext UnknownText_0x763c2 closetext loadmovesprites end @@ -219,7 +219,7 @@ TrainerTwinsMegandpeg2: ; 0x75f9d TwinsMegandpeg2Script: ; 0x75fa9 talkaftercancel loadfont - 2writetext UnknownText_0x76428 + writetext UnknownText_0x76428 closetext loadmovesprites end @@ -248,7 +248,7 @@ TrainerPsychicRodney: ; 0x75fb1 PsychicRodneyScript: ; 0x75fbd talkaftercancel loadfont - 2writetext UnknownText_0x76497 + writetext UnknownText_0x76497 closetext loadmovesprites end @@ -277,7 +277,7 @@ TrainerPokefanmJeremy: ; 0x75fc5 PokefanmJeremyScript: ; 0x75fd1 talkaftercancel loadfont - 2writetext UnknownText_0x7651c + writetext UnknownText_0x7651c closetext loadmovesprites end @@ -306,7 +306,7 @@ TrainerPokefanfGeorgia: ; 0x75fd9 PokefanfGeorgiaScript: ; 0x75fe5 talkaftercancel loadfont - 2writetext UnknownText_0x76596 + writetext UnknownText_0x76596 closetext loadmovesprites end @@ -335,7 +335,7 @@ TrainerSupernerdShawn: ; 0x75fed SupernerdShawnScript: ; 0x75ff9 talkaftercancel loadfont - 2writetext UnknownText_0x7660f + writetext UnknownText_0x7660f closetext loadmovesprites end diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index e2e80bbb7..57f4b84e7 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -29,7 +29,7 @@ TrainerCooltrainermSean: ; 0x75579 CooltrainermSeanScript: ; 0x75585 talkaftercancel loadfont - 2writetext UnknownText_0x7567b + writetext UnknownText_0x7567b closetext loadmovesprites end @@ -58,7 +58,7 @@ TrainerCooltrainerfCarol: ; 0x7558d CooltrainerfCarolScript: ; 0x75599 talkaftercancel loadfont - 2writetext UnknownText_0x756f7 + writetext UnknownText_0x756f7 closetext loadmovesprites end @@ -87,7 +87,7 @@ TrainerPokemaniacEthan: ; 0x755a1 PokemaniacEthanScript: ; 0x755ad talkaftercancel loadfont - 2writetext UnknownText_0x7574b + writetext UnknownText_0x7574b closetext loadmovesprites end @@ -116,7 +116,7 @@ TrainerHikerNoland: ; 0x755b5 HikerNolandScript: ; 0x755c1 talkaftercancel loadfont - 2writetext UnknownText_0x757d4 + writetext UnknownText_0x757d4 closetext loadmovesprites end @@ -145,7 +145,7 @@ TrainerGentlemanEdward: ; 0x755c9 GentlemanEdwardScript: ; 0x755d5 talkaftercancel loadfont - 2writetext UnknownText_0x75937 + writetext UnknownText_0x75937 closetext loadmovesprites end @@ -174,7 +174,7 @@ TrainerBurglarCorey: ; 0x755dd BurglarCoreyScript: ; 0x755e9 talkaftercancel loadfont - 2writetext UnknownText_0x75996 + writetext UnknownText_0x75996 closetext loadmovesprites end @@ -184,7 +184,7 @@ SailorScript_0x755f1: ; 0x755f1 playmusic MUSIC_HIKER_ENCOUNTER faceplayer loadfont - 2writetext UnknownText_0x75812 + writetext UnknownText_0x75812 closetext loadmovesprites winlosstext UnknownText_0x75897, $0000 @@ -194,7 +194,7 @@ SailorScript_0x755f1: ; 0x755f1 special $001b setevent $057d loadfont - 2writetext UnknownText_0x758b1 + writetext UnknownText_0x758b1 closetext loadmovesprites setevent $0033 diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index b8776e0af..d6a24950f 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -15,14 +15,14 @@ CaptainScript_0x75ea7: ; 0x75ea7 loadfont checkevent $0030 iftrue UnknownScript_0x75eb5 - 2writetext UnknownText_0x76012 + writetext UnknownText_0x76012 closetext loadmovesprites end ; 0x75eb5 UnknownScript_0x75eb5: ; 0x75eb5 - 2writetext UnknownText_0x76064 + writetext UnknownText_0x76064 closetext loadmovesprites end @@ -31,12 +31,12 @@ UnknownScript_0x75eb5: ; 0x75eb5 TwinScript_0x75ebb: ; 0x75ebb spriteface $5, $3 loadfont - 2writetext UnknownText_0x761e0 + writetext UnknownText_0x761e0 closetext loadmovesprites faceplayer loadfont - 2writetext UnknownText_0x7621f + writetext UnknownText_0x7621f closetext loadmovesprites special $0030 @@ -55,26 +55,26 @@ TwinScript_0x75ebb: ; 0x75ebb checkflag $0063 iftrue UnknownScript_0x75f03 loadfont - 2writetext UnknownText_0x76284 + writetext UnknownText_0x76284 closetext loadmovesprites - 2jump UnknownScript_0x75f09 + jump UnknownScript_0x75f09 ; 0x75f03 UnknownScript_0x75f03: ; 0x75f03 loadfont - 2writetext UnknownText_0x762c6 + writetext UnknownText_0x762c6 closetext loadmovesprites UnknownScript_0x75f09: ; 0x75f09 spriteface $5, $0 applymovement $3, MovementData_0x76010 loadfont - 2writetext UnknownText_0x76143 + writetext UnknownText_0x76143 keeptextopen setevent $072b domaptrigger GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F, $0 - 2jump UnknownScript_0x75f37 + jump UnknownScript_0x75f37 ; 0x75f1f GentlemanScript_0x75f1f: ; 0x75f1f @@ -84,7 +84,7 @@ GentlemanScript_0x75f1f: ; 0x75f1f iftrue UnknownScript_0x75f67 checkevent $0732 iftrue UnknownScript_0x75f58 - 2writetext UnknownText_0x760ae + writetext UnknownText_0x760ae closetext loadmovesprites domaptrigger GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F, $0 @@ -92,7 +92,7 @@ GentlemanScript_0x75f1f: ; 0x75f1f ; 0x75f37 UnknownScript_0x75f37: ; 0x75f37 - 2writetext UnknownText_0x7619b + writetext UnknownText_0x7619b keeptextopen verbosegiveitem METAL_COAT, 1 iffalse UnknownScript_0x75f44 @@ -103,7 +103,7 @@ UnknownScript_0x75f44: ; 0x75f44 playsound SFX_ELEVATOR_END pause 30 loadfont - 2writetext UnknownText_0x76645 + writetext UnknownText_0x76645 closetext setevent $0031 setevent $0032 @@ -112,7 +112,7 @@ UnknownScript_0x75f44: ; 0x75f44 ; 0x75f58 UnknownScript_0x75f58: ; 0x75f58 - 2writetext UnknownText_0x7619b + writetext UnknownText_0x7619b keeptextopen verbosegiveitem METAL_COAT, 1 iffalse UnknownScript_0x75f65 @@ -123,7 +123,7 @@ UnknownScript_0x75f65: ; 0x75f65 ; 0x75f67 UnknownScript_0x75f67: ; 0x75f67 - 2writetext UnknownText_0x761be + writetext UnknownText_0x761be closetext loadmovesprites end @@ -132,7 +132,7 @@ UnknownScript_0x75f67: ; 0x75f67 TwinScript_0x75f6d: ; 0x75f6d faceplayer loadfont - 2writetext UnknownText_0x7630d + writetext UnknownText_0x7630d closetext loadmovesprites end @@ -161,7 +161,7 @@ TrainerPokefanmColin: ; 0x75f75 PokefanmColinScript: ; 0x75f81 talkaftercancel loadfont - 2writetext UnknownText_0x7635b + writetext UnknownText_0x7635b closetext loadmovesprites end @@ -190,7 +190,7 @@ TrainerTwinsMegandpeg1: ; 0x75f89 TwinsMegandpeg1Script: ; 0x75f95 talkaftercancel loadfont - 2writetext UnknownText_0x763c2 + writetext UnknownText_0x763c2 closetext loadmovesprites end @@ -219,7 +219,7 @@ TrainerTwinsMegandpeg2: ; 0x75f9d TwinsMegandpeg2Script: ; 0x75fa9 talkaftercancel loadfont - 2writetext UnknownText_0x76428 + writetext UnknownText_0x76428 closetext loadmovesprites end @@ -248,7 +248,7 @@ TrainerPsychicRodney: ; 0x75fb1 PsychicRodneyScript: ; 0x75fbd talkaftercancel loadfont - 2writetext UnknownText_0x76497 + writetext UnknownText_0x76497 closetext loadmovesprites end @@ -277,7 +277,7 @@ TrainerPokefanmJeremy: ; 0x75fc5 PokefanmJeremyScript: ; 0x75fd1 talkaftercancel loadfont - 2writetext UnknownText_0x7651c + writetext UnknownText_0x7651c closetext loadmovesprites end @@ -306,7 +306,7 @@ TrainerPokefanfGeorgia: ; 0x75fd9 PokefanfGeorgiaScript: ; 0x75fe5 talkaftercancel loadfont - 2writetext UnknownText_0x76596 + writetext UnknownText_0x76596 closetext loadmovesprites end @@ -335,7 +335,7 @@ TrainerSupernerdShawn: ; 0x75fed SupernerdShawnScript: ; 0x75ff9 talkaftercancel loadfont - 2writetext UnknownText_0x7660f + writetext UnknownText_0x7660f closetext loadmovesprites end diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index 8859a2f2f..1a62f21b5 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -29,7 +29,7 @@ TrainerFirebreatherLyle: ; 0x75a4f FirebreatherLyleScript: ; 0x75a5b talkaftercancel loadfont - 2writetext UnknownText_0x75b52 + writetext UnknownText_0x75b52 closetext loadmovesprites end @@ -58,7 +58,7 @@ TrainerBug_catcherKen: ; 0x75a63 Bug_catcherKenScript: ; 0x75a6f talkaftercancel loadfont - 2writetext UnknownText_0x75bd5 + writetext UnknownText_0x75bd5 closetext loadmovesprites end @@ -87,7 +87,7 @@ TrainerBeautyCassie: ; 0x75a77 BeautyCassieScript: ; 0x75a83 talkaftercancel loadfont - 2writetext UnknownText_0x75c43 + writetext UnknownText_0x75c43 closetext loadmovesprites end @@ -118,7 +118,7 @@ GuitaristClydeScript: ; 0x75a97 special $00a0 iftrue UnknownScript_0x75aa5 loadfont - 2writetext UnknownText_0x75d65 + writetext UnknownText_0x75d65 closetext loadmovesprites end @@ -126,7 +126,7 @@ GuitaristClydeScript: ; 0x75a97 UnknownScript_0x75aa5: ; 0x75aa5 loadfont - 2writetext UnknownText_0x75cfe + writetext UnknownText_0x75cfe closetext loadmovesprites end @@ -134,7 +134,7 @@ UnknownScript_0x75aa5: ; 0x75aa5 MapFastShipCabins_SW_SSW_NWSignpost1Script: ; 0x75aac loadfont - 2writetext UnknownText_0x75da4 + writetext UnknownText_0x75da4 closetext loadmovesprites special $0030 @@ -146,7 +146,7 @@ MapFastShipCabins_SW_SSW_NWSignpost1Script: ; 0x75aac special $003d special $0032 loadfont - 2writetext UnknownText_0x75dc1 + writetext UnknownText_0x75dc1 closetext loadmovesprites checkevent $0031 @@ -165,7 +165,7 @@ UnknownScript_0x75ae2: ; 0x75ae2 checkevent $002f iftrue UnknownScript_0x75af7 loadfont - 2writetext UnknownText_0x75e0f + writetext UnknownText_0x75e0f closetext loadmovesprites setevent $0031 @@ -174,7 +174,7 @@ UnknownScript_0x75ae2: ; 0x75ae2 UnknownScript_0x75af7: ; 0x75af7 loadfont - 2writetext UnknownText_0x75dde + writetext UnknownText_0x75dde closetext loadmovesprites setevent $0031 diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index 834d6dd94..4f2ee927d 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -12,7 +12,7 @@ JanineScript_0x195db9: ; 0x195db9 applymovement $2, MovementData_0x195f27 faceplayer loadfont - 2writetext UnknownText_0x195f35 + writetext UnknownText_0x195f35 closetext loadmovesprites winlosstext UnknownText_0x195fa1, $0000 @@ -30,11 +30,11 @@ JanineScript_0x195db9: ; 0x195db9 variablesprite $a, $27 special $005e loadfont - 2writetext UnknownText_0x195feb + writetext UnknownText_0x195feb playsound SFX_GET_BADGE waitbutton setflag $0027 - 2jump UnknownScript_0x195e02 + jump UnknownScript_0x195e02 ; 0x195e00 UnknownScript_0x195e00: ; 0x195e00 @@ -43,13 +43,13 @@ UnknownScript_0x195e00: ; 0x195e00 UnknownScript_0x195e02: ; 0x195e02 checkevent EVENT_GOT_TM06_TOXIC iftrue UnknownScript_0x195e15 - 2writetext UnknownText_0x196002 + writetext UnknownText_0x196002 keeptextopen verbosegiveitem TM_06, 1 iffalse UnknownScript_0x195e15 setevent EVENT_GOT_TM06_TOXIC UnknownScript_0x195e15: ; 0x195e15 - 2writetext UnknownText_0x196074 + writetext UnknownText_0x196074 closetext loadmovesprites end @@ -67,7 +67,7 @@ UnknownScript_0x195e2c: ; 0x195e2c loadfont checkevent $0517 iftrue UnknownScript_0x195e4f - 2writetext UnknownText_0x1960e6 + writetext UnknownText_0x1960e6 closetext loadmovesprites winlosstext UnknownText_0x196126, $0000 @@ -86,7 +86,7 @@ UnknownScript_0x195e4a: ; 0x195e4a ; 0x195e4f UnknownScript_0x195e4f: ; 0x195e4f - 2writetext UnknownText_0x196139 + writetext UnknownText_0x196139 closetext loadmovesprites end @@ -104,7 +104,7 @@ UnknownScript_0x195e66: ; 0x195e66 loadfont checkevent $051a iftrue UnknownScript_0x195e89 - 2writetext UnknownText_0x196166 + writetext UnknownText_0x196166 closetext loadmovesprites winlosstext UnknownText_0x19617b, $0000 @@ -123,7 +123,7 @@ UnknownScript_0x195e84: ; 0x195e84 ; 0x195e89 UnknownScript_0x195e89: ; 0x195e89 - 2writetext UnknownText_0x196199 + writetext UnknownText_0x196199 closetext loadmovesprites end @@ -141,7 +141,7 @@ UnknownScript_0x195ea0: ; 0x195ea0 loadfont checkevent $0482 iftrue UnknownScript_0x195ec3 - 2writetext UnknownText_0x1961bb + writetext UnknownText_0x1961bb closetext loadmovesprites winlosstext UnknownText_0x1961f1, $0000 @@ -160,7 +160,7 @@ UnknownScript_0x195ebe: ; 0x195ebe ; 0x195ec3 UnknownScript_0x195ec3: ; 0x195ec3 - 2writetext UnknownText_0x19620c + writetext UnknownText_0x19620c closetext loadmovesprites end @@ -178,7 +178,7 @@ UnknownScript_0x195eda: ; 0x195eda loadfont checkevent $041e iftrue UnknownScript_0x195efd - 2writetext UnknownText_0x196228 + writetext UnknownText_0x196228 closetext loadmovesprites winlosstext UnknownText_0x19624a, $0000 @@ -197,7 +197,7 @@ UnknownScript_0x195ef8: ; 0x195ef8 ; 0x195efd UnknownScript_0x195efd: ; 0x195efd - 2writetext UnknownText_0x19626b + writetext UnknownText_0x19626b closetext loadmovesprites end @@ -208,13 +208,13 @@ FuchsiaGymGuyScript: ; 0x195f03 loadfont checkevent EVENT_BEAT_JANINE iftrue .FuchsiaGymGuyWinScript - 2writetext FuchsiaGymGuyText + writetext FuchsiaGymGuyText closetext loadmovesprites end .FuchsiaGymGuyWinScript - 2writetext FuchsiaGymGuyWinText + writetext FuchsiaGymGuyWinText closetext loadmovesprites end diff --git a/maps/FuchsiaPokeCenter1F.asm b/maps/FuchsiaPokeCenter1F.asm index 27cd2e97e..37afaaaca 100644 --- a/maps/FuchsiaPokeCenter1F.asm +++ b/maps/FuchsiaPokeCenter1F.asm @@ -28,7 +28,7 @@ CooltrainerFScript_0x19645f: ; 0x19645f JanineImpersonatorScript_0x196462: ; 0x196462 faceplayer loadfont - 2writetext UnknownText_0x19652e + writetext UnknownText_0x19652e closetext loadmovesprites applymovement $5, MovementData_0x196486 @@ -36,7 +36,7 @@ JanineImpersonatorScript_0x196462: ; 0x196462 variablesprite $c, $a special $005e loadfont - 2writetext UnknownText_0x19654e + writetext UnknownText_0x19654e closetext loadmovesprites applymovement $5, MovementData_0x196486 diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm index 7b0d5c64f..f895f5f46 100644 --- a/maps/GoldenrodBikeShop.asm +++ b/maps/GoldenrodBikeShop.asm @@ -15,28 +15,28 @@ ClerkScript_0x54750: ; 0x54750 loadfont checkevent EVENT_GOT_BICYCLE iftrue UnknownScript_0x54775 - 2writetext UnknownText_0x54787 + writetext UnknownText_0x54787 yesorno iffalse UnknownScript_0x5477b - 2writetext UnknownText_0x547f8 + writetext UnknownText_0x547f8 keeptextopen waitbutton giveitem BICYCLE, $1 - 2writetext UnknownText_0x54848 + writetext UnknownText_0x54848 playsound SFX_KEY_ITEM waitbutton itemnotify setflag $0014 setevent EVENT_GOT_BICYCLE UnknownScript_0x54775: ; 0x54775 - 2writetext UnknownText_0x5485f + writetext UnknownText_0x5485f closetext loadmovesprites end ; 0x5477b UnknownScript_0x5477b: ; 0x5477b - 2writetext UnknownText_0x54898 + writetext UnknownText_0x54898 closetext loadmovesprites end diff --git a/maps/GoldenrodBillsHouse.asm b/maps/GoldenrodBillsHouse.asm index 55902f248..359e69e15 100644 --- a/maps/GoldenrodBillsHouse.asm +++ b/maps/GoldenrodBillsHouse.asm @@ -11,41 +11,41 @@ BillScript_0x54be4: ; 0x54be4 loadfont checkevent EVENT_GOT_EEVEE iftrue UnknownScript_0x54c1f - 2writetext UnknownText_0x54c74 + writetext UnknownText_0x54c74 yesorno iffalse UnknownScript_0x54c19 - 2writetext UnknownText_0x54d3f + writetext UnknownText_0x54d3f keeptextopen waitbutton checkcode $1 if_equal $6, UnknownScript_0x54c13 - 2writetext UnknownText_0x54dae + writetext UnknownText_0x54dae playsound SFX_CAUGHT_MON waitbutton givepoke EEVEE, 20, 0, 0 setevent EVENT_GOT_EEVEE - 2writetext UnknownText_0x54dc1 + writetext UnknownText_0x54dc1 closetext loadmovesprites end ; 0x54c13 UnknownScript_0x54c13: ; 0x54c13 - 2writetext UnknownText_0x54e02 + writetext UnknownText_0x54e02 closetext loadmovesprites end ; 0x54c19 UnknownScript_0x54c19: ; 0x54c19 - 2writetext UnknownText_0x54e2d + writetext UnknownText_0x54e2d closetext loadmovesprites end ; 0x54c1f UnknownScript_0x54c1f: ; 0x54c1f - 2writetext UnknownText_0x54e42 + writetext UnknownText_0x54e42 closetext loadmovesprites end @@ -56,14 +56,14 @@ PokefanFScript_0x54c25: ; 0x54c25 loadfont checkevent $0712 iffalse UnknownScript_0x54c33 - 2writetext UnknownText_0x54ea8 + writetext UnknownText_0x54ea8 closetext loadmovesprites end ; 0x54c33 UnknownScript_0x54c33: ; 0x54c33 - 2writetext UnknownText_0x54f4e + writetext UnknownText_0x54f4e closetext loadmovesprites end @@ -74,34 +74,34 @@ TwinScript_0x54c39: ; 0x54c39 loadfont checkcellnum $3 iftrue UnknownScript_0x54c58 - 2writetext UnknownText_0x54f9e + writetext UnknownText_0x54f9e askforphonenumber $3 if_equal $1, UnknownScript_0x54c64 if_equal $2, UnknownScript_0x54c5e waitbutton addcellnum $3 - 2writetext UnknownText_0x54fd9 + writetext UnknownText_0x54fd9 playsound SFX_REGISTER_PHONE_NUMBER waitbutton keeptextopen UnknownScript_0x54c58: ;0x54c58 - 2writetext UnknownText_0x55069 + writetext UnknownText_0x55069 closetext loadmovesprites end ; 0x54c5e UnknownScript_0x54c5e: ; 0x54c5e - 2writetext UnknownText_0x54ff3 + writetext UnknownText_0x54ff3 closetext loadmovesprites end ; 0x54c64 UnknownScript_0x54c64: ; 0x54c64 - 2writetext UnknownText_0x55046 + writetext UnknownText_0x55046 keeptextopen - 2jump UnknownScript_0x54c5e + jump UnknownScript_0x54c5e ; 0x54c6b MapGoldenrodBillsHouseSignpost1Script: ; 0x54c6b diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 3364aadd6..58852960c 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -46,47 +46,47 @@ UnknownScript_0x198908: ; 0x198908 PokefanMScript_0x198909: ; 0x198909 faceplayer loadfont - 2writetext UnknownText_0x199042 + writetext UnknownText_0x199042 yesorno iffalse UnknownScript_0x19899a special $004f - 2writetext UnknownText_0x199090 + writetext UnknownText_0x199090 yesorno iffalse UnknownScript_0x1989a0 checkcoins 4000 if_equal $2, UnknownScript_0x1989dd - 2writetext UnknownText_0x1990ce + writetext UnknownText_0x1990ce loadmenudata MenuDataHeader_0x198967 interpretmenu2 writebackup if_equal $1, UnknownScript_0x19893a if_equal $2, UnknownScript_0x198949 if_equal $3, UnknownScript_0x198958 - 2jump UnknownScript_0x1989d7 + jump UnknownScript_0x1989d7 ; 0x19893a UnknownScript_0x19893a: ; 0x19893a writebyte $1 - 2writetext UnknownText_0x1991cf + writetext UnknownText_0x1991cf special $0083 if_equal $0, UnknownScript_0x1989a6 - 2jump UnknownScript_0x1989d7 + jump UnknownScript_0x1989d7 ; 0x198949 UnknownScript_0x198949: ; 0x198949 writebyte $2 - 2writetext UnknownText_0x1991cf + writetext UnknownText_0x1991cf special $0083 if_equal $0, UnknownScript_0x1989a6 - 2jump UnknownScript_0x1989d7 + jump UnknownScript_0x1989d7 ; 0x198958 UnknownScript_0x198958: ; 0x198958 writebyte $3 - 2writetext UnknownText_0x1991cf + writetext UnknownText_0x1991cf special $0083 if_equal $0, UnknownScript_0x1989a6 - 2jump UnknownScript_0x1989d7 + jump UnknownScript_0x1989d7 ; 0x198967 @@ -109,33 +109,33 @@ MenuData2_0x19896f: ; 0x19896f UnknownScript_0x19899a: ; 0x19899a - 2writetext UnknownText_0x1990b4 + writetext UnknownText_0x1990b4 closetext loadmovesprites end ; 0x1989a0 UnknownScript_0x1989a0: ; 0x1989a0 - 2writetext UnknownText_0x199107 + writetext UnknownText_0x199107 closetext loadmovesprites end ; 0x1989a6 UnknownScript_0x1989a6: ; 0x1989a6 - 2writetext UnknownText_0x19913a + writetext UnknownText_0x19913a keeptextopen takecoins 4000 waitbutton playsound SFX_TRANSACTION special $004f - 2writetext UnknownText_0x19918b + writetext UnknownText_0x19918b closetext loadmovesprites checkcode $9 if_equal $2, UnknownScript_0x1989c6 applymovement $10, MovementData_0x198a5f - 2jump UnknownScript_0x1989ca + jump UnknownScript_0x1989ca ; 0x1989c6 UnknownScript_0x1989c6: ; 0x1989c6 @@ -150,14 +150,14 @@ UnknownScript_0x1989ca: ; 0x1989ca ; 0x1989d7 UnknownScript_0x1989d7: ; 0x1989d7 - 2writetext UnknownText_0x1991a4 + writetext UnknownText_0x1991a4 closetext loadmovesprites end ; 0x1989dd UnknownScript_0x1989dd: ; 0x1989dd - 2writetext UnknownText_0x1991ac + writetext UnknownText_0x1991ac closetext loadmovesprites end @@ -176,14 +176,14 @@ CooltrainerFScript_0x1989e9: ; 0x1989e9 loadfont checkevent EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x1989f7 - 2writetext UnknownText_0x198ae6 + writetext UnknownText_0x198ae6 closetext loadmovesprites end ; 0x1989f7 UnknownScript_0x1989f7: ; 0x1989f7 - 2writetext UnknownText_0x198b2d + writetext UnknownText_0x198b2d closetext loadmovesprites end @@ -194,14 +194,14 @@ CooltrainerFScript_0x1989fd: ; 0x1989fd loadfont checkflag $0000 iftrue UnknownScript_0x198a0b - 2writetext UnknownText_0x198b73 + writetext UnknownText_0x198b73 closetext loadmovesprites end ; 0x198a0b UnknownScript_0x198a0b: ; 0x198a0b - 2writetext UnknownText_0x198c14 + writetext UnknownText_0x198c14 closetext loadmovesprites end @@ -221,10 +221,10 @@ GrampsScript_0x198a17: ; 0x198a17 RocketScript_0x198a1a: ; 0x198a1a loadfont - 2writetext UnknownText_0x198d0d + writetext UnknownText_0x198d0d keeptextopen faceplayer - 2writetext UnknownText_0x198d2a + writetext UnknownText_0x198d2a closetext loadmovesprites spriteface $9, $1 diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm index be5353181..d3113cdd0 100644 --- a/maps/GoldenrodDeptStore4F.asm +++ b/maps/GoldenrodDeptStore4F.asm @@ -25,7 +25,7 @@ BugCatcherScript_0x55ef4: ; 0x55ef4 GameboyKidScript_0x55ef7: ; 0x55ef7 faceplayer loadfont - 2writetext UnknownText_0x55f74 + writetext UnknownText_0x55f74 closetext loadmovesprites spriteface $5, $0 diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index 6efdae068..b17a4d0d4 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -29,13 +29,13 @@ ClerkScript_0x5609c: ; 0x5609c iftrue UnknownScript_0x560ad checkevent EVENT_GOT_TM08_ROCK_SMASH iftrue UnknownScript_0x560c2 - 2jump UnknownScript_0x560b6 + jump UnknownScript_0x560b6 ; 0x560ad UnknownScript_0x560ad: ; 0x560ad checkevent EVENT_GOT_TM08_ROCK_SMASH iftrue UnknownScript_0x560c8 - 2jump UnknownScript_0x560bc + jump UnknownScript_0x560bc ; 0x560b6 UnknownScript_0x560b6: ; 0x560b6 @@ -70,15 +70,15 @@ ReceptionistScript_0x560ce: ; 0x560ce checkflag $005b iftrue UnknownScript_0x56112 special $0059 - 2writetext UnknownText_0x56143 + writetext UnknownText_0x56143 keeptextopen if_greater_than $95, UnknownScript_0x560ee if_greater_than $31, UnknownScript_0x560fd - 2jump UnknownScript_0x56103 + jump UnknownScript_0x56103 ; 0x560ee UnknownScript_0x560ee: ; 0x560ee - 2writetext UnknownText_0x5615a + writetext UnknownText_0x5615a keeptextopen verbosegiveitem TM_27, 1 iffalse UnknownScript_0x56116 @@ -88,14 +88,14 @@ UnknownScript_0x560ee: ; 0x560ee ; 0x560fd UnknownScript_0x560fd: ; 0x560fd - 2writetext UnknownText_0x561a6 + writetext UnknownText_0x561a6 closetext loadmovesprites end ; 0x56103 UnknownScript_0x56103: ; 0x56103 - 2writetext UnknownText_0x561d8 + writetext UnknownText_0x561d8 keeptextopen verbosegiveitem TM_21, 1 iffalse UnknownScript_0x56116 @@ -105,7 +105,7 @@ UnknownScript_0x56103: ; 0x56103 ; 0x56112 UnknownScript_0x56112: ; 0x56112 - 2writetext UnknownText_0x56202 + writetext UnknownText_0x56202 closetext UnknownScript_0x56116: ; 0x56116 loadmovesprites @@ -117,7 +117,7 @@ TwinScript_0x56118: ; 0x56118 loadfont special $0066 if_not_equal $2, UnknownScript_0x5612a - 2writetext UnknownText_0x56241 + writetext UnknownText_0x56241 closetext loadmovesprites special $0013 @@ -125,7 +125,7 @@ TwinScript_0x56118: ; 0x56118 ; 0x5612a UnknownScript_0x5612a: ; 0x5612a - 2writetext UnknownText_0x56279 + writetext UnknownText_0x56279 closetext loadmovesprites end diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index d137b8d3c..f4054792a 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -8,7 +8,7 @@ GoldenrodDeptStore6F_MapScriptHeader: ; 0x563f3 MapGoldenrodDeptStore6FSignpost5Script: ; 0x563f5 loadfont - 2writetext UnknownText_0x564cb + writetext UnknownText_0x564cb UnknownScript_0x563f9: ; 0x563f9 special $0051 loadmenudata MenuDataHeader_0x56478 @@ -28,7 +28,7 @@ UnknownScript_0x5640f: ; 0x5640f iffalse UnknownScript_0x56471 takemoney $0, 200 itemtotext FRESH_WATER, $0 - 2jump UnknownScript_0x5645d + jump UnknownScript_0x5645d ; 0x56429 UnknownScript_0x56429: ; 0x56429 @@ -38,7 +38,7 @@ UnknownScript_0x56429: ; 0x56429 iffalse UnknownScript_0x56471 takemoney $0, 300 itemtotext SODA_POP, $0 - 2jump UnknownScript_0x5645d + jump UnknownScript_0x5645d ; 0x56443 UnknownScript_0x56443: ; 0x56443 @@ -48,28 +48,28 @@ UnknownScript_0x56443: ; 0x56443 iffalse UnknownScript_0x56471 takemoney $0, 350 itemtotext LEMONADE, $0 - 2jump UnknownScript_0x5645d + jump UnknownScript_0x5645d ; 0x5645d UnknownScript_0x5645d: ; 0x5645d pause 10 playsound SFX_ENTER_DOOR - 2writetext UnknownText_0x564ef + writetext UnknownText_0x564ef keeptextopen itemnotify - 2jump UnknownScript_0x563f9 + jump UnknownScript_0x563f9 ; 0x5646a UnknownScript_0x5646a: ; 0x5646a - 2writetext UnknownText_0x56512 + writetext UnknownText_0x56512 closetext - 2jump UnknownScript_0x563f9 + jump UnknownScript_0x563f9 ; 0x56471 UnknownScript_0x56471: ; 0x56471 - 2writetext UnknownText_0x5652b + writetext UnknownText_0x5652b closetext - 2jump UnknownScript_0x563f9 + jump UnknownScript_0x563f9 ; 0x56478 diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index a4c82a538..7e6da9a2b 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -15,12 +15,12 @@ GoldenrodDeptStoreB1F_MapScriptHeader: ; 0x7d779 UnknownScript_0x7d781: ; 0x7d781 checkevent $004a iftrue UnknownScript_0x7d78a - 2jump UnknownScript_0x7d791 + jump UnknownScript_0x7d791 ; 0x7d78a UnknownScript_0x7d78a: ; 0x7d78a changeblock $10, $4, $d - 2jump UnknownScript_0x7d791 + jump UnknownScript_0x7d791 ; 0x7d791 UnknownScript_0x7d791: ; 0x7d791 @@ -61,7 +61,7 @@ BlackBeltScript_0x7d7b6: ; 0x7d7b6 MachopScript_0x7d7b9: ; 0x7d7b9 loadfont - 2writetext UnknownText_0x7d8bb + writetext UnknownText_0x7d8bb cry MACHOKE closetext loadmovesprites diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index c68159cfc..bc39da5c7 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -52,7 +52,7 @@ PokefanFScript_0x56746: ; 0x56746 FisherScript_0x56749: ; 0x56749 faceplayer loadfont - 2writetext UnknownText_0x567d2 + writetext UnknownText_0x567d2 closetext loadmovesprites spriteface $4, $1 @@ -65,12 +65,12 @@ TwinScript_0x56754: ; 0x56754 SuperNerdScript_0x56757: ; 0x56757 loadfont - 2writetext UnknownText_0x56867 + writetext UnknownText_0x56867 closetext loadmovesprites spriteface $6, $1 loadfont - 2writetext UnknownText_0x56871 + writetext UnknownText_0x56871 closetext loadmovesprites spriteface $6, $3 diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index 525df6626..73a568818 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -19,7 +19,7 @@ TeacherScript_0x5535d: ; 0x5535d iffalse UnknownScript_0x5539c faceplayer loadfont - 2writetext UnknownText_0x554c2 + writetext UnknownText_0x554c2 keeptextopen verbosegiveitem SQUIRTBOTTLE, 1 setevent EVENT_GOT_SQUIRTBOTTLE @@ -32,7 +32,7 @@ TeacherScript_0x5535d: ; 0x5535d UnknownScript_0x5538f: ; 0x5538f spriteface $2, $2 loadfont - 2writetext UnknownText_0x5552e + writetext UnknownText_0x5552e closetext loadmovesprites end @@ -57,7 +57,7 @@ LassScript_0x553a2: ; 0x553a2 iftrue UnknownScript_0x553c5 checkevent EVENT_GOT_SQUIRTBOTTLE iftrue UnknownScript_0x553bf - 2writetext UnknownText_0x55561 + writetext UnknownText_0x55561 closetext loadmovesprites setevent $00ba @@ -67,14 +67,14 @@ LassScript_0x553a2: ; 0x553a2 ; 0x553bf UnknownScript_0x553bf: ; 0x553bf - 2writetext UnknownText_0x555e6 + writetext UnknownText_0x555e6 closetext loadmovesprites end ; 0x553c5 UnknownScript_0x553c5: ; 0x553c5 - 2writetext UnknownText_0x55604 + writetext UnknownText_0x55604 closetext loadmovesprites end diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index 8b446511f..bd10033ab 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -34,7 +34,7 @@ UnknownScript_0x56c19: ;0x56c19 PokefanMScript_0x56c1a: ; 0x56c1a faceplayer loadfont - 2writetext UnknownText_0x5718a + writetext UnknownText_0x5718a closetext loadmovesprites spriteface $d, $3 @@ -48,11 +48,11 @@ ClerkScript_0x56c25: ; 0x56c25 ReceptionistScript_0x56c28: ; 0x56c28 faceplayer loadfont - 2writetext UnknownText_0x56e50 + writetext UnknownText_0x56e50 closetext checkitem COIN_CASE iffalse UnknownScript_0x56cc3 - 2writetext UnknownText_0x56e8b + writetext UnknownText_0x56e8b UnknownScript_0x56c36: ; 056c36 special $004f loadmenudata MenuDataHeader_0x56cc9 @@ -61,47 +61,47 @@ UnknownScript_0x56c36: ; 056c36 if_equal $1, UnknownScript_0x56c4d if_equal $2, UnknownScript_0x56c69 if_equal $3, UnknownScript_0x56c85 - 2jump UnknownScript_0x56cbd + jump UnknownScript_0x56cbd ; 0x56c4d UnknownScript_0x56c4d: ; 0x56c4d checkcoins 5500 if_equal $2, UnknownScript_0x56cb1 itemtotext TM_25, $0 - 2call UnknownScript_0x56ca1 + scall UnknownScript_0x56ca1 iffalse UnknownScript_0x56cbd giveitem TM_25, $1 iffalse UnknownScript_0x56cb7 takecoins 5500 - 2jump UnknownScript_0x56ca6 + jump UnknownScript_0x56ca6 ; 0x56c69 UnknownScript_0x56c69: ; 0x56c69 checkcoins 5500 if_equal $2, UnknownScript_0x56cb1 itemtotext TM_14, $0 - 2call UnknownScript_0x56ca1 + scall UnknownScript_0x56ca1 iffalse UnknownScript_0x56cbd giveitem TM_14, $1 iffalse UnknownScript_0x56cb7 takecoins 5500 - 2jump UnknownScript_0x56ca6 + jump UnknownScript_0x56ca6 ; 0x56c85 UnknownScript_0x56c85: ; 0x56c85 checkcoins 5500 if_equal $2, UnknownScript_0x56cb1 itemtotext TM_38, $0 - 2call UnknownScript_0x56ca1 + scall UnknownScript_0x56ca1 iffalse UnknownScript_0x56cbd giveitem TM_38, $1 iffalse UnknownScript_0x56cb7 takecoins 5500 - 2jump UnknownScript_0x56ca6 + jump UnknownScript_0x56ca6 ; 0x56ca1 UnknownScript_0x56ca1: ; 0x56ca1 - 2writetext UnknownText_0x56ea8 + writetext UnknownText_0x56ea8 yesorno end ; 0x56ca6 @@ -109,34 +109,34 @@ UnknownScript_0x56ca1: ; 0x56ca1 UnknownScript_0x56ca6: ; 0x56ca6 waitbutton playsound SFX_TRANSACTION - 2writetext UnknownText_0x56ebd + writetext UnknownText_0x56ebd closetext - 2jump UnknownScript_0x56c36 + jump UnknownScript_0x56c36 ; 0x56cb1 UnknownScript_0x56cb1: ; 0x56cb1 - 2writetext UnknownText_0x56ecb + writetext UnknownText_0x56ecb closetext loadmovesprites end ; 0x56cb7 UnknownScript_0x56cb7: ; 0x56cb7 - 2writetext UnknownText_0x56ee8 + writetext UnknownText_0x56ee8 closetext loadmovesprites end ; 0x56cbd UnknownScript_0x56cbd: ; 0x56cbd - 2writetext UnknownText_0x56f09 + writetext UnknownText_0x56f09 closetext loadmovesprites end ; 0x56cc3 UnknownScript_0x56cc3: ; 0x56cc3 - 2writetext UnknownText_0x56f35 + writetext UnknownText_0x56f35 closetext loadmovesprites end @@ -164,12 +164,12 @@ MenuData2_0x56cd1: ; 0x56cd1 ReceptionistScript_0x56d01: ; 0x56d01 faceplayer loadfont - 2writetext UnknownText_0x56e50 + writetext UnknownText_0x56e50 closetext checkitem COIN_CASE iffalse UnknownScript_0x56cc3 UnknownScript_0x56d0c: ; 0x56d0c - 2writetext UnknownText_0x56e8b + writetext UnknownText_0x56e8b special $004f loadmenudata MenuDataHeader_0x56db0 interpretmenu2 @@ -177,7 +177,7 @@ UnknownScript_0x56d0c: ; 0x56d0c if_equal $1, UnknownScript_0x56d26 if_equal $2, UnknownScript_0x56d54 if_equal $3, UnknownScript_0x56d82 - 2jump UnknownScript_0x56cbd + jump UnknownScript_0x56cbd ; 0x56d26 UnknownScript_0x56d26: ; 0x56d26 @@ -186,17 +186,17 @@ UnknownScript_0x56d26: ; 0x56d26 checkcode $1 if_equal $6, UnknownScript_0x56cb7 pokenamemem ABRA, $0 - 2call UnknownScript_0x56ca1 + scall UnknownScript_0x56ca1 iffalse UnknownScript_0x56cbd waitbutton playsound SFX_TRANSACTION - 2writetext UnknownText_0x56ebd + writetext UnknownText_0x56ebd closetext writebyte ABRA special $0039 givepoke ABRA, 5, 0, 0 takecoins 100 - 2jump UnknownScript_0x56d0c + jump UnknownScript_0x56d0c ; 0x56d54 UnknownScript_0x56d54: ; 0x56d54 @@ -205,17 +205,17 @@ UnknownScript_0x56d54: ; 0x56d54 checkcode $1 if_equal $6, UnknownScript_0x56cb7 pokenamemem CUBONE, $0 - 2call UnknownScript_0x56ca1 + scall UnknownScript_0x56ca1 iffalse UnknownScript_0x56cbd waitbutton playsound SFX_TRANSACTION - 2writetext UnknownText_0x56ebd + writetext UnknownText_0x56ebd closetext writebyte CUBONE special $0039 givepoke CUBONE, 15, 0, 0 takecoins 800 - 2jump UnknownScript_0x56d0c + jump UnknownScript_0x56d0c ; 0x56d82 UnknownScript_0x56d82: ; 0x56d82 @@ -224,17 +224,17 @@ UnknownScript_0x56d82: ; 0x56d82 checkcode $1 if_equal $6, UnknownScript_0x56cb7 pokenamemem WOBBUFFET, $0 - 2call UnknownScript_0x56ca1 + scall UnknownScript_0x56ca1 iffalse UnknownScript_0x56cbd waitbutton playsound SFX_TRANSACTION - 2writetext UnknownText_0x56ebd + writetext UnknownText_0x56ebd closetext writebyte WOBBUFFET special $0039 givepoke WOBBUFFET, 15, 0, 0 takecoins 1500 - 2jump UnknownScript_0x56d0c + jump UnknownScript_0x56d0c ; 0x56db0 @@ -259,7 +259,7 @@ MenuData2_0x56db8: ; 0x56db8 PharmacistScript_0x56df1: ; 0x56df1 faceplayer loadfont - 2writetext UnknownText_0x56f55 + writetext UnknownText_0x56f55 closetext loadmovesprites spriteface $fe, $2 @@ -269,7 +269,7 @@ PharmacistScript_0x56df1: ; 0x56df1 PokefanMScript_0x56dfc: ; 0x56dfc faceplayer loadfont - 2writetext UnknownText_0x56f9e + writetext UnknownText_0x56f9e closetext loadmovesprites spriteface $7, $3 @@ -279,7 +279,7 @@ PokefanMScript_0x56dfc: ; 0x56dfc CooltrainerMScript_0x56e07: ; 0x56e07 faceplayer loadfont - 2writetext UnknownText_0x56ff4 + writetext UnknownText_0x56ff4 closetext loadmovesprites spriteface $8, $2 @@ -289,7 +289,7 @@ CooltrainerMScript_0x56e07: ; 0x56e07 PokefanFScript_0x56e12: ; 0x56e12 faceplayer loadfont - 2writetext UnknownText_0x5702b + writetext UnknownText_0x5702b closetext loadmovesprites spriteface $9, $3 @@ -303,7 +303,7 @@ CooltrainerFScript_0x56e1d: ; 0x56e1d GentlemanScript_0x56e20: ; 0x56e20 faceplayer loadfont - 2writetext UnknownText_0x570b1 + writetext UnknownText_0x570b1 closetext loadmovesprites spriteface $b, $3 diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index c28c30f6a..bf11bc30b 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -23,7 +23,7 @@ WhitneyScript_0x5400c: ; 0x5400c checkevent EVENT_BEAT_WHITNEY iftrue UnknownScript_0x54037 loadfont - 2writetext UnknownText_0x54122 + writetext UnknownText_0x54122 closetext loadmovesprites winlosstext UnknownText_0x541a5, $0000 @@ -41,7 +41,7 @@ UnknownScript_0x54037: ; 0x54037 loadfont checkevent EVENT_MADE_WHITNEY_CRY iffalse UnknownScript_0x54044 - 2writetext UnknownText_0x541f4 + writetext UnknownText_0x541f4 closetext loadmovesprites end @@ -52,29 +52,29 @@ UnknownScript_0x54044: ; 0x54044 iftrue UnknownScript_0x54077 checkflag $001d iftrue UnknownScript_0x54064 - 2writetext UnknownText_0x54222 + writetext UnknownText_0x54222 keeptextopen waitbutton - 2writetext UnknownText_0x54273 + writetext UnknownText_0x54273 playsound SFX_GET_BADGE waitbutton setflag $001d checkcode $7 - 2call UnknownScript_0x5407d + scall UnknownScript_0x5407d UnknownScript_0x54064: ; 0x54064 - 2writetext UnknownText_0x5428b + writetext UnknownText_0x5428b keeptextopen verbosegiveitem TM_45, 1 iffalse UnknownScript_0x5407b setevent EVENT_GOT_TM45_ATTRACT - 2writetext UnknownText_0x54302 + writetext UnknownText_0x54302 closetext loadmovesprites end ; 0x54077 UnknownScript_0x54077: ; 0x54077 - 2writetext UnknownText_0x54360 + writetext UnknownText_0x54360 closetext UnknownScript_0x5407b: ; 0x5407b loadmovesprites @@ -118,7 +118,7 @@ TrainerLassCarrie: ; 0x5408c LassCarrieScript: ; 0x54098 talkaftercancel loadfont - 2writetext LassCarrieOWText + writetext LassCarrieOWText closetext loadmovesprites end @@ -129,7 +129,7 @@ WhitneyCriesScript: ; 0x540a0 applymovement $4, BridgetWalksUpMovement spriteface $0, $0 loadfont - 2writetext BridgetWhitneyCriesText + writetext BridgetWhitneyCriesText closetext loadmovesprites applymovement $4, BridgetWalksAwayMovement @@ -161,7 +161,7 @@ TrainerLassBridget: ; 0x540bb LassBridgetScript: ; 0x540c7 talkaftercancel loadfont - 2writetext LassBridgetOWText + writetext LassBridgetOWText closetext loadmovesprites end @@ -190,7 +190,7 @@ TrainerBeautyVictoria: ; 0x540cf BeautyVictoriaScript: ; 0x540db talkaftercancel loadfont - 2writetext BeautyVictoriaOWText + writetext BeautyVictoriaOWText closetext loadmovesprites end @@ -219,7 +219,7 @@ TrainerBeautySamantha: ; 0x540e3 BeautySamanthaScript: ; 0x540ef talkaftercancel loadfont - 2writetext BeautySamanthaOWText + writetext BeautySamanthaOWText closetext loadmovesprites end @@ -230,14 +230,14 @@ GoldenrodGymGuyScript: ; 0x540f7 checkevent EVENT_BEAT_WHITNEY iftrue .GoldenrodGymGuyWinScript loadfont - 2writetext GoldenrodGymGuyText + writetext GoldenrodGymGuyText closetext loadmovesprites end .GoldenrodGymGuyWinScript loadfont - 2writetext GoldenrodGymGuyWinText + writetext GoldenrodGymGuyWinText closetext loadmovesprites end diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index 018ff14f8..4b3f71a76 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -10,53 +10,53 @@ TeacherScript_0x54953: ; 0x54953 faceplayer loadfont special $0059 - 2writetext UnknownText_0x549a3 + writetext UnknownText_0x549a3 keeptextopen if_greater_than $f9, UnknownScript_0x54973 if_greater_than $c7, UnknownScript_0x54979 if_greater_than $95, UnknownScript_0x5497f if_greater_than $63, UnknownScript_0x54985 if_greater_than $31, UnknownScript_0x5498b - 2jump UnknownScript_0x54991 + jump UnknownScript_0x54991 ; 0x54973 UnknownScript_0x54973: ; 0x54973 - 2writetext UnknownText_0x549fc + writetext UnknownText_0x549fc closetext loadmovesprites end ; 0x54979 UnknownScript_0x54979: ; 0x54979 - 2writetext UnknownText_0x54a2c + writetext UnknownText_0x54a2c closetext loadmovesprites end ; 0x5497f UnknownScript_0x5497f: ; 0x5497f - 2writetext UnknownText_0x54a5a + writetext UnknownText_0x54a5a closetext loadmovesprites end ; 0x54985 UnknownScript_0x54985: ; 0x54985 - 2writetext UnknownText_0x54a8e + writetext UnknownText_0x54a8e closetext loadmovesprites end ; 0x5498b UnknownScript_0x5498b: ; 0x5498b - 2writetext UnknownText_0x54a9f + writetext UnknownText_0x54a9f closetext loadmovesprites end ; 0x54991 UnknownScript_0x54991: ; 0x54991 - 2writetext UnknownText_0x54ad1 + writetext UnknownText_0x54ad1 closetext loadmovesprites end diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index cab2eb1b5..a3f77c7e5 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -18,19 +18,19 @@ OfficerScript_0x550ec: ; 0x550ec loadfont checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x550fa - 2writetext UnknownText_0x55160 + writetext UnknownText_0x55160 closetext loadmovesprites end ; 0x550fa UnknownScript_0x550fa: ; 0x550fa - 2writetext UnknownText_0x551b7 + writetext UnknownText_0x551b7 yesorno iffalse UnknownScript_0x5512a checkitem PASS iffalse UnknownScript_0x55124 - 2writetext UnknownText_0x551ed + writetext UnknownText_0x551ed closetext loadmovesprites applymovement $2, MovementData_0x55146 @@ -50,14 +50,14 @@ MovementData_0x55122: ; 0x55122 ; 0x55124 UnknownScript_0x55124: ; 0x55124 - 2writetext UnknownText_0x5522c + writetext UnknownText_0x5522c closetext loadmovesprites end ; 0x5512a UnknownScript_0x5512a: ; 0x5512a - 2writetext UnknownText_0x5524f + writetext UnknownText_0x5524f closetext loadmovesprites end @@ -68,7 +68,7 @@ UnknownScript_0x55130: ; 0x55130 applymovement $0, MovementData_0x55158 applymovement $2, MovementData_0x5514b loadfont - 2writetext UnknownText_0x5526a + writetext UnknownText_0x5526a closetext loadmovesprites end diff --git a/maps/GoldenrodPokeCenter1F.asm b/maps/GoldenrodPokeCenter1F.asm index f0a5466c3..660d4cafa 100644 --- a/maps/GoldenrodPokeCenter1F.asm +++ b/maps/GoldenrodPokeCenter1F.asm @@ -28,12 +28,12 @@ UnknownScript_0x60f9e: ; 0x60f9e applymovement $3, MovementData_0x6105a spriteface $0, $1 loadfont - 2writetext UnknownText_0x622f0 + writetext UnknownText_0x622f0 closetext verbosegiveitem GS_BALL, 1 setevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER setevent EVENT_CAN_GIVE_GS_BALL_TO_KURT - 2writetext UnknownText_0x62359 + writetext UnknownText_0x62359 closetext loadmovesprites applymovement $3, MovementData_0x61060 @@ -62,12 +62,12 @@ UnknownScript_0x60fe3: ; 0x60fe3 applymovement $3, MovementData_0x61065 spriteface $0, $1 loadfont - 2writetext UnknownText_0x622f0 + writetext UnknownText_0x622f0 closetext verbosegiveitem GS_BALL, 1 setevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER setevent EVENT_CAN_GIVE_GS_BALL_TO_KURT - 2writetext UnknownText_0x62359 + writetext UnknownText_0x62359 closetext loadmovesprites applymovement $3, MovementData_0x6106c @@ -89,27 +89,27 @@ LassScript_0x61021: ; 0x61021 PokefanFScript_0x61024: ; 0x61024 faceplayer loadfont - 2writetext UnknownText_0x623fb + writetext UnknownText_0x623fb closetext - 2writetext UnknownText_0x6248c + writetext UnknownText_0x6248c yesorno iffalse UnknownScript_0x6104b takeitem EON_MAIL, 1 iffalse UnknownScript_0x6104b - 2writetext UnknownText_0x62549 + writetext UnknownText_0x62549 closetext - 2writetext UnknownText_0x624a4 + writetext UnknownText_0x624a4 closetext verbosegiveitem REVIVE, 1 iffalse UnknownScript_0x61051 - 2writetext UnknownText_0x624e9 + writetext UnknownText_0x624e9 closetext loadmovesprites end ; 0x6104b UnknownScript_0x6104b: ; 0x6104b - 2writetext UnknownText_0x62509 + writetext UnknownText_0x62509 closetext loadmovesprites end @@ -117,7 +117,7 @@ UnknownScript_0x6104b: ; 0x6104b UnknownScript_0x61051: ; 0x61051 giveitem EON_MAIL, $1 - 2writetext UnknownText_0x6252a + writetext UnknownText_0x6252a closetext loadmovesprites end diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/GoldenrodPokeComCenter2FMobile.asm index eb16abcde..66d41b20b 100644 --- a/maps/GoldenrodPokeComCenter2FMobile.asm +++ b/maps/GoldenrodPokeComCenter2FMobile.asm @@ -20,7 +20,7 @@ ScientistScript_0x625d7: ; 0x625d7 MapGoldenrodPokeComCenter2FMobileSignpost0Script: ; 0x625da loadfont - 2writetext UnknownText_0x627ee + writetext UnknownText_0x627ee closetext UnknownScript_0x625df: ; 0x625df reloadmappart @@ -29,21 +29,21 @@ UnknownScript_0x625df: ; 0x625df writebackup if_equal $1, UnknownScript_0x625f0 if_equal $2, UnknownScript_0x625f8 - 2jump UnknownScript_0x62600 + jump UnknownScript_0x62600 ; 0x625f0 UnknownScript_0x625f0: ; 0x625f0 loadfont - 2writetext UnknownText_0x62828 + writetext UnknownText_0x62828 closetext - 2jump UnknownScript_0x625df + jump UnknownScript_0x625df ; 0x625f8 UnknownScript_0x625f8: ; 0x625f8 loadfont - 2writetext UnknownText_0x628f4 + writetext UnknownText_0x628f4 closetext - 2jump UnknownScript_0x625df + jump UnknownScript_0x625df ; 0x62600 UnknownScript_0x62600: ; 0x62600 @@ -71,7 +71,7 @@ MenuData2_0x6260a: ; 0x6260a MapGoldenrodPokeComCenter2FMobileSignpost1Script: ; 0x62624 loadfont - 2writetext UnknownText_0x62989 + writetext UnknownText_0x62989 closetext UnknownScript_0x62629: ; 0x62629 reloadmappart @@ -80,21 +80,21 @@ UnknownScript_0x62629: ; 0x62629 writebackup if_equal $1, UnknownScript_0x6263a if_equal $2, UnknownScript_0x62642 - 2jump UnknownScript_0x6264a + jump UnknownScript_0x6264a ; 0x6263a UnknownScript_0x6263a: ; 0x6263a loadfont - 2writetext UnknownText_0x629ae + writetext UnknownText_0x629ae closetext - 2jump UnknownScript_0x62629 + jump UnknownScript_0x62629 ; 0x62642 UnknownScript_0x62642: ; 0x62642 loadfont - 2writetext UnknownText_0x62a5a + writetext UnknownText_0x62a5a closetext - 2jump UnknownScript_0x62629 + jump UnknownScript_0x62629 ; 0x6264a UnknownScript_0x6264a: ; 0x6264a diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index 3dd9e6a5f..7c218bc72 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -25,7 +25,7 @@ UnknownScript_0x181454: ; 0x181454 stopfollow spriteface $0, $3 loadfont - 2writetext UnknownText_0x1814a6 + writetext UnknownText_0x1814a6 closetext loadmovesprites spriteface $2, $1 diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index 9e181432e..c47e5db49 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -39,32 +39,32 @@ StoneTable_0x7e4c7: ; 0x7e4c7 UnknownScript_0x7e4d8: ; 0x7e4d8 disappear 2 clearevent EVENT_BOULDER_IN_ICE_PATH_1 - 2jump UnknownScript_0x7e4f8 + jump UnknownScript_0x7e4f8 ; 0x7e4e0 UnknownScript_0x7e4e0: ; 0x7e4e0 disappear 3 clearevent EVENT_BOULDER_IN_ICE_PATH_2 - 2jump UnknownScript_0x7e4f8 + jump UnknownScript_0x7e4f8 ; 0x7e4e8 UnknownScript_0x7e4e8: ; 0x7e4e8 disappear 4 clearevent EVENT_BOULDER_IN_ICE_PATH_3 - 2jump UnknownScript_0x7e4f8 + jump UnknownScript_0x7e4f8 ; 0x7e4f0 UnknownScript_0x7e4f0: ; 0x7e4f0 disappear 5 clearevent EVENT_BOULDER_IN_ICE_PATH_4 - 2jump UnknownScript_0x7e4f8 + jump UnknownScript_0x7e4f8 ; 0x7e4f8 UnknownScript_0x7e4f8: ; 0x7e4f8 pause 30 - 2call UnknownScript_0x7e504 + scall UnknownScript_0x7e504 loadfont - 2writetext UnknownText_0x7e512 + writetext UnknownText_0x7e512 closetext loadmovesprites end diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index c3ea12817..e91e49c52 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -93,14 +93,14 @@ YoungsterScript_0x6eb7b: ; 0x6eb7b loadfont checkevent $0029 iftrue UnknownScript_0x6eb89 - 2writetext UnknownText_0x6ef5c + writetext UnknownText_0x6ef5c closetext loadmovesprites end ; 0x6eb89 UnknownScript_0x6eb89: ; 0x6eb89 - 2writetext UnknownText_0x6f019 + writetext UnknownText_0x6f019 closetext loadmovesprites end @@ -121,9 +121,9 @@ BirdScript_0x6eb8f: ; 0x6eb8f UnknownScript_0x6ebba: ; 0x6ebba faceplayer loadfont - 2writetext UnknownText_0x6f06f + writetext UnknownText_0x6f06f keeptextopen - 2writetext UnknownText_0x6f086 + writetext UnknownText_0x6f086 cry FARFETCH_D closetext loadmovesprites @@ -136,7 +136,7 @@ UnknownScript_0x6ebba: ; 0x6ebba ; 0x6ebd9 UnknownScript_0x6ebd9: ; 0x6ebd9 - 2call UnknownScript_0x6eda1 + scall UnknownScript_0x6eda1 if_equal $0, UnknownScript_0x6ebf1 applymovement $2, MovementData_0x6ee95 moveperson $2, $14, $18 @@ -156,7 +156,7 @@ UnknownScript_0x6ebf1: ; 0x6ebf1 ; 0x6ec02 UnknownScript_0x6ec02: ; 0x6ec02 - 2call UnknownScript_0x6eda1 + scall UnknownScript_0x6eda1 if_equal $2, UnknownScript_0x6ec1a applymovement $2, MovementData_0x6eea4 moveperson $2, $1d, $16 @@ -176,7 +176,7 @@ UnknownScript_0x6ec1a: ; 0x6ec1a ; 0x6ec2b UnknownScript_0x6ec2b: ; 0x6ec2b - 2call UnknownScript_0x6eda1 + scall UnknownScript_0x6eda1 if_equal $1, UnknownScript_0x6ec43 applymovement $2, MovementData_0x6eeb1 moveperson $2, $1c, $1f @@ -196,7 +196,7 @@ UnknownScript_0x6ec43: ; 0x6ec43 ; 0x6ec54 UnknownScript_0x6ec54: ; 0x6ec54 - 2call UnknownScript_0x6eda1 + scall UnknownScript_0x6eda1 if_equal $1, UnknownScript_0x6ec85 if_equal $2, UnknownScript_0x6ec74 if_equal $3, UnknownScript_0x6ec96 @@ -236,7 +236,7 @@ UnknownScript_0x6ec96: ; 0x6ec96 ; 0x6eca7 UnknownScript_0x6eca7: ; 0x6eca7 - 2call UnknownScript_0x6eda1 + scall UnknownScript_0x6eda1 if_equal $3, UnknownScript_0x6ecbf applymovement $2, MovementData_0x6eee6 moveperson $2, $16, $1f @@ -256,7 +256,7 @@ UnknownScript_0x6ecbf: ; 0x6ecbf ; 0x6ecd0 UnknownScript_0x6ecd0: ; 0x6ecd0 - 2call UnknownScript_0x6eda1 + scall UnknownScript_0x6eda1 if_equal $0, UnknownScript_0x6ecfd if_equal $2, UnknownScript_0x6ecec applymovement $2, MovementData_0x6eef8 @@ -286,7 +286,7 @@ UnknownScript_0x6ecfd: ; 0x6ecfd ; 0x6ed0e UnknownScript_0x6ed0e: ; 0x6ed0e - 2call UnknownScript_0x6eda1 + scall UnknownScript_0x6eda1 if_equal $1, UnknownScript_0x6ed3f if_equal $2, UnknownScript_0x6ed3f if_equal $3, UnknownScript_0x6ed2e @@ -317,7 +317,7 @@ UnknownScript_0x6ed3f: ; 0x6ed3f ; 0x6ed50 UnknownScript_0x6ed50: ; 0x6ed50 - 2call UnknownScript_0x6eda1 + scall UnknownScript_0x6eda1 if_equal $0, UnknownScript_0x6ed85 if_equal $3, UnknownScript_0x6ed74 applymovement $2, MovementData_0x6ef23 @@ -352,7 +352,7 @@ UnknownScript_0x6ed85: ; 0x6ed85 UnknownScript_0x6ed96: ; 0x6ed96 faceplayer loadfont - 2writetext UnknownText_0x6f086 + writetext UnknownText_0x6f086 cry FARFETCH_D closetext loadmovesprites @@ -362,7 +362,7 @@ UnknownScript_0x6ed96: ; 0x6ed96 UnknownScript_0x6eda1: ; 0x6eda1 faceplayer loadfont - 2writetext UnknownText_0x6f086 + writetext UnknownText_0x6f086 cry FARFETCH_D closetext loadmovesprites @@ -375,11 +375,11 @@ BlackBeltScript_0x6edae: ; 0x6edae loadfont checkevent EVENT_GOT_HM01_CUT iftrue UnknownScript_0x6edd8 - 2writetext UnknownText_0x6f099 + writetext UnknownText_0x6f099 keeptextopen verbosegiveitem HM_01, 1 setevent EVENT_GOT_HM01_CUT - 2writetext UnknownText_0x6f141 + writetext UnknownText_0x6f141 closetext loadmovesprites setevent $06e9 @@ -392,7 +392,7 @@ BlackBeltScript_0x6edae: ; 0x6edae ; 0x6edd8 UnknownScript_0x6edd8: ; 0x6edd8 - 2writetext UnknownText_0x6f1c0 + writetext UnknownText_0x6f1c0 closetext loadmovesprites end @@ -403,13 +403,13 @@ RockerScript_0x6edde: ; 0x6edde loadfont checkevent EVENT_GOT_TM02_HEADBUTT iftrue UnknownScript_0x6edf3 - 2writetext UnknownText_0x6f21b + writetext UnknownText_0x6f21b keeptextopen verbosegiveitem TM_02, 1 iffalse UnknownScript_0x6edf7 setevent EVENT_GOT_TM02_HEADBUTT UnknownScript_0x6edf3: ; 0x6edf3 - 2writetext UnknownText_0x6f26d + writetext UnknownText_0x6f26d closetext UnknownScript_0x6edf7: ; 0x6edf7 loadmovesprites @@ -439,7 +439,7 @@ TrainerBug_catcherWayne: ; 0x6edf9 Bug_catcherWayneScript: ; 0x6ee05 talkaftercancel loadfont - 2writetext UnknownText_0x6f571 + writetext UnknownText_0x6f571 closetext loadmovesprites end @@ -493,7 +493,7 @@ MapIlexForestSignpost0Script: ; 0x6ee24 MapIlexForestSignpost4Script: ; 0x6ee27 checkevent $00c0 iftrue UnknownScript_0x6ee30 - 2jump UnknownScript_0x6ee35 + jump UnknownScript_0x6ee35 ; 0x6ee30 UnknownScript_0x6ee30: ; 0x6ee30 @@ -505,7 +505,7 @@ UnknownScript_0x6ee35: ; 0x6ee35 UnknownScript_0x6ee38: ; 0x6ee38 loadfont - 2writetext UnknownText_0x6f394 + writetext UnknownText_0x6f394 yesorno iftrue UnknownScript_0x6ee42 loadmovesprites @@ -518,7 +518,7 @@ UnknownScript_0x6ee42: ; 0x6ee42 setevent $07a4 disappear $8 clearevent $06eb - 2writetext UnknownText_0x6f43b + writetext UnknownText_0x6f43b closetext loadmovesprites pause 20 @@ -539,7 +539,7 @@ UnknownScript_0x6ee42: ; 0x6ee42 appear $7 applymovement $7, MovementData_0x6ef4e loadfont - 2writetext UnknownText_0x6f452 + writetext UnknownText_0x6f452 closetext loadmovesprites applymovement $7, MovementData_0x6ef53 diff --git a/maps/IndigoPlateauPokeCenter1F.asm b/maps/IndigoPlateauPokeCenter1F.asm index 89f2cfc0a..8a0450247 100644 --- a/maps/IndigoPlateauPokeCenter1F.asm +++ b/maps/IndigoPlateauPokeCenter1F.asm @@ -63,7 +63,7 @@ UnknownScript_0x180053: ; 0x180053 applymovement $5, MovementData_0x180164 playmusic MUSIC_RIVAL_ENCOUNTER spriteface $0, $3 - 2jump UnknownScript_0x1800ce + jump UnknownScript_0x1800ce ; 0x180094 UnknownScript_0x180094: ; 0x180094 @@ -87,7 +87,7 @@ UnknownScript_0x180094: ; 0x180094 spriteface $0, $2 UnknownScript_0x1800ce: ; 0x1800ce loadfont - 2writetext UnknownText_0x1801f5 + writetext UnknownText_0x1801f5 closetext loadmovesprites setevent $077b @@ -101,7 +101,7 @@ UnknownScript_0x1800ce: ; 0x1800ce startbattle reloadmapmusic returnafterbattle - 2jump UnknownScript_0x180113 + jump UnknownScript_0x180113 ; 0x1800f3 UnknownScript_0x1800f3: ; 0x1800f3 @@ -111,7 +111,7 @@ UnknownScript_0x1800f3: ; 0x1800f3 startbattle reloadmapmusic returnafterbattle - 2jump UnknownScript_0x180113 + jump UnknownScript_0x180113 ; 0x180103 UnknownScript_0x180103: ; 0x180103 @@ -121,13 +121,13 @@ UnknownScript_0x180103: ; 0x180103 startbattle reloadmapmusic returnafterbattle - 2jump UnknownScript_0x180113 + jump UnknownScript_0x180113 ; 0x180113 UnknownScript_0x180113: ; 0x180113 playmusic MUSIC_RIVAL_AFTER loadfont - 2writetext UnknownText_0x1802a4 + writetext UnknownText_0x1802a4 closetext loadmovesprites spriteface $0, $0 @@ -158,10 +158,10 @@ CooltrainerMScript_0x180136: ; 0x180136 GrampsScript_0x180139: ; 0x180139 faceplayer loadfont - 2writetext UnknownText_0x180335 + writetext UnknownText_0x180335 yesorno iffalse UnknownScript_0x180154 - 2writetext UnknownText_0x1803e7 + writetext UnknownText_0x1803e7 closetext loadmovesprites playsound SFX_WARP_TO @@ -172,7 +172,7 @@ GrampsScript_0x180139: ; 0x180139 ; 0x180154 UnknownScript_0x180154: ; 0x180154 - 2writetext UnknownText_0x180411 + writetext UnknownText_0x180411 closetext loadmovesprites end @@ -180,7 +180,7 @@ UnknownScript_0x180154: ; 0x180154 JynxScript_0x18015a: ; 0x18015a loadfont - 2writetext UnknownText_0x180433 + writetext UnknownText_0x180433 cry ABRA closetext loadmovesprites diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index cf74ed065..d43428ed0 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -54,7 +54,7 @@ KarenScript_0x180bee: ; 0x180bee loadfont checkevent EVENT_BEAT_ELITE_4_KAREN iftrue UnknownScript_0x180c1c - 2writetext UnknownText_0x180c27 + writetext UnknownText_0x180c27 closetext loadmovesprites winlosstext UnknownText_0x180cf8, $0000 @@ -63,7 +63,7 @@ KarenScript_0x180bee: ; 0x180bee returnafterbattle setevent EVENT_BEAT_ELITE_4_KAREN loadfont - 2writetext UnknownText_0x180d29 + writetext UnknownText_0x180d29 closetext loadmovesprites playsound SFX_ENTER_DOOR @@ -76,7 +76,7 @@ KarenScript_0x180bee: ; 0x180bee ; 0x180c1c UnknownScript_0x180c1c: ; 0x180c1c - 2writetext UnknownText_0x180d29 + writetext UnknownText_0x180d29 closetext loadmovesprites end diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm index 937a53705..2bdc7e1a3 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -54,7 +54,7 @@ KogaScript_0x18075a: ; 0x18075a loadfont checkevent $05b9 iftrue UnknownScript_0x180788 - 2writetext UnknownText_0x180793 + writetext UnknownText_0x180793 closetext loadmovesprites winlosstext UnknownText_0x1808a9, $0000 @@ -63,7 +63,7 @@ KogaScript_0x18075a: ; 0x18075a returnafterbattle setevent $05b9 loadfont - 2writetext UnknownText_0x1808ca + writetext UnknownText_0x1808ca closetext loadmovesprites playsound SFX_ENTER_DOOR @@ -76,7 +76,7 @@ KogaScript_0x18075a: ; 0x18075a ; 0x180788 UnknownScript_0x180788: ; 0x180788 - 2writetext UnknownText_0x1808ca + writetext UnknownText_0x1808ca closetext loadmovesprites end diff --git a/maps/KrissHouse1F.asm b/maps/KrissHouse1F.asm index b067a3657..a03649e76 100644 --- a/maps/KrissHouse1F.asm +++ b/maps/KrissHouse1F.asm @@ -29,34 +29,34 @@ UnknownScript_0x7a4db: ; 0x7a4db checkevent $0000 iffalse UnknownScript_0x7a4f2 applymovement $2, MovementData_0x7a5fc - 2jump UnknownScript_0x7a4f6 + jump UnknownScript_0x7a4f6 ; 0x7a4f2 UnknownScript_0x7a4f2: ; 0x7a4f2 applymovement $2, MovementData_0x7a5fe UnknownScript_0x7a4f6: ; 0x7a4f6 loadfont - 2writetext UnknownText_0x7a604 + writetext UnknownText_0x7a604 keeptextopen stringtotext GearName, $1 - 2call UnknownScript_0x7a57e + scall UnknownScript_0x7a57e setflag $0004 setflag $0002 addcellnum $1 dotrigger $1 setevent $06c7 clearevent $06c8 - 2writetext UnknownText_0x7a6bd + writetext UnknownText_0x7a6bd keeptextopen special $0025 UnknownScript_0x7a519: ; 0x7a519 - 2writetext UnknownText_0x7a742 + writetext UnknownText_0x7a742 yesorno iffalse UnknownScript_0x7a52a special $00a6 yesorno iffalse UnknownScript_0x7a519 - 2jump UnknownScript_0x7a531 + jump UnknownScript_0x7a531 ; 0x7a52a UnknownScript_0x7a52a: ; 0x7a52a @@ -64,43 +64,43 @@ UnknownScript_0x7a52a: ; 0x7a52a yesorno iffalse UnknownScript_0x7a519 UnknownScript_0x7a531: ; 0x7a531 - 2writetext UnknownText_0x7a763 + writetext UnknownText_0x7a763 yesorno iffalse UnknownScript_0x7a542 - 2jump UnknownScript_0x7a53b + jump UnknownScript_0x7a53b ; 0x7a53b UnknownScript_0x7a53b: ; 0x7a53b - 2writetext UnknownText_0x7a7cb + writetext UnknownText_0x7a7cb keeptextopen - 2jump UnknownScript_0x7a549 + jump UnknownScript_0x7a549 ; 0x7a542 UnknownScript_0x7a542: ; 0x7a542 - 2writetext UnknownText_0x7a807 + writetext UnknownText_0x7a807 keeptextopen - 2jump UnknownScript_0x7a549 + jump UnknownScript_0x7a549 ; 0x7a549 UnknownScript_0x7a549: ; 0x7a549 - 2writetext UnknownText_0x7a850 + writetext UnknownText_0x7a850 closetext loadmovesprites checkevent $0000 iftrue UnknownScript_0x7a55d checkevent $0001 iffalse UnknownScript_0x7a564 - 2jump UnknownScript_0x7a56b + jump UnknownScript_0x7a56b ; 0x7a55d UnknownScript_0x7a55d: ; 0x7a55d applymovement $2, MovementData_0x7a600 - 2jump UnknownScript_0x7a56b + jump UnknownScript_0x7a56b ; 0x7a564 UnknownScript_0x7a564: ; 0x7a564 applymovement $2, MovementData_0x7a602 - 2jump UnknownScript_0x7a56b + jump UnknownScript_0x7a56b ; 0x7a56b UnknownScript_0x7a56b: ; 0x7a56b @@ -111,7 +111,7 @@ UnknownScript_0x7a56b: ; 0x7a56b UnknownScript_0x7a572: ; 0x7a572 playmusic MUSIC_MOM - 2jump UnknownScript_0x7a4f6 + jump UnknownScript_0x7a4f6 ; 0x7a578 GearName: ; 0x7a578 @@ -137,21 +137,21 @@ MomScript_0x7a582: ; 0x7a582 iftrue UnknownScript_0x7a5b5 checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue UnknownScript_0x7a5a9 - 2writetext UnknownText_0x7a8b5 + writetext UnknownText_0x7a8b5 closetext loadmovesprites end ; 0x7a5a9 UnknownScript_0x7a5a9: ; 0x7a5a9 - 2writetext UnknownText_0x7a8e5 + writetext UnknownText_0x7a8e5 closetext loadmovesprites end ; 0x7a5af UnknownScript_0x7a5af: ; 0x7a5af - 2writetext UnknownText_0x7a957 + writetext UnknownText_0x7a957 closetext loadmovesprites end @@ -177,25 +177,25 @@ PokefanFScript_0x7a5c1: ; 0x7a5c1 checktime $4 iftrue UnknownScript_0x7a5e0 UnknownScript_0x7a5d2: ; 0x7a5d2 - 2writetext UnknownText_0x7a97d + writetext UnknownText_0x7a97d keeptextopen - 2jump UnknownScript_0x7a5e7 + jump UnknownScript_0x7a5e7 ; 0x7a5d9 UnknownScript_0x7a5d9: ; 0x7a5d9 - 2writetext UnknownText_0x7a99c + writetext UnknownText_0x7a99c keeptextopen - 2jump UnknownScript_0x7a5e7 + jump UnknownScript_0x7a5e7 ; 0x7a5e0 UnknownScript_0x7a5e0: ; 0x7a5e0 - 2writetext UnknownText_0x7a9b4 + writetext UnknownText_0x7a9b4 keeptextopen - 2jump UnknownScript_0x7a5e7 + jump UnknownScript_0x7a5e7 ; 0x7a5e7 UnknownScript_0x7a5e7: ; 0x7a5e7 - 2writetext UnknownText_0x7a9d3 + writetext UnknownText_0x7a9d3 closetext loadmovesprites spriteface $6, $3 diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm index 693bd6386..42e064dbe 100644 --- a/maps/KrissHouse2F.asm +++ b/maps/KrissHouse2F.asm @@ -70,14 +70,14 @@ MapKrissHouse2FSignpost2Script: ; 0x7abda iftrue UnknownScript_0x7ac0a playmusic MUSIC_POKEMON_TALK loadfont - 2writetext UnknownText_0x7ac24 + writetext UnknownText_0x7ac24 pause 45 - 2writetext UnknownText_0x7ac55 + writetext UnknownText_0x7ac55 pause 45 - 2writetext UnknownText_0x7ac64 + writetext UnknownText_0x7ac64 pause 45 musicfadeout $003c, $10 - 2writetext UnknownText_0x7ac84 + writetext UnknownText_0x7ac84 pause 45 loadmovesprites setevent EVENT_LISTENED_TO_RADIO_IN_NEIGHBORS_HOUSE @@ -90,7 +90,7 @@ UnknownScript_0x7ac07: ; 0x7ac07 UnknownScript_0x7ac0a: ; 0x7ac0a loadfont - 2writetext UnknownText_0x7ac84 + writetext UnknownText_0x7ac84 pause 45 loadmovesprites end diff --git a/maps/KrissNeighborsHouse.asm b/maps/KrissNeighborsHouse.asm index 38c2b4f01..ed6089e61 100644 --- a/maps/KrissNeighborsHouse.asm +++ b/maps/KrissNeighborsHouse.asm @@ -25,14 +25,14 @@ MapKrissNeighborsHouseSignpost2Script: ; 0x7acf7 iftrue UnknownScript_0x7ad27 playmusic MUSIC_POKEMON_TALK loadfont - 2writetext UnknownText_0x7ae3b + writetext UnknownText_0x7ae3b pause 45 - 2writetext UnknownText_0x7ae6c + writetext UnknownText_0x7ae6c pause 45 - 2writetext UnknownText_0x7ae7b + writetext UnknownText_0x7ae7b pause 45 musicfadeout $003c, $10 - 2writetext UnknownText_0x7ae9b + writetext UnknownText_0x7ae9b pause 45 loadmovesprites setevent EVENT_LISTENED_TO_RADIO_IN_NEIGHBORS_HOUSE @@ -45,7 +45,7 @@ UnknownScript_0x7ad24: ; 0x7ad24 UnknownScript_0x7ad27: ; 0x7ad27 loadfont - 2writetext UnknownText_0x7ae9b + writetext UnknownText_0x7ae9b pause 45 loadmovesprites end diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index 1faf19ec7..f22f89fec 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -40,7 +40,7 @@ KurtScript_0x18e178: ; 0x18e178 iftrue UnknownScript_0x18e1cc checkevent EVENT_CLEARED_SLOWPOKE_WELL iftrue UnknownScript_0x18e1bf - 2writetext UnknownText_0x18e473 + writetext UnknownText_0x18e473 closetext loadmovesprites special $006a @@ -69,7 +69,7 @@ UnknownScript_0x18e1ab: ; 0x18e1ab ; 0x18e1bf UnknownScript_0x18e1bf: ; 0x18e1bf - 2writetext UnknownText_0x18e615 + writetext UnknownText_0x18e615 keeptextopen verbosegiveitem LURE_BALL, 1 iffalse UnknownScript_0x18e2b2 @@ -98,7 +98,7 @@ UnknownScript_0x18e202: ; 0x18e202 iftrue UnknownScript_0x18e212 checkevent $0002 iftrue UnknownScript_0x18e212 - 2writetext UnknownText_0x18e6c9 + writetext UnknownText_0x18e6c9 closetext UnknownScript_0x18e212: ; 0x18e212 checkitem RED_APRICORN @@ -124,14 +124,14 @@ UnknownScript_0x18e212: ; 0x18e212 ; 0x18e243 UnknownScript_0x18e243: ; 0x18e243 - 2writetext UnknownText_0x18e6c9 + writetext UnknownText_0x18e6c9 closetext loadmovesprites end ; 0x18e249 UnknownScript_0x18e249: ; 0x18e249 - 2writetext UnknownText_0x18e736 + writetext UnknownText_0x18e736 keeptextopen setevent $0002 special $0056 @@ -143,51 +143,51 @@ UnknownScript_0x18e249: ; 0x18e249 if_equal $63, UnknownScript_0x18e28d if_equal $65, UnknownScript_0x18e293 setevent $0258 - 2jump UnknownScript_0x18e299 + jump UnknownScript_0x18e299 ; 0x18e275 UnknownScript_0x18e275: ; 0x18e275 setevent $0259 - 2jump UnknownScript_0x18e299 + jump UnknownScript_0x18e299 ; 0x18e27b UnknownScript_0x18e27b: ; 0x18e27b setevent $025a - 2jump UnknownScript_0x18e299 + jump UnknownScript_0x18e299 ; 0x18e281 UnknownScript_0x18e281: ; 0x18e281 setevent $025b - 2jump UnknownScript_0x18e299 + jump UnknownScript_0x18e299 ; 0x18e287 UnknownScript_0x18e287: ; 0x18e287 setevent $025c - 2jump UnknownScript_0x18e299 + jump UnknownScript_0x18e299 ; 0x18e28d UnknownScript_0x18e28d: ; 0x18e28d setevent $025d - 2jump UnknownScript_0x18e299 + jump UnknownScript_0x18e299 ; 0x18e293 UnknownScript_0x18e293: ; 0x18e293 setevent $025e - 2jump UnknownScript_0x18e299 + jump UnknownScript_0x18e299 ; 0x18e299 UnknownScript_0x18e299: ; 0x18e299 setevent $0000 setflag $0050 UnknownScript_0x18e29f: ; 0x18e29f - 2writetext UnknownText_0x18e779 + writetext UnknownText_0x18e779 closetext loadmovesprites end ; 0x18e2a5 UnknownScript_0x18e2a5: ; 0x18e2a5 - 2writetext UnknownText_0x18e7bc + writetext UnknownText_0x18e7bc closetext loadmovesprites end @@ -196,7 +196,7 @@ UnknownScript_0x18e2a5: ; 0x18e2a5 UnknownScript_0x18e2ab: ; 0x18e2ab setevent $0001 UnknownScript_0x18e2ae: ; 0x18e2ae - 2writetext UnknownText_0x18e82a + writetext UnknownText_0x18e82a closetext UnknownScript_0x18e2b2: ; 0x18e2b2 loadmovesprites @@ -206,85 +206,85 @@ UnknownScript_0x18e2b2: ; 0x18e2b2 UnknownScript_0x18e2b4: ; 0x18e2b4 checkflag $0050 iftrue UnknownScript_0x18e3c5 - 2writetext UnknownText_0x18e7fb + writetext UnknownText_0x18e7fb keeptextopen verbosegiveitem2 LEVEL_BALL, $16 iffalse UnknownScript_0x18e2b2 UnknownScript_0x18e2c4: ; 0x18e2c4 clearevent $0258 - 2jump UnknownScript_0x18e2ab + jump UnknownScript_0x18e2ab ; 0x18e2ca UnknownScript_0x18e2ca: ; 0x18e2ca checkflag $0050 iftrue UnknownScript_0x18e3c5 - 2writetext UnknownText_0x18e7fb + writetext UnknownText_0x18e7fb keeptextopen verbosegiveitem2 LURE_BALL, $16 iffalse UnknownScript_0x18e2b2 UnknownScript_0x18e2da: ; 0x18e2da clearevent $0259 - 2jump UnknownScript_0x18e2ab + jump UnknownScript_0x18e2ab ; 0x18e2e0 UnknownScript_0x18e2e0: ; 0x18e2e0 checkflag $0050 iftrue UnknownScript_0x18e3c5 - 2writetext UnknownText_0x18e7fb + writetext UnknownText_0x18e7fb keeptextopen verbosegiveitem2 MOON_BALL, $16 iffalse UnknownScript_0x18e2b2 UnknownScript_0x18e2f0: ; 0x18e2f0 clearevent $025a - 2jump UnknownScript_0x18e2ab + jump UnknownScript_0x18e2ab ; 0x18e2f6 UnknownScript_0x18e2f6: ; 0x18e2f6 checkflag $0050 iftrue UnknownScript_0x18e3c5 - 2writetext UnknownText_0x18e7fb + writetext UnknownText_0x18e7fb keeptextopen verbosegiveitem2 FRIEND_BALL, $16 iffalse UnknownScript_0x18e2b2 UnknownScript_0x18e306: ; 0x18e306 clearevent $025b - 2jump UnknownScript_0x18e2ab + jump UnknownScript_0x18e2ab ; 0x18e30c UnknownScript_0x18e30c: ; 0x18e30c checkflag $0050 iftrue UnknownScript_0x18e3c5 - 2writetext UnknownText_0x18e7fb + writetext UnknownText_0x18e7fb keeptextopen verbosegiveitem2 FAST_BALL, $16 iffalse UnknownScript_0x18e2b2 UnknownScript_0x18e31c: ; 0x18e31c clearevent $025c - 2jump UnknownScript_0x18e2ab + jump UnknownScript_0x18e2ab ; 0x18e322 UnknownScript_0x18e322: ; 0x18e322 checkflag $0050 iftrue UnknownScript_0x18e3c5 - 2writetext UnknownText_0x18e7fb + writetext UnknownText_0x18e7fb keeptextopen verbosegiveitem2 HEAVY_BALL, $16 iffalse UnknownScript_0x18e2b2 UnknownScript_0x18e332: ; 0x18e332 clearevent $025d - 2jump UnknownScript_0x18e2ab + jump UnknownScript_0x18e2ab ; 0x18e338 UnknownScript_0x18e338: ; 0x18e338 checkflag $0050 iftrue UnknownScript_0x18e3c5 - 2writetext UnknownText_0x18e7fb + writetext UnknownText_0x18e7fb keeptextopen verbosegiveitem2 LOVE_BALL, $16 iffalse UnknownScript_0x18e2b2 UnknownScript_0x18e348: ; 0x18e348 clearevent $025e - 2jump UnknownScript_0x18e2ab + jump UnknownScript_0x18e2ab ; 0x18e34e UnknownScript_0x18e34e: ; 0x18e34e @@ -292,7 +292,7 @@ UnknownScript_0x18e34e: ; 0x18e34e iftrue UnknownScript_0x18e368 checkitem GS_BALL iffalse UnknownScript_0x18e202 - 2writetext UnknownText_0x18e8ab + writetext UnknownText_0x18e8ab closetext loadmovesprites setevent $00bf @@ -304,16 +304,16 @@ UnknownScript_0x18e34e: ; 0x18e34e UnknownScript_0x18e368: ; 0x18e368 checkflag $0050 iffalse UnknownScript_0x18e378 - 2writetext UnknownText_0x18e934 + writetext UnknownText_0x18e934 closetext - 2writetext UnknownText_0x18e949 + writetext UnknownText_0x18e949 closetext loadmovesprites end ; 0x18e378 UnknownScript_0x18e378: ; 0x18e378 - 2writetext UnknownText_0x18e95c + writetext UnknownText_0x18e95c closetext loadmovesprites setevent $00c0 @@ -327,7 +327,7 @@ UnknownScript_0x18e378: ; 0x18e378 spriteface $0, $0 playsound SFX_FLY applymovement $2, MovementData_0x18e466 - 2jump UnknownScript_0x18e3ac + jump UnknownScript_0x18e3ac ; 0x18e3a2 UnknownScript_0x18e3a2: ; 0x18e3a2 @@ -352,7 +352,7 @@ KurtScript_0x18e3bd: ; 0x18e3bd UnknownScript_0x18e3c5: ; 0x18e3c5 checkevent $00bb iffalse UnknownScript_0x18e3d4 - 2writetext UnknownText_0x18e7d8 + writetext UnknownText_0x18e7d8 closetext loadmovesprites spriteface $5, $1 @@ -360,7 +360,7 @@ UnknownScript_0x18e3c5: ; 0x18e3c5 ; 0x18e3d4 UnknownScript_0x18e3d4: ; 0x18e3d4 - 2writetext UnknownText_0x18e863 + writetext UnknownText_0x18e863 closetext loadmovesprites spriteface $5, $1 @@ -369,10 +369,10 @@ UnknownScript_0x18e3d4: ; 0x18e3d4 ; 0x18e3e0 UnknownScript_0x18e3e0: ; 0x18e3e0 - 2writetext UnknownText_0x18e934 + writetext UnknownText_0x18e934 closetext spriteface $5, $1 - 2writetext UnknownText_0x18e949 + writetext UnknownText_0x18e949 closetext loadmovesprites end @@ -393,7 +393,7 @@ TwinScript_0x18e3ed: ; 0x18e3ed checkevent $06fa iftrue UnknownScript_0x18e420 loadfont - 2writetext UnknownText_0x18e9b5 + writetext UnknownText_0x18e9b5 closetext loadmovesprites end @@ -401,7 +401,7 @@ TwinScript_0x18e3ed: ; 0x18e3ed UnknownScript_0x18e419: ; 0x18e419 loadfont - 2writetext UnknownText_0x18ea0f + writetext UnknownText_0x18ea0f closetext loadmovesprites end @@ -409,7 +409,7 @@ UnknownScript_0x18e419: ; 0x18e419 UnknownScript_0x18e420: ; 0x18e420 loadfont - 2writetext UnknownText_0x18e9f1 + writetext UnknownText_0x18e9f1 closetext loadmovesprites end @@ -417,7 +417,7 @@ UnknownScript_0x18e420: ; 0x18e420 UnknownScript_0x18e427: ; 0x18e427 loadfont - 2writetext UnknownText_0x18ea55 + writetext UnknownText_0x18ea55 closetext loadmovesprites end @@ -429,7 +429,7 @@ UnknownScript_0x18e42f: ; 0x18e42f loadfont checkevent $00bf iftrue UnknownScript_0x18e43f - 2writetext UnknownText_0x18eab2 + writetext UnknownText_0x18eab2 closetext loadmovesprites spriteface $6, $3 @@ -437,7 +437,7 @@ UnknownScript_0x18e42f: ; 0x18e42f ; 0x18e43f UnknownScript_0x18e43f: ; 0x18e43f - 2writetext UnknownText_0x18eb14 + writetext UnknownText_0x18eb14 closetext loadmovesprites spriteface $6, $3 @@ -446,7 +446,7 @@ UnknownScript_0x18e43f: ; 0x18e43f UnknownScript_0x18e448: ; 0x18e448 loadfont - 2writetext UnknownText_0x18eafc + writetext UnknownText_0x18eafc closetext loadmovesprites end @@ -455,7 +455,7 @@ UnknownScript_0x18e448: ; 0x18e448 SlowpokeScript_0x18e44f: ; 0x18e44f faceplayer loadfont - 2writetext UnknownText_0x18eb56 + writetext UnknownText_0x18eb56 cry SLOWPOKE closetext loadmovesprites diff --git a/maps/LakeofRage.asm b/maps/LakeofRage.asm index 0e3d6a1df..5237c25d5 100644 --- a/maps/LakeofRage.asm +++ b/maps/LakeofRage.asm @@ -42,14 +42,14 @@ LanceScript_0x70022: ; 0x70022 checkevent EVENT_REFUSED_TO_HELP_LANCE_AT_LAKE_OF_RAGE iftrue UnknownScript_0x70057 loadfont - 2writetext UnknownText_0x70157 + writetext UnknownText_0x70157 keeptextopen faceplayer - 2writetext UnknownText_0x701b4 + writetext UnknownText_0x701b4 yesorno iffalse UnknownScript_0x7004e UnknownScript_0x70035: ; 0x70035 - 2writetext UnknownText_0x702c6 + writetext UnknownText_0x702c6 closetext loadmovesprites playsound SFX_WARP_TO @@ -62,7 +62,7 @@ UnknownScript_0x70035: ; 0x70035 ; 0x7004e UnknownScript_0x7004e: ; 0x7004e - 2writetext UnknownText_0x70371 + writetext UnknownText_0x70371 closetext loadmovesprites setevent EVENT_REFUSED_TO_HELP_LANCE_AT_LAKE_OF_RAGE @@ -72,15 +72,15 @@ UnknownScript_0x7004e: ; 0x7004e UnknownScript_0x70057: ; 0x70057 faceplayer loadfont - 2writetext UnknownText_0x703a5 + writetext UnknownText_0x703a5 yesorno iffalse UnknownScript_0x7004e - 2jump UnknownScript_0x70035 + jump UnknownScript_0x70035 ; 0x70063 GyaradosScript_0x70063: ; 0x70063 loadfont - 2writetext UnknownText_0x703cb + writetext UnknownText_0x703cb pause 15 cry GYARADOS loadmovesprites @@ -94,7 +94,7 @@ UnknownScript_0x7007a: ; 0x7007a loadfont giveitem RED_SCALE, $1 waitbutton - 2writetext UnknownText_0x703df + writetext UnknownText_0x703df playsound SFX_ITEM waitbutton itemnotify @@ -109,14 +109,14 @@ GrampsScript_0x7008e: ; 0x7008e loadfont checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x7009c - 2writetext UnknownText_0x703f8 + writetext UnknownText_0x703f8 closetext loadmovesprites end ; 0x7009c UnknownScript_0x7009c: ; 0x7009c - 2writetext UnknownText_0x70421 + writetext UnknownText_0x70421 closetext loadmovesprites end @@ -136,7 +136,7 @@ MapLakeofRageSignpost0Script: ; 0x700a8 MapLakeofRageSignpost1Script: ; 0x700ab loadfont - 2writetext UnknownText_0x70903 + writetext UnknownText_0x70903 checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x700b8 closetext @@ -174,7 +174,7 @@ TrainerFisherAndre: ; 0x700be FisherAndreScript: ; 0x700ca talkaftercancel loadfont - 2writetext UnknownText_0x7058f + writetext UnknownText_0x7058f closetext loadmovesprites end @@ -203,7 +203,7 @@ TrainerFisherRaymond: ; 0x700d2 FisherRaymondScript: ; 0x700de talkaftercancel loadfont - 2writetext UnknownText_0x70611 + writetext UnknownText_0x70611 closetext loadmovesprites end @@ -232,7 +232,7 @@ TrainerCooltrainermAaron: ; 0x700e6 CooltrainermAaronScript: ; 0x700f2 talkaftercancel loadfont - 2writetext UnknownText_0x7069c + writetext UnknownText_0x7069c closetext loadmovesprites end @@ -261,7 +261,7 @@ TrainerCooltrainerfLois: ; 0x700fa CooltrainerfLoisScript: ; 0x70106 talkaftercancel loadfont - 2writetext UnknownText_0x70752 + writetext UnknownText_0x70752 closetext loadmovesprites end @@ -276,29 +276,29 @@ WesleyScript: if_not_equal WEDNESDAY, WesleyNotWednesdayScript checkevent EVENT_MET_WESLEY_OF_WEDNESDAY iftrue .MetWesley - 2writetext MeetWesleyText + writetext MeetWesleyText keeptextopen setevent EVENT_MET_WESLEY_OF_WEDNESDAY .MetWesley - 2writetext WesleyGivesGiftText + writetext WesleyGivesGiftText keeptextopen verbosegiveitem BLACKBELT, 1 iffalse WesleyDoneScript setevent EVENT_GOT_BLACKBELT_FROM_WESLEY - 2writetext WesleyGaveGiftText + writetext WesleyGaveGiftText closetext loadmovesprites end WesleyWednesdayScript: - 2writetext WesleyWednesdayText + writetext WesleyWednesdayText closetext WesleyDoneScript: loadmovesprites end WesleyNotWednesdayScript: - 2writetext WesleyNotWednesdayText + writetext WesleyNotWednesdayText closetext loadmovesprites end diff --git a/maps/LakeofRageHiddenPowerHouse.asm b/maps/LakeofRageHiddenPowerHouse.asm index c80b912c9..d2a77186b 100644 --- a/maps/LakeofRageHiddenPowerHouse.asm +++ b/maps/LakeofRageHiddenPowerHouse.asm @@ -11,19 +11,19 @@ FisherScript_0x19a527: ; 0x19a527 loadfont checkevent EVENT_GOT_TM10_HIDDEN_POWER iftrue UnknownScript_0x19a542 - 2writetext UnknownText_0x19a54b + writetext UnknownText_0x19a54b keeptextopen verbosegiveitem TM_10, 1 iffalse UnknownScript_0x19a546 setevent EVENT_GOT_TM10_HIDDEN_POWER - 2writetext UnknownText_0x19a5de + writetext UnknownText_0x19a5de closetext loadmovesprites end ; 0x19a542 UnknownScript_0x19a542: ; 0x19a542 - 2writetext UnknownText_0x19a673 + writetext UnknownText_0x19a673 closetext UnknownScript_0x19a546: ; 0x19a546 loadmovesprites diff --git a/maps/LakeofRageMagikarpHouse.asm b/maps/LakeofRageMagikarpHouse.asm index 011381eb0..679164daf 100644 --- a/maps/LakeofRageMagikarpHouse.asm +++ b/maps/LakeofRageMagikarpHouse.asm @@ -17,7 +17,7 @@ FishingGuruScript_0x19a6ae: ; 0x19a6ae iftrue UnknownScript_0x19a6d7 checkevent $0038 iftrue UnknownScript_0x19a6d1 - 2writetext UnknownText_0x19a72e + writetext UnknownText_0x19a72e closetext loadmovesprites setevent $0038 @@ -25,14 +25,14 @@ FishingGuruScript_0x19a6ae: ; 0x19a6ae ; 0x19a6d1 UnknownScript_0x19a6d1: ; 0x19a6d1 - 2writetext UnknownText_0x19a84d + writetext UnknownText_0x19a84d closetext loadmovesprites end ; 0x19a6d7 UnknownScript_0x19a6d7: ; 0x19a6d7 - 2writetext UnknownText_0x19a890 + writetext UnknownText_0x19a890 closetext loadmovesprites setevent $0039 @@ -43,21 +43,21 @@ UnknownScript_0x19a6e0: ; 0x19a6e0 writebyte MAGIKARP special $0042 iffalse UnknownScript_0x19a6d7 - 2writetext UnknownText_0x19a93e + writetext UnknownText_0x19a93e closetext special $0019 if_equal $0, UnknownScript_0x19a71c if_equal $1, UnknownScript_0x19a722 if_equal $2, UnknownScript_0x19a716 - 2jump UnknownScript_0x19a6fe + jump UnknownScript_0x19a6fe ; 0x19a6fe UnknownScript_0x19a6fe: ; 0x19a6fe - 2writetext UnknownText_0x19a977 + writetext UnknownText_0x19a977 keeptextopen verbosegiveitem ELIXER, 1 iffalse UnknownScript_0x19a711 - 2writetext UnknownText_0x19a9c3 + writetext UnknownText_0x19a9c3 closetext loadmovesprites clearevent $003a @@ -71,21 +71,21 @@ UnknownScript_0x19a711: ; 0x19a711 ; 0x19a716 UnknownScript_0x19a716: ; 0x19a716 - 2writetext UnknownText_0x19aa01 + writetext UnknownText_0x19aa01 closetext loadmovesprites end ; 0x19a71c UnknownScript_0x19a71c: ; 0x19a71c - 2writetext UnknownText_0x19aa5c + writetext UnknownText_0x19aa5c closetext loadmovesprites end ; 0x19a722 UnknownScript_0x19a722: ; 0x19a722 - 2writetext UnknownText_0x19aa79 + writetext UnknownText_0x19aa79 closetext loadmovesprites end diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index bed117617..5c6609da4 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -51,7 +51,7 @@ UnknownScript_0x180e53: ; 0x180e53 UnknownScript_0x180e6a: ; 0x180e6a special $006a applymovement $0, MovementData_0x180f38 - 2jump LanceScript_0x180e7b + jump LanceScript_0x180e7b ; 0x180e74 UnknownScript_0x180e74: ; 0x180e74 @@ -60,7 +60,7 @@ UnknownScript_0x180e74: ; 0x180e74 LanceScript_0x180e7b: ; 0x180e7b spriteface $2, $2 loadfont - 2writetext UnknownText_0x180f67 + writetext UnknownText_0x180f67 closetext loadmovesprites winlosstext UnknownText_0x1810a4, $0000 @@ -71,7 +71,7 @@ LanceScript_0x180e7b: ; 0x180e7b returnafterbattle setevent EVENT_BEAT_CHAMPION_LANCE loadfont - 2writetext UnknownText_0x181132 + writetext UnknownText_0x181132 closetext loadmovesprites playsound SFX_ENTER_DOOR @@ -88,7 +88,7 @@ LanceScript_0x180e7b: ; 0x180e7b appear $3 applymovement $3, MovementData_0x180f41 loadfont - 2writetext UnknownText_0x1811dd + writetext UnknownText_0x1811dd closetext loadmovesprites appear $4 @@ -99,19 +99,19 @@ LanceScript_0x180e7b: ; 0x180e7b spriteface $4, $1 spriteface $2, $2 loadfont - 2writetext UnknownText_0x18121b + writetext UnknownText_0x18121b closetext loadmovesprites applymovement $3, MovementData_0x180f4c spriteface $0, $2 loadfont - 2writetext UnknownText_0x18134b + writetext UnknownText_0x18134b closetext loadmovesprites applymovement $2, MovementData_0x180f4f spriteface $0, $1 loadfont - 2writetext UnknownText_0x18137b + writetext UnknownText_0x18137b closetext loadmovesprites follow $2, $0 @@ -127,7 +127,7 @@ LanceScript_0x180e7b: ; 0x180e7b applymovement $3, MovementData_0x180f57 showemote $0, $3, 15 loadfont - 2writetext UnknownText_0x1813c5 + writetext UnknownText_0x1813c5 pause 30 loadmovesprites applymovement $3, MovementData_0x180f5b diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index 9a9aefc1c..6c6173c70 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -25,20 +25,20 @@ GentlemanScript_0x7ee6c: ; 0x7ee6c iftrue .UnknownScript_0x7ee8e checkevent EVENT_RETURNED_MACHINE_PART iftrue .UnknownScript_0x7ee80 - 2writetext UnknownText_0x7effb + writetext UnknownText_0x7effb closetext loadmovesprites end ; 0x7ee80 .UnknownScript_0x7ee80: ; 0x7ee80 - 2writetext UnknownText_0x7f0a1 + writetext UnknownText_0x7f0a1 keeptextopen stringtotext .expncardname, $1 - 2call .UnknownScript_0x7ee94 + scall .UnknownScript_0x7ee94 setflag $0003 .UnknownScript_0x7ee8e ; 0x7ee8e - 2writetext UnknownText_0x7f141 + writetext UnknownText_0x7f141 closetext loadmovesprites end @@ -58,14 +58,14 @@ SuperNerdScript_0x7eea2: ; 0x7eea2 loadfont checkflag $0003 iftrue UnknownScript_0x7eeb0 - 2writetext UnknownText_0x7f193 + writetext UnknownText_0x7f193 closetext loadmovesprites end ; 0x7eeb0 UnknownScript_0x7eeb0: ; 0x7eeb0 - 2writetext UnknownText_0x7f248 + writetext UnknownText_0x7f248 closetext loadmovesprites end diff --git a/maps/LavenderPokeCenter1F.asm b/maps/LavenderPokeCenter1F.asm index 03ad21940..25c1b6f6a 100644 --- a/maps/LavenderPokeCenter1F.asm +++ b/maps/LavenderPokeCenter1F.asm @@ -23,14 +23,14 @@ YoungsterScript_0x7e6a9: ; 0x7e6a9 loadfont checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x7e6b7 - 2writetext UnknownText_0x7e779 + writetext UnknownText_0x7e779 closetext loadmovesprites end ; 0x7e6b7 UnknownScript_0x7e6b7: ; 0x7e6b7 - 2writetext UnknownText_0x7e7ed + writetext UnknownText_0x7e7ed closetext loadmovesprites end diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index 7130e36c7..d1bf21133 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -11,7 +11,7 @@ PryceScript_0x199a9e: ; 0x199a9e loadfont checkevent EVENT_BEAT_PRYCE iftrue UnknownScript_0x199ac8 - 2writetext UnknownText_0x199b8d + writetext UnknownText_0x199b8d closetext loadmovesprites winlosstext UnknownText_0x199cb3, $0000 @@ -20,12 +20,12 @@ PryceScript_0x199a9e: ; 0x199a9e returnafterbattle setevent EVENT_BEAT_PRYCE loadfont - 2writetext UnknownText_0x199d3b + writetext UnknownText_0x199d3b playsound SFX_GET_BADGE waitbutton setflag $0021 checkcode $7 - 2call UnknownScript_0x199af6 + scall UnknownScript_0x199af6 UnknownScript_0x199ac8: ; 0x199ac8 checkevent EVENT_GOT_TM16_ICY_WIND iftrue UnknownScript_0x199af0 @@ -34,19 +34,19 @@ UnknownScript_0x199ac8: ; 0x199ac8 setevent EVENT_BEAT_BOARDER_RONALD setevent EVENT_BEAT_BOARDER_BRAD setevent EVENT_BEAT_BOARDER_DOUGLAS - 2writetext UnknownText_0x199d55 + writetext UnknownText_0x199d55 keeptextopen verbosegiveitem TM_16, 1 iffalse UnknownScript_0x199af4 setevent EVENT_GOT_TM16_ICY_WIND - 2writetext UnknownText_0x199def + writetext UnknownText_0x199def closetext loadmovesprites end ; 0x199af0 UnknownScript_0x199af0: ; 0x199af0 - 2writetext UnknownText_0x199e59 + writetext UnknownText_0x199e59 closetext UnknownScript_0x199af4: ; 0x199af4 loadmovesprites @@ -90,7 +90,7 @@ TrainerSkierRoxanne: ; 0x199b05 SkierRoxanneScript: ; 0x199b11 talkaftercancel loadfont - 2writetext UnknownText_0x19a116 + writetext UnknownText_0x19a116 closetext loadmovesprites end @@ -119,7 +119,7 @@ TrainerSkierClarissa: ; 0x199b19 SkierClarissaScript: ; 0x199b25 talkaftercancel loadfont - 2writetext UnknownText_0x19a18f + writetext UnknownText_0x19a18f closetext loadmovesprites end @@ -148,7 +148,7 @@ TrainerBoarderRonald: ; 0x199b2d BoarderRonaldScript: ; 0x199b39 talkaftercancel loadfont - 2writetext UnknownText_0x199f2d + writetext UnknownText_0x199f2d closetext loadmovesprites end @@ -177,7 +177,7 @@ TrainerBoarderBrad: ; 0x199b41 BoarderBradScript: ; 0x199b4d talkaftercancel loadfont - 2writetext UnknownText_0x199fdd + writetext UnknownText_0x199fdd closetext loadmovesprites end @@ -206,7 +206,7 @@ TrainerBoarderDouglas: ; 0x199b55 BoarderDouglasScript: ; 0x199b61 talkaftercancel loadfont - 2writetext UnknownText_0x19a047 + writetext UnknownText_0x19a047 closetext loadmovesprites end @@ -217,13 +217,13 @@ MahoganyGymGuyScript: ; 0x199b69 loadfont checkevent EVENT_BEAT_PRYCE iftrue .MahoganyGymGuyWinScript - 2writetext MahoganyGymGuyText + writetext MahoganyGymGuyText closetext loadmovesprites end .MahoganyGymGuyWinScript - 2writetext MahoganyGymGuyWinText + writetext MahoganyGymGuyWinText closetext loadmovesprites end diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index 2afd8040d..3f82fd015 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -45,7 +45,7 @@ PharmacistScript_0x6c367: ; 0x6c367 ; 0x6c375 UnknownScript_0x6c375: ; 0x6c375 - 2writetext UnknownText_0x6c46b + writetext UnknownText_0x6c46b closetext loadmovesprites end @@ -56,14 +56,14 @@ BlackBeltScript_0x6c37b: ; 0x6c37b loadfont checkevent EVENT_DECIDED_TO_HELP_LANCE iftrue UnknownScript_0x6c389 - 2writetext UnknownText_0x6c494 + writetext UnknownText_0x6c494 closetext loadmovesprites end ; 0x6c389 UnknownScript_0x6c389: ; 0x6c389 - 2writetext UnknownText_0x6c501 + writetext UnknownText_0x6c501 closetext loadmovesprites end @@ -72,7 +72,7 @@ UnknownScript_0x6c389: ; 0x6c389 UnknownScript_0x6c38f: ; 0x6c38f pause 15 loadfont - 2writetext UnknownText_0x6c52a + writetext UnknownText_0x6c52a pause 15 loadmovesprites playsound SFX_TACKLE @@ -83,7 +83,7 @@ UnknownScript_0x6c38f: ; 0x6c38f pause 15 applymovement $4, MovementData_0x6c407 loadfont - 2writetext UnknownText_0x6c549 + writetext UnknownText_0x6c549 closetext loadmovesprites follow $4, $0 @@ -92,7 +92,7 @@ UnknownScript_0x6c38f: ; 0x6c38f applymovement $4, MovementData_0x6c40e stopfollow loadfont - 2writetext UnknownText_0x6c59e + writetext UnknownText_0x6c59e closetext showemote $0, $2, 10 playsound SFX_UNKNOWN_2A @@ -102,7 +102,7 @@ UnknownScript_0x6c38f: ; 0x6c38f setevent EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART spriteface $4, $2 loadfont - 2writetext UnknownText_0x6c5ba + writetext UnknownText_0x6c5ba closetext loadmovesprites applymovement $4, MovementData_0x6c412 diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm index 2e822dd6b..3b71940d9 100644 --- a/maps/MahoganyRedGyaradosSpeechHouse.asm +++ b/maps/MahoganyRedGyaradosSpeechHouse.asm @@ -15,14 +15,14 @@ TeacherScript_0x199982: ; 0x199982 loadfont checkflag $0013 iftrue UnknownScript_0x199990 - 2writetext UnknownText_0x199a0e + writetext UnknownText_0x199a0e closetext loadmovesprites end ; 0x199990 UnknownScript_0x199990: ; 0x199990 - 2writetext UnknownText_0x199a3d + writetext UnknownText_0x199a3d closetext loadmovesprites end diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index b4dd98865..d88bd4687 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -34,7 +34,7 @@ UnknownScript_0x190013: ; 0x190013 applymovement $0, MovementData_0x1900a7 stopfollow spriteface $0, $3 - 2call UnknownScript_0x19002f + scall UnknownScript_0x19002f applymovement $2, MovementData_0x1900ad end ; 0x19002e @@ -44,13 +44,13 @@ PokefanMScript_0x19002e: ; 0x19002e UnknownScript_0x19002f: ; 0x19002f checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x190039 - 2call UnknownScript_0x190040 + scall UnknownScript_0x190040 end ; 0x190039 UnknownScript_0x190039: ; 0x190039 loadfont - 2writetext UnknownText_0x1901a6 + writetext UnknownText_0x1901a6 closetext loadmovesprites end @@ -58,7 +58,7 @@ UnknownScript_0x190039: ; 0x190039 UnknownScript_0x190040: ; 0x190040 loadfont - 2writetext UnknownText_0x1900b0 + writetext UnknownText_0x1900b0 special $0051 yesorno iffalse UnknownScript_0x190072 @@ -70,28 +70,28 @@ UnknownScript_0x190040: ; 0x190040 playsound SFX_TRANSACTION takemoney $0, 300 special $0051 - 2writetext UnknownText_0x19014a + writetext UnknownText_0x19014a closetext loadmovesprites end ; 0x19006c UnknownScript_0x19006c: ; 0x19006c - 2writetext UnknownText_0x19015b + writetext UnknownText_0x19015b closetext loadmovesprites end ; 0x190072 UnknownScript_0x190072: ; 0x190072 - 2writetext UnknownText_0x190178 + writetext UnknownText_0x190178 closetext loadmovesprites end ; 0x190078 UnknownScript_0x190078: ; 0x190078 - 2writetext UnknownText_0x190188 + writetext UnknownText_0x190188 closetext loadmovesprites end @@ -102,14 +102,14 @@ GrampsScript_0x19007e: ; 0x19007e loadfont checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x19008c - 2writetext UnknownText_0x1901e5 + writetext UnknownText_0x1901e5 closetext loadmovesprites end ; 0x19008c UnknownScript_0x19008c: ; 0x19008c - 2writetext UnknownText_0x19021d + writetext UnknownText_0x19021d closetext loadmovesprites end diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index b0c5ec1fd..eda6bf7d3 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -13,15 +13,15 @@ RockerScript_0x9d278: ; 0x9d278 iftrue UnknownScript_0x9d2fa checkevent EVENT_GOT_SHUCKIE iftrue UnknownScript_0x9d2a4 - 2writetext UnknownText_0x9d303 + writetext UnknownText_0x9d303 yesorno iffalse UnknownScript_0x9d2b6 special SPECIAL_GIVESHUCKLE iffalse UnknownScript_0x9d2b0 - 2writetext UnknownText_0x9d3ed + writetext UnknownText_0x9d3ed keeptextopen waitbutton - 2writetext UnknownText_0x9d41b + writetext UnknownText_0x9d41b playsound SFX_KEY_ITEM waitbutton loadmovesprites @@ -32,28 +32,28 @@ RockerScript_0x9d278: ; 0x9d278 UnknownScript_0x9d2a4: ; 0x9d2a4 checkflag $0055 iffalse UnknownScript_0x9d2bc - 2writetext UnknownText_0x9d3ed + writetext UnknownText_0x9d3ed closetext loadmovesprites end ; 0x9d2b0 UnknownScript_0x9d2b0: ; 0x9d2b0 - 2writetext UnknownText_0x9d42f + writetext UnknownText_0x9d42f closetext loadmovesprites end ; 0x9d2b6 UnknownScript_0x9d2b6: ; 0x9d2b6 - 2writetext UnknownText_0x9d449 + writetext UnknownText_0x9d449 closetext loadmovesprites end ; 0x9d2bc UnknownScript_0x9d2bc: ; 0x9d2bc - 2writetext UnknownText_0x9d470 + writetext UnknownText_0x9d470 yesorno iffalse UnknownScript_0x9d2ee special $004c @@ -61,7 +61,7 @@ UnknownScript_0x9d2bc: ; 0x9d2bc if_equal $1, UnknownScript_0x9d2ee if_equal $3, UnknownScript_0x9d2e5 if_equal $4, UnknownScript_0x9d2fa - 2writetext UnknownText_0x9d4b1 + writetext UnknownText_0x9d4b1 closetext loadmovesprites setevent EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM @@ -69,14 +69,14 @@ UnknownScript_0x9d2bc: ; 0x9d2bc ; 0x9d2df UnknownScript_0x9d2df: ; 0x9d2df - 2writetext UnknownText_0x9d4bd + writetext UnknownText_0x9d4bd closetext loadmovesprites end ; 0x9d2e5 UnknownScript_0x9d2e5: ; 0x9d2e5 - 2writetext UnknownText_0x9d4e3 + writetext UnknownText_0x9d4e3 closetext loadmovesprites setevent EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM @@ -84,21 +84,21 @@ UnknownScript_0x9d2e5: ; 0x9d2e5 ; 0x9d2ee UnknownScript_0x9d2ee: ; 0x9d2ee - 2writetext UnknownText_0x9d53f + writetext UnknownText_0x9d53f closetext loadmovesprites end ; 0x9d2f4 UnknownScript_0x9d2f4: ; 0x9d2f4 - 2writetext UnknownText_0x9d5b0 + writetext UnknownText_0x9d5b0 closetext loadmovesprites end ; 0x9d2fa UnknownScript_0x9d2fa: ; 0x9d2fa - 2writetext UnknownText_0x9d56c + writetext UnknownText_0x9d56c closetext loadmovesprites end diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm index bf47c1539..dfbdfa7ac 100644 --- a/maps/MobileBattleRoom.asm +++ b/maps/MobileBattleRoom.asm @@ -33,11 +33,11 @@ MapMobileBattleRoomSignpost0Script: ; 0x1935da iffalse UnknownScript_0x193624 if_equal $1, UnknownScript_0x1935f4 if_equal $2, UnknownScript_0x19360d - 2jump UnknownScript_0x193624 + jump UnknownScript_0x193624 ; 0x1935f4 UnknownScript_0x1935f4: ; 0x1935f4 - 2writetext UnknownText_0x193644 + writetext UnknownText_0x193644 pause 20 loadmovesprites special $002e @@ -54,7 +54,7 @@ UnknownScript_0x19360d: ; 0x19360d iftrue UnknownScript_0x193624 UnknownScript_0x193619: ; 0x193619 special $00a2 - 2writetext UnknownText_0x193626 + writetext UnknownText_0x193626 closetext reloadmappart special $0081 diff --git a/maps/MobileTradeRoomMobile.asm b/maps/MobileTradeRoomMobile.asm index 64637ded1..cc10fc19a 100644 --- a/maps/MobileTradeRoomMobile.asm +++ b/maps/MobileTradeRoomMobile.asm @@ -28,7 +28,7 @@ UnknownScript_0x19357b: ; 0x19357b MapMobileTradeRoomMobileSignpost0Script: ; 0x193582 refreshscreen $0 special $009f - 2writetext UnknownText_0x193591 + writetext UnknownText_0x193591 closetext reloadmappart special $0082 diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index b2437062e..c4fb9b62a 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -27,7 +27,7 @@ UnknownScript_0x7408e: ; 0x7408e applymovement $2, MovementData_0x740f9 playmusic MUSIC_RIVAL_ENCOUNTER loadfont - 2writetext UnknownText_0x74105 + writetext UnknownText_0x74105 closetext loadmovesprites checkevent EVENT_GOT_TOTODILE_FROM_ELM @@ -40,7 +40,7 @@ UnknownScript_0x7408e: ; 0x7408e startbattle reloadmapmusic returnafterbattle - 2jump UnknownScript_0x740e3 + jump UnknownScript_0x740e3 ; 0x740c3 UnknownScript_0x740c3: ; 0x740c3 @@ -50,7 +50,7 @@ UnknownScript_0x740c3: ; 0x740c3 startbattle reloadmapmusic returnafterbattle - 2jump UnknownScript_0x740e3 + jump UnknownScript_0x740e3 ; 0x740d3 UnknownScript_0x740d3: ; 0x740d3 @@ -60,13 +60,13 @@ UnknownScript_0x740d3: ; 0x740d3 startbattle reloadmapmusic returnafterbattle - 2jump UnknownScript_0x740e3 + jump UnknownScript_0x740e3 ; 0x740e3 UnknownScript_0x740e3: ; 0x740e3 playmusic MUSIC_RIVAL_AFTER loadfont - 2writetext UnknownText_0x741fa + writetext UnknownText_0x741fa closetext loadmovesprites applymovement $2, MovementData_0x740fd diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index 948b856fa..9e7f30019 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -29,7 +29,7 @@ TrainerPokemaniacMiller: ; 0x7de51 PokemaniacMillerScript: ; 0x7de5d talkaftercancel loadfont - 2writetext UnknownText_0x7debd + writetext UnknownText_0x7debd closetext loadmovesprites end @@ -58,7 +58,7 @@ TrainerSupernerdMarkus: ; 0x7de65 SupernerdMarkusScript: ; 0x7de71 talkaftercancel loadfont - 2writetext UnknownText_0x7df97 + writetext UnknownText_0x7df97 closetext loadmovesprites end diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index e9c39c296..5db70563f 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -29,7 +29,7 @@ TrainerSupernerdHugh: ; 0x7e0ca SupernerdHughScript: ; 0x7e0d6 talkaftercancel loadfont - 2writetext UnknownText_0x7e10e + writetext UnknownText_0x7e10e closetext loadmovesprites end diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index dbb55a2b3..a0082d803 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -13,7 +13,7 @@ BlackBeltScript_0x7e1f6: ; 0x7e1f6 iftrue UnknownScript_0x7e231 checkevent $04a9 iftrue UnknownScript_0x7e217 - 2writetext UnknownText_0x7e24d + writetext UnknownText_0x7e24d closetext loadmovesprites winlosstext UnknownText_0x7e2a9, $0000 @@ -23,25 +23,25 @@ BlackBeltScript_0x7e1f6: ; 0x7e1f6 setevent $04a9 loadfont UnknownScript_0x7e217: ; 0x7e217 - 2writetext UnknownText_0x7e2c0 + writetext UnknownText_0x7e2c0 keeptextopen waitbutton checkcode $1 if_equal $6, UnknownScript_0x7e237 - 2writetext UnknownText_0x7e355 + writetext UnknownText_0x7e355 playsound SFX_CAUGHT_MON waitbutton givepoke TYROGUE, 10, 0, 0 setevent EVENT_GOT_TYROGUE_FROM_KIYO UnknownScript_0x7e231: ; 0x7e231 - 2writetext UnknownText_0x7e36a + writetext UnknownText_0x7e36a closetext loadmovesprites end ; 0x7e237 UnknownScript_0x7e237: ; 0x7e237 - 2writetext UnknownText_0x7e3df + writetext UnknownText_0x7e3df closetext loadmovesprites end diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm index dba523b94..6b0da4626 100644 --- a/maps/MrFujisHouse.asm +++ b/maps/MrFujisHouse.asm @@ -16,7 +16,7 @@ LassScript_0x7e8cd: ; 0x7e8cd RhydonScript_0x7e8d0: ; 0x7e8d0 loadfont - 2writetext UnknownText_0x7e9b6 + writetext UnknownText_0x7e9b6 cry PSYDUCK closetext loadmovesprites @@ -25,7 +25,7 @@ RhydonScript_0x7e8d0: ; 0x7e8d0 GrowlitheScript_0x7e8da: ; 0x7e8da loadfont - 2writetext UnknownText_0x7e9c9 + writetext UnknownText_0x7e9c9 cry NIDORINO closetext loadmovesprites @@ -34,7 +34,7 @@ GrowlitheScript_0x7e8da: ; 0x7e8da MoltresScript_0x7e8e4: ; 0x7e8e4 loadfont - 2writetext UnknownText_0x7e9da + writetext UnknownText_0x7e9da cry PIDGEY closetext loadmovesprites diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index 8b7d3eb90..08a02f337 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -23,32 +23,32 @@ UnknownScript_0x196e56: ; 0x196e56 showemote $0, $2, 15 spriteface $2, $0 loadfont - 2writetext UnknownText_0x196f66 + writetext UnknownText_0x196f66 closetext loadmovesprites applymovement $0, MovementData_0x196f5a loadfont - 2writetext UnknownText_0x196fa8 + writetext UnknownText_0x196fa8 keeptextopen waitbutton giveitem MYSTERY_EGG, $1 - 2writetext UnknownText_0x196fd2 + writetext UnknownText_0x196fd2 playsound SFX_KEY_ITEM waitbutton itemnotify setevent EVENT_GOT_MYSTERY_EGG_FROM_MR_POKEMON blackoutmod GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY - 2writetext UnknownText_0x196feb + writetext UnknownText_0x196feb keeptextopen spriteface $2, $3 - 2writetext UnknownText_0x197092 + writetext UnknownText_0x197092 keeptextopen spriteface $2, $0 spriteface $3, $2 - 2writetext UnknownText_0x1970b7 + writetext UnknownText_0x1970b7 closetext loadmovesprites - 2jump UnknownScript_0x196ec9 + jump UnknownScript_0x196ec9 ; 0x196e97 GentlemanScript_0x196e97: ; 0x196e97 @@ -58,31 +58,31 @@ GentlemanScript_0x196e97: ; 0x196e97 iftrue UnknownScript_0x196eb0 checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM iftrue UnknownScript_0x196eaa - 2writetext UnknownText_0x197134 + writetext UnknownText_0x197134 closetext loadmovesprites end ; 0x196eaa UnknownScript_0x196eaa: ; 0x196eaa - 2writetext UnknownText_0x19714a + writetext UnknownText_0x19714a closetext loadmovesprites end ; 0x196eb0 UnknownScript_0x196eb0: ; 0x196eb0 - 2writetext UnknownText_0x197476 + writetext UnknownText_0x197476 yesorno iffalse UnknownScript_0x196ec3 verbosegiveitem EXP_SHARE, 1 iffalse UnknownScript_0x196ec7 takeitem RED_SCALE, 1 - 2jump UnknownScript_0x196eaa + jump UnknownScript_0x196eaa ; 0x196ec3 UnknownScript_0x196ec3: ; 0x196ec3 - 2writetext UnknownText_0x19750d + writetext UnknownText_0x19750d closetext UnknownScript_0x196ec7: ; 0x196ec7 loadmovesprites @@ -94,14 +94,14 @@ UnknownScript_0x196ec9: ; 0x196ec9 applymovement $3, MovementData_0x196f5d spriteface $0, $3 loadfont - 2writetext UnknownText_0x197185 + writetext UnknownText_0x197185 keeptextopen waitbutton - 2writetext UnknownText_0x1973cc + writetext UnknownText_0x1973cc playsound SFX_ITEM waitbutton setflag $000b - 2writetext UnknownText_0x1973de + writetext UnknownText_0x1973de closetext loadmovesprites spriteface $0, $0 @@ -113,7 +113,7 @@ UnknownScript_0x196ec9: ; 0x196ec9 pause 15 spriteface $0, $1 loadfont - 2writetext UnknownText_0x1970ed + writetext UnknownText_0x1970ed closetext loadmovesprites special $0030 @@ -125,7 +125,7 @@ UnknownScript_0x196ec9: ; 0x196ec9 special $0032 special $003d loadfont - 2writetext UnknownText_0x197134 + writetext UnknownText_0x197134 closetext loadmovesprites setevent $06bd diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm index de0737a93..726cb3274 100644 --- a/maps/MrPsychicsHouse.asm +++ b/maps/MrPsychicsHouse.asm @@ -11,13 +11,13 @@ FishingGuruScript_0x18a77a: ; 0x18a77a loadfont checkevent EVENT_GOT_TM29_PSYCHIC iftrue UnknownScript_0x18a78f - 2writetext UnknownText_0x18a798 + writetext UnknownText_0x18a798 keeptextopen verbosegiveitem TM_29, 1 iffalse UnknownScript_0x18a793 setevent EVENT_GOT_TM29_PSYCHIC UnknownScript_0x18a78f: ; 0x18a78f - 2writetext UnknownText_0x18a7bb + writetext UnknownText_0x18a7bb closetext UnknownScript_0x18a793: ; 0x18a793 loadmovesprites diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index f68afa9bf..3f5456ce5 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -19,13 +19,13 @@ TeacherScript_0x5c008: ; 0x5c008 loadfont checkevent EVENT_GOT_QUICK_CLAW iftrue UnknownScript_0x5c01d - 2writetext UnknownText_0x5c265 + writetext UnknownText_0x5c265 keeptextopen verbosegiveitem QUICK_CLAW, 1 iffalse UnknownScript_0x5c021 setevent EVENT_GOT_QUICK_CLAW UnknownScript_0x5c01d: ; 0x5c01d - 2writetext UnknownText_0x5c30d + writetext UnknownText_0x5c30d closetext UnknownScript_0x5c021: ; 0x5c021 loadmovesprites @@ -47,7 +47,7 @@ TeacherScript_0x5c029: ; 0x5c029 GrowlitheScript_0x5c02c: ; 0x5c02c faceplayer loadfont - 2writetext UnknownText_0x5c416 + writetext UnknownText_0x5c416 cry PERSIAN closetext loadmovesprites @@ -57,7 +57,7 @@ GrowlitheScript_0x5c02c: ; 0x5c02c GameboyKidScript_0x5c037: ; 0x5c037 faceplayer loadfont - 2writetext UnknownText_0x5c42a + writetext UnknownText_0x5c42a closetext loadmovesprites spriteface $e, $0 @@ -94,26 +94,26 @@ SchoolboyJack1Script: ; 0x5c04e iftrue UnknownScript_0x5c108 checkevent $025f iftrue UnknownScript_0x5c071 - 2writetext UnknownText_0x5c4f3 + writetext UnknownText_0x5c4f3 keeptextopen setevent $025f - 2call UnknownScript_0x5c0fc - 2jump UnknownScript_0x5c074 + scall UnknownScript_0x5c0fc + jump UnknownScript_0x5c074 ; 0x5c071 UnknownScript_0x5c071: ; 0x5c071 - 2call UnknownScript_0x5c100 + scall UnknownScript_0x5c100 UnknownScript_0x5c074: ; 0x5c074 askforphonenumber $5 if_equal $1, UnknownScript_0x5c110 if_equal $2, UnknownScript_0x5c10c trainertotext SCHOOLBOY, JACK1, $0 - 2call UnknownScript_0x5c104 - 2jump UnknownScript_0x5c108 + scall UnknownScript_0x5c104 + jump UnknownScript_0x5c108 ; 0x5c088 UnknownScript_0x5c088: ; 0x5c088 - 2call UnknownScript_0x5c114 + scall UnknownScript_0x5c114 winlosstext SchoolboyJack1BeatenText, $0000 copybytetovar $d9f2 if_equal $4, UnknownScript_0x5c0a7 @@ -235,7 +235,7 @@ TrainerPokefanmWilliam: ; 0x5c118 PokefanmWilliamScript: ; 0x5c124 talkaftercancel loadfont - 2writetext UnknownText_0x5c645 + writetext UnknownText_0x5c645 closetext loadmovesprites end @@ -273,38 +273,38 @@ PokefanfBeverly1Script: ; 0x5c138 iffalse UnknownScript_0x5c189 checkevent EVENT_SHOWED_BEVERLY_MARILL iftrue UnknownScript_0x5c160 - 2writetext UnknownText_0x5c5bd + writetext UnknownText_0x5c5bd keeptextopen setevent EVENT_SHOWED_BEVERLY_MARILL - 2call UnknownScript_0x5c18f - 2jump UnknownScript_0x5c163 + scall UnknownScript_0x5c18f + jump UnknownScript_0x5c163 ; 0x5c160 UnknownScript_0x5c160: ; 0x5c160 - 2call UnknownScript_0x5c193 + scall UnknownScript_0x5c193 UnknownScript_0x5c163: ; 0x5c163 askforphonenumber $6 if_equal $1, UnknownScript_0x5c1a3 if_equal $2, UnknownScript_0x5c19f trainertotext POKEFANF, BEVERLY1, $0 - 2call UnknownScript_0x5c197 - 2jump UnknownScript_0x5c19b + scall UnknownScript_0x5c197 + jump UnknownScript_0x5c19b ; 0x5c177 UnknownScript_0x5c177: ; 0x5c177 - 2call UnknownScript_0x5c1a7 + scall UnknownScript_0x5c1a7 verbosegiveitem NUGGET, 1 iffalse UnknownScript_0x5c186 clearflag $007d - 2jump UnknownScript_0x5c19b + jump UnknownScript_0x5c19b ; 0x5c186 UnknownScript_0x5c186: ; 0x5c186 - 2jump UnknownScript_0x5c1ab + jump UnknownScript_0x5c1ab ; 0x5c189 UnknownScript_0x5c189: ; 0x5c189 - 2writetext UnknownText_0x5c68a + writetext UnknownText_0x5c68a closetext loadmovesprites end @@ -373,7 +373,7 @@ TrainerLassKrise: ; 0x5c1af LassKriseScript: ; 0x5c1bb talkaftercancel loadfont - 2writetext UnknownText_0x5c71d + writetext UnknownText_0x5c71d closetext loadmovesprites end diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm index bbc6cc968..bc6d0f4b4 100644 --- a/maps/NationalParkBugContest.asm +++ b/maps/NationalParkBugContest.asm @@ -9,7 +9,7 @@ NationalParkBugContest_MapScriptHeader: ; 0x5c8ea YoungsterScript_0x5c8ec: ; 0x5c8ec faceplayer loadfont - 2writetext UnknownText_0x5c94c + writetext UnknownText_0x5c94c closetext loadmovesprites end @@ -18,7 +18,7 @@ YoungsterScript_0x5c8ec: ; 0x5c8ec YoungsterScript_0x5c8f4: ; 0x5c8f4 faceplayer loadfont - 2writetext UnknownText_0x5c973 + writetext UnknownText_0x5c973 closetext loadmovesprites end @@ -27,7 +27,7 @@ YoungsterScript_0x5c8f4: ; 0x5c8f4 RockerScript_0x5c8fc: ; 0x5c8fc faceplayer loadfont - 2writetext UnknownText_0x5c9a3 + writetext UnknownText_0x5c9a3 closetext loadmovesprites end @@ -36,7 +36,7 @@ RockerScript_0x5c8fc: ; 0x5c8fc PokefanMScript_0x5c904: ; 0x5c904 faceplayer loadfont - 2writetext UnknownText_0x5c9cc + writetext UnknownText_0x5c9cc closetext loadmovesprites end @@ -45,7 +45,7 @@ PokefanMScript_0x5c904: ; 0x5c904 YoungsterScript_0x5c90c: ; 0x5c90c faceplayer loadfont - 2writetext UnknownText_0x5ca15 + writetext UnknownText_0x5ca15 closetext loadmovesprites end @@ -54,7 +54,7 @@ YoungsterScript_0x5c90c: ; 0x5c90c YoungsterScript_0x5c914: ; 0x5c914 faceplayer loadfont - 2writetext UnknownText_0x5ca52 + writetext UnknownText_0x5ca52 closetext loadmovesprites end @@ -63,7 +63,7 @@ YoungsterScript_0x5c914: ; 0x5c914 LassScript_0x5c91c: ; 0x5c91c faceplayer loadfont - 2writetext UnknownText_0x5ca8f + writetext UnknownText_0x5ca8f closetext loadmovesprites end @@ -72,7 +72,7 @@ LassScript_0x5c91c: ; 0x5c91c YoungsterScript_0x5c924: ; 0x5c924 faceplayer loadfont - 2writetext UnknownText_0x5cac8 + writetext UnknownText_0x5cac8 closetext loadmovesprites end @@ -81,7 +81,7 @@ YoungsterScript_0x5c924: ; 0x5c924 YoungsterScript_0x5c92c: ; 0x5c92c faceplayer loadfont - 2writetext UnknownText_0x5cb25 + writetext UnknownText_0x5cb25 closetext loadmovesprites end @@ -90,7 +90,7 @@ YoungsterScript_0x5c92c: ; 0x5c92c YoungsterScript_0x5c934: ; 0x5c934 faceplayer loadfont - 2writetext UnknownText_0x5cb64 + writetext UnknownText_0x5cb64 closetext loadmovesprites end diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index 9645456b5..fa0955423 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -32,20 +32,20 @@ UnknownScript_0x1a8016: ; 0x1a8016 playmusic MUSIC_MOM spriteface $2, $2 loadfont - 2writetext UnknownText_0x1a8134 + writetext UnknownText_0x1a8134 closetext loadmovesprites spriteface $0, $3 applymovement $2, MovementData_0x1a80d4 loadfont - 2writetext UnknownText_0x1a813e + writetext UnknownText_0x1a813e closetext loadmovesprites follow $2, $0 applymovement $2, MovementData_0x1a80e0 stopfollow loadfont - 2writetext UnknownText_0x1a815e + writetext UnknownText_0x1a815e closetext loadmovesprites special $003d @@ -56,21 +56,21 @@ UnknownScript_0x1a8041: ; 0x1a8041 playmusic MUSIC_MOM spriteface $2, $2 loadfont - 2writetext UnknownText_0x1a8134 + writetext UnknownText_0x1a8134 closetext loadmovesprites spriteface $0, $3 applymovement $2, MovementData_0x1a80d9 spriteface $0, $1 loadfont - 2writetext UnknownText_0x1a813e + writetext UnknownText_0x1a813e closetext loadmovesprites follow $2, $0 applymovement $2, MovementData_0x1a80e6 stopfollow loadfont - 2writetext UnknownText_0x1a815e + writetext UnknownText_0x1a815e closetext loadmovesprites special $003d @@ -86,28 +86,28 @@ TeacherScript_0x1a806f: ; 0x1a806f iftrue UnknownScript_0x1a808f checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue UnknownScript_0x1a8089 - 2writetext UnknownText_0x1a80f7 + writetext UnknownText_0x1a80f7 closetext loadmovesprites end ; 0x1a8089 UnknownScript_0x1a8089: ; 0x1a8089 - 2writetext UnknownText_0x1a81c4 + writetext UnknownText_0x1a81c4 closetext loadmovesprites end ; 0x1a808f UnknownScript_0x1a808f: ; 0x1a808f - 2writetext UnknownText_0x1a81f2 + writetext UnknownText_0x1a81f2 closetext loadmovesprites end ; 0x1a8095 UnknownScript_0x1a8095: ; 0x1a8095 - 2writetext UnknownText_0x1a8236 + writetext UnknownText_0x1a8236 closetext loadmovesprites end @@ -119,12 +119,12 @@ FisherScript_0x1a809b: ; 0x1a809b SilverScript_0x1a809e: ; 0x1a809e loadfont - 2writetext UnknownText_0x1a82a6 + writetext UnknownText_0x1a82a6 closetext loadmovesprites spriteface $4, $2 loadfont - 2writetext UnknownText_0x1a82cd + writetext UnknownText_0x1a82cd closetext loadmovesprites follow $0, $4 diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index 6e55fc0de..54f1c5f1c 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -17,43 +17,43 @@ OakScript_0x19b3c8: ; 0x19b3c8 iftrue UnknownScript_0x19b3ea checkevent $00e1 iftrue UnknownScript_0x19b3dd - 2writetext UnknownText_0x19b427 + writetext UnknownText_0x19b427 keeptextopen setevent $00e1 UnknownScript_0x19b3dd: ; 0x19b3dd checkcode $7 if_equal $10, UnknownScript_0x19b3f7 if_equal $8, UnknownScript_0x19b401 - 2jump UnknownScript_0x19b408 + jump UnknownScript_0x19b408 ; 0x19b3ea UnknownScript_0x19b3ea: ; 0x19b3ea - 2writetext UnknownText_0x19b4a2 + writetext UnknownText_0x19b4a2 closetext special $0065 - 2writetext UnknownText_0x19b4c8 + writetext UnknownText_0x19b4c8 closetext loadmovesprites end ; 0x19b3f7 UnknownScript_0x19b3f7: ; 0x19b3f7 - 2writetext UnknownText_0x19b4fc + writetext UnknownText_0x19b4fc keeptextopen setevent $074f - 2jump UnknownScript_0x19b3ea + jump UnknownScript_0x19b3ea ; 0x19b401 UnknownScript_0x19b401: ; 0x19b401 - 2writetext UnknownText_0x19b6a2 + writetext UnknownText_0x19b6a2 keeptextopen - 2jump UnknownScript_0x19b3ea + jump UnknownScript_0x19b3ea ; 0x19b408 UnknownScript_0x19b408: ; 0x19b408 - 2writetext UnknownText_0x19b73c + writetext UnknownText_0x19b73c keeptextopen - 2jump UnknownScript_0x19b3ea + jump UnknownScript_0x19b3ea ; 0x19b40f ScientistScript_0x19b40f: ; 0x19b40f diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm index 1ae3a305c..dd948ed90 100644 --- a/maps/OlivineCafe.asm +++ b/maps/OlivineCafe.asm @@ -11,12 +11,12 @@ SailorScript_0x9c8c1: ; 0x9c8c1 loadfont checkevent EVENT_GOT_HM04_STRENGTH iftrue UnknownScript_0x9c8d3 - 2writetext UnknownText_0x9c8df + writetext UnknownText_0x9c8df keeptextopen verbosegiveitem HM_04, 1 setevent EVENT_GOT_HM04_STRENGTH UnknownScript_0x9c8d3: ; 0x9c8d3 - 2writetext UnknownText_0x9c965 + writetext UnknownText_0x9c965 closetext loadmovesprites end diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index 6c754dd7f..e1fefcf01 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -38,7 +38,7 @@ UnknownScript_0x1a8833: ; 0x1a8833 applymovement $5, MovementData_0x1a88d2 playmusic MUSIC_RIVAL_ENCOUNTER loadfont - 2writetext UnknownText_0x1a88fa + writetext UnknownText_0x1a88fa closetext loadmovesprites applymovement $0, MovementData_0x1a88f4 @@ -63,7 +63,7 @@ UnknownScript_0x1a886b: ; 0x1a886b applymovement $5, MovementData_0x1a88d6 playmusic MUSIC_RIVAL_ENCOUNTER loadfont - 2writetext UnknownText_0x1a88fa + writetext UnknownText_0x1a88fa closetext loadmovesprites applymovement $0, MovementData_0x1a88f7 @@ -86,14 +86,14 @@ StandingYoungsterScript_0x1a88a6: ; 0x1a88a6 loadfont random $2 if_equal $0, UnknownScript_0x1a88b4 - 2writetext UnknownText_0x1a8b04 + writetext UnknownText_0x1a8b04 closetext loadmovesprites end ; 0x1a88b4 UnknownScript_0x1a88b4: ; 0x1a88b4 - 2writetext UnknownText_0x1a8b41 + writetext UnknownText_0x1a8b41 closetext loadmovesprites end diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm index 69a931171..a5f1555f5 100644 --- a/maps/OlivineGoodRodHouse.asm +++ b/maps/OlivineGoodRodHouse.asm @@ -11,13 +11,13 @@ FishingGuruScript_0x9c71b: ; 0x9c71b loadfont checkevent EVENT_GOT_GOOD_ROD iftrue UnknownScript_0x9c740 - 2writetext UnknownText_0x9c749 + writetext UnknownText_0x9c749 yesorno iffalse UnknownScript_0x9c73a - 2writetext UnknownText_0x9c7db + writetext UnknownText_0x9c7db keeptextopen verbosegiveitem GOOD_ROD, 1 - 2writetext UnknownText_0x9c807 + writetext UnknownText_0x9c807 closetext loadmovesprites setevent EVENT_GOT_GOOD_ROD @@ -25,14 +25,14 @@ FishingGuruScript_0x9c71b: ; 0x9c71b ; 0x9c73a UnknownScript_0x9c73a: ; 0x9c73a - 2writetext UnknownText_0x9c84c + writetext UnknownText_0x9c84c closetext loadmovesprites end ; 0x9c740 UnknownScript_0x9c740: ; 0x9c740 - 2writetext UnknownText_0x9c87f + writetext UnknownText_0x9c87f closetext loadmovesprites end diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index bae05d336..209c558f5 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -11,7 +11,7 @@ JasmineScript_0x9c12f: ; 0x9c12f loadfont checkevent EVENT_BEAT_JASMINE iftrue UnknownScript_0x9c159 - 2writetext UnknownText_0x9c1b9 + writetext UnknownText_0x9c1b9 closetext loadmovesprites winlosstext UnknownText_0x9c2bb, $0000 @@ -20,28 +20,28 @@ JasmineScript_0x9c12f: ; 0x9c12f returnafterbattle setevent EVENT_BEAT_JASMINE loadfont - 2writetext UnknownText_0x9c33a + writetext UnknownText_0x9c33a playsound SFX_GET_BADGE waitbutton setflag $001f checkcode $7 - 2call UnknownScript_0x9c178 + scall UnknownScript_0x9c178 UnknownScript_0x9c159: ; 0x9c159 checkevent EVENT_GOT_TM23_IRON_TAIL iftrue UnknownScript_0x9c172 - 2writetext UnknownText_0x9c354 + writetext UnknownText_0x9c354 keeptextopen verbosegiveitem TM_23, 1 iffalse UnknownScript_0x9c176 setevent EVENT_GOT_TM23_IRON_TAIL - 2writetext UnknownText_0x9c3a5 + writetext UnknownText_0x9c3a5 closetext loadmovesprites end ; 0x9c172 UnknownScript_0x9c172: ; 0x9c172 - 2writetext UnknownText_0x9c3d1 + writetext UnknownText_0x9c3d1 closetext UnknownScript_0x9c176: ; 0x9c176 loadmovesprites @@ -69,7 +69,7 @@ OlivineGymGuyScript: ; 0x9c187 checkevent EVENT_JASMINE_RETURNED_TO_GYM iffalse .OlivineGymGuyPreScript loadfont - 2writetext OlivineGymGuyText + writetext OlivineGymGuyText closetext loadmovesprites end @@ -77,7 +77,7 @@ OlivineGymGuyScript: ; 0x9c187 .OlivineGymGuyWinScript loadfont - 2writetext OlivineGymGuyWinText + writetext OlivineGymGuyWinText closetext loadmovesprites end @@ -85,7 +85,7 @@ OlivineGymGuyScript: ; 0x9c187 .OlivineGymGuyPreScript loadfont - 2writetext OlivineGymGuyPreText + writetext OlivineGymGuyPreText closetext loadmovesprites end diff --git a/maps/OlivineHouseBeta.asm b/maps/OlivineHouseBeta.asm index e83071ab9..b62b8f9d0 100644 --- a/maps/OlivineHouseBeta.asm +++ b/maps/OlivineHouseBeta.asm @@ -12,7 +12,7 @@ TeacherScript_0x9c58f: ; 0x9c58f RhydonScript_0x9c592: ; 0x9c592 loadfont - 2writetext UnknownText_0x9c5f0 + writetext UnknownText_0x9c5f0 cry RHYDON closetext loadmovesprites diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index 787e56095..f06ab2cdb 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -29,7 +29,7 @@ TrainerGentlemanAlfred: ; 0x5af71 GentlemanAlfredScript: ; 0x5af7d talkaftercancel loadfont - 2writetext UnknownText_0x5b13e + writetext UnknownText_0x5b13e closetext loadmovesprites end @@ -66,23 +66,23 @@ SailorHuey1Script: ; 0x5af91 checkevent $0263 iftrue UnknownScript_0x5afb0 setevent $0263 - 2call UnknownScript_0x5b053 - 2jump UnknownScript_0x5afb3 + scall UnknownScript_0x5b053 + jump UnknownScript_0x5afb3 ; 0x5afb0 UnknownScript_0x5afb0: ; 0x5afb0 - 2call UnknownScript_0x5b057 + scall UnknownScript_0x5b057 UnknownScript_0x5afb3: ; 0x5afb3 askforphonenumber $7 if_equal $1, UnknownScript_0x5b067 if_equal $2, UnknownScript_0x5b063 trainertotext SAILOR, HUEY1, $0 - 2call UnknownScript_0x5b05b - 2jump UnknownScript_0x5b05f + scall UnknownScript_0x5b05b + jump UnknownScript_0x5b05f ; 0x5afc7 UnknownScript_0x5afc7: ; 0x5afc7 - 2call UnknownScript_0x5b06b + scall UnknownScript_0x5b06b winlosstext SailorHuey1BeatenText, $0000 copybytetovar $d9f4 if_equal $3, UnknownScript_0x5afe2 @@ -134,11 +134,11 @@ UnknownScript_0x5b01b: ; 0x5b01b iftrue UnknownScript_0x5b03f checkevent $0265 iftrue UnknownScript_0x5b03e - 2call UnknownScript_0x5b076 + scall UnknownScript_0x5b076 verbosegiveitem PROTEIN, 1 iffalse UnknownScript_0x5b06f setevent $0265 - 2jump UnknownScript_0x5b05f + jump UnknownScript_0x5b05f ; 0x5b03e UnknownScript_0x5b03e: ; 0x5b03e @@ -147,13 +147,13 @@ UnknownScript_0x5b03e: ; 0x5b03e UnknownScript_0x5b03f: ; 0x5b03f loadfont - 2writetext UnknownText_0x5b1b6 + writetext UnknownText_0x5b1b6 closetext verbosegiveitem PROTEIN, 1 iffalse UnknownScript_0x5b06f clearevent EVENT_HUEY_PROTEIN setevent $0265 - 2jump UnknownScript_0x5b05f + jump UnknownScript_0x5b05f ; 0x5b053 UnknownScript_0x5b053: ; 0x5b053 diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index ab627a512..f44991413 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -29,7 +29,7 @@ TrainerBird_keeperTheo: ; 0x5b23d Bird_keeperTheoScript: ; 0x5b249 talkaftercancel loadfont - 2writetext UnknownText_0x5b2df + writetext UnknownText_0x5b2df closetext loadmovesprites end @@ -58,7 +58,7 @@ TrainerGentlemanPreston: ; 0x5b251 GentlemanPrestonScript: ; 0x5b25d talkaftercancel loadfont - 2writetext UnknownText_0x5b457 + writetext UnknownText_0x5b457 closetext loadmovesprites end @@ -87,7 +87,7 @@ TrainerSailorTerrell: ; 0x5b265 SailorTerrellScript: ; 0x5b271 talkaftercancel loadfont - 2writetext UnknownText_0x5b384 + writetext UnknownText_0x5b384 closetext loadmovesprites end diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm index 69b707717..da6f2143a 100644 --- a/maps/OlivineLighthouse4F.asm +++ b/maps/OlivineLighthouse4F.asm @@ -29,7 +29,7 @@ TrainerLassConnie1: ; 0x5b4ea LassConnie1Script: ; 0x5b4f6 talkaftercancel loadfont - 2writetext UnknownText_0x5b63c + writetext UnknownText_0x5b63c closetext loadmovesprites end @@ -58,7 +58,7 @@ TrainerSailorKent: ; 0x5b4fe SailorKentScript: ; 0x5b50a talkaftercancel loadfont - 2writetext UnknownText_0x5b584 + writetext UnknownText_0x5b584 closetext loadmovesprites end diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index abccfbddb..6c0e0b890 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -29,7 +29,7 @@ TrainerBird_keeperDenis: ; 0x60982 Bird_keeperDenisScript: ; 0x6098e talkaftercancel loadfont - 2writetext UnknownText_0x60ac3 + writetext UnknownText_0x60ac3 closetext loadmovesprites end @@ -58,7 +58,7 @@ TrainerSailorErnest: ; 0x60996 SailorErnestScript: ; 0x609a2 talkaftercancel loadfont - 2writetext UnknownText_0x60a1f + writetext UnknownText_0x60a1f closetext loadmovesprites end diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index 2bcaac655..2a12b6a27 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -13,24 +13,24 @@ JasmineScript_0x60b91: ; 0x60b91 iftrue UnknownScript_0x60bab checkevent $0037 iftrue UnknownScript_0x60ba5 - 2writetext UnknownText_0x60c81 + writetext UnknownText_0x60c81 keeptextopen setevent $0037 UnknownScript_0x60ba5: ; 0x60ba5 - 2writetext UnknownText_0x60d64 + writetext UnknownText_0x60d64 closetext loadmovesprites end ; 0x60bab UnknownScript_0x60bab: ; 0x60bab - 2writetext UnknownText_0x60d99 + writetext UnknownText_0x60d99 yesorno iffalse UnknownScript_0x60c25 - 2writetext UnknownText_0x60dc3 + writetext UnknownText_0x60dc3 keeptextopen takeitem SECRETPOTION, 1 - 2writetext UnknownText_0x60dea + writetext UnknownText_0x60dea closetext loadmovesprites spriteface $2, $3 @@ -38,7 +38,7 @@ UnknownScript_0x60bab: ; 0x60bab spriteface $3, $2 loadfont playmusic MUSIC_HEAL - 2writetext UnknownText_0x60e44 + writetext UnknownText_0x60e44 pause 60 keeptextopen loadmovesprites @@ -48,7 +48,7 @@ UnknownScript_0x60bab: ; 0x60bab pause 10 special $0031 loadfont - 2writetext UnknownText_0x60f3d + writetext UnknownText_0x60f3d closetext loadmovesprites spriteface $3, $3 @@ -61,7 +61,7 @@ UnknownScript_0x60bab: ; 0x60bab pause 10 faceplayer loadfont - 2writetext UnknownText_0x60e6c + writetext UnknownText_0x60e6c closetext loadmovesprites setevent EVENT_JASMINE_RETURNED_TO_GYM @@ -87,14 +87,14 @@ UnknownScript_0x60c1e: ; 0x60c1e ; 0x60c25 UnknownScript_0x60c25: ; 0x60c25 - 2writetext UnknownText_0x60edf + writetext UnknownText_0x60edf closetext loadmovesprites spriteface $2, $3 pause 15 spriteface $3, $2 loadfont - 2writetext UnknownText_0x60ef1 + writetext UnknownText_0x60ef1 closetext loadmovesprites end @@ -109,18 +109,18 @@ MonsterScript_0x60c3a: ; 0x60c3a loadfont checkevent EVENT_JASMINE_RETURNED_TO_GYM iftrue UnknownScript_0x60c51 - 2writetext UnknownText_0x60f03 + writetext UnknownText_0x60f03 writebyte AMPHAROS special $005f keeptextopen - 2writetext UnknownText_0x60f19 + writetext UnknownText_0x60f19 closetext loadmovesprites end ; 0x60c51 UnknownScript_0x60c51: ; 0x60c51 - 2writetext UnknownText_0x60f3d + writetext UnknownText_0x60f3d cry AMPHAROS closetext loadmovesprites diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index ac54186e1..a67451bb7 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -33,7 +33,7 @@ SailorScript_0x748c0: ; 0x748c0 loadfont checkevent $0000 iftrue UnknownScript_0x74919 - 2writetext UnknownText_0x74a55 + writetext UnknownText_0x74a55 closetext loadmovesprites spriteface $2, $0 @@ -67,7 +67,7 @@ UnknownScript_0x7490a: ; 0x7490a ; 0x74919 UnknownScript_0x74919: ; 0x74919 - 2writetext UnknownText_0x74a80 + writetext UnknownText_0x74a80 closetext loadmovesprites end @@ -90,23 +90,23 @@ UnknownScript_0x7491f: ; 0x7491f if_equal WEDNESDAY, UnknownScript_0x74981 if_equal THURSDAY, UnknownScript_0x74981 UnknownScript_0x7494e: ; 0x7494e - 2writetext UnknownText_0x74a9c + writetext UnknownText_0x74a9c yesorno iffalse UnknownScript_0x74992 - 2writetext UnknownText_0x74ada + writetext UnknownText_0x74ada keeptextopen checkitem S_S_TICKET iffalse UnknownScript_0x7496d - 2writetext UnknownText_0x74b11 + writetext UnknownText_0x74b11 closetext loadmovesprites setevent $0001 applymovement $0, MovementData_0x74a37 - 2jump SailorScript_0x748c0 + jump SailorScript_0x748c0 ; 0x7496d UnknownScript_0x7496d: ; 0x7496d - 2writetext UnknownText_0x74b41 + writetext UnknownText_0x74b41 closetext loadmovesprites applymovement $0, MovementData_0x74a34 @@ -114,7 +114,7 @@ UnknownScript_0x7496d: ; 0x7496d ; 0x74977 UnknownScript_0x74977: ; 0x74977 - 2writetext UnknownText_0x74ba8 + writetext UnknownText_0x74ba8 closetext loadmovesprites applymovement $0, MovementData_0x74a34 @@ -122,7 +122,7 @@ UnknownScript_0x74977: ; 0x74977 ; 0x74981 UnknownScript_0x74981: ; 0x74981 - 2writetext UnknownText_0x74bce + writetext UnknownText_0x74bce closetext loadmovesprites applymovement $0, MovementData_0x74a34 @@ -134,14 +134,14 @@ UnknownScript_0x7498b: ; 0x7498b ; 0x7498c UnknownScript_0x7498c: ; 0x7498c - 2writetext UnknownText_0x74af6 + writetext UnknownText_0x74af6 closetext loadmovesprites end ; 0x74992 UnknownScript_0x74992: ; 0x74992 - 2writetext UnknownText_0x74af6 + writetext UnknownText_0x74af6 closetext loadmovesprites applymovement $0, MovementData_0x74a34 @@ -162,44 +162,44 @@ SailorScript_0x7499c: ; 0x7499c if_equal WEDNESDAY, UnknownScript_0x749f8 if_equal THURSDAY, UnknownScript_0x749f8 UnknownScript_0x749c0: ; 0x749c0 - 2writetext UnknownText_0x74a9c + writetext UnknownText_0x74a9c yesorno iffalse UnknownScript_0x7498c - 2writetext UnknownText_0x74ada + writetext UnknownText_0x74ada keeptextopen checkitem S_S_TICKET iffalse UnknownScript_0x749ec - 2writetext UnknownText_0x74b11 + writetext UnknownText_0x74b11 closetext loadmovesprites setevent $0001 checkcode $9 if_equal $3, UnknownScript_0x749e5 applymovement $0, MovementData_0x74a3f - 2jump SailorScript_0x748c0 + jump SailorScript_0x748c0 ; 0x749e5 UnknownScript_0x749e5: ; 0x749e5 applymovement $0, MovementData_0x74a49 - 2jump SailorScript_0x748c0 + jump SailorScript_0x748c0 ; 0x749ec UnknownScript_0x749ec: ; 0x749ec - 2writetext UnknownText_0x74b41 + writetext UnknownText_0x74b41 closetext loadmovesprites end ; 0x749f2 UnknownScript_0x749f2: ; 0x749f2 - 2writetext UnknownText_0x74ba8 + writetext UnknownText_0x74ba8 closetext loadmovesprites end ; 0x749f8 UnknownScript_0x749f8: ; 0x749f8 - 2writetext UnknownText_0x74bce + writetext UnknownText_0x74bce closetext loadmovesprites end @@ -212,7 +212,7 @@ SailorScript_0x749fe: ; 0x749fe FishingGuruScript_0x74a01: ; 0x74a01 faceplayer loadfont - 2writetext UnknownText_0x74bf4 + writetext UnknownText_0x74bf4 closetext loadmovesprites spriteface $5, $1 @@ -222,7 +222,7 @@ FishingGuruScript_0x74a01: ; 0x74a01 FishingGuruScript_0x74a0c: ; 0x74a0c faceplayer loadfont - 2writetext UnknownText_0x74c35 + writetext UnknownText_0x74c35 closetext loadmovesprites spriteface $6, $1 @@ -232,7 +232,7 @@ FishingGuruScript_0x74a0c: ; 0x74a0c YoungsterScript_0x74a17: ; 0x74a17 faceplayer loadfont - 2writetext UnknownText_0x74c76 + writetext UnknownText_0x74c76 closetext loadmovesprites spriteface $7, $0 @@ -242,7 +242,7 @@ YoungsterScript_0x74a17: ; 0x74a17 CooltrainerFScript_0x74a22: ; 0x74a22 faceplayer loadfont - 2writetext UnknownText_0x74ca2 + writetext UnknownText_0x74ca2 closetext loadmovesprites spriteface $8, $0 diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index d1426e251..eb7650ed0 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -28,7 +28,7 @@ GrampsScript_0x18c00f: ; 0x18c00f loadfont checkevent EVENT_GOT_SILVER_WING iftrue UnknownScript_0x18c023 - 2writetext UnknownText_0x18c0c6 + writetext UnknownText_0x18c0c6 keeptextopen verbosegiveitem SILVER_WING, 1 setevent EVENT_GOT_SILVER_WING @@ -37,7 +37,7 @@ GrampsScript_0x18c00f: ; 0x18c00f ; 0x18c023 UnknownScript_0x18c023: ; 0x18c023 - 2writetext UnknownText_0x18c1aa + writetext UnknownText_0x18c1aa closetext loadmovesprites end diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index 4ea9b6a5f..02036f079 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -11,7 +11,7 @@ BrockScript_0x1a2864: ; 0x1a2864 loadfont checkflag $0023 iftrue UnknownScript_0x1a2892 - 2writetext UnknownText_0x1a28d0 + writetext UnknownText_0x1a28d0 closetext loadmovesprites winlosstext UnknownText_0x1a29bb, $0000 @@ -21,18 +21,18 @@ BrockScript_0x1a2864: ; 0x1a2864 setevent EVENT_BEAT_BROCK setevent EVENT_BEAT_CAMPER_JERRY loadfont - 2writetext UnknownText_0x1a2a3d + writetext UnknownText_0x1a2a3d playsound SFX_GET_BADGE waitbutton setflag $0023 - 2writetext UnknownText_0x1a2a57 + writetext UnknownText_0x1a2a57 closetext loadmovesprites end ; 0x1a2892 UnknownScript_0x1a2892: ; 0x1a2892 - 2writetext UnknownText_0x1a2ada + writetext UnknownText_0x1a2ada closetext loadmovesprites end @@ -61,7 +61,7 @@ TrainerCamperJerry: ; 0x1a2898 CamperJerryScript: ; 0x1a28a4 talkaftercancel loadfont - 2writetext UnknownText_0x1a2c0f + writetext UnknownText_0x1a2c0f closetext loadmovesprites end @@ -72,13 +72,13 @@ PewterGymGuyScript: ; 0x1a28ac loadfont checkevent EVENT_BEAT_BROCK iftrue .PewterGymGuyWinScript - 2writetext PewterGymGuyText + writetext PewterGymGuyText closetext loadmovesprites end .PewterGymGuyWinScript - 2writetext PewterGymGuyWinText + writetext PewterGymGuyWinText closetext loadmovesprites end diff --git a/maps/PewterNidoranSpeechHouse.asm b/maps/PewterNidoranSpeechHouse.asm index 1ac57e055..69527d0dc 100644 --- a/maps/PewterNidoranSpeechHouse.asm +++ b/maps/PewterNidoranSpeechHouse.asm @@ -12,7 +12,7 @@ SuperNerdScript_0x1a2807: ; 0x1a2807 GrowlitheScript_0x1a280a: ; 0x1a280a loadfont - 2writetext UnknownText_0x1a2825 + writetext UnknownText_0x1a2825 cry NIDORAN_M closetext loadmovesprites diff --git a/maps/PewterPokeCenter1F.asm b/maps/PewterPokeCenter1F.asm index 5015e412b..faf3801f3 100644 --- a/maps/PewterPokeCenter1F.asm +++ b/maps/PewterPokeCenter1F.asm @@ -16,7 +16,7 @@ TeacherScript_0x1a2eea: ; 0x1a2eea JigglypuffScript_0x1a2eed: ; 0x1a2eed loadfont - 2writetext UnknownText_0x1a2f5d + writetext UnknownText_0x1a2f5d cry JIGGLYPUFF closetext loadmovesprites diff --git a/maps/PokeCenter2F.asm b/maps/PokeCenter2F.asm index 9525509e5..f31392fc1 100644 --- a/maps/PokeCenter2F.asm +++ b/maps/PokeCenter2F.asm @@ -61,7 +61,7 @@ UnknownScript_0x192887: ; 0x192887 UnknownScript_0x19288d: ; 0x19288d faceplayer loadfont - 2writetext UnknownText_0x19312f + writetext UnknownText_0x19312f closetext loadmovesprites end @@ -70,7 +70,7 @@ UnknownScript_0x19288d: ; 0x19288d UnknownScript_0x192895: ; 0x192895 faceplayer loadfont - 2writetext UnknownText_0x19315f + writetext UnknownText_0x19315f closetext loadmovesprites end @@ -80,69 +80,69 @@ LinkReceptionistScript_0x19289d: ; 0x19289d checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM iffalse UnknownScript_0x19288d loadfont - 2writetext UnknownText_0x192e3a + writetext UnknownText_0x192e3a yesorno iffalse UnknownScript_0x19291d special $00a0 iffalse UnknownScript_0x1928be - 2writetext UnknownText_0x192d7e + writetext UnknownText_0x192d7e special $008c iffalse UnknownScript_0x19291d if_equal $1, UnknownScript_0x19291f UnknownScript_0x1928be: ; 0x1928be special $0001 - 2writetext UnknownText_0x192f67 + writetext UnknownText_0x192f67 special $0002 iffalse UnknownScript_0x1928f6 - 2writetext UnknownText_0x192f34 + writetext UnknownText_0x192f34 yesorno iffalse UnknownScript_0x192917 special $0004 iffalse UnknownScript_0x192917 - 2writetext UnknownText_0x192f67 + writetext UnknownText_0x192f67 special $0003 iffalse UnknownScript_0x192911 copybytetovar $cf51 iffalse UnknownScript_0x1928fe special $0005 iffalse UnknownScript_0x192909 - 2writetext UnknownText_0x19306b + writetext UnknownText_0x19306b closetext loadmovesprites - 2call UnknownScript_0x192b04 + scall UnknownScript_0x192b04 warpcheck end ; 0x1928f6 UnknownScript_0x1928f6: ; 0x1928f6 special $0008 - 2writetext UnknownText_0x192f19 + writetext UnknownText_0x192f19 loadmovesprites end ; 0x1928fe UnknownScript_0x1928fe: ; 0x1928fe special $0006 - 2writetext UnknownText_0x193029 + writetext UnknownText_0x193029 special $0007 loadmovesprites end ; 0x192909 UnknownScript_0x192909: ; 0x192909 - 2writetext UnknownText_0x19304a + writetext UnknownText_0x19304a special $0007 loadmovesprites end ; 0x192911 UnknownScript_0x192911: ; 0x192911 - 2writetext UnknownText_0x192f75 - 2jump UnknownScript_0x19291a + writetext UnknownText_0x192f75 + jump UnknownScript_0x19291a ; 0x192917 UnknownScript_0x192917: ; 0x192917 - 2writetext UnknownText_0x192fd1 + writetext UnknownText_0x192fd1 UnknownScript_0x19291a: ; 0x19291a special $0008 UnknownScript_0x19291d: ; 0x19291d @@ -151,9 +151,9 @@ UnknownScript_0x19291d: ; 0x19291d ; 0x19291f UnknownScript_0x19291f: ; 0x19291f - 2call UnknownScript_0x19292b + scall UnknownScript_0x19292b iftrue UnknownScript_0x19292a - 2call UnknownScript_0x19294a + scall UnknownScript_0x19294a warpcheck end ; 0x19292a @@ -163,13 +163,13 @@ UnknownScript_0x19292a: ; 0x19292a ; 0x19292b UnknownScript_0x19292b: ; 0x19292b - 2writetext UnknownText_0x192f34 + writetext UnknownText_0x192f34 yesorno iffalse UnknownScript_0x192943 special $0004 iffalse UnknownScript_0x192943 special $007f - 2writetext UnknownText_0x19306b + writetext UnknownText_0x19306b closetext loadmovesprites writebyte $0 @@ -177,7 +177,7 @@ UnknownScript_0x19292b: ; 0x19292b ; 0x192943 UnknownScript_0x192943: ; 0x192943 - 2writetext UnknownText_0x192fd1 + writetext UnknownText_0x192fd1 loadmovesprites writebyte $1 end @@ -193,69 +193,69 @@ LinkReceptionistScript_0x192952: ; 0x192952 checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM iffalse UnknownScript_0x192895 loadfont - 2writetext UnknownText_0x192de0 + writetext UnknownText_0x192de0 yesorno iffalse UnknownScript_0x1929d2 special $00a0 iffalse UnknownScript_0x192973 - 2writetext UnknownText_0x192d39 + writetext UnknownText_0x192d39 special $008c iffalse UnknownScript_0x1929d2 if_equal $1, UnknownScript_0x1929d4 UnknownScript_0x192973: ; 0x192973 special $0009 - 2writetext UnknownText_0x192f67 + writetext UnknownText_0x192f67 special $0002 iffalse UnknownScript_0x1929ab - 2writetext UnknownText_0x192f34 + writetext UnknownText_0x192f34 yesorno iffalse UnknownScript_0x1929cc special $0004 iffalse UnknownScript_0x1929cc - 2writetext UnknownText_0x192f67 + writetext UnknownText_0x192f67 special $0003 iffalse UnknownScript_0x1929c6 copybytetovar $cf51 iffalse UnknownScript_0x1929b3 special $0005 iffalse UnknownScript_0x1929be - 2writetext UnknownText_0x19306b + writetext UnknownText_0x19306b closetext loadmovesprites - 2call UnknownScript_0x192b04 + scall UnknownScript_0x192b04 warpcheck end ; 0x1929ab UnknownScript_0x1929ab: ; 0x1929ab special $0008 - 2writetext UnknownText_0x192f19 + writetext UnknownText_0x192f19 loadmovesprites end ; 0x1929b3 UnknownScript_0x1929b3: ; 0x1929b3 special $0006 - 2writetext UnknownText_0x193029 + writetext UnknownText_0x193029 special $0007 loadmovesprites end ; 0x1929be UnknownScript_0x1929be: ; 0x1929be - 2writetext UnknownText_0x19304a + writetext UnknownText_0x19304a special $0007 loadmovesprites end ; 0x1929c6 UnknownScript_0x1929c6: ; 0x1929c6 - 2writetext UnknownText_0x192f75 - 2jump UnknownScript_0x1929cf + writetext UnknownText_0x192f75 + jump UnknownScript_0x1929cf ; 0x1929cc UnknownScript_0x1929cc: ; 0x1929cc - 2writetext UnknownText_0x192fd1 + writetext UnknownText_0x192fd1 UnknownScript_0x1929cf: ; 0x1929cf special $0008 UnknownScript_0x1929d2: ; 0x1929d2 @@ -264,11 +264,11 @@ UnknownScript_0x1929d2: ; 0x1929d2 ; 0x1929d4 UnknownScript_0x1929d4: ; 0x1929d4 - 2call UnknownScript_0x192a05 + scall UnknownScript_0x192a05 iffalse UnknownScript_0x1929e5 - 2call UnknownScript_0x1929e6 + scall UnknownScript_0x1929e6 iftrue UnknownScript_0x1929e5 - 2call UnknownScript_0x19294a + scall UnknownScript_0x19294a warpcheck end ; 0x1929e5 @@ -278,13 +278,13 @@ UnknownScript_0x1929e5: ; 0x1929e5 ; 0x1929e6 UnknownScript_0x1929e6: ; 0x1929e6 - 2writetext UnknownText_0x192f34 + writetext UnknownText_0x192f34 yesorno iffalse UnknownScript_0x1929fe special $00a1 iffalse UnknownScript_0x1929fe special $007f - 2writetext UnknownText_0x19306b + writetext UnknownText_0x19306b closetext loadmovesprites writebyte $0 @@ -292,7 +292,7 @@ UnknownScript_0x1929e6: ; 0x1929e6 ; 0x1929fe UnknownScript_0x1929fe: ; 0x1929fe - 2writetext UnknownText_0x192fd1 + writetext UnknownText_0x192fd1 loadmovesprites writebyte $1 end @@ -304,11 +304,11 @@ UnknownScript_0x192a05: ; 0x192a05 if_equal $1, UnknownScript_0x192a22 if_equal $2, UnknownScript_0x192a22 if_equal $3, UnknownScript_0x192a1a - 2jump UnknownScript_0x192a1e + jump UnknownScript_0x192a1e ; 0x192a1a UnknownScript_0x192a1a: ; 0x192a1a - 2writetext UnknownText_0x1932bc + writetext UnknownText_0x1932bc closetext UnknownScript_0x192a1e: ; 0x192a1e loadmovesprites @@ -324,7 +324,7 @@ UnknownScript_0x192a22: ; 0x192a22 UnknownScript_0x192a25: ; 0x192a25 faceplayer loadfont - 2writetext UnknownText_0x193100 + writetext UnknownText_0x193100 closetext loadmovesprites end @@ -338,28 +338,28 @@ LinkReceptionistScript_0x192a2d: ; 0x192a2d special $000a faceplayer loadfont - 2writetext UnknownText_0x192e9f + writetext UnknownText_0x192e9f yesorno iffalse UnknownScript_0x192aa2 special $000b if_equal $1, UnknownScript_0x192aa7 if_equal $2, UnknownScript_0x192aac if_equal $3, UnknownScript_0x192ab1 - 2writetext UnknownText_0x192f67 + writetext UnknownText_0x192f67 special $0002 iffalse UnknownScript_0x192a91 - 2writetext UnknownText_0x192f34 + writetext UnknownText_0x192f34 yesorno iffalse UnknownScript_0x192a9f special $0004 iffalse UnknownScript_0x192a9f - 2writetext UnknownText_0x192f67 + writetext UnknownText_0x192f67 special $0003 iffalse UnknownScript_0x192a99 copybytetovar $cf51 iffalse UnknownScript_0x192a84 special $0005 - 2writetext UnknownText_0x19304a + writetext UnknownText_0x19304a special $0007 loadmovesprites end @@ -367,28 +367,28 @@ LinkReceptionistScript_0x192a2d: ; 0x192a2d UnknownScript_0x192a84: ; 0x192a84 special $000c - 2writetext UnknownText_0x19306b + writetext UnknownText_0x19306b closetext loadmovesprites - 2call UnknownScript_0x192bc4 + scall UnknownScript_0x192bc4 warpcheck end ; 0x192a91 UnknownScript_0x192a91: ; 0x192a91 special $0008 - 2writetext UnknownText_0x192f19 + writetext UnknownText_0x192f19 loadmovesprites end ; 0x192a99 UnknownScript_0x192a99: ; 0x192a99 - 2writetext UnknownText_0x192f75 - 2jump UnknownScript_0x192aa2 + writetext UnknownText_0x192f75 + jump UnknownScript_0x192aa2 ; 0x192a9f UnknownScript_0x192a9f: ; 0x192a9f - 2writetext UnknownText_0x192fd1 + writetext UnknownText_0x192fd1 UnknownScript_0x192aa2: ; 0x192aa2 special $0008 loadmovesprites @@ -396,26 +396,26 @@ UnknownScript_0x192aa2: ; 0x192aa2 ; 0x192aa7 UnknownScript_0x192aa7: ; 0x192aa7 - 2writetext UnknownText_0x19308b + writetext UnknownText_0x19308b loadmovesprites end ; 0x192aac UnknownScript_0x192aac: ; 0x192aac - 2writetext UnknownText_0x1930a8 + writetext UnknownText_0x1930a8 loadmovesprites end ; 0x192ab1 UnknownScript_0x192ab1: ; 0x192ab1 - 2writetext UnknownText_0x1930cf + writetext UnknownText_0x1930cf loadmovesprites end ; 0x192ab6 UnknownScript_0x192ab6: ; 0x192ab6 special $0008 - 2call UnknownScript_0x192b50 + scall UnknownScript_0x192b50 dotrigger $0 domaptrigger GROUP_TRADE_CENTER, MAP_TRADE_CENTER, $0 end @@ -423,7 +423,7 @@ UnknownScript_0x192ab6: ; 0x192ab6 UnknownScript_0x192ac3: ; 0x192ac3 special $0080 - 2call UnknownScript_0x192ad0 + scall UnknownScript_0x192ad0 dotrigger $0 domaptrigger GROUP_MOBILE_TRADE_ROOM_MOBILE, MAP_MOBILE_TRADE_ROOM_MOBILE, $0 end @@ -438,7 +438,7 @@ UnknownScript_0x192ad0: ; 0x192ad0 UnknownScript_0x192add: ; 0x192add special $0008 - 2call UnknownScript_0x192b8a + scall UnknownScript_0x192b8a dotrigger $0 domaptrigger GROUP_COLOSSEUM, MAP_COLOSSEUM, $0 end @@ -446,7 +446,7 @@ UnknownScript_0x192add: ; 0x192add UnknownScript_0x192aea: ; 0x192aea special $0080 - 2call UnknownScript_0x192af7 + scall UnknownScript_0x192af7 dotrigger $0 domaptrigger GROUP_MOBILE_BATTLE_ROOM, MAP_MOBILE_BATTLE_ROOM, $0 end @@ -471,13 +471,13 @@ UnknownScript_0x192b12: ; 0x192b12 applymovement2 MovementData_0x192cd8 applymovement $0, MovementData_0x192ce2 loadfont - 2writetext UnknownText_0x193266 + writetext UnknownText_0x193266 closetext loadmovesprites applymovement2 MovementData_0x192cdc spriteface $0, $2 loadfont - 2writetext UnknownText_0x193278 + writetext UnknownText_0x193278 closetext loadmovesprites playsound SFX_TINGLE @@ -488,7 +488,7 @@ UnknownScript_0x192b12: ; 0x192b12 setflag $009f special $0038 loadfont - 2writetext UnknownText_0x19329a + writetext UnknownText_0x19329a closetext loadmovesprites showemote $0, $0, 15 @@ -573,13 +573,13 @@ UnknownScript_0x192bec: ; 0x192bec if_equal $2, UnknownScript_0x192c0a applymovement2 MovementData_0x192d33 applymovement $0, MovementData_0x192d2d - 2jump UnknownScript_0x192c11 + jump UnknownScript_0x192c11 ; 0x192c00 UnknownScript_0x192c00: ; 0x192c00 applymovement2 MovementData_0x192d36 applymovement $0, MovementData_0x192d2f - 2jump UnknownScript_0x192c11 + jump UnknownScript_0x192c11 ; 0x192c0a UnknownScript_0x192c0a: ; 0x192c0a @@ -587,7 +587,7 @@ UnknownScript_0x192c0a: ; 0x192c0a applymovement $0, MovementData_0x192d31 UnknownScript_0x192c11: ; 0x192c11 loadfont - 2writetext UnknownText_0x193266 + writetext UnknownText_0x193266 closetext loadmovesprites checkcode $9 @@ -595,7 +595,7 @@ UnknownScript_0x192c11: ; 0x192c11 spriteface $0, $2 UnknownScript_0x192c20: ; 0x192c20 loadfont - 2writetext UnknownText_0x193278 + writetext UnknownText_0x193278 closetext loadmovesprites playsound SFX_TINGLE @@ -607,7 +607,7 @@ UnknownScript_0x192c20: ; 0x192c20 setflag $009f special $0038 loadfont - 2writetext UnknownText_0x19329a + writetext UnknownText_0x19329a closetext loadmovesprites showemote $0, $0, 15 @@ -622,7 +622,7 @@ UnknownScript_0x192c4e: ; 0x192c4e applymovement $4, MovementData_0x192d08 applymovement $0, MovementData_0x192cf9 applymovement $4, MovementData_0x192d01 - 2jump UnknownScript_0x192c8c + jump UnknownScript_0x192c8c ; 0x192c66 UnknownScript_0x192c66: ; 0x192c66 @@ -655,10 +655,10 @@ OfficerScript_0x192c9a: ; 0x192c9a loadfont checkevent $0711 iftrue UnknownScript_0x192cb8 - 2writetext UnknownText_0x193190 + writetext UnknownText_0x193190 yesorno iffalse UnknownScript_0x192cc4 - 2writetext UnknownText_0x1931c4 + writetext UnknownText_0x1931c4 keeptextopen waitbutton special $0012 @@ -666,21 +666,21 @@ OfficerScript_0x192c9a: ; 0x192c9a itemnotify setevent $0711 UnknownScript_0x192cb8: ; 0x192cb8 - 2writetext UnknownText_0x1931d2 + writetext UnknownText_0x1931d2 closetext loadmovesprites end ; 0x192cbe UnknownScript_0x192cbe: ; 0x192cbe - 2writetext UnknownText_0x1931ef + writetext UnknownText_0x1931ef closetext loadmovesprites end ; 0x192cc4 UnknownScript_0x192cc4: ; 0x192cc4 - 2writetext UnknownText_0x19324d + writetext UnknownText_0x19324d closetext loadmovesprites end diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm index 94e4d8e52..ce86fe900 100644 --- a/maps/PokemonFanClub.asm +++ b/maps/PokemonFanClub.asm @@ -13,32 +13,32 @@ GentlemanScript_0x1917e9: ; 0x1917e9 iftrue UnknownScript_0x191815 checkevent EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT_BUT_BAG_WAS_FULL iftrue UnknownScript_0x191802 - 2writetext UnknownText_0x191881 + writetext UnknownText_0x191881 yesorno iffalse UnknownScript_0x19181b - 2writetext UnknownText_0x191911 + writetext UnknownText_0x191911 keeptextopen UnknownScript_0x191802: ; 0x191802 - 2writetext UnknownText_0x191a3d + writetext UnknownText_0x191a3d keeptextopen verbosegiveitem RARE_CANDY, 1 iffalse UnknownScript_0x19181f setevent EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT - 2writetext UnknownText_0x191a72 + writetext UnknownText_0x191a72 closetext loadmovesprites end ; 0x191815 UnknownScript_0x191815: ; 0x191815 - 2writetext UnknownText_0x191ae0 + writetext UnknownText_0x191ae0 closetext loadmovesprites end ; 0x19181b UnknownScript_0x19181b: ; 0x19181b - 2writetext UnknownText_0x191b38 + writetext UnknownText_0x191b38 closetext UnknownScript_0x19181f: ; 0x19181f loadmovesprites @@ -56,14 +56,14 @@ FisherScript_0x191824: ; 0x191824 iftrue UnknownScript_0x19185f checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x191838 - 2writetext UnknownText_0x191ba0 + writetext UnknownText_0x191ba0 closetext loadmovesprites end ; 0x191838 UnknownScript_0x191838: ; 0x191838 - 2writetext UnknownText_0x191bff + writetext UnknownText_0x191bff checkevent EVENT_MET_COPYCAT_FOUND_OUT_ABOUT_LOST_ITEM iftrue UnknownScript_0x191844 closetext @@ -73,13 +73,13 @@ UnknownScript_0x191838: ; 0x191838 UnknownScript_0x191844: ; 0x191844 keeptextopen - 2writetext UnknownText_0x191c5a + writetext UnknownText_0x191c5a keeptextopen waitbutton giveitem LOST_ITEM, $1 iffalse UnknownScript_0x191865 disappear $6 - 2writetext UnknownText_0x191d0a + writetext UnknownText_0x191d0a playsound SFX_KEY_ITEM waitbutton itemnotify @@ -89,14 +89,14 @@ UnknownScript_0x191844: ; 0x191844 ; 0x19185f UnknownScript_0x19185f: ; 0x19185f - 2writetext UnknownText_0x191d1e + writetext UnknownText_0x191d1e closetext loadmovesprites end ; 0x191865 UnknownScript_0x191865: ; 0x191865 - 2writetext UnknownText_0x191d58 + writetext UnknownText_0x191d58 closetext loadmovesprites end @@ -112,7 +112,7 @@ FairyScript_0x19186e: ; 0x19186e OddishScript_0x191871: ; 0x191871 loadfont - 2writetext UnknownText_0x191de9 + writetext UnknownText_0x191de9 cry BAYLEEF closetext loadmovesprites diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index 08ed89873..8094b2bd6 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -27,13 +27,13 @@ UnknownScript_0x188dc5: ; 0x188dc5 spriteface $3, $0 spriteface $4, $0 loadfont - 2writetext UnknownText_0x188f22 + writetext UnknownText_0x188f22 closetext loadmovesprites spriteface $2, $2 spriteface $0, $3 loadfont - 2writetext UnknownText_0x188f7f + writetext UnknownText_0x188f7f closetext loadmovesprites spriteface $0, $0 @@ -49,21 +49,21 @@ OfficerScript_0x188df5: ; 0x188df5 iftrue UnknownScript_0x188e0f checkevent EVENT_MET_MANAGER_AT_POWER_PLANT iftrue UnknownScript_0x188e09 - 2writetext UnknownText_0x188ee0 + writetext UnknownText_0x188ee0 closetext loadmovesprites end ; 0x188e09 UnknownScript_0x188e09: ; 0x188e09 - 2writetext UnknownText_0x188f7f + writetext UnknownText_0x188f7f closetext loadmovesprites end ; 0x188e0f UnknownScript_0x188e0f: ; 0x188e0f - 2writetext UnknownText_0x188fa2 + writetext UnknownText_0x188fa2 closetext loadmovesprites end @@ -74,14 +74,14 @@ GymGuyScript_0x188e15: ; 0x188e15 loadfont checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x188e23 - 2writetext UnknownText_0x188fcf + writetext UnknownText_0x188fcf closetext loadmovesprites end ; 0x188e23 UnknownScript_0x188e23: ; 0x188e23 - 2writetext UnknownText_0x189038 + writetext UnknownText_0x189038 closetext loadmovesprites end @@ -92,14 +92,14 @@ GymGuyScript_0x188e29: ; 0x188e29 loadfont checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x188e37 - 2writetext UnknownText_0x189079 + writetext UnknownText_0x189079 closetext loadmovesprites end ; 0x188e37 UnknownScript_0x188e37: ; 0x188e37 - 2writetext UnknownText_0x1890ef + writetext UnknownText_0x1890ef closetext loadmovesprites end @@ -110,14 +110,14 @@ OfficerScript_0x188e3d: ; 0x188e3d loadfont checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x188e4b - 2writetext UnknownText_0x18910e + writetext UnknownText_0x18910e closetext loadmovesprites end ; 0x188e4b UnknownScript_0x188e4b: ; 0x188e4b - 2writetext UnknownText_0x18917f + writetext UnknownText_0x18917f closetext loadmovesprites end @@ -128,14 +128,14 @@ GymGuyScript_0x188e51: ; 0x188e51 loadfont checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x188e5f - 2writetext UnknownText_0x1891c2 + writetext UnknownText_0x1891c2 closetext loadmovesprites end ; 0x188e5f UnknownScript_0x188e5f: ; 0x188e5f - 2writetext UnknownText_0x189225 + writetext UnknownText_0x189225 closetext loadmovesprites end @@ -150,7 +150,7 @@ FisherScript_0x188e65: ; 0x188e65 iftrue UnknownScript_0x188e93 checkevent EVENT_MET_MANAGER_AT_POWER_PLANT iftrue UnknownScript_0x188e8d - 2writetext UnknownText_0x189264 + writetext UnknownText_0x189264 closetext loadmovesprites setevent EVENT_MET_MANAGER_AT_POWER_PLANT @@ -162,14 +162,14 @@ FisherScript_0x188e65: ; 0x188e65 ; 0x188e8d UnknownScript_0x188e8d: ; 0x188e8d - 2writetext UnknownText_0x189308 + writetext UnknownText_0x189308 closetext loadmovesprites end ; 0x188e93 UnknownScript_0x188e93: ; 0x188e93 - 2writetext UnknownText_0x18936e + writetext UnknownText_0x18936e keeptextopen takeitem MACHINE_PART, 1 setevent EVENT_RETURNED_MACHINE_PART @@ -181,12 +181,12 @@ UnknownScript_0x188e93: ; 0x188e93 UnknownScript_0x188eac: ; 0x188eac checkevent EVENT_GOT_TM07_ZAP_CANNON iftrue UnknownScript_0x188ec5 - 2writetext UnknownText_0x1893c4 + writetext UnknownText_0x1893c4 keeptextopen verbosegiveitem TM_07, 1 iffalse UnknownScript_0x188ec3 setevent EVENT_GOT_TM07_ZAP_CANNON - 2writetext UnknownText_0x1893f4 + writetext UnknownText_0x1893f4 closetext UnknownScript_0x188ec3: ; 0x188ec3 loadmovesprites @@ -194,7 +194,7 @@ UnknownScript_0x188ec3: ; 0x188ec3 ; 0x188ec5 UnknownScript_0x188ec5: ; 0x188ec5 - 2writetext UnknownText_0x189475 + writetext UnknownText_0x189475 closetext loadmovesprites end diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index 78b1fec7c..eaddfd5bb 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -11,14 +11,14 @@ ReceptionistScript_0x5cd29: ; 0x5cd29 loadfont checkflag $0013 iftrue UnknownScript_0x5cd37 - 2writetext UnknownText_0x5ce77 + writetext UnknownText_0x5ce77 closetext loadmovesprites end ; 0x5cd37 UnknownScript_0x5cd37: ; 0x5cd37 - 2writetext UnknownText_0x5ce81 + writetext UnknownText_0x5ce81 closetext loadmovesprites end @@ -27,7 +27,7 @@ UnknownScript_0x5cd37: ; 0x5cd37 GentlemanScript_0x5cd3d: ; 0x5cd3d faceplayer loadfont - 2writetext UnknownText_0x5ceba + writetext UnknownText_0x5ceba keeptextopen special $0053 iffalse UnknownScript_0x5cd4c @@ -36,15 +36,15 @@ UnknownScript_0x5cd4c: ; 0x5cd4c special $0055 checkflag $004e iftrue UnknownScript_0x5cd84 - 2writetext UnknownText_0x5cf3a + writetext UnknownText_0x5cf3a keeptextopen loadmovesprites applymovement $6, MovementData_0x5ce71 loadfont - 2writetext UnknownText_0x5cf5a + writetext UnknownText_0x5cf5a keeptextopen waitbutton - 2writetext UnknownText_0x5cf79 + writetext UnknownText_0x5cf79 playsound SFX_DEX_FANFARE_20_49 waitbutton keeptextopen @@ -55,18 +55,18 @@ UnknownScript_0x5cd4c: ; 0x5cd4c if_equal $1, UnknownScript_0x5cd8a if_equal $2, UnknownScript_0x5cd9f if_equal $3, UnknownScript_0x5cdb4 - 2jump UnknownScript_0x5cdc9 + jump UnknownScript_0x5cdc9 ; 0x5cd84 UnknownScript_0x5cd84: ; 0x5cd84 - 2writetext UnknownText_0x5cf7e + writetext UnknownText_0x5cf7e closetext loadmovesprites end ; 0x5cd8a UnknownScript_0x5cd8a: ; 0x5cd8a - 2writetext UnknownText_0x5cfb5 + writetext UnknownText_0x5cfb5 playsound SFX_1ST_PLACE waitbutton keeptextopen @@ -74,11 +74,11 @@ UnknownScript_0x5cd8a: ; 0x5cd8a iffalse UnknownScript_0x5cdcf itemnotify setflag $004e - 2jump UnknownScript_0x5cd84 + jump UnknownScript_0x5cd84 ; 0x5cd9f UnknownScript_0x5cd9f: ; 0x5cd9f - 2writetext UnknownText_0x5d023 + writetext UnknownText_0x5d023 playsound SFX_2ND_PLACE waitbutton keeptextopen @@ -86,11 +86,11 @@ UnknownScript_0x5cd9f: ; 0x5cd9f iffalse UnknownScript_0x5cdcf itemnotify setflag $004e - 2jump UnknownScript_0x5cd84 + jump UnknownScript_0x5cd84 ; 0x5cdb4 UnknownScript_0x5cdb4: ; 0x5cdb4 - 2writetext UnknownText_0x5d076 + writetext UnknownText_0x5d076 playsound SFX_3RD_PLACE waitbutton keeptextopen @@ -98,18 +98,18 @@ UnknownScript_0x5cdb4: ; 0x5cdb4 iffalse UnknownScript_0x5cdcf itemnotify setflag $004e - 2jump UnknownScript_0x5cd84 + jump UnknownScript_0x5cd84 ; 0x5cdc9 UnknownScript_0x5cdc9: ; 0x5cdc9 - 2writetext UnknownText_0x5d0c0 + writetext UnknownText_0x5d0c0 closetext loadmovesprites end ; 0x5cdcf UnknownScript_0x5cdcf: ; 0x5cdcf - 2writetext UnknownText_0x5d0e6 + writetext UnknownText_0x5d0e6 closetext loadmovesprites end @@ -120,43 +120,43 @@ CooltrainerFScript_0x5cdd5: ; 0x5cdd5 loadfont checkflag $0000 iftrue UnknownScript_0x5ce2d - 2writetext UnknownText_0x5d12d + writetext UnknownText_0x5d12d yesorno iffalse UnknownScript_0x5ce4b - 2writetext UnknownText_0x5d1f2 + writetext UnknownText_0x5d1f2 yesorno iffalse UnknownScript_0x5ce42 playsound SFX_ELEVATOR_END waitbutton - 2writetext UnknownText_0x5d231 + writetext UnknownText_0x5d231 yesorno iffalse UnknownScript_0x5ce42 playsound SFX_ELEVATOR_END waitbutton - 2writetext UnknownText_0x5d282 + writetext UnknownText_0x5d282 yesorno iftrue UnknownScript_0x5ce42 playsound SFX_ELEVATOR_END waitbutton - 2writetext UnknownText_0x5d2bc + writetext UnknownText_0x5d2bc yesorno iffalse UnknownScript_0x5ce42 playsound SFX_ELEVATOR_END waitbutton - 2writetext UnknownText_0x5d30e + writetext UnknownText_0x5d30e yesorno iftrue UnknownScript_0x5ce42 playsound SFX_ELEVATOR_END waitbutton - 2writetext UnknownText_0x5d37b + writetext UnknownText_0x5d37b keeptextopen stringtotext RadioCardText, $1 - 2call UnknownScript_0x5ce3e - 2writetext UnknownText_0x5d3c0 + scall UnknownScript_0x5ce3e + writetext UnknownText_0x5d3c0 keeptextopen setflag $0000 UnknownScript_0x5ce2d: ; 0x5ce2d - 2writetext UnknownText_0x5d3e5 + writetext UnknownText_0x5d3e5 closetext loadmovesprites end @@ -173,14 +173,14 @@ UnknownScript_0x5ce3e: ; 0x5ce3e UnknownScript_0x5ce42: ; 0x5ce42 playsound SFX_WRONG - 2writetext UnknownText_0x5d409 + writetext UnknownText_0x5d409 closetext loadmovesprites end ; 0x5ce4b UnknownScript_0x5ce4b: ; 0x5ce4b - 2writetext UnknownText_0x5d443 + writetext UnknownText_0x5d443 closetext loadmovesprites end @@ -217,7 +217,7 @@ TrainerGruntM3: ; 0x5ce57 GruntM3Script: ; 0x5ce63 talkaftercancel loadfont - 2writetext UnknownText_0x5d5a2 + writetext UnknownText_0x5d5a2 closetext loadmovesprites end diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index ece419c38..18af832be 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -19,14 +19,14 @@ TeacherScript_0x5d701: ; 0x5d701 loadfont checkflag $0013 iftrue UnknownScript_0x5d70f - 2writetext UnknownText_0x5d956 + writetext UnknownText_0x5d956 closetext loadmovesprites end ; 0x5d70f UnknownScript_0x5d70f: ; 0x5d70f - 2writetext UnknownText_0x5d983 + writetext UnknownText_0x5d983 closetext loadmovesprites end @@ -34,7 +34,7 @@ UnknownScript_0x5d70f: ; 0x5d70f JigglypuffScript_0x5d715: ; 0x5d715 loadfont - 2writetext UnknownText_0x5d9b6 + writetext UnknownText_0x5d9b6 cry JIGGLYPUFF closetext loadmovesprites @@ -72,7 +72,7 @@ TrainerGruntM4: ; 0x5d725 GruntM4Script: ; 0x5d731 talkaftercancel loadfont - 2writetext UnknownText_0x5db07 + writetext UnknownText_0x5db07 closetext loadmovesprites end @@ -101,7 +101,7 @@ TrainerGruntM5: ; 0x5d739 GruntM5Script: ; 0x5d745 talkaftercancel loadfont - 2writetext UnknownText_0x5db99 + writetext UnknownText_0x5db99 closetext loadmovesprites end @@ -130,7 +130,7 @@ TrainerGruntM6: ; 0x5d74d GruntM6Script: ; 0x5d759 talkaftercancel loadfont - 2writetext UnknownText_0x5dc00 + writetext UnknownText_0x5dc00 closetext loadmovesprites end @@ -159,7 +159,7 @@ TrainerGruntF2: ; 0x5d761 GruntF2Script: ; 0x5d76d talkaftercancel loadfont - 2writetext UnknownText_0x5dcd0 + writetext UnknownText_0x5dcd0 closetext loadmovesprites end @@ -183,10 +183,10 @@ BuenaScript_0x5d775: ; 0x5d775 checkcode $18 if_equal $1e, UnknownScript_0x5d87f playmusic MUSIC_BUENAS_PASSWORD - 2writetext UnknownText_0x5de35 + writetext UnknownText_0x5de35 special $00a3 iffalse UnknownScript_0x5d81e - 2writetext UnknownText_0x5de84 + writetext UnknownText_0x5de84 closetext loadmovesprites spriteface $b, $3 @@ -196,7 +196,7 @@ BuenaScript_0x5d775: ; 0x5d775 UnknownScript_0x5d7be: ; 0x5d7be spriteface $0, $3 loadfont - 2writetext UnknownText_0x5dedd + writetext UnknownText_0x5dedd closetext loadmovesprites spriteface $b, $0 @@ -205,7 +205,7 @@ UnknownScript_0x5d7be: ; 0x5d7be loadmovesprites iffalse UnknownScript_0x5d845 loadfont - 2writetext UnknownText_0x5dfc1 + writetext UnknownText_0x5dfc1 closetext loadmovesprites checkcode $18 @@ -217,7 +217,7 @@ UnknownScript_0x5d7be: ; 0x5d7be pause 20 spriteface $b, $3 loadfont - 2writetext UnknownText_0x5e054 + writetext UnknownText_0x5e054 closetext loadmovesprites special $006a @@ -229,12 +229,12 @@ UnknownScript_0x5d7be: ; 0x5d7be ; 0x5d800 UnknownScript_0x5d800: ; 0x5d800 - 2writetext UnknownText_0x5dcf4 + writetext UnknownText_0x5dcf4 keeptextopen setevent EVENT_MET_BUENA verbosegiveitem BLUE_CARD, 1 UnknownScript_0x5d80a: ; 0x5d80a - 2writetext UnknownText_0x5de10 + writetext UnknownText_0x5de10 closetext loadmovesprites checkcellnum $25 @@ -247,7 +247,7 @@ UnknownScript_0x5d81a: ; 0x5d81a ; 0x5d81e UnknownScript_0x5d81e: ; 0x5d81e - 2writetext UnknownText_0x5df29 + writetext UnknownText_0x5df29 closetext loadmovesprites spriteface $b, $3 @@ -258,7 +258,7 @@ UnknownScript_0x5d81e: ; 0x5d81e ; 0x5d82f UnknownScript_0x5d82f: ; 0x5d82f - 2writetext UnknownText_0x5df6c + writetext UnknownText_0x5df6c closetext loadmovesprites checkcellnum $25 @@ -274,13 +274,13 @@ UnknownScript_0x5d83f: ; 0x5d83f UnknownScript_0x5d845: ; 0x5d845 setflag $0060 loadfont - 2writetext UnknownText_0x5e01c + writetext UnknownText_0x5e01c closetext loadmovesprites spriteface $b, $3 pause 20 loadfont - 2writetext UnknownText_0x5e054 + writetext UnknownText_0x5e054 closetext loadmovesprites spriteface $b, $3 @@ -291,14 +291,14 @@ UnknownScript_0x5d845: ; 0x5d845 ; 0x5d865 UnknownScript_0x5d865: ; 0x5d865 - 2writetext UnknownText_0x5e0c2 + writetext UnknownText_0x5e0c2 closetext loadmovesprites end ; 0x5d86b UnknownScript_0x5d86b: ; 0x5d86b - 2writetext UnknownText_0x5e192 + writetext UnknownText_0x5e192 closetext loadmovesprites checkcellnum $25 @@ -311,7 +311,7 @@ UnknownScript_0x5d87b: ; 0x5d87b ; 0x5d87f UnknownScript_0x5d87f: ; 0x5d87f - 2writetext UnknownText_0x5e0f1 + writetext UnknownText_0x5e0f1 closetext loadmovesprites checkcellnum $25 @@ -324,7 +324,7 @@ UnknownScript_0x5d88f: ; 0x5d88f ; 0x5d893 UnknownScript_0x5d893: ; 0x5d893 - 2writetext UnknownText_0x5e131 + writetext UnknownText_0x5e131 closetext loadmovesprites checkcellnum $25 @@ -349,22 +349,22 @@ UnknownScript_0x5d8a4: ; 0x5d8a4 setevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD setevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER loadfont - 2writetext UnknownText_0x5e1ee - 2jump UnknownScript_0x5d8d0 + writetext UnknownText_0x5e1ee + jump UnknownScript_0x5d8d0 ; 0x5d8cc UnknownScript_0x5d8cc: ; 0x5d8cc loadfont - 2writetext UnknownText_0x5e2bf + writetext UnknownText_0x5e2bf UnknownScript_0x5d8d0: ; 0x5d8d0 askforphonenumber $25 if_equal $1, UnknownScript_0x5d8f6 if_equal $2, UnknownScript_0x5d8ed - 2writetext UnknownText_0x5e2f3 + writetext UnknownText_0x5e2f3 playsound SFX_REGISTER_PHONE_NUMBER waitbutton keeptextopen - 2writetext UnknownText_0x5e310 + writetext UnknownText_0x5e310 closetext loadmovesprites spriteface $b, $3 @@ -373,7 +373,7 @@ UnknownScript_0x5d8d0: ; 0x5d8d0 ; 0x5d8ed UnknownScript_0x5d8ed: ; 0x5d8ed - 2writetext UnknownText_0x5e33c + writetext UnknownText_0x5e33c closetext loadmovesprites spriteface $b, $3 @@ -381,7 +381,7 @@ UnknownScript_0x5d8ed: ; 0x5d8ed ; 0x5d8f6 UnknownScript_0x5d8f6: ; 0x5d8f6 - 2writetext UnknownText_0x5e35e + writetext UnknownText_0x5e35e closetext loadmovesprites spriteface $b, $3 @@ -394,7 +394,7 @@ ReceptionistScript_0x5d8ff: ; 0x5d8ff loadfont checkitem BLUE_CARD iffalse UnknownScript_0x5d90f - 2writetext UnknownText_0x5e392 + writetext UnknownText_0x5e392 keeptextopen special SPECIAL_BUENA_PRIZE loadmovesprites @@ -402,7 +402,7 @@ ReceptionistScript_0x5d8ff: ; 0x5d8ff ; 0x5d90f UnknownScript_0x5d90f: ; 0x5d90f - 2writetext UnknownText_0x5e3d8 + writetext UnknownText_0x5e3d8 keeptextopen loadmovesprites end diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index 9c62810d8..e30e4961a 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -31,14 +31,14 @@ GymGuyScript_0x5e556: ; 0x5e556 loadfont checkevent EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x5e564 - 2writetext UnknownText_0x5e682 + writetext UnknownText_0x5e682 closetext loadmovesprites end ; 0x5e564 UnknownScript_0x5e564: ; 0x5e564 - 2writetext UnknownText_0x5e6eb + writetext UnknownText_0x5e6eb closetext loadmovesprites end @@ -53,25 +53,25 @@ CooltrainerFScript_0x5e56a: ; 0x5e56a iftrue UnknownScript_0x5e58a checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER iftrue UnknownScript_0x5e584 - 2writetext UnknownText_0x5e754 + writetext UnknownText_0x5e754 closetext loadmovesprites end ; 0x5e584 UnknownScript_0x5e584: ; 0x5e584 - 2writetext UnknownText_0x5e7cb + writetext UnknownText_0x5e7cb closetext loadmovesprites end ; 0x5e58a UnknownScript_0x5e58a: ; 0x5e58a - 2writetext UnknownText_0x5e7e2 + writetext UnknownText_0x5e7e2 keeptextopen verbosegiveitem TM_11, 1 iffalse UnknownScript_0x5e5a1 - 2writetext UnknownText_0x5e821 + writetext UnknownText_0x5e821 closetext loadmovesprites setevent EVENT_GOT_SUNNY_DAY_FROM_RADIO_TOWER @@ -79,7 +79,7 @@ UnknownScript_0x5e58a: ; 0x5e58a ; 0x5e59d UnknownScript_0x5e59d: ; 0x5e59d - 2writetext UnknownText_0x5e85c + writetext UnknownText_0x5e85c closetext UnknownScript_0x5e5a1: ; 0x5e5a1 loadmovesprites @@ -109,7 +109,7 @@ TrainerGruntM7: ; 0x5e5a3 GruntM7Script: ; 0x5e5af talkaftercancel loadfont - 2writetext UnknownText_0x5e8d0 + writetext UnknownText_0x5e8d0 closetext loadmovesprites end @@ -138,7 +138,7 @@ TrainerGruntM8: ; 0x5e5b7 GruntM8Script: ; 0x5e5c3 talkaftercancel loadfont - 2writetext UnknownText_0x5e944 + writetext UnknownText_0x5e944 closetext loadmovesprites end @@ -167,7 +167,7 @@ TrainerGruntM9: ; 0x5e5cb GruntM9Script: ; 0x5e5d7 talkaftercancel loadfont - 2writetext UnknownText_0x5e9d0 + writetext UnknownText_0x5e9d0 closetext loadmovesprites end @@ -196,7 +196,7 @@ TrainerScientistMarc: ; 0x5e5df ScientistMarcScript: ; 0x5e5eb talkaftercancel loadfont - 2writetext UnknownText_0x5ea61 + writetext UnknownText_0x5ea61 closetext loadmovesprites end @@ -204,7 +204,7 @@ ScientistMarcScript: ; 0x5e5eb MapRadioTower3FSignpost2Script:: ; 0x5e5f3 loadfont - 2writetext UnknownText_0x5eaa4 + writetext UnknownText_0x5eaa4 closetext checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER iftrue UnknownScript_0x5e603 @@ -216,7 +216,7 @@ UnknownScript_0x5e603: ; 0x5e603 ; 0x5e605 UnknownScript_0x5e605: ; 0x5e605 - 2writetext UnknownText_0x5eabc + writetext UnknownText_0x5eabc closetext setevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER playsound SFX_ENTER_DOOR diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index 82746c2da..1425cfc09 100644 --- a/maps/RadioTower4F.asm +++ b/maps/RadioTower4F.asm @@ -17,18 +17,18 @@ TeacherScript_0x5eb85: ; 0x5eb85 iftrue UnknownScript_0x5ebac checkevent EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x5eb99 - 2writetext UnknownText_0x5ec68 + writetext UnknownText_0x5ec68 closetext loadmovesprites end ; 0x5eb99 UnknownScript_0x5eb99: ; 0x5eb99 - 2writetext UnknownText_0x5ecab + writetext UnknownText_0x5ecab keeptextopen verbosegiveitem PINK_BOW, 1 iffalse UnknownScript_0x5ebb0 - 2writetext UnknownText_0x5ecef + writetext UnknownText_0x5ecef closetext loadmovesprites setevent EVENT_GOT_PINK_BOW_FROM_MARY @@ -36,7 +36,7 @@ UnknownScript_0x5eb99: ; 0x5eb99 ; 0x5ebac UnknownScript_0x5ebac: ; 0x5ebac - 2writetext UnknownText_0x5ed2c + writetext UnknownText_0x5ed2c closetext UnknownScript_0x5ebb0: ; 0x5ebb0 loadmovesprites @@ -45,7 +45,7 @@ UnknownScript_0x5ebb0: ; 0x5ebb0 GrowlitheScript_0x5ebb2: ; 0x5ebb2 loadfont - 2writetext UnknownText_0x5ed66 + writetext UnknownText_0x5ed66 cry MEOWTH closetext loadmovesprites @@ -75,7 +75,7 @@ TrainerGruntM10: ; 0x5ebbc GruntM10Script: ; 0x5ebc8 talkaftercancel loadfont - 2writetext UnknownText_0x5ede2 + writetext UnknownText_0x5ede2 closetext loadmovesprites end @@ -104,7 +104,7 @@ TrainerExecutivem2: ; 0x5ebd0 Executivem2Script: ; 0x5ebdc talkaftercancel loadfont - 2writetext UnknownText_0x5ee69 + writetext UnknownText_0x5ee69 closetext loadmovesprites end @@ -133,7 +133,7 @@ TrainerGruntF4: ; 0x5ebe4 GruntF4Script: ; 0x5ebf0 talkaftercancel loadfont - 2writetext UnknownText_0x5ef31 + writetext UnknownText_0x5ef31 closetext loadmovesprites end @@ -162,7 +162,7 @@ TrainerScientistRich: ; 0x5ebf8 ScientistRichScript: ; 0x5ec04 talkaftercancel loadfont - 2writetext UnknownText_0x5efcb + writetext UnknownText_0x5efcb closetext loadmovesprites end diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index 424435e46..bed4fe254 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -27,13 +27,13 @@ UnknownScript_0x60011: ; 0x60011 spriteface $2, $1 showemote $0, $2, 15 loadfont - 2writetext UnknownText_0x60128 + writetext UnknownText_0x60128 closetext loadmovesprites applymovement $2, MovementData_0x60109 playmusic MUSIC_ROCKET_ENCOUNTER loadfont - 2writetext UnknownText_0x60147 + writetext UnknownText_0x60147 closetext loadmovesprites winlosstext UnknownText_0x60223, $0000 @@ -42,7 +42,7 @@ UnknownScript_0x60011: ; 0x60011 startbattle returnafterbattle loadfont - 2writetext UnknownText_0x60246 + writetext UnknownText_0x60246 keeptextopen verbosegiveitem BASEMENT_KEY, 1 loadmovesprites @@ -56,14 +56,14 @@ GentlemanScript_0x60046: ; 0x60046 loadfont checkevent EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x60054 - 2writetext UnknownText_0x60246 + writetext UnknownText_0x60246 closetext loadmovesprites end ; 0x60054 UnknownScript_0x60054: ; 0x60054 - 2writetext UnknownText_0x60824 + writetext UnknownText_0x60824 closetext loadmovesprites end @@ -92,7 +92,7 @@ TrainerExecutivef1: ; 0x6005a Executivef1Script: ; 0x60066 talkaftercancel loadfont - 2writetext UnknownText_0x60358 + writetext UnknownText_0x60358 closetext loadmovesprites end @@ -103,7 +103,7 @@ UnknownScript_0x6006e: ; 0x6006e playmusic MUSIC_ROCKET_ENCOUNTER spriteface $3, $3 loadfont - 2writetext UnknownText_0x603d1 + writetext UnknownText_0x603d1 closetext loadmovesprites winlosstext UnknownText_0x604f3, $0000 @@ -112,7 +112,7 @@ UnknownScript_0x6006e: ; 0x6006e startbattle returnafterbattle loadfont - 2writetext UnknownText_0x6050e + writetext UnknownText_0x6050e closetext loadmovesprites special $0030 @@ -140,17 +140,17 @@ UnknownScript_0x6006e: ; 0x6006e applymovement $2, MovementData_0x6010f spriteface $0, $3 loadfont - 2writetext UnknownText_0x605b2 + writetext UnknownText_0x605b2 keeptextopen verbosegiveitem CLEAR_BELL, 1 - 2writetext UnknownText_0x6062c + writetext UnknownText_0x6062c closetext loadmovesprites dotrigger $2 domaptrigger GROUP_ECRUTEAK_HOUSE, MAP_ECRUTEAK_HOUSE, $0 setevent EVENT_GOT_CLEAR_BELL setevent $0761 - 2jump UnknownScript_0x600f1 + jump UnknownScript_0x600f1 ; 0x600f1 UnknownScript_0x600f1: ; 0x600f1 diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm index d3e23635b..751deae02 100644 --- a/maps/RedsHouse1F.asm +++ b/maps/RedsHouse1F.asm @@ -18,7 +18,7 @@ RedsMomScript_0x19aea3: ; 0x19aea3 loadfont checkevent EVENT_MET_REDS_MOM iftrue UnknownScript_0x19aeb4 - 2writetext UnknownText_0x19aec0 + writetext UnknownText_0x19aec0 closetext loadmovesprites setevent EVENT_MET_REDS_MOM @@ -26,7 +26,7 @@ RedsMomScript_0x19aea3: ; 0x19aea3 ; 0x19aeb4 UnknownScript_0x19aeb4: ; 0x19aeb4 - 2writetext UnknownText_0x19af81 + writetext UnknownText_0x19af81 closetext loadmovesprites end diff --git a/maps/Route1.asm b/maps/Route1.asm index fd5dc2520..eddd39553 100644 --- a/maps/Route1.asm +++ b/maps/Route1.asm @@ -29,7 +29,7 @@ TrainerSchoolboyDanny: ; 0x1ac556 SchoolboyDannyScript: ; 0x1ac562 talkaftercancel loadfont - 2writetext UnknownText_0x1ac5d7 + writetext UnknownText_0x1ac5d7 closetext loadmovesprites end @@ -58,7 +58,7 @@ TrainerCooltrainerfQuinn: ; 0x1ac56a CooltrainerfQuinnScript: ; 0x1ac576 talkaftercancel loadfont - 2writetext UnknownText_0x1ac640 + writetext UnknownText_0x1ac640 closetext loadmovesprites end diff --git a/maps/Route10PokeCenter1F.asm b/maps/Route10PokeCenter1F.asm index 01c1a8141..4f75e87dc 100644 --- a/maps/Route10PokeCenter1F.asm +++ b/maps/Route10PokeCenter1F.asm @@ -19,14 +19,14 @@ GymGuyScript_0x188bda: ; 0x188bda loadfont checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x188be8 - 2writetext UnknownText_0x188c26 + writetext UnknownText_0x188c26 closetext loadmovesprites end ; 0x188be8 UnknownScript_0x188be8: ; 0x188be8 - 2writetext UnknownText_0x188c9e + writetext UnknownText_0x188c9e closetext loadmovesprites end diff --git a/maps/Route10South.asm b/maps/Route10South.asm index 616360692..91ff1d882 100644 --- a/maps/Route10South.asm +++ b/maps/Route10South.asm @@ -29,7 +29,7 @@ TrainerHikerJim: ; 0x1ae3f6 HikerJimScript: ; 0x1ae402 talkaftercancel loadfont - 2writetext UnknownText_0x1ae43b + writetext UnknownText_0x1ae43b closetext loadmovesprites end @@ -58,7 +58,7 @@ TrainerPokefanmRobert: ; 0x1ae40a PokefanmRobertScript: ; 0x1ae416 talkaftercancel loadfont - 2writetext UnknownText_0x1ae4a9 + writetext UnknownText_0x1ae4a9 closetext loadmovesprites end diff --git a/maps/Route11.asm b/maps/Route11.asm index 3671727eb..a6badce14 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -29,7 +29,7 @@ TrainerYoungsterOwen: ; 0x68002 YoungsterOwenScript: ; 0x6800e talkaftercancel loadfont - 2writetext UnknownText_0x680b2 + writetext UnknownText_0x680b2 closetext loadmovesprites end @@ -58,7 +58,7 @@ TrainerYoungsterJason: ; 0x68016 YoungsterJasonScript: ; 0x68022 talkaftercancel loadfont - 2writetext UnknownText_0x6814a + writetext UnknownText_0x6814a closetext loadmovesprites end @@ -87,7 +87,7 @@ TrainerPsychicHerman: ; 0x6802a PsychicHermanScript: ; 0x68036 talkaftercancel loadfont - 2writetext UnknownText_0x6817b + writetext UnknownText_0x6817b closetext loadmovesprites end @@ -116,7 +116,7 @@ TrainerPsychicFidel: ; 0x6803e PsychicFidelScript: ; 0x6804a talkaftercancel loadfont - 2writetext UnknownText_0x681ec + writetext UnknownText_0x681ec closetext loadmovesprites end diff --git a/maps/Route12.asm b/maps/Route12.asm index 422cb63f6..3429f481b 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -29,7 +29,7 @@ TrainerFisherKyle: ; 0x1a6fb5 FisherKyleScript: ; 0x1a6fc1 talkaftercancel loadfont - 2writetext UnknownText_0x1a7238 + writetext UnknownText_0x1a7238 closetext loadmovesprites end @@ -58,7 +58,7 @@ TrainerFisherMartin: ; 0x1a6fc9 FisherMartinScript: ; 0x1a6fd5 talkaftercancel loadfont - 2writetext UnknownText_0x1a704c + writetext UnknownText_0x1a704c closetext loadmovesprites end @@ -87,7 +87,7 @@ TrainerFisherStephen: ; 0x1a6fdd FisherStephenScript: ; 0x1a6fe9 talkaftercancel loadfont - 2writetext UnknownText_0x1a70d4 + writetext UnknownText_0x1a70d4 closetext loadmovesprites end @@ -116,7 +116,7 @@ TrainerFisherBarney: ; 0x1a6ff1 FisherBarneyScript: ; 0x1a6ffd talkaftercancel loadfont - 2writetext UnknownText_0x1a716d + writetext UnknownText_0x1a716d closetext loadmovesprites end diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm index 28acb7474..437b549f8 100644 --- a/maps/Route12SuperRodHouse.asm +++ b/maps/Route12SuperRodHouse.asm @@ -11,23 +11,23 @@ FishingGuruScript_0x7f484: ; 0x7f484 loadfont checkevent EVENT_GOT_SUPER_ROD iftrue UnknownScript_0x7f4a0 - 2writetext UnknownText_0x7f4af + writetext UnknownText_0x7f4af yesorno iffalse UnknownScript_0x7f4a6 - 2writetext UnknownText_0x7f52f + writetext UnknownText_0x7f52f keeptextopen verbosegiveitem SUPER_ROD, 1 iffalse UnknownScript_0x7f4aa setevent EVENT_GOT_SUPER_ROD UnknownScript_0x7f4a0: ; 0x7f4a0 - 2writetext UnknownText_0x7f57c + writetext UnknownText_0x7f57c closetext loadmovesprites end ; 0x7f4a6 UnknownScript_0x7f4a6: ; 0x7f4a6 - 2writetext UnknownText_0x7f5ec + writetext UnknownText_0x7f5ec closetext UnknownScript_0x7f4aa: ; 0x7f4aa loadmovesprites diff --git a/maps/Route13.asm b/maps/Route13.asm index 875f85555..68a58c25f 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -29,7 +29,7 @@ TrainerPokefanmAlex: ; 0x1a2432 PokefanmAlexScript: ; 0x1a243e talkaftercancel loadfont - 2writetext UnknownText_0x1a24e3 + writetext UnknownText_0x1a24e3 closetext loadmovesprites end @@ -58,7 +58,7 @@ TrainerPokefanmJoshua: ; 0x1a2446 PokefanmJoshuaScript: ; 0x1a2452 talkaftercancel loadfont - 2writetext UnknownText_0x1a254f + writetext UnknownText_0x1a254f closetext loadmovesprites end @@ -87,7 +87,7 @@ TrainerBird_keeperPerry: ; 0x1a245a Bird_keeperPerryScript: ; 0x1a2466 talkaftercancel loadfont - 2writetext UnknownText_0x1a25db + writetext UnknownText_0x1a25db closetext loadmovesprites end @@ -116,7 +116,7 @@ TrainerBird_keeperBret: ; 0x1a246e Bird_keeperBretScript: ; 0x1a247a talkaftercancel loadfont - 2writetext UnknownText_0x1a2662 + writetext UnknownText_0x1a2662 closetext loadmovesprites end @@ -145,7 +145,7 @@ TrainerHikerKenny: ; 0x1a2482 HikerKennyScript: ; 0x1a248e talkaftercancel loadfont - 2writetext UnknownText_0x1a26c2 + writetext UnknownText_0x1a26c2 closetext loadmovesprites end diff --git a/maps/Route14.asm b/maps/Route14.asm index 9a8ae4384..70eb27728 100644 --- a/maps/Route14.asm +++ b/maps/Route14.asm @@ -38,7 +38,7 @@ TrainerPokefanmCarter: ; 0x1ad486 PokefanmCarterScript: ; 0x1ad492 talkaftercancel loadfont - 2writetext UnknownText_0x1ad508 + writetext UnknownText_0x1ad508 closetext loadmovesprites end @@ -67,7 +67,7 @@ TrainerBird_keeperRoy: ; 0x1ad49a Bird_keeperRoyScript: ; 0x1ad4a6 talkaftercancel loadfont - 2writetext UnknownText_0x1ad5a4 + writetext UnknownText_0x1ad5a4 closetext loadmovesprites end @@ -96,7 +96,7 @@ TrainerPokefanmTrevor: ; 0x1ad4ae PokefanmTrevorScript: ; 0x1ad4ba talkaftercancel loadfont - 2writetext UnknownText_0x1ad660 + writetext UnknownText_0x1ad660 closetext loadmovesprites end diff --git a/maps/Route15.asm b/maps/Route15.asm index 63d90474d..ec144d7ec 100644 --- a/maps/Route15.asm +++ b/maps/Route15.asm @@ -29,7 +29,7 @@ TrainerTeacherColette: ; 0x1aa569 TeacherColetteScript: ; 0x1aa575 talkaftercancel loadfont - 2writetext UnknownText_0x1aa60d + writetext UnknownText_0x1aa60d closetext loadmovesprites end @@ -58,7 +58,7 @@ TrainerTeacherHillary: ; 0x1aa57d TeacherHillaryScript: ; 0x1aa589 talkaftercancel loadfont - 2writetext UnknownText_0x1aa6ca + writetext UnknownText_0x1aa6ca closetext loadmovesprites end @@ -87,7 +87,7 @@ TrainerSchoolboyKipp: ; 0x1aa591 SchoolboyKippScript: ; 0x1aa59d talkaftercancel loadfont - 2writetext UnknownText_0x1aa740 + writetext UnknownText_0x1aa740 closetext loadmovesprites end @@ -116,7 +116,7 @@ TrainerSchoolboyTommy: ; 0x1aa5a5 SchoolboyTommyScript: ; 0x1aa5b1 talkaftercancel loadfont - 2writetext UnknownText_0x1aa7bc + writetext UnknownText_0x1aa7bc closetext loadmovesprites end @@ -145,7 +145,7 @@ TrainerSchoolboyJohnny: ; 0x1aa5b9 SchoolboyJohnnyScript: ; 0x1aa5c5 talkaftercancel loadfont - 2writetext UnknownText_0x1aa84a + writetext UnknownText_0x1aa84a closetext loadmovesprites end @@ -174,7 +174,7 @@ TrainerSchoolboyBilly: ; 0x1aa5cd SchoolboyBillyScript: ; 0x1aa5d9 talkaftercancel loadfont - 2writetext UnknownText_0x1aa8b0 + writetext UnknownText_0x1aa8b0 closetext loadmovesprites end diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm index 3d79eb193..96d0b05d5 100644 --- a/maps/Route16Gate.asm +++ b/maps/Route16Gate.asm @@ -27,7 +27,7 @@ UnknownScript_0x733f3: ; 0x733f3 showemote $0, $2, 15 spriteface $0, $1 loadfont - 2writetext UnknownText_0x73496 + writetext UnknownText_0x73496 closetext loadmovesprites applymovement $0, MovementData_0x73405 diff --git a/maps/Route17.asm b/maps/Route17.asm index 7c510a885..e74c537a2 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -39,7 +39,7 @@ TrainerBikerCharles: ; 0x1ad0b2 BikerCharlesScript: ; 0x1ad0be talkaftercancel loadfont - 2writetext UnknownText_0x1ad293 + writetext UnknownText_0x1ad293 closetext loadmovesprites end @@ -68,7 +68,7 @@ TrainerBikerRiley: ; 0x1ad0c6 BikerRileyScript: ; 0x1ad0d2 talkaftercancel loadfont - 2writetext UnknownText_0x1ad13b + writetext UnknownText_0x1ad13b closetext loadmovesprites end @@ -97,7 +97,7 @@ TrainerBikerJoel: ; 0x1ad0da BikerJoelScript: ; 0x1ad0e6 talkaftercancel loadfont - 2writetext UnknownText_0x1ad196 + writetext UnknownText_0x1ad196 closetext loadmovesprites end @@ -126,7 +126,7 @@ TrainerBikerGlenn: ; 0x1ad0ee BikerGlennScript: ; 0x1ad0fa talkaftercancel loadfont - 2writetext UnknownText_0x1ad225 + writetext UnknownText_0x1ad225 closetext loadmovesprites end diff --git a/maps/Route1718Gate.asm b/maps/Route1718Gate.asm index e81eb3c86..987b0b526 100644 --- a/maps/Route1718Gate.asm +++ b/maps/Route1718Gate.asm @@ -27,7 +27,7 @@ UnknownScript_0x73617: ; 0x73617 showemote $0, $2, 15 spriteface $0, $1 loadfont - 2writetext UnknownText_0x7364d + writetext UnknownText_0x7364d closetext loadmovesprites applymovement $0, MovementData_0x73629 diff --git a/maps/Route18.asm b/maps/Route18.asm index 17b7ccd19..2f94c2917 100644 --- a/maps/Route18.asm +++ b/maps/Route18.asm @@ -29,7 +29,7 @@ TrainerBird_keeperBoris: ; 0x1acf31 Bird_keeperBorisScript: ; 0x1acf3d talkaftercancel loadfont - 2writetext UnknownText_0x1acfa5 + writetext UnknownText_0x1acfa5 closetext loadmovesprites end @@ -58,7 +58,7 @@ TrainerBird_keeperBob: ; 0x1acf45 Bird_keeperBobScript: ; 0x1acf51 talkaftercancel loadfont - 2writetext UnknownText_0x1ad00d + writetext UnknownText_0x1ad00d closetext loadmovesprites end diff --git a/maps/Route19.asm b/maps/Route19.asm index 6500df84b..08ee826cc 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -46,7 +46,7 @@ TrainerSwimmerfDawn: ; 0x19e9fd SwimmerfDawnScript: ; 0x19ea09 talkaftercancel loadfont - 2writetext UnknownText_0x19ebad + writetext UnknownText_0x19ebad closetext loadmovesprites end @@ -75,7 +75,7 @@ TrainerSwimmermHarold: ; 0x19ea11 SwimmermHaroldScript: ; 0x19ea1d talkaftercancel loadfont - 2writetext UnknownText_0x19eab4 + writetext UnknownText_0x19eab4 closetext loadmovesprites end @@ -104,7 +104,7 @@ TrainerSwimmermJerome: ; 0x19ea25 SwimmermJeromeScript: ; 0x19ea31 talkaftercancel loadfont - 2writetext UnknownText_0x19ec7e + writetext UnknownText_0x19ec7e closetext loadmovesprites end @@ -133,7 +133,7 @@ TrainerSwimmermTucker: ; 0x19ea39 SwimmermTuckerScript: ; 0x19ea45 talkaftercancel loadfont - 2writetext UnknownText_0x19eb3b + writetext UnknownText_0x19eb3b closetext loadmovesprites end @@ -144,14 +144,14 @@ FisherScript_0x19ea4d: ; 0x19ea4d loadfont checkevent $00d7 iftrue UnknownScript_0x19ea5b - 2writetext UnknownText_0x19ecaf + writetext UnknownText_0x19ecaf closetext loadmovesprites end ; 0x19ea5b UnknownScript_0x19ea5b: ; 0x19ea5b - 2writetext UnknownText_0x19ed24 + writetext UnknownText_0x19ed24 closetext loadmovesprites end @@ -162,14 +162,14 @@ FisherScript_0x19ea61: ; 0x19ea61 loadfont checkevent $00d7 iftrue UnknownScript_0x19ea6f - 2writetext UnknownText_0x19ed45 + writetext UnknownText_0x19ed45 closetext loadmovesprites end ; 0x19ea6f UnknownScript_0x19ea6f: ; 0x19ea6f - 2writetext UnknownText_0x19ed7d + writetext UnknownText_0x19ed7d closetext loadmovesprites end diff --git a/maps/Route19FuchsiaGate.asm b/maps/Route19FuchsiaGate.asm index db8fe1d47..23b9de4de 100644 --- a/maps/Route19FuchsiaGate.asm +++ b/maps/Route19FuchsiaGate.asm @@ -11,14 +11,14 @@ OfficerScript_0x1ab3f6: ; 0x1ab3f6 loadfont checkevent $00d7 iftrue UnknownScript_0x1ab404 - 2writetext UnknownText_0x1ab40a + writetext UnknownText_0x1ab40a closetext loadmovesprites end ; 0x1ab404 UnknownScript_0x1ab404: ; 0x1ab404 - 2writetext UnknownText_0x1ab48a + writetext UnknownText_0x1ab48a closetext loadmovesprites end diff --git a/maps/Route2.asm b/maps/Route2.asm index e119e9dcf..e6cf1e6e9 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -29,7 +29,7 @@ TrainerBug_catcherRob: ; 0x1ac2bc Bug_catcherRobScript: ; 0x1ac2c8 talkaftercancel loadfont - 2writetext UnknownText_0x1ac34d + writetext UnknownText_0x1ac34d closetext loadmovesprites end @@ -58,7 +58,7 @@ TrainerBug_catcherEd: ; 0x1ac2d0 Bug_catcherEdScript: ; 0x1ac2dc talkaftercancel loadfont - 2writetext UnknownText_0x1ac3cf + writetext UnknownText_0x1ac3cf closetext loadmovesprites end @@ -87,7 +87,7 @@ TrainerBug_catcherDoug: ; 0x1ac2e4 Bug_catcherDougScript: ; 0x1ac2f0 talkaftercancel loadfont - 2writetext UnknownText_0x1ac423 + writetext UnknownText_0x1ac423 closetext loadmovesprites end diff --git a/maps/Route20.asm b/maps/Route20.asm index 114186224..2d47a5885 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -38,7 +38,7 @@ TrainerSwimmerfNicole: ; 0x1acd29 SwimmerfNicoleScript: ; 0x1acd35 talkaftercancel loadfont - 2writetext UnknownText_0x1acd93 + writetext UnknownText_0x1acd93 closetext loadmovesprites end @@ -67,7 +67,7 @@ TrainerSwimmerfLori: ; 0x1acd3d SwimmerfLoriScript: ; 0x1acd49 talkaftercancel loadfont - 2writetext UnknownText_0x1ace15 + writetext UnknownText_0x1ace15 closetext loadmovesprites end @@ -96,7 +96,7 @@ TrainerSwimmermCameron: ; 0x1acd51 SwimmermCameronScript: ; 0x1acd5d talkaftercancel loadfont - 2writetext UnknownText_0x1ace8b + writetext UnknownText_0x1ace8b closetext loadmovesprites end diff --git a/maps/Route21.asm b/maps/Route21.asm index cdad773cb..8db97cffe 100644 --- a/maps/Route21.asm +++ b/maps/Route21.asm @@ -29,7 +29,7 @@ TrainerSwimmermSeth: ; 0x1ac814 SwimmermSethScript: ; 0x1ac820 talkaftercancel loadfont - 2writetext UnknownText_0x1ac873 + writetext UnknownText_0x1ac873 closetext loadmovesprites end @@ -58,7 +58,7 @@ TrainerSwimmerfNikki: ; 0x1ac828 SwimmerfNikkiScript: ; 0x1ac834 talkaftercancel loadfont - 2writetext UnknownText_0x1ac8f1 + writetext UnknownText_0x1ac8f1 closetext loadmovesprites end @@ -87,7 +87,7 @@ TrainerFisherArnold: ; 0x1ac83c FisherArnoldScript: ; 0x1ac848 talkaftercancel loadfont - 2writetext UnknownText_0x1ac95c + writetext UnknownText_0x1ac95c closetext loadmovesprites end diff --git a/maps/Route24.asm b/maps/Route24.asm index 6c77d33f8..8a30bab43 100644 --- a/maps/Route24.asm +++ b/maps/Route24.asm @@ -10,7 +10,7 @@ RocketScript_0x1adbfa: ; 0x1adbfa faceplayer playmusic MUSIC_ROCKET_ENCOUNTER loadfont - 2writetext UnknownText_0x1adc2e + writetext UnknownText_0x1adc2e closetext loadmovesprites winlosstext UnknownText_0x1add67, $ffff @@ -20,10 +20,10 @@ RocketScript_0x1adbfa: ; 0x1adbfa returnafterbattle playmusic MUSIC_ROCKET_ENCOUNTER loadfont - 2writetext UnknownText_0x1addc0 + writetext UnknownText_0x1addc0 keeptextopen special $006a - 2writetext UnknownText_0x1adee1 + writetext UnknownText_0x1adee1 closetext loadmovesprites special $0030 diff --git a/maps/Route25.asm b/maps/Route25.asm index 30c4b6dfe..e4f66416c 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -31,7 +31,7 @@ UnknownScript_0x19eea0: ; 0x19eea0 pause 10 applymovement $2, MovementData_0x19efed loadfont - 2writetext UnknownText_0x19f006 + writetext UnknownText_0x19f006 closetext loadmovesprites spriteface $0, $0 @@ -58,7 +58,7 @@ UnknownScript_0x19eee0: ; 0x19eee0 pause 10 applymovement $2, MovementData_0x19eff4 loadfont - 2writetext UnknownText_0x19f006 + writetext UnknownText_0x19f006 closetext loadmovesprites spriteface $0, $1 @@ -95,7 +95,7 @@ TrainerSchoolboyDudley: ; 0x19ef20 SchoolboyDudleyScript: ; 0x19ef2c talkaftercancel loadfont - 2writetext UnknownText_0x19f1b5 + writetext UnknownText_0x19f1b5 closetext loadmovesprites end @@ -124,7 +124,7 @@ TrainerLassEllen: ; 0x19ef34 LassEllenScript: ; 0x19ef40 talkaftercancel loadfont - 2writetext UnknownText_0x19f208 + writetext UnknownText_0x19f208 closetext loadmovesprites end @@ -153,7 +153,7 @@ TrainerSchoolboyJoe: ; 0x19ef48 SchoolboyJoeScript: ; 0x19ef54 talkaftercancel loadfont - 2writetext UnknownText_0x19f25c + writetext UnknownText_0x19f25c closetext loadmovesprites end @@ -182,7 +182,7 @@ TrainerLassLaura: ; 0x19ef5c LassLauraScript: ; 0x19ef68 talkaftercancel loadfont - 2writetext UnknownText_0x19f2a6 + writetext UnknownText_0x19f2a6 closetext loadmovesprites end @@ -211,7 +211,7 @@ TrainerCamperLloyd: ; 0x19ef70 CamperLloydScript: ; 0x19ef7c talkaftercancel loadfont - 2writetext UnknownText_0x19f2f8 + writetext UnknownText_0x19f2f8 closetext loadmovesprites end @@ -240,7 +240,7 @@ TrainerLassShannon: ; 0x19ef84 LassShannonScript: ; 0x19ef90 talkaftercancel loadfont - 2writetext UnknownText_0x19f35b + writetext UnknownText_0x19f35b closetext loadmovesprites end @@ -269,7 +269,7 @@ TrainerSupernerdPat: ; 0x19ef98 SupernerdPatScript: ; 0x19efa4 talkaftercancel loadfont - 2writetext UnknownText_0x19f41a + writetext UnknownText_0x19f41a closetext loadmovesprites end @@ -282,13 +282,13 @@ CooltrainerMScript_0x19efac: ; 0x19efac iftrue UnknownScript_0x19efda checkevent EVENT_CLEARED_NUGGET_BRIDGE iftrue UnknownScript_0x19efc7 - 2writetext UnknownText_0x19f43b + writetext UnknownText_0x19f43b keeptextopen verbosegiveitem NUGGET, 1 iffalse UnknownScript_0x19efde setevent EVENT_CLEARED_NUGGET_BRIDGE UnknownScript_0x19efc7: ; 0x19efc7 - 2writetext UnknownText_0x19f49d + writetext UnknownText_0x19f49d closetext loadmovesprites winlosstext UnknownText_0x19f4fd, $0000 @@ -298,7 +298,7 @@ UnknownScript_0x19efc7: ; 0x19efc7 setevent $0558 loadfont UnknownScript_0x19efda: ; 0x19efda - 2writetext UnknownText_0x19f520 + writetext UnknownText_0x19f520 closetext UnknownScript_0x19efde: ; 0x19efde loadmovesprites diff --git a/maps/Route26.asm b/maps/Route26.asm index f6bbe3075..5824c863d 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -29,7 +29,7 @@ TrainerCooltrainermJake: ; 0x1a4d1f CooltrainermJakeScript: ; 0x1a4d2b talkaftercancel loadfont - 2writetext UnknownText_0x1a4f08 + writetext UnknownText_0x1a4f08 closetext loadmovesprites end @@ -65,26 +65,26 @@ CooltrainermGaven3Script: ; 0x1a4d3f iftrue UnknownScript_0x1a4dcb checkevent $026b iftrue UnknownScript_0x1a4d62 - 2writetext UnknownText_0x1a4fe4 + writetext UnknownText_0x1a4fe4 keeptextopen setevent $026b - 2call UnknownScript_0x1a4dbf - 2jump UnknownScript_0x1a4d65 + scall UnknownScript_0x1a4dbf + jump UnknownScript_0x1a4d65 ; 0x1a4d62 UnknownScript_0x1a4d62: ; 0x1a4d62 - 2call UnknownScript_0x1a4dc3 + scall UnknownScript_0x1a4dc3 UnknownScript_0x1a4d65: ; 0x1a4d65 askforphonenumber $b if_equal $1, UnknownScript_0x1a4dd3 if_equal $2, UnknownScript_0x1a4dcf trainertotext COOLTRAINERM, GAVEN3, $0 - 2call UnknownScript_0x1a4dc7 - 2jump UnknownScript_0x1a4dcb + scall UnknownScript_0x1a4dc7 + jump UnknownScript_0x1a4dcb ; 0x1a4d79 UnknownScript_0x1a4d79: ; 0x1a4d79 - 2call UnknownScript_0x1a4dd7 + scall UnknownScript_0x1a4dd7 winlosstext CooltrainermGaven3BeatenText, $0000 copybytetovar $d9f5 if_equal $2, UnknownScript_0x1a4d90 @@ -180,7 +180,7 @@ TrainerCooltrainerfJoyce: ; 0x1a4ddb CooltrainerfJoyceScript: ; 0x1a4de7 talkaftercancel loadfont - 2writetext UnknownText_0x1a50d7 + writetext UnknownText_0x1a50d7 closetext loadmovesprites end @@ -216,26 +216,26 @@ CooltrainerfBeth1Script: ; 0x1a4dfb iftrue UnknownScript_0x1a4e87 checkevent $026d iftrue UnknownScript_0x1a4e1e - 2writetext UnknownText_0x1a51d9 + writetext UnknownText_0x1a51d9 keeptextopen setevent $026d - 2call UnknownScript_0x1a4e7b - 2jump UnknownScript_0x1a4e21 + scall UnknownScript_0x1a4e7b + jump UnknownScript_0x1a4e21 ; 0x1a4e1e UnknownScript_0x1a4e1e: ; 0x1a4e1e - 2call UnknownScript_0x1a4e7f + scall UnknownScript_0x1a4e7f UnknownScript_0x1a4e21: ; 0x1a4e21 askforphonenumber $c if_equal $1, UnknownScript_0x1a4e8f if_equal $2, UnknownScript_0x1a4e8b trainertotext COOLTRAINERF, BETH1, $0 - 2call UnknownScript_0x1a4e83 - 2jump UnknownScript_0x1a4e87 + scall UnknownScript_0x1a4e83 + jump UnknownScript_0x1a4e87 ; 0x1a4e35 UnknownScript_0x1a4e35: ; 0x1a4e35 - 2call UnknownScript_0x1a4e93 + scall UnknownScript_0x1a4e93 winlosstext CooltrainerfBeth1BeatenText, $0000 copybytetovar $d9f6 if_equal $2, UnknownScript_0x1a4e4c @@ -331,7 +331,7 @@ TrainerPsychicRichard: ; 0x1a4e97 PsychicRichardScript: ; 0x1a4ea3 talkaftercancel loadfont - 2writetext UnknownText_0x1a5278 + writetext UnknownText_0x1a5278 closetext loadmovesprites end @@ -360,7 +360,7 @@ TrainerFisherScott: ; 0x1a4eab FisherScottScript: ; 0x1a4eb7 talkaftercancel loadfont - 2writetext UnknownText_0x1a5326 + writetext UnknownText_0x1a5326 closetext loadmovesprites end diff --git a/maps/Route26DayofWeekSiblingsHouse.asm b/maps/Route26DayofWeekSiblingsHouse.asm index 672c24e87..899292903 100644 --- a/maps/Route26DayofWeekSiblingsHouse.asm +++ b/maps/Route26DayofWeekSiblingsHouse.asm @@ -8,13 +8,13 @@ Route26DayofWeekSiblingsHouse_MapScriptHeader: ; 0x7b1e2 PokedexScript_0x7b1e4: ; 0x7b1e4 loadfont - 2writetext UnknownText_0x7b1f9 + writetext UnknownText_0x7b1f9 yesorno iffalse UnknownText_0x7b1f7 - 2writetext UnknownText_0x7b222 + writetext UnknownText_0x7b222 yesorno iffalse UnknownText_0x7b1f7 - 2writetext UnknownText_0x7b2b9 + writetext UnknownText_0x7b2b9 closetext UnknownText_0x7b1f7: ; 0x7b1f7 loadmovesprites diff --git a/maps/Route26HealSpeechHouse.asm b/maps/Route26HealSpeechHouse.asm index 1befb5f02..b2cfc2c06 100644 --- a/maps/Route26HealSpeechHouse.asm +++ b/maps/Route26HealSpeechHouse.asm @@ -9,7 +9,7 @@ Route26HealSpeechHouse_MapScriptHeader: ; 0x7b123 TeacherScript_0x7b125: ; 0x7b125 faceplayer loadfont - 2writetext UnknownText_0x7b14d + writetext UnknownText_0x7b14d closetext loadmovesprites special $0030 @@ -21,7 +21,7 @@ TeacherScript_0x7b125: ; 0x7b125 special $0032 special $003d loadfont - 2writetext UnknownText_0x7b18b + writetext UnknownText_0x7b18b closetext loadmovesprites end diff --git a/maps/Route27.asm b/maps/Route27.asm index cc3bd88a6..e9df736f9 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -22,7 +22,7 @@ UnknownScript_0x1a0873: ; 0x1a0873 spriteface $a, $2 showemote $0, $a, 15 applymovement $a, MovementData_0x1a0a66 - 2jump UnknownScript_0x1a088c + jump UnknownScript_0x1a088c ; 0x1a0881 UnknownScript_0x1a0881: ; 0x1a0881 @@ -32,9 +32,9 @@ UnknownScript_0x1a0881: ; 0x1a0881 UnknownScript_0x1a088c: ; 0x1a088c spriteface $0, $3 loadfont - 2writetext UnknownText_0x1a0a6b + writetext UnknownText_0x1a0a6b keeptextopen - 2writetext UnknownText_0x1a0a71 + writetext UnknownText_0x1a0a71 closetext loadmovesprites dotrigger $1 @@ -68,7 +68,7 @@ TrainerPsychicGilbert: ; 0x1a089f PsychicGilbertScript: ; 0x1a08ab talkaftercancel loadfont - 2writetext UnknownText_0x1a0dd2 + writetext UnknownText_0x1a0dd2 closetext loadmovesprites end @@ -106,26 +106,26 @@ Bird_keeperJose2Script: ; 0x1a08bf iftrue UnknownScript_0x1a0963 checkevent $026f iftrue UnknownScript_0x1a08e8 - 2writetext UnknownText_0x1a0e42 + writetext UnknownText_0x1a0e42 keeptextopen setevent $026f - 2call UnknownScript_0x1a0957 - 2jump UnknownScript_0x1a08eb + scall UnknownScript_0x1a0957 + jump UnknownScript_0x1a08eb ; 0x1a08e8 UnknownScript_0x1a08e8: ; 0x1a08e8 - 2call UnknownScript_0x1a095b + scall UnknownScript_0x1a095b UnknownScript_0x1a08eb: ; 0x1a08eb askforphonenumber $d if_equal $1, UnknownScript_0x1a096b if_equal $2, UnknownScript_0x1a0967 trainertotext BIRD_KEEPER, JOSE2, $0 - 2call UnknownScript_0x1a095f - 2jump UnknownScript_0x1a0963 + scall UnknownScript_0x1a095f + jump UnknownScript_0x1a0963 ; 0x1a08ff UnknownScript_0x1a08ff: ; 0x1a08ff - 2call UnknownScript_0x1a096f + scall UnknownScript_0x1a096f winlosstext Bird_keeperJose2BeatenText, $0000 copybytetovar $d9f7 if_equal $2, UnknownScript_0x1a0916 @@ -164,15 +164,15 @@ UnknownScript_0x1a093c: ; 0x1a093c ; 0x1a0945 UnknownScript_0x1a0945: ; 0x1a0945 - 2call UnknownScript_0x1a0973 + scall UnknownScript_0x1a0973 verbosegiveitem STAR_PIECE, 1 iffalse UnknownScript_0x1a0954 clearflag $007e - 2jump UnknownScript_0x1a0963 + jump UnknownScript_0x1a0963 ; 0x1a0954 UnknownScript_0x1a0954: ; 0x1a0954 - 2jump UnknownScript_0x1a0977 + jump UnknownScript_0x1a0977 ; 0x1a0957 UnknownScript_0x1a0957: ; 0x1a0957 @@ -243,7 +243,7 @@ TrainerCooltrainermBlake: ; 0x1a097b CooltrainermBlakeScript: ; 0x1a0987 talkaftercancel loadfont - 2writetext UnknownText_0x1a0b0b + writetext UnknownText_0x1a0b0b closetext loadmovesprites end @@ -272,7 +272,7 @@ TrainerCooltrainermBrian: ; 0x1a098f CooltrainermBrianScript: ; 0x1a099b talkaftercancel loadfont - 2writetext UnknownText_0x1a0bac + writetext UnknownText_0x1a0bac closetext loadmovesprites end @@ -308,26 +308,26 @@ CooltrainerfReena1Script: ; 0x1a09af iftrue UnknownScript_0x1a0a3b checkevent $0271 iftrue UnknownScript_0x1a09d2 - 2writetext UnknownText_0x1a0c35 + writetext UnknownText_0x1a0c35 keeptextopen setevent $0271 - 2call UnknownScript_0x1a0a2f - 2jump UnknownScript_0x1a09d5 + scall UnknownScript_0x1a0a2f + jump UnknownScript_0x1a09d5 ; 0x1a09d2 UnknownScript_0x1a09d2: ; 0x1a09d2 - 2call UnknownScript_0x1a0a33 + scall UnknownScript_0x1a0a33 UnknownScript_0x1a09d5: ; 0x1a09d5 askforphonenumber $e if_equal $1, UnknownScript_0x1a0a43 if_equal $2, UnknownScript_0x1a0a3f trainertotext COOLTRAINERF, REENA1, $0 - 2call UnknownScript_0x1a0a37 - 2jump UnknownScript_0x1a0a3b + scall UnknownScript_0x1a0a37 + jump UnknownScript_0x1a0a3b ; 0x1a09e9 UnknownScript_0x1a09e9: ; 0x1a09e9 - 2call UnknownScript_0x1a0a47 + scall UnknownScript_0x1a0a47 winlosstext CooltrainerfReena1BeatenText, $0000 copybytetovar $d9f8 if_equal $2, UnknownScript_0x1a0a00 @@ -423,7 +423,7 @@ TrainerCooltrainerfMegan: ; 0x1a0a4b CooltrainerfMeganScript: ; 0x1a0a57 talkaftercancel loadfont - 2writetext UnknownText_0x1a0cce + writetext UnknownText_0x1a0cce closetext loadmovesprites end diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index def1615d8..6218c7858 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -12,20 +12,20 @@ GrannyScript_0x7b394: ; 0x7b394 checkevent EVENT_GOT_TM37_SANDSTORM iftrue UnknownScript_0x7b3b7 special $0059 - 2writetext UnknownText_0x7b3c6 + writetext UnknownText_0x7b3c6 keeptextopen if_greater_than $95, UnknownScript_0x7b3aa - 2jump UnknownScript_0x7b3bd + jump UnknownScript_0x7b3bd ; 0x7b3aa UnknownScript_0x7b3aa: ; 0x7b3aa - 2writetext UnknownText_0x7b42b + writetext UnknownText_0x7b42b keeptextopen verbosegiveitem TM_37, 1 iffalse UnknownScript_0x7b3bb setevent EVENT_GOT_TM37_SANDSTORM UnknownScript_0x7b3b7: ; 0x7b3b7 - 2writetext UnknownText_0x7b48f + writetext UnknownText_0x7b48f closetext UnknownScript_0x7b3bb: ; 0x7b3bb loadmovesprites @@ -33,7 +33,7 @@ UnknownScript_0x7b3bb: ; 0x7b3bb ; 0x7b3bd UnknownScript_0x7b3bd: ; 0x7b3bd - 2writetext UnknownText_0x7b51f + writetext UnknownText_0x7b51f closetext loadmovesprites end diff --git a/maps/Route28FamousSpeechHouse.asm b/maps/Route28FamousSpeechHouse.asm index fbb032576..8c3f3fac6 100644 --- a/maps/Route28FamousSpeechHouse.asm +++ b/maps/Route28FamousSpeechHouse.asm @@ -18,7 +18,7 @@ CooltrainerFScript_0x1ae658: ; 0x1ae658 loadfont checkevent EVENT_GOT_TM47_STEEL_WING iftrue UnknownScript_0x1ae66f - 2writetext UnknownText_0x1ae682 + writetext UnknownText_0x1ae682 keeptextopen verbosegiveitem TM_47, 1 iffalse UnknownScript_0x1ae66d @@ -29,7 +29,7 @@ UnknownScript_0x1ae66d: ; 0x1ae66d ; 0x1ae66f UnknownScript_0x1ae66f: ; 0x1ae66f - 2writetext UnknownText_0x1ae6f0 + writetext UnknownText_0x1ae6f0 closetext loadmovesprites end @@ -37,7 +37,7 @@ UnknownScript_0x1ae66f: ; 0x1ae66f MoltresScript_0x1ae675: ; 0x1ae675 loadfont - 2writetext UnknownText_0x1ae752 + writetext UnknownText_0x1ae752 cry FEAROW closetext loadmovesprites diff --git a/maps/Route29.asm b/maps/Route29.asm index 355e84fe0..0fbc35aa6 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -42,7 +42,7 @@ UnknownScript_0x1a0f6d: ; 0x1a0f6d spriteface $0, $2 setevent EVENT_DUDE_TALKED_TO_YOU loadfont - 2writetext UnknownText_0x1a10df + writetext UnknownText_0x1a10df yesorno iffalse UnknownScript_0x1a0fd9 loadmovesprites @@ -53,7 +53,7 @@ UnknownScript_0x1a0f6d: ; 0x1a0f6d catchtutorial BATTLETYPE_TUTORIAL spriteface $2, $1 loadfont - 2writetext UnknownText_0x1a114d + writetext UnknownText_0x1a114d closetext loadmovesprites dotrigger $0 @@ -68,7 +68,7 @@ UnknownScript_0x1a0fa3: ; 0x1a0fa3 spriteface $0, $2 setevent EVENT_DUDE_TALKED_TO_YOU loadfont - 2writetext UnknownText_0x1a10df + writetext UnknownText_0x1a10df yesorno iffalse UnknownScript_0x1a0fe5 loadmovesprites @@ -79,7 +79,7 @@ UnknownScript_0x1a0fa3: ; 0x1a0fa3 catchtutorial BATTLETYPE_TUTORIAL spriteface $2, $1 loadfont - 2writetext UnknownText_0x1a114d + writetext UnknownText_0x1a114d closetext loadmovesprites dotrigger $0 @@ -88,7 +88,7 @@ UnknownScript_0x1a0fa3: ; 0x1a0fa3 ; 0x1a0fd9 UnknownScript_0x1a0fd9: ; 0x1a0fd9 - 2writetext UnknownText_0x1a1197 + writetext UnknownText_0x1a1197 closetext loadmovesprites applymovement $2, MovementData_0x1a109a @@ -97,7 +97,7 @@ UnknownScript_0x1a0fd9: ; 0x1a0fd9 ; 0x1a0fe5 UnknownScript_0x1a0fe5: ; 0x1a0fe5 - 2writetext UnknownText_0x1a1197 + writetext UnknownText_0x1a1197 closetext loadmovesprites applymovement $2, MovementData_0x1a10a1 @@ -114,14 +114,14 @@ CooltrainerMScript_0x1a0ff1: ; 0x1a0ff1 iftrue UnknownScript_0x1a101c checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM iffalse UnknownScript_0x1a101c - 2writetext UnknownText_0x1a11e3 + writetext UnknownText_0x1a11e3 yesorno iffalse UnknownScript_0x1a1022 loadmovesprites loadpokedata RATTATA, 5 catchtutorial BATTLETYPE_TUTORIAL loadfont - 2writetext UnknownText_0x1a114d + writetext UnknownText_0x1a114d closetext loadmovesprites setevent EVENT_LEARNED_TO_CATCH_POKEMON @@ -129,14 +129,14 @@ CooltrainerMScript_0x1a0ff1: ; 0x1a0ff1 ; 0x1a101c UnknownScript_0x1a101c: ; 0x1a101c - 2writetext UnknownText_0x1a10a7 + writetext UnknownText_0x1a10a7 closetext loadmovesprites end ; 0x1a1022 UnknownScript_0x1a1022: ; 0x1a1022 - 2writetext UnknownText_0x1a1197 + writetext UnknownText_0x1a1197 closetext loadmovesprites end @@ -162,14 +162,14 @@ CooltrainerMScript_0x1a1031: ; 0x1a1031 checktime $4 iftrue UnknownScript_0x1a1043 UnknownScript_0x1a103d: ; 0x1a103d - 2writetext UnknownText_0x1a134c + writetext UnknownText_0x1a134c closetext loadmovesprites end ; 0x1a1043 UnknownScript_0x1a1043: ; 0x1a1043 - 2writetext UnknownText_0x1a137c + writetext UnknownText_0x1a137c closetext loadmovesprites end @@ -184,29 +184,29 @@ TuscanyScript: if_not_equal TUESDAY, TuscanyNotTuesdayScript checkevent EVENT_MET_TUSCANY_OF_TUESDAY iftrue .MetTuscany - 2writetext MeetTuscanyText + writetext MeetTuscanyText keeptextopen setevent EVENT_MET_TUSCANY_OF_TUESDAY .MetTuscany - 2writetext TuscanyGivesGiftText + writetext TuscanyGivesGiftText keeptextopen verbosegiveitem PINK_BOW, 1 iffalse TuscanyDoneScript setevent EVENT_GOT_PINK_BOW_FROM_TUSCANY - 2writetext TuscanyGaveGiftText + writetext TuscanyGaveGiftText closetext loadmovesprites end TuscanyTuesdayScript: - 2writetext TuscanyTuesdayText + writetext TuscanyTuesdayText closetext TuscanyDoneScript: loadmovesprites end TuscanyNotTuesdayScript: - 2writetext TuscanyNotTuesdayText + writetext TuscanyNotTuesdayText closetext loadmovesprites end diff --git a/maps/Route2NuggetSpeechHouse.asm b/maps/Route2NuggetSpeechHouse.asm index 3be9c4ef8..a9c52f8e2 100644 --- a/maps/Route2NuggetSpeechHouse.asm +++ b/maps/Route2NuggetSpeechHouse.asm @@ -11,13 +11,13 @@ FisherScript_0x9b847: ; 0x9b847 loadfont checkevent $00c8 iftrue UnknownScript_0x9b85c - 2writetext UnknownText_0x9b865 + writetext UnknownText_0x9b865 keeptextopen verbosegiveitem NUGGET, 1 iffalse UnknownScript_0x9b860 setevent $00c8 UnknownScript_0x9b85c: ; 0x9b85c - 2writetext UnknownText_0x9b8e5 + writetext UnknownText_0x9b8e5 closetext UnknownScript_0x9b860: ; 0x9b860 loadmovesprites diff --git a/maps/Route3.asm b/maps/Route3.asm index 95dfe656c..bbe1c47f0 100644 --- a/maps/Route3.asm +++ b/maps/Route3.asm @@ -29,7 +29,7 @@ TrainerFirebreatherOtis: ; 0x1adf65 FirebreatherOtisScript: ; 0x1adf71 talkaftercancel loadfont - 2writetext UnknownText_0x1adff7 + writetext UnknownText_0x1adff7 closetext loadmovesprites end @@ -58,7 +58,7 @@ TrainerYoungsterWarren: ; 0x1adf79 YoungsterWarrenScript: ; 0x1adf85 talkaftercancel loadfont - 2writetext UnknownText_0x1ae051 + writetext UnknownText_0x1ae051 closetext loadmovesprites end @@ -87,7 +87,7 @@ TrainerYoungsterJimmy: ; 0x1adf8d YoungsterJimmyScript: ; 0x1adf99 talkaftercancel loadfont - 2writetext UnknownText_0x1ae0a9 + writetext UnknownText_0x1ae0a9 closetext loadmovesprites end @@ -116,7 +116,7 @@ TrainerFirebreatherBurt: ; 0x1adfa1 FirebreatherBurtScript: ; 0x1adfad talkaftercancel loadfont - 2writetext UnknownText_0x1ae118 + writetext UnknownText_0x1ae118 closetext loadmovesprites end diff --git a/maps/Route30.asm b/maps/Route30.asm index eb1e7cc39..9b57182d7 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -10,14 +10,14 @@ YoungsterScript_0x1a1673: ; 0x1a1673 waitbutton playmusic MUSIC_JOHTO_TRAINER_BATTLE loadfont - 2writetext UnknownText_0x1a1806 + writetext UnknownText_0x1a1806 pause 30 loadmovesprites playsound SFX_TACKLE applymovement $8, MovementData_0x1a17fe loadfont faceplayer - 2writetext UnknownText_0x1a181c + writetext UnknownText_0x1a181c closetext spriteface $2, $1 loadmovesprites @@ -57,26 +57,26 @@ YoungsterJoey1Script: ; 0x1a16a6 iftrue UnknownScript_0x1a178f checkevent $0273 iftrue UnknownScript_0x1a16c9 - 2writetext UnknownText_0x1a18c2 + writetext UnknownText_0x1a18c2 keeptextopen setevent $0273 - 2call UnknownScript_0x1a1783 - 2jump UnknownScript_0x1a16cc + scall UnknownScript_0x1a1783 + jump UnknownScript_0x1a16cc ; 0x1a16c9 UnknownScript_0x1a16c9: ; 0x1a16c9 - 2call UnknownScript_0x1a1787 + scall UnknownScript_0x1a1787 UnknownScript_0x1a16cc: ; 0x1a16cc askforphonenumber $f if_equal $1, UnknownScript_0x1a1797 if_equal $2, UnknownScript_0x1a1793 trainertotext YOUNGSTER, JOEY1, $0 - 2call UnknownScript_0x1a178b - 2jump UnknownScript_0x1a178f + scall UnknownScript_0x1a178b + jump UnknownScript_0x1a178f ; 0x1a16e0 UnknownScript_0x1a16e0: ; 0x1a16e0 - 2call UnknownScript_0x1a179b + scall UnknownScript_0x1a179b winlosstext YoungsterJoey1BeatenText, $0000 copybytetovar $d9f9 if_equal $4, UnknownScript_0x1a16ff @@ -141,11 +141,11 @@ UnknownScript_0x1a174b: ; 0x1a174b iftrue UnknownScript_0x1a176f checkevent $0266 iftrue UnknownScript_0x1a176e - 2call UnknownScript_0x1a17a6 + scall UnknownScript_0x1a17a6 verbosegiveitem HP_UP, 1 iffalse UnknownScript_0x1a179f setevent $0266 - 2jump UnknownScript_0x1a178f + jump UnknownScript_0x1a178f ; 0x1a176e UnknownScript_0x1a176e: ; 0x1a176e @@ -154,13 +154,13 @@ UnknownScript_0x1a176e: ; 0x1a176e UnknownScript_0x1a176f: ; 0x1a176f loadfont - 2writetext UnknownText_0x1a1bc0 + writetext UnknownText_0x1a1bc0 closetext verbosegiveitem HP_UP, 1 iffalse UnknownScript_0x1a179f clearevent EVENT_JOEY_HP_UP setevent $0266 - 2jump UnknownScript_0x1a178f + jump UnknownScript_0x1a178f ; 0x1a1783 UnknownScript_0x1a1783: ; 0x1a1783 @@ -232,7 +232,7 @@ TrainerYoungsterMikey: ; 0x1a17aa YoungsterMikeyScript: ; 0x1a17b6 talkaftercancel loadfont - 2writetext UnknownText_0x1a197d + writetext UnknownText_0x1a197d closetext loadmovesprites end @@ -261,7 +261,7 @@ TrainerBug_catcherDon: ; 0x1a17be Bug_catcherDonScript: ; 0x1a17ca talkaftercancel loadfont - 2writetext UnknownText_0x1a1a1c + writetext UnknownText_0x1a1a1c closetext loadmovesprites end @@ -272,14 +272,14 @@ YoungsterScript_0x1a17d2: ; 0x1a17d2 loadfont checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM iftrue UnknownScript_0x1a17e0 - 2writetext UnknownText_0x1a1a6a + writetext UnknownText_0x1a1a6a closetext loadmovesprites end ; 0x1a17e0 UnknownScript_0x1a17e0: ; 0x1a17e0 - 2writetext UnknownText_0x1a1a94 + writetext UnknownText_0x1a1a94 closetext loadmovesprites end diff --git a/maps/Route30BerrySpeechHouse.asm b/maps/Route30BerrySpeechHouse.asm index 4ee67c8dc..384c8fa38 100644 --- a/maps/Route30BerrySpeechHouse.asm +++ b/maps/Route30BerrySpeechHouse.asm @@ -11,13 +11,13 @@ PokefanMScript_0x196d64: ; 0x196d64 loadfont checkevent EVENT_GOT_BERRY_FROM_ROUTE_30_HOUSE iftrue UnknownScript_0x196d79 - 2writetext UnknownText_0x196d82 + writetext UnknownText_0x196d82 keeptextopen verbosegiveitem BERRY, 1 iffalse UnknownScript_0x196d7d setevent EVENT_GOT_BERRY_FROM_ROUTE_30_HOUSE UnknownScript_0x196d79: ; 0x196d79 - 2writetext UnknownText_0x196dec + writetext UnknownText_0x196dec closetext UnknownScript_0x196d7d: ; 0x196d7d loadmovesprites diff --git a/maps/Route31.asm b/maps/Route31.asm index e3b070183..5cd903103 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -53,26 +53,26 @@ Bug_catcherWade1Script: ; 0x1a5453 iftrue UnknownScript_0x1a5558 checkevent $0275 iftrue UnknownScript_0x1a547c - 2writetext UnknownText_0x1a5671 + writetext UnknownText_0x1a5671 closetext setevent $0275 - 2call UnknownScript_0x1a554c - 2jump UnknownScript_0x1a547f + scall UnknownScript_0x1a554c + jump UnknownScript_0x1a547f ; 0x1a547c UnknownScript_0x1a547c: ; 0x1a547c - 2call UnknownScript_0x1a5550 + scall UnknownScript_0x1a5550 UnknownScript_0x1a547f: ; 0x1a547f askforphonenumber $10 if_equal $1, UnknownScript_0x1a5560 if_equal $2, UnknownScript_0x1a555c trainertotext BUG_CATCHER, WADE1, $0 - 2call UnknownScript_0x1a5554 - 2jump UnknownScript_0x1a5558 + scall UnknownScript_0x1a5554 + jump UnknownScript_0x1a5558 ; 0x1a5493 UnknownScript_0x1a5493: ; 0x1a5493 - 2call UnknownScript_0x1a5564 + scall UnknownScript_0x1a5564 winlosstext Bug_catcherWade1BeatenText, $0000 copybytetovar $d9fa if_equal $4, UnknownScript_0x1a54b2 @@ -137,7 +137,7 @@ UnknownScript_0x1a54fe: ; 0x1a54fe ; 0x1a5507 UnknownScript_0x1a5507: ; 0x1a5507 - 2call UnknownScript_0x1a5568 + scall UnknownScript_0x1a5568 checkevent EVENT_WADE_HAS_BERRY iftrue UnknownScript_0x1a5522 checkevent EVENT_WADE_HAS_PSNCUREBERRY @@ -149,19 +149,19 @@ UnknownScript_0x1a5507: ; 0x1a5507 UnknownScript_0x1a5522: ; 0x1a5522 verbosegiveitem BERRY, 1 iffalse UnknownScript_0x1a5549 - 2jump UnknownScript_0x1a5543 + jump UnknownScript_0x1a5543 ; 0x1a552b UnknownScript_0x1a552b: ; 0x1a552b verbosegiveitem PSNCUREBERRY, 1 iffalse UnknownScript_0x1a5549 - 2jump UnknownScript_0x1a5543 + jump UnknownScript_0x1a5543 ; 0x1a5534 UnknownScript_0x1a5534: ; 0x1a5534 verbosegiveitem PRZCUREBERRY, 1 iffalse UnknownScript_0x1a5549 - 2jump UnknownScript_0x1a5543 + jump UnknownScript_0x1a5543 ; 0x1a553d UnknownScript_0x1a553d: ; 0x1a553d @@ -169,11 +169,11 @@ UnknownScript_0x1a553d: ; 0x1a553d iffalse UnknownScript_0x1a5549 UnknownScript_0x1a5543: ; 0x1a5543 clearflag $007f - 2jump UnknownScript_0x1a5558 + jump UnknownScript_0x1a5558 ; 0x1a5549 UnknownScript_0x1a5549: ; 0x1a5549 - 2jump UnknownScript_0x1a556c + jump UnknownScript_0x1a556c ; 0x1a554c UnknownScript_0x1a554c: ; 0x1a554c @@ -228,30 +228,30 @@ FisherScript_0x1a5570: ; 0x1a5570 iftrue UnknownScript_0x1a55af checkevent EVENT_GOT_KENYA iftrue UnknownScript_0x1a5584 - 2writetext UnknownText_0x1a56d9 + writetext UnknownText_0x1a56d9 closetext loadmovesprites end ; 0x1a5584 UnknownScript_0x1a5584: ; 0x1a5584 - 2writetext UnknownText_0x1a5761 + writetext UnknownText_0x1a5761 keeptextopen checkpokeitem ReceivedSpearowMailText if_equal $0, UnknownScript_0x1a55b5 if_equal $2, UnknownScript_0x1a55c1 if_equal $3, UnknownScript_0x1a55bb if_equal $4, UnknownScript_0x1a55c7 - 2writetext UnknownText_0x1a5790 + writetext UnknownText_0x1a5790 keeptextopen - 2writetext UnknownText_0x1a57ba + writetext UnknownText_0x1a57ba keeptextopen setevent EVENT_GAVE_KENYA verbosegiveitem TM_50, 1 iffalse UnknownScript_0x1a55b3 setevent EVENT_GOT_TM50_NIGHTMARE UnknownScript_0x1a55af: ; 0x1a55af - 2writetext UnknownText_0x1a5896 + writetext UnknownText_0x1a5896 closetext UnknownScript_0x1a55b3: ; 0x1a55b3 loadmovesprites @@ -259,28 +259,28 @@ UnknownScript_0x1a55b3: ; 0x1a55b3 ; 0x1a55b5 UnknownScript_0x1a55b5: ; 0x1a55b5 - 2writetext UnknownText_0x1a5921 + writetext UnknownText_0x1a5921 closetext loadmovesprites end ; 0x1a55bb UnknownScript_0x1a55bb: ; 0x1a55bb - 2writetext UnknownText_0x1a5939 + writetext UnknownText_0x1a5939 closetext loadmovesprites end ; 0x1a55c1 UnknownScript_0x1a55c1: ; 0x1a55c1 - 2writetext UnknownText_0x1a5972 + writetext UnknownText_0x1a5972 closetext loadmovesprites end ; 0x1a55c7 UnknownScript_0x1a55c7: ; 0x1a55c7 - 2writetext UnknownText_0x1a5991 + writetext UnknownText_0x1a5991 closetext loadmovesprites end diff --git a/maps/Route32.asm b/maps/Route32.asm index 62ea20e77..0b37e58ed 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -46,37 +46,37 @@ UnknownScript_0x190470: ; 0x190470 iffalse UnknownScript_0x19049f checkevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE iftrue UnknownScript_0x19048f - 2writetext UnknownText_0x1907ab + writetext UnknownText_0x1907ab closetext loadmovesprites end ; 0x190489 UnknownScript_0x190489: ; 0x190489 - 2writetext UnknownText_0x190820 + writetext UnknownText_0x190820 closetext loadmovesprites end ; 0x19048f UnknownScript_0x19048f: ; 0x19048f - 2writetext UnknownText_0x190925 + writetext UnknownText_0x190925 keeptextopen verbosegiveitem MIRACLE_SEED, 1 iffalse UnknownScript_0x1904a9 setevent EVENT_GOT_MIRACLE_SEED_IN_ROUTE_32 - 2jump UnknownScript_0x1904a5 + jump UnknownScript_0x1904a5 ; 0x19049f UnknownScript_0x19049f: ; 0x19049f - 2writetext UnknownText_0x1908b0 + writetext UnknownText_0x1908b0 closetext loadmovesprites end ; 0x1904a5 UnknownScript_0x1904a5: ; 0x1904a5 - 2writetext UnknownText_0x190a15 + writetext UnknownText_0x190a15 closetext UnknownScript_0x1904a9: ; 0x1904a9 loadmovesprites @@ -87,14 +87,14 @@ UnknownScript_0x1904ab: ; 0x1904ab spriteface $9, $2 spriteface $0, $3 loadfont - 2writetext UnknownText_0x190790 + writetext UnknownText_0x190790 closetext loadmovesprites follow $0, $9 applymovement $0, MovementData_0x190789 stopfollow spriteface $0, $0 - 2call UnknownScript_0x190470 + scall UnknownScript_0x190470 applymovement $9, MovementData_0x19078c applymovement $9, MovementData_0x19078e end @@ -105,13 +105,13 @@ FisherScript_0x1904ce: ; 0x1904ce loadfont checkevent EVENT_GOT_TM05_ROAR iftrue UnknownScript_0x1904e3 - 2writetext UnknownText_0x191133 + writetext UnknownText_0x191133 keeptextopen verbosegiveitem TM_05, 1 iffalse UnknownScript_0x1904e7 setevent EVENT_GOT_TM05_ROAR UnknownScript_0x1904e3: ; 0x1904e3 - 2writetext UnknownText_0x19118c + writetext UnknownText_0x19118c closetext UnknownScript_0x1904e7: ; 0x1904e7 loadmovesprites @@ -121,7 +121,7 @@ UnknownScript_0x1904e7: ; 0x1904e7 UnknownScript_0x1904e9: ; 0x1904e9 spriteface $b, $0 spriteface $0, $1 - 2jump UnknownScript_0x1904f3 + jump UnknownScript_0x1904f3 ; 0x1904f2 FisherScript_0x1904f2: ; 0x1904f2 @@ -129,17 +129,17 @@ FisherScript_0x1904f2: ; 0x1904f2 UnknownScript_0x1904f3: ; 0x1904f3 dotrigger $2 loadfont - 2writetext UnknownText_0x190a59 + writetext UnknownText_0x190a59 yesorno iffalse UnknownScript_0x190503 - 2writetext UnknownText_0x190acf + writetext UnknownText_0x190acf closetext loadmovesprites end ; 0x190503 UnknownScript_0x190503: ; 0x190503 - 2writetext UnknownText_0x190afc + writetext UnknownText_0x190afc closetext loadmovesprites end @@ -168,7 +168,7 @@ TrainerCamperRoland: ; 0x190509 CamperRolandScript: ; 0x190515 talkaftercancel loadfont - 2writetext UnknownText_0x190faa + writetext UnknownText_0x190faa closetext loadmovesprites end @@ -197,7 +197,7 @@ TrainerFisherJustin: ; 0x19051d FisherJustinScript: ; 0x190529 talkaftercancel loadfont - 2writetext UnknownText_0x190b4e + writetext UnknownText_0x190b4e closetext loadmovesprites end @@ -235,26 +235,26 @@ FisherRalph1Script: ; 0x19053d iftrue UnknownScript_0x190603 checkevent $0277 iftrue UnknownScript_0x190566 - 2writetext UnknownText_0x190bf8 + writetext UnknownText_0x190bf8 keeptextopen setevent $0277 - 2call UnknownScript_0x1905f7 - 2jump UnknownScript_0x190569 + scall UnknownScript_0x1905f7 + jump UnknownScript_0x190569 ; 0x190566 UnknownScript_0x190566: ; 0x190566 - 2call UnknownScript_0x1905fb + scall UnknownScript_0x1905fb UnknownScript_0x190569: ; 0x190569 askforphonenumber $11 if_equal $1, UnknownScript_0x19060b if_equal $2, UnknownScript_0x190607 trainertotext FISHER, RALPH1, $0 - 2call UnknownScript_0x1905ff - 2jump UnknownScript_0x190603 + scall UnknownScript_0x1905ff + jump UnknownScript_0x190603 ; 0x19057d UnknownScript_0x19057d: ; 0x19057d - 2call UnknownScript_0x19060f + scall UnknownScript_0x19060f winlosstext FisherRalph1BeatenText, $0000 copybytetovar $d9fb if_equal $4, UnknownScript_0x19059c @@ -319,7 +319,7 @@ UnknownScript_0x1905e8: ; 0x1905e8 ; 0x1905f1 UnknownScript_0x1905f1: ; 0x1905f1 - 2writetext UnknownText_0x190c37 + writetext UnknownText_0x190c37 closetext loadmovesprites end @@ -383,7 +383,7 @@ TrainerFisherHenry: ; 0x190613 FisherHenryScript: ; 0x19061f talkaftercancel loadfont - 2writetext UnknownText_0x190df2 + writetext UnknownText_0x190df2 closetext loadmovesprites end @@ -419,26 +419,26 @@ PicnickerLiz1Script: ; 0x190633 iftrue UnknownScript_0x1906ed checkevent $0279 iftrue UnknownScript_0x190656 - 2writetext UnknownText_0x191060 + writetext UnknownText_0x191060 keeptextopen setevent $0279 - 2call UnknownScript_0x1906e1 - 2jump UnknownScript_0x190659 + scall UnknownScript_0x1906e1 + jump UnknownScript_0x190659 ; 0x190656 UnknownScript_0x190656: ; 0x190656 - 2call UnknownScript_0x1906e5 + scall UnknownScript_0x1906e5 UnknownScript_0x190659: ; 0x190659 askforphonenumber $12 if_equal $1, UnknownScript_0x1906f5 if_equal $2, UnknownScript_0x1906f1 trainertotext PICNICKER, LIZ1, $0 - 2call UnknownScript_0x1906e9 - 2jump UnknownScript_0x1906ed + scall UnknownScript_0x1906e9 + jump UnknownScript_0x1906ed ; 0x19066d UnknownScript_0x19066d: ; 0x19066d - 2call UnknownScript_0x1906f9 + scall UnknownScript_0x1906f9 winlosstext PicnickerLiz1BeatenText, $0000 copybytetovar $d9fc if_equal $4, UnknownScript_0x19068c @@ -560,7 +560,7 @@ TrainerYoungsterAlbert: ; 0x1906fd YoungsterAlbertScript: ; 0x190709 talkaftercancel loadfont - 2writetext UnknownText_0x190e82 + writetext UnknownText_0x190e82 closetext loadmovesprites end @@ -589,7 +589,7 @@ TrainerYoungsterGordon: ; 0x190711 YoungsterGordonScript: ; 0x19071d talkaftercancel loadfont - 2writetext UnknownText_0x190f49 + writetext UnknownText_0x190f49 closetext loadmovesprites end @@ -618,7 +618,7 @@ TrainerBird_keeperPeter: ; 0x190725 Bird_keeperPeterScript: ; 0x190731 talkaftercancel loadfont - 2writetext UnknownText_0x1910d4 + writetext UnknownText_0x1910d4 closetext loadmovesprites end @@ -633,29 +633,29 @@ FriedaScript: if_not_equal FRIDAY, FriedaNotFridayScript checkevent EVENT_MET_FRIEDA_OF_FRIDAY iftrue .MetFrieda - 2writetext MeetFriedaText + writetext MeetFriedaText keeptextopen setevent EVENT_MET_FRIEDA_OF_FRIDAY .MetFrieda - 2writetext FriedaGivesGiftText + writetext FriedaGivesGiftText keeptextopen verbosegiveitem POISON_BARB, 1 iffalse FriedaDoneScript setevent EVENT_GOT_POISON_BARB_FROM_FRIEDA - 2writetext FriedaGaveGiftText + writetext FriedaGaveGiftText closetext loadmovesprites end FriedaFridayScript: - 2writetext FriedaFridayText + writetext FriedaFridayText closetext FriedaDoneScript: loadmovesprites end FriedaNotFridayScript: - 2writetext FriedaNotFridayText + writetext FriedaNotFridayText closetext loadmovesprites end diff --git a/maps/Route32PokeCenter1F.asm b/maps/Route32PokeCenter1F.asm index 886519723..db23b7105 100644 --- a/maps/Route32PokeCenter1F.asm +++ b/maps/Route32PokeCenter1F.asm @@ -15,13 +15,13 @@ FishingGuruScript_0x69b55: ; 0x69b55 loadfont checkevent EVENT_GOT_OLD_ROD iftrue UnknownScript_0x69b7a - 2writetext UnknownText_0x69b83 + writetext UnknownText_0x69b83 yesorno iffalse UnknownScript_0x69b74 - 2writetext UnknownText_0x69be8 + writetext UnknownText_0x69be8 keeptextopen verbosegiveitem OLD_ROD, 1 - 2writetext UnknownText_0x69c1b + writetext UnknownText_0x69c1b closetext loadmovesprites setevent EVENT_GOT_OLD_ROD @@ -29,14 +29,14 @@ FishingGuruScript_0x69b55: ; 0x69b55 ; 0x69b74 UnknownScript_0x69b74: ; 0x69b74 - 2writetext UnknownText_0x69c6c + writetext UnknownText_0x69c6c closetext loadmovesprites end ; 0x69b7a UnknownScript_0x69b7a: ; 0x69b7a - 2writetext UnknownText_0x69c8d + writetext UnknownText_0x69c8d closetext loadmovesprites end diff --git a/maps/Route33.asm b/maps/Route33.asm index a5942f186..c1a4997e6 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -42,26 +42,26 @@ HikerAnthony2Script: ; 0x1ac011 iftrue UnknownScript_0x1ac0d7 checkevent $027b iftrue UnknownScript_0x1ac03a - 2writetext UnknownText_0x1ac153 + writetext UnknownText_0x1ac153 keeptextopen setevent $027b - 2call UnknownScript_0x1ac0cb - 2jump UnknownScript_0x1ac03d + scall UnknownScript_0x1ac0cb + jump UnknownScript_0x1ac03d ; 0x1ac03a UnknownScript_0x1ac03a: ; 0x1ac03a - 2call UnknownScript_0x1ac0cf + scall UnknownScript_0x1ac0cf UnknownScript_0x1ac03d: ; 0x1ac03d askforphonenumber $13 if_equal $1, UnknownScript_0x1ac0df if_equal $2, UnknownScript_0x1ac0db trainertotext HIKER, ANTHONY2, $0 - 2call UnknownScript_0x1ac0d3 - 2jump UnknownScript_0x1ac0d7 + scall UnknownScript_0x1ac0d3 + jump UnknownScript_0x1ac0d7 ; 0x1ac051 UnknownScript_0x1ac051: ; 0x1ac051 - 2call UnknownScript_0x1ac0e3 + scall UnknownScript_0x1ac0e3 winlosstext HikerAnthony2BeatenText, $0000 copybytetovar $d9fd if_equal $4, UnknownScript_0x1ac070 @@ -126,7 +126,7 @@ UnknownScript_0x1ac0bc: ; 0x1ac0bc ; 0x1ac0c5 UnknownScript_0x1ac0c5: ; 0x1ac0c5 - 2writetext UnknownText_0x1ac180 + writetext UnknownText_0x1ac180 closetext loadmovesprites end diff --git a/maps/Route34.asm b/maps/Route34.asm index 6b09fa468..e0f321872 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -15,25 +15,25 @@ UnknownScript_0x78005: ; 0x78005 iftrue UnknownScript_0x78014 clearevent $06e5 setevent $06e6 - 2jump UnknownScript_0x7801d + jump UnknownScript_0x7801d ; 0x78014 UnknownScript_0x78014: ; 0x78014 setevent $06e5 clearevent $06e6 - 2jump UnknownScript_0x7801d + jump UnknownScript_0x7801d ; 0x7801d UnknownScript_0x7801d: ; 0x7801d checkflag $0006 iffalse UnknownScript_0x78029 clearevent $06e7 - 2jump UnknownScript_0x7802f + jump UnknownScript_0x7802f ; 0x78029 UnknownScript_0x78029: ; 0x78029 setevent $06e7 - 2jump UnknownScript_0x7802f + jump UnknownScript_0x7802f ; 0x7802f UnknownScript_0x7802f: ; 0x7802f @@ -118,26 +118,26 @@ CamperTodd1Script: ; 0x7807d iftrue UnknownScript_0x78143 checkevent $027d iftrue UnknownScript_0x780a6 - 2writetext UnknownText_0x784f0 + writetext UnknownText_0x784f0 keeptextopen setevent $027d - 2call UnknownScript_0x78137 - 2jump UnknownScript_0x780a9 + scall UnknownScript_0x78137 + jump UnknownScript_0x780a9 ; 0x780a6 UnknownScript_0x780a6: ; 0x780a6 - 2call UnknownScript_0x7813b + scall UnknownScript_0x7813b UnknownScript_0x780a9: ; 0x780a9 askforphonenumber $14 if_equal $1, UnknownScript_0x7814b if_equal $2, UnknownScript_0x78147 trainertotext CAMPER, TODD1, $0 - 2call UnknownScript_0x7813f - 2jump UnknownScript_0x78143 + scall UnknownScript_0x7813f + jump UnknownScript_0x78143 ; 0x780bd UnknownScript_0x780bd: ; 0x780bd - 2call UnknownScript_0x7814f + scall UnknownScript_0x7814f winlosstext CamperTodd1BeatenText, $0000 copybytetovar $d9fe if_equal $4, UnknownScript_0x780dc @@ -202,7 +202,7 @@ UnknownScript_0x78128: ; 0x78128 ; 0x78131 UnknownScript_0x78131: ; 0x78131 - 2writetext UnknownText_0x78532 + writetext UnknownText_0x78532 closetext loadmovesprites end @@ -275,26 +275,26 @@ PicnickerGina1Script: ; 0x7815f iftrue UnknownScript_0x78234 checkevent $027f iftrue UnknownScript_0x78188 - 2writetext UnknownText_0x785b8 + writetext UnknownText_0x785b8 keeptextopen setevent $027f - 2call UnknownScript_0x78228 - 2jump UnknownScript_0x7818b + scall UnknownScript_0x78228 + jump UnknownScript_0x7818b ; 0x78188 UnknownScript_0x78188: ; 0x78188 - 2call UnknownScript_0x7822c + scall UnknownScript_0x7822c UnknownScript_0x7818b: ; 0x7818b askforphonenumber $15 if_equal $1, UnknownScript_0x7823c if_equal $2, UnknownScript_0x78238 trainertotext PICNICKER, GINA1, $0 - 2call UnknownScript_0x78230 - 2jump UnknownScript_0x78234 + scall UnknownScript_0x78230 + jump UnknownScript_0x78234 ; 0x7819f UnknownScript_0x7819f: ; 0x7819f - 2call UnknownScript_0x78240 + scall UnknownScript_0x78240 winlosstext PicnickerGina1BeatenText, $0000 copybytetovar $d9ff if_equal $4, UnknownScript_0x781be @@ -359,16 +359,16 @@ UnknownScript_0x7820a: ; 0x7820a ; 0x78213 UnknownScript_0x78213: ; 0x78213 - 2call UnknownScript_0x78244 + scall UnknownScript_0x78244 verbosegiveitem LEAF_STONE, 1 iffalse UnknownScript_0x78225 clearflag $0080 setevent $0100 - 2jump UnknownScript_0x78234 + jump UnknownScript_0x78234 ; 0x78225 UnknownScript_0x78225: ; 0x78225 - 2jump UnknownScript_0x78248 + jump UnknownScript_0x78248 ; 0x78228 UnknownScript_0x78228: ; 0x78228 @@ -424,7 +424,7 @@ OfficerScript_0x7824c: ; 0x7824c checkevent $0546 iftrue UnknownScript_0x78270 playmusic MUSIC_OFFICER_ENCOUNTER - 2writetext UnknownText_0x785e4 + writetext UnknownText_0x785e4 closetext loadmovesprites winlosstext UnknownText_0x78609, $0000 @@ -437,14 +437,14 @@ OfficerScript_0x7824c: ; 0x7824c ; 0x78270 UnknownScript_0x78270: ; 0x78270 - 2writetext UnknownText_0x78624 + writetext UnknownText_0x78624 closetext loadmovesprites end ; 0x78276 UnknownScript_0x78276: ; 0x78276 - 2writetext UnknownText_0x7866a + writetext UnknownText_0x7866a closetext loadmovesprites end @@ -473,7 +473,7 @@ TrainerYoungsterSamuel: ; 0x7827c YoungsterSamuelScript: ; 0x78288 talkaftercancel loadfont - 2writetext UnknownText_0x783d8 + writetext UnknownText_0x783d8 closetext loadmovesprites end @@ -502,7 +502,7 @@ TrainerYoungsterIan: ; 0x78290 YoungsterIanScript: ; 0x7829c talkaftercancel loadfont - 2writetext UnknownText_0x78469 + writetext UnknownText_0x78469 closetext loadmovesprites end @@ -531,7 +531,7 @@ TrainerPokefanmBrandon: ; 0x782a4 PokefanmBrandonScript: ; 0x782b0 talkaftercancel loadfont - 2writetext UnknownText_0x786fc + writetext UnknownText_0x786fc closetext loadmovesprites end @@ -562,14 +562,14 @@ CooltrainerfIreneScript: ; 0x782c4 loadfont checkevent EVENT_GOT_SOFT_SAND_FROM_KATE iftrue UnknownScript_0x782d2 - 2writetext UnknownText_0x7877f + writetext UnknownText_0x7877f closetext loadmovesprites end ; 0x782d2 UnknownScript_0x782d2: ; 0x782d2 - 2writetext UnknownText_0x787ad + writetext UnknownText_0x787ad closetext loadmovesprites end @@ -600,14 +600,14 @@ CooltrainerfJennScript: ; 0x782e4 loadfont checkevent EVENT_GOT_SOFT_SAND_FROM_KATE iftrue UnknownScript_0x782f2 - 2writetext UnknownText_0x78836 + writetext UnknownText_0x78836 closetext loadmovesprites end ; 0x782f2 UnknownScript_0x782f2: ; 0x782f2 - 2writetext UnknownText_0x78866 + writetext UnknownText_0x78866 closetext loadmovesprites end @@ -638,13 +638,13 @@ CooltrainerfKateScript: ; 0x78304 loadfont checkevent EVENT_GOT_SOFT_SAND_FROM_KATE iftrue UnknownScript_0x78319 - 2writetext UnknownText_0x788e2 + writetext UnknownText_0x788e2 keeptextopen verbosegiveitem SOFT_SAND, 1 iffalse UnknownScript_0x7831d setevent EVENT_GOT_SOFT_SAND_FROM_KATE UnknownScript_0x78319: ; 0x78319 - 2writetext UnknownText_0x7892b + writetext UnknownText_0x7892b closetext UnknownScript_0x7831d: ; 0x7831d loadmovesprites diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index 0cd5d187e..e4225f78f 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -35,7 +35,7 @@ UnknownScript_0x62d3d: ; 0x62d3d stopfollow spriteface $0, $0 loadfont - 2writetext UnknownText_0x62e41 + writetext UnknownText_0x62e41 closetext loadmovesprites applymovement $5, MovementData_0x62d9a @@ -50,13 +50,13 @@ TeacherScript_0x62d63: ; 0x62d63 iftrue UnknownScript_0x62d84 checkevent EVENT_GOT_TM12_SWEET_SCENT iftrue UnknownScript_0x62d7e - 2writetext UnknownText_0x62d9d + writetext UnknownText_0x62d9d keeptextopen verbosegiveitem TM_12, 1 iffalse UnknownScript_0x62d82 setevent EVENT_GOT_TM12_SWEET_SCENT UnknownScript_0x62d7e: ; 0x62d7e - 2writetext UnknownText_0x62df6 + writetext UnknownText_0x62df6 closetext UnknownScript_0x62d82: ; 0x62d82 loadmovesprites @@ -64,7 +64,7 @@ UnknownScript_0x62d82: ; 0x62d82 ; 0x62d84 UnknownScript_0x62d84: ; 0x62d84 - 2writetext UnknownText_0x62e41 + writetext UnknownText_0x62e41 keeptextopen loadmovesprites end @@ -72,7 +72,7 @@ UnknownScript_0x62d84: ; 0x62d84 ButterfreeScript_0x62d8a: ; 0x62d8a loadfont - 2writetext UnknownText_0x62e83 + writetext UnknownText_0x62e83 cry BUTTERFREE closetext loadmovesprites diff --git a/maps/Route35.asm b/maps/Route35.asm index ec3366a2f..1eacf18bc 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -29,7 +29,7 @@ TrainerBird_keeperBryan: ; 0x19c8af Bird_keeperBryanScript: ; 0x19c8bb talkaftercancel loadfont - 2writetext UnknownText_0x19cc87 + writetext UnknownText_0x19cc87 closetext loadmovesprites end @@ -63,22 +63,22 @@ JugglerIrwin1Script: ; 0x19c8cf iftrue UnknownScript_0x19c90f checkevent $0281 iftrue UnknownScript_0x19c8ec - 2writetext UnknownText_0x19cd5a + writetext UnknownText_0x19cd5a keeptextopen setevent $0281 - 2call UnknownScript_0x19c903 - 2jump UnknownScript_0x19c8ef + scall UnknownScript_0x19c903 + jump UnknownScript_0x19c8ef ; 0x19c8ec UnknownScript_0x19c8ec: ; 0x19c8ec - 2call UnknownScript_0x19c907 + scall UnknownScript_0x19c907 UnknownScript_0x19c8ef: ; 0x19c8ef askforphonenumber $16 if_equal $1, UnknownScript_0x19c917 if_equal $2, UnknownScript_0x19c913 trainertotext JUGGLER, IRWIN1, $0 - 2call UnknownScript_0x19c90b - 2jump UnknownScript_0x19c90f + scall UnknownScript_0x19c90b + jump UnknownScript_0x19c90f ; 0x19c903 UnknownScript_0x19c903: ; 0x19c903 @@ -139,7 +139,7 @@ TrainerCamperIvan: ; 0x19c91f CamperIvanScript: ; 0x19c92b talkaftercancel loadfont - 2writetext UnknownText_0x19cac4 + writetext UnknownText_0x19cac4 closetext loadmovesprites end @@ -168,7 +168,7 @@ TrainerCamperElliot: ; 0x19c933 CamperElliotScript: ; 0x19c93f talkaftercancel loadfont - 2writetext UnknownText_0x19cb47 + writetext UnknownText_0x19cb47 closetext loadmovesprites end @@ -197,7 +197,7 @@ TrainerPicnickerBrooke: ; 0x19c947 PicnickerBrookeScript: ; 0x19c953 talkaftercancel loadfont - 2writetext UnknownText_0x19cbba + writetext UnknownText_0x19cbba closetext loadmovesprites end @@ -226,7 +226,7 @@ TrainerPicnickerKim: ; 0x19c95b PicnickerKimScript: ; 0x19c967 talkaftercancel loadfont - 2writetext UnknownText_0x19cc21 + writetext UnknownText_0x19cc21 closetext loadmovesprites end @@ -264,26 +264,26 @@ Bug_catcherArnie1Script: ; 0x19c97b iftrue UnknownScript_0x19c90f checkevent $0283 iftrue UnknownScript_0x19c9a4 - 2writetext UnknownText_0x19cdf6 + writetext UnknownText_0x19cdf6 keeptextopen setevent $0283 - 2call UnknownScript_0x19c903 - 2jump UnknownScript_0x19c9a7 + scall UnknownScript_0x19c903 + jump UnknownScript_0x19c9a7 ; 0x19c9a4 UnknownScript_0x19c9a4: ; 0x19c9a4 - 2call UnknownScript_0x19c907 + scall UnknownScript_0x19c907 UnknownScript_0x19c9a7: ; 0x19c9a7 askforphonenumber $17 if_equal $1, UnknownScript_0x19c917 if_equal $2, UnknownScript_0x19c913 trainertotext BUG_CATCHER, ARNIE1, $0 - 2call UnknownScript_0x19c90b - 2jump UnknownScript_0x19c90f + scall UnknownScript_0x19c90b + jump UnknownScript_0x19c90f ; 0x19c9bb UnknownScript_0x19c9bb: ; 0x19c9bb - 2call UnknownScript_0x19c91b + scall UnknownScript_0x19c91b winlosstext Bug_catcherArnie1BeatenText, $0000 copybytetovar $da01 if_equal $4, UnknownScript_0x19c9da @@ -348,7 +348,7 @@ UnknownScript_0x19ca26: ; 0x19ca26 ; 0x19ca2f UnknownScript_0x19ca2f: ; 0x19ca2f - 2writetext UnknownText_0x19ce38 + writetext UnknownText_0x19ce38 closetext loadmovesprites end @@ -377,7 +377,7 @@ TrainerFirebreatherWalt: ; 0x19ca35 FirebreatherWaltScript: ; 0x19ca41 talkaftercancel loadfont - 2writetext UnknownText_0x19cebc + writetext UnknownText_0x19cebc closetext loadmovesprites end @@ -391,7 +391,7 @@ OfficerScript_0x19ca49: ; 0x19ca49 checkevent $0547 iftrue UnknownScript_0x19ca6d playmusic MUSIC_OFFICER_ENCOUNTER - 2writetext UnknownText_0x19ceea + writetext UnknownText_0x19ceea closetext loadmovesprites winlosstext UnknownText_0x19cf06, $0000 @@ -404,14 +404,14 @@ OfficerScript_0x19ca49: ; 0x19ca49 ; 0x19ca6d UnknownScript_0x19ca6d: ; 0x19ca6d - 2writetext UnknownText_0x19cf0f + writetext UnknownText_0x19cf0f closetext loadmovesprites end ; 0x19ca73 UnknownScript_0x19ca73: ; 0x19ca73 - 2writetext UnknownText_0x19cf56 + writetext UnknownText_0x19cf56 closetext loadmovesprites end diff --git a/maps/Route35Goldenrodgate.asm b/maps/Route35Goldenrodgate.asm index 6a619d091..271b09614 100644 --- a/maps/Route35Goldenrodgate.asm +++ b/maps/Route35Goldenrodgate.asm @@ -15,49 +15,49 @@ OfficerScript_0x69d37: ; 0x69d37 iftrue UnknownScript_0x69d85 checkevent EVENT_GOT_KENYA iftrue UnknownScript_0x69d73 - 2writetext UnknownText_0x69ddd + writetext UnknownText_0x69ddd yesorno iffalse UnknownScript_0x69d7f - 2writetext UnknownText_0x69e48 + writetext UnknownText_0x69e48 keeptextopen waitbutton checkcode $1 if_equal $6, UnknownScript_0x69d79 - 2writetext UnknownText_0x69eb8 + writetext UnknownText_0x69eb8 playsound SFX_KEY_ITEM waitbutton givepoke SPEAROW, 10, 0, 1, GiftSpearowName, GiftSpearowOTName givepokeitem GiftSpearowMail setevent EVENT_GOT_KENYA UnknownScript_0x69d73: ; 0x69d73 - 2writetext UnknownText_0x69ed6 + writetext UnknownText_0x69ed6 closetext loadmovesprites end ; 0x69d79 UnknownScript_0x69d79: ; 0x69d79 - 2writetext UnknownText_0x69f56 + writetext UnknownText_0x69f56 closetext loadmovesprites end ; 0x69d7f UnknownScript_0x69d7f: ; 0x69d7f - 2writetext UnknownText_0x69f74 + writetext UnknownText_0x69f74 closetext loadmovesprites end ; 0x69d85 UnknownScript_0x69d85: ; 0x69d85 - 2writetext UnknownText_0x69f8b + writetext UnknownText_0x69f8b keeptextopen verbosegiveitem HP_UP, 1 iffalse UnknownScript_0x69d96 setevent EVENT_GOT_HP_UP_FROM_RANDY UnknownScript_0x69d92: ; 0x69d92 - 2writetext UnknownText_0x69fd9 + writetext UnknownText_0x69fd9 closetext UnknownScript_0x69d96: ; 0x69d96 loadmovesprites @@ -79,14 +79,14 @@ PokefanFScript_0x69dc6: ; 0x69dc6 loadfont checkevent EVENT_FOUGHT_SUDOWOODO iftrue UnknownScript_0x69dd4 - 2writetext UnknownText_0x6a00a + writetext UnknownText_0x6a00a closetext loadmovesprites end ; 0x69dd4 UnknownScript_0x69dd4: ; 0x69dd4 - 2writetext UnknownText_0x6a09a + writetext UnknownText_0x6a09a closetext loadmovesprites end diff --git a/maps/Route35NationalParkgate.asm b/maps/Route35NationalParkgate.asm index 073648aeb..7e393a2cd 100644 --- a/maps/Route35NationalParkgate.asm +++ b/maps/Route35NationalParkgate.asm @@ -69,20 +69,20 @@ UnknownScript_0x6a1d1: ; 0x6a1d1 checkcode $11 addvar $1 RAM2MEM $0 - 2writetext UnknownText_0x6a79a + writetext UnknownText_0x6a79a yesorno iffalse UnknownScript_0x6a1ee - 2writetext UnknownText_0x6a7db + writetext UnknownText_0x6a7db closetext loadmovesprites jumpstd $0016 ; 0x6a1ee UnknownScript_0x6a1ee: ; 0x6a1ee - 2writetext UnknownText_0x6a823 + writetext UnknownText_0x6a823 closetext loadmovesprites - 2call UnknownScript_0x6a261 + scall UnknownScript_0x6a261 playsound SFX_ENTER_DOOR special $002e waitbutton @@ -100,8 +100,8 @@ OfficerScript_0x6a204: ; 0x6a204 loadfont checkflag $0051 iftrue UnknownScript_0x6a2c1 - 2call UnknownScript_0x6a2de - 2writetext UnknownText_0x6a2eb + scall UnknownScript_0x6a2de + writetext UnknownText_0x6a2eb yesorno iffalse UnknownScript_0x6a2a3 checkcode $1 @@ -111,16 +111,16 @@ OfficerScript_0x6a204: ; 0x6a204 UnknownScript_0x6a234: ; 0x6a234 setflag $0011 special $003c - 2writetext UnknownText_0x6a39d + writetext UnknownText_0x6a39d keeptextopen - 2writetext UnknownText_0x6a3c7 + writetext UnknownText_0x6a3c7 playsound SFX_ITEM waitbutton - 2writetext UnknownText_0x6a3e2 + writetext UnknownText_0x6a3e2 closetext loadmovesprites special $0018 - 2call UnknownScript_0x6a261 + scall UnknownScript_0x6a261 playsound SFX_ENTER_DOOR special $002e waitbutton @@ -150,58 +150,58 @@ UnknownScript_0x6a271: ; 0x6a271 UnknownScript_0x6a27d: ; 6a27d special $005a if_equal $1, UnknownScript_0x6a2bb - 2writetext UnknownText_0x6a4c6 + writetext UnknownText_0x6a4c6 yesorno iffalse UnknownScript_0x6a2a9 special $0016 iftrue UnknownScript_0x6a2af setevent $0308 - 2writetext UnknownText_0x6a537 + writetext UnknownText_0x6a537 keeptextopen - 2writetext UnknownText_0x6a56b + writetext UnknownText_0x6a56b playsound SFX_GOT_SAFARI_BALLS waitbutton keeptextopen - 2jump UnknownScript_0x6a234 + jump UnknownScript_0x6a234 ; 0x6a2a3 UnknownScript_0x6a2a3: ; 0x6a2a3 - 2writetext UnknownText_0x6a5dc + writetext UnknownText_0x6a5dc closetext loadmovesprites end ; 0x6a2a9 UnknownScript_0x6a2a9: ; 0x6a2a9 - 2writetext UnknownText_0x6a597 + writetext UnknownText_0x6a597 closetext loadmovesprites end ; 0x6a2af UnknownScript_0x6a2af: ; 0x6a2af - 2writetext UnknownText_0x6a608 + writetext UnknownText_0x6a608 closetext loadmovesprites end ; 0x6a2b5 UnknownScript_0x6a2b5: ; 0x6a2b5 - 2writetext UnknownText_0x6a67c + writetext UnknownText_0x6a67c closetext loadmovesprites end ; 0x6a2bb UnknownScript_0x6a2bb: ; 0x6a2bb - 2writetext UnknownText_0x6a71f + writetext UnknownText_0x6a71f closetext loadmovesprites end ; 0x6a2c1 UnknownScript_0x6a2c1: ; 0x6a2c1 - 2writetext UnknownText_0x6a84f + writetext UnknownText_0x6a84f closetext loadmovesprites end @@ -216,7 +216,7 @@ OfficerScript_0x6a2ca: ; 0x6a2ca loadfont checkflag $0051 iftrue UnknownScript_0x6a2c1 - 2writetext UnknownText_0x6a894 + writetext UnknownText_0x6a894 closetext loadmovesprites end diff --git a/maps/Route36.asm b/maps/Route36.asm index e95ff6d4e..0e25bcbd1 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -57,7 +57,7 @@ WeirdTreeScript_0x19403c: ; 0x19403c UnknownScript_0x19404a: ; 0x19404a loadfont - 2writetext UnknownText_0x19426b + writetext UnknownText_0x19426b yesorno iffalse UnknownScript_0x194079 loadmovesprites @@ -66,14 +66,14 @@ UnknownScript_0x19404a: ; 0x19404a WateredWeirdTreeScript:: ; 0x194053 loadfont - 2writetext UnknownText_0x194290 + writetext UnknownText_0x194290 closetext loadmovesprites waitbutton playsound SFX_SANDSTORM applymovement $4, MovementData_0x194249 loadfont - 2writetext UnknownText_0x1942aa + writetext UnknownText_0x1942aa closetext loadmovesprites loadpokedata SUDOWOODO, 20 @@ -107,7 +107,7 @@ LassScript_0x19408c: ; 0x19408c checkevent $00ba iftrue UnknownScript_0x1940b3 setevent $00b9 - 2writetext UnknownText_0x1942f1 + writetext UnknownText_0x1942f1 closetext loadmovesprites clearevent $0768 @@ -125,7 +125,7 @@ UnknownScript_0x1940ac: ; 0x1940ac ; 0x1940b3 UnknownScript_0x1940b3: ; 0x1940b3 - 2writetext UnknownText_0x1943ed + writetext UnknownText_0x1943ed closetext loadmovesprites end @@ -138,20 +138,20 @@ FisherScript_0x1940b9: ; 0x1940b9 iftrue UnknownScript_0x1940da checkevent EVENT_FOUGHT_SUDOWOODO iftrue UnknownScript_0x1940cd - 2writetext UnknownText_0x19446f + writetext UnknownText_0x19446f closetext loadmovesprites end ; 0x1940cd UnknownScript_0x1940cd: ; 0x1940cd - 2writetext UnknownText_0x1944d0 + writetext UnknownText_0x1944d0 keeptextopen verbosegiveitem TM_08, 1 iffalse UnknownScript_0x1940de setevent EVENT_GOT_TM08_ROCK_SMASH UnknownScript_0x1940da: ; 0x1940da - 2writetext UnknownText_0x19452c + writetext UnknownText_0x19452c closetext UnknownScript_0x1940de: ; 0x1940de loadmovesprites @@ -163,14 +163,14 @@ LassScript_0x1940e0: ; 0x1940e0 loadfont checkevent EVENT_FOUGHT_SUDOWOODO iftrue UnknownScript_0x1940ee - 2writetext UnknownText_0x194626 + writetext UnknownText_0x194626 closetext loadmovesprites end ; 0x1940ee UnknownScript_0x1940ee: ; 0x1940ee - 2writetext UnknownText_0x19469e + writetext UnknownText_0x19469e closetext loadmovesprites end @@ -208,26 +208,26 @@ SchoolboyAlan1Script: ; 0x194100 iftrue UnknownScript_0x1941d5 checkevent $0285 iftrue UnknownScript_0x194129 - 2writetext UnknownText_0x1947aa + writetext UnknownText_0x1947aa keeptextopen setevent $0285 - 2call UnknownScript_0x1941c9 - 2jump UnknownScript_0x19412c + scall UnknownScript_0x1941c9 + jump UnknownScript_0x19412c ; 0x194129 UnknownScript_0x194129: ; 0x194129 - 2call UnknownScript_0x1941cd + scall UnknownScript_0x1941cd UnknownScript_0x19412c: ; 0x19412c askforphonenumber $18 if_equal $1, UnknownScript_0x1941dd if_equal $2, UnknownScript_0x1941d9 trainertotext SCHOOLBOY, ALAN1, $0 - 2call UnknownScript_0x1941d1 - 2jump UnknownScript_0x1941d5 + scall UnknownScript_0x1941d1 + jump UnknownScript_0x1941d5 ; 0x194140 UnknownScript_0x194140: ; 0x194140 - 2call UnknownScript_0x1941e1 + scall UnknownScript_0x1941e1 winlosstext SchoolboyAlan1BeatenText, $0000 copybytetovar $da02 if_equal $4, UnknownScript_0x19415f @@ -292,16 +292,16 @@ UnknownScript_0x1941ab: ; 0x1941ab ; 0x1941b4 UnknownScript_0x1941b4: ; 0x1941b4 - 2call UnknownScript_0x1941e5 + scall UnknownScript_0x1941e5 verbosegiveitem FIRE_STONE, 1 iffalse UnknownScript_0x1941c6 clearflag $0081 setevent $0101 - 2jump UnknownScript_0x1941d5 + jump UnknownScript_0x1941d5 ; 0x1941c6 UnknownScript_0x1941c6: ; 0x1941c6 - 2jump UnknownScript_0x1941e9 + jump UnknownScript_0x1941e9 ; 0x1941c9 UnknownScript_0x1941c9: ; 0x1941c9 @@ -372,7 +372,7 @@ TrainerPsychicMark: ; 0x1941ed PsychicMarkScript: ; 0x1941f9 talkaftercancel loadfont - 2writetext UnknownText_0x19471e + writetext UnknownText_0x19471e closetext loadmovesprites end @@ -387,29 +387,29 @@ ArthurScript: if_not_equal THURSDAY, ArthurNotThursdayScript checkevent EVENT_MET_ARTHUR_OF_THURSDAY iftrue .MetArthur - 2writetext MeetArthurText + writetext MeetArthurText keeptextopen setevent EVENT_MET_ARTHUR_OF_THURSDAY .MetArthur - 2writetext ArthurGivesGiftText + writetext ArthurGivesGiftText keeptextopen verbosegiveitem HARD_STONE, 1 iffalse ArthurDoneScript setevent EVENT_GOT_HARD_STONE_FROM_ARTHUR - 2writetext ArthurGaveGiftText + writetext ArthurGaveGiftText closetext loadmovesprites end ArthurThursdayScript: - 2writetext ArthurThursdayText + writetext ArthurThursdayText closetext ArthurDoneScript: loadmovesprites end ArthurNotThursdayScript: - 2writetext ArthurNotThursdayText + writetext ArthurNotThursdayText closetext loadmovesprites end diff --git a/maps/Route36NationalParkgate.asm b/maps/Route36NationalParkgate.asm index 1a62b0100..ed4813626 100644 --- a/maps/Route36NationalParkgate.asm +++ b/maps/Route36NationalParkgate.asm @@ -69,15 +69,15 @@ UnknownScript_0x6ab47: ; 0x6ab47 checkcode $11 addvar $1 RAM2MEM $0 - 2writetext UnknownText_0x6b284 + writetext UnknownText_0x6b284 yesorno iffalse UnknownScript_0x6ab76 - 2writetext UnknownText_0x6b2c5 + writetext UnknownText_0x6b2c5 closetext loadmovesprites special $0030 special $0033 - 2call UnknownScript_0x6ab8c + scall UnknownScript_0x6ab8c disappear $2 appear $d applymovement $0, MovementData_0x6add1 @@ -87,7 +87,7 @@ UnknownScript_0x6ab47: ; 0x6ab47 ; 0x6ab76 UnknownScript_0x6ab76: ; 0x6ab76 - 2writetext UnknownText_0x6b300 + writetext UnknownText_0x6b300 closetext loadmovesprites spriteface $0, $2 @@ -153,8 +153,8 @@ OfficerScript_0x6abe0: ; 0x6abe0 loadfont checkflag $0051 iftrue UnknownScript_0x6ac91 - 2call UnknownScript_0x6ad02 - 2writetext UnknownText_0x6add5 + scall UnknownScript_0x6ad02 + writetext UnknownText_0x6add5 yesorno iffalse UnknownScript_0x6ac73 checkcode $1 @@ -164,13 +164,13 @@ OfficerScript_0x6abe0: ; 0x6abe0 UnknownScript_0x6ac10: ; 0x6ac10 setflag $0011 special $003c - 2writetext UnknownText_0x6ae87 + writetext UnknownText_0x6ae87 keeptextopen waitbutton - 2writetext UnknownText_0x6aeb1 + writetext UnknownText_0x6aeb1 playsound SFX_ITEM waitbutton - 2writetext UnknownText_0x6aecc + writetext UnknownText_0x6aecc closetext loadmovesprites setflag $0011 @@ -192,51 +192,51 @@ UnknownScript_0x6ac41: ; 0x6ac41 UnknownScript_0x6ac4d: ; 0x6ac4d special $005a if_equal $1, UnknownScript_0x6ac8b - 2writetext UnknownText_0x6afb0 + writetext UnknownText_0x6afb0 yesorno iffalse UnknownScript_0x6ac79 special $0016 iftrue UnknownScript_0x6ac7f setevent $0308 - 2writetext UnknownText_0x6b021 + writetext UnknownText_0x6b021 keeptextopen - 2writetext UnknownText_0x6b055 + writetext UnknownText_0x6b055 playsound SFX_GOT_SAFARI_BALLS waitbutton keeptextopen - 2jump UnknownScript_0x6ac10 + jump UnknownScript_0x6ac10 ; 0x6ac73 UnknownScript_0x6ac73: ; 0x6ac73 - 2writetext UnknownText_0x6b0c6 + writetext UnknownText_0x6b0c6 closetext loadmovesprites end ; 0x6ac79 UnknownScript_0x6ac79: ; 0x6ac79 - 2writetext UnknownText_0x6b081 + writetext UnknownText_0x6b081 closetext loadmovesprites end ; 0x6ac7f UnknownScript_0x6ac7f: ; 0x6ac7f - 2writetext UnknownText_0x6b0f2 + writetext UnknownText_0x6b0f2 closetext loadmovesprites end ; 0x6ac85 UnknownScript_0x6ac85: ; 0x6ac85 - 2writetext UnknownText_0x6b166 + writetext UnknownText_0x6b166 closetext loadmovesprites end ; 0x6ac8b UnknownScript_0x6ac8b: ; 0x6ac8b - 2writetext UnknownText_0x6b209 + writetext UnknownText_0x6b209 closetext loadmovesprites end @@ -251,14 +251,14 @@ UnknownScript_0x6ac91: ; 0x6ac91 iftrue UnknownScript_0x6accd checkevent $0316 iftrue UnknownScript_0x6acdc - 2writetext UnknownText_0x6b32b + writetext UnknownText_0x6b32b closetext loadmovesprites end ; 0x6acaf UnknownScript_0x6acaf: ; 0x6acaf - 2writetext UnknownText_0x6b97f + writetext UnknownText_0x6b97f keeptextopen verbosegiveitem SUN_STONE, 1 iffalse UnknownScript_0x6aceb @@ -268,7 +268,7 @@ UnknownScript_0x6acaf: ; 0x6acaf ; 0x6acbe UnknownScript_0x6acbe: ; 0x6acbe - 2writetext UnknownText_0x6b97f + writetext UnknownText_0x6b97f keeptextopen verbosegiveitem EVERSTONE, 1 iffalse UnknownScript_0x6aceb @@ -278,7 +278,7 @@ UnknownScript_0x6acbe: ; 0x6acbe ; 0x6accd UnknownScript_0x6accd: ; 0x6accd - 2writetext UnknownText_0x6b97f + writetext UnknownText_0x6b97f keeptextopen verbosegiveitem GOLD_BERRY, 1 iffalse UnknownScript_0x6aceb @@ -288,7 +288,7 @@ UnknownScript_0x6accd: ; 0x6accd ; 0x6acdc UnknownScript_0x6acdc: ; 0x6acdc - 2writetext UnknownText_0x6b97f + writetext UnknownText_0x6b97f keeptextopen verbosegiveitem BERRY, 1 iffalse UnknownScript_0x6aceb @@ -298,7 +298,7 @@ UnknownScript_0x6acdc: ; 0x6acdc ; 0x6aceb UnknownScript_0x6aceb: ; 0x6aceb - 2writetext UnknownText_0x6b910 + writetext UnknownText_0x6b910 closetext loadmovesprites end @@ -313,7 +313,7 @@ OfficerScript_0x6acf4: ; 0x6acf4 loadfont checkflag $0051 iftrue UnknownScript_0x6ac91 - 2writetext UnknownText_0x6b370 + writetext UnknownText_0x6b370 closetext loadmovesprites end @@ -329,14 +329,14 @@ YoungsterScript_0x6ad06: ; 0x6ad06 loadfont checkevent $0000 iffalse UnknownScript_0x6ad14 - 2writetext UnknownText_0x6b399 + writetext UnknownText_0x6b399 closetext loadmovesprites end ; 0x6ad14 UnknownScript_0x6ad14: ; 0x6ad14 - 2writetext UnknownText_0x6b3c4 + writetext UnknownText_0x6b3c4 closetext loadmovesprites end @@ -347,14 +347,14 @@ YoungsterScript_0x6ad1a: ; 0x6ad1a loadfont checkevent $0000 iffalse UnknownScript_0x6ad28 - 2writetext UnknownText_0x6b40f + writetext UnknownText_0x6b40f closetext loadmovesprites end ; 0x6ad28 UnknownScript_0x6ad28: ; 0x6ad28 - 2writetext UnknownText_0x6b440 + writetext UnknownText_0x6b440 closetext loadmovesprites end @@ -365,14 +365,14 @@ RockerScript_0x6ad2e: ; 0x6ad2e loadfont checkevent $0000 iffalse UnknownScript_0x6ad3c - 2writetext UnknownText_0x6b462 + writetext UnknownText_0x6b462 closetext loadmovesprites end ; 0x6ad3c UnknownScript_0x6ad3c: ; 0x6ad3c - 2writetext UnknownText_0x6b496 + writetext UnknownText_0x6b496 closetext loadmovesprites end @@ -383,14 +383,14 @@ PokefanMScript_0x6ad42: ; 0x6ad42 loadfont checkevent $0000 iffalse UnknownScript_0x6ad50 - 2writetext UnknownText_0x6b4da + writetext UnknownText_0x6b4da closetext loadmovesprites end ; 0x6ad50 UnknownScript_0x6ad50: ; 0x6ad50 - 2writetext UnknownText_0x6b50a + writetext UnknownText_0x6b50a closetext loadmovesprites end @@ -401,14 +401,14 @@ YoungsterScript_0x6ad56: ; 0x6ad56 loadfont checkevent $0000 iffalse UnknownScript_0x6ad64 - 2writetext UnknownText_0x6b54e + writetext UnknownText_0x6b54e closetext loadmovesprites end ; 0x6ad64 UnknownScript_0x6ad64: ; 0x6ad64 - 2writetext UnknownText_0x6b57c + writetext UnknownText_0x6b57c closetext loadmovesprites end @@ -419,14 +419,14 @@ YoungsterScript_0x6ad6a: ; 0x6ad6a loadfont checkevent $0000 iffalse UnknownScript_0x6ad78 - 2writetext UnknownText_0x6b5b0 + writetext UnknownText_0x6b5b0 closetext loadmovesprites end ; 0x6ad78 UnknownScript_0x6ad78: ; 0x6ad78 - 2writetext UnknownText_0x6b5dd + writetext UnknownText_0x6b5dd closetext loadmovesprites end @@ -437,14 +437,14 @@ LassScript_0x6ad7e: ; 0x6ad7e loadfont checkevent $0000 iffalse UnknownScript_0x6ad8c - 2writetext UnknownText_0x6b64b + writetext UnknownText_0x6b64b closetext loadmovesprites end ; 0x6ad8c UnknownScript_0x6ad8c: ; 0x6ad8c - 2writetext UnknownText_0x6b698 + writetext UnknownText_0x6b698 closetext loadmovesprites end @@ -455,14 +455,14 @@ YoungsterScript_0x6ad92: ; 0x6ad92 loadfont checkevent $0000 iffalse UnknownScript_0x6ada0 - 2writetext UnknownText_0x6b6b8 + writetext UnknownText_0x6b6b8 closetext loadmovesprites end ; 0x6ada0 UnknownScript_0x6ada0: ; 0x6ada0 - 2writetext UnknownText_0x6b6e9 + writetext UnknownText_0x6b6e9 closetext loadmovesprites end @@ -473,14 +473,14 @@ YoungsterScript_0x6ada6: ; 0x6ada6 loadfont checkevent $0000 iffalse UnknownScript_0x6adb4 - 2writetext UnknownText_0x6b71b + writetext UnknownText_0x6b71b closetext loadmovesprites end ; 0x6adb4 UnknownScript_0x6adb4: ; 0x6adb4 - 2writetext UnknownText_0x6b740 + writetext UnknownText_0x6b740 closetext loadmovesprites end @@ -491,14 +491,14 @@ YoungsterScript_0x6adba: ; 0x6adba loadfont checkevent $0000 iffalse UnknownScript_0x6adc8 - 2writetext UnknownText_0x6b76f + writetext UnknownText_0x6b76f closetext loadmovesprites end ; 0x6adc8 UnknownScript_0x6adc8: ; 0x6adc8 - 2writetext UnknownText_0x6b7af + writetext UnknownText_0x6b7af closetext loadmovesprites end diff --git a/maps/Route37.asm b/maps/Route37.asm index f732f0a90..5519f89c8 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -42,7 +42,7 @@ TrainerTwinsAnnandanne1: ; 0x1a8d83 TwinsAnnandanne1Script: ; 0x1a8d8f talkaftercancel loadfont - 2writetext UnknownText_0x1a8e62 + writetext UnknownText_0x1a8e62 closetext loadmovesprites end @@ -71,7 +71,7 @@ TrainerTwinsAnnandanne2: ; 0x1a8d97 TwinsAnnandanne2Script: ; 0x1a8da3 talkaftercancel loadfont - 2writetext UnknownText_0x1a8eec + writetext UnknownText_0x1a8eec closetext loadmovesprites end @@ -100,7 +100,7 @@ TrainerPsychicGreg: ; 0x1a8dab PsychicGregScript: ; 0x1a8db7 talkaftercancel loadfont - 2writetext UnknownText_0x1a8f80 + writetext UnknownText_0x1a8f80 closetext loadmovesprites end @@ -115,36 +115,36 @@ SunnyScript: if_not_equal SUNDAY, SunnyNotSundayScript checkevent EVENT_MET_SUNNY_OF_SUNDAY iftrue .MetSunny - 2writetext MeetSunnyText + writetext MeetSunnyText keeptextopen setevent EVENT_MET_SUNNY_OF_SUNDAY .MetSunny checkflag $0063 iftrue .Kris - 2writetext SunnyGivesGiftText1 + writetext SunnyGivesGiftText1 keeptextopen - 2jump .next + jump .next .Kris - 2writetext SunnyGivesGiftText2 + writetext SunnyGivesGiftText2 keeptextopen .next verbosegiveitem MAGNET, 1 iffalse SunnyDoneScript setevent EVENT_GOT_MAGNET_FROM_SUNNY - 2writetext SunnyGaveGiftText + writetext SunnyGaveGiftText closetext loadmovesprites end SunnySundayScript: - 2writetext SunnySundayText + writetext SunnySundayText closetext SunnyDoneScript: loadmovesprites end SunnyNotSundayScript: - 2writetext SunnyNotSundayText + writetext SunnyNotSundayText closetext loadmovesprites end diff --git a/maps/Route38.asm b/maps/Route38.asm index 4f5dc4dda..12840be16 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -29,7 +29,7 @@ TrainerBird_keeperToby: ; 0x1a1d0e Bird_keeperTobyScript: ; 0x1a1d1a talkaftercancel loadfont - 2writetext UnknownText_0x1a1f86 + writetext UnknownText_0x1a1f86 closetext loadmovesprites end @@ -58,7 +58,7 @@ TrainerSailorHarry: ; 0x1a1d22 SailorHarryScript: ; 0x1a1d2e talkaftercancel loadfont - 2writetext UnknownText_0x1a220c + writetext UnknownText_0x1a220c closetext loadmovesprites end @@ -96,26 +96,26 @@ LassDana1Script: ; 0x1a1d42 iftrue UnknownScript_0x1a1e17 checkevent $0289 iftrue UnknownScript_0x1a1d6b - 2writetext UnknownText_0x1a20ec + writetext UnknownText_0x1a20ec keeptextopen setevent $0289 - 2call UnknownScript_0x1a1e0b - 2jump UnknownScript_0x1a1d6e + scall UnknownScript_0x1a1e0b + jump UnknownScript_0x1a1d6e ; 0x1a1d6b UnknownScript_0x1a1d6b: ; 0x1a1d6b - 2call UnknownScript_0x1a1e0f + scall UnknownScript_0x1a1e0f UnknownScript_0x1a1d6e: ; 0x1a1d6e askforphonenumber $1a if_equal $1, UnknownScript_0x1a1e1f if_equal $2, UnknownScript_0x1a1e1b trainertotext LASS, DANA1, $0 - 2call UnknownScript_0x1a1e13 - 2jump UnknownScript_0x1a1e17 + scall UnknownScript_0x1a1e13 + jump UnknownScript_0x1a1e17 ; 0x1a1d82 UnknownScript_0x1a1d82: ; 0x1a1d82 - 2call UnknownScript_0x1a1e23 + scall UnknownScript_0x1a1e23 winlosstext LassDana1BeatenText, $0000 copybytetovar $da03 if_equal $4, UnknownScript_0x1a1da1 @@ -180,16 +180,16 @@ UnknownScript_0x1a1ded: ; 0x1a1ded ; 0x1a1df6 UnknownScript_0x1a1df6: ; 0x1a1df6 - 2call UnknownScript_0x1a1e27 + scall UnknownScript_0x1a1e27 verbosegiveitem THUNDERSTONE, 1 iffalse UnknownScript_0x1a1e08 clearflag $0082 setevent $0102 - 2jump UnknownScript_0x1a1e17 + jump UnknownScript_0x1a1e17 ; 0x1a1e08 UnknownScript_0x1a1e08: ; 0x1a1e08 - 2jump UnknownScript_0x1a1e2b + jump UnknownScript_0x1a1e2b ; 0x1a1e0b UnknownScript_0x1a1e0b: ; 0x1a1e0b @@ -267,26 +267,26 @@ SchoolboyChad1Script: ; 0x1a1e3b iftrue UnknownScript_0x1a1ef5 checkevent $028b iftrue UnknownScript_0x1a1e5e - 2writetext UnknownText_0x1a200e + writetext UnknownText_0x1a200e keeptextopen setevent $028b - 2call UnknownScript_0x1a1ee9 - 2jump UnknownScript_0x1a1e61 + scall UnknownScript_0x1a1ee9 + jump UnknownScript_0x1a1e61 ; 0x1a1e5e UnknownScript_0x1a1e5e: ; 0x1a1e5e - 2call UnknownScript_0x1a1eed + scall UnknownScript_0x1a1eed UnknownScript_0x1a1e61: ; 0x1a1e61 askforphonenumber $1b if_equal $1, UnknownScript_0x1a1efd if_equal $2, UnknownScript_0x1a1ef9 trainertotext SCHOOLBOY, CHAD1, $0 - 2call UnknownScript_0x1a1ef1 - 2jump UnknownScript_0x1a1ef5 + scall UnknownScript_0x1a1ef1 + jump UnknownScript_0x1a1ef5 ; 0x1a1e75 UnknownScript_0x1a1e75: ; 0x1a1e75 - 2call UnknownScript_0x1a1f01 + scall UnknownScript_0x1a1f01 winlosstext SchoolboyChad1BeatenText, $0000 copybytetovar $da04 if_equal $4, UnknownScript_0x1a1e94 @@ -408,7 +408,7 @@ TrainerBeautyValerie: ; 0x1a1f05 BeautyValerieScript: ; 0x1a1f11 talkaftercancel loadfont - 2writetext UnknownText_0x1a2185 + writetext UnknownText_0x1a2185 closetext loadmovesprites end @@ -437,7 +437,7 @@ TrainerBeautyOlivia: ; 0x1a1f19 BeautyOliviaScript: ; 0x1a1f25 talkaftercancel loadfont - 2writetext UnknownText_0x1a229a + writetext UnknownText_0x1a229a closetext loadmovesprites end diff --git a/maps/Route39.asm b/maps/Route39.asm index 0cf997ea7..e8eba3deb 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -8,7 +8,7 @@ Route39_MapScriptHeader: ; 0x1a5af3 TaurosScript_0x1a5af5: ; 0x1a5af5 loadfont - 2writetext UnknownText_0x1a5bf9 + writetext UnknownText_0x1a5bf9 cry MILTANK closetext loadmovesprites @@ -47,38 +47,38 @@ PokefanmDerek1Script: ; 0x1a5b0b iffalse UnknownScript_0x1a5b5c checkevent EVENT_SHOWED_DEREK_PIKACHU iftrue UnknownScript_0x1a5b33 - 2writetext UnknownText_0x1a5cf8 + writetext UnknownText_0x1a5cf8 keeptextopen setevent EVENT_SHOWED_DEREK_PIKACHU - 2call UnknownScript_0x1a5b62 - 2jump UnknownScript_0x1a5b36 + scall UnknownScript_0x1a5b62 + jump UnknownScript_0x1a5b36 ; 0x1a5b33 UnknownScript_0x1a5b33: ; 0x1a5b33 - 2call UnknownScript_0x1a5b66 + scall UnknownScript_0x1a5b66 UnknownScript_0x1a5b36: ; 0x1a5b36 askforphonenumber $1c if_equal $1, UnknownScript_0x1a5b76 if_equal $2, UnknownScript_0x1a5b72 trainertotext POKEFANM, DEREK1, $0 - 2call UnknownScript_0x1a5b6a - 2jump UnknownScript_0x1a5b6e + scall UnknownScript_0x1a5b6a + jump UnknownScript_0x1a5b6e ; 0x1a5b4a UnknownScript_0x1a5b4a: ; 0x1a5b4a - 2call UnknownScript_0x1a5b7a + scall UnknownScript_0x1a5b7a verbosegiveitem NUGGET, 1 iffalse UnknownScript_0x1a5b59 clearflag $0083 - 2jump UnknownScript_0x1a5b6e + jump UnknownScript_0x1a5b6e ; 0x1a5b59 UnknownScript_0x1a5b59: ; 0x1a5b59 - 2jump UnknownScript_0x1a5b7e + jump UnknownScript_0x1a5b7e ; 0x1a5b5c UnknownScript_0x1a5b5c: ; 0x1a5b5c - 2writetext UnknownText_0x1a5dec + writetext UnknownText_0x1a5dec closetext loadmovesprites end @@ -147,7 +147,7 @@ TrainerPokefanfRuth: ; 0x1a5b82 PokefanfRuthScript: ; 0x1a5b8e talkaftercancel loadfont - 2writetext UnknownText_0x1a5db2 + writetext UnknownText_0x1a5db2 closetext loadmovesprites end @@ -176,7 +176,7 @@ TrainerSailorEugene: ; 0x1a5b96 SailorEugeneScript: ; 0x1a5ba2 talkaftercancel loadfont - 2writetext UnknownText_0x1a5c4d + writetext UnknownText_0x1a5c4d closetext loadmovesprites end @@ -205,7 +205,7 @@ TrainerPsychicNorman: ; 0x1a5baa PsychicNormanScript: ; 0x1a5bb6 talkaftercancel loadfont - 2writetext UnknownText_0x1a5e57 + writetext UnknownText_0x1a5e57 closetext loadmovesprites end @@ -218,7 +218,7 @@ PokefanFScript_0x1a5bbe: ; 0x1a5bbe iffalse UnknownScript_0x1a5be5 checkevent $05c2 iftrue UnknownScript_0x1a5bdf - 2writetext UnknownText_0x1a5ee8 + writetext UnknownText_0x1a5ee8 closetext loadmovesprites winlosstext UnknownText_0x1a5f17, $0000 @@ -231,14 +231,14 @@ PokefanFScript_0x1a5bbe: ; 0x1a5bbe ; 0x1a5bdf UnknownScript_0x1a5bdf: ; 0x1a5bdf - 2writetext UnknownText_0x1a5f31 + writetext UnknownText_0x1a5f31 closetext loadmovesprites end ; 0x1a5be5 UnknownScript_0x1a5be5: ; 0x1a5be5 - 2writetext UnknownText_0x1a5ec4 + writetext UnknownText_0x1a5ec4 closetext loadmovesprites end diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm index fff276d77..2bebb86ac 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -11,7 +11,7 @@ TwinScript_0x9cc76: ; 0x9cc76 loadfont checkevent EVENT_HEALED_MOOMOO iftrue UnknownScript_0x9cc87 - 2writetext UnknownText_0x9cd2e + writetext UnknownText_0x9cd2e closetext loadmovesprites spriteface $2, $3 @@ -19,7 +19,7 @@ TwinScript_0x9cc76: ; 0x9cc76 ; 0x9cc87 UnknownScript_0x9cc87: ; 0x9cc87 - 2writetext UnknownText_0x9cd5a + writetext UnknownText_0x9cd5a closetext loadmovesprites spriteface $2, $3 @@ -31,7 +31,7 @@ TwinScript_0x9cc90: ; 0x9cc90 loadfont checkevent EVENT_HEALED_MOOMOO iftrue UnknownScript_0x9cca1 - 2writetext UnknownText_0x9cd2e + writetext UnknownText_0x9cd2e closetext loadmovesprites spriteface $3, $2 @@ -39,7 +39,7 @@ TwinScript_0x9cc90: ; 0x9cc90 ; 0x9cca1 UnknownScript_0x9cca1: ; 0x9cca1 - 2writetext UnknownText_0x9cd5a + writetext UnknownText_0x9cd5a closetext loadmovesprites spriteface $3, $2 @@ -50,11 +50,11 @@ TaurosScript_0x9ccaa: ; 0x9ccaa loadfont checkevent EVENT_HEALED_MOOMOO iftrue UnknownScript_0x9cd25 - 2writetext UnknownText_0x9cd70 + writetext UnknownText_0x9cd70 writebyte MILTANK special $005f keeptextopen - 2writetext UnknownText_0x9cd80 + writetext UnknownText_0x9cd80 checkevent EVENT_TALKED_TO_FARMER_ABOUT_MOOMOO iftrue UnknownScript_0x9ccc6 closetext @@ -64,7 +64,7 @@ TaurosScript_0x9ccaa: ; 0x9ccaa UnknownScript_0x9ccc6: ; 0x9ccc6 keeptextopen - 2writetext UnknownText_0x9cda2 + writetext UnknownText_0x9cda2 yesorno iffalse UnknownScript_0x9cd1f checkitem BERRY @@ -76,25 +76,25 @@ UnknownScript_0x9ccc6: ; 0x9ccc6 if_equal $3, UnknownScript_0x9ccf0 if_equal $5, UnknownScript_0x9ccfa if_equal $7, UnknownScript_0x9cd04 - 2writetext UnknownText_0x9cdbc + writetext UnknownText_0x9cdbc closetext loadmovesprites end ; 0x9ccf0 UnknownScript_0x9ccf0: ; 0x9ccf0 - 2writetext UnknownText_0x9cdbc + writetext UnknownText_0x9cdbc keeptextopen - 2writetext UnknownText_0x9cdd8 + writetext UnknownText_0x9cdd8 closetext loadmovesprites end ; 0x9ccfa UnknownScript_0x9ccfa: ; 0x9ccfa - 2writetext UnknownText_0x9cdbc + writetext UnknownText_0x9cdbc keeptextopen - 2writetext UnknownText_0x9cdfc + writetext UnknownText_0x9cdfc closetext loadmovesprites end @@ -102,11 +102,11 @@ UnknownScript_0x9ccfa: ; 0x9ccfa UnknownScript_0x9cd04: ; 0x9cd04 playmusic MUSIC_HEAL - 2writetext UnknownText_0x9cdbc + writetext UnknownText_0x9cdbc pause 60 keeptextopen special $003d - 2writetext UnknownText_0x9ce1b + writetext UnknownText_0x9ce1b closetext loadmovesprites setevent EVENT_HEALED_MOOMOO @@ -114,21 +114,21 @@ UnknownScript_0x9cd04: ; 0x9cd04 ; 0x9cd19 UnknownScript_0x9cd19: ; 0x9cd19 - 2writetext UnknownText_0x9ce3c + writetext UnknownText_0x9ce3c closetext loadmovesprites end ; 0x9cd1f UnknownScript_0x9cd1f: ; 0x9cd1f - 2writetext UnknownText_0x9ce4f + writetext UnknownText_0x9ce4f closetext loadmovesprites end ; 0x9cd25 UnknownScript_0x9cd25: ; 0x9cd25 - 2writetext UnknownText_0x9cd92 + writetext UnknownText_0x9cd92 cry MILTANK closetext loadmovesprites diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index 8457c2765..5135c05c7 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -11,7 +11,7 @@ PokefanMScript_0x9ceb4: ; 0x9ceb4 loadfont checkevent EVENT_HEALED_MOOMOO iftrue UnknownScript_0x9cec5 - 2writetext UnknownText_0x9cf38 + writetext UnknownText_0x9cf38 closetext loadmovesprites setevent EVENT_TALKED_TO_FARMER_ABOUT_MOOMOO @@ -21,7 +21,7 @@ PokefanMScript_0x9ceb4: ; 0x9ceb4 UnknownScript_0x9cec5: ; 0x9cec5 checkitem MOOMOO_MILK iftrue UnknownScript_0x9cf08 - 2writetext UnknownText_0x9cfe1 + writetext UnknownText_0x9cfe1 special $0051 yesorno iffalse UnknownScript_0x9cf02 @@ -33,7 +33,7 @@ UnknownScript_0x9cec5: ; 0x9cec5 special $0051 waitbutton playsound SFX_TRANSACTION - 2writetext UnknownText_0x9d05d + writetext UnknownText_0x9d05d keeptextopen itemnotify loadmovesprites @@ -41,28 +41,28 @@ UnknownScript_0x9cec5: ; 0x9cec5 ; 0x9cef6 UnknownScript_0x9cef6: ; 0x9cef6 - 2writetext UnknownText_0x9d07c + writetext UnknownText_0x9d07c closetext loadmovesprites end ; 0x9cefc UnknownScript_0x9cefc: ; 0x9cefc - 2writetext UnknownText_0x9d09d + writetext UnknownText_0x9d09d closetext loadmovesprites end ; 0x9cf02 UnknownScript_0x9cf02: ; 0x9cf02 - 2writetext UnknownText_0x9d0b7 + writetext UnknownText_0x9d0b7 closetext loadmovesprites end ; 0x9cf08 UnknownScript_0x9cf08: ; 0x9cf08 - 2writetext UnknownText_0x9d0dc + writetext UnknownText_0x9d0dc closetext loadmovesprites end @@ -75,20 +75,20 @@ PokefanFScript_0x9cf0e: ; 0x9cf0e iftrue UnknownScript_0x9cf2f checkevent EVENT_HEALED_MOOMOO iftrue UnknownScript_0x9cf22 - 2writetext UnknownText_0x9d0f6 + writetext UnknownText_0x9d0f6 closetext loadmovesprites end ; 0x9cf22 UnknownScript_0x9cf22: ; 0x9cf22 - 2writetext UnknownText_0x9d156 + writetext UnknownText_0x9d156 keeptextopen verbosegiveitem TM_13, 1 iffalse UnknownScript_0x9cf33 setevent EVENT_GOT_TM13_SNORE_FROM_MOOMOO_FARM UnknownScript_0x9cf2f: ; 0x9cf2f - 2writetext UnknownText_0x9d1c7 + writetext UnknownText_0x9d1c7 closetext UnknownScript_0x9cf33: ; 0x9cf33 loadmovesprites diff --git a/maps/Route4.asm b/maps/Route4.asm index a8ff8084b..8c69d6d58 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -29,7 +29,7 @@ TrainerBird_keeperHank: ; 0x1ae1d0 Bird_keeperHankScript: ; 0x1ae1dc talkaftercancel loadfont - 2writetext UnknownText_0x1ae258 + writetext UnknownText_0x1ae258 closetext loadmovesprites end @@ -58,7 +58,7 @@ TrainerPicnickerHope: ; 0x1ae1e4 PicnickerHopeScript: ; 0x1ae1f0 talkaftercancel loadfont - 2writetext UnknownText_0x1ae320 + writetext UnknownText_0x1ae320 closetext loadmovesprites end @@ -87,7 +87,7 @@ TrainerPicnickerSharon: ; 0x1ae1f8 PicnickerSharonScript: ; 0x1ae204 talkaftercancel loadfont - 2writetext UnknownText_0x1ae369 + writetext UnknownText_0x1ae369 closetext loadmovesprites end diff --git a/maps/Route40.asm b/maps/Route40.asm index 1110356a4..d8bdcdcce 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -43,7 +43,7 @@ TrainerSwimmerfElaine: ; 0x1a6174 SwimmerfElaineScript: ; 0x1a6180 talkaftercancel loadfont - 2writetext UnknownText_0x1a637b + writetext UnknownText_0x1a637b closetext loadmovesprites end @@ -72,7 +72,7 @@ TrainerSwimmerfPaula: ; 0x1a6188 SwimmerfPaulaScript: ; 0x1a6194 talkaftercancel loadfont - 2writetext UnknownText_0x1a63f5 + writetext UnknownText_0x1a63f5 closetext loadmovesprites end @@ -101,7 +101,7 @@ TrainerSwimmermSimon: ; 0x1a619c SwimmermSimonScript: ; 0x1a61a8 talkaftercancel loadfont - 2writetext UnknownText_0x1a6282 + writetext UnknownText_0x1a6282 closetext loadmovesprites end @@ -130,7 +130,7 @@ TrainerSwimmermRandall: ; 0x1a61b0 SwimmermRandallScript: ; 0x1a61bc talkaftercancel loadfont - 2writetext UnknownText_0x1a62fa + writetext UnknownText_0x1a62fa closetext loadmovesprites end @@ -167,29 +167,29 @@ MonicaScript: if_not_equal MONDAY, MonicaNotMondayScript checkevent EVENT_MET_MONICA_OF_MONDAY iftrue .MetMonica - 2writetext MeetMonicaText + writetext MeetMonicaText keeptextopen setevent EVENT_MET_MONICA_OF_MONDAY .MetMonica - 2writetext MonicaGivesGiftText + writetext MonicaGivesGiftText keeptextopen verbosegiveitem SHARP_BEAK, 1 iffalse MonicaDoneScript setevent EVENT_GOT_SHARP_BEAK_FROM_MONICA - 2writetext MonicaGaveGiftText + writetext MonicaGaveGiftText closetext loadmovesprites end MonicaMondayScript: - 2writetext MonicaMondayText + writetext MonicaMondayText closetext MonicaDoneScript: loadmovesprites end MonicaNotMondayScript: - 2writetext MonicaNotMondayText + writetext MonicaNotMondayText closetext loadmovesprites end diff --git a/maps/Route41.asm b/maps/Route41.asm index 6257c882b..56d2e9c1f 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -29,7 +29,7 @@ TrainerSwimmerfKaylee: ; 0x1a6841 SwimmerfKayleeScript: ; 0x1a684d talkaftercancel loadfont - 2writetext UnknownText_0x1a6c7f + writetext UnknownText_0x1a6c7f closetext loadmovesprites end @@ -58,7 +58,7 @@ TrainerSwimmerfSusie: ; 0x1a6855 SwimmerfSusieScript: ; 0x1a6861 talkaftercancel loadfont - 2writetext UnknownText_0x1a6d11 + writetext UnknownText_0x1a6d11 closetext loadmovesprites end @@ -87,7 +87,7 @@ TrainerSwimmerfDenise: ; 0x1a6869 SwimmerfDeniseScript: ; 0x1a6875 talkaftercancel loadfont - 2writetext UnknownText_0x1a6d79 + writetext UnknownText_0x1a6d79 closetext loadmovesprites end @@ -116,7 +116,7 @@ TrainerSwimmerfKara: ; 0x1a687d SwimmerfKaraScript: ; 0x1a6889 talkaftercancel loadfont - 2writetext UnknownText_0x1a6e58 + writetext UnknownText_0x1a6e58 closetext loadmovesprites end @@ -145,7 +145,7 @@ TrainerSwimmerfWendy: ; 0x1a6891 SwimmerfWendyScript: ; 0x1a689d talkaftercancel loadfont - 2writetext UnknownText_0x1a6ec2 + writetext UnknownText_0x1a6ec2 closetext loadmovesprites end @@ -174,7 +174,7 @@ TrainerSwimmermCharlie: ; 0x1a68a5 SwimmermCharlieScript: ; 0x1a68b1 talkaftercancel loadfont - 2writetext UnknownText_0x1a696e + writetext UnknownText_0x1a696e closetext loadmovesprites end @@ -203,7 +203,7 @@ TrainerSwimmermGeorge: ; 0x1a68b9 SwimmermGeorgeScript: ; 0x1a68c5 talkaftercancel loadfont - 2writetext UnknownText_0x1a69d4 + writetext UnknownText_0x1a69d4 closetext loadmovesprites end @@ -232,7 +232,7 @@ TrainerSwimmermBerke: ; 0x1a68cd SwimmermBerkeScript: ; 0x1a68d9 talkaftercancel loadfont - 2writetext UnknownText_0x1a6aa4 + writetext UnknownText_0x1a6aa4 closetext loadmovesprites end @@ -261,7 +261,7 @@ TrainerSwimmermKirk: ; 0x1a68e1 SwimmermKirkScript: ; 0x1a68ed talkaftercancel loadfont - 2writetext UnknownText_0x1a6b6c + writetext UnknownText_0x1a6b6c closetext loadmovesprites end @@ -290,7 +290,7 @@ TrainerSwimmermMathew: ; 0x1a68f5 SwimmermMathewScript: ; 0x1a6901 talkaftercancel loadfont - 2writetext UnknownText_0x1a6bed + writetext UnknownText_0x1a6bed closetext loadmovesprites end diff --git a/maps/Route42.asm b/maps/Route42.asm index bc6b72371..296258be2 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -63,26 +63,26 @@ FisherTully1Script: ; 0x1a923f iftrue UnknownScript_0x1a92fd checkevent $028f iftrue UnknownScript_0x1a9268 - 2writetext UnknownText_0x1a93ab + writetext UnknownText_0x1a93ab keeptextopen setevent $028f - 2call UnknownScript_0x1a92f1 - 2jump UnknownScript_0x1a926b + scall UnknownScript_0x1a92f1 + jump UnknownScript_0x1a926b ; 0x1a9268 UnknownScript_0x1a9268: ; 0x1a9268 - 2call UnknownScript_0x1a92f5 + scall UnknownScript_0x1a92f5 UnknownScript_0x1a926b: ; 0x1a926b askforphonenumber $1d if_equal $1, UnknownScript_0x1a9305 if_equal $2, UnknownScript_0x1a9301 trainertotext FISHER, TULLY1, $0 - 2call UnknownScript_0x1a92f9 - 2jump UnknownScript_0x1a92fd + scall UnknownScript_0x1a92f9 + jump UnknownScript_0x1a92fd ; 0x1a927f UnknownScript_0x1a927f: ; 0x1a927f - 2call UnknownScript_0x1a9309 + scall UnknownScript_0x1a9309 winlosstext FisherTully1BeatenText, $0000 copybytetovar $da06 if_equal $3, UnknownScript_0x1a929a @@ -134,16 +134,16 @@ UnknownScript_0x1a92d3: ; 0x1a92d3 ; 0x1a92dc UnknownScript_0x1a92dc: ; 0x1a92dc - 2call UnknownScript_0x1a930d + scall UnknownScript_0x1a930d verbosegiveitem WATER_STONE, 1 iffalse UnknownScript_0x1a92ee clearflag $0084 setevent $0103 - 2jump UnknownScript_0x1a92fd + jump UnknownScript_0x1a92fd ; 0x1a92ee UnknownScript_0x1a92ee: ; 0x1a92ee - 2jump UnknownScript_0x1a9311 + jump UnknownScript_0x1a9311 ; 0x1a92f1 UnknownScript_0x1a92f1: ; 0x1a92f1 @@ -214,7 +214,7 @@ TrainerPokemaniacShane: ; 0x1a9315 PokemaniacShaneScript: ; 0x1a9321 talkaftercancel loadfont - 2writetext UnknownText_0x1a94d6 + writetext UnknownText_0x1a94d6 closetext loadmovesprites end @@ -243,7 +243,7 @@ TrainerHikerBenjamin: ; 0x1a9329 HikerBenjaminScript: ; 0x1a9335 talkaftercancel loadfont - 2writetext UnknownText_0x1a943f + writetext UnknownText_0x1a943f closetext loadmovesprites end diff --git a/maps/Route43.asm b/maps/Route43.asm index 56764e1d9..19f573c56 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -45,7 +45,7 @@ TrainerCamperSpencer: ; 0x19d061 CamperSpencerScript: ; 0x19d06d talkaftercancel loadfont - 2writetext UnknownText_0x19d57e + writetext UnknownText_0x19d57e closetext loadmovesprites end @@ -74,7 +74,7 @@ TrainerPokemaniacBen: ; 0x19d075 PokemaniacBenScript: ; 0x19d081 talkaftercancel loadfont - 2writetext UnknownText_0x19d2d2 + writetext UnknownText_0x19d2d2 closetext loadmovesprites end @@ -110,26 +110,26 @@ PokemaniacBrent1Script: ; 0x19d095 iftrue UnknownScript_0x19d138 checkevent $0291 iftrue UnknownScript_0x19d0b8 - 2writetext UnknownText_0x19d359 + writetext UnknownText_0x19d359 keeptextopen setevent $0291 - 2call UnknownScript_0x19d12c - 2jump UnknownScript_0x19d0bb + scall UnknownScript_0x19d12c + jump UnknownScript_0x19d0bb ; 0x19d0b8 UnknownScript_0x19d0b8: ; 0x19d0b8 - 2call UnknownScript_0x19d130 + scall UnknownScript_0x19d130 UnknownScript_0x19d0bb: ; 0x19d0bb askforphonenumber $1e if_equal $1, UnknownScript_0x19d140 if_equal $2, UnknownScript_0x19d13c trainertotext POKEMANIAC, BRENT1, $0 - 2call UnknownScript_0x19d134 - 2jump UnknownScript_0x19d138 + scall UnknownScript_0x19d134 + jump UnknownScript_0x19d138 ; 0x19d0cf UnknownScript_0x19d0cf: ; 0x19d0cf - 2call UnknownScript_0x19d144 + scall UnknownScript_0x19d144 winlosstext PokemaniacBrent1BeatenText, $0000 copybytetovar $da07 if_equal $3, UnknownScript_0x19d0ea @@ -238,7 +238,7 @@ TrainerPokemaniacRon: ; 0x19d148 PokemaniacRonScript: ; 0x19d154 talkaftercancel loadfont - 2writetext UnknownText_0x19d3f8 + writetext UnknownText_0x19d3f8 closetext loadmovesprites end @@ -267,7 +267,7 @@ TrainerFisherMarvin: ; 0x19d15c FisherMarvinScript: ; 0x19d168 talkaftercancel loadfont - 2writetext UnknownText_0x19d4d3 + writetext UnknownText_0x19d4d3 closetext loadmovesprites end @@ -307,26 +307,26 @@ PicnickerTiffany3Script: ; 0x19d17c iffalse UnknownScript_0x19d233 checkevent EVENT_SHOWED_TIFFANY_CLEFAIRY iftrue UnknownScript_0x19d1aa - 2writetext UnknownText_0x19d618 + writetext UnknownText_0x19d618 keeptextopen setevent EVENT_SHOWED_TIFFANY_CLEFAIRY - 2call UnknownScript_0x19d239 - 2jump UnknownScript_0x19d1ad + scall UnknownScript_0x19d239 + jump UnknownScript_0x19d1ad ; 0x19d1aa UnknownScript_0x19d1aa: ; 0x19d1aa - 2call UnknownScript_0x19d23d + scall UnknownScript_0x19d23d UnknownScript_0x19d1ad: ; 0x19d1ad askforphonenumber $1f if_equal $1, UnknownScript_0x19d24d if_equal $2, UnknownScript_0x19d249 trainertotext PICNICKER, TIFFANY3, $0 - 2call UnknownScript_0x19d241 - 2jump UnknownScript_0x19d245 + scall UnknownScript_0x19d241 + jump UnknownScript_0x19d245 ; 0x19d1c1 UnknownScript_0x19d1c1: ; 0x19d1c1 - 2call UnknownScript_0x19d251 + scall UnknownScript_0x19d251 winlosstext PicnickerTiffany3BeatenText, $0000 copybytetovar $da08 if_equal $3, UnknownScript_0x19d1dc @@ -378,20 +378,20 @@ UnknownScript_0x19d215: ; 0x19d215 ; 0x19d21e UnknownScript_0x19d21e: ; 0x19d21e - 2call UnknownScript_0x19d255 + scall UnknownScript_0x19d255 verbosegiveitem PINK_BOW, 1 iffalse UnknownScript_0x19d230 clearflag $0085 setevent $0104 - 2jump UnknownScript_0x19d245 + jump UnknownScript_0x19d245 ; 0x19d230 UnknownScript_0x19d230: ; 0x19d230 - 2jump UnknownScript_0x19d259 + jump UnknownScript_0x19d259 ; 0x19d233 UnknownScript_0x19d233: ; 0x19d233 - 2writetext UnknownText_0x19d64b + writetext UnknownText_0x19d64b closetext loadmovesprites end diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index 6f53bf1d9..96718487d 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -52,23 +52,23 @@ UnknownScript_0x19abea: ; 0x19abea showemote $0, $3, 15 applymovement $3, MovementData_0x19aca4 loadfont - 2writetext UnknownText_0x19acd2 + writetext UnknownText_0x19acd2 keeptextopen checkmoney $0, 999 if_equal $0, UnknownScript_0x19ac12 - 2jump UnknownScript_0x19ac1d + jump UnknownScript_0x19ac1d ; 0x19ac12 UnknownScript_0x19ac12: ; 0x19ac12 takemoney $0, 1000 - 2writetext UnknownText_0x19ad0a - 2jump UnknownScript_0x19ac28 + writetext UnknownText_0x19ad0a + jump UnknownScript_0x19ac28 ; 0x19ac1d UnknownScript_0x19ac1d: ; 0x19ac1d takemoney $0, 1000 - 2writetext UnknownText_0x19ad20 - 2jump UnknownScript_0x19ac28 + writetext UnknownText_0x19ad20 + jump UnknownScript_0x19ac28 ; 0x19ac28 UnknownScript_0x19ac28: ; 0x19ac28 @@ -88,23 +88,23 @@ UnknownScript_0x19ac38: ; 0x19ac38 showemote $0, $4, 15 applymovement $4, MovementData_0x19acc7 loadfont - 2writetext UnknownText_0x19acd2 + writetext UnknownText_0x19acd2 keeptextopen checkmoney $0, 999 if_equal $0, UnknownScript_0x19ac5c - 2jump UnknownScript_0x19ac67 + jump UnknownScript_0x19ac67 ; 0x19ac5c UnknownScript_0x19ac5c: ; 0x19ac5c takemoney $0, 1000 - 2writetext UnknownText_0x19ad0a - 2jump UnknownScript_0x19ac72 + writetext UnknownText_0x19ad0a + jump UnknownScript_0x19ac72 ; 0x19ac67 UnknownScript_0x19ac67: ; 0x19ac67 takemoney $0, 1000 - 2writetext UnknownText_0x19ad20 - 2jump UnknownScript_0x19ac72 + writetext UnknownText_0x19ad20 + jump UnknownScript_0x19ac72 ; 0x19ac72 UnknownScript_0x19ac72: ; 0x19ac72 @@ -126,7 +126,7 @@ OfficerScript_0x19ac85: ; 0x19ac85 loadfont checkevent EVENT_GOT_TM36_SLUDGE_BOMB iftrue UnknownScript_0x19ac9c - 2writetext UnknownText_0x19ad9b + writetext UnknownText_0x19ad9b keeptextopen verbosegiveitem TM_36, 1 iffalse UnknownScript_0x19aca0 @@ -136,7 +136,7 @@ OfficerScript_0x19ac85: ; 0x19ac85 ; 0x19ac9c UnknownScript_0x19ac9c: ; 0x19ac9c - 2writetext UnknownText_0x19ae2d + writetext UnknownText_0x19ae2d closetext UnknownScript_0x19aca0: ; 0x19aca0 loadmovesprites diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm index 037a97cab..e03efe453 100644 --- a/maps/Route43MahoganyGate.asm +++ b/maps/Route43MahoganyGate.asm @@ -11,14 +11,14 @@ OfficerScript_0x19ab0b: ; 0x19ab0b loadfont checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x19ab19 - 2writetext UnknownText_0x19ab1f + writetext UnknownText_0x19ab1f closetext loadmovesprites end ; 0x19ab19 UnknownScript_0x19ab19: ; 0x19ab19 - 2writetext UnknownText_0x19ab65 + writetext UnknownText_0x19ab65 closetext loadmovesprites end diff --git a/maps/Route44.asm b/maps/Route44.asm index e2bbad355..a19262533 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -36,26 +36,26 @@ Bird_keeperVance1Script: ; 0x19d830 iftrue UnknownScript_0x19d8eb checkevent $0295 iftrue UnknownScript_0x19d853 - 2writetext UnknownText_0x19dbf3 + writetext UnknownText_0x19dbf3 keeptextopen setevent $0295 - 2call UnknownScript_0x19d8df - 2jump UnknownScript_0x19d856 + scall UnknownScript_0x19d8df + jump UnknownScript_0x19d856 ; 0x19d853 UnknownScript_0x19d853: ; 0x19d853 - 2call UnknownScript_0x19d8e3 + scall UnknownScript_0x19d8e3 UnknownScript_0x19d856: ; 0x19d856 askforphonenumber $20 if_equal $1, UnknownScript_0x19d8f3 if_equal $2, UnknownScript_0x19d8ef trainertotext BIRD_KEEPER, VANCE1, $0 - 2call UnknownScript_0x19d8e7 - 2jump UnknownScript_0x19d8eb + scall UnknownScript_0x19d8e7 + jump UnknownScript_0x19d8eb ; 0x19d86a UnknownScript_0x19d86a: ; 0x19d86a - 2call UnknownScript_0x19d8f7 + scall UnknownScript_0x19d8f7 winlosstext Bird_keeperVance1BeatenText, $0000 copybytetovar $da09 if_equal $2, UnknownScript_0x19d881 @@ -94,11 +94,11 @@ UnknownScript_0x19d8a7: ; 0x19d8a7 iftrue UnknownScript_0x19d8cb checkevent $0267 iftrue UnknownScript_0x19d8ca - 2call UnknownScript_0x19d90a + scall UnknownScript_0x19d90a verbosegiveitem CARBOS, 1 iffalse UnknownScript_0x19d903 setevent $0267 - 2jump UnknownScript_0x19d8eb + jump UnknownScript_0x19d8eb ; 0x19d8ca UnknownScript_0x19d8ca: ; 0x19d8ca @@ -107,13 +107,13 @@ UnknownScript_0x19d8ca: ; 0x19d8ca UnknownScript_0x19d8cb: ; 0x19d8cb loadfont - 2writetext UnknownText_0x19dc67 + writetext UnknownText_0x19dc67 closetext verbosegiveitem CARBOS, 1 iffalse UnknownScript_0x19d903 clearevent EVENT_VANCE_CARBOS setevent $0267 - 2jump UnknownScript_0x19d8eb + jump UnknownScript_0x19d8eb ; 0x19d8df UnknownScript_0x19d8df: ; 0x19d8df @@ -195,7 +195,7 @@ TrainerPsychicPhil: ; 0x19d90e PsychicPhilScript: ; 0x19d91a talkaftercancel loadfont - 2writetext UnknownText_0x19dcfc + writetext UnknownText_0x19dcfc closetext loadmovesprites end @@ -233,26 +233,26 @@ FisherWilton1Script: ; 0x19d92e iftrue UnknownScript_0x19d8eb checkevent $0297 iftrue UnknownScript_0x19d957 - 2writetext UnknownText_0x19daa8 + writetext UnknownText_0x19daa8 keeptextopen setevent $0297 - 2call UnknownScript_0x19d8df - 2jump UnknownScript_0x19d95a + scall UnknownScript_0x19d8df + jump UnknownScript_0x19d95a ; 0x19d957 UnknownScript_0x19d957: ; 0x19d957 - 2call UnknownScript_0x19d8e3 + scall UnknownScript_0x19d8e3 UnknownScript_0x19d95a: ; 0x19d95a askforphonenumber $21 if_equal $1, UnknownScript_0x19d8f3 if_equal $2, UnknownScript_0x19d8ef trainertotext FISHER, WILTON1, $0 - 2call UnknownScript_0x19d8e7 - 2jump UnknownScript_0x19d8eb + scall UnknownScript_0x19d8e7 + jump UnknownScript_0x19d8eb ; 0x19d96e UnknownScript_0x19d96e: ; 0x19d96e - 2call UnknownScript_0x19d8f7 + scall UnknownScript_0x19d8f7 winlosstext FisherWilton1BeatenText, $0000 copybytetovar $da0a if_equal $2, UnknownScript_0x19d985 @@ -291,7 +291,7 @@ UnknownScript_0x19d9ab: ; 0x19d9ab ; 0x19d9b4 UnknownScript_0x19d9b4: ; 0x19d9b4 - 2call UnknownScript_0x19d8fb + scall UnknownScript_0x19d8fb checkevent EVENT_WILTON_HAS_ULTRA_BALL iftrue UnknownScript_0x19d9c9 checkevent EVENT_WILTON_HAS_GREAT_BALL @@ -301,13 +301,13 @@ UnknownScript_0x19d9b4: ; 0x19d9b4 UnknownScript_0x19d9c9: ; 0x19d9c9 verbosegiveitem ULTRA_BALL, 1 iffalse UnknownScript_0x19d9e7 - 2jump UnknownScript_0x19d9e1 + jump UnknownScript_0x19d9e1 ; 0x19d9d2 UnknownScript_0x19d9d2: ; 0x19d9d2 verbosegiveitem GREAT_BALL, 1 iffalse UnknownScript_0x19d9e7 - 2jump UnknownScript_0x19d9e1 + jump UnknownScript_0x19d9e1 ; 0x19d9db UnknownScript_0x19d9db: ; 0x19d9db @@ -315,11 +315,11 @@ UnknownScript_0x19d9db: ; 0x19d9db iffalse UnknownScript_0x19d9e7 UnknownScript_0x19d9e1: ; 0x19d9e1 clearflag $0086 - 2jump UnknownScript_0x19d8eb + jump UnknownScript_0x19d8eb ; 0x19d9e7 UnknownScript_0x19d9e7: ; 0x19d9e7 - 2jump UnknownScript_0x19d8ff + jump UnknownScript_0x19d8ff ; 0x19d9ea TrainerFisherEdgar: ; 0x19d9ea @@ -345,7 +345,7 @@ TrainerFisherEdgar: ; 0x19d9ea FisherEdgarScript: ; 0x19d9f6 talkaftercancel loadfont - 2writetext UnknownText_0x19db6f + writetext UnknownText_0x19db6f closetext loadmovesprites end @@ -374,7 +374,7 @@ TrainerCooltrainerfCybil: ; 0x19d9fe CooltrainerfCybilScript: ; 0x19da0a talkaftercancel loadfont - 2writetext UnknownText_0x19df4d + writetext UnknownText_0x19df4d closetext loadmovesprites end @@ -403,7 +403,7 @@ TrainerPokemaniacZach: ; 0x19da12 PokemaniacZachScript: ; 0x19da1e talkaftercancel loadfont - 2writetext UnknownText_0x19dd7e + writetext UnknownText_0x19dd7e closetext loadmovesprites end @@ -432,7 +432,7 @@ TrainerCooltrainermAllen: ; 0x19da26 CooltrainermAllenScript: ; 0x19da32 talkaftercancel loadfont - 2writetext UnknownText_0x19de66 + writetext UnknownText_0x19de66 closetext loadmovesprites end diff --git a/maps/Route45.asm b/maps/Route45.asm index 03b2cc4c5..bb9251dde 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -35,22 +35,22 @@ BlackbeltKenji3Script: ; 0x19e0ad checkevent $0299 iftrue UnknownScript_0x19e0cd special $0095 - 2writetext UnknownText_0x19e5e2 + writetext UnknownText_0x19e5e2 closetext setevent $0299 - 2call UnknownScript_0x19e11b - 2jump UnknownScript_0x19e0d0 + scall UnknownScript_0x19e11b + jump UnknownScript_0x19e0d0 ; 0x19e0cd UnknownScript_0x19e0cd: ; 0x19e0cd - 2call UnknownScript_0x19e11f + scall UnknownScript_0x19e11f UnknownScript_0x19e0d0: ; 0x19e0d0 askforphonenumber $22 if_equal $1, UnknownScript_0x19e12f if_equal $2, UnknownScript_0x19e12b trainertotext BLACKBELT_T, KENJI3, $0 - 2call UnknownScript_0x19e123 - 2jump UnknownScript_0x19e127 + scall UnknownScript_0x19e123 + jump UnknownScript_0x19e127 ; 0x19e0e4 UnknownScript_0x19e0e4: ; 0x19e0e4 @@ -62,30 +62,30 @@ UnknownScript_0x19e0e4: ; 0x19e0e4 iftrue UnknownScript_0x19e112 checkevent $026a iffalse UnknownScript_0x19e127 - 2call UnknownScript_0x19e137 + scall UnknownScript_0x19e137 verbosegiveitem PP_UP, 1 iffalse UnknownScript_0x19e118 clearevent $026a special $0095 - 2jump UnknownScript_0x19e127 + jump UnknownScript_0x19e127 ; 0x19e10c UnknownScript_0x19e10c: ; 0x19e10c - 2writetext UnknownText_0x19e634 + writetext UnknownText_0x19e634 closetext loadmovesprites end ; 0x19e112 UnknownScript_0x19e112: ; 0x19e112 - 2writetext UnknownText_0x19e66c + writetext UnknownText_0x19e66c closetext loadmovesprites end ; 0x19e118 UnknownScript_0x19e118: ; 0x19e118 - 2jump UnknownScript_0x19e13b + jump UnknownScript_0x19e13b ; 0x19e11b UnknownScript_0x19e11b: ; 0x19e11b @@ -167,7 +167,7 @@ TrainerHikerErik: ; 0x19e14a HikerErikScript: ; 0x19e156 talkaftercancel loadfont - 2writetext UnknownText_0x19e301 + writetext UnknownText_0x19e301 closetext loadmovesprites end @@ -196,7 +196,7 @@ TrainerHikerMichael: ; 0x19e15e HikerMichaelScript: ; 0x19e16a talkaftercancel loadfont - 2writetext UnknownText_0x19e3b1 + writetext UnknownText_0x19e3b1 closetext loadmovesprites end @@ -232,26 +232,26 @@ HikerParry3Script: ; 0x19e17e iftrue UnknownScript_0x19e127 checkevent $029b iftrue UnknownScript_0x19e1a1 - 2writetext UnknownText_0x19e434 + writetext UnknownText_0x19e434 keeptextopen setevent $029b - 2call UnknownScript_0x19e11b - 2jump UnknownScript_0x19e1a4 + scall UnknownScript_0x19e11b + jump UnknownScript_0x19e1a4 ; 0x19e1a1 UnknownScript_0x19e1a1: ; 0x19e1a1 - 2call UnknownScript_0x19e11f + scall UnknownScript_0x19e11f UnknownScript_0x19e1a4: ; 0x19e1a4 askforphonenumber $23 if_equal $1, UnknownScript_0x19e12f if_equal $2, UnknownScript_0x19e12b trainertotext HIKER, PARRY1, $0 - 2call UnknownScript_0x19e123 - 2jump UnknownScript_0x19e127 + scall UnknownScript_0x19e123 + jump UnknownScript_0x19e127 ; 0x19e1b8 UnknownScript_0x19e1b8: ; 0x19e1b8 - 2call UnknownScript_0x19e133 + scall UnknownScript_0x19e133 winlosstext HikerParry3BeatenText, $0000 copybytetovar $da0c if_equal $2, UnknownScript_0x19e1cf @@ -290,11 +290,11 @@ UnknownScript_0x19e1f5: ; 0x19e1f5 iftrue UnknownScript_0x19e219 checkevent $0268 iftrue UnknownScript_0x19e218 - 2call UnknownScript_0x19e146 + scall UnknownScript_0x19e146 verbosegiveitem IRON, 1 iffalse UnknownScript_0x19e13f setevent $0268 - 2jump UnknownScript_0x19e127 + jump UnknownScript_0x19e127 ; 0x19e218 UnknownScript_0x19e218: ; 0x19e218 @@ -303,13 +303,13 @@ UnknownScript_0x19e218: ; 0x19e218 UnknownScript_0x19e219: ; 0x19e219 loadfont - 2writetext UnknownText_0x19e52c + writetext UnknownText_0x19e52c closetext verbosegiveitem IRON, 1 iffalse UnknownScript_0x19e13f clearevent EVENT_PARRY_IRON setevent $0268 - 2jump UnknownScript_0x19e127 + jump UnknownScript_0x19e127 ; 0x19e22d TrainerHikerTimothy: ; 0x19e22d @@ -335,7 +335,7 @@ TrainerHikerTimothy: ; 0x19e22d HikerTimothyScript: ; 0x19e239 talkaftercancel loadfont - 2writetext UnknownText_0x19e4f1 + writetext UnknownText_0x19e4f1 closetext loadmovesprites end @@ -364,7 +364,7 @@ TrainerCooltrainermRyan: ; 0x19e241 CooltrainermRyanScript: ; 0x19e24d talkaftercancel loadfont - 2writetext UnknownText_0x19e70d + writetext UnknownText_0x19e70d closetext loadmovesprites end @@ -393,7 +393,7 @@ TrainerCooltrainerfKelly: ; 0x19e255 CooltrainerfKellyScript: ; 0x19e261 talkaftercancel loadfont - 2writetext UnknownText_0x19e7d1 + writetext UnknownText_0x19e7d1 closetext loadmovesprites end @@ -404,7 +404,7 @@ YoungsterScript_0x19e269: ; 0x19e269 loadfont checkevent $05c3 iftrue UnknownScript_0x19e285 - 2writetext UnknownText_0x19e87f + writetext UnknownText_0x19e87f closetext loadmovesprites winlosstext UnknownText_0x19e899, $0000 @@ -417,14 +417,14 @@ YoungsterScript_0x19e269: ; 0x19e269 ; 0x19e285 UnknownScript_0x19e285: ; 0x19e285 - 2writetext UnknownText_0x19e8bb + writetext UnknownText_0x19e8bb closetext loadmovesprites end ; 0x19e28b UnknownScript_0x19e28b: ; 0x19e28b - 2writetext UnknownText_0x19e830 + writetext UnknownText_0x19e830 closetext loadmovesprites end diff --git a/maps/Route46.asm b/maps/Route46.asm index 72ae49260..41d76dc7f 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -29,7 +29,7 @@ TrainerCamperTed: ; 0x1a9680 CamperTedScript: ; 0x1a968c talkaftercancel loadfont - 2writetext UnknownText_0x1a9851 + writetext UnknownText_0x1a9851 closetext loadmovesprites end @@ -65,26 +65,26 @@ PicnickerErin1Script: ; 0x1a96a0 iftrue UnknownScript_0x1a975b checkevent $029d iftrue UnknownScript_0x1a96c3 - 2writetext UnknownText_0x1a98c6 + writetext UnknownText_0x1a98c6 keeptextopen setevent $029d - 2call UnknownScript_0x1a974f - 2jump UnknownScript_0x1a96c6 + scall UnknownScript_0x1a974f + jump UnknownScript_0x1a96c6 ; 0x1a96c3 UnknownScript_0x1a96c3: ; 0x1a96c3 - 2call UnknownScript_0x1a9753 + scall UnknownScript_0x1a9753 UnknownScript_0x1a96c6: ; 0x1a96c6 askforphonenumber $24 if_equal $1, UnknownScript_0x1a9763 if_equal $2, UnknownScript_0x1a975f trainertotext PICNICKER, ERIN1, $0 - 2call UnknownScript_0x1a9757 - 2jump UnknownScript_0x1a975b + scall UnknownScript_0x1a9757 + jump UnknownScript_0x1a975b ; 0x1a96da UnknownScript_0x1a96da: ; 0x1a96da - 2call UnknownScript_0x1a9767 + scall UnknownScript_0x1a9767 winlosstext PicnickerErin1BeatenText, $0000 copybytetovar $da0d if_equal $2, UnknownScript_0x1a96f1 @@ -123,11 +123,11 @@ UnknownScript_0x1a9717: ; 0x1a9717 iftrue UnknownScript_0x1a973b checkevent $0269 iftrue UnknownScript_0x1a973a - 2call UnknownScript_0x1a9772 + scall UnknownScript_0x1a9772 verbosegiveitem CALCIUM, 1 iffalse UnknownScript_0x1a976b setevent $0269 - 2jump UnknownScript_0x1a975b + jump UnknownScript_0x1a975b ; 0x1a973a UnknownScript_0x1a973a: ; 0x1a973a @@ -136,13 +136,13 @@ UnknownScript_0x1a973a: ; 0x1a973a UnknownScript_0x1a973b: ; 0x1a973b loadfont - 2writetext UnknownText_0x1a9927 + writetext UnknownText_0x1a9927 closetext verbosegiveitem CALCIUM, 1 iffalse UnknownScript_0x1a976b clearevent EVENT_ERIN_CALCIUM setevent $0269 - 2jump UnknownScript_0x1a975b + jump UnknownScript_0x1a975b ; 0x1a974f UnknownScript_0x1a974f: ; 0x1a974f @@ -214,7 +214,7 @@ TrainerHikerBailey: ; 0x1a9776 HikerBaileyScript: ; 0x1a9782 talkaftercancel loadfont - 2writetext UnknownText_0x1a97e8 + writetext UnknownText_0x1a97e8 closetext loadmovesprites end diff --git a/maps/Route5CleanseTagSpeechHouse.asm b/maps/Route5CleanseTagSpeechHouse.asm index d079f3591..806a6554f 100644 --- a/maps/Route5CleanseTagSpeechHouse.asm +++ b/maps/Route5CleanseTagSpeechHouse.asm @@ -11,13 +11,13 @@ GrannyScript_0x18b634: ; 0x18b634 loadfont checkevent EVENT_GOT_CLEANSE_TAG iftrue UnknownScript_0x18b649 - 2writetext UnknownText_0x18b655 + writetext UnknownText_0x18b655 keeptextopen verbosegiveitem CLEANSE_TAG, 1 iffalse UnknownScript_0x18b64d setevent EVENT_GOT_CLEANSE_TAG UnknownScript_0x18b649: ; 0x18b649 - 2writetext UnknownText_0x18b6a7 + writetext UnknownText_0x18b6a7 closetext UnknownScript_0x18b64d: ; 0x18b64d loadmovesprites diff --git a/maps/Route6.asm b/maps/Route6.asm index da8b289a0..5cb412a06 100644 --- a/maps/Route6.asm +++ b/maps/Route6.asm @@ -29,7 +29,7 @@ TrainerPokefanmRex: ; 0x1ad929 PokefanmRexScript: ; 0x1ad935 talkaftercancel loadfont - 2writetext UnknownText_0x1ad9ff + writetext UnknownText_0x1ad9ff closetext loadmovesprites end @@ -58,7 +58,7 @@ TrainerPokefanmAllan: ; 0x1ad93d PokefanmAllanScript: ; 0x1ad949 talkaftercancel loadfont - 2writetext UnknownText_0x1ada88 + writetext UnknownText_0x1ada88 closetext loadmovesprites end diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm index bf295023b..29eea10b6 100644 --- a/maps/Route6SaffronGate.asm +++ b/maps/Route6SaffronGate.asm @@ -18,14 +18,14 @@ OfficerScript_0x1926ea: ; 0x1926ea loadfont checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x1926f8 - 2writetext UnknownText_0x1926fe + writetext UnknownText_0x1926fe closetext loadmovesprites end ; 0x1926f8 UnknownScript_0x1926f8: ; 0x1926f8 - 2writetext UnknownText_0x1927cb + writetext UnknownText_0x1927cb closetext loadmovesprites end diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm index b8dded712..cba403de4 100644 --- a/maps/Route7SaffronGate.asm +++ b/maps/Route7SaffronGate.asm @@ -11,14 +11,14 @@ OfficerScript_0x73518: ; 0x73518 loadfont checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x73526 - 2writetext UnknownText_0x7352c + writetext UnknownText_0x7352c closetext loadmovesprites end ; 0x73526 UnknownScript_0x73526: ; 0x73526 - 2writetext UnknownText_0x73592 + writetext UnknownText_0x73592 closetext loadmovesprites end diff --git a/maps/Route8.asm b/maps/Route8.asm index e5184ed30..b7aad9cd7 100644 --- a/maps/Route8.asm +++ b/maps/Route8.asm @@ -29,7 +29,7 @@ TrainerBikerDwayne: ; 0x6c002 BikerDwayneScript: ; 0x6c00e talkaftercancel loadfont - 2writetext UnknownText_0x6c0c8 + writetext UnknownText_0x6c0c8 closetext loadmovesprites end @@ -58,7 +58,7 @@ TrainerBikerHarris: ; 0x6c016 BikerHarrisScript: ; 0x6c022 talkaftercancel loadfont - 2writetext UnknownText_0x6c143 + writetext UnknownText_0x6c143 closetext loadmovesprites end @@ -87,7 +87,7 @@ TrainerBikerZeke: ; 0x6c02a BikerZekeScript: ; 0x6c036 talkaftercancel loadfont - 2writetext UnknownText_0x6c1a3 + writetext UnknownText_0x6c1a3 closetext loadmovesprites end @@ -116,7 +116,7 @@ TrainerSupernerdSam: ; 0x6c03e SupernerdSamScript: ; 0x6c04a talkaftercancel loadfont - 2writetext UnknownText_0x6c219 + writetext UnknownText_0x6c219 closetext loadmovesprites end @@ -145,7 +145,7 @@ TrainerSupernerdTom: ; 0x6c052 SupernerdTomScript: ; 0x6c05e talkaftercancel loadfont - 2writetext UnknownText_0x6c27e + writetext UnknownText_0x6c27e closetext loadmovesprites end diff --git a/maps/Route9.asm b/maps/Route9.asm index 449da42dd..b5746b97d 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -29,7 +29,7 @@ TrainerCamperDean: ; 0x1aaf27 CamperDeanScript: ; 0x1aaf33 talkaftercancel loadfont - 2writetext UnknownText_0x1aafd9 + writetext UnknownText_0x1aafd9 closetext loadmovesprites end @@ -58,7 +58,7 @@ TrainerPicnickerHeidi: ; 0x1aaf3b PicnickerHeidiScript: ; 0x1aaf47 talkaftercancel loadfont - 2writetext UnknownText_0x1ab07c + writetext UnknownText_0x1ab07c closetext loadmovesprites end @@ -87,7 +87,7 @@ TrainerCamperSid: ; 0x1aaf4f CamperSidScript: ; 0x1aaf5b talkaftercancel loadfont - 2writetext UnknownText_0x1ab0f6 + writetext UnknownText_0x1ab0f6 closetext loadmovesprites end @@ -116,7 +116,7 @@ TrainerPicnickerEdna: ; 0x1aaf63 PicnickerEdnaScript: ; 0x1aaf6f talkaftercancel loadfont - 2writetext UnknownText_0x1ab15f + writetext UnknownText_0x1ab15f closetext loadmovesprites end @@ -145,7 +145,7 @@ TrainerHikerTim: ; 0x1aaf77 HikerTimScript: ; 0x1aaf83 talkaftercancel loadfont - 2writetext UnknownText_0x1ab210 + writetext UnknownText_0x1ab210 closetext loadmovesprites end @@ -174,7 +174,7 @@ TrainerHikerSidney: ; 0x1aaf8b HikerSidneyScript: ; 0x1aaf97 talkaftercancel loadfont - 2writetext UnknownText_0x1ab278 + writetext UnknownText_0x1ab278 closetext loadmovesprites end diff --git a/maps/RuinsofAlphAerodactylChamber.asm b/maps/RuinsofAlphAerodactylChamber.asm index cd4366089..3faf1c92b 100644 --- a/maps/RuinsofAlphAerodactylChamber.asm +++ b/maps/RuinsofAlphAerodactylChamber.asm @@ -98,7 +98,7 @@ MapRuinsofAlphAerodactylChamberSignpost3Script: ; 0x58e27 MapRuinsofAlphAerodactylChamberSignpost4Script: ; 0x58e2a loadfont - 2writetext UnknownText_0x58e4f + writetext UnknownText_0x58e4f writebyte $1 special $0087 loadmovesprites @@ -109,7 +109,7 @@ MapRuinsofAlphAerodactylChamberSignpost5Script: ; 0x58e35 checkevent EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER iftrue UnknownScript_0x58e46 loadfont - 2writetext UnknownText_0x58e81 + writetext UnknownText_0x58e81 writebyte $1 special $0087 loadmovesprites @@ -118,7 +118,7 @@ MapRuinsofAlphAerodactylChamberSignpost5Script: ; 0x58e35 UnknownScript_0x58e46: ; 0x58e46 loadfont - 2writetext UnknownText_0x58ea2 + writetext UnknownText_0x58ea2 closetext loadmovesprites end diff --git a/maps/RuinsofAlphHoOhChamber.asm b/maps/RuinsofAlphHoOhChamber.asm index 9e123d8b1..f4e0d1c1b 100644 --- a/maps/RuinsofAlphHoOhChamber.asm +++ b/maps/RuinsofAlphHoOhChamber.asm @@ -99,7 +99,7 @@ MapRuinsofAlphHoOhChamberSignpost3Script: ; 0x585ea MapRuinsofAlphHoOhChamberSignpost4Script: ; 0x585ed loadfont - 2writetext UnknownText_0x58612 + writetext UnknownText_0x58612 writebyte $3 special $0087 loadmovesprites @@ -110,7 +110,7 @@ MapRuinsofAlphHoOhChamberSignpost5Script: ; 0x585f8 checkevent EVENT_WALL_OPENED_IN_HO_OH_CHAMBER iftrue UnknownScript_0x58609 loadfont - 2writetext UnknownText_0x58644 + writetext UnknownText_0x58644 writebyte $3 special $0087 loadmovesprites @@ -119,7 +119,7 @@ MapRuinsofAlphHoOhChamberSignpost5Script: ; 0x585f8 UnknownScript_0x58609: ; 0x58609 loadfont - 2writetext UnknownText_0x58665 + writetext UnknownText_0x58665 closetext loadmovesprites end diff --git a/maps/RuinsofAlphInnerChamber.asm b/maps/RuinsofAlphInnerChamber.asm index f05e1e48b..9e1ed41a6 100644 --- a/maps/RuinsofAlphInnerChamber.asm +++ b/maps/RuinsofAlphInnerChamber.asm @@ -24,7 +24,7 @@ UnknownScript_0x58f6d: ; 0x58f6d UnknownScript_0x58f6e: ; 0x58f6e loadfont - 2writetext UnknownText_0x58f89 + writetext UnknownText_0x58f89 closetext loadmovesprites dotrigger $0 diff --git a/maps/RuinsofAlphKabutoChamber.asm b/maps/RuinsofAlphKabutoChamber.asm index cd502aff2..cd8d33cc7 100644 --- a/maps/RuinsofAlphKabutoChamber.asm +++ b/maps/RuinsofAlphKabutoChamber.asm @@ -105,10 +105,10 @@ ScientistScript_0x587a8: ; 0x587a8 iftrue UnknownScript_0x587c9 checkevent $02a1 iffalse UnknownScript_0x587c0 - 2writetext UnknownText_0x589b8 + writetext UnknownText_0x589b8 keeptextopen UnknownScript_0x587c0: ; 0x587c0 - 2writetext UnknownText_0x588f5 + writetext UnknownText_0x588f5 closetext loadmovesprites spriteface $3, $1 @@ -116,14 +116,14 @@ UnknownScript_0x587c0: ; 0x587c0 ; 0x587c9 UnknownScript_0x587c9: ; 0x587c9 - 2writetext UnknownText_0x5897c + writetext UnknownText_0x5897c closetext loadmovesprites end ; 0x587cf UnknownScript_0x587cf: ; 0x587cf - 2writetext UnknownText_0x594cb + writetext UnknownText_0x594cb closetext loadmovesprites end @@ -139,7 +139,7 @@ MapRuinsofAlphKabutoChamberSignpost3Script: ; 0x587d8 MapRuinsofAlphKabutoChamberSignpost4Script: ; 0x587db loadfont - 2writetext UnknownText_0x58aa7 + writetext UnknownText_0x58aa7 writebyte $0 special $0087 loadmovesprites @@ -150,7 +150,7 @@ MapRuinsofAlphKabutoChamberSignpost5Script: ; 0x587e6 checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER iftrue UnknownScript_0x587f7 loadfont - 2writetext UnknownText_0x58ad9 + writetext UnknownText_0x58ad9 writebyte $0 special $0087 loadmovesprites @@ -159,7 +159,7 @@ MapRuinsofAlphKabutoChamberSignpost5Script: ; 0x587e6 UnknownScript_0x587f7: ; 0x587f7 loadfont - 2writetext UnknownText_0x58afa + writetext UnknownText_0x58afa closetext loadmovesprites end diff --git a/maps/RuinsofAlphOmanyteChamber.asm b/maps/RuinsofAlphOmanyteChamber.asm index 44be92c98..04f3bfa7d 100644 --- a/maps/RuinsofAlphOmanyteChamber.asm +++ b/maps/RuinsofAlphOmanyteChamber.asm @@ -99,7 +99,7 @@ MapRuinsofAlphOmanyteChamberSignpost3Script: ; 0x58c66 MapRuinsofAlphOmanyteChamberSignpost4Script: ; 0x58c69 loadfont - 2writetext UnknownText_0x58c8e + writetext UnknownText_0x58c8e writebyte $2 special $0087 loadmovesprites @@ -110,7 +110,7 @@ MapRuinsofAlphOmanyteChamberSignpost5Script: ; 0x58c74 checkevent EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER iftrue UnknownScript_0x58c85 loadfont - 2writetext UnknownText_0x58cc0 + writetext UnknownText_0x58cc0 writebyte $2 special $0087 loadmovesprites @@ -119,7 +119,7 @@ MapRuinsofAlphOmanyteChamberSignpost5Script: ; 0x58c74 UnknownScript_0x58c85: ; 0x58c85 loadfont - 2writetext UnknownText_0x58ce1 + writetext UnknownText_0x58ce1 closetext loadmovesprites end diff --git a/maps/RuinsofAlphOutside.asm b/maps/RuinsofAlphOutside.asm index 0e2684092..492e9d448 100644 --- a/maps/RuinsofAlphOutside.asm +++ b/maps/RuinsofAlphOutside.asm @@ -27,13 +27,13 @@ UnknownScript_0x5800f: ; 0x5800f iftrue UnknownScript_0x5802c checkevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS iftrue UnknownScript_0x5801e - 2jump UnknownScript_0x5802c + jump UnknownScript_0x5802c ; 0x5801e UnknownScript_0x5801e: ; 0x5801e checkcode $e if_greater_than $2, UnknownScript_0x58027 - 2jump UnknownScript_0x5802c + jump UnknownScript_0x5802c ; 0x58027 UnknownScript_0x58027: ; 0x58027 @@ -51,20 +51,20 @@ UnknownScript_0x5802c: ; 0x5802c UnknownScript_0x58031: ; 0x58031 spriteface $3, $1 spriteface $0, $0 - 2jump UnknownScript_0x58044 + jump UnknownScript_0x58044 ; 0x5803a UnknownScript_0x5803a: ; 0x5803a spriteface $3, $2 spriteface $0, $3 - 2jump UnknownScript_0x58044 + jump UnknownScript_0x58044 ; 0x58043 ScientistScript_0x58043: ; 0x58043 faceplayer UnknownScript_0x58044: ; 0x58044 loadfont - 2writetext UnknownText_0x580c7 + writetext UnknownText_0x580c7 closetext loadmovesprites playmusic MUSIC_SHOW_ME_AROUND @@ -84,10 +84,10 @@ FisherScript_0x58061: ; 0x58061 checkevent $00bc iftrue UnknownScript_0x58070 setevent $00bc - 2writetext UnknownText_0x583a4 + writetext UnknownText_0x583a4 keeptextopen UnknownScript_0x58070: ;0x58070 - 2writetext UnknownText_0x58420 + writetext UnknownText_0x58420 closetext loadmovesprites end @@ -96,7 +96,7 @@ UnknownScript_0x58070: ;0x58070 YoungsterScript_0x58076: ; 0x58076 faceplayer loadfont - 2writetext UnknownText_0x58449 + writetext UnknownText_0x58449 closetext loadmovesprites end @@ -105,7 +105,7 @@ YoungsterScript_0x58076: ; 0x58076 YoungsterScript_0x5807e: ; 0x5807e faceplayer loadfont - 2writetext UnknownText_0x5848e + writetext UnknownText_0x5848e closetext loadmovesprites spriteface $6, $1 @@ -135,7 +135,7 @@ TrainerPsychicNathan: ; 0x58089 PsychicNathanScript: ; 0x58095 talkaftercancel loadfont - 2writetext UnknownText_0x5830e + writetext UnknownText_0x5830e closetext loadmovesprites end @@ -165,7 +165,7 @@ TrainerSuperNerdStan: ; 0x5809d UnknownScript_0x580a9: ; 0x580a9 talkaftercancel loadfont - 2writetext UnknownText_0x58250 + writetext UnknownText_0x58250 closetext loadmovesprites end diff --git a/maps/RuinsofAlphResearchCenter.asm b/maps/RuinsofAlphResearchCenter.asm index f1b1a0d38..238f6d8b7 100644 --- a/maps/RuinsofAlphResearchCenter.asm +++ b/maps/RuinsofAlphResearchCenter.asm @@ -47,16 +47,16 @@ UnknownScript_0x59192: ; 0x59192 pause 30 spriteface $4, $0 loadfont - 2writetext UnknownText_0x59278 + writetext UnknownText_0x59278 closetext loadmovesprites applymovement $4, MovementData_0x59274 loadfont - 2writetext UnknownText_0x592fa + writetext UnknownText_0x592fa playsound SFX_ITEM waitbutton setflag $000c - 2writetext UnknownText_0x59311 + writetext UnknownText_0x59311 closetext loadmovesprites applymovement $4, MovementData_0x59276 @@ -70,14 +70,14 @@ ScientistScript_0x591d1: ; 0x591d1 loadfont checkcode $e if_equal 26, UnknownScript_0x591df - 2writetext UnknownText_0x59311 + writetext UnknownText_0x59311 closetext loadmovesprites end ; 0x591df UnknownScript_0x591df: ; 0x591df - 2writetext UnknownText_0x5935f + writetext UnknownText_0x5935f closetext loadmovesprites end @@ -92,28 +92,28 @@ ScientistScript_0x591e5: ; 0x591e5 iftrue UnknownScript_0x59205 checkevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS iftrue UnknownScript_0x591ff - 2writetext UnknownText_0x593ed + writetext UnknownText_0x593ed closetext loadmovesprites end ; 0x591ff UnknownScript_0x591ff: ; 0x591ff - 2writetext UnknownText_0x59478 + writetext UnknownText_0x59478 closetext loadmovesprites end ; 0x59205 UnknownScript_0x59205: ; 0x59205 - 2writetext UnknownText_0x59445 + writetext UnknownText_0x59445 closetext loadmovesprites end ; 0x5920b UnknownScript_0x5920b: ; 0x5920b - 2writetext UnknownText_0x594cb + writetext UnknownText_0x594cb closetext loadmovesprites clearevent $078f @@ -127,21 +127,21 @@ ScientistScript_0x59214: ; 0x59214 if_equal 26, UnknownScript_0x5922e checkevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS iftrue UnknownScript_0x59228 - 2writetext UnknownText_0x5954f + writetext UnknownText_0x5954f closetext loadmovesprites end ; 0x59228 UnknownScript_0x59228: ; 0x59228 - 2writetext UnknownText_0x595cb + writetext UnknownText_0x595cb closetext loadmovesprites end ; 0x5922e UnknownScript_0x5922e: ; 0x5922e - 2writetext UnknownText_0x59769 + writetext UnknownText_0x59769 closetext loadmovesprites end @@ -154,14 +154,14 @@ MapRuinsofAlphResearchCenterSignpost1Script: ; 0x59234 checkcode $e if_equal 26, UnknownScript_0x59247 UnknownScript_0x59241: ; 0x59241 - 2writetext UnknownText_0x597b6 + writetext UnknownText_0x597b6 closetext loadmovesprites end ; 0x59247 UnknownScript_0x59247: ; 0x59247 - 2writetext UnknownText_0x597d9 + writetext UnknownText_0x597d9 closetext loadmovesprites end @@ -174,14 +174,14 @@ MapRuinsofAlphResearchCenterSignpost2Script: ; 0x5924d checkcode $e if_equal 26, UnknownScript_0x59260 UnknownScript_0x5925a: ; 0x5925a - 2writetext UnknownText_0x5980e + writetext UnknownText_0x5980e closetext loadmovesprites end ; 0x59260 UnknownScript_0x59260: ; 0x59260 - 2writetext UnknownText_0x5982d + writetext UnknownText_0x5982d closetext special $0027 loadmovesprites diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm index 4b6414dde..03e579b7f 100644 --- a/maps/SafariZoneWardensHome.asm +++ b/maps/SafariZoneWardensHome.asm @@ -11,7 +11,7 @@ LassScript_0x1965c6: ; 0x1965c6 loadfont checkevent EVENT_TALKED_TO_WARDENS_GRANDDAUGHTER iftrue UnknownScript_0x1965d7 - 2writetext UnknownText_0x1965e6 + writetext UnknownText_0x1965e6 closetext loadmovesprites setevent EVENT_TALKED_TO_WARDENS_GRANDDAUGHTER @@ -19,7 +19,7 @@ LassScript_0x1965c6: ; 0x1965c6 ; 0x1965d7 UnknownScript_0x1965d7: ; 0x1965d7 - 2writetext UnknownText_0x196691 + writetext UnknownText_0x196691 closetext loadmovesprites end diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index 9c08c72d3..081f569e6 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -20,14 +20,14 @@ LassScript_0x19932a: ; 0x19932a loadfont checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x199338 - 2writetext UnknownText_0x19938d + writetext UnknownText_0x19938d closetext loadmovesprites end ; 0x199338 UnknownScript_0x199338: ; 0x199338 - 2writetext UnknownText_0x19940d + writetext UnknownText_0x19940d closetext loadmovesprites end @@ -38,14 +38,14 @@ PokefanMScript_0x19933e: ; 0x19933e loadfont checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x19934c - 2writetext UnknownText_0x199460 + writetext UnknownText_0x199460 closetext loadmovesprites end ; 0x19934c UnknownScript_0x19934c: ; 0x19934c - 2writetext UnknownText_0x1994ae + writetext UnknownText_0x1994ae closetext loadmovesprites end @@ -64,14 +64,14 @@ FisherScript_0x199358: ; 0x199358 loadfont checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x199366 - 2writetext UnknownText_0x1995fc + writetext UnknownText_0x1995fc closetext loadmovesprites end ; 0x199366 UnknownScript_0x199366: ; 0x199366 - 2writetext UnknownText_0x19964b + writetext UnknownText_0x19964b closetext loadmovesprites end diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index 205e29034..15b95d155 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -11,7 +11,7 @@ SabrinaScript_0x189c2e: ; 0x189c2e loadfont checkflag $0028 iftrue UnknownScript_0x189c65 - 2writetext UnknownText_0x189cdf + writetext UnknownText_0x189cdf closetext loadmovesprites winlosstext UnknownText_0x189df4, $0000 @@ -24,18 +24,18 @@ SabrinaScript_0x189c2e: ; 0x189c2e setevent EVENT_BEAT_PSYCHIC_FRANKLIN setevent EVENT_BEAT_PSYCHIC_JARED loadfont - 2writetext UnknownText_0x189e95 + writetext UnknownText_0x189e95 playsound SFX_GET_BADGE waitbutton setflag $0028 - 2writetext UnknownText_0x189ead + writetext UnknownText_0x189ead closetext loadmovesprites end ; 0x189c65 UnknownScript_0x189c65: ; 0x189c65 - 2writetext UnknownText_0x189f6c + writetext UnknownText_0x189f6c closetext loadmovesprites end @@ -64,7 +64,7 @@ TrainerMediumRebecca: ; 0x189c6b MediumRebeccaScript: ; 0x189c77 talkaftercancel loadfont - 2writetext UnknownText_0x18a034 + writetext UnknownText_0x18a034 closetext loadmovesprites end @@ -93,7 +93,7 @@ TrainerPsychicFranklin: ; 0x189c7f PsychicFranklinScript: ; 0x189c8b talkaftercancel loadfont - 2writetext UnknownText_0x18a0a6 + writetext UnknownText_0x18a0a6 closetext loadmovesprites end @@ -122,7 +122,7 @@ TrainerMediumDoris: ; 0x189c93 MediumDorisScript: ; 0x189c9f talkaftercancel loadfont - 2writetext UnknownText_0x18a136 + writetext UnknownText_0x18a136 closetext loadmovesprites end @@ -151,7 +151,7 @@ TrainerPsychicJared: ; 0x189ca7 PsychicJaredScript: ; 0x189cb3 talkaftercancel loadfont - 2writetext UnknownText_0x18a1b3 + writetext UnknownText_0x18a1b3 closetext loadmovesprites end @@ -162,13 +162,13 @@ SaffronGymGuyScript: ; 0x189cbb loadfont checkevent EVENT_BEAT_SABRINA iftrue .SaffronGymGuyWinScript - 2writetext SaffronGymGuyText + writetext SaffronGymGuyText closetext loadmovesprites end .SaffronGymGuyWinScript - 2writetext SaffronGymGuyWinText + writetext SaffronGymGuyWinText closetext loadmovesprites end diff --git a/maps/SaffronPokeCenter1F.asm b/maps/SaffronPokeCenter1F.asm index 9cc763df6..b334a24af 100644 --- a/maps/SaffronPokeCenter1F.asm +++ b/maps/SaffronPokeCenter1F.asm @@ -25,14 +25,14 @@ FisherScript_0x18a48c: ; 0x18a48c loadfont checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x18a49a - 2writetext UnknownText_0x18a5d3 + writetext UnknownText_0x18a5d3 closetext loadmovesprites end ; 0x18a49a UnknownScript_0x18a49a: ; 0x18a49a - 2writetext UnknownText_0x18a62e + writetext UnknownText_0x18a62e closetext loadmovesprites end diff --git a/maps/SaffronTrainStation.asm b/maps/SaffronTrainStation.asm index 50cfd0d6e..c809e94c2 100644 --- a/maps/SaffronTrainStation.asm +++ b/maps/SaffronTrainStation.asm @@ -18,19 +18,19 @@ OfficerScript_0x18a81e: ; 0x18a81e loadfont checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x18a82c - 2writetext UnknownText_0x18a8a9 + writetext UnknownText_0x18a8a9 closetext loadmovesprites end ; 0x18a82c UnknownScript_0x18a82c: ; 0x18a82c - 2writetext UnknownText_0x18a8dd + writetext UnknownText_0x18a8dd yesorno iffalse UnknownScript_0x18a85c checkitem PASS iffalse UnknownScript_0x18a856 - 2writetext UnknownText_0x18a917 + writetext UnknownText_0x18a917 closetext loadmovesprites applymovement $2, MovementData_0x18a88f @@ -50,14 +50,14 @@ MovementData_0x18a854: ; 0x18a854 ; 0x18a856 UnknownScript_0x18a856: ; 0x18a856 - 2writetext UnknownText_0x18a956 + writetext UnknownText_0x18a956 closetext loadmovesprites end ; 0x18a85c UnknownScript_0x18a85c: ; 0x18a85c - 2writetext UnknownText_0x18a978 + writetext UnknownText_0x18a978 closetext loadmovesprites end @@ -68,7 +68,7 @@ UnknownScript_0x18a862: ; 0x18a862 applymovement $0, MovementData_0x18a8a1 applymovement $2, MovementData_0x18a894 loadfont - 2writetext UnknownText_0x18a993 + writetext UnknownText_0x18a993 closetext loadmovesprites end @@ -79,14 +79,14 @@ GymGuyScript_0x18a875: ; 0x18a875 loadfont checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x18a883 - 2writetext UnknownText_0x18a9ca + writetext UnknownText_0x18a9ca closetext loadmovesprites end ; 0x18a883 UnknownScript_0x18a883: ; 0x18a883 - 2writetext UnknownText_0x18aa61 + writetext UnknownText_0x18aa61 closetext loadmovesprites end diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm index d62909263..bd109f3f7 100644 --- a/maps/SeafoamGym.asm +++ b/maps/SeafoamGym.asm @@ -18,7 +18,7 @@ BlaineScript_0x1ab4fb: ; 0x1ab4fb loadfont checkflag $0029 iftrue UnknownScript_0x1ab52b - 2writetext UnknownText_0x1ab548 + writetext UnknownText_0x1ab548 closetext loadmovesprites winlosstext UnknownText_0x1ab646, $0000 @@ -30,18 +30,18 @@ UnknownScript_0x1ab516: ; 0x1ab516 returnafterbattle setevent $04cb loadfont - 2writetext UnknownText_0x1ab683 + writetext UnknownText_0x1ab683 playsound SFX_GET_BADGE waitbutton setflag $0029 - 2writetext UnknownText_0x1ab69d + writetext UnknownText_0x1ab69d closetext loadmovesprites end ; 0x1ab52b UnknownScript_0x1ab52b: ; 0x1ab52b - 2writetext UnknownText_0x1ab71c + writetext UnknownText_0x1ab71c closetext loadmovesprites end @@ -52,14 +52,14 @@ SeafoamGymGuyScript: ; 0x1ab531 loadfont checkevent EVENT_TALKED_TO_SEAFOAM_GYM_GUY_ONCE iftrue .TalkedToSeafoamGymGuyScript - 2writetext SeafoamGymGuyWinText + writetext SeafoamGymGuyWinText closetext loadmovesprites setevent EVENT_TALKED_TO_SEAFOAM_GYM_GUY_ONCE end .TalkedToSeafoamGymGuyScript - 2writetext SeafoamGymGuyWinText2 + writetext SeafoamGymGuyWinText2 closetext loadmovesprites end diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm index 92b985023..e977aad49 100644 --- a/maps/SilphCo1F.asm +++ b/maps/SilphCo1F.asm @@ -15,13 +15,13 @@ OfficerScript_0x18abe8: ; 0x18abe8 loadfont checkevent EVENT_GOT_UP_GRADE iftrue UnknownScript_0x18abfd - 2writetext UnknownText_0x18ac36 + writetext UnknownText_0x18ac36 keeptextopen verbosegiveitem UP_GRADE, 1 iffalse UnknownScript_0x18ac01 setevent EVENT_GOT_UP_GRADE UnknownScript_0x18abfd: ; 0x18abfd - 2writetext UnknownText_0x18aca8 + writetext UnknownText_0x18aca8 closetext UnknownScript_0x18ac01: ; 0x18ac01 loadmovesprites diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index f58e611b7..cd4df3362 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -10,7 +10,7 @@ RedScript_0x18c603: ; 0x18c603 special $006a faceplayer loadfont - 2writetext UnknownText_0x18c637 + writetext UnknownText_0x18c637 closetext loadmovesprites winlosstext UnknownText_0x18c63c, UnknownText_0x18c63c @@ -20,7 +20,7 @@ RedScript_0x18c603: ; 0x18c603 returnafterbattle special $006a loadfont - 2writetext UnknownText_0x18c63f + writetext UnknownText_0x18c63f closetext loadmovesprites special $0030 diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index 8af140f05..e1e017eee 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -33,7 +33,7 @@ TrainerGruntM29: ; 0x5a5d8 GruntM29Script: ; 0x5a5e4 talkaftercancel loadfont - 2writetext TrainerGruntM29SlowpokeProfitText + writetext TrainerGruntM29SlowpokeProfitText closetext loadmovesprites end @@ -61,7 +61,7 @@ TrainerGruntM1: ; 0x5a5ec GruntM1Script: ; 0x5a5f8 loadfont - 2writetext TrainerGruntM1WhenTalkText + writetext TrainerGruntM1WhenTalkText closetext loadmovesprites special $0030 @@ -78,7 +78,7 @@ GruntM1Script: ; 0x5a5f8 applymovement $8, KurtSlowpokeWellVictoryMovementData spriteface $0, $3 loadfont - 2writetext KurtLeaveSlowpokeWellText + writetext KurtLeaveSlowpokeWellText closetext loadmovesprites setevent EVENT_CLEARED_SLOWPOKE_WELL @@ -123,7 +123,7 @@ TrainerGruntM2: ; 0x5a659 GruntM2Script: ; 0x5a665 talkaftercancel loadfont - 2writetext UnknownText_0x5aaf2 + writetext UnknownText_0x5aaf2 closetext loadmovesprites end @@ -152,7 +152,7 @@ TrainerGruntF1: ; 0x5a66d GruntF1Script: ; 0x5a679 talkaftercancel loadfont - 2writetext UnknownText_0x5ab8d + writetext UnknownText_0x5ab8d closetext loadmovesprites end @@ -162,7 +162,7 @@ SlowpokeScript_0x5a681: ; 0x5a681 faceplayer loadfont cry SLOWPOKE - 2writetext UnknownText_0x5abcb + writetext UnknownText_0x5abcb yesorno iftrue UnknownScript_0x5a68f loadmovesprites @@ -170,7 +170,7 @@ SlowpokeScript_0x5a681: ; 0x5a681 ; 0x5a68f UnknownScript_0x5a68f: ; 0x5a68f - 2writetext UnknownText_0x5ac09 + writetext UnknownText_0x5ac09 closetext loadmovesprites end @@ -179,7 +179,7 @@ UnknownScript_0x5a68f: ; 0x5a68f SlowpokeScript_0x5a695: ; 0x5a695 faceplayer loadfont - 2writetext UnknownText_0x5ac61 + writetext UnknownText_0x5ac61 cry SLOWPOKE closetext loadmovesprites diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm index 51f12a0e0..02bb779af 100644 --- a/maps/SlowpokeWellB2F.asm +++ b/maps/SlowpokeWellB2F.asm @@ -11,7 +11,7 @@ GymGuyScript_0x5ad0b: ; 0x5ad0b loadfont checkevent EVENT_GOT_KINGS_ROCK_IN_SLOWPOKE_WELL iftrue UnknownScript_0x5ad22 - 2writetext UnknownText_0x5ad2a + writetext UnknownText_0x5ad2a keeptextopen verbosegiveitem KINGS_ROCK, 1 iffalse UnknownScript_0x5ad20 @@ -22,7 +22,7 @@ UnknownScript_0x5ad20: ; 0x5ad20 ; 0x5ad22 UnknownScript_0x5ad22: ; 0x5ad22 - 2writetext UnknownText_0x5adf2 + writetext UnknownText_0x5adf2 closetext loadmovesprites end diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm index e8da1afe5..50d4651df 100644 --- a/maps/SproutTower1F.asm +++ b/maps/SproutTower1F.asm @@ -45,7 +45,7 @@ TrainerSageChow: ; 0x18450a SageChowScript: ; 0x184516 talkaftercancel loadfont - 2writetext UnknownText_0x184583 + writetext UnknownText_0x184583 closetext loadmovesprites end diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm index 5c334014c..c99b2f05e 100644 --- a/maps/SproutTower2F.asm +++ b/maps/SproutTower2F.asm @@ -29,7 +29,7 @@ TrainerSageNico: ; 0x18477c SageNicoScript: ; 0x184788 talkaftercancel loadfont - 2writetext UnknownText_0x1847ff + writetext UnknownText_0x1847ff closetext loadmovesprites end @@ -58,7 +58,7 @@ TrainerSageEdmond: ; 0x184790 SageEdmondScript: ; 0x18479c talkaftercancel loadfont - 2writetext UnknownText_0x18486f + writetext UnknownText_0x18486f closetext loadmovesprites end diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index 6021f6ef3..1db16e21c 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -32,7 +32,7 @@ UnknownScript_0x184947: ; 0x184947 applymovement $0, MovementData_0x184a1d applymovement $8, MovementData_0x184a22 loadfont - 2writetext UnknownText_0x184a27 + writetext UnknownText_0x184a27 closetext loadmovesprites showemote $0, $8, 15 @@ -41,12 +41,12 @@ UnknownScript_0x184947: ; 0x184947 applymovement $8, MovementData_0x184a24 playmusic MUSIC_RIVAL_ENCOUNTER loadfont - 2writetext UnknownText_0x184aec + writetext UnknownText_0x184aec closetext loadmovesprites spriteface $8, $1 loadfont - 2writetext UnknownText_0x184bc8 + writetext UnknownText_0x184bc8 pause 15 loadmovesprites playsound SFX_WARP_TO @@ -65,7 +65,7 @@ SageLiScript: ; 0x1849a6 loadfont checkevent EVENT_GOT_HM05_FLASH iftrue UnknownScript_0x1849d1 - 2writetext SageLiSeenText + writetext SageLiSeenText closetext loadmovesprites winlosstext SageLiBeatenText, $0000 @@ -73,19 +73,19 @@ SageLiScript: ; 0x1849a6 startbattle returnafterbattle loadfont - 2writetext UnknownText_0x184cc2 + writetext UnknownText_0x184cc2 keeptextopen verbosegiveitem HM_05, 1 setevent EVENT_GOT_HM05_FLASH setevent EVENT_BEAT_SAGE_LI - 2writetext UnknownText_0x184d13 + writetext UnknownText_0x184d13 closetext loadmovesprites end ; 0x1849d1 UnknownScript_0x1849d1: ; 0x1849d1 - 2writetext UnknownText_0x184d88 + writetext UnknownText_0x184d88 closetext loadmovesprites end @@ -114,7 +114,7 @@ TrainerSageJin: ; 0x1849d7 SageJinScript: ; 0x1849e3 talkaftercancel loadfont - 2writetext UnknownText_0x184dfa + writetext UnknownText_0x184dfa closetext loadmovesprites end @@ -143,7 +143,7 @@ TrainerSageTroy: ; 0x1849eb SageTroyScript: ; 0x1849f7 talkaftercancel loadfont - 2writetext UnknownText_0x184ea4 + writetext UnknownText_0x184ea4 closetext loadmovesprites end @@ -172,7 +172,7 @@ TrainerSageNeal: ; 0x1849ff SageNealScript: ; 0x184a0b talkaftercancel loadfont - 2writetext UnknownText_0x184f12 + writetext UnknownText_0x184f12 closetext loadmovesprites end diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index d0aa17c29..14152bdb1 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -25,7 +25,7 @@ UnknownScript_0x6c65b: ; 0x6c65b SecurityCamera1a: ; 0x6c65e checkevent EVENT_SECURITY_CAMERA_1 iftrue NoSecurityCamera - 2call PlaySecurityCameraSounds + scall PlaySecurityCameraSounds checkevent $06da iftrue NoSecurityCamera showemote $0, $0, 15 @@ -34,15 +34,15 @@ SecurityCamera1a: ; 0x6c65e appear $2 spriteface $0, $2 applymovement $2, SecurityCameraMovement1 - 2call TrainerCameraGrunt1 + scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera - 2call PlaySecurityCameraSounds + scall PlaySecurityCameraSounds showemote $0, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER moveperson $2, $13, $2 appear $2 applymovement $2, SecurityCameraMovement1 - 2call TrainerCameraGrunt2 + scall TrainerCameraGrunt2 if_equal $1, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_1 end @@ -51,7 +51,7 @@ SecurityCamera1a: ; 0x6c65e SecurityCamera1b: ; 0x6c6a7 checkevent EVENT_SECURITY_CAMERA_1 iftrue NoSecurityCamera - 2call PlaySecurityCameraSounds + scall PlaySecurityCameraSounds checkevent $06da iftrue NoSecurityCamera showemote $0, $0, 15 @@ -60,15 +60,15 @@ SecurityCamera1b: ; 0x6c6a7 appear $2 spriteface $0, $2 applymovement $2, SecurityCameraMovement1 - 2call TrainerCameraGrunt1 + scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera - 2call PlaySecurityCameraSounds + scall PlaySecurityCameraSounds showemote $0, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER moveperson $2, $13, $3 appear $2 applymovement $2, SecurityCameraMovement1 - 2call TrainerCameraGrunt2 + scall TrainerCameraGrunt2 if_equal $1, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_1 end @@ -77,7 +77,7 @@ SecurityCamera1b: ; 0x6c6a7 SecurityCamera2a: ; 0x6c6f0 checkevent EVENT_SECURITY_CAMERA_2 iftrue NoSecurityCamera - 2call PlaySecurityCameraSounds + scall PlaySecurityCameraSounds checkevent $06da iftrue NoSecurityCamera showemote $0, $0, 15 @@ -86,16 +86,16 @@ SecurityCamera2a: ; 0x6c6f0 appear $2 spriteface $0, $2 applymovement $2, SecurityCameraMovement2 - 2call TrainerCameraGrunt1 + scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera - 2call PlaySecurityCameraSounds + scall PlaySecurityCameraSounds showemote $0, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface $0, $3 moveperson $2, $c, $5 appear $2 applymovement $2, SecurityCameraMovement3 - 2call TrainerCameraGrunt2 + scall TrainerCameraGrunt2 if_equal $1, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_2 end @@ -104,7 +104,7 @@ SecurityCamera2a: ; 0x6c6f0 SecurityCamera2b: ; 0x6c73c checkevent EVENT_SECURITY_CAMERA_2 iftrue NoSecurityCamera - 2call PlaySecurityCameraSounds + scall PlaySecurityCameraSounds checkevent $06da iftrue NoSecurityCamera showemote $0, $0, 15 @@ -113,16 +113,16 @@ SecurityCamera2b: ; 0x6c73c appear $2 spriteface $0, $2 applymovement $2, SecurityCameraMovement4 - 2call TrainerCameraGrunt1 + scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera - 2call PlaySecurityCameraSounds + scall PlaySecurityCameraSounds showemote $0, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface $0, $3 moveperson $2, $c, $5 appear $2 applymovement $2, SecurityCameraMovement5 - 2call TrainerCameraGrunt2 + scall TrainerCameraGrunt2 if_equal $1, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_2 end @@ -131,7 +131,7 @@ SecurityCamera2b: ; 0x6c73c SecurityCamera3a: ; 0x6c788 checkevent EVENT_SECURITY_CAMERA_3 iftrue NoSecurityCamera - 2call PlaySecurityCameraSounds + scall PlaySecurityCameraSounds checkevent $06da iftrue NoSecurityCamera showemote $0, $0, 15 @@ -140,16 +140,16 @@ SecurityCamera3a: ; 0x6c788 appear $2 spriteface $0, $2 applymovement $2, SecurityCameraMovement1 - 2call TrainerCameraGrunt1 + scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera - 2call PlaySecurityCameraSounds + scall PlaySecurityCameraSounds showemote $0, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface $0, $3 moveperson $2, $19, $b appear $2 applymovement $2, SecurityCameraMovement6 - 2call TrainerCameraGrunt2 + scall TrainerCameraGrunt2 if_equal $1, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_3 end @@ -158,7 +158,7 @@ SecurityCamera3a: ; 0x6c788 SecurityCamera3b: ; 0x6c7d4 checkevent EVENT_SECURITY_CAMERA_3 iftrue NoSecurityCamera - 2call PlaySecurityCameraSounds + scall PlaySecurityCameraSounds checkevent $06da iftrue NoSecurityCamera showemote $0, $0, 15 @@ -167,16 +167,16 @@ SecurityCamera3b: ; 0x6c7d4 appear $2 spriteface $0, $2 applymovement $2, SecurityCameraMovement1 - 2call TrainerCameraGrunt1 + scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera - 2call PlaySecurityCameraSounds + scall PlaySecurityCameraSounds showemote $0, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface $0, $3 moveperson $2, $19, $c appear $2 applymovement $2, SecurityCameraMovement7 - 2call TrainerCameraGrunt2 + scall TrainerCameraGrunt2 if_equal $1, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_3 end @@ -185,7 +185,7 @@ SecurityCamera3b: ; 0x6c7d4 SecurityCamera4: ; 0x6c820 checkevent EVENT_SECURITY_CAMERA_4 iftrue NoSecurityCamera - 2call PlaySecurityCameraSounds + scall PlaySecurityCameraSounds checkevent $06da iftrue NoSecurityCamera showemote $0, $0, 15 @@ -194,16 +194,16 @@ SecurityCamera4: ; 0x6c820 appear $2 spriteface $0, $2 applymovement $2, SecurityCameraMovement1 - 2call TrainerCameraGrunt1 + scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera - 2call PlaySecurityCameraSounds + scall PlaySecurityCameraSounds showemote $0, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface $0, $3 moveperson $2, $19, $b appear $2 applymovement $2, SecurityCameraMovement8 - 2call TrainerCameraGrunt2 + scall TrainerCameraGrunt2 if_equal $1, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_4 end @@ -212,7 +212,7 @@ SecurityCamera4: ; 0x6c820 SecurityCamera5: ; 0x6c86c checkevent EVENT_SECURITY_CAMERA_5 iftrue NoSecurityCamera - 2call PlaySecurityCameraSounds + scall PlaySecurityCameraSounds checkevent $06da iftrue NoSecurityCamera showemote $0, $0, 15 @@ -221,16 +221,16 @@ SecurityCamera5: ; 0x6c86c appear $2 spriteface $0, $2 applymovement $2, SecurityCameraMovement1 - 2call TrainerCameraGrunt1 + scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera - 2call PlaySecurityCameraSounds + scall PlaySecurityCameraSounds showemote $0, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface $0, $3 moveperson $2, $e, $10 appear $2 applymovement $2, SecurityCameraMovement9 - 2call TrainerCameraGrunt2 + scall TrainerCameraGrunt2 if_equal $1, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_5 end @@ -242,7 +242,7 @@ NoSecurityCamera: ; 0x6c8b8 TrainerCameraGrunt1: ; 0x6c8b9 loadfont - 2writetext CameraGrunt1SeenText + writetext CameraGrunt1SeenText closetext loadmovesprites winlosstext CameraGrunt1BeatenText, $0000 @@ -256,7 +256,7 @@ TrainerCameraGrunt1: ; 0x6c8b9 TrainerCameraGrunt2: ; 0x6c8ce loadfont - 2writetext CameraGrunt2SeenText + writetext CameraGrunt2SeenText closetext loadmovesprites winlosstext CameraGrunt2BeatenText, $0000 @@ -286,7 +286,7 @@ PlaySecurityCameraSounds: ; 0x6c8e3 ExplodingTrap1: ; 0x6c900 checkevent EVENT_EXPLODING_TRAP_1 iftrue NoExplodingTrap - 2call KoffingExplodingTrap + scall KoffingExplodingTrap returnafterbattle setevent EVENT_EXPLODING_TRAP_1 end @@ -294,7 +294,7 @@ ExplodingTrap1: ; 0x6c900 ExplodingTrap2: ; 0x6c90e checkevent EVENT_EXPLODING_TRAP_2 iftrue NoExplodingTrap - 2call VoltorbExplodingTrap + scall VoltorbExplodingTrap returnafterbattle setevent EVENT_EXPLODING_TRAP_2 end @@ -302,7 +302,7 @@ ExplodingTrap2: ; 0x6c90e ExplodingTrap3: ; 0x6c91c checkevent EVENT_EXPLODING_TRAP_3 iftrue NoExplodingTrap - 2call GeodudeExplodingTrap + scall GeodudeExplodingTrap returnafterbattle setevent EVENT_EXPLODING_TRAP_3 end @@ -310,7 +310,7 @@ ExplodingTrap3: ; 0x6c91c ExplodingTrap4: ; 0x6c92a checkevent EVENT_EXPLODING_TRAP_4 iftrue NoExplodingTrap - 2call VoltorbExplodingTrap + scall VoltorbExplodingTrap returnafterbattle setevent EVENT_EXPLODING_TRAP_4 end @@ -318,7 +318,7 @@ ExplodingTrap4: ; 0x6c92a ExplodingTrap5: ; 0x6c938 checkevent EVENT_EXPLODING_TRAP_5 iftrue NoExplodingTrap - 2call GeodudeExplodingTrap + scall GeodudeExplodingTrap returnafterbattle setevent EVENT_EXPLODING_TRAP_5 end @@ -326,7 +326,7 @@ ExplodingTrap5: ; 0x6c938 ExplodingTrap6: ; 0x6c946 checkevent EVENT_EXPLODING_TRAP_6 iftrue NoExplodingTrap - 2call KoffingExplodingTrap + scall KoffingExplodingTrap returnafterbattle setevent EVENT_EXPLODING_TRAP_6 end @@ -334,7 +334,7 @@ ExplodingTrap6: ; 0x6c946 ExplodingTrap7: ; 0x6c954 checkevent EVENT_EXPLODING_TRAP_7 iftrue NoExplodingTrap - 2call VoltorbExplodingTrap + scall VoltorbExplodingTrap returnafterbattle setevent EVENT_EXPLODING_TRAP_7 end @@ -342,7 +342,7 @@ ExplodingTrap7: ; 0x6c954 ExplodingTrap8: ; 0x6c962 checkevent EVENT_EXPLODING_TRAP_8 iftrue NoExplodingTrap - 2call KoffingExplodingTrap + scall KoffingExplodingTrap returnafterbattle setevent EVENT_EXPLODING_TRAP_8 end @@ -350,7 +350,7 @@ ExplodingTrap8: ; 0x6c962 ExplodingTrap9: ; 0x6c970 checkevent EVENT_EXPLODING_TRAP_9 iftrue NoExplodingTrap - 2call KoffingExplodingTrap + scall KoffingExplodingTrap returnafterbattle setevent EVENT_EXPLODING_TRAP_9 end @@ -358,7 +358,7 @@ ExplodingTrap9: ; 0x6c970 ExplodingTrap10: ; 0x6c97e checkevent EVENT_EXPLODING_TRAP_10 iftrue NoExplodingTrap - 2call VoltorbExplodingTrap + scall VoltorbExplodingTrap returnafterbattle setevent EVENT_EXPLODING_TRAP_10 end @@ -366,7 +366,7 @@ ExplodingTrap10: ; 0x6c97e ExplodingTrap11: ; 0x6c98c checkevent EVENT_EXPLODING_TRAP_11 iftrue NoExplodingTrap - 2call GeodudeExplodingTrap + scall GeodudeExplodingTrap returnafterbattle setevent EVENT_EXPLODING_TRAP_11 end @@ -374,7 +374,7 @@ ExplodingTrap11: ; 0x6c98c ExplodingTrap12: ; 0x6c99a checkevent EVENT_EXPLODING_TRAP_12 iftrue NoExplodingTrap - 2call GeodudeExplodingTrap + scall GeodudeExplodingTrap returnafterbattle setevent EVENT_EXPLODING_TRAP_12 end @@ -382,7 +382,7 @@ ExplodingTrap12: ; 0x6c99a ExplodingTrap13: ; 0x6c9a8 checkevent EVENT_EXPLODING_TRAP_13 iftrue NoExplodingTrap - 2call GeodudeExplodingTrap + scall GeodudeExplodingTrap returnafterbattle setevent EVENT_EXPLODING_TRAP_13 end @@ -390,7 +390,7 @@ ExplodingTrap13: ; 0x6c9a8 ExplodingTrap14: ; 0x6c9b6 checkevent EVENT_EXPLODING_TRAP_14 iftrue NoExplodingTrap - 2call KoffingExplodingTrap + scall KoffingExplodingTrap returnafterbattle setevent EVENT_EXPLODING_TRAP_14 end @@ -398,7 +398,7 @@ ExplodingTrap14: ; 0x6c9b6 ExplodingTrap15: ; 0x6c9c4 checkevent EVENT_EXPLODING_TRAP_15 iftrue NoExplodingTrap - 2call VoltorbExplodingTrap + scall VoltorbExplodingTrap returnafterbattle setevent EVENT_EXPLODING_TRAP_15 end @@ -406,7 +406,7 @@ ExplodingTrap15: ; 0x6c9c4 ExplodingTrap16: ; 0x6c9d2 checkevent EVENT_EXPLODING_TRAP_16 iftrue NoExplodingTrap - 2call KoffingExplodingTrap + scall KoffingExplodingTrap returnafterbattle setevent EVENT_EXPLODING_TRAP_16 end @@ -414,7 +414,7 @@ ExplodingTrap16: ; 0x6c9d2 ExplodingTrap17: ; 0x6c9e0 checkevent EVENT_EXPLODING_TRAP_17 iftrue NoExplodingTrap - 2call VoltorbExplodingTrap + scall VoltorbExplodingTrap returnafterbattle setevent EVENT_EXPLODING_TRAP_17 end @@ -422,7 +422,7 @@ ExplodingTrap17: ; 0x6c9e0 ExplodingTrap18: ; 0x6c9ee checkevent EVENT_EXPLODING_TRAP_18 iftrue NoExplodingTrap - 2call GeodudeExplodingTrap + scall GeodudeExplodingTrap returnafterbattle setevent EVENT_EXPLODING_TRAP_18 end @@ -430,7 +430,7 @@ ExplodingTrap18: ; 0x6c9ee ExplodingTrap19: ; 0x6c9fc checkevent EVENT_EXPLODING_TRAP_19 iftrue NoExplodingTrap - 2call GeodudeExplodingTrap + scall GeodudeExplodingTrap returnafterbattle setevent EVENT_EXPLODING_TRAP_19 end @@ -438,7 +438,7 @@ ExplodingTrap19: ; 0x6c9fc ExplodingTrap20: ; 0x6ca0a checkevent EVENT_EXPLODING_TRAP_20 iftrue NoExplodingTrap - 2call VoltorbExplodingTrap + scall VoltorbExplodingTrap returnafterbattle setevent EVENT_EXPLODING_TRAP_20 end @@ -446,7 +446,7 @@ ExplodingTrap20: ; 0x6ca0a ExplodingTrap21: ; 0x6ca18 checkevent EVENT_EXPLODING_TRAP_21 iftrue NoExplodingTrap - 2call KoffingExplodingTrap + scall KoffingExplodingTrap returnafterbattle setevent EVENT_EXPLODING_TRAP_21 end @@ -454,7 +454,7 @@ ExplodingTrap21: ; 0x6ca18 ExplodingTrap22: ; 0x6ca26 checkevent EVENT_EXPLODING_TRAP_22 iftrue NoExplodingTrap - 2call VoltorbExplodingTrap + scall VoltorbExplodingTrap returnafterbattle setevent EVENT_EXPLODING_TRAP_22 end @@ -516,7 +516,7 @@ TrainerScientistJed: ; 0x6ca6e ScientistJedScript: ; 0x6ca7a talkaftercancel loadfont - 2writetext UnknownText_0x6cc16 + writetext UnknownText_0x6cc16 closetext loadmovesprites end @@ -545,7 +545,7 @@ TrainerGruntM16: ; 0x6ca82 GruntM16Script: ; 0x6ca8e talkaftercancel loadfont - 2writetext UnknownText_0x6cd1b + writetext UnknownText_0x6cd1b closetext loadmovesprites end @@ -563,7 +563,7 @@ MapTeamRocketBaseB1FSignpost0Script: ; 0x6ca9c loadfont checkevent EVENT_TURNED_OFF_SECURITY_CAMERAS iftrue UnknownScript_0x6cabe - 2writetext UnknownText_0x6cdad + writetext UnknownText_0x6cdad playsound SFX_TALLY closetext loadmovesprites @@ -577,7 +577,7 @@ MapTeamRocketBaseB1FSignpost0Script: ; 0x6ca9c ; 0x6cabe UnknownScript_0x6cabe: ; 0x6cabe - 2writetext UnknownText_0x6cdd0 + writetext UnknownText_0x6cdd0 closetext loadmovesprites end diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 2d2ea3804..c51bb8c62 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -45,7 +45,7 @@ UnknownScript_0x6cf90: ; 0x6cf90 UnknownScript_0x6cf95: ; 0x6cf95 moveperson $4, $9, $d - 2jump UnknownScript_0x6cfac + jump UnknownScript_0x6cfac ; 0x6cf9c UnknownScript_0x6cf9c: ; 0x6cf9c @@ -57,7 +57,7 @@ UnknownScript_0x6cfac: ; 0x6cfac appear $3 appear $2 loadfont - 2writetext UnknownText_0x6d2ad + writetext UnknownText_0x6d2ad closetext loadmovesprites spriteface $0, $0 @@ -68,7 +68,7 @@ UnknownScript_0x6cfac: ; 0x6cfac spriteface $0, $1 applymovement $2, MovementData_0x6d22f loadfont - 2writetext UnknownText_0x6d2c3 + writetext UnknownText_0x6d2c3 closetext loadmovesprites cry DRAGONITE @@ -81,13 +81,13 @@ UnknownScript_0x6cfac: ; 0x6cfac appear $4 applymovement $4, MovementData_0x6d244 loadfont - 2writetext UnknownText_0x6d38c + writetext UnknownText_0x6d38c closetext loadmovesprites spriteface $0, $3 applymovement $3, MovementData_0x6d241 loadfont - 2writetext UnknownText_0x6d3bd + writetext UnknownText_0x6d3bd closetext loadmovesprites applymovement $2, MovementData_0x6d24a @@ -103,7 +103,7 @@ UnknownScript_0x6cfac: ; 0x6cfac returnafterbattle setevent $0570 loadfont - 2writetext UnknownText_0x6d4c6 + writetext UnknownText_0x6d4c6 closetext loadmovesprites special $0030 @@ -119,13 +119,13 @@ UnknownScript_0x6cfac: ; 0x6cfac clearevent $06d6 spriteface $4, $0 loadfont - 2writetext UnknownText_0x6d5d8 + writetext UnknownText_0x6d5d8 closetext loadmovesprites applymovement $4, MovementData_0x6d250 spriteface $0, $1 loadfont - 2writetext UnknownText_0x6d64e + writetext UnknownText_0x6d64e closetext loadmovesprites follow $4, $0 @@ -133,7 +133,7 @@ UnknownScript_0x6cfac: ; 0x6cfac stopfollow applymovement $4, MovementData_0x6d258 loadfont - 2writetext UnknownText_0x6d6cf + writetext UnknownText_0x6d6cf closetext loadmovesprites applymovement $4, MovementData_0x6d267 @@ -147,7 +147,7 @@ UnknownScript_0x6d075: ; 0x6d075 UnknownScript_0x6d07a: ; 0x6d07a loadfont - 2writetext UnknownText_0x6d7ea + writetext UnknownText_0x6d7ea closetext loadmovesprites applymovement $0, MovementData_0x6d278 @@ -156,7 +156,7 @@ UnknownScript_0x6d07a: ; 0x6d07a UnknownScript_0x6d085: ; 0x6d085 spriteface $0, $1 - 2jump UnknownScript_0x6d091 + jump UnknownScript_0x6d091 ; 0x6d08b UnknownScript_0x6d08b: ; 0x6d08b @@ -164,7 +164,7 @@ UnknownScript_0x6d08b: ; 0x6d08b spriteface $4, $2 UnknownScript_0x6d091: ; 0x6d091 loadfont - 2writetext UnknownText_0x6da97 + writetext UnknownText_0x6da97 closetext loadmovesprites special $002e @@ -173,7 +173,7 @@ UnknownScript_0x6d091: ; 0x6d091 special $001b special $0031 loadfont - 2writetext UnknownText_0x6daf7 + writetext UnknownText_0x6daf7 closetext loadmovesprites dotrigger $1 @@ -214,7 +214,7 @@ TrainerGruntM17: ; 0x6d0c5 GruntM17Script: ; 0x6d0d1 talkaftercancel loadfont - 2writetext UnknownText_0x6db88 + writetext UnknownText_0x6db88 closetext loadmovesprites end @@ -243,7 +243,7 @@ TrainerGruntM18: ; 0x6d0d9 GruntM18Script: ; 0x6d0e5 talkaftercancel loadfont - 2writetext UnknownText_0x6dc1a + writetext UnknownText_0x6dc1a closetext loadmovesprites end @@ -272,7 +272,7 @@ TrainerGruntM19: ; 0x6d0ed GruntM19Script: ; 0x6d0f9 talkaftercancel loadfont - 2writetext UnknownText_0x6dcd1 + writetext UnknownText_0x6dcd1 closetext loadmovesprites end @@ -294,7 +294,7 @@ VoltorbScript_0x6d101: ; 0x6d101 returnafterbattle special $003c applymovement $0, MovementData_0x6d28c - 2jump UnknownScript_0x6d184 + jump UnknownScript_0x6d184 ; 0x6d12c VoltorbScript_0x6d12c: ; 0x6d12c @@ -313,7 +313,7 @@ VoltorbScript_0x6d12c: ; 0x6d12c returnafterbattle special $003c applymovement $0, MovementData_0x6d299 - 2jump UnknownScript_0x6d184 + jump UnknownScript_0x6d184 ; 0x6d157 VoltorbScript_0x6d157: ; 0x6d157 @@ -332,7 +332,7 @@ VoltorbScript_0x6d157: ; 0x6d157 returnafterbattle special $003c applymovement $0, MovementData_0x6d2a4 - 2jump UnknownScript_0x6d184 + jump UnknownScript_0x6d184 ; 0x6d182 UnknownScript_0x6d182: ; 0x6d182 @@ -346,16 +346,16 @@ UnknownScript_0x6d184: ; 0x6d184 applymovement $4, MovementData_0x6d27a spriteface $0, $3 loadfont - 2writetext UnknownText_0x6d809 + writetext UnknownText_0x6d809 keeptextopen verbosegiveitem HM_06, 1 setevent EVENT_GOT_HM06_WHIRLPOOL - 2writetext UnknownText_0x6d8f8 + writetext UnknownText_0x6d8f8 closetext loadmovesprites spriteface $4, $0 loadfont - 2writetext UnknownText_0x6d994 + writetext UnknownText_0x6d994 closetext loadmovesprites spriteface $0, $0 @@ -386,14 +386,14 @@ MapTeamRocketBaseB2FSignpost1Script: ; 0x6d1db loadfont checkevent EVENT_LEARNED_HAIL_GIOVANNI iftrue UnknownScript_0x6d1e8 - 2writetext UnknownText_0x6dd39 + writetext UnknownText_0x6dd39 closetext loadmovesprites end ; 0x6d1e8 UnknownScript_0x6d1e8: ; 0x6d1e8 - 2writetext UnknownText_0x6dd6b + writetext UnknownText_0x6dd6b closetext playsound SFX_ENTER_DOOR changeblock $e, $c, $7 @@ -408,14 +408,14 @@ MapTeamRocketBaseB2FSignpost21Script: ; 0x6d1fa loadfont checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x6d207 - 2writetext UnknownText_0x6dda7 + writetext UnknownText_0x6dda7 closetext loadmovesprites end ; 0x6d207 UnknownScript_0x6d207: ; 0x6d207 - 2writetext UnknownText_0x6de03 + writetext UnknownText_0x6de03 closetext loadmovesprites end diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index cc23fbecf..028a89825 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -51,7 +51,7 @@ LanceScript_0x6dffc: ; 0x6dffc pause 20 applymovement $2, MovementData_0x6e12a loadfont - 2writetext UnknownText_0x6e179 + writetext UnknownText_0x6e179 closetext loadmovesprites applymovement $2, MovementData_0x6e12c @@ -69,7 +69,7 @@ UnknownScript_0x6e019: ; 0x6e019 spriteface $0, $2 playmusic MUSIC_RIVAL_ENCOUNTER loadfont - 2writetext UnknownText_0x6e267 + writetext UnknownText_0x6e267 closetext loadmovesprites playsound SFX_TACKLE @@ -87,7 +87,7 @@ RocketScript_0x6e048: ; 0x6e048 UnknownScript_0x6e04b: ; 0x6e04b applymovement $0, MovementData_0x6e133 - 2jump UnknownScript_0x6e056 + jump UnknownScript_0x6e056 ; 0x6e052 UnknownScript_0x6e052: ; 0x6e052 @@ -98,7 +98,7 @@ UnknownScript_0x6e056: ; 0x6e056 playmusic MUSIC_ROCKET_ENCOUNTER spriteface $3, $0 loadfont - 2writetext UnknownText_0x6e400 + writetext UnknownText_0x6e400 closetext loadmovesprites applymovement $3, MovementData_0x6e142 @@ -109,7 +109,7 @@ UnknownScript_0x6e056: ; 0x6e056 returnafterbattle setevent $0574 loadfont - 2writetext UnknownText_0x6e548 + writetext UnknownText_0x6e548 closetext loadmovesprites applymovement $3, MovementData_0x6e144 @@ -122,7 +122,7 @@ UnknownScript_0x6e056: ; 0x6e056 MoltresScript_0x6e091: ; 0x6e091 loadfont - 2writetext UnknownText_0x6e585 + writetext UnknownText_0x6e585 closetext loadmovesprites setevent EVENT_LEARNED_HAIL_GIOVANNI @@ -152,7 +152,7 @@ TrainerGruntF5: ; 0x6e09b GruntF5Script: ; 0x6e0a7 talkaftercancel loadfont - 2writetext UnknownText_0x6e611 + writetext UnknownText_0x6e611 closetext loadmovesprites setevent $0301 @@ -182,7 +182,7 @@ TrainerGruntM28: ; 0x6e0b2 GruntM28Script: ; 0x6e0be talkaftercancel loadfont - 2writetext UnknownText_0x6e737 + writetext UnknownText_0x6e737 closetext loadmovesprites setevent $0302 @@ -212,7 +212,7 @@ TrainerScientistRoss: ; 0x6e0c9 ScientistRossScript: ; 0x6e0d5 talkaftercancel loadfont - 2writetext UnknownText_0x6e822 + writetext UnknownText_0x6e822 closetext loadmovesprites end @@ -241,7 +241,7 @@ TrainerScientistMitch: ; 0x6e0dd ScientistMitchScript: ; 0x6e0e9 talkaftercancel loadfont - 2writetext UnknownText_0x6e90a + writetext UnknownText_0x6e90a closetext loadmovesprites end @@ -259,18 +259,18 @@ MapTeamRocketBaseB3FSignpost1Script: ; 0x6e0f5 iffalse UnknownScript_0x6e105 checkevent $0302 iffalse UnknownScript_0x6e105 - 2jump UnknownScript_0x6e10b + jump UnknownScript_0x6e10b ; 0x6e105 UnknownScript_0x6e105: ; 0x6e105 - 2writetext UnknownText_0x6e970 + writetext UnknownText_0x6e970 closetext loadmovesprites end ; 0x6e10b UnknownScript_0x6e10b: ; 0x6e10b - 2writetext UnknownText_0x6e9a3 + writetext UnknownText_0x6e9a3 closetext playsound SFX_ENTER_DOOR changeblock $a, $8, $7 diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index fa42feef5..a6b7e4321 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -51,7 +51,7 @@ MapTimeCapsuleSignpost1Script: ; 0x193514 ChrisScript_0x19351a: ; 0x19351a loadfont - 2writetext UnknownText_0x193521 + writetext UnknownText_0x193521 closetext loadmovesprites end diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index d9a1fe044..5820b8f2a 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -50,7 +50,7 @@ UnknownScript_0x185050: ; 0x185050 special $0097 iftrue UnknownScript_0x185065 appear $3 - 2jump UnknownScript_0x185067 + jump UnknownScript_0x185067 ; 0x185065 UnknownScript_0x185065: ; 0x185065 @@ -60,7 +60,7 @@ UnknownScript_0x185067: ; 0x185067 special $0097 iftrue UnknownScript_0x185074 appear $4 - 2jump UnknownScript_0x185076 + jump UnknownScript_0x185076 ; 0x185074 UnknownScript_0x185074: ; 0x185074 @@ -160,7 +160,7 @@ UnknownScript_0x1850d7: ; 0x1850d7 moveperson $8, $b, $d spriteface $0, $3 loadfont - 2writetext UnknownText_0x185203 + writetext UnknownText_0x185203 closetext loadmovesprites applymovement $5, MovementData_0x1851f1 @@ -202,7 +202,7 @@ SageScript_0x185188: ; 0x185188 iftrue UnknownScript_0x1851b6 checkevent EVENT_GOT_RAINBOW_WING iftrue UnknownScript_0x1851b0 - 2writetext UnknownText_0x185629 + writetext UnknownText_0x185629 keeptextopen verbosegiveitem RAINBOW_WING, 1 loadmovesprites @@ -216,14 +216,14 @@ SageScript_0x185188: ; 0x185188 loadmovesprites loadfont UnknownScript_0x1851b0: ; 0x1851b0 - 2writetext UnknownText_0x18564a + writetext UnknownText_0x18564a closetext loadmovesprites end ; 0x1851b6 UnknownScript_0x1851b6: ; 0x1851b6 - 2writetext UnknownText_0x185803 + writetext UnknownText_0x185803 closetext loadmovesprites end diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm index 5e3aa8bea..e74ceb907 100644 --- a/maps/TinTowerRoof.asm +++ b/maps/TinTowerRoof.asm @@ -15,7 +15,7 @@ UnknownScript_0x77230: ; 0x77230 iftrue UnknownScript_0x77241 checkitem RAINBOW_WING iftrue UnknownScript_0x7723e - 2jump UnknownScript_0x77241 + jump UnknownScript_0x77241 ; 0x7723e UnknownScript_0x7723e: ; 0x7723e @@ -31,7 +31,7 @@ UnknownScript_0x77241: ; 0x77241 HoOhScript_0x77244: ; 0x77244 faceplayer loadfont - 2writetext UnknownText_0x77260 + writetext UnknownText_0x77260 cry HO_OH pause 15 loadmovesprites diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index 7f93aa385..1075c169a 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -51,7 +51,7 @@ MapTradeCenterSignpost1Script: ; 0x193405 UnknownScript_0x19340b: ; 0x19340b loadfont - 2writetext UnknownText_0x193412 + writetext UnknownText_0x193412 closetext loadmovesprites end diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index 1c2dac42e..04c13bf58 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -18,29 +18,29 @@ UnknownScript_0x9b38b: ; 0x9b38b loadfont checkflag $0057 iftrue UnknownScript_0x9b3f7 - 2writetext UnknownText_0x9b420 + writetext UnknownText_0x9b420 keeptextopen special $0067 iffalse UnknownScript_0x9b3a6 trainertotext CAL, CAL2, $0 - 2jump UnknownScript_0x9b3aa + jump UnknownScript_0x9b3aa ; 0x9b3a6 UnknownScript_0x9b3a6: ; 0x9b3a6 trainertotext CAL, CAL3, $0 UnknownScript_0x9b3aa: ; 0x9b3aa - 2writetext UnknownText_0x9b46a + writetext UnknownText_0x9b46a keeptextopen - 2writetext UnknownText_0x9b487 + writetext UnknownText_0x9b487 yesorno iffalse UnknownScript_0x9b3ed setflag $0057 - 2writetext UnknownText_0x9b4a2 + writetext UnknownText_0x9b4a2 closetext loadmovesprites applymovement $0, MovementData_0x9b401 loadfont - 2writetext UnknownText_0x9b587 + writetext UnknownText_0x9b587 closetext loadmovesprites special $0067 @@ -63,7 +63,7 @@ UnknownScript_0x9b3e8: ; 0x9b3e8 ; 0x9b3ed UnknownScript_0x9b3ed: ; 0x9b3ed - 2writetext UnknownText_0x9b4d6 + writetext UnknownText_0x9b4d6 closetext loadmovesprites applymovement $0, MovementData_0x9b41d @@ -71,7 +71,7 @@ UnknownScript_0x9b3ed: ; 0x9b3ed ; 0x9b3f7 UnknownScript_0x9b3f7: ; 0x9b3f7 - 2writetext UnknownText_0x9b51d + writetext UnknownText_0x9b51d closetext loadmovesprites applymovement $0, MovementData_0x9b41d diff --git a/maps/UndergroundPathSwitchRoomEntrances.asm b/maps/UndergroundPathSwitchRoomEntrances.asm index 52973d7c2..a32f88c77 100644 --- a/maps/UndergroundPathSwitchRoomEntrances.asm +++ b/maps/UndergroundPathSwitchRoomEntrances.asm @@ -93,7 +93,7 @@ UnknownScript_0x7ca80: ; 0x7ca80 waitbutton applymovement $c, MovementData_0x7ce87 spriteface $0, $3 - 2call UnknownScript_0x7cad4 + scall UnknownScript_0x7cad4 applymovement $c, MovementData_0x7ce92 playsound SFX_EXIT_BUILDING disappear $c @@ -113,7 +113,7 @@ UnknownScript_0x7caaa: ; 0x7caaa waitbutton applymovement $c, MovementData_0x7ce8c spriteface $0, $3 - 2call UnknownScript_0x7cad4 + scall UnknownScript_0x7cad4 applymovement $c, MovementData_0x7ce97 playsound SFX_EXIT_BUILDING disappear $c @@ -131,7 +131,7 @@ UnknownScript_0x7cad4: ; 0x7cad4 UnknownScript_0x7cae1: ; 0x7cae1 playmusic MUSIC_RIVAL_ENCOUNTER loadfont - 2writetext UnknownText_0x7ce9d + writetext UnknownText_0x7ce9d closetext loadmovesprites setevent $06c1 @@ -145,7 +145,7 @@ UnknownScript_0x7cae1: ; 0x7cae1 startbattle reloadmapmusic returnafterbattle - 2jump UnknownScript_0x7cb29 + jump UnknownScript_0x7cb29 ; 0x7cb09 UnknownScript_0x7cb09: ; 0x7cb09 @@ -155,7 +155,7 @@ UnknownScript_0x7cb09: ; 0x7cb09 startbattle reloadmapmusic returnafterbattle - 2jump UnknownScript_0x7cb29 + jump UnknownScript_0x7cb29 ; 0x7cb19 UnknownScript_0x7cb19: ; 0x7cb19 @@ -165,13 +165,13 @@ UnknownScript_0x7cb19: ; 0x7cb19 startbattle reloadmapmusic returnafterbattle - 2jump UnknownScript_0x7cb29 + jump UnknownScript_0x7cb29 ; 0x7cb29 UnknownScript_0x7cb29: ; 0x7cb29 playmusic MUSIC_RIVAL_AFTER loadfont - 2writetext UnknownText_0x7cfc2 + writetext UnknownText_0x7cfc2 closetext loadmovesprites end @@ -200,7 +200,7 @@ TrainerGruntM11: ; 0x7cb33 GruntM11Script: ; 0x7cb3f talkaftercancel loadfont - 2writetext UnknownText_0x7d290 + writetext UnknownText_0x7d290 closetext loadmovesprites end @@ -229,7 +229,7 @@ TrainerGruntM25: ; 0x7cb47 GruntM25Script: ; 0x7cb53 talkaftercancel loadfont - 2writetext UnknownText_0x7d347 + writetext UnknownText_0x7d347 closetext loadmovesprites end @@ -258,7 +258,7 @@ TrainerBurglarDuncan: ; 0x7cb5b BurglarDuncanScript: ; 0x7cb67 talkaftercancel loadfont - 2writetext UnknownText_0x7d3cf + writetext UnknownText_0x7d3cf closetext loadmovesprites end @@ -287,7 +287,7 @@ TrainerBurglarEddie: ; 0x7cb6f BurglarEddieScript: ; 0x7cb7b talkaftercancel loadfont - 2writetext UnknownText_0x7d45b + writetext UnknownText_0x7d45b closetext loadmovesprites end @@ -316,7 +316,7 @@ TrainerGruntM13: ; 0x7cb83 GruntM13Script: ; 0x7cb8f talkaftercancel loadfont - 2writetext UnknownText_0x7d51f + writetext UnknownText_0x7d51f closetext loadmovesprites end @@ -345,7 +345,7 @@ TrainerGruntF3: ; 0x7cb97 GruntF3Script: ; 0x7cba3 talkaftercancel loadfont - 2writetext UnknownText_0x7d5e6 + writetext UnknownText_0x7d5e6 closetext loadmovesprites end @@ -353,92 +353,92 @@ GruntF3Script: ; 0x7cba3 MapUndergroundPathSwitchRoomEntrancesSignpost0Script: ; 0x7cbab loadfont - 2writetext UnknownText_0x7d554 + writetext UnknownText_0x7d554 keeptextopen checkevent EVENT_SWITCH_1 iftrue UnknownScript_0x7cbcb - 2writetext UnknownText_0x7d617 + writetext UnknownText_0x7d617 yesorno iffalse UnknownScript_0x7cc8b copybytetovar UndergroundSwitchPositions addvar $1 copyvartobyte UndergroundSwitchPositions setevent EVENT_SWITCH_1 - 2jump UnknownScript_0x7cc8d + jump UnknownScript_0x7cc8d ; 0x7cbcb UnknownScript_0x7cbcb: ; 0x7cbcb - 2writetext UnknownText_0x7d62d + writetext UnknownText_0x7d62d yesorno iffalse UnknownScript_0x7cc8b copybytetovar UndergroundSwitchPositions addvar -1 copyvartobyte UndergroundSwitchPositions clearevent EVENT_SWITCH_1 - 2jump UnknownScript_0x7cc8d + jump UnknownScript_0x7cc8d ; 0x7cbe0 MapUndergroundPathSwitchRoomEntrancesSignpost1Script: ; 0x7cbe0 loadfont - 2writetext UnknownText_0x7d643 + writetext UnknownText_0x7d643 keeptextopen checkevent EVENT_SWITCH_2 iftrue UnknownScript_0x7cc00 - 2writetext UnknownText_0x7d617 + writetext UnknownText_0x7d617 yesorno iffalse UnknownScript_0x7cc8b copybytetovar UndergroundSwitchPositions addvar $2 copyvartobyte UndergroundSwitchPositions setevent EVENT_SWITCH_2 - 2jump UnknownScript_0x7cc8d + jump UnknownScript_0x7cc8d ; 0x7cc00 UnknownScript_0x7cc00: ; 0x7cc00 - 2writetext UnknownText_0x7d62d + writetext UnknownText_0x7d62d yesorno iffalse UnknownScript_0x7cc8b copybytetovar UndergroundSwitchPositions addvar -2 copyvartobyte UndergroundSwitchPositions clearevent EVENT_SWITCH_2 - 2jump UnknownScript_0x7cc8d + jump UnknownScript_0x7cc8d ; 0x7cc15 MapUndergroundPathSwitchRoomEntrancesSignpost2Script: ; 0x7cc15 loadfont - 2writetext UnknownText_0x7d65a + writetext UnknownText_0x7d65a keeptextopen checkevent EVENT_SWITCH_3 iftrue UnknownScript_0x7cc35 - 2writetext UnknownText_0x7d617 + writetext UnknownText_0x7d617 yesorno iffalse UnknownScript_0x7cc8b copybytetovar UndergroundSwitchPositions addvar $3 copyvartobyte UndergroundSwitchPositions setevent EVENT_SWITCH_3 - 2jump UnknownScript_0x7cc8d + jump UnknownScript_0x7cc8d ; 0x7cc35 UnknownScript_0x7cc35: ; 0x7cc35 - 2writetext UnknownText_0x7d62d + writetext UnknownText_0x7d62d yesorno iffalse UnknownScript_0x7cc8b copybytetovar UndergroundSwitchPositions addvar -3 copyvartobyte UndergroundSwitchPositions clearevent EVENT_SWITCH_3 - 2jump UnknownScript_0x7cc8d + jump UnknownScript_0x7cc8d ; 0x7cc4a MapUndergroundPathSwitchRoomEntrancesSignpost3Script: ; 0x7cc4a loadfont - 2writetext UnknownText_0x7d671 + writetext UnknownText_0x7d671 keeptextopen checkevent EVENT_EMERGENCY_SWITCH iftrue UnknownScript_0x7cc70 - 2writetext UnknownText_0x7d617 + writetext UnknownText_0x7d617 yesorno iffalse UnknownScript_0x7cc8b writebyte $7 @@ -447,11 +447,11 @@ MapUndergroundPathSwitchRoomEntrancesSignpost3Script: ; 0x7cc4a setevent EVENT_SWITCH_1 setevent EVENT_SWITCH_2 setevent EVENT_SWITCH_3 - 2jump UnknownScript_0x7cc8d + jump UnknownScript_0x7cc8d ; 0x7cc70 UnknownScript_0x7cc70: ; 0x7cc70 - 2writetext UnknownText_0x7d62d + writetext UnknownText_0x7d62d yesorno iffalse UnknownScript_0x7cc8b writebyte $0 @@ -460,7 +460,7 @@ UnknownScript_0x7cc70: ; 0x7cc70 clearevent EVENT_SWITCH_1 clearevent EVENT_SWITCH_2 clearevent EVENT_SWITCH_3 - 2jump UnknownScript_0x7cc8d + jump UnknownScript_0x7cc8d ; 0x7cc8b UnknownScript_0x7cc8b: ; 0x7cc8b @@ -480,17 +480,17 @@ UnknownScript_0x7cc8d: ; 0x7cc8d if_equal $7, UnknownScript_0x7cd79 UnknownScript_0x7ccb0: ; 0x7ccb0 playsound SFX_ENTER_DOOR - 2call UnknownScript_0x7ce11 - 2call UnknownScript_0x7ce19 - 2call UnknownScript_0x7ce21 - 2call UnknownScript_0x7ce29 - 2call UnknownScript_0x7ce31 - 2call UnknownScript_0x7ce39 - 2call UnknownScript_0x7ce41 - 2call UnknownScript_0x7ce4d - 2call UnknownScript_0x7ce59 - 2call UnknownScript_0x7ce65 - 2call UnknownScript_0x7ce71 + scall UnknownScript_0x7ce11 + scall UnknownScript_0x7ce19 + scall UnknownScript_0x7ce21 + scall UnknownScript_0x7ce29 + scall UnknownScript_0x7ce31 + scall UnknownScript_0x7ce39 + scall UnknownScript_0x7ce41 + scall UnknownScript_0x7ce4d + scall UnknownScript_0x7ce59 + scall UnknownScript_0x7ce65 + scall UnknownScript_0x7ce71 reloadmappart loadmovesprites end @@ -498,13 +498,13 @@ UnknownScript_0x7ccb0: ; 0x7ccb0 UnknownScript_0x7ccd7: ; 0x7ccd7 playsound SFX_ENTER_DOOR - 2call UnknownScript_0x7cda5 - 2call UnknownScript_0x7cdd5 - 2call UnknownScript_0x7cdf9 - 2call UnknownScript_0x7ce39 - 2call UnknownScript_0x7ce4d - 2call UnknownScript_0x7ce59 - 2call UnknownScript_0x7ce71 + scall UnknownScript_0x7cda5 + scall UnknownScript_0x7cdd5 + scall UnknownScript_0x7cdf9 + scall UnknownScript_0x7ce39 + scall UnknownScript_0x7ce4d + scall UnknownScript_0x7ce59 + scall UnknownScript_0x7ce71 reloadmappart loadmovesprites end @@ -512,13 +512,13 @@ UnknownScript_0x7ccd7: ; 0x7ccd7 UnknownScript_0x7ccf2: ; 0x7ccf2 playsound SFX_ENTER_DOOR - 2call UnknownScript_0x7cdad - 2call UnknownScript_0x7cde1 - 2call UnknownScript_0x7cded - 2call UnknownScript_0x7ce31 - 2call UnknownScript_0x7ce41 - 2call UnknownScript_0x7ce65 - 2call UnknownScript_0x7ce71 + scall UnknownScript_0x7cdad + scall UnknownScript_0x7cde1 + scall UnknownScript_0x7cded + scall UnknownScript_0x7ce31 + scall UnknownScript_0x7ce41 + scall UnknownScript_0x7ce65 + scall UnknownScript_0x7ce71 reloadmappart loadmovesprites end @@ -526,13 +526,13 @@ UnknownScript_0x7ccf2: ; 0x7ccf2 UnknownScript_0x7cd0d: ; 0x7cd0d playsound SFX_ENTER_DOOR - 2call UnknownScript_0x7cdb5 - 2call UnknownScript_0x7cdd5 - 2call UnknownScript_0x7cdf9 - 2call UnknownScript_0x7ce29 - 2call UnknownScript_0x7ce4d - 2call UnknownScript_0x7ce59 - 2call UnknownScript_0x7ce71 + scall UnknownScript_0x7cdb5 + scall UnknownScript_0x7cdd5 + scall UnknownScript_0x7cdf9 + scall UnknownScript_0x7ce29 + scall UnknownScript_0x7ce4d + scall UnknownScript_0x7ce59 + scall UnknownScript_0x7ce71 reloadmappart loadmovesprites end @@ -540,13 +540,13 @@ UnknownScript_0x7cd0d: ; 0x7cd0d UnknownScript_0x7cd28: ; 0x7cd28 playsound SFX_ENTER_DOOR - 2call UnknownScript_0x7cdbd - 2call UnknownScript_0x7cde1 - 2call UnknownScript_0x7cded - 2call UnknownScript_0x7ce21 - 2call UnknownScript_0x7ce41 - 2call UnknownScript_0x7ce65 - 2call UnknownScript_0x7ce71 + scall UnknownScript_0x7cdbd + scall UnknownScript_0x7cde1 + scall UnknownScript_0x7cded + scall UnknownScript_0x7ce21 + scall UnknownScript_0x7ce41 + scall UnknownScript_0x7ce65 + scall UnknownScript_0x7ce71 reloadmappart loadmovesprites end @@ -554,13 +554,13 @@ UnknownScript_0x7cd28: ; 0x7cd28 UnknownScript_0x7cd43: ; 0x7cd43 playsound SFX_ENTER_DOOR - 2call UnknownScript_0x7cdc5 - 2call UnknownScript_0x7cdd5 - 2call UnknownScript_0x7cdf9 - 2call UnknownScript_0x7ce19 - 2call UnknownScript_0x7ce4d - 2call UnknownScript_0x7ce59 - 2call UnknownScript_0x7ce71 + scall UnknownScript_0x7cdc5 + scall UnknownScript_0x7cdd5 + scall UnknownScript_0x7cdf9 + scall UnknownScript_0x7ce19 + scall UnknownScript_0x7ce4d + scall UnknownScript_0x7ce59 + scall UnknownScript_0x7ce71 reloadmappart loadmovesprites end @@ -568,13 +568,13 @@ UnknownScript_0x7cd43: ; 0x7cd43 UnknownScript_0x7cd5e: ; 0x7cd5e playsound SFX_ENTER_DOOR - 2call UnknownScript_0x7cdcd - 2call UnknownScript_0x7cde1 - 2call UnknownScript_0x7cded - 2call UnknownScript_0x7ce05 - 2call UnknownScript_0x7ce11 - 2call UnknownScript_0x7ce41 - 2call UnknownScript_0x7ce65 + scall UnknownScript_0x7cdcd + scall UnknownScript_0x7cde1 + scall UnknownScript_0x7cded + scall UnknownScript_0x7ce05 + scall UnknownScript_0x7ce11 + scall UnknownScript_0x7ce41 + scall UnknownScript_0x7ce65 reloadmappart loadmovesprites end @@ -582,17 +582,17 @@ UnknownScript_0x7cd5e: ; 0x7cd5e UnknownScript_0x7cd79: ; 0x7cd79 playsound SFX_ENTER_DOOR - 2call UnknownScript_0x7ce11 - 2call UnknownScript_0x7ce19 - 2call UnknownScript_0x7cdb5 - 2call UnknownScript_0x7ce29 - 2call UnknownScript_0x7cdc5 - 2call UnknownScript_0x7cdcd - 2call UnknownScript_0x7ce41 - 2call UnknownScript_0x7cde1 - 2call UnknownScript_0x7cded - 2call UnknownScript_0x7ce65 - 2call UnknownScript_0x7ce05 + scall UnknownScript_0x7ce11 + scall UnknownScript_0x7ce19 + scall UnknownScript_0x7cdb5 + scall UnknownScript_0x7ce29 + scall UnknownScript_0x7cdc5 + scall UnknownScript_0x7cdcd + scall UnknownScript_0x7ce41 + scall UnknownScript_0x7cde1 + scall UnknownScript_0x7cded + scall UnknownScript_0x7ce65 + scall UnknownScript_0x7ce05 reloadmappart loadmovesprites writebyte $6 diff --git a/maps/UndergroundWarehouse.asm b/maps/UndergroundWarehouse.asm index cf5245ccf..e39e9ab85 100644 --- a/maps/UndergroundWarehouse.asm +++ b/maps/UndergroundWarehouse.asm @@ -54,7 +54,7 @@ TrainerGruntM24: ; 0x7d983 GruntM24Script: ; 0x7d98f talkaftercancel loadfont - 2writetext UnknownText_0x7da48 + writetext UnknownText_0x7da48 closetext loadmovesprites end @@ -83,7 +83,7 @@ TrainerGruntM14: ; 0x7d997 GruntM14Script: ; 0x7d9a3 talkaftercancel loadfont - 2writetext UnknownText_0x7db01 + writetext UnknownText_0x7db01 closetext loadmovesprites end @@ -112,7 +112,7 @@ TrainerGruntM15: ; 0x7d9ab GruntM15Script: ; 0x7d9b7 talkaftercancel loadfont - 2writetext UnknownText_0x7db8e + writetext UnknownText_0x7db8e closetext loadmovesprites end @@ -123,17 +123,17 @@ GentlemanScript_0x7d9bf: ; 0x7d9bf loadfont checkevent $004a iftrue UnknownScript_0x7d9de - 2writetext UnknownText_0x7dbc6 + writetext UnknownText_0x7dbc6 keeptextopen verbosegiveitem CARD_KEY, 1 setevent $004a setevent $0304 clearevent $0305 clearevent $0306 - 2writetext UnknownText_0x7dc5b + writetext UnknownText_0x7dc5b keeptextopen UnknownScript_0x7d9de: ; 0x7d9de - 2writetext UnknownText_0x7dc8d + writetext UnknownText_0x7dc8d closetext loadmovesprites end diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm index f23c326e6..3c764f12f 100644 --- a/maps/UnionCave1F.asm +++ b/maps/UnionCave1F.asm @@ -29,7 +29,7 @@ TrainerPokemaniacLarry: ; 0x59b9c PokemaniacLarryScript: ; 0x59ba8 talkaftercancel loadfont - 2writetext UnknownText_0x59d31 + writetext UnknownText_0x59d31 closetext loadmovesprites end @@ -58,7 +58,7 @@ TrainerHikerRussell: ; 0x59bb0 HikerRussellScript: ; 0x59bbc talkaftercancel loadfont - 2writetext UnknownText_0x59c6c + writetext UnknownText_0x59c6c closetext loadmovesprites end @@ -87,7 +87,7 @@ TrainerHikerDaniel: ; 0x59bc4 HikerDanielScript: ; 0x59bd0 talkaftercancel loadfont - 2writetext UnknownText_0x59dc9 + writetext UnknownText_0x59dc9 closetext loadmovesprites end @@ -116,7 +116,7 @@ TrainerFirebreatherBill: ; 0x59bd8 FirebreatherBillScript: ; 0x59be4 talkaftercancel loadfont - 2writetext UnknownText_0x59e6f + writetext UnknownText_0x59e6f closetext loadmovesprites end @@ -145,7 +145,7 @@ TrainerFirebreatherRay: ; 0x59bec FirebreatherRayScript: ; 0x59bf8 talkaftercancel loadfont - 2writetext UnknownText_0x59efc + writetext UnknownText_0x59efc closetext loadmovesprites end diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm index 378a4236e..482b23cdd 100644 --- a/maps/UnionCaveB1F.asm +++ b/maps/UnionCaveB1F.asm @@ -29,7 +29,7 @@ TrainerPokemaniacAndrew: ; 0x59fc6 PokemaniacAndrewScript: ; 0x59fd2 talkaftercancel loadfont - 2writetext UnknownText_0x5a181 + writetext UnknownText_0x5a181 closetext loadmovesprites end @@ -58,7 +58,7 @@ TrainerPokemaniacCalvin: ; 0x59fda PokemaniacCalvinScript: ; 0x59fe6 talkaftercancel loadfont - 2writetext UnknownText_0x5a230 + writetext UnknownText_0x5a230 closetext loadmovesprites end @@ -87,7 +87,7 @@ TrainerHikerPhillip: ; 0x59fee HikerPhillipScript: ; 0x59ffa talkaftercancel loadfont - 2writetext UnknownText_0x5a073 + writetext UnknownText_0x5a073 closetext loadmovesprites end @@ -116,7 +116,7 @@ TrainerHikerLeonard: ; 0x5a002 HikerLeonardScript: ; 0x5a00e talkaftercancel loadfont - 2writetext UnknownText_0x5a0fb + writetext UnknownText_0x5a0fb closetext loadmovesprites end diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index b920658af..d63d55810 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -59,7 +59,7 @@ TrainerCooltrainermNick: ; 0x5a32e CooltrainermNickScript: ; 0x5a33a talkaftercancel loadfont - 2writetext UnknownText_0x5a3f0 + writetext UnknownText_0x5a3f0 closetext loadmovesprites end @@ -88,7 +88,7 @@ TrainerCooltrainerfGwen: ; 0x5a342 CooltrainerfGwenScript: ; 0x5a34e talkaftercancel loadfont - 2writetext UnknownText_0x5a488 + writetext UnknownText_0x5a488 closetext loadmovesprites end @@ -117,7 +117,7 @@ TrainerCooltrainerfEmma: ; 0x5a356 CooltrainerfEmmaScript: ; 0x5a362 talkaftercancel loadfont - 2writetext UnknownText_0x5a52b + writetext UnknownText_0x5a52b closetext loadmovesprites end diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index d69a9546f..26a7fc6a0 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -25,13 +25,13 @@ GrampsScript_0x1aa986: ; 0x1aa986 MachopScript_0x1aa989: ; 0x1aa989 loadfont - 2writetext UnknownText_0x1aaaca + writetext UnknownText_0x1aaaca cry MACHOP closetext loadmovesprites earthquake 30 loadfont - 2writetext UnknownText_0x1aaae2 + writetext UnknownText_0x1aaae2 closetext loadmovesprites end @@ -45,14 +45,14 @@ BigSnorlaxScript_0x1aa99e: ; 0x1aa99e loadfont special $0060 iftrue UnknownScript_0x1aa9ab - 2writetext UnknownText_0x1aab64 + writetext UnknownText_0x1aab64 closetext loadmovesprites end ; 0x1aa9ab UnknownScript_0x1aa9ab: ; 0x1aa9ab - 2writetext UnknownText_0x1aab84 + writetext UnknownText_0x1aab84 pause 15 cry SNORLAX loadmovesprites @@ -74,34 +74,34 @@ PokefanMScript_0x1aa9c2: ; 0x1aa9c2 if_equal $10, UnknownScript_0x1aa9ea if_greater_than $d, UnknownScript_0x1aa9e4 if_greater_than $9, UnknownScript_0x1aa9de - 2writetext UnknownText_0x1aabc8 + writetext UnknownText_0x1aabc8 closetext loadmovesprites end ; 0x1aa9de UnknownScript_0x1aa9de: ; 0x1aa9de - 2writetext UnknownText_0x1aac2b + writetext UnknownText_0x1aac2b closetext loadmovesprites end ; 0x1aa9e4 UnknownScript_0x1aa9e4: ; 0x1aa9e4 - 2writetext UnknownText_0x1aac88 + writetext UnknownText_0x1aac88 closetext loadmovesprites end ; 0x1aa9ea UnknownScript_0x1aa9ea: ; 0x1aa9ea - 2writetext UnknownText_0x1aacf3 + writetext UnknownText_0x1aacf3 keeptextopen verbosegiveitem HP_UP, 1 iffalse UnknownScript_0x1aa9fb setevent $00e2 UnknownScript_0x1aa9f7: ; 0x1aa9f7 - 2writetext UnknownText_0x1aad4a + writetext UnknownText_0x1aad4a closetext UnknownScript_0x1aa9fb: ; 0x1aa9fb loadmovesprites diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index 2e221bb18..18fc4c76c 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -11,7 +11,7 @@ SurgeScript_0x1920a5: ; 0x1920a5 loadfont checkflag $0025 iftrue UnknownScript_0x1920d9 - 2writetext UnknownText_0x192142 + writetext UnknownText_0x192142 closetext loadmovesprites winlosstext UnknownText_0x192238, $0000 @@ -23,18 +23,18 @@ SurgeScript_0x1920a5: ; 0x1920a5 setevent EVENT_BEAT_GUITARIST_VINCENT setevent EVENT_BEAT_JUGGLER_HORTON loadfont - 2writetext UnknownText_0x192277 + writetext UnknownText_0x192277 playsound SFX_GET_BADGE waitbutton setflag $0025 - 2writetext UnknownText_0x192291 + writetext UnknownText_0x192291 closetext loadmovesprites end ; 0x1920d9 UnknownScript_0x1920d9: ; 0x1920d9 - 2writetext UnknownText_0x192303 + writetext UnknownText_0x192303 closetext loadmovesprites end @@ -63,7 +63,7 @@ TrainerGentlemanGregory: ; 0x1920df GentlemanGregoryScript: ; 0x1920eb talkaftercancel loadfont - 2writetext UnknownText_0x1923b0 + writetext UnknownText_0x1923b0 closetext loadmovesprites end @@ -92,7 +92,7 @@ TrainerGuitaristVincent: ; 0x1920f3 GuitaristVincentScript: ; 0x1920ff talkaftercancel loadfont - 2writetext UnknownText_0x19244b + writetext UnknownText_0x19244b closetext loadmovesprites end @@ -121,7 +121,7 @@ TrainerJugglerHorton: ; 0x192107 JugglerHortonScript: ; 0x192113 talkaftercancel loadfont - 2writetext UnknownText_0x1924d6 + writetext UnknownText_0x1924d6 closetext loadmovesprites end @@ -132,13 +132,13 @@ VermilionGymGuyScript: ; 0x19211b loadfont checkevent EVENT_BEAT_LTSURGE iftrue .VermilionGymGuyWinScript - 2writetext VermilionGymGuyText + writetext VermilionGymGuyText closetext loadmovesprites end .VermilionGymGuyWinScript - 2writetext VermilionGymGuyWinText + writetext VermilionGymGuyWinText closetext loadmovesprites end diff --git a/maps/VermilionPokeCenter1F.asm b/maps/VermilionPokeCenter1F.asm index 3e420722f..4b5bbf0d7 100644 --- a/maps/VermilionPokeCenter1F.asm +++ b/maps/VermilionPokeCenter1F.asm @@ -15,14 +15,14 @@ FishingGuruScript_0x191606: ; 0x191606 loadfont checkevent EVENT_FOUGHT_SNORLAX iftrue UnknownScript_0x191614 - 2writetext UnknownText_0x191620 + writetext UnknownText_0x191620 closetext loadmovesprites end ; 0x191614 UnknownScript_0x191614: ; 0x191614 - 2writetext UnknownText_0x191698 + writetext UnknownText_0x191698 closetext loadmovesprites end diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index c8c7680bb..c0e155db5 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -47,7 +47,7 @@ SailorScript_0x74dc4: ; 0x74dc4 loadfont checkevent $0000 iftrue UnknownScript_0x74e1a - 2writetext UnknownText_0x74f06 + writetext UnknownText_0x74f06 closetext loadmovesprites spriteface $2, $0 @@ -79,7 +79,7 @@ SailorScript_0x74dc4: ; 0x74dc4 ; 0x74e1a UnknownScript_0x74e1a: ; 0x74e1a - 2writetext UnknownText_0x74f31 + writetext UnknownText_0x74f31 closetext loadmovesprites end @@ -99,23 +99,23 @@ UnknownScript_0x74e20: ; 0x74e20 if_equal THURSDAY, UnknownScript_0x74e7c if_equal FRIDAY, UnknownScript_0x74e7c if_equal SATURDAY, UnknownScript_0x74e7c - 2writetext UnknownText_0x74f4d + writetext UnknownText_0x74f4d yesorno iffalse UnknownScript_0x74e8d - 2writetext UnknownText_0x74f8b + writetext UnknownText_0x74f8b keeptextopen checkitem S_S_TICKET iffalse UnknownScript_0x74e68 - 2writetext UnknownText_0x74fc2 + writetext UnknownText_0x74fc2 closetext loadmovesprites setevent $0001 applymovement $0, MovementData_0x74ef8 - 2jump SailorScript_0x74dc4 + jump SailorScript_0x74dc4 ; 0x74e68 UnknownScript_0x74e68: ; 0x74e68 - 2writetext UnknownText_0x74ff2 + writetext UnknownText_0x74ff2 closetext loadmovesprites applymovement $0, MovementData_0x74ef5 @@ -123,7 +123,7 @@ UnknownScript_0x74e68: ; 0x74e68 ; 0x74e72 UnknownScript_0x74e72: ; 0x74e72 - 2writetext UnknownText_0x75059 + writetext UnknownText_0x75059 closetext loadmovesprites applymovement $0, MovementData_0x74ef5 @@ -131,7 +131,7 @@ UnknownScript_0x74e72: ; 0x74e72 ; 0x74e7c UnknownScript_0x74e7c: ; 0x74e7c - 2writetext UnknownText_0x75080 + writetext UnknownText_0x75080 closetext loadmovesprites applymovement $0, MovementData_0x74ef5 @@ -143,14 +143,14 @@ UnknownScript_0x74e86: ; 0x74e86 ; 0x74e87 UnknownScript_0x74e87: ; 0x74e87 - 2writetext UnknownText_0x74fa7 + writetext UnknownText_0x74fa7 closetext loadmovesprites end ; 0x74e8d UnknownScript_0x74e8d: ; 0x74e8d - 2writetext UnknownText_0x74fa7 + writetext UnknownText_0x74fa7 closetext loadmovesprites applymovement $0, MovementData_0x74ef5 @@ -168,37 +168,37 @@ SailorScript_0x74e97: ; 0x74e97 if_equal THURSDAY, UnknownScript_0x74ee0 if_equal FRIDAY, UnknownScript_0x74ee0 if_equal SATURDAY, UnknownScript_0x74ee0 - 2writetext UnknownText_0x74f4d + writetext UnknownText_0x74f4d yesorno iffalse UnknownScript_0x74e87 - 2writetext UnknownText_0x74f8b + writetext UnknownText_0x74f8b keeptextopen checkitem S_S_TICKET iffalse UnknownScript_0x74ed4 - 2writetext UnknownText_0x74fc2 + writetext UnknownText_0x74fc2 closetext loadmovesprites setevent $0001 applymovement $0, MovementData_0x74efe - 2jump SailorScript_0x74dc4 + jump SailorScript_0x74dc4 ; 0x74ed4 UnknownScript_0x74ed4: ; 0x74ed4 - 2writetext UnknownText_0x74ff2 + writetext UnknownText_0x74ff2 closetext loadmovesprites end ; 0x74eda UnknownScript_0x74eda: ; 0x74eda - 2writetext UnknownText_0x75059 + writetext UnknownText_0x75059 closetext loadmovesprites end ; 0x74ee0 UnknownScript_0x74ee0: ; 0x74ee0 - 2writetext UnknownText_0x75080 + writetext UnknownText_0x75080 closetext loadmovesprites end @@ -207,7 +207,7 @@ UnknownScript_0x74ee0: ; 0x74ee0 SuperNerdScript_0x74ee6: ; 0x74ee6 faceplayer loadfont - 2writetext UnknownText_0x750a6 + writetext UnknownText_0x750a6 closetext loadmovesprites end diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index 05310b5ac..7a87a72ad 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -26,7 +26,7 @@ UnknownScript_0x74492: ; 0x74492 pause 15 appear $2 applymovement $2, MovementData_0x74539 - 2call UnknownScript_0x744d4 + scall UnknownScript_0x744d4 applymovement $2, MovementData_0x7454c disappear $2 dotrigger $1 @@ -41,7 +41,7 @@ UnknownScript_0x744b5: ; 0x744b5 pause 15 appear $2 applymovement $2, MovementData_0x74542 - 2call UnknownScript_0x744d4 + scall UnknownScript_0x744d4 applymovement $2, MovementData_0x74555 disappear $2 dotrigger $1 @@ -53,7 +53,7 @@ UnknownScript_0x744d4: ; 0x744d4 spriteface $0, $0 playmusic MUSIC_RIVAL_ENCOUNTER loadfont - 2writetext UnknownText_0x7455f + writetext UnknownText_0x7455f closetext loadmovesprites setevent $06c2 @@ -67,7 +67,7 @@ UnknownScript_0x744d4: ; 0x744d4 startbattle reloadmapmusic returnafterbattle - 2jump UnknownScript_0x7451f + jump UnknownScript_0x7451f ; 0x744ff UnknownScript_0x744ff: ; 0x744ff @@ -77,7 +77,7 @@ UnknownScript_0x744ff: ; 0x744ff startbattle reloadmapmusic returnafterbattle - 2jump UnknownScript_0x7451f + jump UnknownScript_0x7451f ; 0x7450f UnknownScript_0x7450f: ; 0x7450f @@ -87,13 +87,13 @@ UnknownScript_0x7450f: ; 0x7450f startbattle reloadmapmusic returnafterbattle - 2jump UnknownScript_0x7451f + jump UnknownScript_0x7451f ; 0x7451f UnknownScript_0x7451f: ; 0x7451f playmusic MUSIC_RIVAL_AFTER loadfont - 2writetext UnknownText_0x746ce + writetext UnknownText_0x746ce closetext loadmovesprites end diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index 73d5fd2af..80dd5f677 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -20,18 +20,18 @@ UnknownScript_0x9b9fc: ; 0x9b9fc UnknownScript_0x9b9fd: ; 0x9b9fd spriteface $0, $2 - 2jump UnknownScript_0x9ba04 + jump UnknownScript_0x9ba04 ; 0x9ba03 OfficerScript_0x9ba03: ; 0x9ba03 faceplayer UnknownScript_0x9ba04: ; 0x9ba04 loadfont - 2writetext UnknownText_0x9ba29 + writetext UnknownText_0x9ba29 keeptextopen checkcode $7 if_greater_than $7, UnknownScript_0x9ba19 - 2writetext UnknownText_0x9ba5f + writetext UnknownText_0x9ba5f closetext loadmovesprites applymovement $0, MovementData_0x9ba27 @@ -39,7 +39,7 @@ UnknownScript_0x9ba04: ; 0x9ba04 ; 0x9ba19 UnknownScript_0x9ba19: ; 0x9ba19 - 2writetext UnknownText_0x9bab4 + writetext UnknownText_0x9bab4 closetext loadmovesprites dotrigger $1 diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index ab7d58456..c04ad8069 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -19,21 +19,21 @@ FisherScript_0x1a83bb: ; 0x1a83bb applymovement $2, MovementData_0x1a8465 faceplayer loadfont - 2writetext UnknownText_0x1a8473 + writetext UnknownText_0x1a8473 yesorno iffalse UnknownScript_0x1a83d1 - 2jump UnknownScript_0x1a83cb + jump UnknownScript_0x1a83cb ; 0x1a83cb UnknownScript_0x1a83cb: ; 0x1a83cb - 2writetext UnknownText_0x1a84ac + writetext UnknownText_0x1a84ac closetext loadmovesprites end ; 0x1a83d1 UnknownScript_0x1a83d1: ; 0x1a83d1 - 2writetext UnknownText_0x1a84cb + writetext UnknownText_0x1a84cb closetext loadmovesprites playmusic MUSIC_SHOW_ME_AROUND @@ -44,7 +44,7 @@ UnknownScript_0x1a83d1: ; 0x1a83d1 stopfollow special $003d loadfont - 2writetext UnknownText_0x1a84f9 + writetext UnknownText_0x1a84f9 closetext loadmovesprites applymovement $2, MovementData_0x1a8465 diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index 563c25c25..743c5c471 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -11,7 +11,7 @@ FalknerScript_0x683c2: ; 0x683c2 loadfont checkevent EVENT_BEAT_FALKNER iftrue UnknownScript_0x683ec - 2writetext UnknownText_0x68473 + writetext UnknownText_0x68473 closetext loadmovesprites winlosstext UnknownText_0x6854a, $0000 @@ -20,12 +20,12 @@ FalknerScript_0x683c2: ; 0x683c2 returnafterbattle setevent EVENT_BEAT_FALKNER loadfont - 2writetext UnknownText_0x685af + writetext UnknownText_0x685af playsound SFX_GET_BADGE waitbutton setflag $001b checkcode $7 - 2call UnknownScript_0x68418 + scall UnknownScript_0x68418 UnknownScript_0x683ec: ; 0x683ec checkevent EVENT_GOT_TM31_MUD_SLAP iftrue UnknownScript_0x68412 @@ -33,19 +33,19 @@ UnknownScript_0x683ec: ; 0x683ec setevent EVENT_BEAT_BIRD_KEEPER_ABE domaptrigger GROUP_ELMS_LAB, MAP_ELMS_LAB, $2 specialphonecall $3 - 2writetext UnknownText_0x685c8 + writetext UnknownText_0x685c8 keeptextopen verbosegiveitem TM_31, 1 iffalse UnknownScript_0x68416 setevent EVENT_GOT_TM31_MUD_SLAP - 2writetext UnknownText_0x68648 + writetext UnknownText_0x68648 closetext loadmovesprites end ; 0x68412 UnknownScript_0x68412: ; 0x68412 - 2writetext UnknownText_0x68735 + writetext UnknownText_0x68735 closetext UnknownScript_0x68416: ; 0x68416 loadmovesprites @@ -89,7 +89,7 @@ TrainerBird_keeperRod: ; 0x68427 Bird_keeperRodScript: ; 0x68433 talkaftercancel loadfont - 2writetext UnknownText_0x68837 + writetext UnknownText_0x68837 closetext loadmovesprites end @@ -118,7 +118,7 @@ TrainerBird_keeperAbe: ; 0x6843b Bird_keeperAbeScript: ; 0x68447 talkaftercancel loadfont - 2writetext UnknownText_0x688c7 + writetext UnknownText_0x688c7 closetext loadmovesprites end @@ -129,13 +129,13 @@ VioletGymGuyScript: ; 0x6844f loadfont checkevent EVENT_BEAT_FALKNER iftrue .VioletGymGuyWinScript - 2writetext VioletGymGuyText + writetext VioletGymGuyText closetext loadmovesprites end .VioletGymGuyWinScript - 2writetext VioletGymGuyWinText + writetext VioletGymGuyWinText closetext loadmovesprites end diff --git a/maps/VioletNicknameSpeechHouse.asm b/maps/VioletNicknameSpeechHouse.asm index 004359f1f..ab7cdabef 100644 --- a/maps/VioletNicknameSpeechHouse.asm +++ b/maps/VioletNicknameSpeechHouse.asm @@ -17,7 +17,7 @@ LassScript_0x693ec: ; 0x693ec BirdScript_0x693ef: ; 0x693ef faceplayer loadfont - 2writetext UnknownText_0x6947c + writetext UnknownText_0x6947c cry PIDGEY closetext loadmovesprites diff --git a/maps/VioletPokeCenter1F.asm b/maps/VioletPokeCenter1F.asm index 49d6a2a71..ca1ae8f8c 100644 --- a/maps/VioletPokeCenter1F.asm +++ b/maps/VioletPokeCenter1F.asm @@ -15,7 +15,7 @@ ScientistScript_0x694cc: ; 0x694cc loadfont checkevent EVENT_REFUSED_TO_TAKE_EGG_FROM_ELMS_AIDE iftrue UnknownScript_0x6953a - 2writetext UnknownText_0x69555 + writetext UnknownText_0x69555 UnknownScript_0x694d7: ; 0x694d7 yesorno iffalse UnknownScript_0x69531 @@ -23,12 +23,12 @@ UnknownScript_0x694d7: ; 0x694d7 if_equal $6, UnknownScript_0x6952b giveegg TOGEPI, 5 stringtotext .eggname, $1 - 2call UnknownScript_0x69527 + scall UnknownScript_0x69527 setevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE clearevent EVENT_ELMS_AIDE_IN_LAB clearevent EVENT_TOGEPI_HATCHED domaptrigger GROUP_ROUTE_32, MAP_ROUTE_32, $1 - 2writetext UnknownText_0x695c5 + writetext UnknownText_0x695c5 closetext loadmovesprites checkcode $9 @@ -60,14 +60,14 @@ UnknownScript_0x69527: ; 0x69527 ; 0x6952b UnknownScript_0x6952b: ; 0x6952b - 2writetext UnknownText_0x69693 + writetext UnknownText_0x69693 closetext loadmovesprites end ; 0x69531 UnknownScript_0x69531: ; 0x69531 - 2writetext UnknownText_0x696f2 + writetext UnknownText_0x696f2 closetext loadmovesprites setevent EVENT_REFUSED_TO_TAKE_EGG_FROM_ELMS_AIDE @@ -75,8 +75,8 @@ UnknownScript_0x69531: ; 0x69531 ; 0x6953a UnknownScript_0x6953a: ; 0x6953a - 2writetext UnknownText_0x69712 - 2jump UnknownScript_0x694d7 + writetext UnknownText_0x69712 + jump UnknownScript_0x694d7 ; 0x69540 GameboyKidScript_0x69540: ; 0x69540 diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index ac343c69f..60fdba4d0 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -18,17 +18,17 @@ UnknownScript_0x1a9a48: ; 0x1a9a48 GrampsScript_0x1a9a4c: ; 0x1a9a4c faceplayer loadfont - 2writetext UnknownText_0x1a9aa5 + writetext UnknownText_0x1a9aa5 yesorno iffalse UnknownScript_0x1a9a5b - 2writetext UnknownText_0x1a9b6f + writetext UnknownText_0x1a9b6f closetext loadmovesprites end ; 0x1a9a5b UnknownScript_0x1a9a5b: ; 0x1a9a5b - 2writetext UnknownText_0x1a9bb7 + writetext UnknownText_0x1a9bb7 closetext loadmovesprites end @@ -39,14 +39,14 @@ GrampsScript_0x1a9a61: ; 0x1a9a61 loadfont checkevent $0775 iftrue UnknownScript_0x1a9a6f - 2writetext UnknownText_0x1a9c11 + writetext UnknownText_0x1a9c11 closetext loadmovesprites end ; 0x1a9a6f UnknownScript_0x1a9a6f: ; 0x1a9a6f - 2writetext UnknownText_0x1a9c7e + writetext UnknownText_0x1a9c7e closetext loadmovesprites end @@ -57,13 +57,13 @@ FisherScript_0x1a9a75: ; 0x1a9a75 loadfont checkevent EVENT_GOT_TM42_DREAM_EATER iftrue UnknownScript_0x1a9a8a - 2writetext UnknownText_0x1a9cc4 + writetext UnknownText_0x1a9cc4 keeptextopen verbosegiveitem TM_42, 1 iffalse UnknownScript_0x1a9a8e setevent EVENT_GOT_TM42_DREAM_EATER UnknownScript_0x1a9a8a: ; 0x1a9a8a - 2writetext UnknownText_0x1a9d86 + writetext UnknownText_0x1a9d86 closetext UnknownScript_0x1a9a8e: ; 0x1a9a8e loadmovesprites diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index e3a8def43..a183a6f44 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -11,7 +11,7 @@ BlueScript_0x9aa26: ; 0x9aa26 loadfont checkflag $002a iftrue UnknownScript_0x9aa51 - 2writetext UnknownText_0x9aa7b + writetext UnknownText_0x9aa7b closetext loadmovesprites winlosstext UnknownText_0x9abae, $0000 @@ -20,18 +20,18 @@ BlueScript_0x9aa26: ; 0x9aa26 returnafterbattle setevent EVENT_BEAT_BLUE loadfont - 2writetext UnknownText_0x9ac0f + writetext UnknownText_0x9ac0f playsound SFX_GET_BADGE waitbutton setflag $002a - 2writetext UnknownText_0x9ac27 + writetext UnknownText_0x9ac27 closetext loadmovesprites end ; 0x9aa51 UnknownScript_0x9aa51: ; 0x9aa51 - 2writetext UnknownText_0x9acab + writetext UnknownText_0x9acab closetext loadmovesprites end @@ -42,13 +42,13 @@ ViridianGymGuyScript: ; 0x9aa57 loadfont checkevent EVENT_BEAT_BLUE iftrue .ViridianGymGuyWinScript - 2writetext ViridianGymGuyText + writetext ViridianGymGuyText closetext loadmovesprites end .ViridianGymGuyWinScript - 2writetext ViridianGymGuyWinText + writetext ViridianGymGuyWinText closetext loadmovesprites end diff --git a/maps/ViridianNicknameSpeechHouse.asm b/maps/ViridianNicknameSpeechHouse.asm index 22a085fb4..aed513c1b 100644 --- a/maps/ViridianNicknameSpeechHouse.asm +++ b/maps/ViridianNicknameSpeechHouse.asm @@ -16,7 +16,7 @@ LassScript_0x9ae3d: ; 0x9ae3d MoltresScript_0x9ae40: ; 0x9ae40 loadfont - 2writetext UnknownText_0x9aefe + writetext UnknownText_0x9aefe cry SPEAROW closetext loadmovesprites @@ -25,7 +25,7 @@ MoltresScript_0x9ae40: ; 0x9ae40 GrowlitheScript_0x9ae4a: ; 0x9ae4a loadfont - 2writetext UnknownText_0x9af10 + writetext UnknownText_0x9af10 cry RATTATA closetext loadmovesprites diff --git a/maps/ViridianPokeCenter1F.asm b/maps/ViridianPokeCenter1F.asm index 254cfb552..a5f322aec 100644 --- a/maps/ViridianPokeCenter1F.asm +++ b/maps/ViridianPokeCenter1F.asm @@ -15,14 +15,14 @@ CooltrainerMScript_0x9b693: ; 0x9b693 loadfont checkevent $0775 iftrue UnknownScript_0x9b6a1 - 2writetext UnknownText_0x9b6ad + writetext UnknownText_0x9b6ad closetext loadmovesprites end ; 0x9b6a1 UnknownScript_0x9b6a1: ; 0x9b6a1 - 2writetext UnknownText_0x9b6f5 + writetext UnknownText_0x9b6f5 closetext loadmovesprites end diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm index 1085fa4af..bdcecc4a2 100644 --- a/maps/WarehouseEntrance.asm +++ b/maps/WarehouseEntrance.asm @@ -136,7 +136,7 @@ TrainerSupernerdEric: ; 0x7c0e2 SupernerdEricScript: ; 0x7c0ee talkaftercancel loadfont - 2writetext UnknownText_0x7c36c + writetext UnknownText_0x7c36c closetext loadmovesprites end @@ -165,7 +165,7 @@ TrainerSupernerdTeru: ; 0x7c0f6 SupernerdTeruScript: ; 0x7c102 talkaftercancel loadfont - 2writetext UnknownText_0x7c410 + writetext UnknownText_0x7c410 closetext loadmovesprites end @@ -194,7 +194,7 @@ TrainerPokemaniacIssac: ; 0x7c10a PokemaniacIssacScript: ; 0x7c116 talkaftercancel loadfont - 2writetext UnknownText_0x7c498 + writetext UnknownText_0x7c498 closetext loadmovesprites end @@ -223,7 +223,7 @@ TrainerPokemaniacDonald: ; 0x7c11e PokemaniacDonaldScript: ; 0x7c12a talkaftercancel loadfont - 2writetext UnknownText_0x7c52f + writetext UnknownText_0x7c52f closetext loadmovesprites end @@ -234,7 +234,7 @@ GrannyScript_0x7c132: ; 0x7c132 checkcode $b if_equal SUNDAY, UnknownScript_0x7c140 if_equal SATURDAY, UnknownScript_0x7c140 - 2jump UnknownScript_0x7c300 + jump UnknownScript_0x7c300 ; 0x7c140 UnknownScript_0x7c140: ; 0x7c140 @@ -249,7 +249,7 @@ GrampsScript_0x7c146: ; 0x7c146 iftrue UnknownScript_0x7c300 checkcode $b if_equal MONDAY, UnknownScript_0x7c156 - 2jump UnknownScript_0x7c300 + jump UnknownScript_0x7c300 ; 0x7c156 UnknownScript_0x7c156: ; 0x7c156 @@ -266,19 +266,19 @@ SuperNerdScript_0x7c161: ; 0x7c161 if_equal TUESDAY, UnknownScript_0x7c173 if_equal THURSDAY, UnknownScript_0x7c173 if_equal SATURDAY, UnknownScript_0x7c173 - 2jump UnknownScript_0x7c300 + jump UnknownScript_0x7c300 ; 0x7c173 UnknownScript_0x7c173: ; 0x7c173 checkflag $005a iftrue UnknownScript_0x7c208 special $0051 - 2writetext UnknownText_0x7c5f9 + writetext UnknownText_0x7c5f9 yesorno iffalse UnknownScript_0x7c1fc checkmoney $0, 500 if_equal $2, UnknownScript_0x7c202 - 2writetext UnknownText_0x7c69a + writetext UnknownText_0x7c69a keeptextopen special $0061 if_equal $0, UnknownScript_0x7c1fc @@ -286,34 +286,34 @@ UnknownScript_0x7c173: ; 0x7c173 setflag $005a if_equal $2, UnknownScript_0x7c1a9 if_equal $3, UnknownScript_0x7c1b5 - 2jump UnknownScript_0x7c1c1 + jump UnknownScript_0x7c1c1 ; 0x7c1a9 UnknownScript_0x7c1a9: ; 0x7c1a9 setevent $0000 clearevent $0001 clearevent $0002 - 2jump UnknownScript_0x7c1cd + jump UnknownScript_0x7c1cd ; 0x7c1b5 UnknownScript_0x7c1b5: ; 0x7c1b5 clearevent $0000 setevent $0001 clearevent $0002 - 2jump UnknownScript_0x7c1cd + jump UnknownScript_0x7c1cd ; 0x7c1c1 UnknownScript_0x7c1c1: ; 0x7c1c1 clearevent $0000 clearevent $0001 setevent $0002 - 2jump UnknownScript_0x7c1cd + jump UnknownScript_0x7c1cd ; 0x7c1cd UnknownScript_0x7c1cd: ; 0x7c1cd takemoney $0, 500 special $0051 - 2writetext UnknownText_0x7c6b8 + writetext UnknownText_0x7c6b8 closetext loadmovesprites special $002e @@ -322,31 +322,31 @@ UnknownScript_0x7c1cd: ; 0x7c1cd special $0031 special $003d loadfont - 2writetext UnknownText_0x7c6d8 + writetext UnknownText_0x7c6d8 closetext checkevent $0000 iftrue UnknownScript_0x7c2bb checkevent $0001 iftrue UnknownScript_0x7c2c4 - 2jump UnknownScript_0x7c2cd + jump UnknownScript_0x7c2cd ; 0x7c1fc UnknownScript_0x7c1fc: ; 0x7c1fc - 2writetext UnknownText_0x7c6ea + writetext UnknownText_0x7c6ea closetext loadmovesprites end ; 0x7c202 UnknownScript_0x7c202: ; 0x7c202 - 2writetext UnknownText_0x7c709 + writetext UnknownText_0x7c709 closetext loadmovesprites end ; 0x7c208 UnknownScript_0x7c208: ; 0x7c208 - 2writetext UnknownText_0x7c72b + writetext UnknownText_0x7c72b closetext loadmovesprites end @@ -358,19 +358,19 @@ SuperNerdScript_0x7c20e: ; 0x7c20e if_equal SUNDAY, UnknownScript_0x7c220 if_equal WEDNESDAY, UnknownScript_0x7c220 if_equal FRIDAY, UnknownScript_0x7c220 - 2jump UnknownScript_0x7c300 + jump UnknownScript_0x7c300 ; 0x7c220 UnknownScript_0x7c220: ; 0x7c220 checkflag $005a iftrue UnknownScript_0x7c2b5 special $0051 - 2writetext UnknownText_0x7c75c + writetext UnknownText_0x7c75c yesorno iffalse UnknownScript_0x7c2a9 checkmoney $0, 300 if_equal $2, UnknownScript_0x7c2af - 2writetext UnknownText_0x7c7f1 + writetext UnknownText_0x7c7f1 keeptextopen special $0062 if_equal $0, UnknownScript_0x7c2a9 @@ -378,34 +378,34 @@ UnknownScript_0x7c220: ; 0x7c220 setflag $005a if_equal $2, UnknownScript_0x7c256 if_equal $3, UnknownScript_0x7c262 - 2jump UnknownScript_0x7c26e + jump UnknownScript_0x7c26e ; 0x7c256 UnknownScript_0x7c256: ; 0x7c256 setevent $0000 clearevent $0001 clearevent $0002 - 2jump UnknownScript_0x7c27a + jump UnknownScript_0x7c27a ; 0x7c262 UnknownScript_0x7c262: ; 0x7c262 clearevent $0000 setevent $0001 clearevent $0002 - 2jump UnknownScript_0x7c27a + jump UnknownScript_0x7c27a ; 0x7c26e UnknownScript_0x7c26e: ; 0x7c26e clearevent $0000 clearevent $0001 setevent $0002 - 2jump UnknownScript_0x7c27a + jump UnknownScript_0x7c27a ; 0x7c27a UnknownScript_0x7c27a: ; 0x7c27a takemoney $0, 300 special $0051 - 2writetext UnknownText_0x7c80e + writetext UnknownText_0x7c80e closetext loadmovesprites special $002e @@ -414,38 +414,38 @@ UnknownScript_0x7c27a: ; 0x7c27a special $0031 special $003d loadfont - 2writetext UnknownText_0x7c82a + writetext UnknownText_0x7c82a closetext checkevent $0000 iftrue UnknownScript_0x7c2bb checkevent $0001 iftrue UnknownScript_0x7c2c4 - 2jump UnknownScript_0x7c2cd + jump UnknownScript_0x7c2cd ; 0x7c2a9 UnknownScript_0x7c2a9: ; 0x7c2a9 - 2writetext UnknownText_0x7c842 + writetext UnknownText_0x7c842 closetext loadmovesprites end ; 0x7c2af UnknownScript_0x7c2af: ; 0x7c2af - 2writetext UnknownText_0x7c85b + writetext UnknownText_0x7c85b closetext loadmovesprites end ; 0x7c2b5 UnknownScript_0x7c2b5: ; 0x7c2b5 - 2writetext UnknownText_0x7c87b + writetext UnknownText_0x7c87b closetext loadmovesprites end ; 0x7c2bb UnknownScript_0x7c2bb: ; 0x7c2bb - 2writetext UnknownText_0x7c8bf + writetext UnknownText_0x7c8bf special $0064 closetext loadmovesprites @@ -453,7 +453,7 @@ UnknownScript_0x7c2bb: ; 0x7c2bb ; 0x7c2c4 UnknownScript_0x7c2c4: ; 0x7c2c4 - 2writetext UnknownText_0x7c8dc + writetext UnknownText_0x7c8dc special $0064 closetext loadmovesprites @@ -461,7 +461,7 @@ UnknownScript_0x7c2c4: ; 0x7c2c4 ; 0x7c2cd UnknownScript_0x7c2cd: ; 0x7c2cd - 2writetext UnknownText_0x7c8ee + writetext UnknownText_0x7c8ee special $0064 closetext loadmovesprites @@ -474,7 +474,7 @@ MapWarehouseEntranceSignpost0Script:: ; 0x7c2d6 iftrue UnknownScript_0x7c2fa checkitem BASEMENT_KEY iftrue UnknownScript_0x7c2e8 - 2writetext UnknownText_0x7c5b0 + writetext UnknownText_0x7c5b0 closetext loadmovesprites end @@ -482,7 +482,7 @@ MapWarehouseEntranceSignpost0Script:: ; 0x7c2d6 UnknownScript_0x7c2e8: ; 0x7c2e8 playsound SFX_TRANSACTION - 2writetext UnknownText_0x7c5d6 + writetext UnknownText_0x7c5d6 closetext loadmovesprites changeblock $12, $6, $2e @@ -493,14 +493,14 @@ UnknownScript_0x7c2e8: ; 0x7c2e8 ; 0x7c2fa UnknownScript_0x7c2fa: ; 0x7c2fa - 2writetext UnknownText_0x7c5c3 + writetext UnknownText_0x7c5c3 closetext loadmovesprites end ; 0x7c300 UnknownScript_0x7c300: ; 0x7c300 - 2writetext UnknownText_0x7c904 + writetext UnknownText_0x7c904 closetext loadmovesprites end diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm index ff95c239d..76965fa9e 100644 --- a/maps/WhirlIslandLugiaChamber.asm +++ b/maps/WhirlIslandLugiaChamber.asm @@ -15,7 +15,7 @@ UnknownScript_0x18c504: ; 0x18c504 iftrue UnknownScript_0x18c515 checkitem SILVER_WING iftrue UnknownScript_0x18c512 - 2jump UnknownScript_0x18c515 + jump UnknownScript_0x18c515 ; 0x18c512 UnknownScript_0x18c512: ; 0x18c512 @@ -31,7 +31,7 @@ UnknownScript_0x18c515: ; 0x18c515 LugiaScript_0x18c518: ; 0x18c518 faceplayer loadfont - 2writetext UnknownText_0x18c531 + writetext UnknownText_0x18c531 cry LUGIA pause 15 loadmovesprites diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index 4eda6e204..84f7f7403 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -54,7 +54,7 @@ WillScript_0x1804f8: ; 0x1804f8 loadfont checkevent $05b8 iftrue UnknownScript_0x180526 - 2writetext UnknownText_0x180531 + writetext UnknownText_0x180531 closetext loadmovesprites winlosstext UnknownText_0x18062c, $0000 @@ -63,7 +63,7 @@ WillScript_0x1804f8: ; 0x1804f8 returnafterbattle setevent $05b8 loadfont - 2writetext UnknownText_0x180644 + writetext UnknownText_0x180644 closetext loadmovesprites playsound SFX_ENTER_DOOR @@ -76,7 +76,7 @@ WillScript_0x1804f8: ; 0x1804f8 ; 0x180526 UnknownScript_0x180526: ; 0x180526 - 2writetext UnknownText_0x180644 + writetext UnknownText_0x180644 closetext loadmovesprites end diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index 9d18c9e9b..c5ee42902 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -67,7 +67,7 @@ UnknownScript_0x985a3: ; 0x985a3 stopfollow spriteface $0, $3 loadfont - 2writetext UnknownText_0x98712 + writetext UnknownText_0x98712 closetext loadmovesprites applymovement $4, MovementData_0x98625 @@ -97,7 +97,7 @@ TrainerSageGaku: ; 0x985c6 SageGakuScript: ; 0x985d2 loadfont - 2writetext UnknownText_0x98938 + writetext UnknownText_0x98938 closetext loadmovesprites end @@ -125,7 +125,7 @@ TrainerSageMasa: ; 0x985d9 SageMasaScript: ; 0x985e5 loadfont - 2writetext UnknownText_0x98a35 + writetext UnknownText_0x98a35 closetext loadmovesprites end @@ -157,9 +157,9 @@ SageKojiScript: ; 0x985f8 pause 10 showemote $0, $7, 20 loadfont - 2writetext UnknownText_0x98c6c + writetext UnknownText_0x98c6c keeptextopen - 2writetext UnknownText_0x98cac + writetext UnknownText_0x98cac closetext loadmovesprites applymovement $7, MovementData_0x98628 @@ -171,7 +171,7 @@ SageKojiScript: ; 0x985f8 UnknownScript_0x9861b: ; 0x9861b loadfont - 2writetext UnknownText_0x98db5 + writetext UnknownText_0x98db5 closetext loadmovesprites end From 0fa7b553bddeb4ba70b216c93eb09226b2674beb Mon Sep 17 00:00:00 2001 From: yenatch Date: Tue, 20 Jan 2015 00:05:16 -0800 Subject: [PATCH 9/9] Get rid of the preprocessor. extras is no longer required to build. --- preprocessor.py | 76 ------------------------------------------------- prequeue.py | 38 ------------------------- 2 files changed, 114 deletions(-) delete mode 100644 preprocessor.py delete mode 100644 prequeue.py diff --git a/preprocessor.py b/preprocessor.py deleted file mode 100644 index 436ab2b1b..000000000 --- a/preprocessor.py +++ /dev/null @@ -1,76 +0,0 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- - -import sys - -import extras.pokemontools.configuration as configuration -import extras.pokemontools.preprocessor as preprocessor - -from extras.pokemontools.crystal import ( - command_classes, - Warp, - XYTrigger, - Signpost, - PeopleEvent, - DataByteWordMacro, - text_command_classes, - movement_command_classes, - music_classes, - effect_classes, - ChannelCommand, - OctaveCommand, -) - -from extras.pokemontools.audio import ( - Note, - Noise, - SoundCommand, -) - -from extras.pokemontools.battle_animations import ( - BattleAnimWait, - battle_animation_classes, -) - -def load_pokecrystal_macros(): - """ - Construct a list of macros that are needed for pokecrystal preprocessing. - """ - ourmacros = [] - - even_more_macros = [ - Warp, - XYTrigger, - Signpost, - PeopleEvent, - DataByteWordMacro, - ChannelCommand, - OctaveCommand, - Note, - Noise, - SoundCommand, - ] - - ourmacros += command_classes - ourmacros += even_more_macros - ourmacros += [each[1] for each in text_command_classes] - ourmacros += movement_command_classes - ourmacros += music_classes - ourmacros += effect_classes - ourmacros += battle_animation_classes + [BattleAnimWait] - - return ourmacros - -def setup_processor(): - config = configuration.Config() - macros = load_pokecrystal_macros() - processor = preprocessor.Preprocessor(config, macros) - return processor - -def main(): - processor = setup_processor() - processor.preprocess() - -# only run against stdin when not included as a module -if __name__ == "__main__": - main() diff --git a/prequeue.py b/prequeue.py deleted file mode 100644 index 8125f7035..000000000 --- a/prequeue.py +++ /dev/null @@ -1,38 +0,0 @@ -# coding: utf-8 -""" -Starting a new python process to preprocess each source file creates too much -overhead. Instead, a list of files to preprocess is fed into a script run from -a single process. -""" - -import os -import sys - -import preprocessor - -def preprocess_queue(filenames=sys.argv[1:]): - - stdin = sys.stdin - stdout = sys.stdout - - processor = preprocessor.setup_processor() - - for source in filenames: - dest = os.path.splitext(source)[0] + '.tx' - sys.stdin = open(source, 'r') - sys.stdout = open(dest, 'w') - processor.preprocess() - - sys.stdin = stdin - sys.stdout = stdout - -def main(): - filenames = list(set(sys.argv[1:])) - if filenames: - num_files = len(filenames) - s = '' if num_files == 1 else 's' - sys.stdout.write('Preprocessing {0} file{1}...\n'.format(num_files, s)) - preprocess_queue(filenames) - -if __name__ == '__main__': - main()