foster/pokered
0
0
Fork 0
mirror of https://github.com/pret/pokered.git synced 2024-10-22 22:55:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/huderlem/pokered into pull-data

Browse source 
Conflicts:
	main.asm
	text.asm
	text/maps/route_22.asm
This commit is contained in:
U-Fish-PC\Daniel 2014-05-19 10:38:20 -04:00
commit 1a0992a2f1
42 changed files with 916 additions and 1155 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
constants/move_constants.asm
View file

@ -1,3 +1,5 @@
NUM_MOVES EQU $A4
POUND EQU $01 POUND EQU $01
KARATE_CHOP EQU $02 KARATE_CHOP EQU $02
DOUBLESLAP EQU $03 DOUBLESLAP EQU $03
@ -163,6 +165,7 @@ SUPER_FANG EQU $A2
SLASH EQU $A3 SLASH EQU $A3
SUBSTITUTE EQU $A4 SUBSTITUTE EQU $A4
STRUGGLE EQU $A5 STRUGGLE EQU $A5
; these do double duty as animation identifiers ; these do double duty as animation identifiers
SHOWPIC_ANIM EQU $A6 ; redraw monster pic SHOWPIC_ANIM EQU $A6 ; redraw monster pic
STATUS_AFFECTED_ANIM EQU $A7 ; effect when monster receives a status aliment STATUS_AFFECTED_ANIM EQU $A7 ; effect when monster receives a status aliment

18
constants/move_effect_constants.asm
View file

@ -13,24 +13,30 @@ DREAM_EATER_EFFECT EQU $08
MIRROR_MOVE_EFFECT EQU $09 MIRROR_MOVE_EFFECT EQU $09
ATTACK_UP1_EFFECT EQU $0A ATTACK_UP1_EFFECT EQU $0A
DEFENSE_UP1_EFFECT EQU $0B DEFENSE_UP1_EFFECT EQU $0B
SPEED_UP1_EFFECT EQU $0C
SPECIAL_UP1_EFFECT EQU $0D SPECIAL_UP1_EFFECT EQU $0D
ACCURACY_UP1_EFFECT EQU $0E
EVASION_UP1_EFFECT EQU $0F EVASION_UP1_EFFECT EQU $0F
PAY_DAY_EFFECT EQU $10 PAY_DAY_EFFECT EQU $10
SWIFT_EFFECT EQU $11 SWIFT_EFFECT EQU $11
ATTACK_DOWN1_EFFECT EQU $12 ATTACK_DOWN1_EFFECT EQU $12
DEFENSE_DOWN1_EFFECT EQU $13 DEFENSE_DOWN1_EFFECT EQU $13
SPEED_DOWN1_EFFECT EQU $14 SPEED_DOWN1_EFFECT EQU $14
SPECIAL_DOWN1_EFFECT EQU $15
ACCURACY_DOWN1_EFFECT EQU $16 ACCURACY_DOWN1_EFFECT EQU $16
EVASION_DOWN1_EFFECT EQU $17
CONVERSION_EFFECT EQU $18 CONVERSION_EFFECT EQU $18
HAZE_EFFECT EQU $19 HAZE_EFFECT EQU $19
BIDE_EFFECT EQU $1A BIDE_EFFECT EQU $1A
THRASH_PETAL_DANCE_EFFECT EQU $1B THRASH_PETAL_DANCE_EFFECT EQU $1B
SWITCH_AND_TELEPORT_EFFECT EQU $1C SWITCH_AND_TELEPORT_EFFECT EQU $1C
TWO_TO_FIVE_ATTACKS_EFFECT EQU $1D TWO_TO_FIVE_ATTACKS_EFFECT EQU $1D
; unused effect EQU $1E
FLINCH_SIDE_EFFECT1 EQU $1F FLINCH_SIDE_EFFECT1 EQU $1F
SLEEP_EFFECT EQU $20 SLEEP_EFFECT EQU $20
POISON_SIDE_EFFECT2 EQU $21 POISON_SIDE_EFFECT2 EQU $21
BURN_SIDE_EFFECT2 EQU $22 BURN_SIDE_EFFECT2 EQU $22
; unused effect EQU $23
PARALYZE_SIDE_EFFECT2 EQU $24 PARALYZE_SIDE_EFFECT2 EQU $24
FLINCH_SIDE_EFFECT2 EQU $25 FLINCH_SIDE_EFFECT2 EQU $25
OHKO_EFFECT EQU $26 ; moves like Horn Drill OHKO_EFFECT EQU $26 ; moves like Horn Drill
@ -49,9 +55,16 @@ ATTACK_UP2_EFFECT EQU $32
DEFENSE_UP2_EFFECT EQU $33 DEFENSE_UP2_EFFECT EQU $33
SPEED_UP2_EFFECT EQU $34 SPEED_UP2_EFFECT EQU $34
SPECIAL_UP2_EFFECT EQU $35 SPECIAL_UP2_EFFECT EQU $35
ACCURACY_UP2_EFFECT EQU $36
EVASION_UP2_EFFECT EQU $37
HEAL_EFFECT EQU $38 ; Recover, Softboiled, Rest HEAL_EFFECT EQU $38 ; Recover, Softboiled, Rest
TRANSFORM_EFFECT EQU $39 TRANSFORM_EFFECT EQU $39
ATTACK_DOWN2_EFFECT EQU $3A
DEFENSE_DOWN2_EFFECT EQU $3B DEFENSE_DOWN2_EFFECT EQU $3B
SPEED_DOWN2_EFFECT EQU $3C
SPECIAL_DOWN2_EFFECT EQU $3D
ACCURACY_DOWN2_EFFECT EQU $3E
EVASION_DOWN2_EFFECT EQU $3F
LIGHT_SCREEN_EFFECT EQU $40 LIGHT_SCREEN_EFFECT EQU $40
REFLECT_EFFECT EQU $41 REFLECT_EFFECT EQU $41
POISON_EFFECT EQU $42 POISON_EFFECT EQU $42
@ -60,8 +73,13 @@ ATTACK_DOWN_SIDE_EFFECT EQU $44
DEFENSE_DOWN_SIDE_EFFECT EQU $45 DEFENSE_DOWN_SIDE_EFFECT EQU $45
SPEED_DOWN_SIDE_EFFECT EQU $46 SPEED_DOWN_SIDE_EFFECT EQU $46
SPECIAL_DOWN_SIDE_EFFECT EQU $47 SPECIAL_DOWN_SIDE_EFFECT EQU $47
; unused effect EQU $48
; unused effect EQU $49
; unused effect EQU $4A
; unused effect EQU $4B
CONFUSION_SIDE_EFFECT EQU $4C CONFUSION_SIDE_EFFECT EQU $4C
TWINEEDLE_EFFECT EQU $4D TWINEEDLE_EFFECT EQU $4D
; unused effect EQU $4E
SUBSTITUTE_EFFECT EQU $4F SUBSTITUTE_EFFECT EQU $4F
HYPER_BEAM_EFFECT EQU $50 HYPER_BEAM_EFFECT EQU $50
RAGE_EFFECT EQU $51 RAGE_EFFECT EQU $51

