pokered/scripts/silphco11.asm

SilphCo11Script: ; 620fa (18:60fa)
	call SilphCo11Script_62110
	call EnableAutoTextBoxDrawing
	ld hl, SilphCo11TrainerHeaders
	ld de, SilphCo11ScriptPointers
	ld a, [wSilphCo11CurScript]
	call ExecuteCurMapScriptInTable
	ld [wSilphCo11CurScript], a
	ret

SilphCo11Script_62110: ; 62110 (18:6110)
	ld hl, wCurrentMapScriptFlags
	bit 5, [hl]
	res 5, [hl]
	ret z
	ld hl, SilphCo11GateCoords
	call SilphCo11Script_62137
	call SilphCo11Script_62163
	CheckEvent EVENT_SILPH_CO_11_UNLOCKED_DOOR
	ret nz
	ld a, $20
	ld [wNewTileBlockID], a
	lb bc, 6, 3
	predef_jump ReplaceTileBlock

SilphCo11GateCoords: ; 62134 (18:6134)
	db $06,$03
	db $FF

SilphCo11Script_62137: ; 62137 (18:6137)
	push hl
	ld hl, wCardKeyDoorY
	ld a, [hli]
	ld b, a
	ld a, [hl]
	ld c, a
	xor a
	ld [$ffe0], a
	pop hl
.asm_62143
	ld a, [hli]
	cp $ff
	jr z, .asm_6215f
	push hl
	ld hl, $ffe0
	inc [hl]
	pop hl
	cp b
	jr z, .asm_62154
	inc hl
	jr .asm_62143
.asm_62154
	ld a, [hli]
	cp c
	jr nz, .asm_62143
	ld hl, wCardKeyDoorY
	xor a
	ld [hli], a
	ld [hl], a
	ret
.asm_6215f
	xor a
	ld [$ffe0], a
	ret

SilphCo11Script_62163: ; 62163 (18:6163)
	ld a, [$ffe0]
	and a
	ret z
	SetEvent EVENT_SILPH_CO_11_UNLOCKED_DOOR
	ret

SilphCo11Script_6216d: ; 6216d (18:616d)
	ld hl, MissableObjectIDs_6219b
.asm_62170
	ld a, [hli]
	cp $ff
	jr z, .asm_62181
	push hl
	ld [wMissableObjectIndex], a
	predef HideObject
	pop hl
	jr .asm_62170
.asm_62181
	ld hl, MissableObjectIDs_62194
.asm_62184
	ld a, [hli]
	cp $ff
	ret z
	push hl
	ld [wMissableObjectIndex], a
	predef ShowObject
	pop hl
	jr .asm_62184

MissableObjectIDs_62194: ; 62194 (18:6194)
	db HS_SAFFRON_CITY_8
	db HS_SAFFRON_CITY_9
	db HS_SAFFRON_CITY_A
	db HS_SAFFRON_CITY_B
	db HS_SAFFRON_CITY_C
	db HS_SAFFRON_CITY_D
	db $FF

MissableObjectIDs_6219b: ; 6219b (18:619b)
	db HS_SAFFRON_CITY_1
	db HS_SAFFRON_CITY_2
	db HS_SAFFRON_CITY_3
	db HS_SAFFRON_CITY_4
	db HS_SAFFRON_CITY_5
	db HS_SAFFRON_CITY_6
	db HS_SAFFRON_CITY_7
	db HS_SAFFRON_CITY_E
	db HS_SAFFRON_CITY_F
	db HS_SILPH_CO_2F_2
	db HS_SILPH_CO_2F_3
	db HS_SILPH_CO_2F_4
	db HS_SILPH_CO_2F_5
	db HS_SILPH_CO_3F_1
	db HS_SILPH_CO_3F_2
	db HS_SILPH_CO_4F_1
	db HS_SILPH_CO_4F_2
	db HS_SILPH_CO_4F_3
	db HS_SILPH_CO_5F_1
	db HS_SILPH_CO_5F_2
	db HS_SILPH_CO_5F_3
	db HS_SILPH_CO_5F_4
	db HS_SILPH_CO_6F_1
	db HS_SILPH_CO_6F_2
	db HS_SILPH_CO_6F_3
	db HS_SILPH_CO_7F_1
	db HS_SILPH_CO_7F_2
	db HS_SILPH_CO_7F_3
	db HS_SILPH_CO_7F_4
	db HS_SILPH_CO_8F_1
	db HS_SILPH_CO_8F_2
	db HS_SILPH_CO_8F_3
	db HS_SILPH_CO_9F_1
	db HS_SILPH_CO_9F_2
	db HS_SILPH_CO_9F_3
	db HS_SILPH_CO_10F_1
	db HS_SILPH_CO_10F_2
	db HS_SILPH_CO_11F_1
	db HS_SILPH_CO_11F_2
	db HS_SILPH_CO_11F_3
	db $FF

