mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-04 15:04:31 +00:00
Code Issues Projects Releases Wiki Activity

Improve the format in z_map_mark_data.c and cleanup mapmark.py (#798)

Browse source 
* Cleanup mapmark.py script

* Rename map mark defines

* Remove unused entries from map_mark_data
This commit is contained in:
Roman971 2021-04-28 11:10:23 +02:00 • committed by GitHub
parent 3fbdccbdba
commit 0b8252cfe9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 354 additions and 1673 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/code/z_map_mark.c
View file

@ -98,7 +98,7 @@ void MapMark_Draw(GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_map_mark.c", 303);
while (true) {
if (mapMarkIconData->markType == MAP_MARK_ICON_NONE) {
if (mapMarkIconData->markType == MAP_MARK_NONE) {
break;
}
@ -109,8 +109,7 @@ void MapMark_Draw(GlobalContext* globalCtx) {
markPoint = mapMarkIconData->points;
for (i = 0; i < mapMarkIconData->count; i++) {
if (mapMarkIconData->markType != MAP_MARK_ICON_CHEST ||
!Flags_GetTreasure(globalCtx, markPoint->chestFlag)) {
if ((mapMarkIconData->markType != MAP_MARK_CHEST) || !Flags_GetTreasure(globalCtx, markPoint->chestFlag)) {
markInfo = &sMapMarkInfoTable[mapMarkIconData->markType];
gDPPipeSync(OVERLAY_DISP++);