12
constants/status_constants.asm
View file

@ -1,6 +1,6 @@
; status ailments (masks) ; status ailments
SLP EQU %00000111 SLP EQU %111 ; mask
PSN EQU %00001000 PSN EQU 3
BRN EQU %00010000 BRN EQU 4
FRZ EQU %00100000 FRZ EQU 5
PAR EQU %01000000 PAR EQU 6

3
constants/wram_constants.asm
View file

@ -5,3 +5,6 @@ SPRITEBUFFERSIZE EQU 7*7 * 8 ; 7 * 7 (tiles) * 8 (bytes per tile)
W_WATERRATE EQU $d8a4 W_WATERRATE EQU $d8a4
W_WATERMONS EQU $d8a5 W_WATERMONS EQU $d8a5
; Overload enemy stat modifiers
wTradeMonNick EQU $cd1e

2
data/mapObjects/route22.asm
View file

@ -5,7 +5,7 @@ Route22Object: ; 0x50022 (size=27)
db $5, $8, $0, ROUTE_22_GATE db $5, $8, $0, ROUTE_22_GATE
db $1 ; signs db $1 ; signs
db $b, $7, $3 ; Route22Text3 db $b, $7, $3 ; Route22FrontGateText
db $2 ; people db $2 ; people
db SPRITE_BLUE, $5 + 4, $19 + 4, $ff, $ff, $1 ; person db SPRITE_BLUE, $5 + 4, $19 + 4, $ff, $ff, $1 ; person

12
macros.asm
View file

@ -11,6 +11,18 @@ page EQUS "db $49," ; Start a new Pokedex page.
dex EQUS "db $5f, $50" ; End a Pokedex entry. dex EQUS "db $5f, $50" ; End a Pokedex entry.
callba: MACRO
ld b, BANK(\1)
ld hl, \1
call Bankswitch
ENDM
callab: MACRO
ld hl, \1
ld b, BANK(\1)
call Bankswitch
ENDM
;\1 = X ;\1 = X
;\2 = Y ;\2 = Y
FuncCoord: MACRO FuncCoord: MACRO

1674
main.asm
View file

File diff suppressed because it is too large Load diff

4
menu/pc.asm
View file

@ -346,9 +346,7 @@ Func_21673: ; 21673 (8:5673)
jp Func_214e8 jp Func_214e8
Func_216b3: ; 216b3 (8:56b3) Func_216b3: ; 216b3 (8:56b3)
ld b, BANK(Func_738a1) callba Func_738a1
ld hl, Func_738a1
call Bankswitch ; indirect jump to Func_738a1 (738a1 (1c:78a1))
jp Func_214e8 jp Func_214e8
Func_216be: ; 216be (8:56be) Func_216be: ; 216be (8:56be)

4
scripts/bikeshop.asm
View file

@ -25,9 +25,7 @@ BikeShopText1: ; 1d745 (7:5745)
jr nc, .BagFull jr nc, .BagFull
ld a, BIKE_VOUCHER ld a, BIKE_VOUCHER
ldh [$db], a ldh [$db], a
ld b, BANK(RemoveItemByID) callba RemoveItemByID
ld hl, RemoveItemByID
call Bankswitch
ld hl, $d75f ld hl, $d75f
set 0, [hl] set 0, [hl]
ld hl, BikeShopText_1d824 ld hl, BikeShopText_1d824

4
scripts/celadonmansion3.asm
View file

@ -49,9 +49,7 @@ DirectorText: ; 487b2 (12:47b2)
TX_FAR _CompletedDexText TX_FAR _CompletedDexText
db $6 db $6
db $8 ; asm db $8 ; asm
ld hl, DisplayDiploma callab DisplayDiploma
ld b, BANK(DisplayDiploma)
call Bankswitch
ld a, $1 ld a, $1
ld [$cc3c], a ld [$cc3c], a
jp TextScriptEnd jp TextScriptEnd

8
scripts/ceruleancity.asm
View file

@ -177,9 +177,7 @@ CeruleanCityScript2: ; 195b1 (6:55b1)
ld a, $ff ld a, $ff
ld [$c0ee], a ld [$c0ee], a
call PlaySound call PlaySound
ld b, BANK(Music_RivalAlternateStart) callba Music_RivalAlternateStart
ld hl, Music_RivalAlternateStart
call Bankswitch
ld a, $1 ld a, $1
ld [$ff8c], a ld [$ff8c], a
call SetSpriteMovementBytesToFF call SetSpriteMovementBytesToFF
@ -304,9 +302,7 @@ CeruleanCityText2: ; 1967c (6:567c)
ld [$cc3c], a ld [$cc3c], a
ld hl, ReceivedTM28Text ld hl, ReceivedTM28Text
call PrintText call PrintText
ld b, BANK(Func_74872) callba Func_74872
ld hl, Func_74872
call Bankswitch
.Done .Done
jp TextScriptEnd jp TextScriptEnd

4
scripts/copycatshouse2f.asm
View file

@ -31,9 +31,7 @@ CopycatsHouse2FText1: ; 5cc82 (17:4c82)
call PrintText call PrintText
ld a, POKE_DOLL ld a, POKE_DOLL
ldh [$db], a ldh [$db], a
ld b, BANK(RemoveItemByID) callba RemoveItemByID
ld hl, RemoveItemByID
call Bankswitch
ld hl, $d7af ld hl, $d7af
set 0, [hl] set 0, [hl]
jr .asm_62ecd ; 0x5ccc1 jr .asm_62ecd ; 0x5ccc1

12
scripts/daycarem.asm
View file

@ -35,9 +35,7 @@ DayCareMText1: ; 56254 (15:6254)
pop af pop af
ld hl, DayCareMText_56437 ld hl, DayCareMText_56437
jp c, DayCareMScript_56409 jp c, DayCareMScript_56409
ld hl, Func_2171b callab Func_2171b
ld b, BANK(Func_2171b)
call Bankswitch
ld hl, DayCareMText_5644a ld hl, DayCareMText_5644a
jp c, DayCareMScript_56409 jp c, DayCareMScript_56409
xor a xor a
@ -67,16 +65,12 @@ DayCareMScript_562e1: ; 562e1 (15:62e1)
ld a, $3 ld a, $3
ld [$cc49], a ld [$cc49], a
call LoadMonData call LoadMonData
ld hl, Func_58f43 callab Func_58f43
ld b, BANK(Func_58f43)
call Bankswitch
ld a, d ld a, d
cp $64 cp $64
jr c, .asm_56315 jr c, .asm_56315
ld d, $64 ld d, $64
ld hl, CalcExperience callab CalcExperience
ld b, BANK(CalcExperience)
call Bankswitch
ld hl, $da6d ld hl, $da6d
ld a, [H_NUMTOPRINT] ld a, [H_NUMTOPRINT]
ld [hli], a ld [hli], a