SilphCo11Script_621c4: ; 621c4 (18:61c4)
	xor a
	ld [wJoyIgnore], a

SilphCo11Script_621c8: ; 621c8 (18:61c8)
	ld [wSilphCo11CurScript], a
	ld [wCurMapScript], a
	ret

SilphCo11ScriptPointers: ; 621cf (18:61cf)
	dw SilphCo11Script0
	dw DisplayEnemyTrainerTextAndStartBattle
	dw EndTrainerBattle
	dw SilphCo11Script3
	dw SilphCo11Script4
	dw SilphCo11Script5

SilphCo11Script0: ; 621db (18:61db)
	CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI
	ret nz
	ld hl, CoordsData_62211
	call ArePlayerCoordsInArray
	jp nc, CheckFightingMapTrainers
	ld a, [wCoordIndex]
	ld [wcf0d], a
	xor a
	ld [hJoyHeld], a
	ld a, $f0
	ld [wJoyIgnore], a
	ld a, $3
	ld [hSpriteIndexOrTextID], a
	call DisplayTextID
	ld a, $3
	ld [H_SPRITEINDEX], a
	call SetSpriteMovementBytesToFF
	ld de, MovementData_62216
	call MoveSprite
	ld a, $3
	jp SilphCo11Script_621c8

CoordsData_62211: ; 62211 (18:6211)
	db $0D,$06
	db $0C,$07
	db $FF

MovementData_62216: ; 62216 (18:6216)
	db NPC_MOVEMENT_DOWN
	db NPC_MOVEMENT_DOWN
	db NPC_MOVEMENT_DOWN
	db $FF

SilphCo11Script_6221a: ; 6221a (18:621a)
	ld [wPlayerMovingDirection], a
	ld a, $3
	ld [H_SPRITEINDEX], a
	ld a, b
	ld [hSpriteFacingDirection], a
	jp SetSpriteFacingDirectionAndDelay

SilphCo11Script5: ; 62227 (18:6227)
	ld a, [wIsInBattle]
	cp $ff
	jp z, SilphCo11Script_621c4
	ld a, [wcf0d]
	cp $1
	jr z, .asm_6223c
	ld a, PLAYER_DIR_LEFT
	ld b, SPRITE_FACING_RIGHT
	jr .asm_62240
.asm_6223c
	ld a, PLAYER_DIR_UP
	ld b, SPRITE_FACING_DOWN
.asm_62240
	call SilphCo11Script_6221a
	ld a, $f0
	ld [wJoyIgnore], a
	ld a, $6
	ld [hSpriteIndexOrTextID], a
	call DisplayTextID
	call GBFadeOutToBlack
	call SilphCo11Script_6216d
	call UpdateSprites
	call Delay3
	call GBFadeInFromBlack
	SetEvent EVENT_BEAT_SILPH_CO_GIOVANNI
	xor a
	ld [wJoyIgnore], a
	jp SilphCo11Script_621c8

SilphCo11Script3: ; 6226a (18:626a)
	ld a, [wd730]
	bit 0, a
	ret nz
	ld a, $3
	ld [H_SPRITEINDEX], a
	call SetSpriteMovementBytesToFF
	ld a, [wcf0d]
	cp $1
	jr z, .asm_62284
	ld a, PLAYER_DIR_LEFT
	ld b, SPRITE_FACING_RIGHT
	jr .asm_62288
.asm_62284
	ld a, PLAYER_DIR_UP
	ld b, SPRITE_FACING_DOWN
.asm_62288
	call SilphCo11Script_6221a
	call Delay3
	ld a, $4
	jp SilphCo11Script_621c8

SilphCo11Script4: ; 62293 (18:6293)
	ld hl, wd72d
	set 6, [hl]
	set 7, [hl]
	ld hl, SilphCo10Text_62330
	ld de, SilphCo10Text_62330
	call SaveEndBattleTextPointers
	ld a, [H_SPRITEINDEX]
	ld [wSpriteIndex], a
	call EngageMapTrainer
	call InitBattleEnemyParameters
	xor a
	ld [wJoyIgnore], a
	ld a, $5
	jp SilphCo11Script_621c8

