diff options
| author | dannye <33dannye@gmail.com> | 2025-09-06 16:54:17 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2025-09-06 16:54:17 -0500 |
| commit | 377749ca4efac05b6c57dfed049899891af6c35a (patch) | |
| tree | 4b429403935c4a7c2de710a6cbf7310246874539 /scripts | |
| parent | Fix .tilemap file extension, fix some typos (#138) (diff) | |
| parent | Document visual glitch with Pewter City Gym guy (#526) (diff) | |
| download | pokeyellow-377749ca4efac05b6c57dfed049899891af6c35a.tar.gz pokeyellow-377749ca4efac05b6c57dfed049899891af6c35a.tar.xz pokeyellow-377749ca4efac05b6c57dfed049899891af6c35a.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/CeruleanBadgeHouse.asm | 4 | ||||
| -rw-r--r-- | scripts/HallOfFame.asm | 2 | ||||
| -rw-r--r-- | scripts/PewterCity.asm | 2 | ||||
| -rw-r--r-- | scripts/PokemonMansionB1F.asm | 16 | ||||
| -rw-r--r-- | scripts/SeafoamIslandsB4F.asm | 2 | ||||
| -rw-r--r-- | scripts/VermilionDock.asm | 10 |
6 files changed, 18 insertions, 18 deletions
diff --git a/scripts/CeruleanBadgeHouse.asm b/scripts/CeruleanBadgeHouse.asm index 1c7e0200..65606a5e 100644 --- a/scripts/CeruleanBadgeHouse.asm +++ b/scripts/CeruleanBadgeHouse.asm @@ -53,8 +53,8 @@ CeruleanBadgeHouseMiddleAgedManText: jp TextScriptEnd .BadgeItemList: - table_width 1 db NUM_BADGES ; # + table_width 1 db BOULDERBADGE db CASCADEBADGE db THUNDERBADGE @@ -63,8 +63,8 @@ CeruleanBadgeHouseMiddleAgedManText: db MARSHBADGE db VOLCANOBADGE db EARTHBADGE + assert_table_length NUM_BADGES db -1 ; end - assert_table_length NUM_BADGES + 2 .Text: text_far _CeruleanBadgeHouseMiddleAgedManText diff --git a/scripts/HallOfFame.asm b/scripts/HallOfFame.asm index eb26afaf..31d56022 100644 --- a/scripts/HallOfFame.asm +++ b/scripts/HallOfFame.asm @@ -47,7 +47,7 @@ HallOfFameResetEventsAndSaveScript: ld [wHallOfFameCurScript], a ld a, PALLET_TOWN ld [wLastBlackoutMap], a - farcall SaveSAVtoSRAM + farcall SaveGameData ld b, 5 .delayLoop ld c, 600 / 5 diff --git a/scripts/PewterCity.asm b/scripts/PewterCity.asm index 79c02f9a..ffe546ca 100644 --- a/scripts/PewterCity.asm +++ b/scripts/PewterCity.asm @@ -132,7 +132,7 @@ PewterCityYoungsterShowsPlayerGymScript: call DisplayTextID ld a, $3c ldh [hSpriteScreenYCoord], a - ld a, $40 + ld a, $40 ; BUG: should load $50, using $40 causes sprite misalignment ldh [hSpriteScreenXCoord], a ld a, 22 ldh [hSpriteMapYCoord], a diff --git a/scripts/PokemonMansionB1F.asm b/scripts/PokemonMansionB1F.asm index e31bbd3e..176c243a 100644 --- a/scripts/PokemonMansionB1F.asm +++ b/scripts/PokemonMansionB1F.asm @@ -16,30 +16,30 @@ MansionB1FCheckReplaceSwitchDoorBlocks: CheckEvent EVENT_MANSION_SWITCH_ON jr nz, .switchTurnedOn ld a, $e - ld bc, $80d + lb bc, 8, 13 call Mansion2ReplaceBlock ld a, $e - ld bc, $b06 + lb bc, 11, 6 call Mansion2ReplaceBlock ld a, $5f - ld bc, $304 + lb bc, 3, 4 call Mansion2ReplaceBlock ld a, $54 - ld bc, $808 + lb bc, 8, 8 call Mansion2ReplaceBlock ret .switchTurnedOn ld a, $2d - ld bc, $80d + lb bc, 8, 13 call Mansion2ReplaceBlock ld a, $5f - ld bc, $b06 + lb bc, 11, 6 call Mansion2ReplaceBlock ld a, $e - ld bc, $304 + lb bc, 3, 4 call Mansion2ReplaceBlock ld a, $e - ld bc, $808 + lb bc, 8, 8 call Mansion2ReplaceBlock ret diff --git a/scripts/SeafoamIslandsB4F.asm b/scripts/SeafoamIslandsB4F.asm index 91ba9669..e4df261d 100644 --- a/scripts/SeafoamIslandsB4F.asm +++ b/scripts/SeafoamIslandsB4F.asm @@ -38,7 +38,7 @@ SeafoamIslandsB4FDefaultScript: ld a, [wCoordIndex] cp $3 jr nc, .only1UpInputNeeded - ld a, NPC_MOVEMENT_UP + ld a, PAD_UP ld [wSimulatedJoypadStatesEnd + 1], a ld a, 2 jr .forcePlayerUpFromSurfExit diff --git a/scripts/VermilionDock.asm b/scripts/VermilionDock.asm index 6e8f6822..3cd26619 100644 --- a/scripts/VermilionDock.asm +++ b/scripts/VermilionDock.asm @@ -49,7 +49,7 @@ VermilionDockSSAnneLeavesScript: ld [wSpritePlayerStateData1ImageIndex], a ld c, 120 call DelayFrames - ld b, $9c + ld b, HIGH(vBGMap1) call CopyScreenTileBufferToVRAM hlcoord 0, 10 ld bc, SCREEN_WIDTH * 6 @@ -156,10 +156,10 @@ VermilionDock_EmitSmokePuff: VermilionDockOAMBlock: ; tile ID, attributes - db $fc, $10 - db $fd, $10 - db $fe, $10 - db $ff, $10 + db $fc, OAM_PAL1 + db $fd, OAM_PAL1 + db $fe, OAM_PAL1 + db $ff, OAM_PAL1 VermilionDock_SyncScrollWithLY: ld h, d |