4
scripts/diglettscaveroute11.asm
View file

@ -1,7 +1,7 @@
DiglettsCaveEntranceRoute11Script: ; 1e5ba (7:65ba) DiglettsCaveEntranceRoute11Script: ; 1e5ba (7:65ba)
call EnableAutoTextBoxDrawing call EnableAutoTextBoxDrawing
ld a, $16 ld a, ROUTE_11
ld [$d365], a ld [wLastMap], a
ret ret
DiglettsCaveEntranceRoute11TextPointers: ; 1e5c3 (7:65c3) DiglettsCaveEntranceRoute11TextPointers: ; 1e5c3 (7:65c3)

4
scripts/diglettscaveroute2.asm
View file

@ -1,6 +1,6 @@
DiglettsCaveRoute2Script: ; 1deb0 (7:5eb0) DiglettsCaveRoute2Script: ; 1deb0 (7:5eb0)
ld a, $d ld a, ROUTE_2
ld [$d365], a ld [wLastMap], a
jp EnableAutoTextBoxDrawing jp EnableAutoTextBoxDrawing
DiglettsCaveRoute2TextPointers: ; 1deb8 (7:5eb8) DiglettsCaveRoute2TextPointers: ; 1deb8 (7:5eb8)

4
scripts/fuchsiahouse2.asm
View file

@ -35,9 +35,7 @@ FuchsiaHouse2Text1: ; 750c2 (1d:50c2)
call PrintText call PrintText
ld a, GOLD_TEETH ld a, GOLD_TEETH
ldh [$db], a ldh [$db], a
ld b, BANK(RemoveItemByID) callba RemoveItemByID
ld hl, RemoveItemByID
call Bankswitch
ld hl, $d78e ld hl, $d78e
set 1, [hl] set 1, [hl]
.asm_60cba ; 0x75109 .asm_60cba ; 0x75109

4
scripts/gary.asm
View file

@ -109,9 +109,7 @@ GaryScript3: ; 75fbb (1d:5fbb)
ret ret
GaryScript4: ; 75fe4 (1d:5fe4) GaryScript4: ; 75fe4 (1d:5fe4)
ld b, BANK(Music_Cities1AlternateTempo) callba Music_Cities1AlternateTempo
ld hl, Music_Cities1AlternateTempo
call Bankswitch
ld a, $2 ld a, $2
ld [$ff8c], a ld [$ff8c], a
call GaryScript_760c8 call GaryScript_760c8

12
scripts/halloffameroom.asm
View file

@ -48,14 +48,12 @@ HallofFameRoomScript2: ; 5a4bb (16:64bb)
ld [hl], a ld [hl], a
xor a xor a
ld [W_HALLOFFAMEROOMCURSCRIPT], a ld [W_HALLOFFAMEROOMCURSCRIPT], a
ld a, $0 ld a, PALLET_TOWN
ld [$d719], a ld [wLastBlackoutMap], a
ld b, BANK(SaveSAVtoSRAM) callba SaveSAVtoSRAM
ld hl, SaveSAVtoSRAM ld b, 5
call Bankswitch
ld b, $5
.asm_5a4ff .asm_5a4ff
ld c, $78 ld c, 600 / 5
call DelayFrames call DelayFrames
dec b dec b
jr nz, .asm_5a4ff ; 0x5a505 $f8 jr nz, .asm_5a4ff ; 0x5a505 $f8

4
scripts/lab4.asm
View file

@ -55,9 +55,7 @@ Lab4Text1: ; 75d6c (1d:5d6c)
ld a, [$cd37] ld a, [$cd37]
and a and a
jr z, .asm_75d8d ; 0x75d81 $a jr z, .asm_75d8d ; 0x75d81 $a
ld b, BANK(GiveFossilToCinnabarLab) callba GiveFossilToCinnabarLab
ld hl, GiveFossilToCinnabarLab
call Bankswitch
jr .asm_75d93 ; 0x75d8b $6 jr .asm_75d93 ; 0x75d8b $6
.asm_75d8d .asm_75d8d
ld hl, Lab4Text_75dcb ld hl, Lab4Text_75dcb

4
scripts/namerater.asm
View file

@ -68,9 +68,7 @@ NameRaterText1: ; 1da56 (7:5a56)
jr nz, .asm_1daae ; 0x1da93 $19 jr nz, .asm_1daae ; 0x1da93 $19
ld hl, NameRaterText_1dac2 ld hl, NameRaterText_1dac2
call PrintText call PrintText
ld b, BANK(Func_655c) callba Func_655c
ld hl, Func_655c
call Bankswitch
jr c, .asm_1daae ; 0x1daa3 $9 jr c, .asm_1daae ; 0x1daa3 $9
ld hl, NameRaterText_1dac7 ld hl, NameRaterText_1dac7
.asm_1daa8 .asm_1daa8

12
scripts/oakslab.asm
View file

@ -425,9 +425,7 @@ OaksLabScript13: ; 1ce32 (7:4e32)
ld a, $10 ld a, $10
ld [$ff8c], a ld [$ff8c], a
call DisplayTextID call DisplayTextID
ld b, BANK(Music_RivalAlternateStart) callba Music_RivalAlternateStart
ld hl, Music_RivalAlternateStart
call Bankswitch
ld a, $1 ld a, $1
ld [$ff8c], a ld [$ff8c], a
ld de, .RivalExitMovement ld de, .RivalExitMovement
@ -493,9 +491,7 @@ OaksLabScript15: ; 1ceb0 (7:4eb0)
ld a, $ff ld a, $ff
ld [$c0ee], a ld [$c0ee], a
call PlaySound call PlaySound
ld b, BANK(Music_RivalAlternateStart) callba Music_RivalAlternateStart
ld hl, Music_RivalAlternateStart
call Bankswitch
ld a, $15 ld a, $15
ld [$ff8c], a ld [$ff8c], a
call DisplayTextID call DisplayTextID
@ -603,9 +599,7 @@ OaksLabScript16: ; 1cf12 (7:4f12)
ld a, $ff ld a, $ff
ld [$c0ee], a ld [$c0ee], a
call PlaySound call PlaySound
ld b, BANK(Music_RivalAlternateStart) callba Music_RivalAlternateStart
ld hl, Music_RivalAlternateStart
call Bankswitch
ld a, $1 ld a, $1
ld [$ff8c], a ld [$ff8c], a
ld de, $cc97 ld de, $cc97

4
scripts/pokemontower2.asm
View file