SilphCo11TextPointers: ; 622b7 (18:62b7)
	dw SilphCo11Text1
	dw SilphCo11Text2
	dw SilphCo11Text3
	dw SilphCo11Text4
	dw SilphCo11Text5
	dw SilphCo11Text6

SilphCo11TrainerHeaders: ; 622c3 (18:62c3)
SilphCo11TrainerHeader0: ; 622c3 (18:62c3)
	dbEventFlagBit EVENT_BEAT_SILPH_CO_11F_TRAINER_0
	db ($4 << 4) ; trainer's view range
	dwEventFlagAddress EVENT_BEAT_SILPH_CO_11F_TRAINER_0
	dw SilphCo11BattleText1 ; TextBeforeBattle
	dw SilphCo11AfterBattleText1 ; TextAfterBattle
	dw SilphCo11EndBattleText1 ; TextEndBattle
	dw SilphCo11EndBattleText1 ; TextEndBattle

SilphCo11TrainerHeader1: ; 622cf (18:62cf)
	dbEventFlagBit EVENT_BEAT_SILPH_CO_11F_TRAINER_1
	db ($3 << 4) ; trainer's view range
	dwEventFlagAddress EVENT_BEAT_SILPH_CO_11F_TRAINER_1
	dw SilphCo11BattleText2 ; TextBeforeBattle
	dw SilphCo11AfterBattleText2 ; TextAfterBattle
	dw SilphCo11EndBattleText2 ; TextEndBattle
	dw SilphCo11EndBattleText2 ; TextEndBattle

	db $ff

SilphCo11Text1: ; 622dc (18:62dc)
	TX_ASM
	CheckEvent EVENT_GOT_MASTER_BALL
	jp nz, .asm_62308
	ld hl, SilphCoPresidentText
	call PrintText
	lb bc, MASTER_BALL, 1
	call GiveItem
	jr nc, .BagFull
	ld hl, ReceivedSilphCoMasterBallText
	call PrintText
	SetEvent EVENT_GOT_MASTER_BALL
	jr .asm_6230e
.BagFull
	ld hl, SilphCoMasterBallNoRoomText
	call PrintText
	jr .asm_6230e
.asm_62308
	ld hl, SilphCo10Text_6231c
	call PrintText
.asm_6230e
	jp TextScriptEnd

SilphCoPresidentText: ; 62311 (18:6311)
	TX_FAR _SilphCoPresidentText
	db "@"

ReceivedSilphCoMasterBallText: ; 62316 (18:6316)
	TX_FAR _ReceivedSilphCoMasterBallText
	db $11, "@"

SilphCo10Text_6231c: ; 6231c (18:631c)
	TX_FAR _SilphCo10Text_6231c
	db "@"

SilphCoMasterBallNoRoomText: ; 62321 (18:6321)
	TX_FAR _SilphCoMasterBallNoRoomText
	db "@"

SilphCo11Text2: ; 62326 (18:6326)
	TX_FAR _SilphCo11Text2
	db "@"

SilphCo11Text3: ; 6232b (18:632b)
	TX_FAR _SilphCo11Text3
	db "@"

SilphCo10Text_62330: ; 62330 (18:6330)
	TX_FAR _SilphCo10Text_62330
	db "@"

SilphCo11Text6: ; 62335 (18:6335)
	TX_FAR _SilphCo10Text_62335
	db "@"

SilphCo11Text4: ; 6233a (18:633a)
	TX_ASM
	ld hl, SilphCo11TrainerHeader0
	call TalkToTrainer
	jp TextScriptEnd

SilphCo11BattleText1: ; 62344 (18:6344)
	TX_FAR _SilphCo11BattleText1
	db "@"

SilphCo11EndBattleText1: ; 62349 (18:6349)
	TX_FAR _SilphCo11EndBattleText1
	db "@"

SilphCo11AfterBattleText1: ; 6234e (18:634e)
	TX_FAR _SilphCo11AfterBattleText1
	db "@"

SilphCo11Text5: ; 62353 (18:6353)
	TX_ASM
	ld hl, SilphCo11TrainerHeader1
	call TalkToTrainer
	jp TextScriptEnd

SilphCo11BattleText2: ; 6235d (18:635d)
	TX_FAR _SilphCo11BattleText2
	db "@"

