thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-04 14:31:16 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Labelled and commented mostly sprite-related things

Browse source
This commit is contained in:
YamaArashi 2014-09-09 20:55:19 -07:00
parent daf4fc87ae
commit 91793015e5
86 changed files with 838 additions and 738 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
audio.asm
View file

@ -563,7 +563,7 @@ Func_7d13b:: ; 7d13b (1f:513b)
ld a, [hli] ld a, [hli]
ld c, [hl] ld c, [hl]
call PlayMusic call PlayMusic
jp Func_2307 jp PlayDefaultMusic
PokedexRatingSfxPointers: ; 7d162 (1f:5162) PokedexRatingSfxPointers: ; 7d162 (1f:5162)
db (SFX_1f_51 - SFX_Headers_1f) / 3, BANK(SFX_1f_51) db (SFX_1f_51 - SFX_Headers_1f) / 3, BANK(SFX_1f_51)

5
constants/misc_constants.asm
View file

@ -18,3 +18,8 @@ NUM_BOXES EQU 12
HOF_MON EQU $10 HOF_MON EQU $10
HOF_TEAM EQU PARTY_LENGTH * HOF_MON HOF_TEAM EQU PARTY_LENGTH * HOF_MON
NUM_HOF_TEAMS EQU 50 NUM_HOF_TEAMS EQU 50
NPC_MOVEMENT_DOWN EQU $00
NPC_MOVEMENT_UP EQU $40
NPC_MOVEMENT_LEFT EQU $80
NPC_MOVEMENT_RIGHT EQU $C0

10
constants/sprite_constants.asm
View file

@ -86,4 +86,12 @@ SPRITE_LYING_OLD_MAN EQU $48
; different kinds of people events ; different kinds of people events
ITEM EQU $80 ITEM EQU $80
TRAINER EQU $40 TRAINER EQU $40
BOULDER_MOVEMENT_BYTE_2 EQU $10
; sprite facing directions
SPRITE_FACING_DOWN EQU $00
SPRITE_FACING_UP EQU $04
SPRITE_FACING_LEFT EQU $08
SPRITE_FACING_RIGHT EQU $0C

2
data/mapObjects/fuchsiahouse2.asm
View file

@ -12,7 +12,7 @@ FuchsiaHouse2Object: ; 0x75180 (size=45)
db $3 ; people db $3 ; people
db SPRITE_WARDEN, $3 + 4, $2 + 4, $ff, $ff, $1 ; person db SPRITE_WARDEN, $3 + 4, $2 + 4, $ff, $ff, $1 ; person
db SPRITE_BALL, $3 + 4, $8 + 4, $ff, $ff, ITEM | $2, RARE_CANDY db SPRITE_BALL, $3 + 4, $8 + 4, $ff, $ff, ITEM | $2, RARE_CANDY
db SPRITE_BOULDER, $4 + 4, $8 + 4, $ff, $10, $3 ; person db SPRITE_BOULDER, $4 + 4, $8 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $3 ; person
; warp-to ; warp-to
EVENT_DISP FUCHSIA_HOUSE_2_WIDTH, $7, $4 EVENT_DISP FUCHSIA_HOUSE_2_WIDTH, $7, $4

4
data/mapObjects/seafoamislands1.asm
View file

@ -13,8 +13,8 @@ SeafoamIslands1Object: ; 0x4484f (size=72)
db $0 ; signs db $0 ; signs
db $2 ; people db $2 ; people
db SPRITE_BOULDER, $a + 4, $12 + 4, $ff, $10, $1 ; person db SPRITE_BOULDER, $a + 4, $12 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $1 ; person
db SPRITE_BOULDER, $7 + 4, $1a + 4, $ff, $10, $2 ; person db SPRITE_BOULDER, $7 + 4, $1a + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $2 ; person
; warp-to ; warp-to
EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $11, $4 EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $11, $4

4
data/mapObjects/seafoamislands2.asm
View file

@ -13,8 +13,8 @@ SeafoamIslands2Object: ; 0x46376 (size=72)
db $0 ; signs db $0 ; signs
db $2 ; people db $2 ; people
db SPRITE_BOULDER, $6 + 4, $11 + 4, $ff, $10, $1 ; person db SPRITE_BOULDER, $6 + 4, $11 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $1 ; person
db SPRITE_BOULDER, $6 + 4, $16 + 4, $ff, $10, $2 ; person db SPRITE_BOULDER, $6 + 4, $16 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $2 ; person
; warp-to ; warp-to
EVENT_DISP SEAFOAM_ISLANDS_2_WIDTH, $2, $4 ; SEAFOAM_ISLANDS_3 EVENT_DISP SEAFOAM_ISLANDS_2_WIDTH, $2, $4 ; SEAFOAM_ISLANDS_3

4
data/mapObjects/seafoamislands3.asm
View file

@ -13,8 +13,8 @@ SeafoamIslands3Object: ; 0x464b2 (size=72)
db $0 ; signs db $0 ; signs
db $2 ; people db $2 ; people
db SPRITE_BOULDER, $6 + 4, $12 + 4, $ff, $10, $1 ; person db SPRITE_BOULDER, $6 + 4, $12 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $1 ; person
db SPRITE_BOULDER, $6 + 4, $17 + 4, $ff, $10, $2 ; person db SPRITE_BOULDER, $6 + 4, $17 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $2 ; person
; warp-to ; warp-to
EVENT_DISP SEAFOAM_ISLANDS_3_WIDTH, $3, $5 ; SEAFOAM_ISLANDS_2 EVENT_DISP SEAFOAM_ISLANDS_3_WIDTH, $3, $5 ; SEAFOAM_ISLANDS_2

8
data/mapObjects/seafoamislands4.asm
View file

@ -13,10 +13,10 @@ SeafoamIslands4Object: ; 0x466a6 (size=96)
db $0 ; signs db $0 ; signs
db $6 ; people db $6 ; people
db SPRITE_BOULDER, $e + 4, $5 + 4, $ff, $10, $1 ; person db SPRITE_BOULDER, $e + 4, $5 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $1 ; person
db SPRITE_BOULDER, $f + 4, $3 + 4, $ff, $10, $2 ; person db SPRITE_BOULDER, $f + 4, $3 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $2 ; person
db SPRITE_BOULDER, $e + 4, $8 + 4, $ff, $10, $3 ; person db SPRITE_BOULDER, $e + 4, $8 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $3 ; person
db SPRITE_BOULDER, $e + 4, $9 + 4, $ff, $10, $4 ; person db SPRITE_BOULDER, $e + 4, $9 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $4 ; person
db SPRITE_BOULDER, $6 + 4, $12 + 4, $ff, $ff, $5 ; person db SPRITE_BOULDER, $6 + 4, $12 + 4, $ff, $ff, $5 ; person
db SPRITE_BOULDER, $6 + 4, $13 + 4, $ff, $ff, $6 ; person db SPRITE_BOULDER, $6 + 4, $13 + 4, $ff, $ff, $6 ; person

6
data/mapObjects/victoryroad1.asm
View file

@ -13,9 +13,9 @@ VictoryRoad1Object: ; 0x5dab8 (size=76)
db SPRITE_BLACK_HAIR_BOY_1, $2 + 4, $3 + 4, $ff, $d0, TRAINER | $2, COOLTRAINER_M + $C8, $5 db SPRITE_BLACK_HAIR_BOY_1, $2 + 4, $3 + 4, $ff, $d0, TRAINER | $2, COOLTRAINER_M + $C8, $5
db SPRITE_BALL, $0 + 4, $b + 4, $ff, $ff, ITEM | $3, TM_43 db SPRITE_BALL, $0 + 4, $b + 4, $ff, $ff, ITEM | $3, TM_43
db SPRITE_BALL, $2 + 4, $9 + 4, $ff, $ff, ITEM | $4, RARE_CANDY db SPRITE_BALL, $2 + 4, $9 + 4, $ff, $ff, ITEM | $4, RARE_CANDY
db SPRITE_BOULDER, $f + 4, $5 + 4, $ff, $10, $5 ; person db SPRITE_BOULDER, $f + 4, $5 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $5 ; person
db SPRITE_BOULDER, $2 + 4, $e + 4, $ff, $10, $6 ; person db SPRITE_BOULDER, $2 + 4, $e + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $6 ; person
db SPRITE_BOULDER, $a + 4, $2 + 4, $ff, $10, $7 ; person db SPRITE_BOULDER, $a + 4, $2 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $7 ; person
; warp-to ; warp-to
EVENT_DISP VICTORY_ROAD_1_WIDTH, $11, $8 EVENT_DISP VICTORY_ROAD_1_WIDTH, $11, $8

6
data/mapObjects/victoryroad2.asm
View file

@ -23,9 +23,9 @@ VictoryRoad2Object: ; 0x51915 (size=154)
db SPRITE_BALL, $9 + 4, $12 + 4, $ff, $ff, ITEM | $8, FULL_HEAL db SPRITE_BALL, $9 + 4, $12 + 4, $ff, $ff, ITEM | $8, FULL_HEAL
db SPRITE_BALL, $b + 4, $9 + 4, $ff, $ff, ITEM | $9, TM_05 db SPRITE_BALL, $b + 4, $9 + 4, $ff, $ff, ITEM | $9, TM_05
db SPRITE_BALL, $0 + 4, $b + 4, $ff, $ff, ITEM | $a, GUARD_SPEC_ db SPRITE_BALL, $0 + 4, $b + 4, $ff, $ff, ITEM | $a, GUARD_SPEC_
db SPRITE_BOULDER, $e + 4, $4 + 4, $ff, $10, $b ; person db SPRITE_BOULDER, $e + 4, $4 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $b ; person
db SPRITE_BOULDER, $5 + 4, $5 + 4, $ff, $10, $c ; person db SPRITE_BOULDER, $5 + 4, $5 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $c ; person
db SPRITE_BOULDER, $10 + 4, $17 + 4, $ff, $10, $d ; person db SPRITE_BOULDER, $10 + 4, $17 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $d ; person
; warp-to ; warp-to
EVENT_DISP VICTORY_ROAD_2_WIDTH, $8, $0 ; VICTORY_ROAD_1 EVENT_DISP VICTORY_ROAD_2_WIDTH, $8, $0 ; VICTORY_ROAD_1

8
data/mapObjects/victoryroad3.asm
View file

@ -16,10 +16,10 @@ VictoryRoad3Object: ; 0x44acd (size=106)
db SPRITE_LASS, $3 + 4, $d + 4, $ff, $d3, TRAINER | $4, COOLTRAINER_F + $C8, $3 db SPRITE_LASS, $3 + 4, $d + 4, $ff, $d3, TRAINER | $4, COOLTRAINER_F + $C8, $3
db SPRITE_BALL, $5 + 4, $1a + 4, $ff, $ff, ITEM | $5, MAX_REVIVE db SPRITE_BALL, $5 + 4, $1a + 4, $ff, $ff, ITEM | $5, MAX_REVIVE
db SPRITE_BALL, $7 + 4, $7 + 4, $ff, $ff, ITEM | $6, TM_47 db SPRITE_BALL, $7 + 4, $7 + 4, $ff, $ff, ITEM | $6, TM_47
db SPRITE_BOULDER, $3 + 4, $16 + 4, $ff, $10, $7 ; person db SPRITE_BOULDER, $3 + 4, $16 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $7 ; person
db SPRITE_BOULDER, $c + 4, $d + 4, $ff, $10, $8 ; person db SPRITE_BOULDER, $c + 4, $d + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $8 ; person
db SPRITE_BOULDER, $a + 4, $18 + 4, $ff, $10, $9 ; person db SPRITE_BOULDER, $a + 4, $18 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $9 ; person
db SPRITE_BOULDER, $f + 4, $16 + 4, $ff, $10, $a ; person db SPRITE_BOULDER, $f + 4, $16 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $a ; person
; warp-to ; warp-to
EVENT_DISP VICTORY_ROAD_3_WIDTH, $7, $17 ; VICTORY_ROAD_2 EVENT_DISP VICTORY_ROAD_3_WIDTH, $7, $17 ; VICTORY_ROAD_2

2
engine/battle/4_2.asm
View file

@ -88,7 +88,7 @@ PickUpPayDayMoneyText: ; 1386b (4:786b)
db "@" db "@"
Func_13870: ; 13870 (4:7870) Func_13870: ; 13870 (4:7870)
ld a, [wcc57] ld a, [wNPCMovementScriptPointerTableNum]
and a and a
ret nz ret nz
ld a, [wd736] ld a, [wd736]

26
engine/battle/animations.asm
View file

@ -1411,50 +1411,50 @@ Func_79329: ; 79329 (1e:5329)
ld [hli], a ld [hli], a
ret ret
Func_79337: ; 79337 (1e:5337) AdjustOAMBlockXPos: ; 79337 (1e:5337)
ld l, e ld l, e
ld h, d ld h, d
Func_79339: ; 79339 (1e:5339) AdjustOAMBlockXPos2: ; 79339 (1e:5339)
ld de, $4 ld de, $4
.asm_7933c .loop
ld a, [wd08a] ld a, [wd08a]
ld b, a ld b, a
ld a, [hl] ld a, [hl]
add b add b
cp $a8 cp $a8
jr c, .asm_7934a jr c, .skipPuttingEntryOffScreen
dec hl dec hl
ld a, $a0 ld a, $a0
ld [hli], a ld [hli], a
.asm_7934a .skipPuttingEntryOffScreen
ld [hl], a ld [hl], a
add hl, de add hl, de
dec c dec c
jr nz, .asm_7933c jr nz, .loop
ret ret
Func_79350: ; 79350 (1e:5350) AdjustOAMBlockYPos: ; 79350 (1e:5350)
ld l, e ld l, e
ld h, d ld h, d
Func_79352: ; 79352 (1e:5352) AdjustOAMBlockYPos2: ; 79352 (1e:5352)
ld de, $4 ld de, $4
.asm_79355 .loop
ld a, [wd08a] ld a, [wd08a]
ld b, a ld b, a
ld a, [hl] ld a, [hl]
add b add b
cp $70 cp $70
jr c, .asm_79363 jr c, .skipSettingPreviousEntrysAttribute
dec hl dec hl
ld a, $a0 ld a, $a0 ; bug, sets previous OAM entry's attribute
ld [hli], a ld [hli], a
.asm_79363 .skipSettingPreviousEntrysAttribute
ld [hl], a ld [hl], a
add hl, de add hl, de
dec c dec c
jr nz, .asm_79355 jr nz, .loop
ret ret
AnimationBlinkEnemyMon: ; 79369 (1e:5369) AnimationBlinkEnemyMon: ; 79369 (1e:5369)

2
engine/evolve_trade.asm
View file

@ -41,4 +41,4 @@ EvolveTradeMon: ; 17d7d (5:7d7d)
callab TryEvolvingMon callab TryEvolvingMon
xor a xor a
ld [W_ISLINKBATTLE], a ; W_ISLINKBATTLE ld [W_ISLINKBATTLE], a ; W_ISLINKBATTLE
jp Func_2307 jp PlayDefaultMusic

2
engine/evos_moves.asm
View file

@ -254,7 +254,7 @@ Evolution_PartyMonLoop: ; loop over party mons
ret nz ret nz
ld a, [wd121] ld a, [wd121]
and a and a
call nz, Func_2307 call nz, PlayDefaultMusic
ret ret
; checks if the evolved mon's name is different from the standard name (i.e. it has a nickname) ; checks if the evolved mon's name is different from the standard name (i.e. it has a nickname)

2
engine/hidden_object_functions7.asm
View file

@ -357,7 +357,7 @@ BillsHousePC: ; 1eb6e (7:6b6e)
ld a, (SFX_02_3a - SFX_Headers_02) / 3 ld a, (SFX_02_3a - SFX_Headers_02) / 3
call PlaySound call PlaySound
call WaitForSoundToFinish call WaitForSoundToFinish
call Func_2307 call PlayDefaultMusic
ld hl, wd7f2 ld hl, wd7f2
set 3, [hl] set 3, [hl]
ret ret

2
engine/in_game_trades.asm
View file

@ -150,7 +150,7 @@ Func_71c07: ; 71c07 (1c:5c07)
Func_71ca2: ; 71ca2 (1c:5ca2) Func_71ca2: ; 71ca2 (1c:5ca2)
call GBPalWhiteOutWithDelay3 call GBPalWhiteOutWithDelay3
call Func_3dbe call RestoreScreenTilesAndReloadTilePatterns
call ReloadTilesetTilePatterns call ReloadTilesetTilePatterns
call LoadScreenTilesFromBuffer2 call LoadScreenTilesFromBuffer2
call Delay3 call Delay3

24
engine/items/items.asm
View file

@ -517,7 +517,7 @@ ItemUseBicycle: ; d977 (3:5977)
call ItemUseReloadOverworldData call ItemUseReloadOverworldData
xor a xor a
ld [wd700],a ; change player state to walking ld [wd700],a ; change player state to walking
call Func_2307 ; play walking music call PlayDefaultMusic ; play walking music
ld hl,GotOffBicycleText ld hl,GotOffBicycleText
jr .printText jr .printText
.tryToGetOnBike .tryToGetOnBike
@ -529,7 +529,7 @@ ItemUseBicycle: ; d977 (3:5977)
inc a inc a
ld [wd700],a ; change player state to bicycling ld [wd700],a ; change player state to bicycling
ld hl,GotOnBicycleText ld hl,GotOnBicycleText
call Func_2307 ; play bike riding music call PlayDefaultMusic ; play bike riding music
.printText .printText
jp PrintText jp PrintText
@ -551,7 +551,7 @@ ItemUseSurfboard: ; d9b4 (3:59b4)
set 7,[hl] set 7,[hl]
ld a,2 ld a,2
ld [wd700],a ; change player state to surfing ld [wd700],a ; change player state to surfing
call Func_2307 ; play surfing music call PlayDefaultMusic ; play surfing music
ld hl,SurfingGotOnText ld hl,SurfingGotOnText
jp PrintText jp PrintText
.tryToStopSurfing .tryToStopSurfing
@ -589,28 +589,28 @@ ItemUseSurfboard: ; d9b4 (3:59b4)
ld [wd700],a ; change player state to walking ld [wd700],a ; change player state to walking
dec a dec a
ld [wJoyIgnore],a ld [wJoyIgnore],a
call Func_2307 ; play walking music call PlayDefaultMusic ; play walking music
jp LoadWalkingPlayerSpriteGraphics jp LoadWalkingPlayerSpriteGraphics
; uses a simulated button press to make the player move forward ; uses a simulated button press to make the player move forward
.makePlayerMoveForward .makePlayerMoveForward
ld a,[wd52a] ; direction the player is going ld a,[wd52a] ; direction the player is going
bit 3,a bit 3,a
ld b,%01000000 ; Up key ld b,D_UP
jr nz,.storeSimulatedButtonPress jr nz,.storeSimulatedButtonPress
bit 2,a bit 2,a
ld b,%10000000 ; Down key ld b,D_DOWN
jr nz,.storeSimulatedButtonPress jr nz,.storeSimulatedButtonPress
bit 1,a bit 1,a
ld b,%00100000 ; Left key ld b,D_LEFT
jr nz,.storeSimulatedButtonPress jr nz,.storeSimulatedButtonPress
ld b,%00010000 ; Right key ld b,D_RIGHT
.storeSimulatedButtonPress .storeSimulatedButtonPress
ld a,b ld a,b
ld [wccd3],a ; base address of simulated button presses ld [wSimulatedJoypadStatesEnd],a
xor a xor a
ld [wcd39],a ld [wWastedByteCD39],a
inc a inc a
ld [wcd38],a ; index of current simulated button press ld [wSimulatedJoypadStatesIndex],a
ret ret
SurfingGotOnText: ; da4c (3:5a4c) SurfingGotOnText: ; da4c (3:5a4c)
@ -1727,7 +1727,7 @@ PlayedFluteHadEffectText: ; e215 (3:6215)
ld a,[wc028] ld a,[wc028]
cp a,$b8 cp a,$b8
jr z,.musicWaitLoop jr z,.musicWaitLoop
call Func_2307 ; start playing normal music again call PlayDefaultMusic ; start playing normal music again
.done .done
jp TextScriptEnd ; end text jp TextScriptEnd ; end text

2
engine/menu/diploma.asm
View file

@ -61,7 +61,7 @@ DisplayDiploma: ; 566e2 (15:66e2)
ld hl, wd730 ld hl, wd730
res 6, [hl] res 6, [hl]
call GBPalWhiteOutWithDelay3 call GBPalWhiteOutWithDelay3
call Func_3dbe call RestoreScreenTilesAndReloadTilePatterns
call Delay3 call Delay3
jp GBPalNormal jp GBPalNormal

4
engine/menu/naming_screen.asm
View file

@ -33,7 +33,7 @@ AskName: ; 64eb (1:64eb)
ld a, [W_ISINBATTLE] ; W_ISINBATTLE ld a, [W_ISINBATTLE] ; W_ISINBATTLE
and a and a
jr nz, .asm_653e jr nz, .asm_653e
call Func_3e08 call ReloadMapSpriteTilePatterns
.asm_653e .asm_653e
call LoadScreenTilesFromBuffer1 call LoadScreenTilesFromBuffer1
pop hl pop hl
@ -61,7 +61,7 @@ Func_655c: ; 655c (1:655c)
ld [wd07d], a ld [wd07d], a
call DisplayNamingScreen call DisplayNamingScreen
call GBPalWhiteOutWithDelay3 call GBPalWhiteOutWithDelay3
call Func_3dbe call RestoreScreenTilesAndReloadTilePatterns
call LoadGBPal call LoadGBPal
ld a, [wcf4b] ld a, [wcf4b]
cp $50 cp $50

4
engine/menu/pokedex.asm
View file

@ -36,8 +36,8 @@ ShowPokedexMenu: ; 40000 (10:4000)
ld [wCurrentMenuItem],a ld [wCurrentMenuItem],a
ld [wLastMenuItem],a ld [wLastMenuItem],a
ld [$ffb7],a ld [$ffb7],a
ld [wcd3a],a ld [wWastedByteCD3A],a
ld [wcd3b],a ld [wOverrideSimulatedJoypadStatesMask],a
pop af pop af
ld [wListScrollOffset],a ld [wListScrollOffset],a
call GBPalWhiteOutWithDelay3 call GBPalWhiteOutWithDelay3

18
engine/menu/start_sub_menus.asm
View file

