Rename/organize part 2 of 4

rename functions, clean up address/wram comments, other misc
only broken up so that all changes are viewable on github
This commit is contained in:
U-Daniel-PC\Daniel 2015-07-03 14:38:12 -05:00
parent cd649184f5
commit f4a31b3e0b
142 changed files with 2245 additions and 2242 deletions

View file

@ -40,7 +40,8 @@ AgathaScriptPointers: ; 76469 (1d:6469)
AgathaScript4: ; 76473 (1d:6473) AgathaScript4: ; 76473 (1d:6473)
ret ret
asm_76474: ; 76474 (1d:6474)
AgathaScript_76474: ; 76474 (1d:6474)
ld hl, wSimulatedJoypadStatesEnd ld hl, wSimulatedJoypadStatesEnd
ld a, D_UP ld a, D_UP
ld [hli], a ld [hli], a
@ -66,16 +67,16 @@ AgathaScript0: ; 76490 (1d:6490)
ld [hJoyHeld], a ld [hJoyHeld], a
ld [wSimulatedJoypadStatesEnd], a ld [wSimulatedJoypadStatesEnd], a
ld [wSimulatedJoypadStatesIndex], a ld [wSimulatedJoypadStatesIndex], a
ld a, [wWhichTrade] ; wWhichTrade ld a, [wWhichTrade]
cp $3 cp $3
jr c, .asm_764b4 jr c, .asm_764b4
ld hl, wd865 ld hl, wd865
bit 6, [hl] bit 6, [hl]
set 6, [hl] set 6, [hl]
jr z, asm_76474 jr z, AgathaScript_76474
.asm_764b4 .asm_764b4
ld a, $2 ld a, $2
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a
call DisplayTextID call DisplayTextID
ld a, D_UP ld a, D_UP
ld [wSimulatedJoypadStatesEnd], a ld [wSimulatedJoypadStatesEnd], a
@ -107,11 +108,11 @@ AgathaScript3: ; 764da (1d:64da)
AgathaScript2: ; 764ed (1d:64ed) AgathaScript2: ; 764ed (1d:64ed)
call EndTrainerBattle call EndTrainerBattle
ld a, [W_ISINBATTLE] ; W_ISINBATTLE ld a, [W_ISINBATTLE]
cp $ff cp $ff
jp z, AgathaScript_76464 jp z, AgathaScript_76464
ld a, $1 ld a, $1
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a
call DisplayTextID call DisplayTextID
ld a, $1 ld a, $1
ld [W_GARYCURSCRIPT], a ld [W_GARYCURSCRIPT], a
@ -126,10 +127,10 @@ AgathaTrainerHeader0: ; 76509 (1d:6509)
db $1 ; flag's bit db $1 ; flag's bit
db ($0 << 4) ; trainer's view range db ($0 << 4) ; trainer's view range
dw wd865 ; flag's byte dw wd865 ; flag's byte
dw AgathaBeforeBattleText ; 0x6520 TextBeforeBattle dw AgathaBeforeBattleText ; TextBeforeBattle
dw AgathaAfterBattleText ; 0x652a TextAfterBattle dw AgathaAfterBattleText ; TextAfterBattle
dw AgathaEndBattleText ; 0x6525 TextEndBattle dw AgathaEndBattleText ; TextEndBattle
dw AgathaEndBattleText ; 0x6525 TextEndBattle dw AgathaEndBattleText ; TextEndBattle
db $ff db $ff

View file

@ -3,7 +3,7 @@ BattleCenterMScript: ; 4fd10 (13:7d10)
ld a, [$ffaa] ld a, [$ffaa]
cp $2 cp $2
ld a, $8 ld a, $8
jr z, .asm_4fd1d ; 0x4fd19 $2 jr z, .asm_4fd1d
ld a, $c ld a, $c
.asm_4fd1d .asm_4fd1d
ld [$ff8d], a ld [$ff8d], a

View file

@ -10,14 +10,14 @@ BikeShopText1: ; 1d745 (7:5745)
db $08 ; asm db $08 ; asm
ld a, [wd75f] ld a, [wd75f]
bit 0, a bit 0, a
jr z, .asm_260d4 ; 0x1d74b jr z, .asm_260d4
ld hl, BikeShopText_1d82f ld hl, BikeShopText_1d82f
call PrintText call PrintText
jp .Done jp .Done
.asm_260d4 ; 0x1d756 .asm_260d4
ld b, BIKE_VOUCHER ld b, BIKE_VOUCHER
call IsItemInBag call IsItemInBag
jr z, .asm_41190 ; 0x1d75b jr z, .asm_41190
ld hl, BikeShopText_1d81f ld hl, BikeShopText_1d81f
call PrintText call PrintText
ld bc, (BICYCLE << 8) | 1 ld bc, (BICYCLE << 8) | 1
@ -35,7 +35,7 @@ BikeShopText1: ; 1d745 (7:5745)
ld hl, BikeShopText_1d834 ld hl, BikeShopText_1d834
call PrintText call PrintText
jr .Done jr .Done
.asm_41190 ; 0x1d78c .asm_41190
ld hl, BikeShopText_1d810 ld hl, BikeShopText_1d810
call PrintText call PrintText
xor a xor a
@ -66,15 +66,15 @@ BikeShopText1: ; 1d745 (7:5745)
call PrintText call PrintText
call HandleMenuInput call HandleMenuInput
bit 1, a bit 1, a
jr nz, .asm_b7579 ; 0x1d7dc jr nz, .asm_b7579
ld hl, wd730 ld hl, wd730
res 6, [hl] res 6, [hl]
ld a, [wCurrentMenuItem] ld a, [wCurrentMenuItem]
and a and a
jr nz, .asm_b7579 ; 0x1d7e7 jr nz, .asm_b7579
ld hl, BikeShopText_1d81a ld hl, BikeShopText_1d81a
call PrintText call PrintText
.asm_b7579 ; 0x1d7ef .asm_b7579
ld hl, BikeShopText_1d82a ld hl, BikeShopText_1d82a
call PrintText call PrintText
.Done .Done
@ -104,7 +104,7 @@ BikeShopText_1d81f: ; 1d81f (7:581f)
db "@" db "@"
BikeShopText_1d824: ; 1d824 (7:5824) BikeShopText_1d824: ; 1d824 (7:5824)
TX_FAR _BikeShopText_1d824 ; 0x98eb2 TX_FAR _BikeShopText_1d824
db $11, "@" db $11, "@"
BikeShopText_1d82a: ; 1d82a (7:582a) BikeShopText_1d82a: ; 1d82a (7:582a)
@ -134,9 +134,9 @@ BikeShopText3: ; 1d848 (7:5848)
ld a, [wd75f] ld a, [wd75f]
bit 0, a bit 0, a
ld hl, BikeShopText_1d861 ld hl, BikeShopText_1d861
jr nz, .asm_34d2d ; 0x1d851 jr nz, .asm_34d2d
ld hl, BikeShopText_1d85c ld hl, BikeShopText_1d85c
.asm_34d2d ; 0x1d856 .asm_34d2d
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd

View file

@ -19,7 +19,7 @@ BillsHouseScript1: ; 1e783 (7:6783)
ld a, [wSpriteStateData1 + 9] ld a, [wSpriteStateData1 + 9]
and a and a
ld de, MovementData_1e79c ld de, MovementData_1e79c
jr nz, .asm_1e78f ; 0x1e78a $3 jr nz, .asm_1e78f
ld de, MovementData_1e7a0 ld de, MovementData_1e7a0
.asm_1e78f .asm_1e78f
ld a, $1 ld a, $1
@ -70,7 +70,7 @@ BillsHouseScript3: ; 1e7c5 (7:67c5)
ld a, HS_BILL_1 ld a, HS_BILL_1
ld [wcc4d], a ld [wcc4d], a
predef ShowObject predef ShowObject
ld c, $8 ld c, 8
call DelayFrames call DelayFrames
ld a, $2 ld a, $2
ld [$ff8c], a ld [$ff8c], a
@ -121,37 +121,37 @@ BillsHouseText1: ; 1e83d (7:683d)
call YesNoChoice call YesNoChoice
ld a, [wCurrentMenuItem] ld a, [wCurrentMenuItem]
and a and a
jr nz, asm_6b196 ; 0x1e84b $d jr nz, .asm_1e85a
asm_4d03c: ; 1e84d (7:684d) .asm_1e84d
ld hl, BillsHouseText_1e86a ld hl, BillsHouseText_1e86a
call PrintText call PrintText
ld a, $1 ld a, $1
ld [W_BILLSHOUSECURSCRIPT], a ld [W_BILLSHOUSECURSCRIPT], a
jr asm_fd4e2 ; 0x1e858 $8 jr .asm_1e862
asm_6b196: ; 1e85a (7:685a) .asm_1e85a
ld hl, BillsHouseText_1e86f ld hl, BillsHouseText_1e86f
call PrintText call PrintText
jr asm_4d03c ; 0x1e860 $eb jr .asm_1e84d
asm_fd4e2 ; 0x1e862 .asm_1e862
jp TextScriptEnd jp TextScriptEnd
BillsHouseText_1e865: ; 1e865 (7:6865) BillsHouseText_1e865: ; 1e865 (7:6865)
TX_FAR _BillsHouseText_1e865 ; 0x8d267 TX_FAR _BillsHouseText_1e865
db "@" db "@"
BillsHouseText_1e86a: ; 1e86a (7:686a) BillsHouseText_1e86a: ; 1e86a (7:686a)
TX_FAR _BillsHouseText_1e86a ; 0x8d345 TX_FAR _BillsHouseText_1e86a
db "@" db "@"
BillsHouseText_1e86f: ; 1e86f (7:686f) BillsHouseText_1e86f: ; 1e86f (7:686f)
TX_FAR _BillsHouseText_1e86f ; 0x8d391 TX_FAR _BillsHouseText_1e86f
db "@" db "@"
BillsHouseText2: ; 1e874 (7:6874) BillsHouseText2: ; 1e874 (7:6874)
db $08 ; asm db $08 ; asm
ld a, [wd7f2] ld a, [wd7f2]
bit 4, a bit 4, a
jr nz, .asm_5491f ; 0x1e87a jr nz, .asm_1e8a9
ld hl, BillThankYouText ld hl, BillThankYouText
call PrintText call PrintText
ld bc, (S_S__TICKET << 8) | 1 ld bc, (S_S__TICKET << 8) | 1
@ -167,14 +167,14 @@ BillsHouseText2: ; 1e874 (7:6874)
ld a, HS_CERULEAN_GUARD_2 ld a, HS_CERULEAN_GUARD_2
ld [wcc4d], a ld [wcc4d], a
predef HideObject predef HideObject
.asm_5491f ; 0x1e8a9 .asm_1e8a9
ld hl, BillsHouseText_1e8cb ld hl, BillsHouseText_1e8cb
call PrintText call PrintText
jr .asm_bd408 ; 0x1e8af jr .asm_1e8b7
.BagFull .BagFull
ld hl, SSTicketNoRoomText ld hl, SSTicketNoRoomText
call PrintText call PrintText
.asm_bd408 ; 0x1e8b7 .asm_1e8b7
jp TextScriptEnd jp TextScriptEnd
BillThankYouText: ; 1e8ba (7:68ba) BillThankYouText: ; 1e8ba (7:68ba)

View file

@ -40,7 +40,8 @@ BrunoScriptPointers: ; 76312 (1d:6312)
BrunoScript4: ; 7631c (1d:631c) BrunoScript4: ; 7631c (1d:631c)
ret ret
asm_7631d: ; 7631d (1d:631d)
BrunoScript_7631d: ; 7631d (1d:631d)
ld hl, wSimulatedJoypadStatesEnd ld hl, wSimulatedJoypadStatesEnd
ld a, D_UP ld a, D_UP
ld [hli], a ld [hli], a
@ -66,16 +67,16 @@ BrunoScript0: ; 76339 (1d:6339)
ld [hJoyHeld], a ld [hJoyHeld], a
ld [wSimulatedJoypadStatesEnd], a ld [wSimulatedJoypadStatesEnd], a
ld [wSimulatedJoypadStatesIndex], a ld [wSimulatedJoypadStatesIndex], a
ld a, [wWhichTrade] ; wWhichTrade ld a, [wWhichTrade]
cp $3 cp $3
jr c, .asm_7635d jr c, .asm_7635d
ld hl, wd864 ld hl, wd864
bit 6, [hl] bit 6, [hl]
set 6, [hl] set 6, [hl]
jr z, asm_7631d jr z, BrunoScript_7631d
.asm_7635d .asm_7635d
ld a, $2 ld a, $2
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a
call DisplayTextID call DisplayTextID
ld a, D_UP ld a, D_UP
ld [wSimulatedJoypadStatesEnd], a ld [wSimulatedJoypadStatesEnd], a
@ -107,11 +108,11 @@ BrunoScript3: ; 76383 (1d:6383)
BrunoScript2: ; 76396 (1d:6396) BrunoScript2: ; 76396 (1d:6396)
call EndTrainerBattle call EndTrainerBattle
ld a, [W_ISINBATTLE] ; W_ISINBATTLE ld a, [W_ISINBATTLE]
cp $ff cp $ff
jp z, BrunoScript_7630d jp z, BrunoScript_7630d
ld a, $1 ld a, $1
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a
jp DisplayTextID jp DisplayTextID
BrunoTextPointers: ; 763a8 (1d:63a8) BrunoTextPointers: ; 763a8 (1d:63a8)
@ -123,10 +124,10 @@ BrunoTrainerHeader0: ; 763ac (1d:63ac)
db $1 ; flag's bit db $1 ; flag's bit
db ($0 << 4) ; trainer's view range db ($0 << 4) ; trainer's view range
dw wd864 ; flag's byte dw wd864 ; flag's byte
dw BrunoBeforeBattleText ; 0x63c3 TextBeforeBattle dw BrunoBeforeBattleText ; TextBeforeBattle
dw BrunoAfterBattleText ; 0x63cd TextAfterBattle dw BrunoAfterBattleText ; TextAfterBattle
dw BrunoEndBattleText ; 0x63c8 TextEndBattle dw BrunoEndBattleText ; TextEndBattle
dw BrunoEndBattleText ; 0x63c8 TextEndBattle dw BrunoEndBattleText ; TextEndBattle
db $ff db $ff

View file

@ -47,7 +47,7 @@ CeladonCityText5: ; 1999e (6:599e)
db $08 ; asm db $08 ; asm
ld a, [wd777] ld a, [wd777]
bit 0, a bit 0, a
jr nz, .asm_7053f ; 0x199a4 jr nz, .asm_7053f
ld hl, TM41PreText ld hl, TM41PreText
call PrintText call PrintText
ld bc, (TM_41 << 8) | 1 ld bc, (TM_41 << 8) | 1
@ -62,7 +62,7 @@ CeladonCityText5: ; 1999e (6:599e)
ld hl, wd777 ld hl, wd777
set 0, [hl] set 0, [hl]
jr .Done jr .Done
.asm_7053f ; 0x199c9 .asm_7053f
ld hl, TM41ExplanationText ld hl, TM41ExplanationText
call PrintText call PrintText
.Done .Done

View file

@ -29,7 +29,7 @@ CeladonDinerText5: ; 49173 (12:5173)
db $08 ; asm db $08 ; asm
ld a, [wd783] ld a, [wd783]
bit 0, a bit 0, a
jr nz, .asm_eb14d ; 0x49179 jr nz, .asm_eb14d
ld hl, CeladonDinerText_491a7 ld hl, CeladonDinerText_491a7
call PrintText call PrintText
ld bc, (COIN_CASE << 8) | 1 ld bc, (COIN_CASE << 8) | 1
@ -39,15 +39,15 @@ CeladonDinerText5: ; 49173 (12:5173)
set 0, [hl] set 0, [hl]
ld hl, ReceivedCoinCaseText ld hl, ReceivedCoinCaseText
call PrintText call PrintText
jr .asm_68b61 ; 0x49194 jr .asm_68b61
.BagFull .BagFull
ld hl, CoinCaseNoRoomText ld hl, CoinCaseNoRoomText
call PrintText call PrintText
jr .asm_68b61 ; 0x4919c jr .asm_68b61
.asm_eb14d ; 0x4919e .asm_eb14d
ld hl, CeladonDinerText_491b7 ld hl, CeladonDinerText_491b7
call PrintText call PrintText
.asm_68b61 ; 0x491a4 .asm_68b61
jp TextScriptEnd jp TextScriptEnd
CeladonDinerText_491a7: ; 491a7 (12:51a7) CeladonDinerText_491a7: ; 491a7 (12:51a7)

View file

@ -131,22 +131,22 @@ CeladonGameCornerText2: ; 48ca9 (12:4ca9)
call YesNoChoice call YesNoChoice
ld a, [wCurrentMenuItem] ld a, [wCurrentMenuItem]
and a and a
jr nz, .asm_c650b ; 0x48cba jr nz, .asm_48d0f
ld b,COIN_CASE ld b,COIN_CASE
call IsItemInBag call IsItemInBag
jr z, .asm_ed086 ; 0x48cc1 jr z, .asm_48d19
call Has9990Coins call Has9990Coins
jr nc, .asm_31338 ; 0x48cc6 jr nc, .asm_48d14
xor a xor a
ldh [$9f], a ldh [$9f], a
ldh [$a1], a ldh [$a1], a
ld a, $10 ld a, $10
ldh [$a0], a ldh [$a0], a
call HasEnoughMoney call HasEnoughMoney
jr nc, .asm_b6ef0 ; 0x48cd4 jr nc, .asm_48cdb
ld hl, CeladonGameCornerText_48d31 ; $4d31 ld hl, CeladonGameCornerText_48d31
jr .asm_e2afd ; 0x48cd9 jr .asm_48d1c
.asm_b6ef0 ; 0x48cdb .asm_48cdb
xor a xor a
ldh [$9f], a ldh [$9f], a
ldh [$a1], a ldh [$a1], a
@ -167,16 +167,16 @@ CeladonGameCornerText2: ; 48ca9 (12:4ca9)
predef AddBCDPredef predef AddBCDPredef
call CeladonGameCornerScript_48f1e call CeladonGameCornerScript_48f1e
ld hl, CeladonGameCornerText_48d27 ld hl, CeladonGameCornerText_48d27
jr .asm_e2afd ; 0x48d0d jr .asm_48d1c
.asm_c650b ; 0x48d0f .asm_48d0f
ld hl, CeladonGameCornerText_48d2c ld hl, CeladonGameCornerText_48d2c
jr .asm_e2afd ; 0x48d12 jr .asm_48d1c
.asm_31338 ; 0x48d14 .asm_48d14
ld hl, CeladonGameCornerText_48d36 ld hl, CeladonGameCornerText_48d36
jr .asm_e2afd ; 0x48d17 jr .asm_48d1c
.asm_ed086 ; 0x48d19 .asm_48d19
ld hl, CeladonGameCornerText_48d3b ld hl, CeladonGameCornerText_48d3b
.asm_e2afd ; 0x48d1c .asm_48d1c
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd
@ -216,14 +216,14 @@ CeladonGameCornerText5: ; 48d4a (12:4d4a)
db $08 ; asm db $08 ; asm
ld a, [wd77e] ld a, [wd77e]
bit 2, a bit 2, a
jr nz, .asm_d0957 ; 0x48d50 jr nz, .asm_48d89
ld hl, CeladonGameCornerText_48d9c ld hl, CeladonGameCornerText_48d9c
call PrintText call PrintText
ld b, COIN_CASE ld b, COIN_CASE
call IsItemInBag call IsItemInBag
jr z, .asm_5aef9 ; 0x48d5d jr z, .asm_48d93
call Has9990Coins call Has9990Coins
jr nc, .asm_98546 ; 0x48d62 jr nc, .asm_48d8e
xor a xor a
ldh [$9f], a ldh [$9f], a
ldh [$a0], a ldh [$a0], a
@ -238,16 +238,16 @@ CeladonGameCornerText5: ; 48d4a (12:4d4a)
ld a, $1 ld a, $1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld hl, Received10CoinsText ld hl, Received10CoinsText
jr .asm_c7d1a ; 0x48d87 jr .asm_48d96
.asm_d0957 ; 0x48d89 .asm_48d89
ld hl, CeladonGameCornerText_48dac ld hl, CeladonGameCornerText_48dac
jr .asm_c7d1a ; 0x48d8c jr .asm_48d96
.asm_98546 ; 0x48d8e .asm_48d8e
ld hl, CeladonGameCornerText_48da7 ld hl, CeladonGameCornerText_48da7
jr .asm_c7d1a ; 0x48d91 jr .asm_48d96
.asm_5aef9 ; 0x48d93 .asm_48d93
ld hl, CeladonGameCornerText_48f19 ld hl, CeladonGameCornerText_48f19
.asm_c7d1a ; 0x48d96 .asm_48d96
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd
@ -275,10 +275,10 @@ CeladonGameCornerText7: ; 48db6 (12:4db6)
db $08 ; asm db $08 ; asm
ld a, [wd77c] ld a, [wd77c]
bit 1, a bit 1, a
ld hl, CeladonGameCornerText_48dca ; $4dca ld hl, CeladonGameCornerText_48dca
jr z, .asm_be3fd ; 0x48dbf jr z, .asm_48dc4
ld hl, CeladonGameCornerText_48dcf ; $4dcf ld hl, CeladonGameCornerText_48dcf
.asm_be3fd ; 0x48dc4 .asm_48dc4
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd
@ -298,14 +298,14 @@ CeladonGameCornerText9: ; 48dd9 (12:4dd9)
db $08 ; asm db $08 ; asm
ld a, [wd77e] ld a, [wd77e]
bit 4, a bit 4, a
jr nz, .asm_ed8bc ; 0x48ddf jr nz, .asm_48e13
ld hl, CeladonGameCornerText_48e26 ld hl, CeladonGameCornerText_48e26
call PrintText call PrintText
ld b, COIN_CASE ld b, COIN_CASE
call IsItemInBag call IsItemInBag
jr z, .asm_df794 ; 0x48dec jr z, .asm_48e1d
call Has9990Coins call Has9990Coins
jr nc, .asm_f17c3 ; 0x48df1 jr nc, .asm_48e18
xor a xor a
ldh [$9f], a ldh [$9f], a
ldh [$a0], a ldh [$a0], a
@ -318,16 +318,16 @@ CeladonGameCornerText9: ; 48dd9 (12:4dd9)
ld hl, wd77e ld hl, wd77e
set 4, [hl] set 4, [hl]
ld hl, Received20CoinsText ld hl, Received20CoinsText
jr .asm_0ddc2 ; 0x48e11 jr .asm_48e20
.asm_ed8bc ; 0x48e13 .asm_48e13
ld hl, CeladonGameCornerText_48e36 ld hl, CeladonGameCornerText_48e36
jr .asm_0ddc2 ; 0x48e16 jr .asm_48e20
.asm_f17c3 ; 0x48e18 .asm_48e18
ld hl, CeladonGameCornerText_48e31 ld hl, CeladonGameCornerText_48e31
jr .asm_0ddc2 ; 0x48e1b jr .asm_48e20
.asm_df794 ; 0x48e1d .asm_48e1d
ld hl, CeladonGameCornerText_48f19 ld hl, CeladonGameCornerText_48f19
.asm_0ddc2 ; 0x48e20 .asm_48e20
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd
@ -351,14 +351,14 @@ CeladonGameCornerText10: ; 48e3b (12:4e3b)
db $08 ; asm db $08 ; asm
ld a, [wd77e] ld a, [wd77e]
bit 3, a bit 3, a
jr nz, .asm_ff080 ; 0x48e41 jr nz, .asm_48e75
ld hl, CeladonGameCornerText_48e88 ; $4e88 ld hl, CeladonGameCornerText_48e88
call PrintText call PrintText
ld b,COIN_CASE ld b,COIN_CASE
call IsItemInBag call IsItemInBag
jr z, .asm_4fb0c ; 0x48e4e jr z, .asm_48e7f
call Has9990Coins call Has9990Coins
jr z, .asm_9505a ; 0x48e53 jr z, .asm_48e7a
xor a xor a
ldh [$9f], a ldh [$9f], a
ldh [$a0], a ldh [$a0], a
@ -371,16 +371,16 @@ CeladonGameCornerText10: ; 48e3b (12:4e3b)
ld hl, wd77e ld hl, wd77e
set 3, [hl] set 3, [hl]
ld hl, CeladonGameCornerText_48e8d ld hl, CeladonGameCornerText_48e8d
jr .asm_78d65 ; 0x48e73 jr .asm_48e82
.asm_ff080 ; 0x48e75 .asm_48e75
ld hl, CeladonGameCornerText_48e98 ld hl, CeladonGameCornerText_48e98
jr .asm_78d65 ; 0x48e78 jr .asm_48e82
.asm_9505a ; 0x48e7a .asm_48e7a
ld hl, CeladonGameCornerText_48e93 ld hl, CeladonGameCornerText_48e93
jr .asm_78d65 ; 0x48e7d jr .asm_48e82
.asm_4fb0c ; 0x48e7f .asm_48e7f
ld hl, CeladonGameCornerText_48f19 ld hl, CeladonGameCornerText_48f19
.asm_78d65 ; 0x48e82 .asm_48e82
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd
@ -389,7 +389,7 @@ CeladonGameCornerText_48e88: ; 48e88 (12:4e88)
db "@" db "@"
CeladonGameCornerText_48e8d: ; 48e8d (12:4e8d) CeladonGameCornerText_48e8d: ; 48e8d (12:4e8d)
TX_FAR _CeladonGameCornerText_48e8d ; 0x9dceb TX_FAR _CeladonGameCornerText_48e8d
db $0B, "@" db $0B, "@"
CeladonGameCornerText_48e93: ; 48e93 (12:4e93) CeladonGameCornerText_48e93: ; 48e93 (12:4e93)
@ -453,7 +453,7 @@ CeladonGameCornerText12: ; 48edd (12:4edd)
jp TextScriptEnd jp TextScriptEnd
CeladonGameCornerText_48f09: ; 48f09 (12:4f09) CeladonGameCornerText_48f09: ; 48f09 (12:4f09)
TX_FAR _CeladonGameCornerText_48f09 ; 0x9ddb0 TX_FAR _CeladonGameCornerText_48f09
db $8 db $8
ld a, (SFX_02_49 - SFX_Headers_02) / 3 ld a, (SFX_02_49 - SFX_Headers_02) / 3
call PlaySound call PlaySound

View file

@ -12,8 +12,8 @@ CeladonGymScript: ; 4890a (12:490a)
ret ret
CeladonGymScript_48927: ; 48927 (12:4927) CeladonGymScript_48927: ; 48927 (12:4927)
ld hl, Gym4CityName ; $4930 ld hl, Gym4CityName
ld de, Gym4LeaderName ; $493d ld de, Gym4LeaderName
jp LoadGymLeaderAndCityName jp LoadGymLeaderAndCityName
Gym4CityName: ; 48930 (12:4930) Gym4CityName: ; 48930 (12:4930)
@ -36,7 +36,7 @@ CeladonGymScriptPointers: ; 4894e (12:494e)
dw CeladonGymScript3 dw CeladonGymScript3
CeladonGymScript3: ; 48956 (12:4956) CeladonGymScript3: ; 48956 (12:4956)
ld a, [W_ISINBATTLE] ; W_ISINBATTLE ld a, [W_ISINBATTLE]
cp $ff cp $ff
jp z, CeladonGymText_48943 jp z, CeladonGymText_48943
ld a, $f0 ld a, $f0
@ -44,7 +44,7 @@ CeladonGymScript3: ; 48956 (12:4956)
CeladonGymText_48963: ; 48963 (12:4963) CeladonGymText_48963: ; 48963 (12:4963)
ld a, $9 ld a, $9
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a
call DisplayTextID call DisplayTextID
ld hl, wd77c ld hl, wd77c
set 1, [hl] set 1, [hl]
@ -52,14 +52,14 @@ CeladonGymText_48963: ; 48963 (12:4963)
call GiveItem call GiveItem
jr nc, .BagFull jr nc, .BagFull
ld a, $a ld a, $a
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a
call DisplayTextID call DisplayTextID
ld hl, wd77c ld hl, wd77c
set 0, [hl] set 0, [hl]
jr .asm_4898c jr .asm_4898c
.BagFull .BagFull
ld a, $b ld a, $b
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a
call DisplayTextID call DisplayTextID
.asm_4898c .asm_4898c
ld hl, W_OBTAINEDBADGES ld hl, W_OBTAINEDBADGES
@ -94,64 +94,64 @@ CeladonGymTrainerHeader0: ; 489bc (12:49bc)
db $2 ; flag's bit db $2 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd77c ; flag's byte dw wd77c ; flag's byte
dw CeladonGymBattleText2 ; 0x4a8b TextBeforeBattle dw CeladonGymBattleText2 ; TextBeforeBattle
dw CeladonGymAfterBattleText2 ; 0x4a95 TextAfterBattle dw CeladonGymAfterBattleText2 ; TextAfterBattle
dw CeladonGymEndBattleText2 ; 0x4a90 TextEndBattle dw CeladonGymEndBattleText2 ; TextEndBattle
dw CeladonGymEndBattleText2 ; 0x4a90 TextEndBattle dw CeladonGymEndBattleText2 ; TextEndBattle
CeladonGymTrainerHeader2: ; 489c8 (12:49c8) CeladonGymTrainerHeader2: ; 489c8 (12:49c8)
db $3 ; flag's bit db $3 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd77c ; flag's byte dw wd77c ; flag's byte
dw CeladonGymBattleText3 ; 0x4aa4 TextBeforeBattle dw CeladonGymBattleText3 ; TextBeforeBattle
dw CeladonGymAfterBattleText3 ; 0x4aae TextAfterBattle dw CeladonGymAfterBattleText3 ; TextAfterBattle
dw CeladonGymEndBattleText3 ; 0x4aa9 TextEndBattle dw CeladonGymEndBattleText3 ; TextEndBattle
dw CeladonGymEndBattleText3 ; 0x4aa9 TextEndBattle dw CeladonGymEndBattleText3 ; TextEndBattle
CeladonGymTrainerHeader3: ; 489d4 (12:49d4) CeladonGymTrainerHeader3: ; 489d4 (12:49d4)
db $4 ; flag's bit db $4 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd77c ; flag's byte dw wd77c ; flag's byte
dw CeladonGymBattleText4 ; 0x4abd TextBeforeBattle dw CeladonGymBattleText4 ; TextBeforeBattle
dw CeladonGymAfterBattleText4 ; 0x4ac7 TextAfterBattle dw CeladonGymAfterBattleText4 ; TextAfterBattle
dw CeladonGymEndBattleText4 ; 0x4ac2 TextEndBattle dw CeladonGymEndBattleText4 ; TextEndBattle
dw CeladonGymEndBattleText4 ; 0x4ac2 TextEndBattle dw CeladonGymEndBattleText4 ; TextEndBattle
CeladonGymTrainerHeader4: ; 489e0 (12:49e0) CeladonGymTrainerHeader4: ; 489e0 (12:49e0)
db $5 ; flag's bit db $5 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd77c ; flag's byte dw wd77c ; flag's byte
dw CeladonGymBattleText5 ; 0x4ad6 TextBeforeBattle dw CeladonGymBattleText5 ; TextBeforeBattle
dw CeladonGymAfterBattleText5 ; 0x4ae0 TextAfterBattle dw CeladonGymAfterBattleText5 ; TextAfterBattle
dw CeladonGymEndBattleText5 ; 0x4adb TextEndBattle dw CeladonGymEndBattleText5 ; TextEndBattle
dw CeladonGymEndBattleText5 ; 0x4adb TextEndBattle dw CeladonGymEndBattleText5 ; TextEndBattle
CeladonGymTrainerHeader5: ; 489ec (12:49ec) CeladonGymTrainerHeader5: ; 489ec (12:49ec)
db $6 ; flag's bit db $6 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd77c ; flag's byte dw wd77c ; flag's byte
dw CeladonGymBattleText6 ; 0x4aef TextBeforeBattle dw CeladonGymBattleText6 ; TextBeforeBattle
dw CeladonGymAfterBattleText6 ; 0x4af9 TextAfterBattle dw CeladonGymAfterBattleText6 ; TextAfterBattle
dw CeladonGymEndBattleText6 ; 0x4af4 TextEndBattle dw CeladonGymEndBattleText6 ; TextEndBattle
dw CeladonGymEndBattleText6 ; 0x4af4 TextEndBattle dw CeladonGymEndBattleText6 ; TextEndBattle
CeladonGymTrainerHeader6: ; 489f8 (12:49f8) CeladonGymTrainerHeader6: ; 489f8 (12:49f8)
db $7 ; flag's bit db $7 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd77c ; flag's byte dw wd77c ; flag's byte
dw CeladonGymBattleText7 ; 0x4b08 TextBeforeBattle dw CeladonGymBattleText7 ; TextBeforeBattle
dw CeladonGymAfterBattleText7 ; 0x4b12 TextAfterBattle dw CeladonGymAfterBattleText7 ; TextAfterBattle
dw CeladonGymEndBattleText7 ; 0x4b0d TextEndBattle dw CeladonGymEndBattleText7 ; TextEndBattle
dw CeladonGymEndBattleText7 ; 0x4b0d TextEndBattle dw CeladonGymEndBattleText7 ; TextEndBattle
CeladonGymTrainerHeader7: ; 48a04 (12:4a04) CeladonGymTrainerHeader7: ; 48a04 (12:4a04)
db $8 ; flag's bit db $8 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd77c ; flag's byte dw wd77c ; flag's byte
dw CeladonGymBattleText8 ; 0x4b21 TextBeforeBattle dw CeladonGymBattleText8 ; TextBeforeBattle
dw CeladonGymAfterBattleText8 ; 0x4b2b TextAfterBattle dw CeladonGymAfterBattleText8 ; TextAfterBattle
dw CeladonGymEndBattleText8 ; 0x4b26 TextEndBattle dw CeladonGymEndBattleText8 ; TextEndBattle
dw CeladonGymEndBattleText8 ; 0x4b26 TextEndBattle dw CeladonGymEndBattleText8 ; TextEndBattle
db $ff db $ff
@ -159,17 +159,17 @@ CeladonGymText1: ; 48a11 (12:4a11)
db $08 ; asm db $08 ; asm
ld a, [wd77c] ld a, [wd77c]
bit 1, a bit 1, a
jr z, .asm_16064 ; 0x48a17 jr z, .asm_48a2d
bit 0, a bit 0, a
jr nz, .asm_3b22c ; 0x48a1b jr nz, .asm_48a25
call z, CeladonGymText_48963 call z, CeladonGymText_48963
call DisableWaitingAfterTextDisplay call DisableWaitingAfterTextDisplay
jr .asm_96252 ; 0x48a23 jr .asm_48a5b
.asm_3b22c ; 0x48a25 .asm_48a25
ld hl, CeladonGymText_48a68 ld hl, CeladonGymText_48a68
call PrintText call PrintText
jr .asm_96252 ; 0x48a2b jr .asm_48a5b
.asm_16064 ; 0x48a2d .asm_48a2d
ld hl, CeladonGymText_48a5e ld hl, CeladonGymText_48a5e
call PrintText call PrintText
ld hl, wd72d ld hl, wd72d
@ -187,7 +187,7 @@ CeladonGymText1: ; 48a11 (12:4a11)
ld a, $3 ld a, $3
ld [W_CELADONGYMCURSCRIPT], a ld [W_CELADONGYMCURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
.asm_96252 ; 0x48a5b .asm_48a5b
jp TextScriptEnd jp TextScriptEnd
CeladonGymText_48a5e: ; 48a5e (12:4a5e) CeladonGymText_48a5e: ; 48a5e (12:4a5e)

View file

@ -13,9 +13,9 @@ CeladonMansion5Text2: ; 1dd46 (7:5d46)
db $08 ; asm db $08 ; asm
ld bc,(EEVEE << 8) | 25 ld bc,(EEVEE << 8) | 25
call GivePokemon call GivePokemon
jr nc, .asm_24365 ; 0x1dd4d jr nc, .asm_24365
ld a, HS_CELADON_MANSION_5_GIFT ld a, HS_CELADON_MANSION_5_GIFT
ld [wcc4d], a ld [wcc4d], a
predef HideObject predef HideObject
.asm_24365 ; 0x1dd59 .asm_24365
jp TextScriptEnd jp TextScriptEnd

View file

@ -24,7 +24,7 @@ CeladonMart3Text1: ; 4824a (12:424a)
db $08 ; asm db $08 ; asm
ld a, [wd778] ld a, [wd778]
bit 7, a bit 7, a
jr nz, .asm_a5463 ; 0x48250 jr nz, .asm_a5463
ld hl, TM18PreReceiveText ld hl, TM18PreReceiveText
call PrintText call PrintText
ld bc, (TM_18 << 8) | 1 ld bc, (TM_18 << 8) | 1
@ -33,13 +33,13 @@ CeladonMart3Text1: ; 4824a (12:424a)
ld hl, wd778 ld hl, wd778
set 7, [hl] set 7, [hl]
ld hl, ReceivedTM18Text ld hl, ReceivedTM18Text
jr .asm_81359 ; 0x48268 jr .asm_81359
.BagFull .BagFull
ld hl, TM18NoRoomText ld hl, TM18NoRoomText
jr .asm_81359 ; 0x4826d jr .asm_81359
.asm_a5463 ; 0x4826f .asm_a5463
ld hl, TM18ExplanationText ld hl, TM18ExplanationText
.asm_81359 ; 0x48272 .asm_81359
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd

View file

@ -32,9 +32,9 @@ CeladonMartElevatorScript_4862a: ; 4862a (12:462a)
ret ret
CeladonMartElevatorScript_48631: ; 48631 (12:4631) CeladonMartElevatorScript_48631: ; 48631 (12:4631)
ld hl, CeladonMartElavatorFloors ; $4643 ld hl, CeladonMartElavatorFloors
call LoadItemList call LoadItemList
ld hl, CeldaonMartElevatorWarpMaps ; $464a ld hl, CeldaonMartElevatorWarpMaps
ld de, wcc5b ld de, wcc5b
ld bc, $000a ld bc, $000a
jp CopyData jp CopyData
@ -65,6 +65,6 @@ CeladonMartElevatorTextPointers: ; 4865c (12:465c)
CeladonMartElevatorText1: ; 4865e (12:465e) CeladonMartElevatorText1: ; 4865e (12:465e)
db $08 ; asm db $08 ; asm
call CeladonMartElevatorScript_48631 call CeladonMartElevatorScript_48631
ld hl, CeldaonMartElevatorWarpMaps ; $464a ld hl, CeldaonMartElevatorWarpMaps
predef Func_1c9c6 predef Func_1c9c6
jp TextScriptEnd jp TextScriptEnd

View file

@ -5,7 +5,7 @@ CeladonMartRoofScript_483d8: ; 483d8 (12:43d8)
xor a xor a
ld [wcd37], a ld [wcd37], a
ld de, wcc5b ld de, wcc5b
ld hl, CeladonMartRoofDrinkList ; $4408 ld hl, CeladonMartRoofDrinkList
.asm_483e2 .asm_483e2
ld a, [hli] ld a, [hli]
and a and a
@ -42,19 +42,19 @@ CeladonMartRoofDrinkList: ; 48408 (12:4408)
CeladonMartRoofScript_4840c: ; 4840c (12:440c) CeladonMartRoofScript_4840c: ; 4840c (12:440c)
ld hl, wd730 ld hl, wd730
set 6, [hl] set 6, [hl]
ld hl, CeladonMartRoofText_484ee ; $44ee ld hl, CeladonMartRoofText_484ee
call PrintText call PrintText
xor a xor a
ld [wCurrentMenuItem], a ; wCurrentMenuItem ld [wCurrentMenuItem], a
ld a, $3 ld a, $3
ld [wMenuWatchedKeys], a ; wMenuWatchedKeys ld [wMenuWatchedKeys], a
ld a, [wcd37] ld a, [wcd37]
dec a dec a
ld [wMaxMenuItem], a ; wMaxMenuItem ld [wMaxMenuItem], a
ld a, $2 ld a, $2
ld [wTopMenuItemY], a ; wTopMenuItemY ld [wTopMenuItemY], a
ld a, $1 ld a, $1
ld [wTopMenuItemX], a ; wTopMenuItemX ld [wTopMenuItemX], a
ld a, [wcd37] ld a, [wcd37]
dec a dec a
ld bc, $2 ld bc, $2
@ -73,7 +73,7 @@ CeladonMartRoofScript_4840c: ; 4840c (12:440c)
bit 1, a bit 1, a
ret nz ret nz
ld hl, wcc5b ld hl, wcc5b
ld a, [wCurrentMenuItem] ; wCurrentMenuItem ld a, [wCurrentMenuItem]
ld d, $0 ld d, $0
ld e, a ld e, a
add hl, de add hl, de
@ -86,7 +86,7 @@ CeladonMartRoofScript_4840c: ; 4840c (12:440c)
ld a, [wd778] ld a, [wd778]
bit 6, a bit 6, a
jr nz, .asm_484e0 jr nz, .asm_484e0
ld hl, CeladonMartRoofText_48515 ; $4515 ld hl, CeladonMartRoofText_48515
call PrintText call PrintText
call RemoveItemByIDBank12 call RemoveItemByIDBank12
ld bc, (TM_49 << 8) | 1 ld bc, (TM_49 << 8) | 1
@ -101,13 +101,13 @@ CeladonMartRoofScript_4840c: ; 4840c (12:440c)
ld a, [wd778] ld a, [wd778]
bit 5, a bit 5, a
jr nz, .asm_484e0 jr nz, .asm_484e0
ld hl, CeladonMartRoofText_48504 ; $4504 ld hl, CeladonMartRoofText_48504
call PrintText call PrintText
call RemoveItemByIDBank12 call RemoveItemByIDBank12
ld bc, (TM_48 << 8) | 1 ld bc, (TM_48 << 8) | 1
call GiveItem call GiveItem
jr nc, .BagFull jr nc, .BagFull
ld hl, CeladonMartRoofText_4850a ; $450a ld hl, CeladonMartRoofText_4850a
call PrintText call PrintText
ld hl, wd778 ld hl, wd778
set 5, [hl] set 5, [hl]
@ -116,22 +116,22 @@ CeladonMartRoofScript_4840c: ; 4840c (12:440c)
ld a, [wd778] ld a, [wd778]
bit 4, a bit 4, a
jr nz, .asm_484e0 jr nz, .asm_484e0
ld hl, CeladonMartRoofText_484f3 ; $44f3 ld hl, CeladonMartRoofText_484f3
call PrintText call PrintText
call RemoveItemByIDBank12 call RemoveItemByIDBank12
ld bc, (TM_13 << 8) | 1 ld bc, (TM_13 << 8) | 1
call GiveItem call GiveItem
jr nc, .BagFull jr nc, .BagFull
ld hl, CeladonMartRoofText_484f9 ; $44f9 ld hl, CeladonMartRoofText_484f9
call PrintText call PrintText
ld hl, wd778 ld hl, wd778
set 4, [hl] set 4, [hl]
ret ret
.BagFull .BagFull
ld hl, CeladonMartRoofText_48526 ; $4526 ld hl, CeladonMartRoofText_48526
jp PrintText jp PrintText
.asm_484e0 .asm_484e0
ld hl, CeladonMartRoofText_4852c ; $452c ld hl, CeladonMartRoofText_4852c
jp PrintText jp PrintText
RemoveItemByIDBank12: ; 484e6 (12:44e6) RemoveItemByIDBank12: ; 484e6 (12:44e6)
@ -228,7 +228,7 @@ CeladonMartRoofText2: ; 4856c (12:456c)
call CeladonMartRoofScript_483d8 call CeladonMartRoofScript_483d8
ld a, [wcd37] ld a, [wcd37]
and a and a
jr z, .asm_914b9 ; 0x48574 jr z, .asm_4858f
ld a, $1 ld a, $1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld hl, CeladonMartRoofText4 ld hl, CeladonMartRoofText4
@ -236,13 +236,13 @@ CeladonMartRoofText2: ; 4856c (12:456c)
call YesNoChoice call YesNoChoice
ld a, [wCurrentMenuItem] ld a, [wCurrentMenuItem]
and a and a
jr nz, .asm_05aa4 ; 0x48588 jr nz, .asm_48595
call CeladonMartRoofScript_4840c call CeladonMartRoofScript_4840c
jr .asm_05aa4 ; 0x4858d jr .asm_48595
.asm_914b9 ; 0x4858f .asm_4858f
ld hl, CeladonMartRoofText3 ld hl, CeladonMartRoofText3
call PrintText call PrintText
.asm_05aa4 ; 0x48595 .asm_48595
jp TextScriptEnd jp TextScriptEnd
CeladonMartRoofText3: ; 48598 (12:4598) CeladonMartRoofText3: ; 48598 (12:4598)

View file

@ -38,15 +38,15 @@ CeruleanCityScript4: ; 194a7 (6:54a7)
CeruleanCityScript0: ; 194c8 (6:54c8) CeruleanCityScript0: ; 194c8 (6:54c8)
ld a, [wd75b] ld a, [wd75b]
bit 7, a bit 7, a
jr nz, .asm_194f7 ; 0x194cd $28 jr nz, .asm_194f7
ld hl, CeruleanCityCoords1 ld hl, CeruleanCityCoords1
call ArePlayerCoordsInArray call ArePlayerCoordsInArray
jr nc, .asm_194f7 ; 0x194d5 $20 jr nc, .asm_194f7
ld a, [wWhichTrade] ld a, [wWhichTrade]
cp $1 cp $1
ld a, $8 ld a, $8
ld b, $0 ld b, $0
jr nz, .asm_194e6 ; 0x194e0 $4 jr nz, .asm_194e6
ld a, $4 ld a, $4
ld b, $4 ld b, $4
.asm_194e6 .asm_194e6
@ -66,7 +66,7 @@ CeruleanCityScript0: ; 194c8 (6:54c8)
ret nc ret nc
ld a, [wWalkBikeSurfState] ld a, [wWalkBikeSurfState]
and a and a
jr z, .asm_19512 ; 0x19508 $8 jr z, .asm_19512
ld a, $ff ld a, $ff
ld [wc0ee], a ld [wc0ee], a
call PlaySound call PlaySound
@ -80,7 +80,7 @@ CeruleanCityScript0: ; 194c8 (6:54c8)
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld a, [W_XCOORD] ld a, [W_XCOORD]
cp $14 cp $14
jr z, .asm_19535 ; 0x19526 $d jr z, .asm_19535
ld a, $1 ld a, $1
ld [$ff8c], a ld [$ff8c], a
ld a, $5 ld a, $5
@ -140,12 +140,12 @@ CeruleanCityScript1: ; 19567 (6:5567)
; select which team to use during the encounter ; select which team to use during the encounter
ld a, [W_RIVALSTARTER] ld a, [W_RIVALSTARTER]
cp STARTER2 cp STARTER2
jr nz, .NotSquirtle ; 0x19592 $4 jr nz, .NotSquirtle
ld a, $7 ld a, $7
jr .done jr .done
.NotSquirtle .NotSquirtle
cp STARTER3 cp STARTER3
jr nz, .Charmander ; 0x1959a $4 jr nz, .Charmander
ld a, $8 ld a, $8
jr .done jr .done
.Charmander .Charmander
@ -181,9 +181,9 @@ CeruleanCityScript2: ; 195b1 (6:55b1)
call SetSpriteMovementBytesToFF call SetSpriteMovementBytesToFF
ld a, [W_XCOORD] ld a, [W_XCOORD]
cp $14 cp $14
jr nz, .asm_195f0 ; 0x195e9 $5 jr nz, .asm_195f0
ld de, CeruleanCityMovement4 ld de, CeruleanCityMovement4
jr .asm_195f3 ; 0x195ee $3 jr .asm_195f3
.asm_195f0 .asm_195f0
ld de, CeruleanCityMovement3 ld de, CeruleanCityMovement3
.asm_195f3 .asm_195f3
@ -242,11 +242,11 @@ CeruleanCityText1: ; 1964f (6:564f)
; or talk about bill ; or talk about bill
ld hl, CeruleanCityText_19677 ld hl, CeruleanCityText_19677
call PrintText call PrintText
jr .end ; 0x1965d jr .end
.PreBattleText ; 0x1965f .PreBattleText
ld hl, CeruleanCityText_19668 ld hl, CeruleanCityText_19668
call PrintText call PrintText
.end ; 0x19665 .end
jp TextScriptEnd jp TextScriptEnd
CeruleanCityText_19668: ; 19668 (6:5668) CeruleanCityText_19668: ; 19668 (6:5668)
@ -269,7 +269,7 @@ CeruleanCityText2: ; 1967c (6:567c)
db $8 db $8
ld a, [wd75b] ld a, [wd75b]
bit 7, a bit 7, a
jr nz, .asm_4ca20 ; 0x19682 $29 jr nz, .asm_4ca20
ld hl, CeruleanCityText_196d9 ld hl, CeruleanCityText_196d9
call PrintText call PrintText
ld hl, wd72d ld hl, wd72d
@ -285,7 +285,7 @@ CeruleanCityText2: ; 1967c (6:567c)
ld a, $4 ld a, $4
ld [W_CERULEANCITYCURSCRIPT], a ld [W_CERULEANCITYCURSCRIPT], a
jp TextScriptEnd jp TextScriptEnd
.asm_4ca20 ; 0x196ad .asm_4ca20
ld hl, CeruleanCityText_196f3 ld hl, CeruleanCityText_196f3
call PrintText call PrintText
ld bc, (TM_28 << 8) + 1 ld bc, (TM_28 << 8) + 1
@ -299,7 +299,7 @@ CeruleanCityText2: ; 1967c (6:567c)
ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld hl, ReceivedTM28Text ld hl, ReceivedTM28Text
call PrintText call PrintText
callba Func_74872 callba CeruleanHideRocket
.Done .Done
jp TextScriptEnd jp TextScriptEnd
@ -346,20 +346,20 @@ CeruleanCityText7: ; 1970c (6:570c)
db $08 ; asm db $08 ; asm
ldh a, [$d3] ldh a, [$d3]
cp $b4 cp $b4
jr c, .asm_e9fc9 ; 0x19711 jr c, .asm_e9fc9
ld hl, CeruleanCityText_19730 ld hl, CeruleanCityText_19730
call PrintText call PrintText
jr .asm_d486e ; 0x19719 jr .asm_d486e
.asm_e9fc9 ; 0x1971b .asm_e9fc9
cp $64 cp $64
jr c, .asm_df99b ; 0x1971d jr c, .asm_df99b
ld hl, CeruleanCityText_19735 ld hl, CeruleanCityText_19735
call PrintText call PrintText
jr .asm_d486e ; 0x19725 jr .asm_d486e
.asm_df99b ; 0x19727 .asm_df99b
ld hl, CeruleanCityText_1973a ld hl, CeruleanCityText_1973a
call PrintText call PrintText
.asm_d486e ; 0x1972d .asm_d486e
jp TextScriptEnd jp TextScriptEnd
CeruleanCityText_19730: ; 19730 (6:5730) CeruleanCityText_19730: ; 19730 (6:5730)
@ -376,28 +376,28 @@ CeruleanCityText_1973a: ; 1973a (6:573a)
CeruleanCityText8: ; 1973f (6:573f) CeruleanCityText8: ; 1973f (6:573f)
db $08 ; asm db $08 ; asm
ldh a, [$d3] ld a, [hRandomAdd]
cp $b4 cp $b4
jr c, .asm_e28da ; 0x19744 jr c, .asm_e28da
ld hl, CeruleanCityText_1976f ld hl, CeruleanCityText_1976f
call PrintText call PrintText
jr .asm_f2f38 ; 0x1974c jr .asm_f2f38
.asm_e28da ; 0x1974e .asm_e28da
cp $78 cp $78
jr c, .asm_15d08 ; 0x19750 jr c, .asm_15d08
ld hl, CeruleanCityText_19774 ld hl, CeruleanCityText_19774
call PrintText call PrintText
jr .asm_f2f38 ; 0x19758 jr .asm_f2f38
.asm_15d08 ; 0x1975a .asm_15d08
cp $3c cp $3c
jr c, .asm_d7fea ; 0x1975c jr c, .asm_d7fea
ld hl, CeruleanCityText_19779 ld hl, CeruleanCityText_19779
call PrintText call PrintText
jr .asm_f2f38 ; 0x19764 jr .asm_f2f38
.asm_d7fea ; 0x19766 .asm_d7fea
ld hl, CeruleanCityText_1977e ld hl, CeruleanCityText_1977e
call PrintText call PrintText
.asm_f2f38 ; 0x1976c .asm_f2f38
jp TextScriptEnd jp TextScriptEnd
CeruleanCityText_1976f: ; 1976f (6:576f) CeruleanCityText_1976f: ; 1976f (6:576f)

View file

@ -1,4 +1,4 @@
Func_74872: ; 74872 (1d:4872) CeruleanHideRocket: ; 74872 (1d:4872)
; code similar to this appears in a lot of banks; this particular ; code similar to this appears in a lot of banks; this particular
; one is called after you beat the Rocket that gives you TM28 DIG. ; one is called after you beat the Rocket that gives you TM28 DIG.
; the screen then fades out, he disappears, and fades back in ; the screen then fades out, he disappears, and fades back in

View file

@ -12,8 +12,8 @@ CeruleanGymScript: ; 5c6b3 (17:46b3)
ret ret
CeruleanGymScript_5c6d0: ; 5c6d0 (17:46d0) CeruleanGymScript_5c6d0: ; 5c6d0 (17:46d0)
ld hl, Gym2CityName ; $46d9 ld hl, Gym2CityName
ld de, Gym2LeaderName ; $46e7 ld de, Gym2LeaderName
jp LoadGymLeaderAndCityName jp LoadGymLeaderAndCityName
Gym2CityName: ; 5c6d9 (17:46d9) Gym2CityName: ; 5c6d9 (17:46d9)
@ -36,7 +36,7 @@ CeruleanGymScriptPointers: ; 5c6f8 (17:46f8)
dw CeruleanGymScript3 dw CeruleanGymScript3
CeruleanGymScript3: ; 5c700 (17:4700) CeruleanGymScript3: ; 5c700 (17:4700)
ld a, [W_ISINBATTLE] ; W_ISINBATTLE ld a, [W_ISINBATTLE]
cp $ff cp $ff
jp z, CeruleanGymScript_5c6ed jp z, CeruleanGymScript_5c6ed
ld a, $f0 ld a, $f0
@ -44,7 +44,7 @@ CeruleanGymScript3: ; 5c700 (17:4700)
CeruleanGymScript_5c70d: ; 5c70d (17:470d) CeruleanGymScript_5c70d: ; 5c70d (17:470d)
ld a, $5 ld a, $5
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a
call DisplayTextID call DisplayTextID
ld hl, wd75e ld hl, wd75e
set 7, [hl] set 7, [hl]
@ -52,14 +52,14 @@ CeruleanGymScript_5c70d: ; 5c70d (17:470d)
call GiveItem call GiveItem
jr nc, .BagFull jr nc, .BagFull
ld a, $6 ld a, $6
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a
call DisplayTextID call DisplayTextID
ld hl, wd75e ld hl, wd75e
set 6, [hl] set 6, [hl]
jr .asm_5c736 jr .asm_5c736
.BagFull .BagFull
ld a, $7 ld a, $7
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a
call DisplayTextID call DisplayTextID
.asm_5c736 .asm_5c736
ld hl, W_OBTAINEDBADGES ld hl, W_OBTAINEDBADGES
@ -88,19 +88,19 @@ CeruleanGymTrainerHeader0: ; 5c758 (17:4758)
db $2 ; flag's bit db $2 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd75e ; flag's byte dw wd75e ; flag's byte
dw CeruleanGymBattleText1 ; 0x47e9 TextBeforeBattle dw CeruleanGymBattleText1 ; TextBeforeBattle
dw CeruleanGymAfterBattleText1 ; 0x47f3 TextAfterBattle dw CeruleanGymAfterBattleText1 ; TextAfterBattle
dw CeruleanGymEndBattleText1 ; 0x47ee TextEndBattle dw CeruleanGymEndBattleText1 ; TextEndBattle
dw CeruleanGymEndBattleText1 ; 0x47ee TextEndBattle dw CeruleanGymEndBattleText1 ; TextEndBattle
CeruleanGymTrainerHeader1: ; 5c764 (17:4764) CeruleanGymTrainerHeader1: ; 5c764 (17:4764)
db $3 ; flag's bit db $3 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd75e ; flag's byte dw wd75e ; flag's byte
dw CeruleanGymBattleText2 ; 0x4802 TextBeforeBattle dw CeruleanGymBattleText2 ; TextBeforeBattle
dw CeruleanGymAfterBattleText2 ; 0x480c TextAfterBattle dw CeruleanGymAfterBattleText2 ; TextAfterBattle
dw CeruleanGymEndBattleText2 ; 0x4807 TextEndBattle dw CeruleanGymEndBattleText2 ; TextEndBattle
dw CeruleanGymEndBattleText2 ; 0x4807 TextEndBattle dw CeruleanGymEndBattleText2 ; TextEndBattle
db $ff db $ff
@ -108,17 +108,17 @@ CeruleanGymText1: ; 5c771 (17:4771)
db $08 ; asm db $08 ; asm
ld a, [wd75e] ld a, [wd75e]
bit 7, a bit 7, a
jr z, .asm_10854 ; 0x5c777 jr z, .asm_5c78d
bit 6, a bit 6, a
jr nz, .asm_37a1b ; 0x5c77b jr nz, .asm_5c785
call z, CeruleanGymScript_5c70d call z, CeruleanGymScript_5c70d
call DisableWaitingAfterTextDisplay call DisableWaitingAfterTextDisplay
jr .asm_95b04 ; 0x5c783 jr .asm_5c7bb
.asm_37a1b ; 0x5c785 .asm_5c785
ld hl, CeruleanGymText_5c7c3 ld hl, CeruleanGymText_5c7c3
call PrintText call PrintText
jr .asm_95b04 ; 0x5c78b jr .asm_5c7bb
.asm_10854 ; 0x5c78d .asm_5c78d
ld hl, CeruleanGymText_5c7be ld hl, CeruleanGymText_5c7be
call PrintText call PrintText
ld hl, wd72d ld hl, wd72d
@ -137,7 +137,7 @@ CeruleanGymText1: ; 5c771 (17:4771)
ldh [$b4], a ldh [$b4], a
ld a, $3 ld a, $3
ld [W_CERULEANGYMCURSCRIPT], a ld [W_CERULEANGYMCURSCRIPT], a
.asm_95b04 ; 0x5c7bb .asm_5c7bb
jp TextScriptEnd jp TextScriptEnd
CeruleanGymText_5c7be: ; 5c7be (17:47be) CeruleanGymText_5c7be: ; 5c7be (17:47be)
@ -205,14 +205,14 @@ CeruleanGymText4: ; 5c811 (17:4811)
db $08 ; asm db $08 ; asm
ld a, [wd75e] ld a, [wd75e]
bit 7, a bit 7, a
jr nz, .asm_f80ce ; 0x5c817 jr nz, .asm_5c821
ld hl, CeruleanGymText_5c82a ld hl, CeruleanGymText_5c82a
call PrintText call PrintText
jr .asm_18a31 ; 0x5c81f jr .asm_5c827
.asm_f80ce ; 0x5c821 .asm_5c821
ld hl, CeruleanGymText_5c82f ld hl, CeruleanGymText_5c82f
call PrintText call PrintText
.asm_18a31 ; 0x5c827 .asm_5c827
jp TextScriptEnd jp TextScriptEnd
CeruleanGymText_5c82a: ; 5c82a (17:482a) CeruleanGymText_5c82a: ; 5c82a (17:482a)

View file

@ -31,7 +31,7 @@ CeruleanHouse2Text1: ; 74e15 (1d:4e15)
ld a, SPECIALLISTMENU ld a, SPECIALLISTMENU
ld [wListMenuID], a ld [wListMenuID], a
call DisplayListMenuID call DisplayListMenuID
jr c, .asm_74e60 ; 0x74e49 $15 jr c, .asm_74e60
ld hl, TextPointers_74e86 ld hl, TextPointers_74e86
ld a, [wcf91] ld a, [wcf91]
sub $15 sub $15
@ -43,7 +43,7 @@ CeruleanHouse2Text1: ; 74e15 (1d:4e15)
ld h, [hl] ld h, [hl]
ld l, a ld l, a
call PrintText call PrintText
jr .asm_74e23 ; 0x74e5e $c3 jr .asm_74e23
.asm_74e60 .asm_74e60
xor a xor a
ld [wListScrollOffset], a ld [wListScrollOffset], a

View file

@ -12,14 +12,14 @@ CeruleanHouseTrashedText1: ; 1d68f (7:568f)
ld b, $e4 ld b, $e4
predef IsItemInBag_ predef IsItemInBag_
and b and b
jr z, .asm_f8734 ; 0x1d698 jr z, .asm_f8734
ld hl, CeruleanHouseTrashedText_1d6b0 ld hl, CeruleanHouseTrashedText_1d6b0
call PrintText call PrintText
jr .asm_8dfe9 ; 0x1d6a0 jr .asm_8dfe9
.asm_f8734 ; 0x1d6a2 .asm_f8734
ld hl, CeruleanHouseTrashedText_1d6ab ld hl, CeruleanHouseTrashedText_1d6ab
call PrintText call PrintText
.asm_8dfe9 ; 0x1d6a8 .asm_8dfe9
jp TextScriptEnd jp TextScriptEnd
CeruleanHouseTrashedText_1d6ab: ; 1d6ab (7:56ab) CeruleanHouseTrashedText_1d6ab: ; 1d6ab (7:56ab)

View file

@ -37,7 +37,7 @@ CinnabarGymScript_75792: ; 75792 (1d:5792)
ret ret
CinnabarGymScript_757a0: ; 757a0 (1d:57a0) CinnabarGymScript_757a0: ; 757a0 (1d:57a0)
ld a, [H_DOWNARROWBLINKCNT2] ; $ff8c ld a, [H_DOWNARROWBLINKCNT2]
ld [wTrainerHeaderFlagBit], a ld [wTrainerHeaderFlagBit], a
ret ret
@ -53,11 +53,11 @@ CinnabarGymScript0: ; 757ae (1d:57ae)
ret z ret z
ld [$ff8c], a ld [$ff8c], a
cp $4 cp $4
jr nz, .asm_757c3 ; 0x757b7 $a jr nz, .asm_757c3
ld a, $4 ld a, $4
ld [wd528], a ld [wd528], a
ld de, MovementData_757d7 ld de, MovementData_757d7
jr .asm_757cb ; 0x757c1 $8 jr .asm_757cb
.asm_757c3 .asm_757c3
ld de, MovementData_757da ld de, MovementData_757da
ld a, $1 ld a, $1
@ -101,7 +101,7 @@ CinnabarGymScript2: ; 757f6 (1d:57f6)
call CinnabarGymScript_757f1 call CinnabarGymScript_757f1
ld a, c ld a, c
and a and a
jr nz, .asm_7581b ; 0x7580e $b jr nz, .asm_7581b
call WaitForSoundToFinish call WaitForSoundToFinish
ld a, (SFX_02_57 - SFX_Headers_02) / 3 ld a, (SFX_02_57 - SFX_Headers_02) / 3
call PlaySound call PlaySound
@ -148,7 +148,7 @@ CinnabarGymScript3_75857: ; 75857 (1d:5857)
call DisplayTextID call DisplayTextID
ld hl, wd79a ld hl, wd79a
set 0, [hl] set 0, [hl]
jr .asm_75880 ; 0x75877 $7 jr .asm_75880
.BagFull .BagFull
ld a, $c ld a, $c
ld [$ff8c], a ld [$ff8c], a
@ -186,7 +186,7 @@ CinnabarGymTextPointers: ; 7589f (1d:589f)
dw TM38NoRoomText dw TM38NoRoomText
CinnabarGymScript_758b7: ; 758b7 (1d:58b7) CinnabarGymScript_758b7: ; 758b7 (1d:58b7)
ld a, [H_DOWNARROWBLINKCNT2] ; $ff8c ld a, [H_DOWNARROWBLINKCNT2]
ld [wSpriteIndex], a ld [wSpriteIndex], a
call EngageMapTrainer call EngageMapTrainer
call InitBattleEnemyParameters call InitBattleEnemyParameters
@ -209,17 +209,17 @@ CinnabarGymText1: ; 758df (1d:58df)
db $8 db $8
ld a, [wd79a] ld a, [wd79a]
bit 1, a bit 1, a
jr z, .asm_d9332 ; 0x758e5 $16 jr z, .asm_d9332
bit 0, a bit 0, a
jr nz, .asm_3012f ; 0x758e9 $9 jr nz, .asm_3012f
call z, CinnabarGymScript3_75857 call z, CinnabarGymScript3_75857
call DisableWaitingAfterTextDisplay call DisableWaitingAfterTextDisplay
jp TextScriptEnd jp TextScriptEnd
.asm_3012f ; 0x758f4 .asm_3012f
ld hl, BlaineFireBlastText ld hl, BlaineFireBlastText
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd
.asm_d9332 ; 0x758fd .asm_d9332
ld hl, BlaineBattleText ld hl, BlaineBattleText
call PrintText call PrintText
ld hl, BlaineEndBattleText ld hl, BlaineEndBattleText
@ -262,14 +262,14 @@ CinnabarGymText2: ; 75939 (1d:5939)
call CinnabarGymScript_757a0 call CinnabarGymScript_757a0
ld a, [wd79a] ld a, [wd79a]
bit 2, a bit 2, a
jr nz, .asm_46bb4 ; 0x75942 jr nz, .asm_46bb4
ld hl, CinnabarGymText_7595f ld hl, CinnabarGymText_7595f
call PrintText call PrintText
ld hl, CinnabarGymText_75964 ld hl, CinnabarGymText_75964
ld de, CinnabarGymText_75964 ; $5964 XXX ld de, CinnabarGymText_75964
call SaveEndBattleTextPointers call SaveEndBattleTextPointers
jp CinnabarGymScript_758b7 jp CinnabarGymScript_758b7
.asm_46bb4 ; 0x75956 .asm_46bb4
ld hl, CinnabarGymText_75969 ld hl, CinnabarGymText_75969
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd
@ -291,14 +291,14 @@ CinnabarGymText3: ; 7596e (1d:596e)
call CinnabarGymScript_757a0 call CinnabarGymScript_757a0
ld a, [wd79a] ld a, [wd79a]
bit 3, a bit 3, a
jr nz, .asm_4b406 ; 0x75977 jr nz, .asm_4b406
ld hl, CinnabarGymText_75994 ld hl, CinnabarGymText_75994
call PrintText call PrintText
ld hl, CinnabarGymText_75999 ld hl, CinnabarGymText_75999
ld de, CinnabarGymText_75999 ; $5999 XXX ld de, CinnabarGymText_75999
call SaveEndBattleTextPointers call SaveEndBattleTextPointers
jp CinnabarGymScript_758b7 jp CinnabarGymScript_758b7
.asm_4b406 ; 0x7598b .asm_4b406
ld hl, CinnabarGymText_7599e ld hl, CinnabarGymText_7599e
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd
@ -320,14 +320,14 @@ CinnabarGymText4: ; 759a3 (1d:59a3)
call CinnabarGymScript_757a0 call CinnabarGymScript_757a0
ld a, [wd79a] ld a, [wd79a]
bit 4, a bit 4, a
jr nz, .asm_c0673 ; 0x759ac jr nz, .asm_c0673
ld hl, CinnabarGymText_759c9 ld hl, CinnabarGymText_759c9
call PrintText call PrintText
ld hl, CinnabarGymText_759ce ld hl, CinnabarGymText_759ce
ld de, CinnabarGymText_759ce ; $59ce XXX ld de, CinnabarGymText_759ce
call SaveEndBattleTextPointers call SaveEndBattleTextPointers
jp CinnabarGymScript_758b7 jp CinnabarGymScript_758b7
.asm_c0673 ; 0x759c0 .asm_c0673
ld hl, CinnabarGymText_759d3 ld hl, CinnabarGymText_759d3
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd
@ -349,14 +349,14 @@ CinnabarGymText5: ; 759d8 (1d:59d8)
call CinnabarGymScript_757a0 call CinnabarGymScript_757a0
ld a, [wd79a] ld a, [wd79a]
bit 5, a bit 5, a
jr nz, .asm_5cfd7 ; 0x759e1 jr nz, .asm_5cfd7
ld hl, CinnabarGymText_759fe ld hl, CinnabarGymText_759fe
call PrintText call PrintText
ld hl, CinnabarGymText_75a03 ld hl, CinnabarGymText_75a03
ld de, CinnabarGymText_75a03 ; $5a03 XXX ld de, CinnabarGymText_75a03
call SaveEndBattleTextPointers call SaveEndBattleTextPointers
jp CinnabarGymScript_758b7 jp CinnabarGymScript_758b7
.asm_5cfd7 ; 0x759f5 .asm_5cfd7
ld hl, CinnabarGymText_75a08 ld hl, CinnabarGymText_75a08
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd
@ -378,14 +378,14 @@ CinnabarGymText6: ; 75a0d (1d:5a0d)
call CinnabarGymScript_757a0 call CinnabarGymScript_757a0
ld a, [wd79a] ld a, [wd79a]
bit 6, a bit 6, a
jr nz, .asm_776b4 ; 0x75a16 jr nz, .asm_776b4
ld hl, CinnabarGymText_75a33 ld hl, CinnabarGymText_75a33
call PrintText call PrintText
ld hl, CinnabarGymText_75a38 ld hl, CinnabarGymText_75a38
ld de, CinnabarGymText_75a38 ld de, CinnabarGymText_75a38
call SaveEndBattleTextPointers call SaveEndBattleTextPointers
jp CinnabarGymScript_758b7 jp CinnabarGymScript_758b7
.asm_776b4 ; 0x75a2a .asm_776b4
ld hl, CinnabarGymText_75a3d ld hl, CinnabarGymText_75a3d
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd
@ -407,14 +407,14 @@ CinnabarGymText7: ; 75a42 (1d:5a42)
call CinnabarGymScript_757a0 call CinnabarGymScript_757a0
ld a, [wd79a] ld a, [wd79a]
bit 7, a bit 7, a
jr nz, .asm_2f755 ; 0x75a4b jr nz, .asm_2f755
ld hl, CinnabarGymText_75a68 ld hl, CinnabarGymText_75a68
call PrintText call PrintText
ld hl, CinnabarGymText_75a6d ld hl, CinnabarGymText_75a6d
ld de, CinnabarGymText_75a6d ld de, CinnabarGymText_75a6d
call SaveEndBattleTextPointers call SaveEndBattleTextPointers
jp CinnabarGymScript_758b7 jp CinnabarGymScript_758b7
.asm_2f755 ; 0x75a5f .asm_2f755
ld hl, CinnabarGymText_75a72 ld hl, CinnabarGymText_75a72
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd
@ -436,14 +436,14 @@ CinnabarGymText8: ; 75a77 (1d:5a77)
call CinnabarGymScript_757a0 call CinnabarGymScript_757a0
ld a, [wd79b] ld a, [wd79b]
bit 0, a bit 0, a
jr nz, .asm_d87be ; 0x75a80 jr nz, .asm_d87be
ld hl, CinnabarGymText_75a9d ld hl, CinnabarGymText_75a9d
call PrintText call PrintText
ld hl, CinnabarGymText_75aa2 ld hl, CinnabarGymText_75aa2
ld de, CinnabarGymText_75aa2 ; $5aa2 XXX ld de, CinnabarGymText_75aa2
call SaveEndBattleTextPointers call SaveEndBattleTextPointers
jp CinnabarGymScript_758b7 jp CinnabarGymScript_758b7
.asm_d87be ; 0x75a94 .asm_d87be
ld hl, CinnabarGymText_75aa7 ld hl, CinnabarGymText_75aa7
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd
@ -464,12 +464,12 @@ CinnabarGymText9: ; 75aac (1d:5aac)
db $08 ; asm db $08 ; asm
ld a, [wd79a] ld a, [wd79a]
bit 1, a bit 1, a
jr nz, .asm_627d9 ; 0x75ab2 jr nz, .asm_627d9
ld hl, CinnabarGymText_75ac2 ld hl, CinnabarGymText_75ac2
jr .asm_0b11d ; 0x75ab7 jr .asm_0b11d
.asm_627d9 ; 0x75ab9 .asm_627d9
ld hl, CinnabarGymText_75ac7 ld hl, CinnabarGymText_75ac7
.asm_0b11d ; 0x75abc .asm_0b11d
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd

View file

@ -14,14 +14,14 @@ CopycatsHouse2FText1: ; 5cc82 (17:4c82)
db $08 ; asm db $08 ; asm
ld a, [wd7af] ld a, [wd7af]
bit 0, a bit 0, a
jr nz, .asm_7ccf3 ; 0x5cc88 jr nz, .asm_7ccf3
ld a, $1 ld a, $1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld hl, CopycatsHouse2FText_5ccd4 ld hl, CopycatsHouse2FText_5ccd4
call PrintText call PrintText
ld b, POKE_DOLL ld b, POKE_DOLL
call IsItemInBag call IsItemInBag
jr z, .asm_62ecd ; 0x5cc9a jr z, .asm_62ecd
ld hl, TM31PreReceiveText ld hl, TM31PreReceiveText
call PrintText call PrintText
ld bc, (TM_31 << 8) | 1 ld bc, (TM_31 << 8) | 1
@ -34,15 +34,15 @@ CopycatsHouse2FText1: ; 5cc82 (17:4c82)
callba RemoveItemByID callba RemoveItemByID
ld hl, wd7af ld hl, wd7af
set 0, [hl] set 0, [hl]
jr .asm_62ecd ; 0x5ccc1 jr .asm_62ecd
.BagFull .BagFull
ld hl, TM31NoRoomText ld hl, TM31NoRoomText
call PrintText call PrintText
jr .asm_62ecd ; 0x5ccc9 jr .asm_62ecd
.asm_7ccf3 ; 0x5cccb .asm_7ccf3
ld hl, TM31ExplanationText2 ld hl, TM31ExplanationText2
call PrintText call PrintText
.asm_62ecd ; 0x5ccd1 .asm_62ecd
jp TextScriptEnd jp TextScriptEnd
CopycatsHouse2FText_5ccd4: ; 5ccd4 (17:4cd4) CopycatsHouse2FText_5ccd4: ; 5ccd4 (17:4cd4)
@ -87,9 +87,9 @@ CopycatsHouse2FText7: ; 5cd03 (17:4d03)
ld a, [wSpriteStateData1 + 9] ld a, [wSpriteStateData1 + 9]
cp $4 cp $4
ld hl, CopycatsHouse2FText_5cd1c ld hl, CopycatsHouse2FText_5cd1c
jr nz, .asm_399a4 ; 0x5cd0c jr nz, .asm_399a4
ld hl, CopycatsHouse2FText_5cd17 ld hl, CopycatsHouse2FText_5cd17
.asm_399a4 ; 0x5cd11 .asm_399a4
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd

View file

@ -239,9 +239,9 @@ DayCareMText_56432: ; 56432 (15:6432)
db "@" db "@"
DayCareMText_56437: ; 56437 (15:6437) DayCareMText_56437: ; 56437 (15:6437)
TX_FAR _DayCareMText_56437 ; 0x8c000 TX_FAR _DayCareMText_56437
DayCareMText_5643b: ; 5643b (15:643b) DayCareMText_5643b: ; 5643b (15:643b)
TX_FAR _DayCareMText_5643b ; 0x8c013 TX_FAR _DayCareMText_5643b
db "@" db "@"
DayCareMText_56440: ; 56440 (15:6440) DayCareMText_56440: ; 56440 (15:6440)

View file

@ -99,37 +99,37 @@ FightingDojoTrainerHeader0: ; 5ce13 (17:4e13)
db $2 ; flag's bit db $2 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7b1 ; flag's byte dw wd7b1 ; flag's byte
dw FightingDojoBattleText1 ; 0x4eac TextBeforeBattle dw FightingDojoBattleText1 ; TextBeforeBattle
dw FightingDojoAfterBattleText1 ; 0x4eb6 TextAfterBattle dw FightingDojoAfterBattleText1 ; TextAfterBattle
dw FightingDojoEndBattleText1 ; 0x4eb1 TextEndBattle dw FightingDojoEndBattleText1 ; TextEndBattle
dw FightingDojoEndBattleText1 ; 0x4eb1 TextEndBattle dw FightingDojoEndBattleText1 ; TextEndBattle
FightingDojoTrainerHeader1: ; 5ce1f (17:4e1f) FightingDojoTrainerHeader1: ; 5ce1f (17:4e1f)
db $3 ; flag's bit db $3 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7b1 ; flag's byte dw wd7b1 ; flag's byte
dw FightingDojoBattleText2 ; 0x4ec5 TextBeforeBattle dw FightingDojoBattleText2 ; TextBeforeBattle
dw FightingDojoAfterBattleText2 ; 0x4ecf TextAfterBattle dw FightingDojoAfterBattleText2 ; TextAfterBattle
dw FightingDojoEndBattleText2 ; 0x4eca TextEndBattle dw FightingDojoEndBattleText2 ; TextEndBattle
dw FightingDojoEndBattleText2 ; 0x4eca TextEndBattle dw FightingDojoEndBattleText2 ; TextEndBattle
FightingDojoTrainerHeader2: ; 5ce2b (17:4e2b) FightingDojoTrainerHeader2: ; 5ce2b (17:4e2b)
db $4 ; flag's bit db $4 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7b1 ; flag's byte dw wd7b1 ; flag's byte
dw FightingDojoBattleText3 ; 0x4ede TextBeforeBattle dw FightingDojoBattleText3 ; TextBeforeBattle
dw FightingDojoAfterBattleText3 ; 0x4ee8 TextAfterBattle dw FightingDojoAfterBattleText3 ; TextAfterBattle
dw FightingDojoEndBattleText3 ; 0x4ee3 TextEndBattle dw FightingDojoEndBattleText3 ; TextEndBattle
dw FightingDojoEndBattleText3 ; 0x4ee3 TextEndBattle dw FightingDojoEndBattleText3 ; TextEndBattle
FightingDojoTrainerHeader3: ; 5ce37 (17:4e37) FightingDojoTrainerHeader3: ; 5ce37 (17:4e37)
db $5 ; flag's bit db $5 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7b1 ; flag's byte dw wd7b1 ; flag's byte
dw FightingDojoBattleText4 ; 0x4ef7 TextBeforeBattle dw FightingDojoBattleText4 ; TextBeforeBattle
dw FightingDojoAfterBattleText4 ; 0x4f01 TextAfterBattle dw FightingDojoAfterBattleText4 ; TextAfterBattle
dw FightingDojoEndBattleText4 ; 0x4efc TextEndBattle dw FightingDojoEndBattleText4 ; TextEndBattle
dw FightingDojoEndBattleText4 ; 0x4efc TextEndBattle dw FightingDojoEndBattleText4 ; TextEndBattle
db $ff db $ff
@ -155,15 +155,15 @@ FightingDojoText1: ; 5ce44 (17:4e44)
ld a, $3 ld a, $3
ld [W_FIGHTINGDOJOCURSCRIPT], a ld [W_FIGHTINGDOJOCURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
jr .asm_9dba4 ; 0x5ce7b jr .asm_9dba4
.continue1 ; 0x5ce7d .continue1
ld hl, FightingDojoText_5ce9d ld hl, FightingDojoText_5ce9d
call PrintText call PrintText
jr .asm_9dba4 ; 0x5ce83 jr .asm_9dba4
.continue2 ; 0x5ce85f .continue2
ld hl, FightingDojoText8 ld hl, FightingDojoText8
call PrintText call PrintText
.asm_9dba4 ; 0x5ce8b .asm_9dba4
jp TextScriptEnd jp TextScriptEnd
FightingDojoText_5ce8e: ; 5ce8e (17:4e8e) FightingDojoText_5ce8e: ; 5ce8e (17:4e8e)

View file

@ -137,24 +137,24 @@ FuchsiaCityText24: ; 19af4 (6:5af4)
db $08 ; asm db $08 ; asm
ld a, [wd7f6] ld a, [wd7f6]
bit 6, a bit 6, a
jr nz, .asm_3b4e8 ; 0x19afa jr nz, .asm_3b4e8
bit 7, a bit 7, a
jr nz, .asm_667d5 ; 0x19afe jr nz, .asm_667d5
ld hl, FuchsiaCityText_19b2a ld hl, FuchsiaCityText_19b2a
call PrintText call PrintText
jr .asm_4343f ; 0x19b06 jr .asm_4343f
.asm_3b4e8 ; 0x19b08 .asm_3b4e8
ld hl, FuchsiaCityOmanyteText ld hl, FuchsiaCityOmanyteText
call PrintText call PrintText
ld a, OMANYTE ld a, OMANYTE
jr .asm_81556 ; 0x19b10 jr .asm_81556
.asm_667d5 ; 0x19b12 .asm_667d5
ld hl, FuchsiaCityKabutoText ld hl, FuchsiaCityKabutoText
call PrintText call PrintText
ld a, KABUTO ld a, KABUTO
.asm_81556 ; 0x19b1a .asm_81556
call DisplayPokedex call DisplayPokedex
.asm_4343f ; 0x19b1d .asm_4343f
jp TextScriptEnd jp TextScriptEnd
FuchsiaCityOmanyteText: ; 19b20 (6:5b20) FuchsiaCityOmanyteText: ; 19b20 (6:5b20)

View file

@ -37,14 +37,14 @@ FuchsiaGymScriptPointers: ; 75482 (1d:5482)
dw FuchsiaGymScript3 dw FuchsiaGymScript3
FuchsiaGymScript3: ; 7548a (1d:548a) FuchsiaGymScript3: ; 7548a (1d:548a)
ld a, [W_ISINBATTLE] ; W_ISINBATTLE ld a, [W_ISINBATTLE]
cp $ff cp $ff
jp z, FuchsiaGymScript_75477 jp z, FuchsiaGymScript_75477
ld a, $f0 ld a, $f0
ld [wJoyIgnore], a ld [wJoyIgnore], a
FuchsiaGymScript3_75497: ; 75497 (1d:5497) FuchsiaGymScript3_75497: ; 75497 (1d:5497)
ld a, $9 ld a, $9
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a
call DisplayTextID call DisplayTextID
ld hl, wd792 ld hl, wd792
set 1, [hl] set 1, [hl]
@ -52,14 +52,14 @@ FuchsiaGymScript3_75497: ; 75497 (1d:5497)
call GiveItem call GiveItem
jr nc, .BagFull jr nc, .BagFull
ld a, $a ld a, $a
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a
call DisplayTextID call DisplayTextID
ld hl, wd792 ld hl, wd792
set 0, [hl] set 0, [hl]
jr .asm_754c0 jr .asm_754c0
.BagFull .BagFull
ld a, $b ld a, $b
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a
call DisplayTextID call DisplayTextID
.asm_754c0 .asm_754c0
ld hl, W_OBTAINEDBADGES ld hl, W_OBTAINEDBADGES
@ -92,55 +92,55 @@ FuchsiaGymTrainerHeader0: ; 754eb (1d:54eb)
db $2 ; flag's bit db $2 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd792 ; flag's byte dw wd792 ; flag's byte
dw FuchsiaGymBattleText1 ; 0x55ae TextBeforeBattle dw FuchsiaGymBattleText1 ; TextBeforeBattle
dw FuchsiaGymAfterBattleText1 ; 0x55b8 TextAfterBattle dw FuchsiaGymAfterBattleText1 ; TextAfterBattle
dw FuchsiaGymEndBattleText1 ; 0x55b3 TextEndBattle dw FuchsiaGymEndBattleText1 ; TextEndBattle
dw FuchsiaGymEndBattleText1 ; 0x55b3 TextEndBattle dw FuchsiaGymEndBattleText1 ; TextEndBattle
FuchsiaGymTrainerHeader2: ; 754f7 (1d:54f7) FuchsiaGymTrainerHeader2: ; 754f7 (1d:54f7)
db $3 ; flag's bit db $3 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd792 ; flag's byte dw wd792 ; flag's byte
dw FuchsiaGymBattleText2 ; 0x55c7 TextBeforeBattle dw FuchsiaGymBattleText2 ; TextBeforeBattle
dw FuchsiaGymAfterBattleText2 ; 0x55d1 TextAfterBattle dw FuchsiaGymAfterBattleText2 ; TextAfterBattle
dw FuchsiaGymEndBattleText2 ; 0x55cc TextEndBattle dw FuchsiaGymEndBattleText2 ; TextEndBattle
dw FuchsiaGymEndBattleText2 ; 0x55cc TextEndBattle dw FuchsiaGymEndBattleText2 ; TextEndBattle
FuchsiaGymTrainerHeader3: ; 75503 (1d:5503) FuchsiaGymTrainerHeader3: ; 75503 (1d:5503)
db $4 ; flag's bit db $4 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd792 ; flag's byte dw wd792 ; flag's byte
dw FuchsiaGymBattleText3 ; 0x55e0 TextBeforeBattle dw FuchsiaGymBattleText3 ; TextBeforeBattle
dw FuchsiaGymAfterBattleText3 ; 0x55ea TextAfterBattle dw FuchsiaGymAfterBattleText3 ; TextAfterBattle
dw FuchsiaGymEndBattleText3 ; 0x55e5 TextEndBattle dw FuchsiaGymEndBattleText3 ; TextEndBattle
dw FuchsiaGymEndBattleText3 ; 0x55e5 TextEndBattle dw FuchsiaGymEndBattleText3 ; TextEndBattle
FuchsiaGymTrainerHeader4: ; 7550f (1d:550f) FuchsiaGymTrainerHeader4: ; 7550f (1d:550f)
db $5 ; flag's bit db $5 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd792 ; flag's byte dw wd792 ; flag's byte
dw FuchsiaGymBattleText4 ; 0x55f9 TextBeforeBattle dw FuchsiaGymBattleText4 ; TextBeforeBattle
dw FuchsiaGymAfterBattleText4 ; 0x5603 TextAfterBattle dw FuchsiaGymAfterBattleText4 ; TextAfterBattle
dw FuchsiaGymEndBattleText4 ; 0x55fe TextEndBattle dw FuchsiaGymEndBattleText4 ; TextEndBattle
dw FuchsiaGymEndBattleText4 ; 0x55fe TextEndBattle dw FuchsiaGymEndBattleText4 ; TextEndBattle
FuchsiaGymTrainerHeader5: ; 7551b (1d:551b) FuchsiaGymTrainerHeader5: ; 7551b (1d:551b)
db $6 ; flag's bit db $6 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd792 ; flag's byte dw wd792 ; flag's byte
dw FuchsiaGymBattleText5 ; 0x5612 TextBeforeBattle dw FuchsiaGymBattleText5 ; TextBeforeBattle
dw FuchsiaGymAfterBattleText5 ; 0x561c TextAfterBattle dw FuchsiaGymAfterBattleText5 ; TextAfterBattle
dw FuchsiaGymEndBattleText5 ; 0x5617 TextEndBattle dw FuchsiaGymEndBattleText5 ; TextEndBattle
dw FuchsiaGymEndBattleText5 ; 0x5617 TextEndBattle dw FuchsiaGymEndBattleText5 ; TextEndBattle
FuchsiaGymTrainerHeader6: ; 75527 (1d:5527) FuchsiaGymTrainerHeader6: ; 75527 (1d:5527)
db $7 ; flag's bit db $7 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd792 ; flag's byte dw wd792 ; flag's byte
dw FuchsiaGymBattleText6 ; 0x562b TextBeforeBattle dw FuchsiaGymBattleText6 ; TextBeforeBattle
dw FuchsiaGymAfterBattleText6 ; 0x5635 TextAfterBattle dw FuchsiaGymAfterBattleText6 ; TextAfterBattle
dw FuchsiaGymEndBattleText6 ; 0x5630 TextEndBattle dw FuchsiaGymEndBattleText6 ; TextEndBattle
dw FuchsiaGymEndBattleText6 ; 0x5630 TextEndBattle dw FuchsiaGymEndBattleText6 ; TextEndBattle
db $ff db $ff
@ -148,17 +148,17 @@ FuchsiaGymText1: ; 75534 (1d:5534)
db $08 ; asm db $08 ; asm
ld a, [wd792] ld a, [wd792]
bit 1, a bit 1, a
jr z, .asm_181b6 ; 0x7553a jr z, .asm_181b6
bit 0, a bit 0, a
jr nz, .asm_adc3b ; 0x7553e jr nz, .asm_adc3b
call z, FuchsiaGymScript3_75497 call z, FuchsiaGymScript3_75497
call DisableWaitingAfterTextDisplay call DisableWaitingAfterTextDisplay
jr .asm_e84c6 ; 0x75546 jr .asm_e84c6
.asm_adc3b ; 0x75548 .asm_adc3b
ld hl, KogaExplainToxicText ld hl, KogaExplainToxicText
call PrintText call PrintText
jr .asm_e84c6 ; 0x7554e jr .asm_e84c6
.asm_181b6 ; 0x75550 .asm_181b6
ld hl, KogaBeforeBattleText ld hl, KogaBeforeBattleText
call PrintText call PrintText
ld hl, wd72d ld hl, wd72d
@ -177,7 +177,7 @@ FuchsiaGymText1: ; 75534 (1d:5534)
ldh [$b4], a ldh [$b4], a
ld a, $3 ld a, $3
ld [W_FUCHSIAGYMCURSCRIPT], a ld [W_FUCHSIAGYMCURSCRIPT], a
.asm_e84c6 ; 0x7557e .asm_e84c6
jp TextScriptEnd jp TextScriptEnd
KogaBeforeBattleText: ; 75581 (1d:5581) KogaBeforeBattleText: ; 75581 (1d:5581)
@ -321,9 +321,9 @@ FuchsiaGymText8: ; 7563a (1d:563a)
ld a, [wd792] ld a, [wd792]
bit 1, a bit 1, a
ld hl, FuchsiaGymText_75653 ld hl, FuchsiaGymText_75653
jr nz, .asm_50671 ; 0x75643 jr nz, .asm_50671
ld hl, FuchsiaGymText_7564e ld hl, FuchsiaGymText_7564e
.asm_50671 ; 0x75648 .asm_50671
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd

View file

@ -12,25 +12,25 @@ FuchsiaHouse2Text1: ; 750c2 (1d:50c2)
db $08 ; asm db $08 ; asm
ld a, [wd78e] ld a, [wd78e]
bit 0, a bit 0, a
jr nz, .subtract ; 0x750c8 jr nz, .subtract
ld b,GOLD_TEETH ld b,GOLD_TEETH
call IsItemInBag call IsItemInBag
jr nz, .asm_3f30f ; 0x750cf jr nz, .asm_3f30f
ld a, [wd78e] ld a, [wd78e]
bit 1, a bit 1, a
jr nz, .asm_60cba ; 0x750d6 jr nz, .asm_60cba
ld hl, WardenGibberishText1 ld hl, WardenGibberishText1
call PrintText call PrintText
call YesNoChoice call YesNoChoice
ld a, [wCurrentMenuItem] ld a, [wCurrentMenuItem]
and a and a
ld hl, WardenGibberishText3 ld hl, WardenGibberishText3
jr nz, .asm_61238 ; 0x750e8 jr nz, .asm_61238
ld hl, WardenGibberishText2 ld hl, WardenGibberishText2
.asm_61238 ; 0x750ed .asm_61238
call PrintText call PrintText
jr .asm_52039 ; 0x750f0 jr .asm_52039
.asm_3f30f ; 0x750f2 .asm_3f30f
ld hl, WardenTeethText1 ld hl, WardenTeethText1
call PrintText call PrintText
ld a, GOLD_TEETH ld a, GOLD_TEETH
@ -38,7 +38,7 @@ FuchsiaHouse2Text1: ; 750c2 (1d:50c2)
callba RemoveItemByID callba RemoveItemByID
ld hl, wd78e ld hl, wd78e
set 1, [hl] set 1, [hl]
.asm_60cba ; 0x75109 .asm_60cba
ld hl, WardenThankYouText ld hl, WardenThankYouText
call PrintText call PrintText
ld bc,(HM_04 << 8) | 1 ld bc,(HM_04 << 8) | 1
@ -48,15 +48,15 @@ FuchsiaHouse2Text1: ; 750c2 (1d:50c2)
call PrintText call PrintText
ld hl, wd78e ld hl, wd78e
set 0, [hl] set 0, [hl]
jr .asm_52039 ; 0x75122 jr .asm_52039
.subtract ; 0x75124 .subtract
ld hl, HM04ExplanationText ld hl, HM04ExplanationText
call PrintText call PrintText
jr .asm_52039 ; 0x7512a jr .asm_52039
.BagFull .BagFull
ld hl, HM04NoRoomText ld hl, HM04NoRoomText
call PrintText call PrintText
.asm_52039 ; 0x75132 .asm_52039
jp TextScriptEnd jp TextScriptEnd
WardenGibberishText1: ; 75135 (1d:5135) WardenGibberishText1: ; 75135 (1d:5135)
@ -101,9 +101,9 @@ FuchsiaHouse2Text4: ; 75163 (1d:5163)
ldh a, [$8c] ldh a, [$8c]
cp $4 cp $4
ld hl, FuchsiaHouse2Text_7517b ld hl, FuchsiaHouse2Text_7517b
jr nz, .asm_4c9a2 ; 0x7516b jr nz, .asm_4c9a2
ld hl, FuchsiaHouse2Text_75176 ld hl, FuchsiaHouse2Text_75176
.asm_4c9a2 ; 0x75170 .asm_4c9a2
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd

View file

@ -48,7 +48,7 @@ FuchsiaHouse3Text_561bd: ; 561bd (15:61bd)
db "@" db "@"
FuchsiaHouse3Text_561c2: ; 561c2 (15:61c2) FuchsiaHouse3Text_561c2: ; 561c2 (15:61c2)
TX_FAR _FuchsiaHouse3Text_561c2 ; 0xa06e8 TX_FAR _FuchsiaHouse3Text_561c2
db $0B db $0B
db "@" db "@"

View file

@ -70,12 +70,12 @@ GaryScript2: ; 75f6a (1d:5f6a)
; select which team to use during the encounter ; select which team to use during the encounter
ld a, [W_RIVALSTARTER] ld a, [W_RIVALSTARTER]
cp STARTER2 cp STARTER2
jr nz, .NotSquirtle ; 0x75f9f $4 jr nz, .NotSquirtle
ld a, $1 ld a, $1
jr .done jr .done
.NotSquirtle .NotSquirtle
cp STARTER3 cp STARTER3
jr nz, .Charmander ; 0x75fa7 $4 jr nz, .Charmander
ld a, $2 ld a, $2
jr .done jr .done
.Charmander .Charmander
@ -93,7 +93,7 @@ GaryScript3: ; 75fbb (1d:5fbb)
ld a, [W_ISINBATTLE] ld a, [W_ISINBATTLE]
cp $ff cp $ff
jp z, GaryScript_75f29 jp z, GaryScript_75f29
call UpdateSprites ; move sprites call UpdateSprites
ld hl, wd867 ld hl, wd867
set 1, [hl] set 1, [hl]
ld a, $f0 ld a, $f0
@ -210,7 +210,7 @@ GaryScript9: ; 76099 (1d:6099)
ld [W_GARYCURSCRIPT], a ld [W_GARYCURSCRIPT], a
ret ret
RLEMovement760b4 ; 760b4 (1d:60b4) RLEMovement760b4: ; 760b4 (1d:60b4)
db $40,4 db $40,4
db $20,1 db $20,1
db $ff db $ff
@ -225,7 +225,7 @@ GaryScript10: ; 760b9 (1d:60b9)
ld [W_GARYCURSCRIPT], a ld [W_GARYCURSCRIPT], a
ret ret
GaryScript_760c8 ; 760c8 (1d:60c8) GaryScript_760c8: ; 760c8 (1d:60c8)
ld a, $f0 ld a, $f0
ld [wJoyIgnore], a ld [wJoyIgnore], a
call DisplayTextID call DisplayTextID
@ -245,9 +245,9 @@ GaryText1: ; 760e0 (1d:60e0)
ld a, [wd867] ld a, [wd867]
bit 1, a bit 1, a
ld hl, GaryText_760f4 ld hl, GaryText_760f4
jr z, .asm_17e9f ; 0x760e9 jr z, .asm_17e9f
ld hl, GaryText_76103 ld hl, GaryText_76103
.asm_17e9f ; 0x760ee .asm_17e9f
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd

View file

@ -55,7 +55,7 @@ HallofFameRoomScript2: ; 5a4bb (16:64bb)
ld c, 600 / 5 ld c, 600 / 5
call DelayFrames call DelayFrames
dec b dec b
jr nz, .asm_5a4ff ; 0x5a505 $f8 jr nz, .asm_5a4ff
call WaitForTextScrollButtonPress call WaitForTextScrollButtonPress
jp Init jp Init

View file

@ -14,12 +14,12 @@ Lab2Text2: ; 75c2f (1d:5c2f)
db $8 db $8
ld a, $7 ld a, $7
ld [wWhichTrade], a ld [wWhichTrade], a
jr asm_78552 ; 0x75c35 $6 jr Lab2DoTrade
Lab2Text3: ; 75c37 (1d:5c37) Lab2Text3: ; 75c37 (1d:5c37)
db $8 db $8
ld a, $8 ld a, $8
ld [wWhichTrade], a ld [wWhichTrade], a
asm_78552: ; 75c3d (1d:5c3d) Lab2DoTrade: ; 75c3d (1d:5c3d)
predef DoInGameTradeDialogue predef DoInGameTradeDialogue
jp TextScriptEnd jp TextScriptEnd

View file

@ -12,7 +12,7 @@ Lab3Text1: ; 75c94 (1d:5c94)
db $08 ; asm db $08 ; asm
ld a, [wd7a1] ld a, [wd7a1]
bit 7, a bit 7, a
jr nz, .asm_e551a ; 0x75c9a jr nz, .asm_e551a
ld hl, TM35PreReceiveText ld hl, TM35PreReceiveText
call PrintText call PrintText
ld bc, (TM_35 << 8) | 1 ld bc, (TM_35 << 8) | 1
@ -22,15 +22,15 @@ Lab3Text1: ; 75c94 (1d:5c94)
call PrintText call PrintText
ld hl, wd7a1 ld hl, wd7a1
set 7, [hl] set 7, [hl]
jr .asm_eb896 ; 0x75cb5 jr .asm_eb896
.BagFull .BagFull
ld hl, TM35NoRoomText ld hl, TM35NoRoomText
call PrintText call PrintText
jr .asm_eb896 ; 0x75cbd jr .asm_eb896
.asm_e551a ; 0x75cbf .asm_e551a
ld hl, TM35ExplanationText ld hl, TM35ExplanationText
call PrintText call PrintText
.asm_eb896 ; 0x75cc5 .asm_eb896
jp TextScriptEnd jp TextScriptEnd
TM35PreReceiveText: ; 75cc8 (1d:5cc8) TM35PreReceiveText: ; 75cc8 (1d:5cc8)

View file

@ -51,15 +51,15 @@ Lab4Text1: ; 75d6c (1d:5d6c)
db $8 db $8
ld a, [wd7a3] ld a, [wd7a3]
bit 0, a bit 0, a
jr nz, .asm_75d96 ; 0x75d72 $22 jr nz, .asm_75d96
ld hl, Lab4Text_75dc6 ld hl, Lab4Text_75dc6
call PrintText call PrintText
call Lab4Script_75d38 call Lab4Script_75d38
ld a, [wcd37] ld a, [wcd37]
and a and a
jr z, .asm_75d8d ; 0x75d81 $a jr z, .asm_75d8d
callba GiveFossilToCinnabarLab callba GiveFossilToCinnabarLab
jr .asm_75d93 ; 0x75d8b $6 jr .asm_75d93
.asm_75d8d .asm_75d8d
ld hl, Lab4Text_75dcb ld hl, Lab4Text_75dcb
call PrintText call PrintText
@ -67,10 +67,10 @@ Lab4Text1: ; 75d6c (1d:5d6c)
jp TextScriptEnd jp TextScriptEnd
.asm_75d96 .asm_75d96
bit 1, a bit 1, a
jr z, .asm_75da2 ; 0x75d98 $8 jr z, .asm_75da2
ld hl, Lab4Text_75dd0 ld hl, Lab4Text_75dd0
call PrintText call PrintText
jr .asm_75d93 ; 0x75da0 $f1 jr .asm_75d93
.asm_75da2 .asm_75da2
call LoadFossilItemAndMonNameBank1D call LoadFossilItemAndMonNameBank1D
ld hl, Lab4Text_75dd5 ld hl, Lab4Text_75dd5
@ -81,12 +81,12 @@ Lab4Text1: ; 75d6c (1d:5d6c)
ld b, a ld b, a
ld c, 30 ld c, 30
call GivePokemon call GivePokemon
jr nc, .asm_75d93 ; 0x75db9 $d8 jr nc, .asm_75d93
ld hl, wd7a3 ld hl, wd7a3
res 0, [hl] res 0, [hl]
res 1, [hl] res 1, [hl]
res 2, [hl] res 2, [hl]
jr .asm_75d93 ; 0x75dc4 $cd jr .asm_75d93
Lab4Text_75dc6: ; 75dc6 (1d:5dc6) Lab4Text_75dc6: ; 75dc6 (1d:5dc6)
TX_FAR _Lab4Text_75dc6 TX_FAR _Lab4Text_75dc6

View file

@ -60,11 +60,11 @@ LanceScript0: ; 5a305 (16:6305)
jp nc, CheckFightingMapTrainers jp nc, CheckFightingMapTrainers
xor a xor a
ld [hJoyHeld], a ld [hJoyHeld], a
ld a, [wWhichTrade] ; wWhichTrade ld a, [wWhichTrade]
cp $3 cp $3
jr nc, .asm_5a325 jr nc, .asm_5a325
ld a, $1 ld a, $1
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a
jp DisplayTextID jp DisplayTextID
.asm_5a325 .asm_5a325
cp $5 cp $5
@ -89,11 +89,11 @@ CoordsData_5a33e: ; 5a33e (16:633e)
LanceScript2: ; 5a349 (16:6349) LanceScript2: ; 5a349 (16:6349)
call EndTrainerBattle call EndTrainerBattle
ld a, [W_ISINBATTLE] ; W_ISINBATTLE ld a, [W_ISINBATTLE]
cp $ff cp $ff
jp z, LanceScript_5a2f5 jp z, LanceScript_5a2f5
ld a, $1 ld a, $1
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a
jp DisplayTextID jp DisplayTextID
LanceScript_5a35b: ; 5a35b (16:635b) LanceScript_5a35b: ; 5a35b (16:635b)
@ -136,10 +136,10 @@ LanceTrainerHeader0: ; 5a397 (16:6397)
db $1 ; flag's bit db $1 ; flag's bit
db ($0 << 4) ; trainer's view range db ($0 << 4) ; trainer's view range
dw wd866 ; flag's byte dw wd866 ; flag's byte
dw LanceBeforeBattleText ; 0x63ae TextBeforeBattle dw LanceBeforeBattleText ; TextBeforeBattle
dw LanceAfterBattleText ; 0x63b8 TextAfterBattle dw LanceAfterBattleText ; TextAfterBattle
dw LanceEndBattleText ; 0x63b3 TextEndBattle dw LanceEndBattleText ; TextEndBattle
dw LanceEndBattleText ; 0x63b3 TextEndBattle dw LanceEndBattleText ; TextEndBattle
db $ff db $ff

View file

@ -14,14 +14,14 @@ LavenderHouse1Text1: ; 1d8b8 (7:58b8)
db $08 ; asm db $08 ; asm
ld a, [wd7e0] ld a, [wd7e0]
bit 7, a bit 7, a
jr nz, .asm_72e5d ; 0x1d8be jr nz, .asm_72e5d
ld hl, LavenderHouse1Text_1d8d1 ld hl, LavenderHouse1Text_1d8d1
call PrintText call PrintText
jr .asm_6957f ; 0x1d8c6 jr .asm_6957f
.asm_72e5d ; 0x1d8c8 .asm_72e5d
ld hl, LavenderHouse1Text_1d8d6 ld hl, LavenderHouse1Text_1d8d6
call PrintText call PrintText
.asm_6957f ; 0x1d8ce .asm_6957f
jp TextScriptEnd jp TextScriptEnd
LavenderHouse1Text_1d8d1: ; 1d8d1 (7:58d1) LavenderHouse1Text_1d8d1: ; 1d8d1 (7:58d1)
@ -36,14 +36,14 @@ LavenderHouse1Text2: ; 1d8db (7:58db)
db $08 ; asm db $08 ; asm
ld a, [wd7e0] ld a, [wd7e0]
bit 7, a bit 7, a
jr nz, .asm_06470 ; 0x1d8e1 jr nz, .asm_06470
ld hl, LavenderHouse1Text_1d8f4 ld hl, LavenderHouse1Text_1d8f4
call PrintText call PrintText
jr .asm_3d208 ; 0x1d8e9 jr .asm_3d208
.asm_06470 ; 0x1d8eb .asm_06470
ld hl, LavenderHouse1Text_1d8f9 ld hl, LavenderHouse1Text_1d8f9
call PrintText call PrintText
.asm_3d208 ; 0x1d8f1 .asm_3d208
jp TextScriptEnd jp TextScriptEnd
LavenderHouse1Text_1d8f4: ; 1d8f4 (7:58f4) LavenderHouse1Text_1d8f4: ; 1d8f4 (7:58f4)
@ -72,7 +72,7 @@ LavenderHouse1Text5: ; 1d918 (7:5918)
db $08 ; asm db $08 ; asm
ld a, [wd76c] ld a, [wd76c]
bit 0, a bit 0, a
jr nz, .asm_15ac2 ; 0x1d91e jr nz, .asm_15ac2
ld hl, LavenderHouse1Text_1d94c ld hl, LavenderHouse1Text_1d94c
call PrintText call PrintText
ld bc, (POKE_FLUTE << 8) | 1 ld bc, (POKE_FLUTE << 8) | 1
@ -82,15 +82,15 @@ LavenderHouse1Text5: ; 1d918 (7:5918)
call PrintText call PrintText
ld hl, wd76c ld hl, wd76c
set 0, [hl] set 0, [hl]
jr .asm_da749 ; 0x1d939 jr .asm_da749
.BagFull .BagFull
ld hl, FluteNoRoomText ld hl, FluteNoRoomText
call PrintText call PrintText
jr .asm_da749 ; 0x1d941 jr .asm_da749
.asm_15ac2 ; 0x1d943 .asm_15ac2
ld hl, MrFujiAfterFluteText ld hl, MrFujiAfterFluteText
call PrintText call PrintText
.asm_da749 ; 0x1d949 .asm_da749
jp TextScriptEnd jp TextScriptEnd
LavenderHouse1Text_1d94c: ; 1d94c (7:594c) LavenderHouse1Text_1d94c: ; 1d94c (7:594c)

View file

@ -17,14 +17,14 @@ LavenderHouse2Text2: ; 1d9c3 (7:59c3)
db $08 ; asm db $08 ; asm
ld a, [wd7e0] ld a, [wd7e0]
bit 7, a bit 7, a
jr nz, .asm_65711 ; 0x1d9c9 jr nz, .asm_65711
ld hl, LavenderHouse2Text_1d9dc ld hl, LavenderHouse2Text_1d9dc
call PrintText call PrintText
jr .asm_64be1 ; 0x1d9d1 jr .asm_64be1
.asm_65711 ; 0x1d9d3 .asm_65711
ld hl, LavenderHouse2Text_1d9e1 ld hl, LavenderHouse2Text_1d9e1
call PrintText call PrintText
.asm_64be1 ; 0x1d9d9 .asm_64be1
jp TextScriptEnd jp TextScriptEnd
LavenderHouse2Text_1d9dc: ; 1d9dc (7:59dc) LavenderHouse2Text_1d9dc: ; 1d9dc (7:59dc)

View file

@ -14,14 +14,14 @@ LavenderMartText3: ; 5c93a (17:493a)
db $08 ; asm db $08 ; asm
ld a, [wd7e0] ld a, [wd7e0]
bit 7, a bit 7, a
jr nz, .asm_c88d4 ; 0x5c940 jr nz, .asm_c88d4
ld hl, LavenderMart_5c953 ld hl, LavenderMart_5c953
call PrintText call PrintText
jr .asm_6d225 ; 0x5c948 jr .asm_6d225
.asm_c88d4 ; 0x5c94a .asm_c88d4
ld hl, LavenderMart_5c958 ld hl, LavenderMart_5c958
call PrintText call PrintText
.asm_6d225 ; 0x5c950 .asm_6d225
jp TextScriptEnd jp TextScriptEnd
LavenderMart_5c953: ; 5c953 (17:4953) LavenderMart_5c953: ; 5c953 (17:4953)

View file

@ -20,9 +20,9 @@ LavenderTownText1: ; 44120 (11:4120)
ld a, [wCurrentMenuItem] ld a, [wCurrentMenuItem]
and a and a
ld hl, LavenderTownText_44146 ld hl, LavenderTownText_44146
jr nz, .asm_40831 ; 0x44131 jr nz, .asm_40831
ld hl, LavenderTownText_44141 ld hl, LavenderTownText_44141
.asm_40831 ; 0x44136 .asm_40831
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd

View file

@ -41,7 +41,8 @@ LoreleiScriptPointers: ; 761bb (1d:61bb)
LoreleiScript4: ; 761c5 (1d:61c5) LoreleiScript4: ; 761c5 (1d:61c5)
ret ret
asm_761c6: ; 761c6 (1d:61c6)
LoreleiScript_761c6: ; 761c6 (1d:61c6)
ld hl, wSimulatedJoypadStatesEnd ld hl, wSimulatedJoypadStatesEnd
ld a, D_UP ld a, D_UP
ld [hli], a ld [hli], a
@ -57,6 +58,7 @@ asm_761c6: ; 761c6 (1d:61c6)
ld [W_LORELEICURSCRIPT], a ld [W_LORELEICURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
ret ret
LoreleiScript0: ; 761e2 (1d:61e2) LoreleiScript0: ; 761e2 (1d:61e2)
ld hl, CoordsData_76223 ld hl, CoordsData_76223
call ArePlayerCoordsInArray call ArePlayerCoordsInArray
@ -66,16 +68,16 @@ LoreleiScript0: ; 761e2 (1d:61e2)
ld [hJoyHeld], a ld [hJoyHeld], a
ld [wSimulatedJoypadStatesEnd], a ld [wSimulatedJoypadStatesEnd], a
ld [wSimulatedJoypadStatesIndex], a ld [wSimulatedJoypadStatesIndex], a
ld a, [wWhichTrade] ; wWhichTrade ld a, [wWhichTrade]
cp $3 cp $3
jr c, .asm_76206 jr c, .asm_76206
ld hl, wd863 ld hl, wd863
bit 6, [hl] bit 6, [hl]
set 6, [hl] set 6, [hl]
jr z, asm_761c6 jr z, LoreleiScript_761c6
.asm_76206 .asm_76206
ld a, $2 ld a, $2
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a
call DisplayTextID call DisplayTextID
ld a, D_UP ld a, D_UP
ld [wSimulatedJoypadStatesEnd], a ld [wSimulatedJoypadStatesEnd], a
@ -106,11 +108,11 @@ LoreleiScript3: ; 7622c (1d:622c)
ret ret
LoreleiScript2: ; 7623f (1d:623f) LoreleiScript2: ; 7623f (1d:623f)
call EndTrainerBattle call EndTrainerBattle
ld a, [W_ISINBATTLE] ; W_ISINBATTLE ld a, [W_ISINBATTLE]
cp $ff cp $ff
jp z, LoreleiScript_761b6 jp z, LoreleiScript_761b6
ld a, $1 ld a, $1
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a
jp DisplayTextID jp DisplayTextID
LoreleiTextPointers: ; 76251 (1d:6251) LoreleiTextPointers: ; 76251 (1d:6251)
@ -122,10 +124,10 @@ LoreleiTrainerHeader0: ; 76255 (1d:6255)
db $1 ; flag's bit db $1 ; flag's bit
db ($0 << 4) ; trainer's view range db ($0 << 4) ; trainer's view range
dw wd863 ; flag's byte dw wd863 ; flag's byte
dw LoreleiBeforeBattleText ; 0x626c TextBeforeBattle dw LoreleiBeforeBattleText ; TextBeforeBattle
dw LoreleiAfterBattleText ; 0x6276 TextAfterBattle dw LoreleiAfterBattleText ; TextAfterBattle
dw LoreleiEndBattleText ; 0x6271 TextEndBattle dw LoreleiEndBattleText ; TextEndBattle
dw LoreleiEndBattleText ; 0x6271 TextEndBattle dw LoreleiEndBattleText ; TextEndBattle
db $ff db $ff

View file

@ -15,7 +15,7 @@ Mansion1Subscript1: ; 442c5 (11:42c5)
ret z ret z
ld a, [wd796] ld a, [wd796]
bit 0, a bit 0, a
jr nz, .asm_442ec ; 0x442d2 $18 jr nz, .asm_442ec
ld bc, $060c ld bc, $060c
call Mansion1Script_4430b call Mansion1Script_4430b
ld bc, $0308 ld bc, $0308
@ -37,12 +37,12 @@ Mansion1Subscript1: ; 442c5 (11:42c5)
Mansion1Script_44304: ; 44304 (11:4304) Mansion1Script_44304: ; 44304 (11:4304)
ld a, $2d ld a, $2d
ld [wd09f], a ld [wd09f], a
jr asm_44310 jr Mansion1ReplaceBlock
Mansion1Script_4430b: ; 4430b (11:430b) Mansion1Script_4430b: ; 4430b (11:430b)
ld a, $e ld a, $e
ld [wd09f], a ld [wd09f], a
asm_44310: ; 44310 (11:4310) Mansion1ReplaceBlock: ; 44310 (11:4310)
predef ReplaceTileBlock predef ReplaceTileBlock
ret ret
@ -72,10 +72,10 @@ Mansion1TrainerHeader0: ; 44334 (11:4334)
db $1 ; flag's bit db $1 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd798 ; flag's byte dw wd798 ; flag's byte
dw Mansion1BattleText2 ; 0x434b TextBeforeBattle dw Mansion1BattleText2 ; TextBeforeBattle
dw Mansion1AfterBattleText2 ; 0x4355 TextAfterBattle dw Mansion1AfterBattleText2 ; TextAfterBattle
dw Mansion1EndBattleText2 ; 0x4350 TextEndBattle dw Mansion1EndBattleText2 ; TextEndBattle
dw Mansion1EndBattleText2 ; 0x4350 TextEndBattle dw Mansion1EndBattleText2 ; TextEndBattle
db $ff db $ff
@ -104,7 +104,7 @@ Mansion1Text4: ; 4435a (11:435a)
call YesNoChoice call YesNoChoice
ld a, [wCurrentMenuItem] ld a, [wCurrentMenuItem]
and a and a
jr nz, .asm_4438c ; 0x44368 $22 jr nz, .asm_4438c
ld a, $1 ld a, $1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld hl, wd126 ld hl, wd126
@ -116,9 +116,9 @@ Mansion1Text4: ; 4435a (11:435a)
ld hl, wd796 ld hl, wd796
bit 0, [hl] bit 0, [hl]
set 0, [hl] set 0, [hl]
jr z, .asm_44392 ; 0x44386 $a jr z, .asm_44392
res 0, [hl] res 0, [hl]
jr .asm_44392 ; 0x4438a $6 jr .asm_44392
.asm_4438c .asm_4438c
ld hl, MansionSwitchNotPressedText ld hl, MansionSwitchNotPressedText
call PrintText call PrintText

View file

@ -69,10 +69,10 @@ Mansion2TrainerHeader0: ; 52057 (14:6057)
db $1 ; flag's bit db $1 ; flag's bit
db ($0 << 4) ; trainer's view range db ($0 << 4) ; trainer's view range
dw wd847 ; flag's byte dw wd847 ; flag's byte
dw Mansion2BattleText1 ; 0x606e TextBeforeBattle dw Mansion2BattleText1 ; TextBeforeBattle
dw Mansion2AfterBattleText1 ; 0x6078 TextAfterBattle dw Mansion2AfterBattleText1 ; TextAfterBattle
dw Mansion2EndBattleText1 ; 0x6073 TextEndBattle dw Mansion2EndBattleText1 ; TextEndBattle
dw Mansion2EndBattleText1 ; 0x6073 TextEndBattle dw Mansion2EndBattleText1 ; TextEndBattle
db $ff db $ff
@ -110,7 +110,7 @@ Mansion2Text5: ; 52087 (14:6087)
call YesNoChoice call YesNoChoice
ld a, [wCurrentMenuItem] ld a, [wCurrentMenuItem]
and a and a
jr nz, .asm_520b9 ; 0x52095 $22 jr nz, .asm_520b9
ld a, $1 ld a, $1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld hl, wd126 ld hl, wd126
@ -122,9 +122,9 @@ Mansion2Text5: ; 52087 (14:6087)
ld hl, wd796 ld hl, wd796
bit 0, [hl] bit 0, [hl]
set 0, [hl] set 0, [hl]
jr z, .asm_520bf ; 0x520b3 $a jr z, .asm_520bf
res 0, [hl] res 0, [hl]
jr .asm_520bf ; 0x520b7 $6 jr .asm_520bf
.asm_520b9 .asm_520b9
ld hl, Mansion2Text_520cc ld hl, Mansion2Text_520cc
call PrintText call PrintText

View file

@ -65,7 +65,7 @@ Mansion3Script_5225b: ; 5225b (14:625b)
ret nz ret nz
call ArePlayerCoordsInArray call ArePlayerCoordsInArray
ret nc ret nc
ld a, [wWhichTrade] ; wWhichTrade ld a, [wWhichTrade]
ld [wWhichDungeonWarp], a ld [wWhichDungeonWarp], a
ld hl, wd72d ld hl, wd72d
set 4, [hl] set 4, [hl]
@ -80,7 +80,7 @@ Mansion3Script_Switches: ; 5227a (14:627a)
xor a xor a
ld [hJoyHeld], a ld [hJoyHeld], a
ld a, $6 ld a, $6
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a
jp DisplayTextID jp DisplayTextID
Mansion3TextPointers: ; 5228a (14:628a) Mansion3TextPointers: ; 5228a (14:628a)
@ -96,19 +96,19 @@ Mansion3TrainerHeader0: ; 52296 (14:6296)
db $1 ; flag's bit db $1 ; flag's bit
db ($0 << 4) ; trainer's view range db ($0 << 4) ; trainer's view range
dw wd849 ; flag's byte dw wd849 ; flag's byte
dw Mansion3BattleText1 ; 0x62c3 TextBeforeBattle dw Mansion3BattleText1 ; TextBeforeBattle
dw Mansion3AfterBattleText1 ; 0x62cd TextAfterBattle dw Mansion3AfterBattleText1 ; TextAfterBattle
dw Mansion3EndBattleText1 ; 0x62c8 TextEndBattle dw Mansion3EndBattleText1 ; TextEndBattle
dw Mansion3EndBattleText1 ; 0x62c8 TextEndBattle dw Mansion3EndBattleText1 ; TextEndBattle
Mansion3TrainerHeader2: ; 522a2 (14:62a2) Mansion3TrainerHeader2: ; 522a2 (14:62a2)
db $2 ; flag's bit db $2 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd849 ; flag's byte dw wd849 ; flag's byte
dw Mansion3BattleText2 ; 0x62d2 TextBeforeBattle dw Mansion3BattleText2 ; TextBeforeBattle
dw Mansion3AfterBattleText2 ; 0x62dc TextAfterBattle dw Mansion3AfterBattleText2 ; TextAfterBattle
dw Mansion3EndBattleText2 ; 0x62d7 TextEndBattle dw Mansion3EndBattleText2 ; TextEndBattle
dw Mansion3EndBattleText2 ; 0x62d7 TextEndBattle dw Mansion3EndBattleText2 ; TextEndBattle
db $ff db $ff

View file

@ -51,7 +51,7 @@ Mansion4Script_Switches: ; 52420 (14:6420)
xor a xor a
ld [hJoyHeld], a ld [hJoyHeld], a
ld a, $9 ld a, $9
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a
jp DisplayTextID jp DisplayTextID
Mansion4ScriptPointers: ; 52430 (14:6430) Mansion4ScriptPointers: ; 52430 (14:6430)
@ -75,19 +75,19 @@ Mansion4TrainerHeader0: ; 52448 (14:6448)
db $1 ; flag's bit db $1 ; flag's bit
db ($0 << 4) ; trainer's view range db ($0 << 4) ; trainer's view range
dw wd84b ; flag's byte dw wd84b ; flag's byte
dw Mansion4BattleText1 ; 0x6475 TextBeforeBattle dw Mansion4BattleText1 ; TextBeforeBattle
dw Mansion4AfterBattleText1 ; 0x647f TextAfterBattle dw Mansion4AfterBattleText1 ; TextAfterBattle
dw Mansion4EndBattleText1 ; 0x647a TextEndBattle dw Mansion4EndBattleText1 ; TextEndBattle
dw Mansion4EndBattleText1 ; 0x647a TextEndBattle dw Mansion4EndBattleText1 ; TextEndBattle
Mansion4TrainerHeader2: ; 52454 (14:6454) Mansion4TrainerHeader2: ; 52454 (14:6454)
db $2 ; flag's bit db $2 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd84b ; flag's byte dw wd84b ; flag's byte
dw Mansion4BattleText2 ; 0x6484 TextBeforeBattle dw Mansion4BattleText2 ; TextBeforeBattle
dw Mansion4AfterBattleText2 ; 0x648e TextAfterBattle dw Mansion4AfterBattleText2 ; TextAfterBattle
dw Mansion4EndBattleText2 ; 0x6489 TextEndBattle dw Mansion4EndBattleText2 ; TextEndBattle
dw Mansion4EndBattleText2 ; 0x6489 TextEndBattle dw Mansion4EndBattleText2 ; TextEndBattle
db $ff db $ff

View file

@ -33,64 +33,64 @@ MtMoon1TrainerHeader0: ; 499fd (12:59fd)
db $1 ; flag's bit db $1 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd7f5 ; flag's byte dw wd7f5 ; flag's byte
dw MtMoon1BattleText2 ; 0x5a98 TextBeforeBattle dw MtMoon1BattleText2 ; TextBeforeBattle
dw MtMoon1AfterBattleText2 ; 0x5aa2 TextAfterBattle dw MtMoon1AfterBattleText2 ; TextAfterBattle
dw MtMoon1EndBattleText2 ; 0x5a9d TextEndBattle dw MtMoon1EndBattleText2 ; TextEndBattle
dw MtMoon1EndBattleText2 ; 0x5a9d TextEndBattle dw MtMoon1EndBattleText2 ; TextEndBattle
MtMoon1TrainerHeader2: ; 49a09 (12:5a09) MtMoon1TrainerHeader2: ; 49a09 (12:5a09)
db $2 ; flag's bit db $2 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7f5 ; flag's byte dw wd7f5 ; flag's byte
dw MtMoon1BattleText3 ; 0x5aa7 TextBeforeBattle dw MtMoon1BattleText3 ; TextBeforeBattle
dw MtMoon1AfterBattleText3 ; 0x5ab1 TextAfterBattle dw MtMoon1AfterBattleText3 ; TextAfterBattle
dw MtMoon1EndBattleText3 ; 0x5aac TextEndBattle dw MtMoon1EndBattleText3 ; TextEndBattle
dw MtMoon1EndBattleText3 ; 0x5aac TextEndBattle dw MtMoon1EndBattleText3 ; TextEndBattle
MtMoon1TrainerHeader3: ; 49a15 (12:5a15) MtMoon1TrainerHeader3: ; 49a15 (12:5a15)
db $3 ; flag's bit db $3 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7f5 ; flag's byte dw wd7f5 ; flag's byte
dw MtMoon1BattleText4 ; 0x5ab6 TextBeforeBattle dw MtMoon1BattleText4 ; TextBeforeBattle
dw MtMoon1AfterBattleText4 ; 0x5ac0 TextAfterBattle dw MtMoon1AfterBattleText4 ; TextAfterBattle
dw MtMoon1EndBattleText4 ; 0x5abb TextEndBattle dw MtMoon1EndBattleText4 ; TextEndBattle
dw MtMoon1EndBattleText4 ; 0x5abb TextEndBattle dw MtMoon1EndBattleText4 ; TextEndBattle
MtMoon1TrainerHeader4: ; 49a21 (12:5a21) MtMoon1TrainerHeader4: ; 49a21 (12:5a21)
db $4 ; flag's bit db $4 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7f5 ; flag's byte dw wd7f5 ; flag's byte
dw MtMoon1BattleText5 ; 0x5ac5 TextBeforeBattle dw MtMoon1BattleText5 ; TextBeforeBattle
dw MtMoon1AfterBattleText5 ; 0x5acf TextAfterBattle dw MtMoon1AfterBattleText5 ; TextAfterBattle
dw MtMoon1EndBattleText5 ; 0x5aca TextEndBattle dw MtMoon1EndBattleText5 ; TextEndBattle
dw MtMoon1EndBattleText5 ; 0x5aca TextEndBattle dw MtMoon1EndBattleText5 ; TextEndBattle
MtMoon1TrainerHeader5: ; 49a2d (12:5a2d) MtMoon1TrainerHeader5: ; 49a2d (12:5a2d)
db $5 ; flag's bit db $5 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7f5 ; flag's byte dw wd7f5 ; flag's byte
dw MtMoon1BattleText6 ; 0x5ad4 TextBeforeBattle dw MtMoon1BattleText6 ; TextBeforeBattle
dw MtMoon1AfterBattleText6 ; 0x5ade TextAfterBattle dw MtMoon1AfterBattleText6 ; TextAfterBattle
dw MtMoon1EndBattleText6 ; 0x5ad9 TextEndBattle dw MtMoon1EndBattleText6 ; TextEndBattle
dw MtMoon1EndBattleText6 ; 0x5ad9 TextEndBattle dw MtMoon1EndBattleText6 ; TextEndBattle
MtMoon1TrainerHeader6: ; 49a39 (12:5a39) MtMoon1TrainerHeader6: ; 49a39 (12:5a39)
db $6 ; flag's bit db $6 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7f5 ; flag's byte dw wd7f5 ; flag's byte
dw MtMoon1BattleText7 ; 0x5ae3 TextBeforeBattle dw MtMoon1BattleText7 ; TextBeforeBattle
dw MtMoon1AfterBattleText7 ; 0x5aed TextAfterBattle dw MtMoon1AfterBattleText7 ; TextAfterBattle
dw MtMoon1EndBattleText7 ; 0x5ae8 TextEndBattle dw MtMoon1EndBattleText7 ; TextEndBattle
dw MtMoon1EndBattleText7 ; 0x5ae8 TextEndBattle dw MtMoon1EndBattleText7 ; TextEndBattle
MtMoon1TrainerHeader7: ; 49a45 (12:5a45) MtMoon1TrainerHeader7: ; 49a45 (12:5a45)
db $7 ; flag's bit db $7 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7f5 ; flag's byte dw wd7f5 ; flag's byte
dw MtMoon1BattleText8 ; 0x5af2 TextBeforeBattle dw MtMoon1BattleText8 ; TextBeforeBattle
dw MtMoon1AfterBattleText8 ; 0x5afc TextAfterBattle dw MtMoon1AfterBattleText8 ; TextAfterBattle
dw MtMoon1EndBattleText8 ; 0x5af7 TextEndBattle dw MtMoon1EndBattleText8 ; TextEndBattle
dw MtMoon1EndBattleText8 ; 0x5af7 TextEndBattle dw MtMoon1EndBattleText8 ; TextEndBattle
db $ff db $ff

View file

@ -1,6 +1,6 @@
MtMoon3Script: ; 49d0b (12:5d0b) MtMoon3Script: ; 49d0b (12:5d0b)
call EnableAutoTextBoxDrawing call EnableAutoTextBoxDrawing
ld hl, MtMoon3TrainerHeader0 ; $5e48 ld hl, MtMoon3TrainerHeader0
ld de, MtMoon3ScriptPointers ld de, MtMoon3ScriptPointers
ld a, [W_MTMOON3CURSCRIPT] ld a, [W_MTMOON3CURSCRIPT]
call ExecuteCurMapScriptInTable call ExecuteCurMapScriptInTable
@ -10,7 +10,7 @@ MtMoon3Script: ; 49d0b (12:5d0b)
ret z ret z
ld hl, CoordsData_49d37 ld hl, CoordsData_49d37
call ArePlayerCoordsInArray call ArePlayerCoordsInArray
jr nc, .asm_49d31 ; 0x49d29 $6 jr nc, .asm_49d31
ld hl, wd72e ld hl, wd72e
set 4, [hl] set 4, [hl]
ret ret
@ -57,16 +57,16 @@ MtMoon3Script0: ; 49d6f (12:5d6f)
ld a, [wd7f6] ld a, [wd7f6]
bit 1, a bit 1, a
jp nz, MtMoon3Script_49d91 jp nz, MtMoon3Script_49d91
ld a, [W_YCOORD] ; wd361 ld a, [W_YCOORD]
cp $8 cp $8
jp nz, MtMoon3Script_49d91 jp nz, MtMoon3Script_49d91
ld a, [W_XCOORD] ; wd362 ld a, [W_XCOORD]
cp $d cp $d
jp nz, MtMoon3Script_49d91 jp nz, MtMoon3Script_49d91
xor a xor a
ld [hJoyHeld], a ld [hJoyHeld], a
ld a, $1 ld a, $1
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a
jp DisplayTextID jp DisplayTextID
MtMoon3Script_49d91: ; 49d91 (12:5d91) MtMoon3Script_49d91: ; 49d91 (12:5d91)
@ -76,7 +76,7 @@ MtMoon3Script_49d91: ; 49d91 (12:5d91)
ret ret
MtMoon3Script3: ; 49d9a (12:5d9a) MtMoon3Script3: ; 49d9a (12:5d9a)
ld a, [W_ISINBATTLE] ; W_ISINBATTLE ld a, [W_ISINBATTLE]
cp $ff cp $ff
jp z, MtMoon3Script_49d58 jp z, MtMoon3Script_49d58
call UpdateSprites call UpdateSprites
@ -92,7 +92,7 @@ MtMoon3Script3: ; 49d9a (12:5d9a)
MtMoon3Script4: ; 49dba (12:5dba) MtMoon3Script4: ; 49dba (12:5dba)
ld a, $1 ld a, $1
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a
call SetSpriteMovementBytesToFF call SetSpriteMovementBytesToFF
ld hl, CoordsData_49dea ld hl, CoordsData_49dea
call ArePlayerCoordsInArray call ArePlayerCoordsInArray
@ -106,7 +106,7 @@ MtMoon3Script4: ; 49dba (12:5dba)
ld de, MovementData_49df8 ld de, MovementData_49df8
.asm_49dda .asm_49dda
ld a, $1 ld a, $1
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a
call MoveSprite call MoveSprite
ld a, $5 ld a, $5
ld [W_MTMOON3CURSCRIPT], a ld [W_MTMOON3CURSCRIPT], a
@ -140,7 +140,7 @@ MtMoon3Script5: ; 49dfb (12:5dfb)
ld a, $1 ld a, $1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld a, $a ld a, $a
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a
call DisplayTextID call DisplayTextID
ld a, [wd7f6] ld a, [wd7f6]
bit 6, a bit 6, a
@ -176,37 +176,37 @@ MtMoon3TrainerHeader0: ; 49e48 (12:5e48)
db $2 ; flag's bit db $2 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7f6 ; flag's byte dw wd7f6 ; flag's byte
dw MtMoon3BattleText2 ; 0x5f9f TextBeforeBattle dw MtMoon3BattleText2 ; TextBeforeBattle
dw MtMoon3AfterBattleText2 ; 0x5fa9 TextAfterBattle dw MtMoon3AfterBattleText2 ; TextAfterBattle
dw MtMoon3EndBattleText2 ; 0x5fa4 TextEndBattle dw MtMoon3EndBattleText2 ; TextEndBattle
dw MtMoon3EndBattleText2 ; 0x5fa4 TextEndBattle dw MtMoon3EndBattleText2 ; TextEndBattle
MtMoon3TrainerHeader2: ; 49e54 (12:5e54) MtMoon3TrainerHeader2: ; 49e54 (12:5e54)
db $3 ; flag's bit db $3 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7f6 ; flag's byte dw wd7f6 ; flag's byte
dw MtMoon3BattleText3 ; 0x5fae TextBeforeBattle dw MtMoon3BattleText3 ; TextBeforeBattle
dw MtMoon3AfterBattleText3 ; 0x5fb8 TextAfterBattle dw MtMoon3AfterBattleText3 ; TextAfterBattle
dw MtMoon3EndBattleText3 ; 0x5fb3 TextEndBattle dw MtMoon3EndBattleText3 ; TextEndBattle
dw MtMoon3EndBattleText3 ; 0x5fb3 TextEndBattle dw MtMoon3EndBattleText3 ; TextEndBattle
MtMoon3TrainerHeader3: ; 49e60 (12:5e60) MtMoon3TrainerHeader3: ; 49e60 (12:5e60)
db $4 ; flag's bit db $4 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7f6 ; flag's byte dw wd7f6 ; flag's byte
dw MtMoon3BattleText4 ; 0x5fbd TextBeforeBattle dw MtMoon3BattleText4 ; TextBeforeBattle
dw MtMoon3AfterBattleText4 ; 0x5fc7 TextAfterBattle dw MtMoon3AfterBattleText4 ; TextAfterBattle
dw MtMoon3EndBattleText4 ; 0x5fc2 TextEndBattle dw MtMoon3EndBattleText4 ; TextEndBattle
dw MtMoon3EndBattleText4 ; 0x5fc2 TextEndBattle dw MtMoon3EndBattleText4 ; TextEndBattle
MtMoon3TrainerHeader4: ; 49e6c (12:5e6c) MtMoon3TrainerHeader4: ; 49e6c (12:5e6c)
db $5 ; flag's bit db $5 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7f6 ; flag's byte dw wd7f6 ; flag's byte
dw MtMoon3BattleText5 ; 0x5fcc TextBeforeBattle dw MtMoon3BattleText5 ; TextBeforeBattle
dw MtMoon3AfterBattleText5 ; 0x5fd6 TextAfterBattle dw MtMoon3AfterBattleText5 ; TextAfterBattle
dw MtMoon3EndBattleText5 ; 0x5fd1 TextEndBattle dw MtMoon3EndBattleText5 ; TextEndBattle
dw MtMoon3EndBattleText5 ; 0x5fd1 TextEndBattle dw MtMoon3EndBattleText5 ; TextEndBattle
db $ff db $ff
@ -214,13 +214,13 @@ MtMoon3Text1: ; 49e79 (12:5e79)
db $08 ; asm db $08 ; asm
ld a, [wd7f6] ld a, [wd7f6]
bit 1, a bit 1, a
jr z, .asm_be1e0 ; 0x49e7f jr z, .asm_49e8d
and $c0 and $c0
jr nz, .asm_f8cd4 ; 0x49e83 jr nz, .asm_49eb8
ld hl, MtMoon3Text_49f8f ld hl, MtMoon3Text_49f8f
call PrintText call PrintText
jr .asm_f1fba ; 0x49e8b jr .asm_49ebe
.asm_be1e0 ; 0x49e8d .asm_49e8d
ld hl, MtMoon3Text_49f85 ld hl, MtMoon3Text_49f85
call PrintText call PrintText
ld hl, wd72d ld hl, wd72d
@ -236,11 +236,11 @@ MtMoon3Text1: ; 49e79 (12:5e79)
ld a, $3 ld a, $3
ld [W_MTMOON3CURSCRIPT], a ld [W_MTMOON3CURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
jr .asm_f1fba ; 0x49eb6 jr .asm_49ebe
.asm_f8cd4 ; 0x49eb8 .asm_49eb8
ld hl, MtMoon3Text_49f94 ld hl, MtMoon3Text_49f94
call PrintText call PrintText
.asm_f1fba ; 0x49ebe .asm_49ebe
jp TextScriptEnd jp TextScriptEnd
MtMoon3Text2: ; 49ec1 (12:5ec1) MtMoon3Text2: ; 49ec1 (12:5ec1)
@ -263,7 +263,7 @@ MtMoon3Text4: ; 49ed5 (12:5ed5)
MtMoon3Text5: ; 49edf (12:5edf) MtMoon3Text5: ; 49edf (12:5edf)
db $08 ; asm db $08 ; asm
ld hl, MtMoon3TrainerHeader4 ; $5e6c ld hl, MtMoon3TrainerHeader4
call TalkToTrainer call TalkToTrainer
jp TextScriptEnd jp TextScriptEnd
@ -276,7 +276,7 @@ MtMoon3Text6: ; 49ee9 (12:5ee9)
call YesNoChoice call YesNoChoice
ld a, [wCurrentMenuItem] ld a, [wCurrentMenuItem]
and a and a
jr nz, .asm_1fa5e ; 0x49efc jr nz, .asm_49f21
ld bc,(DOME_FOSSIL << 8) | 1 ld bc,(DOME_FOSSIL << 8) | 1
call GiveItem call GiveItem
jp nc, MtMoon3Script_49f76 jp nc, MtMoon3Script_49f76
@ -289,7 +289,7 @@ MtMoon3Text6: ; 49ee9 (12:5ee9)
ld a, $4 ld a, $4
ld [W_MTMOON3CURSCRIPT], a ld [W_MTMOON3CURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
.asm_1fa5e ; 0x49f21 .asm_49f21
jp TextScriptEnd jp TextScriptEnd
MtMoon3Text_49f24: ; 49f24 (12:5f24) MtMoon3Text_49f24: ; 49f24 (12:5f24)
@ -305,7 +305,7 @@ MtMoon3Text7: ; 49f29 (12:5f29)
call YesNoChoice call YesNoChoice
ld a, [wCurrentMenuItem] ld a, [wCurrentMenuItem]
and a and a
jr nz, .asm_8e988 ; 0x49f3c jr nz, .asm_49f61
ld bc, (HELIX_FOSSIL << 8) | 1 ld bc, (HELIX_FOSSIL << 8) | 1
call GiveItem call GiveItem
jp nc, MtMoon3Script_49f76 jp nc, MtMoon3Script_49f76
@ -318,7 +318,7 @@ MtMoon3Text7: ; 49f29 (12:5f29)
ld a, $4 ld a, $4
ld [W_MTMOON3CURSCRIPT], a ld [W_MTMOON3CURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
.asm_8e988 ; 0x49f61 .asm_49f61
jp TextScriptEnd jp TextScriptEnd
MtMoon3Text_49f64: ; 49f64 (12:5f64) MtMoon3Text_49f64: ; 49f64 (12:5f64)
@ -330,7 +330,7 @@ MtMoon3Script_49f69: ; 49f69 (12:5f69)
jp PrintText jp PrintText
MtMoon3Text_49f6f: ; 49f6f (12:5f6f) MtMoon3Text_49f6f: ; 49f6f (12:5f6f)
TX_FAR _MtMoon3Text_49f6f ; 0x80995 TX_FAR _MtMoon3Text_49f6f
db $11, $d, "@" db $11, $d, "@"
MtMoon3Script_49f76: ; 49f76 (12:5f76) MtMoon3Script_49f76: ; 49f76 (12:5f76)
@ -339,7 +339,7 @@ MtMoon3Script_49f76: ; 49f76 (12:5f76)
jp TextScriptEnd jp TextScriptEnd
MtMoon3Text_49f7f: ; 49f7f (12:5f7f) MtMoon3Text_49f7f: ; 49f7f (12:5f7f)
TX_FAR _MtMoon3Text_49f7f ; 0x809a8 TX_FAR _MtMoon3Text_49f7f
db $d, "@" db $d, "@"
MtMoon3Text_49f85: ; 49f85 (12:5f85) MtMoon3Text_49f85: ; 49f85 (12:5f85)

View file

@ -40,13 +40,13 @@ MtMoonPokecenterText4: ; 492ec (12:52ec)
ld a, $5 ld a, $5
ldh [$a0], a ldh [$a0], a
call HasEnoughMoney call HasEnoughMoney
jr nc, .asm_faa09 ; 0x49317 jr nc, .asm_faa09
ld hl, MtMoonPokecenterText_49366 ld hl, MtMoonPokecenterText_49366
jr .asm_49356 ; 0x4931c jr .asm_49356
.asm_faa09 ; 0x4931e .asm_faa09
ld bc,(MAGIKARP << 8) | 5 ld bc,(MAGIKARP << 8) | 5
call GivePokemon call GivePokemon
jr nc, .asm_49359 ; 0x49324 jr nc, .asm_49359
xor a xor a
ld [wWhichTrade], a ld [wWhichTrade], a
ld [wTrainerFacingDirection], a ld [wTrainerFacingDirection], a
@ -61,15 +61,15 @@ MtMoonPokecenterText4: ; 492ec (12:52ec)
call DisplayTextBoxID call DisplayTextBoxID
ld hl, wd7c6 ld hl, wd7c6
set 7, [hl] set 7, [hl]
jr .asm_49359 ; 0x4934c jr .asm_49359
.asm_4934e ; 0x4934e .asm_4934e
ld hl, MtMoonPokecenterText_49361 ld hl, MtMoonPokecenterText_49361
jr .asm_49356 ; 0x49351 jr .asm_49356
.asm_49353 ; 0x49353 .asm_49353
ld hl, MtMoonPokecenterText_4936b ld hl, MtMoonPokecenterText_4936b
.asm_49356 ; 0x49356 .asm_49356
call PrintText call PrintText
.asm_49359 ; 0x49359 .asm_49359
jp TextScriptEnd jp TextScriptEnd
MtMoonPokecenterText_4935c: ; 4935c (12:535c) MtMoonPokecenterText_4935c: ; 4935c (12:535c)

View file

@ -17,7 +17,7 @@ Museum1FScript0: ; 5c10d (17:410d)
ret nz ret nz
ld a, [W_XCOORD] ld a, [W_XCOORD]
cp $9 cp $9
jr z, .asm_5c120 ; 0x5c118 $6 jr z, .asm_5c120
ld a, [W_XCOORD] ld a, [W_XCOORD]
cp $a cp $a
ret nz ret nz
@ -59,7 +59,7 @@ Museum1FText1: ; 5c135 (17:4135)
jr nz, .asm_31a16 jr nz, .asm_31a16
ld hl, Museum1FText_5c23d ld hl, Museum1FText_5c23d
call PrintText call PrintText
jp asm_d1145 jp Museum1FScriptEnd
.asm_b8709 .asm_b8709
ld a, [wd754] ld a, [wd754]
bit 0, a bit 0, a
@ -67,7 +67,7 @@ Museum1FText1: ; 5c135 (17:4135)
.asm_31a16 .asm_31a16
ld hl, Museum1FText_5c242 ld hl, Museum1FText_5c242
call PrintText call PrintText
jp asm_d1145 jp Museum1FScriptEnd
.asm_3ded4 .asm_3ded4
ld a, $13 ld a, $13
ld [wTextBoxID], a ld [wTextBoxID], a
@ -112,7 +112,7 @@ Museum1FText1: ; 5c135 (17:4135)
call WaitForSoundToFinish call WaitForSoundToFinish
jr .asm_0b094 jr .asm_0b094
.asm_de133 .asm_de133
ld hl, Museum1FText_5c21a ; $421a ld hl, Museum1FText_5c21a
call PrintText call PrintText
ld a, $1 ld a, $1
ld [wSimulatedJoypadStatesIndex], a ld [wSimulatedJoypadStatesIndex], a
@ -120,11 +120,11 @@ Museum1FText1: ; 5c135 (17:4135)
ld [wSimulatedJoypadStatesEnd], a ld [wSimulatedJoypadStatesEnd], a
call StartSimulatingJoypadStates call StartSimulatingJoypadStates
call UpdateSprites call UpdateSprites
jr asm_d1145 jr Museum1FScriptEnd
.asm_0b094 .asm_0b094
ld a, $1 ld a, $1
ld [W_MUSEUM1FCURSCRIPT], a ld [W_MUSEUM1FCURSCRIPT], a
jr asm_d1145 jr Museum1FScriptEnd
Museum1FScript_5c1f9: ; 5c1f9 (17:41f9) Museum1FScript_5c1f9: ; 5c1f9 (17:41f9)
ld hl, Museum1FText_5c22e ld hl, Museum1FText_5c22e
@ -135,11 +135,11 @@ Museum1FScript_5c1f9: ; 5c1f9 (17:41f9)
jr nz, .asm_d1144 jr nz, .asm_d1144
ld hl, Museum1FText_5c233 ld hl, Museum1FText_5c233
call PrintText call PrintText
jr asm_d1145 jr Museum1FScriptEnd
.asm_d1144 .asm_d1144
ld hl, Museum1FText_5c238 ld hl, Museum1FText_5c238
call PrintText call PrintText
asm_d1145: ; 5c217 (17:4217) Museum1FScriptEnd: ; 5c217 (17:4217)
jp TextScriptEnd jp TextScriptEnd
Museum1FText_5c21a: ; 5c21a (17:421a) Museum1FText_5c21a: ; 5c21a (17:421a)
@ -192,7 +192,7 @@ Museum1FText3: ; 5c256 (17:4256)
db $08 ; asm db $08 ; asm
ld a, [wd754] ld a, [wd754]
bit 1, a bit 1, a
jr nz, .asm_16599 ; 0x5c25c jr nz, .asm_5c285
ld hl, Museum1FText_5c28e ld hl, Museum1FText_5c28e
call PrintText call PrintText
ld bc, (OLD_AMBER << 8) | 1 ld bc, (OLD_AMBER << 8) | 1
@ -204,13 +204,13 @@ Museum1FText3: ; 5c256 (17:4256)
ld [wcc4d], a ld [wcc4d], a
predef HideObject predef HideObject
ld hl, ReceivedOldAmberText ld hl, ReceivedOldAmberText
jr .asm_52e0f ; 0x5c27e jr .asm_5c288
.BagFull .BagFull
ld hl, Museum1FText_5c29e ld hl, Museum1FText_5c29e
jr .asm_52e0f ; 0x5c283 jr .asm_5c288
.asm_16599 ; 0x5c285 .asm_5c285
ld hl, Museum1FText_5c299 ld hl, Museum1FText_5c299
.asm_52e0f ; 0x5c288 .asm_5c288
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd

View file

@ -16,7 +16,7 @@ NameRaterScript_1da20: ; 1da20 (7:5a20)
ld de, wPlayerName ld de, wPlayerName
ld c, $b ld c, $b
call .asm_1da47 call .asm_1da47
jr c, .asm_1da52 ; 0x1da34 $1c jr c, .asm_1da52
ld hl, wPartyMon1OTID ld hl, wPartyMon1OTID
ld bc, $002c ld bc, $002c
ld a, [wWhichPokemon] ld a, [wWhichPokemon]
@ -26,11 +26,11 @@ NameRaterScript_1da20: ; 1da20 (7:5a20)
.asm_1da47 .asm_1da47
ld a, [de] ld a, [de]
cp [hl] cp [hl]
jr nz, .asm_1da52 ; 0x1da49 $7 jr nz, .asm_1da52
inc hl inc hl
inc de inc de
dec c dec c
jr nz, .asm_1da47 ; 0x1da4e $f7 jr nz, .asm_1da47
and a and a
ret ret
.asm_1da52 .asm_1da52
@ -45,7 +45,7 @@ NameRaterText1: ; 1da56 (7:5a56)
call SaveScreenTilesToBuffer2 call SaveScreenTilesToBuffer2
ld hl, NameRaterText_1dab3 ld hl, NameRaterText_1dab3
call NameRaterScript_1da15 call NameRaterScript_1da15
jr nz, .asm_1daae ; 0x1da60 $4c jr nz, .asm_1daae
ld hl, NameRaterText_1dab8 ld hl, NameRaterText_1dab8
call PrintText call PrintText
xor a xor a
@ -58,25 +58,25 @@ NameRaterText1: ; 1da56 (7:5a56)
call RestoreScreenTilesAndReloadTilePatterns call RestoreScreenTilesAndReloadTilePatterns
call LoadGBPal call LoadGBPal
pop af pop af
jr c, .asm_1daae ; 0x1da80 $2c jr c, .asm_1daae
call GetPartyMonName2 call GetPartyMonName2
call NameRaterScript_1da20 call NameRaterScript_1da20
ld hl, NameRaterText_1dad1 ld hl, NameRaterText_1dad1
jr c, .asm_1daa8 ; 0x1da8b $1b jr c, .asm_1daa8
ld hl, NameRaterText_1dabd ld hl, NameRaterText_1dabd
call NameRaterScript_1da15 call NameRaterScript_1da15
jr nz, .asm_1daae ; 0x1da93 $19 jr nz, .asm_1daae
ld hl, NameRaterText_1dac2 ld hl, NameRaterText_1dac2
call PrintText call PrintText
callba Func_655c callba Func_655c
jr c, .asm_1daae ; 0x1daa3 $9 jr c, .asm_1daae
ld hl, NameRaterText_1dac7 ld hl, NameRaterText_1dac7
.asm_1daa8 .asm_1daa8
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd
.asm_1daae .asm_1daae
ld hl, NameRaterText_1dacc ld hl, NameRaterText_1dacc
jr .asm_1daa8 ; 0x1dab1 $f5 jr .asm_1daa8
NameRaterText_1dab3: ; 1dab3 (7:5ab3) NameRaterText_1dab3: ; 1dab3 (7:5ab3)
TX_FAR _NameRaterText_1dab3 TX_FAR _NameRaterText_1dab3

View file

@ -194,17 +194,17 @@ OaksLabScript7: ; 1cc72 (7:4c72)
OaksLabScript8: ; 1cc80 (7:4c80) OaksLabScript8: ; 1cc80 (7:4c80)
ld a, [W_PLAYERSTARTER] ld a, [W_PLAYERSTARTER]
cp STARTER1 cp STARTER1
jr z, .Charmander ; 0x1cc85 $6 jr z, .Charmander
cp STARTER2 cp STARTER2
jr z, .Squirtle ; 0x1cc89 $1d jr z, .Squirtle
jr .Bulbasaur ; 0x1cc8b $38 jr .Bulbasaur
.Charmander .Charmander
ld de, .MiddleBallMovement1 ld de, .MiddleBallMovement1
ld a, [W_YCOORD] ld a, [W_YCOORD]
cp $4 ; is the player standing below the table? cp $4 ; is the player standing below the table?
jr z, .asm_1ccf3 ; 0x1cc95 $5c jr z, .asm_1ccf3
ld de, .MiddleBallMovement2 ld de, .MiddleBallMovement2
jr .asm_1ccf3 ; 0x1cc9a $57 jr .asm_1ccf3
.MiddleBallMovement1 .MiddleBallMovement1
db 0,0,$C0,$C0,$C0,$40,$FF db 0,0,$C0,$C0,$C0,$40,$FF
@ -215,9 +215,9 @@ OaksLabScript8: ; 1cc80 (7:4c80)
ld de, .RightBallMovement1 ld de, .RightBallMovement1
ld a, [W_YCOORD] ld a, [W_YCOORD]
cp $4 ; is the player standing below the table? cp $4 ; is the player standing below the table?
jr z, .asm_1ccf3 ; 0x1ccb0 $41 jr z, .asm_1ccf3
ld de, .RightBallMovement2 ld de, .RightBallMovement2
jr .asm_1ccf3 ; 0x1ccb5 $3c jr .asm_1ccf3
.RightBallMovement1 .RightBallMovement1
db 0,0,$C0,$C0,$C0,$C0,$40,$FF db 0,0,$C0,$C0,$C0,$C0,$40,$FF
@ -228,7 +228,7 @@ OaksLabScript8: ; 1cc80 (7:4c80)
ld de, .LeftBallMovement1 ld de, .LeftBallMovement1
ld a, [W_XCOORD] ld a, [W_XCOORD]
cp $9 ; is the player standing to the right of the table? cp $9 ; is the player standing to the right of the table?
jr nz, .asm_1ccf3 ; 0x1cccd $24 jr nz, .asm_1ccf3
push hl push hl
ld a, $1 ld a, $1
ld [H_SPRITEINDEX], a ld [H_SPRITEINDEX], a
@ -247,7 +247,7 @@ OaksLabScript8: ; 1cc80 (7:4c80)
ld [hl], $9 ld [hl], $9
ld de, .LeftBallMovement2 ; the rival is not currently onscreen, so account for that ld de, .LeftBallMovement2 ; the rival is not currently onscreen, so account for that
pop hl pop hl
jr .asm_1ccf3 ; 0x1cced $4 jr .asm_1ccf3
.LeftBallMovement1 .LeftBallMovement1
db $00,$C0 ; not yet terminated! db $00,$C0 ; not yet terminated!
@ -279,14 +279,14 @@ OaksLabScript9: ; 1cd00 (7:4d00)
call DisplayTextID call DisplayTextID
ld a, [wTrainerEngageDistance] ld a, [wTrainerEngageDistance]
cp $2 cp $2
jr nz, .asm_1cd28 ; 0x1cd22 $4 jr nz, .asm_1cd28
ld a, HS_STARTER_BALL_1 ld a, HS_STARTER_BALL_1
jr .asm_1cd32 ; 0x1cd26 $a jr .asm_1cd32
.asm_1cd28 .asm_1cd28
cp $3 cp $3
jr nz, .asm_1cd30 ; 0x1cd2a $4 jr nz, .asm_1cd30
ld a, HS_STARTER_BALL_2 ld a, HS_STARTER_BALL_2
jr .asm_1cd32 ; 0x1cd2e $2 jr .asm_1cd32
.asm_1cd30 .asm_1cd30
ld a, HS_STARTER_BALL_3 ld a, HS_STARTER_BALL_3
.asm_1cd32 .asm_1cd32
@ -328,7 +328,7 @@ OaksLabScript10: ; 1cd6d (7:4d6d)
ld [wd528], a ld [wd528], a
ld c, BANK(Music_MeetRival) ld c, BANK(Music_MeetRival)
ld a, MUSIC_MEET_RIVAL ld a, MUSIC_MEET_RIVAL
call PlayMusic ; play music call PlayMusic
ld a, $f ld a, $f
ld [$ff8c], a ld [$ff8c], a
call DisplayTextID call DisplayTextID
@ -361,14 +361,14 @@ OaksLabScript11: ; 1cdb9 (7:4db9)
ld [W_CUROPPONENT], a ld [W_CUROPPONENT], a
ld a, [W_RIVALSTARTER] ld a, [W_RIVALSTARTER]
cp STARTER2 cp STARTER2
jr nz, .NotSquirtle ; 0x1cdc9 $4 jr nz, .NotSquirtle
ld a, $1 ld a, $1
jr .done ; 0x1cdcd $a jr .done
.NotSquirtle .NotSquirtle
cp STARTER3 cp STARTER3
jr nz, .Charmander ; 0x1cdd1 $4 jr nz, .Charmander
ld a, $2 ld a, $2
jr .done ; 0x1cdd5 $2 jr .done
.Charmander .Charmander
ld a, $3 ld a, $3
.done .done
@ -413,7 +413,7 @@ OaksLabScript12: ; 1ce03 (7:4e03)
ret ret
OaksLabScript13: ; 1ce32 (7:4e32) OaksLabScript13: ; 1ce32 (7:4e32)
ld c, $14 ld c, 20
call DelayFrames call DelayFrames
ld a, $10 ld a, $10
ld [$ff8c], a ld [$ff8c], a
@ -426,9 +426,9 @@ OaksLabScript13: ; 1ce32 (7:4e32)
ld a, [W_XCOORD] ld a, [W_XCOORD]
cp $4 cp $4
; move left or right depending on where the player is standing ; move left or right depending on where the player is standing
jr nz, .asm_1ce5b ; 0x1ce55 $4 jr nz, .asm_1ce5b
ld a, $c0 ld a, $c0
jr .asm_1ce5d ; 0x1ce59 $2 jr .asm_1ce5d
.asm_1ce5b .asm_1ce5b
ld a, $80 ld a, $80
.asm_1ce5d .asm_1ce5d
@ -444,7 +444,7 @@ OaksLabScript13: ; 1ce32 (7:4e32)
OaksLabScript14: ; 1ce6d (7:4e6d) OaksLabScript14: ; 1ce6d (7:4e6d)
ld a, [wd730] ld a, [wd730]
bit 0, a bit 0, a
jr nz, .asm_1ce8c ; 0x1ce72 $18 jr nz, .asm_1ce8c
ld a, HS_OAKS_LAB_RIVAL ld a, HS_OAKS_LAB_RIVAL
ld [wcc4d], a ld [wcc4d], a
predef HideObject predef HideObject
@ -453,21 +453,21 @@ OaksLabScript14: ; 1ce6d (7:4e6d)
call PlayDefaultMusic ; reset to map music call PlayDefaultMusic ; reset to map music
ld a, $12 ld a, $12
ld [W_OAKSLABCURSCRIPT], a ld [W_OAKSLABCURSCRIPT], a
jr .done ; 0x1ce8a $23 jr .done
.asm_1ce8c .asm_1ce8c
ld a, [wcf0f] ld a, [wcf0f]
cp $5 cp $5
jr nz, .asm_1cea8 ; 0x1ce91 $15 jr nz, .asm_1cea8
ld a, [W_XCOORD] ld a, [W_XCOORD]
cp $4 cp $4
jr nz, .asm_1cea1 ; 0x1ce98 $7 jr nz, .asm_1cea1
ld a, $c ld a, $c
ld [wSpriteStateData1 + 9], a ld [wSpriteStateData1 + 9], a
jr .done ; 0x1ce9f $e jr .done
.asm_1cea1 .asm_1cea1
ld a, $8 ld a, $8
ld [wSpriteStateData1 + 9], a ld [wSpriteStateData1 + 9], a
jr .done ; 0x1cea6 $7 jr .done
.asm_1cea8 .asm_1cea8
cp $4 cp $4
ret nz ret nz
@ -508,7 +508,7 @@ OaksLabScript15: ; 1ceb0 (7:4eb0)
ld [W_OAKSLABCURSCRIPT], a ld [W_OAKSLABCURSCRIPT], a
ret ret
OaksLabScript_1cefd ; 1cefd (7:4efd) OaksLabScript_1cefd: ; 1cefd (7:4efd)
ld a, $1 ld a, $1
ld [H_SPRITEINDEX], a ld [H_SPRITEINDEX], a
ld a, $4 ld a, $4
@ -631,10 +631,10 @@ OaksLabScript_1d00a: ; 1d00a (7:500a)
cp $ff cp $ff
ret z ret z
cp OAKS_PARCEL cp OAKS_PARCEL
jr z, .GotParcel ; 0x1d016 $4 jr z, .GotParcel
inc hl inc hl
inc c inc c
jr .asm_1d010 ; 0x1d01a $f4 jr .asm_1d010
.GotParcel .GotParcel
ld hl, wNumBagItems ld hl, wNumBagItems
ld a, c ld a, c
@ -650,29 +650,29 @@ OaksLabScript_1d02b: ; 1d02b (7:502b)
ld [$ffee], a ld [$ffee], a
ld a, [W_YCOORD] ld a, [W_YCOORD]
cp $3 cp $3
jr nz, .asm_1d045 ; 0x1d038 $b jr nz, .asm_1d045
ld a, $4 ld a, $4
ld [wNPCMovementDirections2Index], a ld [wNPCMovementDirections2Index], a
ld a, $30 ld a, $30
ld b, $b ld b, $b
jr .asm_1d068 ; 0x1d043 $23 jr .asm_1d068
.asm_1d045 .asm_1d045
cp $1 cp $1
jr nz, .asm_1d054 ; 0x1d047 $b jr nz, .asm_1d054
ld a, $2 ld a, $2
ld [wNPCMovementDirections2Index], a ld [wNPCMovementDirections2Index], a
ld a, $30 ld a, $30
ld b, $9 ld b, $9
jr .asm_1d068 ; 0x1d052 $14 jr .asm_1d068
.asm_1d054 .asm_1d054
ld a, $3 ld a, $3
ld [wNPCMovementDirections2Index], a ld [wNPCMovementDirections2Index], a
ld b, $a ld b, $a
ld a, [W_XCOORD] ld a, [W_XCOORD]
cp $4 cp $4
jr nz, .asm_1d066 ; 0x1d060 $4 jr nz, .asm_1d066
ld a, $40 ld a, $40
jr .asm_1d068 ; 0x1d064 $2 jr .asm_1d068
.asm_1d066 .asm_1d066
ld a, $20 ld a, $20
.asm_1d068 .asm_1d068
@ -685,7 +685,7 @@ OaksLabScript_1d02b: ; 1d02b (7:502b)
ret ret
OaksLabScript_1d076: ; 1d076 (7:5076) OaksLabScript_1d076: ; 1d076 (7:5076)
ld hl, OaksLabTextPointers + $36 ; $50b8 ; starts at OaksLabText28 ld hl, OaksLabTextPointers + $36 ; starts at OaksLabText28
ld a, l ld a, l
ld [W_MAPTEXTPTR], a ld [W_MAPTEXTPTR], a
ld a, h ld a, h
@ -737,20 +737,20 @@ OaksLabText1: ; 1d0ce (7:50ce)
db $08 ; asm db $08 ; asm
ld a, [wd74b] ld a, [wd74b]
bit 0, a bit 0, a
jr nz, .asm_1d0de ; 0x1d0d4 jr nz, .asm_1d0de
ld hl, OaksLabGaryText1 ld hl, OaksLabGaryText1
call PrintText call PrintText
jr .asm_1d0f0 ; 0x1d0dc jr .asm_1d0f0
.asm_1d0de ; 0x1d0de .asm_1d0de
bit 2, a bit 2, a
jr nz, .asm_1d0ea ; 0x1d0e0 jr nz, .asm_1d0ea
ld hl, OaksLabText40 ld hl, OaksLabText40
call PrintText call PrintText
jr .asm_1d0f0 ; 0x1d0e8 jr .asm_1d0f0
.asm_1d0ea ; 0x1d0ea .asm_1d0ea
ld hl, OaksLabText41 ld hl, OaksLabText41
call PrintText call PrintText
.asm_1d0f0 ; 0x1d0f0 .asm_1d0f0
jp TextScriptEnd jp TextScriptEnd
OaksLabGaryText1: ; 1d0f3 (7:50f3) OaksLabGaryText1: ; 1d0f3 (7:50f3)
@ -774,7 +774,7 @@ OaksLabText2: ; 1d102 (7:5102)
ld [wTrainerEngageDistance], a ld [wTrainerEngageDistance], a
ld a, STARTER1 ld a, STARTER1
ld b, $2 ld b, $2
jr OaksLabScript_1d133 ; 0x1d111 $20 jr OaksLabScript_1d133
OaksLabText30: ; 1d113 (7:5113) OaksLabText30: ; 1d113 (7:5113)
OaksLabText3: ; 1d113 (7:5113) OaksLabText3: ; 1d113 (7:5113)
@ -785,7 +785,7 @@ OaksLabText3: ; 1d113 (7:5113)
ld [wTrainerEngageDistance], a ld [wTrainerEngageDistance], a
ld a, STARTER2 ld a, STARTER2
ld b, $3 ld b, $3
jr OaksLabScript_1d133 ; 0x1d122 $f jr OaksLabScript_1d133
OaksLabText31: ; 1d124 (7:5124) OaksLabText31: ; 1d124 (7:5124)
OaksLabText4: ; 1d124 (7:5124) OaksLabText4: ; 1d124 (7:5124)
@ -806,7 +806,7 @@ OaksLabScript_1d133: ; 1d133 (7:5133)
bit 2, a bit 2, a
jp nz, OaksLabScript_1d22d jp nz, OaksLabScript_1d22d
bit 1, a bit 1, a
jr nz, OaksLabScript_1d157 ; 0x1d147 $e jr nz, OaksLabScript_1d157
ld hl, OaksLabText39 ld hl, OaksLabText39
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd
@ -822,7 +822,6 @@ OaksLabScript_1d157: ; 1d157 (7:5157)
ld [$ff8b], a ld [$ff8b], a
call GetPointerWithinSpriteStateData1 call GetPointerWithinSpriteStateData1
ld [hl], $0 ld [hl], $0
; manually fixed some disassembler issues around here
ld a, $1 ld a, $1
ld [H_SPRITEINDEX], a ld [H_SPRITEINDEX], a
ld a, $9 ld a, $9
@ -835,7 +834,7 @@ OaksLabScript_1d157: ; 1d157 (7:5157)
ld hl, wd730 ld hl, wd730
res 6, [hl] res 6, [hl]
call ReloadMapData call ReloadMapData
ld c, $a ld c, 10
call DelayFrames call DelayFrames
ld a, [wSpriteIndex] ld a, [wSpriteIndex]
cp $2 cp $2
@ -844,7 +843,7 @@ OaksLabScript_1d157: ; 1d157 (7:5157)
jr z, OaksLabLookAtSquirtle jr z, OaksLabLookAtSquirtle
jr OaksLabLookAtBulbasaur jr OaksLabLookAtBulbasaur
OaksLabLookAtCharmander ; 0x1d195 OaksLabLookAtCharmander: ; 1d195 (7:5195)
ld hl, OaksLabCharmanderText ld hl, OaksLabCharmanderText
jr OaksLabMonChoiceMenu jr OaksLabMonChoiceMenu
OaksLabCharmanderText: ; 1d19a (7:519a) OaksLabCharmanderText: ; 1d19a (7:519a)
@ -879,17 +878,17 @@ OaksLabMonChoiceMenu: ; 1d1b3 (7:51b3)
call GetMonName call GetMonName
ld a, [wSpriteIndex] ld a, [wSpriteIndex]
cp $2 cp $2
jr nz, asm_1d1db ; 0x1d1d5 $4 jr nz, .asm_1d1db
ld a, HS_STARTER_BALL_1 ld a, HS_STARTER_BALL_1
jr asm_1d1e5 ; 0x1d1d9 $a jr .asm_1d1e5
asm_1d1db: ; 1d1db (7:51db) .asm_1d1db
cp $3 cp $3
jr nz, asm_1d1e3 ; 0x1d1dd $4 jr nz, .asm_1d1e3
ld a, HS_STARTER_BALL_2 ld a, HS_STARTER_BALL_2
jr asm_1d1e5 ; 0x1d1e1 $2 jr .asm_1d1e5
asm_1d1e3: ; 1d1e3 (7:51e3) .asm_1d1e3
ld a, HS_STARTER_BALL_3 ld a, HS_STARTER_BALL_3
asm_1d1e5: ; 1d1e5 (7:51e5) .asm_1d1e5
ld [wcc4d], a ld [wcc4d], a
predef HideObject predef HideObject
ld a, $1 ld a, $1
@ -942,77 +941,77 @@ OaksLabText5: ; 1d248 (7:5248)
db $08 ; asm db $08 ; asm
ld a, [wd747] ld a, [wd747]
bit 6, a bit 6, a
jr nz, .asm_50e81 ; 0x1d24e jr nz, .asm_1d266
ld hl, wPokedexOwned ld hl, wPokedexOwned
ld b, wPokedexOwnedEnd - wPokedexOwned ld b, wPokedexOwnedEnd - wPokedexOwned
call CountSetBits call CountSetBits
ld a, [wd11e] ld a, [wd11e]
cp $2 cp $2
jr c, .asm_b28b0 ; 0x1d25d jr c, .asm_1d279
ld a, [wd74b] ld a, [wd74b]
bit 5, a bit 5, a
jr z, .asm_b28b0 ; 0x1d264 jr z, .asm_1d279
.asm_50e81 ; 0x1d266 .asm_1d266
ld hl, OaksLabText_1d31d ld hl, OaksLabText_1d31d
call PrintText call PrintText
ld a, $1 ld a, $1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld [wDoNotWaitForButtonPressAfterDisplayingText], a
predef DisplayDexRating predef DisplayDexRating
jp .asm_0f042 jp .asm_1d2ed
.asm_b28b0 ; 0x1d279 .asm_1d279
ld b,POKE_BALL ld b,POKE_BALL
call IsItemInBag call IsItemInBag
jr nz, .asm_17c30 ; 0x1d27e jr nz, .asm_1d2e7
ld a, [wd7eb] ld a, [wd7eb]
bit 5, a bit 5, a
jr nz, .asm_f1adc ; 0x1d285 jr nz, .asm_1d2d0
ld a, [wd74b] ld a, [wd74b]
bit 5, a bit 5, a
jr nz, .asm_333a2 ; 0x1d28c jr nz, .asm_1d2c8
bit 3, a bit 3, a
jr nz, .asm_76269 ; 0x1d290 jr nz, .asm_1d2a9
ld a, [wd72e] ld a, [wd72e]
bit 3, a bit 3, a
jr nz, .asm_4a5e0 ; 0x1d297 jr nz, .asm_1d2a1
ld hl, OaksLabText_1d2f0 ld hl, OaksLabText_1d2f0
call PrintText call PrintText
jr .asm_0f042 ; 0x1d29f jr .asm_1d2ed
.asm_4a5e0 ; 0x1d2a1 .asm_1d2a1
ld hl, OaksLabText_1d2f5 ld hl, OaksLabText_1d2f5
call PrintText call PrintText
jr .asm_0f042 ; 0x1d2a7 jr .asm_1d2ed
.asm_76269 ; 0x1d2a9 .asm_1d2a9
ld b, OAKS_PARCEL ld b, OAKS_PARCEL
call IsItemInBag call IsItemInBag
jr nz, .asm_a8fcf ; 0x1d2ae jr nz, .asm_1d2b8
ld hl, OaksLabText_1d2fa ld hl, OaksLabText_1d2fa
call PrintText call PrintText
jr .asm_0f042 ; 0x1d2b6 jr .asm_1d2ed
.asm_a8fcf ; 0x1d2b8 .asm_1d2b8
ld hl, OaksLabDeliverParcelText ld hl, OaksLabDeliverParcelText
call PrintText call PrintText
call OaksLabScript_1d00a call OaksLabScript_1d00a
ld a, $f ld a, $f
ld [W_OAKSLABCURSCRIPT], a ld [W_OAKSLABCURSCRIPT], a
jr .asm_0f042 ; 0x1d2c6 jr .asm_1d2ed
.asm_333a2 ; 0x1d2c8 .asm_1d2c8
ld hl, OaksLabAroundWorldText ld hl, OaksLabAroundWorldText
call PrintText call PrintText
jr .asm_0f042 ; 0x1d2ce jr .asm_1d2ed
.asm_f1adc ; 0x1d2d0 .asm_1d2d0
ld hl, wd74b ld hl, wd74b
bit 4, [hl] bit 4, [hl]
set 4, [hl] set 4, [hl]
jr nz, .asm_17c30 ; 0x1d2d7 jr nz, .asm_1d2e7
ld bc, (POKE_BALL << 8) | 5 ld bc, (POKE_BALL << 8) | 5
call GiveItem call GiveItem
ld hl, OaksLabGivePokeballsText ld hl, OaksLabGivePokeballsText
call PrintText call PrintText
jr .asm_0f042 ; 0x1d2e5 jr .asm_1d2ed
.asm_17c30 ; 0x1d2e7 .asm_1d2e7
ld hl, OaksLabPleaseVisitText ld hl, OaksLabPleaseVisitText
call PrintText call PrintText
.asm_0f042 ; 0x1d2ed .asm_1d2ed
jp TextScriptEnd jp TextScriptEnd
OaksLabText_1d2f0: ; 1d2f0 (7:52f0) OaksLabText_1d2f0: ; 1d2f0 (7:52f0)

View file

@ -35,7 +35,7 @@ PalletTownScript0: ; 18e81 (6:4e81)
ld a, BANK(Music_MeetProfOak) ld a, BANK(Music_MeetProfOak)
ld c,a ; song bank ld c,a ; song bank
ld a, MUSIC_MEET_PROF_OAK ; “oak appears” music ld a, MUSIC_MEET_PROF_OAK ; “oak appears” music
call PlayMusic ; plays music call PlayMusic
ld a,$FC ld a,$FC
ld [wJoyIgnore],a ld [wJoyIgnore],a
ld hl,wd74b ld hl,wd74b

View file

@ -72,7 +72,7 @@ PewterCityScript1: ; 19280 (6:5280)
call SetSpritePosition1 call SetSpritePosition1
ld a, $3 ld a, $3
ld [$ff8c], a ld [$ff8c], a
ld de, MovementData_PewterMuseumGuyExit ; $52ce ld de, MovementData_PewterMuseumGuyExit
call MoveSprite call MoveSprite
ld a, $2 ld a, $2
ld [W_PEWTERCITYCURSCRIPT], a ld [W_PEWTERCITYCURSCRIPT], a
@ -200,11 +200,11 @@ PewterCityText3: ; 193b1 (6:53b1)
call YesNoChoice call YesNoChoice
ld a, [wCurrentMenuItem] ld a, [wCurrentMenuItem]
and a and a
jr nz, .asm_f46a9 ; 0x193bf jr nz, .asm_193c9
ld hl, PewterCityText_193f6 ld hl, PewterCityText_193f6
call PrintText call PrintText
jr .asm_ac429 ; 0x193c7 jr .asm_193ee
.asm_f46a9 ; 0x193c9 .asm_193c9
ld hl, PewterCityText_193fb ld hl, PewterCityText_193fb
call PrintText call PrintText
xor a xor a
@ -220,7 +220,7 @@ PewterCityText3: ; 193b1 (6:53b1)
call GetSpritePosition2 call GetSpritePosition2
ld a, $1 ld a, $1
ld [W_PEWTERCITYCURSCRIPT], a ld [W_PEWTERCITYCURSCRIPT], a
.asm_ac429 ; 0x193ee .asm_193ee
jp TextScriptEnd jp TextScriptEnd
PewterCityText_193f1: ; 193f1 (6:53f1) PewterCityText_193f1: ; 193f1 (6:53f1)
@ -246,14 +246,14 @@ PewterCityText4: ; 19405 (6:5405)
call YesNoChoice call YesNoChoice
ld a, [wCurrentMenuItem] ld a, [wCurrentMenuItem]
cp $0 cp $0
jr nz, .asm_e4603 jr nz, .asm_1941e
ld hl, PewterCityText_1942c ld hl, PewterCityText_1942c
call PrintText call PrintText
jr .asm_e4604 ; 0x1941c $6 jr .asm_19424
.asm_e4603 .asm_1941e
ld hl, PewterCityText_19431 ld hl, PewterCityText_19431
call PrintText call PrintText
.asm_e4604 ; 0x19424 .asm_19424
jp TextScriptEnd jp TextScriptEnd
PewterCityText_19427: ; 19427 (6:5427) PewterCityText_19427: ; 19427 (6:5427)

View file

@ -12,8 +12,8 @@ PewterGymScript: ; 5c387 (17:4387)
ret ret
PewterGymScript_5c3a4: ; 5c3a4 (17:43a4) PewterGymScript_5c3a4: ; 5c3a4 (17:43a4)
ld hl, Gym1CityName ; $43ad ld hl, Gym1CityName
ld de, Gym1LeaderName ; $43b9 ld de, Gym1LeaderName
jp LoadGymLeaderAndCityName jp LoadGymLeaderAndCityName
Gym1CityName: ; 5c3ad (17:43ad) Gym1CityName: ; 5c3ad (17:43ad)
@ -36,7 +36,7 @@ PewterGymScriptPointers: ; 5c3ca (17:43ca)
dw PewterGymScript3 dw PewterGymScript3
PewterGymScript3: ; 5c3d2 (17:43d2) PewterGymScript3: ; 5c3d2 (17:43d2)
ld a, [W_ISINBATTLE] ; W_ISINBATTLE ld a, [W_ISINBATTLE]
cp $ff cp $ff
jp z, PewterGymScript_5c3bf jp z, PewterGymScript_5c3bf
ld a, $f0 ld a, $f0
@ -44,7 +44,7 @@ PewterGymScript3: ; 5c3d2 (17:43d2)
PewterGymScript_5c3df: ; 5c3df (17:43df) PewterGymScript_5c3df: ; 5c3df (17:43df)
ld a, $4 ld a, $4
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a
call DisplayTextID call DisplayTextID
ld hl, wd755 ld hl, wd755
set 7, [hl] set 7, [hl]
@ -52,14 +52,14 @@ PewterGymScript_5c3df: ; 5c3df (17:43df)
call GiveItem call GiveItem
jr nc, .BagFull jr nc, .BagFull
ld a, $5 ld a, $5
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a
call DisplayTextID call DisplayTextID
ld hl, wd755 ld hl, wd755
set 6, [hl] set 6, [hl]
jr .asm_5c408 jr .asm_5c408
.BagFull .BagFull
ld a, $6 ld a, $6
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a
call DisplayTextID call DisplayTextID
.asm_5c408 .asm_5c408
ld hl, W_OBTAINEDBADGES ld hl, W_OBTAINEDBADGES
@ -97,10 +97,10 @@ PewterGymTrainerHeader0: ; 5c441 (17:4441)
db $2 ; flag's bit db $2 ; flag's bit
db ($5 << 4) ; trainer's view range db ($5 << 4) ; trainer's view range
dw wd755 ; flag's byte dw wd755 ; flag's byte
dw PewterGymBattleText1 ; 0x44d0 TextBeforeBattle dw PewterGymBattleText1 ; TextBeforeBattle
dw PewterGymAfterBattleText1 ; 0x44da TextAfterBattle dw PewterGymAfterBattleText1 ; TextAfterBattle
dw PewterGymEndBattleText1 ; 0x44d5 TextEndBattle dw PewterGymEndBattleText1 ; TextEndBattle
dw PewterGymEndBattleText1 ; 0x44d5 TextEndBattle dw PewterGymEndBattleText1 ; TextEndBattle
db $ff db $ff
@ -108,17 +108,17 @@ PewterGymText1: ; 5c44e (17:444e)
db $08 ; asm db $08 ; asm
ld a, [wd755] ld a, [wd755]
bit 7, a bit 7, a
jr z, .asm_4a735 ; 0x5c454 jr z, .asm_5c46a
bit 6, a bit 6, a
jr nz, .asm_ff7d0 ; 0x5c458 jr nz, .asm_5c462
call z, PewterGymScript_5c3df call z, PewterGymScript_5c3df
call DisableWaitingAfterTextDisplay call DisableWaitingAfterTextDisplay
jr .asm_e0ffb ; 0x5c460 jr .asm_5c49b
.asm_ff7d0 ; 0x5c462 .asm_5c462
ld hl, PewterGymText_5c4a3 ld hl, PewterGymText_5c4a3
call PrintText call PrintText
jr .asm_e0ffb ; 0x5c468 jr .asm_5c49b
.asm_4a735 ; 0x5c46a .asm_5c46a
ld hl, PewterGymText_5c49e ld hl, PewterGymText_5c49e
call PrintText call PrintText
ld hl, wd72d ld hl, wd72d
@ -138,7 +138,7 @@ PewterGymText1: ; 5c44e (17:444e)
ld a, $3 ld a, $3
ld [W_PEWTERGYMCURSCRIPT], a ld [W_PEWTERGYMCURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
.asm_e0ffb ; 0x5c49b .asm_5c49b
jp TextScriptEnd jp TextScriptEnd
PewterGymText_5c49e: ; 5c49e (17:449e) PewterGymText_5c49e: ; 5c49e (17:449e)
@ -191,27 +191,27 @@ PewterGymText3: ; 5c4df (17:44df)
db $08 ; asm db $08 ; asm
ld a, [wd72a] ld a, [wd72a]
bit 0, a bit 0, a
jr nz, .asm_71369 ; 0x5c4e5 jr nz, .asm_5c50c
ld hl, PewterGymText_5c515 ld hl, PewterGymText_5c515
call PrintText call PrintText
call YesNoChoice call YesNoChoice
ld a, [wCurrentMenuItem] ld a, [wCurrentMenuItem]
and a and a
jr nz, .asm_6123a ; 0x5c4f4 jr nz, .asm_5c4fe
ld hl, PewterGymText_5c51a ld hl, PewterGymText_5c51a
call PrintText call PrintText
jr .asm_d1578 ; 0x5c4fc jr .asm_5c504
.asm_6123a ; 0x5c4fe .asm_5c4fe
ld hl, PewterGymText_5c524 ld hl, PewterGymText_5c524
call PrintText call PrintText
.asm_d1578 ; 0x5c504 .asm_5c504
ld hl, PewterGymText_5c51f ld hl, PewterGymText_5c51f
call PrintText call PrintText
jr .asm_07013 ; 0x5c50a jr .asm_5c512
.asm_71369 ; 0x5c50c .asm_5c50c
ld hl, PewterGymText_5c529 ld hl, PewterGymText_5c529
call PrintText call PrintText
.asm_07013 ; 0x5c512 .asm_5c512
jp TextScriptEnd jp TextScriptEnd
PewterGymText_5c515: ; 5c515 (17:4515) PewterGymText_5c515: ; 5c515 (17:4515)

View file

@ -23,7 +23,7 @@ PewterPokecenterText3: ; 5c59b (17:459b)
call PrintText call PrintText
ld a, $ff ld a, $ff
call PlaySound call PlaySound
ld c, $20 ld c, 32
call DelayFrames call DelayFrames
ld hl, JigglypuffFacingDirections ld hl, JigglypuffFacingDirections
ld de, wTrainerFacingDirection ld de, wTrainerFacingDirection
@ -34,7 +34,7 @@ PewterPokecenterText3: ; 5c59b (17:459b)
.asm_5c5c3 .asm_5c5c3
cp [hl] cp [hl]
inc hl inc hl
jr nz, .asm_5c5c3 ; 0x5c5c5 $fc jr nz, .asm_5c5c3
dec hl dec hl
push hl push hl
ld c, BANK(Music_JigglypuffSong) ld c, BANK(Music_JigglypuffSong)
@ -52,14 +52,14 @@ PewterPokecenterText3: ; 5c59b (17:459b)
ld a, [wTrainerEngageDistance] ld a, [wTrainerEngageDistance]
ld [wcd42], a ld [wcd42], a
pop hl pop hl
ld c, $18 ld c, 24
call DelayFrames call DelayFrames
ld a, [wc026] ld a, [wc026]
ld b, a ld b, a
ld a, [wc027] ld a, [wc027]
or b or b
jr nz, .asm_5c5d1 ; 0x5c5f6 $d9 jr nz, .asm_5c5d1
ld c, $30 ld c, 48
call DelayFrames call DelayFrames
call PlayDefaultMusic call PlayDefaultMusic
jp TextScriptEnd jp TextScriptEnd

View file

@ -20,7 +20,7 @@ PokemonTower2Script0: ; 6050f (18:450f)
ld a, [wd764] ld a, [wd764]
bit 7, a bit 7, a
ret nz ret nz
ld hl, CoordsData_6055e ; $455e ld hl, CoordsData_6055e
call ArePlayerCoordsInArray call ArePlayerCoordsInArray
ret nc ret nc
ld a, $ff ld a, $ff
@ -35,7 +35,7 @@ PokemonTower2Script0: ; 6050f (18:450f)
cp $1 cp $1
ld a, $8 ld a, $8
ld b, $0 ld b, $0
jr nz, .asm_60544 ; 0x60539 $9 jr nz, .asm_60544
ld hl, wd764 ld hl, wd764
set 6, [hl] set 6, [hl]
ld a, $2 ld a, $2
@ -74,7 +74,7 @@ PokemonTower2Script1: ; 60563 (18:4563)
ld de, MovementData_605b2 ld de, MovementData_605b2
ld a, [wd764] ld a, [wd764]
bit 6, a bit 6, a
jr nz, .asm_60589 ; 0x60584 $3 jr nz, .asm_60589
ld de, MovementData_605a9 ld de, MovementData_605a9
.asm_60589 .asm_60589
ld a, $1 ld a, $1
@ -118,18 +118,18 @@ PokemonTower2Text1: ; 605df (18:45df)
db $08 ; asm db $08 ; asm
ld a, [wd764] ld a, [wd764]
bit 7, a bit 7, a
jr z, .asm_16f24 ; 0x605e5 jr z, .asm_16f24
ld hl, PokemonTower2Text_6063c ld hl, PokemonTower2Text_6063c
call PrintText call PrintText
jr .asm_41852 ; 0x605ed jr .asm_41852
.asm_16f24 ; 0x605ef .asm_16f24
ld hl, PokemonTower2Text_6062d ld hl, PokemonTower2Text_6062d
call PrintText call PrintText
ld hl, wd72d ld hl, wd72d
set 6, [hl] set 6, [hl]
set 7, [hl] set 7, [hl]
ld hl, PokemonTower2Text_60632 ld hl, PokemonTower2Text_60632
ld de, PokemonTower2Text_60637 ; XXX $4637 ld de, PokemonTower2Text_60637
call SaveEndBattleTextPointers call SaveEndBattleTextPointers
ld a, SONY2 + $c8 ld a, SONY2 + $c8
ld [W_CUROPPONENT], a ld [W_CUROPPONENT], a
@ -137,15 +137,15 @@ PokemonTower2Text1: ; 605df (18:45df)
; select which team to use during the encounter ; select which team to use during the encounter
ld a, [W_RIVALSTARTER] ld a, [W_RIVALSTARTER]
cp STARTER2 cp STARTER2
jr nz, .NotSquirtle ; 0x6060f jr nz, .NotSquirtle
ld a, $4 ld a, $4
jr .done jr .done
.NotSquirtle ; 0x60615 .NotSquirtle
cp STARTER3 cp STARTER3
jr nz, .Charmander ; 0x60617 jr nz, .Charmander
ld a, $5 ld a, $5
jr .done jr .done
.Charmander ; 0x6061d .Charmander
ld a, $6 ld a, $6
.done .done
ld [W_TRAINERNO], a ld [W_TRAINERNO], a
@ -153,7 +153,7 @@ PokemonTower2Text1: ; 605df (18:45df)
ld a, $1 ld a, $1
ld [W_POKEMONTOWER2CURSCRIPT], a ld [W_POKEMONTOWER2CURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
.asm_41852 ; 0x6062a .asm_41852
jp TextScriptEnd jp TextScriptEnd
PokemonTower2Text_6062d: ; 6062d (18:462d) PokemonTower2Text_6062d: ; 6062d (18:462d)

View file

@ -23,28 +23,28 @@ PokemonTower3TrainerHeader0: ; 606ed (18:46ed)
db $1 ; flag's bit db $1 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd765 ; flag's byte dw wd765 ; flag's byte
dw PokemonTower3BattleText1 ; 0x4730 TextBeforeBattle dw PokemonTower3BattleText1 ; TextBeforeBattle
dw PokemonTower3AfterBattleText1 ; 0x473a TextAfterBattle dw PokemonTower3AfterBattleText1 ; TextAfterBattle
dw PokemonTower3EndBattleText1 ; 0x4735 TextEndBattle dw PokemonTower3EndBattleText1 ; TextEndBattle
dw PokemonTower3EndBattleText1 ; 0x4735 TextEndBattle dw PokemonTower3EndBattleText1 ; TextEndBattle
PokemonTower3TrainerHeader1: ; 606f9 (18:46f9) PokemonTower3TrainerHeader1: ; 606f9 (18:46f9)
db $2 ; flag's bit db $2 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd765 ; flag's byte dw wd765 ; flag's byte
dw PokemonTower3BattleText2 ; 0x473f TextBeforeBattle dw PokemonTower3BattleText2 ; TextBeforeBattle
dw PokemonTower3AfterBattleText2 ; 0x4749 TextAfterBattle dw PokemonTower3AfterBattleText2 ; TextAfterBattle
dw PokemonTower3EndBattleText2 ; 0x4744 TextEndBattle dw PokemonTower3EndBattleText2 ; TextEndBattle
dw PokemonTower3EndBattleText2 ; 0x4744 TextEndBattle dw PokemonTower3EndBattleText2 ; TextEndBattle
PokemonTower3TrainerHeader2: ; 60705 (18:4705) PokemonTower3TrainerHeader2: ; 60705 (18:4705)
db $3 ; flag's bit db $3 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd765 ; flag's byte dw wd765 ; flag's byte
dw PokemonTower3BattleText3 ; 0x474e TextBeforeBattle dw PokemonTower3BattleText3 ; TextBeforeBattle
dw PokemonTower3AfterBattleText3 ; 0x4758 TextAfterBattle dw PokemonTower3AfterBattleText3 ; TextAfterBattle
dw PokemonTower3EndBattleText3 ; 0x4753 TextEndBattle dw PokemonTower3EndBattleText3 ; TextEndBattle
dw PokemonTower3EndBattleText3 ; 0x4753 TextEndBattle dw PokemonTower3EndBattleText3 ; TextEndBattle
db $ff db $ff
PokemonTower3Text1: ; 60712 (18:4712) PokemonTower3Text1: ; 60712 (18:4712)

View file

@ -25,28 +25,28 @@ PokemonTower4TrainerHeader0: ; 6081b (18:481b)
db $1 ; flag's bit db $1 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd766 ; flag's byte dw wd766 ; flag's byte
dw PokemonTower4BattleText1 ; 0x485e TextBeforeBattle dw PokemonTower4BattleText1 ; TextBeforeBattle
dw PokemonTower4AfterBattleText1 ; 0x4868 TextAfterBattle dw PokemonTower4AfterBattleText1 ; TextAfterBattle
dw PokemonTower4EndBattleText1 ; 0x4863 TextEndBattle dw PokemonTower4EndBattleText1 ; TextEndBattle
dw PokemonTower4EndBattleText1 ; 0x4863 TextEndBattle dw PokemonTower4EndBattleText1 ; TextEndBattle
PokemonTower4TrainerHeader1: ; 60827 (18:4827) PokemonTower4TrainerHeader1: ; 60827 (18:4827)
db $2 ; flag's bit db $2 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd766 ; flag's byte dw wd766 ; flag's byte
dw PokemonTower4BattleText2 ; 0x486d TextBeforeBattle dw PokemonTower4BattleText2 ; TextBeforeBattle
dw PokemonTower4AfterBattleText2 ; 0x4877 TextAfterBattle dw PokemonTower4AfterBattleText2 ; TextAfterBattle
dw PokemonTower4EndBattleText2 ; 0x4872 TextEndBattle dw PokemonTower4EndBattleText2 ; TextEndBattle
dw PokemonTower4EndBattleText2 ; 0x4872 TextEndBattle dw PokemonTower4EndBattleText2 ; TextEndBattle
PokemonTower4TrainerHeader2: ; 60833 (18:4833) PokemonTower4TrainerHeader2: ; 60833 (18:4833)
db $3 ; flag's bit db $3 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd766 ; flag's byte dw wd766 ; flag's byte
dw PokemonTower4BattleText3 ; 0x487c TextBeforeBattle dw PokemonTower4BattleText3 ; TextBeforeBattle
dw PokemonTower4AfterBattleText3 ; 0x4886 TextAfterBattle dw PokemonTower4AfterBattleText3 ; TextAfterBattle
dw PokemonTower4EndBattleText3 ; 0x4881 TextEndBattle dw PokemonTower4EndBattleText3 ; TextEndBattle
dw PokemonTower4EndBattleText3 ; 0x4881 TextEndBattle dw PokemonTower4EndBattleText3 ; TextEndBattle
db $ff db $ff

View file

@ -13,7 +13,7 @@ PokemonTower5ScriptPointers: ; 60945 (18:4945)
dw EndTrainerBattle dw EndTrainerBattle
PokemonTower5Script0: ; 6094b (18:494b) PokemonTower5Script0: ; 6094b (18:494b)
ld hl, CoordsData_60992 ; $4992 ld hl, CoordsData_60992
call ArePlayerCoordsInArray call ArePlayerCoordsInArray
jr c, .asm_60960 jr c, .asm_60960
ld hl, wd72e ld hl, wd72e
@ -38,7 +38,7 @@ PokemonTower5Script0: ; 6094b (18:494b)
call Delay3 call Delay3
call GBFadeInFromWhite call GBFadeInFromWhite
ld a, $7 ld a, $7
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a
call DisplayTextID call DisplayTextID
xor a xor a
ld [wJoyIgnore], a ld [wJoyIgnore], a
@ -65,37 +65,37 @@ PokemonTower5TrainerHeader0: ; 609a9 (18:49a9)
db $2 ; flag's bit db $2 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd767 ; flag's byte dw wd767 ; flag's byte
dw PokemonTower5BattleText1 ; 0x49e9 TextBeforeBattle dw PokemonTower5BattleText1 ; TextBeforeBattle
dw PokemonTower5AfterBattleText1 ; 0x49f3 TextAfterBattle dw PokemonTower5AfterBattleText1 ; TextAfterBattle
dw PokemonTower5EndBattleText1 ; 0x49ee TextEndBattle dw PokemonTower5EndBattleText1 ; TextEndBattle
dw PokemonTower5EndBattleText1 ; 0x49ee TextEndBattle dw PokemonTower5EndBattleText1 ; TextEndBattle
PokemonTower5TrainerHeader1: ; 609b5 (18:49b5) PokemonTower5TrainerHeader1: ; 609b5 (18:49b5)
db $3 ; flag's bit db $3 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd767 ; flag's byte dw wd767 ; flag's byte
dw PokemonTower5BattleText2 ; 0x4a02 TextBeforeBattle dw PokemonTower5BattleText2 ; TextBeforeBattle
dw PokemonTower5AfterBattleText2 ; 0x4a0c TextAfterBattle dw PokemonTower5AfterBattleText2 ; TextAfterBattle
dw PokemonTower5EndBattleText2 ; 0x4a07 TextEndBattle dw PokemonTower5EndBattleText2 ; TextEndBattle
dw PokemonTower5EndBattleText2 ; 0x4a07 TextEndBattle dw PokemonTower5EndBattleText2 ; TextEndBattle
PokemonTower5TrainerHeader2: ; 609c1 (18:49c1) PokemonTower5TrainerHeader2: ; 609c1 (18:49c1)
db $4 ; flag's bit db $4 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd767 ; flag's byte dw wd767 ; flag's byte
dw PokemonTower5BattleText3 ; 0x4a1b TextBeforeBattle dw PokemonTower5BattleText3 ; TextBeforeBattle
dw PokemonTower5AfterBattleText3 ; 0x4a25 TextAfterBattle dw PokemonTower5AfterBattleText3 ; TextAfterBattle
dw PokemonTower5EndBattleText3 ; 0x4a20 TextEndBattle dw PokemonTower5EndBattleText3 ; TextEndBattle
dw PokemonTower5EndBattleText3 ; 0x4a20 TextEndBattle dw PokemonTower5EndBattleText3 ; TextEndBattle
PokemonTower5TrainerHeader3: ; 609cd (18:49cd) PokemonTower5TrainerHeader3: ; 609cd (18:49cd)
db $5 ; flag's bit db $5 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd767 ; flag's byte dw wd767 ; flag's byte
dw PokemonTower5BattleText4 ; 0x4a34 TextBeforeBattle dw PokemonTower5BattleText4 ; TextBeforeBattle
dw PokemonTower5AfterBattleText4 ; 0x4a3e TextAfterBattle dw PokemonTower5AfterBattleText4 ; TextAfterBattle
dw PokemonTower5EndBattleText4 ; 0x4a39 TextEndBattle dw PokemonTower5EndBattleText4 ; TextEndBattle
dw PokemonTower5EndBattleText4 ; 0x4a39 TextEndBattle dw PokemonTower5EndBattleText4 ; TextEndBattle
db $ff db $ff
@ -159,7 +159,7 @@ PokemonTower5AfterBattleText3: ; 60a25 (18:4a25)
PokemonTower5Text5: ; 60a2a (18:4a2a) PokemonTower5Text5: ; 60a2a (18:4a2a)
db $08 ; asm db $08 ; asm
ld hl, PokemonTower5TrainerHeader3 ; $49cd ld hl, PokemonTower5TrainerHeader3
call TalkToTrainer call TalkToTrainer
jp TextScriptEnd jp TextScriptEnd

View file

@ -25,18 +25,18 @@ PokemonTower6Script0: ; 60b17 (18:4b17)
ld a, [wd768] ld a, [wd768]
bit 7, a bit 7, a
jp nz, CheckFightingMapTrainers jp nz, CheckFightingMapTrainers
ld hl, CoordsData_60b45 ; $4b45 ld hl, CoordsData_60b45
call ArePlayerCoordsInArray call ArePlayerCoordsInArray
jp nc, CheckFightingMapTrainers jp nc, CheckFightingMapTrainers
xor a xor a
ld [hJoyHeld], a ld [hJoyHeld], a
ld a, $6 ld a, $6
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a
call DisplayTextID call DisplayTextID
ld a, MAROWAK ld a, MAROWAK
ld [W_CUROPPONENT], a ; wd059 ld [W_CUROPPONENT], a
ld a, 30 ld a, 30
ld [W_CURENEMYLVL], a ; W_CURENEMYLVL ld [W_CURENEMYLVL], a
ld a, $4 ld a, $4
ld [W_POKEMONTOWER6CURSCRIPT], a ld [W_POKEMONTOWER6CURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
@ -46,7 +46,7 @@ CoordsData_60b45: ; 60b45 (18:4b45)
db $10,$0A,$FF db $10,$0A,$FF
PokemonTower6Script4: ; 60b48 (18:4b48) PokemonTower6Script4: ; 60b48 (18:4b48)
ld a, [W_ISINBATTLE] ; W_ISINBATTLE ld a, [W_ISINBATTLE]
cp $ff cp $ff
jp z, PokemonTower6Script_60b02 jp z, PokemonTower6Script_60b02
ld a, $ff ld a, $ff
@ -63,7 +63,7 @@ PokemonTower6Script4: ; 60b48 (18:4b48)
ld hl, wd768 ld hl, wd768
set 7, [hl] set 7, [hl]
ld a, $7 ld a, $7
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a
call DisplayTextID call DisplayTextID
xor a xor a
ld [wJoyIgnore], a ld [wJoyIgnore], a
@ -110,28 +110,28 @@ PokemonTower6TrainerHeader0: ; 60bbf (18:4bbf)
db $1 ; flag's bit db $1 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd768 ; flag's byte dw wd768 ; flag's byte
dw PokemonTower6BattleText1 ; 0x4c29 TextBeforeBattle dw PokemonTower6BattleText1 ; TextBeforeBattle
dw PokemonTower6AfterBattleText1 ; 0x4c33 TextAfterBattle dw PokemonTower6AfterBattleText1 ; TextAfterBattle
dw PokemonTower6EndBattleText1 ; 0x4c2e TextEndBattle dw PokemonTower6EndBattleText1 ; TextEndBattle
dw PokemonTower6EndBattleText1 ; 0x4c2e TextEndBattle dw PokemonTower6EndBattleText1 ; TextEndBattle
PokemonTower6TrainerHeader1: ; 60bcb (18:4bcb) PokemonTower6TrainerHeader1: ; 60bcb (18:4bcb)
db $2 ; flag's bit db $2 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd768 ; flag's byte dw wd768 ; flag's byte
dw PokemonTower6BattleText2 ; 0x4c38 TextBeforeBattle dw PokemonTower6BattleText2 ; TextBeforeBattle
dw PokemonTower6AfterBattleText2 ; 0x4c42 TextAfterBattle dw PokemonTower6AfterBattleText2 ; TextAfterBattle
dw PokemonTower6EndBattleText2 ; 0x4c3d TextEndBattle dw PokemonTower6EndBattleText2 ; TextEndBattle
dw PokemonTower6EndBattleText2 ; 0x4c3d TextEndBattle dw PokemonTower6EndBattleText2 ; TextEndBattle
PokemonTower6TrainerHeader2: ; 60bd7 (18:4bd7) PokemonTower6TrainerHeader2: ; 60bd7 (18:4bd7)
db $3 ; flag's bit db $3 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd768 ; flag's byte dw wd768 ; flag's byte
dw PokemonTower6BattleText3 ; 0x4c47 TextBeforeBattle dw PokemonTower6BattleText3 ; TextBeforeBattle
dw PokemonTower6AfterBattleText3 ; 0x4c51 TextAfterBattle dw PokemonTower6AfterBattleText3 ; TextAfterBattle
dw PokemonTower6EndBattleText3 ; 0x4c4c TextEndBattle dw PokemonTower6EndBattleText3 ; TextEndBattle
dw PokemonTower6EndBattleText3 ; 0x4c4c TextEndBattle dw PokemonTower6EndBattleText3 ; TextEndBattle
db $ff db $ff
@ -160,7 +160,7 @@ PokemonTower6Text7: ; 60c02 (18:4c02)
ld a, MAROWAK ld a, MAROWAK
call PlayCry call PlayCry
call WaitForSoundToFinish call WaitForSoundToFinish
ld c, $1e ld c, 30
call DelayFrames call DelayFrames
ld hl, PokemonTower2Text_60c24 ld hl, PokemonTower2Text_60c24
call PrintText call PrintText

View file

@ -24,14 +24,14 @@ PokemonTower7ScriptPointers:
PokemonTower7Script2: ; 60d23 (18:4d23) PokemonTower7Script2: ; 60d23 (18:4d23)
ld hl, wFlags_0xcd60 ld hl, wFlags_0xcd60
res 0, [hl] res 0, [hl]
ld a, [W_ISINBATTLE] ; W_ISINBATTLE ld a, [W_ISINBATTLE]
cp $ff cp $ff
jp z, PokemonTower7Script_60d18 jp z, PokemonTower7Script_60d18
call EndTrainerBattle call EndTrainerBattle
ld a, $f0 ld a, $f0
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld a, [wSpriteIndex] ld a, [wSpriteIndex]
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a
call DisplayTextID call DisplayTextID
call PokemonTower7Script_60db6 call PokemonTower7Script_60db6
ld a, $3 ld a, $3
@ -72,7 +72,7 @@ PokemonTower7Script4: ; 60d86 (18:4d86)
ld a, $4 ld a, $4
ld [wSpriteStateData1 + 9], a ld [wSpriteStateData1 + 9], a
ld a, LAVENDER_HOUSE_1 ld a, LAVENDER_HOUSE_1
ld [H_DOWNARROWBLINKCNT1], a ; $ff8b ld [H_DOWNARROWBLINKCNT1], a
ld a, $1 ld a, $1
ld [wDestinationWarpID], a ld [wDestinationWarpID], a
ld a, LAVENDER_TOWN ld a, LAVENDER_TOWN
@ -85,16 +85,16 @@ PokemonTower7Script4: ; 60d86 (18:4d86)
ret ret
PokemonTower7Script_60db6: ; 60db6 (18:4db6) PokemonTower7Script_60db6: ; 60db6 (18:4db6)
ld hl, CoordsData_60de3 ; $4de3 ld hl, CoordsData_60de3
ld a, [wSpriteIndex] ld a, [wSpriteIndex]
dec a dec a
swap a swap a
ld d, $0 ld d, $0
ld e, a ld e, a
add hl, de add hl, de
ld a, [W_YCOORD] ; wd361 ld a, [W_YCOORD]
ld b, a ld b, a
ld a, [W_XCOORD] ; wd362 ld a, [W_XCOORD]
ld c, a ld c, a
.asm_60dcb .asm_60dcb
ld a, [hli] ld a, [hli]
@ -107,7 +107,7 @@ PokemonTower7Script_60db6: ; 60db6 (18:4db6)
ld d, [hl] ld d, [hl]
ld e, a ld e, a
ld a, [wSpriteIndex] ld a, [wSpriteIndex]
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a
jp MoveSprite jp MoveSprite
.asm_60dde .asm_60dde
inc hl inc hl
@ -171,28 +171,28 @@ PokemonTower7TrainerHeader0: ; 60e47 (18:4e47)
db $1 ; flag's bit db $1 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd769 ; flag's byte dw wd769 ; flag's byte
dw PokemonTower7BattleText1 ; 0x4ec9 TextBeforeBattle dw PokemonTower7BattleText1 ; TextBeforeBattle
dw PokemonTower7AfterBattleText1 ; 0x4ed3 TextAfterBattle dw PokemonTower7AfterBattleText1 ; TextAfterBattle
dw PokemonTower7EndBattleText1 ; 0x4ece TextEndBattle dw PokemonTower7EndBattleText1 ; TextEndBattle
dw PokemonTower7EndBattleText1 ; 0x4ece TextEndBattle dw PokemonTower7EndBattleText1 ; TextEndBattle
PokemonTower7TrainerHeader1: ; 60e53 (18:4e53) PokemonTower7TrainerHeader1: ; 60e53 (18:4e53)
db $2 ; flag's bit db $2 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd769 ; flag's byte dw wd769 ; flag's byte
dw PokemonTower7BattleText2 ; 0x4ed8 TextBeforeBattle dw PokemonTower7BattleText2 ; TextBeforeBattle
dw PokemonTower7AfterBattleText2 ; 0x4ee2 TextAfterBattle dw PokemonTower7AfterBattleText2 ; TextAfterBattle
dw PokemonTower7EndBattleText2 ; 0x4edd TextEndBattle dw PokemonTower7EndBattleText2 ; TextEndBattle
dw PokemonTower7EndBattleText2 ; 0x4edd TextEndBattle dw PokemonTower7EndBattleText2 ; TextEndBattle
PokemonTower7TrainerHeader2: ; 60e5f (18:4e5f) PokemonTower7TrainerHeader2: ; 60e5f (18:4e5f)
db $3 ; flag's bit db $3 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd769 ; flag's byte dw wd769 ; flag's byte
dw PokemonTower7BattleText3 ; 0x4ee7 TextBeforeBattle dw PokemonTower7BattleText3 ; TextBeforeBattle
dw PokemonTower7AfterBattleText3 ; 0x4ef1 TextAfterBattle dw PokemonTower7AfterBattleText3 ; TextAfterBattle
dw PokemonTower7EndBattleText3 ; 0x4eec TextEndBattle dw PokemonTower7EndBattleText3 ; TextEndBattle
dw PokemonTower7EndBattleText3 ; 0x4eec TextEndBattle dw PokemonTower7EndBattleText3 ; TextEndBattle
db $ff db $ff

View file

@ -112,7 +112,7 @@ PowerPlantTrainerHeader8: ; 1e35b (7:635b)
db $ff db $ff
asm_234cc: ; 1e368 (7:6368) InitVoltorbBattle: ; 1e368 (7:6368)
call TalkToTrainer call TalkToTrainer
ld a, [W_CURMAPSCRIPT] ld a, [W_CURMAPSCRIPT]
ld [W_POWERPLANTCURSCRIPT], a ld [W_POWERPLANTCURSCRIPT], a
@ -120,48 +120,48 @@ asm_234cc: ; 1e368 (7:6368)
PowerPlantText1: ; 1e374 (7:6374) PowerPlantText1: ; 1e374 (7:6374)
db $8 ; asm db $8 ; asm
ld hl, PowerPlantTrainerHeader0 ; $62fb ld hl, PowerPlantTrainerHeader0
jr asm_234cc ; 0x1e378 $ee jr InitVoltorbBattle
PowerPlantText2: ; 1e37a (7:637a) PowerPlantText2: ; 1e37a (7:637a)
db $8 ; asm db $8 ; asm
ld hl, PowerPlantTrainerHeader1 ; $6307 ld hl, PowerPlantTrainerHeader1
jr asm_234cc ; 0x1e37e $e8 jr InitVoltorbBattle
PowerPlantText3: ; 1e380 (7:6380) PowerPlantText3: ; 1e380 (7:6380)
db $8 ; asm db $8 ; asm
ld hl, PowerPlantTrainerHeader2 ; $6313 ld hl, PowerPlantTrainerHeader2
jr asm_234cc ; 0x1e384 $e2 jr InitVoltorbBattle
PowerPlantText4: ; 1e386 (7:6386) PowerPlantText4: ; 1e386 (7:6386)
db $8 ; asm db $8 ; asm
ld hl, PowerPlantTrainerHeader3 ; $631f ld hl, PowerPlantTrainerHeader3
jr asm_234cc ; 0x1e38a $dc jr InitVoltorbBattle
PowerPlantText5: ; 1e38c (7:638c) PowerPlantText5: ; 1e38c (7:638c)
db $8 ; asm db $8 ; asm
ld hl, PowerPlantTrainerHeader4 ; $632b ld hl, PowerPlantTrainerHeader4
jr asm_234cc ; 0x1e390 $d6 jr InitVoltorbBattle
PowerPlantText6: ; 1e392 (7:6392) PowerPlantText6: ; 1e392 (7:6392)
db $8 ; asm db $8 ; asm
ld hl, PowerPlantTrainerHeader5 ; $6337 ld hl, PowerPlantTrainerHeader5
jr asm_234cc ; 0x1e396 $d0 jr InitVoltorbBattle
PowerPlantText7: ; 1e398 (7:6398) PowerPlantText7: ; 1e398 (7:6398)
db $8 ; asm db $8 ; asm
ld hl, PowerPlantTrainerHeader6 ; $6343 ld hl, PowerPlantTrainerHeader6
jr asm_234cc ; 0x1e39c $ca jr InitVoltorbBattle
PowerPlantText8: ; 1e39e (7:639e) PowerPlantText8: ; 1e39e (7:639e)
db $8 ; asm db $8 ; asm
ld hl, PowerPlantTrainerHeader7 ; $634f ld hl, PowerPlantTrainerHeader7
jr asm_234cc ; 0x1e3a2 $c4 jr InitVoltorbBattle
PowerPlantText9: ; 1e3a4 (7:63a4) PowerPlantText9: ; 1e3a4 (7:63a4)
db $8 ; asm db $8 ; asm
ld hl, PowerPlantTrainerHeader8 ; $635b ld hl, PowerPlantTrainerHeader8
jr asm_234cc ; 0x1e3a8 $be jr InitVoltorbBattle
VoltorbBattleText: ; 1e3aa (7:63aa) VoltorbBattleText: ; 1e3aa (7:63aa)
TX_FAR _VoltorbBattleText TX_FAR _VoltorbBattleText

View file

@ -30,7 +30,7 @@ MomHealPokemon: ; 4818a (12:418a)
predef HealParty predef HealParty
ld a, MUSIC_PKMN_HEALED ld a, MUSIC_PKMN_HEALED
ld [wc0ee], a ld [wc0ee], a
call PlaySound ; play sound? call PlaySound
.next .next
ld a, [wc026] ld a, [wc026]
cp MUSIC_PKMN_HEALED cp MUSIC_PKMN_HEALED

View file

@ -51,46 +51,46 @@ RocketHideout1TrainerHeader0: ; 44c22 (11:4c22)
db $1 ; flag's bit db $1 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd815 ; flag's byte dw wd815 ; flag's byte
dw RocketHideout1BattleText2 ; 0x4ca1 TextBeforeBattle dw RocketHideout1BattleText2 ; TextBeforeBattle
dw RocketHideout1AfterBattleTxt2 ; 0x4cab TextAfterBattle dw RocketHideout1AfterBattleTxt2 ; TextAfterBattle
dw RocketHideout1EndBattleText2 ; 0x4ca6 TextEndBattle dw RocketHideout1EndBattleText2 ; TextEndBattle
dw RocketHideout1EndBattleText2 ; 0x4ca6 TextEndBattle dw RocketHideout1EndBattleText2 ; TextEndBattle
RocketHideout1TrainerHeader2: ; 44c2e (11:4c2e) RocketHideout1TrainerHeader2: ; 44c2e (11:4c2e)
db $2 ; flag's bit db $2 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd815 ; flag's byte dw wd815 ; flag's byte
dw RocketHideout1BattleText3 ; 0x4cb0 TextBeforeBattle dw RocketHideout1BattleText3 ; TextBeforeBattle
dw RocketHideout1AfterBattleTxt3 ; 0x4cba TextAfterBattle dw RocketHideout1AfterBattleTxt3 ; TextAfterBattle
dw RocketHideout1EndBattleText3 ; 0x4cb5 TextEndBattle dw RocketHideout1EndBattleText3 ; TextEndBattle
dw RocketHideout1EndBattleText3 ; 0x4cb5 TextEndBattle dw RocketHideout1EndBattleText3 ; TextEndBattle
RocketHideout1TrainerHeader3: ; 44c3a (11:4c3a) RocketHideout1TrainerHeader3: ; 44c3a (11:4c3a)
db $3 ; flag's bit db $3 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd815 ; flag's byte dw wd815 ; flag's byte
dw RocketHideout1BattleText4 ; 0x4cbf TextBeforeBattle dw RocketHideout1BattleText4 ; TextBeforeBattle
dw RocketHideout1AfterBattleTxt4 ; 0x4cc9 TextAfterBattle dw RocketHideout1AfterBattleTxt4 ; TextAfterBattle
dw RocketHideout1EndBattleText4 ; 0x4cc4 TextEndBattle dw RocketHideout1EndBattleText4 ; TextEndBattle
dw RocketHideout1EndBattleText4 ; 0x4cc4 TextEndBattle dw RocketHideout1EndBattleText4 ; TextEndBattle
RocketHideout1TrainerHeader4: ; 44c46 (11:4c46) RocketHideout1TrainerHeader4: ; 44c46 (11:4c46)
db $4 ; flag's bit db $4 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd815 ; flag's byte dw wd815 ; flag's byte
dw RocketHideout1BattleText5 ; 0x4cce TextBeforeBattle dw RocketHideout1BattleText5 ; TextBeforeBattle
dw RocketHideout1AfterBattleTxt5 ; 0x4cd8 TextAfterBattle dw RocketHideout1AfterBattleTxt5 ; TextAfterBattle
dw RocketHideout1EndBattleText5 ; 0x4cd3 TextEndBattle dw RocketHideout1EndBattleText5 ; TextEndBattle
dw RocketHideout1EndBattleText5 ; 0x4cd3 TextEndBattle dw RocketHideout1EndBattleText5 ; TextEndBattle
RocketHideout1TrainerHeader5: ; 44c52 (11:4c52) RocketHideout1TrainerHeader5: ; 44c52 (11:4c52)
db $5 ; flag's bit db $5 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd815 ; flag's byte dw wd815 ; flag's byte
dw RocketHideout1BattleText6 ; 0x4cdd TextBeforeBattle dw RocketHideout1BattleText6 ; TextBeforeBattle
dw RocketHideout1AfterBattleTxt6 ; 0x4ce2 TextAfterBattle dw RocketHideout1AfterBattleTxt6 ; TextAfterBattle
dw RocketHideout1EndBattleText6 ; 0x4c91 TextEndBattle dw RocketHideout1EndBattleText6 ; TextEndBattle
dw RocketHideout1EndBattleText6 ; 0x4c91 TextEndBattle dw RocketHideout1EndBattleText6 ; TextEndBattle
db $ff db $ff

View file

@ -321,17 +321,17 @@ LoadSpinnerArrowTiles: ; 44fd7 (11:4fd7)
ld a, [wSpriteStateData1 + 2] ld a, [wSpriteStateData1 + 2]
srl a srl a
srl a srl a
ld hl, SpinnerPlayerFacingDirections ; $5083 ld hl, SpinnerPlayerFacingDirections
ld c, a ld c, a
ld b, $0 ld b, $0
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
ld [wSpriteStateData1 + 2], a ld [wSpriteStateData1 + 2], a
ld a, [W_CURMAPTILESET] ; W_CURMAPTILESET ld a, [W_CURMAPTILESET]
cp FACILITY cp FACILITY
ld hl, FacilitySpinnerArrows ; $5023 ld hl, FacilitySpinnerArrows
jr z, .asm_44ff6 jr z, .asm_44ff6
ld hl, GymSpinnerArrows ; $5053 ld hl, GymSpinnerArrows
.asm_44ff6 .asm_44ff6
ld a, [wSimulatedJoypadStatesIndex] ld a, [wSimulatedJoypadStatesIndex]
bit 0, a bit 0, a
@ -429,10 +429,10 @@ RocketHideout2TrainerHeader0: ; 450d1 (11:50d1)
db $1 ; flag's bit db $1 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd817 ; flag's byte dw wd817 ; flag's byte
dw RocketHideout2BattleText2 ; 0x50e8 TextBeforeBattle dw RocketHideout2BattleText2 ; TextBeforeBattle
dw RocketHideout2AfterBattleTxt2 ; 0x50f2 TextAfterBattle dw RocketHideout2AfterBattleTxt2 ; TextAfterBattle
dw RocketHideout2EndBattleText2 ; 0x50ed TextEndBattle dw RocketHideout2EndBattleText2 ; TextEndBattle
dw RocketHideout2EndBattleText2 ; 0x50ed TextEndBattle dw RocketHideout2EndBattleText2 ; TextEndBattle
db $ff db $ff

View file

@ -135,7 +135,7 @@ RocketHideout3ArrowMovement12: ; 452e1 (11:52e1)
db $40,$01 db $40,$01
db $FF db $FF
RocketHideout3Script3 ; 452e4 (11:452e4) RocketHideout3Script3: ; 452e4 (11:452e4)
ld a, [wSimulatedJoypadStatesIndex] ld a, [wSimulatedJoypadStatesIndex]
and a and a
jp nz, LoadSpinnerArrowTiles jp nz, LoadSpinnerArrowTiles
@ -158,19 +158,19 @@ RocketHideout3TrainerHeader0: ; 45302 (11:5302)
db $1 ; flag's bit db $1 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd819 ; flag's byte dw wd819 ; flag's byte
dw RocketHideout3BattleText2 ; 0x5325 TextBeforeBattle dw RocketHideout3BattleText2 ; TextBeforeBattle
dw RocketHideout3AfterBattleTxt2 ; 0x532f TextAfterBattle dw RocketHideout3AfterBattleTxt2 ; TextAfterBattle
dw RocketHideout3EndBattleText2 ; 0x532a TextEndBattle dw RocketHideout3EndBattleText2 ; TextEndBattle
dw RocketHideout3EndBattleText2 ; 0x532a TextEndBattle dw RocketHideout3EndBattleText2 ; TextEndBattle
RocketHideout3TrainerHeader2: ; 4530e (11:530e) RocketHideout3TrainerHeader2: ; 4530e (11:530e)
db $2 ; flag's bit db $2 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd819 ; flag's byte dw wd819 ; flag's byte
dw RocketHideout3BattleTxt ; 0x533e TextBeforeBattle dw RocketHideout3BattleTxt ; TextBeforeBattle
dw RocketHideout3AfterBattleText3 ; 0x5348 TextAfterBattle dw RocketHideout3AfterBattleText3 ; TextAfterBattle
dw RocketHideout3EndBattleText3 ; 0x5343 TextEndBattle dw RocketHideout3EndBattleText3 ; TextEndBattle
dw RocketHideout3EndBattleText3 ; 0x5343 TextEndBattle dw RocketHideout3EndBattleText3 ; TextEndBattle
db $ff db $ff

View file

@ -93,28 +93,28 @@ RocketHideout4TrainerHeader0: ; 45515 (11:5515)
db $2 ; flag's bit db $2 ; flag's bit
db ($0 << 4) ; trainer's view range db ($0 << 4) ; trainer's view range
dw wd81b ; flag's byte dw wd81b ; flag's byte
dw RocketHideout4BattleText2 ; 0x5593 TextBeforeBattle dw RocketHideout4BattleText2 ; TextBeforeBattle
dw RocketHideout4AfterBattleText2 ; 0x559d TextAfterBattle dw RocketHideout4AfterBattleText2 ; TextAfterBattle
dw RocketHideout4EndBattleText2 ; 0x5598 TextEndBattle dw RocketHideout4EndBattleText2 ; TextEndBattle
dw RocketHideout4EndBattleText2 ; 0x5598 TextEndBattle dw RocketHideout4EndBattleText2 ; TextEndBattle
RocketHideout4TrainerHeader2: ; 45521 (11:5521) RocketHideout4TrainerHeader2: ; 45521 (11:5521)
db $3 ; flag's bit db $3 ; flag's bit
db ($0 << 4) ; trainer's view range db ($0 << 4) ; trainer's view range
dw wd81b ; flag's byte dw wd81b ; flag's byte
dw RocketHideout4BattleText3 ; 0x55ac TextBeforeBattle dw RocketHideout4BattleText3 ; TextBeforeBattle
dw RocketHideout4AfterBattleText3 ; 0x55b6 TextAfterBattle dw RocketHideout4AfterBattleText3 ; TextAfterBattle
dw RocketHideout4EndBattleText3 ; 0x55b1 TextEndBattle dw RocketHideout4EndBattleText3 ; TextEndBattle
dw RocketHideout4EndBattleText3 ; 0x55b1 TextEndBattle dw RocketHideout4EndBattleText3 ; TextEndBattle
RocketHideout4TrainerHeader3: ; 4552d (11:552d) RocketHideout4TrainerHeader3: ; 4552d (11:552d)
db $4 ; flag's bit db $4 ; flag's bit
db ($1 << 4) ; trainer's view range db ($1 << 4) ; trainer's view range
dw wd81b ; flag's byte dw wd81b ; flag's byte
dw RocketHideout4BattleText4 ; 0x55c5 TextBeforeBattle dw RocketHideout4BattleText4 ; TextBeforeBattle
dw RocketHideout4AfterBattleText4 ; 0x55cf TextAfterBattle dw RocketHideout4AfterBattleText4 ; TextAfterBattle
dw RocketHideout4EndBattleText4 ; 0x55ca TextEndBattle dw RocketHideout4EndBattleText4 ; TextEndBattle
dw RocketHideout4EndBattleText4 ; 0x55ca TextEndBattle dw RocketHideout4EndBattleText4 ; TextEndBattle
db $ff db $ff
@ -140,11 +140,11 @@ RocketHideout4Text1: ; 4553a (11:553a)
ld a, $3 ld a, $3
ld [W_ROCKETHIDEOUT4CURSCRIPT], a ld [W_ROCKETHIDEOUT4CURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
jr .asm_209f0 ; 0x4556f jr .asm_209f0
.asm_545571 .asm_545571
ld hl, RocketHideout4Text10 ld hl, RocketHideout4Text10
call PrintText call PrintText
.asm_209f0 ; 0x45577 .asm_209f0
jp TextScriptEnd jp TextScriptEnd
RocketHideout4Text_4557a: ; 4557a (11:557a) RocketHideout4Text_4557a: ; 4557a (11:557a)
@ -211,12 +211,12 @@ RocketHideout4EndBattleText4: ; 455ca (11:55ca)
RocketHideout4AfterBattleText4: ; 455cf (11:55cf) RocketHideout4AfterBattleText4: ; 455cf (11:55cf)
db $8 db $8
ld hl, RocketHideout4Text_455ec ; $55ec ld hl, RocketHideout4Text_455ec
call PrintText call PrintText
ld hl, wd81b ld hl, wd81b
bit 6, [hl] bit 6, [hl]
set 6, [hl] set 6, [hl]
jr nz, .asm_455e9 ; 0x455dd $a jr nz, .asm_455e9
ld a, HS_ROCKET_HIDEOUT_4_ITEM_5 ld a, HS_ROCKET_HIDEOUT_4_ITEM_5
ld [wcc4d], a ld [wcc4d], a
predef ShowObject predef ShowObject

View file

@ -32,9 +32,9 @@ RocketHideoutElevatorScript_4573a: ; 4573a (11:573a)
ret ret
RocketHideoutElevatorScript_45741: ; 45741 (11:5741) RocketHideoutElevatorScript_45741: ; 45741 (11:5741)
ld hl, RocketHideoutElavatorFloors ; $5754 ld hl, RocketHideoutElavatorFloors
call LoadItemList call LoadItemList
ld hl, RocketHideoutElevatorWarpMaps ; $5759 ld hl, RocketHideoutElevatorWarpMaps
ld de, wcc5b ld de, wcc5b
ld bc, $0006 ld bc, $0006
call CopyData call CopyData
@ -65,17 +65,17 @@ RocketHideoutElevatorText1: ; 4576d (11:576d)
db $08 ; asm db $08 ; asm
ld b, LIFT_KEY ld b, LIFT_KEY
call IsItemInBag call IsItemInBag
jr z, .asm_8d8f0 ; 0x45773 jr z, .asm_45782
call RocketHideoutElevatorScript_45741 call RocketHideoutElevatorScript_45741
ld hl, RocketHideoutElevatorWarpMaps ; $5759 ld hl, RocketHideoutElevatorWarpMaps
predef Func_1c9c6 predef Func_1c9c6
jr .asm_46c43 ; 0x45780 jr .asm_45788
.asm_8d8f0 ; 0x45782 .asm_45782
ld hl, RocketHideoutElevatorText_4578b ld hl, RocketHideoutElevatorText_4578b
call PrintText call PrintText
.asm_46c43 ; 0x45788 .asm_45788
jp TextScriptEnd jp TextScriptEnd
RocketHideoutElevatorText_4578b: ; 4578b (11:578b) RocketHideoutElevatorText_4578b: ; 4578b (11:578b)
TX_FAR _RocketElevatorText_4578b ; 0x82438 TX_FAR _RocketElevatorText_4578b
db $d, "@" db $d, "@"

View file

@ -27,101 +27,101 @@ RockTunnel1TrainerHeader1: ; 44505 (11:4505)
db $1 ; flag's bit db $1 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7d2 ; flag's byte dw wd7d2 ; flag's byte
dw RockTunnel1BattleText1 ; 0x4588 TextBeforeBattle dw RockTunnel1BattleText1 ; TextBeforeBattle
dw RockTunnel1AfterBattleText1 ; 0x4592 TextAfterBattle dw RockTunnel1AfterBattleText1 ; TextAfterBattle
dw RockTunnel1EndBattleText1 ; 0x458d TextEndBattle dw RockTunnel1EndBattleText1 ; TextEndBattle
dw RockTunnel1EndBattleText1 ; 0x458d TextEndBattle dw RockTunnel1EndBattleText1 ; TextEndBattle
RockTunnel1TrainerHeader2: ; 44511 (11:4511) RockTunnel1TrainerHeader2: ; 44511 (11:4511)
db $2 ; flag's bit db $2 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7d2 ; flag's byte dw wd7d2 ; flag's byte
dw RockTunnel1BattleText2 ; 0x4597 TextBeforeBattle dw RockTunnel1BattleText2 ; TextBeforeBattle
dw RockTunnel1AfterBattleText2 ; 0x45a1 TextAfterBattle dw RockTunnel1AfterBattleText2 ; TextAfterBattle
dw RockTunnel1EndBattleText2 ; 0x459c TextEndBattle dw RockTunnel1EndBattleText2 ; TextEndBattle
dw RockTunnel1EndBattleText2 ; 0x459c TextEndBattle dw RockTunnel1EndBattleText2 ; TextEndBattle
RockTunnel1TrainerHeader3: ; 4451d (11:451d) RockTunnel1TrainerHeader3: ; 4451d (11:451d)
db $3 ; flag's bit db $3 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7d2 ; flag's byte dw wd7d2 ; flag's byte
dw RockTunnel1BattleText3 ; 0x45a6 TextBeforeBattle dw RockTunnel1BattleText3 ; TextBeforeBattle
dw RockTunnel1AfterBattleText3 ; 0x45b0 TextAfterBattle dw RockTunnel1AfterBattleText3 ; TextAfterBattle
dw RockTunnel1EndBattleText3 ; 0x45ab TextEndBattle dw RockTunnel1EndBattleText3 ; TextEndBattle
dw RockTunnel1EndBattleText3 ; 0x45ab TextEndBattle dw RockTunnel1EndBattleText3 ; TextEndBattle
RockTunnel1TrainerHeader4: ; 44529 (11:4529) RockTunnel1TrainerHeader4: ; 44529 (11:4529)
db $4 ; flag's bit db $4 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7d2 ; flag's byte dw wd7d2 ; flag's byte
dw RockTunnel1BattleText4 ; 0x45b5 TextBeforeBattle dw RockTunnel1BattleText4 ; TextBeforeBattle
dw RockTunnel1AfterBattleText4 ; 0x45bf TextAfterBattle dw RockTunnel1AfterBattleText4 ; TextAfterBattle
dw RockTunnel1EndBattleText4 ; 0x45ba TextEndBattle dw RockTunnel1EndBattleText4 ; TextEndBattle
dw RockTunnel1EndBattleText4 ; 0x45ba TextEndBattle dw RockTunnel1EndBattleText4 ; TextEndBattle
RockTunnel1TrainerHeader5: ; 44535 (11:4535) RockTunnel1TrainerHeader5: ; 44535 (11:4535)
db $5 ; flag's bit db $5 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7d2 ; flag's byte dw wd7d2 ; flag's byte
dw RockTunnel1BattleText5 ; 0x45c4 TextBeforeBattle dw RockTunnel1BattleText5 ; TextBeforeBattle
dw RockTunnel1AfterBattleText5 ; 0x45ce TextAfterBattle dw RockTunnel1AfterBattleText5 ; TextAfterBattle
dw RockTunnel1EndBattleText5 ; 0x45c9 TextEndBattle dw RockTunnel1EndBattleText5 ; TextEndBattle
dw RockTunnel1EndBattleText5 ; 0x45c9 TextEndBattle dw RockTunnel1EndBattleText5 ; TextEndBattle
RockTunnel1TrainerHeader6: ; 44541 (11:4541) RockTunnel1TrainerHeader6: ; 44541 (11:4541)
db $6 ; flag's bit db $6 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7d2 ; flag's byte dw wd7d2 ; flag's byte
dw RockTunnel1BattleText6 ; 0x45d3 TextBeforeBattle dw RockTunnel1BattleText6 ; TextBeforeBattle
dw RockTunnel1AfterBattleText6 ; 0x45dd TextAfterBattle dw RockTunnel1AfterBattleText6 ; TextAfterBattle
dw RockTunnel1EndBattleText6 ; 0x45d8 TextEndBattle dw RockTunnel1EndBattleText6 ; TextEndBattle
dw RockTunnel1EndBattleText6 ; 0x45d8 TextEndBattle dw RockTunnel1EndBattleText6 ; TextEndBattle
RockTunnel1TrainerHeader7: ; 4454d (11:454d) RockTunnel1TrainerHeader7: ; 4454d (11:454d)
db $7 ; flag's bit db $7 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7d2 ; flag's byte dw wd7d2 ; flag's byte
dw RockTunnel1BattleText7 ; 0x45e2 TextBeforeBattle dw RockTunnel1BattleText7 ; TextBeforeBattle
dw RockTunnel1AfterBattleText7 ; 0x45ec TextAfterBattle dw RockTunnel1AfterBattleText7 ; TextAfterBattle
dw RockTunnel1EndBattleText7 ; 0x45e7 TextEndBattle dw RockTunnel1EndBattleText7 ; TextEndBattle
dw RockTunnel1EndBattleText7 ; 0x45e7 TextEndBattle dw RockTunnel1EndBattleText7 ; TextEndBattle
db $ff db $ff
RockTunnel1Text1: ; 4455a (11:455a) RockTunnel1Text1: ; 4455a (11:455a)
db $8 db $8
ld hl, RockTunnel1TrainerHeader1 ; $4505 ld hl, RockTunnel1TrainerHeader1
jr asm_0c916 ; 0x4455e $22 jr RockTunnel1TalkToTrainer
RockTunnel1Text2: ; 44560 (11:4560) RockTunnel1Text2: ; 44560 (11:4560)
db $8 db $8
ld hl, RockTunnel1TrainerHeader2 ; $4511 ld hl, RockTunnel1TrainerHeader2
jr asm_0c916 ; 0x44564 $1c jr RockTunnel1TalkToTrainer
RockTunnel1Text3: ; 44566 (11:4566) RockTunnel1Text3: ; 44566 (11:4566)
db $8 db $8
ld hl, RockTunnel1TrainerHeader3 ; $451d ld hl, RockTunnel1TrainerHeader3
jr asm_0c916 ; 0x4456a $16 jr RockTunnel1TalkToTrainer
RockTunnel1Text4: ; 4456c (11:456c) RockTunnel1Text4: ; 4456c (11:456c)
db $8 db $8
ld hl, RockTunnel1TrainerHeader4 ; $4529 ld hl, RockTunnel1TrainerHeader4
jr asm_0c916 ; 0x44570 $10 jr RockTunnel1TalkToTrainer
RockTunnel1Text5: ; 44572 (11:4572) RockTunnel1Text5: ; 44572 (11:4572)
db $8 db $8
ld hl, RockTunnel1TrainerHeader5 ; $4535 ld hl, RockTunnel1TrainerHeader5
jr asm_0c916 ; 0x44576 $a jr RockTunnel1TalkToTrainer
RockTunnel1Text6: ; 44578 (11:4578) RockTunnel1Text6: ; 44578 (11:4578)
db $8 db $8
ld hl, RockTunnel1TrainerHeader6 ; $4541 ld hl, RockTunnel1TrainerHeader6
jr asm_0c916 ; 0x4457c $4 jr RockTunnel1TalkToTrainer
RockTunnel1Text7: ; 4457e (11:457e) RockTunnel1Text7: ; 4457e (11:457e)
db $8 db $8
ld hl, RockTunnel1TrainerHeader7 ; $454d ld hl, RockTunnel1TrainerHeader7
asm_0c916: ; 44582 (11:4582) RockTunnel1TalkToTrainer: ; 44582 (11:4582)
call TalkToTrainer call TalkToTrainer
jp TextScriptEnd jp TextScriptEnd

View file

@ -27,73 +27,73 @@ RockTunnel2TrainerHeader0: ; 46014 (11:6014)
db $1 ; flag's bit db $1 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd87d ; flag's byte dw wd87d ; flag's byte
dw RockTunnel2BattleText2 ; 0x60c5 TextBeforeBattle dw RockTunnel2BattleText2 ; TextBeforeBattle
dw RockTunnel2AfterBattleText2 ; 0x60cf TextAfterBattle dw RockTunnel2AfterBattleText2 ; TextAfterBattle
dw RockTunnel2EndBattleText2 ; 0x60ca TextEndBattle dw RockTunnel2EndBattleText2 ; TextEndBattle
dw RockTunnel2EndBattleText2 ; 0x60ca TextEndBattle dw RockTunnel2EndBattleText2 ; TextEndBattle
RockTunnel2TrainerHeader2: ; 46020 (11:6020) RockTunnel2TrainerHeader2: ; 46020 (11:6020)
db $2 ; flag's bit db $2 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd87d ; flag's byte dw wd87d ; flag's byte
dw RockTunnel2BattleText3 ; 0x60d4 TextBeforeBattle dw RockTunnel2BattleText3 ; TextBeforeBattle
dw RockTunnel2AfterBattleText3 ; 0x60de TextAfterBattle dw RockTunnel2AfterBattleText3 ; TextAfterBattle
dw RockTunnel2EndBattleText3 ; 0x60d9 TextEndBattle dw RockTunnel2EndBattleText3 ; TextEndBattle
dw RockTunnel2EndBattleText3 ; 0x60d9 TextEndBattle dw RockTunnel2EndBattleText3 ; TextEndBattle
RockTunnel2TrainerHeader3: ; 4602c (11:602c) RockTunnel2TrainerHeader3: ; 4602c (11:602c)
db $3 ; flag's bit db $3 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd87d ; flag's byte dw wd87d ; flag's byte
dw RockTunnel2BattleText4 ; 0x60e3 TextBeforeBattle dw RockTunnel2BattleText4 ; TextBeforeBattle
dw RockTunnel2AfterBattleText4 ; 0x60ed TextAfterBattle dw RockTunnel2AfterBattleText4 ; TextAfterBattle
dw RockTunnel2EndBattleText4 ; 0x60e8 TextEndBattle dw RockTunnel2EndBattleText4 ; TextEndBattle
dw RockTunnel2EndBattleText4 ; 0x60e8 TextEndBattle dw RockTunnel2EndBattleText4 ; TextEndBattle
RockTunnel2TrainerHeader4: ; 46038 (11:6038) RockTunnel2TrainerHeader4: ; 46038 (11:6038)
db $4 ; flag's bit db $4 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd87d ; flag's byte dw wd87d ; flag's byte
dw RockTunnel2BattleText5 ; 0x60f2 TextBeforeBattle dw RockTunnel2BattleText5 ; TextBeforeBattle
dw RockTunnel2AfterBattleText5 ; 0x60fc TextAfterBattle dw RockTunnel2AfterBattleText5 ; TextAfterBattle
dw RockTunnel2EndBattleText5 ; 0x60f7 TextEndBattle dw RockTunnel2EndBattleText5 ; TextEndBattle
dw RockTunnel2EndBattleText5 ; 0x60f7 TextEndBattle dw RockTunnel2EndBattleText5 ; TextEndBattle
RockTunnel2TrainerHeader5: ; 46044 (11:6044) RockTunnel2TrainerHeader5: ; 46044 (11:6044)
db $5 ; flag's bit db $5 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd87d ; flag's byte dw wd87d ; flag's byte
dw RockTunnel2BattleText6 ; 0x6101 TextBeforeBattle dw RockTunnel2BattleText6 ; TextBeforeBattle
dw RockTunnel2AfterBattleText6 ; 0x610b TextAfterBattle dw RockTunnel2AfterBattleText6 ; TextAfterBattle
dw RockTunnel2EndBattleText6 ; 0x6106 TextEndBattle dw RockTunnel2EndBattleText6 ; TextEndBattle
dw RockTunnel2EndBattleText6 ; 0x6106 TextEndBattle dw RockTunnel2EndBattleText6 ; TextEndBattle
RockTunnel2TrainerHeader6: ; 46050 (11:6050) RockTunnel2TrainerHeader6: ; 46050 (11:6050)
db $6 ; flag's bit db $6 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd87d ; flag's byte dw wd87d ; flag's byte
dw RockTunnel2BattleText7 ; 0x6110 TextBeforeBattle dw RockTunnel2BattleText7 ; TextBeforeBattle
dw RockTunnel2AfterBattleText7 ; 0x611a TextAfterBattle dw RockTunnel2AfterBattleText7 ; TextAfterBattle
dw RockTunnel2EndBattleText7 ; 0x6115 TextEndBattle dw RockTunnel2EndBattleText7 ; TextEndBattle
dw RockTunnel2EndBattleText7 ; 0x6115 TextEndBattle dw RockTunnel2EndBattleText7 ; TextEndBattle
RockTunnel2TrainerHeader7: ; 4605c (11:605c) RockTunnel2TrainerHeader7: ; 4605c (11:605c)
db $7 ; flag's bit db $7 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd87d ; flag's byte dw wd87d ; flag's byte
dw RockTunnel2BattleText8 ; 0x611f TextBeforeBattle dw RockTunnel2BattleText8 ; TextBeforeBattle
dw RockTunnel2AfterBattleText8 ; 0x6129 TextAfterBattle dw RockTunnel2AfterBattleText8 ; TextAfterBattle
dw RockTunnel2EndBattleText8 ; 0x6124 TextEndBattle dw RockTunnel2EndBattleText8 ; TextEndBattle
dw RockTunnel2EndBattleText8 ; 0x6124 TextEndBattle dw RockTunnel2EndBattleText8 ; TextEndBattle
RockTunnel2TrainerHeader8: ; 46068 (11:6068) RockTunnel2TrainerHeader8: ; 46068 (11:6068)
db $8 ; flag's bit db $8 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd87d ; flag's byte dw wd87d ; flag's byte
dw RockTunnel2BattleText9 ; 0x612e TextBeforeBattle dw RockTunnel2BattleText9 ; TextBeforeBattle
dw RockTunnel2AfterBattleText9 ; 0x6138 TextAfterBattle dw RockTunnel2AfterBattleText9 ; TextAfterBattle
dw RockTunnel2EndBattleText9 ; 0x6133 TextEndBattle dw RockTunnel2EndBattleText9 ; TextEndBattle
dw RockTunnel2EndBattleText9 ; 0x6133 TextEndBattle dw RockTunnel2EndBattleText9 ; TextEndBattle
db $ff db $ff

View file

@ -11,20 +11,20 @@ Route1Text1: ; 1cab8 (7:4ab8)
ld hl, wd7bf ld hl, wd7bf
bit 0, [hl] bit 0, [hl]
set 0, [hl] set 0, [hl]
jr nz, .asm_02840 ; 0x1cac0 jr nz, .asm_1cada
ld hl, Route1ViridianMartSampleText ld hl, Route1ViridianMartSampleText
call PrintText call PrintText
ld bc, (POTION << 8) | 1 ld bc, (POTION << 8) | 1
call GiveItem call GiveItem
jr nc, .BagFull jr nc, .BagFull
ld hl, Route1Text_1cae8 ; $4ae8 ld hl, Route1Text_1cae8
jr .asm_46d43 ; 0x1cad3 jr .asm_1cadd
.BagFull .BagFull
ld hl, Route1Text_1caf3 ; $4af3 ld hl, Route1Text_1caf3
jr .asm_46d43 ; 0x1cad8 jr .asm_1cadd
.asm_02840 ; 0x1cada .asm_1cada
ld hl, Route1Text_1caee ; $4aee ld hl, Route1Text_1caee
.asm_46d43 ; 0x1cadd .asm_1cadd
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd

View file

@ -29,55 +29,55 @@ Route10TrainerHeader0: ; 59363 (16:5363)
db $1 ; flag's bit db $1 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7d1 ; flag's byte dw wd7d1 ; flag's byte
dw Route10BattleText1 ; 0x53b6 TextBeforeBattle dw Route10BattleText1 ; TextBeforeBattle
dw Route10AfterBattleText1 ; 0x53c0 TextAfterBattle dw Route10AfterBattleText1 ; TextAfterBattle
dw Route10EndBattleText1 ; 0x53bb TextEndBattle dw Route10EndBattleText1 ; TextEndBattle
dw Route10EndBattleText1 ; 0x53bb TextEndBattle dw Route10EndBattleText1 ; TextEndBattle
Route10TrainerHeader1: ; 5936f (16:536f) Route10TrainerHeader1: ; 5936f (16:536f)
db $2 ; flag's bit db $2 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7d1 ; flag's byte dw wd7d1 ; flag's byte
dw Route10BattleText2 ; 0x53cf TextBeforeBattle dw Route10BattleText2 ; TextBeforeBattle
dw Route10AfterBattleText2 ; 0x53d9 TextAfterBattle dw Route10AfterBattleText2 ; TextAfterBattle
dw Route10EndBattleText2 ; 0x53d4 TextEndBattle dw Route10EndBattleText2 ; TextEndBattle
dw Route10EndBattleText2 ; 0x53d4 TextEndBattle dw Route10EndBattleText2 ; TextEndBattle
Route10TrainerHeader2: ; 5937b (16:537b) Route10TrainerHeader2: ; 5937b (16:537b)
db $3 ; flag's bit db $3 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7d1 ; flag's byte dw wd7d1 ; flag's byte
dw Route10BattleText3 ; 0x53e8 TextBeforeBattle dw Route10BattleText3 ; TextBeforeBattle
dw Route10AfterBattleText3 ; 0x53f2 TextAfterBattle dw Route10AfterBattleText3 ; TextAfterBattle
dw Route10EndBattleText3 ; 0x53ed TextEndBattle dw Route10EndBattleText3 ; TextEndBattle
dw Route10EndBattleText3 ; 0x53ed TextEndBattle dw Route10EndBattleText3 ; TextEndBattle
Route10TrainerHeader3: ; 59387 (16:5387) Route10TrainerHeader3: ; 59387 (16:5387)
db $4 ; flag's bit db $4 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7d1 ; flag's byte dw wd7d1 ; flag's byte
dw Route10BattleText4 ; 0x5401 TextBeforeBattle dw Route10BattleText4 ; TextBeforeBattle
dw Route10AfterBattleText4 ; 0x540b TextAfterBattle dw Route10AfterBattleText4 ; TextAfterBattle
dw Route10EndBattleText4 ; 0x5406 TextEndBattle dw Route10EndBattleText4 ; TextEndBattle
dw Route10EndBattleText4 ; 0x5406 TextEndBattle dw Route10EndBattleText4 ; TextEndBattle
Route10TrainerHeader4: ; 59393 (16:5393) Route10TrainerHeader4: ; 59393 (16:5393)
db $5 ; flag's bit db $5 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd7d1 ; flag's byte dw wd7d1 ; flag's byte
dw Route10BattleText5 ; 0x541a TextBeforeBattle dw Route10BattleText5 ; TextBeforeBattle
dw Route10AfterBattleText5 ; 0x5424 TextAfterBattle dw Route10AfterBattleText5 ; TextAfterBattle
dw Route10EndBattleText5 ; 0x541f TextEndBattle dw Route10EndBattleText5 ; TextEndBattle
dw Route10EndBattleText5 ; 0x541f TextEndBattle dw Route10EndBattleText5 ; TextEndBattle
Route10TrainerHeader5: ; 5939f (16:539f) Route10TrainerHeader5: ; 5939f (16:539f)
db $6 ; flag's bit db $6 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd7d1 ; flag's byte dw wd7d1 ; flag's byte
dw Route10BattleText6 ; 0x5433 TextBeforeBattle dw Route10BattleText6 ; TextBeforeBattle
dw Route10AfterBattleText6 ; 0x543d TextAfterBattle dw Route10AfterBattleText6 ; TextAfterBattle
dw Route10EndBattleText6 ; 0x5438 TextEndBattle dw Route10EndBattleText6 ; TextEndBattle
dw Route10EndBattleText6 ; 0x5438 TextEndBattle dw Route10EndBattleText6 ; TextEndBattle
db $ff db $ff

View file

@ -30,91 +30,91 @@ Route11TrainerHeader0: ; 5947b (16:547b)
db $1 ; flag's bit db $1 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7d5 ; flag's byte dw wd7d5 ; flag's byte
dw Route11BattleText1 ; 0x54fe TextBeforeBattle dw Route11BattleText1 ; TextBeforeBattle
dw Route11AfterBattleText1 ; 0x5508 TextAfterBattle dw Route11AfterBattleText1 ; TextAfterBattle
dw Route11EndBattleText1 ; 0x5503 TextEndBattle dw Route11EndBattleText1 ; TextEndBattle
dw Route11EndBattleText1 ; 0x5503 TextEndBattle dw Route11EndBattleText1 ; TextEndBattle
Route11TrainerHeader1: ; 59487 (16:5487) Route11TrainerHeader1: ; 59487 (16:5487)
db $2 ; flag's bit db $2 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd7d5 ; flag's byte dw wd7d5 ; flag's byte
dw Route11BattleText2 ; 0x5517 TextBeforeBattle dw Route11BattleText2 ; TextBeforeBattle
dw Route11AfterBattleText2 ; 0x5521 TextAfterBattle dw Route11AfterBattleText2 ; TextAfterBattle
dw Route11EndBattleText2 ; 0x551c TextEndBattle dw Route11EndBattleText2 ; TextEndBattle
dw Route11EndBattleText2 ; 0x551c TextEndBattle dw Route11EndBattleText2 ; TextEndBattle
Route11TrainerHeader2: ; 59493 (16:5493) Route11TrainerHeader2: ; 59493 (16:5493)
db $3 ; flag's bit db $3 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7d5 ; flag's byte dw wd7d5 ; flag's byte
dw Route11BattleText3 ; 0x5530 TextBeforeBattle dw Route11BattleText3 ; TextBeforeBattle
dw Route11AfterBattleText3 ; 0x553a TextAfterBattle dw Route11AfterBattleText3 ; TextAfterBattle
dw Route11EndBattleText3 ; 0x5535 TextEndBattle dw Route11EndBattleText3 ; TextEndBattle
dw Route11EndBattleText3 ; 0x5535 TextEndBattle dw Route11EndBattleText3 ; TextEndBattle
Route11TrainerHeader3: ; 5949f (16:549f) Route11TrainerHeader3: ; 5949f (16:549f)
db $4 ; flag's bit db $4 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7d5 ; flag's byte dw wd7d5 ; flag's byte
dw Route11BattleText4 ; 0x5549 TextBeforeBattle dw Route11BattleText4 ; TextBeforeBattle
dw Route11AfterBattleText4 ; 0x5553 TextAfterBattle dw Route11AfterBattleText4 ; TextAfterBattle
dw Route11EndBattleText4 ; 0x554e TextEndBattle dw Route11EndBattleText4 ; TextEndBattle
dw Route11EndBattleText4 ; 0x554e TextEndBattle dw Route11EndBattleText4 ; TextEndBattle
Route11TrainerHeader4: ; 594ab (16:54ab) Route11TrainerHeader4: ; 594ab (16:54ab)
db $5 ; flag's bit db $5 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7d5 ; flag's byte dw wd7d5 ; flag's byte
dw Route11BattleText5 ; 0x5562 TextBeforeBattle dw Route11BattleText5 ; TextBeforeBattle
dw Route11AfterBattleText5 ; 0x556c TextAfterBattle dw Route11AfterBattleText5 ; TextAfterBattle
dw Route11EndBattleText5 ; 0x5567 TextEndBattle dw Route11EndBattleText5 ; TextEndBattle
dw Route11EndBattleText5 ; 0x5567 TextEndBattle dw Route11EndBattleText5 ; TextEndBattle
Route11TrainerHeader5: ; 594b7 (16:54b7) Route11TrainerHeader5: ; 594b7 (16:54b7)
db $6 ; flag's bit db $6 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7d5 ; flag's byte dw wd7d5 ; flag's byte
dw Route11BattleText6 ; 0x557b TextBeforeBattle dw Route11BattleText6 ; TextBeforeBattle
dw Route11AfterBattleText6 ; 0x5585 TextAfterBattle dw Route11AfterBattleText6 ; TextAfterBattle
dw Route11EndBattleText6 ; 0x5580 TextEndBattle dw Route11EndBattleText6 ; TextEndBattle
dw Route11EndBattleText6 ; 0x5580 TextEndBattle dw Route11EndBattleText6 ; TextEndBattle
Route11TrainerHeader6: ; 594c3 (16:54c3) Route11TrainerHeader6: ; 594c3 (16:54c3)
db $7 ; flag's bit db $7 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7d5 ; flag's byte dw wd7d5 ; flag's byte
dw Route11BattleText7 ; 0x5594 TextBeforeBattle dw Route11BattleText7 ; TextBeforeBattle
dw Route11AfterBattleText7 ; 0x559e TextAfterBattle dw Route11AfterBattleText7 ; TextAfterBattle
dw Route11EndBattleText7 ; 0x5599 TextEndBattle dw Route11EndBattleText7 ; TextEndBattle
dw Route11EndBattleText7 ; 0x5599 TextEndBattle dw Route11EndBattleText7 ; TextEndBattle
Route11TrainerHeader7: ; 594cf (16:54cf) Route11TrainerHeader7: ; 594cf (16:54cf)
db $8 ; flag's bit db $8 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7d5 ; flag's byte dw wd7d5 ; flag's byte
dw Route11BattleText8 ; 0x55ad TextBeforeBattle dw Route11BattleText8 ; TextBeforeBattle
dw Route11AfterBattleText8 ; 0x55b7 TextAfterBattle dw Route11AfterBattleText8 ; TextAfterBattle
dw Route11EndBattleText8 ; 0x55b2 TextEndBattle dw Route11EndBattleText8 ; TextEndBattle
dw Route11EndBattleText8 ; 0x55b2 TextEndBattle dw Route11EndBattleText8 ; TextEndBattle
Route11TrainerHeader8: ; 594db (16:54db) Route11TrainerHeader8: ; 594db (16:54db)
db $9 ; flag's bit db $9 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7d5 ; flag's byte dw wd7d5 ; flag's byte
dw Route11BattleText9 ; 0x55c6 TextBeforeBattle dw Route11BattleText9 ; TextBeforeBattle
dw Route11AfterBattleText9 ; 0x55d0 TextAfterBattle dw Route11AfterBattleText9 ; TextAfterBattle
dw Route11EndBattleText9 ; 0x55cb TextEndBattle dw Route11EndBattleText9 ; TextEndBattle
dw Route11EndBattleText9 ; 0x55cb TextEndBattle dw Route11EndBattleText9 ; TextEndBattle
Route11TrainerHeader9: ; 594e7 (16:54e7) Route11TrainerHeader9: ; 594e7 (16:54e7)
db $a ; flag's bit db $a ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7d5 ; flag's byte dw wd7d5 ; flag's byte
dw Route11BattleText10 ; 0x55df TextBeforeBattle dw Route11BattleText10 ; TextBeforeBattle
dw Route11AfterBattleText10 ; 0x55e9 TextAfterBattle dw Route11AfterBattleText10 ; TextAfterBattle
dw Route11EndBattleText10 ; 0x55e4 TextEndBattle dw Route11EndBattleText10 ; TextEndBattle
dw Route11EndBattleText10 ; 0x55e4 TextEndBattle dw Route11EndBattleText10 ; TextEndBattle
db $ff db $ff

View file

@ -12,14 +12,14 @@ Route11GateUpstairsText1: ; 4945f (12:545f)
xor a xor a
ld [wWhichTrade], a ld [wWhichTrade], a
predef DoInGameTradeDialogue predef DoInGameTradeDialogue
asm_49469: ; 49469 (12:5469) Route11GateUpstairsScriptEnd: ; 49469 (12:5469)
jp TextScriptEnd jp TextScriptEnd
Route11GateUpstairsText2: ; 4946c (12:546c) Route11GateUpstairsText2: ; 4946c (12:546c)
db $8 db $8
ld a, [wd7d6] ld a, [wd7d6]
add a add a
jr c, .asm_4949b ; 0x49471 $28 jr c, .asm_4949b
ld a, 30 ; pokemon needed ld a, 30 ; pokemon needed
ld [$ffdb], a ld [$ffdb], a
ld a, ITEMFINDER ; oak's aide reward ld a, ITEMFINDER ; oak's aide reward
@ -34,14 +34,14 @@ Route11GateUpstairsText2: ; 4946c (12:546c)
predef OaksAideScript ; call oak's aide script predef OaksAideScript ; call oak's aide script
ld a, [$ffdb] ld a, [$ffdb]
dec a dec a
jr nz, .asm_494a1 ; 0x49494 $b jr nz, .asm_494a1
ld hl, wd7d6 ld hl, wd7d6
set 7, [hl] set 7, [hl]
.asm_4949b .asm_4949b
ld hl, Route11GateUpstairsText_494a3 ld hl, Route11GateUpstairsText_494a3
call PrintText call PrintText
.asm_494a1 .asm_494a1
jr asm_49469 ; 0x494a1 $c6 jr Route11GateUpstairsScriptEnd
Route11GateUpstairsText_494a3: ; 494a3 (12:54a3) Route11GateUpstairsText_494a3: ; 494a3 (12:54a3)
TX_FAR _Route11GateUpstairsText_494a3 TX_FAR _Route11GateUpstairsText_494a3
@ -71,7 +71,7 @@ BinocularsNoSnorlaxText:
Route11GateUpstairsText4: ; 494ce (12:54ce) Route11GateUpstairsText4: ; 494ce (12:54ce)
db $8 db $8
ld hl, Route11GateUpstairsText_494d5 ; $54d5 ld hl, Route11GateUpstairsText_494d5
jp Route12GateUpstairsScript_495c9 jp Route12GateUpstairsScript_495c9
Route11GateUpstairsText_494d5: ; 494d5 (12:54d5) Route11GateUpstairsText_494d5: ; 494d5 (12:54d5)

View file

@ -28,12 +28,12 @@ Route12Script0: ; 59619 (16:5619)
res 6, [hl] res 6, [hl]
jp z, CheckFightingMapTrainers jp z, CheckFightingMapTrainers
ld a, $d ld a, $d
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a
call DisplayTextID call DisplayTextID
ld a, SNORLAX ld a, SNORLAX
ld [W_CUROPPONENT], a ; wd059 ld [W_CUROPPONENT], a
ld a, 30 ld a, 30
ld [W_CURENEMYLVL], a ; W_CURENEMYLVL ld [W_CURENEMYLVL], a
ld a, HS_ROUTE_12_SNORLAX ld a, HS_ROUTE_12_SNORLAX
ld [wcc4d], a ld [wcc4d], a
predef HideObject predef HideObject
@ -43,7 +43,7 @@ Route12Script0: ; 59619 (16:5619)
ret ret
Route12Script3: ; 5964c (16:564c) Route12Script3: ; 5964c (16:564c)
ld a, [W_ISINBATTLE] ; W_ISINBATTLE ld a, [W_ISINBATTLE]
cp $ff cp $ff
jr z, Route12Script_59606 jr z, Route12Script_59606
call UpdateSprites call UpdateSprites
@ -51,7 +51,7 @@ Route12Script3: ; 5964c (16:564c)
cp $2 cp $2
jr z, .asm_59664 jr z, .asm_59664
ld a, $e ld a, $e
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a
call DisplayTextID call DisplayTextID
.asm_59664 .asm_59664
ld hl, wd7d8 ld hl, wd7d8
@ -83,64 +83,64 @@ Route12TrainerHeader0: ; 59691 (16:5691)
db $2 ; flag's bit db $2 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7d7 ; flag's byte dw wd7d7 ; flag's byte
dw Route12BattleText1 ; 0x56ff TextBeforeBattle dw Route12BattleText1 ; TextBeforeBattle
dw Route12AfterBattleText1 ; 0x5709 TextAfterBattle dw Route12AfterBattleText1 ; TextAfterBattle
dw Route12EndBattleText1 ; 0x5704 TextEndBattle dw Route12EndBattleText1 ; TextEndBattle
dw Route12EndBattleText1 ; 0x5704 TextEndBattle dw Route12EndBattleText1 ; TextEndBattle
Route12TrainerHeader1: ; 5969d (16:569d) Route12TrainerHeader1: ; 5969d (16:569d)
db $3 ; flag's bit db $3 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7d7 ; flag's byte dw wd7d7 ; flag's byte
dw Route12BattleText2 ; 0x5718 TextBeforeBattle dw Route12BattleText2 ; TextBeforeBattle
dw Route12AfterBattleText2 ; 0x5722 TextAfterBattle dw Route12AfterBattleText2 ; TextAfterBattle
dw Route12EndBattleText2 ; 0x571d TextEndBattle dw Route12EndBattleText2 ; TextEndBattle
dw Route12EndBattleText2 ; 0x571d TextEndBattle dw Route12EndBattleText2 ; TextEndBattle
Route12TrainerHeader2: ; 596a9 (16:56a9) Route12TrainerHeader2: ; 596a9 (16:56a9)
db $4 ; flag's bit db $4 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7d7 ; flag's byte dw wd7d7 ; flag's byte
dw Route12BattleText3 ; 0x5731 TextBeforeBattle dw Route12BattleText3 ; TextBeforeBattle
dw Route12AfterBattleText3 ; 0x573b TextAfterBattle dw Route12AfterBattleText3 ; TextAfterBattle
dw Route12EndBattleText3 ; 0x5736 TextEndBattle dw Route12EndBattleText3 ; TextEndBattle
dw Route12EndBattleText3 ; 0x5736 TextEndBattle dw Route12EndBattleText3 ; TextEndBattle
Route12TrainerHeader3: ; 596b5 (16:56b5) Route12TrainerHeader3: ; 596b5 (16:56b5)
db $5 ; flag's bit db $5 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7d7 ; flag's byte dw wd7d7 ; flag's byte
dw Route12BattleText4 ; 0x574a TextBeforeBattle dw Route12BattleText4 ; TextBeforeBattle
dw Route12AfterBattleText4 ; 0x5754 TextAfterBattle dw Route12AfterBattleText4 ; TextAfterBattle
dw Route12EndBattleText4 ; 0x574f TextEndBattle dw Route12EndBattleText4 ; TextEndBattle
dw Route12EndBattleText4 ; 0x574f TextEndBattle dw Route12EndBattleText4 ; TextEndBattle
Route12TrainerHeader4: ; 596c1 (16:56c1) Route12TrainerHeader4: ; 596c1 (16:56c1)
db $6 ; flag's bit db $6 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7d7 ; flag's byte dw wd7d7 ; flag's byte
dw Route12BattleText5 ; 0x5763 TextBeforeBattle dw Route12BattleText5 ; TextBeforeBattle
dw Route12AfterBattleText5 ; 0x576d TextAfterBattle dw Route12AfterBattleText5 ; TextAfterBattle
dw Route12EndBattleText5 ; 0x5768 TextEndBattle dw Route12EndBattleText5 ; TextEndBattle
dw Route12EndBattleText5 ; 0x5768 TextEndBattle dw Route12EndBattleText5 ; TextEndBattle
Route12TrainerHeader5: ; 596cd (16:56cd) Route12TrainerHeader5: ; 596cd (16:56cd)
db $7 ; flag's bit db $7 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7d7 ; flag's byte dw wd7d7 ; flag's byte
dw Route12BattleText6 ; 0x577c TextBeforeBattle dw Route12BattleText6 ; TextBeforeBattle
dw Route12AfterBattleText6 ; 0x5786 TextAfterBattle dw Route12AfterBattleText6 ; TextAfterBattle
dw Route12EndBattleText6 ; 0x5781 TextEndBattle dw Route12EndBattleText6 ; TextEndBattle
dw Route12EndBattleText6 ; 0x5781 TextEndBattle dw Route12EndBattleText6 ; TextEndBattle
Route12TrainerHeader6: ; 596d9 (16:56d9) Route12TrainerHeader6: ; 596d9 (16:56d9)
db $8 ; flag's bit db $8 ; flag's bit
db ($1 << 4) ; trainer's view range db ($1 << 4) ; trainer's view range
dw wd7d7 ; flag's byte dw wd7d7 ; flag's byte
dw Route12BattleText7 ; 0x5795 TextBeforeBattle dw Route12BattleText7 ; TextBeforeBattle
dw Route12AfterBattleText7 ; 0x579f TextAfterBattle dw Route12AfterBattleText7 ; TextAfterBattle
dw Route12EndBattleText7 ; 0x579a TextEndBattle dw Route12EndBattleText7 ; TextEndBattle
dw Route12EndBattleText7 ; 0x579a TextEndBattle dw Route12EndBattleText7 ; TextEndBattle
db $ff db $ff

View file

@ -10,7 +10,7 @@ Route12GateUpstairsText1: ; 49569 (12:5569)
db $08 ; asm db $08 ; asm
ld a, [wd7d7] ld a, [wd7d7]
rrca rrca
jr c, .asm_0ad3c ; 0x4956e jr c, .asm_0ad3c
ld hl, TM39PreReceiveText ld hl, TM39PreReceiveText
call PrintText call PrintText
ld bc, (TM_39 << 8) | 1 ld bc, (TM_39 << 8) | 1
@ -20,15 +20,15 @@ Route12GateUpstairsText1: ; 49569 (12:5569)
call PrintText call PrintText
ld hl, wd7d7 ld hl, wd7d7
set 0, [hl] set 0, [hl]
jr .asm_4ba56 ; 0x49589 jr .asm_4ba56
.BagFull .BagFull
ld hl, TM39NoRoomText ld hl, TM39NoRoomText
call PrintText call PrintText
jr .asm_4ba56 ; 0x49591 jr .asm_4ba56
.asm_0ad3c ; 0x49593 .asm_0ad3c
ld hl, TM39ExplanationText ld hl, TM39ExplanationText
call PrintText call PrintText
.asm_4ba56 ; 0x49599 .asm_4ba56
jp TextScriptEnd jp TextScriptEnd
TM39PreReceiveText: ; 4959c (12:559c) TM39PreReceiveText: ; 4959c (12:559c)
@ -68,9 +68,9 @@ Route12GateUpstairsText_495c4: ; 495c4 (12:55c4)
Route12GateUpstairsScript_495c9: ; 495c9 (12:55c9) Route12GateUpstairsScript_495c9: ; 495c9 (12:55c9)
ld a, [wSpriteStateData1 + 9] ld a, [wSpriteStateData1 + 9]
cp $4 cp $4
jr z, .asm_495d4 ; 0x495ce $4 jr z, .asm_495d4
ld a, $1 ld a, $1
jr .asm_495d8 ; 0x495d2 $4 jr .asm_495d8
.asm_495d4 .asm_495d4
call PrintText call PrintText
xor a xor a

View file

@ -27,7 +27,7 @@ Route12HouseText1: ; 56484 (15:6484)
jr .asm_df984 jr .asm_df984
.asm_a2d76 .asm_a2d76
ld hl, Route12HouseText_564cf ld hl, Route12HouseText_564cf
jr .asm_df984 ; 0x564b5 jr .asm_df984
.asm_b4cad .asm_b4cad
ld hl, Route12HouseText_564d4 ld hl, Route12HouseText_564d4
.asm_df984 .asm_df984
@ -39,9 +39,9 @@ Route12HouseText_564c0: ; 564c0 (15:64c0)
db "@" db "@"
Route12HouseText_564c5: ; 564c5 (15:64c5) Route12HouseText_564c5: ; 564c5 (15:64c5)
TX_FAR _Route12HouseText_564c5 ; 0x8ca00 TX_FAR _Route12HouseText_564c5
db $0B db $0B
TX_FAR _Route12HouseText_564ca ; 0x8ca4f TX_FAR _Route12HouseText_564ca
db "@" db "@"
Route12HouseText_564cf: ; 564cf (15:64cf) Route12HouseText_564cf: ; 564cf (15:64cf)

View file

@ -32,91 +32,91 @@ Route13TrainerHeader0: ; 55851 (15:5851)
db $1 ; flag's bit db $1 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd7d9 ; flag's byte dw wd7d9 ; flag's byte
dw Route13BattleText2 ; 0x58d4 TextBeforeBattle dw Route13BattleText2 ; TextBeforeBattle
dw Route13AfterBattleText2 ; 0x58de TextAfterBattle dw Route13AfterBattleText2 ; TextAfterBattle
dw Route13EndBattleText2 ; 0x58d9 TextEndBattle dw Route13EndBattleText2 ; TextEndBattle
dw Route13EndBattleText2 ; 0x58d9 TextEndBattle dw Route13EndBattleText2 ; TextEndBattle
Route13TrainerHeader2: ; 5585d (15:585d) Route13TrainerHeader2: ; 5585d (15:585d)
db $2 ; flag's bit db $2 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd7d9 ; flag's byte dw wd7d9 ; flag's byte
dw Route13BattleText3 ; 0x58ed TextBeforeBattle dw Route13BattleText3 ; TextBeforeBattle
dw Route13AfterBattleText3 ; 0x58f7 TextAfterBattle dw Route13AfterBattleText3 ; TextAfterBattle
dw Route13EndBattleText3 ; 0x58f2 TextEndBattle dw Route13EndBattleText3 ; TextEndBattle
dw Route13EndBattleText3 ; 0x58f2 TextEndBattle dw Route13EndBattleText3 ; TextEndBattle
Route13TrainerHeader3: ; 55869 (15:5869) Route13TrainerHeader3: ; 55869 (15:5869)
db $3 ; flag's bit db $3 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd7d9 ; flag's byte dw wd7d9 ; flag's byte
dw Route13BattleText4 ; 0x5906 TextBeforeBattle dw Route13BattleText4 ; TextBeforeBattle
dw Route13AfterBattleText4 ; 0x5910 TextAfterBattle dw Route13AfterBattleText4 ; TextAfterBattle
dw Route13EndBattleText4 ; 0x590b TextEndBattle dw Route13EndBattleText4 ; TextEndBattle
dw Route13EndBattleText4 ; 0x590b TextEndBattle dw Route13EndBattleText4 ; TextEndBattle
Route13TrainerHeader4: ; 55875 (15:5875) Route13TrainerHeader4: ; 55875 (15:5875)
db $4 ; flag's bit db $4 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd7d9 ; flag's byte dw wd7d9 ; flag's byte
dw Route13BattleText5 ; 0x591f TextBeforeBattle dw Route13BattleText5 ; TextBeforeBattle
dw Route13AfterBattleText5 ; 0x5929 TextAfterBattle dw Route13AfterBattleText5 ; TextAfterBattle
dw Route13EndBattleText5 ; 0x5924 TextEndBattle dw Route13EndBattleText5 ; TextEndBattle
dw Route13EndBattleText5 ; 0x5924 TextEndBattle dw Route13EndBattleText5 ; TextEndBattle
Route13TrainerHeader5: ; 55881 (15:5881) Route13TrainerHeader5: ; 55881 (15:5881)
db $5 ; flag's bit db $5 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7d9 ; flag's byte dw wd7d9 ; flag's byte
dw Route13BattleText6 ; 0x5938 TextBeforeBattle dw Route13BattleText6 ; TextBeforeBattle
dw Route13AfterBattleText6 ; 0x5942 TextAfterBattle dw Route13AfterBattleText6 ; TextAfterBattle
dw Route13EndBattleText6 ; 0x593d TextEndBattle dw Route13EndBattleText6 ; TextEndBattle
dw Route13EndBattleText6 ; 0x593d TextEndBattle dw Route13EndBattleText6 ; TextEndBattle
Route13TrainerHeader6: ; 5588d (15:588d) Route13TrainerHeader6: ; 5588d (15:588d)
db $6 ; flag's bit db $6 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd7d9 ; flag's byte dw wd7d9 ; flag's byte
dw Route13BattleText7 ; 0x5951 TextBeforeBattle dw Route13BattleText7 ; TextBeforeBattle
dw Route13AfterBattleText7 ; 0x595b TextAfterBattle dw Route13AfterBattleText7 ; TextAfterBattle
dw Route13EndBattleText7 ; 0x5956 TextEndBattle dw Route13EndBattleText7 ; TextEndBattle
dw Route13EndBattleText7 ; 0x5956 TextEndBattle dw Route13EndBattleText7 ; TextEndBattle
Route13TrainerHeader7: ; 55899 (15:5899) Route13TrainerHeader7: ; 55899 (15:5899)
db $7 ; flag's bit db $7 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7d9 ; flag's byte dw wd7d9 ; flag's byte
dw Route13BattleText8 ; 0x596a TextBeforeBattle dw Route13BattleText8 ; TextBeforeBattle
dw Route13AfterBattleText8 ; 0x5974 TextAfterBattle dw Route13AfterBattleText8 ; TextAfterBattle
dw Route13EndBattleText8 ; 0x596f TextEndBattle dw Route13EndBattleText8 ; TextEndBattle
dw Route13EndBattleText8 ; 0x596f TextEndBattle dw Route13EndBattleText8 ; TextEndBattle
Route13TrainerHeader8: ; 558a5 (15:58a5) Route13TrainerHeader8: ; 558a5 (15:58a5)
db $8 ; flag's bit db $8 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd7d9 ; flag's byte dw wd7d9 ; flag's byte
dw Route13BattleText9 ; 0x5983 TextBeforeBattle dw Route13BattleText9 ; TextBeforeBattle
dw Route13AfterBattleText9 ; 0x598d TextAfterBattle dw Route13AfterBattleText9 ; TextAfterBattle
dw Route13EndBattleText9 ; 0x5988 TextEndBattle dw Route13EndBattleText9 ; TextEndBattle
dw Route13EndBattleText9 ; 0x5988 TextEndBattle dw Route13EndBattleText9 ; TextEndBattle
Route13TrainerHeader9: ; 558b1 (15:58b1) Route13TrainerHeader9: ; 558b1 (15:58b1)
db $9 ; flag's bit db $9 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd7d9 ; flag's byte dw wd7d9 ; flag's byte
dw Route13BattleText10 ; 0x599c TextBeforeBattle dw Route13BattleText10 ; TextBeforeBattle
dw Route13AfterBattleText10 ; 0x59a6 TextAfterBattle dw Route13AfterBattleText10 ; TextAfterBattle
dw Route13EndBattleText10 ; 0x59a1 TextEndBattle dw Route13EndBattleText10 ; TextEndBattle
dw Route13EndBattleText10 ; 0x59a1 TextEndBattle dw Route13EndBattleText10 ; TextEndBattle
Route13TrainerHeader10: ; 558bd (15:58bd) Route13TrainerHeader10: ; 558bd (15:58bd)
db $a ; flag's bit db $a ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7d9 ; flag's byte dw wd7d9 ; flag's byte
dw Route13BattleText11 ; 0x59b5 TextBeforeBattle dw Route13BattleText11 ; TextBeforeBattle
dw Route13AfterBattleText11 ; 0x59bf TextAfterBattle dw Route13AfterBattleText11 ; TextAfterBattle
dw Route13EndBattleText11 ; 0x59ba TextEndBattle dw Route13EndBattleText11 ; TextEndBattle
dw Route13EndBattleText11 ; 0x59ba TextEndBattle dw Route13EndBattleText11 ; TextEndBattle
db $ff db $ff

View file

@ -30,91 +30,91 @@ Route14TrainerHeader0: ; 55a02 (15:5a02)
db $1 ; flag's bit db $1 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd7db ; flag's byte dw wd7db ; flag's byte
dw Route14BattleText1 ; 0x5a85 TextBeforeBattle dw Route14BattleText1 ; TextBeforeBattle
dw Route14AfterBattleText1 ; 0x5a8f TextAfterBattle dw Route14AfterBattleText1 ; TextAfterBattle
dw Route14EndBattleText1 ; 0x5a8a TextEndBattle dw Route14EndBattleText1 ; TextEndBattle
dw Route14EndBattleText1 ; 0x5a8a TextEndBattle dw Route14EndBattleText1 ; TextEndBattle
Route14TrainerHeader1: ; 55a0e (15:5a0e) Route14TrainerHeader1: ; 55a0e (15:5a0e)
db $2 ; flag's bit db $2 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd7db ; flag's byte dw wd7db ; flag's byte
dw Route14BattleText2 ; 0x5a9e TextBeforeBattle dw Route14BattleText2 ; TextBeforeBattle
dw Route14AfterBattleText2 ; 0x5aa8 TextAfterBattle dw Route14AfterBattleText2 ; TextAfterBattle
dw Route14EndBattleText2 ; 0x5aa3 TextEndBattle dw Route14EndBattleText2 ; TextEndBattle
dw Route14EndBattleText2 ; 0x5aa3 TextEndBattle dw Route14EndBattleText2 ; TextEndBattle
Route14TrainerHeader2: ; 55a1a (15:5a1a) Route14TrainerHeader2: ; 55a1a (15:5a1a)
db $3 ; flag's bit db $3 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7db ; flag's byte dw wd7db ; flag's byte
dw Route14BattleText3 ; 0x5ab7 TextBeforeBattle dw Route14BattleText3 ; TextBeforeBattle
dw Route14AfterBattleText3 ; 0x5ac1 TextAfterBattle dw Route14AfterBattleText3 ; TextAfterBattle
dw Route14EndBattleText3 ; 0x5abc TextEndBattle dw Route14EndBattleText3 ; TextEndBattle
dw Route14EndBattleText3 ; 0x5abc TextEndBattle dw Route14EndBattleText3 ; TextEndBattle
Route14TrainerHeader3: ; 55a26 (15:5a26) Route14TrainerHeader3: ; 55a26 (15:5a26)
db $4 ; flag's bit db $4 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7db ; flag's byte dw wd7db ; flag's byte
dw Route14BattleText4 ; 0x5ad0 TextBeforeBattle dw Route14BattleText4 ; TextBeforeBattle
dw Route14AfterBattleText4 ; 0x5ada TextAfterBattle dw Route14AfterBattleText4 ; TextAfterBattle
dw Route14EndBattleText4 ; 0x5ad5 TextEndBattle dw Route14EndBattleText4 ; TextEndBattle
dw Route14EndBattleText4 ; 0x5ad5 TextEndBattle dw Route14EndBattleText4 ; TextEndBattle
Route14TrainerHeader4: ; 55a32 (15:5a32) Route14TrainerHeader4: ; 55a32 (15:5a32)
db $5 ; flag's bit db $5 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7db ; flag's byte dw wd7db ; flag's byte
dw Route14BattleText5 ; 0x5ae9 TextBeforeBattle dw Route14BattleText5 ; TextBeforeBattle
dw Route14AfterBattleText5 ; 0x5af3 TextAfterBattle dw Route14AfterBattleText5 ; TextAfterBattle
dw Route14EndBattleText5 ; 0x5aee TextEndBattle dw Route14EndBattleText5 ; TextEndBattle
dw Route14EndBattleText5 ; 0x5aee TextEndBattle dw Route14EndBattleText5 ; TextEndBattle
Route14TrainerHeader5: ; 55a3e (15:5a3e) Route14TrainerHeader5: ; 55a3e (15:5a3e)
db $6 ; flag's bit db $6 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7db ; flag's byte dw wd7db ; flag's byte
dw Route14BattleText6 ; 0x5b02 TextBeforeBattle dw Route14BattleText6 ; TextBeforeBattle
dw Route14AfterBattleText6 ; 0x5b0c TextAfterBattle dw Route14AfterBattleText6 ; TextAfterBattle
dw Route14EndBattleText6 ; 0x5b07 TextEndBattle dw Route14EndBattleText6 ; TextEndBattle
dw Route14EndBattleText6 ; 0x5b07 TextEndBattle dw Route14EndBattleText6 ; TextEndBattle
Route14TrainerHeader6: ; 55a4a (15:5a4a) Route14TrainerHeader6: ; 55a4a (15:5a4a)
db $7 ; flag's bit db $7 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7db ; flag's byte dw wd7db ; flag's byte
dw Route14BattleText7 ; 0x5b1b TextBeforeBattle dw Route14BattleText7 ; TextBeforeBattle
dw Route14AfterBattleText7 ; 0x5b25 TextAfterBattle dw Route14AfterBattleText7 ; TextAfterBattle
dw Route14EndBattleText7 ; 0x5b20 TextEndBattle dw Route14EndBattleText7 ; TextEndBattle
dw Route14EndBattleText7 ; 0x5b20 TextEndBattle dw Route14EndBattleText7 ; TextEndBattle
Route14TrainerHeader7: ; 55a56 (15:5a56) Route14TrainerHeader7: ; 55a56 (15:5a56)
db $8 ; flag's bit db $8 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7db ; flag's byte dw wd7db ; flag's byte
dw Route14BattleText8 ; 0x5b34 TextBeforeBattle dw Route14BattleText8 ; TextBeforeBattle
dw Route14AfterBattleText8 ; 0x5b3e TextAfterBattle dw Route14AfterBattleText8 ; TextAfterBattle
dw Route14EndBattleText8 ; 0x5b39 TextEndBattle dw Route14EndBattleText8 ; TextEndBattle
dw Route14EndBattleText8 ; 0x5b39 TextEndBattle dw Route14EndBattleText8 ; TextEndBattle
Route14TrainerHeader8: ; 55a62 (15:5a62) Route14TrainerHeader8: ; 55a62 (15:5a62)
db $9 ; flag's bit db $9 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7db ; flag's byte dw wd7db ; flag's byte
dw Route14BattleText9 ; 0x5b4d TextBeforeBattle dw Route14BattleText9 ; TextBeforeBattle
dw Route14AfterBattleText9 ; 0x5b57 TextAfterBattle dw Route14AfterBattleText9 ; TextAfterBattle
dw Route14EndBattleText9 ; 0x5b52 TextEndBattle dw Route14EndBattleText9 ; TextEndBattle
dw Route14EndBattleText9 ; 0x5b52 TextEndBattle dw Route14EndBattleText9 ; TextEndBattle
Route14TrainerHeader9: ; 55a6e (15:5a6e) Route14TrainerHeader9: ; 55a6e (15:5a6e)
db $a ; flag's bit db $a ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7db ; flag's byte dw wd7db ; flag's byte
dw Route14BattleText10 ; 0x5b66 TextBeforeBattle dw Route14BattleText10 ; TextBeforeBattle
dw Route14AfterBattleText10 ; 0x5b70 TextAfterBattle dw Route14AfterBattleText10 ; TextAfterBattle
dw Route14EndBattleText10 ; 0x5b6b TextEndBattle dw Route14EndBattleText10 ; TextEndBattle
dw Route14EndBattleText10 ; 0x5b6b TextEndBattle dw Route14EndBattleText10 ; TextEndBattle
db $ff db $ff

View file

@ -31,143 +31,143 @@ Route15TrainerHeader0: ; 597df (16:57df)
db $1 ; flag's bit db $1 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd7dd ; flag's byte dw wd7dd ; flag's byte
dw Route15BattleText1 ; 0x5898 TextBeforeBattle dw Route15BattleText1 ; TextBeforeBattle
dw Route15AfterBattleText1 ; 0x58a2 TextAfterBattle dw Route15AfterBattleText1 ; TextAfterBattle
dw Route15EndBattleText1 ; 0x589d TextEndBattle dw Route15EndBattleText1 ; TextEndBattle
dw Route15EndBattleText1 ; 0x589d TextEndBattle dw Route15EndBattleText1 ; TextEndBattle
Route15TrainerHeader1: ; 597eb (16:57eb) Route15TrainerHeader1: ; 597eb (16:57eb)
db $2 ; flag's bit db $2 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7dd ; flag's byte dw wd7dd ; flag's byte
dw Route15BattleText2 ; 0x58a7 TextBeforeBattle dw Route15BattleText2 ; TextBeforeBattle
dw Route15AfterBattleText2 ; 0x58b1 TextAfterBattle dw Route15AfterBattleText2 ; TextAfterBattle
dw Route15EndBattleText2 ; 0x58ac TextEndBattle dw Route15EndBattleText2 ; TextEndBattle
dw Route15EndBattleText2 ; 0x58ac TextEndBattle dw Route15EndBattleText2 ; TextEndBattle
Route15TrainerHeader2: ; 597f7 (16:57f7) Route15TrainerHeader2: ; 597f7 (16:57f7)
db $3 ; flag's bit db $3 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7dd ; flag's byte dw wd7dd ; flag's byte
dw Route15BattleText3 ; 0x58b6 TextBeforeBattle dw Route15BattleText3 ; TextBeforeBattle
dw Route15AfterBattleText3 ; 0x58c0 TextAfterBattle dw Route15AfterBattleText3 ; TextAfterBattle
dw Route15EndBattleText3 ; 0x58bb TextEndBattle dw Route15EndBattleText3 ; TextEndBattle
dw Route15EndBattleText3 ; 0x58bb TextEndBattle dw Route15EndBattleText3 ; TextEndBattle
Route15TrainerHeader3: ; 59803 (16:5803) Route15TrainerHeader3: ; 59803 (16:5803)
db $4 ; flag's bit db $4 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7dd ; flag's byte dw wd7dd ; flag's byte
dw Route15BattleText4 ; 0x58c5 TextBeforeBattle dw Route15BattleText4 ; TextBeforeBattle
dw Route15AfterBattleText4 ; 0x58cf TextAfterBattle dw Route15AfterBattleText4 ; TextAfterBattle
dw Route15EndBattleText4 ; 0x58ca TextEndBattle dw Route15EndBattleText4 ; TextEndBattle
dw Route15EndBattleText4 ; 0x58ca TextEndBattle dw Route15EndBattleText4 ; TextEndBattle
Route15TrainerHeader4: ; 5980f (16:580f) Route15TrainerHeader4: ; 5980f (16:580f)
db $5 ; flag's bit db $5 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd7dd ; flag's byte dw wd7dd ; flag's byte
dw Route15BattleText5 ; 0x58d4 TextBeforeBattle dw Route15BattleText5 ; TextBeforeBattle
dw Route15AfterBattleText5 ; 0x58de TextAfterBattle dw Route15AfterBattleText5 ; TextAfterBattle
dw Route15EndBattleText5 ; 0x58d9 TextEndBattle dw Route15EndBattleText5 ; TextEndBattle
dw Route15EndBattleText5 ; 0x58d9 TextEndBattle dw Route15EndBattleText5 ; TextEndBattle
Route15TrainerHeader5: ; 5981b (16:581b) Route15TrainerHeader5: ; 5981b (16:581b)
db $6 ; flag's bit db $6 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7dd ; flag's byte dw wd7dd ; flag's byte
dw Route15BattleText6 ; 0x58e3 TextBeforeBattle dw Route15BattleText6 ; TextBeforeBattle
dw Route15AfterBattleText6 ; 0x58ed TextAfterBattle dw Route15AfterBattleText6 ; TextAfterBattle
dw Route15EndBattleText6 ; 0x58e8 TextEndBattle dw Route15EndBattleText6 ; TextEndBattle
dw Route15EndBattleText6 ; 0x58e8 TextEndBattle dw Route15EndBattleText6 ; TextEndBattle
Route15TrainerHeader6: ; 59827 (16:5827) Route15TrainerHeader6: ; 59827 (16:5827)
db $7 ; flag's bit db $7 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7dd ; flag's byte dw wd7dd ; flag's byte
dw Route15BattleText7 ; 0x58f2 TextBeforeBattle dw Route15BattleText7 ; TextBeforeBattle
dw Route15AfterBattleText7 ; 0x58fc TextAfterBattle dw Route15AfterBattleText7 ; TextAfterBattle
dw Route15EndBattleText7 ; 0x58f7 TextEndBattle dw Route15EndBattleText7 ; TextEndBattle
dw Route15EndBattleText7 ; 0x58f7 TextEndBattle dw Route15EndBattleText7 ; TextEndBattle
Route15TrainerHeader7: ; 59833 (16:5833) Route15TrainerHeader7: ; 59833 (16:5833)
db $8 ; flag's bit db $8 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7dd ; flag's byte dw wd7dd ; flag's byte
dw Route15BattleText8 ; 0x5901 TextBeforeBattle dw Route15BattleText8 ; TextBeforeBattle
dw Route15AfterBattleText8 ; 0x590b TextAfterBattle dw Route15AfterBattleText8 ; TextAfterBattle
dw Route15EndBattleText8 ; 0x5906 TextEndBattle dw Route15EndBattleText8 ; TextEndBattle
dw Route15EndBattleText8 ; 0x5906 TextEndBattle dw Route15EndBattleText8 ; TextEndBattle
Route15TrainerHeader8: ; 5983f (16:583f) Route15TrainerHeader8: ; 5983f (16:583f)
db $9 ; flag's bit db $9 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7dd ; flag's byte dw wd7dd ; flag's byte
dw Route15BattleText9 ; 0x5910 TextBeforeBattle dw Route15BattleText9 ; TextBeforeBattle
dw Route15AfterBattleText9 ; 0x591a TextAfterBattle dw Route15AfterBattleText9 ; TextAfterBattle
dw Route15EndBattleText9 ; 0x5915 TextEndBattle dw Route15EndBattleText9 ; TextEndBattle
dw Route15EndBattleText9 ; 0x5915 TextEndBattle dw Route15EndBattleText9 ; TextEndBattle
Route15TrainerHeader9: ; 5984b (16:584b) Route15TrainerHeader9: ; 5984b (16:584b)
db $a ; flag's bit db $a ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7dd ; flag's byte dw wd7dd ; flag's byte
dw Route15BattleText10 ; 0x591f TextBeforeBattle dw Route15BattleText10 ; TextBeforeBattle
dw Route15AfterBattleText10 ; 0x5929 TextAfterBattle dw Route15AfterBattleText10 ; TextAfterBattle
dw Route15EndBattleText10 ; 0x5924 TextEndBattle dw Route15EndBattleText10 ; TextEndBattle
dw Route15EndBattleText10 ; 0x5924 TextEndBattle dw Route15EndBattleText10 ; TextEndBattle
db $ff db $ff
Route15Text1: ; 59858 (16:5858) Route15Text1: ; 59858 (16:5858)
db $8 ; asm db $8 ; asm
ld hl, Route15TrainerHeader0 ld hl, Route15TrainerHeader0
jr asm_33cb7 ; 0x5985c $34 jr Route15TalkToTrainer
Route15Text2: ; 5985e (16:585e) Route15Text2: ; 5985e (16:585e)
db $8 ; asm db $8 ; asm
ld hl, Route15TrainerHeader1 ld hl, Route15TrainerHeader1
jr asm_33cb7 ; 0x59862 $2e jr Route15TalkToTrainer
Route15Text3: ; 59864 (16:5864) Route15Text3: ; 59864 (16:5864)
db $8 ; asm db $8 ; asm
ld hl, Route15TrainerHeader2 ld hl, Route15TrainerHeader2
jr asm_33cb7 ; 0x59868 $28 jr Route15TalkToTrainer
Route15Text4: ; 5986a (16:586a) Route15Text4: ; 5986a (16:586a)
db $8 ; asm db $8 ; asm
ld hl, Route15TrainerHeader3 ld hl, Route15TrainerHeader3
jr asm_33cb7 ; 0x5986e $22 jr Route15TalkToTrainer
Route15Text5: ; 59870 (16:5870) Route15Text5: ; 59870 (16:5870)
db $8 ; asm db $8 ; asm
ld hl, Route15TrainerHeader4 ld hl, Route15TrainerHeader4
jr asm_33cb7 ; 0x59874 $1c jr Route15TalkToTrainer
Route15Text6: ; 59876 (16:5876) Route15Text6: ; 59876 (16:5876)
db $8 ; asm db $8 ; asm
ld hl, Route15TrainerHeader5 ld hl, Route15TrainerHeader5
jr asm_33cb7 ; 0x5987a $16 jr Route15TalkToTrainer
Route15Text7: ; 5987c (16:587c) Route15Text7: ; 5987c (16:587c)
db $8 ; asm db $8 ; asm
ld hl, Route15TrainerHeader6 ld hl, Route15TrainerHeader6
jr asm_33cb7 ; 0x59880 $10 jr Route15TalkToTrainer
Route15Text8: ; 59882 (16:5882) Route15Text8: ; 59882 (16:5882)
db $8 ; asm db $8 ; asm
ld hl, Route15TrainerHeader7 ld hl, Route15TrainerHeader7
jr asm_33cb7 ; 0x59886 $a jr Route15TalkToTrainer
Route15Text9: ; 59888 (16:5888) Route15Text9: ; 59888 (16:5888)
db $8 ; asm db $8 ; asm
ld hl, Route15TrainerHeader8 ld hl, Route15TrainerHeader8
jr asm_33cb7 ; 0x5988c $4 jr Route15TalkToTrainer
Route15Text10: ; 5988e (16:588e) Route15Text10: ; 5988e (16:588e)
db $8 ; asm db $8 ; asm
ld hl, Route15TrainerHeader9 ld hl, Route15TrainerHeader9
asm_33cb7: ; 59892 (16:5892) Route15TalkToTrainer: ; 59892 (16:5892)
call TalkToTrainer call TalkToTrainer
jp TextScriptEnd jp TextScriptEnd

View file

@ -9,7 +9,7 @@ Route15GateUpstairsText1: ; 49651 (12:5651)
db $8 db $8
ld a, [wd7dd] ld a, [wd7dd]
bit 0, a bit 0, a
jr nz, .asm_49683 ; 0x49657 $2a jr nz, .asm_49683
ld a, 50 ; pokemon needed ld a, 50 ; pokemon needed
ld [$ffdb], a ld [$ffdb], a
ld a, EXP__ALL ; oak's aide reward ld a, EXP__ALL ; oak's aide reward
@ -23,7 +23,7 @@ Route15GateUpstairsText1: ; 49651 (12:5651)
predef OaksAideScript ; call oak's aide script predef OaksAideScript ; call oak's aide script
ld a, [$ffdb] ld a, [$ffdb]
cp $1 cp $1
jr nz, .asm_49689 ; 0x4967c $b jr nz, .asm_49689
ld hl, wd7dd ld hl, wd7dd
set 0, [hl] set 0, [hl]
.asm_49683 .asm_49683

View file

@ -28,12 +28,12 @@ Route16Script0: ; 59959 (16:5959)
res 0, [hl] res 0, [hl]
jp z, CheckFightingMapTrainers jp z, CheckFightingMapTrainers
ld a, $a ld a, $a
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a
call DisplayTextID call DisplayTextID
ld a, SNORLAX ld a, SNORLAX
ld [W_CUROPPONENT], a ; wd059 ld [W_CUROPPONENT], a
ld a, 30 ld a, 30
ld [W_CURENEMYLVL], a ; W_CURENEMYLVL ld [W_CURENEMYLVL], a
ld a, HS_ROUTE_16_SNORLAX ld a, HS_ROUTE_16_SNORLAX
ld [wcc4d], a ld [wcc4d], a
predef HideObject predef HideObject
@ -44,7 +44,7 @@ Route16Script0: ; 59959 (16:5959)
ret ret
Route16Script3: ; 5998f (16:598f) Route16Script3: ; 5998f (16:598f)
ld a, [W_ISINBATTLE] ; W_ISINBATTLE ld a, [W_ISINBATTLE]
cp $ff cp $ff
jp z, Route16Script_59946 jp z, Route16Script_59946
call UpdateSprites call UpdateSprites
@ -52,7 +52,7 @@ Route16Script3: ; 5998f (16:598f)
cp $2 cp $2
jr z, .asm_599a8 jr z, .asm_599a8
ld a, $b ld a, $b
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a
call DisplayTextID call DisplayTextID
.asm_599a8 .asm_599a8
ld hl, wd7e0 ld hl, wd7e0
@ -81,55 +81,55 @@ Route16TrainerHeader0: ; 599cf (16:59cf)
db $1 ; flag's bit db $1 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7df ; flag's byte dw wd7df ; flag's byte
dw Route16BattleText1 ; 0x5a22 TextBeforeBattle dw Route16BattleText1 ; TextBeforeBattle
dw Route16AfterBattleText1 ; 0x5a2c TextAfterBattle dw Route16AfterBattleText1 ; TextAfterBattle
dw Route16EndBattleText1 ; 0x5a27 TextEndBattle dw Route16EndBattleText1 ; TextEndBattle
dw Route16EndBattleText1 ; 0x5a27 TextEndBattle dw Route16EndBattleText1 ; TextEndBattle
Route16TrainerHeader1: ; 599db (16:59db) Route16TrainerHeader1: ; 599db (16:59db)
db $2 ; flag's bit db $2 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd7df ; flag's byte dw wd7df ; flag's byte
dw Route16BattleText2 ; 0x5a3b TextBeforeBattle dw Route16BattleText2 ; TextBeforeBattle
dw Route16AfterBattleText2 ; 0x5a45 TextAfterBattle dw Route16AfterBattleText2 ; TextAfterBattle
dw Route16EndBattleText2 ; 0x5a40 TextEndBattle dw Route16EndBattleText2 ; TextEndBattle
dw Route16EndBattleText2 ; 0x5a40 TextEndBattle dw Route16EndBattleText2 ; TextEndBattle
Route16TrainerHeader2: ; 599e7 (16:59e7) Route16TrainerHeader2: ; 599e7 (16:59e7)
db $3 ; flag's bit db $3 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd7df ; flag's byte dw wd7df ; flag's byte
dw Route16BattleText3 ; 0x5a54 TextBeforeBattle dw Route16BattleText3 ; TextBeforeBattle
dw Route16AfterBattleText3 ; 0x5a5e TextAfterBattle dw Route16AfterBattleText3 ; TextAfterBattle
dw Route16EndBattleText3 ; 0x5a59 TextEndBattle dw Route16EndBattleText3 ; TextEndBattle
dw Route16EndBattleText3 ; 0x5a59 TextEndBattle dw Route16EndBattleText3 ; TextEndBattle
Route16TrainerHeader3: ; 599f3 (16:59f3) Route16TrainerHeader3: ; 599f3 (16:59f3)
db $4 ; flag's bit db $4 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd7df ; flag's byte dw wd7df ; flag's byte
dw Route16BattleText4 ; 0x5a6d TextBeforeBattle dw Route16BattleText4 ; TextBeforeBattle
dw Route16AfterBattleText4 ; 0x5a77 TextAfterBattle dw Route16AfterBattleText4 ; TextAfterBattle
dw Route16EndBattleText4 ; 0x5a72 TextEndBattle dw Route16EndBattleText4 ; TextEndBattle
dw Route16EndBattleText4 ; 0x5a72 TextEndBattle dw Route16EndBattleText4 ; TextEndBattle
Route16TrainerHeader4: ; 599ff (16:59ff) Route16TrainerHeader4: ; 599ff (16:59ff)
db $5 ; flag's bit db $5 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd7df ; flag's byte dw wd7df ; flag's byte
dw Route16BattleText5 ; 0x5a86 TextBeforeBattle dw Route16BattleText5 ; TextBeforeBattle
dw Route16AfterBattleText5 ; 0x5a90 TextAfterBattle dw Route16AfterBattleText5 ; TextAfterBattle
dw Route16EndBattleText5 ; 0x5a8b TextEndBattle dw Route16EndBattleText5 ; TextEndBattle
dw Route16EndBattleText5 ; 0x5a8b TextEndBattle dw Route16EndBattleText5 ; TextEndBattle
Route16TrainerHeader5: ; 59a0b (16:5a0b) Route16TrainerHeader5: ; 59a0b (16:5a0b)
db $6 ; flag's bit db $6 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7df ; flag's byte dw wd7df ; flag's byte
dw Route16BattleText6 ; 0x5a9f TextBeforeBattle dw Route16BattleText6 ; TextBeforeBattle
dw Route16AfterBattleText6 ; 0x5aa9 TextAfterBattle dw Route16AfterBattleText6 ; TextAfterBattle
dw Route16EndBattleText6 ; 0x5aa4 TextEndBattle dw Route16EndBattleText6 ; TextEndBattle
dw Route16EndBattleText6 ; 0x5aa4 TextEndBattle dw Route16EndBattleText6 ; TextEndBattle
db $ff db $ff

View file

@ -25,7 +25,7 @@ Route16GateScript0: ; 496d7 (12:56d7)
ld [hJoyHeld], a ld [hJoyHeld], a
ld a, [wWhichTrade] ld a, [wWhichTrade]
cp $1 cp $1
jr z, .asm_4970e ; 0x496f1 $1b jr z, .asm_4970e
ld a, [wWhichTrade] ld a, [wWhichTrade]
dec a dec a
ld [wSimulatedJoypadStatesIndex], a ld [wSimulatedJoypadStatesIndex], a
@ -94,14 +94,14 @@ Route16GateTextPointers: ; 4975a (12:575a)
Route16GateText1: ; 49760 (12:5760) Route16GateText1: ; 49760 (12:5760)
db $08 ; asm db $08 ; asm
call Route16GateScript_49755 call Route16GateScript_49755
jr z, .asm_0bdf3 ; 0x49764 jr z, .asm_0bdf3
ld hl, Route16GateText_4977c ld hl, Route16GateText_4977c
call PrintText call PrintText
jr .asm_56c9d ; 0x4976c jr .asm_56c9d
.asm_0bdf3 ; 0x4976e .asm_0bdf3
ld hl, Route16GateText_49777 ld hl, Route16GateText_49777
call PrintText call PrintText
.asm_56c9d ; 0x49774 .asm_56c9d
jp TextScriptEnd jp TextScriptEnd
Route16GateText_49777: ; 49777 (12:5777) Route16GateText_49777: ; 49777 (12:5777)

View file

@ -38,7 +38,7 @@ Route16GateUpstairsText_4983b: ; 4983b (12:583b)
Route16GateUpstairsText4: ; 49840 (12:5840) Route16GateUpstairsText4: ; 49840 (12:5840)
db $8 db $8
ld hl, Route16GateUpstairsText_49847 ; $5847 ld hl, Route16GateUpstairsText_49847
jp Route12GateUpstairsScript_495c9 jp Route12GateUpstairsScript_495c9
Route16GateUpstairsText_49847: ; 49847 (12:5847) Route16GateUpstairsText_49847: ; 49847 (12:5847)

View file

@ -10,7 +10,7 @@ Route16HouseText1: ; 1e5ff (7:65ff)
ld a, [wd7e0] ld a, [wd7e0]
bit 6, a bit 6, a
ld hl, HM02ExplanationText ld hl, HM02ExplanationText
jr nz, .asm_13616 ; 0x1e608 jr nz, .asm_13616
ld hl, Route16HouseText3 ld hl, Route16HouseText3
call PrintText call PrintText
ld bc, (HM_02 << 8) | 1 ld bc, (HM_02 << 8) | 1
@ -19,10 +19,10 @@ Route16HouseText1: ; 1e5ff (7:65ff)
ld hl, wd7e0 ld hl, wd7e0
set 6, [hl] set 6, [hl]
ld hl, ReceivedHM02Text ld hl, ReceivedHM02Text
jr .asm_13616 ; 0x1e620 jr .asm_13616
.BagFull .BagFull
ld hl, HM02NoRoomText ld hl, HM02NoRoomText
.asm_13616 ; 0x1e625 .asm_13616
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd

View file

@ -35,91 +35,91 @@ Route17TrainerHeader0: ; 55bb3 (15:5bb3)
db $1 ; flag's bit db $1 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7e1 ; flag's byte dw wd7e1 ; flag's byte
dw Route17BattleText1 ; 0x5c36 TextBeforeBattle dw Route17BattleText1 ; TextBeforeBattle
dw Route17AfterBattleText1 ; 0x5c40 TextAfterBattle dw Route17AfterBattleText1 ; TextAfterBattle
dw Route17EndBattleText1 ; 0x5c3b TextEndBattle dw Route17EndBattleText1 ; TextEndBattle
dw Route17EndBattleText1 ; 0x5c3b TextEndBattle dw Route17EndBattleText1 ; TextEndBattle
Route17TrainerHeader1: ; 55bbf (15:5bbf) Route17TrainerHeader1: ; 55bbf (15:5bbf)
db $2 ; flag's bit db $2 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7e1 ; flag's byte dw wd7e1 ; flag's byte
dw Route17BattleText2 ; 0x5c4f TextBeforeBattle dw Route17BattleText2 ; TextBeforeBattle
dw Route17AfterBattleText2 ; 0x5c59 TextAfterBattle dw Route17AfterBattleText2 ; TextAfterBattle
dw Route17EndBattleText2 ; 0x5c54 TextEndBattle dw Route17EndBattleText2 ; TextEndBattle
dw Route17EndBattleText2 ; 0x5c54 TextEndBattle dw Route17EndBattleText2 ; TextEndBattle
Route17TrainerHeader2: ; 55bcb (15:5bcb) Route17TrainerHeader2: ; 55bcb (15:5bcb)
db $3 ; flag's bit db $3 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7e1 ; flag's byte dw wd7e1 ; flag's byte
dw Route17BattleText3 ; 0x5c68 TextBeforeBattle dw Route17BattleText3 ; TextBeforeBattle
dw Route17AfterBattleText3 ; 0x5c72 TextAfterBattle dw Route17AfterBattleText3 ; TextAfterBattle
dw Route17EndBattleText3 ; 0x5c6d TextEndBattle dw Route17EndBattleText3 ; TextEndBattle
dw Route17EndBattleText3 ; 0x5c6d TextEndBattle dw Route17EndBattleText3 ; TextEndBattle
Route17TrainerHeader3: ; 55bd7 (15:5bd7) Route17TrainerHeader3: ; 55bd7 (15:5bd7)
db $4 ; flag's bit db $4 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7e1 ; flag's byte dw wd7e1 ; flag's byte
dw Route17BattleText4 ; 0x5c81 TextBeforeBattle dw Route17BattleText4 ; TextBeforeBattle
dw Route17AfterBattleText4 ; 0x5c8b TextAfterBattle dw Route17AfterBattleText4 ; TextAfterBattle
dw Route17EndBattleText4 ; 0x5c86 TextEndBattle dw Route17EndBattleText4 ; TextEndBattle
dw Route17EndBattleText4 ; 0x5c86 TextEndBattle dw Route17EndBattleText4 ; TextEndBattle
Route17TrainerHeader4: ; 55be3 (15:5be3) Route17TrainerHeader4: ; 55be3 (15:5be3)
db $5 ; flag's bit db $5 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7e1 ; flag's byte dw wd7e1 ; flag's byte
dw Route17BattleText5 ; 0x5c9a TextBeforeBattle dw Route17BattleText5 ; TextBeforeBattle
dw Route17AfterBattleText5 ; 0x5ca4 TextAfterBattle dw Route17AfterBattleText5 ; TextAfterBattle
dw Route17EndBattleText5 ; 0x5c9f TextEndBattle dw Route17EndBattleText5 ; TextEndBattle
dw Route17EndBattleText5 ; 0x5c9f TextEndBattle dw Route17EndBattleText5 ; TextEndBattle
Route17TrainerHeader5: ; 55bef (15:5bef) Route17TrainerHeader5: ; 55bef (15:5bef)
db $6 ; flag's bit db $6 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd7e1 ; flag's byte dw wd7e1 ; flag's byte
dw Route17BattleText6 ; 0x5cb3 TextBeforeBattle dw Route17BattleText6 ; TextBeforeBattle
dw Route17AfterBattleText6 ; 0x5cbd TextAfterBattle dw Route17AfterBattleText6 ; TextAfterBattle
dw Route17EndBattleText6 ; 0x5cb8 TextEndBattle dw Route17EndBattleText6 ; TextEndBattle
dw Route17EndBattleText6 ; 0x5cb8 TextEndBattle dw Route17EndBattleText6 ; TextEndBattle
Route17TrainerHeader6: ; 55bfb (15:5bfb) Route17TrainerHeader6: ; 55bfb (15:5bfb)
db $7 ; flag's bit db $7 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7e1 ; flag's byte dw wd7e1 ; flag's byte
dw Route17BattleText7 ; 0x5ccc TextBeforeBattle dw Route17BattleText7 ; TextBeforeBattle
dw Route17AfterBattleText7 ; 0x5cd6 TextAfterBattle dw Route17AfterBattleText7 ; TextAfterBattle
dw Route17EndBattleText7 ; 0x5cd1 TextEndBattle dw Route17EndBattleText7 ; TextEndBattle
dw Route17EndBattleText7 ; 0x5cd1 TextEndBattle dw Route17EndBattleText7 ; TextEndBattle
Route17TrainerHeader7: ; 55c07 (15:5c07) Route17TrainerHeader7: ; 55c07 (15:5c07)
db $8 ; flag's bit db $8 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd7e1 ; flag's byte dw wd7e1 ; flag's byte
dw Route17BattleText8 ; 0x5ce5 TextBeforeBattle dw Route17BattleText8 ; TextBeforeBattle
dw Route17AfterBattleText8 ; 0x5cef TextAfterBattle dw Route17AfterBattleText8 ; TextAfterBattle
dw Route17EndBattleText8 ; 0x5cea TextEndBattle dw Route17EndBattleText8 ; TextEndBattle
dw Route17EndBattleText8 ; 0x5cea TextEndBattle dw Route17EndBattleText8 ; TextEndBattle
Route17TrainerHeader8: ; 55c13 (15:5c13) Route17TrainerHeader8: ; 55c13 (15:5c13)
db $9 ; flag's bit db $9 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7e1 ; flag's byte dw wd7e1 ; flag's byte
dw Route17BattleText9 ; 0x5cfe TextBeforeBattle dw Route17BattleText9 ; TextBeforeBattle
dw Route17AfterBattleText9 ; 0x5d08 TextAfterBattle dw Route17AfterBattleText9 ; TextAfterBattle
dw Route17EndBattleText9 ; 0x5d03 TextEndBattle dw Route17EndBattleText9 ; TextEndBattle
dw Route17EndBattleText9 ; 0x5d03 TextEndBattle dw Route17EndBattleText9 ; TextEndBattle
Route17TrainerHeader9: ; 55c1f (15:5c1f) Route17TrainerHeader9: ; 55c1f (15:5c1f)
db $a ; flag's bit db $a ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7e1 ; flag's byte dw wd7e1 ; flag's byte
dw Route17BattleText10 ; 0x5d17 TextBeforeBattle dw Route17BattleText10 ; TextBeforeBattle
dw Route17AfterBattleText10 ; 0x5d21 TextAfterBattle dw Route17AfterBattleText10 ; TextAfterBattle
dw Route17EndBattleText10 ; 0x5d1c TextEndBattle dw Route17EndBattleText10 ; TextEndBattle
dw Route17EndBattleText10 ; 0x5d1c TextEndBattle dw Route17EndBattleText10 ; TextEndBattle
db $ff db $ff

View file

@ -24,28 +24,28 @@ Route18TrainerHeader0: ; 59aea (16:5aea)
db $1 ; flag's bit db $1 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7e3 ; flag's byte dw wd7e3 ; flag's byte
dw Route18BattleText1 ; 0x5b19 TextBeforeBattle dw Route18BattleText1 ; TextBeforeBattle
dw Route18AfterBattleText1 ; 0x5b23 TextAfterBattle dw Route18AfterBattleText1 ; TextAfterBattle
dw Route18EndBattleText1 ; 0x5b1e TextEndBattle dw Route18EndBattleText1 ; TextEndBattle
dw Route18EndBattleText1 ; 0x5b1e TextEndBattle dw Route18EndBattleText1 ; TextEndBattle
Route18TrainerHeader1: ; 59af6 (16:5af6) Route18TrainerHeader1: ; 59af6 (16:5af6)
db $2 ; flag's bit db $2 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7e3 ; flag's byte dw wd7e3 ; flag's byte
dw Route18BattleText2 ; 0x5b32 TextBeforeBattle dw Route18BattleText2 ; TextBeforeBattle
dw Route18AfterBattleText2 ; 0x5b3c TextAfterBattle dw Route18AfterBattleText2 ; TextAfterBattle
dw Route18EndBattleText2 ; 0x5b37 TextEndBattle dw Route18EndBattleText2 ; TextEndBattle
dw Route18EndBattleText2 ; 0x5b37 TextEndBattle dw Route18EndBattleText2 ; TextEndBattle
Route18TrainerHeader2: ; 59b02 (16:5b02) Route18TrainerHeader2: ; 59b02 (16:5b02)
db $3 ; flag's bit db $3 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7e3 ; flag's byte dw wd7e3 ; flag's byte
dw Route18BattleText3 ; 0x5b4b TextBeforeBattle dw Route18BattleText3 ; TextBeforeBattle
dw Route18AfterBattleText3 ; 0x5b55 TextAfterBattle dw Route18AfterBattleText3 ; TextAfterBattle
dw Route18EndBattleText3 ; 0x5b50 TextEndBattle dw Route18EndBattleText3 ; TextEndBattle
dw Route18EndBattleText3 ; 0x5b50 TextEndBattle dw Route18EndBattleText3 ; TextEndBattle
db $ff db $ff

View file

@ -25,7 +25,7 @@ Route18GateScript0: ; 4988f (12:588f)
ld [hJoyHeld], a ld [hJoyHeld], a
ld a, [wWhichTrade] ld a, [wWhichTrade]
cp $1 cp $1
jr z, .asm_498c6 ; 0x498a9 $1b jr z, .asm_498c6
ld a, [wWhichTrade] ld a, [wWhichTrade]
dec a dec a
ld [wSimulatedJoypadStatesIndex], a ld [wSimulatedJoypadStatesIndex], a
@ -89,14 +89,14 @@ Route18GateTextPointers: ; 4990d (12:590d)
Route18GateText1: ; 49911 (12:5911) Route18GateText1: ; 49911 (12:5911)
db $08 ; asm db $08 ; asm
call Route16GateScript_49755 call Route16GateScript_49755
jr z, .asm_3c84d ; 0x49915 jr z, .asm_3c84d
ld hl, Route18GateText_4992d ld hl, Route18GateText_4992d
call PrintText call PrintText
jr .asm_a8410 ; 0x4991d jr .asm_a8410
.asm_3c84d ; 0x4991f .asm_3c84d
ld hl, Route18GateText_49928 ld hl, Route18GateText_49928
call PrintText call PrintText
.asm_a8410 ; 0x49925 .asm_a8410
jp TextScriptEnd jp TextScriptEnd
Route18GateText_49928: ; 49928 (12:5928) Route18GateText_49928: ; 49928 (12:5928)

View file

@ -15,7 +15,7 @@ Route18GateUpstairsText1: ; 4997e (12:597e)
Route18GateUpstairsText2: ; 4998c (12:598c) Route18GateUpstairsText2: ; 4998c (12:598c)
db $8 db $8
ld hl, Route18GateUpstairsText_49993 ; $5993 ld hl, Route18GateUpstairsText_49993
jp Route12GateUpstairsScript_495c9 jp Route12GateUpstairsScript_495c9
Route18GateUpstairsText_49993: ; 49993 (12:5993) Route18GateUpstairsText_49993: ; 49993 (12:5993)
@ -24,7 +24,7 @@ Route18GateUpstairsText_49993: ; 49993 (12:5993)
Route18GateUpstairsText3: ; 49998 (12:5998) Route18GateUpstairsText3: ; 49998 (12:5998)
db $8 db $8
ld hl, Route18GateUpstairsText_4999f ; $599f ld hl, Route18GateUpstairsText_4999f
jp Route12GateUpstairsScript_495c9 jp Route12GateUpstairsScript_495c9
Route18GateUpstairsText_4999f: ; 4999f (12:599f) Route18GateUpstairsText_4999f: ; 4999f (12:599f)

View file

@ -30,91 +30,91 @@ Route19TrainerHeader0: ; 55d73 (15:5d73)
db $1 ; flag's bit db $1 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7e5 ; flag's byte dw wd7e5 ; flag's byte
dw Route19BattleText1 ; 0x5e50 TextBeforeBattle dw Route19BattleText1 ; TextBeforeBattle
dw Route19AfterBattleText1 ; 0x5e5a TextAfterBattle dw Route19AfterBattleText1 ; TextAfterBattle
dw Route19EndBattleText1 ; 0x5e55 TextEndBattle dw Route19EndBattleText1 ; TextEndBattle
dw Route19EndBattleText1 ; 0x5e55 TextEndBattle dw Route19EndBattleText1 ; TextEndBattle
Route19TrainerHeader1: ; 55d7f (15:5d7f) Route19TrainerHeader1: ; 55d7f (15:5d7f)
db $2 ; flag's bit db $2 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7e5 ; flag's byte dw wd7e5 ; flag's byte
dw Route19BattleText2 ; 0x5e5f TextBeforeBattle dw Route19BattleText2 ; TextBeforeBattle
dw Route19AfterBattleText2 ; 0x5e69 TextAfterBattle dw Route19AfterBattleText2 ; TextAfterBattle
dw Route19EndBattleText2 ; 0x5e64 TextEndBattle dw Route19EndBattleText2 ; TextEndBattle
dw Route19EndBattleText2 ; 0x5e64 TextEndBattle dw Route19EndBattleText2 ; TextEndBattle
Route19TrainerHeader2: ; 55d8b (15:5d8b) Route19TrainerHeader2: ; 55d8b (15:5d8b)
db $3 ; flag's bit db $3 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7e5 ; flag's byte dw wd7e5 ; flag's byte
dw Route19BattleText3 ; 0x5e6e TextBeforeBattle dw Route19BattleText3 ; TextBeforeBattle
dw Route19AfterBattleText3 ; 0x5e78 TextAfterBattle dw Route19AfterBattleText3 ; TextAfterBattle
dw Route19EndBattleText3 ; 0x5e73 TextEndBattle dw Route19EndBattleText3 ; TextEndBattle
dw Route19EndBattleText3 ; 0x5e73 TextEndBattle dw Route19EndBattleText3 ; TextEndBattle
Route19TrainerHeader3: ; 55d97 (15:5d97) Route19TrainerHeader3: ; 55d97 (15:5d97)
db $4 ; flag's bit db $4 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7e5 ; flag's byte dw wd7e5 ; flag's byte
dw Route19BattleText4 ; 0x5e7d TextBeforeBattle dw Route19BattleText4 ; TextBeforeBattle
dw Route19AfterBattleText4 ; 0x5e87 TextAfterBattle dw Route19AfterBattleText4 ; TextAfterBattle
dw Route19EndBattleText4 ; 0x5e82 TextEndBattle dw Route19EndBattleText4 ; TextEndBattle
dw Route19EndBattleText4 ; 0x5e82 TextEndBattle dw Route19EndBattleText4 ; TextEndBattle
Route19TrainerHeader4: ; 55da3 (15:5da3) Route19TrainerHeader4: ; 55da3 (15:5da3)
db $5 ; flag's bit db $5 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7e5 ; flag's byte dw wd7e5 ; flag's byte
dw Route19BattleText5 ; 0x5e8c TextBeforeBattle dw Route19BattleText5 ; TextBeforeBattle
dw Route19AfterBattleText5 ; 0x5e96 TextAfterBattle dw Route19AfterBattleText5 ; TextAfterBattle
dw Route19EndBattleText5 ; 0x5e91 TextEndBattle dw Route19EndBattleText5 ; TextEndBattle
dw Route19EndBattleText5 ; 0x5e91 TextEndBattle dw Route19EndBattleText5 ; TextEndBattle
Route19TrainerHeader5: ; 55daf (15:5daf) Route19TrainerHeader5: ; 55daf (15:5daf)
db $6 ; flag's bit db $6 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7e5 ; flag's byte dw wd7e5 ; flag's byte
dw Route19BattleText6 ; 0x5e9b TextBeforeBattle dw Route19BattleText6 ; TextBeforeBattle
dw Route19AfterBattleText6 ; 0x5ea5 TextAfterBattle dw Route19AfterBattleText6 ; TextAfterBattle
dw Route19EndBattleText6 ; 0x5ea0 TextEndBattle dw Route19EndBattleText6 ; TextEndBattle
dw Route19EndBattleText6 ; 0x5ea0 TextEndBattle dw Route19EndBattleText6 ; TextEndBattle
Route19TrainerHeader6: ; 55dbb (15:5dbb) Route19TrainerHeader6: ; 55dbb (15:5dbb)
db $7 ; flag's bit db $7 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7e5 ; flag's byte dw wd7e5 ; flag's byte
dw Route19BattleText7 ; 0x5eaa TextBeforeBattle dw Route19BattleText7 ; TextBeforeBattle
dw Route19AfterBattleText7 ; 0x5eb4 TextAfterBattle dw Route19AfterBattleText7 ; TextAfterBattle
dw Route19EndBattleText7 ; 0x5eaf TextEndBattle dw Route19EndBattleText7 ; TextEndBattle
dw Route19EndBattleText7 ; 0x5eaf TextEndBattle dw Route19EndBattleText7 ; TextEndBattle
Route19TrainerHeader7: ; 55dc7 (15:5dc7) Route19TrainerHeader7: ; 55dc7 (15:5dc7)
db $8 ; flag's bit db $8 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7e5 ; flag's byte dw wd7e5 ; flag's byte
dw Route19BattleText8 ; 0x5eb9 TextBeforeBattle dw Route19BattleText8 ; TextBeforeBattle
dw Route19AfterBattleText8 ; 0x5ec3 TextAfterBattle dw Route19AfterBattleText8 ; TextAfterBattle
dw Route19EndBattleText8 ; 0x5ebe TextEndBattle dw Route19EndBattleText8 ; TextEndBattle
dw Route19EndBattleText8 ; 0x5ebe TextEndBattle dw Route19EndBattleText8 ; TextEndBattle
Route19TrainerHeader8: ; 55dd3 (15:5dd3) Route19TrainerHeader8: ; 55dd3 (15:5dd3)
db $9 ; flag's bit db $9 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7e5 ; flag's byte dw wd7e5 ; flag's byte
dw Route19BattleText9 ; 0x5ec8 TextBeforeBattle dw Route19BattleText9 ; TextBeforeBattle
dw Route19AfterBattleText9 ; 0x5ed2 TextAfterBattle dw Route19AfterBattleText9 ; TextAfterBattle
dw Route19EndBattleText9 ; 0x5ecd TextEndBattle dw Route19EndBattleText9 ; TextEndBattle
dw Route19EndBattleText9 ; 0x5ecd TextEndBattle dw Route19EndBattleText9 ; TextEndBattle
Route19TrainerHeader9: ; 55ddf (15:5ddf) Route19TrainerHeader9: ; 55ddf (15:5ddf)
db $a ; flag's bit db $a ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7e5 ; flag's byte dw wd7e5 ; flag's byte
dw Route19BattleText10 ; 0x5ed7 TextBeforeBattle dw Route19BattleText10 ; TextBeforeBattle
dw Route19AfterBattleText10 ; 0x5ee1 TextAfterBattle dw Route19AfterBattleText10 ; TextAfterBattle
dw Route19EndBattleText10 ; 0x5edc TextEndBattle dw Route19EndBattleText10 ; TextEndBattle
dw Route19EndBattleText10 ; 0x5edc TextEndBattle dw Route19EndBattleText10 ; TextEndBattle
db $ff db $ff

View file

@ -4,7 +4,7 @@ Route20Script: ; 50ca9 (14:4ca9)
res 0, [hl] res 0, [hl]
call nz, Route20Script_50cc6 call nz, Route20Script_50cc6
call EnableAutoTextBoxDrawing call EnableAutoTextBoxDrawing
ld hl, Route20TrainerHeader0 ; $4d3a ld hl, Route20TrainerHeader0
ld de, Route20ScriptPointers ld de, Route20ScriptPointers
ld a, [W_ROUTE20CURSCRIPT] ld a, [W_ROUTE20CURSCRIPT]
call ExecuteCurMapScriptInTable call ExecuteCurMapScriptInTable
@ -16,11 +16,11 @@ Route20Script_50cc6: ; 50cc6 (14:4cc6)
and $3 and $3
cp $3 cp $3
jr z, .asm_50cef jr z, .asm_50cef
ld a, $d7 ld a, HS_SEAFOAM_ISLANDS_1_BOULDER_1
call Route20Script_50d0c call Route20Script_50d0c
ld a, $d8 ld a, HS_SEAFOAM_ISLANDS_1_BOULDER_2
call Route20Script_50d0c call Route20Script_50d0c
ld hl, .MissableObjectIDs ; $4ce8 ld hl, .MissableObjectIDs
.asm_50cdc .asm_50cdc
ld a, [hli] ld a, [hli]
cp $ff cp $ff
@ -86,91 +86,91 @@ Route20TrainerHeader0: ; 50d3a (14:4d3a)
db $1 ; flag's bit db $1 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7e7 ; flag's byte dw wd7e7 ; flag's byte
dw Route20BattleText1 ; 0x4e17 TextBeforeBattle dw Route20BattleText1 ; TextBeforeBattle
dw Route20AfterBattleText1 ; 0x4e21 TextAfterBattle dw Route20AfterBattleText1 ; TextAfterBattle
dw Route20EndBattleText1 ; 0x4e1c TextEndBattle dw Route20EndBattleText1 ; TextEndBattle
dw Route20EndBattleText1 ; 0x4e1c TextEndBattle dw Route20EndBattleText1 ; TextEndBattle
Route20TrainerHeader2: ; 50d46 (14:4d46) Route20TrainerHeader2: ; 50d46 (14:4d46)
db $2 ; flag's bit db $2 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7e7 ; flag's byte dw wd7e7 ; flag's byte
dw Route20BattleText2 ; 0x4e26 TextBeforeBattle dw Route20BattleText2 ; TextBeforeBattle
dw Route20AfterBattleText2 ; 0x4e30 TextAfterBattle dw Route20AfterBattleText2 ; TextAfterBattle
dw Route20EndBattleText2 ; 0x4e2b TextEndBattle dw Route20EndBattleText2 ; TextEndBattle
dw Route20EndBattleText2 ; 0x4e2b TextEndBattle dw Route20EndBattleText2 ; TextEndBattle
Route20TrainerHeader3: ; 50d52 (14:4d52) Route20TrainerHeader3: ; 50d52 (14:4d52)
db $3 ; flag's bit db $3 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd7e7 ; flag's byte dw wd7e7 ; flag's byte
dw Route20BattleText3 ; 0x4e35 TextBeforeBattle dw Route20BattleText3 ; TextBeforeBattle
dw Route20AfterBattleText3 ; 0x4e3f TextAfterBattle dw Route20AfterBattleText3 ; TextAfterBattle
dw Route20EndBattleText3 ; 0x4e3a TextEndBattle dw Route20EndBattleText3 ; TextEndBattle
dw Route20EndBattleText3 ; 0x4e3a TextEndBattle dw Route20EndBattleText3 ; TextEndBattle
Route20TrainerHeader4: ; 50d5e (14:4d5e) Route20TrainerHeader4: ; 50d5e (14:4d5e)
db $4 ; flag's bit db $4 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7e7 ; flag's byte dw wd7e7 ; flag's byte
dw Route20BattleText4 ; 0x4e44 TextBeforeBattle dw Route20BattleText4 ; TextBeforeBattle
dw Route20AfterBattleText4 ; 0x4e4e TextAfterBattle dw Route20AfterBattleText4 ; TextAfterBattle
dw Route20EndBattleText4 ; 0x4e49 TextEndBattle dw Route20EndBattleText4 ; TextEndBattle
dw Route20EndBattleText4 ; 0x4e49 TextEndBattle dw Route20EndBattleText4 ; TextEndBattle
Route20TrainerHeader5: ; 50d6a (14:4d6a) Route20TrainerHeader5: ; 50d6a (14:4d6a)
db $5 ; flag's bit db $5 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7e7 ; flag's byte dw wd7e7 ; flag's byte
dw Route20BattleText5 ; 0x4e53 TextBeforeBattle dw Route20BattleText5 ; TextBeforeBattle
dw Route20AfterBattleText5 ; 0x4e5d TextAfterBattle dw Route20AfterBattleText5 ; TextAfterBattle
dw Route20EndBattleText5 ; 0x4e58 TextEndBattle dw Route20EndBattleText5 ; TextEndBattle
dw Route20EndBattleText5 ; 0x4e58 TextEndBattle dw Route20EndBattleText5 ; TextEndBattle
Route20TrainerHeader6: ; 50d76 (14:4d76) Route20TrainerHeader6: ; 50d76 (14:4d76)
db $6 ; flag's bit db $6 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7e7 ; flag's byte dw wd7e7 ; flag's byte
dw Route20BattleText6 ; 0x4e62 TextBeforeBattle dw Route20BattleText6 ; TextBeforeBattle
dw Route20AfterBattleText6 ; 0x4e6c TextAfterBattle dw Route20AfterBattleText6 ; TextAfterBattle
dw Route20EndBattleText6 ; 0x4e67 TextEndBattle dw Route20EndBattleText6 ; TextEndBattle
dw Route20EndBattleText6 ; 0x4e67 TextEndBattle dw Route20EndBattleText6 ; TextEndBattle
Route20TrainerHeader7: ; 50d82 (14:4d82) Route20TrainerHeader7: ; 50d82 (14:4d82)
db $7 ; flag's bit db $7 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd7e7 ; flag's byte dw wd7e7 ; flag's byte
dw Route20BattleText7 ; 0x4e71 TextBeforeBattle dw Route20BattleText7 ; TextBeforeBattle
dw Route20AfterBattleText7 ; 0x4e7b TextAfterBattle dw Route20AfterBattleText7 ; TextAfterBattle
dw Route20EndBattleText7 ; 0x4e76 TextEndBattle dw Route20EndBattleText7 ; TextEndBattle
dw Route20EndBattleText7 ; 0x4e76 TextEndBattle dw Route20EndBattleText7 ; TextEndBattle
Route20TrainerHeader8: ; 50d8e (14:4d8e) Route20TrainerHeader8: ; 50d8e (14:4d8e)
db $8 ; flag's bit db $8 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7e7 ; flag's byte dw wd7e7 ; flag's byte
dw Route20BattleText8 ; 0x4e80 TextBeforeBattle dw Route20BattleText8 ; TextBeforeBattle
dw Route20AfterBattleText8 ; 0x4e8a TextAfterBattle dw Route20AfterBattleText8 ; TextAfterBattle
dw Route20EndBattleText8 ; 0x4e85 TextEndBattle dw Route20EndBattleText8 ; TextEndBattle
dw Route20EndBattleText8 ; 0x4e85 TextEndBattle dw Route20EndBattleText8 ; TextEndBattle
Route20TrainerHeader9: ; 50d9a (14:4d9a) Route20TrainerHeader9: ; 50d9a (14:4d9a)
db $9 ; flag's bit db $9 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7e7 ; flag's byte dw wd7e7 ; flag's byte
dw Route20BattleText9 ; 0x4e8f TextBeforeBattle dw Route20BattleText9 ; TextBeforeBattle
dw Route20AfterBattleText9 ; 0x4e99 TextAfterBattle dw Route20AfterBattleText9 ; TextAfterBattle
dw Route20EndBattleText9 ; 0x4e94 TextEndBattle dw Route20EndBattleText9 ; TextEndBattle
dw Route20EndBattleText9 ; 0x4e94 TextEndBattle dw Route20EndBattleText9 ; TextEndBattle
Route20TrainerHeader10: ; 50da6 (14:4da6) Route20TrainerHeader10: ; 50da6 (14:4da6)
db $a ; flag's bit db $a ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7e7 ; flag's byte dw wd7e7 ; flag's byte
dw Route20BattleText10 ; 0x4e9e TextBeforeBattle dw Route20BattleText10 ; TextBeforeBattle
dw Route20AfterBattleText10 ; 0x4ea8 TextAfterBattle dw Route20AfterBattleText10 ; TextAfterBattle
dw Route20EndBattleText10 ; 0x4ea3 TextEndBattle dw Route20EndBattleText10 ; TextEndBattle
dw Route20EndBattleText10 ; 0x4ea3 TextEndBattle dw Route20EndBattleText10 ; TextEndBattle
db $ff db $ff

View file

@ -28,82 +28,82 @@ Route21TrainerHeader0: ; 55f16 (15:5f16)
db $1 ; flag's bit db $1 ; flag's bit
db ($0 << 4) ; trainer's view range db ($0 << 4) ; trainer's view range
dw wd7e9 ; flag's byte dw wd7e9 ; flag's byte
dw Route21BattleText1 ; 0x5fdd TextBeforeBattle dw Route21BattleText1 ; TextBeforeBattle
dw Route21AfterBattleText1 ; 0x5fe7 TextAfterBattle dw Route21AfterBattleText1 ; TextAfterBattle
dw Route21EndBattleText1 ; 0x5fe2 TextEndBattle dw Route21EndBattleText1 ; TextEndBattle
dw Route21EndBattleText1 ; 0x5fe2 TextEndBattle dw Route21EndBattleText1 ; TextEndBattle
Route21TrainerHeader1: ; 55f22 (15:5f22) Route21TrainerHeader1: ; 55f22 (15:5f22)
db $2 ; flag's bit db $2 ; flag's bit
db ($0 << 4) ; trainer's view range db ($0 << 4) ; trainer's view range
dw wd7e9 ; flag's byte dw wd7e9 ; flag's byte
dw Route21BattleText2 ; 0x5fec TextBeforeBattle dw Route21BattleText2 ; TextBeforeBattle
dw Route21AfterBattleText2 ; 0x5ff6 TextAfterBattle dw Route21AfterBattleText2 ; TextAfterBattle
dw Route21EndBattleText2 ; 0x5ff1 TextEndBattle dw Route21EndBattleText2 ; TextEndBattle
dw Route21EndBattleText2 ; 0x5ff1 TextEndBattle dw Route21EndBattleText2 ; TextEndBattle
Route21TrainerHeader2: ; 55f2e (15:5f2e) Route21TrainerHeader2: ; 55f2e (15:5f2e)
db $3 ; flag's bit db $3 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7e9 ; flag's byte dw wd7e9 ; flag's byte
dw Route21BattleText3 ; 0x5ffb TextBeforeBattle dw Route21BattleText3 ; TextBeforeBattle
dw Route21AfterBattleText3 ; 0x6005 TextAfterBattle dw Route21AfterBattleText3 ; TextAfterBattle
dw Route21EndBattleText3 ; 0x6000 TextEndBattle dw Route21EndBattleText3 ; TextEndBattle
dw Route21EndBattleText3 ; 0x6000 TextEndBattle dw Route21EndBattleText3 ; TextEndBattle
Route21TrainerHeader3: ; 55f3a (15:5f3a) Route21TrainerHeader3: ; 55f3a (15:5f3a)
db $4 ; flag's bit db $4 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7e9 ; flag's byte dw wd7e9 ; flag's byte
dw Route21BattleText4 ; 0x600a TextBeforeBattle dw Route21BattleText4 ; TextBeforeBattle
dw Route21AfterBattleText4 ; 0x6014 TextAfterBattle dw Route21AfterBattleText4 ; TextAfterBattle
dw Route21EndBattleText4 ; 0x600f TextEndBattle dw Route21EndBattleText4 ; TextEndBattle
dw Route21EndBattleText4 ; 0x600f TextEndBattle dw Route21EndBattleText4 ; TextEndBattle
Route21TrainerHeader4: ; 55f46 (15:5f46) Route21TrainerHeader4: ; 55f46 (15:5f46)
db $5 ; flag's bit db $5 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7e9 ; flag's byte dw wd7e9 ; flag's byte
dw Route21BattleText5 ; 0x6019 TextBeforeBattle dw Route21BattleText5 ; TextBeforeBattle
dw Route21AfterBattleText5 ; 0x6023 TextAfterBattle dw Route21AfterBattleText5 ; TextAfterBattle
dw Route21EndBattleText5 ; 0x601e TextEndBattle dw Route21EndBattleText5 ; TextEndBattle
dw Route21EndBattleText5 ; 0x601e TextEndBattle dw Route21EndBattleText5 ; TextEndBattle
Route21TrainerHeader5: ; 55f52 (15:5f52) Route21TrainerHeader5: ; 55f52 (15:5f52)
db $6 ; flag's bit db $6 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7e9 ; flag's byte dw wd7e9 ; flag's byte
dw Route21BattleText6 ; 0x6028 TextBeforeBattle dw Route21BattleText6 ; TextBeforeBattle
dw Route21AfterBattleText6 ; 0x6032 TextAfterBattle dw Route21AfterBattleText6 ; TextAfterBattle
dw Route21EndBattleText6 ; 0x602d TextEndBattle dw Route21EndBattleText6 ; TextEndBattle
dw Route21EndBattleText6 ; 0x602d TextEndBattle dw Route21EndBattleText6 ; TextEndBattle
Route21TrainerHeader6: ; 55f5e (15:5f5e) Route21TrainerHeader6: ; 55f5e (15:5f5e)
db $7 ; flag's bit db $7 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7e9 ; flag's byte dw wd7e9 ; flag's byte
dw Route21BattleText7 ; 0x6037 TextBeforeBattle dw Route21BattleText7 ; TextBeforeBattle
dw Route21AfterBattleText7 ; 0x6041 TextAfterBattle dw Route21AfterBattleText7 ; TextAfterBattle
dw Route21EndBattleText7 ; 0x603c TextEndBattle dw Route21EndBattleText7 ; TextEndBattle
dw Route21EndBattleText7 ; 0x603c TextEndBattle dw Route21EndBattleText7 ; TextEndBattle
Route21TrainerHeader7: ; 55f6a (15:5f6a) Route21TrainerHeader7: ; 55f6a (15:5f6a)
db $8 ; flag's bit db $8 ; flag's bit
db ($0 << 4) ; trainer's view range db ($0 << 4) ; trainer's view range
dw wd7e9 ; flag's byte dw wd7e9 ; flag's byte
dw Route21BattleText8 ; 0x6046 TextBeforeBattle dw Route21BattleText8 ; TextBeforeBattle
dw Route21AfterBattleText8 ; 0x6050 TextAfterBattle dw Route21AfterBattleText8 ; TextAfterBattle
dw Route21EndBattleText8 ; 0x604b TextEndBattle dw Route21EndBattleText8 ; TextEndBattle
dw Route21EndBattleText8 ; 0x604b TextEndBattle dw Route21EndBattleText8 ; TextEndBattle
Route21TrainerHeader8: ; 55f76 (15:5f76) Route21TrainerHeader8: ; 55f76 (15:5f76)
db $9 ; flag's bit db $9 ; flag's bit
db ($0 << 4) ; trainer's view range db ($0 << 4) ; trainer's view range
dw wd7e9 ; flag's byte dw wd7e9 ; flag's byte
dw Route21BattleText9 ; 0x6055 TextBeforeBattle dw Route21BattleText9 ; TextBeforeBattle
dw Route21AfterBattleText9 ; 0x605f TextAfterBattle dw Route21AfterBattleText9 ; TextAfterBattle
dw Route21EndBattleText9 ; 0x605a TextEndBattle dw Route21EndBattleText9 ; TextEndBattle
dw Route21EndBattleText9 ; 0x605a TextEndBattle dw Route21EndBattleText9 ; TextEndBattle
db $ff db $ff

View file

@ -22,7 +22,7 @@ Route22Script7: ; 50ed5 (14:4ed5)
ret ret
Route22Script_50ed6: ; 50ed6 (14:4ed6) Route22Script_50ed6: ; 50ed6 (14:4ed6)
ld a, [W_RIVALSTARTER] ; wd715 ld a, [W_RIVALSTARTER]
ld b, a ld b, a
.asm_50eda .asm_50eda
ld a, [hli] ld a, [hli]
@ -32,11 +32,11 @@ Route22Script_50ed6: ; 50ed6 (14:4ed6)
jr .asm_50eda jr .asm_50eda
.asm_50ee1 .asm_50ee1
ld a, [hl] ld a, [hl]
ld [W_TRAINERNO], a ; wd05d ld [W_TRAINERNO], a
ret ret
Route22MoveRivalSprite: ; 50ee6 (14:4ee6) Route22MoveRivalSprite: ; 50ee6 (14:4ee6)
ld de, Route22RivalMovementData ; $4efb ld de, Route22RivalMovementData
ld a, [wcf0d] ld a, [wcf0d]
cp $1 cp $1
jr z, .asm_50ef1 jr z, .asm_50ef1
@ -54,7 +54,7 @@ Route22Script0: ; 50f00 (14:4f00)
ld a, [wd7eb] ld a, [wd7eb]
bit 7, a bit 7, a
ret z ret z
ld hl, .Route22RivalBattleCoords ; $4f2d ld hl, .Route22RivalBattleCoords
call ArePlayerCoordsInArray call ArePlayerCoordsInArray
ret nc ret nc
ld a, [wWhichTrade] ld a, [wWhichTrade]
@ -67,7 +67,7 @@ Route22Script0: ; 50f00 (14:4f00)
ld [wd528], a ld [wd528], a
ld a, [wd7eb] ld a, [wd7eb]
bit 0, a ; is this the rival battle at the beginning of the game? bit 0, a ; is this the rival battle at the beginning of the game?
jr nz, .firstRivalBattle ; 0x50f25 $b jr nz, .firstRivalBattle
bit 1, a ; is this the rival at the end of the game? bit 1, a ; is this the rival at the end of the game?
jp nz, Route22Script_5104e jp nz, Route22Script_5104e
ret ret
@ -85,7 +85,7 @@ Route22Script0: ; 50f00 (14:4f00)
predef EmotionBubble predef EmotionBubble
ld a, [wWalkBikeSurfState] ld a, [wWalkBikeSurfState]
and a and a
jr z, .asm_50f4e ; 0x50f44 $8 jr z, .asm_50f4e
ld a, $ff ld a, $ff
ld [wc0ee], a ld [wc0ee], a
call PlaySound call PlaySound
@ -106,11 +106,11 @@ Route22Script1: ; 50f62 (14:4f62)
ret nz ret nz
ld a, [wcf0d] ld a, [wcf0d]
cp $1 cp $1
jr nz, .asm_50f78 ; 0x50f6d $9 jr nz, .asm_50f78
ld a, $4 ld a, $4
ld [wd528], a ld [wd528], a
ld a, $4 ld a, $4
jr .asm_50f7a ; 0x50f76 $2 jr .asm_50f7a
.asm_50f78 .asm_50f78
ld a, $c ld a, $c
.asm_50f7a .asm_50f7a
@ -131,7 +131,7 @@ Route22Script1: ; 50f62 (14:4f62)
call SaveEndBattleTextPointers call SaveEndBattleTextPointers
ld a, SONY1 + $c8 ld a, SONY1 + $c8
ld [W_CUROPPONENT], a ld [W_CUROPPONENT], a
ld hl, StarterMons_50faf ; $4faf ld hl, StarterMons_50faf
call Route22Script_50ed6 call Route22Script_50ed6
ld a, $2 ld a, $2
ld [W_ROUTE22CURSCRIPT], a ld [W_ROUTE22CURSCRIPT], a
@ -149,9 +149,9 @@ Route22Script2: ; 50fb5 (14:4fb5)
jp z, Route22Script_50ece jp z, Route22Script_50ece
ld a, [wSpriteStateData1 + 9] ld a, [wSpriteStateData1 + 9]
and a and a
jr nz, .asm_50fc7 ; 0x50fc1 $4 jr nz, .asm_50fc7
ld a, $4 ld a, $4
jr .asm_50fc9 ; 0x50fc5 $2 jr .asm_50fc9
.asm_50fc7 .asm_50fc7
ld a, $c ld a, $c
.asm_50fc9 .asm_50fc9
@ -172,9 +172,9 @@ Route22Script2: ; 50fb5 (14:4fb5)
callba Music_RivalAlternateStart callba Music_RivalAlternateStart
ld a, [wcf0d] ld a, [wcf0d]
cp $1 cp $1
jr nz, .asm_50fff ; 0x50ff8 $5 jr nz, .asm_50fff
call Route22Script_51008 call Route22Script_51008
jr .asm_51002 ; 0x50ffd $3 jr .asm_51002
.asm_50fff .asm_50fff
call Route22Script_5100d call Route22Script_5100d
.asm_51002 .asm_51002
@ -183,12 +183,12 @@ Route22Script2: ; 50fb5 (14:4fb5)
ret ret
Route22Script_51008: ; 51008 (14:5008) Route22Script_51008: ; 51008 (14:5008)
ld de, Route22RivalExitMovementData1 ; $5017 ld de, Route22RivalExitMovementData1
jr asm_51010 jr Route22MoveRival1
Route22Script_5100d: ; 5100d (14:500d) Route22Script_5100d: ; 5100d (14:500d)
ld de, Route22RivalExitMovementData2 ; $501f ld de, Route22RivalExitMovementData2
asm_51010 Route22MoveRival1: ; 51010 (14:5010)
ld a, $1 ld a, $1
ld [H_SPRITEHEIGHT], a ld [H_SPRITEHEIGHT], a
jp MoveSprite jp MoveSprite
@ -234,7 +234,7 @@ Route22Script_5104e: ; 5104e (14:504e)
call PlaySound call PlaySound
callba Music_RivalAlternateTempo callba Music_RivalAlternateTempo
ld a, $2 ld a, $2
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a
call Route22MoveRivalSprite call Route22MoveRivalSprite
ld a, $4 ld a, $4
ld [W_ROUTE22CURSCRIPT], a ld [W_ROUTE22CURSCRIPT], a
@ -245,7 +245,7 @@ Route22Script4: ; 51087 (14:5087)
bit 0, a bit 0, a
ret nz ret nz
ld a, $2 ld a, $2
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a
ld a, [wcf0d] ld a, [wcf0d]
cp $1 cp $1
jr nz, .asm_510a1 jr nz, .asm_510a1
@ -263,17 +263,17 @@ Route22Script4: ; 51087 (14:5087)
xor a xor a
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld a, $2 ld a, $2
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a
call DisplayTextID call DisplayTextID
ld hl, wd72d ld hl, wd72d
set 6, [hl] set 6, [hl]
set 7, [hl] set 7, [hl]
ld hl, Route22RivalDefeatedText2 ; $51cb ld hl, Route22RivalDefeatedText2
ld de, Route22Text_511d0 ; $51d0 ld de, Route22Text_511d0
call SaveEndBattleTextPointers call SaveEndBattleTextPointers
ld a, SONY2 + $c8 ld a, SONY2 + $c8
ld [W_CUROPPONENT], a ; wd059 ld [W_CUROPPONENT], a
ld hl, StarterMons_510d9 ; $50d9 ld hl, StarterMons_510d9
call Route22Script_50ed6 call Route22Script_50ed6
ld a, $5 ld a, $5
ld [W_ROUTE22CURSCRIPT], a ld [W_ROUTE22CURSCRIPT], a
@ -285,11 +285,11 @@ StarterMons_510d9: ; 510d9 (14:50d9)
db STARTER1,$0c db STARTER1,$0c
Route22Script5: ; 510df (14:50df) Route22Script5: ; 510df (14:50df)
ld a, [W_ISINBATTLE] ; W_ISINBATTLE ld a, [W_ISINBATTLE]
cp $ff cp $ff
jp z, Route22Script_50ece jp z, Route22Script_50ece
ld a, $2 ld a, $2
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a
ld a, [wcf0d] ld a, [wcf0d]
cp $1 cp $1
jr nz, .asm_510fb jr nz, .asm_510fb
@ -309,7 +309,7 @@ Route22Script5: ; 510df (14:50df)
ld hl, wd7eb ld hl, wd7eb
set 6, [hl] set 6, [hl]
ld a, $2 ld a, $2
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a
call DisplayTextID call DisplayTextID
ld a, $ff ld a, $ff
ld [wc0ee], a ld [wc0ee], a
@ -328,14 +328,14 @@ Route22Script5: ; 510df (14:50df)
ret ret
Route22Script_5113d: ; 5113d (14:513d) Route22Script_5113d: ; 5113d (14:513d)
ld de, MovementData_5114c ; $514c ld de, MovementData_5114c
jr asm_51145 jr Route22MoveRival2
Route22Script_51142: ; 51142 (14:5142) Route22Script_51142: ; 51142 (14:5142)
ld de, MovementData_5114d ; $514d ld de, MovementData_5114d
asm_51145: ; 51145 (14:5145) Route22MoveRival2: ; 51145 (14:5145)
ld a, $2 ld a, $2
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a
jp MoveSprite jp MoveSprite
MovementData_5114c: ; 5114c (14:514c) MovementData_5114c: ; 5114c (14:514c)
@ -370,28 +370,28 @@ Route22Text1: ; 5117b (14:517b)
db $08 ; asm db $08 ; asm
ld a, [wd7eb] ld a, [wd7eb]
bit 5, a bit 5, a
jr z, .asm_a88cf ; 0x51181 jr z, .asm_5118b
ld hl, Route22RivalAfterBattleText1 ld hl, Route22RivalAfterBattleText1
call PrintText call PrintText
jr .asm_48088 ; 0x51189 jr .asm_51191
.asm_a88cf ; 0x5118b .asm_5118b
ld hl, Route22RivalBeforeBattleText1 ld hl, Route22RivalBeforeBattleText1
call PrintText call PrintText
.asm_48088 ; 0x51191 .asm_51191
jp TextScriptEnd jp TextScriptEnd
Route22Text2: ; 51194 (14:5194) Route22Text2: ; 51194 (14:5194)
db $08 ; asm db $08 ; asm
ld a, [wd7eb] ld a, [wd7eb]
bit 6, a bit 6, a
jr z, .asm_58c0a ; 0x5119a jr z, .asm_511a4
ld hl, Route22RivalAfterBattleText2 ld hl, Route22RivalAfterBattleText2
call PrintText call PrintText
jr .asm_673ee ; 0x511a2 jr .asm_511aa
.asm_58c0a ; 0x511a4 .asm_511a4
ld hl, Route22RivalBeforeBattleText2 ld hl, Route22RivalBeforeBattleText2
call PrintText call PrintText
.asm_673ee ; 0x511aa .asm_511aa
jp TextScriptEnd jp TextScriptEnd
Route22RivalBeforeBattleText1: ; 511ad (14:51ad) Route22RivalBeforeBattleText1: ; 511ad (14:51ad)

View file

@ -6,7 +6,7 @@ Route22GateScript: ; 1e683 (7:6683)
ld a, [W_YCOORD] ld a, [W_YCOORD]
cp $4 cp $4
ld a, ROUTE_23 ld a, ROUTE_23
jr c, .asm_1e69a ; 0x1e696 $2 jr c, .asm_1e69a
ld a, ROUTE_22 ld a, ROUTE_22
.asm_1e69a .asm_1e69a
ld [wLastMap], a ld [wLastMap], a
@ -60,27 +60,27 @@ Route22GateText1: ; 1e6e1 (7:66e1)
db $8 db $8
ld a, [W_OBTAINEDBADGES] ld a, [W_OBTAINEDBADGES]
bit 0, a bit 0, a
jr nz, .asm_8a809 ; 0x1e6e7 $d jr nz, .asm_1e6f6
ld hl, Route22GateText_1e704 ld hl, Route22GateText_1e704
call PrintText call PrintText
call Route22GateScript_1e6ba call Route22GateScript_1e6ba
ld a, $1 ld a, $1
jr .asm_20f7e ; 0x1e6f4 $8 jr .asm_1e6fe
.asm_8a809 ; 0x1e6f6 .asm_1e6f6
ld hl, Route22GateText_1e71a ld hl, Route22GateText_1e71a
call PrintText call PrintText
ld a, $2 ld a, $2
.asm_20f7e ; 0x1e6fe .asm_1e6fe
ld [W_ROUTE22GATECURSCRIPT], a ld [W_ROUTE22GATECURSCRIPT], a
jp TextScriptEnd jp TextScriptEnd
Route22GateText_1e704: ; 1e704 (7:6704) Route22GateText_1e704: ; 1e704 (7:6704)
TX_FAR _Route22GateText_1e704 ; 0x8cfbb TX_FAR _Route22GateText_1e704
db $8 db $8
ld a, (SFX_02_51 - SFX_Headers_02) / 3 ld a, (SFX_02_51 - SFX_Headers_02) / 3
call PlaySoundWaitForCurrent call PlaySoundWaitForCurrent
call WaitForSoundToFinish call WaitForSoundToFinish
ld hl, Route22GateText_1e715 ; $6715 ld hl, Route22GateText_1e715
ret ret
Route22GateText_1e715: ; 1e715 (7:6715) Route22GateText_1e715: ; 1e715 (7:6715)
@ -88,5 +88,5 @@ Route22GateText_1e715: ; 1e715 (7:6715)
db "@" db "@"
Route22GateText_1e71a: ; 1e71a (7:671a) Route22GateText_1e71a: ; 1e71a (7:671a)
TX_FAR _Route22GateText_1e71a ; 0x8d03e TX_FAR _Route22GateText_1e71a
db $0B, "@" db $0B, "@"

View file

@ -29,7 +29,7 @@ Route23ScriptPointers: ; 51213 (14:5213)
dw Route23Script2 dw Route23Script2
Route23Script0: ; 51219 (14:5219) Route23Script0: ; 51219 (14:5219)
ld hl, YCoordsData_51255 ; $5255 ld hl, YCoordsData_51255
ld a, [W_YCOORD] ld a, [W_YCOORD]
ld b, a ld b, a
ld e, $0 ld e, $0
@ -41,9 +41,9 @@ Route23Script0: ; 51219 (14:5219)
inc e inc e
dec c dec c
cp b cp b
jr nz, .asm_51224 ; 0x5122b $f7 jr nz, .asm_51224
cp $23 cp $23
jr nz, .asm_51237 ; 0x5122f $6 jr nz, .asm_51237
ld a, [W_XCOORD] ld a, [W_XCOORD]
cp $e cp $e
ret nc ret nc
@ -68,8 +68,8 @@ YCoordsData_51255: ; 51255 (14:5255)
db $23,$38,$55,$60,$69,$77,$88,$FF db $23,$38,$55,$60,$69,$77,$88,$FF
Route23Script_5125d: ; 5125d (14:525d) Route23Script_5125d: ; 5125d (14:525d)
ld hl, BadgeTextPointers ; $5276 ld hl, BadgeTextPointers
ld a, [wWhichTrade] ; wWhichTrade ld a, [wWhichTrade]
ld c, a ld c, a
ld b, $0 ld b, $0
add hl, bc add hl, bc
@ -188,9 +188,9 @@ Route23Text7: ; 5133d (14:533d)
jp TextScriptEnd jp TextScriptEnd
Route23Script_51346: ; 51346 (14:5346) Route23Script_51346: ; 51346 (14:5346)
ld [wWhichTrade], a ; wWhichTrade ld [wWhichTrade], a
call Route23Script_5125d call Route23Script_5125d
ld a, [wWhichTrade] ; wWhichTrade ld a, [wWhichTrade]
inc a inc a
ld c, a ld c, a
ld b, $2 ld b, $2
@ -208,7 +208,7 @@ Route23Script_51346: ; 51346 (14:5346)
.asm_5136e .asm_5136e
ld hl, VictoryRoadGuardText2 ld hl, VictoryRoadGuardText2
call PrintText call PrintText
ld a, [wWhichTrade] ; wWhichTrade ld a, [wWhichTrade]
ld c, a ld c, a
ld b, $1 ld b, $1
ld hl, wd7ed ld hl, wd7ed

View file

@ -25,13 +25,13 @@ Route24Script0: ; 513d5 (14:53d5)
ld a, [wd7ef] ld a, [wd7ef]
bit 0, a bit 0, a
jp nz, CheckFightingMapTrainers jp nz, CheckFightingMapTrainers
ld hl, CoordsData_5140e ; $540e ld hl, CoordsData_5140e
call ArePlayerCoordsInArray call ArePlayerCoordsInArray
jp nc, CheckFightingMapTrainers jp nc, CheckFightingMapTrainers
xor a xor a
ld [hJoyHeld], a ld [hJoyHeld], a
ld a, $1 ld a, $1
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a
call DisplayTextID call DisplayTextID
ld hl, wd7f0 ld hl, wd7f0
bit 1, [hl] bit 1, [hl]
@ -61,7 +61,7 @@ Route24Script4: ; 51411 (14:5411)
ret ret
Route24Script3: ; 51422 (14:5422) Route24Script3: ; 51422 (14:5422)
ld a, [W_ISINBATTLE] ; W_ISINBATTLE ld a, [W_ISINBATTLE]
cp $ff cp $ff
jp z, Route24Script_513c0 jp z, Route24Script_513c0
call UpdateSprites call UpdateSprites
@ -70,7 +70,7 @@ Route24Script3: ; 51422 (14:5422)
ld hl, wd7ef ld hl, wd7ef
set 1, [hl] set 1, [hl]
ld a, $1 ld a, $1
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a
call DisplayTextID call DisplayTextID
xor a xor a
ld [wJoyIgnore], a ld [wJoyIgnore], a
@ -94,55 +94,55 @@ Route24TrainerHeader0: ; 5145b (14:545b)
db $2 ; flag's bit db $2 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7ef ; flag's byte dw wd7ef ; flag's byte
dw Route24BattleText1 ; 0x5571 TextBeforeBattle dw Route24BattleText1 ; TextBeforeBattle
dw Route24AfterBattleText1 ; 0x557b TextAfterBattle dw Route24AfterBattleText1 ; TextAfterBattle
dw Route24EndBattleText1 ; 0x5576 TextEndBattle dw Route24EndBattleText1 ; TextEndBattle
dw Route24EndBattleText1 ; 0x5576 TextEndBattle dw Route24EndBattleText1 ; TextEndBattle
Route24TrainerHeader2: ; 51467 (14:5467) Route24TrainerHeader2: ; 51467 (14:5467)
db $3 ; flag's bit db $3 ; flag's bit
db ($1 << 4) ; trainer's view range db ($1 << 4) ; trainer's view range
dw wd7ef ; flag's byte dw wd7ef ; flag's byte
dw Route24BattleText2 ; 0x5580 TextBeforeBattle dw Route24BattleText2 ; TextBeforeBattle
dw Route24AfterBattleText2 ; 0x558a TextAfterBattle dw Route24AfterBattleText2 ; TextAfterBattle
dw Route24EndBattleText2 ; 0x5585 TextEndBattle dw Route24EndBattleText2 ; TextEndBattle
dw Route24EndBattleText2 ; 0x5585 TextEndBattle dw Route24EndBattleText2 ; TextEndBattle
Route24TrainerHeader3: ; 51473 (14:5473) Route24TrainerHeader3: ; 51473 (14:5473)
db $4 ; flag's bit db $4 ; flag's bit
db ($1 << 4) ; trainer's view range db ($1 << 4) ; trainer's view range
dw wd7ef ; flag's byte dw wd7ef ; flag's byte
dw Route24BattleText3 ; 0x558f TextBeforeBattle dw Route24BattleText3 ; TextBeforeBattle
dw Route24AfterBattleText3 ; 0x5599 TextAfterBattle dw Route24AfterBattleText3 ; TextAfterBattle
dw Route24EndBattleText3 ; 0x5594 TextEndBattle dw Route24EndBattleText3 ; TextEndBattle
dw Route24EndBattleText3 ; 0x5594 TextEndBattle dw Route24EndBattleText3 ; TextEndBattle
Route24TrainerHeader4: ; 5147f (14:547f) Route24TrainerHeader4: ; 5147f (14:547f)
db $5 ; flag's bit db $5 ; flag's bit
db ($1 << 4) ; trainer's view range db ($1 << 4) ; trainer's view range
dw wd7ef ; flag's byte dw wd7ef ; flag's byte
dw Route24BattleText4 ; 0x559e TextBeforeBattle dw Route24BattleText4 ; TextBeforeBattle
dw Route24AfterBattleText4 ; 0x55a8 TextAfterBattle dw Route24AfterBattleText4 ; TextAfterBattle
dw Route24EndBattleText4 ; 0x55a3 TextEndBattle dw Route24EndBattleText4 ; TextEndBattle
dw Route24EndBattleText4 ; 0x55a3 TextEndBattle dw Route24EndBattleText4 ; TextEndBattle
Route24TrainerHeader5: ; 5148b (14:548b) Route24TrainerHeader5: ; 5148b (14:548b)
db $6 ; flag's bit db $6 ; flag's bit
db ($1 << 4) ; trainer's view range db ($1 << 4) ; trainer's view range
dw wd7ef ; flag's byte dw wd7ef ; flag's byte
dw Route24BattleText5 ; 0x55ad TextBeforeBattle dw Route24BattleText5 ; TextBeforeBattle
dw Route24AfterBattleText5 ; 0x55b7 TextAfterBattle dw Route24AfterBattleText5 ; TextAfterBattle
dw Route24EndBattleText5 ; 0x55b2 TextEndBattle dw Route24EndBattleText5 ; TextEndBattle
dw Route24EndBattleText5 ; 0x55b2 TextEndBattle dw Route24EndBattleText5 ; TextEndBattle
Route24TrainerHeader6: ; 51497 (14:5497) Route24TrainerHeader6: ; 51497 (14:5497)
db $7 ; flag's bit db $7 ; flag's bit
db ($1 << 4) ; trainer's view range db ($1 << 4) ; trainer's view range
dw wd7ef ; flag's byte dw wd7ef ; flag's byte
dw Route24BattleText6 ; 0x55bc TextBeforeBattle dw Route24BattleText6 ; TextBeforeBattle
dw Route24AfterBattleText6 ; 0x55c6 TextAfterBattle dw Route24AfterBattleText6 ; TextAfterBattle
dw Route24EndBattleText6 ; 0x55c1 TextEndBattle dw Route24EndBattleText6 ; TextEndBattle
dw Route24EndBattleText6 ; 0x55c1 TextEndBattle dw Route24EndBattleText6 ; TextEndBattle
db $ff db $ff
@ -152,7 +152,7 @@ Route24Text1: ; 514a4 (14:54a4)
res 1, [hl] res 1, [hl]
ld a, [wd7ef] ld a, [wd7ef]
bit 0, a bit 0, a
jr nz, .asm_a03f5 ; 0x514af $48 jr nz, .asm_514f9
ld hl, Route24Text_51510 ld hl, Route24Text_51510
call PrintText call PrintText
ld bc, (NUGGET << 8) | 1 ld bc, (NUGGET << 8) | 1
@ -180,7 +180,7 @@ Route24Text1: ; 514a4 (14:54a4)
ld [W_ROUTE24CURSCRIPT], a ld [W_ROUTE24CURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
jp TextScriptEnd jp TextScriptEnd
.asm_a03f5 ; 0x514f9 .asm_514f9
ld hl, Route24Text_51530 ld hl, Route24Text_51530
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd
@ -192,13 +192,13 @@ Route24Text1: ; 514a4 (14:54a4)
jp TextScriptEnd jp TextScriptEnd
Route24Text_51510: ; 51510 (14:5510) Route24Text_51510: ; 51510 (14:5510)
TX_FAR _Route24Text_51510 ; 0x92721 TX_FAR _Route24Text_51510
db $0B db $0B
TX_FAR _Route24Text_51515 ; 0x92755 TX_FAR _Route24Text_51515
db "@" db "@"
Route24Text_5151a: ; 5151a (14:551a) Route24Text_5151a: ; 5151a (14:551a)
TX_FAR _Route24Text_5151a ; 0x92779 TX_FAR _Route24Text_5151a
db $0B, $6, "@" db $0B, $6, "@"
Route24Text_51521: ; 51521 (14:5521) Route24Text_51521: ; 51521 (14:5521)

View file

@ -59,82 +59,82 @@ Route25TrainerHeader0: ; 5163e (14:563e)
db $1 ; flag's bit db $1 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd7f1 ; flag's byte dw wd7f1 ; flag's byte
dw Route25BattleText1 ; 0x5705 TextBeforeBattle dw Route25BattleText1 ; TextBeforeBattle
dw Route25AfterBattleText1 ; 0x570f TextAfterBattle dw Route25AfterBattleText1 ; TextAfterBattle
dw Route25EndBattleText1 ; 0x570a TextEndBattle dw Route25EndBattleText1 ; TextEndBattle
dw Route25EndBattleText1 ; 0x570a TextEndBattle dw Route25EndBattleText1 ; TextEndBattle
Route25TrainerHeader2: ; 5164a (14:564a) Route25TrainerHeader2: ; 5164a (14:564a)
db $2 ; flag's bit db $2 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7f1 ; flag's byte dw wd7f1 ; flag's byte
dw Route25BattleText2 ; 0x5714 TextBeforeBattle dw Route25BattleText2 ; TextBeforeBattle
dw Route25AfterBattleText2 ; 0x571e TextAfterBattle dw Route25AfterBattleText2 ; TextAfterBattle
dw Route25EndBattleText2 ; 0x5719 TextEndBattle dw Route25EndBattleText2 ; TextEndBattle
dw Route25EndBattleText2 ; 0x5719 TextEndBattle dw Route25EndBattleText2 ; TextEndBattle
Route25TrainerHeader3: ; 51656 (14:5656) Route25TrainerHeader3: ; 51656 (14:5656)
db $3 ; flag's bit db $3 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7f1 ; flag's byte dw wd7f1 ; flag's byte
dw Route25BattleText3 ; 0x5723 TextBeforeBattle dw Route25BattleText3 ; TextBeforeBattle
dw Route25AfterBattleText3 ; 0x572d TextAfterBattle dw Route25AfterBattleText3 ; TextAfterBattle
dw Route25EndBattleText3 ; 0x5728 TextEndBattle dw Route25EndBattleText3 ; TextEndBattle
dw Route25EndBattleText3 ; 0x5728 TextEndBattle dw Route25EndBattleText3 ; TextEndBattle
Route25TrainerHeader4: ; 51662 (14:5662) Route25TrainerHeader4: ; 51662 (14:5662)
db $4 ; flag's bit db $4 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd7f1 ; flag's byte dw wd7f1 ; flag's byte
dw Route25BattleText4 ; 0x5732 TextBeforeBattle dw Route25BattleText4 ; TextBeforeBattle
dw Route25AfterBattleText4 ; 0x573c TextAfterBattle dw Route25AfterBattleText4 ; TextAfterBattle
dw Route25EndBattleText4 ; 0x5737 TextEndBattle dw Route25EndBattleText4 ; TextEndBattle
dw Route25EndBattleText4 ; 0x5737 TextEndBattle dw Route25EndBattleText4 ; TextEndBattle
Route25TrainerHeader5: ; 5166e (14:566e) Route25TrainerHeader5: ; 5166e (14:566e)
db $5 ; flag's bit db $5 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7f1 ; flag's byte dw wd7f1 ; flag's byte
dw Route25BattleText5 ; 0x5741 TextBeforeBattle dw Route25BattleText5 ; TextBeforeBattle
dw Route25AfterBattleText5 ; 0x574b TextAfterBattle dw Route25AfterBattleText5 ; TextAfterBattle
dw Route25EndBattleText5 ; 0x5746 TextEndBattle dw Route25EndBattleText5 ; TextEndBattle
dw Route25EndBattleText5 ; 0x5746 TextEndBattle dw Route25EndBattleText5 ; TextEndBattle
Route25TrainerHeader6: ; 5167a (14:567a) Route25TrainerHeader6: ; 5167a (14:567a)
db $6 ; flag's bit db $6 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7f1 ; flag's byte dw wd7f1 ; flag's byte
dw Route25BattleText6 ; 0x5750 TextBeforeBattle dw Route25BattleText6 ; TextBeforeBattle
dw Route25AfterBattleText6 ; 0x575a TextAfterBattle dw Route25AfterBattleText6 ; TextAfterBattle
dw Route25EndBattleText6 ; 0x5755 TextEndBattle dw Route25EndBattleText6 ; TextEndBattle
dw Route25EndBattleText6 ; 0x5755 TextEndBattle dw Route25EndBattleText6 ; TextEndBattle
Route25TrainerHeader7: ; 51686 (14:5686) Route25TrainerHeader7: ; 51686 (14:5686)
db $7 ; flag's bit db $7 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7f1 ; flag's byte dw wd7f1 ; flag's byte
dw Route25BattleText7 ; 0x575f TextBeforeBattle dw Route25BattleText7 ; TextBeforeBattle
dw Route25AfterBattleText7 ; 0x5769 TextAfterBattle dw Route25AfterBattleText7 ; TextAfterBattle
dw Route25EndBattleText7 ; 0x5764 TextEndBattle dw Route25EndBattleText7 ; TextEndBattle
dw Route25EndBattleText7 ; 0x5764 TextEndBattle dw Route25EndBattleText7 ; TextEndBattle
Route25TrainerHeader8: ; 51692 (14:5692) Route25TrainerHeader8: ; 51692 (14:5692)
db $8 ; flag's bit db $8 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd7f1 ; flag's byte dw wd7f1 ; flag's byte
dw Route25BattleText8 ; 0x576e TextBeforeBattle dw Route25BattleText8 ; TextBeforeBattle
dw Route25AfterBattleText8 ; 0x5778 TextAfterBattle dw Route25AfterBattleText8 ; TextAfterBattle
dw Route25EndBattleText8 ; 0x5773 TextEndBattle dw Route25EndBattleText8 ; TextEndBattle
dw Route25EndBattleText8 ; 0x5773 TextEndBattle dw Route25EndBattleText8 ; TextEndBattle
Route25TrainerHeader9: ; 5169e (14:569e) Route25TrainerHeader9: ; 5169e (14:569e)
db $9 ; flag's bit db $9 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd7f1 ; flag's byte dw wd7f1 ; flag's byte
dw Route25BattleText9 ; 0x577d TextBeforeBattle dw Route25BattleText9 ; TextBeforeBattle
dw Route25AfterBattleText9 ; 0x5787 TextAfterBattle dw Route25AfterBattleText9 ; TextAfterBattle
dw Route25EndBattleText9 ; 0x5782 TextEndBattle dw Route25EndBattleText9 ; TextEndBattle
dw Route25EndBattleText9 ; 0x5782 TextEndBattle dw Route25EndBattleText9 ; TextEndBattle
db $ff db $ff

View file

@ -9,13 +9,13 @@ Route2GateText1: ; 5d5db (17:55db)
db $08 ; asm db $08 ; asm
ld a, [wd7c2] ld a, [wd7c2]
bit 0, a bit 0, a
jr nz, .asm_6592c ; 0x5d5e1 jr nz, .asm_5d60d
ld a, 10 ; pokemon needed ld a, 10 ; pokemon needed
ldh [$db], a ldh [$db], a
ld a, HM_05 ; oak's aide reward ld a, HM_05 ; oak's aide reward
ldh [$dc], a ldh [$dc], a
ld [wd11e], a ld [wd11e], a
call GetItemName ; $2fcf call GetItemName
ld hl, wcd6d ld hl, wcd6d
ld de, wcc5b ld de, wcc5b
ld bc, $000d ld bc, $000d
@ -23,13 +23,13 @@ Route2GateText1: ; 5d5db (17:55db)
predef OaksAideScript ; call oak's aide script predef OaksAideScript ; call oak's aide script
ldh a, [$db] ldh a, [$db]
cp $1 cp $1
jr nz, .asm_ad646 ; 0x5d606 jr nz, .asm_5d613
ld hl, wd7c2 ld hl, wd7c2
set 0, [hl] set 0, [hl]
.asm_6592c ; 0x5d60d .asm_5d60d
ld hl, Route2GateText_5d616 ld hl, Route2GateText_5d616
call PrintText call PrintText
.asm_ad646 ; 0x5d613 .asm_5d613
jp TextScriptEnd jp TextScriptEnd
Route2GateText_5d616: ; 5d616 (17:5616) Route2GateText_5d616: ; 5d616 (17:5616)

View file

@ -29,73 +29,73 @@ Route3TrainerHeader0: ; 55525 (15:5525)
db $2 ; flag's bit db $2 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd7c3 ; flag's byte dw wd7c3 ; flag's byte
dw Route3BattleText1 ; 0x5595 TextBeforeBattle dw Route3BattleText1 ; TextBeforeBattle
dw Route3AfterBattleText1 ; 0x559f TextAfterBattle dw Route3AfterBattleText1 ; TextAfterBattle
dw Route3EndBattleText1 ; 0x559a TextEndBattle dw Route3EndBattleText1 ; TextEndBattle
dw Route3EndBattleText1 ; 0x559a TextEndBattle dw Route3EndBattleText1 ; TextEndBattle
Route3TrainerHeader2: ; 55531 (15:5531) Route3TrainerHeader2: ; 55531 (15:5531)
db $3 ; flag's bit db $3 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7c3 ; flag's byte dw wd7c3 ; flag's byte
dw Route3BattleText2 ; 0x55ae TextBeforeBattle dw Route3BattleText2 ; TextBeforeBattle
dw Route3AfterBattleText2 ; 0x55b8 TextAfterBattle dw Route3AfterBattleText2 ; TextAfterBattle
dw Route3EndBattleText2 ; 0x55b3 TextEndBattle dw Route3EndBattleText2 ; TextEndBattle
dw Route3EndBattleText2 ; 0x55b3 TextEndBattle dw Route3EndBattleText2 ; TextEndBattle
Route3TrainerHeader3: ; 5553d (15:553d) Route3TrainerHeader3: ; 5553d (15:553d)
db $4 ; flag's bit db $4 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd7c3 ; flag's byte dw wd7c3 ; flag's byte
dw Route3BattleText3 ; 0x55c7 TextBeforeBattle dw Route3BattleText3 ; TextBeforeBattle
dw Route3AfterBattleText3 ; 0x55d1 TextAfterBattle dw Route3AfterBattleText3 ; TextAfterBattle
dw Route3EndBattleText3 ; 0x55cc TextEndBattle dw Route3EndBattleText3 ; TextEndBattle
dw Route3EndBattleText3 ; 0x55cc TextEndBattle dw Route3EndBattleText3 ; TextEndBattle
Route3TrainerHeader4: ; 55549 (15:5549) Route3TrainerHeader4: ; 55549 (15:5549)
db $5 ; flag's bit db $5 ; flag's bit
db ($1 << 4) ; trainer's view range db ($1 << 4) ; trainer's view range
dw wd7c3 ; flag's byte dw wd7c3 ; flag's byte
dw Route3BattleText4 ; 0x55e0 TextBeforeBattle dw Route3BattleText4 ; TextBeforeBattle
dw Route3AfterBattleText4 ; 0x55ea TextAfterBattle dw Route3AfterBattleText4 ; TextAfterBattle
dw Route3EndBattleText4 ; 0x55e5 TextEndBattle dw Route3EndBattleText4 ; TextEndBattle
dw Route3EndBattleText4 ; 0x55e5 TextEndBattle dw Route3EndBattleText4 ; TextEndBattle
Route3TrainerHeader5: ; 55555 (15:5555) Route3TrainerHeader5: ; 55555 (15:5555)
db $6 ; flag's bit db $6 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7c3 ; flag's byte dw wd7c3 ; flag's byte
dw Route3BattleText5 ; 0x55f9 TextBeforeBattle dw Route3BattleText5 ; TextBeforeBattle
dw Route3AfterBattleText5 ; 0x5603 TextAfterBattle dw Route3AfterBattleText5 ; TextAfterBattle
dw Route3EndBattleText5 ; 0x55fe TextEndBattle dw Route3EndBattleText5 ; TextEndBattle
dw Route3EndBattleText5 ; 0x55fe TextEndBattle dw Route3EndBattleText5 ; TextEndBattle
Route3TrainerHeader6: ; 55561 (15:5561) Route3TrainerHeader6: ; 55561 (15:5561)
db $7 ; flag's bit db $7 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7c3 ; flag's byte dw wd7c3 ; flag's byte
dw Route3BattleText6 ; 0x5612 TextBeforeBattle dw Route3BattleText6 ; TextBeforeBattle
dw Route3AfterBattleText6 ; 0x561c TextAfterBattle dw Route3AfterBattleText6 ; TextAfterBattle
dw Route3EndBattleText6 ; 0x5617 TextEndBattle dw Route3EndBattleText6 ; TextEndBattle
dw Route3EndBattleText6 ; 0x5617 TextEndBattle dw Route3EndBattleText6 ; TextEndBattle
Route3TrainerHeader7: ; 5556d (15:556d) Route3TrainerHeader7: ; 5556d (15:556d)
db $8 ; flag's bit db $8 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7c3 ; flag's byte dw wd7c3 ; flag's byte
dw Route3BattleText7 ; 0x562b TextBeforeBattle dw Route3BattleText7 ; TextBeforeBattle
dw Route3AfterBattleText7 ; 0x5635 TextAfterBattle dw Route3AfterBattleText7 ; TextAfterBattle
dw Route3EndBattleText7 ; 0x5630 TextEndBattle dw Route3EndBattleText7 ; TextEndBattle
dw Route3EndBattleText7 ; 0x5630 TextEndBattle dw Route3EndBattleText7 ; TextEndBattle
Route3TrainerHeader8: ; 55579 (15:5579) Route3TrainerHeader8: ; 55579 (15:5579)
db $9 ; flag's bit db $9 ; flag's bit
db ($2 << 4) ; trainer's view range db ($2 << 4) ; trainer's view range
dw wd7c3 ; flag's byte dw wd7c3 ; flag's byte
dw Route3BattleText8 ; 0x5644 TextBeforeBattle dw Route3BattleText8 ; TextBeforeBattle
dw Route3AfterBattleText8 ; 0x564e TextAfterBattle dw Route3AfterBattleText8 ; TextAfterBattle
dw Route3EndBattleText8 ; 0x5649 TextEndBattle dw Route3EndBattleText8 ; TextEndBattle
dw Route3EndBattleText8 ; 0x5649 TextEndBattle dw Route3EndBattleText8 ; TextEndBattle
db $ff db $ff

View file

@ -25,10 +25,10 @@ Route4TrainerHeader0: ; 5567d (15:567d)
db $2 ; flag's bit db $2 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7c5 ; flag's byte dw wd7c5 ; flag's byte
dw Route4BattleText1 ; 0x5699 TextBeforeBattle dw Route4BattleText1 ; TextBeforeBattle
dw Route4AfterBattleText1 ; 0x56a3 TextAfterBattle dw Route4AfterBattleText1 ; TextAfterBattle
dw Route4EndBattleText1 ; 0x569e TextEndBattle dw Route4EndBattleText1 ; TextEndBattle
dw Route4EndBattleText1 ; 0x569e TextEndBattle dw Route4EndBattleText1 ; TextEndBattle
db $ff db $ff

View file

@ -29,7 +29,7 @@ Route5GateScript0: ; 1df50 (7:5f50)
callba RemoveGuardDrink callba RemoveGuardDrink
ld a, [$ffdb] ld a, [$ffdb]
and a and a
jr nz, .asm_1df82 ; 0x1df70 $10 jr nz, .asm_1df82
ld a, $2 ld a, $2
ld [$ff8c], a ld [$ff8c], a
call DisplayTextID call DisplayTextID
@ -72,24 +72,24 @@ Route5GateText1: ; 1dfaa (7:5faa)
db $8 db $8
ld a, [wd728] ld a, [wd728]
bit 6, a bit 6, a
jr nz, .asm_88856 ; 0x1dfb0 $2c jr nz, .asm_88856
callba RemoveGuardDrink callba RemoveGuardDrink
ld a, [$ffdb] ld a, [$ffdb]
and a and a
jr nz, .asm_768a2 ; 0x1dfbd $11 jr nz, .asm_768a2
ld hl, Route5GateText2 ld hl, Route5GateText2
call PrintText call PrintText
call Route5GateScript_1df43 call Route5GateScript_1df43
ld a, $1 ld a, $1
ld [W_ROUTE5GATECURSCRIPT], a ld [W_ROUTE5GATECURSCRIPT], a
jp TextScriptEnd jp TextScriptEnd
.asm_768a2 ; 0x1dfd0 .asm_768a2
ld hl, Route5GateText3 ld hl, Route5GateText3
call PrintText call PrintText
ld hl, wd728 ld hl, wd728
set 6, [hl] set 6, [hl]
jp TextScriptEnd jp TextScriptEnd
.asm_88856 ; 0x1dfde .asm_88856
ld hl, SaffronGateText_1dff6 ld hl, SaffronGateText_1dff6
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd
@ -105,9 +105,9 @@ Route8GateText3: ; 1dfec (7:5fec)
Route7GateText3: ; 1dfec (7:5fec) Route7GateText3: ; 1dfec (7:5fec)
Route6GateText3: ; 1dfec (7:5fec) Route6GateText3: ; 1dfec (7:5fec)
Route5GateText3: ; 1dfec (7:5fec) Route5GateText3: ; 1dfec (7:5fec)
TX_FAR _SaffronGateText_8aaa9 ; 0x8aaa9 TX_FAR _SaffronGateText_8aaa9
db $11 db $11
TX_FAR _SaffronGateText_1dff1 ; 0x8aaef TX_FAR _SaffronGateText_1dff1
db "@" db "@"
SaffronGateText_1dff6: ; 1dff6 (7:5ff6) SaffronGateText_1dff6: ; 1dff6 (7:5ff6)

View file

@ -26,55 +26,55 @@ Route6TrainerHeader0: ; 590d7 (16:50d7)
db $1 ; flag's bit db $1 ; flag's bit
db ($0 << 4) ; trainer's view range db ($0 << 4) ; trainer's view range
dw wd7c9 ; flag's byte dw wd7c9 ; flag's byte
dw Route6BattleText1 ; 0x512a TextBeforeBattle dw Route6BattleText1 ; TextBeforeBattle
dw Route6AfterBattleText1 ; 0x5134 TextAfterBattle dw Route6AfterBattleText1 ; TextAfterBattle
dw Route6EndBattleText1 ; 0x512f TextEndBattle dw Route6EndBattleText1 ; TextEndBattle
dw Route6EndBattleText1 ; 0x512f TextEndBattle dw Route6EndBattleText1 ; TextEndBattle
Route6TrainerHeader1: ; 590e3 (16:50e3) Route6TrainerHeader1: ; 590e3 (16:50e3)
db $2 ; flag's bit db $2 ; flag's bit
db ($0 << 4) ; trainer's view range db ($0 << 4) ; trainer's view range
dw wd7c9 ; flag's byte dw wd7c9 ; flag's byte
dw Route6BattleText2 ; 0x5143 TextBeforeBattle dw Route6BattleText2 ; TextBeforeBattle
dw Route6AfterBattleText1 ; 0x5134 TextAfterBattle dw Route6AfterBattleText1 ; TextAfterBattle
dw Route6EndBattleText2 ; 0x5148 TextEndBattle dw Route6EndBattleText2 ; TextEndBattle
dw Route6EndBattleText2 ; 0x5148 TextEndBattle dw Route6EndBattleText2 ; TextEndBattle
Route6TrainerHeader2: ; 590ef (16:50ef) Route6TrainerHeader2: ; 590ef (16:50ef)
db $3 ; flag's bit db $3 ; flag's bit
db ($4 << 4) ; trainer's view range db ($4 << 4) ; trainer's view range
dw wd7c9 ; flag's byte dw wd7c9 ; flag's byte
dw Route6BattleText3 ; 0x5157 TextBeforeBattle dw Route6BattleText3 ; TextBeforeBattle
dw Route6AfterBattleText3 ; 0x5161 TextAfterBattle dw Route6AfterBattleText3 ; TextAfterBattle
dw Route6EndBattleText3 ; 0x515c TextEndBattle dw Route6EndBattleText3 ; TextEndBattle
dw Route6EndBattleText3 ; 0x515c TextEndBattle dw Route6EndBattleText3 ; TextEndBattle
Route6TrainerHeader3: ; 590fb (16:50fb) Route6TrainerHeader3: ; 590fb (16:50fb)
db $4 ; flag's bit db $4 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7c9 ; flag's byte dw wd7c9 ; flag's byte
dw Route6BattleText4 ; 0x5170 TextBeforeBattle dw Route6BattleText4 ; TextBeforeBattle
dw Route6AfterBattleText4 ; 0x517a TextAfterBattle dw Route6AfterBattleText4 ; TextAfterBattle
dw Route6EndBattleText4 ; 0x5175 TextEndBattle dw Route6EndBattleText4 ; TextEndBattle
dw Route6EndBattleText4 ; 0x5175 TextEndBattle dw Route6EndBattleText4 ; TextEndBattle
Route6TrainerHeader4: ; 59107 (16:5107) Route6TrainerHeader4: ; 59107 (16:5107)
db $5 ; flag's bit db $5 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7c9 ; flag's byte dw wd7c9 ; flag's byte
dw Route6BattleText5 ; 0x5189 TextBeforeBattle dw Route6BattleText5 ; TextBeforeBattle
dw Route6AfterBattleText5 ; 0x5193 TextAfterBattle dw Route6AfterBattleText5 ; TextAfterBattle
dw Route6EndBattleText5 ; 0x518e TextEndBattle dw Route6EndBattleText5 ; TextEndBattle
dw Route6EndBattleText5 ; 0x518e TextEndBattle dw Route6EndBattleText5 ; TextEndBattle
Route6TrainerHeader5: ; 59113 (16:5113) Route6TrainerHeader5: ; 59113 (16:5113)
db $6 ; flag's bit db $6 ; flag's bit
db ($3 << 4) ; trainer's view range db ($3 << 4) ; trainer's view range
dw wd7c9 ; flag's byte dw wd7c9 ; flag's byte
dw Route6BattleText6 ; 0x51a2 TextBeforeBattle dw Route6BattleText6 ; TextBeforeBattle
dw Route6AfterBattleText6 ; 0x51ac TextAfterBattle dw Route6AfterBattleText6 ; TextAfterBattle
dw Route6EndBattleText6 ; 0x51a7 TextEndBattle dw Route6EndBattleText6 ; TextEndBattle
dw Route6EndBattleText6 ; 0x51a7 TextEndBattle dw Route6EndBattleText6 ; TextEndBattle
db $ff db $ff

View file

@ -23,7 +23,7 @@ Route6GateScript0: ; 1e04e (7:604e)
callba RemoveGuardDrink callba RemoveGuardDrink
ld a, [$ffdb] ld a, [$ffdb]
and a and a
jr nz, .asm_1e080 ; 0x1e06e $10 jr nz, .asm_1e080
ld a, $2 ld a, $2
ld [$ff8c], a ld [$ff8c], a
call DisplayTextID call DisplayTextID

View file

@ -35,7 +35,7 @@ Route7GateScript0: ; 1e128 (7:6128)
callba RemoveGuardDrink callba RemoveGuardDrink
ld a, [$ffdb] ld a, [$ffdb]
and a and a
jr nz, .asm_1e15a ; 0x1e148 $10 jr nz, .asm_1e15a
ld a, $2 ld a, $2
ld [$ff8c], a ld [$ff8c], a
call DisplayTextID call DisplayTextID

Some files were not shown because too many files have changed in this diff Show more