SilphCo11EndBattleText2: ; 62362 (18:6362)
	TX_FAR _SilphCo11EndBattleText2
	db "@"

SilphCo11AfterBattleText2: ; 62367 (18:6367)
	TX_FAR _SilphCo11AfterBattleText2
	db "@"

SilphCo10Text_6236c: ; 6236c (18:636c)
	TX_ASM
	ld hl, SilphCo10Text_6237b
	call PrintText
	ld a, PORYGON
	call DisplayPokedex
	jp TextScriptEnd

SilphCo10Text_6237b: ; 6237b (18:637b)
	TX_FAR _SilphCo10Text_6237b
	db "@"
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`SilphCo11Script: ; 620fa (18:60fa)`
			`call SilphCo11Script_62110`
			`call EnableAutoTextBoxDrawing`
			`ld hl, SilphCo11TrainerHeaders`
			`ld de, SilphCo11ScriptPointers`
No more W_ 2015-08-31 02:38:41 +00:00			`ld a, [wSilphCo11CurScript]`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`call ExecuteCurMapScriptInTable`
No more W_ 2015-08-31 02:38:41 +00:00			`ld [wSilphCo11CurScript], a`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`ret`

			`SilphCo11Script_62110: ; 62110 (18:6110)`
Fix game time labels 2016-01-03 19:17:10 +00:00			`ld hl, wCurrentMapScriptFlags`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`bit 5, [hl]`
			`res 5, [hl]`
			`ret z`
Use more lb and other clean up 2015-08-05 21:20:29 +00:00			`ld hl, SilphCo11GateCoords`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`call SilphCo11Script_62137`
			`call SilphCo11Script_62163`
named most of the used events 2015-07-21 17:36:03 +00:00			`CheckEvent EVENT_SILPH_CO_11_UNLOCKED_DOOR`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`ret nz`
			`ld a, $20`
named animation functions/variables 2015-07-24 21:39:45 +00:00			`ld [wNewTileBlockID], a`
Use more lb and other clean up 2015-08-05 21:20:29 +00:00			`lb bc, 6, 3`
Commented/labelled misc functions 2014-09-14 18:29:18 +00:00			`predef_jump ReplaceTileBlock`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00
Use more lb and other clean up 2015-08-05 21:20:29 +00:00			`SilphCo11GateCoords: ; 62134 (18:6134)`
			`db $06,$03`
			`db $FF`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00
			`SilphCo11Script_62137: ; 62137 (18:6137)`
			`push hl`
Commented/labelled misc functions 2014-09-14 18:29:18 +00:00			`ld hl, wCardKeyDoorY`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`ld a, [hli]`
			`ld b, a`
			`ld a, [hl]`
			`ld c, a`
			`xor a`
			`ld [$ffe0], a`
			`pop hl`
			`.asm_62143`
			`ld a, [hli]`
			`cp $ff`
			`jr z, .asm_6215f`
			`push hl`
			`ld hl, $ffe0`
			`inc [hl]`
			`pop hl`
			`cp b`
			`jr z, .asm_62154`
			`inc hl`
			`jr .asm_62143`
			`.asm_62154`
			`ld a, [hli]`
			`cp c`
			`jr nz, .asm_62143`
Commented/labelled misc functions 2014-09-14 18:29:18 +00:00			`ld hl, wCardKeyDoorY`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`xor a`
			`ld [hli], a`
			`ld [hl], a`
			`ret`
			`.asm_6215f`
			`xor a`
			`ld [$ffe0], a`
			`ret`

			`SilphCo11Script_62163: ; 62163 (18:6163)`
			`ld a, [$ffe0]`
			`and a`
			`ret z`
named most of the used events 2015-07-21 17:36:03 +00:00			`SetEvent EVENT_SILPH_CO_11_UNLOCKED_DOOR`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`ret`

			`SilphCo11Script_6216d: ; 6216d (18:616d)`
$U-Daniel-PC\Daniel$ 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 2015-07-03 19:38:12 +00:00			`ld hl, MissableObjectIDs_6219b`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`.asm_62170`
			`ld a, [hli]`
			`cp $ff`
			`jr z, .asm_62181`
			`push hl`
more naming variables 2015-07-25 03:27:59 +00:00			`ld [wMissableObjectIndex], a`
Use macros for predef calls/jumps instead of static ids. 2014-06-16 20:57:26 +00:00			`predef HideObject`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`pop hl`
			`jr .asm_62170`
			`.asm_62181`