@ -25,7 +25,7 @@ StartMenu_Pokemon: ; 130a9 (4:70a9)
jr nc,.chosePokemon jr nc,.chosePokemon
.exitMenu .exitMenu
call GBPalWhiteOutWithDelay3 call GBPalWhiteOutWithDelay3
call Func_3dbe call RestoreScreenTilesAndReloadTilePatterns
call LoadGBPal call LoadGBPal
jp RedisplayStartMenu jp RedisplayStartMenu
.chosePokemon .chosePokemon
@ -273,7 +273,7 @@ StartMenu_Pokemon: ; 130a9 (4:70a9)
TX_FAR _NotHealthyEnoughText TX_FAR _NotHealthyEnoughText
db "@" db "@"
.goBackToMap .goBackToMap
call Func_3dbe call RestoreScreenTilesAndReloadTilePatterns
jp CloseTextDisplay jp CloseTextDisplay
.newBadgeRequired .newBadgeRequired
ld hl,.newBadgeRequiredText ld hl,.newBadgeRequiredText
@ -413,7 +413,7 @@ StartMenu_Item: ; 13302 (4:7302)
cp a,$02 cp a,$02
jp z,.partyMenuNotDisplayed jp z,.partyMenuNotDisplayed
call GBPalWhiteOutWithDelay3 call GBPalWhiteOutWithDelay3
call Func_3dbe call RestoreScreenTilesAndReloadTilePatterns
pop af pop af
ld [wcfcb],a ld [wcfcb],a
jp StartMenu_Item jp StartMenu_Item
@ -790,7 +790,7 @@ SwitchPartyMon_Stats: ; 13653 (4:7653)
ld a, [wCurrentMenuItem] ; wCurrentMenuItem ld a, [wCurrentMenuItem] ; wCurrentMenuItem
call AddNTimes call AddNTimes
push hl push hl
ld de, wcc97 ld de, wSwitchPartyMonTempBuffer
ld bc, $2c ld bc, $2c
call CopyData call CopyData
ld hl, wPartyMons ld hl, wPartyMons
@ -802,14 +802,14 @@ SwitchPartyMon_Stats: ; 13653 (4:7653)
ld bc, $2c ld bc, $2c
call CopyData call CopyData
pop de pop de
ld hl, wcc97 ld hl, wSwitchPartyMonTempBuffer
ld bc, $2c ld bc, $2c
call CopyData call CopyData
ld hl, wPartyMonOT ; wd273 ld hl, wPartyMonOT ; wd273
ld a, [wCurrentMenuItem] ; wCurrentMenuItem ld a, [wCurrentMenuItem] ; wCurrentMenuItem
call SkipFixedLengthTextEntries call SkipFixedLengthTextEntries
push hl push hl
ld de, wcc97 ld de, wSwitchPartyMonTempBuffer
ld bc, $b ld bc, $b
call CopyData call CopyData
ld hl, wPartyMonOT ; wd273 ld hl, wPartyMonOT ; wd273
@ -820,14 +820,14 @@ SwitchPartyMon_Stats: ; 13653 (4:7653)
ld bc, $b ld bc, $b
call CopyData call CopyData
pop de pop de
ld hl, wcc97 ld hl, wSwitchPartyMonTempBuffer
ld bc, $b ld bc, $b
call CopyData call CopyData
ld hl, wPartyMonNicks ; wPartyMonNicks ld hl, wPartyMonNicks ; wPartyMonNicks
ld a, [wCurrentMenuItem] ; wCurrentMenuItem ld a, [wCurrentMenuItem] ; wCurrentMenuItem
call SkipFixedLengthTextEntries call SkipFixedLengthTextEntries
push hl push hl
ld de, wcc97 ld de, wSwitchPartyMonTempBuffer
ld bc, $b ld bc, $b
call CopyData call CopyData
ld hl, wPartyMonNicks ; wPartyMonNicks ld hl, wPartyMonNicks ; wPartyMonNicks
@ -838,7 +838,7 @@ SwitchPartyMon_Stats: ; 13653 (4:7653)
ld bc, $b ld bc, $b
call CopyData call CopyData
pop de pop de
ld hl, wcc97 ld hl, wSwitchPartyMonTempBuffer
ld bc, $b ld bc, $b
call CopyData call CopyData
ld a, [wMenuItemToSwap] ld a, [wMenuItemToSwap]

38
engine/overworld/cut.asm
View file

@ -36,7 +36,7 @@ asm_ef82: ; ef82 (3:6f82)
set 6, [hl] set 6, [hl]
call GBPalWhiteOutWithDelay3 call GBPalWhiteOutWithDelay3
call ClearSprites call ClearSprites
call Func_3dbe call RestoreScreenTilesAndReloadTilePatterns
ld a, $90 ld a, $90
ld [hVBlankWY], a ld [hVBlankWY], a
call Delay3 call Delay3
@ -87,17 +87,17 @@ AnimateCutTree: ; eff7 (3:6ff7)
ld hl, vChars1 + $7e0 ld hl, vChars1 + $7e0
ld bc, (BANK(Overworld_GFX) << 8) + $02 ld bc, (BANK(Overworld_GFX) << 8) + $02
call CopyVideoData call CopyVideoData
jr asm_f055 jr WriteCutTreeBoulderDustAnimationOAMBlock
.asm_f020 .asm_f020
ld hl, vChars1 + $7c0 ld hl, vChars1 + $7c0
call LoadCutTreeOAM call LoadCutTreeAnimationTilePattern
ld hl, vChars1 + $7d0 ld hl, vChars1 + $7d0
call LoadCutTreeOAM call LoadCutTreeAnimationTilePattern
ld hl, vChars1 + $7e0 ld hl, vChars1 + $7e0
call LoadCutTreeOAM call LoadCutTreeAnimationTilePattern
ld hl, vChars1 + $7f0 ld hl, vChars1 + $7f0
call LoadCutTreeOAM call LoadCutTreeAnimationTilePattern
call asm_f055 call WriteCutTreeBoulderDustAnimationOAMBlock
ld hl, wOAMBuffer + $93 ld hl, wOAMBuffer + $93
ld de, $4 ld de, $4
ld a, $30 ld a, $30
@ -110,26 +110,27 @@ AnimateCutTree: ; eff7 (3:6ff7)
jr nz, .asm_f044 jr nz, .asm_f044
ret ret
LoadCutTreeOAM: ; f04c (3:704c) LoadCutTreeAnimationTilePattern: ; f04c (3:704c)
ld de, AnimationTileset2 + $60 ; $474e ; tile depicting a leaf ld de, AnimationTileset2 + $60 ; $474e ; tile depicting a leaf
ld bc, (BANK(AnimationTileset2) << 8) + $01 ld bc, (BANK(AnimationTileset2) << 8) + $01
jp CopyVideoData jp CopyVideoData
asm_f055: ; f055 (3:7055)
call Func_f068 WriteCutTreeBoulderDustAnimationOAMBlock: ; f055 (3:7055)
call GetCutTreeBoulderDustAnimationOffsets
ld a, $9 ld a, $9
ld de, CutTreeOAM ; $7060 ld de, CutTreeBoulderDustAnimationTilesAndAttributes
jp WriteOAMBlock jp WriteOAMBlock
CutTreeOAM: ; f060 (3:7060) CutTreeBoulderDustAnimationTilesAndAttributes: ; f060 (3:7060)
db $FC,$10,$FD,$10 db $FC,$10,$FD,$10
db $FE,$10,$FF,$10 db $FE,$10,$FF,$10
Func_f068: ; f068 (3:7068) GetCutTreeBoulderDustAnimationOffsets: ; f068 (3:7068)
ld hl, wSpriteStateData1 + 4 ld hl, wSpriteStateData1 + 4
ld a, [hli] ld a, [hli] ; player's sprite screen Y position
ld b, a ld b, a
inc hl inc hl
ld a, [hli] ld a, [hli] ; player's sprite screen X position
ld c, a ; bc holds ypos/xpos of player's sprite ld c, a ; bc holds ypos/xpos of player's sprite
inc hl inc hl
inc hl inc hl
@ -139,9 +140,9 @@ Func_f068: ; f068 (3:7068)
ld d, $0 ; de holds direction (00: down, 02: up, 04: left, 06: right) ld d, $0 ; de holds direction (00: down, 02: up, 04: left, 06: right)
ld a, [wcd50] ld a, [wcd50]
and a and a
ld hl, CutTreeAnimationOffsets ; $708f ld hl, CutTreeAnimationOffsets
jr z, .asm_f084 jr z, .asm_f084
ld hl, CutTreeAnimationOffsets2 ; $7097 ld hl, BoulderDustAnimationOffsets
.asm_f084 .asm_f084
add hl, de add hl, de
ld e, [hl] ld e, [hl]
@ -162,8 +163,7 @@ CutTreeAnimationOffsets: ; f08f (3:708f)
db -8, 20 ; player is facing left db -8, 20 ; player is facing left
db 24, 20 ; player is facing right db 24, 20 ; player is facing right
CutTreeAnimationOffsets2: ; f097 (3:7097) BoulderDustAnimationOffsets: ; f097 (3:7097)
; Not sure if these ever get used. CutTreeAnimationOffsets only seems to be used.
; Each pair represents the x and y pixels offsets from the player of where the cut tree animation should be drawn ; Each pair represents the x and y pixels offsets from the player of where the cut tree animation should be drawn
; These offsets represent 2 blocks away from the player ; These offsets represent 2 blocks away from the player
db 8, 52 ; player is facing down db 8, 52 ; player is facing down

14
engine/overworld/cut2.asm
View file

@ -9,12 +9,12 @@ Func_79e96: ; 79e96 (1e:5e96)
ld a, $1 ld a, $1
ld [wd08a], a ld [wd08a], a
ld c, $2 ld c, $2
call Func_79339 call AdjustOAMBlockXPos2
ld hl, wOAMBuffer + $99 ld hl, wOAMBuffer + $99
ld a, $ff ld a, $ff
ld [wd08a], a ld [wd08a], a
ld c, $2 ld c, $2
call Func_79339 call AdjustOAMBlockXPos2
ld a, [rOBP1] ; $ff49 ld a, [rOBP1] ; $ff49
xor $64 xor $64
ld [rOBP1], a ; $ff49 ld [rOBP1], a ; $ff49
@ -37,7 +37,7 @@ Func_79e96: ; 79e96 (1e:5e96)
ld a, $2 ld a, $2
ld [wd08a], a ld [wd08a], a
ld c, $4 ld c, $4
call Func_79352 call AdjustOAMBlockYPos2
pop bc pop bc
dec c dec c
jr nz, .asm_79eca jr nz, .asm_79eca
@ -49,22 +49,22 @@ Func_79eed: ; 79eed (1e:5eed)
ld a, $1 ld a, $1
ld [wd08a], a ld [wd08a], a
ld c, $1 ld c, $1
call Func_79339 call AdjustOAMBlockXPos2
ld hl, wOAMBuffer + $95 ld hl, wOAMBuffer + $95
ld a, $2 ld a, $2
ld [wd08a], a ld [wd08a], a
ld c, $1 ld c, $1
call Func_79339 call AdjustOAMBlockXPos2
ld hl, wOAMBuffer + $99 ld hl, wOAMBuffer + $99
ld a, $fe ld a, $fe
ld [wd08a], a ld [wd08a], a
ld c, $1 ld c, $1
call Func_79339 call AdjustOAMBlockXPos2
ld hl, wOAMBuffer + $9d ld hl, wOAMBuffer + $9d
ld a, $ff ld a, $ff
ld [wd08a], a ld [wd08a], a
ld c, $1 ld c, $1
call Func_79339 call AdjustOAMBlockXPos2
ld a, [rOBP1] ; $ff49 ld a, [rOBP1] ; $ff49
xor $64 xor $64
ld [rOBP1], a ; $ff49 ld [rOBP1], a ; $ff49

15
engine/overworld/doors.asm
View file

@ -1,26 +1,27 @@
HandleDoors: ; 1a609 (6:6609) ; returns whether the player is standing on a door in carry
IsPlayerStandingOnDoor: ; 1a609 (6:6609)
push de push de
ld hl, DoorTileIDPointers ; $662c ld hl, DoorTileIDPointers ; $662c
ld a, [W_CURMAPTILESET] ; W_CURMAPTILESET ld a, [W_CURMAPTILESET] ; W_CURMAPTILESET
ld de, $3 ld de, $3
call IsInArray call IsInArray
pop de pop de
jr nc, .asm_1a62a jr nc, .notStandingOnDoor
inc hl inc hl
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
aCoord 8, 9 aCoord 8, 9 ; a = lower left background tile under player's sprite
ld b, a ld b, a
.asm_1a621 .loop
ld a, [hli] ld a, [hli]
and a and a
jr z, .asm_1a62a jr z, .notStandingOnDoor
cp b cp b
jr nz, .asm_1a621 jr nz, .loop
scf scf
ret ret
.asm_1a62a .notStandingOnDoor
and a and a
ret ret

2
engine/overworld/elevator.asm
View file

@ -38,7 +38,7 @@ ShakeElevator: ; 7bf15 (1e:7f15)
cp $b9 cp $b9
jr z, .asm_7bf57 jr z, .asm_7bf57
call UpdateSprites call UpdateSprites
jp Func_2307 jp PlayDefaultMusic
Func_7bf64: ; 7bf64 (1e:7f64) Func_7bf64: ; 7bf64 (1e:7f64)
ld hl, wd527 ld hl, wd527

8
engine/overworld/ledges.asm
View file

@ -43,12 +43,12 @@ HandleLedges: ; 1a672 (6:6672)
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld hl, wd736 ld hl, wd736
set 6, [hl] set 6, [hl]
call Func_3486 call StartSimulatingJoypadStates
ld a, e ld a, e
ld [wccd3], a ld [wSimulatedJoypadStatesEnd], a
ld [wccd4], a ld [wSimulatedJoypadStatesEnd + 1], a
ld a, $2 ld a, $2
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
call LoadHoppingShadowOAM call LoadHoppingShadowOAM
ld a, (SFX_02_4e - SFX_Headers_02) / 3 ld a, (SFX_02_4e - SFX_Headers_02) / 3
call PlaySound call PlaySound

14
engine/overworld/movement.asm
View file

@ -168,8 +168,8 @@ Func_4ed1: ; 4ed1 (1:4ed1)
ld hl, wd730 ld hl, wd730
res 0, [hl] res 0, [hl]
xor a xor a
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
ld [wcd3a], a ld [wWastedByteCD3A], a
ret ret
.asm_4f4b .asm_4f4b
cp $fe cp $fe
@ -493,6 +493,8 @@ CheckSpriteAvailability: ; 50dc (1:50dc)
cp b cp b
jr c, .spriteInvisible ; right of screen region jr c, .spriteInvisible ; right of screen region
.skipXVisibilityTest .skipXVisibilityTest
; make the sprite invisible if a text box is in front of it
; $5F is the maximum number for map tiles
call getTileSpriteStandsOn call getTileSpriteStandsOn
ld d, $60 ld d, $60
ld a, [hli] ld a, [hli]
@ -719,8 +721,8 @@ Func_5236: ; 5236 (1:5236)
bit 7, [hl] bit 7, [hl]
set 7, [hl] set 7, [hl]
jp z, Func_52a6 jp z, Func_52a6
ld hl, wcc97 ld hl, wNPCMovementDirections2
ld a, [wcd37] ld a, [wNPCMovementDirections2Index]
add l add l
ld l, a ld l, a
jr nc, .asm_5251 jr nc, .asm_5251
@ -773,13 +775,13 @@ Func_5236: ; 5236 (1:5236)
ret nz ret nz
ld a, $8 ld a, $8
ld [wcf18], a ld [wcf18], a
ld hl, wcd37 ld hl, wNPCMovementDirections2Index
inc [hl] inc [hl]
ret ret
Func_52a6: ; 52a6 (1:52a6) Func_52a6: ; 52a6 (1:52a6)
xor a xor a
ld [wcd37], a ld [wNPCMovementDirections2Index], a
ld a, $8 ld a, $8
ld [wcf18], a ld [wcf18], a
jp Func_52c3 jp Func_52c3

138
engine/overworld/npc_movement.asm
View file

@ -1,25 +1,25 @@
Func_1a3e0: ; 1a3e0 (6:63e0) PlayerStepOutFromDoor: ; 1a3e0 (6:63e0)
ld hl, wd730 ld hl, wd730
res 1, [hl] res 1, [hl]
call HandleDoors call IsPlayerStandingOnDoor
jr nc, .asm_1a406 jr nc, .notStandingOnDoor
ld a, $fc ld a, $fc
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld hl, wd736 ld hl, wd736
set 1, [hl] set 1, [hl]
ld a, $1 ld a, $1
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
ld a, $80 ld a, D_DOWN
ld [wccd3], a ld [wSimulatedJoypadStatesEnd], a
xor a xor a
ld [wSpriteStateData1 + 2], a ld [wSpriteStateData1 + 2], a
call Func_3486 call StartSimulatingJoypadStates
ret ret
.asm_1a406 .notStandingOnDoor
xor a xor a
ld [wcd3a], a ld [wWastedByteCD3A], a
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
ld [wccd3], a ld [wSimulatedJoypadStatesEnd], a
ld hl, wd736 ld hl, wd736
res 0, [hl] res 0, [hl]
res 1, [hl] res 1, [hl]
@ -27,7 +27,7 @@ Func_1a3e0: ; 1a3e0 (6:63e0)
res 7, [hl] res 7, [hl]
ret ret
Func_1a41d: ; 1a41d (6:641d) _EndNPCMovementScript: ; 1a41d (6:641d)
ld hl, wd730 ld hl, wd730
res 7, [hl] res 7, [hl]
ld hl, wd72e ld hl, wd72e
@ -36,15 +36,15 @@ Func_1a41d: ; 1a41d (6:641d)
res 0, [hl] res 0, [hl]
res 1, [hl] res 1, [hl]
xor a xor a
ld [wcf17], a ld [wNPCMovementScriptSpriteOffset], a
ld [wcc57], a ld [wNPCMovementScriptPointerTableNum], a
ld [wcf10], a ld [wNPCMovementScriptFunctionNum], a
ld [wcd3a], a ld [wWastedByteCD3A], a
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
ld [wccd3], a ld [wSimulatedJoypadStatesEnd], a
ret ret
PointerTable_1a442: ; 1a442 (6:6442) ProfOakMovementScriptPointerTable: ; 1a442 (6:6442)
dw Func_1a44c dw Func_1a44c
dw Func_1a485 dw Func_1a485
dw Func_1a4a1 dw Func_1a4a1
@ -58,20 +58,20 @@ Func_1a44c: ; 1a44c (6:644c)
jr z, .asm_1a475 jr z, .asm_1a475
ld b, $0 ld b, $0
ld c, a ld c, a
ld hl, wcc97 ld hl, wNPCMovementDirections2
ld a, $80 ld a, $80
call FillMemory call FillMemory
ld [hl], $ff ld [hl], $ff
ld a, [wcf13] ld a, [wcf13]
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
ld de, wcc97 ld de, wNPCMovementDirections2
call MoveSprite call MoveSprite
ld a, $1 ld a, $1
ld [wcf10], a ld [wNPCMovementScriptFunctionNum], a
jr .asm_1a47a jr .asm_1a47a
.asm_1a475 .asm_1a475
ld a, $3 ld a, $3
ld [wcf10], a ld [wNPCMovementScriptFunctionNum], a
.asm_1a47a .asm_1a47a
ld hl, W_FLAGS_D733 ld hl, W_FLAGS_D733
set 1, [hl] set 1, [hl]
@ -84,33 +84,33 @@ Func_1a485: ; 1a485 (6:6485)
bit 0, a bit 0, a
ret nz ret nz
ld a, [wcca1] ld a, [wcca1]
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
ld [$ff95], a ld [$ff95], a
predef Func_f9a0 predef ConvertNPCMovementDirectionsToJoypadMasks
call Func_3486 call StartSimulatingJoypadStates
ld a, $2 ld a, $2
ld [wcf10], a ld [wNPCMovementScriptFunctionNum], a
ret ret
Func_1a4a1: ; 1a4a1 (6:64a1) Func_1a4a1: ; 1a4a1 (6:64a1)
ld a, [wcd38] ld a, [wSimulatedJoypadStatesIndex]
and a and a
ret nz ret nz
Func_1a4a6: ; 1a4a6 (6:64a6) Func_1a4a6: ; 1a4a6 (6:64a6)
xor a xor a
ld [wcd3b], a ld [wOverrideSimulatedJoypadStatesMask], a
ld a, [wcf13] ld a, [wcf13]
swap a swap a
ld [wcf17], a ld [wNPCMovementScriptSpriteOffset], a
xor a xor a
ld [wSpriteStateData2 + $06], a ld [wSpriteStateData2 + $06], a
ld hl, wccd3 ld hl, wSimulatedJoypadStatesEnd
ld de, RLEList_1a4e9 ld de, RLEList_1a4e9
call DecodeRLEList call DecodeRLEList
dec a dec a
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
ld hl, wcc97 ld hl, wNPCMovementDirections2
ld de, RLEList_1a4dc ld de, RLEList_1a4dc
call DecodeRLEList call DecodeRLEList
ld hl, wd72e ld hl, wd72e
@ -118,7 +118,7 @@ Func_1a4a6: ; 1a4a6 (6:64a6)
ld hl, wd730 ld hl, wd730
set 7, [hl] set 7, [hl]
ld a, $4 ld a, $4
ld [wcf10], a ld [wNPCMovementScriptFunctionNum], a
ret ret
RLEList_1a4dc: ; 1a4dc (6:64dc) RLEList_1a4dc: ; 1a4dc (6:64dc)
@ -131,15 +131,15 @@ RLEList_1a4dc: ; 1a4dc (6:64dc)
db $FF db $FF
RLEList_1a4e9: ; 1a4e9 (6:64e9) RLEList_1a4e9: ; 1a4e9 (6:64e9)
db $40, $02 db D_UP, $02
db $10, $03 db D_RIGHT, $03
db $80, $05 db D_DOWN, $05
db $20, $01 db D_LEFT, $01
db $80, $06 db D_DOWN, $06
db $FF db $FF
Func_1a4f4: ; 1a4f4 (6:64f4) Func_1a4f4: ; 1a4f4 (6:64f4)
ld a, [wcd38] ld a, [wSimulatedJoypadStatesIndex]
and a and a
ret nz ret nz
ld a, $0 ld a, $0
@ -149,11 +149,11 @@ Func_1a4f4: ; 1a4f4 (6:64f4)
res 7, [hl] res 7, [hl]
ld hl, wd72e ld hl, wd72e
res 7, [hl] res 7, [hl]
jp Func_314e jp EndNPCMovementScript
PointerTable_1a510: ; 1a510 (6:6510) PewterMuseumGuyMovementScriptPointerTable: ; 1a510 (6:6510)
dw Func_1a514 dw Func_1a514
dw Func_1a56b dw PewterMovementScriptDone
Func_1a514: ; 1a514 (6:6514) Func_1a514: ; 1a514 (6:6514)
ld a, BANK(Music_MuseumGuy) ld a, BANK(Music_MuseumGuy)
@ -164,30 +164,30 @@ Func_1a514: ; 1a514 (6:6514)
call PlaySound call PlaySound
ld a, [wcf13] ld a, [wcf13]
swap a swap a
ld [wcf17], a ld [wNPCMovementScriptSpriteOffset], a
call Func_3486 call StartSimulatingJoypadStates
ld hl, wccd3 ld hl, wSimulatedJoypadStatesEnd
ld de, RLEList_PewterMuseumPlayer ld de, RLEList_PewterMuseumPlayer
call DecodeRLEList call DecodeRLEList
dec a dec a
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
xor a xor a
ld [wd12f], a ld [wd12f], a
predef PewterGuys predef PewterGuys
ld hl, wcc97 ld hl, wNPCMovementDirections2
ld de, RLEList_PewterMuseumGuy ld de, RLEList_PewterMuseumGuy
call DecodeRLEList call DecodeRLEList
ld hl, wd72e ld hl, wd72e
res 7, [hl] res 7, [hl]
ld a, $1 ld a, $1
ld [wcf10], a ld [wNPCMovementScriptFunctionNum], a
ret ret
RLEList_PewterMuseumPlayer: ; 1a559 (6:6559) RLEList_PewterMuseumPlayer: ; 1a559 (6:6559)
db $00, $01 db 0, $01
db $40, $03 db D_UP, $03
db $20, $0D db D_LEFT, $0D
db $40, $06 db D_UP, $06
db $FF db $FF
RLEList_PewterMuseumGuy: ; 1a562 (6:6562) RLEList_PewterMuseumGuy: ; 1a562 (6:6562)
@ -197,19 +197,19 @@ RLEList_PewterMuseumGuy: ; 1a562 (6:6562)
db $80, $01 db $80, $01
db $FF db $FF
Func_1a56b: ; 1a56b (6:656b) PewterMovementScriptDone: ; 1a56b (6:656b)
ld a, [wcd38] ld a, [wSimulatedJoypadStatesIndex]
and a and a
ret nz ret nz
ld hl, wd730 ld hl, wd730
res 7, [hl] res 7, [hl]
ld hl, wd72e ld hl, wd72e
res 7, [hl] res 7, [hl]
jp Func_314e jp EndNPCMovementScript
PointerTable_1a57d: ; 1a57d (6:657d) PewterGymGuyMovementScriptPointerTable: ; 1a57d (6:657d)
dw Func_1a581 dw Func_1a581
dw Func_1a56b dw PewterMovementScriptDone
Func_1a581: ; 1a581 (6:6581) Func_1a581: ; 1a581 (6:6581)
ld a, BANK(Music_MuseumGuy) ld a, BANK(Music_MuseumGuy)
@ -220,18 +220,18 @@ Func_1a581: ; 1a581 (6:6581)
call PlaySound call PlaySound
ld a, [wcf13] ld a, [wcf13]
swap a swap a
ld [wcf17], a ld [wNPCMovementScriptSpriteOffset], a
xor a xor a
ld [wSpriteStateData2 + $06], a ld [wSpriteStateData2 + $06], a
ld hl, wccd3 ld hl, wSimulatedJoypadStatesEnd
ld de, RLEList_PewterGymPlayer ld de, RLEList_PewterGymPlayer
call DecodeRLEList call DecodeRLEList
dec a dec a
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
ld a, $1 ld a, $1
ld [wd12f], a ld [wd12f], a
predef PewterGuys predef PewterGuys
ld hl, wcc97 ld hl, wNPCMovementDirections2
ld de, RLEList_PewterGymGuy ld de, RLEList_PewterGymGuy
call DecodeRLEList call DecodeRLEList
ld hl, wd72e ld hl, wd72e
@ -239,16 +239,16 @@ Func_1a581: ; 1a581 (6:6581)
ld hl, wd730 ld hl, wd730
set 7, [hl] set 7, [hl]
ld a, $1 ld a, $1
ld [wcf10], a ld [wNPCMovementScriptFunctionNum], a
ret ret
RLEList_PewterGymPlayer: ; 1a5cd (6:65cd) RLEList_PewterGymPlayer: ; 1a5cd (6:65cd)
db $00, $01 db 0, $01
db $10, $02 db D_RIGHT, $02
db $80, $05 db D_DOWN, $05
db $20, $0B db D_LEFT, $0B
db $40, $05 db D_UP, $05
db $20, $0F db D_LEFT, $0F
db $FF db $FF
RLEList_PewterGymGuy: ; 1a5da (6:65da) RLEList_PewterGymGuy: ; 1a5da (6:65da)

