From fdda670f406c9eb2b323d3b251c67f69f970a071 Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 23 Jan 2018 11:17:21 -0500 Subject: [PATCH] Cry headers and map headers were eliminated --- constants/map_data_constants.asm | 2 +- data/maps/definitions.asm | 2 +- home/audio.asm | 2 +- home/cry.asm | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm index d35966b28..11063bec0 100644 --- a/constants/map_data_constants.asm +++ b/constants/map_data_constants.asm @@ -4,7 +4,7 @@ GROUP_NONE EQU 0 MAP_NONE EQU 0 -; map header struct members (see data/maps/definitions.asm) +; map_def struct members (see data/maps/definitions.asm) const_def const MAPDEF_MAPDATA_BANK ; 0 const MAPDEF_TILESET ; 1 diff --git a/data/maps/definitions.asm b/data/maps/definitions.asm index ccc723177..e9afbf31c 100644 --- a/data/maps/definitions.asm +++ b/data/maps/definitions.asm @@ -15,7 +15,7 @@ map_def: MACRO ENDM MapGroupPointers:: -; pointers to the first map header of each map group +; pointers to the first map_def of each map group dw MapGroup_Olivine ; 1 dw MapGroup_Mahogany ; 2 dw MapGroup_Dungeons ; 3 diff --git a/home/audio.asm b/home/audio.asm index 7508d569c..c7e49721a 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -142,7 +142,7 @@ PlayMusic2:: ; 3bbc PlayCry:: ; 3be3 -; Play cry header de. +; Play cry de. push hl push de diff --git a/home/cry.asm b/home/cry.asm index 204b02ba4..c671c5fd0 100644 --- a/home/cry.asm +++ b/home/cry.asm @@ -55,7 +55,7 @@ _PlayMonCry:: ; 37e2 ; 37f3 LoadCry:: ; 37f3 -; Load cry header bc. +; Load cry bc. call GetCryIndex ret c