$U-Daniel-PC\Daniel$ 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 2015-07-03 19:38:12 +00:00			`ld hl, MissableObjectIDs_62194`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`.asm_62184`
			`ld a, [hli]`
			`cp $ff`
			`ret z`
			`push hl`
more naming variables 2015-07-25 03:27:59 +00:00			`ld [wMissableObjectIndex], a`
Use macros for predef calls/jumps instead of static ids. 2014-06-16 20:57:26 +00:00			`predef ShowObject`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`pop hl`
			`jr .asm_62184`

			`MissableObjectIDs_62194: ; 62194 (18:6194)`
$U-Daniel-PC\Daniel$ Make Hide/Show objects more dynamic be on the look out for more static ids in the wild unused constants are still included because a script could be written to check whether the player has picked up an item/fought a legendary etc. 2014-09-25 23:21:49 +00:00			`db HS_SAFFRON_CITY_8`
			`db HS_SAFFRON_CITY_9`
			`db HS_SAFFRON_CITY_A`
			`db HS_SAFFRON_CITY_B`
			`db HS_SAFFRON_CITY_C`
			`db HS_SAFFRON_CITY_D`
			`db $FF`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00
			`MissableObjectIDs_6219b: ; 6219b (18:619b)`
$U-Daniel-PC\Daniel$ Make Hide/Show objects more dynamic be on the look out for more static ids in the wild unused constants are still included because a script could be written to check whether the player has picked up an item/fought a legendary etc. 2014-09-25 23:21:49 +00:00			`db HS_SAFFRON_CITY_1`
			`db HS_SAFFRON_CITY_2`
			`db HS_SAFFRON_CITY_3`
			`db HS_SAFFRON_CITY_4`
			`db HS_SAFFRON_CITY_5`
			`db HS_SAFFRON_CITY_6`
			`db HS_SAFFRON_CITY_7`
			`db HS_SAFFRON_CITY_E`
			`db HS_SAFFRON_CITY_F`
			`db HS_SILPH_CO_2F_2`
			`db HS_SILPH_CO_2F_3`
			`db HS_SILPH_CO_2F_4`
			`db HS_SILPH_CO_2F_5`
			`db HS_SILPH_CO_3F_1`
			`db HS_SILPH_CO_3F_2`
			`db HS_SILPH_CO_4F_1`
			`db HS_SILPH_CO_4F_2`
			`db HS_SILPH_CO_4F_3`
			`db HS_SILPH_CO_5F_1`
			`db HS_SILPH_CO_5F_2`
			`db HS_SILPH_CO_5F_3`
			`db HS_SILPH_CO_5F_4`
			`db HS_SILPH_CO_6F_1`
			`db HS_SILPH_CO_6F_2`
			`db HS_SILPH_CO_6F_3`
			`db HS_SILPH_CO_7F_1`
			`db HS_SILPH_CO_7F_2`
			`db HS_SILPH_CO_7F_3`
			`db HS_SILPH_CO_7F_4`
			`db HS_SILPH_CO_8F_1`
			`db HS_SILPH_CO_8F_2`
			`db HS_SILPH_CO_8F_3`
			`db HS_SILPH_CO_9F_1`
			`db HS_SILPH_CO_9F_2`
			`db HS_SILPH_CO_9F_3`
			`db HS_SILPH_CO_10F_1`
			`db HS_SILPH_CO_10F_2`
			`db HS_SILPH_CO_11F_1`
			`db HS_SILPH_CO_11F_2`
			`db HS_SILPH_CO_11F_3`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`db $FF`

			`SilphCo11Script_621c4: ; 621c4 (18:61c4)`
			`xor a`
Rename joypad registers. 2014-05-25 17:51:53 +00:00			`ld [wJoyIgnore], a`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00
			`SilphCo11Script_621c8: ; 621c8 (18:61c8)`
No more W_ 2015-08-31 02:38:41 +00:00			`ld [wSilphCo11CurScript], a`
			`ld [wCurMapScript], a`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`ret`

			`SilphCo11ScriptPointers: ; 621cf (18:61cf)`
			`dw SilphCo11Script0`
Commented/labelled misc functions 2014-09-14 18:29:18 +00:00			`dw DisplayEnemyTrainerTextAndStartBattle`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`dw EndTrainerBattle`
			`dw SilphCo11Script3`
			`dw SilphCo11Script4`
			`dw SilphCo11Script5`

			`SilphCo11Script0: ; 621db (18:61db)`
