diff options
Diffstat (limited to 'engine/events')
| -rwxr-xr-x | engine/events/elevator.asm | 58 | ||||
| -rwxr-xr-x | engine/events/magnet_train.asm | 31 | ||||
| -rw-r--r-- | engine/events/poisonstep_pals.asm | 1 | ||||
| -rw-r--r-- | engine/events/std_scripts.asm | 5 |
4 files changed, 16 insertions, 79 deletions
diff --git a/engine/events/elevator.asm b/engine/events/elevator.asm index 9170b642d..35e95fa3c 100755 --- a/engine/events/elevator.asm +++ b/engine/events/elevator.asm @@ -200,12 +200,12 @@ Elevator_MenuData2: ; 0x13558 db 4, 0 ; rows, columns db 1 ; horizontal spacing dbw 0, CurElevator - dba GetElevatorFlorStrings + dba GetElevatorFloorStrings dba NULL dba NULL ; 13568 -GetElevatorFlorStrings: ; 13568 +GetElevatorFloorStrings: ; 13568 ld a, [MenuSelection] GetFloorString: ; 1356b push de @@ -220,7 +220,7 @@ FloorToString: ; 13575 push de ld e, a ld d, 0 - ld hl, .floors + ld hl, ElevatorFloorNames add hl, de add hl, de ld a, [hli] @@ -230,54 +230,4 @@ FloorToString: ; 13575 ret ; 13583 -.floors - dw .b4f - dw .b3f - dw .b2f - dw .b1f - dw ._1f - dw ._2f - dw ._3f - dw ._4f - dw ._5f - dw ._6f - dw ._7f - dw ._8f - dw ._9f - dw ._10f - dw ._11f - dw .roof - -.b4f - db "B4F@" -.b3f - db "B3F@" -.b2f - db "B2F@" -.b1f - db "B1F@" -._1f - db "1F@" -._2f - db "2F@" -._3f - db "3F@" -._4f - db "4F@" -._5f - db "5F@" -._6f - db "6F@" -._7f - db "7F@" -._8f - db "8F@" -._9f - db "9F@" -._10f - db "10F@" -._11f - db "11F@" -.roof - db "ROOF@" -; 135db +INCLUDE "data/elevator_floors.asm" diff --git a/engine/events/magnet_train.asm b/engine/events/magnet_train.asm index c85642ab8..a4b523d1e 100755 --- a/engine/events/magnet_train.asm +++ b/engine/events/magnet_train.asm @@ -220,8 +220,7 @@ GetMagnetTrainBGTiles: ; 8cd74 ; 8cd82 MagnetTrainBGTiles: ; 8cd82 -; Alternating tiles for each line -; of the Magnet Train tilemap. +; Alternating tiles for each line of the Magnet Train tilemap. db $4c, $4d ; bush db $5c, $5d ; bush db $4c, $4d ; bush @@ -263,25 +262,25 @@ SetMagnetTrainPals: ; 8cdc3 ; bushes hlbgcoord 0, 0 ld bc, 4 * BG_MAP_WIDTH - ld a, $2 + ld a, PAL_BG_GREEN call ByteFill ; train hlbgcoord 0, 4 ld bc, 10 * BG_MAP_WIDTH - xor a + xor a ; PAL_BG_GRAY call ByteFill ; more bushes hlbgcoord 0, 14 ld bc, 4 * BG_MAP_WIDTH - ld a, $2 + ld a, PAL_BG_GREEN call ByteFill ; train window hlbgcoord 7, 8 ld bc, 6 - ld a, $4 + ld a, PAL_BG_YELLOW call ByteFill ld a, $0 @@ -459,23 +458,11 @@ MagnetTrain_Jumptable_FirstRunThrough: ; 8ceae ; 8ceff MagnetTrainTilemap1: - db $1f, $05, $06, $0a, $0a - db $0a, $09, $0a, $0a, $0a - db $0a, $0a, $0a, $09, $0a - db $0a, $0a, $0b, $0c, $1f + db $1f, $05, $06, $0a, $0a, $0a, $09, $0a, $0a, $0a, $0a, $0a, $0a, $09, $0a, $0a, $0a, $0b, $0c, $1f MagnetTrainTilemap2: - db $14, $15, $16, $1a, $1a - db $1a, $19, $1a, $1a, $1a - db $1a, $1a, $1a, $19, $1a - db $1a, $1a, $1b, $1c, $1d + db $14, $15, $16, $1a, $1a, $1a, $19, $1a, $1a, $1a, $1a, $1a, $1a, $19, $1a, $1a, $1a, $1b, $1c, $1d MagnetTrainTilemap3: - db $24, $25, $26, $27, $07 - db $2f, $29, $28, $28, $28 - db $28, $28, $28, $29, $07 - db $2f, $2a, $2b, $2c, $2d + db $24, $25, $26, $27, $07, $2f, $29, $28, $28, $28, $28, $28, $28, $29, $07, $2f, $2a, $2b, $2c, $2d MagnetTrainTilemap4: - db $20, $1f, $2e, $1f, $17 - db $00, $2e, $1f, $1f, $1f - db $1f, $1f, $1f, $2e, $17 - db $00, $1f, $2e, $1f, $0f + db $20, $1f, $2e, $1f, $17, $00, $2e, $1f, $1f, $1f, $1f, $1f, $1f, $2e, $17, $00, $1f, $2e, $1f, $0f ; 8cf4f diff --git a/engine/events/poisonstep_pals.asm b/engine/events/poisonstep_pals.asm index 498ae8f18..10a254ceb 100644 --- a/engine/events/poisonstep_pals.asm +++ b/engine/events/poisonstep_pals.asm @@ -31,7 +31,6 @@ LoadPoisonBGPals: ; cbcdd ld hl, wBGPals2 ld c, 4 palettes .loop -; RGB 28, 21, 31 ld a, LOW(palred 28 + palgreen 21 + palblue 31) ld [hli], a ld a, HIGH(palred 28 + palgreen 21 + palblue 31) diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index 297725c60..da2d38138 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -1,4 +1,5 @@ StdScripts:: +; entries correspond to constants/std_constants.asm dba PokecenterNurseScript dba DifficultBookshelfScript dba PictureBookshelfScript @@ -1818,7 +1819,7 @@ CoinVendor_IntroScript: ; 0xbcde0 ; 0xbcdf7 .Buy50: ; 0xbcdf7 - checkcoins 9949 + checkcoins MAX_COINS - 50 if_equal $0, .CoinCaseFull checkmoney $0, 1000 if_equal $2, .NotEnoughMoney @@ -1832,7 +1833,7 @@ CoinVendor_IntroScript: ; 0xbcde0 ; 0xbce1b .Buy500: ; 0xbce1b - checkcoins 9499 + checkcoins MAX_COINS - 500 if_equal $0, .CoinCaseFull checkmoney $0, 10000 if_equal $2, .NotEnoughMoney |