From a77d20f1381d9ce479173d525e1669cc9aec2253 Mon Sep 17 00:00:00 2001 From: Snesrev Date: Tue, 14 Mar 2023 20:22:53 +0100 Subject: [PATCH] Remove u from constants --- src/sm_80.c | 164 +++++++++++------------ src/sm_81.c | 162 +++++++++++------------ src/sm_82.c | 178 ++++++++++++------------- src/sm_84.c | 178 ++++++++++++------------- src/sm_85.c | 56 ++++---- src/sm_86.c | 14 +- src/sm_88.c | 14 +- src/sm_8b.c | 366 ++++++++++++++++++++++++++-------------------------- src/sm_90.c | 2 +- src/sm_91.c | 84 ++++++------ src/sm_92.c | 10 +- src/sm_a0.c | 4 +- src/sm_a2.c | 28 ++-- src/sm_a4.c | 46 +++---- src/sm_a5.c | 6 +- src/sm_a6.c | 96 +++++++------- src/sm_a7.c | 28 ++-- src/sm_a8.c | 2 +- src/sm_a9.c | 122 +++++++++--------- src/sm_aa.c | 14 +- src/sm_ad.c | 36 +++--- src/sm_b2.c | 10 +- src/sm_b3.c | 4 +- src/sm_b4.c | 2 +- 24 files changed, 813 insertions(+), 813 deletions(-) diff --git a/src/sm_80.c b/src/sm_80.c index 24d5ee6..0497229 100644 --- a/src/sm_80.c +++ b/src/sm_80.c @@ -267,7 +267,7 @@ void InitializeCpuIoRegs(void) { // 0x80875D } void InitializePpuIoRegs(void) { // 0x808792 - WriteReg(INIDISP, 0x8Fu); + WriteReg(INIDISP, 0x8F); reg_INIDISP = 0x8f; WriteReg(OBSEL, 3u); reg_OBSEL = 3; @@ -281,11 +281,11 @@ void InitializePpuIoRegs(void) { // 0x808792 reg_BGMODE = 9; WriteReg(MOSAIC, 0); reg_MOSAIC = 0; - WriteReg(BG1SC, 0x40u); + WriteReg(BG1SC, 0x40); reg_BG1SC = 64; - WriteReg(BG2SC, 0x44u); + WriteReg(BG2SC, 0x44); reg_BG2SC = 68; - WriteReg(BG3SC, 0x48u); + WriteReg(BG3SC, 0x48); reg_BG3SC = 72; WriteReg(BG4SC, 0); reg_BG4SC = 0; @@ -326,7 +326,7 @@ void InitializePpuIoRegs(void) { // 0x808792 reg_WOBJSEL = 0; WriteReg(WH0, 0); reg_WH0 = 0; - WriteReg(WH1, 0xF8u); + WriteReg(WH1, 0xF8); reg_WH1 = -8; WriteReg(WH2, 0); reg_WH2 = 0; @@ -336,9 +336,9 @@ void InitializePpuIoRegs(void) { // 0x808792 reg_WBGLOG = 0; WriteReg(WOBJLOG, 0); reg_WOBJLOG = 0; - WriteReg(TM, 0x11u); + WriteReg(TM, 0x11); reg_TM = 17; - WriteReg(TMW, 0x11u); + WriteReg(TMW, 0x11); reg_TMW = 17; WriteReg(TS, 2u); reg_TS = 2; @@ -346,15 +346,15 @@ void InitializePpuIoRegs(void) { // 0x808792 reg_TSW = 2; WriteReg(CGWSEL, 2u); next_gameplay_CGWSEL = 2; - WriteReg(CGADSUB, 0xA1u); + WriteReg(CGADSUB, 0xA1); next_gameplay_CGADSUB = -95; - WriteReg(COLDATA, 0xE0u); - WriteReg(COLDATA, 0xE0u); + WriteReg(COLDATA, 0xE0); + WriteReg(COLDATA, 0xE0); WriteReg(COLDATA, 0x80); reg_COLDATA[0] = 0x80; - WriteReg(COLDATA, 0x40u); + WriteReg(COLDATA, 0x40); reg_COLDATA[1] = 64; - WriteReg(COLDATA, 0x20u); + WriteReg(COLDATA, 0x20); reg_COLDATA[2] = 32; WriteReg(SETINI, 0); reg_SETINI = 0; @@ -367,15 +367,15 @@ void WriteLotsOf0x1c2f(void) { // 0x8088D1 } void sub_8088EB(uint16 a) { // 0x8088EB - memset7E((uint16*)(g_ram + 0x3000), a, 0x800u); + memset7E((uint16*)(g_ram + 0x3000), a, 0x800); } void sub_8088FE(uint16 a) { // 0x8088FE - memset7E((uint16 *)(g_ram + 0x4000), a, 0x800u); + memset7E((uint16 *)(g_ram + 0x4000), a, 0x800); } void sub_808911(uint16 a) { // 0x808911 - memset7E((uint16 *)(g_ram + 0x6000), a, 0x800u); + memset7E((uint16 *)(g_ram + 0x6000), a, 0x800); } void HandleFadeOut(void) { // 0x808924 @@ -471,9 +471,9 @@ void NMI_ProcessMode7QueueInner(uint16 k) { // 0x808BD3 WriteReg(A1B1, v5->src_addr.bank); WriteRegWord(DAS1L, v5->count); if (v4 < 0) - WriteReg(BBAD1, 0x19u); + WriteReg(BBAD1, 0x19); else - WriteReg(BBAD1, 0x18u); + WriteReg(BBAD1, 0x18); WriteRegWord(VMADDL, v5->vram_addr); WriteReg(VMAIN, v5->vmain); WriteReg(MDMAEN, 2u); @@ -486,7 +486,7 @@ void NMI_ProcessMode7QueueInner(uint16 k) { // 0x808BD3 WriteRegWord(A1T1L, *(uint16 *)(v1 + 1)); WriteReg(A1B1, v1[3]); WriteRegWord(DAS1L, *((uint16 *)v1 + 2)); - WriteReg(BBAD1, 0x22u); + WriteReg(BBAD1, 0x22); WriteReg(CGADD, v1[6]); WriteReg(MDMAEN, 2u); k += 7; @@ -496,7 +496,7 @@ void NMI_ProcessMode7QueueInner(uint16 k) { // 0x808BD3 void NMI_ProcessVramWriteQueue(void) { // 0x808C83 if (vram_write_queue_tail) { gVramWriteEntry(vram_write_queue_tail)->size = 0; - WriteRegWord(DMAP1, 0x1801u); + WriteRegWord(DMAP1, 0x1801); for (int i = 0; ; i += 7) { VramWriteEntry *e = gVramWriteEntry(i); if (!e->size) @@ -515,14 +515,14 @@ void NMI_ProcessVramWriteQueue(void) { // 0x808C83 } void Nmi_ProcessHorizScrollingDma(void) { // 0x808CD8 - WriteReg(VMAIN, 0x81u); + WriteReg(VMAIN, 0x81); if ((uint8)bg1_update_col_enable) { LOBYTE(bg1_update_col_enable) = 0; uint16 v0 = bg1_update_col_unwrapped_dst; WriteRegWord(VMADDL, bg1_update_col_unwrapped_dst); - WriteRegWord(DMAP1, 0x1801u); + WriteRegWord(DMAP1, 0x1801); WriteRegWord(A1T1L, ADDR16_OF_RAM(*bg1_column_update_tilemap_left_halves)); - WriteReg(A1B1, 0x7Eu); + WriteReg(A1B1, 0x7E); uint16 v1 = bg1_update_col_unwrapped_size; WriteRegWord(DAS1L, bg1_update_col_unwrapped_size); WriteReg(MDMAEN, 2u); @@ -547,9 +547,9 @@ void Nmi_ProcessHorizScrollingDma(void) { // 0x808CD8 LOBYTE(bg2_update_col_enable) = 0; uint16 v4 = bg2_update_col_unwrapped_dst; WriteRegWord(VMADDL, bg2_update_col_unwrapped_dst); - WriteRegWord(DMAP1, 0x1801u); + WriteRegWord(DMAP1, 0x1801); WriteRegWord(A1T1L, ADDR16_OF_RAM(*bg2_column_update_tilemap_left_halves)); - WriteReg(A1B1, 0x7Eu); + WriteReg(A1B1, 0x7E); uint16 v5 = bg2_update_col_unwrapped_size; WriteRegWord(DAS1L, bg2_update_col_unwrapped_size); WriteReg(MDMAEN, 2u); @@ -578,9 +578,9 @@ void Nmi_ProcessVertScrollingDma(void) { // 0x808DAC LOBYTE(bg1_update_row_enable) = 0; uint16 v0 = bg1_update_row_unwrapped_dst; WriteRegWord(VMADDL, bg1_update_row_unwrapped_dst); - WriteRegWord(DMAP1, 0x1801u); + WriteRegWord(DMAP1, 0x1801); WriteRegWord(A1T1L, ADDR16_OF_RAM(*bg1_column_update_tilemap_top_halves)); - WriteReg(A1B1, 0x7Eu); + WriteReg(A1B1, 0x7E); uint16 v1 = bg1_update_row_unwrapped_size; WriteRegWord(DAS1L, bg1_update_row_unwrapped_size); WriteReg(MDMAEN, 2u); @@ -605,9 +605,9 @@ void Nmi_ProcessVertScrollingDma(void) { // 0x808DAC LOBYTE(bg2_update_row_enable) = 0; uint16 v4 = bg2_update_row_unwrapped_dst; WriteRegWord(VMADDL, bg2_update_row_unwrapped_dst); - WriteRegWord(DMAP1, 0x1801u); + WriteRegWord(DMAP1, 0x1801); WriteRegWord(A1T1L, ADDR16_OF_RAM(*bg2_column_update_tilemap_top_halves)); - WriteReg(A1B1, 0x7Eu); + WriteReg(A1B1, 0x7E); uint16 v5 = bg2_update_row_unwrapped_size; WriteRegWord(DAS1L, bg2_update_row_unwrapped_size); WriteReg(MDMAEN, 2u); @@ -933,15 +933,15 @@ void NmiUpdateIoRegisters(void) { // 0x8091EE } void NmiUpdatePalettesAndOam(void) { // 0x80933A - WriteRegWord(DMAP0, 0x400u); + WriteRegWord(DMAP0, 0x400); WriteRegWord(A1T0L, ADDR16_OF_RAM(*oam_ent)); WriteReg(A1B0, 0); - WriteRegWord(DAS0L, 0x220u); + WriteRegWord(DAS0L, 0x220); WriteRegWord(OAMADDL, 0); - WriteRegWord(DMAP1, 0x2200u); + WriteRegWord(DMAP1, 0x2200); WriteRegWord(A1T1L, ADDR16_OF_RAM(*palette_buffer)); - WriteReg(A1B1, 0x7Eu); - WriteRegWord(DAS1L, 0x200u); + WriteReg(A1B1, 0x7E); + WriteRegWord(DAS1L, 0x200); WriteReg(CGADD, 0); WriteReg(MDMAEN, 3u); } @@ -950,8 +950,8 @@ void NmiTransferSamusToVram(void) { // 0x809376 WriteReg(VMAIN, 0x80); if ((uint8)nmi_copy_samus_halves) { nmicopy1_var_d = nmi_copy_samus_top_half_src; - WriteRegWord(VMADDL, 0x6000u); - WriteRegWord(DMAP1, 0x1801u); + WriteRegWord(VMADDL, 0x6000); + WriteRegWord(DMAP1, 0x1801); uint16 v0 = *(uint16 *)RomPtr_92(nmicopy1_var_d); WriteRegWord(A1T1L, v0); R20_ = v0; @@ -961,7 +961,7 @@ void NmiTransferSamusToVram(void) { // 0x809376 WriteRegWord(DAS1L, v2); R20_ += v2; WriteReg(MDMAEN, 2u); - WriteRegWord(VMADDL, 0x6100u); + WriteRegWord(VMADDL, 0x6100); WriteRegWord(A1T1L, R20_); uint8 *v3 = RomPtr_92(nmicopy1_var_d); if (*(uint16 *)(v3 + 5)) { @@ -971,8 +971,8 @@ void NmiTransferSamusToVram(void) { // 0x809376 } if (HIBYTE(nmi_copy_samus_halves)) { nmicopy1_var_d = nmi_copy_samus_bottom_half_src; - WriteRegWord(VMADDL, 0x6080u); - WriteRegWord(DMAP1, 0x1801u); + WriteRegWord(VMADDL, 0x6080); + WriteRegWord(DMAP1, 0x1801); uint16 v4 = *(uint16 *)RomPtr_92(nmicopy1_var_d); WriteRegWord(A1T1L, v4); R20_ = v4; @@ -982,7 +982,7 @@ void NmiTransferSamusToVram(void) { // 0x809376 WriteRegWord(DAS1L, v6); R20_ += v6; WriteReg(MDMAEN, 2u); - WriteRegWord(VMADDL, 0x6180u); + WriteRegWord(VMADDL, 0x6180); WriteRegWord(A1T1L, R20_); uint8 *v7 = RomPtr_92(nmicopy1_var_d); if (*(uint16 *)(v7 + 5)) { @@ -999,8 +999,8 @@ void NmiProcessAnimtilesVramTransfers(void) { // 0x809416 if (animtiles_ids[v1]) { if (animtiles_src_ptr[v1]) { WriteRegWord(A1T0L, animtiles_src_ptr[v1]); - WriteReg(A1B0, 0x87u); - WriteRegWord(DMAP0, 0x1801u); + WriteReg(A1B0, 0x87); + WriteRegWord(DMAP0, 0x1801); WriteRegWord(DAS0L, animtiles_sizes[v1]); WriteRegWord(VMADDL, animtiles_vram_ptr[v1]); WriteReg(VMAIN, 0x80); @@ -1117,14 +1117,14 @@ void Vector_NMI(void) { // 0x809583 void Irq_DoorTransitionVramUpdate(void) { // 0x809632 WriteReg(INIDISP, 0x80); WriteRegWord(VMADDL, door_transition_vram_update_dst); - WriteRegWord(DMAP1, 0x1801u); + WriteRegWord(DMAP1, 0x1801); WriteRegWord(A1T1L, door_transition_vram_update_src.addr); WriteReg(A1B1, door_transition_vram_update_src.bank); WriteRegWord(DAS1L, door_transition_vram_update_size); WriteReg(VMAIN, 0x80); WriteReg(MDMAEN, 2u); door_transition_vram_update_enabled &= ~0x8000; - WriteReg(INIDISP, 0xFu); + WriteReg(INIDISP, 0xF); } void WaitForIrqDoorTransitionVramUpdate(void) { @@ -1151,7 +1151,7 @@ void IrqHandler_2_DisableIRQ(void) { // 0x809680 } void IrqHandler_4_Main_BeginHudDraw(void) { // 0x80968B - WriteReg(BG3SC, 0x5Au); + WriteReg(BG3SC, 0x5A); WriteReg(CGWSEL, 0); WriteReg(CGADSUB, 0); WriteReg(TM, 4u); @@ -1170,7 +1170,7 @@ void IrqHandler_6_Main_EndHudDraw(void) { // 0x8096A9 } void IrqHandler_8_StartOfDoor_BeginHud(void) { // 0x8096D3 - WriteReg(BG3SC, 0x5Au); + WriteReg(BG3SC, 0x5A); WriteReg(TM, 4u); WriteReg(CGWSEL, 0); WriteReg(CGADSUB, 0); @@ -1331,19 +1331,19 @@ void AddMissilesToHudTilemap(void) { } void AddSuperMissilesToHudTilemap(void) { // 0x809A0E - AddToTilemapInner(0x1Cu, addr_kHudTilemaps_Missiles + 12); + AddToTilemapInner(0x1C, addr_kHudTilemaps_Missiles + 12); } void AddPowerBombsToHudTilemap(void) { // 0x809A1E - AddToTilemapInner(0x22u, addr_kHudTilemaps_Missiles + 20); + AddToTilemapInner(0x22, addr_kHudTilemaps_Missiles + 20); } void AddGrappleToHudTilemap(void) { // 0x809A2E - AddToTilemapInner(0x28u, addr_kHudTilemaps_Missiles + 28); + AddToTilemapInner(0x28, addr_kHudTilemaps_Missiles + 28); } void AddXrayToHudTilemap(void) { // 0x809A3E - AddToTilemapInner(0x2Eu, addr_kHudTilemaps_Missiles + 36); + AddToTilemapInner(0x2E, addr_kHudTilemaps_Missiles + 36); } void AddToTilemapInner(uint16 k, uint16 j) { // 0x809A4C @@ -1384,13 +1384,13 @@ void InitializeHud(void) { // 0x809A79 R0_.addr = addr_kDigitTilesetsWeapon; *(uint16 *)&R0_.bank = 128; if (samus_max_missiles) - DrawThreeHudDigits(samus_missiles, 0x94u); + DrawThreeHudDigits(samus_missiles, 0x94); if (samus_max_super_missiles) - DrawTwoHudDigits(samus_super_missiles, 0x9Cu); + DrawTwoHudDigits(samus_super_missiles, 0x9C); if (samus_max_power_bombs) - DrawTwoHudDigits(samus_power_bombs, 0xA2u); - ToggleHudItemHighlight(hud_item_index, 0x1000u); - ToggleHudItemHighlight(samus_prev_hud_item_index, 0x1400u); + DrawTwoHudDigits(samus_power_bombs, 0xA2); + ToggleHudItemHighlight(hud_item_index, 0x1000); + ToggleHudItemHighlight(samus_prev_hud_item_index, 0x1400); HandleHudTilemap(); } @@ -1429,27 +1429,27 @@ void HandleHudTilemap(void) { // 0x809B44 v2 += 2; } while ((int16)(v2 - 28) < 0); R0_.addr = addr_kDigitTilesetsHealth; - DrawTwoHudDigits(R18_, 0x8Cu); + DrawTwoHudDigits(R18_, 0x8C); } R0_.addr = addr_kDigitTilesetsWeapon; if (samus_max_missiles && samus_missiles != samus_prev_missiles) { samus_prev_missiles = samus_missiles; - DrawThreeHudDigits(samus_missiles, 0x94u); + DrawThreeHudDigits(samus_missiles, 0x94); } if (samus_max_super_missiles && samus_super_missiles != samus_prev_super_missiles) { samus_prev_super_missiles = samus_super_missiles; if ((joypad_dbg_flags & 0x1F40) != 0) - DrawThreeHudDigits(samus_prev_super_missiles, 0x9Cu); + DrawThreeHudDigits(samus_prev_super_missiles, 0x9C); else - DrawTwoHudDigits(samus_prev_super_missiles, 0x9Cu); + DrawTwoHudDigits(samus_prev_super_missiles, 0x9C); } if (samus_max_power_bombs && samus_power_bombs != samus_prev_power_bombs) { samus_prev_power_bombs = samus_power_bombs; - DrawTwoHudDigits(samus_power_bombs, 0xA2u); + DrawTwoHudDigits(samus_power_bombs, 0xA2); } if (hud_item_index != samus_prev_hud_item_index) { - ToggleHudItemHighlight(hud_item_index, 0x1000u); - ToggleHudItemHighlight(samus_prev_hud_item_index, 0x1400u); + ToggleHudItemHighlight(hud_item_index, 0x1000); + ToggleHudItemHighlight(samus_prev_hud_item_index, 0x1400); samus_prev_hud_item_index = hud_item_index; if (samus_movement_type != 3 && samus_movement_type != 20 @@ -1634,9 +1634,9 @@ uint8 ProcessTimer_Decrement(void) { // 0x809EA9 void DrawTimer(void) { // 0x809F6C DrawTimerSpritemap(0, addr_word_80A060); - DrawTwoTimerDigits(*(uint16 *)&timer_minutes, 0xFFE4u); - DrawTwoTimerDigits(*(uint16 *)&timer_seconds, 0xFFFCu); - DrawTwoTimerDigits(*(uint16 *)&timer_centiseconds, 0x14u); + DrawTwoTimerDigits(*(uint16 *)&timer_minutes, 0xFFE4); + DrawTwoTimerDigits(*(uint16 *)&timer_seconds, 0xFFFC); + DrawTwoTimerDigits(*(uint16 *)&timer_centiseconds, 0x14); } #define kTimerDigitsSpritemapPtr ((uint16*)RomPtr(0x809fd4)) @@ -1768,35 +1768,35 @@ void QueueClearingOfFxTilemap(void) { // 0x80A211 } void ClearBG2Tilemap(void) { // 0x80A23F - WriteRegWord(VMADDL, 0x4800u); - WriteRegWord(DMAP1, 0x1808u); - WriteRegWord(A1T1L, 0xA29Au); + WriteRegWord(VMADDL, 0x4800); + WriteRegWord(DMAP1, 0x1808); + WriteRegWord(A1T1L, 0xA29A); WriteRegWord(A1B1, 0x80); - WriteRegWord(DAS1L, 0x800u); + WriteRegWord(DAS1L, 0x800); WriteReg(VMAIN, 0); WriteReg(MDMAEN, 2u); - WriteRegWord(VMADDL, 0x4800u); - WriteRegWord(DMAP1, 0x1908u); - WriteRegWord(A1T1L, 0xA29Au); + WriteRegWord(VMADDL, 0x4800); + WriteRegWord(DMAP1, 0x1908); + WriteRegWord(A1T1L, 0xA29A); WriteRegWord(A1B1, 0x80); - WriteRegWord(DAS1L, 0x800u); + WriteRegWord(DAS1L, 0x800); WriteReg(VMAIN, 0x80); WriteReg(MDMAEN, 2u); } void ClearFXTilemap(void) { // 0x80A29C - WriteRegWord(VMADDL, 0x5880u); - WriteRegWord(DMAP1, 0x1808u); - WriteRegWord(A1T1L, 0xA2F7u); + WriteRegWord(VMADDL, 0x5880); + WriteRegWord(DMAP1, 0x1808); + WriteRegWord(A1T1L, 0xA2F7); WriteRegWord(A1B1, 0x80); - WriteRegWord(DAS1L, 0x780u); + WriteRegWord(DAS1L, 0x780); WriteReg(VMAIN, 0); WriteReg(MDMAEN, 2u); - WriteRegWord(VMADDL, 0x5880u); - WriteRegWord(DMAP1, 0x1908u); - WriteRegWord(A1T1L, 0xA2F8u); + WriteRegWord(VMADDL, 0x5880); + WriteRegWord(DMAP1, 0x1908); + WriteRegWord(A1T1L, 0xA2F8); WriteRegWord(A1B1, 0x80); - WriteRegWord(DAS1L, 0x780u); + WriteRegWord(DAS1L, 0x780); WriteReg(VMAIN, 0x80); WriteReg(MDMAEN, 2u); } @@ -2175,7 +2175,7 @@ void UpdateLevelOrBackgroundDataColumn(uint16 k) { // 0x80A9DE uint16 v3 = (4 * (uint8)vram_blocks_to_update_y_block) & 0x3C; *(uint16 *)((char *)&bg1_update_col_wrapped_size + k) = v3; *(uint16 *)((char *)&bg1_update_col_unwrapped_size + k) = (v3 ^ 0x3F) + 1; - prod = Mult8x8(vram_blocks_to_update_y_block & 0xF, 0x40u); + prod = Mult8x8(vram_blocks_to_update_y_block & 0xF, 0x40); x_block_of_vram_blocks_to_update = vram_blocks_to_update_x_block & 0x1F; uint16 v4 = 2 * x_block_of_vram_blocks_to_update; temp933 = prod + v4; @@ -2266,7 +2266,7 @@ void UpdateLevelOrBackgroundDataRow(uint16 v0) { // 0x80AB78 temp933 = vram_blocks_to_update_x_block & 0xF; *(uint16 *)((char *)&bg1_update_row_unwrapped_size + v0) = 4 * (16 - temp933); *(uint16 *)((char *)&bg1_update_row_wrapped_size + v0) = 4 * (temp933 + 1); - prod = Mult8x8(vram_blocks_to_update_y_block & 0xF, 0x40u); + prod = Mult8x8(vram_blocks_to_update_y_block & 0xF, 0x40); x_block_of_vram_blocks_to_update = vram_blocks_to_update_x_block & 0x1F; uint16 v3 = 2 * x_block_of_vram_blocks_to_update; temp933 = prod + v3; diff --git a/src/sm_81.c b/src/sm_81.c index e4c9b95..befc0f0 100644 --- a/src/sm_81.c +++ b/src/sm_81.c @@ -716,19 +716,19 @@ void LoadInitialMenuTiles(void) { // 0x818DDB SetupDmaTransfer(&unk_818DF1); WriteReg(MDMAEN, 2u); WriteReg(VMADDL, 0); - WriteReg(VMADDH, 0x30u); + WriteReg(VMADDH, 0x30); WriteReg(VMAIN, 0x80); static const StartDmaCopy unk_818E11 = { 1, 1, 0x18, LONGPTR(0xb68000), 0x2000 }; SetupDmaTransfer(&unk_818E11); WriteReg(MDMAEN, 2u); WriteReg(VMADDL, 0); - WriteReg(VMADDH, 0x60u); + WriteReg(VMADDH, 0x60); WriteReg(VMAIN, 0x80); static const StartDmaCopy unk_818E31 = { 1, 1, 0x18, LONGPTR(0xb6c000), 0x2000 }; SetupDmaTransfer(&unk_818E31); WriteReg(MDMAEN, 2u); WriteReg(VMADDL, 0); - WriteReg(VMADDH, 0x40u); + WriteReg(VMADDH, 0x40); WriteReg(VMAIN, 0x80); static const StartDmaCopy unk_818E51 = { 1, 1, 0x18, LONGPTR(0x8ed600), 0x0600 }; SetupDmaTransfer(&unk_818E51); @@ -814,7 +814,7 @@ void RestorePalettesAndIoAfterDebugGameover(void) { // 0x81905B void GameOverMenu_5_Continue(void) { // 0x81907E WriteReg(VMADDL, 0); - WriteReg(VMADDH, 0x40u); + WriteReg(VMADDH, 0x40); WriteReg(VMAIN, 0x80); static const StartDmaCopy unk_819093 = { 1, 1, 0x18, LONGPTR(0x9ab200), 0x2000 }; SetupDmaTransfer(&unk_819093); @@ -918,11 +918,11 @@ void GameOverMenu_1_Init(void) { // 0x8191A4 v2->vram_dst = (reg_BG1SC & 0xFC) << 8; vram_write_queue_tail = v1 + 7; enemy_data[0].palette_index = 0; - LoadMenuTilemap(0x156u, addr_kMenuTilemap_GameOver); - LoadMenuTilemap(0x38Au, addr_kMenuTilemap_FindMetroidLarva); - LoadMenuTilemap(0x414u, addr_kMenuTilemap_TryAgain); - LoadMenuTilemap(0x4CEu, addr_kMenuTilemap_YesReturnToGame); - LoadMenuTilemap(0x5CEu, addr_kMenuTilemap_NoGoToTitle); + LoadMenuTilemap(0x156, addr_kMenuTilemap_GameOver); + LoadMenuTilemap(0x38A, addr_kMenuTilemap_FindMetroidLarva); + LoadMenuTilemap(0x414, addr_kMenuTilemap_TryAgain); + LoadMenuTilemap(0x4CE, addr_kMenuTilemap_YesReturnToGame); + LoadMenuTilemap(0x5CE, addr_kMenuTilemap_NoGoToTitle); enemy_data[0].current_instruction = 0; enemy_data[0].instruction_timer = 0; HandleGameOverBabyMetroid(); @@ -1094,8 +1094,8 @@ void FileSelectMenu_6_FileCopyInit(void) { // 0x819561 void FileSelectMenu_Func1(void) { // 0x819566 ClearMenuTilemap(); enemy_data[0].palette_index = 0; - LoadMenuTilemap(0x52u, addr_kMenuTilemap_DataCopyMode); - LoadMenuTilemap(0x150u, addr_kMenuTilemap_CopyWhichData); + LoadMenuTilemap(0x52, addr_kMenuTilemap_DataCopyMode); + LoadMenuTilemap(0x150, addr_kMenuTilemap_CopyWhichData); LoadMenuExitTilemap(); DrawFileCopySaveFileInfo(); SetInitialFileCopyMenuSelection(); @@ -1126,7 +1126,7 @@ void ClearMenuTilemap(void) { // 0x8195A6 } void LoadMenuExitTilemap(void) { // 0x8195B5 - LoadMenuTilemap(0x688u, addr_kMenuTilemap_Exit); + LoadMenuTilemap(0x688, addr_kMenuTilemap_Exit); } void DrawFileCopySaveFileInfo(void) { // 0x8195BE @@ -1149,24 +1149,24 @@ void DrawFileCopySaveFileInfo(void) { // 0x8195BE } void DrawFileCopySaveSlotAInfo(void) { // 0x81960F - DrawFileSelectionHealth((nonempty_save_slots & 1) == 0, 0x218u); - DrawFileSelectionTime((nonempty_save_slots & 1) == 0, 0x272u); - LoadMenuTilemap(0x234u, addr_kMenuTilemap_TIME); - LoadMenuTilemap(0x208u, addr_kMenuTilemap_SamusA); + DrawFileSelectionHealth((nonempty_save_slots & 1) == 0, 0x218); + DrawFileSelectionTime((nonempty_save_slots & 1) == 0, 0x272); + LoadMenuTilemap(0x234, addr_kMenuTilemap_TIME); + LoadMenuTilemap(0x208, addr_kMenuTilemap_SamusA); } void DrawFileCopySaveSlotBInfo(void) { // 0x81963F - DrawFileSelectionHealth(~(uint8)nonempty_save_slots & 2, 0x318u); - DrawFileSelectionTime(~(uint8)nonempty_save_slots & 2, 0x372u); - LoadMenuTilemap(0x334u, addr_kMenuTilemap_TIME); - LoadMenuTilemap(0x308u, addr_kMenuTilemap_SamusB); + DrawFileSelectionHealth(~(uint8)nonempty_save_slots & 2, 0x318); + DrawFileSelectionTime(~(uint8)nonempty_save_slots & 2, 0x372); + LoadMenuTilemap(0x334, addr_kMenuTilemap_TIME); + LoadMenuTilemap(0x308, addr_kMenuTilemap_SamusB); } void DrawFileCopySaveSlotCInfo(void) { // 0x81966F - DrawFileSelectionHealth(~(uint8)nonempty_save_slots & 4, 0x418u); - DrawFileSelectionTime(~(uint8)nonempty_save_slots & 4, 0x472u); - LoadMenuTilemap(0x434u, addr_kMenuTilemap_TIME); - LoadMenuTilemap(0x408u, addr_kMenuTilemap_SamusC); + DrawFileSelectionHealth(~(uint8)nonempty_save_slots & 4, 0x418); + DrawFileSelectionTime(~(uint8)nonempty_save_slots & 4, 0x472); + LoadMenuTilemap(0x434, addr_kMenuTilemap_TIME); + LoadMenuTilemap(0x408, addr_kMenuTilemap_SamusC); } void QueueTransferOfMenuTilemapToVramBG1(void) { // 0x81969F @@ -1247,9 +1247,9 @@ void FileSelectMenu_9_InitializeSelectDest(void) { // 0x81977A void DrawFileCopySelectDestinationSaveFileInfo(void) { // 0x819799 ClearMenuTilemap(); enemy_data[0].palette_index = 0; - LoadMenuTilemap(0x52u, addr_kMenuTilemap_DataCopyMode); + LoadMenuTilemap(0x52, addr_kMenuTilemap_DataCopyMode); enemy_data[0].palette_index = 0; - LoadMenuTilemap(0x148u, addr_kMenuTilemap_CopySamusToWhere); + LoadMenuTilemap(0x148, addr_kMenuTilemap_CopySamusToWhere); ram3000.pause_menu_map_tilemap[944] = enemy_projectile_id[16] + 8298; LoadMenuExitTilemap(); LoadFromSram_(0); @@ -1322,7 +1322,7 @@ LABEL_8: void FileSelectMenu_11_InitializeConfirm(void) { // 0x8198B7 DrawBorderAroundDataCopyMode(); enemy_data[0].palette_index = 0; - LoadMenuTilemap(0x144u, addr_kMenuTilemap_CopySamusToSamus); + LoadMenuTilemap(0x144, addr_kMenuTilemap_CopySamusToSamus); ram3000.pause_menu_map_tilemap[942] = enemy_projectile_id[16] + 8298; ram3000.pause_menu_map_tilemap[955] = enemy_projectile_id[17] + 8298; DrawFileCopyClearConfirmation(); @@ -1333,16 +1333,16 @@ void FileSelectMenu_11_InitializeConfirm(void) { // 0x8198B7 void DrawFileCopyClearConfirmation(void) { // 0x8198ED enemy_data[0].palette_index = 0; - LoadMenuTilemap(0x514u, addr_kMenuTilemap_IsThisOk); + LoadMenuTilemap(0x514, addr_kMenuTilemap_IsThisOk); enemy_data[0].palette_index = 0; - LoadMenuTilemap(0x59Cu, addr_kMenuTilemap_Yes); + LoadMenuTilemap(0x59C, addr_kMenuTilemap_Yes); int v0 = 832; do { ram3000.pause_menu_map_tilemap[v0 + 768] = 15; ++v0; } while ((int16)(v0 * 2 - 1728) < 0); enemy_data[0].palette_index = 0; - LoadMenuTilemap(0x65Cu, addr_kMenuTilemap_No); + LoadMenuTilemap(0x65C, addr_kMenuTilemap_No); DrawFileCopyConfirmationSaveFileInfo(); } @@ -1453,7 +1453,7 @@ void FileSelectMenu_13_FileCopyDoIt(void) { // 0x819A2C v7 += 2; } while ((int16)(v7 - 22) < 0); enemy_data[0].palette_index = 0; - LoadMenuTilemap(0x510u, addr_kMenuTilemap_CopyCompleted); + LoadMenuTilemap(0x510, addr_kMenuTilemap_CopyCompleted); DrawFileCopyConfirmationSaveFileInfo(); RtlWriteSram(); } @@ -1485,8 +1485,8 @@ void FileSelectMenu_20_FileClearInit(void) { // 0x819B33 void InitFileSelectMenuFileClear(void) { // 0x819B3C ClearMenuTilemap(); enemy_data[0].palette_index = 0; - LoadMenuTilemap(0x50u, addr_kMenuTilemap_DataClearMode); - LoadMenuTilemap(0x140u, addr_kMenuTilemap_ClearWhichData); + LoadMenuTilemap(0x50, addr_kMenuTilemap_DataClearMode); + LoadMenuTilemap(0x140, addr_kMenuTilemap_ClearWhichData); LoadMenuExitTilemap(); DrawFileCopySaveFileInfo(); enemy_projectile_id[16] = 0; @@ -1547,7 +1547,7 @@ void SetFileClearMenuMissilePos(void) { // 0x819BEF void FileSelectMenu_23_FileClearInitConfirm(void) { // 0x819C0B DrawBorderAroundDataClearMode(); enemy_data[0].palette_index = 0; - LoadMenuTilemap(0x140u, addr_kMenuTilemap_ClearSamusA); + LoadMenuTilemap(0x140, addr_kMenuTilemap_ClearSamusA); ram3000.pause_menu_map_tilemap[949] = enemy_projectile_id[16] + 8298; enemy_projectile_id[17] = 3; DrawFileCopyClearConfirmation(); @@ -1612,7 +1612,7 @@ void FileSelectMenu_25_FileClearDoClear(void) { // 0x819C9E } while ((int16)(v3 * 2 - 1856) < 0); nonempty_save_slots &= kBitShl_Not[enemy_projectile_id[16]]; enemy_data[0].palette_index = 0; - LoadMenuTilemap(0x500u, addr_kMenuTilemap_DataCleared); + LoadMenuTilemap(0x500, addr_kMenuTilemap_DataCleared); DrawFileCopyConfirmationSaveFileInfo(); RtlWriteSram(); } @@ -1762,36 +1762,36 @@ void FileSelectMenu_16(void) { // 0x819EF3 *(uint16 *)((char *)&ram3000.pause_menu_map_tilemap[768] + (uint16)i) = 15; nonempty_save_slots = -1; enemy_data[0].palette_index = 0; - LoadMenuTilemap(0x56u, addr_kMenuTilemap_SamusData); - LoadMenuTilemap(0x146u, addr_kMenuTilemap_SamusA); + LoadMenuTilemap(0x56, addr_kMenuTilemap_SamusData); + LoadMenuTilemap(0x146, addr_kMenuTilemap_SamusA); uint8 c = LoadFromSram_(0); nonempty_save_slots = (nonempty_save_slots >> 1) | (c << 15); - DrawFileSelectionHealth(nonempty_save_slots & 0x8000, 0x15Cu); - DrawFileSelectionTime(nonempty_save_slots & 0x8000, 0x1B4u); - LoadMenuTilemap(0x176u, addr_kMenuTilemap_TIME); + DrawFileSelectionHealth(nonempty_save_slots & 0x8000, 0x15C); + DrawFileSelectionTime(nonempty_save_slots & 0x8000, 0x1B4); + LoadMenuTilemap(0x176, addr_kMenuTilemap_TIME); enemy_data[0].palette_index = 0; - LoadMenuTilemap(0x286u, addr_kMenuTilemap_SamusB); + LoadMenuTilemap(0x286, addr_kMenuTilemap_SamusB); c = LoadFromSram_(1u); nonempty_save_slots = (nonempty_save_slots >> 1) | (c << 15); - DrawFileSelectionHealth(nonempty_save_slots & 0x8000, 0x29Cu); - DrawFileSelectionTime(nonempty_save_slots & 0x8000, 0x2F4u); - LoadMenuTilemap(0x2B6u, addr_kMenuTilemap_TIME); + DrawFileSelectionHealth(nonempty_save_slots & 0x8000, 0x29C); + DrawFileSelectionTime(nonempty_save_slots & 0x8000, 0x2F4); + LoadMenuTilemap(0x2B6, addr_kMenuTilemap_TIME); enemy_data[0].palette_index = 0; - LoadMenuTilemap(0x3C6u, addr_kMenuTilemap_SamusC); + LoadMenuTilemap(0x3C6, addr_kMenuTilemap_SamusC); c = LoadFromSram_(2u); nonempty_save_slots = (nonempty_save_slots >> 1) | (c << 15); - DrawFileSelectionHealth(nonempty_save_slots & 0x8000, 0x3DCu); - DrawFileSelectionTime(nonempty_save_slots & 0x8000, 0x434u); - LoadMenuTilemap(0x3F6u, addr_kMenuTilemap_TIME); + DrawFileSelectionHealth(nonempty_save_slots & 0x8000, 0x3DC); + DrawFileSelectionTime(nonempty_save_slots & 0x8000, 0x434); + LoadMenuTilemap(0x3F6, addr_kMenuTilemap_TIME); nonempty_save_slots = swap16(~nonempty_save_slots) >> 5; if (nonempty_save_slots) { enemy_data[0].palette_index = 0; - LoadMenuTilemap(0x508u, addr_kMenuTilemap_DataCopy); + LoadMenuTilemap(0x508, addr_kMenuTilemap_DataCopy); enemy_data[0].palette_index = 0; - LoadMenuTilemap(0x5C8u, addr_kMenuTilemap_DataClear); + LoadMenuTilemap(0x5C8, addr_kMenuTilemap_DataClear); } enemy_data[0].palette_index = 0; - LoadMenuTilemap(0x688u, addr_kMenuTilemap_Exit); + LoadMenuTilemap(0x688, addr_kMenuTilemap_Exit); QueueTransferOfMenuTilemapToVramBG1(); enemy_projectile_enable_flag = 1; enemy_projectile_unk198F = 0; @@ -2014,7 +2014,7 @@ void FileSelectMap_1(void) { // 0x81A37C int16 v2; - if (AdvanceGradualColorChangeOfPalette(0, 0x40u)) { + if (AdvanceGradualColorChangeOfPalette(0, 0x40)) { reg_BG1VOFS = 0; reg_BG1HOFS = 0; reg_BG2VOFS = 0; @@ -2128,13 +2128,13 @@ void FileSelectMap_4_SetupExpandingSquareTransition(void) { // 0x81A5B3 reg_CGWSEL = 2; WriteReg(CGWSEL, 2u); reg_CGADSUB = 37; - WriteReg(CGADSUB, 0x25u); + WriteReg(CGADSUB, 0x25); reg_COLDATA[2] = 0x80; reg_COLDATA[1] = 64; reg_COLDATA[0] = 32; SetupInitialExpandingSquareHDMA(); reg_HDMAEN = 12; - WriteReg(HDMAEN, 0xCu); + WriteReg(HDMAEN, 0xC); ConfigureWindow1ForExpandingSquare(); hdma_objects_enable_flag = 0; LOBYTE(menu_index) = menu_index + 1; @@ -2142,15 +2142,15 @@ void FileSelectMap_4_SetupExpandingSquareTransition(void) { // 0x81A5B3 void ConfigureWindow1ForExpandingSquare(void) { // 0x81A5F6 reg_TM = 19; - WriteReg(TM, 0x13u); + WriteReg(TM, 0x13); reg_TMW = 19; - WriteReg(TMW, 0x13u); + WriteReg(TMW, 0x13); reg_W12SEL = 35; - WriteReg(W12SEL, 0x23u); + WriteReg(W12SEL, 0x23); reg_W34SEL = 3; WriteReg(W34SEL, 3u); reg_WOBJSEL = 35; - WriteReg(WOBJSEL, 0x23u); + WriteReg(WOBJSEL, 0x23); } void SetupInitialExpandingSquareHDMA(void) { // 0x81A61C @@ -2170,12 +2170,12 @@ void SetupInitialExpandingSquareHDMA(void) { // 0x81A61C hdma_window_1_left_pos[3].field_0 = 111; hdma_window_1_left_pos[3].field_1 = 32; hdma_window_1_left_pos[3].field_2 = -98; - WriteReg(DMAP2, 0x40u); - WriteReg(BBAD2, 0x26u); + WriteReg(DMAP2, 0x40); + WriteReg(BBAD2, 0x26); WriteReg(A1T2L, 0); - WriteReg(A1T2H, 0x9Eu); - WriteReg(A1B2, 0x7Eu); - WriteReg(DAS20, 0x7Eu); + WriteReg(A1T2H, 0x9E); + WriteReg(A1B2, 0x7E); + WriteReg(DAS20, 0x7E); WriteReg(DAS2L, 0); WriteReg(DAS2H, 0); WriteReg(A2A2L, 0); @@ -2193,12 +2193,12 @@ void SetupInitialExpandingSquareHDMA(void) { // 0x81A61C hdma_window_1_right_pos[3].field_0 = 111; hdma_window_1_right_pos[3].field_1 = 32; hdma_window_1_right_pos[3].field_2 = -98; - WriteReg(DMAP3, 0x40u); - WriteReg(BBAD3, 0x27u); - WriteReg(A1T3L, 0x10u); - WriteReg(A1T3H, 0x9Eu); - WriteReg(A1B3, 0x7Eu); - WriteReg(DAS30, 0x7Eu); + WriteReg(DMAP3, 0x40); + WriteReg(BBAD3, 0x27); + WriteReg(A1T3L, 0x10); + WriteReg(A1T3H, 0x9E); + WriteReg(A1B3, 0x7E); + WriteReg(DAS30, 0x7E); WriteReg(DAS3L, 0); WriteReg(DAS3H, 0); WriteReg(A2A3L, 0); @@ -2415,7 +2415,7 @@ void DrawAreaSelectMapLabels(void) { int v5; R3_.addr = 0; - DrawMenuSpritemap(g_word_82C749[0], 0x80, 0x10u); + DrawMenuSpritemap(g_word_82C749[0], 0x80, 0x10); R28_ = 0; do { v0 = 512; @@ -2464,13 +2464,13 @@ void FileSelectMap_7_PrepExpandSquareTransToRoomMap(void) { // 0x81AAAC reg_TM = 19; reg_TMW = 19; reg_W12SEL = 50; - WriteReg(W12SEL, 0x32u); + WriteReg(W12SEL, 0x32); reg_W34SEL = 2; WriteReg(W34SEL, 2u); reg_CGADSUB = 5; WriteReg(CGADSUB, 5u); reg_WOBJSEL = 34; - WriteReg(WOBJSEL, 0x22u); + WriteReg(WOBJSEL, 0x22); reg_BG12NBA = 48; hdma_window_1_left_pos[3].field_0 = 0; hdma_window_1_right_pos[3].field_0 = 0; @@ -2510,7 +2510,7 @@ void FileSelectMap_7_PrepExpandSquareTransToRoomMap(void) { // 0x81AAAC + (uint16)(16 * area_index)); SetupRoomSelectMapExpandingSquareTransHDMA(); reg_HDMAEN = 12; - WriteReg(HDMAEN, 0xCu); + WriteReg(HDMAEN, 0xC); ++menu_index; QueueSfx1_Max6(0x3Bu); } @@ -2518,18 +2518,18 @@ void FileSelectMap_7_PrepExpandSquareTransToRoomMap(void) { // 0x81AAAC void SetupRoomSelectMapExpandingSquareTransHDMA(void) { // 0x81ABA7 uint16 k = 0; uint16 v0 = expanding_square_top_pos; - AddExpandingSqTransLeftIndirHDMA(v0, k, 0x9E22u); - k = AddExpandingSqTransRightIndirHDMA(v0, k, 0x9E20u); + AddExpandingSqTransLeftIndirHDMA(v0, k, 0x9E22); + k = AddExpandingSqTransRightIndirHDMA(v0, k, 0x9E20); uint16 v2 = expanding_square_bottom_pos - expanding_square_top_pos; if ((uint8)expanding_square_bottom_pos == (uint8)expanding_square_top_pos) v2 = 1; - AddExpandingSqTransLeftIndirHDMA(v2, k, 0x9E32u); - k = AddExpandingSqTransRightIndirHDMA(v2, k, 0x9E36u); + AddExpandingSqTransLeftIndirHDMA(v2, k, 0x9E32); + k = AddExpandingSqTransRightIndirHDMA(v2, k, 0x9E36); uint16 v4 = -32 - expanding_square_bottom_pos; if ((uint8)expanding_square_bottom_pos == 0xE0) v4 = 1; - AddExpandingSqTransLeftIndirHDMA(v4, k, 0x9E22u); - k = AddExpandingSqTransRightIndirHDMA(v4, k, 0x9E20u); + AddExpandingSqTransLeftIndirHDMA(v4, k, 0x9E22); + k = AddExpandingSqTransRightIndirHDMA(v4, k, 0x9E20); *(&hdma_window_1_left_pos[0].field_0 + k) = 0; *(&hdma_window_1_right_pos[0].field_0 + k) = 0; } @@ -2812,9 +2812,9 @@ void FileSelectMap_20_SetupExpandingSquare(void) { // 0x81AFF6 SetupRoomSelectMapExpandingSquareTransHDMA(); ++menu_index; reg_HDMAEN = 12; - WriteReg(HDMAEN, 0xCu); + WriteReg(HDMAEN, 0xC); reg_W12SEL = 50; - WriteReg(W12SEL, 0x32u); + WriteReg(W12SEL, 0x32); reg_W34SEL = 2; WriteReg(W34SEL, 2u); reg_BG12NBA = 48; diff --git a/src/sm_82.c b/src/sm_82.c index 4046fdd..37b1bac 100644 --- a/src/sm_82.c +++ b/src/sm_82.c @@ -176,11 +176,11 @@ void InitPpuForGameplay(void) { // 0x8281DD reg_BG34NBA = 4; WriteReg(BG34NBA, 4u); reg_BG1SC = 81; - WriteReg(BG1SC, 0x51u); + WriteReg(BG1SC, 0x51); reg_BG2SC = 73; - WriteReg(BG2SC, 0x49u); + WriteReg(BG2SC, 0x49); reg_BG3SC = 90; - WriteReg(BG3SC, 0x5Au); + WriteReg(BG3SC, 0x5A); reg_BG4SC = 0; WriteReg(BG4SC, 0); WriteReg(VMAIN, 0); @@ -204,7 +204,7 @@ void InitPpuForGameplay(void) { // 0x8281DD reg_WBGLOG = 0; WriteReg(WOBJLOG, 0); reg_WOBJLOG = 0; - WriteReg(TM, 0x17u); + WriteReg(TM, 0x17); reg_TM = 23; WriteReg(TMW, 0); reg_TMW = 0; @@ -216,13 +216,13 @@ void InitPpuForGameplay(void) { // 0x8281DD next_gameplay_CGWSEL = 0; WriteReg(CGADSUB, 0); next_gameplay_CGADSUB = 0; - WriteReg(COLDATA, 0xE0u); + WriteReg(COLDATA, 0xE0); WriteReg(SETINI, 0); reg_SETINI = 0; oam_next_ptr = 0; - memset7E((uint16*)&ram3000, 0, 0x7FEu); - memset7E((uint16 *)&ram4000, 0x6Fu, 0x7FEu); - memset7E(ram4000.bg2_tilemap, 0x2C0Fu, 0xFEu); + memset7E((uint16*)&ram3000, 0, 0x7FE); + memset7E((uint16 *)&ram4000, 0x6F, 0x7FE); + memset7E(ram4000.bg2_tilemap, 0x2C0F, 0xFE); } #define kInitialPalette ((uint16*)RomPtr(0x9a8000)) @@ -241,26 +241,26 @@ void LoadInitialPalette(void) { // 0x8282C5 void LoadStdBG3andSpriteTilesClearTilemaps(void) { // 0x8282E2 WriteReg(VMADDL, 0); - WriteReg(VMADDH, 0x40u); + WriteReg(VMADDH, 0x40); WriteReg(VMAIN, 0x80); static const StartDmaCopy unk_8282F8 = { 1, 1, 0x18, LONGPTR(0x9ab200), 0x2000 }; SetupDmaTransfer(&unk_8282F8); WriteReg(MDMAEN, 2u); WriteReg(VMADDL, 0); - WriteReg(VMADDH, 0x60u); + WriteReg(VMADDH, 0x60); WriteReg(VMAIN, 0x80); // Bug fix: Asm code does DMA from RAM here. static const StartDmaCopy unk_828318 = { 1, 1, 0x18, LONGPTR(0x9ad200), 0x2e00 }; SetupDmaTransfer(&unk_828318); WriteReg(MDMAEN, 2u); WriteReg(VMADDL, 0); - WriteReg(VMADDH, 0x50u); + WriteReg(VMADDH, 0x50); WriteReg(VMAIN, 0x80); static const StartDmaCopy unk_828338 = { 1, 1, 0x18, LONGPTR(0x7e4000), 0x1000 }; SetupDmaTransfer(&unk_828338); WriteReg(MDMAEN, 2u); WriteReg(VMADDL, 0); - WriteReg(VMADDH, 0x58u); + WriteReg(VMADDH, 0x58); WriteReg(VMAIN, 0x80); static const StartDmaCopy unk_828358 = { 1, 1, 0x18, LONGPTR(0x7e4000), 0x0800 }; SetupDmaTransfer(&unk_828358); @@ -992,7 +992,7 @@ void DrawOptionsMenuSpritemaps(void) { // 0x828CA1 R22_ = optionsmenu_arr10[v1]; R20_ = optionsmenu_arr8[v1]; R18_ = optionsmenu_arr9[v1]; - DrawSpritemap(0x82u, v2); + DrawSpritemap(0x82, v2); } } } @@ -1052,10 +1052,10 @@ void BackupBG2TilemapForPauseMenu(void) { // 0x828D51 WriteRegWord(VMADDL, (reg_BG2SC & 0xFC) << 8 | 1); // fixed: this was missing WriteReg(VMAIN, 0x80); - WriteReg(DMAP1, 0x81u); - WriteReg(BBAD1, 0x39u); + WriteReg(DMAP1, 0x81); + WriteReg(BBAD1, 0x39); WriteRegWord(A1T1L, 0xDF5C); - WriteReg(A1B1, 0x7Eu); + WriteReg(A1B1, 0x7E); WriteRegWord(DAS1L, 0x1000); WriteReg(DAS10, 0); WriteRegWord(A2A1L, 0); @@ -1119,13 +1119,13 @@ void LoadPauseMenuTilesAndClearBG2(void) { // 0x828E75 SetupDmaTransfer(&unk_828E8B); WriteReg(MDMAEN, 2u); WriteReg(VMADDL, 0); - WriteReg(VMADDH, 0x20u); + WriteReg(VMADDH, 0x20); WriteReg(VMAIN, 0x80); static const StartDmaCopy unk_828EAB = { 1, 1, 0x18, LONGPTR(0xb6c000), 0x2000 }; SetupDmaTransfer(&unk_828EAB); WriteReg(MDMAEN, 2u); WriteReg(VMADDL, 0); - WriteReg(VMADDH, 0x40u); + WriteReg(VMADDH, 0x40); WriteReg(VMAIN, 0x80); static const StartDmaCopy unk_828ECB = { 1, 1, 0x18, LONGPTR(0x9ab200), 0x2000 }; SetupDmaTransfer(&unk_828ECB); @@ -1134,20 +1134,20 @@ void LoadPauseMenuTilesAndClearBG2(void) { // 0x828E75 void LoadPauseScreenBaseTilemaps(void) { // 0x828EDA WriteReg(VMADDL, 0); - WriteReg(VMADDH, 0x38u); + WriteReg(VMADDH, 0x38); WriteReg(VMAIN, 0x80); static const StartDmaCopy unk_828EF0 = { 1, 1, 0x18, LONGPTR(0xb6e000), 0x0800 }; SetupDmaTransfer(&unk_828EF0); WriteReg(MDMAEN, 2u); WriteReg(WMADDL, 0); - WriteReg(WMADDM, 0x34u); - WriteReg(WMADDH, 0x7Eu); + WriteReg(WMADDM, 0x34); + WriteReg(WMADDH, 0x7E); static const StartDmaCopy unk_828F10 = { 1, 0, 0x80, LONGPTR(0xb6e400), 0x0400 }; SetupDmaTransfer(&unk_828F10); WriteReg(MDMAEN, 2u); WriteReg(WMADDL, 0); - WriteReg(WMADDM, 0x38u); - WriteReg(WMADDH, 0x7Eu); + WriteReg(WMADDM, 0x38); + WriteReg(WMADDH, 0x7E); static const StartDmaCopy unk_828F30 = { 1, 0, 0x80, LONGPTR(0xb6e800), 0x0800 }; SetupDmaTransfer(&unk_828F30); WriteReg(MDMAEN, 2u); @@ -1499,24 +1499,24 @@ void LoadPauseMenuMapTilemapAndAreaLabel(void) { // 0x8293C3 reg_BG1HOFS = reg_BG4HOFS; reg_BG1VOFS = reg_BG4VOFS; WriteReg(VMADDL, 0); - WriteReg(VMADDH, 0x30u); + WriteReg(VMADDH, 0x30); WriteReg(VMAIN, 0x80); LoadPauseMenuMapTilemap(); static const StartDmaCopy unk_8293E9 = { 1, 1, 0x18, LONGPTR(0x7e4000), 0x1000 }; SetupDmaTransfer(&unk_8293E9); WriteReg(MDMAEN, 2u); - WriteReg(VMADDL, 0xAAu); - WriteReg(VMADDH, 0x38u); + WriteReg(VMADDL, 0xAA); + WriteReg(VMADDH, 0x38); WriteReg(VMAIN, 0x80); WriteReg(DMAP1, 1u); - WriteReg(BBAD1, 0x18u); - WriteReg(DAS1L, 0x18u); + WriteReg(BBAD1, 0x18); + WriteReg(DAS1L, 0x18); WriteReg(DAS1H, 0); uint16 v0 = area_index; if (!sign16(area_index - 7)) v0 = 0; WriteRegWord(A1T1L, kPauseAreaLabelTilemap[v0]); - WriteReg(A1B1, 0x82u); + WriteReg(A1B1, 0x82); WriteReg(MDMAEN, 2u); } @@ -1595,7 +1595,7 @@ void LoadPauseMenuMapTilemap(void) { // 0x82943D uint8 t = map_tiles_explored[v2]; map_tiles_explored[v2] <<= 1; if (!(t & 0x80)) { - IndirWriteWord(&R3_, v1, 0x1Fu); + IndirWriteWord(&R3_, v1, 0x1F); } else { ++map_tiles_explored[v2]; uint8 *v3 = IndirPtr(&R0_, v1); @@ -1690,7 +1690,7 @@ void DrawRoomSelectMap(void) { // 0x829517 uint8 what = map_tiles_explored[v2]; map_tiles_explored[v2] <<= 1; if (!(what & 0x80)) { - IndirWriteWord(&R3_, v1, 0xFu); + IndirWriteWord(&R3_, v1, 0xF); } else { ++map_tiles_explored[v2]; IndirWriteWord(&R3_, v1, *(uint16 *)IndirPtr(&R0_, v1) & ~0x400); @@ -1879,14 +1879,14 @@ void SetupPpuForPauseMenu(void) { // 0x82A09A reg_BG34NBA = 4; WriteReg(BG34NBA, 4u); reg_BG1SC = 49; - WriteReg(BG1SC, 0x31u); + WriteReg(BG1SC, 0x31); reg_BG2SC = 56; - WriteReg(BG2SC, 0x38u); + WriteReg(BG2SC, 0x38); reg_BG3SC = 88; - WriteReg(BG3SC, 0x58u); + WriteReg(BG3SC, 0x58); reg_BG4SC = 0; WriteReg(BG4SC, 0); - WriteReg(TM, 0x17u); + WriteReg(TM, 0x17); reg_TM = 23; WriteReg(MOSAIC, 0); reg_MOSAIC = 0; @@ -2039,7 +2039,7 @@ void SetPaletteOfR22TilemapBytesToR18(void) { // 0x82A29D void ClearSamusBeamTiles(void) { // 0x82A2BE WriteReg(VMADDL, 0); - WriteReg(VMADDH, 0x60u); + WriteReg(VMADDH, 0x60); WriteReg(VMAIN, 0x80); static const StartDmaCopy unk_82A2D4 = { 1, 1, 0x18, LONGPTR(0x9ad200), 0x1000 }; SetupDmaTransfer(&unk_82A2D4); @@ -2073,11 +2073,11 @@ void SetupPpuForGameplayResume(void) { // 0x82A313 reg_BG34NBA = 4; WriteReg(BG34NBA, 4u); reg_BG1SC = 81; - WriteReg(BG1SC, 0x51u); + WriteReg(BG1SC, 0x51); reg_BG2SC = 73; - WriteReg(BG2SC, 0x49u); + WriteReg(BG2SC, 0x49); reg_BG3SC = 90; - WriteReg(BG3SC, 0x5Au); + WriteReg(BG3SC, 0x5A); reg_BG4SC = 0; WriteReg(BG4SC, 0); } @@ -2213,8 +2213,8 @@ void HandlePauseMenuLRPressHighlight(void) { // 0x82A56D } void DrawLrHighlight(void) { // 0x82A59A - DrawPauseScreenSpriteAnim(2u, 0x18u, 0xD0u); - DrawPauseScreenSpriteAnim(2u, 0xE8u, 0xD0u); + DrawPauseScreenSpriteAnim(2u, 0x18, 0xD0); + DrawPauseScreenSpriteAnim(2u, 0xE8, 0xD0); } void HandlePauseScreenStart(void) { // 0x82A5B7 @@ -2236,7 +2236,7 @@ void HighlightPauseScreenButton(void) { // 0x82A5F1 if (pausemenu_start_lr_pressed_highlight_timer) { --pausemenu_start_lr_pressed_highlight_timer; R3_.addr = 0; - DrawMenuSpritemap(0x2Bu, 0x90u, 0xD0u); + DrawMenuSpritemap(0x2B, 0x90, 0xD0); } } static Func_V *const kSetPauseScreenButtonLabelPalettes_Funcs[3] = { // 0x82A615 @@ -2553,7 +2553,7 @@ LABEL_21: void EquipmentScreenTransferBG1Tilemap(void) { // 0x82AC22 WriteReg(VMADDL, 0); - WriteReg(VMADDH, 0x30u); + WriteReg(VMADDH, 0x30); WriteReg(VMAIN, 0x80); static const StartDmaCopy unk_82AC3B = { 1, 1, 0x18, LONGPTR(0x7e3800), 0x0800 }; SetupDmaTransfer(&unk_82AC3B); @@ -2986,7 +2986,7 @@ void EquipmentScreenDisplayReserveTankAmount_(void) { uint16 v0 = 0; do { a = v0; - DrawMenuSpritemap(0x1Bu, kEquipmentScreenReserveTank_X[v0 >> 1], kEquipmentScreenReserveTank_Y - 1); + DrawMenuSpritemap(0x1B, kEquipmentScreenReserveTank_X[v0 >> 1], kEquipmentScreenReserveTank_Y - 1); v0 += 2; --R46; } while (R46); @@ -3207,9 +3207,9 @@ static const uint16 kMap_Criteria_SavePoints[16] = { 0xd8, 0x28, 0x90, 0x38, 0xf void DrawMapIcons(void) { // 0x82B672 DrawBossMapIcons(9u, addr_kMapIconDataPointers); R3_.addr = 3584; - DrawSimpleMapIcons(0xBu, addr_kMapIconDataPointers + 0x10); - DrawSimpleMapIcons(0xAu, addr_kMapIconDataPointers + 0x20); - DrawSimpleMapIcons(0x4Eu, addr_kMapIconDataPointers + 0x30); + DrawSimpleMapIcons(0xB, addr_kMapIconDataPointers + 0x10); + DrawSimpleMapIcons(0xA, addr_kMapIconDataPointers + 0x20); + DrawSimpleMapIcons(0x4E, addr_kMapIconDataPointers + 0x30); R3_.addr = 1024; DrawSaveStationMapIcon(8u, 0xC80B); if (enable_debug) @@ -3227,11 +3227,11 @@ void DrawFileSelectMapIcons(void) { // 0x82B6DD int16 v0; HandlePauseScreenPaletteAnimation(); - DrawBossMapIcons(9u, 0xC7CBu); + DrawBossMapIcons(9u, 0xC7CB); R3_.addr = 3584; - DrawSimpleMapIcons(0xBu, 0xC7DBu); - DrawSimpleMapIcons(0xAu, 0xC7EBu); - DrawSimpleMapIcons(0x4Eu, 0xC7FBu); + DrawSimpleMapIcons(0xB, 0xC7DB); + DrawSimpleMapIcons(0xA, 0xC7EB); + DrawSimpleMapIcons(0x4E, 0xC7FB); R3_.addr = 3584; uint16 a = UpdateSamusPositionIndicatorAnimation(); *(uint16 *)&R0_.bank = 130; @@ -3240,13 +3240,13 @@ void DrawFileSelectMapIcons(void) { // 0x82B6DD uint16 v1 = *(uint16 *)IndirPtr(&R0_, 4 * load_station_index) - reg_BG1HOFS; uint16 v2 = *(uint16 *)IndirPtr(&R0_, v0 + 2) - reg_BG1VOFS; if ((samus_position_indicator_animation_loop_counter & 1) == 0) - DrawMenuSpritemap(0x12u, v1, v2); + DrawMenuSpritemap(0x12, v1, v2); DrawMenuSpritemap(a, v1, v2); if (enable_debug) { R3_.addr = 1536; - DrawDebugSaveMapIcons(0xCu, 0xC80B); - DrawDebugElevatorMapIcons(0x17u, 0xC81B); - DrawSimpleMapIcons(0xCu, 0xC82B); + DrawDebugSaveMapIcons(0xC, 0xC80B); + DrawDebugElevatorMapIcons(0x17, 0xC81B); + DrawSimpleMapIcons(0xC, 0xC82B); } if (!area_index) { R3_.addr = 3584; @@ -3356,7 +3356,7 @@ void DrawBossMapIcons(uint16 a, uint16 k) { // 0x82B892 if (v5) { { uint8 *v7 = RomPtr_82(i); - DrawMenuSpritemap(0x62u, *(uint16 *)v7 - reg_BG1HOFS, *((uint16 *)v7 + 1) - reg_BG1VOFS); + DrawMenuSpritemap(0x62, *(uint16 *)v7 - reg_BG1HOFS, *((uint16 *)v7 + 1) - reg_BG1VOFS); R3_.addr = 3072; } LABEL_7:; @@ -3437,17 +3437,17 @@ uint16 UpdateSamusPositionIndicatorAnimation(void) { // 0x82B9FC void DrawBorderAroundSamusData(void) { // 0x82BA35 R3_.addr = 3584; - DrawMenuSpritemap(0x48u, 0x80, 0x10u); + DrawMenuSpritemap(0x48, 0x80, 0x10); } void DrawBorderAroundDataCopyMode(void) { // 0x82BA48 R3_.addr = 3584; - DrawMenuSpritemap(0x49u, 0x80, 0x10u); + DrawMenuSpritemap(0x49, 0x80, 0x10); } void DrawBorderAroundDataClearMode(void) { // 0x82BA5B R3_.addr = 3584; - DrawMenuSpritemap(0x4Au, 0x7Cu, 0x10u); + DrawMenuSpritemap(0x4A, 0x7C, 0x10); } static const uint16 kDrawMenuSelectionMissile_Enable[4] = { 8, 8, 8, 8 }; static const uint16 kDrawMenuSelectionMissile_SpriteMap[4] = { 0x37, 0x36, 0x35, 0x34 }; @@ -3553,9 +3553,9 @@ void DrawBabyMetroid(uint16 k) { // 0x82BB9E } while ((int16)(v2 - 32) < 0); R3_.addr = 2048; uint8 *v3 = RomPtr_82(k); - DrawMenuSpritemap(*((uint16 *)v3 + 1), 0x7Cu, 0x50u); + DrawMenuSpritemap(*((uint16 *)v3 + 1), 0x7C, 0x50); R3_.addr = 2560; - DrawMenuSpritemap(0x64u, 0x7Cu, 0x50u); + DrawMenuSpritemap(0x64, 0x7C, 0x50); } void FinishProcessingGameOverBabyMetroidAsm(void) { // 0x82BBF0 @@ -3855,7 +3855,7 @@ CoroutineRet GameState_20_SamusNoHealth_BlackOut(void) { // 0x82DCE0 QueueSfx3_Max15(1u); QueueMusic_Delayed8(0); QueueMusic_Delayed8(0xFF39u); - QueueMusic_DelayedY(5u, 0xEu); + QueueMusic_DelayedY(5u, 0xE); } return kCoroutineNone; } @@ -4550,7 +4550,7 @@ void LoadCRETilesTilesetTilesAndPalette(void) { // 0x82E783 WriteRegWord(VMAIN, 0x80); mov24(&decompress_src, 0xb98000); decompress_dst.addr = addr_unk_605000; - WriteRegWord(VMADDL, 0x2800u); + WriteRegWord(VMADDL, 0x2800); DecompressToVRAM(); copy24(&decompress_src, &tileset_tiles_pointer); WriteRegWord(VMADDL, 0); @@ -4707,9 +4707,9 @@ void LoadLibraryBackground(void) { if (fx_tilemap_ptr) { WriteRegWord(A1T1L, fx_tilemap_ptr); WriteRegWord(VMADDL, addr_unk_605BE0); - WriteRegWord(DMAP1, 0x1801u); - WriteRegWord(A1B1, 0x8Au); - WriteRegWord(DAS1L, 0x840u); + WriteRegWord(DMAP1, 0x1801); + WriteRegWord(A1B1, 0x8A); + WriteRegWord(DAS1L, 0x840); WriteReg(VMAIN, 0x80); WriteReg(MDMAEN, 2u); } @@ -4737,7 +4737,7 @@ uint16 LoadLibraryBackgroundFunc_E_DoorDependentTransferToVram(uint16 j) { // 0 uint16 LoadLibraryBackgroundFunc_2_TransferToVram(uint16 j) { // 0x82E9F9 uint16 *LoadBg_28 = (uint16 *)get_LoadBg_28(j); WriteRegWord(VMADDL, *(uint16 *)((char *)LoadBg_28 + 3)); - WriteRegWord(DMAP1, 0x1801u); + WriteRegWord(DMAP1, 0x1801); WriteRegWord(A1T1L, *LoadBg_28); WriteRegWord(A1B1, LoadBg_28[1]); WriteRegWord(DAS1L, *(uint16 *)((char *)LoadBg_28 + 5)); @@ -4928,7 +4928,7 @@ void GameOptionsMenu_1_LoadingOptionsScreen(void) { // 0x82EC11 reg_CGWSEL = 0; reg_CGADSUB = 0; WriteReg(VMADDL, 0); - WriteReg(VMADDH, 0x58u); + WriteReg(VMADDH, 0x58); WriteReg(VMAIN, 0x80); static const StartDmaCopy unk_82EC3D = { 1, 1, 0x18, LONGPTR(0x8edc00), 0x0800 }; SetupDmaTransfer(&unk_82EC3D); @@ -4940,15 +4940,15 @@ void GameOptionsMenu_1_LoadingOptionsScreen(void) { // 0x82EC11 debug_invincibility = 0; for (int i = 510; i >= 0; i -= 2) palette_buffer[i >> 1] = kMenuPalettes[i >> 1]; - mov24(&decompress_src, 0x978DF4u); + mov24(&decompress_src, 0x978DF4); DecompressToMem_IpArg(&unk_82EC74); - mov24(&decompress_src, 0x978FCDu); + mov24(&decompress_src, 0x978FCD); DecompressToMem_IpArg(&unk_82EC85); - mov24(&decompress_src, 0x9791C4u); + mov24(&decompress_src, 0x9791C4); DecompressToMem_IpArg(&unk_82EC96); - mov24(&decompress_src, 0x97938Du); + mov24(&decompress_src, 0x97938D); DecompressToMem_IpArg(&unk_82ECA7); - mov24(&decompress_src, 0x97953Au); + mov24(&decompress_src, 0x97953A); DecompressToMem_IpArg(&unk_82ECB8); for (j = 1023; (j & 0x8000u) == 0; --j) ram3000.pause_menu_map_tilemap[j] = custom_background[j + 5375]; @@ -5032,15 +5032,15 @@ void GameOptionsMenuItemFunc_2_ToggleJapanese(void) { // 0x82EDDA void OptionsMenuFunc4(void) { // 0x82EDED if (japanese_text_flag) { - OptionsMenuFunc5(0x400u, 0x288u, 0x18u); - OptionsMenuFunc5(0x400u, 0x2C8u, 0x18u); - OptionsMenuFunc5(0, 0x348u, 0x32u); - OptionsMenuFunc5(0, 0x388u, 0x32u); + OptionsMenuFunc5(0x400, 0x288, 0x18); + OptionsMenuFunc5(0x400, 0x2C8, 0x18); + OptionsMenuFunc5(0, 0x348, 0x32); + OptionsMenuFunc5(0, 0x388, 0x32); } else { - OptionsMenuFunc5(0, 0x288u, 0x18u); - OptionsMenuFunc5(0, 0x2C8u, 0x18u); - OptionsMenuFunc5(0x400u, 0x348u, 0x32u); - OptionsMenuFunc5(0x400u, 0x388u, 0x32u); + OptionsMenuFunc5(0, 0x288, 0x18); + OptionsMenuFunc5(0, 0x2C8, 0x18); + OptionsMenuFunc5(0x400, 0x348, 0x32); + OptionsMenuFunc5(0x400, 0x388, 0x32); } } @@ -5225,15 +5225,15 @@ void OptionsMenuFunc7(void) { uint16 v0 = 4 * menu_option_index; if (*(uint16 *)RomPtr_RAM(kOptionsMenuSpecialPtrs[menu_option_index])) { - OptionsMenuFunc5(0, g_word_82F149[(uint16)(4 * menu_option_index) >> 1], 0xCu); - OptionsMenuFunc5(0, g_word_82F149[(v0 >> 1) + 1], 0xCu); - OptionsMenuFunc5(0x400u, g_word_82F151[v0 >> 1], 0xCu); - OptionsMenuFunc5(0x400u, g_word_82F151[(v0 >> 1) + 1], 0xCu); + OptionsMenuFunc5(0, g_word_82F149[(uint16)(4 * menu_option_index) >> 1], 0xC); + OptionsMenuFunc5(0, g_word_82F149[(v0 >> 1) + 1], 0xC); + OptionsMenuFunc5(0x400, g_word_82F151[v0 >> 1], 0xC); + OptionsMenuFunc5(0x400, g_word_82F151[(v0 >> 1) + 1], 0xC); } else { - OptionsMenuFunc5(0x400u, g_word_82F149[(uint16)(4 * menu_option_index) >> 1], 0xCu); - OptionsMenuFunc5(0x400u, g_word_82F149[(v0 >> 1) + 1], 0xCu); - OptionsMenuFunc5(0, g_word_82F151[v0 >> 1], 0xCu); - OptionsMenuFunc5(0, g_word_82F151[(v0 >> 1) + 1], 0xCu); + OptionsMenuFunc5(0x400, g_word_82F149[(uint16)(4 * menu_option_index) >> 1], 0xC); + OptionsMenuFunc5(0x400, g_word_82F149[(v0 >> 1) + 1], 0xC); + OptionsMenuFunc5(0, g_word_82F151[v0 >> 1], 0xC); + OptionsMenuFunc5(0, g_word_82F151[(v0 >> 1) + 1], 0xC); } } diff --git a/src/sm_84.c b/src/sm_84.c index b0894cf..01aa106 100644 --- a/src/sm_84.c +++ b/src/sm_84.c @@ -1654,8 +1654,8 @@ uint8 PlmSetup_B6D3_MapStation(uint16 j) { // 0x84B18B if (map_station_byte_array[area_index]) { plm_instr_list_ptrs[v1] = addr_word_84AD76; } else { - WriteLevelDataBlockTypeAndBts(plm_block_indices[v1] + 2, 0xB047u); - WriteLevelDataBlockTypeAndBts(plm_block_indices[v1] - 4, 0xB048u); + WriteLevelDataBlockTypeAndBts(plm_block_indices[v1] + 2, 0xB047); + WriteLevelDataBlockTypeAndBts(plm_block_indices[v1] - 4, 0xB048); } return 0; } @@ -1678,7 +1678,7 @@ uint8 PlmSetup_PlmB6DF_EnergyStation(uint16 j) { // 0x84B21D int v1 = j >> 1; int v2 = plm_block_indices[v1] >> 1; level_data[v2] = level_data[v2] & 0xFFF | 0x8000; - WriteLevelDataBlockTypeAndBts(plm_block_indices[v1] + 2, 0xB049u); + WriteLevelDataBlockTypeAndBts(plm_block_indices[v1] + 2, 0xB049); WriteLevelDataBlockTypeAndBts(plm_block_indices[v1] - 2, FUNC16(PlmSetup_SetrupWreckedShipEntrance)); return 0; } @@ -1687,8 +1687,8 @@ uint8 PlmSetup_PlmB6EB_EnergyStation(uint16 j) { // 0x84B245 int v1 = j >> 1; int v2 = plm_block_indices[v1] >> 1; level_data[v2] = level_data[v2] & 0xFFF | 0x8000; - WriteLevelDataBlockTypeAndBts(plm_block_indices[v1] + 2, 0xB04Bu); - WriteLevelDataBlockTypeAndBts(plm_block_indices[v1] - 2, 0xB04Cu); + WriteLevelDataBlockTypeAndBts(plm_block_indices[v1] + 2, 0xB04B); + WriteLevelDataBlockTypeAndBts(plm_block_indices[v1] - 2, 0xB04C); return 0; } @@ -1743,25 +1743,25 @@ void DeletePlm(uint16 j) { // 0x84B333 } uint8 PlmSetup_B638_Rightwards_Extension(uint16 j) { // 0x84B33A - WriteLevelDataBlockTypeAndBts(plm_block_indices[j >> 1], 0x50FFu); + WriteLevelDataBlockTypeAndBts(plm_block_indices[j >> 1], 0x50FF); DeletePlm(j); return 0; } uint8 PlmSetup_B63F_Leftwards_Extension(uint16 j) { // 0x84B345 - WriteLevelDataBlockTypeAndBts(plm_block_indices[j >> 1], 0x5001u); + WriteLevelDataBlockTypeAndBts(plm_block_indices[j >> 1], 0x5001); DeletePlm(j); return 0; } uint8 PlmSetup_B643_Downwards_Extension(uint16 j) { // 0x84B350 - WriteLevelDataBlockTypeAndBts(plm_block_indices[j >> 1], 0xD0FFu); + WriteLevelDataBlockTypeAndBts(plm_block_indices[j >> 1], 0xD0FF); DeletePlm(j); return 0; } uint8 PlmSetup_B647_Upwards_Extension(uint16 j) { // 0x84B35B - WriteLevelDataBlockTypeAndBts(plm_block_indices[j >> 1], 0xD001u); + WriteLevelDataBlockTypeAndBts(plm_block_indices[j >> 1], 0xD001); DeletePlm(j); return 0; } @@ -1772,7 +1772,7 @@ void SkipDebugDrawInstructionsForScrollPlms(uint16 j) { // 0x84B366 uint8 PlmSetup_B703_ScrollPLM(uint16 j) { // 0x84B371 int v1 = j >> 1; - WriteLevelDataBlockTypeAndBts(plm_block_indices[v1], 0x3046u); + WriteLevelDataBlockTypeAndBts(plm_block_indices[v1], 0x3046); plm_variable[v1] = 0; SkipDebugDrawInstructionsForScrollPlms(j); return 0; @@ -1780,7 +1780,7 @@ uint8 PlmSetup_B703_ScrollPLM(uint16 j) { // 0x84B371 uint8 PlmSetup_B707_SolidScrollPLM(uint16 j) { // 0x84B382 int v1 = j >> 1; - WriteLevelDataBlockTypeAndBts(plm_block_indices[v1], 0xB046u); + WriteLevelDataBlockTypeAndBts(plm_block_indices[v1], 0xB046); plm_variable[v1] = 0; SkipDebugDrawInstructionsForScrollPlms(j); return 0; @@ -2040,17 +2040,17 @@ uint8 PlmSetup_B76B_SaveStationTrigger(uint16 j) { // 0x84B590 } uint8 PlmSetup_B76F_SaveStation(uint16 j) { // 0x84B5EE - WriteLevelDataBlockTypeAndBts(plm_block_indices[j >> 1], 0xB04Du); + WriteLevelDataBlockTypeAndBts(plm_block_indices[j >> 1], 0xB04D); return 0; } uint8 PlmSetup_MotherBrainRoomEscapeDoor(uint16 j) { // 0x84B5F8 uint16 v1 = plm_block_indices[j >> 1]; - WriteLevelDataBlockTypeAndBts(v1, 0x9001u); + WriteLevelDataBlockTypeAndBts(v1, 0x9001); uint16 v2 = room_width_in_blocks * 2 + v1; - WriteLevelDataBlockTypeAndBts(v2, 0xD0FFu); + WriteLevelDataBlockTypeAndBts(v2, 0xD0FF); uint16 v3 = room_width_in_blocks * 2 + v2; - WriteLevelDataBlockTypeAndBts(v3, 0xD0FFu); + WriteLevelDataBlockTypeAndBts(v3, 0xD0FF); WriteLevelDataBlockTypeAndBts( room_width_in_blocks * 2 + v3, 0xD0FFu); @@ -2175,7 +2175,7 @@ void PlmPreInstr_OldTourianEscapeShaftEscape(uint16 k) { // 0x84B927 R18_ = 240; R20_ = 2080; if (!WakePlmIfSamusIsBelowAndRightOfTarget(k)) - SpawnEnemyProjectileWithRoomGfx(0xB4B1u, 0); + SpawnEnemyProjectileWithRoomGfx(0xB4B1, 0); } void PlmPreInstr_EscapeRoomBeforeOldTourianEscapeShaft(uint16 k) { // 0x84B948 @@ -2213,9 +2213,9 @@ uint16 PlmInstr_SetCrittersEscapedEvent(uint16 j, uint16 k) { // 0x84B9B9 uint8 PlmSetup_B9ED_CrittersEscapeBlock(uint16 j) { // 0x84B9C5 uint16 v1 = plm_block_indices[j >> 1]; - WriteLevelDataBlockTypeAndBts(v1, 0xC04Fu); + WriteLevelDataBlockTypeAndBts(v1, 0xC04F); uint16 v2 = room_width_in_blocks * 2 + v1; - WriteLevelDataBlockTypeAndBts(v2, 0xD0FFu); + WriteLevelDataBlockTypeAndBts(v2, 0xD0FF); WriteLevelDataBlockTypeAndBts( room_width_in_blocks * 2 + v2, 0xD0FFu); @@ -2245,7 +2245,7 @@ void UNUSED_sub_84BAD1(uint16 j) { // 0x84BAD1 int v1 = j >> 1; plm_variable[v1] = 4; plm_room_arguments[v1] = plm_room_arguments[v1] & 0x3FF | 0x8000; - WriteLevelDataBlockTypeAndBts(plm_block_indices[v1], 0xC044u); + WriteLevelDataBlockTypeAndBts(plm_block_indices[v1], 0xC044); } uint8 PlmSetup_BB30_CrateriaMainstreetEscape(uint16 j) { // 0x84BB09 @@ -2566,13 +2566,13 @@ uint16 SetBtsTo0x10AdvanceRowUp(uint16 k) { // 0x84C6A9 } uint8 PlmSetup_C82A_DownwardsClosedGate(uint16 j) { // 0x84C6BE - SpawnEnemyProjectileWithRoomGfx(0xE659u, 0); + SpawnEnemyProjectileWithRoomGfx(0xE659, 0); SetBts0x10FiveStepsDown(j); return 0; } uint8 PlmSetup_C832_UpwardsClosedGate(uint16 j) { // 0x84C6CB - SpawnEnemyProjectileWithRoomGfx(0xE675u, 0); + SpawnEnemyProjectileWithRoomGfx(0xE675, 0); SetBts0x10FiveStepsUp(j); return 0; } @@ -2615,12 +2615,12 @@ uint8 PlmSetup_C794_GreyDoor(uint16 j) { // 0x84C794 int v1 = j >> 1; plm_variable[v1] = (uint16)(HIBYTE(plm_room_arguments[v1]) & 0x7C) >> 1; plm_room_arguments[v1] &= ~0x7C00; - WriteLevelDataBlockTypeAndBts(plm_block_indices[v1], 0xC044u); + WriteLevelDataBlockTypeAndBts(plm_block_indices[v1], 0xC044); return 0; } uint8 PlmSetup_Door_Colored(uint16 j) { // 0x84C7B1 - WriteLevelDataBlockTypeAndBts(plm_block_indices[j >> 1], 0xC044u); + WriteLevelDataBlockTypeAndBts(plm_block_indices[j >> 1], 0xC044); return 0; } @@ -2827,12 +2827,12 @@ uint8 PlmSetup_D113_LowerNorfairChozoRoomPlug(uint16 j) { // 0x84D108 } uint8 PlmSetup_D127(uint16 j) { // 0x84D117 - WriteLevelDataBlockTypeAndBts(plm_block_indices[j >> 1], 0xC000u); + WriteLevelDataBlockTypeAndBts(plm_block_indices[j >> 1], 0xC000); return 0; } uint8 PlmSetup_D138(uint16 j) { // 0x84D12B - WriteLevelDataBlockTypeAndBts(plm_block_indices[j >> 1], 0xE000u); + WriteLevelDataBlockTypeAndBts(plm_block_indices[j >> 1], 0xE000); return 0; } @@ -2845,7 +2845,7 @@ void PlmPreInstr_DeletePlmAndSpawnTriggerIfBlockDestroyed(uint16 k) { // 0x84D1 uint16 prod = 8 * (uint8)room_width_in_blocks; uint16 v1 = 2 * (prod + 4); if (level_data[v1 >> 1] == 255) { - WriteLevelDataBlockTypeAndBts(v1, 0xB083u); + WriteLevelDataBlockTypeAndBts(v1, 0xB083); plm_header_ptr[plm_id >> 1] = 0; } } @@ -2903,7 +2903,7 @@ uint16 PlmInstr_SpawnFourMotherBrainGlass(uint16 j, uint16 k) { // 0x84D30B } void SpawnMotherBrainGlassShatteringShard(uint16 a) { // 0x84D331 - SpawnEnemyProjectileWithRoomGfx(0xCEFCu, a); + SpawnEnemyProjectileWithRoomGfx(0xCEFC, a); } void PlmPreInstr_WakePlmIfSamusHasBombs(uint16 k) { // 0x84D33B @@ -2918,7 +2918,7 @@ void PlmPreInstr_WakePlmIfSamusHasBombs(uint16 k) { // 0x84D33B uint16 PlmInstr_SpawnTorizoStatueBreaking(uint16 j, uint16 k) { // 0x84D357 uint16 *v2 = (uint16 *)RomPtr_84(j); - SpawnEnemyProjectileWithRoomGfx(0xA993u, *v2); + SpawnEnemyProjectileWithRoomGfx(0xA993, *v2); return j + 2; } @@ -2928,14 +2928,14 @@ uint16 PlmInstr_QueueSong1MusicTrack(uint16 j, uint16 k) { // 0x84D3C7 } uint16 PlmInstr_TransferWreckedShipChozoSpikesToSlopes(uint16 j, uint16 k) { // 0x84D3D7 - WriteLevelDataBlockTypeAndBts(0x1608u, 0x1012u); - WriteLevelDataBlockTypeAndBts(0x160Au, 0x1013u); + WriteLevelDataBlockTypeAndBts(0x1608, 0x1012); + WriteLevelDataBlockTypeAndBts(0x160A, 0x1013); return j; } uint16 PlmInstr_TransferWreckedShipSlopesToChozoSpikes(uint16 j, uint16 k) { // 0x84D3F4 - WriteLevelDataBlockTypeAndBts(0x1608u, 0xA000u); - WriteLevelDataBlockTypeAndBts(0x160Au, 0xA000u); + WriteLevelDataBlockTypeAndBts(0x1608, 0xA000); + WriteLevelDataBlockTypeAndBts(0x160A, 0xA000); return j; } @@ -2974,7 +2974,7 @@ uint16 PlmInstr_EnableWaterPhysics(uint16 j, uint16 k) { // 0x84D525 uint16 PlmInstr_SpawnN00bTubeCrackEnemyProjectile(uint16 j, uint16 k) { // 0x84D52C uint16 v2 = 0; // undefined - SpawnEnemyProjectileWithRoomGfx(0xD904u, v2); + SpawnEnemyProjectileWithRoomGfx(0xD904, v2); return j; } @@ -2990,17 +2990,17 @@ uint16 PlmInstr_Spawn10shardsAnd6n00bs(uint16 j, uint16 k) { // 0x84D543 SpawnEnemyProjectileWithRoomGfx(addr_kEproj_N00bTubeShards, 4u); SpawnEnemyProjectileWithRoomGfx(addr_kEproj_N00bTubeShards, 6u); SpawnEnemyProjectileWithRoomGfx(addr_kEproj_N00bTubeShards, 8u); - SpawnEnemyProjectileWithRoomGfx(addr_kEproj_N00bTubeShards, 0xAu); - SpawnEnemyProjectileWithRoomGfx(addr_kEproj_N00bTubeShards, 0xCu); - SpawnEnemyProjectileWithRoomGfx(addr_kEproj_N00bTubeShards, 0xEu); - SpawnEnemyProjectileWithRoomGfx(addr_kEproj_N00bTubeShards, 0x10u); - SpawnEnemyProjectileWithRoomGfx(addr_kEproj_N00bTubeShards, 0x12u); + SpawnEnemyProjectileWithRoomGfx(addr_kEproj_N00bTubeShards, 0xA); + SpawnEnemyProjectileWithRoomGfx(addr_kEproj_N00bTubeShards, 0xC); + SpawnEnemyProjectileWithRoomGfx(addr_kEproj_N00bTubeShards, 0xE); + SpawnEnemyProjectileWithRoomGfx(addr_kEproj_N00bTubeShards, 0x10); + SpawnEnemyProjectileWithRoomGfx(addr_kEproj_N00bTubeShards, 0x12); SpawnEnemyProjectileWithRoomGfx(addr_kEproj_N00bTubeReleasedAirBubbles, 0); SpawnEnemyProjectileWithRoomGfx(addr_kEproj_N00bTubeReleasedAirBubbles, 2u); SpawnEnemyProjectileWithRoomGfx(addr_kEproj_N00bTubeReleasedAirBubbles, 4u); SpawnEnemyProjectileWithRoomGfx(addr_kEproj_N00bTubeReleasedAirBubbles, 6u); SpawnEnemyProjectileWithRoomGfx(addr_kEproj_N00bTubeReleasedAirBubbles, 8u); - SpawnEnemyProjectileWithRoomGfx(addr_kEproj_N00bTubeReleasedAirBubbles, 0xAu); + SpawnEnemyProjectileWithRoomGfx(addr_kEproj_N00bTubeReleasedAirBubbles, 0xA); return j; } @@ -3017,7 +3017,7 @@ uint16 PlmInstr_EnableSamusControls(uint16 j, uint16 k) { // 0x84D5EE uint8 PlmSetup_MotherBrainGlass(uint16 j) { // 0x84D5F6 int v1 = j >> 1; plm_room_arguments[v1] = 0; - WriteLevelDataBlockTypeAndBts(plm_block_indices[v1], 0x8044u); + WriteLevelDataBlockTypeAndBts(plm_block_indices[v1], 0x8044); return 0; } @@ -3028,7 +3028,7 @@ uint8 PlmSetup_DeletePlmIfAreaTorizoDead(uint16 j) { // 0x84D606 } uint8 PlmSetup_MakeBllockChozoHandTrigger(uint16 j) { // 0x84D616 - WriteLevelDataBlockTypeAndBts(plm_block_indices[j >> 1], 0xB080u); + WriteLevelDataBlockTypeAndBts(plm_block_indices[j >> 1], 0xB080); return 0; } @@ -3052,19 +3052,19 @@ uint8 PlmSetup_D6F2_WreckedShipChozoHandTrigger(uint16 j) { // 0x84D620 } uint8 PlmSetup_D700_MakePlmAirBlock_Unused(uint16 j) { // 0x84D67F - WriteLevelDataBlockTypeAndBts(plm_block_indices[j >> 1], 0x44u); + WriteLevelDataBlockTypeAndBts(plm_block_indices[j >> 1], 0x44); return 0; } uint8 PlmSetup_D704_AlteranateLowerNorfairChozoHand_Unused(uint16 j) { // 0x84D689 - WriteLevelDataBlockTypeAndBts(plm_block_indices[j >> 1], 0x8044u); + WriteLevelDataBlockTypeAndBts(plm_block_indices[j >> 1], 0x8044); return 0; } uint8 PlmSetup_D708_LowerNorfairChozoBlockUnused(uint16 j) { // 0x84D693 int v1 = j >> 1; - WriteLevelDataBlockTypeAndBts(plm_block_indices[v1], 0x8044u); - WriteLevelDataBlockTypeAndBts(plm_block_indices[v1] + 2, 0x50FFu); + WriteLevelDataBlockTypeAndBts(plm_block_indices[v1], 0x8044); + WriteLevelDataBlockTypeAndBts(plm_block_indices[v1] + 2, 0x50FF); WriteLevelDataBlockTypeAndBts( room_width_in_blocks + room_width_in_blocks @@ -3080,7 +3080,7 @@ uint8 PlmSetup_D708_LowerNorfairChozoBlockUnused(uint16 j) { // 0x84D693 } uint8 PlmSetup_D70C_NoobTube(uint16 j) { // 0x84D6CC - WriteLevelDataBlockTypeAndBts(plm_block_indices[j >> 1], 0x8044u); + WriteLevelDataBlockTypeAndBts(plm_block_indices[j >> 1], 0x8044); return 0; } @@ -3109,13 +3109,13 @@ uint16 PlmInstr_SpawnEyeDoorSweatEnemyProjectile(uint16 j, uint16 k) { // 0x84D } uint16 PlmInstr_SpawnTwoEyeDoorSmoke(uint16 j, uint16 k) { // 0x84D79F - SpawnEnemyProjectileWithRoomGfx(0xE517u, 0x30Au); - SpawnEnemyProjectileWithRoomGfx(0xE517u, 0x30Au); + SpawnEnemyProjectileWithRoomGfx(0xE517, 0x30A); + SpawnEnemyProjectileWithRoomGfx(0xE517, 0x30A); return j; } uint16 PlmInstr_SpawnEyeDoorSmokeProjectile(uint16 j, uint16 k) { // 0x84D7B6 - SpawnEnemyProjectileWithRoomGfx(addr_kEproj_EyeDoorSmoke, 0xBu); + SpawnEnemyProjectileWithRoomGfx(addr_kEproj_EyeDoorSmoke, 0xB); return j; } @@ -3125,7 +3125,7 @@ uint16 PlmInstr_MoveUpAndMakeBlueDoorFacingRight(uint16 j, uint16 k) { // 0x84D - __PAIR32__(room_width_in_blocks, room_width_in_blocks)) >> 16; plm_block_indices[v2] = v3; uint16 v4 = v3; - WriteLevelDataBlockTypeAndBts(v3, 0xC041u); + WriteLevelDataBlockTypeAndBts(v3, 0xC041); sub_84D7EF(v4); return j; } @@ -3136,16 +3136,16 @@ uint16 PlmInstr_MoveUpAndMakeBlueDoorFacingLeft(uint16 j, uint16 k) { // 0x84D7 - __PAIR32__(room_width_in_blocks, room_width_in_blocks)) >> 16; plm_block_indices[v2] = v3; uint16 v4 = v3; - WriteLevelDataBlockTypeAndBts(v3, 0xC040u); + WriteLevelDataBlockTypeAndBts(v3, 0xC040); sub_84D7EF(v4); return j; } void sub_84D7EF(uint16 k) { // 0x84D7EF uint16 v1 = room_width_in_blocks * 2 + k; - WriteLevelDataBlockTypeAndBts(v1, 0xD0FFu); + WriteLevelDataBlockTypeAndBts(v1, 0xD0FF); uint16 v2 = room_width_in_blocks * 2 + v1; - WriteLevelDataBlockTypeAndBts(v2, 0xD0FEu); + WriteLevelDataBlockTypeAndBts(v2, 0xD0FE); WriteLevelDataBlockTypeAndBts( room_width_in_blocks * 2 + v2, 0xD0FDu); @@ -3155,7 +3155,7 @@ uint8 PlmSetup_EyeDoorEye(uint16 j) { // 0x84DA8C int idx = PrepareBitAccess(plm_room_arguments[j >> 1]); if ((bitmask & opened_door_bit_array[idx]) == 0) { int v1 = j >> 1; - WriteLevelDataBlockTypeAndBts(plm_block_indices[v1], 0xC044u); + WriteLevelDataBlockTypeAndBts(plm_block_indices[v1], 0xC044); WriteLevelDataBlockTypeAndBts( room_width_in_blocks + room_width_in_blocks @@ -3168,7 +3168,7 @@ uint8 PlmSetup_EyeDoorEye(uint16 j) { // 0x84DA8C uint8 PlmSetup_EyeDoor(uint16 j) { // 0x84DAB9 int idx = PrepareBitAccess(plm_room_arguments[j >> 1]); if ((bitmask & opened_door_bit_array[idx]) == 0) - WriteLevelDataBlockTypeAndBts(plm_block_indices[j >> 1], 0xA000u); + WriteLevelDataBlockTypeAndBts(plm_block_indices[j >> 1], 0xA000); return 0; } @@ -3219,7 +3219,7 @@ void SetPlmVarPtr(uint16 k, uint16 a) { uint16 PlmInstr_DamageDraygonTurret(uint16 j, uint16 k) { // 0x84DB8E SetPlmVarPtr(k, 1); uint16 v2 = plm_block_indices[k >> 1]; - WriteLevelDataBlockTypeAndBts(v2, 0xA003u); + WriteLevelDataBlockTypeAndBts(v2, 0xA003); WriteLevelDataBlockTypeAndBts( room_width_in_blocks * 2 + v2, 0xA003u); @@ -3229,11 +3229,11 @@ uint16 PlmInstr_DamageDraygonTurret(uint16 j, uint16 k) { // 0x84DB8E uint16 PlmInstr_DamageDraygonTurretFacingDownRight(uint16 j, uint16 k) { // 0x84DBB8 SetPlmVarPtr(k, 1); uint16 v2 = plm_block_indices[k >> 1]; - WriteLevelDataBlockTypeAndBts(v2, 0xA003u); - WriteLevelDataBlockTypeAndBts(v2 + 2, 0xA003u); + WriteLevelDataBlockTypeAndBts(v2, 0xA003); + WriteLevelDataBlockTypeAndBts(v2 + 2, 0xA003); uint16 v3 = plm_block_indices[plm_id >> 1]; uint16 v4 = room_width_in_blocks * 2 + v3; - WriteLevelDataBlockTypeAndBts(v4, 0xA003u); + WriteLevelDataBlockTypeAndBts(v4, 0xA003); WriteLevelDataBlockTypeAndBts(v4 + 2, 0); return j; } @@ -3241,18 +3241,18 @@ uint16 PlmInstr_DamageDraygonTurretFacingDownRight(uint16 j, uint16 k) { // 0x8 uint16 PlmInstr_DamageDraygonTurretFacingUpRight(uint16 j, uint16 k) { // 0x84DBF7 SetPlmVarPtr(k, 1); uint16 v2 = plm_block_indices[k >> 1]; - WriteLevelDataBlockTypeAndBts(v2, 0xA003u); + WriteLevelDataBlockTypeAndBts(v2, 0xA003); WriteLevelDataBlockTypeAndBts(v2 + 2, 0); uint16 v4 = room_width_in_blocks * 2 + v2; - WriteLevelDataBlockTypeAndBts(v4, 0xA003u); - WriteLevelDataBlockTypeAndBts(v4 + 2, 0xA003u); + WriteLevelDataBlockTypeAndBts(v4, 0xA003); + WriteLevelDataBlockTypeAndBts(v4 + 2, 0xA003); return j; } uint16 PlmInstr_DamageDraygonTurret2(uint16 j, uint16 k) { // 0x84DC36 SetPlmVarPtr(k, 1); uint16 v2 = plm_block_indices[k >> 1]; - WriteLevelDataBlockTypeAndBts(v2, 0xA003u); + WriteLevelDataBlockTypeAndBts(v2, 0xA003); WriteLevelDataBlockTypeAndBts( room_width_in_blocks * 2 + v2, 0xA003u); @@ -3262,10 +3262,10 @@ uint16 PlmInstr_DamageDraygonTurret2(uint16 j, uint16 k) { // 0x84DC36 uint16 PlmInstr_DamageDraygonTurretFacingDownLeft(uint16 j, uint16 k) { // 0x84DC60 SetPlmVarPtr(k, 1); uint16 v2 = plm_block_indices[k >> 1]; - WriteLevelDataBlockTypeAndBts(v2, 0xA003u); - WriteLevelDataBlockTypeAndBts(v2 - 2, 0xA003u); + WriteLevelDataBlockTypeAndBts(v2, 0xA003); + WriteLevelDataBlockTypeAndBts(v2 - 2, 0xA003); uint16 v4 = room_width_in_blocks * 2 + v2; - WriteLevelDataBlockTypeAndBts(v4, 0xA003u); + WriteLevelDataBlockTypeAndBts(v4, 0xA003); WriteLevelDataBlockTypeAndBts(v4 - 2, 0); return j; } @@ -3273,11 +3273,11 @@ uint16 PlmInstr_DamageDraygonTurretFacingDownLeft(uint16 j, uint16 k) { // 0x84 uint16 PlmInstr_DamageDraygonTurretFacingUpLeft(uint16 j, uint16 k) { // 0x84DC9F SetPlmVarPtr(k, 1); uint16 v2 = plm_block_indices[k >> 1]; - WriteLevelDataBlockTypeAndBts(v2, 0xA003u); + WriteLevelDataBlockTypeAndBts(v2, 0xA003); WriteLevelDataBlockTypeAndBts(v2 - 2, 0); uint16 v4 = v2 + room_width_in_blocks * 2; - WriteLevelDataBlockTypeAndBts(v4, 0xA003u); - WriteLevelDataBlockTypeAndBts(v4 - 2, 0xA003u); + WriteLevelDataBlockTypeAndBts(v4, 0xA003); + WriteLevelDataBlockTypeAndBts(v4 - 2, 0xA003); return j; } @@ -3286,8 +3286,8 @@ uint8 PlmSetup_DraygonCannonFacingRight(uint16 j) { // 0x84DE94 plm_variable[v1] = plm_room_arguments[v1]; plm_room_arguments[v1] = 0; uint16 v2 = plm_block_indices[v1]; - WriteLevelDataBlockTypeAndBts(v2, 0xC044u); - WriteLevelDataBlockTypeAndBts(room_width_in_blocks * 2 + v2, 0xD0FFu); + WriteLevelDataBlockTypeAndBts(v2, 0xC044); + WriteLevelDataBlockTypeAndBts(room_width_in_blocks * 2 + v2, 0xD0FF); return 0; } @@ -3296,11 +3296,11 @@ uint8 PlmSetup_DraygonCannonFacingDiagonalRight(uint16 j) { // 0x84DEB9 plm_variable[v1] = plm_room_arguments[v1]; plm_room_arguments[v1] = 0; uint16 v2 = plm_block_indices[v1]; - WriteLevelDataBlockTypeAndBts(v2, 0xC044u); - WriteLevelDataBlockTypeAndBts(v2 + 2, 0x50FFu); + WriteLevelDataBlockTypeAndBts(v2, 0xC044); + WriteLevelDataBlockTypeAndBts(v2 + 2, 0x50FF); uint16 v3 = room_width_in_blocks * 2 + v2; - WriteLevelDataBlockTypeAndBts(v3, 0xD0FFu); - WriteLevelDataBlockTypeAndBts(v3 + 2, 0xD0FFu); + WriteLevelDataBlockTypeAndBts(v3, 0xD0FF); + WriteLevelDataBlockTypeAndBts(v3 + 2, 0xD0FF); return 0; } @@ -3309,8 +3309,8 @@ uint8 PlmSetup_DraygonCannonFacingLeft(uint16 j) { // 0x84DEF0 plm_variable[v1] = plm_room_arguments[v1]; plm_room_arguments[v1] = 0; uint16 v2 = plm_block_indices[v1]; - WriteLevelDataBlockTypeAndBts(v2, 0xC044u); - WriteLevelDataBlockTypeAndBts(room_width_in_blocks * 2 + v2, 0xD0FFu); + WriteLevelDataBlockTypeAndBts(v2, 0xC044); + WriteLevelDataBlockTypeAndBts(room_width_in_blocks * 2 + v2, 0xD0FF); return 0; } @@ -3319,11 +3319,11 @@ uint8 PlmSetup_DraygonCannonFacingDiagonalLeft(uint16 j) { // 0x84DF15 plm_variable[v1] = plm_room_arguments[v1]; plm_room_arguments[v1] = 0; uint16 v2 = plm_block_indices[v1]; - WriteLevelDataBlockTypeAndBts(v2, 0xC044u); - WriteLevelDataBlockTypeAndBts(v2 - 2, 0x5001u); + WriteLevelDataBlockTypeAndBts(v2, 0xC044); + WriteLevelDataBlockTypeAndBts(v2 - 2, 0x5001); uint16 v3 = room_width_in_blocks * 2 + v2; - WriteLevelDataBlockTypeAndBts(v3, 0xD0FFu); - WriteLevelDataBlockTypeAndBts(v3 - 2, 0xD0FFu); + WriteLevelDataBlockTypeAndBts(v3, 0xD0FF); + WriteLevelDataBlockTypeAndBts(v3 - 2, 0xD0FF); return 0; } @@ -3390,15 +3390,15 @@ uint8 sub_84EE4D(uint16 j) { // 0x84EE4D } uint8 sub_84EE52(uint16 j) { // 0x84EE52 - return sub_84EE5F(j, 0xAu); + return sub_84EE5F(j, 0xA); } uint8 sub_84EE57(uint16 j) { // 0x84EE57 - return sub_84EE5F(j, 0xCu); + return sub_84EE5F(j, 0xC); } uint8 sub_84EE5C(uint16 j) { // 0x84EE5C - return sub_84EE5F(j, 0xEu); + return sub_84EE5F(j, 0xE); } uint8 sub_84EE5F(uint16 j, uint16 a) { // 0x84EE5F @@ -3407,7 +3407,7 @@ uint8 sub_84EE5F(uint16 j, uint16 a) { // 0x84EE5F } uint8 sub_84EE64(uint16 j) { // 0x84EE64 - WriteLevelDataBlockTypeAndBts(plm_block_indices[j >> 1], 0x45u); + WriteLevelDataBlockTypeAndBts(plm_block_indices[j >> 1], 0x45); ++global_number_of_items_loaded_ctr; return 0; } @@ -3417,15 +3417,15 @@ uint8 sub_84EE77(uint16 j) { // 0x84EE77 } uint8 sub_84EE7C(uint16 j) { // 0x84EE7C - return sub_84EE89(j, 0xAu); + return sub_84EE89(j, 0xA); } uint8 sub_84EE81(uint16 j) { // 0x84EE81 - return sub_84EE89(j, 0xCu); + return sub_84EE89(j, 0xC); } uint8 sub_84EE86(uint16 j) { // 0x84EE86 - return sub_84EE89(j, 0xEu); + return sub_84EE89(j, 0xE); } uint8 sub_84EE89(uint16 j, uint16 a) { // 0x84EE89 @@ -3435,7 +3435,7 @@ uint8 sub_84EE89(uint16 j, uint16 a) { // 0x84EE89 uint8 sub_84EE8E(uint16 j) { // 0x84EE8E int v1 = j >> 1; - WriteLevelDataBlockTypeAndBts(plm_block_indices[v1], 0xC045u); + WriteLevelDataBlockTypeAndBts(plm_block_indices[v1], 0xC045); plm_variable[v1] = level_data[plm_block_indices[v1] >> 1]; ++global_number_of_items_loaded_ctr; return 0; diff --git a/src/sm_85.c b/src/sm_85.c index 909cd40..a1622d0 100644 --- a/src/sm_85.c +++ b/src/sm_85.c @@ -62,10 +62,10 @@ CoroutineRet DisplayMessageBox_Async(uint16 a) { // 0x858080 void InitializePpuForMessageBoxes(void) { // 0x858143 save_confirmation_selection = 0; WriteReg(HDMAEN, 0); - WriteReg(CGADD, 0x19u); - WriteReg(CGDATA, 0xB1u); - WriteReg(CGDATA, 0xBu); - WriteReg(CGDATA, 0x1Fu); + WriteReg(CGADD, 0x19); + WriteReg(CGDATA, 0xB1); + WriteReg(CGDATA, 0xB); + WriteReg(CGDATA, 0x1F); WriteReg(CGDATA, 0); ram3000.msgbox.backup_of_enabled_hdma_channels = reg_HDMAEN; ram3000.misc.field_3E8[3] = gameplay_BG3SC; @@ -73,8 +73,8 @@ void InitializePpuForMessageBoxes(void) { // 0x858143 gameplay_TM = 23; gameplay_CGWSEL = 0; gameplay_CGADSUB = 0; - WriteReg(COLDATA, 0x20u); - WriteReg(COLDATA, 0x40u); + WriteReg(COLDATA, 0x20); + WriteReg(COLDATA, 0x40); WriteReg(COLDATA, 0x80); ReadReg(BG3HOFS); WriteReg(BG3HOFS, 0); @@ -86,10 +86,10 @@ void InitializePpuForMessageBoxes(void) { // 0x858143 *(uint16 *)((char *)ram3000.pause_menu_map_tilemap + (uint16)i) = 0; WriteRegWord(VMADDL, addr_unk_605880); ReadRegWord(RDVRAML); - WriteRegWord(DMAP1, 0x3981u); + WriteRegWord(DMAP1, 0x3981); WriteRegWord(A1T1L, ADDR16_OF_RAM(ram4000) + 256); - WriteRegWord(A1B1, 0x7Eu); - WriteRegWord(DAS1L, 0x700u); + WriteRegWord(A1B1, 0x7E); + WriteRegWord(DAS1L, 0x700); WriteRegWord(DAS10, 0); WriteRegWord(A2A1H, 0); WriteReg(VMAIN, 0x80); @@ -104,10 +104,10 @@ void ClearMessageBoxBg3Tilemap(void) { // 0x8581F3 v0 -= 2; } while (v0 >= 0); WriteRegWord(VMADDL, addr_unk_605880); - WriteRegWord(DMAP1, 0x1801u); + WriteRegWord(DMAP1, 0x1801); WriteRegWord(A1T1L, ADDR16_OF_RAM(ram3800)); - WriteRegWord(A1B1, 0x7Eu); - WriteRegWord(DAS1L, 0x700u); + WriteRegWord(A1B1, 0x7E); + WriteRegWord(DAS1L, 0x700); WriteRegWord(DAS10, 0); WriteRegWord(A2A1H, 0); WriteReg(VMAIN, 0x80); @@ -202,28 +202,28 @@ void SetupMessageBoxBg3YscrollHdma(void) { // 0x858363 *(uint32 *)&ram3000.menu.palette_backup_in_menu[64] = -516947713; ram3000.pause_menu_map_tilemap[450] = 12542; ram3000.msgbox.indirect_hdma[6] = 0; - WriteReg(DMAP6, 0x42u); - WriteReg(BBAD6, 0x12u); + WriteReg(DMAP6, 0x42); + WriteReg(BBAD6, 0x12); WriteReg(A1T6L, 0x80); WriteReg(DAS6L, 0x80); - WriteReg(A1T6H, 0x33u); - WriteReg(DAS6H, 0x33u); - WriteReg(A1B6, 0x7Eu); - WriteReg(DAS60, 0x7Eu); + WriteReg(A1T6H, 0x33); + WriteReg(DAS6H, 0x33); + WriteReg(A1B6, 0x7E); + WriteReg(DAS60, 0x7E); WriteReg(A2A6L, 0); WriteReg(A2A6H, 0); WriteReg(NTRL6, 0); MsgBoxMakeHdmaTable(); - WriteReg(HDMAEN, 0x40u); + WriteReg(HDMAEN, 0x40); } void SetupPpuForActiveMessageBox(void) { // 0x85831E SetupMessageBoxBg3YscrollHdma(); bg3_tilemap_offset += 22528; WriteRegWord(VMADDL, bg3_tilemap_offset); - WriteRegWord(DMAP1, 0x1801u); + WriteRegWord(DMAP1, 0x1801); WriteRegWord(A1T1L, ADDR16_OF_RAM(ram3000) + 512); - WriteRegWord(A1B1, 0x7Eu); + WriteRegWord(A1B1, 0x7E); WriteRegWord(DAS1L, *(uint16 *)((char *)&R8_ + 1)); WriteRegWord(DAS10, 0); WriteRegWord(A2A1H, 0); @@ -374,10 +374,10 @@ void ToggleSaveConfirmationSelection(void) { } while (bg3_tilemap_offset); bg3_tilemap_offset = addr_unk_6059A0; WriteRegWord(VMADDL, addr_unk_6059A0); - WriteRegWord(DMAP1, 0x1801u); + WriteRegWord(DMAP1, 0x1801); WriteRegWord(A1T1L, ADDR16_OF_RAM(ram3000) + 512); - WriteRegWord(A1B1, 0x7Eu); - WriteRegWord(DAS1L, 0x180u); + WriteRegWord(A1B1, 0x7E); + WriteRegWord(DAS1L, 0x180); WriteRegWord(DAS10, 0); WriteRegWord(A2A1H, 0); WriteReg(VMAIN, 0x80); @@ -413,10 +413,10 @@ void MsgBoxMakeHdmaTable(void) { void RestorePpuForMessageBox(void) { // 0x85861A WriteRegWord(VMADDL, addr_unk_605880); - WriteRegWord(DMAP1, 0x1801u); + WriteRegWord(DMAP1, 0x1801); WriteRegWord(A1T1L, ADDR16_OF_RAM(ram4000) + 256); - WriteRegWord(A1B1, 0x7Eu); - WriteRegWord(DAS1L, 0x700u); + WriteRegWord(A1B1, 0x7E); + WriteRegWord(DAS1L, 0x700); WriteRegWord(DAS10, 0); WriteRegWord(A2A1H, 0); WriteReg(VMAIN, 0x80); @@ -427,7 +427,7 @@ void RestorePpuForMessageBox(void) { // 0x85861A gameplay_TM = reg_TM; gameplay_CGWSEL = next_gameplay_CGWSEL; gameplay_CGADSUB = next_gameplay_CGADSUB; - WriteReg(CGADD, 0x19u); + WriteReg(CGADD, 0x19); WriteReg(CGDATA, palette_buffer[25]); WriteReg(CGDATA, HIBYTE(palette_buffer[25])); WriteReg(CGDATA, palette_buffer[26]); diff --git a/src/sm_86.c b/src/sm_86.c index 58a737c..58e32a1 100644 --- a/src/sm_86.c +++ b/src/sm_86.c @@ -1538,7 +1538,7 @@ void EprojPreInstr_CrocomireSpikeWallPieces(uint16 k) { int v12 = k >> 1; R18_ = enemy_projectile_x_pos[v12]; R20_ = enemy_projectile_y_pos[v12]; - SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0x15u); + SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0x15); QueueSfx2_Max6(0x25u); } } @@ -1706,7 +1706,7 @@ void EprojInit_9688(uint16 j) { // 0x8694A0 int v2 = j >> 1; enemy_projectile_x_vel[v2] = 0; enemy_projectile_y_vel[v2] = -3584; - EprojInit_Common(j, v1, 0x9688u); + EprojInit_Common(j, v1, 0x9688); } void EprojInit_9696(uint16 j) { // 0x8694B4 @@ -1730,7 +1730,7 @@ void EprojInit_967A(uint16 j) { // 0x8694DC int v2 = j >> 1; enemy_projectile_x_vel[v2] = -3584; enemy_projectile_y_vel[v2] = 0; - EprojInit_Common(j, v1, 0x967Au); + EprojInit_Common(j, v1, 0x967A); } void EprojInit_Common(uint16 j, uint16 k, uint16 a) { // 0x8694EE @@ -1907,7 +1907,7 @@ void EprojInit_PhantoonStartingFireballs(uint16 j) { // 0x86993A enemy_projectile_y_vel[v1] = 0; uint16 v2 = byte_869979[enemy_projectile_init_param]; enemy_projectile_E[v1] = v2; - Eproj_PhantomFireballs_Func1(v2, 0x30u); + Eproj_PhantomFireballs_Func1(v2, 0x30); enemy_projectile_x_pos[v1] = R20_ + enemy_data[0].x_pos; enemy_projectile_y_pos[v1] = R22_ + enemy_data[0].y_pos + 16; } @@ -3625,7 +3625,7 @@ void EprojPreInstr_MotherBrainRoomTurrets(uint16 k) { // 0x86BFDF int v5 = k >> 1; R18_ = enemy_projectile_x_pos[v5]; R20_ = enemy_projectile_y_pos[v5]; - SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0xCu); + SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0xC); } else { int v1 = k >> 1; bool v2 = enemy_projectile_x_vel[v1]-- == 1; @@ -4054,7 +4054,7 @@ void EprojInit_MotherBrainDeathBeemFired(uint16 j) { // 0x86C684 enemy_projectile_id[v1] = 0; R18_ = enemy_projectile_x_pos[v1]; R20_ = enemy_projectile_y_pos[v1]; - SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0x1Du); + SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0x1D); QueueSfx3_Max6(0x13u); earthquake_timer = 10; earthquake_type = 5; @@ -4265,7 +4265,7 @@ void MotherBrainTubeFallingFunc_Falling(uint16 k) { // 0x86CC08 enemy_projectile_id[v1] = 0; R18_ = enemy_projectile_x_pos[v1]; R20_ = enemy_projectile_y_pos[v1]; - SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0xCu); + SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0xC); } } diff --git a/src/sm_88.c b/src/sm_88.c index 6dbc982..d9533cd 100644 --- a/src/sm_88.c +++ b/src/sm_88.c @@ -334,7 +334,7 @@ void InitializeSpecialEffectsForNewRoom(void) { // 0x8882C1 debug_disable_minimap = 0; for (int i = 32; i != 0x80; i += 16) { WriteReg((SnesRegs)(i + 17152), 0); - WriteReg((SnesRegs)(i + 17153), 0x13u); + WriteReg((SnesRegs)(i + 17153), 0x13); WriteReg((SnesRegs)(i + 17154), 0); WriteReg((SnesRegs)(i + 17155), 0); WriteReg((SnesRegs)(i + 17156), 0); @@ -382,7 +382,7 @@ void InitializeSpecialEffectsForNewRoom(void) { // 0x8882C1 pause_hook.addr = FUNC16(PauseHook_Empty); unpause_hook.addr = FUNC16(PauseHook_Empty); WriteReg(WMADDL, 0xF0); - WriteReg(WMADDM, 0xFFu); + WriteReg(WMADDM, 0xFF); WriteReg(WMADDH, 1u); reg_HDMAEN = 0; reg_COLDATA[0] = 32; @@ -995,7 +995,7 @@ void HdmaobjPreInstr_XrayFunc5_DeactivateBeam(uint16 k) { // 0x888A08 R0_.bank = 126; R0_.addr = ADDR16_OF_RAM(*hdma_table_1); for (int i = 510; i >= 0; i -= 2) - IndirWriteWord(&R0_, i, 0xFFu); + IndirWriteWord(&R0_, i, 0xFF); if (samus_auto_cancel_hud_item_index) { hud_item_index = 0; samus_auto_cancel_hud_item_index = 0; @@ -2195,7 +2195,7 @@ void HdmaobjPreInstr_LavaAcidBG2YScroll(uint16 k) { // 0x88B4D5 } void Handle_LavaAcidBG2YScroll_Func1(uint16 v0) { // 0x88B51D - WriteReg((SnesRegs)(*((uint8 *)hdma_object_bank_slot + v0) + 17153), 0x10u); + WriteReg((SnesRegs)(*((uint8 *)hdma_object_bank_slot + v0) + 17153), 0x10); uint8 v1 = 30; uint16 v2 = reg_BG2VOFS & 0x1FF; do { @@ -2205,7 +2205,7 @@ void Handle_LavaAcidBG2YScroll_Func1(uint16 v0) { // 0x88B51D } #define g_word_88B589 ((uint16*)RomPtr(0x88b589)) void Handle_LavaAcidBG2YScroll_Func2(uint16 v0) { // 0x88B53B - WriteReg((SnesRegs)(*((uint8 *)hdma_object_bank_slot + v0) + 17153), 0xFu); + WriteReg((SnesRegs)(*((uint8 *)hdma_object_bank_slot + v0) + 17153), 0xF); int v1 = v0 >> 1; if (hdma_object_B[v1]-- == 1) { hdma_object_B[v1] = 6; @@ -2223,7 +2223,7 @@ void Handle_LavaAcidBG2YScroll_Func2(uint16 v0) { // 0x88B53B } #define g_word_88B60A ((uint16*)RomPtr(0x88b60a)) void Handle_LavaAcidBG2YScroll_Func3(uint16 v0) { // 0x88B5A9 - WriteReg((SnesRegs)(*((uint8 *)hdma_object_bank_slot + v0) + BBAD0), 0x10u); + WriteReg((SnesRegs)(*((uint8 *)hdma_object_bank_slot + v0) + BBAD0), 0x10); int v1 = v0 >> 1; if (hdma_object_B[v1]-- == 1) { hdma_object_B[v1] = 4; @@ -2656,7 +2656,7 @@ void HdmaobjPreInstr_HazeColorMathSubscreen_CeresRidleyAlive(uint16 k) { // 0x8 } void HdmaobjPreInstr_HazeColorMathSubscreen_CeresRidleyDead(uint16 k) { // 0x88DE15 - sub_88DE18(k, 0x20u); + sub_88DE18(k, 0x20); } void sub_88DE18(uint16 k, uint16 a) { // 0x88DE18 diff --git a/src/sm_8b.c b/src/sm_8b.c index b7510d9..f7d7496 100644 --- a/src/sm_8b.c +++ b/src/sm_8b.c @@ -52,7 +52,7 @@ void SetupPpuForTitleSequence(void) { // 0x8B8000 WriteReg(BG12NBA, 0); reg_BG34NBA = 0; WriteReg(BG34NBA, 0); - WriteReg(TM, 0x10u); + WriteReg(TM, 0x10); reg_TM = 16; WriteReg(TS, 0); reg_TS = 0; @@ -63,10 +63,10 @@ void SetupPpuForTitleSequence(void) { // 0x8B8000 next_gameplay_CGWSEL = 0; WriteReg(CGADSUB, 0); next_gameplay_CGADSUB = 0; - WriteReg(COLDATA, 0xE0u); + WriteReg(COLDATA, 0xE0); WriteReg(SETINI, 0); reg_SETINI = 0; - memset(g_ram + 0x3000u, 0, 0x7FEu); + memset(g_ram + 0x3000u, 0, 0x7FE); oam_next_ptr = 0; menu_option_index = 0; screen_fade_delay = 0; @@ -110,11 +110,11 @@ void SetupPpu_Intro(void) { // 0x8B80DA WriteReg(M7SEL, 0); reg_M7SEL = 0; reg_BG1SC = 80; - WriteReg(BG1SC, 0x50u); + WriteReg(BG1SC, 0x50); reg_BG2SC = 72; - WriteReg(BG2SC, 0x48u); + WriteReg(BG2SC, 0x48); reg_BG3SC = 76; - WriteReg(BG3SC, 0x4Cu); + WriteReg(BG3SC, 0x4C); reg_BG4SC = 0; WriteReg(BG4SC, 0); reg_BG12NBA = 0; @@ -132,7 +132,7 @@ void SetupPpu_Intro(void) { // 0x8B80DA next_gameplay_CGWSEL = 0; WriteReg(CGADSUB, 0); next_gameplay_CGADSUB = 0; - WriteReg(COLDATA, 0xE0u); + WriteReg(COLDATA, 0xE0); WriteReg(SETINI, 0); reg_SETINI = 0; reg_CGWSEL = 0; @@ -141,7 +141,7 @@ void SetupPpu_Intro(void) { // 0x8B80DA reg_COLDATA[1] = 64; reg_COLDATA[2] = 0x80; reg_MOSAIC = 0; - memset7E((uint16*)(g_ram + 0x3000), 0x2Fu, 0x7FEu); + memset7E((uint16*)(g_ram + 0x3000), 0x2F, 0x7FE); oam_next_ptr = 0; cinematic_var5 = 0; cinematic_var6 = 256; @@ -181,7 +181,7 @@ void SetupPpu_3_Mode7(void) { // 0x8B819B WriteReg(BG12NBA, 0); reg_BG34NBA = 0; WriteReg(BG34NBA, 0); - WriteReg(TM, 0x11u); + WriteReg(TM, 0x11); reg_TM = 17; WriteReg(TS, 0); reg_TS = 0; @@ -192,7 +192,7 @@ void SetupPpu_3_Mode7(void) { // 0x8B819B next_gameplay_CGWSEL = 0; WriteReg(CGADSUB, 0); next_gameplay_CGADSUB = 0; - WriteReg(COLDATA, 0xE0u); + WriteReg(COLDATA, 0xE0); reg_CGWSEL = 0; reg_CGADSUB = 0; reg_COLDATA[0] = 32; @@ -220,7 +220,7 @@ void SetupPpu_4_Mode1(void) { // 0x8B8230 WriteReg(M7SEL, 0); reg_M7SEL = 0; reg_BG1SC = 92; - WriteReg(BG1SC, 0x5Cu); + WriteReg(BG1SC, 0x5C); reg_BG2SC = 0; WriteReg(BG2SC, 0); reg_BG3SC = 0; @@ -231,7 +231,7 @@ void SetupPpu_4_Mode1(void) { // 0x8B8230 WriteReg(BG12NBA, 6u); reg_BG34NBA = 0; WriteReg(BG34NBA, 0); - WriteReg(TM, 0x11u); + WriteReg(TM, 0x11); reg_TM = 17; WriteReg(TS, 0); reg_TS = 0; @@ -249,7 +249,7 @@ void SetupPpu_4_Mode1(void) { // 0x8B8230 void SetupPpu_5_Mode7(void) { // 0x8B8293 WriteReg(INIDISP, 0x80); reg_INIDISP = 0x80; - WriteReg(OBSEL, 0xA3u); + WriteReg(OBSEL, 0xA3); reg_OBSEL = -93; WriteReg(BGMODE, 7u); reg_BGMODE = 7; @@ -267,7 +267,7 @@ void SetupPpu_5_Mode7(void) { // 0x8B8293 WriteReg(BG12NBA, 0); reg_BG34NBA = 0; WriteReg(BG34NBA, 0); - WriteReg(TM, 0x11u); + WriteReg(TM, 0x11); reg_TM = 17; WriteReg(TS, 0); reg_TS = 0; @@ -280,7 +280,7 @@ void SetupPpu_5_Mode7(void) { // 0x8B8293 next_gameplay_CGADSUB = 0; reg_CGWSEL = 0; reg_CGADSUB = 0; - WriteReg(COLDATA, 0xE0u); + WriteReg(COLDATA, 0xE0); WriteReg(SETINI, 0); reg_SETINI = 0; reg_COLDATA[0] = 32; @@ -311,18 +311,18 @@ void SetupPpu_6_Mode1(void) { // 0x8B833A WriteReg(M7SEL, 0); reg_M7SEL = 0; reg_BG1SC = 112; - WriteReg(BG1SC, 0x70u); + WriteReg(BG1SC, 0x70); reg_BG2SC = 120; - WriteReg(BG2SC, 0x78u); + WriteReg(BG2SC, 0x78); reg_BG3SC = 0; WriteReg(BG3SC, 0); reg_BG4SC = 0; WriteReg(BG4SC, 0); reg_BG12NBA = 68; - WriteReg(BG12NBA, 0x44u); + WriteReg(BG12NBA, 0x44); reg_BG34NBA = 0; WriteReg(BG34NBA, 0); - WriteReg(TM, 0x10u); + WriteReg(TM, 0x10); reg_TM = 16; WriteReg(TS, 0); reg_TS = 0; @@ -333,7 +333,7 @@ void SetupPpu_6_Mode1(void) { // 0x8B833A next_gameplay_CGWSEL = 0; WriteReg(CGADSUB, 0); next_gameplay_CGADSUB = 0; - WriteReg(COLDATA, 0xE0u); + WriteReg(COLDATA, 0xE0); reg_CGWSEL = 0; reg_CGADSUB = 0; reg_COLDATA[0] = 32; @@ -363,15 +363,15 @@ void SetupPpu_7_Mode1(void) { // 0x8B83D3 WriteReg(M7SEL, 0); reg_M7SEL = 0; reg_BG1SC = 72; - WriteReg(BG1SC, 0x48u); + WriteReg(BG1SC, 0x48); reg_BG2SC = 76; - WriteReg(BG2SC, 0x4Cu); + WriteReg(BG2SC, 0x4C); reg_BG3SC = 36; - WriteReg(BG3SC, 0x24u); + WriteReg(BG3SC, 0x24); reg_BG4SC = 0; WriteReg(BG4SC, 0); reg_BG12NBA = 84; - WriteReg(BG12NBA, 0x54u); + WriteReg(BG12NBA, 0x54); reg_BG34NBA = 2; WriteReg(BG34NBA, 2u); WriteReg(TM, 1u); @@ -389,13 +389,13 @@ void SetupPpu_7_Mode1(void) { // 0x8B83D3 reg_COLDATA[1] = 64; reg_COLDATA[2] = 0x80; oam_next_ptr = 0; - WriteRegWord(M7A, 0x100u); + WriteRegWord(M7A, 0x100); reg_M7A = 256; WriteRegWord(M7B, 0); reg_M7B = 0; WriteRegWord(M7C, 0); reg_M7C = 0; - WriteRegWord(M7D, 0x100u); + WriteRegWord(M7D, 0x100); reg_M7D = 256; WriteRegWord(M7X, 0x80); reg_M7X = 128; @@ -572,7 +572,7 @@ void ProcessCinematicBgObject_DrawChar(uint16 k, uint16 j) { // 0x8B884D cinematicbg_arr8[15] = v3 - 8; if (*((uint16 *)v2 + 2) != 0xD67D && cinematicbg_var1) QueueSfx3_Max6(0xDu); - ProcessCinematicBgObject_DrawToTextTilemap(0x1Eu, j); + ProcessCinematicBgObject_DrawToTextTilemap(0x1E, j); } void ProcessCinematicBgObject_DrawToTextTilemap(uint16 k, uint16 j) { // 0x8B88B7 @@ -1032,7 +1032,7 @@ uint8 AdvanceSlowScreenFadeIn(void) { // 0x8B911B CoroutineRet InitializeIoDisplayLogo_Async(void) { // 0x8B9146 COROUTINE_BEGIN(coroutine_state_1, 0); - WriteReg(INIDISP, 0x8Fu); + WriteReg(INIDISP, 0x8F); reg_INIDISP = 0x8f; oam_next_ptr = 0; ClearOamExt(); @@ -1124,7 +1124,7 @@ CoroutineRet InitializeIoDisplayLogo_Async(void) { // 0x8B9146 reg_WBGLOG = 0; WriteReg(WOBJLOG, 0); reg_WOBJLOG = 0; - WriteReg(TM, 0x10u); + WriteReg(TM, 0x10); reg_TM = 16; WriteReg(TMW, 0); reg_TMW = 0; @@ -1136,19 +1136,19 @@ CoroutineRet InitializeIoDisplayLogo_Async(void) { // 0x8B9146 next_gameplay_CGWSEL = 0; WriteReg(CGADSUB, 0); next_gameplay_CGADSUB = 0; - WriteReg(COLDATA, 0xE0u); + WriteReg(COLDATA, 0xE0); reg_COLDATA[0] = 32; reg_COLDATA[1] = 64; reg_COLDATA[2] = 0x80; WriteReg(SETINI, 0); reg_SETINI = 0; - mov24(&decompress_src, 0x9580D8u); + mov24(&decompress_src, 0x9580D8); { static const LongPtr unk_8B92A1 = LONGPTR(0x7f5000); DecompressToMem_IpArg(&unk_8B92A1); } WriteReg(VMADDL, 0); - WriteReg(VMADDH, 0x60u); + WriteReg(VMADDH, 0x60); WriteReg(VMAIN, 0x80); { static const StartDmaCopy unk_8B92B9 = { 1, 1, 0x18, LONGPTR(0x7f5000), 0x4000 }; @@ -1202,7 +1202,7 @@ CoroutineRet InitializeIoDisplayLogo_Async(void) { // 0x8B9146 } ClearUnusedOam(); COROUTINE_AWAIT(6, WaitForNMI_Async()); - WriteReg(INIDISP, 0x8Fu); + WriteReg(INIDISP, 0x8F); reg_INIDISP = 0x8f; COROUTINE_END(0); @@ -1212,7 +1212,7 @@ void AddNintentoLogoToOam(void) { // 0x8B936B R22_ = 0; R20_ = 128; R18_ = 112; - DrawSpritemap(0x8Cu, addr_kSpriteMap_NintendoLogo); + DrawSpritemap(0x8C, addr_kSpriteMap_NintendoLogo); } uint8 SpawnCinematicSpriteObject(uint16 j, uint16 a) { // 0x8B938A @@ -1836,7 +1836,7 @@ void DrawCinematicSpriteObjects_Intro(void) { // 0x8B9746 if ((uint16)(v3 + 128) < 0x1FFu) DrawSpritemapOffScreen(v2); } else if ((uint16)(v3 + 128) < 0x1FFu) { - DrawSpritemap(0x8Cu, v2); + DrawSpritemap(0x8C, v2); } } } @@ -1855,7 +1855,7 @@ void DrawCinematicSpriteObjects_Ending(void) { // 0x8B9799 if ((uint16)(v3 + 128) < 0x1FFu) DrawSpritemapOffScreen(v2); } else if ((uint16)(v3 + 128) < 0x1FFu) { - DrawSpritemap(0x8Cu, v2); + DrawSpritemap(0x8C, v2); } } } @@ -2273,17 +2273,17 @@ void LoadTitleSequenceGraphics(void) { // 0x8B9B87 palette_buffer[v0 >> 1] = g_word_8CE1E9[v0 >> 1]; v0 += 2; } while ((int16)(v0 - 512) < 0); - mov24(&decompress_src, 0x94E000u); + mov24(&decompress_src, 0x94E000); static const LongPtr unk_8B9BB4 = LONGPTR(0x7f0000); static const LongPtr unk_8B9BC5 = LONGPTR(0x7f4000); static const LongPtr unk_8B9BD6 = LONGPTR(0x7f5000); static const LongPtr unk_8B9BE7 = LONGPTR(0x7f9000); DecompressToMem_IpArg(&unk_8B9BB4); - mov24(&decompress_src, 0x96FC04u); + mov24(&decompress_src, 0x96FC04); DecompressToMem_IpArg(&unk_8B9BC5); - mov24(&decompress_src, 0x9580D8u); + mov24(&decompress_src, 0x9580D8); DecompressToMem_IpArg(&unk_8B9BD6); - mov24(&decompress_src, 0x95A5E1u); + mov24(&decompress_src, 0x95A5E1); DecompressToMem_IpArg(&unk_8B9BE7); WriteReg(VMADDL, 0); WriteReg(VMADDH, 0); @@ -2296,7 +2296,7 @@ void LoadTitleSequenceGraphics(void) { // 0x8B9B87 WriteReg(VMADDH, 0); v1 = 0x4000; do { - WriteReg(VMDATAL, 0xFFu); + WriteReg(VMDATAL, 0xFF); --v1; } while (v1); WriteReg(VMADDL, 0); @@ -2306,18 +2306,18 @@ void LoadTitleSequenceGraphics(void) { // 0x8B9B87 SetupDmaTransfer(&unk_8B9C37); WriteReg(MDMAEN, 2u); WriteReg(VMADDL, 0); - WriteReg(VMADDH, 0x60u); + WriteReg(VMADDH, 0x60); WriteReg(VMAIN, 0x80); static const StartDmaCopy unk_8B9C57 = { 1, 1, 0x18, LONGPTR(0x7f5000), 0x4000 }; SetupDmaTransfer(&unk_8B9C57); WriteReg(MDMAEN, 2u); - WriteRegWord(M7A, 0x100u); + WriteRegWord(M7A, 0x100); reg_M7A = 256; WriteRegWord(M7B, 0); reg_M7B = 0; WriteRegWord(M7C, 0); reg_M7C = 0; - WriteRegWord(M7D, 0x100u); + WriteRegWord(M7D, 0x100); reg_M7D = 256; WriteRegWord(M7X, 0x80); reg_M7X = 128; @@ -2716,42 +2716,42 @@ void CinematicFunction_Intro_Initial(void) { // 0x8BA395 SetupDmaTransfer(&unk_8BA469); WriteReg(MDMAEN, 2u); WriteReg(VMADDL, 0); - WriteReg(VMADDH, 0x40u); + WriteReg(VMADDH, 0x40); WriteReg(VMAIN, 0x80); static const StartDmaCopy unk_8BA489 = { 1, 1, 0x18, LONGPTR(0x7f8000), 0x0900 }; SetupDmaTransfer(&unk_8BA489); WriteReg(MDMAEN, 2u); WriteReg(VMADDL, 0); - WriteReg(VMADDH, 0x48u); + WriteReg(VMADDH, 0x48); WriteReg(VMAIN, 0x80); static const StartDmaCopy unk_8BA4A9 = { 1, 1, 0x18, LONGPTR(0x7f9000), 0x0800 }; SetupDmaTransfer(&unk_8BA4A9); WriteReg(MDMAEN, 2u); WriteReg(VMADDL, 0); - WriteReg(VMADDH, 0x4Cu); + WriteReg(VMADDH, 0x4C); WriteReg(VMAIN, 0x80); static const StartDmaCopy unk_8BA4C9 = { 1, 1, 0x18, LONGPTR(0x7fe000), 0x0800 }; SetupDmaTransfer(&unk_8BA4C9); WriteReg(MDMAEN, 2u); WriteReg(VMADDL, 0); - WriteReg(VMADDH, 0x50u); + WriteReg(VMADDH, 0x50); WriteReg(VMAIN, 0x80); static const StartDmaCopy unk_8BA4E9 = { 1, 1, 0x18, LONGPTR(0x7f9800), 0x2000 }; SetupDmaTransfer(&unk_8BA4E9); WriteReg(MDMAEN, 2u); WriteReg(VMADDL, 0); - WriteReg(VMADDH, 0x60u); + WriteReg(VMADDH, 0x60); WriteReg(VMAIN, 0x80); static const StartDmaCopy unk_8BA509 = { 1, 1, 0x18, LONGPTR(0x9ad200), 0x2000 }; SetupDmaTransfer(&unk_8BA509); WriteReg(MDMAEN, 2u); WriteReg(VMADDL, 0); - WriteReg(VMADDH, 0x6Eu); + WriteReg(VMADDH, 0x6E); WriteReg(VMAIN, 0x80); static const StartDmaCopy unk_8BA529 = { 1, 1, 0x18, LONGPTR(0x7fb800), 0x2400 }; SetupDmaTransfer(&unk_8BA529); WriteReg(MDMAEN, 2u); - mov24(&decompress_src, 0x95D713u); + mov24(&decompress_src, 0x95D713); static const LongPtr unk_8BA546 = LONGPTR(0x7fa000); DecompressToMem_IpArg(&unk_8BA546); EnableNMI(); @@ -2813,7 +2813,7 @@ void CinematicFunc_Intro_QueueGalaxyIsAtPeace(void) { // 0x8BA613 if (!cinematic_var4 || v0) { QueueMusic_Delayed8(0); QueueMusic_Delayed8(0xFF42u); - QueueMusic_DelayedY(5u, 0xEu); + QueueMusic_DelayedY(5u, 0xE); cinematic_function = FUNC16(CinematicFunc_Intro_WaitForQueueWait4secs); } } @@ -2842,12 +2842,12 @@ void CinematicFunc_Intro_WaitForFadeOut(void) { // 0x8BA663 void CinematicFunc_Intro_SetupTextPage2(void) { // 0x8BA66F ClearJapaneseTextTiles(); WriteReg(VMADDL, 0x80); - WriteReg(VMADDH, 0x41u); + WriteReg(VMADDH, 0x41); WriteReg(VMAIN, 0x80); static const StartDmaCopy unk_8BA689 = { 1, 1, 0x18, LONGPTR(0x7e4000), 0x0600 }; SetupDmaTransfer(&unk_8BA689); WriteReg(MDMAEN, 2u); - WriteReg(TM, 0x16u); + WriteReg(TM, 0x16); reg_TM = 22; ClearCinematicBgObjects(0x2F); EnableCinematicBgObjects(); @@ -2865,9 +2865,9 @@ void CinematicFunc_Intro_SetupTextPage2(void) { // 0x8BA66F ++v1; } while ((int16)(v1 * 2 - 1792) < 0); *(uint32 *)&ram3000.menu.menu_tilemap[286] = 472456233; - SpawnCinematicSpriteObject(addr_kCinematicSpriteObjectDef_8BCE6D, 0x1C29u); + SpawnCinematicSpriteObject(addr_kCinematicSpriteObjectDef_8BCE6D, 0x1C29); cinematic_var4 = 127; - SpawnCinematicBgObject(addr_kCinematicBgObjectDef_8BCF63, 0x4C00u); + SpawnCinematicBgObject(addr_kCinematicBgObjectDef_8BCF63, 0x4C00); cinematic_var10 = 8; reg_BG2VOFS = 8; reg_BG3VOFS = 8; @@ -2875,7 +2875,7 @@ void CinematicFunc_Intro_SetupTextPage2(void) { // 0x8BA66F SetSomeStuffForSpriteObject_16(); QueueMusic_Delayed8(0); QueueMusic_Delayed8(0xFF36u); - QueueMusic_DelayedY(5u, 0xEu); + QueueMusic_DelayedY(5u, 0xE); cinematic_function = FUNC16(CinematicFunc_Intro_WaitFadeinShowText); } @@ -2884,7 +2884,7 @@ void CinematicFunc_Intro_WaitFadeinShowText(void) { // 0x8BA82B cinematic_function = FUNC16(CinematicFunc_Intro_WaitForFadeinSleep); screen_fade_delay = 2; screen_fade_counter = 2; - SpawnCinematicBgObject(addr_kCinematicBgObjectDef_8BCF3F, 0x4C00u); + SpawnCinematicBgObject(addr_kCinematicBgObjectDef_8BCF3F, 0x4C00); } } @@ -3216,7 +3216,7 @@ void CinematicFunction_Intro_WaitInputSetupMotherBrainFight(void) { // 0x8BAEB8 cinematic_var8 = 0; cinematic_var13 = 127; R18_ = 0; - SpawnCinematicSpriteObjectToR18(addr_kCinematicSpriteObjectDef_8BCE55, 0x7Fu); + SpawnCinematicSpriteObjectToR18(addr_kCinematicSpriteObjectDef_8BCE55, 0x7F); SpawnCinematicSpriteObject(addr_kCinematicSpriteObjectDef_8BCF27, 0); uint16 v1 = 0; do { @@ -3259,7 +3259,7 @@ void CinematicFunction_Intro_WaitInputSetupBabyMetroid(void) { // 0x8BAF6C samus_prev_y_pos = 147; cinematic_var8 = 0; cinematic_var13 = 127; - SpawnCinematicSpriteObject(addr_kCinematicSpriteObjectDef_8BCE5B, 0x7Fu); + SpawnCinematicSpriteObject(addr_kCinematicSpriteObjectDef_8BCE5B, 0x7F); SpawnCinematicSpriteObject(addr_kCinematicSpriteObjectDef_8BCE79, 0); cinematic_var11 = 0; uint16 v1 = 0; @@ -3292,10 +3292,10 @@ void CinematicFunction_Intro_SetupTransitionToGameplay(void) { // 0x8BB018 v0 += 2; } while ((int16)(v0 - 512) < 0); DecomposePaletteDataForFading(); - ClearYColorsFromIndexX(0x28u, 3u); - ClearYColorsFromIndexX(0xE0u, 0x10u); - ClearYColorsFromIndexX(0x180u, 0x20u); - ClearYColorsFromIndexX(0x1E0u, 0x10u); + ClearYColorsFromIndexX(0x28, 3u); + ClearYColorsFromIndexX(0xE0, 0x10); + ClearYColorsFromIndexX(0x180, 0x20); + ClearYColorsFromIndexX(0x1E0, 0x10); ComposeFadingPalettes(); } @@ -3343,7 +3343,7 @@ void CinematicFunction_Intro_Func11(void) { // 0x8BB0F2 cinematic_var8 = 32; cinematic_var10 = 8; cinematic_var13 = 127; - SpawnCinematicSpriteObject(addr_kCinematicSpriteObjectDef_8BCE61, 0x7Fu); + SpawnCinematicSpriteObject(addr_kCinematicSpriteObjectDef_8BCE61, 0x7F); CinematicFunction_Intro_Func13(); } } @@ -3356,7 +3356,7 @@ void CinematicFunction_Intro_Func12(void) { // 0x8BB123 cinematic_var8 = 0; cinematic_var10 = -24; cinematic_var13 = 127; - SpawnCinematicSpriteObject(addr_kCinematicSpriteObjectDef_8BCE67, 0x7Fu); + SpawnCinematicSpriteObject(addr_kCinematicSpriteObjectDef_8BCE67, 0x7F); CinematicFunction_Intro_Func13(); } } @@ -3375,8 +3375,8 @@ void CinematicFunction_Intro_Func13(void) { // 0x8BB151 v0 += 2; } while ((int16)(v0 - 512) < 0); DecomposePaletteDataForFading(); - ClearYColorsFromIndexX(0x40u, 0x10u); - ClearYColorsFromIndexX(0x1C0u, 9u); + ClearYColorsFromIndexX(0x40, 0x10); + ClearYColorsFromIndexX(0x1C0, 9u); ComposeFadingPalettes(); } @@ -3417,7 +3417,7 @@ void CinematicFunction_Intro_Func15(void) { // 0x8BB1DA void CinematicFunction_Intro_Func15b(void) { // 0x8BB207 EnableCinematicBgTilemapUpdates(); ClearEnglishTextTilemap(); - SpawnCinematicBgObject(addr_kCinematicBgObjectDef_8BCF5D, 0x4C00u); + SpawnCinematicBgObject(addr_kCinematicBgObjectDef_8BCF5D, 0x4C00); cinematic_function = FUNC16(nullsub_121); SetSomeStuffForSpriteObject_16(); QueueMusic_Delayed8(0); @@ -3439,13 +3439,13 @@ uint16 CinematicBgInstr_Func17(uint16 k, uint16 j) { // 0x8BB240 void CinematicFunction_Intro_XfadeGameplayFade(void) { // 0x8BB250 if ((cinematic_var4 & 3) == 0) { - FadeOutYColorsFromIndexX(0, 0x14u); - FadeOutYColorsFromIndexX(0x60u, 0x10u); - FadeOutYColorsFromIndexX(0x1D2u, 6u); - FadeInYColorsFromIndexX(0x28u, 3u); - FadeInYColorsFromIndexX(0xE0u, 0x10u); - FadeInYColorsFromIndexX(0x180u, 0x20u); - FadeInYColorsFromIndexX(0x1E0u, 0x10u); + FadeOutYColorsFromIndexX(0, 0x14); + FadeOutYColorsFromIndexX(0x60, 0x10); + FadeOutYColorsFromIndexX(0x1D2, 6u); + FadeInYColorsFromIndexX(0x28, 3u); + FadeInYColorsFromIndexX(0xE0, 0x10); + FadeInYColorsFromIndexX(0x180, 0x20); + FadeInYColorsFromIndexX(0x1E0, 0x10); ComposeFadingPalettes(); } if ((--cinematic_var4 & 0x8000u) != 0) { @@ -3465,11 +3465,11 @@ void CinematicFunction_Intro_XfadeGameplayFade(void) { // 0x8BB250 void CinematicFunction_Intro_XfadeScientistFade(void) { // 0x8BB2D2 if ((cinematic_var4 & 3) == 0) { - FadeOutYColorsFromIndexX(0, 0x14u); - FadeOutYColorsFromIndexX(0x60u, 0x10u); - FadeOutYColorsFromIndexX(0x1D2u, 6u); - FadeInYColorsFromIndexX(0x40u, 0x10u); - FadeInYColorsFromIndexX(0x1C0u, 9u); + FadeOutYColorsFromIndexX(0, 0x14); + FadeOutYColorsFromIndexX(0x60, 0x10); + FadeOutYColorsFromIndexX(0x1D2, 6u); + FadeInYColorsFromIndexX(0x40, 0x10); + FadeInYColorsFromIndexX(0x1C0, 9u); ComposeFadingPalettes(); } if ((--cinematic_var4 & 0x8000u) != 0) { @@ -3516,25 +3516,25 @@ void Instr_StartIntroPage_Common(void) { // 0x8BB354 } void CinematicFunction_Intro_Page2(void) { // 0x8BB35F - SpawnCinematicBgObject(addr_kCinematicBgObjectDef_8BCF45, 0x4C00u); + SpawnCinematicBgObject(addr_kCinematicBgObjectDef_8BCF45, 0x4C00); cinematic_function = FUNC16(CinematicFunction_Intro_Fadestuff); CinematicFunction_Intro_SetupStuff(); } void CinematicFunction_Intro_Page3(void) { // 0x8BB370 - SpawnCinematicBgObject(addr_kCinematicBgObjectDef_8BCF4B, 0x4C00u); + SpawnCinematicBgObject(addr_kCinematicBgObjectDef_8BCF4B, 0x4C00); cinematic_function = FUNC16(CinematicFunction_Intro_Fadestuff); CinematicFunction_Intro_SetupStuff(); } void CinematicFunction_Intro_Page4(void) { // 0x8BB381 - SpawnCinematicBgObject(addr_kCinematicBgObjectDef_8BCF51, 0x4C00u); + SpawnCinematicBgObject(addr_kCinematicBgObjectDef_8BCF51, 0x4C00); cinematic_function = FUNC16(CinematicFunction_Intro_Fadestuff2); CinematicFunction_Intro_SetupStuff(); } void CinematicFunction_Intro_Page5(void) { // 0x8BB392 - SpawnCinematicBgObject(addr_kCinematicBgObjectDef_8BCF57, 0x4C00u); + SpawnCinematicBgObject(addr_kCinematicBgObjectDef_8BCF57, 0x4C00); cinematic_function = FUNC16(CinematicFunction_Intro_Fadestuff2); CinematicFunction_Intro_SetupStuff(); } @@ -3550,9 +3550,9 @@ void CinematicFunction_Intro_SetupStuff(void) { // 0x8BB3A1 v0 += 2; } while ((int16)(v0 - 512) < 0); DecomposePaletteDataForFading(); - ClearYColorsFromIndexX(0, 0x10u); - ClearYColorsFromIndexX(0x60u, 0x10u); - ClearYColorsFromIndexX(0x1D2u, 6u); + ClearYColorsFromIndexX(0, 0x10); + ClearYColorsFromIndexX(0x60, 0x10); + ClearYColorsFromIndexX(0x1D2, 6u); ComposeFadingPalettes(); cinematic_var4 = 127; EnableCinematicBgTilemapUpdates(); @@ -3561,13 +3561,13 @@ void CinematicFunction_Intro_SetupStuff(void) { // 0x8BB3A1 void CinematicFunction_Intro_Fadestuff(void) { // 0x8BB3F4 if ((cinematic_var13 & 3) == 0) { - FadeInYColorsFromIndexX(0, 0x10u); - FadeInYColorsFromIndexX(0x60u, 0x10u); - FadeInYColorsFromIndexX(0x1D2u, 6u); - FadeOutYColorsFromIndexX(0x28u, 3u); - FadeOutYColorsFromIndexX(0xE0u, 0x10u); - FadeOutYColorsFromIndexX(0x180u, 0x20u); - FadeOutYColorsFromIndexX(0x1E0u, 0x10u); + FadeInYColorsFromIndexX(0, 0x10); + FadeInYColorsFromIndexX(0x60, 0x10); + FadeInYColorsFromIndexX(0x1D2, 6u); + FadeOutYColorsFromIndexX(0x28, 3u); + FadeOutYColorsFromIndexX(0xE0, 0x10); + FadeOutYColorsFromIndexX(0x180, 0x20); + FadeOutYColorsFromIndexX(0x1E0, 0x10); ComposeFadingPalettes(); } if ((--cinematic_var13 & 0x8000u) != 0) { @@ -3581,11 +3581,11 @@ void CinematicFunction_Intro_Fadestuff(void) { // 0x8BB3F4 void CinematicFunction_Intro_Fadestuff2(void) { // 0x8BB458 if ((cinematic_var13 & 3) == 0) { - FadeInYColorsFromIndexX(0, 0x10u); - FadeInYColorsFromIndexX(0x60u, 0x10u); - FadeInYColorsFromIndexX(0x1D2u, 6u); - FadeOutYColorsFromIndexX(0x40u, 0x10u); - FadeOutYColorsFromIndexX(0x1C0u, 9u); + FadeInYColorsFromIndexX(0, 0x10); + FadeInYColorsFromIndexX(0x60, 0x10); + FadeInYColorsFromIndexX(0x1D2, 6u); + FadeOutYColorsFromIndexX(0x40, 0x10); + FadeOutYColorsFromIndexX(0x1C0, 9u); ComposeFadingPalettes(); } if ((--cinematic_var13 & 0x8000u) != 0) { @@ -4171,9 +4171,9 @@ void CinematicFunction_Intro_Func54(void) { // 0x8BBCA0 static const DecompressToParams unk_8BBCEC = { LONGPTR(0x7f5000) }; mov24(&decompress_src, 0x95A82F); DecompressToMem_IpArg(&unk_8BBCCA); - mov24(&decompress_src, 0x96FE69u); + mov24(&decompress_src, 0x96FE69); DecompressToMem_IpArg(&unk_8BBCDB); - mov24(&decompress_src, 0x96D10Au); + mov24(&decompress_src, 0x96D10A); DecompressToMem_IpArg(&unk_8BBCEC); WriteReg(VMADDL, 0); WriteReg(VMADDH, 0); @@ -4186,7 +4186,7 @@ void CinematicFunction_Intro_Func54(void) { // 0x8BBCA0 WriteReg(VMADDH, 0); v1 = 0x4000; do { - WriteReg(VMDATAL, 0x8Cu); + WriteReg(VMDATAL, 0x8C); --v1; } while (v1); WriteReg(VMADDL, 0); @@ -4196,22 +4196,22 @@ void CinematicFunction_Intro_Func54(void) { // 0x8BBCA0 SetupDmaTransfer(&unk_8BBD3C); WriteReg(MDMAEN, 2u); WriteReg(VMADDL, 0); - WriteReg(VMADDH, 0x60u); + WriteReg(VMADDH, 0x60); WriteReg(VMAIN, 0x80); static const StartDmaCopy unk_8BBD5C = { 1, 1, 0x18, LONGPTR(0x7f5000), 0x4000 }; SetupDmaTransfer(&unk_8BBD5C); WriteReg(MDMAEN, 2u); - WriteRegWord(M7A, 0x100u); + WriteRegWord(M7A, 0x100); reg_M7A = 256; WriteRegWord(M7B, 0); reg_M7B = 0; WriteRegWord(M7C, 0); reg_M7C = 0; - WriteRegWord(M7D, 0x100u); + WriteRegWord(M7D, 0x100); reg_M7D = 256; - WriteRegWord(M7X, 0x38u); + WriteRegWord(M7X, 0x38); reg_M7X = 56; - WriteRegWord(M7Y, 0x18u); + WriteRegWord(M7Y, 0x18); reg_M7Y = 24; cinematic_var8 = -72; cinematic_var10 = -104; @@ -4225,7 +4225,7 @@ void CinematicFunction_Intro_Func54(void) { // 0x8BBCA0 SpawnCinematicSpriteObject(addr_kCinematicSpriteObjectDef_8BCF0F, 0); cinematic_function = FUNC16(CinematicFunction_Intro_Func55); QueueMusic_Delayed8(0xFF2Du); - QueueMusic_DelayedY(5u, 0xEu); + QueueMusic_DelayedY(5u, 0xE); } void CinematicFunction_Intro_Func55(void) { // 0x8BBDE4 @@ -4392,7 +4392,7 @@ void CinematicFunction_Intro_Func67(void) { // 0x8BBFDA cinematic_var10 = 0; EnableCinematicBgObjects(); EnableCinematicBgTilemapUpdates(); - SpawnCinematicBgObject(addr_kCinematicBgObjectDef_8BCF69, 0x5C00u); + SpawnCinematicBgObject(addr_kCinematicBgObjectDef_8BCF69, 0x5C00); cinematic_function = FUNC16(nullsub_120); } } @@ -4484,7 +4484,7 @@ void CinematicFunctionBlackoutFromCeres(void) { // 0x8BC11B WriteReg(VMADDH, 0); v3 = 0x4000; do { - WriteReg(VMDATAL, 0x8Cu); + WriteReg(VMDATAL, 0x8C); --v3; } while (v3); WriteReg(VMADDL, 0); @@ -4494,28 +4494,28 @@ void CinematicFunctionBlackoutFromCeres(void) { // 0x8BC11B SetupDmaTransfer(&unk_8BC1D4); WriteReg(MDMAEN, 2u); WriteReg(VMADDL, 0); - WriteReg(VMADDH, 0x60u); + WriteReg(VMADDH, 0x60); WriteReg(VMAIN, 0x80); static const StartDmaCopy unk_8BC1F4 = { 1, 1, 0x18, LONGPTR(0x7f5000), 0x4000 }; SetupDmaTransfer(&unk_8BC1F4); WriteReg(MDMAEN, 2u); WriteReg(VMADDL, 0); - WriteReg(VMADDH, 0x60u); + WriteReg(VMADDH, 0x60); WriteReg(VMAIN, 0x80); static const StartDmaCopy unk_8BC214 = { 1, 1, 0x18, LONGPTR(0x9ad200), 0x1a00 }; SetupDmaTransfer(&unk_8BC214); WriteReg(MDMAEN, 2u); - WriteRegWord(M7A, 0x100u); + WriteRegWord(M7A, 0x100); reg_M7A = 256; WriteRegWord(M7B, 0); reg_M7B = 0; WriteRegWord(M7C, 0); reg_M7C = 0; - WriteRegWord(M7D, 0x100u); + WriteRegWord(M7D, 0x100); reg_M7D = 256; - WriteRegWord(M7X, 0x34u); + WriteRegWord(M7X, 0x34); reg_M7X = 52; - WriteRegWord(M7Y, 0x30u); + WriteRegWord(M7Y, 0x30); reg_M7Y = 48; cinematic_var8 = -44; cinematic_var10 = -112; @@ -4541,9 +4541,9 @@ void CinematicFunctionBlackoutFromCeres(void) { // 0x8BC11B QueueMusic_Delayed8(0); QueueMusic_Delayed8(0xFF2Du); if (game_state == kGameState_37_CeresGoesBoomWithSamus) - QueueMusic_DelayedY(8u, 0xEu); + QueueMusic_DelayedY(8u, 0xE); else - QueueMusic_DelayedY(7u, 0xEu); + QueueMusic_DelayedY(7u, 0xE); } void CinematicFunction_Intro_Func74(void) { // 0x8BC2E4 @@ -4755,28 +4755,28 @@ void CinematicFunction_Intro_Func86(void) { // 0x8BC699 SetupDmaTransfer(&unk_8BC6E4); WriteReg(MDMAEN, 2u); WriteReg(VMADDL, 0); - WriteReg(VMADDH, 0x5Cu); + WriteReg(VMADDH, 0x5C); WriteReg(VMAIN, 0x80); static const StartDmaCopy unk_8BC704 = { 1, 1, 0x18, LONGPTR(0x7f9000), 0x0800 }; SetupDmaTransfer(&unk_8BC704); WriteReg(MDMAEN, 2u); WriteReg(VMADDL, 0); - WriteReg(VMADDH, 0x60u); + WriteReg(VMADDH, 0x60); WriteReg(VMAIN, 0x80); static const StartDmaCopy unk_8BC724 = { 1, 1, 0x18, LONGPTR(0x7f5000), 0x4000 }; SetupDmaTransfer(&unk_8BC724); WriteReg(MDMAEN, 2u); - WriteRegWord(M7A, 0x100u); + WriteRegWord(M7A, 0x100); reg_M7A = 256; WriteRegWord(M7B, 0); reg_M7B = 0; WriteRegWord(M7C, 0); reg_M7C = 0; - WriteRegWord(M7D, 0x100u); + WriteRegWord(M7D, 0x100); reg_M7D = 256; - WriteRegWord(M7X, 0x38u); + WriteRegWord(M7X, 0x38); reg_M7X = 56; - WriteRegWord(M7Y, 0x18u); + WriteRegWord(M7Y, 0x18); reg_M7Y = 24; cinematic_var8 = 0; cinematic_var10 = 0; @@ -5107,13 +5107,13 @@ void CinematicFunctionEscapeFromCebes(void) { // 0x8BD480 SetupDmaTransfer(&unk_8BD4FC); WriteReg(MDMAEN, 2u); WriteReg(VMADDL, 0); - WriteReg(VMADDH, 0x20u); + WriteReg(VMADDH, 0x20); WriteReg(VMAIN, 0x80); static const StartDmaCopy unk_8BD51C = { 1, 1, 0x18, LONGPTR(0x7f8000), 0x4000 }; SetupDmaTransfer(&unk_8BD51C); WriteReg(MDMAEN, 2u); WriteReg(VMADDL, 0); - WriteReg(VMADDH, 0x60u); + WriteReg(VMADDH, 0x60); WriteReg(VMAIN, 0x80); static const StartDmaCopy unk_8BD53C = { 1, 1, 0x18, LONGPTR(0x7f4000), 0x4000 }; SetupDmaTransfer(&unk_8BD53C); @@ -5159,13 +5159,13 @@ void CinematicFunctionEscapeFromCebes(void) { // 0x8BD480 DecompressToMem_IpArg(&unk_8BD612); mov24(&decompress_src, 0x99d932); DecompressToMem_IpArg(&unk_8BD623); - WriteRegWord(M7A, 0x100u); + WriteRegWord(M7A, 0x100); reg_M7A = 256; WriteRegWord(M7B, 0); reg_M7B = 0; WriteRegWord(M7C, 0); reg_M7C = 0; - WriteRegWord(M7D, 0x100u); + WriteRegWord(M7D, 0x100); reg_M7D = 256; WriteRegWord(M7X, 0x80); reg_M7X = 128; @@ -5195,7 +5195,7 @@ void CinematicFunctionEscapeFromCebes(void) { // 0x8BD480 cinematic_function = FUNC16(CinematicFunction_Intro_Func109); QueueMusic_Delayed8(0); QueueMusic_Delayed8(0xFF33u); - QueueMusic_DelayedY(5u, 0xEu); + QueueMusic_DelayedY(5u, 0xE); } void CinematicFunction_Intro_Func109(void) { // 0x8BD6D7 @@ -5230,12 +5230,12 @@ void CinematicFunction_Intro_Func112(void) { // 0x8BD731 SetupDmaTransfer(&unk_8BD746); WriteReg(MDMAEN, 2u); WriteReg(VMADDL, 0); - WriteReg(VMADDH, 0x20u); + WriteReg(VMADDH, 0x20); WriteReg(VMAIN, 0x80); static const StartDmaCopy unk_8BD766 = { 1, 1, 0x18, LONGPTR(0x7e2000), 0x4000 }; SetupDmaTransfer(&unk_8BD766); WriteReg(MDMAEN, 2u); - mov24(&decompress_src, 0x98ED4Fu); + mov24(&decompress_src, 0x98ED4F); static const DecompressToParams unk_8BD783 = { LONGPTR(0x7e2000) }; DecompressToMem_IpArg(&unk_8BD783); WriteReg(VMADDL, 0); @@ -5282,12 +5282,12 @@ void CinematicFunction_Intro_Func115(void) { // 0x8BD837 SetupDmaTransfer(&unk_8BD84C); WriteReg(MDMAEN, 2u); WriteReg(VMADDL, 0); - WriteReg(VMADDH, 0x20u); + WriteReg(VMADDH, 0x20); WriteReg(VMAIN, 0x80); static const StartDmaCopy unk_8BD86C = { 1, 1, 0x18, LONGPTR(0x7e6000), 0x4000 }; SetupDmaTransfer(&unk_8BD86C); WriteReg(MDMAEN, 2u); - mov24(&decompress_src, 0x999101u); + mov24(&decompress_src, 0x999101); static const DecompressToParams unk_8BD889 = { LONGPTR(0x7e6000) }; DecompressToMem_IpArg(&unk_8BD889); WriteReg(VMADDL, 0); @@ -5297,37 +5297,37 @@ void CinematicFunction_Intro_Func115(void) { // 0x8BD837 SetupDmaTransfer(&unk_8BD8A1); WriteReg(MDMAEN, 2u); WriteReg(VMADDL, 0); - WriteReg(VMADDH, 0x40u); + WriteReg(VMADDH, 0x40); WriteReg(VMAIN, 0x80); static const StartDmaCopy unk_8BD8C1 = { 1, 1, 0x18, LONGPTR(0x7f8000), 0x6000 }; SetupDmaTransfer(&unk_8BD8C1); WriteReg(MDMAEN, 2u); WriteReg(VMADDL, 0); - WriteReg(VMADDH, 0x70u); + WriteReg(VMADDH, 0x70); WriteReg(VMAIN, 0x80); static const StartDmaCopy unk_8BD8E1 = { 1, 1, 0x18, LONGPTR(0x7fe000), 0x0800 }; SetupDmaTransfer(&unk_8BD8E1); WriteReg(MDMAEN, 2u); WriteReg(VMADDL, 0); - WriteReg(VMADDH, 0x74u); + WriteReg(VMADDH, 0x74); WriteReg(VMAIN, 0x80); static const StartDmaCopy unk_8BD901 = { 1, 1, 0x18, LONGPTR(0x7fe800), 0x0800 }; SetupDmaTransfer(&unk_8BD901); WriteReg(MDMAEN, 2u); WriteReg(VMADDL, 0); - WriteReg(VMADDH, 0x78u); + WriteReg(VMADDH, 0x78); WriteReg(VMAIN, 0x80); static const StartDmaCopy unk_8BD921 = { 1, 1, 0x18, LONGPTR(0x7ff000), 0x0800 }; SetupDmaTransfer(&unk_8BD921); WriteReg(MDMAEN, 2u); WriteReg(VMADDL, 0); - WriteReg(VMADDH, 0x7Cu); + WriteReg(VMADDH, 0x7C); WriteReg(VMAIN, 0x80); static const StartDmaCopy unk_8BD941 = { 1, 1, 0x18, LONGPTR(0x7ff800), 0x0800 }; SetupDmaTransfer(&unk_8BD941); WriteReg(MDMAEN, 2u); WriteReg(VMADDL, 0); - WriteReg(VMADDH, 0x50u); + WriteReg(VMADDH, 0x50); WriteReg(VMAIN, 0x80); static const StartDmaCopy unk_8BD961 = { 1, 1, 0x18, LONGPTR(0x7ea000), 0x1000 }; SetupDmaTransfer(&unk_8BD961); @@ -5362,8 +5362,8 @@ void CinematicFunction_Intro_Func115(void) { // 0x8BD837 reg_CGADSUB = 33; CopyPalettesToFadingPalettes(); DecomposePaletteDataForFading(); - ClearYColorsFromIndexX(0x1A0u, 0x10u); - ClearYColorsFromIndexX(0x1E0u, 0x10u); + ClearYColorsFromIndexX(0x1A0, 0x10); + ClearYColorsFromIndexX(0x1E0, 0x10); ComposeFadingPalettes(); cinematic_var4 = 63; cinematic_function = FUNC16(CinematicFunction_Intro_Func116); @@ -5381,9 +5381,9 @@ void CinematicFunction_Intro_Func116(void) { // 0x8BDA02 void CinematicFunction_Intro_Func117(void) { // 0x8BDA1A cinematic_var6 += 4; if ((cinematic_var4 & 1) == 0) { - FadeOutYColorsFromIndexX(0xE0u, 0x10u); - FadeInYColorsFromIndexX(0x1A0u, 0x10u); - FadeInYColorsFromIndexX(0x1E0u, 0x10u); + FadeOutYColorsFromIndexX(0xE0, 0x10); + FadeInYColorsFromIndexX(0x1A0, 0x10); + FadeInYColorsFromIndexX(0x1E0, 0x10); ComposeFadingPalettes(); } if ((--cinematic_var4 & 0x8000u) != 0) { @@ -5407,7 +5407,7 @@ void CinematicFunction_Intro_Func117(void) { // 0x8BDA1A next_gameplay_CGADSUB = 0; reg_CGWSEL = 0; reg_CGADSUB = 0; - WriteReg(COLDATA, 0xE0u); + WriteReg(COLDATA, 0xE0); reg_COLDATA[0] = 32; reg_COLDATA[1] = 64; reg_COLDATA[2] = 0x80; @@ -5477,7 +5477,7 @@ void CinematicFunction_Intro_Func119(void) { // 0x8BDB9E if (!cinematic_var4 || v0) { QueueMusic_Delayed8(0); QueueMusic_Delayed8(0xFF3Cu); - QueueMusic_DelayedY(5u, 0xEu); + QueueMusic_DelayedY(5u, 0xE); cinematic_function = FUNC16(CinematicFunction_Intro_Func120); } } @@ -5572,7 +5572,7 @@ void CinematicFunction_Intro_Func123(void) { // 0x8BDD42 cinematic_var13 = 0; if (CheckEventHappened(0xFu)) { R18_ = 4; - SpawnCinematicSpriteObjectToR18(0xEF21u, 4u); + SpawnCinematicSpriteObjectToR18(0xEF21, 4u); } } } @@ -5627,63 +5627,63 @@ void CinematicFunction_Intro_Func126(void) { // 0x8BDE80 static const DecompressToParams unk_8BDEFF = { LONGPTR(0x7f4000) }; static const DecompressToParams unk_8BDF10 = { LONGPTR(0x7fe800) }; static const DecompressToParams unk_8BDF21 = { LONGPTR(0x7ff000) }; - mov24(&decompress_src, 0x979803u); + mov24(&decompress_src, 0x979803); DecompressToMem_IpArg(&unk_8BDEAA); - mov24(&decompress_src, 0x97B957u); + mov24(&decompress_src, 0x97B957); DecompressToMem_IpArg(&unk_8BDEBB); - mov24(&decompress_src, 0x97D7FCu); + mov24(&decompress_src, 0x97D7FC); DecompressToMem_IpArg(&unk_8BDECC); - mov24(&decompress_src, 0x97E7DEu); + mov24(&decompress_src, 0x97E7DE); DecompressToMem_IpArg(&unk_8BDEDD); - mov24(&decompress_src, 0x9796F4u); + mov24(&decompress_src, 0x9796F4); DecompressToMem_IpArg(&unk_8BDEEE); - mov24(&decompress_src, 0x97F987u); + mov24(&decompress_src, 0x97F987); DecompressToMem_IpArg(&unk_8BDEFF); - mov24(&decompress_src, 0x99DA9Fu); + mov24(&decompress_src, 0x99DA9F); DecompressToMem_IpArg(&unk_8BDF10); - mov24(&decompress_src, 0x99DAB1u); + mov24(&decompress_src, 0x99DAB1); DecompressToMem_IpArg(&unk_8BDF21); WriteReg(VMADDL, 0); - WriteReg(VMADDH, 0x20u); + WriteReg(VMADDH, 0x20); WriteReg(VMAIN, 0x80); static const StartDmaCopy unk_8BDF39 = { 1, 1, 0x18, LONGPTR(0x7fe800), 0x0100 }; SetupDmaTransfer(&unk_8BDF39); WriteReg(MDMAEN, 2u); WriteReg(VMADDL, 0); - WriteReg(VMADDH, 0x24u); + WriteReg(VMADDH, 0x24); WriteReg(VMAIN, 0x80); static const StartDmaCopy unk_8BDF59 = { 1, 1, 0x18, LONGPTR(0x7ff000), 0x0800 }; SetupDmaTransfer(&unk_8BDF59); WriteReg(MDMAEN, 2u); WriteReg(VMADDL, 0); - WriteReg(VMADDH, 0x40u); + WriteReg(VMADDH, 0x40); WriteReg(VMAIN, 0x80); static const StartDmaCopy unk_8BDF79 = { 1, 1, 0x18, LONGPTR(0x7fc000), 0x1000 }; SetupDmaTransfer(&unk_8BDF79); WriteReg(MDMAEN, 2u); WriteReg(VMADDL, 0); - WriteReg(VMADDH, 0x60u); + WriteReg(VMADDH, 0x60); WriteReg(VMAIN, 0x80); static const StartDmaCopy unk_8BDF99 = { 1, 1, 0x18, LONGPTR(0x7e6000), 0x4000 }; SetupDmaTransfer(&unk_8BDF99); WriteReg(MDMAEN, 2u); WriteReg(VMADDL, 0); - WriteReg(VMADDH, 0x50u); + WriteReg(VMADDH, 0x50); WriteReg(VMAIN, 0x80); static const StartDmaCopy unk_8BDFB9 = { 1, 1, 0x18, LONGPTR(0x7f0000), 0x2000 }; SetupDmaTransfer(&unk_8BDFB9); WriteReg(MDMAEN, 2u); WriteReg(VMADDL, 0); - WriteReg(VMADDH, 0x4Cu); + WriteReg(VMADDH, 0x4C); WriteReg(VMAIN, 0x80); static const StartDmaCopy unk_8BDFD9 = { 1, 1, 0x18, LONGPTR(0x7fe000), 0x0800 }; SetupDmaTransfer(&unk_8BDFD9); WriteReg(MDMAEN, 2u); - mov24(&decompress_src, 0x99E089u); + mov24(&decompress_src, 0x99E089); static const DecompressToParams unk_8BDFF6 = { LONGPTR(0x7e6000) }; DecompressToMem_IpArg(&unk_8BDFF6); - mov24(&decompress_src, 0x99ECC4u); + mov24(&decompress_src, 0x99ECC4); static const DecompressToParams unk_8BE007 = { LONGPTR(0x7e8000) }; DecompressToMem_IpArg(&unk_8BE007); if (sign16(game_time_hours - 3)) { @@ -5701,17 +5701,17 @@ void CinematicFunction_Intro_Func126(void) { // 0x8BDE80 SetupDmaTransfer(&unk_8BE04B); WriteReg(MDMAEN, 2u); } - WriteRegWord(M7A, 0x100u); + WriteRegWord(M7A, 0x100); reg_M7A = 256; WriteRegWord(M7B, 0); reg_M7B = 0; WriteRegWord(M7C, 0); reg_M7C = 0; - WriteRegWord(M7D, 0x100u); + WriteRegWord(M7D, 0x100); reg_M7D = 256; - WriteRegWord(M7X, 0x68u); + WriteRegWord(M7X, 0x68); reg_M7X = 104; - WriteRegWord(M7Y, 0x70u); + WriteRegWord(M7Y, 0x70); reg_M7Y = 112; cinematic_var8 = -8; cinematic_var10 = -24; @@ -5725,7 +5725,7 @@ void CinematicFunction_Intro_Func126(void) { // 0x8BDE80 for (int i = 510; i >= 0; i -= 2) hdma_table_1[i >> 1] = 0; CinematicFunction_Intro_Func127(); - mov24(&decompress_src, 0x97EEFFu); + mov24(&decompress_src, 0x97EEFF); static const DecompressToParams unk_8BE0CB = { LONGPTR(0x7f0000) }; DecompressToMem_IpArg(&unk_8BE0CB); ClearCinematicBgObjects(0x7F); @@ -5757,7 +5757,7 @@ void CinematicFunction_Intro_Func130(void) { // 0x8BE110 screen_fade_counter = 0; CopyPalettesToFadingPalettes(); DecomposePaletteDataForFading(); - ClearYColorsFromIndexX(0x40u, 0x10u); + ClearYColorsFromIndexX(0x40, 0x10); ComposeFadingPalettes(); cinematic_var4 = 32; cinematic_function = FUNC16(CinematicFunction_Intro_Func131); @@ -5765,7 +5765,7 @@ void CinematicFunction_Intro_Func130(void) { // 0x8BE110 } void CinematicFunction_Intro_Func131(void) { // 0x8BE158 - FadeInYColorsFromIndexX(0x40u, 0x10u); + FadeInYColorsFromIndexX(0x40, 0x10); ComposeFadingPalettes(); bool v0 = (--cinematic_var4 & 0x8000u) != 0; if (!cinematic_var4 || v0) { @@ -5822,9 +5822,9 @@ void CinematicFunction_Intro_Func134(void) { // 0x8BE1D2 DecomposePaletteDataForFading(); SpawnCinematicSpriteObject(addr_kCinematicSpriteObjectDef_8BEF51, 0); SpawnCinematicSpriteObject(addr_kCinematicSpriteObjectDef_8BEF45, 0); - ClearYColorsFromIndexX(0x1C0u, 0x10u); + ClearYColorsFromIndexX(0x1C0, 0x10); } - ClearYColorsFromIndexX(0x1A0u, 0x10u); + ClearYColorsFromIndexX(0x1A0, 0x10); ComposeFadingPalettes(); reg_TM = 2; reg_TS = 16; @@ -5838,10 +5838,10 @@ void CinematicFunction_Intro_Func136(void) { // 0x8BE265 if ((cinematic_var4 & 3) != 0) { CinematicFunction_Intro_Func135(); } else { - FadeOutYColorsFromIndexX(0x40u, 0x10u); + FadeOutYColorsFromIndexX(0x40, 0x10); if (!sign16(game_time_hours - 3)) - FadeInYColorsFromIndexX(0x1C0u, 0x10u); - FadeInYColorsFromIndexX(0x1A0u, 0x10u); + FadeInYColorsFromIndexX(0x1C0, 0x10); + FadeInYColorsFromIndexX(0x1A0, 0x10); ComposeFadingPalettes(); CinematicFunction_Intro_Func135(); } @@ -5885,10 +5885,10 @@ void CinematicFunction_Intro_Func138(void) { // 0x8BE314 if ((cinematic_var4 & 3) != 0) { CinematicFunction_Intro_Func145(); } else { - FadeOutYColorsFromIndexX(0x40u, 0x10u); + FadeOutYColorsFromIndexX(0x40, 0x10); if (!sign16(game_time_hours - 3)) - FadeInYColorsFromIndexX(0x1C0u, 0x10u); - FadeInYColorsFromIndexX(0x1A0u, 0x10u); + FadeInYColorsFromIndexX(0x1C0, 0x10); + FadeInYColorsFromIndexX(0x1A0, 0x10); ComposeFadingPalettes(); CinematicFunction_Intro_Func145(); } @@ -5923,7 +5923,7 @@ void CinematicFunction_Intro_Func145(void) { // 0x8BE342 void CinematicFunction_Intro_Func139(void) { // 0x8BE3AE if (cinematic_var14) { --cinematic_var14; - FadeOutYColorsFromIndexX(0x180u, 0x10u); + FadeOutYColorsFromIndexX(0x180, 0x10); if (cinematic_var4) ComposeFadingPalettes(); } @@ -5944,7 +5944,7 @@ void CinematicFunction_Intro_Func139(void) { // 0x8BE3AE void CinematicFunction_Intro_Func140(void) { // 0x8BE409 if (cinematic_var17) { --cinematic_var17; - FadeOutYColorsFromIndexX(0x1E0u, 0x10u); + FadeOutYColorsFromIndexX(0x1E0, 0x10); ComposeFadingPalettes(); } } @@ -6045,7 +6045,7 @@ void CinematicFunction_Intro_Func144(void) { // 0x8BE58A if (!sign16(++cinematic_var4 - 16)) { cinematic_function = FUNC16(nullsub_127); ClearCinematicSprites(); - SpawnCinematicBgObject(addr_kCinematicBgObjectDef_8BF74E, 0x4C00u); + SpawnCinematicBgObject(addr_kCinematicBgObjectDef_8BF74E, 0x4C00); } } @@ -6113,7 +6113,7 @@ uint16 CinematicFunction_Intro_Func147(uint16 k, uint16 j) { // 0x8BE780 void CinematicFunction_Intro_Func148(void) { // 0x8BE797 cinematic_var10 -= 2; if (sign16(cinematic_var10 + 79)) { - SpawnCinematicBgObject(addr_kCinematicBgObjectDef_8BF748, 0x4C00u); + SpawnCinematicBgObject(addr_kCinematicBgObjectDef_8BF748, 0x4C00); cinematic_function = FUNC16(nullsub_127); CopySuperMetroidString(); } diff --git a/src/sm_90.c b/src/sm_90.c index 0c62edb..9ac2817 100644 --- a/src/sm_90.c +++ b/src/sm_90.c @@ -4799,7 +4799,7 @@ void ProjPreInstr_IceSba(uint16 k) { // 0x90CF09 k = projectile_index; } int v3 = k >> 1; - Projectile_SinLookup(projectile_variables[v3], 0x20u); + Projectile_SinLookup(projectile_variables[v3], 0x20); projectile_x_pos[v3] = R20_ + samus_x_pos; projectile_y_pos[v3] = R22_ + samus_y_pos; projectile_variables[v3] = (uint8)(used_for_sba_attacksB60 + projectile_variables[v3]); diff --git a/src/sm_91.c b/src/sm_91.c index 462cc34..7faae2d 100644 --- a/src/sm_91.c +++ b/src/sm_91.c @@ -717,7 +717,7 @@ void XrayHdmaFunc_BeamAimedR(void) { // 0x91BEC2 goto LABEL_10; } do { - IndirWriteWord(&R0_, v2, 0xFFu); + IndirWriteWord(&R0_, v2, 0xFF); v2 -= 2; } while (v2 >= 0); LABEL_10:; @@ -748,14 +748,14 @@ LABEL_10:; goto LABEL_19; } do { - IndirWriteWord(&R0_, v4, 0xFFu); + IndirWriteWord(&R0_, v4, 0xFF); v4 += 2; } while ((int16)(v4 - 460) < 0); LABEL_19:; uint16 v5 = R18_; do { do { - IndirWriteWord(&R0_, v5, 0xFF00u); + IndirWriteWord(&R0_, v5, 0xFF00); v5 += 2; } while ((int16)(v5 - R20_) < 0); } while (v5 == R20_); @@ -793,7 +793,7 @@ void XrayHdmaFunc_BeamAimedL(void) { // 0x91BF72 goto LABEL_10; } do { - IndirWriteWord(&R0_, v2, 0xFFu); + IndirWriteWord(&R0_, v2, 0xFF); v2 -= 2; } while (v2 >= 0); LABEL_10:; @@ -824,14 +824,14 @@ LABEL_10:; goto LABEL_19; } do { - IndirWriteWord(&R0_, v4, 0xFFu); + IndirWriteWord(&R0_, v4, 0xFF); v4 += 2; } while ((int16)(v4 - 460) < 0); LABEL_19:; uint16 v5 = R18_; do { do { - IndirWriteWord(&R0_, v5, 0xFF00u); + IndirWriteWord(&R0_, v5, 0xFF00); v5 += 2; } while ((int16)(v5 - R20_) < 0); } while (v5 == R20_); @@ -858,7 +858,7 @@ void XrayHdmaFunc_BeamAimedU(void) { off_91C063[v0 >> 1](2 * (R24_ - 1)); uint16 v1 = R18_; do { - IndirWriteWord(&R0_, v1, 0xFFu); + IndirWriteWord(&R0_, v1, 0xFF); v1 += 2; } while ((int16)(v1 - 460) < 0); } @@ -896,7 +896,7 @@ void XrayHdmaFunc_BeamAimedUUR(uint16 v0) { // 0x91C069 goto LABEL_12; } do { - IndirWriteByte(&R0_, v2, 0xFFu); + IndirWriteByte(&R0_, v2, 0xFF); v2 -= 2; } while (v2 >= 0); } else { @@ -930,7 +930,7 @@ LABEL_12: goto LABEL_23; } do { - IndirWriteByte(&R0_, v4, 0xFFu); + IndirWriteByte(&R0_, v4, 0xFF); v4 -= 2; } while (v4 >= 0); } else { @@ -1011,7 +1011,7 @@ LABEL_12: return; } do { - IndirWriteByte(&R0_, v4, 0xFFu); + IndirWriteByte(&R0_, v4, 0xFF); v4 -= 2; } while (v4 >= 0); } else { @@ -1094,7 +1094,7 @@ LABEL_12: LABEL_23:; uint16 v5 = R20_; do { - IndirWriteByte(&R0_, v5, 0xFFu); + IndirWriteByte(&R0_, v5, 0xFF); v5 += 2; } while ((int16)(v5 - R18_) < 0); } @@ -1121,7 +1121,7 @@ void XrayHdmaFunc_BeamAimedD(void) { off_91C2B7[v0 >> 1](R24_ * 2); v1 = R18_; do { - IndirWriteWord(&R0_, v1, 0xFFu); + IndirWriteWord(&R0_, v1, 0xFF); v1 -= 2; } while (v1 >= 0); } @@ -1155,7 +1155,7 @@ void XrayHdmaFunc_BeamAimedDDR(uint16 j) { // 0x91C2BD goto LABEL_12; } do { - IndirWriteWord(&R0_, v2, 0xFFu); + IndirWriteWord(&R0_, v2, 0xFF); v2 += 2; } while ((int16)(v2 - 460) < 0); } else { @@ -1190,7 +1190,7 @@ LABEL_12:; goto LABEL_23; } do { - IndirWriteByte(&R0_, v4, 0xFFu); + IndirWriteByte(&R0_, v4, 0xFF); v4 += 2; } while ((int16)(v4 - 460) < 0); } else { @@ -1275,7 +1275,7 @@ LABEL_15:; return; } do { - IndirWriteByte(&R0_, v4, 0xFFu); + IndirWriteByte(&R0_, v4, 0xFF); v4 += 2; } while ((int16)(v4 - 460) < 0); } else { @@ -1356,7 +1356,7 @@ LABEL_12:; LABEL_23:; uint16 v5 = R20_; do { - IndirWriteByte(&R0_, v5, 0xFFu); + IndirWriteByte(&R0_, v5, 0xFF); v5 -= 2; } while ((int16)(v5 - R18_) >= 0); } @@ -1365,19 +1365,19 @@ void XrayHdmaFunc_BeamHoriz(void) { // 0x91C505 int16 v1; uint16 v0 = 2 * (R24_ - 1); - IndirWriteWord(&R0_, v0, 0xFF00u); + IndirWriteWord(&R0_, v0, 0xFF00); v1 = v0 - 2; do { if (*(uint16 *)IndirPtr(&R0_, v1) == 255) break; - IndirWriteWord(&R0_, v1, 0xFFu); + IndirWriteWord(&R0_, v1, 0xFF); v1 -= 2; } while (v1 >= 0); uint16 v2 = 2 * R24_; do { if (*(uint16 *)IndirPtr(&R0_, v2) == 255) break; - IndirWriteWord(&R0_, v2, 0xFFu); + IndirWriteWord(&R0_, v2, 0xFF); v2 += 2; } while ((int16)(v2 - 460) < 0); } @@ -1459,7 +1459,7 @@ void XrayHdmaOnScreen_BeamAimedR(void) { // 0x91C5FF goto LABEL_6; } do { - IndirWriteWord(&R0_, v1, 0xFFu); + IndirWriteWord(&R0_, v1, 0xFF); v1 -= 2; } while (v1 >= 0); LABEL_6:; @@ -1475,7 +1475,7 @@ LABEL_6:; return; } do { - IndirWriteWord(&R0_, v3, 0xFFu); + IndirWriteWord(&R0_, v3, 0xFF); v3 += 2; } while ((int16)(v3 - 460) < 0); } @@ -1499,7 +1499,7 @@ void XrayHdmaOnScreen_BeamAimedL(void) { // 0x91C660 goto LABEL_6; } do { - IndirWriteWord(&R0_, v1, 0xFFu); + IndirWriteWord(&R0_, v1, 0xFF); v1 -= 2; } while (v1 >= 0); LABEL_6:; @@ -1515,7 +1515,7 @@ LABEL_6:; return; } do { - IndirWriteWord(&R0_, v3, 0xFFu); + IndirWriteWord(&R0_, v3, 0xFF); v3 += 2; } while ((int16)(v3 - 460) < 0); } @@ -1545,7 +1545,7 @@ void XrayHdmaOnScreen_BeamAimedU(void) { // 0x91C6C1 do { if (*(uint16 *)IndirPtr(&R0_, v3) == 255) break; - IndirWriteWord(&R0_, v3, 0xFFu); + IndirWriteWord(&R0_, v3, 0xFF); v3 += 2; } while ((int16)(v3 - 460) < 0); } @@ -1567,7 +1567,7 @@ void XrayHdmaOnScreen_BeamAimedUUR(uint16 v0) { // 0x91C71C } grapple_beam_unkD1E = v0; do { - IndirWriteByte(&R0_, v0, 0xFFu); + IndirWriteByte(&R0_, v0, 0xFF); v0 -= 2; } while ((v0 & 0x8000u) == 0); LABEL_7: @@ -1583,12 +1583,12 @@ LABEL_7: return; } do { - IndirWriteByte(&R0_, v2, 0xFFu); + IndirWriteByte(&R0_, v2, 0xFF); v2 -= 2; } while (v2 >= 0); if (grapple_beam_unkD1E) { for (int i = grapple_beam_unkD1E - 2; i >= 0; i -= 2) - IndirWriteWord(&R0_, i, 0xFFu); + IndirWriteWord(&R0_, i, 0xFF); } } @@ -1624,7 +1624,7 @@ LABEL_6: return; } do { - IndirWriteByte(&R0_, v2, 0xFFu); + IndirWriteByte(&R0_, v2, 0xFF); v2 -= 2; } while (v2 >= 0); } @@ -1668,7 +1668,7 @@ LABEL_6: } while (v2 >= 0); v3 = v5 - 1; do { - IndirWriteByte(&R0_, v3, 0xFFu); + IndirWriteByte(&R0_, v3, 0xFF); v3 -= 2; } while (v3 >= 0); } @@ -1700,7 +1700,7 @@ void XrayHdmaOnScreen_BeamAimedD(void) { // 0x91C822 do { if (*(uint16 *)IndirPtr(&R0_, v3) == 255) break; - IndirWriteWord(&R0_, v3, 0xFFu); + IndirWriteWord(&R0_, v3, 0xFF); v3 -= 2; } while (v3 >= 0); } @@ -1719,7 +1719,7 @@ void XrayHdmaOnScreen_BeamAimedDDR(uint16 j) { // 0x91C87A } grapple_beam_unkD1E = j; do { - IndirWriteWord(&R0_, j, 0xFFu); + IndirWriteWord(&R0_, j, 0xFF); j += 2; } while ((int16)(j - 460) < 0); LABEL_7:; @@ -1735,14 +1735,14 @@ LABEL_7:; return; } do { - IndirWriteByte(&R0_, v2, 0xFFu); + IndirWriteByte(&R0_, v2, 0xFF); v2 += 2; } while ((int16)(v2 - 460) < 0); if (grapple_beam_unkD1E) { uint16 v3 = grapple_beam_unkD1E + 2; if ((int16)(grapple_beam_unkD1E - 458) < 0) { do { - IndirWriteWord(&R0_, v3, 0xFFu); + IndirWriteWord(&R0_, v3, 0xFF); v3 += 2; } while ((int16)(v3 - 460) < 0); } @@ -1778,7 +1778,7 @@ LABEL_6:; return; } do { - IndirWriteByte(&R0_, v2, 0xFFu); + IndirWriteByte(&R0_, v2, 0xFF); v2 += 2; } while ((int16)(v2 - 460) < 0); } @@ -1818,7 +1818,7 @@ LABEL_6:; } while ((int16)(v2 - 460) < 0); uint16 v3 = v5 - 1; do { - IndirWriteByte(&R0_, v3, 0xFFu); + IndirWriteByte(&R0_, v3, 0xFF); v3 += 2; } while ((int16)(v3 - 460) < 0); } @@ -1833,12 +1833,12 @@ void XrayHdmaOnScreen_BeamHoriz(void) { // 0x91C998 IndirWriteWord(&R0_, v0, R22_ & 0xFF00); v1 = v0 - 2; do { - IndirWriteWord(&R0_, v1, 0xFFu); + IndirWriteWord(&R0_, v1, 0xFF); v1 -= 2; } while (v1 >= 0); uint16 v2 = 2 * R24_; do { - IndirWriteWord(&R0_, v2, 0xFFu); + IndirWriteWord(&R0_, v2, 0xFF); v2 += 2; } while ((int16)(v2 - 460) < 0); } @@ -2371,8 +2371,8 @@ void Xray_SetupStage7(void) { // 0x91D1A0 vram_write_queue_tail = v0 + 7; } mov24((LongPtr *)&demo_enable, 0x9800E4); - mov24((LongPtr *)((char *)&demo_num_input_frames + 1), 0x98C8E4u); - mov24((LongPtr *)&demo_input_prev_new, 0x999098u); + mov24((LongPtr *)((char *)&demo_num_input_frames + 1), 0x98C8E4); + mov24((LongPtr *)&demo_input_prev_new, 0x999098); *(uint16 *)((char *)&demo_backup_prev_controller_input + 1) = 0; demo_input_pre_instr = 0; demo_input_instr_timer = 0; @@ -2509,9 +2509,9 @@ void InitializeSuitPickupHdma(void) { // 0x91D692 reg_COLDATA[0] = suit_pickup_color_math_R; reg_COLDATA[1] = suit_pickup_color_math_G; reg_COLDATA[2] = suit_pickup_color_math_B; - mov24((LongPtr *)&demo_enable, 0x9800E4u); - mov24((LongPtr *)((char *)&demo_num_input_frames + 1), 0x98C8E4u); - mov24((LongPtr *)&demo_input_prev_new, 0x999098u); + mov24((LongPtr *)&demo_enable, 0x9800E4); + mov24((LongPtr *)((char *)&demo_num_input_frames + 1), 0x98C8E4); + mov24((LongPtr *)&demo_input_prev_new, 0x999098); *(uint16 *)((char *)&demo_backup_prev_controller_input + 1) = 0; } diff --git a/src/sm_92.c b/src/sm_92.c index 79548ec..ffabc28 100644 --- a/src/sm_92.c +++ b/src/sm_92.c @@ -34,7 +34,7 @@ uint8 PlaySamusFanfare(void) { // 0x92ED24 if (substate == 5) PlayRoomMusicTrackAfterAFrames(0x168u); } else { - QueueMusic_DelayedY(1u, 0xEu); + QueueMusic_DelayedY(1u, 0xE); } if (sign16(substate - 359)) { ++substate; @@ -50,10 +50,10 @@ uint8 PlaySamusFanfare(void) { // 0x92ED24 } void Unused_SamusTileViewer(void) { // 0x92ED7A - DrawSamusSpritemap(0x182u, 0x40u, 0x40u); - DrawSamusSpritemap(0x183u, 0xC0u, 0x40u); - DrawSamusSpritemap(0x184u, 0x80, 0x60u); - DrawSamusSpritemap(0x185u, 0x80, 0x50u); + DrawSamusSpritemap(0x182, 0x40, 0x40); + DrawSamusSpritemap(0x183, 0xC0, 0x40); + DrawSamusSpritemap(0x184, 0x80, 0x60); + DrawSamusSpritemap(0x185, 0x80, 0x50); } void DrawSamusSuitExploding(void) { // 0x92EDBE diff --git a/src/sm_a0.c b/src/sm_a0.c index d6a473d..c3fe13f 100644 --- a/src/sm_a0.c +++ b/src/sm_a0.c @@ -3586,12 +3586,12 @@ uint16 EnemyWithNormalSpritesIsOffScreen(void) { // 0xA0ADE7 } uint16 DetermineDirectionOfSamusFromEnemy(void) { // 0xA0AE29 - if (IsSamusWithinEnemy_Y(cur_enemy_index, 0x20u)) { + if (IsSamusWithinEnemy_Y(cur_enemy_index, 0x20)) { uint16 v1 = 2; if ((GetSamusEnemyDelta_X(cur_enemy_index) & 0x8000u) != 0) return 7; return v1; - } else if (IsSamusWithinEnemy_X(cur_enemy_index, 0x20u)) { + } else if (IsSamusWithinEnemy_X(cur_enemy_index, 0x20)) { uint16 v3 = 4; if ((GetSamusEnemyDelta_Y(cur_enemy_index) & 0x8000u) != 0) return 0; diff --git a/src/sm_a2.c b/src/sm_a2.c index 5e3fd21..d520507 100644 --- a/src/sm_a2.c +++ b/src/sm_a2.c @@ -1834,7 +1834,7 @@ void GunshipTop_18(uint16 k) { // 0xA2AC1B SpawnEnemyProjectileWithRoomGfx(addr_stru_86A379, 4u); SpawnEnemyProjectileWithRoomGfx(addr_stru_86A379, 6u); SpawnEnemyProjectileWithRoomGfx(addr_stru_86A379, 8u); - SpawnEnemyProjectileWithRoomGfx(addr_stru_86A379, 0xAu); + SpawnEnemyProjectileWithRoomGfx(addr_stru_86A379, 0xA); } } else { E0->gtp_var_F = FUNC16(GunshipTop_19); @@ -1947,7 +1947,7 @@ void Flies_4(uint16 k) { // 0xA2B14E uint16 flies_var_A = E->flies_var_A; if (flies_var_A) { E->flies_var_A = flies_var_A - 1; - } else if (!(CompareDistToSamus_X(k, 0x70u) & 1)) { + } else if (!(CompareDistToSamus_X(k, 0x70) & 1)) { Flies_3(k); return; } @@ -1963,7 +1963,7 @@ void Flies_5(uint16 k) { // 0xA2B17C uint16 flies_var_A = E->flies_var_A; if (flies_var_A) { E->flies_var_A = flies_var_A - 1; - } else if (!(CompareDistToSamus_X(k, 0x70u) & 1)) { + } else if (!(CompareDistToSamus_X(k, 0x70) & 1)) { Flies_3(k); return; } @@ -2064,8 +2064,8 @@ void LavaquakeRocks_Main(void) { // 0xA2B58F } void LavaquakeRocks_1(void) { // 0xA2B596 - if (IsSamusWithinEnemy_X(cur_enemy_index, 0x40u)) { - if (IsSamusWithinEnemy_Y(cur_enemy_index, 0x40u)) + if (IsSamusWithinEnemy_X(cur_enemy_index, 0x40)) { + if (IsSamusWithinEnemy_Y(cur_enemy_index, 0x40)) Get_LavaquakeRocks(cur_enemy_index)->lrs_var_A = FUNC16(LavaquakeRocks_2); } } @@ -2383,7 +2383,7 @@ void Rinka_B960(uint16 k) { // 0xA2B960 E->base.properties |= kEnemyProps_Tangible | kEnemyProps_Invisible; R18_ = E->base.x_pos; R20_ = E->base.y_pos; - SpawnEnemyProjectileWithRoomGfx(0xE509u, 3u); + SpawnEnemyProjectileWithRoomGfx(0xE509, 3u); E->rinka_var_A = FUNC16(Rinka_4); E->rinka_var_F = 1; } else { @@ -2453,7 +2453,7 @@ void Rio_Main(void) { // 0xA2BBE3 } void Rio_1(uint16 k) { // 0xA2BBED - if (!(CompareDistToSamus_X(k, 0xA0u) & 1)) { + if (!(CompareDistToSamus_X(k, 0xA0) & 1)) { Enemy_Rio *E = Get_Rio(k); E->rio_var_C = g_word_A2BBBB; E->rio_var_D = g_word_A2BBBF; @@ -2788,7 +2788,7 @@ void NorfairRio_Func_1(uint16 k) { // 0xA2C281 void NorfairRio_Func_2(uint16 k) { // 0xA2C2E7 Enemy_NorfairRio *E = Get_NorfairRio(k); - if ((random_number & 0x101) != 0 && !(CompareDistToSamus_X(k, 0xC0u) & 1)) { + if ((random_number & 0x101) != 0 && !(CompareDistToSamus_X(k, 0xC0) & 1)) { E->nro_var_A = g_word_A2C1C1[(uint16)((random_number >> 1) & 2) >> 1]; E->nro_var_B = g_word_A2C1C5; if ((int16)(samus_x_pos - E->base.x_pos) < 0) @@ -2940,7 +2940,7 @@ void LowerNorfairRio_Func_1(uint16 k) { // 0xA2C72E void LowerNorfairRio_Func_2(uint16 k) { // 0xA2C771 Enemy_NorfairRio *E = Get_NorfairRio(k); - if ((random_number & 0x101) != 0 && !(CompareDistToSamus_X(k, 0x70u) & 1)) { + if ((random_number & 0x101) != 0 && !(CompareDistToSamus_X(k, 0x70) & 1)) { E->nro_var_C = g_word_A2C6CA; E->nro_var_D = g_word_A2C6CE; if ((int16)(samus_x_pos - E->base.x_pos) < 0) @@ -3157,7 +3157,7 @@ void MaridiaLargeSnail_Func_4(void) { // 0xA2CDE6 E->mlsl_var_00 = 1; } MaridiaLargeSnail_Func_10(cur_enemy_index); - if (IsSamusWithinEnemy_X(cur_enemy_index, 0x18u)) { + if (IsSamusWithinEnemy_X(cur_enemy_index, 0x18)) { E->mlsl_var_00 |= 2u; MaridiaLargeSnail_Func_10(cur_enemy_index); E->mlsl_var_A = FUNC16(MaridiaLargeSnail_Func_5); @@ -3181,7 +3181,7 @@ void MaridiaLargeSnail_Func_5(void) { // 0xA2CE2B if (!E->mlsl_var_0B) { R36 = 0; bool v4 = (--E->mlsl_var_C & 0x8000u) != 0; - if (v4 && (E->mlsl_var_C = 0, IsSamusWithinEnemy_X(cur_enemy_index, 0x20u)) && E->mlsl_var_03 && !E->mlsl_var_E) { + if (v4 && (E->mlsl_var_C = 0, IsSamusWithinEnemy_X(cur_enemy_index, 0x20)) && E->mlsl_var_03 && !E->mlsl_var_E) { E->mlsl_var_00 = 0; E->mlsl_var_D = 0; if ((GetSamusEnemyDelta_X(cur_enemy_index) & 0x8000u) != 0) { @@ -3305,7 +3305,7 @@ void MaridiaLargeSnail_Func_11(void) { // 0xA2CFFF Enemy_MaridiaLargeSnail *E = Get_MaridiaLargeSnail(cur_enemy_index); E->mlsl_var_04 = 0; E->mlsl_var_05 = 0; - if (IsSamusWithinEnemy_Y(cur_enemy_index, 0x20u) && IsSamusWithinEnemy_X(cur_enemy_index, 0x18u)) { + if (IsSamusWithinEnemy_Y(cur_enemy_index, 0x20) && IsSamusWithinEnemy_X(cur_enemy_index, 0x18)) { E->mlsl_var_04 = 1; if ((GetSamusEnemyDelta_X(cur_enemy_index) & 0x8000u) != 0) E->mlsl_var_05 = 1; @@ -3392,7 +3392,7 @@ void HirisingSlowfalling_Main(void) { // 0xA2E02E } void HirisingSlowfalling_Func_4(void) { // 0xA2E035 - if (IsSamusWithinEnemy_X(cur_enemy_index, 0x50u)) { + if (IsSamusWithinEnemy_X(cur_enemy_index, 0x50)) { Enemy_HirisingSlowfalling *E = Get_HirisingSlowfalling(cur_enemy_index); E->hsg_var_07 = E->hsg_parameter_2; E->hsg_var_A = FUNC16(HirisingSlowfalling_Func_5); @@ -3699,7 +3699,7 @@ void LavaSeahorse_Func_3(uint16 k) { // 0xA2E6F1 if (E->lse_var_02) { E->lse_var_02 = 0; E->lse_var_01 = -1; - SpawnEnemyProjectileWithGfx(0xFFFFu, k, addr_kEproj_LavaSeahorseFireball); + SpawnEnemyProjectileWithGfx(0xFFFF, k, addr_kEproj_LavaSeahorseFireball); QueueSfx2_Max6(0x61u); if (E->lse_var_D-- == 1) { E->lse_var_00 -= 4; diff --git a/src/sm_a4.c b/src/sm_a4.c index d37c1b9..6eb7180 100644 --- a/src/sm_a4.c +++ b/src/sm_a4.c @@ -604,7 +604,7 @@ void Crocomire_Func_37(void) { // 0xA48D5E kraid_unk9000 = 1; R18_ = 1536; R20_ = 176; - SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0x15u); + SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0x15); } } else if (sign16(E0->base.x_pos - 1552)) { g_word_7E9002 = 0; @@ -616,7 +616,7 @@ void Crocomire_Func_37(void) { // 0xA48D5E SpawnHardcodedPlm(&unk_A48DC2); R18_ = 1568; R20_ = 176; - SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0x15u); + SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0x15); } } else { uint16 x_pos = E0->base.x_pos; @@ -630,7 +630,7 @@ void Crocomire_Func_37(void) { // 0xA48D5E SpawnHardcodedPlm(&unk_A48E13); R18_ = 1584; R20_ = 176; - SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0x15u); + SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0x15); } } else if ((int16)(x_pos - g_word_A486A4) >= 0) { Crocomire_8EE5(); @@ -697,25 +697,25 @@ void Crocomire_8EE5(void) { // 0xA48EE5 SpawnHardcodedPlm(&unk_A48F31); R18_ = 1536; R20_ = 176; - SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0x15u); + SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0x15); R18_ = 1552; R20_ = 192; - SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0x15u); + SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0x15); R18_ = 1568; R20_ = 176; - SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0x15u); + SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0x15); R18_ = 1584; R20_ = 192; - SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0x15u); + SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0x15); R18_ = 1600; R20_ = 192; - SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0x15u); + SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0x15); R18_ = 1616; R20_ = 192; - SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0x15u); + SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0x15); R18_ = 1632; R20_ = 192; - SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0x15u); + SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0x15); } void Crocomire_Func_38(uint16 k) { // 0xA48FC2 @@ -1508,7 +1508,7 @@ void Crocomire_Func_73(void) { // 0xA49A38 } uint16 Crocomire_Instr_8(uint16 k, uint16 j) { // 0xA49A9B - return Crocomire_Func_87(j, 0xFFE0u); + return Crocomire_Func_87(j, 0xFFE0); } uint16 Crocomire_Instr_6(uint16 k, uint16 j) { // 0xA49AA0 @@ -1516,11 +1516,11 @@ uint16 Crocomire_Instr_6(uint16 k, uint16 j) { // 0xA49AA0 } uint16 Crocomire_Instr_9(uint16 k, uint16 j) { // 0xA49AA5 - return Crocomire_Func_87(j, 0xFFF0u); + return Crocomire_Func_87(j, 0xFFF0); } uint16 Crocomire_Instr_5(uint16 k, uint16 j) { // 0xA49AAA - return Crocomire_Func_87(j, 0x10u); + return Crocomire_Func_87(j, 0x10); } uint16 Crocomire_Instr_20(uint16 k, uint16 j) { // 0xA49AAF @@ -1532,31 +1532,31 @@ uint16 Crocomire_Instr_21(uint16 k, uint16 j) { // 0xA49AB4 } uint16 Crocomire_Instr_22(uint16 k, uint16 j) { // 0xA49AB9 - return Crocomire_Func_87(j, 0x10u); + return Crocomire_Func_87(j, 0x10); } uint16 Crocomire_Instr_23(uint16 k, uint16 j) { // 0xA49ABE - return Crocomire_Func_87(j, 0x18u); + return Crocomire_Func_87(j, 0x18); } uint16 Crocomire_Instr_24(uint16 k, uint16 j) { // 0xA49AC3 - return Crocomire_Func_87(j, 0x20u); + return Crocomire_Func_87(j, 0x20); } uint16 Crocomire_Instr_10(uint16 k, uint16 j) { // 0xA49AC8 - return Crocomire_Func_87(j, 0x28u); + return Crocomire_Func_87(j, 0x28); } uint16 Crocomire_Instr_25(uint16 k, uint16 j) { // 0xA49ACD - return Crocomire_Func_87(j, 0x30u); + return Crocomire_Func_87(j, 0x30); } uint16 Crocomire_Instr_26(uint16 k, uint16 j) { // 0xA49AD2 - return Crocomire_Func_87(j, 0x38u); + return Crocomire_Func_87(j, 0x38); } uint16 Crocomire_Instr_27(uint16 k, uint16 j) { // 0xA49AD7 - return Crocomire_Func_87(j, 0x40u); + return Crocomire_Func_87(j, 0x40); } uint16 Crocomire_Func_87(uint16 j, uint16 a) { // 0xA49ADA @@ -1564,7 +1564,7 @@ uint16 Crocomire_Func_87(uint16 j, uint16 a) { // 0xA49ADA Enemy_Crocomire *E = Get_Crocomire(0); R18_ = a + E->base.x_pos + (random_number & 7); R20_ = E->base.y_height + E->base.y_pos - 16; - SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0x15u); + SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0x15); return j; } @@ -1619,8 +1619,8 @@ void Crocomire_9B86(void) { // 0xA49B86 camera_distance_index = 0; *(uint16 *)&boss_bits_for_area[area_index] |= 2u; QueueMusic_Delayed8(6u); - Crocomire_Func_87(0, 0xFFF0u); - Crocomire_Func_87(0, 0x10u); + Crocomire_Func_87(0, 0xFFF0); + Crocomire_Func_87(0, 0x10); Crocomire_9BB3(); } diff --git a/src/sm_a5.c b/src/sm_a5.c index 433ed46..87319a8 100644 --- a/src/sm_a5.c +++ b/src/sm_a5.c @@ -1438,7 +1438,7 @@ void Draygon_Func_48(uint16 k) { // 0xA5C48D Enemy_Draygon *E1 = Get_Draygon(0x40u); R18_ = E1->base.x_pos - 24; R20_ = E1->base.y_pos - 32; - SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0x18u); + SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0x18); } Enemy_Draygon *E0 = Get_Draygon(0); R18_ = E0->base.x_pos - 24; @@ -1473,7 +1473,7 @@ void Draygon_Func_49(uint16 k) { // 0xA5C513 if ((Get_Draygon(k)->base.frame_counter & 0x7F) == 0) { R18_ = E0->base.x_pos + 24; R20_ = E0->base.y_pos - 32; - SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0x18u); + SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0x18); } R18_ = E0->base.x_pos + 24; @@ -1654,7 +1654,7 @@ uint16 Draygon_Instr_28(uint16 k, uint16 j) { // 0xA5E96E R18_ += E->base.x_pos; R20_ = ((uint16)(random_number & 0x7F00) >> 8) - 64; R20_ += E->base.y_pos; - SpawnEnemyProjectileWithRoomGfx(0xE509u, 0x15u); + SpawnEnemyProjectileWithRoomGfx(0xE509, 0x15); QueueSfx2_Max6(0x29u); return j; } diff --git a/src/sm_a6.c b/src/sm_a6.c index 2e78dbe..6b767b6 100644 --- a/src/sm_a6.c +++ b/src/sm_a6.c @@ -280,7 +280,7 @@ void Boulder_Func_4(void) { // 0xA6888B E->base.properties |= kEnemyProps_Deleted; R18_ = E->base.x_pos; R20_ = E->base.y_pos; - SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0x11u); + SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0x11); QueueSfx2_Max6(0x43u); } else { E->boulder_var_A = FUNC16(Boulder_Func_3); @@ -323,7 +323,7 @@ void Boulder_Func_5(void) { // 0xA68942 QueueSfx2_Max6(0x42u); R18_ = E->base.x_pos; R20_ = E->base.y_pos; - SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0x11u); + SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0x11); QueueSfx2_Max6(0x43u); } else { uint16 v5 = E->boulder_var_B + 64; @@ -1099,7 +1099,7 @@ uint16 FakeKraid_Instr_3(uint16 k, uint16 j) { // 0xA69BB2 } uint16 FakeKraid_Instr_4(uint16 k, uint16 j) { // 0xA69BC4 - FakeKraid_InstrHelper_45(k, 0, 0xFFFCu); + FakeKraid_InstrHelper_45(k, 0, 0xFFFC); return j; } @@ -1193,7 +1193,7 @@ void CeresRidley_Init(void) { // 0xA6A0F5 E->cry_var_23 = 224; E->cry_var_10 = 2; E->cry_var_1C = 120; - WriteColorsToTargetPalette(0xa6, 0x140u, addr_word_A6E1CF, 0x20u); + WriteColorsToTargetPalette(0xa6, 0x140, addr_word_A6E1CF, 0x20); uint16 v3 = 0; v4 = 15; do { @@ -1219,7 +1219,7 @@ void CeresRidley_Init(void) { // 0xA6A0F5 E->cry_var_21 = 176; E->cry_var_22 = 40; E->cry_var_23 = 224; - WriteColorsToTargetPalette(0xa6, 0x140u, addr_word_A6E16F, 0x20u); + WriteColorsToTargetPalette(0xa6, 0x140, addr_word_A6E16F, 0x20); uint16 v7 = 482; v8 = 15; do { @@ -1338,7 +1338,7 @@ void CeresRidley_Hurt(void) { // 0xA6A2D3 void Ridley_A2DC(void) { // 0xA6A2DC Ridley_Func_49(); if (Get_CeresRidley(0)->cry_var_02) { - mov24(&enemy_gfx_drawn_hook, 0xA6A2F2u); + mov24(&enemy_gfx_drawn_hook, 0xA6A2F2); } else { Ridley_A2F2(); } @@ -1355,7 +1355,7 @@ void Ridley_A2F2(void) { // 0xA6A2F2 R20_ = E->base.x_pos + g_word_A6A321[(uint8)(earthquake_timer & 3)]; R18_ = E->base.y_pos; R22_ = 1024; - DrawSpritemap(0xA6u, addr_kCeresRidley_Sprmap_A329); + DrawSpritemap(0xA6, addr_kCeresRidley_Sprmap_A329); } } @@ -1495,7 +1495,7 @@ uint8 CeresRidley_Func_8(uint16 a) { // 0xA6A4D6 uint16 v1 = g_off_A6A4EB[a]; if (!v1) return 1; - WriteColorsToPalette(0xE2u, 0xa6, v1, 0xEu); + WriteColorsToPalette(0xE2, 0xa6, v1, 0xE); return 0; } @@ -1607,7 +1607,7 @@ void CeresRidley_Func_15(void) { // 0xA6A84E if (sign16(samus_y_pos - 132)) v0 = 64; R20_ = v0; - Ridley_Func_106(0, 0xDu); + Ridley_Func_106(0, 0xD); R22_ = 2; R24_ = 2; if (!(Shitroid_Func_2(0) & 1) @@ -1713,9 +1713,9 @@ void CeresRidley_Func_23(void) { // 0xA6A9A0 E->cry_var_C = 0; tilemap_stuff[0] = 0; E->cry_var_A = FUNC16(CeresRidley_Func_24); - WriteColorsToPalette(0xA2u, 0xa6, addr_word_A6A9E3, 0xFu); - WriteColorsToPalette(0x42u, 0xa6, addr_word_A6AA01, 8u); - WriteColorsToPalette(0x1E2u, 0xa6, addr_word_A6AA01, 8u); + WriteColorsToPalette(0xA2, 0xa6, addr_word_A6A9E3, 0xF); + WriteColorsToPalette(0x42, 0xa6, addr_word_A6AA01, 8u); + WriteColorsToPalette(0x1E2, 0xa6, addr_word_A6AA01, 8u); } } @@ -1726,8 +1726,8 @@ void CeresRidley_Func_24(void) { // 0xA6AA11 } void CeresRidley_Func_25(void) { // 0xA6AA20 - SpawnEnemy(0xA6u, addr_stru_A6AA2F); - SpawnEnemy(0xA6u, addr_stru_A6AA3F); + SpawnEnemy(0xA6, addr_stru_A6AA2F); + SpawnEnemy(0xA6, addr_stru_A6AA3F); } void CeresRidley_Func_26(void) { // 0xA6AA50 @@ -1873,7 +1873,7 @@ void CeresRidley_Func_33(void) { // 0xA6ACBC Enemy_CeresRidley *E = Get_CeresRidley(0); uint16 v1 = ((uint8)E->cry_var_36 + 1) & 3; E->cry_var_36 = v1; - QueueMode7Transfers(0xA6u, g_off_A6ACDA[v1]); + QueueMode7Transfers(0xA6, g_off_A6ACDA[v1]); } } @@ -1882,12 +1882,12 @@ void CeresRidley_Func_34(void) { // 0xA6AD27 Enemy_CeresRidley *E = Get_CeresRidley(0); uint16 v1 = ((uint8)E->cry_var_37 + 1) & 1; E->cry_var_37 = v1; - QueueMode7Transfers(0xA6u, g_off_A6AD45[v1]); + QueueMode7Transfers(0xA6, g_off_A6AD45[v1]); } } void CeresRidley_Func_35(uint16 a) { // 0xA6B0EF - WriteColorsToPalette(0xA2u, 0xa6, 32 * HIBYTE(a) - 0x4EF9, 0xFu); + WriteColorsToPalette(0xA2, 0xa6, 32 * HIBYTE(a) - 0x4EF9, 0xF); } void Ridley_Main(void) { // 0xA6B227 @@ -2269,7 +2269,7 @@ void Ridley_Func_21(void) { // 0xA6B70E earthquake_timer = 4; Ridley_Func_28(); Ridley_Func_29(); - Ridley_Func_93(0x2026u, addr_word_A6D37C); + Ridley_Func_93(0x2026, addr_word_A6D37C); tilemap_stuff[20] = 3072; tilemap_stuff[30] = 3072; tilemap_stuff[40] = 3072; @@ -2798,7 +2798,7 @@ uint16 BabyMetroid_Incr2(uint16 k) { // 0xA6BFDE uint16 BabyMetroid_Instr_3(uint16 k) { // 0xA6BFE1 uint16 v1 = *(uint16 *)RomPtr_A6(k); - WriteColorsToPalette(0x162u, 0xa6, v1, 0xFu); + WriteColorsToPalette(0x162, 0xa6, v1, 0xF); return BabyMetroid_Incr2(k); } @@ -3162,7 +3162,7 @@ void Ridley_Func_67(void) { // 0xA6C5DA uint8 Ridley_Func_68(void) { // 0xA6C601 R18_ = 128; R20_ = 328; - Ridley_Func_104(0, 0, 0x10u); + Ridley_Func_104(0, 0, 0x10); R22_ = 4; R24_ = 4; return Shitroid_Func_2(0) & 1; @@ -3333,18 +3333,18 @@ void RidleysExplosion_Func_1(uint16 k) { // 0xA6C913 } void RidleysExplosion_Func_2(void) { // 0xA6C932 - SpawnEnemy(0xA6u, addr_stru_A6C9E7); - SpawnEnemy(0xA6u, addr_stru_A6C9D7); - SpawnEnemy(0xA6u, addr_stru_A6C9C7); - SpawnEnemy(0xA6u, addr_stru_A6C9B7); - SpawnEnemy(0xA6u, addr_stru_A6C9A7); - SpawnEnemy(0xA6u, addr_stru_A6C997); - SpawnEnemy(0xA6u, addr_stru_A6C987); - SpawnEnemy(0xA6u, addr_stru_A6C9F7); - SpawnEnemy(0xA6u, addr_stru_A6CA07); - SpawnEnemy(0xA6u, addr_stru_A6CA27); - SpawnEnemy(0xA6u, addr_stru_A6CA17); - SpawnEnemy(0xA6u, addr_stru_A6CA37); + SpawnEnemy(0xA6, addr_stru_A6C9E7); + SpawnEnemy(0xA6, addr_stru_A6C9D7); + SpawnEnemy(0xA6, addr_stru_A6C9C7); + SpawnEnemy(0xA6, addr_stru_A6C9B7); + SpawnEnemy(0xA6, addr_stru_A6C9A7); + SpawnEnemy(0xA6, addr_stru_A6C997); + SpawnEnemy(0xA6, addr_stru_A6C987); + SpawnEnemy(0xA6, addr_stru_A6C9F7); + SpawnEnemy(0xA6, addr_stru_A6CA07); + SpawnEnemy(0xA6, addr_stru_A6CA27); + SpawnEnemy(0xA6, addr_stru_A6CA17); + SpawnEnemy(0xA6, addr_stru_A6CA37); } void locret_A6CB20(void) {} @@ -3867,11 +3867,11 @@ void Ridley_Func_92(void) { // 0xA6D2D6 tilemap_stuff[57] = 17; tilemap_stuff[67] = 17; tilemap_stuff[77] = 17; - Ridley_Func_93(0x2024u, addr_word_A6D36E); - Ridley_Func_93(0x2026u, addr_word_A6D37C); - Ridley_Func_93(0x202Au, addr_word_A6D38A); - Ridley_Func_93(0x202Cu, addr_word_A6D398); - Ridley_Func_93(0x202Eu, addr_word_A6D3A6); + Ridley_Func_93(0x2024, addr_word_A6D36E); + Ridley_Func_93(0x2026, addr_word_A6D37C); + Ridley_Func_93(0x202A, addr_word_A6D38A); + Ridley_Func_93(0x202C, addr_word_A6D398); + Ridley_Func_93(0x202E, addr_word_A6D3A6); tilemap_stuff[16] = 0; tilemap_stuff[26] = 0; tilemap_stuff[36] = 0; @@ -3920,7 +3920,7 @@ void Ridley_Func_D3DC(uint16 a) { // 0xA6D3DC void Ridley_Func_96(void) { // 0xA6D3F9 int16 v0; - Ridley_Func_93(0x2026u, addr_word_A6D37C); + Ridley_Func_93(0x2026, addr_word_A6D37C); v0 = 7; uint16 v1 = 0; do { @@ -3972,7 +3972,7 @@ void Ridley_Func_100(void) { // 0xA6D474 void Ridley_D495(void) { // 0xA6D495 if (!palette_change_num) - WriteColorsToPalette(0x1E2u, 0xa6, 28 * R18_ - 7062, 0xEu); + WriteColorsToPalette(0x1E2, 0xa6, 28 * R18_ - 7062, 0xE); } void Ridley_Func_101(void) { // 0xA6D4B5 @@ -4790,7 +4790,7 @@ void Ridley_Func_129(void) { // 0xA6E088 QueueSfx1_Max6(0x3Du); v2 = 6; } - SpawnEnemyProjectileWithRoomGfx(0xE509u, v2); + SpawnEnemyProjectileWithRoomGfx(0xE509, v2); } } } @@ -4942,7 +4942,7 @@ uint16 Ridley_Instr_13(uint16 k, uint16 j) { // 0xA6E909 uint16 Ridley_E90C(uint16 k, uint16 j, uint16 a) { // 0xA6E90C enemy_projectile_unk1995 = a; Enemy_Ridley *E = Get_Ridley(0); - SpawnEnemyProjectileWithRoomGfx(0x9642u, E->ridley_var_10); + SpawnEnemyProjectileWithRoomGfx(0x9642, E->ridley_var_10); return j; } @@ -5117,13 +5117,13 @@ void CeresDoor_Init(void) { // 0xA6F6C5 v3 = addr_word_A6F50C__plus__2; } else { if (E->cdr_parameter_1 == 3) { - WriteColorsToTargetPalette(0xa6, 0x142u, addr_kCeresDoor_Palette__plus__2, 0xFu); + WriteColorsToTargetPalette(0xa6, 0x142, addr_kCeresDoor_Palette__plus__2, 0xF); return; } v3 = addr_kCeresDoor_Palette__plus__2; } Get_CeresDoor(cur_enemy_index)->base.palette_index = 3584; - WriteColorsToTargetPalette(0xa6, 0x1E2u, v3, 0xFu); + WriteColorsToTargetPalette(0xa6, 0x1E2, v3, 0xF); } void CeresDoor_Func_1(uint16 k) { // 0xA6F739 @@ -5219,7 +5219,7 @@ void CeresDoor_Func_6(uint16 k) { // 0xA6F7DC uint16 v6 = 3; if (NextRandom() < 0x4000u) v6 = 12; - SpawnEnemyProjectileWithRoomGfx(0xE509u, v6); + SpawnEnemyProjectileWithRoomGfx(0xE509, v6); QueueSfx2_Max6(0x25u); } } @@ -5235,7 +5235,7 @@ void CeresDoor_Func_7(void) { // 0xA6F850 } void CeresDoor_Func_8(void) { // 0xA6F8F1 - QueueMode7Transfers(0xA6u, g_off_A6F900[(uint8)(nmi_frame_counter_word & 2) >> 1]); + QueueMode7Transfers(0xA6, g_off_A6F900[(uint8)(nmi_frame_counter_word & 2) >> 1]); } void Zebetites_Init(void) { // 0xA6FB72 @@ -5348,11 +5348,11 @@ void Zebetites_Func_7(uint16 j, uint8 a) { // 0xA6FCCB } void Zebetites_Func_8(void) { // 0xA6FCD9 - SpawnEnemy(0xA6u, addr_stru_A6FCE1); + SpawnEnemy(0xA6, addr_stru_A6FCE1); } uint16 Zebetites_Func_9(void) { // 0xA6FCF1 - return SpawnEnemy(0xA6u, addr_stru_A6FCF9); + return SpawnEnemy(0xA6, addr_stru_A6FCF9); } void Zebetites_Func_5(void) { // 0xA6FD09 @@ -5384,7 +5384,7 @@ void Zebetites_Func_4(void) { // 0xA6FD5E Enemy_Zebetites *E = Get_Zebetites(0); uint16 v1 = ((uint8)E->zebet_var_C + 1) & 7; E->zebet_var_C = v1; - WriteColorsToPalette(0x158u, 0xa6, 4 * v1 - 0x279, 2u); + WriteColorsToPalette(0x158, 0xa6, 4 * v1 - 0x279, 2u); } } diff --git a/src/sm_a7.c b/src/sm_a7.c index bd0f103..508a65d 100644 --- a/src/sm_a7.c +++ b/src/sm_a7.c @@ -1345,7 +1345,7 @@ void KraidsFoot_SecondPhaseSetup_WalkToStartPt(void) { // 0xA7BB6E } void KraidsFoot_SecondPhase_Init(void) { // 0xA7BBA4 - Kraid_SetWalkingBackwards(0xB4u, 0x160u); + Kraid_SetWalkingBackwards(0xB4, 0x160); } void KraidsFoot_SecondPhase_WalkForward(void) { // 0xA7BBAE @@ -1653,7 +1653,7 @@ void UnpauseHook_Kraid_IsDead(void) { // 0xA7C1FB SetupDmaTransfer(&unk_A7C21E); WriteReg(MDMAEN, 2u); WriteReg(VMADDL, 0); - WriteReg(VMADDH, 0x40u); + WriteReg(VMADDH, 0x40); WriteReg(VMAIN, 0x80); SetupDmaTransfer(&unk_A7C23E); WriteReg(MDMAEN, 2u); @@ -1750,17 +1750,17 @@ void Kraid_Death_Init(void) { // 0xA7C360 Enemy_Kraid *E6 = Get_Kraid(0x180u); E6->base.properties &= ~0x4000u; cur_enemy_index = 384; - EnemyDeathAnimation(v4, 0x180u); + EnemyDeathAnimation(v4, 0x180); Enemy_Kraid *E7 = Get_Kraid(0x1C0u); E7->base.properties &= ~0x4000u; cur_enemy_index = 448; - EnemyDeathAnimation(v4, 0x1C0u); + EnemyDeathAnimation(v4, 0x1C0); cur_enemy_index = 128; EnemyDeathAnimation(v4, 0x80); cur_enemy_index = 192; - EnemyDeathAnimation(v4, 0xC0u); + EnemyDeathAnimation(v4, 0xC0); cur_enemy_index = 256; - EnemyDeathAnimation(v4, 0x100u); + EnemyDeathAnimation(v4, 0x100); cur_enemy_index = v7; static const SpawnHardcodedPlmArgs unk_A7C3F4 = { 0x05, 0x1b, 0xb7bf }; SpawnHardcodedPlm(&unk_A7C3F4); @@ -1905,22 +1905,22 @@ static const SpawnHardcodedPlmArgs unk_A7C6FA = { 0x08, 0x12, 0xb7af }; static const SpawnHardcodedPlmArgs unk_A7C710 = { 0x10, 0x12, 0xb7af }; void Kraid_CrumbleLeftPlatform_Left(void) { // 0xA7C691 - SpawnEnemyProjectileWithGfx(0x70u, cur_enemy_index, addr_kEproj_RocksFallingKraidCeiling); + SpawnEnemyProjectileWithGfx(0x70, cur_enemy_index, addr_kEproj_RocksFallingKraidCeiling); SpawnHardcodedPlm(&unk_A7C6A2); } void Kraid_CrumbleRightPlatform_Middle(void) { // 0xA7C6A7 - SpawnEnemyProjectileWithGfx(0xF0u, cur_enemy_index, addr_kEproj_RocksFallingKraidCeiling); + SpawnEnemyProjectileWithGfx(0xF0, cur_enemy_index, addr_kEproj_RocksFallingKraidCeiling); SpawnHardcodedPlm(&unk_A7C6B8); } void Kraid_CrumbleRightPlatform_Left(void) { // 0xA7C6BD - SpawnEnemyProjectileWithGfx(0xE0u, cur_enemy_index, addr_kEproj_RocksFallingKraidCeiling); + SpawnEnemyProjectileWithGfx(0xE0, cur_enemy_index, addr_kEproj_RocksFallingKraidCeiling); SpawnHardcodedPlm(&unk_A7C6CE); } void Kraid_CrumbleLeftPlatform_Right(void) { // 0xA7C6D3 - SpawnEnemyProjectileWithGfx(0x90u, cur_enemy_index, addr_kEproj_RocksFallingKraidCeiling); + SpawnEnemyProjectileWithGfx(0x90, cur_enemy_index, addr_kEproj_RocksFallingKraidCeiling); SpawnHardcodedPlm(&unk_A7C6E4); } @@ -1930,7 +1930,7 @@ void Kraid_CrumbleLeftPlatform_Middle(void) { // 0xA7C6E9 } void Kraid_CrumbleRightPlatform_Right(void) { // 0xA7C6FF - SpawnEnemyProjectileWithGfx(0x100u, cur_enemy_index, addr_kEproj_RocksFallingKraidCeiling); + SpawnEnemyProjectileWithGfx(0x100, cur_enemy_index, addr_kEproj_RocksFallingKraidCeiling); SpawnHardcodedPlm(&unk_A7C710); } @@ -3506,7 +3506,7 @@ void Etecoon_Func_6(uint16 k) { // 0xA7EA37 if (Etecoon_Func_3(k) & 1) { Enemy_Etecoon *E = Get_Etecoon(k); if ((E->etecoon_var_A & 0x8000u) == 0) { - if (IsSamusWithinEnemy_Y(k, 0x40u) && IsSamusWithinEnemy_X(k, g_word_A7E910)) { + if (IsSamusWithinEnemy_Y(k, 0x40) && IsSamusWithinEnemy_X(k, g_word_A7E910)) { uint16 v2 = DetermineDirectionOfSamusFromEnemy(); if (sign16(v2 - 5)) { E->base.current_instruction = addr_kEtecoon_Ilist_E81E; @@ -3790,7 +3790,7 @@ void Etecoon_Func_24(uint16 k) { // 0xA7EE3E bool v2 = E->etecoon_var_E == 1; bool v3 = (--E->etecoon_var_E & 0x8000u) != 0; if (v2 || v3) { - if (IsSamusWithinEnemy_Y(k, 0x40u) && IsSamusWithinEnemy_X(k, 0x30u)) { + if (IsSamusWithinEnemy_Y(k, 0x40) && IsSamusWithinEnemy_X(k, 0x30)) { E->base.current_instruction = addr_stru_A7E880; E->etecoon_var_F = FUNC16(Etecoon_Func_18); } else { @@ -3879,7 +3879,7 @@ void Dachora_Func_2(uint16 k) { // 0xA7F570 R20_ = 1; R18_ = 0; Enemy_MoveDown(k); - if (IsSamusWithinEnemy_Y(k, 0x40u) && IsSamusWithinEnemy_X(k, g_word_A7F4C9)) { + if (IsSamusWithinEnemy_Y(k, 0x40) && IsSamusWithinEnemy_X(k, g_word_A7F4C9)) { Enemy_Dachora *E = Get_Dachora(k); if (E->dachor_parameter_1) E->base.current_instruction = addr_kDachora_Ilist_F48B; diff --git a/src/sm_a8.c b/src/sm_a8.c index 7eee71a..b73e323 100644 --- a/src/sm_a8.c +++ b/src/sm_a8.c @@ -2073,7 +2073,7 @@ void Beetom_Main(void) { // 0xA8B80D } void Beetom_Func_3(void) { // 0xA8B814 - if (IsSamusWithinEnemy_X(cur_enemy_index, 0x60u)) + if (IsSamusWithinEnemy_X(cur_enemy_index, 0x60)) Get_Beetom(cur_enemy_index)->beetom_var_C = FUNC16(Beetom_Func_12); else Get_Beetom(cur_enemy_index)->beetom_var_C = FUNC16(Beetom_Func_4); diff --git a/src/sm_a9.c b/src/sm_a9.c index e061cd5..a87ed6e 100644 --- a/src/sm_a9.c +++ b/src/sm_a9.c @@ -275,8 +275,8 @@ void MotherBrainsBody_Init(void) { // 0xA98687 E->base.vram_tiles_index = 0; E->base.properties |= kEnemyProps_BlockPlasmaBeam | kEnemyProps_Tangible | kEnemyProps_Invisible; E->base.palette_index = 0; - WriteColorsToTargetPalette(0xa9, 0x162u, addr_kMotherBrainPalette_4 + 2, 0xFu); - WriteColorsToTargetPalette(0xa9, 0x1E2u, addr_kMotherBrainPalette_3 + 2, 0xFu); + WriteColorsToTargetPalette(0xa9, 0x162, addr_kMotherBrainPalette_4 + 2, 0xF); + WriteColorsToTargetPalette(0xa9, 0x1E2, addr_kMotherBrainPalette_3 + 2, 0xF); E->mbn_var_00 = 0; Enemy_MotherBrain *E1 = Get_MotherBrain(0x40); @@ -294,7 +294,7 @@ void MotherBrainsBody_Init(void) { // 0xA98687 } void MotherBrainsBrain_Init(void) { // 0xA98705 - InitializeEnemyCorpseRotting(0x40u, addr_stru_A9DE08); + InitializeEnemyCorpseRotting(0x40, addr_stru_A9DE08); Enemy_MotherBrain *E1 = Get_MotherBrain(0x40); E1->base.health = 3000; MotherBrain_SetBrainUnusedInstrs(addr_kMotherBrain_Ilist_9C13); @@ -341,7 +341,7 @@ void MotherBrainsBody_Powerbomb(void) { // 0xA98787 } void MotherBrainsBrain_Hurt(void) { // 0xA9878B - mov24(&enemy_gfx_drawn_hook, 0xA98786u); + mov24(&enemy_gfx_drawn_hook, 0xA98786); EnemyData *v0 = gEnemyData(0); if ((v0[1].properties & 0x100) != 0) CallMotherBrainFunc(v0[1].ai_var_A | 0xA90000); @@ -353,7 +353,7 @@ void MotherBrainsBrain_SetupBrainAndNeckToDraw(void) { // 0xA987A2 Enemy_MotherBrain *E1 = Get_MotherBrain(0x40); E1->base.x_pos = E1->mbn_var_2E; E1->base.y_pos = E1->mbn_var_2F - 21; - mov24(&enemy_gfx_drawn_hook, 0xA987C9u); + mov24(&enemy_gfx_drawn_hook, 0xA987C9); } void MotherBrain_DrawBrainNeck_EnemyGfxDrawHook(void) { // 0xA987C9 @@ -362,7 +362,7 @@ void MotherBrain_DrawBrainNeck_EnemyGfxDrawHook(void) { // 0xA987C9 } void MotherBrainsBrain_SetupBrainToDraw(void) { // 0xA987D0 - mov24(&enemy_gfx_drawn_hook, 0xA987DDu); + mov24(&enemy_gfx_drawn_hook, 0xA987DD); } void MotherBrainsBrain_GfxDrawHook(void) { // 0xA987DD @@ -494,7 +494,7 @@ void MotherBrainBody_0_Wait(void) { // 0xA98949 v0 += 2; } while ((int16)(v0 - 36) < 0); if ((int16)(v1 - 4) >= 0) { - SpawnEnemy(0xA9u, addr_stru_A98AE5); + SpawnEnemy(0xA9, addr_stru_A98AE5); Get_MotherBrainBody(0x40)->mbby_var_E = FUNC16(MotherBrainBody_1_ClearBottomLeftTube); } } @@ -521,7 +521,7 @@ void MotherBrainBody_2_SpawnTopRightTubeFalling(void) { // 0xA98983 if ((--E->mbby_var_F & 0x8000) != 0) { R18_ = 152; R20_ = 47; - SpawnEnemyProjectileWithRoomGfx(0xCC5Bu, 0x2Fu); + SpawnEnemyProjectileWithRoomGfx(0xCC5B, 0x2F); E->mbby_var_E = -30304; } } @@ -538,7 +538,7 @@ void MotherBrainBody_4_SpawnTopLeftTubeFalling(void) { // 0xA989B5 if ((--E->mbby_var_F & 0x8000) != 0) { R18_ = 104; R20_ = 47; - SpawnEnemyProjectileWithRoomGfx(addr_kEproj_MotherBrainTubeFalling_TopLeft, 0x2Fu); + SpawnEnemyProjectileWithRoomGfx(addr_kEproj_MotherBrainTubeFalling_TopLeft, 0x2F); E->mbby_var_E = FUNC16(MotherBrainBody_4_ClearCeilingBlock6); } } @@ -553,7 +553,7 @@ void MotherBrainBody_4_ClearCeilingBlock6(void) { // 0xA989D2 void MotherBrainBody_5_SpawnTubeFallingEnemy1(void) { // 0xA989E7 Enemy_MotherBrainBody *E = Get_MotherBrainBody(0x40); if ((--E->mbby_var_F & 0x8000) != 0) { - SpawnEnemy(0xA9u, addr_stru_A98AF5); + SpawnEnemy(0xA9, addr_stru_A98AF5); E->mbby_var_E = FUNC16(MotherBrainBody_6_ClearBottomRightTube); } } @@ -568,7 +568,7 @@ void MotherBrainBody_6_ClearBottomRightTube(void) { // 0xA989FA void MotherBrainBody_7_SpawnTubeFallingEnemy2(void) { // 0xA98A0F Enemy_MotherBrainBody *E = Get_MotherBrainBody(0x40); if ((--E->mbby_var_F & 0x8000) != 0) { - SpawnEnemy(0xA9u, addr_stru_A98B05); + SpawnEnemy(0xA9, addr_stru_A98B05); E->mbby_var_E = FUNC16(MotherBrainBody_8_ClearBottomMiddleLeftTube); } } @@ -585,7 +585,7 @@ void MotherBrainBody_9_SpawnTopMiddleLeftFalling(void) { // 0xA98A37 if ((--E->mbby_var_F & 0x8000) != 0) { R18_ = 120; R20_ = 59; - SpawnEnemyProjectileWithRoomGfx(addr_kEproj_MotherBrainTubeFalling_TopMiddleLeft, 0x3Bu); + SpawnEnemyProjectileWithRoomGfx(addr_kEproj_MotherBrainTubeFalling_TopMiddleLeft, 0x3B); E->mbby_var_E = FUNC16(MotherBrainBody_10_ClearCeilingTubeColumn7); } } @@ -602,7 +602,7 @@ void MotherBrainBody_11_SpawnTopMiddleRightFalling(void) { // 0xA98A69 if ((--E->mbby_var_F & 0x8000) != 0) { R18_ = 136; R20_ = 59; - SpawnEnemyProjectileWithRoomGfx(addr_kEproj_MotherBrainTubeFalling_TopMiddleRight, 0x3Bu); + SpawnEnemyProjectileWithRoomGfx(addr_kEproj_MotherBrainTubeFalling_TopMiddleRight, 0x3B); E->mbby_var_E = FUNC16(MotherBrainBody_12_ClearCeilingTubeColumn8); } } @@ -617,7 +617,7 @@ void MotherBrainBody_12_ClearCeilingTubeColumn8(void) { // 0xA98A86 void MotherBrainBody_13_SpawnTubeFallingEnemy3(void) { // 0xA98A9B Enemy_MotherBrainBody *E = Get_MotherBrainBody(0x40); if ((--E->mbby_var_F & 0x8000) != 0) { - SpawnEnemy(0xA9u, FUNC16(EnemyProj_Init_0x8bde_SkreeDownLeft)); + SpawnEnemy(0xA9, FUNC16(EnemyProj_Init_0x8bde_SkreeDownLeft)); E->mbby_var_E = FUNC16(MotherBrainBody_14_ClearBottomMiddleRightTube); } } @@ -632,7 +632,7 @@ void MotherBrainBody_14_ClearBottomMiddleRightTube(void) { // 0xA98AAE void MotherBrainBody_15_SpawnTubeFallingEnemy4(void) { // 0xA98AC3 Enemy_MotherBrainBody *E = Get_MotherBrainBody(0x40); if ((--E->mbby_var_F & 0x8000) != 0) { - SpawnEnemy(0xA9u, addr_stru_A98B25); + SpawnEnemy(0xA9, addr_stru_A98B25); E->mbby_var_E = FUNC16(MotherBrainBody_16_ClearBottomMiddleTubes); } } @@ -793,8 +793,8 @@ void MotherBrainBody_FakeDeath_Ascent_5_DrawBG1RowCD(void) { // 0xA98CFA void MotherBrainBody_FakeDeath_Ascent_6_SetupPhase2Gfx(void) { // 0xA98D11 *(uint16 *)&layer2_scroll_x = 257; *(uint16 *)®_BG2SC &= 0xFFFCu; - WriteColorsToPalette(0x142u, 0xa9, addr_kMotherBrainPalette_1 + 2, 0xFu); - WriteColorsToPalette(0x162u, 0xa9, addr_kMotherBrainPalette_0 + 2, 0xFu); + WriteColorsToPalette(0x142, 0xa9, addr_kMotherBrainPalette_1 + 2, 0xF); + WriteColorsToPalette(0x162, 0xa9, addr_kMotherBrainPalette_0 + 2, 0xF); Get_MotherBrain(0)->mbn_var_A = FUNC16(MotherBrainBody_FakeDeath_Ascent_7_SetupPhase2Brain); nmi_flag_bg2_enemy_vram_transfer = 1; Get_MotherBrain(0x40)->mbn_var_02 = 1; @@ -1352,7 +1352,7 @@ void MotherBrain_FootstepEffect(void) { // 0xA99599 } uint16 MotherBrain_Instr_MoveBodyUp10Left4(uint16 k, uint16 j) { // 0xA995B6 - MotherBrain_MoveBodyDownScrollLeft(4u, 0xFFF6u); + MotherBrain_MoveBodyDownScrollLeft(4u, 0xFFF6); return j; } @@ -1362,22 +1362,22 @@ uint16 MotherBrain_Instr_MoveBodyUp16Left4(uint16 k, uint16 j) { // 0xA995C0 } uint16 MotherBrain_Instr_MoveBodyUp12Right2(uint16 k, uint16 j) { // 0xA995CA - MotherBrain_MoveBodyDownScrollLeft(0xFFFEu, 0xFFF4u); + MotherBrain_MoveBodyDownScrollLeft(0xFFFE, 0xFFF4); return j; } uint16 MotherBrain_Instr_MoveDown12Left4(uint16 k, uint16 j) { // 0xA995DE - MotherBrain_MoveBodyDownScrollLeft(4u, 0xCu); + MotherBrain_MoveBodyDownScrollLeft(4u, 0xC); return j; } uint16 MotherBrain_Instr_MoveDown16Right2(uint16 k, uint16 j) { // 0xA995E8 - MotherBrain_MoveBodyDownScrollLeft(0xFFFEu, 0x10); + MotherBrain_MoveBodyDownScrollLeft(0xFFFE, 0x10); return j; } uint16 MotherBrain_Instr_MoveDown10Right2(uint16 k, uint16 j) { // 0xA995F2 - MotherBrain_MoveBodyDownScrollLeft(0xFFFEu, 0xAu); + MotherBrain_MoveBodyDownScrollLeft(0xFFFE, 0xA); return j; } @@ -1536,7 +1536,7 @@ uint16 MotherBrain_Instr_SpawnDeathBeamEproj(uint16 k, uint16 j) { // 0xA99AEF uint16 v2; printf("A undefined\n"); v2 = 0; QueueSfx2_Max6(0x63u); - SpawnEnemyProjectileWithGfx(v2, 0x40u, addr_kEproj_MotherBrainDeathBeamCharging); + SpawnEnemyProjectileWithGfx(v2, 0x40, addr_kEproj_MotherBrainDeathBeamCharging); return j; } @@ -1718,7 +1718,7 @@ void MotherBrain_Phase3_Death_0(void) { // 0xA9AEE1 Enemy_MotherBrain *E1 = Get_MotherBrain(0x40); E1->base.properties |= 0x400u; E->mbn_var_04 = 0; - if (MotherBrain_MakeWalkBackwards(0x28u, 6u) & 1) { + if (MotherBrain_MakeWalkBackwards(0x28, 6u) & 1) { E->mbn_var_A = FUNC16(MotherBrain_Phase3_Death_1); E->mbn_var_F = 128; MotherBrain_Phase3_Death_1(); @@ -1950,7 +1950,7 @@ void MotherBrain_CorpseRottingFinished(void) { // 0xA9B223 Enemy_MotherBrain *E1 = Get_MotherBrain(0x40); R18_ = E1->base.x_pos + (random_number & 0x1F) - 16; R20_ = E1->base.y_pos + 16; - SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0xAu); + SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0xA); if ((enemy_damage_routine_exec_count & 7) == 0) QueueSfx2_Max3(0x10); } @@ -1964,7 +1964,7 @@ void MotherBrain_Phase3_Death_15_LoadEscapeTimerTiles(void) { // 0xA9B258 void MotherBrain_Phase3_Death_16_StartEscape(void) { // 0xA9B26D if (ProcessSpriteTilesTransfers(0xa9, addr_stru_A9902F)) { - WriteColorsToPalette(0x122u, 0xa9, addr_kMotherBrainPalette_5 + 2, 0xEu); + WriteColorsToPalette(0x122, 0xa9, addr_kMotherBrainPalette_5 + 2, 0xE); QueueMusic_Delayed8(7u); earthquake_type = 5; earthquake_timer = -1; @@ -2471,7 +2471,7 @@ void MotherBomb_FiringDeathBeam(void) { } void MotherBomb_FiringDeathBeam_0(void) { // 0xA9B88F - if (MotherBrain_MakeWalkBackwards(0x28u, 8u) & 1) { + if (MotherBrain_MakeWalkBackwards(0x28, 8u) & 1) { Enemy_MotherBrain *E1 = Get_MotherBrain(0x40); E1->mbn_var_32 = 8; E1->mbn_var_33 = 6; @@ -2680,7 +2680,7 @@ void MotherBomb_FiringRainbowBeam_14_DecideNextAction(void) { // 0xA9BB06 Enemy_MotherBomb *E = Get_MotherBomb(0); if ((--E->mbb_var_F & 0x8000) != 0) { if (sign16(samus_health - 400)) { - MotherBrain_MakeWalkForwards(0xAu, E->base.x_pos + 16); + MotherBrain_MakeWalkForwards(0xA, E->base.x_pos + 16); E->mbb_var_A = FUNC16(MotherBrain_Phase2Cut_0); } else { E->mbb_var_A = FUNC16(MotherBomb_FiringRainbowBeam_0); @@ -2701,7 +2701,7 @@ void MotherBrain_PlayRainbowBeamSfx(void) { // 0xA9BB2E } uint8 MotherBrain_WalkBackwardsSlowlyAndRetractHead(uint16 a) { // 0xA9BB48 - uint8 rv = MotherBrain_MakeWalkBackwards(a, 0xAu); + uint8 rv = MotherBrain_MakeWalkBackwards(a, 0xA); if (rv) MotherBrain_RetractHead(); return rv; @@ -2825,9 +2825,9 @@ void MotherBrain_BodyRainbowBeamPalAnimIndex0(void) { // 0xA9BCC6 } void MotherBrain_WriteDefaultPalette(void) { // 0xA9BCCE - WriteColorsToPalette(0x82u, 0xa9, addr_kMotherBrainsBrain_Palette + 2, 0xFu); - WriteColorsToPalette(0x122u, 0xa9, addr_kMotherBrainsBrain_Palette + 2, 0xFu); - WriteColorsToPalette(0x162u, 0xa9, addr_kMotherBrainPalette_0 + 2, 0xFu); + WriteColorsToPalette(0x82, 0xa9, addr_kMotherBrainsBrain_Palette + 2, 0xF); + WriteColorsToPalette(0x122, 0xa9, addr_kMotherBrainsBrain_Palette + 2, 0xF); + WriteColorsToPalette(0x162, 0xa9, addr_kMotherBrainPalette_0 + 2, 0xF); } void MotherBrain_WritePhase2DeathPalette(void) { // 0xA9BCF6 @@ -2849,9 +2849,9 @@ void MotherBrain_HandleRainbowBeamPalette(void) { // 0xA9BCFD } void MotherBrain_WritePalette(uint16 j) { // 0xA9BD1D - WriteColorsToPalette(0x82u, 0xad, j, 15); - WriteColorsToPalette(0x122u, 0xad, j, 15); - WriteColorsToPalette(0x162u, 0xad, j + 30, 15); + WriteColorsToPalette(0x82, 0xad, j, 15); + WriteColorsToPalette(0x122, 0xad, j, 15); + WriteColorsToPalette(0x162, 0xad, j + 30, 15); } void MotherBrain_Phase2Cut_0(void) { // 0xA9BD45 @@ -2923,7 +2923,7 @@ void MotherBrain_Phase2Cut_5(void) { // 0xA9BDED } void MotherBrain_SpawnShitroidInCutscene(void) { // 0xA9BE1B - Get_MotherBrain(0x40)->mbn_var_0A = SpawnEnemy(0xA9u, addr_stru_A9BE28); + Get_MotherBrain(0x40)->mbn_var_0A = SpawnEnemy(0xA9, addr_stru_A9BE28); } void MotherBrain_DrainedByShitroid_0(void) { // 0xA9BE38 @@ -2998,7 +2998,7 @@ void MotherBrain_DrainedByShitroid_3(void) { // 0xA9BF0E } void MotherBrain_DrainedByShitroid_4(void) { // 0xA9BF41 - if (MotherBrain_MakeWalkBackwards(0x28u, 0) & 1) { + if (MotherBrain_MakeWalkBackwards(0x28, 0) & 1) { Get_MotherBrain(0)->mbn_var_A = FUNC16(MotherBrain_DrainedByShitroid_5); Get_MotherBrain(0x40)->mbn_var_33 = 0; MotherBrain_DrainedByShitroid_5(); @@ -3048,7 +3048,7 @@ void MotherBrain_DrainedByShitroid_7(void) { // 0xA9BF95 void MotherBrain_PainfulWalkForwards(void) { // 0xA9BFD0 Enemy_MotherBrain *E = Get_MotherBrain(0x40); - if (MotherBrain_MakeWalkForwards(E->mbn_var_07, 0x48u) & 1) { + if (MotherBrain_MakeWalkForwards(E->mbn_var_07, 0x48) & 1) { E->mbn_var_08 = FUNC16(MotherBrain_PainfulWalkingForwards); MotherBrain_SetPainfulWalkingTimer(); } @@ -3066,7 +3066,7 @@ void MotherBrain_PainfulWalkingForwards(void) { // 0xA9BFE8 void MotherBrain_PainfulWalkBackwards(void) { // 0xA9C004 Enemy_MotherBrain *E = Get_MotherBrain(0x40); - if (MotherBrain_MakeWalkBackwards(0x28u, E->mbn_var_07) & 1) { + if (MotherBrain_MakeWalkBackwards(0x28, E->mbn_var_07) & 1) { E->mbn_var_08 = FUNC16(MotherBrain_PainfulWalkingBackwards); MotherBrain_SetPainfulWalkingTimer(); } @@ -3177,7 +3177,7 @@ void MotherBrain_Phase2_Revive_7(void) { // 0xA9C11E void MotherBrain_Phase2_Revive_8(void) { // 0xA9C147 if (MotherBrain_MakeHerStandUp() & 1) { Get_MotherBrain(0)->mbn_var_A = FUNC16(MotherBrain_Phase2_MurderShitroid_1); - MotherBrain_MakeWalkForwards(0xAu, 0x50); + MotherBrain_MakeWalkForwards(0xA, 0x50); MotherBrain_Phase2_MurderShitroid_1(); } } @@ -3203,7 +3203,7 @@ void MotherBrain_Phase2_MurderShitroid_2(void) { // 0xA9C182 void MotherBrain_Phase2_PrepareForFinalShitroid(void) { // 0xA9C18E MotherBrain_MakeHerStandUp(); - MotherBrain_MakeWalkBackwards(0x40u, 4u); + MotherBrain_MakeWalkBackwards(0x40, 4u); } void MotherBrain_Phase2_ExecuteFinalkShitroid(void) { // 0xA9C19A @@ -3673,7 +3673,7 @@ void ShitroidInCutscene_Init(void) { // 0xA9C710 E->sice_var_A = FUNC16(ShitroidInCutscene_DashOntoScreen); E->sice_var_F = 248; E->sice_var_0F = FUNC16(Shitroid_HandleCutscenePalette); - WriteColorsToPalette(0x1E2u, 0xa9, addr_kMotherBrainPalette_2 + 2, 0xFu); + WriteColorsToPalette(0x1E2, 0xa9, addr_kMotherBrainPalette_2 + 2, 0xF); } void CallShitroidCutsceneFuncA(uint32 ea, uint16 k) { @@ -4021,7 +4021,7 @@ void ShitroidInCutscene_MoveToFinalChargeStart(uint16 k) { // 0xA9CB7B void ShitroidInCutscene_InitiateFinalCharge(uint16 k) { // 0xA9CBB3 R18_ = 290; R20_ = 128; - Shitroid_Func_GraduallyAccelerateTowards0x400(k, 0xAu); + Shitroid_Func_GraduallyAccelerateTowards0x400(k, 0xA); R22_ = 4; R24_ = 4; if (!(Shitroid_Func_2(k) & 1)) @@ -4032,7 +4032,7 @@ void ShitroidInCutscene_FinalCharge(uint16 k) { // 0xA9CBD8 Enemy_ShitroidInCutscene *E1 = Get_ShitdroidInCutscene(0x40); R18_ = E1->base.x_pos; R20_ = E1->base.y_pos - 32; - Shitroid_Func_GraduallyAccelerateTowards0x400(k, 0xCu); + Shitroid_Func_GraduallyAccelerateTowards0x400(k, 0xC); Enemy_ShitroidInCutscene *E = Get_ShitdroidInCutscene(k); if (!E->base.health) { E->sice_var_0F = FUNC16(nullsub_338); @@ -4179,7 +4179,7 @@ uint8 ShitroidInCutscene_FadeShitroidToBlack(uint16 k) { // 0xA9CD69 if (!sign16(E->sice_var_0D - 6)) return 1; E->sice_var_0D = v4; - WriteColorsToPalette(0x1E2u, 0xad, kShitroid_FadingToBlack[v4], 0xEu); + WriteColorsToPalette(0x1E2, 0xad, kShitroid_FadingToBlack[v4], 0xE); return 0; } @@ -4248,9 +4248,9 @@ void ShitroidInCutscene_HandleHealthBasedPalette(uint16 k) { // 0xA9CE69 } uint16 v5 = v3; uint16 v4 = kShitroid_HealthBasedPalettes_Shell[v3 >> 1]; - WriteColorsToPalette(0x1E2u, 0xad, v4, 4); - WriteColorsToPalette(0x1F4u, 0xad, v4 + 8, 5); - WriteColorsToPalette(0x1EAu, 0xad, kShitroid_HealthBasedPalettes_Innards[v5 >> 1], 5u); + WriteColorsToPalette(0x1E2, 0xad, v4, 4); + WriteColorsToPalette(0x1F4, 0xad, v4 + 8, 5); + WriteColorsToPalette(0x1EA, 0xad, kShitroid_HealthBasedPalettes_Innards[v5 >> 1], 5u); } } } @@ -4353,9 +4353,9 @@ void MotherBrain_Pal_HandleRoomPal(void) { // 0xA9D01C } void MotherBrain_Pal_WriteRoomPal(uint16 j) { // 0xA9D025 - WriteColorsToPalette(0x68u, 0xa9, j, 12); - WriteColorsToPalette(0xA6u, 0xa9, j + 24, 12); - WriteColorsToPalette(0xE6u, 0xa9, j + 24, 12); + WriteColorsToPalette(0x68, 0xa9, j, 12); + WriteColorsToPalette(0xA6, 0xa9, j + 24, 12); + WriteColorsToPalette(0xE6, 0xa9, j + 24, 12); } uint16 HandleRoomPaletteInstructionList(uint16 a) { // 0xA9D192 @@ -4492,7 +4492,7 @@ void DeadTorizo_Main(void) { // 0xA9D368 E->base.properties |= kEnemyProps_Tangible; E->dto_var_A = FUNC16(DeadTorizo_Rotting); } - mov24(&enemy_gfx_drawn_hook, 0xA9D39Au); + mov24(&enemy_gfx_drawn_hook, 0xA9D39A); CallDeadTorizoFuncA(E->dto_var_A | 0xA90000); DeadTorizo_Func_1(); } @@ -4639,7 +4639,7 @@ void DeadTorizo_Func_1(void) { // 0xA9D4CF void DeadTorizo_CorpseRottingFinished(void) { // 0xA9D5BD R18_ = (random_number & 0x1F) + 272; R20_ = 188; - SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0xAu); + SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0xA); if ((enemy_damage_routine_exec_count & 7) == 0) QueueSfx2_Max6(0x10); } @@ -5039,7 +5039,7 @@ void CorpseRottingRotEntryFinishedHook(void) { // 0xA9DC08 EnemyData *v0 = gEnemyData(cur_enemy_index); R18_ = v0->x_pos + (random_number & 0x1A) - 14; R20_ = v0->y_pos + 16; - SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0xAu); + SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0xA); if ((enemy_damage_routine_exec_count & 7) == 0) QueueSfx2_Max3(0x10); } @@ -6079,9 +6079,9 @@ void Shitroid_Init(void) { // 0xA9EF37 E->shitr_var_C = 0; E->shitr_var_E = 10; E->shitr_parameter_2 = 0; - WriteColorsToTargetPalette(0xa9, 0x120u, addr_word_A9F8C6, 0x10); - WriteColorsToTargetPalette(0xa9, 0x140u, addr_kShitroidInCutscene_Palette, 0x10); - WriteColorsToTargetPalette(0xa9, 0x1E0u, addr_kDeadSidehopper_Palette_0, 0x10); + WriteColorsToTargetPalette(0xa9, 0x120, addr_word_A9F8C6, 0x10); + WriteColorsToTargetPalette(0xa9, 0x140, addr_kShitroidInCutscene_Palette, 0x10); + WriteColorsToTargetPalette(0xa9, 0x1E0, addr_kDeadSidehopper_Palette_0, 0x10); } void Shitroid_Powerbomb(void) { // 0xA9EFBA @@ -6169,7 +6169,7 @@ void Shitroid_Func_6(uint16 k) { // 0xA9F037 void Shitroid_Func_7(uint16 k) { // 0xA9F049 R18_ = 584; R20_ = 74; - Shitroid_Func_GraduallyAccelerateTowards0x400(k, 0xFu); + Shitroid_Func_GraduallyAccelerateTowards0x400(k, 0xF); R22_ = 1; R24_ = 1; if (!(Shitroid_Func_2(k) & 1)) @@ -6180,7 +6180,7 @@ void Shitroid_Func_8(uint16 k) { // 0xA9F06D Enemy_Shitroid *E = Get_Shitroid(k + 64); R18_ = E->base.x_pos; R20_ = E->base.y_pos - 32; - Shitroid_Func_GraduallyAccelerateTowards0x400(k, 0xFu); + Shitroid_Func_GraduallyAccelerateTowards0x400(k, 0xF); if (!(Shitroid_Func_1(k, k + 64) & 1)) Get_Shitroid(k)->shitr_var_A = FUNC16(Shitroid_Func_9); } @@ -6275,14 +6275,14 @@ void Shitroid_Func_13(uint16 k) { // 0xA9F180 } R20_ = v5; R18_ = samus_x_pos; - Shitroid_Func_GraduallyAccelerateTowards0x400(cur_enemy_index, 0xAu); + Shitroid_Func_GraduallyAccelerateTowards0x400(cur_enemy_index, 0xA); } } void Shitroid_Func_14(uint16 k) { // 0xA9F1FA R18_ = samus_x_pos; R20_ = samus_y_pos - 32; - Shitroid_Func_GraduallyAccelerateTowards0x400(k, 0xFu); + Shitroid_Func_GraduallyAccelerateTowards0x400(k, 0xF); } void Shitroid_Func_15(uint16 k) { // 0xA9F20E diff --git a/src/sm_aa.c b/src/sm_aa.c index 2ee27aa..9fabdf2 100644 --- a/src/sm_aa.c +++ b/src/sm_aa.c @@ -463,7 +463,7 @@ uint16 Torizo_Instr_23(uint16 k, uint16 j) { // 0xAAC55A } uint16 Torizo_Instr_14(uint16 k, uint16 j) { // 0xAAC567 - if (CompareDistToSamus_X(k, 0x38u) & 1) + if (CompareDistToSamus_X(k, 0x38) & 1) return j + 2; Enemy_Torizo *E = Get_Torizo(k); if (((E->toriz_parameter_1 ^ (samus_x_pos - E->base.x_pos)) & 0x8000u) == 0) @@ -473,7 +473,7 @@ uint16 Torizo_Instr_14(uint16 k, uint16 j) { // 0xAAC567 } uint16 Torizo_Instr_15(uint16 k, uint16 j) { // 0xAAC58B - if (CompareDistToSamus_X(k, 0x20u) & 1 || (Torizo_Func_12(k) & 0x8000u) != 0) + if (CompareDistToSamus_X(k, 0x20) & 1 || (Torizo_Func_12(k) & 0x8000u) != 0) return j + 2; Torizo_C22D(k); return *(uint16 *)RomPtr_AA(j); @@ -940,7 +940,7 @@ uint16 Torizo_Instr_47(uint16 k, uint16 j) { // 0xAAD3E0 uint16 Torizo_Instr_49(uint16 k, uint16 j) { // 0xAAD3EA if ((Torizo_Func_12(k) & 0x8000u) == 0 || !(CompareDistToSamus_X(k, 4u) & 1) - || CompareDistToSamus_X(k, 0x28u) & 1 + || CompareDistToSamus_X(k, 0x28) & 1 || samus_pose != kPose_1D_FaceR_Morphball_Ground && samus_pose != kPose_1E_MoveR_Morphball_Ground && samus_pose != kPose_1F_MoveL_Morphball_Ground @@ -962,8 +962,8 @@ uint16 Torizo_Instr_61(uint16 k, uint16 j) { // 0xAAD436 uint16 Torizo_Instr_53(uint16 k, uint16 j) { // 0xAAD445 if ((Torizo_Func_12(k) & 0x8000u) != 0 - || !(CompareDistToSamus_X(k, 0x20u) & 1) - || CompareDistToSamus_X(k, 0x60u) & 1 + || !(CompareDistToSamus_X(k, 0x20) & 1) + || CompareDistToSamus_X(k, 0x60) & 1 || (NextRandom() & 0x110) != 0) { return j + 2; } @@ -989,7 +989,7 @@ uint16 Torizo_Instr_52(uint16 k, uint16 j) { // 0xAAD49B } uint16 Torizo_Instr_50(uint16 k, uint16 j) { // 0xAAD4BA - if (!(CompareDistToSamus_X(k, 0x70u) & 1)) + if (!(CompareDistToSamus_X(k, 0x70) & 1)) return j + 2; if ((Torizo_Func_12(k) & 0x8000u) != 0) return j + 2; @@ -1010,7 +1010,7 @@ uint16 Torizo_Instr_43(uint16 k, uint16 j) { // 0xAAD4F3 uint16 Torizo_Instr_51(uint16 k, uint16 j) { // 0xAAD4FD Enemy_Torizo *E = Get_Torizo(k); - if (E->toriz_var_09 < 8u && (CompareDistToSamus_X(k, 0x20u) & 1 || (Torizo_Func_12(k) & 0x8000u) != 0)) + if (E->toriz_var_09 < 8u && (CompareDistToSamus_X(k, 0x20) & 1 || (Torizo_Func_12(k) & 0x8000u) != 0)) return j + 2; E->toriz_var_09 = 0; Torizo_C22D(k); diff --git a/src/sm_ad.c b/src/sm_ad.c index d62e59d..c79ab88 100644 --- a/src/sm_ad.c +++ b/src/sm_ad.c @@ -419,9 +419,9 @@ void MotherBrain_HealthBasedPaletteHandling(void) { // 0xADE3D5 v0 = 6; } } - WriteColorsToPalette(0x82u, 0xad, kMotherBrain_HealthBasedPalettes_Brain[v0 >> 1], 0xFu); - WriteColorsToPalette(0x122u, 0xad, kMotherBrain_HealthBasedPalettes_Brain[v0 >> 1], 0xFu); - WriteColorsToPalette(0x162u, 0xad, kMotherBrain_HealthBasedPalettes_BackLeg[v0 >> 1], 0xFu); + WriteColorsToPalette(0x82, 0xad, kMotherBrain_HealthBasedPalettes_Brain[v0 >> 1], 0xF); + WriteColorsToPalette(0x122, 0xad, kMotherBrain_HealthBasedPalettes_Brain[v0 >> 1], 0xF); + WriteColorsToPalette(0x162, 0xad, kMotherBrain_HealthBasedPalettes_BackLeg[v0 >> 1], 0xF); } } @@ -430,9 +430,9 @@ uint8 MotherBrain_FadePalToBlack(uint16 a) { // 0xADE9B4 if (!kMotherBrain_FadePalToBlack[v1]) return 1; uint16 j = kMotherBrain_FadePalToBlack[v1]; - WriteColorsToPalette(0x82u, 0xad, j, 14); - WriteColorsToPalette(0x122u, 0xad, j, 14); - WriteColorsToPalette(0x162u, 0xad, j + 28, 14); + WriteColorsToPalette(0x82, 0xad, j, 14); + WriteColorsToPalette(0x122, 0xad, j, 14); + WriteColorsToPalette(0x162, 0xad, j + 28, 14); return 0; } @@ -453,7 +453,7 @@ uint8 MotherBrain_FadeFromGray_FakeDeath(uint16 a) { // 0xADEEEA } uint8 MotherBrain_EEF6(uint16 a) { // 0xADEEF6 - WriteColorsToPalette(0x122u, 0xad, a, 3u); + WriteColorsToPalette(0x122, 0xad, a, 3u); return 0; } @@ -464,9 +464,9 @@ uint8 MotherBrain_FadeFromGray_Drained(uint16 a) { // 0xADEF0D if (!kMotherBrain_TransitionToFromGrey_Decr[v1]) return 1; uint16 j = kMotherBrain_TransitionToFromGrey_Decr[v1]; - WriteColorsToPalette(0x82u, 0xad, j, 13); - WriteColorsToPalette(0x122u, 0xad, j, 13); - WriteColorsToPalette(0x168u, 0xad, j + 26, 5); + WriteColorsToPalette(0x82, 0xad, j, 13); + WriteColorsToPalette(0x122, 0xad, j, 13); + WriteColorsToPalette(0x168, 0xad, j + 26, 5); v3 = *(uint16 *)RomPtr_AD(j + 36); *(uint16 *)&g_ram[0x17C] = v3; return 0; @@ -479,9 +479,9 @@ uint8 MotherBrain_FadeToGray_Drained(uint16 a) { // 0xADEF4A if (!kMotherBrain_FadeToGray_Drained[v1]) return 1; uint16 j = kMotherBrain_FadeToGray_Drained[v1]; - WriteColorsToPalette(0x82u, 0xad, j, 15); - WriteColorsToPalette(0x122u, 0xad, j, 15); - WriteColorsToPalette(0x168u, 0xad, j + 30, 5); + WriteColorsToPalette(0x82, 0xad, j, 15); + WriteColorsToPalette(0x122, 0xad, j, 15); + WriteColorsToPalette(0x168, 0xad, j + 30, 5); v3 = *(uint16 *)RomPtr_AD(j + 40); *(uint16 *)&g_ram[0x17C] = v3; return 0; @@ -491,13 +491,13 @@ uint8 MotherBrain_FadeToGray_RealDeath(uint16 a) { // 0xADF0E9 int v1 = a; if (!kMotherBrain_FadeToGray_RealDeath[v1]) return 1; - WriteColorsToPalette(0x1E2u, 0xad, kMotherBrain_FadeToGray_RealDeath[v1], 0xFu); + WriteColorsToPalette(0x1E2, 0xad, kMotherBrain_FadeToGray_RealDeath[v1], 0xF); return 0; } void TurnOffLightsForShitroidDeath(void) { // 0xADF209 - WriteColorsToPalette(0x62u, 0xad, addr_kTurnOffLightsForShitroidDeath, 14); - WriteColorsToPalette(0xA2u, 0xad, addr_kTurnOffLightsForShitroidDeath, 14); + WriteColorsToPalette(0x62, 0xad, addr_kTurnOffLightsForShitroidDeath, 14); + WriteColorsToPalette(0xA2, 0xad, addr_kTurnOffLightsForShitroidDeath, 14); } uint8 MotherBrain_Phase3_TurnLightsBackOn(uint16 a) { // 0xADF24B @@ -505,8 +505,8 @@ uint8 MotherBrain_Phase3_TurnLightsBackOn(uint16 a) { // 0xADF24B if (!kMotherBrain_Phase3_TurnLightsBackOn[v1]) return 1; uint16 v3 = kMotherBrain_Phase3_TurnLightsBackOn[v1]; - WriteColorsToPalette(0x62u, 0xad, v3, 14); - WriteColorsToPalette(0xA2u, 0xad, v3 + 28, 14); + WriteColorsToPalette(0x62, 0xad, v3, 14); + WriteColorsToPalette(0xA2, 0xad, v3 + 28, 14); return 0; } diff --git a/src/sm_b2.c b/src/sm_b2.c index a6084ca..ec59431 100644 --- a/src/sm_b2.c +++ b/src/sm_b2.c @@ -298,7 +298,7 @@ void WallSpacePirates_Main(void) { // 0xB2F02D } void SpacePirates_Func_1(uint16 k) { // 0xB2F034 - if (IsSamusWithinEnemy_Y(cur_enemy_index, 0x20u)) { + if (IsSamusWithinEnemy_Y(cur_enemy_index, 0x20)) { Enemy_SpacePirates *E = Get_SpacePirates(cur_enemy_index); E->base.current_instruction = addr_kSpacePirates_Ilist_ED80; E->base.instruction_timer = 1; @@ -326,7 +326,7 @@ void SpacePirates_Func_2(uint16 k) { // 0xB2F050 } void SpacePirates_Func_3(uint16 k) { // 0xB2F0C8 - if (IsSamusWithinEnemy_Y(cur_enemy_index, 0x20u)) { + if (IsSamusWithinEnemy_Y(cur_enemy_index, 0x20)) { Enemy_SpacePirates *E = Get_SpacePirates(cur_enemy_index); E->base.current_instruction = addr_kSpacePirates_Ilist_ECC0; E->base.instruction_timer = 1; @@ -768,7 +768,7 @@ uint16 SpacePirates_Instr_11(uint16 k, uint16 j) { // 0xB2FCB8 uint16 SpacePirates_Instr_13(uint16 k, uint16 j) { // 0xB2FCC8 uint16 result; - if (IsSamusWithinEnemy_Y(cur_enemy_index, 0x10u)) { + if (IsSamusWithinEnemy_Y(cur_enemy_index, 0x10)) { result = addr_kSpacePirates_Ilist_FB8C; if ((int16)(samus_x_pos - Get_SpacePirates(cur_enemy_index)->base.x_pos) >= 0) return addr_kSpacePirates_Ilist_FC0E; @@ -801,7 +801,7 @@ void WalkingSpacePirates_Main(void) { // 0xB2FD32 void WalkingSpacePirates_FD44(void) { // 0xB2FD44 Enemy_SpacePirates *E = Get_SpacePirates(cur_enemy_index); - if (IsSamusWithinEnemy_Y(cur_enemy_index, 0x10u)) { + if (IsSamusWithinEnemy_Y(cur_enemy_index, 0x10)) { uint16 v1 = addr_kSpacePirates_Ilist_FB8C; if ((int16)(samus_x_pos - E->base.x_pos) >= 0) v1 = addr_kSpacePirates_Ilist_FC0E; @@ -831,7 +831,7 @@ void WalkingSpacePirates_FD44(void) { // 0xB2FD44 void WalkingSpacePirates_FDCE(void) { // 0xB2FDCE Enemy_SpacePirates *E = Get_SpacePirates(cur_enemy_index); - if (IsSamusWithinEnemy_Y(cur_enemy_index, 0x10u)) { + if (IsSamusWithinEnemy_Y(cur_enemy_index, 0x10)) { uint16 v1 = addr_kSpacePirates_Ilist_FB8C; if ((int16)(samus_x_pos - E->base.x_pos) >= 0) v1 = addr_kSpacePirates_Ilist_FC0E; diff --git a/src/sm_b3.c b/src/sm_b3.c index 5e4c428..05c2298 100644 --- a/src/sm_b3.c +++ b/src/sm_b3.c @@ -497,7 +497,7 @@ void BrinstarYellowPipeBug_Func_1(void) { // 0xB38FB5 v2 = GetSamusEnemyDelta_X(cur_enemy_index); if (v2 >= 0 && sign16(v2 - 192)) { LABEL_7: - if (IsSamusWithinEnemy_Y(cur_enemy_index, 0x30u)) { + if (IsSamusWithinEnemy_Y(cur_enemy_index, 0x30)) { E->base.properties &= ~kEnemyProps_Invisible; E->pbg_var_20 = 24; E->pbg_var_A = FUNC16(BrinstarYellowPipeBug_Func_2); @@ -1071,7 +1071,7 @@ void Botwoon_Func_15(void) { // 0xB39A5E E->botwoon_var_D = FUNC16(Botwoon_Func_16); R18_ = E->base.x_pos; R20_ = E->base.y_pos; - SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0x1Du); + SpawnEnemyProjectileWithRoomGfx(addr_kEproj_DustCloudExplosion, 0x1D); Botwoon_QueueExplosionSfx(); E->base.properties |= 0x500u; } diff --git a/src/sm_b4.c b/src/sm_b4.c index 8d77485..d8e0437 100644 --- a/src/sm_b4.c +++ b/src/sm_b4.c @@ -99,7 +99,7 @@ void DrawSpriteObjects(void) { // 0xB4BD32 R3_.addr = sprite_palettes[v1] & 0xE00; R0_.addr = sprite_palettes[v1] & 0x1FF; uint8 *v3 = RomPtr_B4(sprite_instr_list_ptrs[v1]); - DrawSpritemapWithBaseTile(0xB4u, *((uint16 *)v3 + 1)); + DrawSpritemapWithBaseTile(0xB4, *((uint16 *)v3 + 1)); } } }