named most of the used events 2015-07-21 17:36:03 +00:00			`CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`ret nz`
$U-Daniel-PC\Daniel$ 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 2015-07-03 19:38:12 +00:00			`ld hl, CoordsData_62211`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`call ArePlayerCoordsInArray`
			`jp nc, CheckFightingMapTrainers`
fix variable naming 2015-07-18 15:17:29 +00:00			`ld a, [wCoordIndex]`
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue. 2014-05-26 21:04:56 +00:00			`ld [wcf0d], a`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`xor a`
Rename joypad registers. 2014-05-25 17:51:53 +00:00			`ld [hJoyHeld], a`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`ld a, $f0`
Rename joypad registers. 2014-05-25 17:51:53 +00:00			`ld [wJoyIgnore], a`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`ld a, $3`
fix variable naming 2015-07-18 15:17:29 +00:00			`ld [hSpriteIndexOrTextID], a`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`call DisplayTextID`
			`ld a, $3`
fix variable naming 2015-07-18 15:17:29 +00:00			`ld [H_SPRITEINDEX], a`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`call SetSpriteMovementBytesToFF`
			`ld de, MovementData_62216`
			`call MoveSprite`
			`ld a, $3`
			`jp SilphCo11Script_621c8`

			`CoordsData_62211: ; 62211 (18:6211)`
			`db $0D,$06`
			`db $0C,$07`
			`db $FF`

			`MovementData_62216: ; 62216 (18:6216)`
More direction constants facing directions, npc movement, joypad 2015-07-17 07:52:25 +00:00			`db NPC_MOVEMENT_DOWN`
			`db NPC_MOVEMENT_DOWN`
			`db NPC_MOVEMENT_DOWN`
			`db $FF`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00
			`SilphCo11Script_6221a: ; 6221a (18:621a)`
naming 2015-07-20 00:52:26 +00:00			`ld [wPlayerMovingDirection], a`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`ld a, $3`
fix variable naming 2015-07-18 15:17:29 +00:00			`ld [H_SPRITEINDEX], a`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`ld a, b`
fix variable naming 2015-07-18 15:17:29 +00:00			`ld [hSpriteFacingDirection], a`
Labelled and commented mostly sprite-related things 2014-09-10 03:55:19 +00:00			`jp SetSpriteFacingDirectionAndDelay`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00
			`SilphCo11Script5: ; 62227 (18:6227)`
No more W_ 2015-08-31 02:38:41 +00:00			`ld a, [wIsInBattle]`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`cp $ff`
			`jp z, SilphCo11Script_621c4`
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue. 2014-05-26 21:04:56 +00:00			`ld a, [wcf0d]`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`cp $1`
			`jr z, .asm_6223c`
naming 2015-07-20 00:52:26 +00:00			`ld a, PLAYER_DIR_LEFT`
fix variable naming 2015-07-18 15:17:29 +00:00			`ld b, SPRITE_FACING_RIGHT`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`jr .asm_62240`
			`.asm_6223c`
naming 2015-07-20 00:52:26 +00:00			`ld a, PLAYER_DIR_UP`
fix variable naming 2015-07-18 15:17:29 +00:00			`ld b, SPRITE_FACING_DOWN`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`.asm_62240`
			`call SilphCo11Script_6221a`
			`ld a, $f0`
Rename joypad registers. 2014-05-25 17:51:53 +00:00			`ld [wJoyIgnore], a`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`ld a, $6`
fix variable naming 2015-07-18 15:17:29 +00:00			`ld [hSpriteIndexOrTextID], a`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`call DisplayTextID`
Commented more sprite and map code 2014-09-13 07:50:56 +00:00			`call GBFadeOutToBlack`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`call SilphCo11Script_6216d`
			`call UpdateSprites`
			`call Delay3`
Commented more sprite and map code 2014-09-13 07:50:56 +00:00			`call GBFadeInFromBlack`
named most of the used events 2015-07-21 17:36:03 +00:00			`SetEvent EVENT_BEAT_SILPH_CO_GIOVANNI`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`xor a`
Rename joypad registers. 2014-05-25 17:51:53 +00:00			`ld [wJoyIgnore], a`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`jp SilphCo11Script_621c8`

			`SilphCo11Script3: ; 6226a (18:626a)`
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue. 2014-05-26 21:04:56 +00:00			`ld a, [wd730]`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`bit 0, a`
			`ret nz`
			`ld a, $3`
fix variable naming 2015-07-18 15:17:29 +00:00			`ld [H_SPRITEINDEX], a`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`call SetSpriteMovementBytesToFF`
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue. 2014-05-26 21:04:56 +00:00			`ld a, [wcf0d]`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`cp $1`
			`jr z, .asm_62284`
naming 2015-07-20 00:52:26 +00:00			`ld a, PLAYER_DIR_LEFT`
fix variable naming 2015-07-18 15:17:29 +00:00			`ld b, SPRITE_FACING_RIGHT`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`jr .asm_62288`
			`.asm_62284`
naming 2015-07-20 00:52:26 +00:00			`ld a, PLAYER_DIR_UP`
fix variable naming 2015-07-18 15:17:29 +00:00			`ld b, SPRITE_FACING_DOWN`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`.asm_62288`
			`call SilphCo11Script_6221a`
			`call Delay3`
			`ld a, $4`
			`jp SilphCo11Script_621c8`

			`SilphCo11Script4: ; 62293 (18:6293)`
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue. 2014-05-26 21:04:56 +00:00			`ld hl, wd72d`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`set 6, [hl]`
			`set 7, [hl]`
$U-Daniel-PC\Daniel$ 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 2015-07-03 19:38:12 +00:00			`ld hl, SilphCo10Text_62330`
			`ld de, SilphCo10Text_62330`
Commented/labelled misc functions 2014-09-14 18:29:18 +00:00			`call SaveEndBattleTextPointers`
fix variable naming 2015-07-18 15:17:29 +00:00			`ld a, [H_SPRITEINDEX]`
Commented more sprite and map code 2014-09-13 07:50:56 +00:00			`ld [wSpriteIndex], a`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`call EngageMapTrainer`
			`call InitBattleEnemyParameters`
			`xor a`
Rename joypad registers. 2014-05-25 17:51:53 +00:00			`ld [wJoyIgnore], a`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`ld a, $5`
			`jp SilphCo11Script_621c8`

			`SilphCo11TextPointers: ; 622b7 (18:62b7)`
			`dw SilphCo11Text1`
			`dw SilphCo11Text2`
			`dw SilphCo11Text3`
			`dw SilphCo11Text4`
			`dw SilphCo11Text5`
			`dw SilphCo11Text6`

			`SilphCo11TrainerHeaders: ; 622c3 (18:62c3)`
			`SilphCo11TrainerHeader0: ; 622c3 (18:62c3)`
enumerate events 2015-07-21 01:32:02 +00:00			`dbEventFlagBit EVENT_BEAT_SILPH_CO_11F_TRAINER_0`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`db ($4 << 4) ; trainer's view range`
enumerate events 2015-07-21 01:32:02 +00:00			`dwEventFlagAddress EVENT_BEAT_SILPH_CO_11F_TRAINER_0`
$U-Daniel-PC\Daniel$ 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 2015-07-03 19:38:12 +00:00			`dw SilphCo11BattleText1 ; TextBeforeBattle`
			`dw SilphCo11AfterBattleText1 ; TextAfterBattle`
			`dw SilphCo11EndBattleText1 ; TextEndBattle`
			`dw SilphCo11EndBattleText1 ; TextEndBattle`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00
			`SilphCo11TrainerHeader1: ; 622cf (18:62cf)`
