diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-16 11:28:35 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-16 11:28:35 -0400 |
| commit | 782b0a7c88381a4ec54d1953374d1fb6142bf1af (patch) | |
| tree | 851a14e31c88ad93c9349a07d8c0b6409678a468 | |
| parent | de86add680a823b6bf1ea0fea984c942453cdd82 (diff) | |
Harmonize some more symbols with pokecrystal
| -rw-r--r-- | constants/map_constants.asm | 2 | ||||
| -rw-r--r-- | engine/menus/intro_menu.asm | 2 | ||||
| -rw-r--r-- | engine/printer/printer.asm | 2 | ||||
| -rw-r--r-- | gfx/tileset_palette_maps.asm | 1 | ||||
| -rw-r--r-- | home/printer.asm | 2 | ||||
| -rw-r--r-- | macros/legacy.asm | 3 |
6 files changed, 7 insertions, 5 deletions
diff --git a/constants/map_constants.asm b/constants/map_constants.asm index fc033859..9bd588b9 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -472,4 +472,4 @@ ENDM map_const MR_POKEMONS_HOUSE, 4, 4 ; 10 map_const ROUTE_31_VIOLET_GATE, 5, 4 ; 11 -NUM_MAP_GROUPS EQU const_value +NUM_MAP_GROUPS EQU const_value ; 26 diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm index c85b56f6..b7456f95 100644 --- a/engine/menus/intro_menu.asm +++ b/engine/menus/intro_menu.asm @@ -276,7 +276,7 @@ Continue: ld c, 20 call DelayFrames farcall JumpRoamMons - farcall MysteryGift_CopyReceivedDecosToPC ; Mystery Gift + farcall MysteryGift_CopyReceivedDecosToPC farcall ClockContinue ld a, [wSpawnAfterChampion] cp SPAWN_LANCE diff --git a/engine/printer/printer.asm b/engine/printer/printer.asm index df8ca355..18e71c3d 100644 --- a/engine/printer/printer.asm +++ b/engine/printer/printer.asm @@ -444,7 +444,7 @@ CheckCancelPrint: .pressed_b ld a, [wc980] - cp $c + cp $0c jr nz, .cancel .loop ld a, [wPrinterOpcode] diff --git a/gfx/tileset_palette_maps.asm b/gfx/tileset_palette_maps.asm index 3b623e5f..58799237 100644 --- a/gfx/tileset_palette_maps.asm +++ b/gfx/tileset_palette_maps.asm @@ -94,6 +94,5 @@ INCLUDE "gfx/tilesets/ice_path_palette_map.asm" TilesetForestPalMap: INCLUDE "gfx/tilesets/forest_palette_map.asm" -; referenced in engine/tilesets/map_palettes.asm MapGroupPalettes: ds NUM_MAP_GROUPS, PAL_BG_ROOF diff --git a/home/printer.asm b/home/printer.asm index 9747713c..745399a5 100644 --- a/home/printer.asm +++ b/home/printer.asm @@ -23,7 +23,7 @@ AskSerial:: xor a ld [hl], a - ld a, 12 + ld a, $0c ld [wPrinterOpcode], a ; handshake diff --git a/macros/legacy.asm b/macros/legacy.asm index 09482186..814e7179 100644 --- a/macros/legacy.asm +++ b/macros/legacy.asm @@ -374,3 +374,6 @@ receivetogepiegg EQUS "ReceiveTogepiEggScript" pcscript EQUS "PCScript" gamecornercoinvendor EQUS "GameCornerCoinVendorScript" happinesschecknpc EQUS "HappinessCheckScript" + +; constants/sprite_constants.asm +SPRITE_BUENA EQUS "SPRITE_BEAUTY" |