diff options
| author | Narishma-gb <194818981+Narishma-gb@users.noreply.github.com> | 2025-09-03 17:56:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-03 11:56:09 -0400 |
| commit | 4d2594cb24b7e67cde4e1373c9a2b5e0ae7ff473 (patch) | |
| tree | 5bd4fce0a314171b46b3962a5db5df6eb5154ee2 /scripts | |
| parent | Document where badge and elevator floor "items" are used (diff) | |
| download | pokeyellow-4d2594cb24b7e67cde4e1373c9a2b5e0ae7ff473.tar.gz pokeyellow-4d2594cb24b7e67cde4e1373c9a2b5e0ae7ff473.tar.xz pokeyellow-4d2594cb24b7e67cde4e1373c9a2b5e0ae7ff473.zip | |
Label and constant cleanup (#528)
* Label cleanup, add some constants instead of raw numbers
* Rename load/save game functions to be more explicit
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/HallOfFame.asm | 2 | ||||
| -rw-r--r-- | scripts/PokemonMansionB1F.asm | 16 | ||||
| -rw-r--r-- | scripts/SeafoamIslandsB4F.asm | 2 | ||||
| -rw-r--r-- | scripts/VermilionDock.asm | 2 |
4 files changed, 11 insertions, 11 deletions
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/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 314a8d50..40ecee0a 100644 --- a/scripts/SeafoamIslandsB4F.asm +++ b/scripts/SeafoamIslandsB4F.asm @@ -37,7 +37,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 608d2b7e..237b4175 100644 --- a/scripts/VermilionDock.asm +++ b/scripts/VermilionDock.asm @@ -50,7 +50,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 |