enumerate events 2015-07-21 01:32:02 +00:00			`dbEventFlagBit EVENT_BEAT_SILPH_CO_11F_TRAINER_1`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`db ($3 << 4) ; trainer's view range`
enumerate events 2015-07-21 01:32:02 +00:00			`dwEventFlagAddress EVENT_BEAT_SILPH_CO_11F_TRAINER_1`
$U-Daniel-PC\Daniel$ 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 2015-07-03 19:38:12 +00:00			`dw SilphCo11BattleText2 ; TextBeforeBattle`
			`dw SilphCo11AfterBattleText2 ; TextAfterBattle`
			`dw SilphCo11EndBattleText2 ; TextEndBattle`
			`dw SilphCo11EndBattleText2 ; TextEndBattle`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00
			`db $ff`

			`SilphCo11Text1: ; 622dc (18:62dc)`
$U-Daniel-PC\Daniel$ TX_ASM 2015-07-03 19:58:50 +00:00			`TX_ASM`
named most of the used events 2015-07-21 17:36:03 +00:00			`CheckEvent EVENT_GOT_MASTER_BALL`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`jp nz, .asm_62308`
			`ld hl, SilphCoPresidentText`
			`call PrintText`
Use more lb and other clean up 2015-08-05 21:20:29 +00:00			`lb bc, MASTER_BALL, 1`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`call GiveItem`
			`jr nc, .BagFull`
			`ld hl, ReceivedSilphCoMasterBallText`
			`call PrintText`