@ -83,9 +83,7 @@ PokemonTower2Script1: ; 60563 (18:4563)
ld a, $ff ld a, $ff
ld [$c0ee], a ld [$c0ee], a
call PlaySound call PlaySound
ld b, BANK(Music_RivalAlternateStart) callba Music_RivalAlternateStart
ld hl, Music_RivalAlternateStart
call Bankswitch
ld a, $2 ld a, $2
ld [W_POKEMONTOWER2CURSCRIPT], a ld [W_POKEMONTOWER2CURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a

4
scripts/pokemontower7.asm
View file

@ -77,8 +77,8 @@ PokemonTower7Script4: ; 60d86 (18:4d86)
ld [H_DOWNARROWBLINKCNT1], a ; $ff8b ld [H_DOWNARROWBLINKCNT1], a ; $ff8b
ld a, $1 ld a, $1
ld [$d42f], a ld [$d42f], a
ld a, $4 ld a, LAVENDER_TOWN
ld [$d365], a ld [wLastMap], a
ld hl, $d72d ld hl, $d72d
set 3, [hl] set 3, [hl]
ld a, $0 ld a, $0

4
scripts/rockethideoutelevator.asm
View file

@ -55,9 +55,7 @@ RocketHideoutElevatorWarpMaps: ; 45759 (11:5759)
RocketHideoutElevatorScript_4575f: ; 4575f (11:575f) RocketHideoutElevatorScript_4575f: ; 4575f (11:575f)
call Delay3 call Delay3
ld b, BANK(ShakeElevator) callba ShakeElevator
ld hl, ShakeElevator
call Bankswitch
ret ret
RocketHideoutElevatorTextPointers: ; 4576b (11:576b) RocketHideoutElevatorTextPointers: ; 4576b (11:576b)

91
scripts/route22.asm
View file

@ -35,8 +35,8 @@ Route22Script_50ed6: ; 50ed6 (14:4ed6)
ld [W_TRAINERNO], a ; $d05d ld [W_TRAINERNO], a ; $d05d
ret ret
Route22Script_50ee6: ; 50ee6 (14:4ee6) Route22MoveRivalSprite: ; 50ee6 (14:4ee6)
ld de, MovementData_50efb ; $4efb ld de, Route22RivalMovementData ; $4efb
ld a, [$cf0d] ld a, [$cf0d]
cp $1 cp $1
jr z, .asm_50ef1 jr z, .asm_50ef1
@ -47,14 +47,14 @@ Route22Script_50ee6: ; 50ee6 (14:4ee6)
ld [$ff8d], a ld [$ff8d], a
jp Func_34a6 jp Func_34a6
MovementData_50efb: ; 50efb (14:4efb) Route22RivalMovementData: ; 50efb (14:4efb)
db $C0,$C0,$C0,$C0,$FF db $C0,$C0,$C0,$C0,$FF ; move right 4 times
Route22Script0: ; 50f00 (14:4f00) Route22Script0: ; 50f00 (14:4f00)
ld a, [$d7eb] ld a, [$d7eb]
bit 7, a bit 7, a
ret z ret z
ld hl, .CoordsData_50f2d ; $4f2d ld hl, .Route22RivalBattleCoords ; $4f2d
call ArePlayerCoordsInArray call ArePlayerCoordsInArray
ret nc ret nc
ld a, [$cd3d] ld a, [$cd3d]
@ -66,18 +66,18 @@ Route22Script0: ; 50f00 (14:4f00)
ld a, $2 ld a, $2
ld [$d528], a ld [$d528], a
ld a, [$d7eb] ld a, [$d7eb]
bit 0, a bit 0, a ; is this the rival battle at the beginning of the game?
jr nz, .asm_50f32 ; 0x50f25 $b jr nz, .firstRivalBattle ; 0x50f25 $b
bit 1, a bit 1, a ; is this the rival at the end of the game?
jp nz, Route22Script_5104e jp nz, Route22Script_5104e
ret ret
.CoordsData_50f2d .Route22RivalBattleCoords
db $04, $1D db $04, $1D
db $05, $1D db $05, $1D
db $FF db $FF
.asm_50f32 .firstRivalBattle
ld a, $1 ld a, $1
ld [$cd4f], a ld [$cd4f], a
xor a xor a
@ -96,7 +96,7 @@ Route22Script0: ; 50f00 (14:4f00)
call PlayMusic call PlayMusic
ld a, $1 ld a, $1
ld [$ff8c], a ld [$ff8c], a
call Route22Script_50ee6 call Route22MoveRivalSprite
ld a, $1 ld a, $1
ld [W_ROUTE22CURSCRIPT], a ld [W_ROUTE22CURSCRIPT], a
ret ret
@ -127,7 +127,7 @@ Route22Script1: ; 50f62 (14:4f62)
ld hl, $d72d ld hl, $d72d
set 6, [hl] set 6, [hl]
set 7, [hl] set 7, [hl]
ld hl, Route22Text_511b7 ld hl, Route22RivalDefeatedText1
ld de, Route22Text_511bc ld de, Route22Text_511bc
call PreBattleSaveRegisters call PreBattleSaveRegisters
ld a, SONY1 + $c8 ld a, SONY1 + $c8
@ -139,6 +139,7 @@ Route22Script1: ; 50f62 (14:4f62)
ret ret
StarterMons_50faf: ; 50faf (14:4faf) StarterMons_50faf: ; 50faf (14:4faf)
; starter the rival picked, rival trainer number
db SQUIRTLE,$04 db SQUIRTLE,$04
db BULBASAUR,$05 db BULBASAUR,$05
db CHARMANDER,$06 db CHARMANDER,$06
@ -169,9 +170,7 @@ Route22Script2: ; 50fb5 (14:4fb5)
ld a, $ff ld a, $ff
ld [$c0ee], a ld [$c0ee], a
call PlaySound call PlaySound
ld b, BANK(Music_RivalAlternateStart) callba Music_RivalAlternateStart
ld hl, Music_RivalAlternateStart
call Bankswitch
ld a, [$cf0d] ld a, [$cf0d]
cp $1 cp $1
jr nz, .asm_50fff ; 0x50ff8 $5 jr nz, .asm_50fff ; 0x50ff8 $5
@ -185,20 +184,20 @@ Route22Script2: ; 50fb5 (14:4fb5)
ret ret
Route22Script_51008: ; 51008 (14:5008) Route22Script_51008: ; 51008 (14:5008)
ld de, MovementData_51017 ; $5017 ld de, Route22RivalExitMovementData1 ; $5017
jr asm_51010 jr asm_51010
Route22Script_5100d: ; 5100d (14:500d) Route22Script_5100d: ; 5100d (14:500d)
ld de, MovementData_5101f ; $501f ld de, Route22RivalExitMovementData2 ; $501f
asm_51010 asm_51010
ld a, $1 ld a, $1
ld [H_SPRITEHEIGHT], a ld [H_SPRITEHEIGHT], a
jp MoveSprite jp MoveSprite
MovementData_51017: ; 51017 (14:5017) Route22RivalExitMovementData1: ; 51017 (14:5017)
db $C0,$C0,$00,$00,$00,$00,$00,$FF db $C0,$C0,$00,$00,$00,$00,$00,$FF
MovementData_5101f: ; 5101f (14:501f) Route22RivalExitMovementData2: ; 5101f (14:501f)
db $40,$C0,$C0,$C0,$00,$00,$00,$00,$00,$00,$FF db $40,$C0,$C0,$C0,$00,$00,$00,$00,$00,$00,$FF
Route22Script3: ; 5102a (14:502a) Route22Script3: ; 5102a (14:502a)
@ -236,12 +235,10 @@ Route22Script_5104e: ; 5104e (14:504e)
ld a, $ff ld a, $ff
ld [$c0ee], a ld [$c0ee], a
call PlaySound call PlaySound
ld b, BANK(Music_RivalAlternateTempo) callba Music_RivalAlternateTempo
ld hl, Music_RivalAlternateTempo
call Bankswitch
ld a, $2 ld a, $2
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call Route22Script_50ee6 call Route22MoveRivalSprite
ld a, $4 ld a, $4
ld [W_ROUTE22CURSCRIPT], a ld [W_ROUTE22CURSCRIPT], a
ret ret
@ -274,7 +271,7 @@ Route22Script4: ; 51087 (14:5087)
ld hl, $d72d ld hl, $d72d
set 6, [hl] set 6, [hl]
set 7, [hl] set 7, [hl]
ld hl, Route22Text_511cb ; $51cb ld hl, Route22RivalDefeatedText2 ; $51cb
ld de, Route22Text_511d0 ; $51d0 ld de, Route22Text_511d0 ; $51d0
call PreBattleSaveRegisters call PreBattleSaveRegisters
ld a, SONY2 + $c8 ld a, SONY2 + $c8
@ -320,9 +317,7 @@ Route22Script5: ; 510df (14:50df)
ld a, $ff ld a, $ff
ld [$c0ee], a ld [$c0ee], a
call PlaySound call PlaySound
ld b, BANK(Music_RivalAlternateStartAndTempo) callba Music_RivalAlternateStartAndTempo
ld hl, Music_RivalAlternateStartAndTempo
call Bankswitch
ld a, [$cf0d] ld a, [$cf0d]
cp $1 cp $1
jr nz, .asm_51134 jr nz, .asm_51134
@ -347,10 +342,10 @@ asm_51145: ; 51145 (14:5145)
jp MoveSprite jp MoveSprite
MovementData_5114c: ; 5114c (14:514c) MovementData_5114c: ; 5114c (14:514c)
db $80 db $80 ; left
MovementData_5114d: ; 5114d (14:514d) MovementData_5114d: ; 5114d (14:514d)
db $80,$80,$80,$FF db $80,$80,$80,$FF ; left x3
Route22Script6: ; 51151 (14:5151) Route22Script6: ; 51151 (14:5151)
ld a, [$d730] ld a, [$d730]
@ -373,18 +368,18 @@ Route22Script6: ; 51151 (14:5151)
Route22TextPointers: ; 51175 (14:5175) Route22TextPointers: ; 51175 (14:5175)
dw Route22Text1 dw Route22Text1
dw Route22Text2 dw Route22Text2
dw Route22Text3 dw Route22FrontGateText
Route22Text1: ; 5117b (14:517b) Route22Text1: ; 5117b (14:517b)
db $08 ; asm db $08 ; asm
ld a, [$d7eb] ld a, [$d7eb]
bit 5, a bit 5, a
jr z, .asm_a88cf ; 0x51181 jr z, .asm_a88cf ; 0x51181
ld hl, Route22Text_511b2 ld hl, Route22RivalAfterBattleText1
call PrintText call PrintText
jr .asm_48088 ; 0x51189 jr .asm_48088 ; 0x51189
.asm_a88cf ; 0x5118b .asm_a88cf ; 0x5118b
ld hl, Route22Text_511ad ld hl, Route22RivalBeforeBattleText1
call PrintText call PrintText
.asm_48088 ; 0x51191 .asm_48088 ; 0x51191
jp TextScriptEnd jp TextScriptEnd
@ -394,47 +389,47 @@ Route22Text2: ; 51194 (14:5194)
ld a, [$d7eb] ld a, [$d7eb]
bit 6, a bit 6, a
jr z, .asm_58c0a ; 0x5119a jr z, .asm_58c0a ; 0x5119a
ld hl, Route22Text_511c6 ld hl, Route22RivalAfterBattleText2
call PrintText call PrintText
jr .asm_673ee ; 0x511a2 jr .asm_673ee ; 0x511a2
.asm_58c0a ; 0x511a4 .asm_58c0a ; 0x511a4
ld hl, Route22Text_511c1 ld hl, Route22RivalBeforeBattleText2
call PrintText call PrintText
.asm_673ee ; 0x511aa .asm_673ee ; 0x511aa
jp TextScriptEnd jp TextScriptEnd
Route22Text_511ad: ; 511ad (14:51ad) Route22RivalBeforeBattleText1: ; 511ad (14:51ad)
TX_FAR _Route22Text_511ad TX_FAR _Route22RivalBeforeBattleText1
db "@" db "@"
Route22Text_511b2: ; 511b2 (14:51b2) Route22RivalAfterBattleText1: ; 511b2 (14:51b2)
TX_FAR _Route22Text_511b2 TX_FAR _Route22RivalAfterBattleText1
db "@" db "@"
Route22Text_511b7: ; 511b7 (14:51b7) Route22RivalDefeatedText1: ; 511b7 (14:51b7)
TX_FAR _Route22Text_511b7 TX_FAR _Route22RivalDefeatedText1
db "@" db "@"
Route22Text_511bc: ; 511bc (14:51bc) Route22Text_511bc: ; 511bc (14:51bc)
TX_FAR _Route22Text_511bc TX_FAR _Route22Text_511bc
db "@" db "@"
Route22Text_511c1: ; 511c1 (14:51c1) Route22RivalBeforeBattleText2: ; 511c1 (14:51c1)
TX_FAR _Route22Text_511c1 TX_FAR _Route22RivalBeforeBattleText2
db "@" db "@"
Route22Text_511c6: ; 511c6 (14:51c6) Route22RivalAfterBattleText2: ; 511c6 (14:51c6)
TX_FAR _Route22Text_511c6 TX_FAR _Route22RivalAfterBattleText2
db "@" db "@"
Route22Text_511cb: ; 511cb (14:51cb) Route22RivalDefeatedText2: ; 511cb (14:51cb)
TX_FAR _Route22Text_511cb TX_FAR _Route22RivalDefeatedText2
db "@" db "@"
Route22Text_511d0: ; 511d0 (14:51d0) Route22Text_511d0: ; 511d0 (14:51d0)
TX_FAR _Route22Text_511d0 TX_FAR _Route22Text_511d0
db "@" db "@"
Route22Text3: ; 511d5 (14:51d5) Route22FrontGateText: ; 511d5 (14:51d5)
TX_FAR _Route22Text3 TX_FAR _Route22FrontGateText
db "@" db "@"

6
scripts/route22gate.asm
View file

@ -5,11 +5,11 @@ Route22GateScript: ; 1e683 (7:6683)
call CallFunctionInTable call CallFunctionInTable
ld a, [W_YCOORD] ld a, [W_YCOORD]
cp $4 cp $4
ld a, $22 ld a, ROUTE_23
jr c, .asm_1e69a ; 0x1e696 $2 jr c, .asm_1e69a ; 0x1e696 $2
ld a, $21 ld a, ROUTE_22
.asm_1e69a .asm_1e69a
ld [$d365], a ld [wLastMap], a
ret ret
Route22GateScriptPointers: ; 1e69e (7:669e) Route22GateScriptPointers: ; 1e69e (7:669e)

8
scripts/route5gate.asm
View file

@ -26,9 +26,7 @@ Route5GateScript0: ; 1df50 (7:5f50)
ld [$d528], a ld [$d528], a
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS], a ld [H_CURRENTPRESSEDBUTTONS], a
ld b, BANK(RemoveGuardDrink) callba RemoveGuardDrink
ld hl, RemoveGuardDrink
call Bankswitch
ld a, [$ff00+$db] ld a, [$ff00+$db]
and a and a
jr nz, .asm_1df82 ; 0x1df70 $10 jr nz, .asm_1df82 ; 0x1df70 $10
@ -75,9 +73,7 @@ Route5GateText1: ; 1dfaa (7:5faa)
ld a, [$d728] ld a, [$d728]
bit 6, a bit 6, a
jr nz, .asm_88856 ; 0x1dfb0 $2c jr nz, .asm_88856 ; 0x1dfb0 $2c
ld b, BANK(RemoveGuardDrink) callba RemoveGuardDrink
ld hl, RemoveGuardDrink
call Bankswitch
ld a, [$ff00+$db] ld a, [$ff00+$db]
and a and a
jr nz, .asm_768a2 ; 0x1dfbd $11 jr nz, .asm_768a2 ; 0x1dfbd $11