12
engine/overworld/pewter_guys.asm
View file

@ -1,8 +1,8 @@
PewterGuys: ; 37ca1 (d:7ca1) PewterGuys: ; 37ca1 (d:7ca1)
ld hl, wccd3 ld hl, wSimulatedJoypadStatesEnd
ld a, [wcd38] ld a, [wSimulatedJoypadStatesIndex]
dec a dec a ; this decrement causes it to overwrite the last byte before $FF in the list
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
ld d, 0 ld d, 0
ld e, a ld e, a
add hl, de add hl, de
@ -37,9 +37,9 @@ PewterGuys: ; 37ca1 (d:7ca1)
ret z ret z
ld [de], a ld [de], a
inc de inc de
ld a, [wcd38] ld a, [wSimulatedJoypadStatesIndex]
inc a inc a
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
jr .asm_37cd2 jr .asm_37cd2
.asm_37ce1 .asm_37ce1
inc hl inc hl

2
engine/overworld/player_animations.asm
View file

@ -34,7 +34,7 @@ Func_70510: ; 70510 (1c:4510)
ld hl, wcd48 ld hl, wcd48
call Func_70730 call Func_70730
.asm_70558 .asm_70558
call Func_2307 call PlayDefaultMusic
.asm_7055b .asm_7055b
jp Func_70772 jp Func_70772
.asm_7055e .asm_7055e

48
engine/overworld/ssanne.asm
View file

@ -1,37 +1,37 @@
Func_79f54: ; 79f54 (1e:5f54) AnimateBoulderDust: ; 79f54 (1e:5f54)
ld a, $1 ld a, $1
ld [wcd50], a ld [wcd50], a ; select the boulder dust offsets
ld a, [wcfcb] ld a, [wcfcb]
push af push af
ld a, $ff ld a, $ff
ld [wcfcb], a ld [wcfcb], a
ld a, $e4 ld a, %11100100
ld [rOBP1], a ; $ff49 ld [rOBP1], a
call LoadSmokeTileFourTimes call LoadSmokeTileFourTimes
callba asm_f055 callba WriteCutTreeBoulderDustAnimationOAMBlock
ld c, $8 ld c, 8 ; number of steps in animation
.asm_79f73 .loop
push bc push bc
call Func_79f92 call GetMoveBoulderDustFunctionPointer
ld bc, .asm_79f7e ld bc, .returnAddress
push bc push bc
ld c, $4 ld c, $4
jp [hl] jp [hl]
.asm_79f7e .returnAddress
ld a, [rOBP1] ; $ff49 ld a, [rOBP1]
xor $64 xor %01100100
ld [rOBP1], a ; $ff49 ld [rOBP1], a
call Delay3 call Delay3
pop bc pop bc
dec c dec c
jr nz, .asm_79f73 jr nz, .loop
pop af pop af
ld [wcfcb], a ld [wcfcb], a
jp LoadPlayerSpriteGraphics jp LoadPlayerSpriteGraphics
Func_79f92: ; 79f92 (1e:5f92) GetMoveBoulderDustFunctionPointer: ; 79f92 (1e:5f92)
ld a, [wSpriteStateData1 + 9] ld a, [wSpriteStateData1 + 9] ; player's sprite facing direction
ld hl, PointerTable_79fb0 ; $5fb0 ld hl, MoveBoulderDustFunctionPointerTable
ld c, a ld c, a
ld b, $0 ld b, $0
add hl, bc add hl, bc
@ -51,18 +51,22 @@ Func_79f92: ; 79f92 (1e:5f92)
pop hl pop hl
ret ret
PointerTable_79fb0: ; 79fb0 (1e:5fb0) MoveBoulderDustFunctionPointerTable: ; 79fb0 (1e:5fb0)
; facing down
db $FF,$00 db $FF,$00
dw Func_79350 dw AdjustOAMBlockYPos
; facing up
db $01,$00 db $01,$00
dw Func_79350 dw AdjustOAMBlockYPos
; facing left
db $01,$01 db $01,$01
dw Func_79337 dw AdjustOAMBlockXPos
; facing right
db $FF,$01 db $FF,$01
dw Func_79337 dw AdjustOAMBlockXPos
LoadSmokeTileFourTimes: ; 79fc0 (1e:5fc0) LoadSmokeTileFourTimes: ; 79fc0 (1e:5fc0)
ld hl, vChars1 + $7c0 ld hl, vChars1 + $7c0

78
engine/overworld/trainers.asm
View file

@ -1,9 +1,9 @@
Func_567f9: ; 567f9 (15:67f9) _GetSpritePosition1: ; 567f9 (15:67f9)
ld hl, wSpriteStateData1 ld hl, wSpriteStateData1
ld de, $4 ld de, $4
ld a, [wcf13] ld a, [wcf13]
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_SPRITEINDEX], a
call Func_56903 call GetSpriteDataPointer
ld a, [hli] ld a, [hli]
ld [$ffeb], a ld [$ffeb], a
inc hl inc hl
@ -17,50 +17,50 @@ Func_567f9: ; 567f9 (15:67f9)
ld [$ffee], a ld [$ffee], a
ret ret
Func_56819: ; 56819 (15:6819) _GetSpritePosition2: ; 56819 (15:6819)
ld hl, wSpriteStateData1
ld de, $0004
ld a, [wcf13]
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call Func_56903
ld a, [hli]
ld [wd130], a
inc hl
ld a, [hl]
ld [wd131], a
ld de, $00fe
add hl, de
ld a, [hli]
ld [wd132], a
ld a, [hl]
ld [wd133], a
ret
Func_5683d: ; 5683d (15:683d)
ld hl, wSpriteStateData1 ld hl, wSpriteStateData1
ld de, $4 ld de, $4
ld a, [wcf13] ld a, [wcf13]
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_SPRITEINDEX], a
call Func_56903 call GetSpriteDataPointer
ld a, [$ffeb] ld a, [hli] ; c1x4 (screen Y pos)
ld [wd130], a
inc hl
ld a, [hl] ; c1x6 (screen X pos)
ld [wd131], a
ld de, $104 - $6
add hl, de
ld a, [hli] ; c2x4 (map Y pos)
ld [wd132], a
ld a, [hl] ; c2x5 (map X pos)
ld [wd133], a
ret
_SetSpritePosition1: ; 5683d (15:683d)
ld hl, wSpriteStateData1
ld de, $4
ld a, [wcf13]
ld [H_SPRITEINDEX], a
call GetSpriteDataPointer
ld a, [$ffeb] ; c1x4 (screen Y pos)
ld [hli], a ld [hli], a
inc hl inc hl
ld a, [$ffec] ld a, [$ffec] ; c1x6 (screen X pos)
ld [hl], a ld [hl], a
ld de, $fe ld de, $104 - $6
add hl, de add hl, de
ld a, [$ffed] ld a, [$ffed] ; c2x4 (map Y pos)
ld [hli], a ld [hli], a
ld a, [$ffee] ld a, [$ffee] ; c2x5 (map X pos)
ld [hl], a ld [hl], a
ret ret
Func_5685d: ; 5685d (15:685d) _SetSpritePosition2: ; 5685d (15:685d)
ld hl, wSpriteStateData1 ld hl, wSpriteStateData1
ld de, $0004 ld de, $0004
ld a, [wcf13] ld a, [wcf13]
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_SPRITEINDEX], a
call Func_56903 call GetSpriteDataPointer
ld a, [wd130] ld a, [wd130]
ld [hli], a ld [hli], a
inc hl inc hl
@ -139,18 +139,20 @@ TrainerWalkUpToPlayer: ; 56881 (15:6881)
ld b, $0 ld b, $0
ld a, $80 ; a = direction to go to ld a, $80 ; a = direction to go to
.writeWalkScript .writeWalkScript
ld hl, wcc97 ld hl, wNPCMovementDirections2
ld de, wcc97 ld de, wNPCMovementDirections2
call FillMemory ; write the necessary steps to reach player call FillMemory ; write the necessary steps to reach player
ld [hl], $ff ; write end of list sentinel ld [hl], $ff ; write end of list sentinel
ld a, [wcf13] ld a, [wcf13]
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_SPRITEINDEX], a
jp MoveSprite_ jp MoveSprite_
Func_56903: ; 56903 (15:6903) ; input: de = offset within sprite entry
; output: de = pointer to sprite data
GetSpriteDataPointer: ; 56903 (15:6903)
push de push de
add hl, de add hl, de
ld a, [H_DOWNARROWBLINKCNT2] ; $ff8c ld a, [H_SPRITEINDEX]
swap a swap a
ld d, $0 ld d, $0
ld e, a ld e, a

6
engine/predefs.asm
View file

@ -84,10 +84,10 @@ PredefPointers:: ; 4fe79 (13:7e79)
dbw $03,Func_3eb5 ; for these two, the bank number is actually 0 dbw $03,Func_3eb5 ; for these two, the bank number is actually 0
dbw $03,GiveItem dbw $03,GiveItem
add_predef Func_480eb add_predef Func_480eb
add_predef Func_f8ba add_predef FindPathToPlayer
add_predef Func_480ff add_predef Func_480ff
add_predef Func_f929 add_predef CalcPositionOfPlayerRelativeToNPC
add_predef Func_f9a0 add_predef ConvertNPCMovementDirectionsToJoypadMasks
add_predef Func_48125 add_predef Func_48125
add_predef UpdateHPBar add_predef UpdateHPBar
add_predef HPBarLength add_predef HPBarLength

2
engine/slot_machine.asm
View file

@ -42,7 +42,7 @@ PromptUserToPlaySlots: ; 3730e (d:730e)
ld a, $1 ld a, $1
ld [wcfcb], a ld [wcfcb], a
call GoPAL_SET_CF1C call GoPAL_SET_CF1C
call Func_3e08 call ReloadMapSpriteTilePatterns
call ReloadTilesetTilePatterns call ReloadTilesetTilePatterns
.skip .skip
call LoadScreenTilesFromBuffer2 call LoadScreenTilesFromBuffer2

18
engine/turn_sprite.asm
View file

@ -1,25 +1,25 @@
Func_13074: ; 13074 (4:7074) UpdateSpriteFacingOffsetAndDelayMovement: ; 13074 (4:7074)
ld h, $c2 ld h, $c2
ld a, [H_CURRENTSPRITEOFFSET] ld a, [H_CURRENTSPRITEOFFSET]
add $8 add $8
ld l, a ld l, a
ld a, $7f ld a, $7f ; maximum movement delay
ld [hl], a ld [hl], a ; c2x8 (movement delay)
dec h dec h
ld a, [H_CURRENTSPRITEOFFSET] ld a, [H_CURRENTSPRITEOFFSET]
add $9 add $9
ld l, a ld l, a
ld a, [hld] ld a, [hld] ; c1x9 (facing direction)
ld b, a ld b, a
xor a xor a
ld [hld], a ld [hld], a
ld [hl], a ld [hl], a ; c1x8 (walk animation frame)
ld a, [H_CURRENTSPRITEOFFSET] ld a, [H_CURRENTSPRITEOFFSET]
add $2 add $2
ld l, a ld l, a
ld a, [hl] ld a, [hl] ; c1x2 (facing and animation table offset)
or b or b ; or in the facing direction
ld [hld], a ld [hld], a
ld a, $2 ld a, $2 ; delayed movement status
ld [hl], a ld [hl], a ; c1x1 (movement status)
ret ret

126
home.asm
View file