named most of the used events 2015-07-21 17:36:03 +00:00			`SetEvent EVENT_GOT_MASTER_BALL`
$U-Daniel-PC\Daniel$ 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 2015-07-03 19:38:12 +00:00			`jr .asm_6230e`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`.BagFull`
			`ld hl, SilphCoMasterBallNoRoomText`
			`call PrintText`
$U-Daniel-PC\Daniel$ 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 2015-07-03 19:38:12 +00:00			`jr .asm_6230e`
			`.asm_62308`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`ld hl, SilphCo10Text_6231c`
			`call PrintText`
$U-Daniel-PC\Daniel$ 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 2015-07-03 19:38:12 +00:00			`.asm_6230e`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`jp TextScriptEnd`

			`SilphCoPresidentText: ; 62311 (18:6311)`
			`TX_FAR _SilphCoPresidentText`
			`db "@"`

			`ReceivedSilphCoMasterBallText: ; 62316 (18:6316)`
			`TX_FAR _ReceivedSilphCoMasterBallText`
			`db $11, "@"`

			`SilphCo10Text_6231c: ; 6231c (18:631c)`
			`TX_FAR _SilphCo10Text_6231c`
			`db "@"`

			`SilphCoMasterBallNoRoomText: ; 62321 (18:6321)`
			`TX_FAR _SilphCoMasterBallNoRoomText`
			`db "@"`

			`SilphCo11Text2: ; 62326 (18:6326)`
			`TX_FAR _SilphCo11Text2`
			`db "@"`

			`SilphCo11Text3: ; 6232b (18:632b)`
			`TX_FAR _SilphCo11Text3`
			`db "@"`

			`SilphCo10Text_62330: ; 62330 (18:6330)`
			`TX_FAR _SilphCo10Text_62330`
			`db "@"`

			`SilphCo11Text6: ; 62335 (18:6335)`
			`TX_FAR _SilphCo10Text_62335`
			`db "@"`

			`SilphCo11Text4: ; 6233a (18:633a)`
$U-Daniel-PC\Daniel$ TX_ASM 2015-07-03 19:58:50 +00:00			`TX_ASM`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`ld hl, SilphCo11TrainerHeader0`
			`call TalkToTrainer`
			`jp TextScriptEnd`

			`SilphCo11BattleText1: ; 62344 (18:6344)`
			`TX_FAR _SilphCo11BattleText1`
			`db "@"`

			`SilphCo11EndBattleText1: ; 62349 (18:6349)`
			`TX_FAR _SilphCo11EndBattleText1`
			`db "@"`

			`SilphCo11AfterBattleText1: ; 6234e (18:634e)`
			`TX_FAR _SilphCo11AfterBattleText1`
			`db "@"`

			`SilphCo11Text5: ; 62353 (18:6353)`
$U-Daniel-PC\Daniel$ TX_ASM 2015-07-03 19:58:50 +00:00			`TX_ASM`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`ld hl, SilphCo11TrainerHeader1`
			`call TalkToTrainer`
			`jp TextScriptEnd`

			`SilphCo11BattleText2: ; 6235d (18:635d)`
			`TX_FAR _SilphCo11BattleText2`
			`db "@"`

			`SilphCo11EndBattleText2: ; 62362 (18:6362)`
			`TX_FAR _SilphCo11EndBattleText2`
			`db "@"`

			`SilphCo11AfterBattleText2: ; 62367 (18:6367)`
			`TX_FAR _SilphCo11AfterBattleText2`
			`db "@"`

			`SilphCo10Text_6236c: ; 6236c (18:636c)`
$U-Daniel-PC\Daniel$ TX_ASM 2015-07-03 19:58:50 +00:00			`TX_ASM`
$U-Fish-PC\Daniel$ Pull map scripts out of main.asm 2014-05-18 18:19:10 +00:00			`ld hl, SilphCo10Text_6237b`
			`call PrintText`
			`ld a, PORYGON`
			`call DisplayPokedex`
			`jp TextScriptEnd`

			`SilphCo10Text_6237b: ; 6237b (18:637b)`
			`TX_FAR _SilphCo10Text_6237b`
			`db "@"`