4
scripts/route6gate.asm
View file

@ -20,9 +20,7 @@ Route6GateScript0: ; 1e04e (7:604e)
ld [$d528], a ld [$d528], a
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS], a ld [H_CURRENTPRESSEDBUTTONS], a
ld b, BANK(RemoveGuardDrink) callba RemoveGuardDrink
ld hl, RemoveGuardDrink
call Bankswitch
ld a, [$ffdb] ld a, [$ffdb]
and a and a
jr nz, .asm_1e080 ; 0x1e06e $10 jr nz, .asm_1e080 ; 0x1e06e $10

4
scripts/route7gate.asm
View file

@ -32,9 +32,7 @@ Route7GateScript0: ; 1e128 (7:6128)
ld [$d528], a ld [$d528], a
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS], a ld [H_CURRENTPRESSEDBUTTONS], a
ld b, BANK(RemoveGuardDrink) callba RemoveGuardDrink
ld hl, RemoveGuardDrink
call Bankswitch
ld a, [$ffdb] ld a, [$ffdb]
and a and a
jr nz, .asm_1e15a ; 0x1e148 $10 jr nz, .asm_1e15a ; 0x1e148 $10

4
scripts/route8gate.asm
View file

@ -31,9 +31,7 @@ Route8GateScript0: ; 1e1ee (7:61ee)
ld [$d528], a ld [$d528], a
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS], a ld [H_CURRENTPRESSEDBUTTONS], a
ld b, BANK(RemoveGuardDrink) callba RemoveGuardDrink
ld hl, RemoveGuardDrink
call Bankswitch
ld a, [$ffdb] ld a, [$ffdb]
and a and a
jr nz, .asm_1e220 ; 0x1e20e $10 jr nz, .asm_1e220 ; 0x1e20e $10