@ -256,6 +256,7 @@ LoadMonData:: ; 1372 (0:1372)
jp Bankswitch jp Bankswitch
; writes c to wd0dc+b ; writes c to wd0dc+b
; XXX unused?
Func_137a:: ; 137a (0:137a) Func_137a:: ; 137a (0:137a)
ld hl, wd0dc ld hl, wd0dc
ld e, b ld e, b
@ -538,6 +539,7 @@ PrintLevelCommon:: ; 1523 (0:1523)
ld b,$41 ; no leading zeroes, left-aligned, one byte ld b,$41 ; no leading zeroes, left-aligned, one byte
jp PrintNumber jp PrintNumber
; XXX unused?
Func_152e:: ; 152e (0:152e) Func_152e:: ; 152e (0:152e)
ld hl,wd0dc ld hl,wd0dc
ld c,a ld c,a
@ -1627,7 +1629,7 @@ DisplayTextID:: ; 2920 (0:2920)
push hl push hl
push de push de
push bc push bc
callba Func_13074 ; update the graphics of the sprite the player is talking to (to face the right direction) callba UpdateSpriteFacingOffsetAndDelayMovement ; update the graphics of the sprite the player is talking to (to face the right direction)
pop bc pop bc
pop de pop de
ld hl,W_MAPSPRITEDATA ; NPC text entries ld hl,W_MAPSPRITEDATA ; NPC text entries
@ -2686,7 +2688,7 @@ DisplayTextBoxID:: ; 30e8 (0:30e8)
ret ret
Func_30fd:: ; 30fd (0:30fd) Func_30fd:: ; 30fd (0:30fd)
ld a, [wcc57] ld a, [wNPCMovementScriptPointerTableNum]
and a and a
ret nz ret nz
ld a, [wd736] ld a, [wd736]
@ -2696,46 +2698,46 @@ Func_30fd:: ; 30fd (0:30fd)
and $80 and $80
ret ret
Func_310e:: ; 310e (0:310e) RunNPCMovementScript:: ; 310e (0:310e)
ld hl, wd736 ld hl, wd736
bit 0, [hl] bit 0, [hl]
res 0, [hl] res 0, [hl]
jr nz, .asm_3146 jr nz, .playerStepOutFromDoor
ld a, [wcc57] ld a, [wNPCMovementScriptPointerTableNum]
and a and a
ret z ret z
dec a dec a
add a add a
ld d, $0 ld d, 0
ld e, a ld e, a
ld hl, .pointerTable_3140 ld hl, .NPCMovementScriptPointerTables
add hl, de add hl, de
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
ld a, [H_LOADEDROMBANK] ld a, [H_LOADEDROMBANK]
push af push af
ld a, [wcc58] ld a, [wNPCMovementScriptBank]
ld [H_LOADEDROMBANK], a ld [H_LOADEDROMBANK], a
ld [$2000], a ld [$2000], a
ld a, [wcf10] ld a, [wNPCMovementScriptFunctionNum]
call CallFunctionInTable call CallFunctionInTable
pop af pop af
ld [H_LOADEDROMBANK], a ld [H_LOADEDROMBANK], a
ld [$2000], a ld [$2000], a
ret ret
.pointerTable_3140 .NPCMovementScriptPointerTables
dw PointerTable_1a442 dw ProfOakMovementScriptPointerTable
dw PointerTable_1a510 dw PewterMuseumGuyMovementScriptPointerTable
dw PointerTable_1a57d dw PewterGymGuyMovementScriptPointerTable
.asm_3146 .playerStepOutFromDoor
ld b, BANK(Func_1a3e0) ld b, BANK(PlayerStepOutFromDoor)
ld hl, Func_1a3e0 ld hl, PlayerStepOutFromDoor
jp Bankswitch jp Bankswitch
Func_314e:: ; 314e (0:314e) EndNPCMovementScript:: ; 314e (0:314e)
ld b, BANK(Func_1a41d) ld b, BANK(_EndNPCMovementScript)
ld hl, Func_1a41d ld hl, _EndNPCMovementScript
jp Bankswitch jp Bankswitch
Func_3156:: ; 3156 (0:3156) Func_3156:: ; 3156 (0:3156)
@ -2978,22 +2980,22 @@ InitBattleEnemyParameters:: ; 32d7 (0:32d7)
ld [W_CURENEMYLVL], a ; W_CURENEMYLVL ld [W_CURENEMYLVL], a ; W_CURENEMYLVL
ret ret
Func_32ef:: ; 32ef (0:32ef) GetSpritePosition1:: ; 32ef (0:32ef)
ld hl, Func_567f9 ld hl, _GetSpritePosition1
jr asm_3301 jr asm_3301
Func_32f4:: ; 32f4 (0:32f4) GetSpritePosition2:: ; 32f4 (0:32f4)
ld hl, Func_56819 ld hl, _GetSpritePosition2
jr asm_3301 ; 0x32f7 $8 jr asm_3301 ; 0x32f7 $8
Func_32f9:: ; 32f9 (0:32f9) SetSpritePosition1:: ; 32f9 (0:32f9)
ld hl, Func_5683d ld hl, _SetSpritePosition1
jr asm_3301 jr asm_3301
Func_32fe:: ; 32fe (0:32fe) SetSpritePosition2:: ; 32fe (0:32fe)
ld hl, Func_5685d ld hl, _SetSpritePosition2
asm_3301:: ; 3301 (0:3301) asm_3301:: ; 3301 (0:3301)
ld b, BANK(Func_567f9) ; BANK(Func_56819), BANK(Func_5683d), BANK(Func_5685d) ld b, BANK(_GetSpritePosition1) ; BANK(_GetSpritePosition2), BANK(_SetSpritePosition1), BANK(_SetSpritePosition2)
jp Bankswitch ; indirect jump to one of the four functions jp Bankswitch ; indirect jump to one of the four functions
CheckForEngagingTrainers:: ; 3306 (0:3306) CheckForEngagingTrainers:: ; 3306 (0:3306)
@ -3187,10 +3189,10 @@ Func_3442:: ; 3442 (0:3442)
ld a, [hli] ld a, [hli]
ld d, [hl] ld d, [hl]
ld e, a ld e, a
ld hl, wccd3 ld hl, wSimulatedJoypadStatesEnd
call DecodeRLEList call DecodeRLEList
dec a dec a
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
ret ret
.asm_345b .asm_345b
inc hl inc hl
@ -3225,10 +3227,10 @@ FuncTX_PokemonCenterPC:: ; 347f (0:347f)
ld hl, ActivatePC ld hl, ActivatePC
jr bankswitchAndContinue jr bankswitchAndContinue
Func_3486:: ; 3486 (0:3486) StartSimulatingJoypadStates:: ; 3486 (0:3486)
xor a xor a
ld [wcd3b], a ld [wOverrideSimulatedJoypadStatesMask], a
ld [wSpriteStateData2 + $06], a ld [wSpriteStateData2 + $06], a ; player's sprite movement byte 1
ld hl, wd730 ld hl, wd730
set 7, [hl] set 7, [hl]
ret ret
@ -3249,21 +3251,21 @@ DisplayPokedex:: ; 349b (0:349b)
ld hl, Func_7c18 ld hl, Func_7c18
jp Bankswitch jp Bankswitch
Func_34a6:: ; 34a6 (0:34a6) SetSpriteFacingDirectionAndDelay:: ; 34a6 (0:34a6)
call Func_34ae call SetSpriteFacingDirection
ld c, $6 ld c, $6
jp DelayFrames jp DelayFrames
Func_34ae:: ; 34ae (0:34ae) SetSpriteFacingDirection:: ; 34ae (0:34ae)
ld a, $9 ld a, $9
ld [H_DOWNARROWBLINKCNT1], a ; $ff8b ld [H_SPRITEDATAOFFSET], a
call Func_34fc call GetPointerWithinSpriteStateData1
ld a, [$ff8d] ld a, [$ff8d]
ld [hl], a ld [hl], a
ret ret
Func_34b9:: ; 34b9 (0:34b9) SetSpriteImageIndexAfterSettingFacingDirection:: ; 34b9 (0:34b9)
ld de, $fff9 ld de, -7
add hl, de add hl, de
ld [hl], a ld [hl], a
ret ret
@ -3332,16 +3334,17 @@ CheckBoulderCoords:: ; 34e4 (0:34e4)
pop hl pop hl
jp CheckCoords jp CheckCoords
Func_34fc:: ; 34fc (0:34fc) GetPointerWithinSpriteStateData1:: ; 34fc (0:34fc)
ld h, $c1 ld h, $c1
jr asm_3502 jr _GetPointerWithinSpriteStateData
Func_3500:: ; 3500 (0:3500) GetPointerWithinSpriteStateData2:: ; 3500 (0:3500)
ld h, $c2 ld h, $c2
asm_3502:: ; 3502 (0:3502)
ld a, [H_DOWNARROWBLINKCNT1] ; $ff8b _GetPointerWithinSpriteStateData:
ld a, [H_SPRITEDATAOFFSET]
ld b, a ld b, a
ld a, [H_DOWNARROWBLINKCNT2] ; $ff8c ld a, [H_SPRITEINDEX]
swap a swap a
add b add b
ld l, a ld l, a
@ -3402,7 +3405,7 @@ SetSpriteMovementBytesToFF:: ; 3541 (0:3541)
; returns the sprite movement byte 1 pointer for sprite [$FF8C] in hl ; returns the sprite movement byte 1 pointer for sprite [$FF8C] in hl
GetSpriteMovementByte1Pointer:: ; 354e (0:354e) GetSpriteMovementByte1Pointer:: ; 354e (0:354e)
ld h,$C2 ld h,$C2
ld a,[$FF8C] ; the sprite to move ld a,[H_SPRITEINDEX] ; the sprite to move
swap a swap a
add a,6 add a,6
ld l,a ld l,a
@ -3591,30 +3594,31 @@ MoveSprite_:: ; 363d (0:363d)
set 0,[hl] set 0,[hl]
pop hl pop hl
xor a xor a
ld [wcd3b],a ld [wOverrideSimulatedJoypadStatesMask],a
ld [wccd3],a ld [wSimulatedJoypadStatesEnd],a
dec a dec a
ld [wJoyIgnore],a ld [wJoyIgnore],a
ld [wcd3a],a ld [wWastedByteCD3A],a
ret ret
Func_366b:: ; 366b (0:366b) ; divides [$ffe5] by [$ffe6] and stores the quotient in [$ffe7]
DivideBytes:: ; 366b (0:366b)
push hl push hl
ld hl, $ffe7 ld hl, $ffe7
xor a xor a
ld [hld], a ld [hld], a
ld a, [hld] ld a, [hld]
and a and a
jr z, .asm_367e jr z, .done
ld a, [hli] ld a, [hli]
.asm_3676 .loop
sub [hl] sub [hl]
jr c, .asm_367e jr c, .done
inc hl inc hl
inc [hl] inc [hl]
dec hl dec hl
jr .asm_3676 jr .loop
.asm_367e .done
pop hl pop hl
ret ret
@ -5008,11 +5012,11 @@ IsInRestOfArray::
ret ret
Func_3dbe:: ; 3dbe (0:3dbe) RestoreScreenTilesAndReloadTilePatterns:: ; 3dbe (0:3dbe)
call ClearSprites call ClearSprites
ld a, $1 ld a, $1
ld [wcfcb], a ld [wcfcb], a
call Func_3e08 call ReloadMapSpriteTilePatterns
call LoadScreenTilesFromBuffer2 call LoadScreenTilesFromBuffer2
call LoadTextBoxTilePatterns call LoadTextBoxTilePatterns
call GoPAL_SET_CF1C call GoPAL_SET_CF1C
@ -5068,14 +5072,16 @@ GetHealthBarColor::
ld [hl], d ld [hl], d
ret ret
Func_3e08:: ; 3e08 (0:3e08) ; Copy the current map's sprites' tile patterns to VRAM again after they have
; been overwritten by other tile patterns.
ReloadMapSpriteTilePatterns:: ; 3e08 (0:3e08)
ld hl, wcfc4 ld hl, wcfc4
ld a, [hl] ld a, [hl]
push af push af
res 0, [hl] res 0, [hl]
push hl push hl
xor a xor a
ld [W_SPRITESETID], a ; W_SPRITESETID ld [W_SPRITESETID], a
call DisableLCD call DisableLCD
callba InitMapSprites callba InitMapSprites
call EnableLCD call EnableLCD

2
home/audio.asm
View file

@ -1,4 +1,4 @@
Func_2307:: ; 2307 (0:2307) PlayDefaultMusic:: ; 2307 (0:2307)
call WaitForSoundToFinish call WaitForSoundToFinish
xor a xor a
ld c, a ld c, a

41
home/overworld.asm
View file

@ -362,7 +362,7 @@ NewBattle:: ; 0683 (0:0683)
; function to make bikes twice as fast as walking ; function to make bikes twice as fast as walking
BikeSpeedup:: ; 06a0 (0:06a0) BikeSpeedup:: ; 06a0 (0:06a0)
ld a,[wcc57] ld a,[wNPCMovementScriptPointerTableNum]
and a and a
ret nz ret nz
ld a,[W_CURMAP] ld a,[W_CURMAP]
@ -520,7 +520,7 @@ WarpFound2:: ; 073c (0:073c)
ld [wd35d],a ld [wd35d],a
.done .done
ld hl,wd736 ld hl,wd736
set 0,[hl] set 0,[hl] ; have the player's sprite step out from the door (if there is one)
call Func_12da call Func_12da
jp EnterMap jp EnterMap
@ -1203,9 +1203,9 @@ CollisionCheckOnLand:: ; 0bd1 (0:0bd1)
bit 6,a ; is the player jumping? bit 6,a ; is the player jumping?
jr nz,.noCollision jr nz,.noCollision
; if not jumping a ledge ; if not jumping a ledge
ld a,[wcd38] ld a,[wSimulatedJoypadStatesIndex]
and a and a
jr nz,.noCollision jr nz,.noCollision ; no collisions when the player's movements are being controlled by the game
ld a,[wd52a] ; the direction that the player is trying to go in ld a,[wd52a] ; the direction that the player is trying to go in
ld d,a ld d,a
ld a,[wSpriteStateData1 + 12] ; the player sprite's collision data (bit field) (set in the sprite movement code) ld a,[wSpriteStateData1 + 12] ; the player sprite's collision data (bit field) (set in the sprite movement code)
@ -1835,28 +1835,27 @@ JoypadOverworld:: ; 0f4d (0:0f4d)
ld a,[W_CURMAP] ld a,[W_CURMAP]
cp a,ROUTE_17 ; Cycling Road cp a,ROUTE_17 ; Cycling Road
jr nz,.notForcedDownwards jr nz,.notForcedDownwards
ld a,[hJoyHeld] ; current joypad state ld a,[hJoyHeld]
and a,%11110011 ; bit mask for all directions and A/B and a,D_DOWN | D_UP | D_LEFT | D_RIGHT | B_BUTTON | A_BUTTON
jr nz,.notForcedDownwards jr nz,.notForcedDownwards
ld a,%10000000 ; down pressed ld a,D_DOWN
ld [hJoyHeld],a ; on the cycling road, if there isn't a trainer and the player isn't pressing buttons, simulate a down press ld [hJoyHeld],a ; on the cycling road, if there isn't a trainer and the player isn't pressing buttons, simulate a down press
.notForcedDownwards .notForcedDownwards
ld a,[wd730] ld a,[wd730]
bit 7,a bit 7,a
ret z ret z
; if simulating button presses ; if simulating button presses
ld a,[hJoyHeld] ; current joypad state ld a,[hJoyHeld]
ld b,a ld b,a
ld a,[wcd3b] ; bit mask for button presses that override simulated ones ld a,[wOverrideSimulatedJoypadStatesMask] ; bit mask for button presses that override simulated ones
and b and b
ret nz ; return if the simulated button presses are overridden ret nz ; return if the simulated button presses are overridden
ld hl,wcd38 ; index of current simulated button press ld hl,wSimulatedJoypadStatesIndex
dec [hl] dec [hl]
ld a,[hl] ld a,[hl]
cp a,$ff cp a,$ff
jr z,.doneSimulating ; if the end of the simulated button presses has been reached jr z,.doneSimulating ; if the end of the simulated button presses has been reached
ld hl,wccd3 ; base address of simulated button presses ld hl,wSimulatedJoypadStatesEnd
; add offset to base address
add l add l
ld l,a ld l,a
jr nc,.noCarry jr nc,.noCarry
@ -1872,9 +1871,9 @@ JoypadOverworld:: ; 0f4d (0:0f4d)
; if done simulating button presses ; if done simulating button presses
.doneSimulating .doneSimulating
xor a xor a
ld [wcd3a],a ld [wWastedByteCD3A],a
ld [wcd38],a ld [wSimulatedJoypadStatesIndex],a
ld [wccd3],a ld [wSimulatedJoypadStatesEnd],a
ld [wJoyIgnore],a ld [wJoyIgnore],a
ld [hJoyHeld],a ld [hJoyHeld],a
ld hl,wd736 ld hl,wd736
@ -1944,7 +1943,7 @@ CollisionCheckOnWater:: ; 0fb7 (0:0fb7)
xor a xor a
ld [wd700],a ld [wd700],a
call LoadPlayerSpriteGraphics call LoadPlayerSpriteGraphics
call Func_2307 call PlayDefaultMusic
jr .noCollision jr .noCollision
.checkIfVermilionDockTileset .checkIfVermilionDockTileset
ld a, [W_CURMAPTILESET] ; tileset ld a, [W_CURMAPTILESET] ; tileset
@ -1957,16 +1956,16 @@ RunMapScript:: ; 101b (0:101b)
push hl push hl
push de push de
push bc push bc
callba Func_f225 ; check if the player is pushing a boulder callba TryPushingBoulder
ld a,[wFlags_0xcd60] ld a,[wFlags_0xcd60]
bit 1,a ; is the player pushing a boulder? bit 1,a ; play boulder dust animation
jr z,.afterBoulderEffect jr z,.afterBoulderEffect
callba Func_f2b5 ; displays dust effect when pushing a boulder callba DoBoulderDustAnimation
.afterBoulderEffect .afterBoulderEffect
pop bc pop bc
pop de pop de
pop hl pop hl
call Func_310e call RunNPCMovementScript
ld a,[W_CURMAP] ; current map number ld a,[W_CURMAP] ; current map number
call SwitchToMapRomBank ; change to the ROM bank the map's data is in call SwitchToMapRomBank ; change to the ROM bank the map's data is in
ld hl,W_MAPSCRIPTPTR ld hl,W_MAPSCRIPTPTR
@ -2400,4 +2399,4 @@ ForceBikeOrSurf:: ; 12ed (0:12ed)
ld b, BANK(RedSprite) ld b, BANK(RedSprite)
ld hl, LoadPlayerSpriteGraphics ld hl, LoadPlayerSpriteGraphics
call Bankswitch call Bankswitch
jp Func_2307 ; update map/player state? jp PlayDefaultMusic ; update map/player state?

3
hram.asm
View file

@ -14,6 +14,9 @@ hSoftReset EQU $FF8A
H_DOWNARROWBLINKCNT1 EQU $FF8B H_DOWNARROWBLINKCNT1 EQU $FF8B
H_DOWNARROWBLINKCNT2 EQU $FF8C H_DOWNARROWBLINKCNT2 EQU $FF8C
H_SPRITEDATAOFFSET EQU $FF8B
H_SPRITEINDEX EQU $FF8C
; Note: the following multiplication and division addresses are used for multiple purposes ; Note: the following multiplication and division addresses are used for multiple purposes
; and so they overlap with each other ; and so they overlap with each other

214
main.asm
View file

@ -26,9 +26,9 @@ Func_40b0::
ld [wd700], a ld [wd700], a
ld [W_ISINBATTLE], a ld [W_ISINBATTLE], a
ld [wd35d], a ld [wd35d], a
ld [wcf10], a ld [wNPCMovementScriptFunctionNum], a
ld [hJoyHeld], a ld [hJoyHeld], a
ld [wcc57], a ld [wNPCMovementScriptPointerTableNum], a
ld [wFlags_0xcd60], a ld [wFlags_0xcd60], a
ld [$ff9f], a ld [$ff9f], a
@ -213,7 +213,7 @@ UpdateNonPlayerSprite:
dec a dec a
swap a swap a
ld [$ff93], a ; $10 * sprite# ld [$ff93], a ; $10 * sprite#
ld a, [wcf17] ; some sprite offset? ld a, [wNPCMovementScriptSpriteOffset] ; some sprite offset?
ld b, a ld b, a
ld a, [H_CURRENTSPRITEOFFSET] ld a, [H_CURRENTSPRITEOFFSET]
cp b cp b
@ -2247,7 +2247,7 @@ Func_c49d: ; c49d (3:449d)
push hl push hl
push de push de
push bc push bc
callba HandleDoors callba IsPlayerStandingOnDoor
jr c, .asm_c4c8 jr c, .asm_c4c8
ld a, [W_CURMAPTILESET] ; W_CURMAPTILESET ld a, [W_CURMAPTILESET] ; W_CURMAPTILESET
add a add a
@ -3388,70 +3388,71 @@ MissableObjectFlagAction:
ld c, a ld c, a
ret ret
Func_f225: ; f225 (3:7225) TryPushingBoulder: ; f225 (3:7225)
ld a, [wd728] ld a, [wd728]
bit 0, a bit 0, a ; using Strength?
ret z ret z
ld a, [wFlags_0xcd60] ld a, [wFlags_0xcd60]
bit 1, a bit 1, a ; has boulder dust animation from previous push played yet?
ret nz ret nz
xor a xor a
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [$ff8c], a
call IsSpriteInFrontOfPlayer call IsSpriteInFrontOfPlayer
ld a, [H_DOWNARROWBLINKCNT2] ; $ff8c ld a, [$ff8c]
ld [wd718], a ld [wd718], a
and a and a
jp z, Func_f2dd jp z, ResetBoulderPushFlags
ld hl, wSpriteStateData1 + 1 ld hl, wSpriteStateData1 + 1
ld d, $0 ld d, $0
ld a, [H_DOWNARROWBLINKCNT2] ; $ff8c ld a, [$ff8c]
swap a swap a
ld e, a ld e, a
add hl, de add hl, de
res 7, [hl] res 7, [hl]
call GetSpriteMovementByte2Pointer call GetSpriteMovementByte2Pointer
ld a, [hl] ld a, [hl]
cp $10 cp BOULDER_MOVEMENT_BYTE_2
jp nz, Func_f2dd jp nz, ResetBoulderPushFlags
ld hl, wFlags_0xcd60 ld hl, wFlags_0xcd60
bit 6, [hl] bit 6, [hl]
set 6, [hl] set 6, [hl] ; indicate that the player has tried pushing
ret z ret z ; the player must try pushing twice before the boulder will move
ld a, [hJoyHeld] ld a, [hJoyHeld]
and $f0 and $f0
ret z ret z
predef Func_c60b predef Func_c60b
ld a, [wd71c] ld a, [wd71c]
and a and a
jp nz, Func_f2dd jp nz, ResetBoulderPushFlags
ld a, [hJoyHeld] ld a, [hJoyHeld]
ld b, a ld b, a
ld a, [wSpriteStateData1 + 9] ld a, [wSpriteStateData1 + 9] ; player's sprite facing direction
cp $4 cp SPRITE_FACING_UP
jr z, .asm_f289 jr z, .pushBoulderUp
cp $8 cp SPRITE_FACING_LEFT
jr z, .asm_f291 jr z, .pushBoulderLeft
cp $c cp SPRITE_FACING_RIGHT
jr z, .asm_f299 jr z, .pushBoulderRight
.pushBoulderDown
bit 7, b bit 7, b
ret z ret z
ld de, MovementData_f2af ld de, PushBoulderDownMovementData
jr .asm_f29f jr .done
.asm_f289 .pushBoulderUp
bit 6, b bit 6, b
ret z ret z
ld de, MovementData_f2ad ld de, PushBoulderUpMovementData
jr .asm_f29f jr .done
.asm_f291 .pushBoulderLeft
bit 5, b bit 5, b
ret z ret z
ld de, MovementData_f2b1 ld de, PushBoulderLeftMovementData
jr .asm_f29f jr .done
.asm_f299 .pushBoulderRight
bit 4, b bit 4, b
ret z ret z
ld de, MovementData_f2b3 ld de, PushBoulderRightMovementData
.asm_f29f .done
call MoveSprite call MoveSprite
ld a, (SFX_02_53 - SFX_Headers_02) / 3 ld a, (SFX_02_53 - SFX_Headers_02) / 3
call PlaySound call PlaySound
@ -3459,26 +3460,26 @@ Func_f225: ; f225 (3:7225)
set 1, [hl] set 1, [hl]
ret ret
MovementData_f2ad: ; f2ad (3:72ad) PushBoulderUpMovementData: ; f2ad (3:72ad)
db $40,$FF db NPC_MOVEMENT_UP,$FF
MovementData_f2af: ; f2af (3:72af) PushBoulderDownMovementData: ; f2af (3:72af)
db $00,$FF db NPC_MOVEMENT_DOWN,$FF
MovementData_f2b1: ; f2b1 (3:72b1) PushBoulderLeftMovementData: ; f2b1 (3:72b1)
db $80,$FF db NPC_MOVEMENT_LEFT,$FF
MovementData_f2b3: ; f2b3 (3:72b3) PushBoulderRightMovementData: ; f2b3 (3:72b3)
db $C0,$FF db NPC_MOVEMENT_RIGHT,$FF
Func_f2b5: ; f2b5 (3:72b5) DoBoulderDustAnimation: ; f2b5 (3:72b5)
ld a, [wd730] ld a, [wd730]
bit 0, a bit 0, a
ret nz ret nz
callab Func_79f54 callab AnimateBoulderDust
call DiscardButtonPresses call DiscardButtonPresses
ld [wJoyIgnore], a ld [wJoyIgnore], a
call Func_f2dd call ResetBoulderPushFlags
set 7, [hl] set 7, [hl]
ld a, [wd718] ld a, [wd718]
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
@ -3487,7 +3488,7 @@ Func_f2b5: ; f2b5 (3:72b5)
ld a, (SFX_02_56 - SFX_Headers_02) / 3 ld a, (SFX_02_56 - SFX_Headers_02) / 3
jp PlaySound jp PlaySound
Func_f2dd: ; f2dd (3:72dd) ResetBoulderPushFlags: ; f2dd (3:72dd)
ld hl, wFlags_0xcd60 ld hl, wFlags_0xcd60
res 1, [hl] res 1, [hl]
res 6, [hl] res 6, [hl]
@ -4460,20 +4461,19 @@ IsItemInBag_: ; f8a5 (3:78a5)
ld b, $0 ld b, $0
ret ret
Func_f8ba: ; f8ba (3:78ba) FindPathToPlayer: ; f8ba (3:78ba)
xor a xor a
ld hl, $ff97 ld hl, $ff97
ld [hli], a ld [hli], a
ld [hli], a ld [hli], a
ld [hli], a ld [hli], a
ld [hl], a ld [hl], a
ld hl, wcc97 ld hl, wNPCMovementDirections2
ld de, $0 ld de, $0
.loop
Func_f8c8: ; f8c8 (3:78c8) ld a, [$ff99]
ld a, [H_REMAINDER] ; $ff99 (aliases: H_DIVISOR, H_MULTIPLIER, H_POWEROFTEN)
ld b, a ld b, a
ld a, [H_DIVIDEND] ; $ff95 (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT) ld a, [$ff95] ; Y distance in steps
call CalcDifference call CalcDifference
ld d, a ld d, a
and a and a
@ -4484,7 +4484,7 @@ Func_f8c8: ; f8c8 (3:78c8)
.asm_f8da .asm_f8da
ld a, [$ff9a] ld a, [$ff9a]
ld b, a ld b, a
ld a, [H_NUMTOPRINT] ; $ff96 (aliases: H_MULTIPLICAND) ld a, [$ff96] ; X distance in steps
call CalcDifference call CalcDifference
ld e, a ld e, a
and a and a
@ -4495,17 +4495,17 @@ Func_f8c8: ; f8c8 (3:78c8)
.asm_f8ec .asm_f8ec
ld a, [$ff98] ld a, [$ff98]
cp $3 cp $3
jr z, .asm_f926 jr z, .done
ld a, e ld a, e
cp d cp d
jr c, .asm_f90a jr c, .asm_f90a
ld a, [$ff9d] ld a, [$ff9d]
bit 1, a bit 1, a
jr nz, .asm_f900 jr nz, .asm_f900
ld d, $c0 ld d, NPC_MOVEMENT_RIGHT
jr .asm_f902 jr .asm_f902
.asm_f900 .asm_f900
ld d, $80 ld d, NPC_MOVEMENT_LEFT
.asm_f902 .asm_f902
ld a, [$ff9a] ld a, [$ff9a]
add $1 add $1
@ -4515,91 +4515,93 @@ Func_f8c8: ; f8c8 (3:78c8)
ld a, [$ff9d] ld a, [$ff9d]
bit 0, a bit 0, a
jr nz, .asm_f914 jr nz, .asm_f914
ld d, $0 ld d, NPC_MOVEMENT_DOWN
jr .asm_f916 jr .asm_f916
.asm_f914 .asm_f914
ld d, $40 ld d, NPC_MOVEMENT_UP
.asm_f916 .asm_f916
ld a, [H_REMAINDER] ; $ff99 (aliases: H_DIVISOR, H_MULTIPLIER, H_POWEROFTEN) ld a, [$ff99]
add $1 add $1
ld [H_REMAINDER], a ; $ff99 (aliases: H_DIVISOR, H_MULTIPLIER, H_POWEROFTEN) ld [$ff99], a
.asm_f91c .asm_f91c
ld a, d ld a, d
ld [hli], a ld [hli], a
ld a, [$ff97] ld a, [$ff97]
inc a inc a
ld [$ff97], a ld [$ff97], a
jp Func_f8c8 jp .loop
.asm_f926 .done
ld [hl], $ff ld [hl], $ff
ret ret
Func_f929: ; f929 (3:7929) CalcPositionOfPlayerRelativeToNPC: ; f929 (3:7929)
xor a xor a
ld [$ff9d], a ld [$ff9d], a
ld a, [wSpriteStateData1 + 4] ld a, [wSpriteStateData1 + 4] ; player's sprite screen Y position in pixels
ld d, a ld d, a
ld a, [wSpriteStateData1 + 6] ld a, [wSpriteStateData1 + 6] ; player's sprite screen X position in pixels
ld e, a ld e, a
ld hl, wSpriteStateData1 ld hl, wSpriteStateData1
ld a, [H_DIVIDEND] ; $ff95 (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT) ld a, [$ff95] ; sprite offset
add l add l
add $4 add $4
ld l, a ld l, a
jr nc, .asm_f940 jr nc, .noCarry
inc h inc h
.asm_f940 .noCarry
ld a, d ld a, d
ld b, a ld b, a
ld a, [hli] ld a, [hli] ; NPC sprite screen Y position in pixels
call CalcDifference call CalcDifference
jr nc, .asm_f953 jr nc, .NPCSouthOfOrAlignedWithPlayer
.NPCNorthOfPlayer
push hl push hl
ld hl, $ff9d ld hl, $ff9d
bit 0, [hl] bit 0, [hl]
set 0, [hl] set 0, [hl]
pop hl pop hl
jr .asm_f95c jr .divideYDistance
.asm_f953 .NPCSouthOfOrAlignedWithPlayer
push hl push hl
ld hl, $ff9d ld hl, $ff9d
bit 0, [hl] bit 0, [hl]
res 0, [hl] res 0, [hl]
pop hl pop hl
.asm_f95c .divideYDistance
push hl push hl
ld hl, $ffe5 ld hl, $ffe5
ld [hli], a ld [hli], a
ld a, $10 ld a, 16
ld [hli], a ld [hli], a
call Func_366b call DivideBytes ; divide Y absolute distance by 16
ld a, [hl] ld a, [hl] ; quotient
ld [H_DIVIDEND], a ; $ff95 (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT) ld [$ff95], a
pop hl pop hl
inc hl inc hl
ld b, e ld b, e
ld a, [hl] ld a, [hl] ; NPC sprite screen X position in pixels
call CalcDifference call CalcDifference
jr nc, .asm_f97e jr nc, .NPCEastOfOrAlignedWithPlayer
.NPCWestOfPlayer
push hl push hl
ld hl, $ff9d ld hl, $ff9d
bit 1, [hl] bit 1, [hl]
set 1, [hl] set 1, [hl]
pop hl pop hl
jr .asm_f987 jr .divideXDistance
.asm_f97e .NPCEastOfOrAlignedWithPlayer
push hl push hl
ld hl, $ff9d ld hl, $ff9d
bit 1, [hl] bit 1, [hl]
res 1, [hl] res 1, [hl]
pop hl pop hl
.asm_f987 .divideXDistance
ld [$ffe5], a ld [$ffe5], a
ld a, $10 ld a, 16
ld [$ffe6], a ld [$ffe6], a
call Func_366b call DivideBytes ; divide X absolute distance by 16
ld a, [$ffe7] ld a, [$ffe7] ; quotient
ld [H_NUMTOPRINT], a ; $ff96 (aliases: H_MULTIPLICAND) ld [$ff96], a
ld a, [$ff9b] ld a, [$ff9b]
and a and a
ret z ret z
@ -4609,47 +4611,51 @@ Func_f929: ; f929 (3:7929)
ld [$ff9d], a ld [$ff9d], a
ret ret
Func_f9a0: ; f9a0 (3:79a0) ConvertNPCMovementDirectionsToJoypadMasks: ; f9a0 (3:79a0)
ld a, [$ff95] ld a, [$ff95]
ld [wcd37], a ld [wNPCMovementDirections2Index], a
dec a dec a
ld de, wccd3 ld de, wSimulatedJoypadStatesEnd
ld hl, wcc97 ld hl, wNPCMovementDirections2
add l add l
ld l, a ld l, a
jr nc, .asm_f9b1 jr nc, .loop
inc h inc h
.asm_f9b1 .loop
ld a, [hld] ld a, [hld]
call Func_f9bf call ConvertNPCMovementDirectionToJoypadMask
ld [de], a ld [de], a
inc de inc de
ld a, [$ff95] ld a, [$ff95]
dec a dec a
ld [$ff95], a ld [$ff95], a
jr nz, .asm_f9b1 jr nz, .loop
ret ret
Func_f9bf: ; f9bf (3:79bf) ConvertNPCMovementDirectionToJoypadMask: ; f9bf (3:79bf)
push hl push hl
ld b, a ld b, a
ld hl, DataTable_f9d2 ld hl, NPCMovementDirectionsToJoypadMasksTable
.asm_f9c4 .loop
ld a, [hli] ld a, [hli]
cp $ff cp $ff
jr z, .asm_f9d0 jr z, .done
cp b cp b
jr z, .asm_f9cf jr z, .loadJoypadMask
inc hl inc hl
jr .asm_f9c4 jr .loop
.asm_f9cf .loadJoypadMask
ld a, [hl] ld a, [hl]
.asm_f9d0 .done
pop hl pop hl
ret ret
DataTable_f9d2: ; f9d2 (3:79d2) NPCMovementDirectionsToJoypadMasksTable: ; f9d2 (3:79d2)
db $40, $40, $00, $80, $80, $20, $c0, $10, $ff db NPC_MOVEMENT_UP, D_UP
db NPC_MOVEMENT_DOWN, D_DOWN
db NPC_MOVEMENT_LEFT, D_LEFT
db NPC_MOVEMENT_RIGHT, D_RIGHT
db $ff
Func_f9db: ; f9db (3:79db) Func_f9db: ; f9db (3:79db)
ret ret

