diff options
| author | Roman971 <32455037+Roman971@users.noreply.github.com> | 2021-05-03 01:15:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-02 19:15:16 -0400 |
| commit | a53e084cd236c36da5fca25c07da18ac83a7dbab (patch) | |
| tree | ccc0625dd7cc356d595d08caf06943af1c4efb4f /src/code/z_map_exp.c | |
| parent | 4e9f40cb139ab66313fd24282fb9ef2060db5eed (diff) | |
Decompile the pause menu aka. ovl_kaleido_scope (+ minor changes) (#803)
* Decompile ovl_kaleido_scope + minor cleanups
* Add a common header for ovl_kaleido_scope
* Start cleaning up and documenting kaleido_scope (+ some interface docs)
* Improve and fix some kaleido_scope non matchings
* Match KaleidoSetup_Init
* Extract icon_item_fra/ger_static files
* Add more documentation and matches to kaleido_scope
* Improve the z_kaleido_collect.c non matching
* Rename z_kaleido_8081EFF0.c to z_kaleido_prompt.c
* Update most kaleido variables to be static
* Improve GS flag macros
* Improve z_lmap_mark.c and extract z_lmap_mark_data.c with a script
* Various minor fixes and improvements
* Minor fixes and review changes
* Review changes part 2
* Rename gSetTileCustom to gDPSetTileCustom
* Review changes part 3
Diffstat (limited to 'src/code/z_map_exp.c')
| -rw-r--r-- | src/code/z_map_exp.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/code/z_map_exp.c b/src/code/z_map_exp.c index d50e093e5..6fa9d2f20 100644 --- a/src/code/z_map_exp.c +++ b/src/code/z_map_exp.c @@ -20,20 +20,20 @@ void Map_SavePlayerInitialInfo(GlobalContext* globalCtx) { void Map_SetPaletteData(GlobalContext* globalCtx, s16 room) { s32 mapIndex = gSaveContext.mapIndex; InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx; - s16 paletteNum = gMapData->roomPalette[mapIndex][room]; + s16 paletteIndex = gMapData->roomPalette[mapIndex][room]; if (interfaceCtx->mapRoomNum == room) { - interfaceCtx->mapPaletteNum = paletteNum; + interfaceCtx->mapPaletteIndex = paletteIndex; } osSyncPrintf(VT_FGCOL(YELLOW)); // Translates to: "PALETE Set" - osSyncPrintf("PALETEセット 【 i=%x : room=%x 】Room_Inf[%d][4]=%x ( map_palete_no = %d )\n", paletteNum, - room, mapIndex, gSaveContext.sceneFlags[mapIndex].rooms, interfaceCtx->mapPaletteNum); + osSyncPrintf("PALETEセット 【 i=%x : room=%x 】Room_Inf[%d][4]=%x ( map_palete_no = %d )\n", paletteIndex, + room, mapIndex, gSaveContext.sceneFlags[mapIndex].rooms, interfaceCtx->mapPaletteIndex); osSyncPrintf(VT_RST); - interfaceCtx->unk_140[paletteNum * 2] = 2; - interfaceCtx->unk_140[paletteNum * 2 + 1] = 0xBF; + interfaceCtx->mapPalette[paletteIndex * 2] = 2; + interfaceCtx->mapPalette[paletteIndex * 2 + 1] = 0xBF; } void Map_SetFloorPalettesData(GlobalContext* globalCtx, s16 floor) { @@ -43,13 +43,13 @@ void Map_SetFloorPalettesData(GlobalContext* globalCtx, s16 floor) { s16 i; for (i = 0; i < 16; i++) { - interfaceCtx->unk_140[i] = 0; - interfaceCtx->unk_140[i + 16] = 0; + interfaceCtx->mapPalette[i] = 0; + interfaceCtx->mapPalette[i + 16] = 0; } if (CHECK_DUNGEON_ITEM(DUNGEON_MAP, mapIndex)) { - interfaceCtx->unk_140[30] = 0; - interfaceCtx->unk_140[31] = 1; + interfaceCtx->mapPalette[30] = 0; + interfaceCtx->mapPalette[31] = 1; } switch (globalCtx->sceneNum) { @@ -397,7 +397,7 @@ void Minimap_Draw(GlobalContext* globalCtx) { if (CHECK_DUNGEON_ITEM(DUNGEON_COMPASS, mapIndex)) { Minimap_DrawCompassIcons(globalCtx); // Draw icons for the player spawn and current position func_80094520(globalCtx->state.gfxCtx); - MapMark_DrawConditionally(globalCtx); + MapMark_Draw(globalCtx); } } @@ -510,7 +510,7 @@ void Map_Update(GlobalContext* globalCtx) { s16 floor; s16 i; - if ((globalCtx->pauseCtx.state == 0) && (globalCtx->pauseCtx.flag == 0)) { + if ((globalCtx->pauseCtx.state == 0) && (globalCtx->pauseCtx.debugState == 0)) { switch (globalCtx->sceneNum) { case SCENE_YDAN: case SCENE_DDAN: @@ -522,11 +522,11 @@ void Map_Update(GlobalContext* globalCtx) { case SCENE_HAKADAN: case SCENE_HAKADANCH: case SCENE_ICE_DOUKUTO: - interfaceCtx->unk_140[30] = 0; + interfaceCtx->mapPalette[30] = 0; if (CHECK_DUNGEON_ITEM(DUNGEON_MAP, mapIndex)) { - interfaceCtx->unk_140[31] = 1; + interfaceCtx->mapPalette[31] = 1; } else { - interfaceCtx->unk_140[31] = 0; + interfaceCtx->mapPalette[31] = 0; } for (floor = 0; floor < 8; floor++) { |