4
scripts/silphco7.asm
View file

@ -221,9 +221,7 @@ SilphCo7Script4: ; 51cc8 (14:5cc8)
ld a, $ff ld a, $ff
ld [$c0ee], a ld [$c0ee], a
call PlaySound call PlaySound
ld b, BANK(Music_RivalAlternateStart) callba Music_RivalAlternateStart
ld hl, Music_RivalAlternateStart
call Bankswitch
ld de, MovementData_51d1d ld de, MovementData_51d1d
ld a, [$cf0d] ld a, [$cf0d]
cp $1 cp $1

4
scripts/silphcoelevator.asm
View file

@ -63,9 +63,7 @@ SilphCoElevatorWarpMaps: ; 45811 (11:45811)
SilphCoElevatorScript_45827: ; 45827 (11:5827) SilphCoElevatorScript_45827: ; 45827 (11:5827)
call Delay3 call Delay3
ld b, BANK(ShakeElevator) callba ShakeElevator
ld hl, ShakeElevator
call Bankswitch
ret ret
SilphCoElevatorTextPointers: ; 45833 (11:5833) SilphCoElevatorTextPointers: ; 45833 (11:5833)

4
scripts/ssanne2.asm
View file

@ -144,9 +144,7 @@ SSAnne2Script2: ; 6146d (18:546d)
ld a, $ff ld a, $ff
ld [$c0ee], a ld [$c0ee], a
call PlaySound call PlaySound
ld b, BANK(Music_RivalAlternateStart) callba Music_RivalAlternateStart
ld hl, Music_RivalAlternateStart
call Bankswitch
ld a, $3 ld a, $3
ld [W_SSANNE2CURSCRIPT], a ld [W_SSANNE2CURSCRIPT], a
ret ret

4
scripts/undergroundpathentranceroute5.asm
View file

@ -1,6 +1,6 @@
UndergroundPathEntranceRoute5Script: ; 5d6a9 (17:56a9) UndergroundPathEntranceRoute5Script: ; 5d6a9 (17:56a9)
ld a, $10 ld a, ROUTE_5
ld [$d365], a ld [wLastMap], a
ret ret
UndergroundPathEntranceRoute5_5d6af: ; 5d6af (17:56af) UndergroundPathEntranceRoute5_5d6af: ; 5d6af (17:56af)

4
scripts/undergroundpathentranceroute6.asm
View file

@ -1,6 +1,6 @@
UndergroundPathEntranceRoute6Script: ; 5d6ef (17:56ef) UndergroundPathEntranceRoute6Script: ; 5d6ef (17:56ef)
ld a, $11 ld a, ROUTE_6
ld [$d365], a ld [wLastMap], a
jp EnableAutoTextBoxDrawing jp EnableAutoTextBoxDrawing
UndergroundPathEntranceRoute6TextPointers: ; 5d6f7 (17:56f7) UndergroundPathEntranceRoute6TextPointers: ; 5d6f7 (17:56f7)

4
scripts/undergroundpathentranceroute7.asm
View file

@ -1,6 +1,6 @@
UndergroundPathEntranceRoute7Script: ; 5d72c (17:572c) UndergroundPathEntranceRoute7Script: ; 5d72c (17:572c)
ld a, $12 ld a, ROUTE_7
ld [$d365], a ld [wLastMap], a
jp EnableAutoTextBoxDrawing jp EnableAutoTextBoxDrawing
UndergroundPathEntranceRoute7TextPointers: ; 5d734 (17:5734) UndergroundPathEntranceRoute7TextPointers: ; 5d734 (17:5734)