22
scripts/agatha.asm
View file

@ -41,8 +41,8 @@ AgathaScriptPointers: ; 76469 (1d:6469)
AgathaScript4: ; 76473 (1d:6473) AgathaScript4: ; 76473 (1d:6473)
ret ret
asm_76474: ; 76474 (1d:6474) asm_76474: ; 76474 (1d:6474)
ld hl, wccd3 ld hl, wSimulatedJoypadStatesEnd
ld a, $40 ld a, D_UP
ld [hli], a ld [hli], a
ld [hli], a ld [hli], a
ld [hli], a ld [hli], a
@ -50,8 +50,8 @@ asm_76474: ; 76474 (1d:6474)
ld [hli], a ld [hli], a
ld [hl], a ld [hl], a
ld a, $6 ld a, $6
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
call Func_3486 call StartSimulatingJoypadStates
ld a, $3 ld a, $3
ld [W_AGATHACURSCRIPT], a ld [W_AGATHACURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
@ -64,8 +64,8 @@ AgathaScript0: ; 76490 (1d:6490)
xor a xor a
ld [hJoyPressed], a ld [hJoyPressed], a
ld [hJoyHeld], a ld [hJoyHeld], a
ld [wccd3], a ld [wSimulatedJoypadStatesEnd], a
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
ld a, [wWhichTrade] ; wWhichTrade ld a, [wWhichTrade] ; wWhichTrade
cp $3 cp $3
jr c, .asm_764b4 jr c, .asm_764b4
@ -77,11 +77,11 @@ AgathaScript0: ; 76490 (1d:6490)
ld a, $2 ld a, $2
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID call DisplayTextID
ld a, $40 ld a, D_UP
ld [wccd3], a ld [wSimulatedJoypadStatesEnd], a
ld a, $1 ld a, $1
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
call Func_3486 call StartSimulatingJoypadStates
ld a, $3 ld a, $3
ld [W_AGATHACURSCRIPT], a ld [W_AGATHACURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
@ -95,7 +95,7 @@ CoordsData_764d1: ; 764d1 (1d:64d1)
db $FF db $FF
AgathaScript3: ; 764da (1d:64da) AgathaScript3: ; 764da (1d:64da)
ld a, [wcd38] ld a, [wSimulatedJoypadStatesIndex]
and a and a
ret nz ret nz
call Delay3 call Delay3

2
scripts/battlecenterm.asm
View file

@ -9,7 +9,7 @@ BattleCenterMScript: ; 4fd10 (13:7d10)
ld [$ff8d], a ld [$ff8d], a
ld a, $1 ld a, $1
ld [$ff8c], a ld [$ff8c], a
call Func_34ae call SetSpriteFacingDirection
ld hl, wd72d ld hl, wd72d
bit 0, [hl] bit 0, [hl]
set 0, [hl] set 0, [hl]

2
scripts/billshouse.asm
View file

@ -66,7 +66,7 @@ BillsHouseScript3: ; 1e7c5 (7:67c5)
ld [$ffed], a ld [$ffed], a
ld a, $5 ld a, $5
ld [$ffee], a ld [$ffee], a
call Func_32f9 call SetSpritePosition1
ld a, $62 ld a, $62
ld [wcc4d], a ld [wcc4d], a
predef ShowObject predef ShowObject

22
scripts/bruno.asm
View file

@ -41,8 +41,8 @@ BrunoScriptPointers: ; 76312 (1d:6312)
BrunoScript4: ; 7631c (1d:631c) BrunoScript4: ; 7631c (1d:631c)
ret ret
asm_7631d: ; 7631d (1d:631d) asm_7631d: ; 7631d (1d:631d)
ld hl, wccd3 ld hl, wSimulatedJoypadStatesEnd
ld a, $40 ld a, D_UP
ld [hli], a ld [hli], a
ld [hli], a ld [hli], a
ld [hli], a ld [hli], a
@ -50,8 +50,8 @@ asm_7631d: ; 7631d (1d:631d)
ld [hli], a ld [hli], a
ld [hl], a ld [hl], a
ld a, $6 ld a, $6
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
call Func_3486 call StartSimulatingJoypadStates
ld a, $3 ld a, $3
ld [W_BRUNOCURSCRIPT], a ld [W_BRUNOCURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
@ -64,8 +64,8 @@ BrunoScript0: ; 76339 (1d:6339)
xor a xor a
ld [hJoyPressed], a ld [hJoyPressed], a
ld [hJoyHeld], a ld [hJoyHeld], a
ld [wccd3], a ld [wSimulatedJoypadStatesEnd], a
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
ld a, [wWhichTrade] ; wWhichTrade ld a, [wWhichTrade] ; wWhichTrade
cp $3 cp $3
jr c, .asm_7635d jr c, .asm_7635d
@ -77,11 +77,11 @@ BrunoScript0: ; 76339 (1d:6339)
ld a, $2 ld a, $2
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID call DisplayTextID
ld a, $40 ld a, D_UP
ld [wccd3], a ld [wSimulatedJoypadStatesEnd], a
ld a, $1 ld a, $1
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
call Func_3486 call StartSimulatingJoypadStates
ld a, $3 ld a, $3
ld [W_BRUNOCURSCRIPT], a ld [W_BRUNOCURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
@ -95,7 +95,7 @@ CoordsData_7637a: ; 7637a (1d:637a)
db $FF db $FF
BrunoScript3: ; 76383 (1d:6383) BrunoScript3: ; 76383 (1d:6383)
ld a, [wcd38] ld a, [wSimulatedJoypadStatesIndex]
and a and a
ret nz ret nz
call Delay3 call Delay3

6
scripts/ceruleancity.asm
View file

@ -85,7 +85,7 @@ CeruleanCityScript0: ; 194c8 (6:54c8)
ld [$ff8c], a ld [$ff8c], a
ld a, $5 ld a, $5
ld [$ff8b], a ld [$ff8b], a
call Func_3500 call GetPointerWithinSpriteStateData2
ld [hl], $19 ld [hl], $19
.asm_19535 .asm_19535
ld a, $5 ld a, $5
@ -117,7 +117,7 @@ CeruleanCityScript_1955d: ; 1955d (6:555d)
ld [$ff8c],a ld [$ff8c],a
xor a xor a
ld [$ff8d],a ld [$ff8d],a
jp Func_34a6 ; face object jp SetSpriteFacingDirectionAndDelay ; face object
CeruleanCityScript1: ; 19567 (6:5567) CeruleanCityScript1: ; 19567 (6:5567)
ld a, [wd730] ld a, [wd730]
@ -209,7 +209,7 @@ CeruleanCityScript3: ; 19610 (6:5610)
predef HideObject predef HideObject
xor a xor a
ld [wJoyIgnore], a ld [wJoyIgnore], a
call Func_2307 call PlayDefaultMusic
ld a, $0 ld a, $0
ld [W_CERULEANCITYCURSCRIPT], a ld [W_CERULEANCITYCURSCRIPT], a
ret ret

10
scripts/cinnabarisland.asm
View file

@ -32,10 +32,10 @@ CinnabarIslandScript0: ; 1ca38 (7:4a38)
xor a xor a
ld [hJoyHeld], a ld [hJoyHeld], a
ld a, $1 ld a, $1
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
ld a, $80 ld a, D_DOWN
ld [wccd3], a ld [wSimulatedJoypadStatesEnd], a
call Func_3486 call StartSimulatingJoypadStates
xor a xor a
ld [wSpriteStateData1 + 9], a ld [wSpriteStateData1 + 9], a
ld [wJoyIgnore], a ld [wJoyIgnore], a
@ -44,7 +44,7 @@ CinnabarIslandScript0: ; 1ca38 (7:4a38)
ret ret
CinnabarIslandScript1: ; 1ca73 (7:4a73) CinnabarIslandScript1: ; 1ca73 (7:4a73)
ld a, [wcd38] ld a, [wSimulatedJoypadStatesIndex]
and a and a
ret nz ret nz
call Delay3 call Delay3

2
scripts/daycarem.asm
View file

@ -30,7 +30,7 @@ DayCareMText1: ; 56254 (15:6254)
call DisplayPartyMenu call DisplayPartyMenu
push af push af
call GBPalWhiteOutWithDelay3 call GBPalWhiteOutWithDelay3
call Func_3dbe call RestoreScreenTilesAndReloadTilePatterns
call LoadGBPal call LoadGBPal
pop af pop af
ld hl, DayCareMText_56437 ld hl, DayCareMText_56437

4
scripts/fightingdojo.asm
View file

@ -48,7 +48,7 @@ FightingDojoScript1: ; 5cd83 (17:4d83)
ld [$ff8c], a ld [$ff8c], a
ld a, $8 ld a, $8
ld [$ff8d], a ld [$ff8d], a
call Func_34a6 call SetSpriteFacingDirectionAndDelay
ld a, $1 ld a, $1
ld [$ff8c], a ld [$ff8c], a
call DisplayTextID call DisplayTextID
@ -67,7 +67,7 @@ FightingDojoScript3: ; 5cdc6 (17:4dc6)
ld [$ff8c], a ld [$ff8c], a
ld a, $8 ld a, $8
ld [$ff8d], a ld [$ff8d], a
call Func_34a6 call SetSpriteFacingDirectionAndDelay
.asm_5cde4 .asm_5cde4
ld a, $f0 ld a, $f0

24
scripts/gary.asm
View file

@ -29,12 +29,12 @@ GaryScript0: ; 75f47 (1d:5f47)
GaryScript1: ; 75f48 (1d:5f48) GaryScript1: ; 75f48 (1d:5f48)
ld a, $ff ld a, $ff
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld hl, wccd3 ld hl, wSimulatedJoypadStatesEnd
ld de, RLEMovement75f63 ld de, RLEMovement75f63
call DecodeRLEList call DecodeRLEList
dec a dec a
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
call Func_3486 call StartSimulatingJoypadStates
ld a, $2 ld a, $2
ld [W_GARYCURSCRIPT], a ld [W_GARYCURSCRIPT], a
ret ret
@ -46,7 +46,7 @@ RLEMovement75f63: ; 75f63 (1d:5f63)
db $ff db $ff
GaryScript2: ; 75f6a (1d:5f6a) GaryScript2: ; 75f6a (1d:5f6a)
ld a, [wcd38] ld a, [wSimulatedJoypadStatesIndex]
and a and a
ret nz ret nz
call Delay3 call Delay3
@ -140,12 +140,12 @@ GaryScript5: ; 7601a (1d:601a)
ld [$ff8c], a ld [$ff8c], a
ld a, $8 ld a, $8
ld [$ff8d], a ld [$ff8d], a
call Func_34a6 call SetSpriteFacingDirectionAndDelay
ld a, $2 ld a, $2
ld [$ff8c], a ld [$ff8c], a
xor a xor a
ld [$ff8d], a ld [$ff8d], a
call Func_34a6 ; face object call SetSpriteFacingDirectionAndDelay ; face object
ld a, $3 ld a, $3
ld [$ff8c], a ld [$ff8c], a
call GaryScript_760c8 call GaryScript_760c8
@ -158,7 +158,7 @@ GaryScript6: ; 76047 (1d:6047)
ld [$ff8c], a ld [$ff8c], a
ld a, $c ld a, $c
ld [$ff8d], a ld [$ff8d], a
call Func_34a6 ; face object call SetSpriteFacingDirectionAndDelay ; face object
ld a, $4 ld a, $4
ld [$ff8c], a ld [$ff8c], a
call GaryScript_760c8 call GaryScript_760c8
@ -171,7 +171,7 @@ GaryScript7: ; 7605f (1d:605f)
ld [$ff8c], a ld [$ff8c], a
xor a xor a
ld [$ff8d], a ld [$ff8d], a
call Func_34a6 ; face object call SetSpriteFacingDirectionAndDelay ; face object
ld a, $5 ld a, $5
ld [$ff8c], a ld [$ff8c], a
call GaryScript_760c8 call GaryScript_760c8
@ -200,12 +200,12 @@ GaryScript8: ; 76083 (1d:6083)
GaryScript9: ; 76099 (1d:6099) GaryScript9: ; 76099 (1d:6099)
ld a, $ff ld a, $ff
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld hl, wccd3 ld hl, wSimulatedJoypadStatesEnd
ld de, RLEMovement760b4 ld de, RLEMovement760b4
call DecodeRLEList call DecodeRLEList
dec a dec a
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
call Func_3486 call StartSimulatingJoypadStates
ld a, $a ld a, $a
ld [W_GARYCURSCRIPT], a ld [W_GARYCURSCRIPT], a
ret ret
@ -216,7 +216,7 @@ RLEMovement760b4 ; 760b4 (1d:60b4)
db $ff db $ff
GaryScript10: ; 760b9 (1d:60b9) GaryScript10: ; 760b9 (1d:60b9)
ld a, [wcd38] ld a, [wSimulatedJoypadStatesIndex]
and a and a
ret nz ret nz
xor a xor a

10
scripts/halloffameroom.asm
View file

@ -62,12 +62,12 @@ HallofFameRoomScript2: ; 5a4bb (16:64bb)
HallofFameRoomScript0: ; 5a50d (16:650d) HallofFameRoomScript0: ; 5a50d (16:650d)
ld a, $ff ld a, $ff
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld hl, wccd3 ld hl, wSimulatedJoypadStatesEnd
ld de, RLEMovement5a528 ld de, RLEMovement5a528
call DecodeRLEList call DecodeRLEList
dec a dec a
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
call Func_3486 call StartSimulatingJoypadStates
ld a, $1 ld a, $1
ld [W_HALLOFFAMEROOMCURSCRIPT], a ld [W_HALLOFFAMEROOMCURSCRIPT], a
ret ret
@ -77,7 +77,7 @@ RLEMovement5a528: ; 5a528 (16:6528)
db $ff db $ff
HallofFameRoomScript1: ; 5a52b (16:652b) HallofFameRoomScript1: ; 5a52b (16:652b)
ld a, [wcd38] ld a, [wSimulatedJoypadStatesIndex]
and a and a
ret nz ret nz
ld a, $1 ld a, $1
@ -87,7 +87,7 @@ HallofFameRoomScript1: ; 5a52b (16:652b)
call SetSpriteMovementBytesToFF call SetSpriteMovementBytesToFF
ld a, $8 ld a, $8
ld [$ff8d], a ld [$ff8d], a
call Func_34a6 call SetSpriteFacingDirectionAndDelay
call Delay3 call Delay3
xor a xor a
ld [wJoyIgnore], a ld [wJoyIgnore], a

8
scripts/lance.asm
View file

@ -99,12 +99,12 @@ LanceScript2: ; 5a349 (16:6349)
LanceScript_5a35b: ; 5a35b (16:635b) LanceScript_5a35b: ; 5a35b (16:635b)
ld a, $ff ld a, $ff
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld hl, wccd3 ld hl, wSimulatedJoypadStatesEnd
ld de, RLEList_5a379 ld de, RLEList_5a379
call DecodeRLEList call DecodeRLEList
dec a dec a
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
call Func_3486 call StartSimulatingJoypadStates
ld a, $3 ld a, $3
ld [W_LANCECURSCRIPT], a ld [W_LANCECURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
@ -118,7 +118,7 @@ RLEList_5a379: ; 5a379 (16:6379)
db $FF db $FF
LanceScript3: ; 5a382 (16:6382) LanceScript3: ; 5a382 (16:6382)
ld a, [wcd38] ld a, [wSimulatedJoypadStatesIndex]
and a and a
ret nz ret nz
call Delay3 call Delay3

22
scripts/lorelei.asm
View file

@ -42,8 +42,8 @@ LoreleiScriptPointers: ; 761bb (1d:61bb)
LoreleiScript4: ; 761c5 (1d:61c5) LoreleiScript4: ; 761c5 (1d:61c5)
ret ret
asm_761c6: ; 761c6 (1d:61c6) asm_761c6: ; 761c6 (1d:61c6)
ld hl, wccd3 ld hl, wSimulatedJoypadStatesEnd
ld a, $40 ld a, D_UP
ld [hli], a ld [hli], a
ld [hli], a ld [hli], a
ld [hli], a ld [hli], a
@ -51,8 +51,8 @@ asm_761c6: ; 761c6 (1d:61c6)
ld [hli], a ld [hli], a
ld [hl], a ld [hl], a
ld a, $6 ld a, $6
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
call Func_3486 call StartSimulatingJoypadStates
ld a, $3 ld a, $3
ld [W_LORELEICURSCRIPT], a ld [W_LORELEICURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
@ -64,8 +64,8 @@ LoreleiScript0: ; 761e2 (1d:61e2)
xor a xor a
ld [hJoyPressed], a ld [hJoyPressed], a
ld [hJoyHeld], a ld [hJoyHeld], a
ld [wccd3], a ld [wSimulatedJoypadStatesEnd], a
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
ld a, [wWhichTrade] ; wWhichTrade ld a, [wWhichTrade] ; wWhichTrade
cp $3 cp $3
jr c, .asm_76206 jr c, .asm_76206
@ -77,11 +77,11 @@ LoreleiScript0: ; 761e2 (1d:61e2)
ld a, $2 ld a, $2
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID call DisplayTextID
ld a, $40 ld a, D_UP
ld [wccd3], a ld [wSimulatedJoypadStatesEnd], a
ld a, $1 ld a, $1
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
call Func_3486 call StartSimulatingJoypadStates
ld a, $3 ld a, $3
ld [W_LORELEICURSCRIPT], a ld [W_LORELEICURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
@ -95,7 +95,7 @@ CoordsData_76223: ; 76223 (1d:6223)
db $FF db $FF
LoreleiScript3: ; 7622c (1d:622c) LoreleiScript3: ; 7622c (1d:622c)
ld a, [wcd38] ld a, [wSimulatedJoypadStatesIndex]
and a and a
ret nz ret nz
call Delay3 call Delay3

6
scripts/museum1f.asm
View file

@ -115,10 +115,10 @@ Museum1FText1: ; 5c135 (17:4135)
ld hl, Museum1FText_5c21a ; $421a ld hl, Museum1FText_5c21a ; $421a
call PrintText call PrintText
ld a, $1 ld a, $1
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
ld a, $80 ld a, $80
ld [wccd3], a ld [wSimulatedJoypadStatesEnd], a
call Func_3486 call StartSimulatingJoypadStates
call UpdateSprites call UpdateSprites
jr asm_d1145 jr asm_d1145
.asm_0b094 .asm_0b094

2
scripts/namerater.asm
View file

@ -55,7 +55,7 @@ NameRaterText1: ; 1da56 (7:5a56)
call DisplayPartyMenu call DisplayPartyMenu
push af push af
call GBPalWhiteOutWithDelay3 call GBPalWhiteOutWithDelay3
call Func_3dbe call RestoreScreenTilesAndReloadTilePatterns
call LoadGBPal call LoadGBPal
pop af pop af
jr c, .asm_1daae ; 0x1da80 $2c jr c, .asm_1daae ; 0x1da80 $2c

130
scripts/oakslab.asm
View file

@ -35,7 +35,7 @@ OaksLabScript0: ; 1cb4e (7:4b4e)
ld a, [wd74b] ld a, [wd74b]
bit 7, a bit 7, a
ret z ret z
ld a, [wcf10] ld a, [wNPCMovementScriptFunctionNum]
and a and a
ret nz ret nz
ld a, $31 ld a, $31
@ -50,7 +50,7 @@ OaksLabScript0: ; 1cb4e (7:4b4e)
OaksLabScript1: ; 1cb6e (7:4b6e) OaksLabScript1: ; 1cb6e (7:4b6e)
ld a, $8 ld a, $8
ld [$ff8c], a ld [H_SPRITEINDEX], a
ld de, OakEntryMovement ld de, OakEntryMovement
call MoveSprite call MoveSprite
@ -78,22 +78,22 @@ OaksLabScript2: ; 1cb82 (7:4b82)
OaksLabScript3: ; 1cba2 (7:4ba2) OaksLabScript3: ; 1cba2 (7:4ba2)
call Delay3 call Delay3
ld hl, wccd3 ld hl, wSimulatedJoypadStatesEnd
ld de, PlayerEntryMovementRLE ld de, PlayerEntryMovementRLE
call DecodeRLEList call DecodeRLEList
dec a dec a
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
call Func_3486 call StartSimulatingJoypadStates
ld a, $1 ld a, $1
ld [$ff8c], a ld [H_SPRITEINDEX], a
xor a xor a
ld [$ff8d], a ld [$ff8d], a
call Func_34a6 ; face object call SetSpriteFacingDirectionAndDelay
ld a, $5 ld a, $5
ld [$ff8c], a ld [H_SPRITEINDEX], a
xor a xor a
ld [$ff8d], a ld [$ff8d], a
call Func_34a6 ; face object call SetSpriteFacingDirectionAndDelay
ld a, $4 ld a, $4
ld [W_OAKSLABCURSCRIPT], a ld [W_OAKSLABCURSCRIPT], a
@ -103,7 +103,7 @@ PlayerEntryMovementRLE: ; 1cbcf (7:4bcf)
db $40, $8, $ff db $40, $8, $ff
OaksLabScript4: ; 1cbd2 (7:4bd2) OaksLabScript4: ; 1cbd2 (7:4bd2)
ld a, [wcd38] ld a, [wSimulatedJoypadStatesIndex]
and a and a
ret nz ret nz
ld hl, wd747 ld hl, wd747
@ -111,14 +111,14 @@ OaksLabScript4: ; 1cbd2 (7:4bd2)
ld hl, wd74b ld hl, wd74b
set 0, [hl] set 0, [hl]
ld a, $1 ld a, $1
ld [$ff8c], a ld [H_SPRITEINDEX], a
ld a, $4 ld a, $4
ld [$ff8d], a ld [$ff8d], a
call Func_34a6 ; face object call SetSpriteFacingDirectionAndDelay
call UpdateSprites call UpdateSprites
ld hl, W_FLAGS_D733 ld hl, W_FLAGS_D733
res 1, [hl] res 1, [hl]
call Func_2307 call PlayDefaultMusic
ld a, $5 ld a, $5
ld [W_OAKSLABCURSCRIPT], a ld [W_OAKSLABCURSCRIPT], a
@ -156,24 +156,24 @@ OaksLabScript6: ; 1cc36 (7:4c36)
cp $6 cp $6
ret nz ret nz
ld a, $5 ld a, $5
ld [$ff8c], a ld [H_SPRITEINDEX], a
xor a xor a
ld [$ff8d], a ld [$ff8d], a
call Func_34a6 ; face object call SetSpriteFacingDirectionAndDelay
ld a, $1 ld a, $1
ld [$ff8c], a ld [H_SPRITEINDEX], a
xor a xor a
ld [$ff8d], a ld [$ff8d], a
call Func_34a6 ; face object call SetSpriteFacingDirectionAndDelay
call UpdateSprites call UpdateSprites
ld a, $c ld a, $c
ld [$ff8c], a ld [$ff8c], a
call DisplayTextID call DisplayTextID
ld a, $1 ld a, $1
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
ld a, $40 ld a, $40
ld [wccd3], a ld [wSimulatedJoypadStatesEnd], a
call Func_3486 call StartSimulatingJoypadStates
ld a, $8 ld a, $8
ld [wd528], a ld [wd528], a
@ -182,7 +182,7 @@ OaksLabScript6: ; 1cc36 (7:4c36)
ret ret
OaksLabScript7: ; 1cc72 (7:4c72) OaksLabScript7: ; 1cc72 (7:4c72)
ld a, [wcd38] ld a, [wSimulatedJoypadStatesIndex]
and a and a
ret nz ret nz
call Delay3 call Delay3
@ -231,10 +231,10 @@ OaksLabScript8: ; 1cc80 (7:4c80)
jr nz, .asm_1ccf3 ; 0x1cccd $24 jr nz, .asm_1ccf3 ; 0x1cccd $24
push hl push hl
ld a, $1 ld a, $1
ld [$ff8c], a ld [H_SPRITEINDEX], a
ld a, $4 ld a, $4
ld [$ff8b], a ld [$ff8b], a
call Func_34fc call GetPointerWithinSpriteStateData1
push hl push hl
ld [hl], $4c ld [hl], $4c
inc hl inc hl
@ -256,7 +256,7 @@ OaksLabScript8: ; 1cc80 (7:4c80)
.asm_1ccf3 .asm_1ccf3
ld a, $1 ld a, $1
ld [$ff8c], a ld [H_SPRITEINDEX], a
call MoveSprite call MoveSprite
ld a, $9 ld a, $9
@ -270,10 +270,10 @@ OaksLabScript9: ; 1cd00 (7:4d00)
ld a, $fc ld a, $fc
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld a, $1 ld a, $1
ld [$ff8c], a ld [H_SPRITEINDEX], a
ld a, $4 ld a, $4
ld [$ff8d], a ld [$ff8d], a
call Func_34a6 ; face object call SetSpriteFacingDirectionAndDelay
ld a, $d ld a, $d
ld [$ff8c], a ld [$ff8c], a
call DisplayTextID call DisplayTextID
@ -299,10 +299,10 @@ OaksLabScript9: ; 1cd00 (7:4d00)
ld [wd11e], a ld [wd11e], a
call GetMonName call GetMonName
ld a, $1 ld a, $1
ld [$ff8c], a ld [H_SPRITEINDEX], a
ld a, $4 ld a, $4
ld [$ff8d], a ld [$ff8d], a
call Func_34a6 ; face object call SetSpriteFacingDirectionAndDelay
ld a, $e ld a, $e
ld [$ff8c], a ld [$ff8c], a
call DisplayTextID call DisplayTextID
@ -320,10 +320,10 @@ OaksLabScript10: ; 1cd6d (7:4d6d)
cp $6 cp $6
ret nz ret nz
ld a, $1 ld a, $1
ld [$ff8c], a ld [H_SPRITEINDEX], a
xor a xor a
ld [$ff8d], a ld [$ff8d], a
call Func_34a6 ; face object call SetSpriteFacingDirectionAndDelay
ld a, $8 ld a, $8
ld [wd528], a ld [wd528], a
ld c, BANK(Music_MeetRival) ld c, BANK(Music_MeetRival)
@ -337,14 +337,14 @@ OaksLabScript10: ; 1cd6d (7:4d6d)
ld a, $1 ld a, $1
swap a swap a
ld [$ff95], a ld [$ff95], a
predef Func_f929 predef CalcPositionOfPlayerRelativeToNPC
ld a, [$ff95] ld a, [$ff95]
dec a dec a
ld [$ff95], a ld [$ff95], a
predef Func_f8ba predef FindPathToPlayer
ld de, wcc97 ld de, wNPCMovementDirections2
ld a, $1 ld a, $1
ld [$ff8c], a ld [H_SPRITEINDEX], a
call MoveSprite call MoveSprite
ld a, $b ld a, $b
@ -375,7 +375,7 @@ OaksLabScript11: ; 1cdb9 (7:4db9)
ld [W_TRAINERNO], a ld [W_TRAINERNO], a
ld a, $1 ld a, $1
ld [wcf13], a ld [wcf13], a
call Func_32ef call GetSpritePosition1
ld hl, OaksLabText_1d3be ld hl, OaksLabText_1d3be
ld de, OaksLabText_1d3c3 ld de, OaksLabText_1d3c3
call PreBattleSaveRegisters call PreBattleSaveRegisters
@ -398,12 +398,12 @@ OaksLabScript12: ; 1ce03 (7:4e03)
call UpdateSprites call UpdateSprites
ld a, $1 ld a, $1
ld [wcf13], a ld [wcf13], a
call Func_32f9 call SetSpritePosition1
ld a, $1 ld a, $1
ld [$ff8c], a ld [H_SPRITEINDEX], a
xor a xor a
ld [$ff8d], a ld [$ff8d], a
call Func_34a6 ; face object call SetSpriteFacingDirectionAndDelay
predef HealParty predef HealParty
ld hl, wd74b ld hl, wd74b
set 3, [hl] set 3, [hl]
@ -420,7 +420,7 @@ OaksLabScript13: ; 1ce32 (7:4e32)
call DisplayTextID call DisplayTextID
callba Music_RivalAlternateStart callba Music_RivalAlternateStart
ld a, $1 ld a, $1
ld [$ff8c], a ld [H_SPRITEINDEX], a
ld de, .RivalExitMovement ld de, .RivalExitMovement
call MoveSprite call MoveSprite
ld a, [W_XCOORD] ld a, [W_XCOORD]
@ -450,7 +450,7 @@ OaksLabScript14: ; 1ce6d (7:4e6d)
predef HideObject predef HideObject
xor a xor a
ld [wJoyIgnore], a ld [wJoyIgnore], a
call Func_2307 ; 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 ; 0x1ce8a $23
@ -491,17 +491,17 @@ OaksLabScript15: ; 1ceb0 (7:4eb0)
ld a, $2a ld a, $2a
ld [wcc4d], a ld [wcc4d], a
predef ShowObject predef ShowObject
ld a, [wcd37] ld a, [wNPCMovementDirections2Index]
ld [wd157], a ld [wd157], a
ld b, $0 ld b, $0
ld c, a ld c, a
ld hl, wcc97 ld hl, wNPCMovementDirections2
ld a, $40 ld a, $40
call FillMemory call FillMemory
ld [hl], $ff ld [hl], $ff
ld a, $1 ld a, $1
ld [$ff8c], a ld [H_SPRITEINDEX], a
ld de, wcc97 ld de, wNPCMovementDirections2
call MoveSprite call MoveSprite
ld a, $10 ld a, $10
@ -510,22 +510,22 @@ OaksLabScript15: ; 1ceb0 (7:4eb0)
OaksLabScript_1cefd ; 1cefd (7:4efd) OaksLabScript_1cefd ; 1cefd (7:4efd)
ld a, $1 ld a, $1
ld [$ff8c], a ld [H_SPRITEINDEX], a
ld a, $4 ld a, $4
ld [$ff8d], a ld [$ff8d], a
call Func_34a6 ; face object call SetSpriteFacingDirectionAndDelay
ld a, $8 ld a, $8
ld [$ff8c], a ld [H_SPRITEINDEX], a
xor a xor a
ld [$ff8d], a ld [$ff8d], a
jp Func_34a6 ; face object jp SetSpriteFacingDirectionAndDelay
OaksLabScript16: ; 1cf12 (7:4f12) OaksLabScript16: ; 1cf12 (7:4f12)
ld a, [wd730] ld a, [wd730]
bit 0, a bit 0, a
ret nz ret nz
call EnableAutoTextBoxDrawing call EnableAutoTextBoxDrawing
call Func_2307 call PlayDefaultMusic
ld a, $fc ld a, $fc
ld [wJoyIgnore], a ld [wJoyIgnore], a
call OaksLabScript_1cefd call OaksLabScript_1cefd
@ -558,10 +558,10 @@ OaksLabScript16: ; 1cf12 (7:4f12)
ld [$ff8c], a ld [$ff8c], a
call DisplayTextID call DisplayTextID
ld a, $1 ld a, $1
ld [$ff8c], a ld [H_SPRITEINDEX], a
ld a, $c ld a, $c
ld [$ff8d], a ld [$ff8d], a
call Func_34a6 ; face object call SetSpriteFacingDirectionAndDelay
call Delay3 call Delay3
ld a, $1b ld a, $1b
ld [$ff8c], a ld [$ff8c], a
@ -579,7 +579,7 @@ OaksLabScript16: ; 1cf12 (7:4f12)
ld a, [wd157] ld a, [wd157]
ld b, $0 ld b, $0
ld c, a ld c, a
ld hl, wcc97 ld hl, wNPCMovementDirections2
xor a xor a
call FillMemory call FillMemory
ld [hl], $ff ld [hl], $ff
@ -588,8 +588,8 @@ OaksLabScript16: ; 1cf12 (7:4f12)
call PlaySound call PlaySound
callba Music_RivalAlternateStart callba Music_RivalAlternateStart
ld a, $1 ld a, $1
ld [$ff8c], a ld [H_SPRITEINDEX], a
ld de, wcc97 ld de, wNPCMovementDirections2
call MoveSprite call MoveSprite
ld a, $11 ld a, $11
@ -600,7 +600,7 @@ OaksLabScript17: ; 1cfd4 (7:4fd4)
ld a, [wd730] ld a, [wd730]
bit 0, a bit 0, a
ret nz ret nz
call Func_2307 call PlayDefaultMusic
ld a, $2a ld a, $2a
ld [wcc4d], a ld [wcc4d], a
predef HideObject predef HideObject
@ -652,7 +652,7 @@ OaksLabScript_1d02b: ; 1d02b (7:502b)
cp $3 cp $3
jr nz, .asm_1d045 ; 0x1d038 $b jr nz, .asm_1d045 ; 0x1d038 $b
ld a, $4 ld a, $4
ld [wcd37], a ld [wNPCMovementDirections2Index], a
ld a, $30 ld a, $30
ld b, $b ld b, $b
jr .asm_1d068 ; 0x1d043 $23 jr .asm_1d068 ; 0x1d043 $23
@ -660,13 +660,13 @@ OaksLabScript_1d02b: ; 1d02b (7:502b)
cp $1 cp $1
jr nz, .asm_1d054 ; 0x1d047 $b jr nz, .asm_1d054 ; 0x1d047 $b
ld a, $2 ld a, $2
ld [wcd37], a ld [wNPCMovementDirections2Index], a
ld a, $30 ld a, $30
ld b, $9 ld b, $9
jr .asm_1d068 ; 0x1d052 $14 jr .asm_1d068 ; 0x1d052 $14
.asm_1d054 .asm_1d054
ld a, $3 ld a, $3
ld [wcd37], a ld [wNPCMovementDirections2Index], a
ld b, $a ld b, $a
ld a, [W_XCOORD] ld a, [W_XCOORD]
cp $4 cp $4
@ -681,7 +681,7 @@ OaksLabScript_1d02b: ; 1d02b (7:502b)
ld [$ffed], a ld [$ffed], a
ld a, $1 ld a, $1
ld [wcf13], a ld [wcf13], a
call Func_32f9 call SetSpritePosition1
ret ret
OaksLabScript_1d076: ; 1d076 (7:5076) OaksLabScript_1d076: ; 1d076 (7:5076)
@ -817,17 +817,17 @@ OaksLabText39: ; 1d152 (7:5152)
OaksLabScript_1d157: ; 1d157 (7:5157) OaksLabScript_1d157: ; 1d157 (7:5157)
ld a, $5 ld a, $5
ld [$ff8c], a ld [H_SPRITEINDEX], a
ld a, $9 ld a, $9
ld [$ff8b], a ld [$ff8b], a
call Func_34fc call GetPointerWithinSpriteStateData1
ld [hl], $0 ld [hl], $0
; manually fixed some disassembler issues around here ; manually fixed some disassembler issues around here
ld a, $1 ld a, $1
ld [$FF8c], a ld [H_SPRITEINDEX], a
ld a, $9 ld a, $9
ld [$ff8b], a ld [$ff8b], a
call Func_34fc call GetPointerWithinSpriteStateData1
ld [hl], $c ld [hl], $c
ld hl, wd730 ld hl, wd730
set 6, [hl] set 6, [hl]
@ -924,10 +924,10 @@ OaksLabReceivedMonText: ; 1d227 (7:5227)
OaksLabScript_1d22d: ; 1d22d (7:522d) OaksLabScript_1d22d: ; 1d22d (7:522d)
ld a, $5 ld a, $5
ld [$ff8c], a ld [H_SPRITEINDEX], a
ld a, $9 ld a, $9
ld [$ff8b], a ld [$ff8b], a
call Func_34fc call GetPointerWithinSpriteStateData1
ld [hl], $0 ld [hl], $0
ld hl, OaksLabLastMonText ld hl, OaksLabLastMonText
call PrintText call PrintText

16
scripts/pallettown.asm
View file

@ -68,7 +68,7 @@ PalletTownScript2: ; 18ed2 (6:4ed2)
ld [$FF8C],a ld [$FF8C],a
ld a,4 ld a,4
ld [$FF8D],a ld [$FF8D],a
call Func_34a6 call SetSpriteFacingDirectionAndDelay
call Delay3 call Delay3
ld a,1 ld a,1
ld [W_YCOORD],a ld [W_YCOORD],a
@ -77,11 +77,11 @@ PalletTownScript2: ; 18ed2 (6:4ed2)
ld a,1 ld a,1
swap a swap a
ld [$FF95],a ld [$FF95],a
predef Func_f929 predef CalcPositionOfPlayerRelativeToNPC
ld hl,$FF95 ld hl,$FF95
dec [hl] dec [hl]
predef Func_f8ba ; load Oak’s movement into wcc97 predef FindPathToPlayer ; load Oak’s movement into wNPCMovementDirections2
ld de,wcc97 ld de,wNPCMovementDirections2
ld a,1 ; oak ld a,1 ; oak
ld [$FF8C],a ld [$FF8C],a
call MoveSprite call MoveSprite
@ -111,11 +111,11 @@ PalletTownScript3: ; 18f12 (6:4f12)
ld a,1 ld a,1
ld [wcf13],a ld [wcf13],a
xor a xor a
ld [wcf10],a ld [wNPCMovementScriptFunctionNum],a
ld a,1 ld a,1
ld [wcc57],a ld [wNPCMovementScriptPointerTableNum],a
ld a,[H_LOADEDROMBANK] ld a,[H_LOADEDROMBANK]
ld [wcc58],a ld [wNPCMovementScriptBank],a
; trigger the next script ; trigger the next script
ld a,4 ld a,4
@ -123,7 +123,7 @@ PalletTownScript3: ; 18f12 (6:4f12)
ret ret
PalletTownScript4: ; 18f4b (6:4f4b) PalletTownScript4: ; 18f4b (6:4f4b)
ld a,[wcc57] ld a,[wNPCMovementScriptPointerTableNum]
and a and a
ret nz ret nz

50
scripts/pewtercity.asm
View file

@ -42,18 +42,18 @@ CoordsData_19277: ; 19277 (6:5277)
db $ff db $ff
PewterCityScript1: ; 19280 (6:5280) PewterCityScript1: ; 19280 (6:5280)
ld a, [wcc57] ld a, [wNPCMovementScriptPointerTableNum]
and a and a
ret nz ret nz
ld a, $3 ld a, $3
ld [$ff8c], a ld [H_SPRITEINDEX], a
ld a, $4 ld a, SPRITE_FACING_UP
ld [$ff8d], a ld [$ff8d], a
call Func_34a6 call SetSpriteFacingDirectionAndDelay
ld a, $34 ld a, ($3 << 4) | SPRITE_FACING_UP
ld [$ff8d], a ld [$ff8d], a
call Func_34b9 call SetSpriteImageIndexAfterSettingFacingDirection
call Func_2307 call PlayDefaultMusic
ld hl, wFlags_0xcd60 ld hl, wFlags_0xcd60
set 4, [hl] set 4, [hl]
ld a, $d ld a, $d
@ -69,7 +69,7 @@ PewterCityScript1: ; 19280 (6:5280)
ld [$ffee], a ld [$ffee], a
ld a, $3 ld a, $3
ld [wcf13], a ld [wcf13], a
call Func_32f9 call SetSpritePosition1
ld a, $3 ld a, $3
ld [$ff8c], a ld [$ff8c], a
ld de, MovementData_PewterMuseumGuyExit ; $52ce ld de, MovementData_PewterMuseumGuyExit ; $52ce
@ -95,7 +95,7 @@ PewterCityScript2: ; 192d3 (6:52d3)
PewterCityScript3: ; 192e9 (6:52e9) PewterCityScript3: ; 192e9 (6:52e9)
ld a, $3 ld a, $3
ld [wcf13], a ld [wcf13], a
call Func_32fe call SetSpritePosition2
ld a, $3 ld a, $3
ld [wcc4d], a ld [wcc4d], a
predef ShowObject predef ShowObject
@ -106,18 +106,18 @@ PewterCityScript3: ; 192e9 (6:52e9)
ret ret
PewterCityScript4: ; 19305 (6:5305) PewterCityScript4: ; 19305 (6:5305)
ld a, [wcc57] ld a, [wNPCMovementScriptPointerTableNum]
and a and a
ret nz ret nz
ld a, $5 ld a, $5
ld [$ff8c], a ld [$ff8c], a
ld a, $8 ld a, SPRITE_FACING_LEFT
ld [$ff8d], a ld [$ff8d], a
call Func_34a6 call SetSpriteFacingDirectionAndDelay
ld a, $18 ld a, ($1 << 4) | SPRITE_FACING_LEFT
ld [$ff8d], a ld [$ff8d], a
call Func_34b9 call SetSpriteImageIndexAfterSettingFacingDirection
call Func_2307 call PlayDefaultMusic
ld hl, wFlags_0xcd60 ld hl, wFlags_0xcd60
set 4, [hl] set 4, [hl]
ld a, $e ld a, $e
@ -133,7 +133,7 @@ PewterCityScript4: ; 19305 (6:5305)
ld [$ffee], a ld [$ffee], a
ld a, $5 ld a, $5
ld [wcf13], a ld [wcf13], a
call Func_32f9 call SetSpritePosition1
ld a, $5 ld a, $5
ld [$ff8c], a ld [$ff8c], a
ld de, MovementData_PewterGymGuyExit ld de, MovementData_PewterGymGuyExit
@ -159,7 +159,7 @@ PewterCityScript5: ; 19359 (6:5359)
PewterCityScript6: ; 1936f (6:536f) PewterCityScript6: ; 1936f (6:536f)
ld a, $5 ld a, $5
ld [wcf13], a ld [wcf13], a
call Func_32fe call SetSpritePosition2
ld a, $4 ld a, $4
ld [wcc4d], a ld [wcc4d], a
predef ShowObject predef ShowObject
@ -210,14 +210,14 @@ PewterCityText3: ; 193b1 (6:53b1)
xor a xor a
ldh [$b3], a ldh [$b3], a
ldh [$b4], a ldh [$b4], a
ld [wcf10], a ld [wNPCMovementScriptFunctionNum], a
ld a, $2 ld a, $2
ld [wcc57], a ld [wNPCMovementScriptPointerTableNum], a
ldh a, [$b8] ldh a, [$b8]
ld [wcc58], a ld [wNPCMovementScriptBank], a
ld a, $3 ld a, $3
ld [wcf13], a ld [wcf13], a
call Func_32f4 call GetSpritePosition2
ld a, $1 ld a, $1
ld [W_PEWTERCITYCURSCRIPT], a ld [W_PEWTERCITYCURSCRIPT], a
.asm_ac429 ; 0x193ee .asm_ac429 ; 0x193ee
@ -274,14 +274,14 @@ PewterCityText5: ; 19436 (6:5436)
call PrintText call PrintText
xor a xor a
ldh [$b4], a ldh [$b4], a
ld [wcf10], a ld [wNPCMovementScriptFunctionNum], a
ld a, $3 ld a, $3
ld [wcc57], a ld [wNPCMovementScriptPointerTableNum], a
ldh a, [$b8] ldh a, [$b8]
ld [wcc58], a ld [wNPCMovementScriptBank], a
ld a, $5 ld a, $5
ld [wcf13], a ld [wcf13], a
call Func_32f4 call GetSpritePosition2
ld a, $4 ld a, $4
ld [W_PEWTERCITYCURSCRIPT], a ld [W_PEWTERCITYCURSCRIPT], a
jp TextScriptEnd jp TextScriptEnd

2
scripts/pewterpokecenter.asm
View file

@ -61,7 +61,7 @@ PewterPokecenterText3: ; 5c59b (17:459b)
jr nz, .asm_5c5d1 ; 0x5c5f6 $d9 jr nz, .asm_5c5d1 ; 0x5c5f6 $d9
ld c, $30 ld c, $30
call DelayFrames call DelayFrames
call Func_2307 call PlayDefaultMusic
jp TextScriptEnd jp TextScriptEnd
PewterPokecenterText5: ; 5c603 (17:4603) PewterPokecenterText5: ; 5c603 (17:4603)

4
scripts/pokemontower2.asm
View file

@ -46,7 +46,7 @@ PokemonTower2Script0: ; 6050f (18:450f)
ld [$ff8c], a ld [$ff8c], a
ld a, b ld a, b
ld [$ff8d], a ld [$ff8d], a
call Func_34a6 call SetSpriteFacingDirectionAndDelay
ld a, $1 ld a, $1
ld [$ff8c], a ld [$ff8c], a
call DisplayTextID call DisplayTextID
@ -104,7 +104,7 @@ PokemonTower2Script2: ; 605bb (18:45bb)
predef HideObject predef HideObject
xor a xor a
ld [wJoyIgnore], a ld [wJoyIgnore], a
call Func_2307 call PlayDefaultMusic
ld a, $0 ld a, $0
ld [W_POKEMONTOWER2CURSCRIPT], a ld [W_POKEMONTOWER2CURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a

8
scripts/pokemontower6.asm
View file

@ -73,12 +73,12 @@ PokemonTower6Script4: ; 60b48 (18:4b48)
ret ret
.asm_60b82 .asm_60b82
ld a, $1 ld a, $1
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
ld a, $10 ld a, $10
ld [wccd3], a ld [wSimulatedJoypadStatesEnd], a
xor a xor a
ld [wSpriteStateData2 + $06], a ld [wSpriteStateData2 + $06], a
ld [wcd3b], a ld [wOverrideSimulatedJoypadStatesMask], a
ld hl, wd730 ld hl, wd730
set 7, [hl] set 7, [hl]
ld a, $3 ld a, $3
@ -87,7 +87,7 @@ PokemonTower6Script4: ; 60b48 (18:4b48)
ret ret
PokemonTower6Script3: ; 60ba1 (18:4ba1) PokemonTower6Script3: ; 60ba1 (18:4ba1)
ld a, [wcd38] ld a, [wSimulatedJoypadStatesIndex]
and a and a
ret nz ret nz
call Delay3 call Delay3

6
scripts/rockethideout2.asm
View file

@ -24,7 +24,7 @@ RocketHideout2Script0: ; 44e42 (11:4e42)
jp z, CheckFightingMapTrainers jp z, CheckFightingMapTrainers
ld hl, wd736 ld hl, wd736
set 7, [hl] set 7, [hl]
call Func_3486 call StartSimulatingJoypadStates
ld a, (SFX_02_52 - SFX_Headers_02) / 3 ld a, (SFX_02_52 - SFX_Headers_02) / 3
call PlaySound call PlaySound
ld a, $ff ld a, $ff
@ -306,7 +306,7 @@ RocketHideout2ArrowMovement36: ; 44fbb (11:4fbb)
db $FF db $FF
RocketHideout2Script3: ; 44fc2 (11:4fc2) RocketHideout2Script3: ; 44fc2 (11:4fc2)
ld a, [wcd38] ld a, [wSimulatedJoypadStatesIndex]
and a and a
jr nz, LoadSpinnerArrowTiles jr nz, LoadSpinnerArrowTiles
xor a xor a
@ -333,7 +333,7 @@ LoadSpinnerArrowTiles: ; 44fd7 (11:4fd7)
jr z, .asm_44ff6 jr z, .asm_44ff6
ld hl, GymSpinnerArrows ; $5053 ld hl, GymSpinnerArrows ; $5053
.asm_44ff6 .asm_44ff6
ld a, [wcd38] ld a, [wSimulatedJoypadStatesIndex]
bit 0, a bit 0, a
jr nz, .asm_45001 jr nz, .asm_45001
ld de, $18 ld de, $18

4
scripts/rockethideout3.asm
View file

@ -24,7 +24,7 @@ RocketHideout3Script0: ; 45240 (11:5240)
jp z, CheckFightingMapTrainers jp z, CheckFightingMapTrainers
ld hl, wd736 ld hl, wd736
set 7, [hl] set 7, [hl]
call Func_3486 call StartSimulatingJoypadStates
ld a, (SFX_02_52 - SFX_Headers_02) / 3 ld a, (SFX_02_52 - SFX_Headers_02) / 3
call PlaySound call PlaySound
ld a, $ff ld a, $ff
@ -136,7 +136,7 @@ RocketHideout3ArrowMovement12: ; 452e1 (11:52e1)
db $FF db $FF
RocketHideout3Script3 ; 452e4 (11:452e4) RocketHideout3Script3 ; 452e4 (11:452e4)
ld a, [wcd38] ld a, [wSimulatedJoypadStatesIndex]
and a and a
jp nz, LoadSpinnerArrowTiles jp nz, LoadSpinnerArrowTiles
xor a xor a

16
scripts/route16gate.asm
View file

@ -28,13 +28,13 @@ Route16GateScript0: ; 496d7 (12:56d7)
jr z, .asm_4970e ; 0x496f1 $1b jr z, .asm_4970e ; 0x496f1 $1b
ld a, [wWhichTrade] ld a, [wWhichTrade]
dec a dec a
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
ld b, $0 ld b, $0
ld c, a ld c, a
ld a, $40 ld a, $40
ld hl, wccd3 ld hl, wSimulatedJoypadStatesEnd
call FillMemory call FillMemory
call Func_3486 call StartSimulatingJoypadStates
ld a, $1 ld a, $1
ld [W_ROUTE16GATECURSCRIPT], a ld [W_ROUTE16GATECURSCRIPT], a
ret ret
@ -51,7 +51,7 @@ CoordsData_49714: ; 49714 (12:5714)
db $FF db $FF
Route16GateScript1: ; 4971d (12:571d) Route16GateScript1: ; 4971d (12:571d)
ld a, [wcd38] ld a, [wSimulatedJoypadStatesIndex]
and a and a
ret nz ret nz
ld a, $f0 ld a, $f0
@ -62,16 +62,16 @@ Route16GateScript2: ; 49727 (12:5727)
ld [H_SPRITEHEIGHT], a ld [H_SPRITEHEIGHT], a
call DisplayTextID call DisplayTextID
ld a, $1 ld a, $1
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
ld a, $10 ld a, $10
ld [wccd3], a ld [wSimulatedJoypadStatesEnd], a
call Func_3486 call StartSimulatingJoypadStates
ld a, $3 ld a, $3
ld [W_ROUTE16GATECURSCRIPT], a ld [W_ROUTE16GATECURSCRIPT], a
ret ret
Route16GateScript3: ; 49741 (12:5741) Route16GateScript3: ; 49741 (12:5741)
ld a, [wcd38] ld a, [wSimulatedJoypadStatesIndex]
and a and a
ret nz ret nz
xor a xor a

16
scripts/route18gate.asm
View file

@ -28,13 +28,13 @@ Route18GateScript0: ; 4988f (12:588f)
jr z, .asm_498c6 ; 0x498a9 $1b jr z, .asm_498c6 ; 0x498a9 $1b
ld a, [wWhichTrade] ld a, [wWhichTrade]
dec a dec a
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
ld b, $0 ld b, $0
ld c, a ld c, a
ld a, $40 ld a, $40
ld hl, wccd3 ld hl, wSimulatedJoypadStatesEnd
call FillMemory call FillMemory
call Func_3486 call StartSimulatingJoypadStates
ld a, $1 ld a, $1
ld [W_ROUTE18GATECURSCRIPT], a ld [W_ROUTE18GATECURSCRIPT], a
ret ret
@ -51,7 +51,7 @@ CoordsData_498cc: ; 498cc (12:58cc)
db $FF db $FF
Route18GateScript1: ; 498d5 (12:58d5) Route18GateScript1: ; 498d5 (12:58d5)
ld a, [wcd38] ld a, [wSimulatedJoypadStatesIndex]
and a and a
ret nz ret nz
ld a, $f0 ld a, $f0
@ -62,16 +62,16 @@ Route18GateScript2: ; 498df (12:58df)
ld [H_SPRITEHEIGHT], a ld [H_SPRITEHEIGHT], a
call DisplayTextID call DisplayTextID
ld a, $1 ld a, $1
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
ld a, $10 ld a, $10
ld [wccd3], a ld [wSimulatedJoypadStatesEnd], a
call Func_3486 call StartSimulatingJoypadStates
ld a, $3 ld a, $3
ld [W_ROUTE18GATECURSCRIPT], a ld [W_ROUTE18GATECURSCRIPT], a
ret ret
Route18GateScript3: ; 498f9 (12:58f9) Route18GateScript3: ; 498f9 (12:58f9)
ld a, [wcd38] ld a, [wSimulatedJoypadStatesIndex]
and a and a
ret nz ret nz
xor a xor a

14
scripts/route22.asm
View file

@ -45,7 +45,7 @@ Route22MoveRivalSprite: ; 50ee6 (14:4ee6)
call MoveSprite call MoveSprite
ld a, $c ld a, $c
ld [$ff8d], a ld [$ff8d], a
jp Func_34a6 jp SetSpriteFacingDirectionAndDelay
Route22RivalMovementData: ; 50efb (14:4efb) Route22RivalMovementData: ; 50efb (14:4efb)
db $C0,$C0,$C0,$C0,$FF ; move right 4 times db $C0,$C0,$C0,$C0,$FF ; move right 4 times
@ -117,7 +117,7 @@ Route22Script1: ; 50f62 (14:4f62)
ld [$ff8d], a ld [$ff8d], a
ld a, $1 ld a, $1
ld [$ff8c], a ld [$ff8c], a
call Func_34a6 call SetSpriteFacingDirectionAndDelay
xor a xor a
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld a, $1 ld a, $1
@ -158,7 +158,7 @@ Route22Script2: ; 50fb5 (14:4fb5)
ld [$ff8d], a ld [$ff8d], a
ld a, $1 ld a, $1
ld [$ff8c], a ld [$ff8c], a
call Func_34a6 call SetSpriteFacingDirectionAndDelay
ld a, $f0 ld a, $f0
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld hl, wd7eb ld hl, wd7eb
@ -208,7 +208,7 @@ Route22Script3: ; 5102a (14:502a)
ld a, $22 ld a, $22
ld [wcc4d], a ld [wcc4d], a
predef HideObject predef HideObject
call Func_2307 call PlayDefaultMusic
ld hl, wd7eb ld hl, wd7eb
res 0, [hl] res 0, [hl]
res 7, [hl] res 7, [hl]
@ -259,7 +259,7 @@ Route22Script4: ; 51087 (14:5087)
ld a, $c ld a, $c
.asm_510a8 .asm_510a8
ld [$ff8d], a ld [$ff8d], a
call Func_34a6 call SetSpriteFacingDirectionAndDelay
xor a xor a
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld a, $2 ld a, $2
@ -303,7 +303,7 @@ Route22Script5: ; 510df (14:50df)
ld a, $c ld a, $c
.asm_51102 .asm_51102
ld [$ff8d], a ld [$ff8d], a
call Func_34a6 call SetSpriteFacingDirectionAndDelay
ld a, $f0 ld a, $f0
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld hl, wd7eb ld hl, wd7eb
@ -353,7 +353,7 @@ Route22Script6: ; 51151 (14:5151)
ld a, $23 ld a, $23
ld [wcc4d], a ld [wcc4d], a
predef HideObject predef HideObject
call Func_2307 call PlayDefaultMusic
ld hl, wd7eb ld hl, wd7eb
res 1, [hl] res 1, [hl]
res 7, [hl] res 7, [hl]

8
scripts/route22gate.asm
View file

@ -34,15 +34,15 @@ Route22GateScriptCoords: ; 1e6b5 (7:66b5)
Route22GateScript_1e6ba: ; 1e6ba (7:66ba) Route22GateScript_1e6ba: ; 1e6ba (7:66ba)
ld a, $1 ld a, $1
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
ld a, $80 ld a, $80
ld [wccd3], a ld [wSimulatedJoypadStatesEnd], a
ld [wSpriteStateData1 + 9], a ld [wSpriteStateData1 + 9], a
ld [wJoyIgnore], a ld [wJoyIgnore], a
jp Func_3486 jp StartSimulatingJoypadStates
Route22GateScript1: ; 1e6cd (7:66cd) Route22GateScript1: ; 1e6cd (7:66cd)
ld a, [wcd38] ld a, [wSimulatedJoypadStatesIndex]
and a and a
ret nz ret nz
xor a xor a

8
scripts/route23.asm
View file

@ -118,16 +118,16 @@ CascadeBadgeText: ; 512cb (14:52cb)
Route23Script_512d8: ; 512d8 (14:52d8) Route23Script_512d8: ; 512d8 (14:52d8)
ld a, $1 ld a, $1
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
ld a, $80 ld a, $80
ld [wccd3], a ld [wSimulatedJoypadStatesEnd], a
xor a xor a
ld [wSpriteStateData1 + 9], a ld [wSpriteStateData1 + 9], a
ld [wJoyIgnore], a ld [wJoyIgnore], a
jp Func_3486 jp StartSimulatingJoypadStates
Route23Script1: ; 512ec (14:52ec) Route23Script1: ; 512ec (14:52ec)
ld a, [wcd38] ld a, [wSimulatedJoypadStatesIndex]
and a and a
ret nz ret nz
Route23Script2: ; 512f1 (14:52f1) Route23Script2: ; 512f1 (14:52f1)

8
scripts/route24.asm
View file

@ -38,10 +38,10 @@ Route24Script0: ; 513d5 (14:53d5)
res 1, [hl] res 1, [hl]
ret z ret z
ld a, $80 ld a, $80
ld [wccd3], a ld [wSimulatedJoypadStatesEnd], a
ld a, $1 ld a, $1
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
call Func_3486 call StartSimulatingJoypadStates
ld a, $4 ld a, $4
ld [W_ROUTE24CURSCRIPT], a ld [W_ROUTE24CURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
@ -51,7 +51,7 @@ CoordsData_5140e: ; 5140e (14:540e)
db $0F,$0A,$FF db $0F,$0A,$FF
Route24Script4: ; 51411 (14:5411) Route24Script4: ; 51411 (14:5411)
ld a, [wcd38] ld a, [wSimulatedJoypadStatesIndex]
and a and a
ret nz ret nz
call Delay3 call Delay3

8
scripts/route5gate.asm
View file

@ -10,10 +10,10 @@ Route5GateScriptPointers: ; 1df3f (7:5f3f)
Route5GateScript_1df43: ; 1df43 (7:5f43) Route5GateScript_1df43: ; 1df43 (7:5f43)
ld a, $40 ld a, $40
ld [wccd3], a ld [wSimulatedJoypadStatesEnd], a
ld a, $1 ld a, $1
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
jp Func_3486 jp StartSimulatingJoypadStates
Route5GateScript0: ; 1df50 (7:5f50) Route5GateScript0: ; 1df50 (7:5f50)
ld a, [wd728] ld a, [wd728]
@ -51,7 +51,7 @@ CoordsData_1df8f: ; 1df8f (7:5f8f)
db $ff db $ff
Route5GateScript1: ; 1df94 (7:5f94) Route5GateScript1: ; 1df94 (7:5f94)
ld a, [wcd38] ld a, [wSimulatedJoypadStatesIndex]
and a and a
ret nz ret nz
call Delay3 call Delay3

8
scripts/route6gate.asm
View file

@ -43,7 +43,7 @@ CoordsData_1e08c: ; 1e08c (7:608c)
db $02,$04,$FF db $02,$04,$FF
Route6GateScript1: ; 1e091 (7:6091) Route6GateScript1: ; 1e091 (7:6091)
ld a, [wcd38] ld a, [wSimulatedJoypadStatesIndex]
and a and a
ret nz ret nz
call Delay3 call Delay3
@ -56,12 +56,12 @@ Route6GateScript_1e0a1: ; 1e0a1 (7:60a1)
ld hl, wd730 ld hl, wd730
set 7, [hl] set 7, [hl]
ld a, $80 ld a, $80
ld [wccd3], a ld [wSimulatedJoypadStatesEnd], a
ld a, $1 ld a, $1
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
xor a xor a
ld [wSpriteStateData2 + $06], a ld [wSpriteStateData2 + $06], a
ld [wcd3b], a ld [wOverrideSimulatedJoypadStatesMask], a
ret ret
Route6GateTextPointers: ; 1e0b8 (7:60b8) Route6GateTextPointers: ; 1e0b8 (7:60b8)

8
scripts/route7gate.asm
View file

@ -13,12 +13,12 @@ Route7GateScript_1e111: ; 1e111 (7:6111)
ld hl, wd730 ld hl, wd730
set 7, [hl] set 7, [hl]
ld a, $20 ld a, $20
ld [wccd3], a ld [wSimulatedJoypadStatesEnd], a
ld a, $1 ld a, $1
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
xor a xor a
ld [wSpriteStateData2 + $06], a ld [wSpriteStateData2 + $06], a
ld [wcd3b], a ld [wOverrideSimulatedJoypadStatesMask], a
ret ret
Route7GateScript0: ; 1e128 (7:6128) Route7GateScript0: ; 1e128 (7:6128)
@ -57,7 +57,7 @@ CoordsData_1e167: ; 1e167 (7:6167)
db $ff db $ff
Route7GateScript1: ; 1e16c (7:616c) Route7GateScript1: ; 1e16c (7:616c)
ld a, [wcd38] ld a, [wSimulatedJoypadStatesIndex]
and a and a
ret nz ret nz
call Delay3 call Delay3

8
scripts/route8gate.asm
View file

@ -12,12 +12,12 @@ Route8GateScript_1e1d7: ; 1e1d7 (7:61d7)
ld hl, wd730 ld hl, wd730
set 7, [hl] set 7, [hl]
ld a, $10 ld a, $10
ld [wccd3], a ld [wSimulatedJoypadStatesEnd], a
ld a, $1 ld a, $1
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
xor a xor a
ld [wSpriteStateData2 + $06], a ld [wSpriteStateData2 + $06], a
ld [wcd3b], a ld [wOverrideSimulatedJoypadStatesMask], a
ret ret
Route8GateScript0: ; 1e1ee (7:61ee) Route8GateScript0: ; 1e1ee (7:61ee)
@ -55,7 +55,7 @@ CoordsData_1e22c: ; 1e22c (7:622c)
db $ff db $ff
Route8GateScript1: ; 1e231 (7:6231) Route8GateScript1: ; 1e231 (7:6231)
ld a, [wcd38] ld a, [wSimulatedJoypadStatesIndex]
and a and a
ret nz ret nz
call Delay3 call Delay3

8
scripts/safarizoneentrance.asm
View file

@ -121,14 +121,14 @@ SafariZoneEntranceScript_752a3: ; 752a3 (1d:52a3)
push af push af
ld b, $0 ld b, $0
ld a, c ld a, c
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
ld hl, wccd3 ld hl, wSimulatedJoypadStatesEnd
pop af pop af
call FillMemory call FillMemory
jp Func_3486 jp StartSimulatingJoypadStates
SafariZoneEntranceScript_752b4: ; 752b4 (1d:52b4) SafariZoneEntranceScript_752b4: ; 752b4 (1d:52b4)
ld a, [wcd38] ld a, [wSimulatedJoypadStatesIndex]
and a and a
ret ret

14
scripts/seafoamislands4.asm
View file

@ -66,12 +66,12 @@ SeafoamIslands4Script0: ; 46603 (11:6603)
ld a, [W_XCOORD] ld a, [W_XCOORD]
cp $f cp $f
ret nz ret nz
ld hl, wccd3 ld hl, wSimulatedJoypadStatesEnd
ld de, RLEMovement46632 ld de, RLEMovement46632
call DecodeRLEList call DecodeRLEList
dec a dec a
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
call Func_3486 call StartSimulatingJoypadStates
ld hl, W_FLAGS_D733 ld hl, W_FLAGS_D733
set 2, [hl] set 2, [hl]
ld a, $1 ld a, $1
@ -85,7 +85,7 @@ RLEMovement46632: ; 46632 (11:6632)
db $ff db $ff
SeafoamIslands4Script1: ; 46639 (11:6639) SeafoamIslands4Script1: ; 46639 (11:6639)
ld a, [wcd38] ld a, [wSimulatedJoypadStatesIndex]
and a and a
ret nz ret nz
ld a, $0 ld a, $0
@ -108,10 +108,10 @@ SeafoamIslands4Script2: ; 46644 (11:6644)
.asm_4665e .asm_4665e
ld de, RLEData_46688 ld de, RLEData_46688
.asm_46661 .asm_46661
ld hl, wccd3 ld hl, wSimulatedJoypadStatesEnd
call DecodeRLEList call DecodeRLEList
dec a dec a
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
xor a xor a
ld [wSpriteStateData2 + $06], a ld [wSpriteStateData2 + $06], a
ld hl, wd730 ld hl, wd730
@ -130,7 +130,7 @@ RLEData_46688: ; 46688 (11:6688)
db $80,$06,$10,$02,$80,$04,$FF db $80,$06,$10,$02,$80,$04,$FF
SeafoamIslands4Script3: ; 4668f (11:668f) SeafoamIslands4Script3: ; 4668f (11:668f)
ld a, [wcd38] ld a, [wSimulatedJoypadStatesIndex]
and a and a
ret nz ret nz
ld a, $0 ld a, $0

16
scripts/seafoamislands5.asm
View file

@ -44,10 +44,10 @@ SeafoamIslands5Script0: ; 467c7 (11:67c7)
.asm_467e6 .asm_467e6
ld a, $1 ld a, $1
.asm_467e8 .asm_467e8
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
ld a, $40 ld a, $40
ld [wccd3], a ld [wSimulatedJoypadStatesEnd], a
call Func_3486 call StartSimulatingJoypadStates
ld hl, W_FLAGS_D733 ld hl, W_FLAGS_D733
res 2, [hl] res 2, [hl]
ld a, $1 ld a, $1
@ -62,7 +62,7 @@ CoordsData_467fe: ; 467fe (11:67fe)
db $FF db $FF
SeafoamIslands5Script1: ; 46807 (11:6807) SeafoamIslands5Script1: ; 46807 (11:6807)
ld a, [wcd38] ld a, [wSimulatedJoypadStatesIndex]
and a and a
ret nz ret nz
xor a xor a
@ -89,11 +89,11 @@ SeafoamIslands5Script2: ; 46816 (11:6816)
.asm_46837 .asm_46837
ld de, RLEMovementData_46852 ld de, RLEMovementData_46852
.asm_4683a .asm_4683a
ld hl, wccd3 ld hl, wSimulatedJoypadStatesEnd
call DecodeRLEList call DecodeRLEList
dec a dec a
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
call Func_3486 call StartSimulatingJoypadStates
ld a, $3 ld a, $3
.asm_46849 .asm_46849
ld [W_SEAFOAMISLANDS5CURSCRIPT], a ld [W_SEAFOAMISLANDS5CURSCRIPT], a
@ -117,7 +117,7 @@ RLEMovementData_46859: ; 46859 (11:6859)
db $FF db $FF
SeafoamIslands5Script3: ; 46860 (11:6860) SeafoamIslands5Script3: ; 46860 (11:6860)
ld a, [wcd38] ld a, [wSimulatedJoypadStatesIndex]
ld b, a ld b, a
cp $1 cp $1
call z, SeaFoamIslands5Script_46872 call z, SeaFoamIslands5Script_46872

2
scripts/silphco11.asm
View file

@ -160,7 +160,7 @@ SilphCo11Script_6221a: ; 6221a (18:621a)
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
ld a, b ld a, b
ld [$ff8d], a ld [$ff8d], a
jp Func_34a6 jp SetSpriteFacingDirectionAndDelay
SilphCo11Script5: ; 62227 (18:6227) SilphCo11Script5: ; 62227 (18:6227)
ld a, [W_ISINBATTLE] ; W_ISINBATTLE ld a, [W_ISINBATTLE] ; W_ISINBATTLE

6
scripts/silphco7.asm
View file

@ -211,7 +211,7 @@ SilphCo7Script4: ; 51cc8 (14:5cc8)
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
ld a, $4 ld a, $4
ld [$ff8d], a ld [$ff8d], a
call Func_34a6 call SetSpriteFacingDirectionAndDelay
ld a, $f ld a, $f
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID call DisplayTextID
@ -244,7 +244,7 @@ SilphCo7Script5: ; 51d25 (14:5d25)
ld a, $a7 ld a, $a7
ld [wcc4d], a ld [wcc4d], a
predef HideObject predef HideObject
call Func_2307 call PlayDefaultMusic
xor a xor a
ld [wJoyIgnore], a ld [wJoyIgnore], a
jp SilphCo7Text_51c10 jp SilphCo7Text_51c10
@ -323,7 +323,7 @@ SilphCo7Text1:
ld bc, (LAPRAS << 8) | 15 ld bc, (LAPRAS << 8) | 15
call GivePokemon call GivePokemon
jr nc, .done jr nc, .done
ld a, [wccd3] ld a, [wSimulatedJoypadStatesEnd]
and a and a
call z, WaitForTextScrollButtonPress call z, WaitForTextScrollButtonPress
call EnableAutoTextBoxDrawing call EnableAutoTextBoxDrawing

4
scripts/ssanne2.asm
View file

@ -79,7 +79,7 @@ SSAnne2Script_61416: ; 61416 (18:5416)
ld [$ff8d], a ld [$ff8d], a
ld a, $2 ld a, $2
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
jp Func_34a6 jp SetSpriteFacingDirectionAndDelay
SSAnne2Script1: ; 61430 (18:5430) SSAnne2Script1: ; 61430 (18:5430)
ld a, [wd730] ld a, [wd730]
@ -163,7 +163,7 @@ SSAnne2Script3: ; 614be (18:54be)
ld a, $71 ld a, $71
ld [wcc4d], a ld [wcc4d], a
predef HideObject predef HideObject
call Func_2307 call PlayDefaultMusic
ld a, $4 ld a, $4
ld [W_SSANNE2CURSCRIPT], a ld [W_SSANNE2CURSCRIPT], a
ret ret

2
scripts/ssanne7.asm
View file

@ -64,7 +64,7 @@ SSAnne7RubText: ; 618ec (18:58ec)
ld a, [wc026] ld a, [wc026]
cp MUSIC_PKMN_HEALED cp MUSIC_PKMN_HEALED
jr z, .asm_61910 ; 0x61915 $f9 jr z, .asm_61910 ; 0x61915 $f9
call Func_2307 call PlayDefaultMusic
ld hl, wd803 ld hl, wd803
set 1, [hl] set 1, [hl]
ld hl, wd72d ld hl, wd72d

16
scripts/vermilioncity.asm
View file

@ -61,10 +61,10 @@ VermilionCityScript0: ; 197e6 (6:57e6)
ret nz ret nz
.asm_19810 .asm_19810
ld a, $40 ld a, $40
ld [wccd3], a ld [wSimulatedJoypadStatesEnd], a
ld a, $1 ld a, $1
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
call Func_3486 call StartSimulatingJoypadStates
ld a, $1 ld a, $1
ld [W_VERMILIONCITYCURSCRIPT], a ld [W_VERMILIONCITYCURSCRIPT], a
ret ret
@ -85,17 +85,17 @@ VermilionCityScript2: ; 19833 (6:5833)
ld a, $ff ld a, $ff
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld a, $40 ld a, $40
ld [wccd3], a ld [wSimulatedJoypadStatesEnd], a
ld [wccd4], a ld [wccd4], a
ld a, $2 ld a, $2
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
call Func_3486 call StartSimulatingJoypadStates
ld a, $3 ld a, $3
ld [W_VERMILIONCITYCURSCRIPT], a ld [W_VERMILIONCITYCURSCRIPT], a
ret ret
VermilionCityScript3: ; 1984e (6:584e) VermilionCityScript3: ; 1984e (6:584e)
ld a, [wcd38] ld a, [wSimulatedJoypadStatesIndex]
and a and a
ret nz ret nz
xor a xor a
@ -106,7 +106,7 @@ VermilionCityScript3: ; 1984e (6:584e)
ret ret
VermilionCityScript1: ; 1985f (6:585f) VermilionCityScript1: ; 1985f (6:585f)
ld a, [wcd38] ld a, [wSimulatedJoypadStatesIndex]
and a and a
ret nz ret nz
ld c, $a ld c, $a

8
scripts/vermiliondock.asm
View file

@ -14,23 +14,23 @@ VermilionDockScript: ; 1db52 (7:5b52)
call Delay3 call Delay3
ld hl, wd730 ld hl, wd730
set 7, [hl] set 7, [hl]
ld hl, wccd3 ld hl, wSimulatedJoypadStatesEnd
ld a, $40 ld a, $40
ld [hli], a ld [hli], a
ld [hli], a ld [hli], a
ld [hl], a ld [hl], a
ld a, $3 ld a, $3
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
xor a xor a
ld [wSpriteStateData2 + $06], a ld [wSpriteStateData2 + $06], a
ld [wcd3b], a ld [wOverrideSimulatedJoypadStatesMask], a
dec a dec a
ld [wJoyIgnore], a ld [wJoyIgnore], a
ret ret
.asm_1db8d .asm_1db8d
bit 5, [hl] bit 5, [hl]
ret nz ret nz
ld a, [wcd38] ld a, [wSimulatedJoypadStatesIndex]
and a and a
ret nz ret nz
ld [wJoyIgnore], a ld [wJoyIgnore], a

8
scripts/viridiancity.asm
View file

@ -108,7 +108,7 @@ ViridianCityScript2: ; 1908f (6:508f)
ret ret
ViridianCityScript3: ; 190c1 (6:50c1) ViridianCityScript3: ; 190c1 (6:50c1)
ld a, [wcd38] ld a, [wSimulatedJoypadStatesIndex]
and a and a
ret nz ret nz
call Delay3 call Delay3
@ -117,11 +117,11 @@ ViridianCityScript3: ; 190c1 (6:50c1)
ret ret
ViridianCityScript_190cf: ; 190cf (6:50cf) ViridianCityScript_190cf: ; 190cf (6:50cf)
call Func_3486 call StartSimulatingJoypadStates
ld a, $1 ld a, $1
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
ld a, $80 ld a, $80
ld [wccd3], a ld [wSimulatedJoypadStatesEnd], a
xor a xor a
ld [wSpriteStateData1 + 9], a ld [wSpriteStateData1 + 9], a
ld [wJoyIgnore], a ld [wJoyIgnore], a

4
scripts/viridiangym.asm
View file

@ -38,7 +38,7 @@ ViridianGymScript0: ; 748eb (1d:48eb)
call Func_3442 call Func_3442
cp $ff cp $ff
jp z, CheckFightingMapTrainers jp z, CheckFightingMapTrainers
call Func_3486 call StartSimulatingJoypadStates
ld hl, wd736 ld hl, wd736
set 7, [hl] set 7, [hl]
ld a, (SFX_02_52 - SFX_Headers_02) / 3 ld a, (SFX_02_52 - SFX_Headers_02) / 3
@ -121,7 +121,7 @@ ViridianGymArrowMovement12: ; 74968 (1d:4968)
db $20,$0C,$FF db $20,$0C,$FF
ViridianGymScript4: ; 7496b (1d:496b) ViridianGymScript4: ; 7496b (1d:496b)
ld a, [wcd38] ld a, [wSimulatedJoypadStatesIndex]
and a and a
jr nz, .asm_74980 jr nz, .asm_74980
xor a xor a

8
scripts/viridianmart.asm
View file

@ -30,12 +30,12 @@ ViridianMartScript0: ; 1d49b (7:549b)
ld a, $4 ld a, $4
ld [$ff8c], a ld [$ff8c], a
call DisplayTextID call DisplayTextID
ld hl, wccd3 ld hl, wSimulatedJoypadStatesEnd
ld de, RLEMovement1d4bb ld de, RLEMovement1d4bb
call DecodeRLEList call DecodeRLEList
dec a dec a
ld [wcd38], a ld [wSimulatedJoypadStatesIndex], a
call Func_3486 call StartSimulatingJoypadStates
ld a, $1 ld a, $1
ld [W_VIRIDIANMARKETCURSCRIPT], a ld [W_VIRIDIANMARKETCURSCRIPT], a
ret ret
@ -46,7 +46,7 @@ RLEMovement1d4bb: ; 1d4bb (7:54bb)
db $ff db $ff
ViridianMartScript1: ; 1d4c0 (7:54c0) ViridianMartScript1: ; 1d4c0 (7:54c0)
ld a, [wcd38] ld a, [wSimulatedJoypadStatesIndex]
and a and a
ret nz ret nz
call Delay3 call Delay3

88
wram.asm
View file

@ -287,8 +287,16 @@ wTrainerHeaderFlagBit:: ; cc55
ds 1 ds 1
wcc57:: ds 1 wNPCMovementScriptPointerTableNum:: ; cc57
wcc58:: ds 3 ; which NPC movement script pointer is being used
; 0 if an NPC movement script is not running
ds 1
wNPCMovementScriptBank:: ; cc58
; ROM bank of current NPC movement script
ds 1
ds 2
wHallOfFame:: ; cc5b wHallOfFame:: ; cc5b
wcc5b:: ds 1 wcc5b:: ds 1
@ -298,12 +306,23 @@ wcc5e:: ds 13
wcc6b:: ds 14 wcc6b:: ds 14
wcc79:: ds 30 wcc79:: ds 30
wcc97:: ds 10
wNPCMovementDirections2:: ; cc97
wSwitchPartyMonTempBuffer:: ; cc97
; temporary buffer when swapping party mon data
ds 10
wcca1:: ds 49 wcca1:: ds 49
wRLEByteCount:: ; ccd2 wRLEByteCount:: ; ccd2
ds 1 ds 1
wSimulatedJoypadStatesEnd:: ; ccd3
; this is the end of the joypad states
; the list starts above this address and extends downwards in memory until here
; overloaded with below labels
wccd3:: ds 1 wccd3:: ds 1
wccd4:: ds 1 wccd4:: ds 1
wccd5:: ds 2 wccd5:: ds 2
@ -452,11 +471,30 @@ wEnemyMonEvasionMod:: ; cd33
ds 1 ds 1
wcd34:: ds 3 wcd34:: ds 3
wNPCMovementDirections2Index:: ; cd37
wcd37:: ds 1 wcd37:: ds 1
wcd38:: ds 1
wcd39:: ds 1 wSimulatedJoypadStatesIndex:: ; cd38
wcd3a:: ds 1 ; the next simulated joypad state is at wSimulatedJoypadStatesEnd plus this value minus 1
wcd3b:: ds 2 ; 0 if the joypad state is not being simulated
ds 1
wWastedByteCD39:: ; cd39
; written to but nothing ever reads it
ds 1
wWastedByteCD3A:: ; cd3a
; written to but nothing ever reads it
ds 1
wOverrideSimulatedJoypadStatesMask:: ; cd3b
; mask indicating which real button presses can override simulated ones
; XXX is it ever not 0?
ds 1
ds 1
wWhichTrade:: ; cd3d wWhichTrade:: ; cd3d
; which entry from TradeMons to select ; which entry from TradeMons to select
@ -499,6 +537,8 @@ wcd5f:: ds 1
wFlags_0xcd60:: ; cd60 wFlags_0xcd60:: ; cd60
; bit 0: is player engaged by trainer (to avoid being engaged by multiple trainers simultaneously) ; bit 0: is player engaged by trainer (to avoid being engaged by multiple trainers simultaneously)
; bit 1: boulder dust animation (from using Strength) pending
; bit 6: tried pushing against boulder once (you need to push twice before it will move)
ds 1 ds 1
ds 9 ds 9
@ -557,7 +597,12 @@ wcf0c:: ds 1
wcf0d:: ds 1 wcf0d:: ds 1
wcf0e:: ds 1 wcf0e:: ds 1
wcf0f:: ds 1 wcf0f:: ds 1
wcf10:: ds 1
wNPCMovementScriptFunctionNum:: ; cf10
; which script function within the pointer table indicated by
; wNPCMovementScriptPointerTableNum
ds 1
wcf11:: ds 1 wcf11:: ds 1
wPredefParentBank:: ; cf12 wPredefParentBank:: ; cf12
@ -571,7 +616,10 @@ wCurSpriteMovement2:: ; cf14
ds 2 ds 2
wcf17:: ds 1 wNPCMovementScriptSpriteOffset:: ; cf17
; sprite offset of sprite being controlled by NPC movement script
ds 1
wcf18:: ds 2 wcf18:: ds 2
wGBC:: ; cf1a wGBC:: ; cf1a
@ -1657,12 +1705,24 @@ wd71c:: ds 1
wd71d:: ds 1 wd71d:: ds 1
wd71e:: ds 1 wd71e:: ds 1
wd71f:: ds 9 wd71f:: ds 9
wd728:: ds 2
wd728::
; bit 0: using Strength outside of battle
ds 1
ds 1
wd72a:: ds 2 wd72a:: ds 2
wd72c:: ds 1 wd72c:: ds 1
wd72d:: ds 1 wd72d:: ds 1
wd72e:: ds 2 wd72e:: ds 2
wd730:: ds 2
wd730::
; bit 7: set if joypad states are being simulated in the overworld
ds 1
ds 1
wd732:: ds 1 wd732:: ds 1
W_FLAGS_D733:: ; d733 W_FLAGS_D733:: ; d733
@ -1670,7 +1730,11 @@ W_FLAGS_D733:: ; d733
ds 1 ds 1
wd734:: ds 2 wd734:: ds 2
wd736:: ds 1
wd736:: ; d736
; bit 0: check if the player is standing on a door and make him walk down a step if so
ds 1
wd737:: ds 4 wd737:: ds 4
wd73b:: ds 1 wd73b:: ds 1
wd73c:: ds 3 wd73c:: ds 3