4
scripts/undergroundpathentranceroute7copy.asm
View file

@ -1,6 +1,6 @@
UndergroundPathEntranceRoute7CopyScript: ; 5d769 (17:5769) UndergroundPathEntranceRoute7CopyScript: ; 5d769 (17:5769)
ld a, $12 ld a, ROUTE_7
ld [$d365], a ld [wLastMap], a
ret ret
UndergroundPathEntranceRoute7CopyTextPointers: ; 5d76f (17:576f) UndergroundPathEntranceRoute7CopyTextPointers: ; 5d76f (17:576f)

4
scripts/undergroundpathentranceroute8.asm
View file

@ -1,6 +1,6 @@
UndergroundPathEntranceRoute8Script: ; 1e289 (7:6289) UndergroundPathEntranceRoute8Script: ; 1e289 (7:6289)
ld a, $13 ld a, ROUTE_8
ld [$d365], a ld [wLastMap], a
jp EnableAutoTextBoxDrawing jp EnableAutoTextBoxDrawing
UndergroundPathEntranceRoute8TextPointers: ; 1e291 (7:6291) UndergroundPathEntranceRoute8TextPointers: ; 1e291 (7:6291)

4
scripts/vermiliondock.asm
View file

@ -46,9 +46,7 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b)
ld c, BANK(Music_Surfing) ld c, BANK(Music_Surfing)
ld a, MUSIC_SURFING ld a, MUSIC_SURFING
call PlayMusic call PlayMusic
ld b, BANK(LoadSmokeTileFourTimes) callba LoadSmokeTileFourTimes
ld hl, LoadSmokeTileFourTimes
call Bankswitch
xor a xor a
ld [$c102], a ld [$c102], a
ld c, $78 ld c, $78

66
text.asm
View file

@ -1340,12 +1340,12 @@ _ExclamationPoint5Text:: ; 89a73 (22:5a73)
text "!" text "!"
done done
_MissedText:: ; 89a76 (22:5a76) _AttackMissedText:: ; 89a76 (22:5a76)
text $5a, "'s" text $5a, "'s"
line "attack missed!" line "attack missed!"
prompt prompt
_CrashedText:: ; 89a89 (22:5a89) _KeptGoingAndCrashedText:: ; 89a89 (22:5a89)
text $5a text $5a
line "kept going and" line "kept going and"
cont "crashed!" cont "crashed!"
@ -1356,7 +1356,7 @@ _UnaffectedText:: ; 89aa4 (22:5aa4)
line "unaffected!" line "unaffected!"
prompt prompt
_DoesntAffectText:: ; 89ab4 (22:5ab4) _DoesntAffectMonText:: ; 89ab4 (22:5ab4)
text "It doesn't affect" text "It doesn't affect"
line $59, "!" line $59, "!"
prompt prompt
@ -1420,7 +1420,7 @@ _MirrorMoveFailedText:: ; 89b96 (22:5b96)
next "failed!" next "failed!"
prompt prompt
_HitMultipleTimesText:: ; 89baf (22:5baf) _HitXTimesText:: ; 89baf (22:5baf)
text "Hit @" text "Hit @"
TX_NUM $cd05, 1, 1 TX_NUM $cd05, 1, 1
text " times!" text " times!"
@ -2130,60 +2130,60 @@ _FellText:: ; 947c9 (25:47c9)
text " fell!" text " fell!"
prompt prompt
_RanText:: ; 947d1 (25:47d1) _RanFromBattleText:: ; 947d1 (25:47d1)
text $5a text $5a
line "ran from battle!" line "ran from battle!"
prompt prompt
_RanScaredText:: ; 947e5 (25:47e5) _RanAwayScaredText:: ; 947e5 (25:47e5)
text $59 text $59
line "ran away scared!" line "ran away scared!"
prompt prompt
_BlownAwayText:: ; 947f9 (25:47f9) _WasBlownAwayText:: ; 947f9 (25:47f9)
text $59 text $59
line "was blown away!" line "was blown away!"
prompt prompt
_MonName2Text:: ; 9480c (25:480c) _ChargeMoveEffectText:: ; 9480c (25:480c)
text $5a, "@@" text $5a, "@@"
_RazorwindText:: ; 94810 (25:4810) _MadeWhirlwindText:: ; 94810 (25:4810)
db $0 db $0
line "made a whirlwind!" line "made a whirlwind!"
prompt prompt
_SolarBeamText:: ; 94824 (25:4824) _TookInSunlightText:: ; 94824 (25:4824)
db $0 db $0
line "took in sunlight!" line "took in sunlight!"
prompt prompt
_SkullBashText:: ; 94838 (25:4838) _LoweredItsHeadText:: ; 94838 (25:4838)
db $0 db $0
line "lowered its head!" line "lowered its head!"
prompt prompt
_SkyAttackText:: ; 9484c (25:484c) _SkyAttackGlowingText:: ; 9484c (25:484c)
db $0 db $0
line "is glowing!" line "is glowing!"
prompt prompt
_FlyText:: ; 9485a (25:485a) _FlewUpHighText:: ; 9485a (25:485a)
db $0 db $0
line "flew up high!" line "flew up high!"
prompt prompt
_DigText:: ; 9486a (25:486a) _DugAHoleText:: ; 9486a (25:486a)
db $0 db $0
line "dug a hole!" line "dug a hole!"
prompt prompt
_ConfusedText:: ; 94878 (25:4878) _BecameConfusedText:: ; 94878 (25:4878)
text $59 text $59
line "became confused!" line "became confused!"
prompt prompt
_LearnedMove2Text:: ; 9488c (25:488c) _MimicLearnedMoveText:: ; 9488c (25:488c)
text $5a text $5a
line "learned" line "learned"
cont "@" cont "@"
@ -2191,7 +2191,7 @@ _LearnedMove2Text:: ; 9488c (25:488c)
text "!" text "!"
prompt prompt
_DisableText:: ; 9489e (25:489e) _MoveWasDisabledText:: ; 9489e (25:489e)
text $59, "'s" text $59, "'s"
line "@" line "@"
TX_RAM $cd6d TX_RAM $cd6d
@ -2207,7 +2207,7 @@ _NoEffectText:: ; 948c9 (25:48c9)
text "No effect!" text "No effect!"
prompt prompt
_ItFailedText:: ; 948d5 (25:48d5) _ButItFailedText:: ; 948d5 (25:48d5)
text "But, it failed! " text "But, it failed! "
prompt prompt
@ -2221,7 +2221,7 @@ _IsUnaffectedText:: ; 948fb (25:48fb)
line "is unaffected!" line "is unaffected!"
prompt prompt
_MayNotAttackText:: ; 9490d (25:490d) _ParalyzedMayNotAttackText:: ; 9490d (25:490d)
text $59, "'s" text $59, "'s"
line "paralyzed! It may" line "paralyzed! It may"
cont "not attack!" cont "not attack!"
@ -2242,58 +2242,58 @@ _TooWeakSubstituteText:: ; 9495e (25:495e)
line "a SUBSTITUTE!" line "a SUBSTITUTE!"
prompt prompt
_PayDayText:: ; 9497e (25:497e) _CoinsScatteredText:: ; 9497e (25:497e)
text "Coins scattered" text "Coins scattered"
line "everywhere!" line "everywhere!"
prompt prompt
_FocusEnergyText:: ; 9499b (25:499b) _GettingPumpedText:: ; 9499b (25:499b)
text $5a, "'s" text $5a, "'s"
line "getting pumped!" line "getting pumped!"
prompt prompt
_SeededText:: ; 949af (25:49af) _WasSeededText:: ; 949af (25:49af)
text $59 text $59
line "was seeded!" line "was seeded!"
prompt prompt
_EvadedText:: ; 949be (25:49be) _EvadedAttackText:: ; 949be (25:49be)
text $59 text $59
line "evaded attack!" line "evaded attack!"
prompt prompt
_RecoilText:: ; 949d0 (25:49d0) _HitWithRecoilText:: ; 949d0 (25:49d0)
text $5a, "'s" text $5a, "'s"
line "hit with recoil!" line "hit with recoil!"
prompt prompt
_ConversionText:: ; 949e5 (25:49e5) _ConvertedTypeText:: ; 949e5 (25:49e5)
text "Converted type to" text "Converted type to"
line $59, "'s!" line $59, "'s!"
prompt prompt
_HazeText:: ; 949fc (25:49fc) _StatusChangesEliminatedText:: ; 949fc (25:49fc)
text "All STATUS changes" text "All STATUS changes"
line "are eliminated!" line "are eliminated!"
prompt prompt
_RestText:: ; 94a20 (25:4a20) _StartedSleepingEffect:: ; 94a20 (25:4a20)
text $5a text $5a
line "started sleeping!" line "started sleeping!"
done done
_RestBecameHealthyText:: ; 94a35 (25:4a35) _FellAsleepBecameHealthyText:: ; 94a35 (25:4a35)
text $5a text $5a
line "fell asleep and" line "fell asleep and"
cont "became healthy!" cont "became healthy!"
done done
_RecoverText:: ; 94a58 (25:4a58) _RegainedHealthText:: ; 94a58 (25:4a58)
text $5a text $5a
line "regained health!" line "regained health!"
prompt prompt
_TransformText:: ; 94a6c (25:4a6c) _TransformedText:: ; 94a6c (25:4a6c)
text $5a text $5a
line "transformed into" line "transformed into"
cont "@" cont "@"
@ -2301,18 +2301,18 @@ _TransformText:: ; 94a6c (25:4a6c)
text "!" text "!"
prompt prompt
_LightscreenText:: ; 94a87 (25:4a87) _LightScreenProtectedText:: ; 94a87 (25:4a87)
text $5a, "'s" text $5a, "'s"
line "protected against" line "protected against"
cont "special attacks!" cont "special attacks!"
prompt prompt
_AcidArmorText:: ; 94aae (25:4aae) _ReflectGainedArmorText:: ; 94aae (25:4aae)
text $5a text $5a
line "gained armor!" line "gained armor!"
prompt prompt
_MistText:: ; 94abf (25:4abf) _ShroudedInMistText:: ; 94abf (25:4abf)
text $5a, "'s" text $5a, "'s"
line "shrouded in mist!" line "shrouded in mist!"
prompt prompt

14
text/maps/route_22.asm
View file

@ -1,4 +1,4 @@
_Route22Text_511ad:: ; 922cd (24:62cd) _Route22RivalBeforeBattleText1:: ; 922cd (24:62cd)
text $53, ": Hey!" text $53, ": Hey!"
line $52, "!" line $52, "!"
@ -17,7 +17,7 @@ _Route22Text_511ad:: ; 922cd (24:62cd)
cont "get any stronger?" cont "get any stronger?"
done done
_Route22Text_511b2:: ; 9236f (24:636f) _Route22RivalAfterBattleText1:: ; 9236f (24:636f)
text "I heard #MON" text "I heard #MON"
line "LEAGUE has many" line "LEAGUE has many"
cont "tough trainers!" cont "tough trainers!"
@ -31,7 +31,7 @@ _Route22Text_511b2:: ; 9236f (24:636f)
cont "a move on!" cont "a move on!"
done done
_Route22Text_511b7:: ; 923f4 (24:63f4) _Route22RivalDefeatedText1:: ; 923f4 (24:63f4)
text "Awww!" text "Awww!"
line "You just lucked" line "You just lucked"
cont "out!" cont "out!"
@ -46,7 +46,7 @@ _Route22Text_511bc:: ; 92410 (24:6410)
cont "some more too!" cont "some more too!"
prompt prompt
_Route22Text_511c1:: ; 92450 (24:6450) _Route22RivalBeforeBattleText2:: ; 92450 (24:6450)
text $53, ": What?" text $53, ": What?"
line $52, "! What a" line $52, "! What a"
cont "surprise to see" cont "surprise to see"
@ -67,7 +67,7 @@ _Route22Text_511c1:: ; 92450 (24:6450)
para "Come on!" para "Come on!"
done done
_Route22Text_511c6:: ; 92506 (24:6506) _Route22RivalAfterBattleText2:: ; 92506 (24:6506)
text "That loosened me" text "That loosened me"
line "up! I'm ready for" line "up! I'm ready for"
cont "#MON LEAGUE!" cont "#MON LEAGUE!"
@ -80,7 +80,7 @@ _Route22Text_511c6:: ; 92506 (24:6506)
cont "here. Smell ya!" cont "here. Smell ya!"
done done
_Route22Text_511cb:: ; 92583 (24:6583) _Route22RivalDefeatedText2:: ; 92583 (24:6583)
text "What!?" text "What!?"
para "I was just" para "I was just"
@ -98,7 +98,7 @@ _Route22Text_511d0:: ; 925a0 (24:65a0)
line "more! You loser!" line "more! You loser!"
prompt prompt
_Route22Text3:: ; 92606 (24:6606) _Route22FrontGateText:: ; 92606 (24:6606)
text "#MON LEAGUE" text "#MON LEAGUE"
line "Front Gate" line "Front Gate"
done done

14
wram.asm
View file

@ -964,7 +964,12 @@ W_YBLOCKCOORD:: ; d363
ds 1 ds 1
W_XBLOCKCOORD:: ; d364 W_XBLOCKCOORD:: ; d364
ds 3 ds 1
wLastMap:: ; d365
ds 1
ds 1
W_CURMAPTILESET:: ; d367 W_CURMAPTILESET:: ; d367
ds 1 ds 1
@ -1323,7 +1328,12 @@ W_RIVALSTARTER:: ; d715
W_PLAYERSTARTER:: ; d717 W_PLAYERSTARTER:: ; d717
ds 1 ds 1
ds 27 ds 1
wLastBlackoutMap:: ; d719
ds 1
ds 25
W_FLAGS_D733:: ; d733 W_FLAGS_D733:: ; d733