From 2340b15e97a541c7d5a770540387c17baf1f5411 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Thu, 9 Mar 2023 01:55:54 +0900 Subject: [PATCH] Master to main (#970) * step 1 * gMasterGfxPos -> gMainGfxPos * change label name --- .github/workflows/docs.yaml | 2 +- CONTRIBUTING.md | 2 +- Jenkinsfile | 8 +- README.md | 4 +- include/dead.h | 2 +- include/variables.h | 2 +- src/16c8e0.c | 96 ++--- src/17D6A0.c | 2 +- src/190B20.c | 22 +- src/325AD0.c | 34 +- src/415D90.c | 4 +- src/43F0.c | 22 +- src/80850_len_3060.c | 2 +- src/8800.c | 52 +-- src/8a160_len_700.c | 22 +- src/8a860_len_3f30.c | 12 +- src/B4580.c | 66 ++-- src/C50A0.c | 280 +++++++-------- src/CEE40.c | 140 ++++---- src/a5dd0_len_114e0.c | 176 ++++----- src/background_gfx.c | 134 +++---- src/battle/area/hos/stage/hos_01.c | 8 +- src/battle/area/kzn2/actor/lava_piranha.c | 18 +- src/battle/common/stage/sam_Snowflakes.inc.c | 2 +- src/battle/move/item/mystery.c | 2 +- src/battle/move/item/strange_cake.c | 2 +- src/cd180_len_38f0.c | 140 ++++---- src/curtains.c | 26 +- src/d0a70_len_4fe0.c | 244 ++++++------- src/dc470_len_14c0.c | 44 +-- src/de740_len_23f0.c | 46 +-- src/draw_box.c | 162 ++++----- src/effects.c | 16 +- src/effects/attack_result_text.c | 36 +- src/effects/aura.c | 30 +- src/effects/balloon.c | 14 +- src/effects/big_smoke_puff.c | 20 +- src/effects/big_snowflakes.c | 12 +- src/effects/blast.c | 20 +- src/effects/bombette_breaking.c | 26 +- src/effects/breaking_junk.c | 18 +- src/effects/bulb_glow.c | 16 +- src/effects/butterflies.c | 20 +- src/effects/chapter_change.c | 18 +- src/effects/chomp_drop.c | 38 +- src/effects/cloud_puff.c | 16 +- src/effects/cloud_trail.c | 16 +- src/effects/cold_breath.c | 32 +- src/effects/confetti.c | 36 +- src/effects/damage_indicator.c | 66 ++-- src/effects/damage_stars.c | 18 +- src/effects/debuff.c | 22 +- src/effects/disable_x.c | 56 +-- src/effects/drop_leaves.c | 12 +- src/effects/dust.c | 18 +- src/effects/effect_3D.c | 20 +- src/effects/effect_46.c | 18 +- src/effects/effect_63.c | 22 +- src/effects/effect_65.c | 26 +- src/effects/effect_75.c | 22 +- src/effects/effect_86.c | 18 +- src/effects/embers.c | 26 +- src/effects/emote.c | 34 +- src/effects/ending_decals.c | 30 +- src/effects/energy_in_out.c | 22 +- src/effects/energy_orb_wave.c | 40 +-- src/effects/energy_shockwave.c | 22 +- src/effects/explosion.c | 28 +- src/effects/falling_leaves.c | 12 +- src/effects/fire_breath.c | 28 +- src/effects/fire_flower.c | 36 +- src/effects/firework.c | 42 +-- src/effects/firework_rocket.c | 12 +- src/effects/flame.c | 32 +- src/effects/flashing_box_shockwave.c | 32 +- src/effects/floating_cloud_puff.c | 18 +- src/effects/floating_flower.c | 12 +- src/effects/floating_rock.c | 20 +- src/effects/flower_splash.c | 14 +- src/effects/flower_trail.c | 16 +- src/effects/footprint.c | 14 +- src/effects/fright_jar.c | 72 ++-- src/effects/gather_energy_pink.c | 26 +- src/effects/gather_magic.c | 20 +- src/effects/got_item_outline.c | 36 +- src/effects/green_impact.c | 50 +-- src/effects/hieroglyphs.c | 44 +-- src/effects/huff_puff_breath.c | 20 +- src/effects/ice_pillar.c | 18 +- src/effects/ice_shard.c | 30 +- src/effects/landing_dust.c | 34 +- src/effects/lens_flare.c | 26 +- src/effects/light_rays.c | 22 +- src/effects/lightning.c | 30 +- src/effects/lightning_bolt.c | 28 +- src/effects/lil_oink.c | 18 +- src/effects/merlin_house_stars.c | 24 +- src/effects/misc_particles.c | 20 +- src/effects/motion_blur_flame.c | 18 +- src/effects/moving_cloud.c | 18 +- src/effects/music_note.c | 16 +- src/effects/partner_buff.c | 34 +- src/effects/peach_star_beam.c | 46 +-- src/effects/pink_sparkles.c | 16 +- src/effects/purple_ring.c | 18 +- src/effects/quizmo_answer.c | 20 +- src/effects/quizmo_assistant.c | 16 +- src/effects/quizmo_audience.c | 20 +- src/effects/quizmo_stage.c | 68 ++-- src/effects/radial_shimmer.c | 26 +- src/effects/radiating_energy_orb.c | 58 +-- src/effects/recover.c | 48 +-- src/effects/red_impact.c | 48 +-- src/effects/ring_blast.c | 34 +- src/effects/rising_bubble.c | 26 +- src/effects/shape_spell.c | 40 +-- src/effects/shattering_stones.c | 20 +- src/effects/shimmer_burst.c | 42 +-- src/effects/shimmer_wave.c | 42 +-- src/effects/shiny_flare.c | 18 +- src/effects/shockwave.c | 54 +-- src/effects/sleep_bubble.c | 40 +-- src/effects/small_gold_sparkle.c | 24 +- src/effects/smoke_burst.c | 26 +- src/effects/smoke_impact.c | 34 +- src/effects/smoke_ring.c | 28 +- src/effects/snaking_static.c | 28 +- src/effects/snowfall.c | 18 +- src/effects/snowflake.c | 18 +- src/effects/snowman_doll.c | 18 +- src/effects/something_rotating.c | 32 +- src/effects/sparkles.c | 16 +- src/effects/spiky_white_aura.c | 14 +- src/effects/spirit_card.c | 20 +- src/effects/squirt.c | 26 +- src/effects/star.c | 30 +- src/effects/star_outline.c | 40 +-- src/effects/star_spirits_energy.c | 26 +- src/effects/stars_burst.c | 14 +- src/effects/stars_orbiting.c | 18 +- src/effects/stars_shimmer.c | 18 +- src/effects/stars_spread.c | 18 +- src/effects/stat_change.c | 44 +-- src/effects/static_status.c | 20 +- src/effects/steam_burst.c | 26 +- src/effects/stop_watch.c | 44 +-- src/effects/sun.c | 24 +- src/effects/sweat.c | 12 +- src/effects/tattle_window.c | 32 +- src/effects/throw_spiny.c | 16 +- src/effects/thunderbolt_ring.c | 36 +- src/effects/tubba_heart_attack.c | 22 +- src/effects/underwater.c | 62 ++-- src/effects/walking_dust.c | 24 +- src/effects/water_block.c | 46 +-- src/effects/water_fountain.c | 32 +- src/effects/water_splash.c | 24 +- src/effects/waterfall.c | 24 +- src/effects/whirlwind.c | 62 ++-- src/effects/windy_leaves.c | 12 +- src/entity/Block.c | 4 +- src/entity/BlueWarpPipe.c | 4 +- src/entity/Chest.c | 4 +- src/entity/HeartBlock.c | 4 +- src/entity/HiddenPanel.c | 8 +- src/entity/ItemBlock.c | 4 +- src/entity/SaveBlock.c | 4 +- src/entity/ShatteringBlock_common.c | 4 +- src/entity/SuperBlock.c | 4 +- src/entity/WoodenCrate.c | 4 +- src/entity/default/BoardedFloor.c | 4 +- src/entity/default/BombableRock.c | 4 +- src/entity/default/Padlock.c | 6 +- src/entity/jan_iwa/ArrowSign.c | 4 +- src/entity/jan_iwa/Plants1.c | 8 +- src/entity/sbk_omo/StarBoxLauncher.c | 4 +- src/entity/sbk_omo/Tweester.c | 84 ++--- src/entity_model.c | 188 +++++----- src/evt/virtual_entity.c | 18 +- src/filemenu/filemenu_common.c | 64 ++-- src/filemenu/filemenu_createfile.c | 6 +- src/filemenu/filemenu_msg.c | 42 +-- src/hud_element.c | 246 ++++++------- src/i_spy.c | 6 +- src/inspect_icon.c | 6 +- src/main.c | 42 +-- src/main_loop.c | 22 +- src/msg.c | 332 ++++++++--------- src/pause/pause_badges.c | 44 +-- src/pause/pause_gfx.c | 2 +- src/pause/pause_items.c | 6 +- src/pause/pause_main.c | 32 +- src/pause/pause_map.c | 22 +- src/pause/pause_partners.c | 20 +- src/pause/pause_spirits.c | 18 +- src/pulse_stone.c | 6 +- src/speech_bubble.c | 6 +- src/sprite.c | 82 ++--- src/state_logos.c | 38 +- src/state_title_screen.c | 80 ++--- src/status_icons.c | 26 +- src/windows.c | 18 +- src/world/area_dro/dro_02/npc_merlee.c | 36 +- src/world/area_end/common/Credits.inc.c | 46 +-- .../area_end/end_01/end_01_4_opera_float.c | 4 +- src/world/area_flo/flo_10/flo_10_6_waterfx.c | 58 +-- src/world/area_flo/flo_14/flo_14_3_bubbles.c | 6 +- .../area_hos/hos_00/hos_00_7_shade_gfx.c | 6 +- src/world/area_hos/hos_01/hos_01_3_model_fx.c | 8 +- src/world/area_hos/hos_02/hos_02_3_model_fx.c | 10 +- src/world/area_hos/hos_03/hos_03_3_model_fx.c | 12 +- .../area_hos/hos_04/hos_04_3_fountains.c | 4 +- src/world/area_hos/hos_05/hos_05_5_intro.c | 50 +-- src/world/area_hos/hos_05/hos_05_7_model_fx.c | 12 +- src/world/area_isk/isk_05/isk_05_3_npc.c | 36 +- src/world/area_isk/isk_13/isk_13_3_npc.c | 36 +- src/world/area_isk/isk_14/isk_14_3_npc.c | 36 +- src/world/area_iwa/iwa_01/iwa_01_3_splash.c | 14 +- src/world/area_jan/jan_13/jan_13_2_puzzle.c | 2 +- src/world/area_kgr/kgr_01/kgr_01_2_wiggle.c | 2 +- src/world/area_kgr/kgr_02/kgr_02_2_unused.c | 12 +- .../area_kkj/kkj_14/kkj_14_3_interactables.c | 8 +- .../area_kkj/kkj_27/kkj_27_3_rotating_wall.c | 4 +- .../area_kmr/kmr_06/kmr_06_5_sticker_sign.c | 6 +- src/world/area_kmr/kmr_20/kmr_20_13_records.c | 10 +- src/world/area_kmr/kmr_21/kmr_21_1_main.c | 12 +- src/world/area_kmr/kmr_23/kmr_23_2_npc.c | 2 +- src/world/area_kmr/kmr_30/kmr_30_3_the_end.c | 4 +- .../area_mac/mac_00/mac_00_9_water_gfx.c | 24 +- .../mac_01/mac_01_6_crystal_ball_gfx.c | 72 ++-- .../area_mac/mac_01/npc/flower_gate.inc.c | 4 +- .../area_mac/mac_01/npc/rowf_and_rhuff.inc.c | 2 +- .../area_mac/mac_05/mac_05_7_club64_sign.c | 2 +- .../area_mgm/mgm_00/mgm_00_3_scoreboard.c | 10 +- src/world/area_mim/mim_04/mim_04_4_hint.c | 8 +- src/world/area_mim/mim_07/mim_07_4_hint.c | 8 +- src/world/area_nok/nok_04/nok_04_4_npc.c | 18 +- src/world/area_pra/pra_29/pra_29_4_bridge.c | 4 +- src/world/area_trd/trd_05/trd_05_3_trap.c | 30 +- src/world/area_trd/trd_06/trd_06_2_falling.c | 30 +- src/world/area_tst/tst_13/tst_13_1_main.c | 14 +- src/world/common/atomic/WhaleAnim.inc.c | 4 +- .../common/complete/KnockDownPlayer.inc.c | 30 +- src/world/common/lava_piranha/part2.inc.c | 18 +- .../dead/area_flo/flo_10/flo_10_6_waterfx.c | 90 ++--- .../dead/area_flo/flo_14/flo_14_3_bubbles.c | 6 +- src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c | 18 +- tools/fix_bad_evt_changes.py | 2 +- ver/ique/asm/bss.s | 2 +- .../B4580/appendGfx_animator_node.s | 16 +- .../C50A0/draw_image_with_clipping.s | 4 +- .../appendGfx_shading_palette.s | 8 +- .../hud_element/render_hud_element.s | 28 +- .../asm/nonmatchings/msg/appendGfx_message.s | 336 +++++++++--------- ver/ique/asm/nonmatchings/msg/msg_draw_char.s | 36 +- .../title_screen_draw_copyright.s | 12 +- ver/ique/symbol_addrs.txt | 2 +- ver/jp/asm/main.bss.s | 2 +- ver/jp/symbol_addrs.txt | 2 +- ver/us/asm/bss.s | 2 +- .../asm/nonmatchings/325AD0/func_E02000AC.s | 4 +- .../80850_len_3060/update_status_menu.s | 4 +- .../B4580/appendGfx_animator_node.s | 16 +- .../C50A0/draw_image_with_clipping.s | 4 +- .../appendGfx_shading_palette.s | 8 +- .../effects/blast/blast_appendGfx.s | 8 +- .../effects/bulb_glow/bulb_glow_appendGfx.s | 4 +- .../effects/effect_65/fx_65_appendGfx.s | 12 +- .../effects/underwater/underwater_appendGfx.s | 12 +- .../hud_element/render_hud_element.s | 28 +- ver/us/symbol_addrs.txt | 2 +- ver/us/undefined_syms.txt | 2 +- 272 files changed, 4108 insertions(+), 4108 deletions(-) diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index e7cd183149..dfa656b3cb 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -2,7 +2,7 @@ name: Doxygen on: push: branches: - - master + - main paths: - 'src/*' - 'include/*' diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a3b8eaf72b..f0a7ab37df 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -61,7 +61,7 @@ Recompile the ROM: ninja ``` -This will probably end up either `FAIL`ing (the resulting ROM does not match the baserom), or the compilation of the C file you just modified did not succeed. mips_to_c loves to use void pointers and weird syntax that won't compile properly. Fixing this will involve typing the function signature correctly, which you may find in [Star Rod's library database](https://github.com/nanaian/star-rod/blob/master/database/common_func_library.lib). For structs, see [common_structs.h](include/common_structs.h). +This will probably end up either `FAIL`ing (the resulting ROM does not match the baserom), or the compilation of the C file you just modified did not succeed. mips_to_c loves to use void pointers and weird syntax that won't compile properly. Fixing this will involve typing the function signature correctly, which can involve trial and error. For structs, see [common_structs.h](include/common_structs.h). Once the C file compiles, you can compare the assembly generated by your code versus the original assembly with the following command, replacing `function_name` with the name of the function you're working on: diff --git a/Jenkinsfile b/Jenkinsfile index 0e7c8a2ed9..b0ed7c8031 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -26,7 +26,7 @@ pipeline { stage("Comment") { when { not { - branch 'master' + branch 'main' } } steps { @@ -60,7 +60,7 @@ pipeline { } stage('Report Progress') { when { - branch 'master' + branch 'main' } steps { sh 'mkdir reports' @@ -82,10 +82,10 @@ pipeline { } stage('Update Progress') { when { - branch 'master' + branch 'main' } agent { - label 'master' + label 'pm_website' } steps { unstash 'reports' diff --git a/README.md b/README.md index ed5f094cf1..d45070da8a 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,8 @@ [![Progress (iQue)][progress-ique-badge]][progress-ique] [![Discord Channel][discord-badge]][discord] -[jenkins]: https://jenkins.deco.mp/job/papermario/job/master -[jenkins-badge]: https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fjenkins.deco.mp%2Fjob%2Fpapermario%2Fjob%2Fmaster +[jenkins]: https://jenkins.deco.mp/job/papermario/job/main +[jenkins-badge]: https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fjenkins.deco.mp%2Fjob%2Fpapermario%2Fjob%2Fmain [progress-us]: https://papermar.io/progress-us [progress-us-badge]: https://img.shields.io/endpoint?url=https://papermar.io/reports/progress_us_shield.json diff --git a/include/dead.h b/include/dead.h index f67599dd17..1ee0b3fe41 100644 --- a/include/dead.h +++ b/include/dead.h @@ -108,7 +108,7 @@ #define entity_upgrade_block_hide_content dead_entity_upgrade_block_hide_content #define fx_misc_particles dead_fx_misc_particles #define transform_point dead_transform_point -#define gMasterGfxPos dead_gMasterGfxPos +#define gMainGfxPos dead_gMainGfxPos #define osVirtualToPhysical dead_osVirtualToPhysical #define nuGfxZBuffer dead_nuGfxZBuffer #define nuGfxCfb_ptr dead_nuGfxCfb_ptr diff --git a/include/variables.h b/include/variables.h index 868fc4e045..dd3d1aa2e5 100644 --- a/include/variables.h +++ b/include/variables.h @@ -196,7 +196,7 @@ extern OSDevMgr __osPiDevMgr; // gfx extern DisplayContext* gDisplayContext; -extern Gfx* gMasterGfxPos; +extern Gfx* gMainGfxPos; extern u16 gMatrixListPos; extern s32 gCurrentDisplayContextIndex; diff --git a/src/16c8e0.c b/src/16c8e0.c index c9d766410d..01ec1cf909 100644 --- a/src/16c8e0.c +++ b/src/16c8e0.c @@ -754,19 +754,19 @@ void tattle_cam_pre_render(Camera* camera) { } if (gGameStatusPtr->backgroundFlags & BACKGROUND_FLAG_TEXTURE) { - gDPPipeSync(gMasterGfxPos++); - gDPSetCycleType(gMasterGfxPos++, G_CYC_COPY); - gDPSetTexturePersp(gMasterGfxPos++, G_TP_NONE); - gDPSetTextureLUT(gMasterGfxPos++, G_TT_RGBA16); - gDPSetCombineMode(gMasterGfxPos++, G_CC_DECALRGB, G_CC_DECALRGB); - gDPSetRenderMode(gMasterGfxPos++, G_RM_NOOP, G_RM_NOOP2); - gDPSetTextureFilter(gMasterGfxPos++, G_TF_POINT); - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, cam->viewportStartX, cam->viewportStartY, cam->viewportStartX + cam->viewportW - 1, cam->viewportStartY + cam->viewportH - 1); - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); + gDPSetCycleType(gMainGfxPos++, G_CYC_COPY); + gDPSetTexturePersp(gMainGfxPos++, G_TP_NONE); + gDPSetTextureLUT(gMainGfxPos++, G_TT_RGBA16); + gDPSetCombineMode(gMainGfxPos++, G_CC_DECALRGB, G_CC_DECALRGB); + gDPSetRenderMode(gMainGfxPos++, G_RM_NOOP, G_RM_NOOP2); + gDPSetTextureFilter(gMainGfxPos++, G_TF_POINT); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, cam->viewportStartX, cam->viewportStartY, cam->viewportStartX + cam->viewportW - 1, cam->viewportStartY + cam->viewportH - 1); + gDPPipeSync(gMainGfxPos++); if (!fogEnabled) { - gDPLoadTLUT_pal256(gMasterGfxPos++, gGameStatusPtr->backgroundPalette); + gDPLoadTLUT_pal256(gMainGfxPos++, gGameStatusPtr->backgroundPalette); } else { - gDPLoadTLUT_pal256(gMasterGfxPos++, gTattleBgPalette); + gDPLoadTLUT_pal256(gMainGfxPos++, gTattleBgPalette); } bgWidth = gGameStatusPtr->backgroundMaxX; bgHeight = gGameStatusPtr->backgroundMaxY; @@ -781,15 +781,15 @@ void tattle_cam_pre_render(Camera* camera) { if (texOffsetY > gGameStatusPtr->backgroundMaxY) { texOffsetY -= gGameStatusPtr->backgroundMaxY; } - gDPLoadTextureTile(gMasterGfxPos++, gGameStatusPtr->backgroundRaster + bgWidth * texOffsetY, + gDPLoadTextureTile(gMainGfxPos++, gGameStatusPtr->backgroundRaster + bgWidth * texOffsetY, G_IM_FMT_CI, G_IM_SIZ_8b, bgWidth, 6, 0, 0, 295, 5, 0, G_TX_WRAP, G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPTextureRectangle(gMasterGfxPos++, posX * 4, (lineHeight * i + posY) * 4, + gSPTextureRectangle(gMainGfxPos++, posX * 4, (lineHeight * i + posY) * 4, (texOffsetX + posX - 1) * 4, (lineHeight * i + lineHeight - 1 + posY) * 4, G_TX_RENDERTILE, bgWidth * 32, 0, 4096, 1024); - gSPTextureRectangle(gMasterGfxPos++, (texOffsetX + posX) * 4, (lineHeight * i + posY) * 4, + gSPTextureRectangle(gMainGfxPos++, (texOffsetX + posX) * 4, (lineHeight * i + posY) * 4, (bgWidth + posX - 1) * 4, (lineHeight * i + lineHeight - 1 + posY) * 4, G_TX_RENDERTILE, 0, 0, 4096, 1024); } @@ -798,55 +798,55 @@ void tattle_cam_pre_render(Camera* camera) { if (texOffsetY > gGameStatusPtr->backgroundMaxY) { texOffsetY -= gGameStatusPtr->backgroundMaxY; } - gDPLoadTextureTile(gMasterGfxPos++, gGameStatusPtr->backgroundRaster + bgWidth * texOffsetY, + gDPLoadTextureTile(gMainGfxPos++, gGameStatusPtr->backgroundRaster + bgWidth * texOffsetY, G_IM_FMT_CI, G_IM_SIZ_8b, bgWidth, extraHeight, 0, 0, 295, extraHeight - 1, 0, G_TX_WRAP, G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPTextureRectangle(gMasterGfxPos++, posX * 4, (i * lineHeight + posY) * 4, + gSPTextureRectangle(gMainGfxPos++, posX * 4, (i * lineHeight + posY) * 4, (texOffsetX + posX - 1) * 4, (bgHeight + - 1 + posY) * 4, G_TX_RENDERTILE, bgWidth * 32, 0, 4096, 1024); - gSPTextureRectangle(gMasterGfxPos++, (texOffsetX + posX) * 4, (i * lineHeight + posY) * 4, + gSPTextureRectangle(gMainGfxPos++, (texOffsetX + posX) * 4, (i * lineHeight + posY) * 4, (bgWidth + posX - 1) * 4, (bgHeight - 1 + posY) * 4, G_TX_RENDERTILE, 0, 0, 4096, 1024); } } - gSPViewport(gMasterGfxPos++, &cam->vp); - gSPClearGeometryMode(gMasterGfxPos++, G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); - gSPTexture(gMasterGfxPos++, 0, 0, 0, G_TX_RENDERTILE, G_OFF); - gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); - gDPPipelineMode(gMasterGfxPos++, G_PM_NPRIMITIVE); - gDPSetScissorFrac(gMasterGfxPos++, G_SC_NON_INTERLACE, cam->viewportStartX * 4.0f, cam->viewportStartY * 4.0f, (cam->viewportStartX + cam->viewportW) * 4.0f, (cam->viewportStartY + cam->viewportH) * 4.0f); - gDPSetTextureLOD(gMasterGfxPos++, G_TL_TILE); - gDPSetTextureLUT(gMasterGfxPos++, G_TT_NONE); - gDPSetTextureDetail(gMasterGfxPos++, G_TD_CLAMP); - gDPSetTexturePersp(gMasterGfxPos++, G_TP_PERSP); - gDPSetTextureFilter(gMasterGfxPos++, G_TF_BILERP); - gDPSetTextureConvert(gMasterGfxPos++, G_TC_FILT); - gDPSetCombineMode(gMasterGfxPos++, G_CC_SHADE, G_CC_SHADE); - gDPSetCombineKey(gMasterGfxPos++, G_CK_NONE); - gDPSetAlphaCompare(gMasterGfxPos++, G_AC_NONE); - gDPSetRenderMode(gMasterGfxPos++, G_RM_OPA_SURF, G_RM_OPA_SURF2); - gDPSetColorDither(gMasterGfxPos++, G_CD_DISABLE); - gSPClipRatio(gMasterGfxPos++, FRUSTRATIO_2); - gDPPipeSync(gMasterGfxPos++); - gDPSetCycleType(gMasterGfxPos++, G_CYC_FILL); - gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, osVirtualToPhysical(nuGfxZBuffer)); - gDPSetFillColor(gMasterGfxPos++, PACK_FILL_DEPTH(G_MAXFBZ, 0)); - gDPFillRectangle(gMasterGfxPos++, cam->viewportStartX, cam->viewportStartY, cam->viewportStartX + cam->viewportW - 1, cam->viewportStartY + cam->viewportH - 1); - gDPPipeSync(gMasterGfxPos++); - gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, osVirtualToPhysical(nuGfxCfb_ptr)); + gSPViewport(gMainGfxPos++, &cam->vp); + gSPClearGeometryMode(gMainGfxPos++, G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); + gSPTexture(gMainGfxPos++, 0, 0, 0, G_TX_RENDERTILE, G_OFF); + gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE); + gDPPipelineMode(gMainGfxPos++, G_PM_NPRIMITIVE); + gDPSetScissorFrac(gMainGfxPos++, G_SC_NON_INTERLACE, cam->viewportStartX * 4.0f, cam->viewportStartY * 4.0f, (cam->viewportStartX + cam->viewportW) * 4.0f, (cam->viewportStartY + cam->viewportH) * 4.0f); + gDPSetTextureLOD(gMainGfxPos++, G_TL_TILE); + gDPSetTextureLUT(gMainGfxPos++, G_TT_NONE); + gDPSetTextureDetail(gMainGfxPos++, G_TD_CLAMP); + gDPSetTexturePersp(gMainGfxPos++, G_TP_PERSP); + gDPSetTextureFilter(gMainGfxPos++, G_TF_BILERP); + gDPSetTextureConvert(gMainGfxPos++, G_TC_FILT); + gDPSetCombineMode(gMainGfxPos++, G_CC_SHADE, G_CC_SHADE); + gDPSetCombineKey(gMainGfxPos++, G_CK_NONE); + gDPSetAlphaCompare(gMainGfxPos++, G_AC_NONE); + gDPSetRenderMode(gMainGfxPos++, G_RM_OPA_SURF, G_RM_OPA_SURF2); + gDPSetColorDither(gMainGfxPos++, G_CD_DISABLE); + gSPClipRatio(gMainGfxPos++, FRUSTRATIO_2); + gDPPipeSync(gMainGfxPos++); + gDPSetCycleType(gMainGfxPos++, G_CYC_FILL); + gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, osVirtualToPhysical(nuGfxZBuffer)); + gDPSetFillColor(gMainGfxPos++, PACK_FILL_DEPTH(G_MAXFBZ, 0)); + gDPFillRectangle(gMainGfxPos++, cam->viewportStartX, cam->viewportStartY, cam->viewportStartX + cam->viewportW - 1, cam->viewportStartY + cam->viewportH - 1); + gDPPipeSync(gMainGfxPos++); + gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, osVirtualToPhysical(nuGfxCfb_ptr)); if (!(gGameStatusPtr->backgroundFlags & BACKGROUND_FLAG_TEXTURE)) { - gDPSetCycleType(gMasterGfxPos++, G_CYC_FILL); - gDPSetFillColor(gMasterGfxPos++, PACK_FILL_COLOR(cam->bgColor[0], cam->bgColor[1], cam->bgColor[2], 1)); - gDPFillRectangle(gMasterGfxPos++, cam->viewportStartX, cam->viewportStartY, cam->viewportStartX + cam->viewportW - 1, cam->viewportStartY + cam->viewportH - 1); + gDPSetCycleType(gMainGfxPos++, G_CYC_FILL); + gDPSetFillColor(gMainGfxPos++, PACK_FILL_COLOR(cam->bgColor[0], cam->bgColor[1], cam->bgColor[2], 1)); + gDPFillRectangle(gMainGfxPos++, cam->viewportStartX, cam->viewportStartY, cam->viewportStartX + cam->viewportW - 1, cam->viewportStartY + cam->viewportH - 1); } - gDPPipeSync(gMasterGfxPos++); - gSPPerspNormalize(gMasterGfxPos++, cam->perspNorm); + gDPPipeSync(gMainGfxPos++); + gSPPerspNormalize(gMainGfxPos++, cam->perspNorm); guMtxF2L(cam->perspectiveMatrix, &gDisplayContext->camPerspMatrix[gCurrentCamID]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCamID], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gMainGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCamID], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); } void func_8023FF84(Camera* camera) { diff --git a/src/17D6A0.c b/src/17D6A0.c index f77d1c99e0..e14bf98931 100644 --- a/src/17D6A0.c +++ b/src/17D6A0.c @@ -2960,7 +2960,7 @@ void func_8024F768(void* data) { if (alphaAmt > 10) { alphaAmt = 10; } - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, (alphaAmt * 255) / 10); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, (alphaAmt * 255) / 10); } void func_8024F7C8(void) { diff --git a/src/190B20.c b/src/190B20.c index a23ac3f43e..937ad5ab1c 100644 --- a/src/190B20.c +++ b/src/190B20.c @@ -2904,23 +2904,23 @@ void btl_update_ko_status(void) { } void btl_appendGfx_prim_quad(u8 r, u8 g, u8 b, u8 a, u16 left, u16 top, u16 right, u16 bottom) { - gDPPipeSync(gMasterGfxPos++); - gSPDisplayList(gMasterGfxPos++, D_80293970); + gDPPipeSync(gMainGfxPos++); + gSPDisplayList(gMainGfxPos++, D_80293970); if (a == 255) { - gDPSetRenderMode(gMasterGfxPos++, G_RM_OPA_SURF, G_RM_OPA_SURF2); - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, PRIMITIVE, 0, 0, 0, 1, 0, 0, 0, PRIMITIVE, 0, 0, 0, 1); + gDPSetRenderMode(gMainGfxPos++, G_RM_OPA_SURF, G_RM_OPA_SURF2); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, PRIMITIVE, 0, 0, 0, 1, 0, 0, 0, PRIMITIVE, 0, 0, 0, 1); } else { - gDPSetRenderMode(gMasterGfxPos++, G_RM_XLU_SURF, G_RM_XLU_SURF2); - gDPSetCombineMode(gMasterGfxPos++, G_CC_PRIMITIVE, G_CC_PRIMITIVE); + gDPSetRenderMode(gMainGfxPos++, G_RM_XLU_SURF, G_RM_XLU_SURF2); + gDPSetCombineMode(gMainGfxPos++, G_CC_PRIMITIVE, G_CC_PRIMITIVE); } - gDPSetPrimColor(gMasterGfxPos++, 0, 0, r, g, b, a); - gDPFillRectangle(gMasterGfxPos++, left, top, right, bottom); + gDPSetPrimColor(gMainGfxPos++, 0, 0, r, g, b, a); + gDPFillRectangle(gMainGfxPos++, left, top, right, bottom); - gDPPipeSync(gMasterGfxPos++); - gDPSetRenderMode(gMasterGfxPos++, G_RM_TEX_EDGE, G_RM_TEX_EDGE2); - gDPSetCombineMode(gMasterGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); + gDPPipeSync(gMainGfxPos++); + gDPSetRenderMode(gMainGfxPos++, G_RM_TEX_EDGE, G_RM_TEX_EDGE2); + gDPSetCombineMode(gMainGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); } void btl_draw_prim_quad(u8 r, u8 g, u8 b, u8 a, u16 left, u16 top, u16 arg6, u16 arg7) { diff --git a/src/325AD0.c b/src/325AD0.c index fe70cd0530..af53fe92fe 100644 --- a/src/325AD0.c +++ b/src/325AD0.c @@ -56,60 +56,60 @@ s32 func_E0200044(s32 max, s32 idx) { void func_E02000AC(s32 arg0, s32 arg1) { s32 i, j; - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 128, 128, 128, 255); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 128, 128, 128, 255); for (i = 0; i < 10; i++) { - gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, nuGfxCfb_ptr); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, + gDPSetTextureImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, nuGfxCfb_ptr); + gDPSetTile(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, (((((79)-(0)+1) * G_IM_SIZ_16b_TILE_BYTES)+7)>>3), 0, G_TX_LOADTILE, 0, G_TX_WRAP, 6, G_TX_NOLOD, G_TX_WRAP, 7, G_TX_NOLOD); - gDPLoadSync(gMasterGfxPos++); - gDPLoadTile(gMasterGfxPos++, G_TX_LOADTILE, + gDPLoadSync(gMainGfxPos++); + gDPLoadTile(gMainGfxPos++, G_TX_LOADTILE, (0)<>3), 0, G_TX_RENDERTILE, 0, G_TX_WRAP, 6, G_TX_NOLOD, G_TX_WRAP, 7, G_TX_NOLOD); - gDPLoadTile(gMasterGfxPos++, G_TX_RENDERTILE, + gDPLoadTile(gMainGfxPos++, G_TX_RENDERTILE, (arg0)<>3), 0x100, G_TX_LOADTILE, 0, G_TX_WRAP, 6, G_TX_NOLOD, G_TX_WRAP, 7, G_TX_NOLOD); - gDPLoadSync(gMasterGfxPos++); - gDPLoadTile(gMasterGfxPos++, G_TX_LOADTILE, + gDPLoadSync(gMainGfxPos++); + gDPLoadTile(gMainGfxPos++, G_TX_LOADTILE, (arg0)<>3), 0, G_TX_RENDERTILE + 1, 0, G_TX_WRAP, 6, G_TX_NOLOD, G_TX_WRAP, 7, G_TX_NOLOD); - gDPTextureRectangle(gMasterGfxPos++, arg0 * 4, (arg1 + i * 6) * 4, (arg0 + 80) * 4, (arg1 + i * 6 + 6) * 4, 0, arg0 * 32, arg1 * 32, 0x400, 0x400); + gDPTextureRectangle(gMainGfxPos++, arg0 * 4, (arg1 + i * 6) * 4, (arg0 + 80) * 4, (arg1 + i * 6 + 6) * 4, 0, arg0 * 32, arg1 * 32, 0x400, 0x400); } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } } #else diff --git a/src/415D90.c b/src/415D90.c index 9c1ad94764..4a5a361be5 100644 --- a/src/415D90.c +++ b/src/415D90.c @@ -1460,7 +1460,7 @@ void func_802A3C98(void* data, s32 x, s32 y) { yPos = y + 18; var_t0 = yPos + 1 + (D_802AD10E * 13); gDPSetScissor( - gMasterGfxPos++, G_SC_NON_INTERLACE, + gMainGfxPos++, G_SC_NON_INTERLACE, xPos, yPos, x + 153, @@ -2018,7 +2018,7 @@ void func_802A5290(void* data, s32 x, s32 y) { xPos = x + 4; yPos = y + 18; var_t0 = yPos + 1 + (D_802AD60A * 13); - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, xPos, yPos, x + 142, var_t0); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, xPos, yPos, x + 142, var_t0); xPos = x + 33; yPos = y + 19 + D_802AD60C; diff --git a/src/43F0.c b/src/43F0.c index fafb819c86..c3bcdbb34d 100644 --- a/src/43F0.c +++ b/src/43F0.c @@ -769,23 +769,23 @@ f32 update_lerp(s32 easing, f32 start, f32 end, s32 elapsed, s32 duration) { } void appendGfx_startup_prim_rect(u8 r, u8 g, u8 b, u8 a, u16 left, u16 top, u16 right, u16 bottom) { - gDPPipeSync(gMasterGfxPos++); - gSPDisplayList(gMasterGfxPos++, D_80074580); + gDPPipeSync(gMainGfxPos++); + gSPDisplayList(gMainGfxPos++, D_80074580); if (a == 255) { - gDPSetRenderMode(gMasterGfxPos++, G_RM_OPA_SURF, G_RM_OPA_SURF2); - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, PRIMITIVE, 0, 0, 0, 1, 0, 0, 0, PRIMITIVE, 0, 0, 0, 1); + gDPSetRenderMode(gMainGfxPos++, G_RM_OPA_SURF, G_RM_OPA_SURF2); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, PRIMITIVE, 0, 0, 0, 1, 0, 0, 0, PRIMITIVE, 0, 0, 0, 1); } else { - gDPSetRenderMode(gMasterGfxPos++, G_RM_XLU_SURF, G_RM_XLU_SURF2); - gDPSetCombineMode(gMasterGfxPos++, G_CC_PRIMITIVE, G_CC_PRIMITIVE); + gDPSetRenderMode(gMainGfxPos++, G_RM_XLU_SURF, G_RM_XLU_SURF2); + gDPSetCombineMode(gMainGfxPos++, G_CC_PRIMITIVE, G_CC_PRIMITIVE); } - gDPSetPrimColor(gMasterGfxPos++, 0, 0, r, g, b, a); - gDPFillRectangle(gMasterGfxPos++, left, top, right, bottom); + gDPSetPrimColor(gMainGfxPos++, 0, 0, r, g, b, a); + gDPFillRectangle(gMainGfxPos++, left, top, right, bottom); - gDPPipeSync(gMasterGfxPos++); - gDPSetRenderMode(gMasterGfxPos++, G_RM_TEX_EDGE, G_RM_TEX_EDGE2); - gDPSetCombineMode(gMasterGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); + gDPPipeSync(gMainGfxPos++); + gDPSetRenderMode(gMainGfxPos++, G_RM_TEX_EDGE, G_RM_TEX_EDGE2); + gDPSetCombineMode(gMainGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); } void startup_draw_prim_rect_COPY(s16 left, s16 top, s16 right, s16 bottom, u16 r, u16 g, u16 b, u16 a) { diff --git a/src/80850_len_3060.c b/src/80850_len_3060.c index 6fcc917037..9b674202b1 100644 --- a/src/80850_len_3060.c +++ b/src/80850_len_3060.c @@ -702,7 +702,7 @@ void update_status_menu(void) { break; } - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 12, 20, SCREEN_WIDTH - 12, SCREEN_HEIGHT - 20); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, 12, 20, SCREEN_WIDTH - 12, SCREEN_HEIGHT - 20); fp = uiStatus->drawPosX; s5 = uiStatus->drawPosY; draw_box(0, WINDOW_STYLE_5, fp, s5, 0, 174, 35, 255, 0, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, NULL, NULL, NULL, SCREEN_WIDTH, SCREEN_HEIGHT, NULL); diff --git a/src/8800.c b/src/8800.c index 24451cf4ed..01f32beaa1 100644 --- a/src/8800.c +++ b/src/8800.c @@ -115,12 +115,12 @@ void render_frame(s32 flag) { s32 lrx; s32 lry; - gSPViewport(gMasterGfxPos++, &camera->vp); - gSPClearGeometryMode(gMasterGfxPos++, G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | + gSPViewport(gMainGfxPos++, &camera->vp); + gSPClearGeometryMode(gMainGfxPos++, G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); - gSPTexture(gMasterGfxPos++, 0, 0, 0, G_TX_RENDERTILE, G_OFF); - gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); - gDPPipelineMode(gMasterGfxPos++, G_PM_NPRIMITIVE); + gSPTexture(gMainGfxPos++, 0, 0, 0, G_TX_RENDERTILE, G_OFF); + gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE); + gDPPipelineMode(gMainGfxPos++, G_PM_NPRIMITIVE); ulx = camera->viewportStartX; uly = camera->viewportStartY; @@ -153,29 +153,29 @@ void render_frame(s32 flag) { lry = SCREEN_HEIGHT; } - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, ulx, uly, lrx, lry); - gDPSetTextureLOD(gMasterGfxPos++, G_TL_TILE); - gDPSetTextureLUT(gMasterGfxPos++, G_TT_NONE); - gDPSetTextureDetail(gMasterGfxPos++, G_TD_CLAMP); - gDPSetTexturePersp(gMasterGfxPos++, G_TP_PERSP); - gDPSetTextureFilter(gMasterGfxPos++, G_TF_BILERP); - gDPSetTextureConvert(gMasterGfxPos++, G_TC_FILT); - gDPSetCombineMode(gMasterGfxPos++, G_CC_SHADE, G_CC_SHADE); - gDPSetCombineKey(gMasterGfxPos++, G_CK_NONE); - gDPSetAlphaCompare(gMasterGfxPos++, G_AC_NONE); - gDPSetRenderMode(gMasterGfxPos++, G_RM_OPA_SURF, G_RM_OPA_SURF2); - gDPSetColorDither(gMasterGfxPos++, G_CD_DISABLE); - gSPClipRatio(gMasterGfxPos++, FRUSTRATIO_2); - gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, ulx, uly, lrx, lry); + gDPSetTextureLOD(gMainGfxPos++, G_TL_TILE); + gDPSetTextureLUT(gMainGfxPos++, G_TT_NONE); + gDPSetTextureDetail(gMainGfxPos++, G_TD_CLAMP); + gDPSetTexturePersp(gMainGfxPos++, G_TP_PERSP); + gDPSetTextureFilter(gMainGfxPos++, G_TF_BILERP); + gDPSetTextureConvert(gMainGfxPos++, G_TC_FILT); + gDPSetCombineMode(gMainGfxPos++, G_CC_SHADE, G_CC_SHADE); + gDPSetCombineKey(gMainGfxPos++, G_CK_NONE); + gDPSetAlphaCompare(gMainGfxPos++, G_AC_NONE); + gDPSetRenderMode(gMainGfxPos++, G_RM_OPA_SURF, G_RM_OPA_SURF2); + gDPSetColorDither(gMainGfxPos++, G_CD_DISABLE); + gSPClipRatio(gMainGfxPos++, FRUSTRATIO_2); + gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(nuGfxCfb_ptr)); - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); if (!(camera->flags & CAMERA_FLAG_ORTHO)) { - gSPPerspNormalize(gMasterGfxPos++, camera->perspNorm); + gSPPerspNormalize(gMainGfxPos++, camera->perspNorm); } guMtxF2L(camera->perspectiveMatrix, &gDisplayContext->camPerspMatrix[gCurrentCamID]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCamID], G_MTX_NOPUSH | G_MTX_LOAD | + gSPMatrix(gMainGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCamID], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); } @@ -203,7 +203,7 @@ void render_frame(s32 flag) { guOrthoF(camera->perspectiveMatrix, 0.0f, SCREEN_WIDTH, -SCREEN_HEIGHT, 0.0f, -1000.0f, 1000.0f, 1.0f); guMtxF2L(camera->perspectiveMatrix, &gDisplayContext->camPerspMatrix[gCurrentCamID]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCamID], G_MTX_NOPUSH | + gSPMatrix(gMainGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCamID], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); render_hud_elements_world(); render_item_entities(); @@ -217,10 +217,10 @@ void render_frame(s32 flag) { camera->fpDoPostRender(camera); } - gDPPipeSync(gMasterGfxPos++); - gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, + gDPPipeSync(gMainGfxPos++); + gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(nuGfxCfb_ptr)); - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } } } diff --git a/src/8a160_len_700.c b/src/8a160_len_700.c index 5bf37d9440..2af3230785 100644 --- a/src/8a160_len_700.c +++ b/src/8a160_len_700.c @@ -144,17 +144,17 @@ void func_800F102C(void) { s32 i; s32 j; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x00, 0x00000000); - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); - gSPViewport(gMasterGfxPos++, &D_801096B0); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x00, 0x00000000); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); + gSPViewport(gMainGfxPos++, &D_801096B0); guOrthoF(sp20, 0.0f, SCREEN_WIDTH, SCREEN_HEIGHT, 0.0f, -100.0f, 100.0f, 1.0f); guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - gSPDisplayList(gMasterGfxPos++, D_80109710); - gDPSetEnvColor(gMasterGfxPos++, 127, 127, 127, 127); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPDisplayList(gMainGfxPos++, D_80109710); + gDPSetEnvColor(gMainGfxPos++, 127, 127, 127, 127); for (i = 0; i < ARRAY_COUNT(D_8010D000); i++, outer++) { outer = &D_8010D000[i]; @@ -170,11 +170,11 @@ void func_800F102C(void) { it->x, it->y, 0.0f); guMtxF2L(sp60, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 80 - it->lodVal, it->rgba.r, it->rgba.g, it->rgba.b, it->rgba.a); - gSPDisplayList(gMasterGfxPos++, D_801097D8); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 80 - it->lodVal, it->rgba.r, it->rgba.g, it->rgba.b, it->rgba.a); + gSPDisplayList(gMainGfxPos++, D_801097D8); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } } diff --git a/src/8a860_len_3f30.c b/src/8a860_len_3f30.c index c6292150cf..213cf3d4f6 100644 --- a/src/8a860_len_3f30.c +++ b/src/8a860_len_3f30.c @@ -1109,14 +1109,14 @@ void popup_menu_draw_menu_contents(s32* userData, s32 baseX, s32 baseY, s32 widt case POPUP_MENU_READ_POSTCARD: case POPUP_MENU_USEKEY: case POPUP_MENU_POST_OFFICE: - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, x, y, x + 112, y1); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, x, y, x + 112, y1); break; case POPUP_MENU_SWITCH_PARTNER: case POPUP_MENU_UPGRADE_PARTNER: - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, x, y, x + 90, y1); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, x, y, x + 90, y1); break; case POPUP_MENU_THROW_AWAY_ITEM: - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, x, y, x + 160, y1); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, x, y, x + 160, y1); break; } @@ -1137,7 +1137,7 @@ void popup_menu_draw_menu_contents(s32* userData, s32 baseX, s32 baseY, s32 widt y = baseY; y1++; } - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, x, y, x + PopupContentScissorWidths[gPopupMenu->popupType], y1); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, x, y, x + PopupContentScissorWidths[gPopupMenu->popupType], y1); offset = 0; x = baseX + 32; y = baseY + D_8010D658 + 2; @@ -1350,11 +1350,11 @@ void popup_menu_draw_menu_contents(s32* userData, s32 baseX, s32 baseY, s32 widt case POPUP_MENU_READ_POSTCARD: case POPUP_MENU_USEKEY: case POPUP_MENU_POST_OFFICE: - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, x, y, x + 112, y1); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, x, y, x + 112, y1); break; case POPUP_MENU_SWITCH_PARTNER: case POPUP_MENU_UPGRADE_PARTNER: - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, x, y, x + 100, y1); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, x, y, x + 100, y1); break; } diff --git a/src/B4580.c b/src/B4580.c index da4e469393..ddd36dd7ef 100644 --- a/src/B4580.c +++ b/src/B4580.c @@ -747,72 +747,72 @@ void appendGfx_animator(ModelAnimator* animator) { Matrix4f sp10; if (animator->baseAddr != NULL) { - gSPSegment(gMasterGfxPos++, gAnimVtxSegment, VIRTUAL_TO_PHYSICAL(animator->baseAddr)); + gSPSegment(gMainGfxPos++, gAnimVtxSegment, VIRTUAL_TO_PHYSICAL(animator->baseAddr)); } gDisplayContext->matrixStack[gMatrixListPos] = animator->mtx; - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); //TODO find better match switch (gAnimModelFogEnabled != 0) { case FALSE: switch (animator->renderMode) { case RENDER_MODE_SURFACE_OPA: - gSPDisplayList(gMasterGfxPos++, D_8014B7F8); + gSPDisplayList(gMainGfxPos++, D_8014B7F8); break; case RENDER_MODE_DECAL_OPA: - gSPDisplayList(gMasterGfxPos++, D_8014B820); + gSPDisplayList(gMainGfxPos++, D_8014B820); break; case RENDER_MODE_INTERSECTING_OPA: - gSPDisplayList(gMasterGfxPos++, D_8014B848); + gSPDisplayList(gMainGfxPos++, D_8014B848); break; case RENDER_MODE_ALPHATEST: - gSPDisplayList(gMasterGfxPos++, D_8014B870); + gSPDisplayList(gMainGfxPos++, D_8014B870); break; case RENDER_MODE_SURFACE_XLU_LAYER1: - gSPDisplayList(gMasterGfxPos++, D_8014B898); + gSPDisplayList(gMainGfxPos++, D_8014B898); break; case RENDER_MODE_DECAL_XLU: - gSPDisplayList(gMasterGfxPos++, D_8014B8C0); + gSPDisplayList(gMainGfxPos++, D_8014B8C0); break; case RENDER_MODE_INTERSECTING_XLU: - gSPDisplayList(gMasterGfxPos++, D_8014B8E8); + gSPDisplayList(gMainGfxPos++, D_8014B8E8); break; } break; case TRUE: switch (animator->renderMode) { case RENDER_MODE_SURFACE_OPA: - gSPDisplayList(gMasterGfxPos++, D_8014BE78); + gSPDisplayList(gMainGfxPos++, D_8014BE78); break; case RENDER_MODE_DECAL_OPA: - gSPDisplayList(gMasterGfxPos++, D_8014BEA0); + gSPDisplayList(gMainGfxPos++, D_8014BEA0); break; case RENDER_MODE_INTERSECTING_OPA: - gSPDisplayList(gMasterGfxPos++, D_8014BEC8); + gSPDisplayList(gMainGfxPos++, D_8014BEC8); break; case RENDER_MODE_ALPHATEST: - gSPDisplayList(gMasterGfxPos++, D_8014BEF0); + gSPDisplayList(gMainGfxPos++, D_8014BEF0); break; case RENDER_MODE_SURFACE_XLU_LAYER1: - gSPDisplayList(gMasterGfxPos++, D_8014BF18); + gSPDisplayList(gMainGfxPos++, D_8014BF18); break; case RENDER_MODE_DECAL_XLU: - gSPDisplayList(gMasterGfxPos++, D_8014BF40); + gSPDisplayList(gMainGfxPos++, D_8014BF40); break; case RENDER_MODE_INTERSECTING_XLU: - gSPDisplayList(gMasterGfxPos++, D_8014BF68); + gSPDisplayList(gMainGfxPos++, D_8014BF68); break; } - gDPSetFogColor(gMasterGfxPos++, gAnimModelFogR, gAnimModelFogG, gAnimModelFogB, gAnimModelFogA); - gSPFogPosition(gMasterGfxPos++, gAnimModelFogStart, gAnimModelFogEnd); + gDPSetFogColor(gMainGfxPos++, gAnimModelFogR, gAnimModelFogG, gAnimModelFogB, gAnimModelFogA); + gSPFogPosition(gMainGfxPos++, gAnimModelFogStart, gAnimModelFogEnd); break; } guMtxL2F(sp10, &animator->mtx); appendGfx_animator_node(animator, animator->rootNode, sp10); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } #ifdef NON_EQUIVALENT @@ -837,31 +837,31 @@ void appendGfx_animator_node(ModelAnimator* animator, AnimatorNode* node, Matrix guMtxCatF(node->mtx, mtx, node->mtx); guMtxF2L(node->mtx, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPPipeSync(gMasterGfxPos++); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gDPPipeSync(gMainGfxPos++); - gSPTexture(gMasterGfxPos++, 0, 0, 0, G_TX_RENDERTILE, G_OFF); - gDPSetTextureLOD(gMasterGfxPos++, G_TL_TILE); - gDPSetTextureLUT(gMasterGfxPos++, G_TT_NONE); - gSPClearGeometryMode(gMasterGfxPos++, G_LIGHTING); + gSPTexture(gMainGfxPos++, 0, 0, 0, G_TX_RENDERTILE, G_OFF); + gDPSetTextureLOD(gMainGfxPos++, G_TL_TILE); + gDPSetTextureLUT(gMainGfxPos++, G_TT_NONE); + gSPClearGeometryMode(gMainGfxPos++, G_LIGHTING); if (animator->flags & MODEL_ANIMATOR_FLAG_CULL_BACK) { - gSPSetGeometryMode(gMasterGfxPos++, G_CULL_BACK); + gSPSetGeometryMode(gMainGfxPos++, G_CULL_BACK); } if (!gAnimModelFogEnabled) { - gDPSetCombineMode(gMasterGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); + gDPSetCombineMode(gMainGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); } else { - gDPSetCombineLERP(gMasterGfxPos++, TEXEL0, 0, SHADE, 0, TEXEL0, 0, 0, TEXEL0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED); + gDPSetCombineLERP(gMainGfxPos++, TEXEL0, 0, SHADE, 0, TEXEL0, 0, 0, TEXEL0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED); } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); if (animator->fpRenderCallback != NULL) { animator->fpRenderCallback(animator->renderCallbackArg); } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); if (node->displayList != NULL) { if (node->vertexStartOffset < 0) { - gSPDisplayList(gMasterGfxPos++, node->displayList); + gSPDisplayList(gMainGfxPos++, node->displayList); } else { dlSize = 0; if (node->displayList[dlSize].words.w0 >> 0x18 != G_ENDDL) { @@ -917,10 +917,10 @@ void appendGfx_animator_node(ModelAnimator* animator, AnimatorNode* node, Matrix } } while (TRUE); gSPEndDisplayList(gfxPos++); - gSPDisplayList(gMasterGfxPos++, bufferHandle->addr); + gSPDisplayList(gMainGfxPos++, bufferHandle->addr); } } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); for (i = 0; i < ARRAY_COUNT(node->children); i++) { if (node->children[i] != NULL) { diff --git a/src/C50A0.c b/src/C50A0.c index 9f09136f73..5714558e11 100644 --- a/src/C50A0.c +++ b/src/C50A0.c @@ -122,34 +122,34 @@ s32 draw_ci_image_with_clipping(IMG_PTR raster, s32 width, s32 height, s32 fmt, s16 posY, u16 clipULx, u16 clipULy, u16 clipLRx, u16 clipRLy, u8 opacity) { s32 ret; - gDPPipeSync(gMasterGfxPos++); - gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); - gDPSetTextureFilter(gMasterGfxPos++, G_TF_POINT); - gDPSetTexturePersp(gMasterGfxPos++, G_TP_NONE); + gDPPipeSync(gMainGfxPos++); + gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE); + gDPSetTextureFilter(gMainGfxPos++, G_TF_POINT); + gDPSetTexturePersp(gMainGfxPos++, G_TP_NONE); if (opacity == 255) { - gDPSetRenderMode(gMasterGfxPos++, G_RM_TEX_EDGE, G_RM_TEX_EDGE2); - gDPSetCombineMode(gMasterGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); + gDPSetRenderMode(gMainGfxPos++, G_RM_TEX_EDGE, G_RM_TEX_EDGE2); + gDPSetCombineMode(gMainGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); } else if (opacity == 0) { return 1; } else { - gDPSetRenderMode(gMasterGfxPos++, G_RM_XLU_SURF, G_RM_XLU_SURF2); - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, opacity); + gDPSetRenderMode(gMainGfxPos++, G_RM_XLU_SURF, G_RM_XLU_SURF2); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, opacity); } if (fmt == G_IM_FMT_CI) { - gDPSetTextureLUT(gMasterGfxPos++, G_TT_RGBA16); + gDPSetTextureLUT(gMainGfxPos++, G_TT_RGBA16); if (bitDepth == G_IM_SIZ_4b) { - gDPLoadTLUT_pal16(gMasterGfxPos++, 0, palette); + gDPLoadTLUT_pal16(gMainGfxPos++, 0, palette); } else { - gDPLoadTLUT_pal256(gMasterGfxPos++, palette); + gDPLoadTLUT_pal256(gMainGfxPos++, palette); } } else { - gDPSetTextureLUT(gMasterGfxPos++, G_TT_NONE); + gDPSetTextureLUT(gMainGfxPos++, G_TT_NONE); } ret = draw_image_with_clipping(raster, width, height, fmt, bitDepth, posX, posY, clipULx, clipULy, clipLRx, clipRLy); - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); return ret; } @@ -252,20 +252,20 @@ s32 draw_image_with_clipping(u8* img, u32 width, u32 height, s32 fmt, s32 bitDep } if (bitDepth == G_IM_SIZ_4b) { - gDPLoadTextureTile_4b(gMasterGfxPos++, img, fmt, width, height, + gDPLoadTextureTile_4b(gMainGfxPos++, img, fmt, width, height, texRect.ulx, texRect.uly, texRect.lrx, texRect.lry, 0, G_TX_WRAP, G_TX_WRAP, 6, 5, G_TX_NOLOD, G_TX_NOLOD); } else if (bitDepth == G_IM_SIZ_16b) { - gDPLoadTextureTile(gMasterGfxPos++, img, fmt, G_IM_SIZ_16b, width, height, + gDPLoadTextureTile(gMainGfxPos++, img, fmt, G_IM_SIZ_16b, width, height, texRect.ulx, texRect.uly, texRect.lrx, texRect.lry, 0, G_TX_WRAP, G_TX_WRAP, 6, 5, G_TX_NOLOD, G_TX_NOLOD); } else if (bitDepth == G_IM_SIZ_8b) { - gDPLoadTextureTile(gMasterGfxPos++, img, fmt, G_IM_SIZ_8b, width, height, + gDPLoadTextureTile(gMainGfxPos++, img, fmt, G_IM_SIZ_8b, width, height, texRect.ulx, texRect.uly, texRect.lrx, texRect.lry, 0, G_TX_WRAP, G_TX_WRAP, 6, 5, G_TX_NOLOD, G_TX_NOLOD); } - gSPTextureRectangle(gMasterGfxPos++, drawRect.ulx * 4, drawRect.uly * 4, drawRect.lrx * 4, drawRect.lry * 4, + gSPTextureRectangle(gMainGfxPos++, drawRect.ulx * 4, drawRect.uly * 4, drawRect.lrx * 4, drawRect.lry * 4, 0, texOffsetX * 32, texOffsetY * 32, 1024, 1024); if (stopDrawingLine) { @@ -388,16 +388,16 @@ s32 draw_tiled_image(IMG_PTR raster, u32 width, u32 height, u8 fmt, u8 bitDepth, } if (bitDepth == G_IM_SIZ_16b) { - gDPLoadTextureTile(gMasterGfxPos++, raster, fmt, G_IM_SIZ_16b, width, height, + gDPLoadTextureTile(gMainGfxPos++, raster, fmt, G_IM_SIZ_16b, width, height, texRect.ulx, texRect.uly, texRect.lrx, texRect.lry, 0, G_TX_WRAP, G_TX_WRAP, 6, 5, G_TX_NOLOD, G_TX_NOLOD); } else if (bitDepth == G_IM_SIZ_4b) { - gDPLoadTextureTile_4b(gMasterGfxPos++, raster, fmt, width, height, + gDPLoadTextureTile_4b(gMainGfxPos++, raster, fmt, width, height, texRect.ulx, texRect.uly, texRect.lrx, texRect.lry, 0, G_TX_WRAP, G_TX_WRAP, 6, 5, G_TX_NOLOD, G_TX_NOLOD); } - gSPTextureRectangle(gMasterGfxPos++, drawRect.ulx * 4, drawRect.uly * 4, (drawRect.lrx - stopDrawingLine) * 4, drawRect.lry * 4, + gSPTextureRectangle(gMainGfxPos++, drawRect.ulx * 4, drawRect.uly * 4, (drawRect.lrx - stopDrawingLine) * 4, drawRect.lry * 4, 0, texOffsetX, texOffsetY, dsdx, dtdy); if (stopDrawingLine) { @@ -575,23 +575,23 @@ s32 draw_adjustable_tiled_image(IMG_PTR raster, u32 width, u32 height, u8 fmt, u } if (bitDepth == G_IM_SIZ_4b) { - gDPLoadTextureTile_4b(gMasterGfxPos++, raster, fmt, width, height, + gDPLoadTextureTile_4b(gMainGfxPos++, raster, fmt, width, height, texRect.ulx, texRect.uly, texRect.lrx, texRect.lry, 0, G_TX_WRAP, G_TX_WRAP, masks, maskt, G_TX_NOLOD, G_TX_NOLOD); } else if (bitDepth == G_IM_SIZ_8b) { - gDPLoadTextureTile(gMasterGfxPos++, raster, fmt, G_IM_SIZ_8b, width, height, + gDPLoadTextureTile(gMainGfxPos++, raster, fmt, G_IM_SIZ_8b, width, height, texRect.ulx, texRect.uly, texRect.lrx, texRect.lry, 0, G_TX_WRAP, G_TX_WRAP, masks, maskt, G_TX_NOLOD, G_TX_NOLOD); } else if (bitDepth == G_IM_SIZ_16b) { - gDPLoadTextureTile(gMasterGfxPos++, raster, fmt, G_IM_SIZ_16b, width, height, + gDPLoadTextureTile(gMainGfxPos++, raster, fmt, G_IM_SIZ_16b, width, height, texRect.ulx, texRect.uly, texRect.lrx, texRect.lry, 0, G_TX_WRAP, G_TX_WRAP, masks, maskt, G_TX_NOLOD, G_TX_NOLOD); } else if (bitDepth == G_IM_SIZ_32b) { - gDPLoadTextureTile(gMasterGfxPos++, raster, fmt, G_IM_SIZ_32b, width, height, + gDPLoadTextureTile(gMainGfxPos++, raster, fmt, G_IM_SIZ_32b, width, height, texRect.ulx, texRect.uly, texRect.lrx, texRect.lry, 0, G_TX_WRAP, G_TX_WRAP, masks, maskt, G_TX_NOLOD, G_TX_NOLOD); } - gSPTextureRectangle(gMasterGfxPos++, drawRect.ulx * 4, drawRect.uly * 4, drawRect.lrx * 4, drawRect.lry * 4, + gSPTextureRectangle(gMainGfxPos++, drawRect.ulx * 4, drawRect.uly * 4, drawRect.lrx * 4, drawRect.lry * 4, 0, texOffsetX, texOffsetY, dsdx, dtdy); if (stopDrawing) { @@ -674,20 +674,20 @@ void draw_coin_sparkles(ItemEntity* itemEntity) { guMtxCatF(sp98, sp58, spD8); guMtxF2L(spD8, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); - gSPClearGeometryMode(gMasterGfxPos++, G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); - gSPSetGeometryMode(gMasterGfxPos++, G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH); - gSPSetLights1(gMasterGfxPos++, D_8014C6C8); - gSPTexture(gMasterGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); - gDPSetTextureLOD(gMasterGfxPos++, G_TL_TILE); - gDPSetTexturePersp(gMasterGfxPos++, G_TP_PERSP); - gDPSetTextureFilter(gMasterGfxPos++, G_TF_BILERP); - gDPSetColorDither(gMasterGfxPos++, G_CD_DISABLE); - gDPSetTextureDetail(gMasterGfxPos++, G_TD_CLAMP); - gDPSetTextureConvert(gMasterGfxPos++, G_TC_FILT); - gDPSetCombineKey(gMasterGfxPos++, G_CK_NONE); - gDPSetAlphaCompare(gMasterGfxPos++, G_AC_NONE); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE); + gSPClearGeometryMode(gMainGfxPos++, G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); + gSPSetGeometryMode(gMainGfxPos++, G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH); + gSPSetLights1(gMainGfxPos++, D_8014C6C8); + gSPTexture(gMainGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); + gDPSetTextureLOD(gMainGfxPos++, G_TL_TILE); + gDPSetTexturePersp(gMainGfxPos++, G_TP_PERSP); + gDPSetTextureFilter(gMainGfxPos++, G_TF_BILERP); + gDPSetColorDither(gMainGfxPos++, G_CD_DISABLE); + gDPSetTextureDetail(gMainGfxPos++, G_TD_CLAMP); + gDPSetTextureConvert(gMainGfxPos++, G_TC_FILT); + gDPSetCombineKey(gMainGfxPos++, G_CK_NONE); + gDPSetAlphaCompare(gMainGfxPos++, G_AC_NONE); foldImage.raster = itemEntity->sparkleRaster; foldImage.palette = itemEntity->sparklePalette; @@ -698,8 +698,8 @@ void draw_coin_sparkles(ItemEntity* itemEntity) { foldImage.opacity = 255; fold_appendGfx_component(0, &foldImage, 0, spD8); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPPipeSync(gMasterGfxPos++); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMainGfxPos++); } ItemEntity* get_item_entity(s32 itemEntityIndex) { @@ -1397,50 +1397,50 @@ void appendGfx_item_entity(void* data) { gDisplayContext->matrixStack[gMatrixListPos] = mtxTransform; - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (gSpriteShadingProfile->flags != 0) { - gSPDisplayList(gMasterGfxPos++, D_8014BBD8); + gSPDisplayList(gMainGfxPos++, D_8014BBD8); } else { - gSPDisplayList(gMasterGfxPos++, D_8014B870); + gSPDisplayList(gMainGfxPos++, D_8014B870); } - gSPClearGeometryMode(gMasterGfxPos++, G_CULL_BOTH | G_LIGHTING); - gSPDisplayList(gMasterGfxPos++, D_8014C620); + gSPClearGeometryMode(gMainGfxPos++, G_CULL_BOTH | G_LIGHTING); + gSPDisplayList(gMainGfxPos++, D_8014C620); if (itemEntity->flags & (ITEM_ENTITY_FLAG_8000000 | ITEM_ENTITY_FLAG_TRANSPARENT)) { if (gSpriteShadingProfile->flags != 0) { - gDPSetRenderMode(gMasterGfxPos++, AA_EN | IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | G_RM_PASS, + gDPSetRenderMode(gMainGfxPos++, AA_EN | IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | G_RM_PASS, AA_EN | IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)); } else { - gDPSetRenderMode(gMasterGfxPos++, AA_EN | IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | + gDPSetRenderMode(gMainGfxPos++, AA_EN | IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA), AA_EN | IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)); - gDPSetCombineLERP(gMasterGfxPos++, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, + gDPSetCombineLERP(gMainGfxPos++, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, TEXEL0, 0, PRIMITIVE, 0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 255, 255, alpha); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 255, alpha); } } if (!(itemEntity->flags & ITEM_ENTITY_FLAG_40000)) { - gDPLoadTLUT_pal16(gMasterGfxPos++, 0, gHudElementCacheTablePalette[itemEntity->lookupPaletteIndex].data); + gDPLoadTLUT_pal16(gMainGfxPos++, 0, gHudElementCacheTablePalette[itemEntity->lookupPaletteIndex].data); if (gSpriteShadingProfile->flags != 0) { - gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 12, gHudElementCacheTableRaster[itemEntity->lookupRasterIndex].data); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 2, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | + gDPSetTextureImage(gMainGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 12, gHudElementCacheTableRaster[itemEntity->lookupRasterIndex].data); + gDPSetTile(gMainGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 2, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD); - gDPLoadSync(gMasterGfxPos++); - gDPLoadTile(gMasterGfxPos++, G_TX_LOADTILE, 0, 0, 0x002E, 0x005C); - gDPPipeSync(gMasterGfxPos++); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_CI, G_IM_SIZ_4b, 2, 0x0000, 1, 0, G_TX_NOMIRROR | G_TX_CLAMP, 8, + gDPLoadSync(gMainGfxPos++); + gDPLoadTile(gMainGfxPos++, G_TX_LOADTILE, 0, 0, 0x002E, 0x005C); + gDPPipeSync(gMainGfxPos++); + gDPSetTile(gMainGfxPos++, G_IM_FMT_CI, G_IM_SIZ_4b, 2, 0x0000, 1, 0, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD); - gDPSetTileSize(gMasterGfxPos++, 1, 0x0400, 0x0400, 0x045C, 0x045C); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_CI, G_IM_SIZ_4b, 2, 0x0000, G_TX_RENDERTILE, 1, + gDPSetTileSize(gMainGfxPos++, 1, 0x0400, 0x0400, 0x045C, 0x045C); + gDPSetTile(gMainGfxPos++, G_IM_FMT_CI, G_IM_SIZ_4b, 2, 0x0000, G_TX_RENDERTILE, 1, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 4, 0x0100, 2, 0, G_TX_NOMIRROR | G_TX_WRAP, + gDPSetTile(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 4, 0x0100, 2, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); - gDPSetTileSize(gMasterGfxPos++, 2, 0, 0, 0x00FC, 0); + gDPSetTileSize(gMainGfxPos++, 2, 0, 0, 0x00FC, 0); if (itemEntity->flags & (ITEM_ENTITY_FLAG_8000000 | ITEM_ENTITY_FLAG_TRANSPARENT)) { func_801491E4(mtxTranslate, 0, 0, 0x18, 0x18, alpha); @@ -1448,54 +1448,54 @@ void appendGfx_item_entity(void* data) { func_801491E4(mtxTranslate, 0, 0, 0x18, 0x18, 255); } } else { - gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 12, gHudElementCacheTableRaster[itemEntity->lookupRasterIndex].data); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 2, 0x0000, G_TX_LOADTILE, 0, + gDPSetTextureImage(gMainGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 12, gHudElementCacheTableRaster[itemEntity->lookupRasterIndex].data); + gDPSetTile(gMainGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 2, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD); - gDPLoadSync(gMasterGfxPos++); - gDPLoadTile(gMasterGfxPos++, G_TX_LOADTILE, 0, 0, 0x002E, 0x005C); - gDPPipeSync(gMasterGfxPos++); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_CI, G_IM_SIZ_4b, 2, 0x0000, G_TX_RENDERTILE, 0, + gDPLoadSync(gMainGfxPos++); + gDPLoadTile(gMainGfxPos++, G_TX_LOADTILE, 0, 0, 0x002E, 0x005C); + gDPPipeSync(gMainGfxPos++); + gDPSetTile(gMainGfxPos++, G_IM_FMT_CI, G_IM_SIZ_4b, 2, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD); - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, 0x0400, 0x0400, 0x045C, 0x045C); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, 0x0400, 0x0400, 0x045C, 0x045C); } - gSPDisplayList(gMasterGfxPos++, D_8014C678); + gSPDisplayList(gMainGfxPos++, D_8014C678); } else { - gDPLoadTLUT_pal16(gMasterGfxPos++, 0, gHudElementCacheTablePalette[itemEntity->lookupPaletteIndex].data); + gDPLoadTLUT_pal16(gMainGfxPos++, 0, gHudElementCacheTablePalette[itemEntity->lookupPaletteIndex].data); if (gSpriteShadingProfile->flags != 0) { - gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 16, gHudElementCacheTableRaster[itemEntity->lookupRasterIndex].data); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 2, 0x0000, G_TX_LOADTILE, 0, + gDPSetTextureImage(gMainGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 16, gHudElementCacheTableRaster[itemEntity->lookupRasterIndex].data); + gDPSetTile(gMainGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 2, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD); - gDPLoadSync(gMasterGfxPos++); - gDPLoadTile(gMasterGfxPos++, G_TX_LOADTILE, 0, 0, 0x003E, 0x007C); - gDPPipeSync(gMasterGfxPos++); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_CI, G_IM_SIZ_4b, 2, 0x0000, 1, 0, G_TX_NOMIRROR | G_TX_CLAMP, + gDPLoadSync(gMainGfxPos++); + gDPLoadTile(gMainGfxPos++, G_TX_LOADTILE, 0, 0, 0x003E, 0x007C); + gDPPipeSync(gMainGfxPos++); + gDPSetTile(gMainGfxPos++, G_IM_FMT_CI, G_IM_SIZ_4b, 2, 0x0000, 1, 0, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD); - gDPSetTileSize(gMasterGfxPos++, 1, 0x0400, 0x0400, 0x047C, 0x047C); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_CI, G_IM_SIZ_4b, 2, 0x0000, G_TX_RENDERTILE, 1, + gDPSetTileSize(gMainGfxPos++, 1, 0x0400, 0x0400, 0x047C, 0x047C); + gDPSetTile(gMainGfxPos++, G_IM_FMT_CI, G_IM_SIZ_4b, 2, 0x0000, G_TX_RENDERTILE, 1, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 4, 0x0100, 2, 0, G_TX_NOMIRROR | G_TX_WRAP, + gDPSetTile(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 4, 0x0100, 2, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); - gDPSetTileSize(gMasterGfxPos++, 2, 0, 0, 0x00FC, 0); + gDPSetTileSize(gMainGfxPos++, 2, 0, 0, 0x00FC, 0); if (itemEntity->flags & (ITEM_ENTITY_FLAG_8000000 | ITEM_ENTITY_FLAG_TRANSPARENT)) { func_801491E4(mtxTranslate, 0, 0, 0x20, 0x20, alpha); } else { func_801491E4(mtxTranslate, 0, 0, 0x20, 0x20, 255); } } else { - gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 16, gHudElementCacheTableRaster[itemEntity->lookupRasterIndex].data); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 2, 0x0000, G_TX_LOADTILE, 0, + gDPSetTextureImage(gMainGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 16, gHudElementCacheTableRaster[itemEntity->lookupRasterIndex].data); + gDPSetTile(gMainGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 2, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD); - gDPLoadSync(gMasterGfxPos++); - gDPLoadTile(gMasterGfxPos++, G_TX_LOADTILE, 0, 0, 0x003E, 0x007C); - gDPPipeSync(gMasterGfxPos++); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_CI, G_IM_SIZ_4b, 2, 0x0000, G_TX_RENDERTILE, 0, + gDPLoadSync(gMainGfxPos++); + gDPLoadTile(gMainGfxPos++, G_TX_LOADTILE, 0, 0, 0x003E, 0x007C); + gDPPipeSync(gMainGfxPos++); + gDPSetTile(gMainGfxPos++, G_IM_FMT_CI, G_IM_SIZ_4b, 2, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD); - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, 0x0400, 0x0400, 0x047C, 0x047C); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, 0x0400, 0x0400, 0x047C, 0x047C); } - gSPDisplayList(gMasterGfxPos++, D_8014C6A0); + gSPDisplayList(gMainGfxPos++, D_8014C6A0); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPPipeSync(gMasterGfxPos++); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMainGfxPos++); if (itemEntity->itemID == ITEM_COIN) { draw_coin_sparkles(itemEntity); @@ -1606,15 +1606,15 @@ void render_item_entities(void) { guMtxCatF(sp98, sp58, sp58); guMtxF2L(sp58, &sp18); gDisplayContext->matrixStack[gMatrixListPos] = sp18; - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (gSpriteShadingProfile->flags != 0) { - gSPDisplayList(gMasterGfxPos++, D_8014BBD8); + gSPDisplayList(gMainGfxPos++, D_8014BBD8); } else { - gSPDisplayList(gMasterGfxPos++, D_8014B870); + gSPDisplayList(gMainGfxPos++, D_8014B870); } - gSPClearGeometryMode(gMasterGfxPos++, G_LIGHTING); - gSPDisplayList(gMasterGfxPos++, D_8014C620); + gSPClearGeometryMode(gMainGfxPos++, G_LIGHTING); + gSPDisplayList(gMainGfxPos++, D_8014C620); alpha = 255; if (item->flags & (ITEM_ENTITY_FLAG_TRANSPARENT | ITEM_ENTITY_FLAG_8000000)) { @@ -1627,76 +1627,76 @@ void render_item_entities(void) { } if (item->flags & (ITEM_ENTITY_FLAG_TRANSPARENT | ITEM_ENTITY_FLAG_8000000)) { if (gSpriteShadingProfile->flags) { - gDPSetRenderMode(gMasterGfxPos++, AA_EN | IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | G_RM_PASS, + gDPSetRenderMode(gMainGfxPos++, AA_EN | IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | G_RM_PASS, AA_EN | IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)); } else { - gDPSetRenderMode(gMasterGfxPos++, AA_EN | IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA), + gDPSetRenderMode(gMainGfxPos++, AA_EN | IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA), AA_EN | IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)); - gDPSetCombineLERP(gMasterGfxPos++, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, TEXEL0, 0, PRIMITIVE, 0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 255, 255, alpha); + gDPSetCombineLERP(gMainGfxPos++, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, TEXEL0, 0, PRIMITIVE, 0); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 255, alpha); } } } if (!(item->flags & ITEM_ENTITY_FLAG_40000)) { - gDPLoadTLUT_pal16(gMasterGfxPos++, 0, gHudElementCacheTablePalette[item->lookupPaletteIndex].data); + gDPLoadTLUT_pal16(gMainGfxPos++, 0, gHudElementCacheTablePalette[item->lookupPaletteIndex].data); if (gSpriteShadingProfile->flags) { - gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 12, gHudElementCacheTableRaster[item->lookupRasterIndex].data); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 2, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD); - gDPLoadSync(gMasterGfxPos++); - gDPLoadTile(gMasterGfxPos++, G_TX_LOADTILE, 0, 0, 0x002E, 0x005C); - gDPPipeSync(gMasterGfxPos++); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_CI, G_IM_SIZ_4b, 2, 0x0000, 1, 0, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD); - gDPSetTileSize(gMasterGfxPos++, 1, 0x0400, 0x0400, 0x045C, 0x045C); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_CI, G_IM_SIZ_4b, 2, 0x0000, G_TX_RENDERTILE, 1, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 4, 0x0100, 2, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); - gDPSetTileSize(gMasterGfxPos++, 2, 0, 0, 0x00FC, 0); + gDPSetTextureImage(gMainGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 12, gHudElementCacheTableRaster[item->lookupRasterIndex].data); + gDPSetTile(gMainGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 2, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD); + gDPLoadSync(gMainGfxPos++); + gDPLoadTile(gMainGfxPos++, G_TX_LOADTILE, 0, 0, 0x002E, 0x005C); + gDPPipeSync(gMainGfxPos++); + gDPSetTile(gMainGfxPos++, G_IM_FMT_CI, G_IM_SIZ_4b, 2, 0x0000, 1, 0, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD); + gDPSetTileSize(gMainGfxPos++, 1, 0x0400, 0x0400, 0x045C, 0x045C); + gDPSetTile(gMainGfxPos++, G_IM_FMT_CI, G_IM_SIZ_4b, 2, 0x0000, G_TX_RENDERTILE, 1, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD); + gDPSetTile(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 4, 0x0100, 2, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); + gDPSetTileSize(gMainGfxPos++, 2, 0, 0, 0x00FC, 0); if (item->flags & (ITEM_ENTITY_FLAG_TRANSPARENT | ITEM_ENTITY_FLAG_8000000)) { func_801491E4(sp58, 0, 0, 24, 24, alpha); } else { func_801491E4(sp58, 0, 0, 24, 24, 255); } } else { - gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 12, gHudElementCacheTableRaster[item->lookupRasterIndex].data); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 2, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD); - gDPLoadSync(gMasterGfxPos++); - gDPLoadTile(gMasterGfxPos++, G_TX_LOADTILE, 0, 0, 0x002E, 0x005C); - gDPPipeSync(gMasterGfxPos++); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_CI, G_IM_SIZ_4b, 2, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD); - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, 0x0400, 0x0400, 0x045C, 0x045C); + gDPSetTextureImage(gMainGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 12, gHudElementCacheTableRaster[item->lookupRasterIndex].data); + gDPSetTile(gMainGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 2, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD); + gDPLoadSync(gMainGfxPos++); + gDPLoadTile(gMainGfxPos++, G_TX_LOADTILE, 0, 0, 0x002E, 0x005C); + gDPPipeSync(gMainGfxPos++); + gDPSetTile(gMainGfxPos++, G_IM_FMT_CI, G_IM_SIZ_4b, 2, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, 0x0400, 0x0400, 0x045C, 0x045C); } - gSPDisplayList(gMasterGfxPos++, D_8014C678); + gSPDisplayList(gMainGfxPos++, D_8014C678); } else { - gDPLoadTLUT_pal16(gMasterGfxPos++, 0, gHudElementCacheTablePalette[item->lookupPaletteIndex].data); + gDPLoadTLUT_pal16(gMainGfxPos++, 0, gHudElementCacheTablePalette[item->lookupPaletteIndex].data); if (gSpriteShadingProfile->flags) { - gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 16, gHudElementCacheTableRaster[item->lookupRasterIndex].data); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 2, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD); - gDPLoadSync(gMasterGfxPos++); - gDPLoadTile(gMasterGfxPos++, G_TX_LOADTILE, 0, 0, 0x003E, 0x007C); - gDPPipeSync(gMasterGfxPos++); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_CI, G_IM_SIZ_4b, 2, 0x0000, 1, 0, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD); - gDPSetTileSize(gMasterGfxPos++, 1, 0x0400, 0x0400, 0x047C, 0x047C); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_CI, G_IM_SIZ_4b, 2, 0x0000, G_TX_RENDERTILE, 1, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 4, 0x0100, 2, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); - gDPSetTileSize(gMasterGfxPos++, 2, 0, 0, 0x00FC, 0); + gDPSetTextureImage(gMainGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 16, gHudElementCacheTableRaster[item->lookupRasterIndex].data); + gDPSetTile(gMainGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 2, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD); + gDPLoadSync(gMainGfxPos++); + gDPLoadTile(gMainGfxPos++, G_TX_LOADTILE, 0, 0, 0x003E, 0x007C); + gDPPipeSync(gMainGfxPos++); + gDPSetTile(gMainGfxPos++, G_IM_FMT_CI, G_IM_SIZ_4b, 2, 0x0000, 1, 0, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD); + gDPSetTileSize(gMainGfxPos++, 1, 0x0400, 0x0400, 0x047C, 0x047C); + gDPSetTile(gMainGfxPos++, G_IM_FMT_CI, G_IM_SIZ_4b, 2, 0x0000, G_TX_RENDERTILE, 1, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD); + gDPSetTile(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 4, 0x0100, 2, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); + gDPSetTileSize(gMainGfxPos++, 2, 0, 0, 0x00FC, 0); if (item->flags & (ITEM_ENTITY_FLAG_TRANSPARENT | ITEM_ENTITY_FLAG_8000000)) { func_801491E4(sp58, 0, 0, 32, 32, alpha); } else { func_801491E4(sp58, 0, 0, 32, 32, 255); } } else { - gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 16, gHudElementCacheTableRaster[item->lookupRasterIndex].data); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 2, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD); - gDPLoadSync(gMasterGfxPos++); - gDPLoadTile(gMasterGfxPos++, G_TX_LOADTILE, 0, 0, 0x003E, 0x007C); - gDPPipeSync(gMasterGfxPos++); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_CI, G_IM_SIZ_4b, 2, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD); - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, 0x0400, 0x0400, 0x047C, 0x047C); + gDPSetTextureImage(gMainGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 16, gHudElementCacheTableRaster[item->lookupRasterIndex].data); + gDPSetTile(gMainGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 2, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD); + gDPLoadSync(gMainGfxPos++); + gDPLoadTile(gMainGfxPos++, G_TX_LOADTILE, 0, 0, 0x003E, 0x007C); + gDPPipeSync(gMainGfxPos++); + gDPSetTile(gMainGfxPos++, G_IM_FMT_CI, G_IM_SIZ_4b, 2, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, 0x0400, 0x0400, 0x047C, 0x047C); } - gSPDisplayList(gMasterGfxPos++, D_8014C6A0); + gSPDisplayList(gMainGfxPos++, D_8014C6A0); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPPipeSync(gMasterGfxPos++); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMainGfxPos++); } } } diff --git a/src/CEE40.c b/src/CEE40.c index c9f851cf49..ac1a3176a7 100644 --- a/src/CEE40.c +++ b/src/CEE40.c @@ -42,32 +42,32 @@ void func_80138740(s32 x1, s32 y1, s32 x2, s32 y2, f32 arg4) { } } - gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, TEXEL0, 0, 0, 0, PRIMITIVE, 0, 0, 0, TEXEL0, 0, 0, 0, PRIMITIVE); - gDPSetRenderMode(gMasterGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); - gDPSetColorDither(gMasterGfxPos++, G_CD_DISABLE); - gDPSetAlphaDither(gMasterGfxPos++, G_AD_NOISE); - gDPSetTextureFilter(gMasterGfxPos++, G_TF_POINT); - gDPSetTexturePersp(gMasterGfxPos++, G_TP_NONE); - gSPTexture(gMasterGfxPos++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); - gDPSetTextureLUT(gMasterGfxPos++, G_TT_NONE); - gDPSetTextureDetail(gMasterGfxPos++, G_TD_CLAMP); - gDPSetTextureLOD(gMasterGfxPos++, G_TL_TILE); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 255, 255, arg4); + gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, TEXEL0, 0, 0, 0, PRIMITIVE, 0, 0, 0, TEXEL0, 0, 0, 0, PRIMITIVE); + gDPSetRenderMode(gMainGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); + gDPSetColorDither(gMainGfxPos++, G_CD_DISABLE); + gDPSetAlphaDither(gMainGfxPos++, G_AD_NOISE); + gDPSetTextureFilter(gMainGfxPos++, G_TF_POINT); + gDPSetTexturePersp(gMainGfxPos++, G_TP_NONE); + gSPTexture(gMainGfxPos++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); + gDPSetTextureLUT(gMainGfxPos++, G_TT_NONE); + gDPSetTextureDetail(gMainGfxPos++, G_TD_CLAMP); + gDPSetTextureLOD(gMainGfxPos++, G_TL_TILE); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 255, arg4); for (i = 0; i < t9; i++) { - gDPLoadTextureTile(gMasterGfxPos++, osVirtualToPhysical(prevGfxCfb), G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, 6, + gDPLoadTextureTile(gMainGfxPos++, osVirtualToPhysical(prevGfxCfb), G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, 6, x1, y1 + i * 6, x2 - 1, y1 + i * 6 + 5, 0, G_TX_WRAP, G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPTextureRectangle(gMasterGfxPos++, x1 * 4, (y1 + i * 6) * 4, x2 * 4, (y1 + i * 6 + 6) * 4, + gSPTextureRectangle(gMainGfxPos++, x1 * 4, (y1 + i * 6) * 4, x2 * 4, (y1 + i * 6 + 6) * 4, G_TX_RENDERTILE, x1 * 32, (y1 + i * 6) * 32, 1024, 1024); } if (sp10 != 0) { - gDPLoadTextureTile(gMasterGfxPos++, osVirtualToPhysical(prevGfxCfb), G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, sp10, + gDPLoadTextureTile(gMainGfxPos++, osVirtualToPhysical(prevGfxCfb), G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, sp10, x1, y1 + i * 6, x2 - 1, y1 + i * 6 + sp10 - 1, 0, G_TX_WRAP, G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPTextureRectangle(gMasterGfxPos++, x1 * 4, (y1 + i * 6) * 4, x2 * 4, (y1 + i * 6 + sp10) * 4, + gSPTextureRectangle(gMainGfxPos++, x1 * 4, (y1 + i * 6) * 4, x2 * 4, (y1 + i * 6 + sp10) * 4, G_TX_RENDERTILE, x1 * 32, (y1 + i * 6) * 32, 1024, 1024); } } @@ -142,20 +142,20 @@ void func_80138E54(s32 arg0, s32 arg1, s32 arg2, f32 arg3, f32 arg4) { } guOrtho(&gDisplayContext->matrixStack[gMatrixListPos], -16.0f, 0.0f, 0.0f, 16.0f, -1000.0f, 1000.0f, 1.0f); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - gDPSetAlphaDither(gMasterGfxPos++, G_AD_PATTERN); - gDPSetTextureFilter(gMasterGfxPos++, G_TF_POINT); - gDPSetTexturePersp(gMasterGfxPos++, G_TP_PERSP); - gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_32b, 64, osVirtualToPhysical(nuGfxZBuffer)); - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 0, 0, 64, 64); - gSPViewport(gMasterGfxPos++, &D_8014ED98); - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gDPSetAlphaDither(gMainGfxPos++, G_AD_PATTERN); + gDPSetTextureFilter(gMainGfxPos++, G_TF_POINT); + gDPSetTexturePersp(gMainGfxPos++, G_TP_PERSP); + gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_32b, 64, osVirtualToPhysical(nuGfxZBuffer)); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, 0, 0, 64, 64); + gSPViewport(gMainGfxPos++, &D_8014ED98); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1); guRotate(&gDisplayContext->matrixStack[gMatrixListPos], 0.0f, 0.0f, 0.0f, 1.0f); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_8014EDE8); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPPipeSync(gMasterGfxPos++); - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, 0, PRIMITIVE, TEXEL0, PRIMITIVE, 0, 0, 0, 0, 0, PRIMITIVE, TEXEL0, PRIMITIVE, 0); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_8014EDE8); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMainGfxPos++); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, 0, PRIMITIVE, TEXEL0, PRIMITIVE, 0, 0, 0, 0, 0, PRIMITIVE, TEXEL0, PRIMITIVE, 0); for (i = 0; i < 2; i++) { f32 f20; @@ -172,64 +172,64 @@ void func_80138E54(s32 arg0, s32 arg1, s32 arg2, f32 arg3, f32 arg4) { s0 = 255; } - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 255, 255, s0); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 255, s0); guRotate(&gDisplayContext->matrixStack[gMatrixListPos], i * 70 + f2, 0.0f, 0.0f, 1.0f); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); guScale(&gDisplayContext->matrixStack[gMatrixListPos], f20, f20, 1.0f); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_8014EDE8); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_8014EDE8); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } - gDPPipeSync(gMasterGfxPos++); - gDPSetTexturePersp(gMasterGfxPos++, G_TP_NONE); - gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_I, G_IM_SIZ_8b, 64, osVirtualToPhysical(nuGfxZBuffer)); - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 0, 0, 64, 64); - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, TEXEL0, 0, 0, 0, 1, 0, 0, 0, TEXEL0, 0, 0, 0, 1); + gDPPipeSync(gMainGfxPos++); + gDPSetTexturePersp(gMainGfxPos++, G_TP_NONE); + gDPSetColorImage(gMainGfxPos++, G_IM_FMT_I, G_IM_SIZ_8b, 64, osVirtualToPhysical(nuGfxZBuffer)); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, 0, 0, 64, 64); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, TEXEL0, 0, 0, 0, 1, 0, 0, 0, TEXEL0, 0, 0, 0, 1); for (i = 0; i < 4; i++) { - gDPLoadTextureTile(gMasterGfxPos++, osVirtualToPhysical(&nuGfxZBuffer[i * 2048]), G_IM_FMT_RGBA, G_IM_SIZ_32b, 64, 16, 0, 0, 63, 15, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gDPPipeSync(gMasterGfxPos++); - gSPTextureRectangle(gMasterGfxPos++, 0, (i * 16) * 4, 64 * 4, (i * 16 + 16) * 4, G_TX_RENDERTILE, 0, 0, 0x400, 0x400); - gDPPipeSync(gMasterGfxPos++); + gDPLoadTextureTile(gMainGfxPos++, osVirtualToPhysical(&nuGfxZBuffer[i * 2048]), G_IM_FMT_RGBA, G_IM_SIZ_32b, 64, 16, 0, 0, 63, 15, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); + gDPPipeSync(gMainGfxPos++); + gSPTextureRectangle(gMainGfxPos++, 0, (i * 16) * 4, 64 * 4, (i * 16 + 16) * 4, G_TX_RENDERTILE, 0, 0, 0x400, 0x400); + gDPPipeSync(gMainGfxPos++); } - gDPLoadTextureTile(gMasterGfxPos++, osVirtualToPhysical(nuGfxZBuffer), G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0, 0, 63, 63, + gDPLoadTextureTile(gMainGfxPos++, osVirtualToPhysical(nuGfxZBuffer), G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0, 0, 63, 63, 0, G_TX_MIRROR | G_TX_CLAMP, G_TX_MIRROR | G_TX_CLAMP, 6, 6, 15, 15); - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, 0, 0, 0x01FC, 0x01FC); - gDPPipeSync(gMasterGfxPos++); - gDPSetCycleType(gMasterGfxPos++, G_CYC_FILL); - gDPSetRenderMode(gMasterGfxPos++, G_RM_NOOP, G_RM_NOOP2); - gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_32b, 64, osVirtualToPhysical(nuGfxZBuffer)); - gDPSetFillColor(gMasterGfxPos++, GPACK_ZDZ(G_MAXFBZ, 0)<<16 | GPACK_ZDZ(G_MAXFBZ, 0)); - gDPFillRectangle(gMasterGfxPos++, 0, 0, 63, 63); - gDPPipeSync(gMasterGfxPos++); - gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(nuGfxCfb_ptr)); - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); - gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); - gDPSetColorDither(gMasterGfxPos++, G_CD_MAGICSQ); - gDPSetAlphaDither(gMasterGfxPos++, G_AD_PATTERN); - gDPSetTextureFilter(gMasterGfxPos++, G_TF_AVERAGE); - gDPSetRenderMode(gMasterGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, 0, 0, 0x01FC, 0x01FC); + gDPPipeSync(gMainGfxPos++); + gDPSetCycleType(gMainGfxPos++, G_CYC_FILL); + gDPSetRenderMode(gMainGfxPos++, G_RM_NOOP, G_RM_NOOP2); + gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_32b, 64, osVirtualToPhysical(nuGfxZBuffer)); + gDPSetFillColor(gMainGfxPos++, GPACK_ZDZ(G_MAXFBZ, 0)<<16 | GPACK_ZDZ(G_MAXFBZ, 0)); + gDPFillRectangle(gMainGfxPos++, 0, 0, 63, 63); + gDPPipeSync(gMainGfxPos++); + gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(nuGfxCfb_ptr)); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); + gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE); + gDPSetColorDither(gMainGfxPos++, G_CD_MAGICSQ); + gDPSetAlphaDither(gMainGfxPos++, G_AD_PATTERN); + gDPSetTextureFilter(gMainGfxPos++, G_TF_AVERAGE); + gDPSetRenderMode(gMainGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); if (arg3 != 255.0f || arg0 == 1) { - gDPSetCombineLERP(gMasterGfxPos++, 1, TEXEL0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, PRIMITIVE, 1, TEXEL0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, PRIMITIVE); + gDPSetCombineLERP(gMainGfxPos++, 1, TEXEL0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, PRIMITIVE, 1, TEXEL0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, PRIMITIVE); } else { - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, 0, 1, 0, ENVIRONMENT, PRIMITIVE, 0, 0, 0, 0, 1, 0, ENVIRONMENT, PRIMITIVE); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, 0, 1, 0, ENVIRONMENT, PRIMITIVE, 0, 0, 0, 0, 1, 0, ENVIRONMENT, PRIMITIVE); } arg3 *= 0.5f; - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, arg3 * 0.5f * arg4 / 255.0f); - gDPSetEnvColor(gMasterGfxPos++, 255, 255, 255, (255.0f - arg3 * 0.5f) * arg4 / 255.0f); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, arg3 * 0.5f * arg4 / 255.0f); + gDPSetEnvColor(gMainGfxPos++, 255, 255, 255, (255.0f - arg3 * 0.5f) * arg4 / 255.0f); if (arg0 == 0) { - gSPTextureRectangle(gMasterGfxPos++, + gSPTextureRectangle(gMainGfxPos++, camera->viewportStartX * 4, camera->viewportStartY * 4, (camera->viewportStartX + camera->viewportW) * 4, (camera->viewportStartY + camera->viewportH) * 4, G_TX_RENDERTILE, (12 - arg1) * 32.0f / texScale + 16.0f + 1024.0f, (19 - arg2) * 32.0f / texScale + 16.0f + 1024.0f, 1024.0f / texScale, 1024.0f / texScale); } else { - gSPTextureRectangle(gMasterGfxPos++, + gSPTextureRectangle(gMainGfxPos++, camera->viewportStartX * 4, camera->viewportStartY * 4, (camera->viewportStartX + camera->viewportW) * 4, (camera->viewportStartY + camera->viewportH) * 4, G_TX_RENDERTILE, @@ -262,14 +262,14 @@ void func_80139F10(s32 arg0, s32 arg1, f32 alpha, s32 primR, s32 primG, s32 prim return; } - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, x1, y1, x2, y2); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, x1, y1, x2, y2); if (alpha == 255.0f) { - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, PRIMITIVE, 0, 0, 0, 1, 0, 0, 0, PRIMITIVE, 0, 0, 0, 1); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, PRIMITIVE, 0, 0, 0, 1, 0, 0, 0, PRIMITIVE, 0, 0, 0, 1); } - gDPSetPrimColor(gMasterGfxPos++, 0, 0, primR, primG, primB, primA); + gDPSetPrimColor(gMainGfxPos++, 0, 0, primR, primG, primB, primA); texScale = (255.0f - alpha) * 10.5f / 255.0f + 0.09; // range from - gSPTextureRectangle(gMasterGfxPos++, x1 * 4, y1 * 4, x2 * 4, y2 * 4, G_TX_RENDERTILE, + gSPTextureRectangle(gMainGfxPos++, x1 * 4, y1 * 4, x2 * 4, y2 * 4, G_TX_RENDERTILE, (t5 - arg0) * 32.0f / texScale + 16.0f + 1024.0f, (t6 - arg1) * 32.0f / texScale + 16.0f + 1024.0f, 1024.0f / texScale, 1024.0f / texScale); - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/a5dd0_len_114e0.c b/src/a5dd0_len_114e0.c index 3d8da6322a..294064abe8 100644 --- a/src/a5dd0_len_114e0.c +++ b/src/a5dd0_len_114e0.c @@ -1397,11 +1397,11 @@ void exec_entity_commandlist(Entity* entity) { void func_8010FD98(void* arg0, s32 alpha) { if (alpha >= 255) { - gDPSetRenderMode(gMasterGfxPos++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2); - gDPSetCombineMode(gMasterGfxPos++, G_CC_MODULATEIA, G_CC_MODULATEIA); + gDPSetRenderMode(gMainGfxPos++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2); + gDPSetCombineMode(gMainGfxPos++, G_CC_MODULATEIA, G_CC_MODULATEIA); } else { - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, alpha); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, alpha); } } @@ -1412,8 +1412,8 @@ void func_8010FE44(void* arg0) { void entity_model_set_shadow_color(void* data) { s32 alpha = (s32)data; - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, 0, PRIMITIVE, 0, TEXEL0, 0, 0, 0, 0, 0, TEXEL0, 0, PRIMITIVE, 0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, alpha); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, 0, PRIMITIVE, 0, TEXEL0, 0, 0, 0, 0, 0, TEXEL0, 0, PRIMITIVE, 0); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, alpha); } void render_entities(void) { @@ -3048,7 +3048,7 @@ void appendGfx_model(void* data) { s32 fogMin, fogMax; s32 fogR, fogG, fogB, fogA; - Gfx** gfxPos = &gMasterGfxPos; + Gfx** gfxPos = &gMainGfxPos; mtxPushMode = G_MTX_PUSH; mtxLoadMode = G_MTX_LOAD; @@ -3416,61 +3416,61 @@ void appendGfx_model(void* data) { gSPDisplayList((*gfxPos)++, D_8014AFC0[0x10]); switch (renderMode) { case RENDER_MODE_SURFACE_OPA: - gDPSetRenderMode(gMasterGfxPos++, GBL_c1(G_BL_CLR_BL, G_BL_A_FOG, G_BL_CLR_IN, G_BL_1MA), G_RM_AA_ZB_OPA_SURF2); + gDPSetRenderMode(gMainGfxPos++, GBL_c1(G_BL_CLR_BL, G_BL_A_FOG, G_BL_CLR_IN, G_BL_1MA), G_RM_AA_ZB_OPA_SURF2); break; case RENDER_MODE_SURFACE_OPA_NO_AA: - gDPSetRenderMode(gMasterGfxPos++, GBL_c1(G_BL_CLR_BL, G_BL_A_FOG, G_BL_CLR_IN, G_BL_1MA), G_RM_ZB_OPA_SURF2); + gDPSetRenderMode(gMainGfxPos++, GBL_c1(G_BL_CLR_BL, G_BL_A_FOG, G_BL_CLR_IN, G_BL_1MA), G_RM_ZB_OPA_SURF2); break; case RENDER_MODE_DECAL_OPA: - gDPSetRenderMode(gMasterGfxPos++, GBL_c1(G_BL_CLR_BL, G_BL_A_FOG, G_BL_CLR_IN, G_BL_1MA), G_RM_AA_ZB_OPA_DECAL2); + gDPSetRenderMode(gMainGfxPos++, GBL_c1(G_BL_CLR_BL, G_BL_A_FOG, G_BL_CLR_IN, G_BL_1MA), G_RM_AA_ZB_OPA_DECAL2); break; case RENDER_MODE_DECAL_OPA_NO_AA: - gDPSetRenderMode(gMasterGfxPos++, GBL_c1(G_BL_CLR_BL, G_BL_A_FOG, G_BL_CLR_IN, G_BL_1MA), G_RM_ZB_OPA_DECAL2); + gDPSetRenderMode(gMainGfxPos++, GBL_c1(G_BL_CLR_BL, G_BL_A_FOG, G_BL_CLR_IN, G_BL_1MA), G_RM_ZB_OPA_DECAL2); break; case RENDER_MODE_INTERSECTING_OPA: - gDPSetRenderMode(gMasterGfxPos++, GBL_c1(G_BL_CLR_BL, G_BL_A_FOG, G_BL_CLR_IN, G_BL_1MA), G_RM_AA_ZB_OPA_INTER2); + gDPSetRenderMode(gMainGfxPos++, GBL_c1(G_BL_CLR_BL, G_BL_A_FOG, G_BL_CLR_IN, G_BL_1MA), G_RM_AA_ZB_OPA_INTER2); break; case RENDER_MODE_ALPHATEST: - gDPSetRenderMode(gMasterGfxPos++, GBL_c1(G_BL_CLR_BL, G_BL_A_FOG, G_BL_CLR_IN, G_BL_1MA), G_RM_AA_ZB_TEX_EDGE2); + gDPSetRenderMode(gMainGfxPos++, GBL_c1(G_BL_CLR_BL, G_BL_A_FOG, G_BL_CLR_IN, G_BL_1MA), G_RM_AA_ZB_TEX_EDGE2); break; case RENDER_MODE_ALPHATEST_ONESIDED: - gDPSetRenderMode(gMasterGfxPos++, GBL_c1(G_BL_CLR_BL, G_BL_A_FOG, G_BL_CLR_IN, G_BL_1MA), G_RM_AA_ZB_TEX_EDGE2); + gDPSetRenderMode(gMainGfxPos++, GBL_c1(G_BL_CLR_BL, G_BL_A_FOG, G_BL_CLR_IN, G_BL_1MA), G_RM_AA_ZB_TEX_EDGE2); break; case RENDER_MODE_SURFACE_XLU_LAYER1: - gDPSetRenderMode(gMasterGfxPos++, GBL_c1(G_BL_CLR_BL, G_BL_A_FOG, G_BL_CLR_IN, G_BL_1MA), G_RM_AA_ZB_XLU_SURF2); + gDPSetRenderMode(gMainGfxPos++, GBL_c1(G_BL_CLR_BL, G_BL_A_FOG, G_BL_CLR_IN, G_BL_1MA), G_RM_AA_ZB_XLU_SURF2); break; case RENDER_MODE_SURFACE_XLU_LAYER2: - gDPSetRenderMode(gMasterGfxPos++, GBL_c1(G_BL_CLR_BL, G_BL_A_FOG, G_BL_CLR_IN, G_BL_1MA), G_RM_AA_ZB_XLU_SURF2); + gDPSetRenderMode(gMainGfxPos++, GBL_c1(G_BL_CLR_BL, G_BL_A_FOG, G_BL_CLR_IN, G_BL_1MA), G_RM_AA_ZB_XLU_SURF2); break; case RENDER_MODE_SURFACE_XLU_LAYER3: - gDPSetRenderMode(gMasterGfxPos++, GBL_c1(G_BL_CLR_BL, G_BL_A_FOG, G_BL_CLR_IN, G_BL_1MA), G_RM_AA_ZB_XLU_SURF2); + gDPSetRenderMode(gMainGfxPos++, GBL_c1(G_BL_CLR_BL, G_BL_A_FOG, G_BL_CLR_IN, G_BL_1MA), G_RM_AA_ZB_XLU_SURF2); break; case RENDER_MODE_SURFACE_XLU_NO_AA: - gDPSetRenderMode(gMasterGfxPos++, GBL_c1(G_BL_CLR_BL, G_BL_A_FOG, G_BL_CLR_IN, G_BL_1MA), G_RM_ZB_XLU_SURF2); + gDPSetRenderMode(gMainGfxPos++, GBL_c1(G_BL_CLR_BL, G_BL_A_FOG, G_BL_CLR_IN, G_BL_1MA), G_RM_ZB_XLU_SURF2); break; case RENDER_MODE_DECAL_XLU: - gDPSetRenderMode(gMasterGfxPos++, GBL_c1(G_BL_CLR_BL, G_BL_A_FOG, G_BL_CLR_IN, G_BL_1MA), G_RM_AA_ZB_XLU_DECAL2); + gDPSetRenderMode(gMainGfxPos++, GBL_c1(G_BL_CLR_BL, G_BL_A_FOG, G_BL_CLR_IN, G_BL_1MA), G_RM_AA_ZB_XLU_DECAL2); break; case RENDER_MODE_DECAL_XLU_NOAA: - gDPSetRenderMode(gMasterGfxPos++, GBL_c1(G_BL_CLR_BL, G_BL_A_FOG, G_BL_CLR_IN, G_BL_1MA), G_RM_AA_ZB_XLU_DECAL2); + gDPSetRenderMode(gMainGfxPos++, GBL_c1(G_BL_CLR_BL, G_BL_A_FOG, G_BL_CLR_IN, G_BL_1MA), G_RM_AA_ZB_XLU_DECAL2); break; case RENDER_MODE_INTERSECTING_XLU: - gDPSetRenderMode(gMasterGfxPos++, GBL_c1(G_BL_CLR_BL, G_BL_A_FOG, G_BL_CLR_IN, G_BL_1MA), G_RM_AA_ZB_XLU_INTER2); + gDPSetRenderMode(gMainGfxPos++, GBL_c1(G_BL_CLR_BL, G_BL_A_FOG, G_BL_CLR_IN, G_BL_1MA), G_RM_AA_ZB_XLU_INTER2); break; case RENDER_MODE_SURFACE_OPA_NO_ZB: - gDPSetRenderMode(gMasterGfxPos++, GBL_c1(G_BL_CLR_BL, G_BL_A_FOG, G_BL_CLR_IN, G_BL_1MA), G_RM_AA_OPA_SURF2); + gDPSetRenderMode(gMainGfxPos++, GBL_c1(G_BL_CLR_BL, G_BL_A_FOG, G_BL_CLR_IN, G_BL_1MA), G_RM_AA_OPA_SURF2); break; case RENDER_MODE_ALPHATEST_NO_ZB: - gDPSetRenderMode(gMasterGfxPos++, GBL_c1(G_BL_CLR_BL, G_BL_A_FOG, G_BL_CLR_IN, G_BL_1MA), G_RM_AA_TEX_EDGE2); + gDPSetRenderMode(gMainGfxPos++, GBL_c1(G_BL_CLR_BL, G_BL_A_FOG, G_BL_CLR_IN, G_BL_1MA), G_RM_AA_TEX_EDGE2); break; case RENDER_MODE_SURFACE_XLU_NO_ZB: - gDPSetRenderMode(gMasterGfxPos++, GBL_c1(G_BL_CLR_BL, G_BL_A_FOG, G_BL_CLR_IN, G_BL_1MA), G_RM_AA_XLU_SURF2); + gDPSetRenderMode(gMainGfxPos++, GBL_c1(G_BL_CLR_BL, G_BL_A_FOG, G_BL_CLR_IN, G_BL_1MA), G_RM_AA_XLU_SURF2); break; case RENDER_MODE_CLOUD: - gDPSetRenderMode(gMasterGfxPos++, GBL_c1(G_BL_CLR_BL, G_BL_A_FOG, G_BL_CLR_IN, G_BL_1MA), G_RM_ZB_CLD_SURF2); + gDPSetRenderMode(gMainGfxPos++, GBL_c1(G_BL_CLR_BL, G_BL_A_FOG, G_BL_CLR_IN, G_BL_1MA), G_RM_ZB_CLD_SURF2); break; case RENDER_MODE_CLOUD_NO_ZB: - gDPSetRenderMode(gMasterGfxPos++, GBL_c1(G_BL_CLR_BL, G_BL_A_FOG, G_BL_CLR_IN, G_BL_1MA), G_RM_CLD_SURF2); + gDPSetRenderMode(gMainGfxPos++, GBL_c1(G_BL_CLR_BL, G_BL_A_FOG, G_BL_CLR_IN, G_BL_1MA), G_RM_CLD_SURF2); break; } gDPSetFogColor((*gfxPos)++, gCurrentFogSettings->r, @@ -3554,7 +3554,7 @@ void appendGfx_model(void* data) { fogMin = (gCurrentFogSettings->startDistance * (255 - mdl_bgMultiplyColorA) + 900 * mdl_bgMultiplyColorA) / 255; fogMax = (gCurrentFogSettings->endDistance * (255 - mdl_bgMultiplyColorA) + 1000 * mdl_bgMultiplyColorA) / 255; - gDPSetFogColor(gMasterGfxPos++, fogR, fogG, fogB, gCurrentFogSettings->a); + gDPSetFogColor(gMainGfxPos++, fogR, fogG, fogB, gCurrentFogSettings->a); gSPFogPosition((*gfxPos)++, fogMin, fogMax); break; case 10: @@ -4592,7 +4592,7 @@ void func_80117D00(Model* model) { // this looks like a switch, but I can't figure it out void render_transform_group_node(ModelNode* node) { - Gfx** gfx = &gMasterGfxPos; + Gfx** gfx = &gMainGfxPos; Model* model; if (node != NULL) { @@ -4644,7 +4644,7 @@ void render_transform_group_node(ModelNode* node) { // gfx temps needed void render_transform_group(void* data) { ModelTransformGroup* group = data; - Gfx** gfx = &gMasterGfxPos; + Gfx** gfx = &gMainGfxPos; if (!(group->flags & MODEL_TRANSFORM_GROUP_FLAG_4)) { mdl_currentTransformGroupChildIndex = group->minChildModelIndex; @@ -5447,31 +5447,31 @@ void set_custom_gfx_builders(s32 customGfxIndex, ModelCustomGfxBuilderFunc pre, } void build_custom_gfx(void) { - Gfx* gfx = gMasterGfxPos; + Gfx* gfx = gMainGfxPos; ModelCustomGfxBuilderFunc preFunc; ModelCustomGfxBuilderFunc postFunc; s32 i; - gSPBranchList(gMasterGfxPos++, 0x00000000); + gSPBranchList(gMainGfxPos++, 0x00000000); for (i = 0; i < ARRAY_COUNT(*gCurrentCustomModelGfxPtr) / 2; i++) { preFunc = (*gCurrentCustomModelGfxBuildersPtr)[i * 2]; if (preFunc != NULL) { - (*gCurrentCustomModelGfxPtr)[i * 2] = gMasterGfxPos; + (*gCurrentCustomModelGfxPtr)[i * 2] = gMainGfxPos; preFunc(i); - gSPEndDisplayList(gMasterGfxPos++); + gSPEndDisplayList(gMainGfxPos++); } postFunc = (*gCurrentCustomModelGfxBuildersPtr)[i * 2 + 1]; if (postFunc != NULL) { - (*gCurrentCustomModelGfxPtr)[i * 2 + 1] = gMasterGfxPos; + (*gCurrentCustomModelGfxPtr)[i * 2 + 1] = gMainGfxPos; postFunc(i); - gSPEndDisplayList(gMasterGfxPos++); + gSPEndDisplayList(gMainGfxPos++); } } - gSPBranchList(gfx, gMasterGfxPos); + gSPBranchList(gfx, gMainGfxPos); } // weird temps necessary to match @@ -5917,39 +5917,39 @@ s32 is_model_center_visible(u16 modelID, s32 depthQueryID, f32* screenX, f32* sc } } if (outX >= 0.0f && outY >= 0.0f && outX < 320.0f && outY < 240.0f) { - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); // Load a 4x1 pixel tile of the depth buffer - gDPLoadTextureTile(gMasterGfxPos++, osVirtualToPhysical(&nuGfxZBuffer[(s32) outY * 320]), G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, 1, + gDPLoadTextureTile(gMainGfxPos++, osVirtualToPhysical(&nuGfxZBuffer[(s32) outY * 320]), G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, 1, (s32) outX, 0, (s32) outX + 3, 0, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 9, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); // Set the current color image to the buffer where copied depth values are stored. - gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, depthCopyBuffer); - gDPPipeSync(gMasterGfxPos++); + gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, depthCopyBuffer); + gDPPipeSync(gMainGfxPos++); // Set up 1 cycle mode and all other relevant othermode params. // One cycle mode must be used here because only one pixel is copied, and copy mode only supports multiples of 4 pixels. - gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); - gDPSetRenderMode(gMasterGfxPos++, G_RM_OPA_SURF, G_RM_OPA_SURF2); - gDPSetCombineMode(gMasterGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); - gDPSetTextureFilter(gMasterGfxPos++, G_TF_POINT); - gDPSetTexturePersp(gMasterGfxPos++, G_TP_NONE); - gSPTexture(gMasterGfxPos++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); - gDPSetTextureLUT(gMasterGfxPos++, G_TT_NONE); - gDPSetTextureDetail(gMasterGfxPos++, G_TD_CLAMP); - gDPSetTextureLOD(gMasterGfxPos++, G_TL_TILE); + gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE); + gDPSetRenderMode(gMainGfxPos++, G_RM_OPA_SURF, G_RM_OPA_SURF2); + gDPSetCombineMode(gMainGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); + gDPSetTextureFilter(gMainGfxPos++, G_TF_POINT); + gDPSetTexturePersp(gMainGfxPos++, G_TP_NONE); + gSPTexture(gMainGfxPos++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); + gDPSetTextureLUT(gMainGfxPos++, G_TT_NONE); + gDPSetTextureDetail(gMainGfxPos++, G_TD_CLAMP); + gDPSetTextureLOD(gMainGfxPos++, G_TL_TILE); // Adjust the scissor to only draw to the specified pixel. - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, depthQueryID, 0, depthQueryID + 1, 1); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, depthQueryID, 0, depthQueryID + 1, 1); // Draw a texrect to copy one pixel of the loaded depth tile to the output buffer. - gSPTextureRectangle(gMasterGfxPos++, depthQueryID << 2, 0 << 2, 4 << 2, 1 << 2, G_TX_RENDERTILE, (s32) outX << 5, 0, 1 << 10, 1 << 10); + gSPTextureRectangle(gMainGfxPos++, depthQueryID << 2, 0 << 2, 4 << 2, 1 << 2, G_TX_RENDERTILE, (s32) outX << 5, 0, 1 << 10, 1 << 10); // Sync and swap the color image back to the current framebuffer. - gDPPipeSync(gMasterGfxPos++); - gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, osVirtualToPhysical(nuGfxCfb_ptr)); - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); + gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, osVirtualToPhysical(nuGfxCfb_ptr)); + gDPPipeSync(gMainGfxPos++); // Reconfigure the frame's normal scissor. - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, camera->viewportStartX, camera->viewportStartY, camera->viewportStartX + camera->viewportW, camera->viewportStartY + camera->viewportH); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, camera->viewportStartX, camera->viewportStartY, camera->viewportStartX + camera->viewportW, camera->viewportStartY + camera->viewportH); // The following code will use last frame's depth value, since the copy that was just written won't be executed until the current frame is drawn. @@ -6023,39 +6023,39 @@ s32 is_point_visible(f32 x, f32 y, f32 z, s32 depthQueryID, f32* screenX, f32* s return outZ > 0.0f; } if (outX >= 0.0f && outY >= 0.0f && outX < 320.0f && outY < 240.0f) { - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); // Load a 4x1 pixel tile of the depth buffer - gDPLoadTextureTile(gMasterGfxPos++, osVirtualToPhysical(&nuGfxZBuffer[(s32) outY * 320]), G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, 1, + gDPLoadTextureTile(gMainGfxPos++, osVirtualToPhysical(&nuGfxZBuffer[(s32) outY * 320]), G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, 1, (s32) outX, 0, (s32) outX + 3, 0, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 9, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); // Set the current color image to the buffer where copied depth values are stored. - gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, depthCopyBuffer); - gDPPipeSync(gMasterGfxPos++); + gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, depthCopyBuffer); + gDPPipeSync(gMainGfxPos++); // Set up 1 cycle mode and all other relevant othermode params. // One cycle mode must be used here because only one pixel is copied, and copy mode only supports multiples of 4 pixels. - gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); - gDPSetRenderMode(gMasterGfxPos++, G_RM_OPA_SURF, G_RM_OPA_SURF2); - gDPSetCombineMode(gMasterGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); - gDPSetTextureFilter(gMasterGfxPos++, G_TF_POINT); - gDPSetTexturePersp(gMasterGfxPos++, G_TP_NONE); - gSPTexture(gMasterGfxPos++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); - gDPSetTextureLUT(gMasterGfxPos++, G_TT_NONE); - gDPSetTextureDetail(gMasterGfxPos++, G_TD_CLAMP); - gDPSetTextureLOD(gMasterGfxPos++, G_TL_TILE); + gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE); + gDPSetRenderMode(gMainGfxPos++, G_RM_OPA_SURF, G_RM_OPA_SURF2); + gDPSetCombineMode(gMainGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); + gDPSetTextureFilter(gMainGfxPos++, G_TF_POINT); + gDPSetTexturePersp(gMainGfxPos++, G_TP_NONE); + gSPTexture(gMainGfxPos++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); + gDPSetTextureLUT(gMainGfxPos++, G_TT_NONE); + gDPSetTextureDetail(gMainGfxPos++, G_TD_CLAMP); + gDPSetTextureLOD(gMainGfxPos++, G_TL_TILE); // Adjust the scissor to only draw to the specified pixel. - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, depthQueryID, 0, depthQueryID + 1, 1); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, depthQueryID, 0, depthQueryID + 1, 1); // Draw a texrect to copy one pixel of the loaded depth tile to the output buffer. - gSPTextureRectangle(gMasterGfxPos++, depthQueryID << 2, 0 << 2, (depthQueryID + 1) << 2, 1 << 2, G_TX_RENDERTILE, (s32) outX << 5, 0, 1 << 10, 1 << 10); + gSPTextureRectangle(gMainGfxPos++, depthQueryID << 2, 0 << 2, (depthQueryID + 1) << 2, 1 << 2, G_TX_RENDERTILE, (s32) outX << 5, 0, 1 << 10, 1 << 10); // Sync and swap the color image back to the current framebuffer. - gDPPipeSync(gMasterGfxPos++); - gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, osVirtualToPhysical(nuGfxCfb_ptr)); - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); + gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, osVirtualToPhysical(nuGfxCfb_ptr)); + gDPPipeSync(gMainGfxPos++); // Reconfigure the frame's normal scissor. - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, camera->viewportStartX, camera->viewportStartY, camera->viewportStartX + camera->viewportW, camera->viewportStartY + camera->viewportH); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, camera->viewportStartX, camera->viewportStartY, camera->viewportStartX + camera->viewportW, camera->viewportStartY + camera->viewportH); // The following code will use last frame's depth value, since the copy that was just written won't be executed until the current frame is drawn. @@ -6082,20 +6082,20 @@ void mdl_draw_hidden_panel_surface(Gfx** arg0, u16 treeIndex) { Gfx* oldGfxPos; s32 flag; - if (*arg0 == gMasterGfxPos) { + if (*arg0 == gMainGfxPos) { flag = 1; } - oldGfxPos = gMasterGfxPos; - gMasterGfxPos = *arg0; + oldGfxPos = gMainGfxPos; + gMainGfxPos = *arg0; copied.flags = MODEL_FLAG_HAS_LOCAL_VERTEX_COPY | MODEL_FLAG_FLAG_1; appendGfx_model(&copied); - *arg0 = gMasterGfxPos; + *arg0 = gMainGfxPos; if (flag == 0) { - gMasterGfxPos = oldGfxPos; + gMainGfxPos = oldGfxPos; } } @@ -6254,18 +6254,18 @@ void execute_render_tasks(void) { appendGfx = task->appendGfx; if (task->renderMode & RENDER_TASK_FLAG_REFLECT_FLOOR) { - savedGfxPos = gMasterGfxPos++; + savedGfxPos = gMainGfxPos++; } appendGfx(task->appendGfxArg); if (task->renderMode & RENDER_TASK_FLAG_REFLECT_FLOOR) { - gSPEndDisplayList(gMasterGfxPos++); - gSPBranchList(savedGfxPos, gMasterGfxPos); - gSPDisplayList(gMasterGfxPos++, savedGfxPos + 1); - gSPMatrix(gMasterGfxPos++, dispMtx, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); - gSPDisplayList(gMasterGfxPos++, savedGfxPos + 1); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCamID], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPEndDisplayList(gMainGfxPos++); + gSPBranchList(savedGfxPos, gMainGfxPos); + gSPDisplayList(gMainGfxPos++, savedGfxPos + 1); + gSPMatrix(gMainGfxPos++, dispMtx, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); + gSPDisplayList(gMainGfxPos++, savedGfxPos + 1); + gSPMatrix(gMainGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCamID], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); } } } else { diff --git a/src/background_gfx.c b/src/background_gfx.c index 659b7a6f9c..d26a706f41 100644 --- a/src/background_gfx.c +++ b/src/background_gfx.c @@ -33,9 +33,9 @@ Gfx D_80074230[] = { //extern s32 timeFreezeMode; // TODO bss void gfx_init_state(void) { - gSPSegment(gMasterGfxPos++, 0x00, 0x0); - gSPDisplayList(gMasterGfxPos++, OS_K0_TO_PHYSICAL(D_80074230)); - gSPDisplayList(gMasterGfxPos++, OS_K0_TO_PHYSICAL(D_80074210)); + gSPSegment(gMainGfxPos++, 0x00, 0x0); + gSPDisplayList(gMainGfxPos++, OS_K0_TO_PHYSICAL(D_80074230)); + gSPDisplayList(gMainGfxPos++, OS_K0_TO_PHYSICAL(D_80074210)); } s32 gfx_frame_filter_pass_0(const u16* frameBuffer0, const u16* frameBuffer1, s32 y, s32 x, Color_RGBA8* out) { @@ -279,21 +279,21 @@ void func_80027BAC(s32 arg0, s32 arg1) { s32 i; s32 temp = 24; // todo figure out why this is needed and can't be used elsewhere - gDPPipeSync(gMasterGfxPos++); - gSPTexture(gMasterGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); - gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, arg1); - gDPSetCycleType(gMasterGfxPos++, G_CYC_COPY); - gDPSetTexturePersp(gMasterGfxPos++, G_TP_NONE); - gDPSetTextureLUT(gMasterGfxPos++, G_TT_NONE); - gDPSetRenderMode(gMasterGfxPos++, G_RM_NOOP, G_RM_NOOP2); - gDPSetTextureFilter(gMasterGfxPos++, G_TF_POINT); + gDPPipeSync(gMainGfxPos++); + gSPTexture(gMainGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); + gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, arg1); + gDPSetCycleType(gMainGfxPos++, G_CYC_COPY); + gDPSetTexturePersp(gMainGfxPos++, G_TP_NONE); + gDPSetTextureLUT(gMainGfxPos++, G_TT_NONE); + gDPSetRenderMode(gMainGfxPos++, G_RM_NOOP, G_RM_NOOP2); + gDPSetTextureFilter(gMainGfxPos++, G_TF_POINT); for (i = 0; i < 40; i++) { - gDPLoadTextureTile(gMasterGfxPos++, arg0 + (0xF00 * i), G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, + gDPLoadTextureTile(gMainGfxPos++, arg0 + (0xF00 * i), G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0, SCREEN_WIDTH - 1, 5, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPTextureRectangle(gMasterGfxPos++, 0, i * temp, 0x04FC, (i * 24) + 20, G_TX_RENDERTILE, 0, 0, 0x1000, 0x0400); - gDPPipeSync(gMasterGfxPos++); + gSPTextureRectangle(gMainGfxPos++, 0, i * temp, 0x04FC, (i * 24) + 20, G_TX_RENDERTILE, 0, 0, 0x1000, 0x0400); + gDPPipeSync(gMainGfxPos++); } } @@ -314,7 +314,7 @@ void gfx_draw_background(void) { s32 i; s32 a = SCREEN_COPY_TILE_HEIGHT << 2; - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); camera = &gCameras[gCurrentCameraID]; bgFlags = gGameStatusPtr->backgroundFlags & BACKGROUND_RENDER_STATE_MASK; @@ -322,16 +322,16 @@ void gfx_draw_background(void) { switch (bgFlags) { case BACKGROUND_RENDER_STATE_1: // Save coverage to nunGfxCfb[1] using the VISCVG render mode - gDPPipeSync(gMasterGfxPos++); - gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, nuGfxCfb[1]); - gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); - gDPSetBlendColor(gMasterGfxPos++, 0x80, 0x80, 0x80, 0xFF); - gDPSetPrimDepth(gMasterGfxPos++, 0xFFFF, 0xFFFF); - gDPSetDepthSource(gMasterGfxPos++, G_ZS_PRIM); - gDPSetRenderMode(gMasterGfxPos++, G_RM_VISCVG, G_RM_VISCVG2); - gDPFillRectangle(gMasterGfxPos++, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); - gDPPipeSync(gMasterGfxPos++); - gDPSetDepthSource(gMasterGfxPos++, G_ZS_PIXEL); + gDPPipeSync(gMainGfxPos++); + gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, nuGfxCfb[1]); + gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE); + gDPSetBlendColor(gMainGfxPos++, 0x80, 0x80, 0x80, 0xFF); + gDPSetPrimDepth(gMainGfxPos++, 0xFFFF, 0xFFFF); + gDPSetDepthSource(gMainGfxPos++, G_ZS_PRIM); + gDPSetRenderMode(gMainGfxPos++, G_RM_VISCVG, G_RM_VISCVG2); + gDPFillRectangle(gMainGfxPos++, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); + gDPPipeSync(gMainGfxPos++); + gDPSetDepthSource(gMainGfxPos++, G_ZS_PIXEL); gGameStatusPtr->backgroundFlags &= ~BACKGROUND_RENDER_STATE_MASK; gGameStatusPtr->backgroundFlags |= BACKGROUND_RENDER_STATE_2; break; @@ -349,57 +349,57 @@ void gfx_draw_background(void) { gPauseBackgroundFade = 128; } - gDPPipeSync(gMasterGfxPos++); - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); - gDPSetCycleType(gMasterGfxPos++, G_CYC_FILL); - gDPSetRenderMode(gMasterGfxPos++, G_RM_NOOP, G_RM_NOOP2); - gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, nuGfxCfb_ptr); - gDPSetFillColor(gMasterGfxPos++, PACK_FILL_COLOR(0, 0, 0, 1)); - gDPFillRectangle(gMasterGfxPos++, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); - gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); - gDPSetTexturePersp(gMasterGfxPos++, G_TP_NONE); - gDPSetTextureLUT(gMasterGfxPos++, G_TT_NONE); - gDPSetRenderMode(gMasterGfxPos++, G_RM_OPA_SURF, G_RM_OPA_SURF2); + gDPPipeSync(gMainGfxPos++); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); + gDPSetCycleType(gMainGfxPos++, G_CYC_FILL); + gDPSetRenderMode(gMainGfxPos++, G_RM_NOOP, G_RM_NOOP2); + gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, nuGfxCfb_ptr); + gDPSetFillColor(gMainGfxPos++, PACK_FILL_COLOR(0, 0, 0, 1)); + gDPFillRectangle(gMainGfxPos++, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); + gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE); + gDPSetTexturePersp(gMainGfxPos++, G_TP_NONE); + gDPSetTextureLUT(gMainGfxPos++, G_TT_NONE); + gDPSetRenderMode(gMainGfxPos++, G_RM_OPA_SURF, G_RM_OPA_SURF2); // @bug In 1-cycle mode, the two combiner cycles should be identical. Using Texel1 here in the second cycle, // which is the actual cycle of the combiner used on hardware in 1-cycle mode, actually samples the next // pixel's texel value instead of the current pixel's. This results in a one-pixel offset. - gDPSetCombineLERP(gMasterGfxPos++, PRIMITIVE, TEXEL0, PRIMITIVE_ALPHA, TEXEL0, 0, 0, 0, 1, PRIMITIVE, + gDPSetCombineLERP(gMainGfxPos++, PRIMITIVE, TEXEL0, PRIMITIVE_ALPHA, TEXEL0, 0, 0, 0, 1, PRIMITIVE, TEXEL1, PRIMITIVE_ALPHA, TEXEL1, 0, 0, 0, 1); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 40, 40, 40, gPauseBackgroundFade); - gDPSetTextureFilter(gMasterGfxPos++, G_TF_POINT); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 40, 40, 40, gPauseBackgroundFade); + gDPSetTextureFilter(gMainGfxPos++, G_TF_POINT); for (i = 0; i < 40; i++) { - gDPLoadTextureTile(gMasterGfxPos++, nuGfxZBuffer + (i * SCREEN_WIDTH * SCREEN_COPY_TILE_HEIGHT), G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, + gDPLoadTextureTile(gMainGfxPos++, nuGfxZBuffer + (i * SCREEN_WIDTH * SCREEN_COPY_TILE_HEIGHT), G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0, SCREEN_WIDTH - 1, SCREEN_COPY_TILE_HEIGHT - 1, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); // @bug Due to the previous issue with the incorrect second cycle combiner, the devs added a 1-pixel offset to texture coordinates // in this texrect to compensate for the combiner error. - gSPTextureRectangle(gMasterGfxPos++, + gSPTextureRectangle(gMainGfxPos++, // ulx, uly, lrx, lry 0 << 2, i * a, SCREEN_WIDTH << 2, a + (i * (SCREEN_COPY_TILE_HEIGHT << 2)), // tile G_TX_RENDERTILE, // s, t, dsdx, dtdy -1 << 5, 0 << 5, 1 << 10, 1 << 10); - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } break; default: // Draw the scene's background as normal if (gOverrideFlags & GLOBAL_OVERRIDES_8) { - gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(nuGfxCfb_ptr)); + gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(nuGfxCfb_ptr)); return; } - gDPSetDepthImage(gMasterGfxPos++, OS_K0_TO_PHYSICAL(nuGfxZBuffer)); - gDPSetCycleType(gMasterGfxPos++, G_CYC_FILL); - gDPSetRenderMode(gMasterGfxPos++, G_RM_NOOP, G_RM_NOOP2); - gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, OS_K0_TO_PHYSICAL(nuGfxZBuffer)); - gDPSetFillColor(gMasterGfxPos++, PACK_FILL_DEPTH(G_MAXFBZ, 0)); - gDPFillRectangle(gMasterGfxPos++, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); - gDPPipeSync(gMasterGfxPos++); - gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(nuGfxCfb_ptr)); - gDPSetFillColor(gMasterGfxPos++, PACK_FILL_COLOR(camera->bgColor[0], camera->bgColor[1], camera->bgColor[2], 1)); + gDPSetDepthImage(gMainGfxPos++, OS_K0_TO_PHYSICAL(nuGfxZBuffer)); + gDPSetCycleType(gMainGfxPos++, G_CYC_FILL); + gDPSetRenderMode(gMainGfxPos++, G_RM_NOOP, G_RM_NOOP2); + gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, OS_K0_TO_PHYSICAL(nuGfxZBuffer)); + gDPSetFillColor(gMainGfxPos++, PACK_FILL_DEPTH(G_MAXFBZ, 0)); + gDPFillRectangle(gMainGfxPos++, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); + gDPPipeSync(gMainGfxPos++); + gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(nuGfxCfb_ptr)); + gDPSetFillColor(gMainGfxPos++, PACK_FILL_COLOR(camera->bgColor[0], camera->bgColor[1], camera->bgColor[2], 1)); backgroundMinX = gGameStatusPtr->backgroundMinX; backgroundMaxX = backgroundMinX + gGameStatusPtr->backgroundMaxX; @@ -456,37 +456,37 @@ void gfx_draw_background(void) { } if (!(gGameStatusPtr->backgroundFlags & BACKGROUND_FLAG_TEXTURE)) { - gDPFillRectangle(gMasterGfxPos++, backgroundMinX, backgroundMinY, backgroundMaxX - 1, backgroundMaxY - 1); + gDPFillRectangle(gMainGfxPos++, backgroundMinX, backgroundMinY, backgroundMaxX - 1, backgroundMaxY - 1); } else { appendGfx_background_texture(); } - gDPPipeSync(gMasterGfxPos++); - gDPSetCycleType(gMasterGfxPos++, G_CYC_FILL); - gDPSetRenderMode(gMasterGfxPos++, G_RM_NOOP, G_RM_NOOP2); - gDPSetFillColor(gMasterGfxPos++, PACK_FILL_COLOR(0, 0, 0, 1)); - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); + gDPSetCycleType(gMainGfxPos++, G_CYC_FILL); + gDPSetRenderMode(gMainGfxPos++, G_RM_NOOP, G_RM_NOOP2); + gDPSetFillColor(gMainGfxPos++, PACK_FILL_COLOR(0, 0, 0, 1)); + gDPPipeSync(gMainGfxPos++); if (backgroundMinY > 0) { - gDPFillRectangle(gMasterGfxPos++, 0, 0, SCREEN_WIDTH - 1, backgroundMinY - 1); - gDPNoOp(gMasterGfxPos++); + gDPFillRectangle(gMainGfxPos++, 0, 0, SCREEN_WIDTH - 1, backgroundMinY - 1); + gDPNoOp(gMainGfxPos++); } if (backgroundMinX > 0) { - gDPFillRectangle(gMasterGfxPos++, 0, backgroundMinY, backgroundMinX - 1, backgroundMaxY - 1); - gDPNoOp(gMasterGfxPos++); + gDPFillRectangle(gMainGfxPos++, 0, backgroundMinY, backgroundMinX - 1, backgroundMaxY - 1); + gDPNoOp(gMainGfxPos++); } if (backgroundMaxX < SCREEN_WIDTH) { - gDPFillRectangle(gMasterGfxPos++, backgroundMaxX, backgroundMinY, SCREEN_WIDTH - 1, backgroundMaxY - 1); - gDPNoOp(gMasterGfxPos++); + gDPFillRectangle(gMainGfxPos++, backgroundMaxX, backgroundMinY, SCREEN_WIDTH - 1, backgroundMaxY - 1); + gDPNoOp(gMainGfxPos++); } if (backgroundMaxY < SCREEN_HEIGHT) { - gDPFillRectangle(gMasterGfxPos++, 0, backgroundMaxY, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); - gDPNoOp(gMasterGfxPos++); + gDPFillRectangle(gMainGfxPos++, 0, backgroundMaxY, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); + gDPNoOp(gMainGfxPos++); } break; } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/battle/area/hos/stage/hos_01.c b/src/battle/area/hos/stage/hos_01.c index 1b1257689d..1177229ecd 100644 --- a/src/battle/area/hos/stage/hos_01.c +++ b/src/battle/area/hos/stage/hos_01.c @@ -27,7 +27,7 @@ void N(build_gfx_yellow_stars)(s32 index) { vtx->v.cn[2] = vtx->v.cn[0] * temp3 / 0x10000; } - gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(index)); + gSPDisplayList(gMainGfxPos++, mdl_get_copied_gfx(index)); N(StarPhaseAngles)[index] += (s32)RAD_TO_BINANG(25.1898); } @@ -51,7 +51,7 @@ void N(build_gfx_blue_stars)(s32 index) { colors[2] = colors[0] * temp3 / 0x10000 + 99.6078431372549; } - gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(index)); + gSPDisplayList(gMainGfxPos++, mdl_get_copied_gfx(index)); N(StarPhaseAngles)[index] += (s32)RAD_TO_BINANG(25.1898); } @@ -75,7 +75,7 @@ void N(build_gfx_green_stars)(s32 index) { colors[2] = colors[0] * temp3 / 0x10000 + 59.21568627450981; } - gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(index)); + gSPDisplayList(gMainGfxPos++, mdl_get_copied_gfx(index)); N(StarPhaseAngles)[index] += (s32)RAD_TO_BINANG(25.1898); } @@ -99,7 +99,7 @@ void N(build_gfx_pink_stars)(s32 index) { colors[2] = colors[0] * temp3 / 0x10000 + 96.07843137254902; } - gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(index)); + gSPDisplayList(gMainGfxPos++, mdl_get_copied_gfx(index)); N(StarPhaseAngles)[index] += (s32)RAD_TO_BINANG(25.1898); } diff --git a/src/battle/area/kzn2/actor/lava_piranha.c b/src/battle/area/kzn2/actor/lava_piranha.c index 46e87d2402..eef2277860 100644 --- a/src/battle/area/kzn2/actor/lava_piranha.c +++ b/src/battle/area/kzn2/actor/lava_piranha.c @@ -438,8 +438,8 @@ void func_8021835C_59EA3C(void* data) { N(VineRenderState) = 1; } - gDPPipeSync(gMasterGfxPos++); - gSPDisplayList(gMasterGfxPos++, D_8021CF40_5A3620); + gDPPipeSync(gMainGfxPos++); + gSPDisplayList(gMainGfxPos++, D_8021CF40_5A3620); for (i = 0; i < NUM_VINES; i++) { LavaPiranhaVine* vine = &N(VineData)[i]; @@ -452,10 +452,10 @@ void func_8021835C_59EA3C(void* data) { // here and leave space behind for the gSPBranchList command followed by two vertices // for each point in numPoints - vtxBuffer = (Vtx_t*)(gMasterGfxPos + 1); - gSPBranchList(gMasterGfxPos, &gMasterGfxPos[1 + 2 * (2 * numPoints)]); - vtx = (Vtx_t*) (++gMasterGfxPos); - gMasterGfxPos = &gMasterGfxPos[2 * (2 * numPoints)]; + vtxBuffer = (Vtx_t*)(gMainGfxPos + 1); + gSPBranchList(gMainGfxPos, &gMainGfxPos[1 + 2 * (2 * numPoints)]); + vtx = (Vtx_t*) (++gMainGfxPos); + gMainGfxPos = &gMainGfxPos[2 * (2 * numPoints)]; for (j = 0; j < numPoints; j++) { posX = vine->points[j].x; @@ -505,12 +505,12 @@ void func_8021835C_59EA3C(void* data) { } for (j = 0; j < numPoints - 1; j++) { - gSPVertex(gMasterGfxPos++, &vtxBuffer[2*j], 4, 0); - gSP2Triangles(gMasterGfxPos++, 1, 0, 2, 0, 1, 2, 3, 0); + gSPVertex(gMainGfxPos++, &vtxBuffer[2*j], 4, 0); + gSP2Triangles(gMainGfxPos++, 1, 0, 2, 0, 1, 2, 3, 0); } } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } void N(worker_render_piranha_vines)(void) { diff --git a/src/battle/common/stage/sam_Snowflakes.inc.c b/src/battle/common/stage/sam_Snowflakes.inc.c index 1b5182751c..b45df678c1 100644 --- a/src/battle/common/stage/sam_Snowflakes.inc.c +++ b/src/battle/common/stage/sam_Snowflakes.inc.c @@ -24,7 +24,7 @@ void N(build_gfx_star)(s32 index) { vtx->v.cn[0] = vtx->v.cn[0] * temp3 / 0x10000; } - gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(index)); + gSPDisplayList(gMainGfxPos++, mdl_get_copied_gfx(index)); N(StarAnimPhases)[index] += 0x253; } diff --git a/src/battle/move/item/mystery.c b/src/battle/move/item/mystery.c index 92c1599ff4..f4406ee21d 100644 --- a/src/battle/move/item/mystery.c +++ b/src/battle/move/item/mystery.c @@ -89,7 +89,7 @@ void N(func_802A123C_72C7EC(void)) { if (D_802A25E4 < 6) { if (D_802A25E4 > 0) { draw_box(0, WINDOW_STYLE_7, 106, 86, 0, 36, 36, 255, 0, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, NULL, NULL, NULL, SCREEN_WIDTH, SCREEN_HEIGHT, NULL); - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 108, 90, 139, 118); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, 108, 90, 139, 118); for (i = 0; i < ARRAY_COUNT(D_802A25C8); i++) { id = D_802A25C8[i]; diff --git a/src/battle/move/item/strange_cake.c b/src/battle/move/item/strange_cake.c index 199e766e50..0646a55e2e 100644 --- a/src/battle/move/item/strange_cake.c +++ b/src/battle/move/item/strange_cake.c @@ -52,7 +52,7 @@ void N(func_802A123C_73153C(void)) { if (D_802A2DEC < 6) { if (D_802A2DEC > 0) { draw_box(0, WINDOW_STYLE_7, 106, 86, 0, 36, 36, 255, 0, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, NULL, NULL, NULL, SCREEN_WIDTH, SCREEN_HEIGHT, NULL); - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 108, 90, 139, 118); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, 108, 90, 139, 118); for (i = 0; i < ARRAY_COUNT(D_802A2DD8); i++) { id = D_802A2DD8[i]; diff --git a/src/cd180_len_38f0.c b/src/cd180_len_38f0.c index 034e254bf8..be22f25d12 100644 --- a/src/cd180_len_38f0.c +++ b/src/cd180_len_38f0.c @@ -202,137 +202,137 @@ void _render_transition_stencil(u8 arg0, f32 arg1, ScreenOverlay* overlay) { switch (arg0) { case 0: - gDPPipeSync(gMasterGfxPos++); - gDPSetColorDither(gMasterGfxPos++, G_CD_MAGICSQ); - gDPSetAlphaDither(gMasterGfxPos++, G_AD_PATTERN); - gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); + gDPPipeSync(gMainGfxPos++); + gDPSetColorDither(gMainGfxPos++, G_CD_MAGICSQ); + gDPSetAlphaDither(gMainGfxPos++, G_AD_PATTERN); + gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE); if (arg1 == 255.0f) { - gDPSetRenderMode(gMasterGfxPos++, CVG_DST_SAVE | G_RM_OPA_SURF, CVG_DST_SAVE | G_RM_OPA_SURF2); + gDPSetRenderMode(gMainGfxPos++, CVG_DST_SAVE | G_RM_OPA_SURF, CVG_DST_SAVE | G_RM_OPA_SURF2); } else { - gDPSetRenderMode(gMasterGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); + gDPSetRenderMode(gMainGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); } - gDPSetCombineMode(gMasterGfxPos++, G_CC_PRIMITIVE, G_CC_PRIMITIVE); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, s3, s4, s5, arg1); - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); - gDPFillRectangle(gMasterGfxPos++, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); - gDPSetColorDither(gMasterGfxPos++, G_CD_DISABLE); + gDPSetCombineMode(gMainGfxPos++, G_CC_PRIMITIVE, G_CC_PRIMITIVE); + gDPSetPrimColor(gMainGfxPos++, 0, 0, s3, s4, s5, arg1); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); + gDPFillRectangle(gMainGfxPos++, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); + gDPSetColorDither(gMainGfxPos++, G_CD_DISABLE); return; case 1: - gDPPipeSync(gMasterGfxPos++); - gDPSetColorDither(gMasterGfxPos++, G_CD_MAGICSQ); - gDPSetAlphaDither(gMasterGfxPos++, G_AD_PATTERN); - gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); + gDPPipeSync(gMainGfxPos++); + gDPSetColorDither(gMainGfxPos++, G_CD_MAGICSQ); + gDPSetAlphaDither(gMainGfxPos++, G_AD_PATTERN); + gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE); if (arg1 == 255.0f) { - gDPSetRenderMode(gMasterGfxPos++, CVG_DST_SAVE | G_RM_OPA_SURF, CVG_DST_SAVE | G_RM_OPA_SURF2); + gDPSetRenderMode(gMainGfxPos++, CVG_DST_SAVE | G_RM_OPA_SURF, CVG_DST_SAVE | G_RM_OPA_SURF2); } else { - gDPSetRenderMode(gMasterGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); + gDPSetRenderMode(gMainGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); } - gDPSetCombineMode(gMasterGfxPos++, G_CC_PRIMITIVE, G_CC_PRIMITIVE); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, s3, s4, s5, arg1); - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); - gDPFillRectangle(gMasterGfxPos++, camera->viewportStartX, camera->viewportStartY, + gDPSetCombineMode(gMainGfxPos++, G_CC_PRIMITIVE, G_CC_PRIMITIVE); + gDPSetPrimColor(gMainGfxPos++, 0, 0, s3, s4, s5, arg1); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); + gDPFillRectangle(gMainGfxPos++, camera->viewportStartX, camera->viewportStartY, camera->viewportStartX + camera->viewportW, camera->viewportStartY + camera->viewportH); - gDPSetColorDither(gMasterGfxPos++, G_CD_DISABLE); + gDPSetColorDither(gMainGfxPos++, G_CD_DISABLE); return; } guOrtho(&matrixStack[gMatrixListPos], 0.0f, 320.0f, 0.0f, 240.0f, -1000.0f, 1000.0f, 1.0f); - gSPMatrix(gMasterGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gMainGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); switch (arg0) { case 4: - gSPDisplayList(gMasterGfxPos++, Gfx_LoadStencilTex_Mario); + gSPDisplayList(gMainGfxPos++, Gfx_LoadStencilTex_Mario); func_80139F10(160, 120, arg1, s3, s4, s5, arg1 * f28 / 255.0f, gCurrentCameraID); break; case 7: - gSPDisplayList(gMasterGfxPos++, Gfx_LoadStencilTex_Mario); + gSPDisplayList(gMainGfxPos++, Gfx_LoadStencilTex_Mario); func_80139F10(160, 120, arg1, s3, s4, s5, arg1 * f28 / 255.0f, -1); break; case 5: - gSPDisplayList(gMasterGfxPos++, Gfx_LoadStencilTex_Star); + gSPDisplayList(gMainGfxPos++, Gfx_LoadStencilTex_Star); func_80139F10(160, 120, arg1, s3, s4, s5, arg1 * f28 / 255.0f, gCurrentCameraID); break; case 8: - gSPDisplayList(gMasterGfxPos++, Gfx_LoadStencilTex_Star); + gSPDisplayList(gMainGfxPos++, Gfx_LoadStencilTex_Star); func_80139F10(160, 120, arg1, s3, s4, s5, arg1 * f28 / 255.0f, -1); break; case 3: - gSPDisplayList(gMasterGfxPos++, Gfx_LoadStencilTex_SharpCircle); + gSPDisplayList(gMainGfxPos++, Gfx_LoadStencilTex_SharpCircle); func_80139F10(s1, s2, arg1, 0, 0, 0, 0, gCurrentCameraID); break; case 6: - gSPDisplayList(gMasterGfxPos++, Gfx_LoadStencilTex_SharpCircle); + gSPDisplayList(gMainGfxPos++, Gfx_LoadStencilTex_SharpCircle); func_80139F10(s1, s2, arg1, 0, 0, 0, 0, -1); break; case 2: s0 = arg1; guTranslate(&matrixStack[gMatrixListPos], 80.0f, 120.0f, 0.0f); - gSPMatrix(gMasterGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); guScale(&matrixStack[gMatrixListPos], (1.0f - s0 / 255.0f) * 0.8, (1.0f - s0 / 255.0f) * 0.8, 1.0f); - gSPMatrix(gMasterGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); guRotate(&matrixStack[gMatrixListPos], s0 * 0.5f, 0.0f, 0.0f, 1.0f); - gSPMatrix(gMasterGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_8014E8F0); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_8014E8F0); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); guTranslate(&matrixStack[gMatrixListPos], 240.0f, 120.0f, 0.0f); - gSPMatrix(gMasterGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); guScale(&matrixStack[gMatrixListPos], (1.0f - s0 / 255.0f) * 0.8, (1.0f - s0 / 255.0f) * 0.8, 1.0f); - gSPMatrix(gMasterGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); guRotate(&matrixStack[gMatrixListPos], s0 * 0.5f, 0.0f, 0.0f, 1.0f); - gSPMatrix(gMasterGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_8014E8F0); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_8014E8F0); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); guTranslate(&matrixStack[gMatrixListPos], 0.0f, 0.0f, 0.0f); - gSPMatrix(gMasterGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_8014EA48); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_8014EA48); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); break; case 9: s0 = arg1; - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, 0); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, 0); guTranslate(&matrixStack[gMatrixListPos], s1, SCREEN_HEIGHT - s2, 0.0f); - gSPMatrix(gMasterGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); guScale(&matrixStack[gMatrixListPos], (1.0f - s0 / 255.0f) * 0.8, (1.0f - s0 / 255.0f) * 0.8, 1.0f); - gSPMatrix(gMasterGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); guRotate(&matrixStack[gMatrixListPos], -s0, 0.0f, 0.0f, 1.0f); - gSPMatrix(gMasterGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_8014E8F0); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_8014E8F0); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); guTranslate(&matrixStack[gMatrixListPos], s6, SCREEN_HEIGHT - s7, 0.0f); - gSPMatrix(gMasterGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); guScale(&matrixStack[gMatrixListPos], (1.0f - s0 / 255.0f) * 0.8, (1.0f - s0 / 255.0f) * 0.8, 1.0f); - gSPMatrix(gMasterGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); guRotate(&matrixStack[gMatrixListPos], -s0, 0.0f, 0.0f, 1.0f); - gSPMatrix(gMasterGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_8014E8F0); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_8014E8F0); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); guTranslate(&matrixStack[gMatrixListPos], 0.0f, 0.0f, 0.0f); - gSPMatrix(gMasterGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, f28); - gSPDisplayList(gMasterGfxPos++, D_8014E9A8); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, f28); + gSPDisplayList(gMainGfxPos++, D_8014E9A8); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); break; case 10: s0 = arg1; - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, 0); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, 0); guTranslate(&matrixStack[gMatrixListPos], s1, SCREEN_HEIGHT - s2, 0.0f); - gSPMatrix(gMasterGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); guScale(&matrixStack[gMatrixListPos], (1.0f - s0 / 255.0f) * 0.8, (1.0f - s0 / 255.0f) * 0.8, 1.0f); - gSPMatrix(gMasterGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); guRotate(&matrixStack[gMatrixListPos], (f32)(-s0) * 0.5, 0.0f, 0.0f, 1.0f); - gSPMatrix(gMasterGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_8014E8F0); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_8014E8F0); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); guTranslate(&matrixStack[gMatrixListPos], 0.0f, 0.0f, 0.0f); - gSPMatrix(gMasterGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, f28); - gSPDisplayList(gMasterGfxPos++, D_8014E9A8); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, f28); + gSPDisplayList(gMainGfxPos++, D_8014E9A8); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); v0 = arg1 + 40; if (arg1 > 170) { v0 = 170; @@ -340,14 +340,14 @@ void _render_transition_stencil(u8 arg0, f32 arg1, ScreenOverlay* overlay) { func_80138D88(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1, v0); break; case 11: - gSPDisplayList(gMasterGfxPos++, Gfx_LoadStencilTex_BlurryCircle); + gSPDisplayList(gMainGfxPos++, Gfx_LoadStencilTex_BlurryCircle); func_80138E54(1, s6, s7, f28, arg1); break; case 12: func_80138D88(s1, s2, s6, s7, arg1); break; case 13: - gSPDisplayList(gMasterGfxPos++, Gfx_LoadStencilTex_BlurryCircle); + gSPDisplayList(gMainGfxPos++, Gfx_LoadStencilTex_BlurryCircle); func_80138E54(0, s1, s2, f28, arg1); break; case 14: @@ -355,7 +355,7 @@ void _render_transition_stencil(u8 arg0, f32 arg1, ScreenOverlay* overlay) { break; } - gSPMatrix(gMasterGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCameraID], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gMainGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCameraID], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); } void set_screen_overlay_params_front(u8 type, f32 zoom) { diff --git a/src/curtains.c b/src/curtains.c index 81ea85b344..9e51d70139 100644 --- a/src/curtains.c +++ b/src/curtains.c @@ -228,14 +228,14 @@ void render_curtains(void) { f32 scale; s8 rgb; - gDPPipeSync(gMasterGfxPos++); - gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(nuGfxCfb_ptr)); - gSPDisplayList(gMasterGfxPos++, &D_800760C0); + gDPPipeSync(gMainGfxPos++); + gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(nuGfxCfb_ptr)); + gSPDisplayList(gMainGfxPos++, &D_800760C0); guFrustumF(m, -80.0f, 80.0f, -60.0f, 60.0f, 160.0f, 640.0f, 1.0f); guMtxF2L(m, &D_8009BAA8[0]); - gSPMatrix(gMasterGfxPos++, &D_8009BAA8[0], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gMainGfxPos++, &D_8009BAA8[0], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); scale = gCurtainScale - 0.01; if (scale < 1.0f) { @@ -246,12 +246,12 @@ void render_curtains(void) { guMtxF2L(m, &D_8009BAA8[1]); - gSPMatrix(gMasterGfxPos++, &D_8009BAA8[1], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &D_8009BAA8[1], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); rgb = 255.0f - (gCurtainFade * 255.0f); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, rgb, rgb, rgb, 255); - gSPDisplayList(gMasterGfxPos++, &D_80076078); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPPipeSync(gMasterGfxPos++); + gDPSetPrimColor(gMainGfxPos++, 0, 0, rgb, rgb, rgb, 255); + gSPDisplayList(gMainGfxPos++, &D_80076078); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMainGfxPos++); } if (gCurtainDrawCallback != NULL) { @@ -268,10 +268,10 @@ void render_curtains(void) { alpha = 255; } - gSPDisplayList(gMasterGfxPos++, &D_800760C0); - gSPDisplayList(gMasterGfxPos++, &D_80077140); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0xFF, 0x20, 0x10, alpha); - gSPDisplayList(gMasterGfxPos++, &D_800771E8); + gSPDisplayList(gMainGfxPos++, &D_800760C0); + gSPDisplayList(gMainGfxPos++, &D_80077140); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0xFF, 0x20, 0x10, alpha); + gSPDisplayList(gMainGfxPos++, &D_800771E8); } } } diff --git a/src/d0a70_len_4fe0.c b/src/d0a70_len_4fe0.c index d6db74250d..f08eec6a1f 100644 --- a/src/d0a70_len_4fe0.c +++ b/src/d0a70_len_4fe0.c @@ -724,18 +724,18 @@ void func_8013B1B0(FoldState* state, Matrix4f mtx) { s32 t1; s32 t2; - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); if (!(state->flags & FOLD_STATE_FLAG_10)) { - gSPDisplayList(gMasterGfxPos++, DefaultFoldSetupGfx); + gSPDisplayList(gMainGfxPos++, DefaultFoldSetupGfx); if (state->flags & FOLD_STATE_FLAG_NO_FILTERING) { - gDPSetTextureFilter(gMasterGfxPos++, G_TF_POINT); + gDPSetTextureFilter(gMainGfxPos++, G_TF_POINT); } if (state->flags & FOLD_STATE_FLAG_G_CULL_BACK) { - gSPSetGeometryMode(gMasterGfxPos++, G_CULL_BACK); + gSPSetGeometryMode(gMainGfxPos++, G_CULL_BACK); } if (state->flags & FOLD_STATE_FLAG_G_CULL_FRONT) { - gSPSetGeometryMode(gMasterGfxPos++, G_CULL_FRONT); + gSPSetGeometryMode(gMainGfxPos++, G_CULL_FRONT); } fold = &D_8014EE98[state->renderType]; @@ -777,9 +777,9 @@ void func_8013B1B0(FoldState* state, Matrix4f mtx) { } if (state->flags & FOLD_STATE_FLAG_40) { - gSPClearGeometryMode(gMasterGfxPos++, G_ZBUFFER); + gSPClearGeometryMode(gMainGfxPos++, G_ZBUFFER); } else { - gSPSetGeometryMode(gMasterGfxPos++, G_ZBUFFER); + gSPSetGeometryMode(gMainGfxPos++, G_ZBUFFER); if (cond) { mode1 |= 0x10; mode2 |= 0x10; @@ -789,77 +789,77 @@ void func_8013B1B0(FoldState* state, Matrix4f mtx) { } } state->unk_78 = mode2; - gDPSetRenderMode(gMasterGfxPos++, mode1, mode2); + gDPSetRenderMode(gMainGfxPos++, mode1, mode2); switch (renderType) { case FOLD_RENDER_TYPE_1: - gDPSetCombineMode(gMasterGfxPos++, G_CC_MODULATEIDECALA_PRIM, G_CC_MODULATEIDECALA_PRIM); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, state->unk_1C[1][0], state->unk_1C[1][1], state->unk_1C[1][2], 0); + gDPSetCombineMode(gMainGfxPos++, G_CC_MODULATEIDECALA_PRIM, G_CC_MODULATEIDECALA_PRIM); + gDPSetPrimColor(gMainGfxPos++, 0, 0, state->unk_1C[1][0], state->unk_1C[1][1], state->unk_1C[1][2], 0); break; case FOLD_RENDER_TYPE_2: if (primColor <= 0) { return; } - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0, + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, primColor); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, primColor); break; case FOLD_RENDER_TYPE_3: if (primColor <= 0) { return; } - gDPSetCombineMode(gMasterGfxPos++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, state->unk_1C[1][0], state->unk_1C[1][1], + gDPSetCombineMode(gMainGfxPos++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); + gDPSetPrimColor(gMainGfxPos++, 0, 0, state->unk_1C[1][0], state->unk_1C[1][1], state->unk_1C[1][2], primColor); break; case FOLD_RENDER_TYPE_4: - gDPSetCombineLERP(gMasterGfxPos++, 1, PRIMITIVE, TEXEL0, PRIMITIVE, 0, 0, 0, TEXEL0, 1, PRIMITIVE, + gDPSetCombineLERP(gMainGfxPos++, 1, PRIMITIVE, TEXEL0, PRIMITIVE, 0, 0, 0, TEXEL0, 1, PRIMITIVE, TEXEL0, PRIMITIVE, 0, 0, 0, TEXEL0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, state->unk_1C[1][0], state->unk_1C[1][1], state->unk_1C[1][2], 0); + gDPSetPrimColor(gMainGfxPos++, 0, 0, state->unk_1C[1][0], state->unk_1C[1][1], state->unk_1C[1][2], 0); break; case FOLD_RENDER_TYPE_5: if (primColor <= 0) { return; } - gDPSetCombineLERP(gMasterGfxPos++, 1, 0, TEXEL0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 1, 0, TEXEL0, + gDPSetCombineLERP(gMainGfxPos++, 1, 0, TEXEL0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 1, 0, TEXEL0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, state->unk_1C[1][0], state->unk_1C[1][1], + gDPSetPrimColor(gMainGfxPos++, 0, 0, state->unk_1C[1][0], state->unk_1C[1][1], state->unk_1C[1][2], primColor); break; case FOLD_RENDER_TYPE_6: - gDPSetCombineMode(gMasterGfxPos++, G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA); - gSPSetGeometryMode(gMasterGfxPos++, G_SHADE | G_SHADING_SMOOTH); - gSPClearGeometryMode(gMasterGfxPos++, G_LIGHTING); + gDPSetCombineMode(gMainGfxPos++, G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA); + gSPSetGeometryMode(gMainGfxPos++, G_SHADE | G_SHADING_SMOOTH); + gSPClearGeometryMode(gMainGfxPos++, G_LIGHTING); break; case FOLD_RENDER_TYPE_9: - gDPSetCombineLERP(gMasterGfxPos++, 1, SHADE, TEXEL0, SHADE, 0, 0, 0, TEXEL0, 1, SHADE, TEXEL0, SHADE, + gDPSetCombineLERP(gMainGfxPos++, 1, SHADE, TEXEL0, SHADE, 0, 0, 0, TEXEL0, 1, SHADE, TEXEL0, SHADE, 0, 0, 0, TEXEL0); - gSPSetGeometryMode(gMasterGfxPos++, G_SHADE | G_SHADING_SMOOTH); - gSPClearGeometryMode(gMasterGfxPos++, G_LIGHTING); + gSPSetGeometryMode(gMainGfxPos++, G_SHADE | G_SHADING_SMOOTH); + gSPClearGeometryMode(gMainGfxPos++, G_LIGHTING); break; case FOLD_RENDER_TYPE_7: - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, TEXEL0, TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, TEXEL0, TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, SHADE, 0); - gSPSetGeometryMode(gMasterGfxPos++, G_SHADE | G_SHADING_SMOOTH); - gSPClearGeometryMode(gMasterGfxPos++, G_LIGHTING); + gSPSetGeometryMode(gMainGfxPos++, G_SHADE | G_SHADING_SMOOTH); + gSPClearGeometryMode(gMainGfxPos++, G_LIGHTING); break; case FOLD_RENDER_TYPE_8: - gDPSetCombineMode(gMasterGfxPos++, G_CC_MODULATEIA, G_CC_MODULATEIA); - gSPSetGeometryMode(gMasterGfxPos++, G_SHADE | G_SHADING_SMOOTH); - gSPClearGeometryMode(gMasterGfxPos++, G_LIGHTING); + gDPSetCombineMode(gMainGfxPos++, G_CC_MODULATEIA, G_CC_MODULATEIA); + gSPSetGeometryMode(gMainGfxPos++, G_SHADE | G_SHADING_SMOOTH); + gSPClearGeometryMode(gMainGfxPos++, G_LIGHTING); break; case FOLD_RENDER_TYPE_A: - gDPSetCombineLERP(gMasterGfxPos++, 1, SHADE, TEXEL0, SHADE, TEXEL0, 0, SHADE, 0, 1, SHADE, TEXEL0, + gDPSetCombineLERP(gMainGfxPos++, 1, SHADE, TEXEL0, SHADE, TEXEL0, 0, SHADE, 0, 1, SHADE, TEXEL0, SHADE, TEXEL0, 0, SHADE, 0); - gSPSetGeometryMode(gMasterGfxPos++, G_SHADE | G_SHADING_SMOOTH); - gSPClearGeometryMode(gMasterGfxPos++, G_LIGHTING); + gSPSetGeometryMode(gMainGfxPos++, G_SHADE | G_SHADING_SMOOTH); + gSPClearGeometryMode(gMainGfxPos++, G_LIGHTING); break; case FOLD_RENDER_TYPE_B: if (state->flags & (FOLD_STATE_FLAG_2000 | FOLD_STATE_FLAG_8000)) { Camera* currentCam = &gCameras[gCurrentCameraID]; - gDPSetCombineMode(gMasterGfxPos++, G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA); - gSPSetGeometryMode(gMasterGfxPos++, G_SHADE | G_LIGHTING | G_SHADING_SMOOTH); + gDPSetCombineMode(gMainGfxPos++, G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA); + gSPSetGeometryMode(gMainGfxPos++, G_SHADE | G_LIGHTING | G_SHADING_SMOOTH); angle1 = cosine(currentCam->currentYaw) * 120.0f; angle2 = cosine(currentCam->currentYaw + 90.0f) * 120.0f; @@ -869,24 +869,24 @@ void func_8013B1B0(FoldState* state, Matrix4f mtx) { D_8014EE18.l[1].l.dir[0] = angle1; D_8014EE18.l[0].l.dir[2] = angle2; D_8014EE18.l[1].l.dir[2] = t2; - gSPSetLights2(gMasterGfxPos++, D_8014EE18); + gSPSetLights2(gMainGfxPos++, D_8014EE18); break; } - gDPSetCombineMode(gMasterGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); + gDPSetCombineMode(gMainGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); break; case FOLD_RENDER_TYPE_C: if (state->unk_1C[1][0] == 0) { primColor = state->unk_1C[1][3] * alphaComp; - gDPSetCombineLERP(gMasterGfxPos++, NOISE, PRIMITIVE, PRIMITIVE, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, + gDPSetCombineLERP(gMainGfxPos++, NOISE, PRIMITIVE, PRIMITIVE, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, NOISE, PRIMITIVE, PRIMITIVE, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, state->unk_1C[1][1], state->unk_1C[1][1], + gDPSetPrimColor(gMainGfxPos++, 0, 0, state->unk_1C[1][1], state->unk_1C[1][1], state->unk_1C[1][1],primColor); } else if (state->unk_1C[1][0] == 1) { primColor = state->unk_1C[1][3] * alphaComp; - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0, + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, primColor); - gDPSetAlphaCompare(gMasterGfxPos++, G_AC_DITHER); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, primColor); + gDPSetAlphaCompare(gMainGfxPos++, G_AC_DITHER); } else if (state->unk_1C[1][0] == 2) { blendColor = state->unk_1C[1][3] + state->unk_1C[1][1]; if (blendColor > 255) { @@ -894,28 +894,28 @@ void func_8013B1B0(FoldState* state, Matrix4f mtx) { } primColor = state->unk_1C[1][3] * alphaComp; - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0, + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); - gDPSetAlphaDither(gMasterGfxPos++, G_AD_NOISE); - gDPSetAlphaCompare(gMasterGfxPos++, G_AC_THRESHOLD); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, primColor); - gDPSetBlendColor(gMasterGfxPos++, 0, 0, 0, blendColor); + gDPSetAlphaDither(gMainGfxPos++, G_AD_NOISE); + gDPSetAlphaCompare(gMainGfxPos++, G_AC_THRESHOLD); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, primColor); + gDPSetBlendColor(gMainGfxPos++, 0, 0, 0, blendColor); } break; case FOLD_RENDER_TYPE_D: - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, PRIMITIVE, 0, 0, 0, TEXEL0, 0, 0, 0, PRIMITIVE, 0, 0, 0, + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, PRIMITIVE, 0, 0, 0, TEXEL0, 0, 0, 0, PRIMITIVE, 0, 0, 0, TEXEL0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, state->unk_1C[1][0], state->unk_1C[1][1], state->unk_1C[1][2], 0); + gDPSetPrimColor(gMainGfxPos++, 0, 0, state->unk_1C[1][0], state->unk_1C[1][1], state->unk_1C[1][2], 0); break; case FOLD_RENDER_TYPE_0: case FOLD_RENDER_TYPE_E: case FOLD_RENDER_TYPE_10: - gDPSetCombineMode(gMasterGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); + gDPSetCombineMode(gMainGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); break; case FOLD_RENDER_TYPE_F: - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, state->unk_1C[1][1]); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, state->unk_1C[1][1]); break; } } @@ -933,16 +933,16 @@ void func_8013B1B0(FoldState* state, Matrix4f mtx) { break; case FOLD_MESH_TYPE_4: func_8013CFA8(state, mtx); - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); func_8013E904(state, mtx); break; } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); if (state->renderType == FOLD_RENDER_TYPE_C) { - gDPSetAlphaCompare(gMasterGfxPos++, G_AC_NONE); - gDPSetAlphaDither(gMasterGfxPos++, G_AD_DISABLE); + gDPSetAlphaCompare(gMainGfxPos++, G_AC_NONE); + gDPSetAlphaDither(gMainGfxPos++, G_AD_DISABLE); } } @@ -1326,8 +1326,8 @@ void func_8013CFA8(FoldState* state, Matrix4f mtx) { s32 i; if (!(state->flags & FOLD_STATE_FLAG_20)) { - gDPSetTextureLUT(gMasterGfxPos++, G_TT_RGBA16); - gDPLoadTLUT_pal16(gMasterGfxPos++, 0, fold_currentImage->palette); + gDPSetTextureLUT(gMainGfxPos++, G_TT_RGBA16); + gDPLoadTLUT_pal16(gMainGfxPos++, 0, fold_currentImage->palette); } i = state->firstVtxIdx; @@ -1351,7 +1351,7 @@ void func_8013CFA8(FoldState* state, Matrix4f mtx) { || state->renderType == FOLD_RENDER_TYPE_F || state->renderType == FOLD_RENDER_TYPE_7) ) { - gDPScrollMultiTile2_4b(gMasterGfxPos++, + gDPScrollMultiTile2_4b(gMainGfxPos++, fold_currentImage->raster, G_IM_FMT_CI, fold_currentImage->width, fold_currentImage->height, // img size uls, ult, // top left @@ -1361,10 +1361,10 @@ void func_8013CFA8(FoldState* state, Matrix4f mtx) { 8, 8, // mask G_TX_NOLOD, G_TX_NOLOD, // shift, 0x100, 0x100); // scroll - gDPSetTile(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 4, 0x0100, 2, 0, + gDPSetTile(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 4, 0x0100, 2, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); - gDPSetTileSize(gMasterGfxPos++, 2, 0, 0, 252, 0); + gDPSetTileSize(gMainGfxPos++, 2, 0, 0, 252, 0); alpha = 255; switch (state->renderType) { @@ -1383,29 +1383,29 @@ void func_8013CFA8(FoldState* state, Matrix4f mtx) { cam = &gCameras[gCurrentCamID]; if (gGameStatusPtr->isBattle == 2) { - gSPViewport(gMasterGfxPos++, &D_8014EE50); + gSPViewport(gMainGfxPos++, &D_8014EE50); } else { - gSPViewport(gMasterGfxPos++, &cam->vpAlt); + gSPViewport(gMainGfxPos++, &cam->vpAlt); } - gDPSetRenderMode(gMasterGfxPos++, G_RM_PASS, state->unk_78); + gDPSetRenderMode(gMainGfxPos++, G_RM_PASS, state->unk_78); if (alpha == -1) { - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, 0, SHADE, 0, TEXEL1, 0, 0, 0, 0, 0, 0, + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, 0, SHADE, 0, TEXEL1, 0, 0, 0, 0, 0, 0, 0, 0, COMBINED); } else { - gDPSetEnvColor(gMasterGfxPos++, 0, 0, 0, alpha); - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, 0, ENVIRONMENT, 0, TEXEL1, 0, 0, 0, 0, + gDPSetEnvColor(gMainGfxPos++, 0, 0, 0, alpha); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, 0, ENVIRONMENT, 0, TEXEL1, 0, 0, 0, 0, 0, 0, 0, 0, COMBINED); } - gSPVertex(gMasterGfxPos++, &fold_vtxBuf[i], 4, 0); - gSP2Triangles(gMasterGfxPos++, 0, 2, 1, 0, 1, 2, 3, 0); - gDPPipeSync(gMasterGfxPos++); + gSPVertex(gMainGfxPos++, &fold_vtxBuf[i], 4, 0); + gSP2Triangles(gMainGfxPos++, 0, 2, 1, 0, 1, 2, 3, 0); + gDPPipeSync(gMainGfxPos++); } create_shading_palette(mtx, uls, ult, lrs, lrt, alpha, state->unk_78); } else { - gDPScrollTextureTile_4b(gMasterGfxPos++, + gDPScrollTextureTile_4b(gMainGfxPos++, fold_currentImage->raster, G_IM_FMT_CI, fold_currentImage->width, fold_currentImage->height, // img size uls, ult, // top left @@ -1421,15 +1421,15 @@ void func_8013CFA8(FoldState* state, Matrix4f mtx) { cam = &gCameras[gCurrentCamID]; if (gGameStatusPtr->isBattle == 2) { - gSPViewport(gMasterGfxPos++, &D_8014EE50); + gSPViewport(gMainGfxPos++, &D_8014EE50); } else { - gSPViewport(gMasterGfxPos++, &cam->vpAlt); + gSPViewport(gMainGfxPos++, &cam->vpAlt); } if (alpha2 == 255) { - gDPSetRenderMode(gMasterGfxPos++, G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2); + gDPSetRenderMode(gMainGfxPos++, G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2); } else { - gDPSetRenderMode(gMasterGfxPos++, G_RM_ZB_XLU_SURF, G_RM_ZB_XLU_SURF2); + gDPSetRenderMode(gMainGfxPos++, G_RM_ZB_XLU_SURF, G_RM_ZB_XLU_SURF2); } switch (state->renderType) { @@ -1446,28 +1446,28 @@ void func_8013CFA8(FoldState* state, Matrix4f mtx) { } if (alpha2 == -1) { - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, 0, SHADE, 0, TEXEL0, 0, 0, 0, 0, 0, SHADE, 0, TEXEL0, 0); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, 0, SHADE, 0, TEXEL0, 0, 0, 0, 0, 0, SHADE, 0, TEXEL0, 0); } else { - gDPSetEnvColor(gMasterGfxPos++, 0, 0, 0, alpha2); - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, 0, ENVIRONMENT, 0, TEXEL0, 0, 0, 0, 0, 0, + gDPSetEnvColor(gMainGfxPos++, 0, 0, 0, alpha2); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, 0, ENVIRONMENT, 0, TEXEL0, 0, 0, 0, 0, 0, ENVIRONMENT, 0, TEXEL0, 0); } - gSPVertex(gMasterGfxPos++, &fold_vtxBuf[i], 4, 0); - gSP2Triangles(gMasterGfxPos++, 0, 2, 1, 0, 1, 2, 3, 0); - gDPPipeSync(gMasterGfxPos++); + gSPVertex(gMainGfxPos++, &fold_vtxBuf[i], 4, 0); + gSP2Triangles(gMainGfxPos++, 0, 2, 1, 0, 1, 2, 3, 0); + gDPPipeSync(gMainGfxPos++); if (alpha2 == 255) { - gDPSetRenderMode(gMasterGfxPos++, G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2); + gDPSetRenderMode(gMainGfxPos++, G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2); } else { - gDPSetRenderMode(gMasterGfxPos++, G_RM_ZB_XLU_SURF, G_RM_ZB_XLU_SURF2); + gDPSetRenderMode(gMainGfxPos++, G_RM_ZB_XLU_SURF, G_RM_ZB_XLU_SURF2); } - gDPSetEnvColor(gMasterGfxPos++, 100, 100, 100, 255); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, alpha2); - gDPSetCombineLERP(gMasterGfxPos++, SHADE, ENVIRONMENT, TEXEL0, TEXEL0, 0, 0, 0, TEXEL0, SHADE, + gDPSetEnvColor(gMainGfxPos++, 100, 100, 100, 255); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, alpha2); + gDPSetCombineLERP(gMainGfxPos++, SHADE, ENVIRONMENT, TEXEL0, TEXEL0, 0, 0, 0, TEXEL0, SHADE, ENVIRONMENT, TEXEL0, TEXEL0, 0, 0, 0, TEXEL0); - gDPSetColorDither(gMasterGfxPos++, G_CD_MAGICSQ); + gDPSetColorDither(gMainGfxPos++, G_CD_MAGICSQ); } } } @@ -1475,16 +1475,16 @@ void func_8013CFA8(FoldState* state, Matrix4f mtx) { if ((gSpriteShadingProfile->flags & 2) && D_80156954[0][0].arrayIdx != 0 && (state->flags & someFlags)) { cam = &gCameras[gCurrentCamID]; if (gGameStatusPtr->isBattle == 2) { - gSPViewport(gMasterGfxPos++, &D_8014EE40); + gSPViewport(gMainGfxPos++, &D_8014EE40); D_8014EE50.vp.vtrans[0] = D_8014EE40.vp.vtrans[0] + gGameStatusPtr->unk_82; D_8014EE50.vp.vtrans[1] = D_8014EE40.vp.vtrans[1] + gGameStatusPtr->unk_83; } else { - gSPViewport(gMasterGfxPos++, &cam->vp); + gSPViewport(gMainGfxPos++, &cam->vp); } } - gSPVertex(gMasterGfxPos++, &fold_vtxBuf[i], 4, 0); - gSP2Triangles(gMasterGfxPos++, 0, 2, 1, 0, 1, 2, 3, 0); + gSPVertex(gMainGfxPos++, &fold_vtxBuf[i], 4, 0); + gSP2Triangles(gMainGfxPos++, 0, 2, 1, 0, 1, 2, 3, 0); if (i + 3 >= state->lastVtxIdx) { break; @@ -1499,8 +1499,8 @@ void func_8013DAB4(FoldState* state, Matrix4f mtx) { s32 firstVtxIdx; if (!(state->flags & FOLD_STATE_FLAG_20)) { - gDPSetTextureLUT(gMasterGfxPos++, G_TT_RGBA16); - gDPLoadTLUT_pal16(gMasterGfxPos++, 0, fold_currentImage->palette); + gDPSetTextureLUT(gMainGfxPos++, G_TT_RGBA16); + gDPLoadTLUT_pal16(gMainGfxPos++, 0, fold_currentImage->palette); } firstVtxIdx = state->firstVtxIdx; @@ -1518,7 +1518,7 @@ void func_8013DAB4(FoldState* state, Matrix4f mtx) { || state->renderType == FOLD_RENDER_TYPE_2 || state->renderType == FOLD_RENDER_TYPE_7)) { s32 alpha = 255; - gDPScrollMultiTile2_4b(gMasterGfxPos++, + gDPScrollMultiTile2_4b(gMainGfxPos++, fold_currentImage->raster, G_IM_FMT_CI, fold_currentImage->width, fold_currentImage->height, // img size (fold_vtxBuf[ulIdx].v.tc[0] >> 5) - 0x100, (fold_vtxBuf[ulIdx].v.tc[1] >> 5) - 0x100, // top left @@ -1528,8 +1528,8 @@ void func_8013DAB4(FoldState* state, Matrix4f mtx) { 8, 8, // mask G_TX_NOLOD, G_TX_NOLOD, // shift, 0x100, 0x100); // scroll - gDPSetTile(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 4, 0x0100, 2, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); - gDPSetTileSize(gMasterGfxPos++, 2, 0, 0, 63 << 2, 0); + gDPSetTile(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 4, 0x0100, 2, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); + gDPSetTileSize(gMainGfxPos++, 2, 0, 0, 63 << 2, 0); switch (state->renderType) { case FOLD_RENDER_TYPE_0: alpha = 255; @@ -1547,7 +1547,7 @@ void func_8013DAB4(FoldState* state, Matrix4f mtx) { (fold_vtxBuf[lrIdx].v.tc[0] >> 5) - 0x100, (fold_vtxBuf[lrIdx].v.tc[1] >> 5) - 0x100, alpha, state->unk_78); } else { - gDPScrollTextureTile_4b(gMasterGfxPos++, + gDPScrollTextureTile_4b(gMainGfxPos++, fold_currentImage->raster, G_IM_FMT_CI, fold_currentImage->width, fold_currentImage->height, // img size (fold_vtxBuf[ulIdx].v.tc[0] >> 5) - 0x100, (fold_vtxBuf[ulIdx].v.tc[1] >> 5) - 0x100, // top left @@ -1560,11 +1560,11 @@ void func_8013DAB4(FoldState* state, Matrix4f mtx) { } } - gSPVertex(gMasterGfxPos++, &fold_vtxBuf[ulIdx], 1, 0); - gSPVertex(gMasterGfxPos++, &fold_vtxBuf[urIdx], 1, 1); - gSPVertex(gMasterGfxPos++, &fold_vtxBuf[llIdx], 1, 2); - gSPVertex(gMasterGfxPos++, &fold_vtxBuf[lrIdx], 1, 3); - gSP2Triangles(gMasterGfxPos++, 0, 2, 1, 0, 1, 2, 3, 0); + gSPVertex(gMainGfxPos++, &fold_vtxBuf[ulIdx], 1, 0); + gSPVertex(gMainGfxPos++, &fold_vtxBuf[urIdx], 1, 1); + gSPVertex(gMainGfxPos++, &fold_vtxBuf[llIdx], 1, 2); + gSPVertex(gMainGfxPos++, &fold_vtxBuf[lrIdx], 1, 3); + gSP2Triangles(gMainGfxPos++, 0, 2, 1, 0, 1, 2, 3, 0); } } } @@ -1575,11 +1575,11 @@ void func_8013E2F0(FoldState* state, Matrix4f mtx) { } guScale(&gDisplayContext->matrixStack[gMatrixListPos], 0.1f, 0.1f, 0.1f); - gSPMatrix(gMasterGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); if (!(state->flags & FOLD_STATE_FLAG_20)) { - gDPSetTextureLUT(gMasterGfxPos++, G_TT_RGBA16); - gDPLoadTLUT_pal16(gMasterGfxPos++, 0, fold_currentImage->palette); + gDPSetTextureLUT(gMainGfxPos++, G_TT_RGBA16); + gDPLoadTLUT_pal16(gMainGfxPos++, 0, fold_currentImage->palette); if ((gSpriteShadingProfile->flags & 1) && (state->flags & (FOLD_STATE_FLAG_100000 | FOLD_STATE_FLAG_80000)) && (state->renderType == FOLD_RENDER_TYPE_0 @@ -1588,14 +1588,14 @@ void func_8013E2F0(FoldState* state, Matrix4f mtx) { || state->renderType == FOLD_RENDER_TYPE_B) ) { s32 alpha = 255; - gDPScrollMultiTile2_4b(gMasterGfxPos++, fold_currentImage->raster, G_IM_FMT_CI, + gDPScrollMultiTile2_4b(gMainGfxPos++, fold_currentImage->raster, G_IM_FMT_CI, fold_currentImage->width, fold_currentImage->height, 0, 0, fold_currentImage->width - 1, fold_currentImage->height - 1, 0, G_TX_CLAMP, G_TX_CLAMP, 8, 8, G_TX_NOLOD, G_TX_NOLOD, 256, 256); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 4, 0x0100, 2, 0, + gDPSetTile(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 4, 0x0100, 2, 0, G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); - gDPSetTileSize(gMasterGfxPos++, 2, 0, 0, 252, 0); + gDPSetTileSize(gMainGfxPos++, 2, 0, 0, 252, 0); switch (state->renderType) { case FOLD_RENDER_TYPE_0: @@ -1612,15 +1612,15 @@ void func_8013E2F0(FoldState* state, Matrix4f mtx) { } create_shading_palette(mtx, 0, 0, fold_currentImage->width, fold_currentImage->height, alpha, state->unk_78); } else { - gDPScrollTextureTile_4b(gMasterGfxPos++, fold_currentImage->raster, G_IM_FMT_CI, + gDPScrollTextureTile_4b(gMainGfxPos++, fold_currentImage->raster, G_IM_FMT_CI, fold_currentImage->width, fold_currentImage->height, 0, 0, fold_currentImage->width - 1, fold_currentImage->height - 1, 0, G_TX_CLAMP, G_TX_CLAMP, 8, 8, G_TX_NOLOD, G_TX_NOLOD, 256, 256); } } - gSPDisplayList(gMasterGfxPos++, state->gfxBufs[gCurrentDisplayContextIndex]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, state->gfxBufs[gCurrentDisplayContextIndex]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } void func_8013E904(FoldState* state, Matrix4f mtx) { @@ -1631,19 +1631,19 @@ void func_8013E904(FoldState* state, Matrix4f mtx) { s32 lrs, lrt; guScale(&gDisplayContext->matrixStack[gMatrixListPos], (f32)fold_currentImage->width / 100.0, (f32)fold_currentImage->height / 100.0, 1.0f); - gSPMatrix(gMasterGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetRenderMode(gMasterGfxPos++, G_RM_ZB_XLU_DECAL, G_RM_ZB_XLU_DECAL2); + gSPMatrix(gMainGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetRenderMode(gMainGfxPos++, G_RM_ZB_XLU_DECAL, G_RM_ZB_XLU_DECAL2); if (state->renderType == FOLD_RENDER_TYPE_F) { s32 temp = state->unk_1C[1][1]; - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, temp); - gDPSetCombineLERP(gMasterGfxPos++, TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, temp); + gDPSetCombineLERP(gMainGfxPos++, TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0); } else { - gDPSetCombineMode(gMasterGfxPos++, G_CC_MODULATEIA, G_CC_MODULATEIA); + gDPSetCombineMode(gMainGfxPos++, G_CC_MODULATEIA, G_CC_MODULATEIA); } - gDPSetTextureLUT(gMasterGfxPos++, G_TT_RGBA16); - gDPLoadTLUT_pal16(gMasterGfxPos++, 0, ufs->palette); - gDPScrollTextureTile_4b(gMasterGfxPos++, ufs->raster, G_IM_FMT_CI, ufs->width, ufs->height, + gDPSetTextureLUT(gMainGfxPos++, G_TT_RGBA16); + gDPLoadTLUT_pal16(gMainGfxPos++, 0, ufs->palette); + gDPScrollTextureTile_4b(gMainGfxPos++, ufs->raster, G_IM_FMT_CI, ufs->width, ufs->height, 0, 0, ufs->width - 1, ufs->height - 1, 0, G_TX_WRAP, G_TX_WRAP, shifts, shiftt, G_TX_NOLOD, G_TX_NOLOD, 256, 256); @@ -1652,12 +1652,12 @@ void func_8013E904(FoldState* state, Matrix4f mtx) { ult = state->unk_3C[1][1]; lrs = ufs->width * 4 + state->unk_3C[1][0]; lrt = ufs->height * 4 + state->unk_3C[1][1]; - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, uls, ult, lrs, lrt); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, uls, ult, lrs, lrt); state->unk_3C[1][0] = (s32)(state->unk_3C[1][0] + ufs->unk_0C) % (ufs->width * 4); state->unk_3C[1][1] = (s32)(state->unk_3C[1][1] + ufs->unk_10) % (ufs->height * 4); - gSPDisplayList(gMasterGfxPos++, ufs->unk_14); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, ufs->unk_14); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } void func_8013EE48(FoldState* state) { diff --git a/src/dc470_len_14c0.c b/src/dc470_len_14c0.c index cc5e67f67b..a4c540f969 100644 --- a/src/dc470_len_14c0.c +++ b/src/dc470_len_14c0.c @@ -198,19 +198,19 @@ void appendGfx_background_texture(void) { bgMinX = gGameStatusPtr->backgroundMinX; bgMinY = gGameStatusPtr->backgroundMinY; - gDPPipeSync(gMasterGfxPos++); - gDPSetCycleType(gMasterGfxPos++, G_CYC_COPY); - gDPSetTexturePersp(gMasterGfxPos++, G_TP_NONE); - gDPSetTextureLUT(gMasterGfxPos++, G_TT_RGBA16); - gDPSetCombineMode(gMasterGfxPos++, G_CC_DECALRGB, G_CC_DECALRGB); - gDPSetRenderMode(gMasterGfxPos++, G_RM_NOOP, G_RM_NOOP2); - gDPSetTextureFilter(gMasterGfxPos++, G_TF_POINT); - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); + gDPSetCycleType(gMainGfxPos++, G_CYC_COPY); + gDPSetTexturePersp(gMainGfxPos++, G_TP_NONE); + gDPSetTextureLUT(gMainGfxPos++, G_TT_RGBA16); + gDPSetCombineMode(gMainGfxPos++, G_CC_DECALRGB, G_CC_DECALRGB); + gDPSetRenderMode(gMainGfxPos++, G_RM_NOOP, G_RM_NOOP2); + gDPSetTextureFilter(gMainGfxPos++, G_TF_POINT); + gDPPipeSync(gMainGfxPos++); if (!(gGameStatusPtr->backgroundFlags & BACKGROUND_FLAG_FOG)) { - gDPLoadTLUT_pal256(gMasterGfxPos++, gGameStatusPtr->backgroundPalette); + gDPLoadTLUT_pal256(gMainGfxPos++, gGameStatusPtr->backgroundPalette); } else { - gDPLoadTLUT_pal256(gMasterGfxPos++, gBackgroundPalette); + gDPLoadTLUT_pal256(gMainGfxPos++, gBackgroundPalette); } if (!gBackroundWaveEnabled) { @@ -222,15 +222,15 @@ void appendGfx_background_texture(void) { if (texOffsetY > gGameStatusPtr->backgroundMaxY) { texOffsetY -= gGameStatusPtr->backgroundMaxY; } - gDPLoadTextureTile(gMasterGfxPos++, gGameStatusPtr->backgroundRaster + bgMaxX * texOffsetY, + gDPLoadTextureTile(gMainGfxPos++, gGameStatusPtr->backgroundRaster + bgMaxX * texOffsetY, G_IM_FMT_CI, G_IM_SIZ_8b, bgMaxX, 6, 0, 0, 295, 5, 0, G_TX_WRAP, G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPTextureRectangle(gMasterGfxPos++, bgMinX * 4, (lineHeight * i + bgMinY) * 4, + gSPTextureRectangle(gMainGfxPos++, bgMinX * 4, (lineHeight * i + bgMinY) * 4, (bgXOffset + bgMinX - 1) * 4, (lineHeight * i + lineHeight - 1 + bgMinY) * 4, G_TX_RENDERTILE, (bgMaxX - bgXOffset) * 32, 0, 4096, 1024); - gSPTextureRectangle(gMasterGfxPos++, (bgXOffset + bgMinX) * 4, (lineHeight * i + bgMinY) * 4, + gSPTextureRectangle(gMainGfxPos++, (bgXOffset + bgMinX) * 4, (lineHeight * i + bgMinY) * 4, (bgMaxX + bgMinX - 1) * 4, (lineHeight * i + lineHeight - 1 + bgMinY) * 4, G_TX_RENDERTILE, 0, 0, 4096, 1024); } @@ -239,14 +239,14 @@ void appendGfx_background_texture(void) { if (texOffsetY > gGameStatusPtr->backgroundMaxY) { texOffsetY -= gGameStatusPtr->backgroundMaxY; } - gDPLoadTextureTile(gMasterGfxPos++, gGameStatusPtr->backgroundRaster + bgMaxX * texOffsetY, + gDPLoadTextureTile(gMainGfxPos++, gGameStatusPtr->backgroundRaster + bgMaxX * texOffsetY, G_IM_FMT_CI, G_IM_SIZ_8b, bgMaxX, extraHeight, 0, 0, 295, extraHeight - 1, 0, G_TX_WRAP, G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPTextureRectangle(gMasterGfxPos++, bgMinX * 4, (lineHeight * i + bgMinY) * 4, + gSPTextureRectangle(gMainGfxPos++, bgMinX * 4, (lineHeight * i + bgMinY) * 4, (bgXOffset + bgMinX - 1) * 4, (bgMaxY - 1 + bgMinY) * 4, G_TX_RENDERTILE, (bgMaxX - bgXOffset) * 32, 0, 4096, 1024); - gSPTextureRectangle(gMasterGfxPos++, (bgXOffset + bgMinX) * 4, (lineHeight * i + bgMinY) * 4, + gSPTextureRectangle(gMainGfxPos++, (bgXOffset + bgMinX) * 4, (lineHeight * i + bgMinY) * 4, (bgMaxX + bgMinX - 1) * 4, (bgMaxY - 1 + bgMinY) * 4, G_TX_RENDERTILE, 0, 0, 4096, 1024); } @@ -262,15 +262,15 @@ void appendGfx_background_texture(void) { if (texOffsetY > gGameStatusPtr->backgroundMaxY) { texOffsetY -= gGameStatusPtr->backgroundMaxY; } - gDPLoadTextureTile(gMasterGfxPos++, gGameStatusPtr->backgroundRaster + bgMaxX * texOffsetY, + gDPLoadTextureTile(gMainGfxPos++, gGameStatusPtr->backgroundRaster + bgMaxX * texOffsetY, G_IM_FMT_CI, G_IM_SIZ_8b, bgMaxX, 6, 0, 0, 295, 5, 0, G_TX_WRAP, G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPTextureRectangle(gMasterGfxPos++, bgMinX * 4, (lineHeight * i + bgMinY) * 4, + gSPTextureRectangle(gMainGfxPos++, bgMinX * 4, (lineHeight * i + bgMinY) * 4, (2 * bgXOffset + (bgMinX - 1)) * 4, (lineHeight * i + lineHeight - 1 + bgMinY) * 4, G_TX_RENDERTILE, bgMaxX * 32 - bgXOffset * 16, 0, 4096, 1024); - gSPTextureRectangle(gMasterGfxPos++, bgXOffset * 2 + bgMinX * 4, (lineHeight * i + bgMinY) * 4, + gSPTextureRectangle(gMainGfxPos++, bgXOffset * 2 + bgMinX * 4, (lineHeight * i + bgMinY) * 4, (bgMaxX + bgMinX - 1) * 4, (lineHeight * i + lineHeight - 1 + bgMinY) * 4, G_TX_RENDERTILE, 0, 0, 4096, 1024); } @@ -281,14 +281,14 @@ void appendGfx_background_texture(void) { if (texOffsetY > gGameStatusPtr->backgroundMaxY) { texOffsetY -= gGameStatusPtr->backgroundMaxY; } - gDPLoadTextureTile(gMasterGfxPos++, gGameStatusPtr->backgroundRaster + bgMaxX * texOffsetY, + gDPLoadTextureTile(gMainGfxPos++, gGameStatusPtr->backgroundRaster + bgMaxX * texOffsetY, G_IM_FMT_CI, G_IM_SIZ_8b, bgMaxX, extraHeight, 0, 0, 295, extraHeight - 1, 0, G_TX_WRAP, G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPTextureRectangle(gMasterGfxPos++, bgMinX * 4, (lineHeight * i + bgMinY) * 4, + gSPTextureRectangle(gMainGfxPos++, bgMinX * 4, (lineHeight * i + bgMinY) * 4, (2 * bgXOffset + (bgMinX - 1)) * 4, (bgMaxY - 1 + bgMinY) * 4, // @bug xh = 2 * bgXOffset + (bgMinX - 1) * 4 G_TX_RENDERTILE, bgMaxX * 32 - bgXOffset * 16, 0, 4096, 1024); - gSPTextureRectangle(gMasterGfxPos++, bgXOffset * 2 + bgMinX * 4, (lineHeight * i + bgMinY) * 4, + gSPTextureRectangle(gMainGfxPos++, bgXOffset * 2 + bgMinX * 4, (lineHeight * i + bgMinY) * 4, (bgMaxX + bgMinX - 1) * 4, (bgMaxY - 1 + bgMinY) * 4, // @bug xh = 2 * bgXOffset + (bgMinX - 1) * 4 G_TX_RENDERTILE, 0, 0, 4096, 1024); } diff --git a/src/de740_len_23f0.c b/src/de740_len_23f0.c index abfc614517..9c96b9d3ba 100644 --- a/src/de740_len_23f0.c +++ b/src/de740_len_23f0.c @@ -376,55 +376,55 @@ void appendGfx_shading_palette( highlightB = 255; } - gDPSetPrimColor(gMasterGfxPos++, 0, 0, shadowR, shadowG, shadowB, alpha); - gDPSetCombineLERP(gMasterGfxPos++, TEXEL1, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0, COMBINED, TEXEL0, COMBINED_ALPHA, + gDPSetPrimColor(gMainGfxPos++, 0, 0, shadowR, shadowG, shadowB, alpha); + gDPSetCombineLERP(gMainGfxPos++, TEXEL1, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0, COMBINED, TEXEL0, COMBINED_ALPHA, TEXEL0, PRIMITIVE, 0, TEXEL0, 0); - gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, D_80159880); - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 0, 0, 16, 1); + gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, D_80159880); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, 0, 0, 16, 1); - gSPSetOtherMode(gMasterGfxPos++, G_SETOTHERMODE_H, 4, 18, + gSPSetOtherMode(gMainGfxPos++, G_SETOTHERMODE_H, 4, 18, G_AD_DISABLE | G_CD_DISABLE | G_CK_NONE | G_TC_FILT | G_TF_POINT | G_TT_NONE | G_TL_TILE | G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE); - gDPSetRenderMode(gMasterGfxPos++, G_RM_OPA_SURF, G_RM_OPA_SURF2); + gDPSetRenderMode(gMainGfxPos++, G_RM_OPA_SURF, G_RM_OPA_SURF2); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, shadowR, shadowG, shadowB, alpha); - gDPSetEnvColor(gMasterGfxPos++, highlightR, highlightG, highlightB, 0); - gDPSetCombineLERP(gMasterGfxPos++, PRIMITIVE, ENVIRONMENT, TEXEL0_ALPHA, ENVIRONMENT, 0, 0, 0, 1, + gDPSetPrimColor(gMainGfxPos++, 0, 0, shadowR, shadowG, shadowB, alpha); + gDPSetEnvColor(gMainGfxPos++, highlightR, highlightG, highlightB, 0); + gDPSetCombineLERP(gMainGfxPos++, PRIMITIVE, ENVIRONMENT, TEXEL0_ALPHA, ENVIRONMENT, 0, 0, 0, 1, PRIMITIVE, ENVIRONMENT, TEXEL0_ALPHA, ENVIRONMENT, 0, 0, 0, 1); - gSPTextureRectangle(gMasterGfxPos++, 0, 0, 16 << 2, 1 << 2, 2, 0, 0, 4 << 10, 1 << 10); - gDPPipeSync(gMasterGfxPos++); - gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(nuGfxCfb_ptr)); + gSPTextureRectangle(gMainGfxPos++, 0, 0, 16 << 2, 1 << 2, 2, 0, 0, 4 << 10, 1 << 10); + gDPPipeSync(gMainGfxPos++); + gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(nuGfxCfb_ptr)); gDPSetScissor( - gMasterGfxPos++, 0, + gMainGfxPos++, 0, camera->viewportStartX, camera->viewportStartY, camera->viewportStartX + camera->viewportW, camera->viewportStartY + camera->viewportH ); - gDPLoadTLUT_pal16(gMasterGfxPos++, 1, D_80159880); + gDPLoadTLUT_pal16(gMainGfxPos++, 1, D_80159880); - gSPSetOtherMode(gMasterGfxPos++, G_SETOTHERMODE_H, 4, 18, + gSPSetOtherMode(gMainGfxPos++, G_SETOTHERMODE_H, 4, 18, G_AD_DISABLE | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_RGBA16 | G_TL_TILE | G_TD_CLAMP | G_TP_PERSP | G_CYC_2CYCLE | G_PM_NPRIMITIVE); - gDPSetRenderMode(gMasterGfxPos++, G_RM_PASS, renderMode); - gDPSetEnvColor(gMasterGfxPos++, 100, 100, 100, 255); + gDPSetRenderMode(gMainGfxPos++, G_RM_PASS, renderMode); + gDPSetEnvColor(gMainGfxPos++, 100, 100, 100, 255); if (alpha == 255) { - gDPSetCombineLERP(gMasterGfxPos++, TEXEL0, 0, TEXEL1, 0, 0, 0, 0, TEXEL1, SHADE, ENVIRONMENT, COMBINED, + gDPSetCombineLERP(gMainGfxPos++, TEXEL0, 0, TEXEL1, 0, 0, 0, 0, TEXEL1, SHADE, ENVIRONMENT, COMBINED, COMBINED, 0, 0, 0, COMBINED); } else { - gDPSetCombineLERP(gMasterGfxPos++, TEXEL0, 0, TEXEL1, 0, PRIMITIVE, 0, TEXEL1, 0, SHADE, ENVIRONMENT, COMBINED, + gDPSetCombineLERP(gMainGfxPos++, TEXEL0, 0, TEXEL1, 0, PRIMITIVE, 0, TEXEL1, 0, SHADE, ENVIRONMENT, COMBINED, COMBINED, 0, 0, 0, COMBINED); } abc = var_f26; abc *= var_f30; gDPSetTileSize( - gMasterGfxPos++, + gMainGfxPos++, 0, ((uls + 0x100) << 2) + (s32)abc, ((ult + 0x100) << 2) + (s32)temp_f28, @@ -437,11 +437,11 @@ INCLUDE_ASM(s32, "de740_len_23f0", appendGfx_shading_palette); #endif void func_801491E4(Matrix4f mtx, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 alpha) { - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, alpha); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, alpha); if (alpha == 255) { - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, TEXEL1, 0, 0, 0, TEXEL1, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, TEXEL1, 0, 0, 0, TEXEL1, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED); } else { - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED); } } diff --git a/src/draw_box.c b/src/draw_box.c index a70eab2b14..f7f3cb3b83 100644 --- a/src/draw_box.c +++ b/src/draw_box.c @@ -438,20 +438,20 @@ s32 draw_box(s32 flags, WindowStyle windowStyle, s32 posX, s32 posY, s32 posZ, s } } - gDPPipeSync(gMasterGfxPos++); - gDPSetCycleType(gMasterGfxPos++, G_CYC_2CYCLE); - gDPSetBlendColor(gMasterGfxPos++, 0, 0, 0, 0); - gDPSetFogColor(gMasterGfxPos++, 0, 0, 0, darkening); - gDPSetRenderMode(gMasterGfxPos++, GBL_c1(G_BL_CLR_BL, G_BL_A_FOG, G_BL_CLR_IN, G_BL_1MA), G_RM_XLU_SURF2); + gDPPipeSync(gMainGfxPos++); + gDPSetCycleType(gMainGfxPos++, G_CYC_2CYCLE); + gDPSetBlendColor(gMainGfxPos++, 0, 0, 0, 0); + gDPSetFogColor(gMainGfxPos++, 0, 0, 0, darkening); + gDPSetRenderMode(gMainGfxPos++, GBL_c1(G_BL_CLR_BL, G_BL_A_FOG, G_BL_CLR_IN, G_BL_1MA), G_RM_XLU_SURF2); if (!(flags & DRAW_FLAG_NO_CLIP)) { - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); } if (defaultStyle != NULL) { - Gfx* gfxPos = gMasterGfxPos; + Gfx* gfxPos = gMainGfxPos; *gfxPos = gBoxCombineModes[defaultStyle->combineModeIndex + (primA != 255 ? 2 : 0)]; } else { - Gfx* gfxPos = gMasterGfxPos; + Gfx* gfxPos = gMainGfxPos; if (primA != 255) { *gfxPos = customStyle->transparentCombineMode; } else { @@ -459,15 +459,15 @@ s32 draw_box(s32 flags, WindowStyle windowStyle, s32 posX, s32 posY, s32 posZ, s } } - gMasterGfxPos++; - gDPSetTextureFilter(gMasterGfxPos++, G_TF_POINT); + gMainGfxPos++; + gDPSetTextureFilter(gMainGfxPos++, G_TF_POINT); if (quads != NULL) { - gSPViewport(gMasterGfxPos++, &gBoxViewport); + gSPViewport(gMainGfxPos++, &gBoxViewport); guFrustumF(mtx1, -80.0f, 80.0f, 60.0f, -60.0f, 160.0f, 480.0f, 1.0f); guMtxF2L(mtx1, &gDisplayContext->matrixStack[gMatrixListPos]); sp154 = &gDisplayContext->matrixStack[gMatrixListPos]; - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); guPositionF(mtx1, rotX, rotY, rotZ, 1.0f, posX + width / 2, posY + height / 2, posZ); if (scaleX != 1.0f || scaleY != 1.0f) { guScaleF(mtx2, scaleX, scaleY, 1.0f); @@ -487,50 +487,50 @@ s32 draw_box(s32 flags, WindowStyle windowStyle, s32 posX, s32 posY, s32 posZ, s } guTranslateF(mtx2, -160.0f, -120.0f, -320.0f); guMtxCatF(mtx1, mtx2, mtx1); - gSPClearGeometryMode(gMasterGfxPos++, G_CULL_BOTH | G_LIGHTING); + gSPClearGeometryMode(gMainGfxPos++, G_CULL_BOTH | G_LIGHTING); if (flags & DRAW_FLAG_CULL_BACK) { - gSPSetGeometryMode(gMasterGfxPos++, G_CULL_BACK); + gSPSetGeometryMode(gMainGfxPos++, G_CULL_BACK); } guMtxF2L(mtx1, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetTexturePersp(gMasterGfxPos++, G_TP_PERSP); - gSPPerspNormalize(gMasterGfxPos++, 20); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gDPSetTexturePersp(gMainGfxPos++, G_TP_PERSP); + gSPPerspNormalize(gMainGfxPos++, 20); } else { - gDPSetTexturePersp(gMasterGfxPos++, G_TP_NONE); + gDPSetTexturePersp(gMainGfxPos++, G_TP_NONE); } - gSPTexture(gMasterGfxPos++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); - gDPSetTextureLUT(gMasterGfxPos++, G_TT_NONE); - gDPSetTextureDetail(gMasterGfxPos++, G_TD_CLAMP); - gDPSetTextureLOD(gMasterGfxPos++, G_TL_TILE); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, primR, primG, primB, primA); - gDPSetEnvColor(gMasterGfxPos++, envR, envG, envB, envA); + gSPTexture(gMainGfxPos++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); + gDPSetTextureLUT(gMainGfxPos++, G_TT_NONE); + gDPSetTextureDetail(gMainGfxPos++, G_TD_CLAMP); + gDPSetTextureLOD(gMainGfxPos++, G_TL_TILE); + gDPSetPrimColor(gMainGfxPos++, 0, 0, primR, primG, primB, primA); + gDPSetEnvColor(gMainGfxPos++, envR, envG, envB, envA); if (bgImage != NULL) { switch (background->bitDepth) { case G_IM_SIZ_4b: - gDPLoadTextureTile_4b(gMasterGfxPos++, bgImage, bgFmt, bgWidth, bgHeight, 0, 0, bgWidth - 1, bgHeight - 1, 0, G_TX_WRAP, G_TX_WRAP, bgMasks, bgMaskt, G_TX_NOLOD, G_TX_NOLOD); + gDPLoadTextureTile_4b(gMainGfxPos++, bgImage, bgFmt, bgWidth, bgHeight, 0, 0, bgWidth - 1, bgHeight - 1, 0, G_TX_WRAP, G_TX_WRAP, bgMasks, bgMaskt, G_TX_NOLOD, G_TX_NOLOD); break; case G_IM_SIZ_8b: - gDPLoadTextureTile(gMasterGfxPos++, bgImage, bgFmt, G_IM_SIZ_8b, bgWidth, bgHeight, 0, 0, bgWidth - 1, bgHeight - 1, 0, G_TX_WRAP, G_TX_WRAP, bgMasks, bgMaskt, G_TX_NOLOD, G_TX_NOLOD); + gDPLoadTextureTile(gMainGfxPos++, bgImage, bgFmt, G_IM_SIZ_8b, bgWidth, bgHeight, 0, 0, bgWidth - 1, bgHeight - 1, 0, G_TX_WRAP, G_TX_WRAP, bgMasks, bgMaskt, G_TX_NOLOD, G_TX_NOLOD); break; case G_IM_SIZ_16b: - gDPLoadTextureTile(gMasterGfxPos++, bgImage, bgFmt, G_IM_SIZ_16b, bgWidth, bgHeight, 0, 0, bgWidth - 1, bgHeight - 1, 0, G_TX_WRAP, G_TX_WRAP, bgMasks, bgMaskt, G_TX_NOLOD, G_TX_NOLOD); + gDPLoadTextureTile(gMainGfxPos++, bgImage, bgFmt, G_IM_SIZ_16b, bgWidth, bgHeight, 0, 0, bgWidth - 1, bgHeight - 1, 0, G_TX_WRAP, G_TX_WRAP, bgMasks, bgMaskt, G_TX_NOLOD, G_TX_NOLOD); break; case G_IM_SIZ_32b: - gDPLoadTextureTile(gMasterGfxPos++, bgImage, bgFmt, G_IM_SIZ_32b, bgWidth, bgHeight, 0, 0, bgWidth - 1, bgHeight - 1, 0, G_TX_WRAP, G_TX_WRAP, bgMasks, bgMaskt, G_TX_NOLOD, G_TX_NOLOD); + gDPLoadTextureTile(gMainGfxPos++, bgImage, bgFmt, G_IM_SIZ_32b, bgWidth, bgHeight, 0, 0, bgWidth - 1, bgHeight - 1, 0, G_TX_WRAP, G_TX_WRAP, bgMasks, bgMaskt, G_TX_NOLOD, G_TX_NOLOD); break; } if (flags & DRAW_FLAG_ANIMATED_BACKGROUND) { bgScrollOffsetY = (gGameStatusPtr->frameCounter * 4) & 0x1FF; bgScrollOffsetX = 511 - bgScrollOffsetY; - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, width / 2 * 4 + bgScrollOffsetX, height / 2 * 4 + bgScrollOffsetY, (width / 2 + bgWidth - 1) * 4 + bgScrollOffsetX, (height / 2 + bgHeight - 1) * 4 + bgScrollOffsetY); } else { - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, width / 2 * 4, height / 2 * 4, + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, width / 2 * 4, height / 2 * 4, (width / 2 + bgWidth - 1) * 4, (height / 2 + bgHeight - 1)* 4); } } @@ -545,32 +545,32 @@ s32 draw_box(s32 flags, WindowStyle windowStyle, s32 posX, s32 posY, s32 posZ, s switch (cornersBitDepth) { case G_IM_SIZ_4b: - gDPLoadMultiTile_4b(gMasterGfxPos++, cornersImage, tmem, 1, cornersFmt, cornerWidth, cornerHeight, 0, 0, cornerWidth - 1, cornerHeight - 1, 0, G_TX_CLAMP, G_TX_CLAMP, masks, maskt, G_TX_NOLOD, G_TX_NOLOD); + gDPLoadMultiTile_4b(gMainGfxPos++, cornersImage, tmem, 1, cornersFmt, cornerWidth, cornerHeight, 0, 0, cornerWidth - 1, cornerHeight - 1, 0, G_TX_CLAMP, G_TX_CLAMP, masks, maskt, G_TX_NOLOD, G_TX_NOLOD); cornersImage += cornerWidth * cornerHeight / 2; break; case G_IM_SIZ_8b: - gDPLoadMultiTile(gMasterGfxPos++, cornersImage, tmem, 1, cornersFmt, G_IM_SIZ_8b, cornerWidth, cornerHeight, 0, 0, cornerWidth - 1, cornerHeight - 1, 0, G_TX_CLAMP, G_TX_CLAMP, masks, maskt, G_TX_NOLOD, G_TX_NOLOD); + gDPLoadMultiTile(gMainGfxPos++, cornersImage, tmem, 1, cornersFmt, G_IM_SIZ_8b, cornerWidth, cornerHeight, 0, 0, cornerWidth - 1, cornerHeight - 1, 0, G_TX_CLAMP, G_TX_CLAMP, masks, maskt, G_TX_NOLOD, G_TX_NOLOD); cornersImage += cornerWidth * cornerHeight; break; case G_IM_SIZ_16b: - gDPLoadMultiTile(gMasterGfxPos++, cornersImage, tmem, 1, cornersFmt, G_IM_SIZ_16b, cornerWidth, cornerHeight, 0, 0, cornerWidth - 1, cornerHeight - 1, 0, G_TX_CLAMP, G_TX_CLAMP, masks, maskt, G_TX_NOLOD, G_TX_NOLOD); + gDPLoadMultiTile(gMainGfxPos++, cornersImage, tmem, 1, cornersFmt, G_IM_SIZ_16b, cornerWidth, cornerHeight, 0, 0, cornerWidth - 1, cornerHeight - 1, 0, G_TX_CLAMP, G_TX_CLAMP, masks, maskt, G_TX_NOLOD, G_TX_NOLOD); cornersImage += cornerWidth * cornerHeight * 2; break; case G_IM_SIZ_32b: - gDPLoadMultiTile(gMasterGfxPos++, cornersImage, tmem, 1, cornersFmt, G_IM_SIZ_32b, cornerWidth, cornerHeight, 0, 0, cornerWidth - 1, cornerHeight - 1, 0, G_TX_CLAMP, G_TX_CLAMP, masks, maskt, G_TX_NOLOD, G_TX_NOLOD); + gDPLoadMultiTile(gMainGfxPos++, cornersImage, tmem, 1, cornersFmt, G_IM_SIZ_32b, cornerWidth, cornerHeight, 0, 0, cornerWidth - 1, cornerHeight - 1, 0, G_TX_CLAMP, G_TX_CLAMP, masks, maskt, G_TX_NOLOD, G_TX_NOLOD); cornersImage += cornerWidth * cornerHeight * 4; break; } switch(idx) { case 1: - gDPSetTileSize(gMasterGfxPos++, 1, (width - cornerWidth) * 4, 0, (width - 1) * 4, (cornerHeight - 1) * 4); + gDPSetTileSize(gMainGfxPos++, 1, (width - cornerWidth) * 4, 0, (width - 1) * 4, (cornerHeight - 1) * 4); break; case 2: - gDPSetTileSize(gMasterGfxPos++, 1, 0, (height - cornerHeight) * 4, (cornerWidth - 1) * 4, (height - 1) * 4); + gDPSetTileSize(gMainGfxPos++, 1, 0, (height - cornerHeight) * 4, (cornerWidth - 1) * 4, (height - 1) * 4); break; case 3: - gDPSetTileSize(gMasterGfxPos++, 1, (width - cornerWidth) * 4, (height - cornerHeight) * 4, (width - 1) * 4, (height - 1) * 4); + gDPSetTileSize(gMainGfxPos++, 1, (width - cornerWidth) * 4, (height - cornerHeight) * 4, (width - 1) * 4, (height - 1) * 4); break; } @@ -699,26 +699,26 @@ s32 draw_box(s32 flags, WindowStyle windowStyle, s32 posX, s32 posY, s32 posZ, s quads += 12; break; } - gSPVertex(gMasterGfxPos++, quads, 4, 0); - gSP2Triangles(gMasterGfxPos++, 0, 3, 1, 0, 0, 2, 3, 0); + gSPVertex(gMainGfxPos++, quads, 4, 0); + gSP2Triangles(gMainGfxPos++, 0, 3, 1, 0, 0, 2, 3, 0); } else { switch (idx) { case 0: - gSPScisTextureRectangle(gMasterGfxPos++, posX * 4, posY * 4, (posX + width / 2) * 4, (posY + height / 2) * 4, G_TX_RENDERTILE, 0, 0, 0x400, 0x400); + gSPScisTextureRectangle(gMainGfxPos++, posX * 4, posY * 4, (posX + width / 2) * 4, (posY + height / 2) * 4, G_TX_RENDERTILE, 0, 0, 0x400, 0x400); break; case 1: - gSPScisTextureRectangle(gMasterGfxPos++, (posX + width / 2) * 4, posY * 4, (posX + width) * 4, (posY + height / 2) * 4, G_TX_RENDERTILE, (width / 2) * 32, 0, 0x400, 0x400); + gSPScisTextureRectangle(gMainGfxPos++, (posX + width / 2) * 4, posY * 4, (posX + width) * 4, (posY + height / 2) * 4, G_TX_RENDERTILE, (width / 2) * 32, 0, 0x400, 0x400); break; case 2: - gSPScisTextureRectangle(gMasterGfxPos++, posX * 4, (posY + height / 2) * 4, (posX + width / 2) * 4, (posY + height) * 4, G_TX_RENDERTILE, 0, (height / 2) * 32, 0x400, 0x400); + gSPScisTextureRectangle(gMainGfxPos++, posX * 4, (posY + height / 2) * 4, (posX + width / 2) * 4, (posY + height) * 4, G_TX_RENDERTILE, 0, (height / 2) * 32, 0x400, 0x400); break; case 3: - gSPScisTextureRectangle(gMasterGfxPos++, (posX + width / 2) * 4, (posY + height / 2) * 4, (posX + width) * 4, (posY + height) * 4, G_TX_RENDERTILE, (width / 2) * 32, (height / 2) * 32, 0x400, 0x400); + gSPScisTextureRectangle(gMainGfxPos++, (posX + width / 2) * 4, (posY + height / 2) * 4, (posX + width) * 4, (posY + height) * 4, G_TX_RENDERTILE, (width / 2) * 32, (height / 2) * 32, 0x400, 0x400); break; } } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } } else if (bgImage != NULL) { if (quads != NULL) { @@ -751,49 +751,49 @@ s32 draw_box(s32 flags, WindowStyle windowStyle, s32 posX, s32 posY, s32 posZ, s quads[3].v.tc[0] = width * 32; quads[3].v.tc[1] = height * 32; - gSPVertex(gMasterGfxPos++, &quads[0], 4, 0); - gSP2Triangles(gMasterGfxPos++, 0, 3, 1, 0, 0, 2, 3, 0); + gSPVertex(gMainGfxPos++, &quads[0], 4, 0); + gSP2Triangles(gMainGfxPos++, 0, 3, 1, 0, 0, 2, 3, 0); } else { - gSPScisTextureRectangle(gMasterGfxPos++, posX * 4, posY * 4, (posX + width) * 4, (posY + height) * 4, G_TX_RENDERTILE, 0, 0, 0x0400, 0x0400); + gSPScisTextureRectangle(gMainGfxPos++, posX * 4, posY * 4, (posX + width) * 4, (posY + height) * 4, G_TX_RENDERTILE, 0, 0, 0x0400, 0x0400); } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } - gDPSetTexturePersp(gMasterGfxPos++, G_TP_NONE); - gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); + gDPSetTexturePersp(gMainGfxPos++, G_TP_NONE); + gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE); if(fpDrawContents != NULL) { if (quads != NULL) { void* mdl_address = mdl_get_next_texture_address(width * height * 2); if(mdl_address != 0) { - gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, width, OS_K0_TO_PHYSICAL(mdl_address)); - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 0, 0, width, height); - gDPSetCycleType(gMasterGfxPos++, G_CYC_FILL); - gDPSetFillColor(gMasterGfxPos++, PACK_FILL_COLOR(primR, primG, primB, 0)); - gDPSetRenderMode(gMasterGfxPos++, G_RM_NOOP, G_RM_NOOP2); - gDPFillRectangle(gMasterGfxPos++, 0, 0, width - 1, height - 1); - gDPPipeSync(gMasterGfxPos++); - gDPSetScissorFrac(gMasterGfxPos++, G_SC_NON_INTERLACE, 4, 4, (width - 1) * 4.0f, (height - 1) * 4.0f); - gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); + gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, width, OS_K0_TO_PHYSICAL(mdl_address)); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, 0, 0, width, height); + gDPSetCycleType(gMainGfxPos++, G_CYC_FILL); + gDPSetFillColor(gMainGfxPos++, PACK_FILL_COLOR(primR, primG, primB, 0)); + gDPSetRenderMode(gMainGfxPos++, G_RM_NOOP, G_RM_NOOP2); + gDPFillRectangle(gMainGfxPos++, 0, 0, width - 1, height - 1); + gDPPipeSync(gMainGfxPos++); + gDPSetScissorFrac(gMainGfxPos++, G_SC_NON_INTERLACE, 4, 4, (width - 1) * 4.0f, (height - 1) * 4.0f); + gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE); fpDrawContents((s32)drawContentsArg0, 0, 0, width, height, opacity, darkening); - gDPPipeSync(gMasterGfxPos++); - gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, OS_K0_TO_PHYSICAL(nuGfxCfb_ptr)); - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 0, 0, 320, 240); - gSPViewport(gMasterGfxPos++, &gBoxViewport); - gSPMatrix(gMasterGfxPos++, sp154, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - gSPTexture(gMasterGfxPos++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); - gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); - gDPSetTextureLUT(gMasterGfxPos++, G_TT_NONE); - gDPSetCombineMode(gMasterGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); - gDPSetRenderMode(gMasterGfxPos++, G_RM_CLD_SURF, G_RM_NOOP2); - gDPSetTexturePersp(gMasterGfxPos++, G_TP_PERSP); - gDPSetTextureFilter(gMasterGfxPos++, G_TF_BILERP); + gDPPipeSync(gMainGfxPos++); + gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, OS_K0_TO_PHYSICAL(nuGfxCfb_ptr)); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, 0, 0, 320, 240); + gSPViewport(gMainGfxPos++, &gBoxViewport); + gSPMatrix(gMainGfxPos++, sp154, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPTexture(gMainGfxPos++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); + gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE); + gDPSetTextureLUT(gMainGfxPos++, G_TT_NONE); + gDPSetCombineMode(gMainGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); + gDPSetRenderMode(gMainGfxPos++, G_RM_CLD_SURF, G_RM_NOOP2); + gDPSetTexturePersp(gMainGfxPos++, G_TP_PERSP); + gDPSetTextureFilter(gMainGfxPos++, G_TF_BILERP); guTranslateF(mtx3, 0.0f, 6.0f, 0.0f); guMtxF2L(mtx3, &gBoxMatrix); guTranslateF(mtx3, 0.0f, -height / 2, 0.0f); guMtxF2L(mtx3, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); for (idx = 0; idx < height / 6; idx++) { s32 extraHeight, lineHeight; if (idx == height / 6 - 1) { @@ -805,14 +805,14 @@ s32 draw_box(s32 flags, WindowStyle windowStyle, s32 posX, s32 posY, s32 posZ, s extraHeight = 1; } lineHeight = extraHeight + 5; - gDPLoadTextureTile(gMasterGfxPos++, OS_K0_TO_PHYSICAL(mdl_address), G_IM_FMT_RGBA, G_IM_SIZ_16b, width, 0, + gDPLoadTextureTile(gMainGfxPos++, OS_K0_TO_PHYSICAL(mdl_address), G_IM_FMT_RGBA, G_IM_SIZ_16b, width, 0, 0, idx * 6, width - 1, idx * 6 + lineHeight, 0, G_TX_CLAMP, G_TX_CLAMP, 9, 3, G_TX_NOLOD, G_TX_NOLOD); - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, (160 - width / 2) * 4, 0, ((160 - width / 2) + width - 1) * 4, lineHeight * 4); - gSPVertex(gMasterGfxPos++, &vtx_drawbox1, 4, 0); - gSP2Triangles(gMasterGfxPos++, 0, 3, 1, 0, 0, 2, 3, 0); - gDPPipeSync(gMasterGfxPos++); - gSPMatrix(gMasterGfxPos++, &gBoxMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, (160 - width / 2) * 4, 0, ((160 - width / 2) + width - 1) * 4, lineHeight * 4); + gSPVertex(gMainGfxPos++, &vtx_drawbox1, 4, 0); + gSP2Triangles(gMainGfxPos++, 0, 3, 1, 0, 0, 2, 3, 0); + gDPPipeSync(gMainGfxPos++); + gSPMatrix(gMainGfxPos++, &gBoxMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); } } } else { @@ -820,9 +820,9 @@ s32 draw_box(s32 flags, WindowStyle windowStyle, s32 posX, s32 posY, s32 posZ, s } } if (quads != NULL) { - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPSetTexturePersp(gMasterGfxPos++, G_TP_NONE); - gDPPipeSync(gMasterGfxPos++); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPSetTexturePersp(gMainGfxPos++, G_TP_NONE); + gDPPipeSync(gMainGfxPos++); } return FALSE; } diff --git a/src/effects.c b/src/effects.c index e35cd93446..45e4722420 100644 --- a/src/effects.c +++ b/src/effects.c @@ -299,23 +299,23 @@ void render_effects_UI(void) { if (cond) { Camera* camera = &gCameras[gCurrentCameraID]; - gDPPipeSync(gMasterGfxPos++); - gSPViewport(gMasterGfxPos++, &camera->vp); - gSPClearGeometryMode(gMasterGfxPos++, G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | + gDPPipeSync(gMainGfxPos++); + gSPViewport(gMainGfxPos++, &camera->vp); + gSPClearGeometryMode(gMainGfxPos++, G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH | G_CLIPPING | 0x40F9FA); - gSPSetGeometryMode(gMasterGfxPos++, G_ZBUFFER | G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH); - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, + gSPSetGeometryMode(gMainGfxPos++, G_ZBUFFER | G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, camera->viewportStartX, camera->viewportStartY, camera->viewportStartX + camera->viewportW, camera->viewportStartY + camera->viewportH); - gSPClipRatio(gMasterGfxPos++, FRUSTRATIO_2); + gSPClipRatio(gMainGfxPos++, FRUSTRATIO_2); cond = FALSE; if (!(camera->flags & CAMERA_FLAG_ORTHO)) { - gSPPerspNormalize(gMasterGfxPos++, camera->perspNorm); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCameraID], + gSPPerspNormalize(gMainGfxPos++, camera->perspNorm); + gSPMatrix(gMainGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCameraID], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); } } diff --git a/src/effects/attack_result_text.c b/src/effects/attack_result_text.c index db3f32819b..c6c697c614 100644 --- a/src/effects/attack_result_text.c +++ b/src/effects/attack_result_text.c @@ -182,14 +182,14 @@ void func_E0090444(EffectInstance* effect) { if (data->unk_24 != 0) { scale = data->unk_28; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effect->graphics->data)); - gDPSetDepthSource(gMasterGfxPos++, G_ZS_PRIM); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effect->graphics->data)); + gDPSetDepthSource(gMainGfxPos++, G_ZS_PRIM); z = 200 - unk_1C; if (z < 0) { z = 0; } - gDPSetPrimDepth(gMasterGfxPos++, z, 0); + gDPSetPrimDepth(gMainGfxPos++, z, 0); if (unk_00 < 5) { shim_guTranslateF(sp18, data->unk_08, data->unk_0C, data->unk_10); @@ -198,29 +198,29 @@ void func_E0090444(EffectInstance* effect) { shim_guScaleF(sp58, scale, scale, 1.0f); shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 255, 255, data->unk_14); - gSPDisplayList(gMasterGfxPos++, D_090015A8_391978); - gSPDisplayList(gMasterGfxPos++, D_E0090A40[data->unk_04]); - gSPDisplayList(gMasterGfxPos++, D_E0090A54[data->unk_04]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 255, data->unk_14); + gSPDisplayList(gMainGfxPos++, D_090015A8_391978); + gSPDisplayList(gMainGfxPos++, D_E0090A40[data->unk_04]); + gSPDisplayList(gMainGfxPos++, D_E0090A54[data->unk_04]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } else { unk_00 -= 5; - gDPSetPrimColor(gMasterGfxPos++, 0, 0, D_E0090A78[unk_00][0], D_E0090A78[unk_00][1], D_E0090A78[unk_00][2], data->unk_14); - gDPSetEnvColor(gMasterGfxPos++, D_E0090A78[unk_00][3], D_E0090A78[unk_00][4], D_E0090A78[unk_00][5], 0); - gSPDisplayList(gMasterGfxPos++, D_09001500_3918D0); - gSPDisplayList(gMasterGfxPos++, D_E0090A40[data->unk_04]); + gDPSetPrimColor(gMainGfxPos++, 0, 0, D_E0090A78[unk_00][0], D_E0090A78[unk_00][1], D_E0090A78[unk_00][2], data->unk_14); + gDPSetEnvColor(gMainGfxPos++, D_E0090A78[unk_00][3], D_E0090A78[unk_00][4], D_E0090A78[unk_00][5], 0); + gSPDisplayList(gMainGfxPos++, D_09001500_3918D0); + gSPDisplayList(gMainGfxPos++, D_E0090A40[data->unk_04]); - gSPScisTextureRectangle(gMasterGfxPos++, + gSPScisTextureRectangle(gMainGfxPos++, data->unk_08 * 4.0f, data->unk_0C * 4.0f, (data->unk_08 + 128.0f) * 4.0f, (data->unk_0C + 64.0f) * 4.0f, G_TX_RENDERTILE, 0, 1024, 512, 65024); } - gDPPipeSync(gMasterGfxPos++); - gDPSetDepthSource(gMasterGfxPos++, G_ZS_PIXEL); - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); + gDPSetDepthSource(gMainGfxPos++, G_ZS_PIXEL); + gDPPipeSync(gMainGfxPos++); } } diff --git a/src/effects/aura.c b/src/effects/aura.c index 847aa40403..ba6d621e83 100644 --- a/src/effects/aura.c +++ b/src/effects/aura.c @@ -271,8 +271,8 @@ void aura_appendGfx(void* argEffect) { s32 primA = data->primA; s32 v1, v2; - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effect->graphics->data)); - gSPDisplayList(gMasterGfxPos++, D_E0076ED0[type]); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effect->graphics->data)); + gSPDisplayList(gMainGfxPos++, D_E0076ED0[type]); shim_guTranslateF(translateMtx, data->posB.x, data->posB.y, data->posB.z); if (type == 2) { @@ -289,9 +289,9 @@ void aura_appendGfx(void* argEffect) { } shim_guMtxF2L(transformMtx, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_E0076EC0[type]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_E0076EC0[type]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); shim_guTranslateF(translateMtx, data->posA.x, data->posA.y, data->posA.z); if (type == 2) { @@ -308,23 +308,23 @@ void aura_appendGfx(void* argEffect) { } shim_guMtxF2L(transformMtx, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_E0076EB0[type]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_E0076EB0[type]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, data->primR, data->primG, data->primB, primA); - gDPSetEnvColor(gMasterGfxPos++, data->envR, data->envG, data->engB, data->engA); + gDPSetPrimColor(gMainGfxPos++, 0, 0, data->primR, data->primG, data->primB, primA); + gDPSetEnvColor(gMainGfxPos++, data->envR, data->envG, data->engB, data->engA); v1 = data->unk_34 * 4.0f; v2 = data->unk_40 * 4.0f; - gDPSetTileSize(gMasterGfxPos++, 1, v1, v2, v1 + 124, v2 + 508); - gSPDisplayList(gMasterGfxPos++, D_E0076E90[type]); + gDPSetTileSize(gMainGfxPos++, 1, v1, v2, v1 + 124, v2 + 508); + gSPDisplayList(gMainGfxPos++, D_E0076E90[type]); v1 = data->unk_4C * 4.0f; v2 = data->unk_58 * 4.0f; - gDPSetTileSize(gMasterGfxPos++, 1, v1 + 30, v2 + 30, v1 + 282, v2 + 538); - gSPDisplayList(gMasterGfxPos++, D_E0076EA0[type]); - gDPPipeSync(gMasterGfxPos++); + gDPSetTileSize(gMainGfxPos++, 1, v1 + 30, v2 + 30, v1 + 282, v2 + 538); + gSPDisplayList(gMainGfxPos++, D_E0076EA0[type]); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/balloon.c b/src/effects/balloon.c index 37d05bdfaa..1f5f2cf440 100644 --- a/src/effects/balloon.c +++ b/src/effects/balloon.c @@ -89,8 +89,8 @@ void balloon_appendGfx(void* effect) { BalloonFXData* data = ((EffectInstance*)effect)->data.balloon; s32 idx = data->unk_00; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guTranslateF(sp18, data->unk_04, data->unk_08, data->unk_0C); shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); @@ -99,10 +99,10 @@ void balloon_appendGfx(void* effect) { shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_E00963E0[idx]); - gSPDisplayList(gMasterGfxPos++, D_09001508_395B78); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPPipeSync(gMasterGfxPos++); + gSPDisplayList(gMainGfxPos++, D_E00963E0[idx]); + gSPDisplayList(gMainGfxPos++, D_09001508_395B78); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/big_smoke_puff.c b/src/effects/big_smoke_puff.c index cf24523ed9..ceacbb78d7 100644 --- a/src/effects/big_smoke_puff.c +++ b/src/effects/big_smoke_puff.c @@ -125,13 +125,13 @@ void big_smoke_puff_appendGfx(void* effect) { Matrix4f mtx; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guPositionF(mtx, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, data->x, data->y, data->z); shim_guMtxF2L(mtx, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); for (i = 0; i < ((EffectInstance*)effect)->numParts; i++, data++) { @@ -149,7 +149,7 @@ void big_smoke_puff_appendGfx(void* effect) { data->partY, 0.0f); shim_guMtxF2L(mtx, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); temp_f12 = data->unk_00 - 1; @@ -164,15 +164,15 @@ void big_smoke_puff_appendGfx(void* effect) { dlist = sDlists[(s32)temp]; } - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, (u32)(primAlpha * 105) / 8); - gDPSetEnvColor(gMasterGfxPos++, 0, 0, 0, envAlpha); - gSPDisplayList(gMasterGfxPos++, dlist); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, (u32)(primAlpha * 105) / 8); + gDPSetEnvColor(gMainGfxPos++, 0, 0, 0, envAlpha); + gSPDisplayList(gMainGfxPos++, dlist); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPPipeSync(gMasterGfxPos++); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMainGfxPos++); } void func_E0002738(EffectInstance* effect) { diff --git a/src/effects/big_snowflakes.c b/src/effects/big_snowflakes.c index 57fcb4bcfc..75ba73ad6a 100644 --- a/src/effects/big_snowflakes.c +++ b/src/effects/big_snowflakes.c @@ -115,9 +115,9 @@ void big_snowflakes_appendGfx(void* effect) { Gfx* dlist = D_E0060738[0]; s32 i; - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, dlist); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 20, 100, 20, data->unk_24); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gSPDisplayList(gMainGfxPos++, dlist); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 20, 100, 20, data->unk_24); shim_guTranslateF(sp18, data->unk_04, data->unk_08, data->unk_0C); shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); @@ -138,8 +138,8 @@ void big_snowflakes_appendGfx(void* effect) { } shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, dlist2); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, dlist2); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } diff --git a/src/effects/blast.c b/src/effects/blast.c index ae3b594513..50b31049d2 100644 --- a/src/effects/blast.c +++ b/src/effects/blast.c @@ -111,10 +111,10 @@ void blast_appendGfx(void *effect) { unk_20f = unk_20; envAlpha = (unk_20f - unk_20) * two_fifty_six; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, D_09001300_37ECD0); - gSPDisplayList(gMasterGfxPos++, D_E007C510[unk_20]); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gSPDisplayList(gMainGfxPos++, D_09001300_37ECD0); + gSPDisplayList(gMainGfxPos++, D_E007C510[unk_20]); shim_guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); @@ -125,19 +125,19 @@ void blast_appendGfx(void *effect) { shim_guMtxCatF(sp18, sp98, sp98); shim_guMtxF2L(sp98, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); if (data->unk_20 > 4.0f) { - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 255, 255, 127); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 255, 127); } else { - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 255, 128, 127); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 128, 127); } - gDPSetEnvColor(gMasterGfxPos++, 255, 255, 139, envAlpha); + gDPSetEnvColor(gMainGfxPos++, 255, 255, 139, envAlpha); - gSPDisplayList(gMasterGfxPos++, dlist); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, dlist); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } #else INCLUDE_ASM(s32, "effects/blast", blast_appendGfx); diff --git a/src/effects/bombette_breaking.c b/src/effects/bombette_breaking.c index a857f1dbc3..2cc92af122 100644 --- a/src/effects/bombette_breaking.c +++ b/src/effects/bombette_breaking.c @@ -216,39 +216,39 @@ void bombette_breaking_appendGfx(void* effect) { timeLeft *= 4; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guTranslateF(sp20, data->center.x, data->center.y, data->center.z); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - shim_mdl_draw_hidden_panel_surface(&gMasterGfxPos, data->treeIndex); + shim_mdl_draw_hidden_panel_surface(&gMainGfxPos, data->treeIndex); data++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, data++) { shim_guPositionF(sp20, timeLeft + (130 * i), timeLeft - (40 * i), timeLeft + (80 * i), unk_40, data->unk_14.x, data->unk_14.y, data->unk_14.z); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_E0084E1C[type]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_E0084E1C[type]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } - gSPDisplayList(gMasterGfxPos++, sp64); + gSPDisplayList(gMainGfxPos++, sp64); data = ((EffectInstance*)effect)->data.bombetteBreaking; data++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, data++) { - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 255, 255, (data->alpha * mainAlpha) / 255); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 255, (data->alpha * mainAlpha) / 255); shim_guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, unk_38, data->center.x, data->center.y, data->center.z); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, sp60); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, sp60); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/breaking_junk.c b/src/effects/breaking_junk.c index 77aece5616..047de86f70 100644 --- a/src/effects/breaking_junk.c +++ b/src/effects/breaking_junk.c @@ -137,21 +137,21 @@ void breaking_junk_appendGfx(void* effect) { s32 alpha = data->primA; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, D_E01187C0[0]); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gSPDisplayList(gMainGfxPos++, D_E01187C0[0]); for (i = 0; i < ((EffectInstance*)effect)->numParts; i++, data++) { shim_guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, data->scale * 0.5, data->pos.x, data->pos.y, data->pos.z); shim_guRotateF(sp60, data->rot, 0.0f, 0.0f, 1.0f); shim_guMtxCatF(sp60, sp20, sp20); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, data->primR, data->primG, data->primB, alpha); - gDPSetEnvColor(gMasterGfxPos++, data->envR, data->envG, data->envB, data->envA); - gSPDisplayList(gMasterGfxPos++, D_E01187B0[(u32)i % ARRAY_COUNT(D_E01187B0)]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, data->primR, data->primG, data->primB, alpha); + gDPSetEnvColor(gMainGfxPos++, data->envR, data->envG, data->envB, data->envA); + gSPDisplayList(gMainGfxPos++, D_E01187B0[(u32)i % ARRAY_COUNT(D_E01187B0)]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/bulb_glow.c b/src/effects/bulb_glow.c index 702b630076..ad7f790596 100644 --- a/src/effects/bulb_glow.c +++ b/src/effects/bulb_glow.c @@ -185,8 +185,8 @@ void bulb_glow_appendGfx(void* effect) { brightness = 0x7F; } - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); temp_s1 = &D_E0078918[temp_s2]; glowExtent = temp_s1->unk_10; @@ -203,14 +203,14 @@ void bulb_glow_appendGfx(void* effect) { return; } - gSPDisplayList(gMasterGfxPos++, D_E0078900[temp_s2]); + gSPDisplayList(gMainGfxPos++, D_E0078900[temp_s2]); temp_v0 = &D_E00789AC[data->unk_20]; colorScale = (brightness * 2); r = temp_v0->r * colorScale / 255; g = temp_v0->g * colorScale / 255; b = temp_v0->b * colorScale / 255; - gDPSetPrimColor(gMasterGfxPos++, 0, 0, r, g, b, 0x7F); + gDPSetPrimColor(gMainGfxPos++, 0, 0, r, g, b, 0x7F); // temp_s1 = E0078948 // unk_00 = 64 @@ -251,7 +251,7 @@ void bulb_glow_appendGfx(void* effect) { numRects = (yMax - yMin) / rectHeight; for (i = yStart / rectHeight; i < numRects && (i + 1) * rectHeight + yMin < SCREEN_HEIGHT; i++) { - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, // uls = 183 << 2 (s32) (xMin * temp_s1->unk_08) << 2, // This code is correct due to being masked to 12 bits @@ -265,7 +265,7 @@ void bulb_glow_appendGfx(void* effect) { (s32) (temp_s1->unk_04 * 21 - i * temp_s1->unk_14 * temp_s1->unk_0C) << 2); for (j = 0; j < 1; j++) { - gDPLoadMultiTile(gMasterGfxPos++, + gDPLoadMultiTile(gMainGfxPos++, // Offset the image to the rows being loaded VIRTUAL_TO_PHYSICAL(nuGfxCfb_ptr + (i * rectHeight + yMin) * (SCREEN_WIDTH * sizeof(u16))), TMEM_ADDR(TMEM_SIZE/2), G_TX_RENDERTILE + 1, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, 0, @@ -274,7 +274,7 @@ void bulb_glow_appendGfx(void* effect) { // lrs = 311 - 1, lrt = 8 - 1 xMax - 1, rectHeight - 1, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 9, 8, G_TX_NOLOD, G_TX_NOLOD); - gSPTextureRectangle(gMasterGfxPos++, + gSPTextureRectangle(gMainGfxPos++, // xl = 183 << 2, yl = (43 << 2, 51 << 2, 59 << 2, ...) (xMin + xStart) << 2, (i * rectHeight + yMin) << 2, // xr = 311 << 2, yh = (51 << 2, 59 << 2, 67 << 2, ...) @@ -283,7 +283,7 @@ void bulb_glow_appendGfx(void* effect) { // s = 183 << 5, t = 0 ((xMin + xStart) & 0x1FF) << 5, 0, 1 << 10, 1 << 10); - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } } } diff --git a/src/effects/butterflies.c b/src/effects/butterflies.c index e7954ec1cd..a0dfa7f51c 100644 --- a/src/effects/butterflies.c +++ b/src/effects/butterflies.c @@ -170,8 +170,8 @@ void butterflies_appendGfx(void* effect) { s32 primColor = data->unk_24; s32 type = data->unk_00; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->graphics->data)); shim_guTranslateF(sp18, data->unk_0C, data->unk_10 + D_E00AA6EC[data->unk_2C] * 0.3f, data->unk_14); shim_guRotateF(sp58, data->unk_28, 0.0f, 1.0f, 0.0f); @@ -180,12 +180,12 @@ void butterflies_appendGfx(void* effect) { shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, primColor, primColor, primColor, 255); - gSPDisplayList(gMasterGfxPos++, D_09003880_3AE8B0); - gSPDisplayList(gMasterGfxPos++, D_E00AA6C0[type]); - gSPVertex(gMasterGfxPos++, &D_09002D40_3ADD70[data->unk_2C], 6, 0); - gSPDisplayList(gMasterGfxPos++, D_09003DC8_3AEDF8); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPPipeSync(gMasterGfxPos++); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, primColor, primColor, primColor, 255); + gSPDisplayList(gMainGfxPos++, D_09003880_3AE8B0); + gSPDisplayList(gMainGfxPos++, D_E00AA6C0[type]); + gSPVertex(gMainGfxPos++, &D_09002D40_3ADD70[data->unk_2C], 6, 0); + gSPDisplayList(gMainGfxPos++, D_09003DC8_3AEDF8); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/chapter_change.c b/src/effects/chapter_change.c index ce7daf3786..c55298f3f9 100644 --- a/src/effects/chapter_change.c +++ b/src/effects/chapter_change.c @@ -108,11 +108,11 @@ void func_E010E000(ChapterChangeFXData* data, s32 arg1, UnkStruct* arg2) { if (arg2 != NULL) { for (it = arg2; it->displayList != NULL; it++) { - gSPDisplayList(gMasterGfxPos++, it->displayList); + gSPDisplayList(gMainGfxPos++, it->displayList); temp = it->x - 384; - gDPSetTileSize(gMasterGfxPos++, 1, (unk_1C * 4 - temp) * 4, 0, (unk_1C * 4 - it->x + 511) * 4, 0); - gSPScisTextureRectangle(gMasterGfxPos++, + gDPSetTileSize(gMainGfxPos++, 1, (unk_1C * 4 - temp) * 4, 0, (unk_1C * 4 - it->x + 511) * 4, 0); + gSPScisTextureRectangle(gMainGfxPos++, (posX + it->x) * 4, (posY + it->y) * 4, (posX + it->x + it->width) * 4, @@ -120,7 +120,7 @@ void func_E010E000(ChapterChangeFXData* data, s32 arg1, UnkStruct* arg2) { G_TX_RENDERTILE, 0, 0, 1024, 1024); } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } } @@ -218,8 +218,8 @@ void chapter_change_appendGfx(void* effect) { UnkStruct* ptr0; UnkStruct* ptr1; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); switch (unk_00) { case 1: @@ -256,8 +256,8 @@ void chapter_change_appendGfx(void* effect) { break; } - gDPSetPrimColor(gMasterGfxPos++, 0, 0, data->unk_20, data->unk_24, data->unk_28, unk_2C); - gDPSetEnvColor(gMasterGfxPos++, data->unk_30, data->unk_34, data->unk_38, data->unk_3C); + gDPSetPrimColor(gMainGfxPos++, 0, 0, data->unk_20, data->unk_24, data->unk_28, unk_2C); + gDPSetEnvColor(gMainGfxPos++, data->unk_30, data->unk_34, data->unk_38, data->unk_3C); func_E010E000(data, 0, ptr0); func_E010E000(data, 1, ptr1); @@ -266,5 +266,5 @@ void chapter_change_appendGfx(void* effect) { shim_draw_msg(data->unk_54, data->unk_40 - data->unk_48, data->unk_44, 255, 21, 0); } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/chomp_drop.c b/src/effects/chomp_drop.c index 9541e7fed8..edae697557 100644 --- a/src/effects/chomp_drop.c +++ b/src/effects/chomp_drop.c @@ -143,18 +143,18 @@ void chomp_drop_appendGfx(void* effect) { Vtx_t* vtxTemp; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effectTemp)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effectTemp)->graphics->data)); shim_guScaleF(sp20, 0.01f, 0.01f, 0.01f); shim_guPositionF(sp60, 0.0f, 0.0f, 0.0f, data->unk_24, data->unk_04 * 100.0f, data->unk_08 * 100.0f, data->unk_0C * 100.0f); shim_guMtxCatF(sp60, sp20, sp20); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetPrimColor( - gMasterGfxPos++, 0, 0, + gMainGfxPos++, 0, 0, (shim_sin_deg(temp_s6 * 30) * 25.0f) + 225.0f, (shim_sin_deg(temp_s6 * 30) * 25.0f) + 225.0f, 255, @@ -162,21 +162,21 @@ void chomp_drop_appendGfx(void* effect) { ); if (data->unk_2C == 1) { - gSPDisplayList(gMasterGfxPos++, D_09001040_398080); - gSPDisplayList(gMasterGfxPos++, D_09001190_3981D0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, ((30 - data->unk_30) * 255) / 30); - gSPDisplayList(gMasterGfxPos++, D_090010E8_398128); - gSPDisplayList(gMasterGfxPos++, D_09001190_3981D0); + gSPDisplayList(gMainGfxPos++, D_09001040_398080); + gSPDisplayList(gMainGfxPos++, D_09001190_3981D0); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, ((30 - data->unk_30) * 255) / 30); + gSPDisplayList(gMainGfxPos++, D_090010E8_398128); + gSPDisplayList(gMainGfxPos++, D_09001190_3981D0); } else { if (data->unk_2C > 0) { - gSPDisplayList(gMasterGfxPos++, D_090010E8_398128); + gSPDisplayList(gMainGfxPos++, D_090010E8_398128); } else { - gSPDisplayList(gMasterGfxPos++, D_09001040_398080); + gSPDisplayList(gMainGfxPos++, D_09001040_398080); } - savedGfxPos = gMasterGfxPos + 1; - gSPBranchList(gMasterGfxPos, gMasterGfxPos + 0x41); - gMasterGfxPos = savedGfxPos; + savedGfxPos = gMainGfxPos + 1; + gSPBranchList(gMainGfxPos, gMainGfxPos + 0x41); + gMainGfxPos = savedGfxPos; vtxTemp = (Vtx_t*) savedGfxPos; for (i = 0; i < 16; i++) { @@ -198,17 +198,17 @@ void chomp_drop_appendGfx(void* effect) { vtx->tc[1] = i * 128; } - gMasterGfxPos += 0x40; - gSPVertex(gMasterGfxPos++, vtxTemp, 32, 0); + gMainGfxPos += 0x40; + gSPVertex(gMainGfxPos++, vtxTemp, 32, 0); for (i = 0; i < 15; i++) { s32 i2 = i * 2; - gSP2Triangles(gMasterGfxPos++, + gSP2Triangles(gMainGfxPos++, i2 , i2 + 2, i2 + 1, i2, i2 + 1, i2 + 2, i2 + 3, i2); }; } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPPipeSync(gMasterGfxPos++); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/cloud_puff.c b/src/effects/cloud_puff.c index be02fbb152..82ead0e23b 100644 --- a/src/effects/cloud_puff.c +++ b/src/effects/cloud_puff.c @@ -119,9 +119,9 @@ void cloud_puff_appendGfx(void* effect) { Matrix4f sp60; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->graphics->data)); - gSPDisplayList(gMasterGfxPos++, D_090000E0_32ED30); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->graphics->data)); + gSPDisplayList(gMainGfxPos++, D_090000E0_32ED30); for (i = 0; i < effectTemp->numParts; i++, part++) { if (part->alive) { @@ -131,12 +131,12 @@ void cloud_puff_appendGfx(void* effect) { shim_guMtxCatF(sp60, sp20, sp20); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 112, 96, 24, part->alpha); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gDPSetPrimColor(gMainGfxPos++, 0, 0, 112, 96, 24, part->alpha); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_090001B8_32EE08); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_090001B8_32EE08); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/cloud_trail.c b/src/effects/cloud_trail.c index 3a810add47..f9d8758119 100644 --- a/src/effects/cloud_trail.c +++ b/src/effects/cloud_trail.c @@ -120,9 +120,9 @@ void cloud_trail_appendGfx(void* effect) { Matrix4f sp60; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->graphics->data)); - gSPDisplayList(gMasterGfxPos++, D_090000E0_32ED30); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->graphics->data)); + gSPDisplayList(gMainGfxPos++, D_090000E0_32ED30); for (i = 0; i < effectTemp->numParts; i++, part++) { if (part->alive) { @@ -134,12 +134,12 @@ void cloud_trail_appendGfx(void* effect) { shim_guMtxCatF(sp60, sp20, sp20); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 112, 96, 24, part->alpha); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gDPSetPrimColor(gMainGfxPos++, 0, 0, 112, 96, 24, part->alpha); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_090001B8_32EE08); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_090001B8_32EE08); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/cold_breath.c b/src/effects/cold_breath.c index bee4bdcd32..842b04850d 100644 --- a/src/effects/cold_breath.c +++ b/src/effects/cold_breath.c @@ -193,19 +193,19 @@ void cold_breath_appendGfx(void* effect) { s32 envAlpha; s32 cond; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guTranslateF(sp20, data->unk_04, data->unk_08, data->unk_0C); shim_guScaleF(sp60, data->unk_40, data->unk_40, data->unk_40); shim_guMtxCatF(sp60, sp20, sp20); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(gMasterGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, data->unk_18, data->unk_1C, data->unk_20, 0.5 * unk24); - gDPSetAlphaDither(gMasterGfxPos++, G_AD_NOISE); - gSPDisplayList(gMasterGfxPos++, D_E00DE84C[unk00]); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, data->unk_18, data->unk_1C, data->unk_20, 0.5 * unk24); + gDPSetAlphaDither(gMainGfxPos++, G_AD_NOISE); + gSPDisplayList(gMainGfxPos++, D_E00DE84C[unk00]); unkIndex = (unk14 < 30 ? unk14 : 29) + unk00 * 30; temp1 = D_E00DE96C[unkIndex]; @@ -214,7 +214,7 @@ void cold_breath_appendGfx(void* effect) { shim_guPositionF(sp20, 0.0f, 0.0f, -temp1, temp2 * 0.01f, temp3, 0.0f, 0.0f); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); temp_f32 = D_E00DE910[unkIndex] * 5.0f / 256.0f; temp_s32 = temp_f32; @@ -223,16 +223,16 @@ void cold_breath_appendGfx(void* effect) { cond = temp_s32 >= 4; if (temp_s32 < 5) { if (cond) { - gDPSetTileSize(gMasterGfxPos++, 1, 0, 0, 0, 0); + gDPSetTileSize(gMainGfxPos++, 1, 0, 0, 0, 0); } else { - gDPSetTileSize(gMasterGfxPos++, 1, 0, 0, 31 << 2, 127 << 2); + gDPSetTileSize(gMainGfxPos++, 1, 0, 0, 31 << 2, 127 << 2); } - gDPSetEnvColor(gMasterGfxPos++, data->unk_28, data->unk_2C, data->unk_30, envAlpha); - gSPDisplayList(gMasterGfxPos++, D_E00DE810[unk00][temp_s32]); + gDPSetEnvColor(gMainGfxPos++, data->unk_28, data->unk_2C, data->unk_30, envAlpha); + gSPDisplayList(gMainGfxPos++, D_E00DE810[unk00][temp_s32]); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPSetAlphaDither(gMasterGfxPos++, G_AD_DISABLE); - gDPPipeSync(gMasterGfxPos++); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPSetAlphaDither(gMainGfxPos++, G_AD_DISABLE); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/confetti.c b/src/effects/confetti.c index 3054ff72d1..4607132332 100644 --- a/src/effects/confetti.c +++ b/src/effects/confetti.c @@ -266,17 +266,17 @@ void confetti_appendGfx(void* effect) { unk_28 = part->unk_28; spA0 = D_E0088CC0[part->unk_00]; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, D_09000940_38C4E0); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gSPDisplayList(gMainGfxPos++, D_09000940_38C4E0); shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - savedGfxPos = gMasterGfxPos++; + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + savedGfxPos = gMainGfxPos++; part++; for (i = 0; i < unk_2C; i++, part++) { @@ -286,34 +286,34 @@ void confetti_appendGfx(void* effect) { shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, color->r, color->g, color->b, unk_28); + gDPSetPrimColor(gMainGfxPos++, 0, 0, color->r, color->g, color->b, unk_28); switch ((unk_24 + i) % 3) { case 0: - gDPSetCombineLERP(gMasterGfxPos++, TEXEL0, 0, PRIMITIVE, ENVIRONMENT, PRIMITIVE, 0, TEXEL0, 0, TEXEL0, ENVIRONMENT, PRIMITIVE, 0, PRIMITIVE, 0, TEXEL0, 0); + gDPSetCombineLERP(gMainGfxPos++, TEXEL0, 0, PRIMITIVE, ENVIRONMENT, PRIMITIVE, 0, TEXEL0, 0, TEXEL0, ENVIRONMENT, PRIMITIVE, 0, PRIMITIVE, 0, TEXEL0, 0); break; case 1: - gDPSetCombineLERP(gMasterGfxPos++, TEXEL0, 0, PRIMITIVE, ENVIRONMENT, PRIMITIVE, 0, TEXEL0, 0, TEXEL0, 0, PRIMITIVE, ENVIRONMENT, PRIMITIVE, 0, TEXEL0, 0); + gDPSetCombineLERP(gMainGfxPos++, TEXEL0, 0, PRIMITIVE, ENVIRONMENT, PRIMITIVE, 0, TEXEL0, 0, TEXEL0, 0, PRIMITIVE, ENVIRONMENT, PRIMITIVE, 0, TEXEL0, 0); break; case 2: - gDPSetCombineLERP(gMasterGfxPos++, TEXEL0, 0, PRIMITIVE, ENVIRONMENT, PRIMITIVE, 0, TEXEL0, 0, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, 0, TEXEL0, 0); + gDPSetCombineLERP(gMainGfxPos++, TEXEL0, 0, PRIMITIVE, ENVIRONMENT, PRIMITIVE, 0, TEXEL0, 0, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, 0, TEXEL0, 0); break; } uly = ((i + D_E0088D00[unk_24 % 6]) & 0xF) * 16; - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, ulx << 2, uly << 2, + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, ulx << 2, uly << 2, (ulx << 2) + ((width >> 1) << 1), (uly << 2) + height); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, spA0); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, spA0); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } - gSPEndDisplayList(gMasterGfxPos++); - gSPBranchList(savedGfxPos, gMasterGfxPos); + gSPEndDisplayList(gMainGfxPos++); + gSPBranchList(savedGfxPos, gMainGfxPos); savedGfxPos++; - gSPDisplayList(gMasterGfxPos++, savedGfxPos); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPPipeSync(gMasterGfxPos++); + gSPDisplayList(gMainGfxPos++, savedGfxPos); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/damage_indicator.c b/src/effects/damage_indicator.c index 16ad4407cc..66a3ae7c88 100644 --- a/src/effects/damage_indicator.c +++ b/src/effects/damage_indicator.c @@ -198,90 +198,90 @@ void func_E003C498(EffectInstance* effect) { s32 numParts = part->numParts; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effect->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effect->graphics->data)); shim_guTranslateF(sp20, part->unk_04.x, part->unk_04.y, part->unk_04.z); shim_guRotateF(sp60, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); shim_guMtxCatF(sp60, sp20, sp20); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); spA0 = part->unk_34 - 1; lastPartIdx = effect->numParts - 1; part = &(effect->data.damageIndicator)[effect->numParts - 1]; if (part->alpha == 255) { - gDPSetRenderMode(gMasterGfxPos++, G_RM_AA_TEX_EDGE, G_RM_AA_TEX_EDGE2); - gDPSetCombineLERP(gMasterGfxPos++, 1, 0, SHADE, PRIMITIVE, PRIMITIVE, 0, TEXEL0, 0, 1, 0, SHADE, PRIMITIVE, PRIMITIVE, 0, TEXEL0, 0); + gDPSetRenderMode(gMainGfxPos++, G_RM_AA_TEX_EDGE, G_RM_AA_TEX_EDGE2); + gDPSetCombineLERP(gMainGfxPos++, 1, 0, SHADE, PRIMITIVE, PRIMITIVE, 0, TEXEL0, 0, 1, 0, SHADE, PRIMITIVE, PRIMITIVE, 0, TEXEL0, 0); } else { - gDPSetRenderMode(gMasterGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); - gDPSetCombineLERP(gMasterGfxPos++, 1, 0, SHADE, PRIMITIVE, PRIMITIVE, 0, TEXEL0, 0, 1, 0, SHADE, PRIMITIVE, PRIMITIVE, 0, TEXEL0, 0); + gDPSetRenderMode(gMainGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); + gDPSetCombineLERP(gMainGfxPos++, 1, 0, SHADE, PRIMITIVE, PRIMITIVE, 0, TEXEL0, 0, 1, 0, SHADE, PRIMITIVE, PRIMITIVE, 0, TEXEL0, 0); } for(i = 1; i < effect->numParts; i++, part--) { s32 rIdx = ((i + spA0) % 12) * 3; - gDPSetPrimColor(gMasterGfxPos++, 0, 0, D_E003CCF8[rIdx], D_E003CCF8[rIdx + 1], D_E003CCF8[rIdx + 2], part->alpha); - gSPDisplayList(gMasterGfxPos++, D_09001D40_351F60); + gDPSetPrimColor(gMainGfxPos++, 0, 0, D_E003CCF8[rIdx], D_E003CCF8[rIdx + 1], D_E003CCF8[rIdx + 2], part->alpha); + gSPDisplayList(gMainGfxPos++, D_09001D40_351F60); if (i == lastPartIdx) { shim_guPositionF(sp20, 0.0f, 0.0f, 0.0f, part->unk_38, part->unk_10.x, part->unk_10.y, part->unk_10.z); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_09002150_352370); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_09002150_352370); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); shim_guPositionF(sp20, 0.0f, 0.0f, 0.0f, part->unk_38, (part->unk_10.x + part->unk_04.x) * 0.5, (part->unk_10.y + part->unk_04.y) * 0.5, (part->unk_10.z + part->unk_04.z) * 0.5); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_09002160_352380); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_09002160_352380); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } - gSPDisplayList(gMasterGfxPos++, D_09001D40_351F60); + gSPDisplayList(gMainGfxPos++, D_09001D40_351F60); shim_guTranslateF(sp20, part->unk_04.x, part->unk_04.y, part->unk_04.z); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); shim_guScaleF(sp20, part->unk_38, part->unk_38, 1.0f); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); if (i == lastPartIdx) { - gSPDisplayList(gMasterGfxPos++, D_09002170_352390); + gSPDisplayList(gMainGfxPos++, D_09002170_352390); } else { - gSPDisplayList(gMasterGfxPos++, D_09002180_3523A0); + gSPDisplayList(gMainGfxPos++, D_09002180_3523A0); } if (i == lastPartIdx) { - gSPDisplayList(gMasterGfxPos++, D_090021A8_3523C8); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_09001DE0_352000); + gSPDisplayList(gMainGfxPos++, D_090021A8_3523C8); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_09001DE0_352000); if (numParts < 10) { - gSPDisplayList(gMasterGfxPos++, D_E003CCA0[i]); - gSPDisplayList(gMasterGfxPos++, D_090021C0_3523E0); + gSPDisplayList(gMainGfxPos++, D_E003CCA0[i]); + gSPDisplayList(gMainGfxPos++, D_090021C0_3523E0); } else { s32 temp = numParts % 10; s32 temp2 = numParts / 10; - gSPDisplayList(gMasterGfxPos++, D_E003CCA0[temp]); - gSPDisplayList(gMasterGfxPos++, D_09002200_352420); - gSPDisplayList(gMasterGfxPos++, D_E003CCA0[temp2]); - gSPDisplayList(gMasterGfxPos++, D_090021E0_352400); + gSPDisplayList(gMainGfxPos++, D_E003CCA0[temp]); + gSPDisplayList(gMainGfxPos++, D_09002200_352420); + gSPDisplayList(gMainGfxPos++, D_E003CCA0[temp2]); + gSPDisplayList(gMainGfxPos++, D_090021E0_352400); } } else { - gSPDisplayList(gMasterGfxPos++, D_09002190_3523B0); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_09002190_3523B0); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/damage_stars.c b/src/effects/damage_stars.c index 9eb8f46c91..265052bd70 100644 --- a/src/effects/damage_stars.c +++ b/src/effects/damage_stars.c @@ -246,9 +246,9 @@ void damage_stars_appendGfx(void* effect) { s32 baseIdx; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, D_090004C0_343500); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gSPDisplayList(gMainGfxPos++, D_090004C0_343500); baseIdx = (part->unk_2C - 1) * 3; baseIdx %= 36; @@ -258,20 +258,20 @@ void damage_stars_appendGfx(void* effect) { s32 gIdx = baseIdx + 1 + i * 3; s32 bIdx = baseIdx + 2 + i * 3; - gDPSetPrimColor(gMasterGfxPos++, 0, 0, D_E0030E90[rIdx % 36], D_E0030E90[gIdx % 36], D_E0030E90[bIdx % 36], part->unk_24); + gDPSetPrimColor(gMainGfxPos++, 0, 0, D_E0030E90[rIdx % 36], D_E0030E90[gIdx % 36], D_E0030E90[bIdx % 36], part->unk_24); shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); shim_guRotateF(sp18, part->unk_1C, 0.0f, 0.0f, 1.0f); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_090005E0_343620); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_090005E0_343620); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } diff --git a/src/effects/debuff.c b/src/effects/debuff.c index 6d9c9a4325..a17801e1d7 100644 --- a/src/effects/debuff.c +++ b/src/effects/debuff.c @@ -140,19 +140,19 @@ void debuff_appendGfx(void* effect) { Matrix4f sp98; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(eff->graphics->data)); - gSPDisplayList(gMasterGfxPos++, dlist2); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(eff->graphics->data)); + gSPDisplayList(gMainGfxPos++, dlist2); shim_guTranslateF(sp18, data->unk_04, data->unk_08, data->unk_0C); shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); shim_guMtxCatF(sp58, sp18, sp98); shim_guMtxF2L(sp98, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, data->unk_38, data->unk_39, data->unk_3A, data->unk_34); - gDPSetEnvColor(gMasterGfxPos++, data->unk_3B, data->unk_3C, data->unk_3D, 0); + gDPSetPrimColor(gMainGfxPos++, 0, 0, data->unk_38, data->unk_39, data->unk_3A, data->unk_34); + gDPSetEnvColor(gMainGfxPos++, data->unk_3B, data->unk_3C, data->unk_3D, 0); data++; for (i = 1; i < eff->numParts; i++, data++) { @@ -163,12 +163,12 @@ void debuff_appendGfx(void* effect) { shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, dlist); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, dlist); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPPipeSync(gMasterGfxPos++); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/disable_x.c b/src/effects/disable_x.c index 4717ea2d2f..5fca944e44 100644 --- a/src/effects/disable_x.c +++ b/src/effects/disable_x.c @@ -220,7 +220,7 @@ void func_E0082580(DisableXFXData* data) { shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); } @@ -236,19 +236,19 @@ void func_E00826C4(DisableXFXData* data) { shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, data->alpha); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, data->alpha); if (data->alpha == 255) { - gDPSetRenderMode(gMasterGfxPos++, AA_EN | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | + gDPSetRenderMode(gMainGfxPos++, AA_EN | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM), AA_EN | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM)); - gDPSetCombineMode(gMasterGfxPos++, G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA); + gDPSetCombineMode(gMainGfxPos++, G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA); } else { - gDPSetRenderMode(gMasterGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); - gDPSetCombineLERP(gMasterGfxPos++, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, TEXEL0, 0, TEXEL0, 0, SHADE, 0, + gDPSetRenderMode(gMainGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); + gDPSetCombineLERP(gMainGfxPos++, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, TEXEL0, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, TEXEL0, 0); } } @@ -259,8 +259,8 @@ void func_E00828B4(EffectInstance* effect) { s32 unk_38; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effect->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effect->graphics->data)); func_E0082580(data); unk_38 = data->unk_38; type = data->type; @@ -269,17 +269,17 @@ void func_E00828B4(EffectInstance* effect) { for (i = 1; i < effect->numParts; i++, data++) { if (unk_38 > 0 || type == 10) { if (type == 1) { - gSPDisplayList(gMasterGfxPos++, D_09002198_388548); + gSPDisplayList(gMainGfxPos++, D_09002198_388548); } else { - gSPDisplayList(gMasterGfxPos++, D_09002100_3884B0); + gSPDisplayList(gMainGfxPos++, D_09002100_3884B0); } func_E00826C4(data); - gSPDisplayList(gMasterGfxPos++, D_09002230_3885E0); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_09002230_3885E0); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPPipeSync(gMasterGfxPos++); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMainGfxPos++); } void func_E0082A84(EffectInstance* effect) { @@ -287,8 +287,8 @@ void func_E0082A84(EffectInstance* effect) { s32 unk_38; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effect->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effect->graphics->data)); func_E0082580(data); unk_38 = data->unk_38; @@ -296,23 +296,23 @@ void func_E0082A84(EffectInstance* effect) { for (i = 1; i < effect->numParts; i++, data++) { func_E00826C4(data); if (unk_38 > 0) { - gSPDisplayList(gMasterGfxPos++, D_090022B0_388660); + gSPDisplayList(gMainGfxPos++, D_090022B0_388660); if (unk_38 < 10) { - gSPDisplayList(gMasterGfxPos++, D_E0082D00[unk_38]); - gSPDisplayList(gMasterGfxPos++, D_09002250_388600); + gSPDisplayList(gMainGfxPos++, D_E0082D00[unk_38]); + gSPDisplayList(gMainGfxPos++, D_09002250_388600); } else { s32 ones = unk_38 % 10; s32 tens = unk_38 / 10; - gSPDisplayList(gMasterGfxPos++, D_E0082D00[ones]); - gSPDisplayList(gMasterGfxPos++, D_E0082D00[tens]); - gSPDisplayList(gMasterGfxPos++, D_09002290_388640); - gSPDisplayList(gMasterGfxPos++, D_E0082D00[tens]); - gSPDisplayList(gMasterGfxPos++, D_09002270_388620); + gSPDisplayList(gMainGfxPos++, D_E0082D00[ones]); + gSPDisplayList(gMainGfxPos++, D_E0082D00[tens]); + gSPDisplayList(gMainGfxPos++, D_09002290_388640); + gSPDisplayList(gMainGfxPos++, D_E0082D00[tens]); + gSPDisplayList(gMainGfxPos++, D_09002270_388620); } } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPPipeSync(gMasterGfxPos++); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/drop_leaves.c b/src/effects/drop_leaves.c index 0fc9384b9d..84fca1b7bc 100644 --- a/src/effects/drop_leaves.c +++ b/src/effects/drop_leaves.c @@ -133,9 +133,9 @@ void drop_leaves_appendGfx(void* effect) { Matrix4f sp98; s32 i; - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, D_09001180_33E790); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 20, 100, 20, part->unk_24); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gSPDisplayList(gMainGfxPos++, D_09001180_33E790); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 20, 100, 20, part->unk_24); shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); @@ -151,8 +151,8 @@ void drop_leaves_appendGfx(void* effect) { shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_09001230_33E840); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_09001230_33E840); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } diff --git a/src/effects/dust.c b/src/effects/dust.c index 40cfeefdfb..c338f3a8ce 100644 --- a/src/effects/dust.c +++ b/src/effects/dust.c @@ -134,10 +134,10 @@ void dust_appendGfx(void* effect) { Mtx* matrix; s32 i; - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, part->unk_00 == 0 ? D_09000CC0_33FCC0 : D_09000D68_33FD68); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, part->unk_30, part->unk_34, part->unk_38, part->unk_18); - gDPSetEnvColor(gMasterGfxPos++, part->unk_3C, part->unk_40, part->unk_44, 0); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gSPDisplayList(gMainGfxPos++, part->unk_00 == 0 ? D_09000CC0_33FCC0 : D_09000D68_33FD68); + gDPSetPrimColor(gMainGfxPos++, 0, 0, part->unk_30, part->unk_34, part->unk_38, part->unk_18); + gDPSetEnvColor(gMainGfxPos++, part->unk_3C, part->unk_40, part->unk_44, 0); shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); @@ -154,15 +154,15 @@ void dust_appendGfx(void* effect) { shim_guMtxCatF(sp58, sp98, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPMatrix(gMasterGfxPos++, matrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, matrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); if (unk_00 < 2) { - gSPDisplayList(gMasterGfxPos++, (i % 2) ? D_09000E18_33FE18 : D_09000E38_33FE38); + gSPDisplayList(gMainGfxPos++, (i % 2) ? D_09000E18_33FE18 : D_09000E38_33FE38); } else { - gSPDisplayList(gMasterGfxPos++, D_09000E58_33FE58); + gSPDisplayList(gMainGfxPos++, D_09000E58_33FE58); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } diff --git a/src/effects/effect_3D.c b/src/effects/effect_3D.c index 8598b83dec..408ca6ce83 100644 --- a/src/effects/effect_3D.c +++ b/src/effects/effect_3D.c @@ -220,18 +220,18 @@ void fx_3D_appendGfx(void* effect) { Matrix4f sp58; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, D_09000240_37D3C0); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gSPDisplayList(gMainGfxPos++, D_09000240_37D3C0); shim_guTranslateF(sp18, part->pos.x, part->pos.y, part->pos.z); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); part++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, part++) { - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 200, 255, 255, part->unk_58); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 200, 255, 255, part->unk_58); shim_guTranslateF(sp18, part->pos.x, part->pos.y, part->pos.z); shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); @@ -242,11 +242,11 @@ void fx_3D_appendGfx(void* effect) { shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_090002E8_37D468); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_090002E8_37D468); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPPipeSync(gMasterGfxPos++); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/effect_46.c b/src/effects/effect_46.c index 28ea521749..6cbf501a8f 100644 --- a/src/effects/effect_46.c +++ b/src/effects/effect_46.c @@ -209,16 +209,16 @@ void fx_46_appendGfx(void* effect) { unk_00 = part->unk_00; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, D_09000420_38EDB0); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gSPDisplayList(gMainGfxPos++, D_09000420_38EDB0); shim_guTranslateF(sp20, part->unk_08, part->unk_0C, part->unk_10); shim_guRotateF(sp60, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); shim_guMtxCatF(sp60, sp20, sp20); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); part++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, part++) { @@ -234,14 +234,14 @@ void fx_46_appendGfx(void* effect) { shim_guMtxCatF(sp60, sp20, sp20); } - gDPSetPrimColor(gMasterGfxPos++, 0, 0, part->unk_44, part->unk_45, part->unk_46, unk_1C); + gDPSetPrimColor(gMainGfxPos++, 0, 0, part->unk_44, part->unk_45, part->unk_46, unk_1C); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_090003A0_38ED30); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_090003A0_38ED30); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/effect_63.c b/src/effects/effect_63.c index 5df7e51f0b..78fb94fa6c 100644 --- a/src/effects/effect_63.c +++ b/src/effects/effect_63.c @@ -221,11 +221,11 @@ void fx_63_appendGfx(void* effect) { s32 i; if (part->unk_00 != 0) { - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, part->unk_28, part->unk_2C, part->unk_30, unk_34); - gDPSetEnvColor(gMasterGfxPos++, part->unk_38, part->unk_3C, part->unk_40, part->unk_44); - gSPDisplayList(gMasterGfxPos++, D_E00C6C9C[unk_00]); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPSetPrimColor(gMainGfxPos++, 0, 0, part->unk_28, part->unk_2C, part->unk_30, unk_34); + gDPSetEnvColor(gMainGfxPos++, part->unk_38, part->unk_3C, part->unk_40, part->unk_44); + gSPDisplayList(gMainGfxPos++, D_E00C6C9C[unk_00]); for (i = 0; i < ((EffectInstance*)effect)->numParts; i++, part++) { part->unk_4C += part->unk_54; @@ -251,18 +251,18 @@ void fx_63_appendGfx(void* effect) { shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(gMasterGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); shim_guScaleF(sp18, part->unk_70, part->unk_6C, 1.0f); shim_guRotateF(sp58, part->unk_74, 0.0f, 0.0f, 1.0f); shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetTileSize(gMasterGfxPos++, 1, tempX, tempY, (tempX + 0x3F) * 4, (tempY + 0xF) * 4); - gSPDisplayList(gMasterGfxPos++, D_E00C6C90[unk_00]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetTileSize(gMainGfxPos++, 1, tempX, tempY, (tempX + 0x3F) * 4, (tempY + 0xF) * 4); + gSPDisplayList(gMainGfxPos++, D_E00C6C90[unk_00]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } } diff --git a/src/effects/effect_65.c b/src/effects/effect_65.c index 6506998af2..c50e51f288 100644 --- a/src/effects/effect_65.c +++ b/src/effects/effect_65.c @@ -246,27 +246,27 @@ void fx_65_appendGfx(void* effect) { sp54 = data->unk_00; sp58 = data->unk_34; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guTranslateF(sp10, 0.0f, 0.0f, 0.0f); shim_guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_E00CACB0[sp54]); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_E00CACB0[sp54]); if (sp54 >= 2) { - gDPSetCombineLERP(gMasterGfxPos++, SHADE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, SHADE, 0, 0, 0, 0, COMBINED, COMBINED, 0, PRIMITIVE, 0); + gDPSetCombineLERP(gMainGfxPos++, SHADE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, SHADE, 0, 0, 0, 0, COMBINED, COMBINED, 0, PRIMITIVE, 0); } - gDPSetPrimColor(gMasterGfxPos++, 0, 0, data->unk_18, data->unk_1C, data->unk_20, primAlpha); - gDPSetEnvColor(gMasterGfxPos++, data->unk_28, data->unk_2C, data->unk_30, 0); - gSPBranchList(gMasterGfxPos, gMasterGfxPos + 0x79); + gDPSetPrimColor(gMainGfxPos++, 0, 0, data->unk_18, data->unk_1C, data->unk_20, primAlpha); + gDPSetEnvColor(gMainGfxPos++, data->unk_28, data->unk_2C, data->unk_30, 0); + gSPBranchList(gMainGfxPos, gMainGfxPos + 0x79); - sp5C = (Vtx_t*) (gMasterGfxPos + 1); + sp5C = (Vtx_t*) (gMainGfxPos + 1); sp60 = -1; sp64 = (sp50 & 0x3F) << 5; - gMasterGfxPos += 0x79; + gMainGfxPos += 0x79; // use i in iteration? var_fp = 0; @@ -381,12 +381,12 @@ void fx_65_appendGfx(void* effect) { } for (i = sp60; i < 29; i++) { - gSPVertex(gMasterGfxPos++, &sp5C[i * 2], 4, 0); - gSP2Triangles(gMasterGfxPos++, 0, 2, 1, 0, 1, 2, 3, 0); + gSPVertex(gMainGfxPos++, &sp5C[i * 2], 4, 0); + gSP2Triangles(gMainGfxPos++, 0, 2, 1, 0, 1, 2, 3, 0); } } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } #else INCLUDE_ASM(s32, "effects/effect_65", fx_65_appendGfx); diff --git a/src/effects/effect_75.c b/src/effects/effect_75.c index e20b66ca90..9b20fbb159 100644 --- a/src/effects/effect_75.c +++ b/src/effects/effect_75.c @@ -200,8 +200,8 @@ void fx_75_appendGfx(void* effect) { Matrix4f mtxTransfrom; Matrix4f mtxTemp; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guTranslateF(mtxTransfrom, data->pos.x, data->pos.y, data->pos.z); shim_guScaleF(mtxTemp, data->scale, data->scale, data->scale); @@ -212,13 +212,13 @@ void fx_75_appendGfx(void* effect) { } shim_guMtxF2L(mtxTransfrom, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(gMasterGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, data->primCol.r, data->primCol.g, data->primCol.b, data->unk_34); - gDPSetEnvColor(gMasterGfxPos++, data->envCol.r, data->envCol.g, data->envCol.b, data->unk_24 * data->masterAlpha / 255); - gSPDisplayList(gMasterGfxPos++, D_E00EAA58[0]); - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, uls0, ult0, uls0 + 252, ult0 + 252); - gDPSetTileSize(gMasterGfxPos++, 1, uls1, ult1, uls1 + 252, ult1 + 252); - gSPDisplayList(gMasterGfxPos++, D_E00EAA50[type]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, data->primCol.r, data->primCol.g, data->primCol.b, data->unk_34); + gDPSetEnvColor(gMainGfxPos++, data->envCol.r, data->envCol.g, data->envCol.b, data->unk_24 * data->masterAlpha / 255); + gSPDisplayList(gMainGfxPos++, D_E00EAA58[0]); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, uls0, ult0, uls0 + 252, ult0 + 252); + gDPSetTileSize(gMainGfxPos++, 1, uls1, ult1, uls1 + 252, ult1 + 252); + gSPDisplayList(gMainGfxPos++, D_E00EAA50[type]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/effect_86.c b/src/effects/effect_86.c index 7bb383222c..0251fcd46a 100644 --- a/src/effects/effect_86.c +++ b/src/effects/effect_86.c @@ -115,19 +115,19 @@ void fx_86_appendGfx(void* effect) { s32 primAlpha = part->unk_24; s32 dlistIdx = part->unk_00; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guTranslateF(sp10, part->unk_04, part->unk_08, part->unk_0C); shim_guScaleF(sp50, part->unk_34, part->unk_34, part->unk_34); shim_guMtxCatF(sp50, sp10, sp10); shim_guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(gMasterGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, part->unk_18, part->unk_1C, part->unk_20, primAlpha); - gDPSetEnvColor(gMasterGfxPos++, part->unk_28, part->unk_2C, part->unk_30, 0); - gSPDisplayList(gMasterGfxPos++, D_E01284B0[0]); - gSPDisplayList(gMasterGfxPos++, D_E0128480[dlistIdx % ARRAY_COUNT(D_E0128480)]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, part->unk_18, part->unk_1C, part->unk_20, primAlpha); + gDPSetEnvColor(gMainGfxPos++, part->unk_28, part->unk_2C, part->unk_30, 0); + gSPDisplayList(gMainGfxPos++, D_E01284B0[0]); + gSPDisplayList(gMainGfxPos++, D_E0128480[dlistIdx % ARRAY_COUNT(D_E0128480)]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/embers.c b/src/effects/embers.c index 90a91750af..ca702bafb1 100644 --- a/src/effects/embers.c +++ b/src/effects/embers.c @@ -193,19 +193,19 @@ void embers_appendGfx(void* effect) { Matrix4f sp50; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guTranslateF(sp10, part->unk_04, part->unk_08, part->unk_0C); shim_guScaleF(sp50, part->unk_40, part->unk_40, part->unk_40); shim_guMtxCatF(sp50, sp10, sp10); shim_guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(gMasterGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, part->unk_20, part->unk_24, part->unk_28, unk_2C); - gDPSetEnvColor(gMasterGfxPos++, part->unk_30, part->unk_34, part->unk_38, part->unk_3C); - gSPDisplayList(gMasterGfxPos++, D_E00E0A40[1]); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, part->unk_20, part->unk_24, part->unk_28, unk_2C); + gDPSetEnvColor(gMainGfxPos++, part->unk_30, part->unk_34, part->unk_38, part->unk_3C); + gSPDisplayList(gMainGfxPos++, D_E00E0A40[1]); part++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, part++) { @@ -213,13 +213,13 @@ void embers_appendGfx(void* effect) { shim_guTranslateF(sp10, part->unk_04, part->unk_08, part->unk_0C); shim_guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, 0, (i % 4) * 16 * 4, 15 * 4, ((i % 4) * 16 + 15) * 4); - gDPSetTileSize(gMasterGfxPos++, 1, (s32) part->unk_5C * 4, (s32) part->unk_60 * 4, ((s32) part->unk_5C + 15) * 4, ((s32) part->unk_60 + 15) * 4); - gSPDisplayList(gMasterGfxPos++, D_E00E0A40[0]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, 0, (i % 4) * 16 * 4, 15 * 4, ((i % 4) * 16 + 15) * 4); + gDPSetTileSize(gMainGfxPos++, 1, (s32) part->unk_5C * 4, (s32) part->unk_60 * 4, ((s32) part->unk_5C + 15) * 4, ((s32) part->unk_60 + 15) * 4); + gSPDisplayList(gMainGfxPos++, D_E00E0A40[0]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/emote.c b/src/effects/emote.c index bb3f5fbcee..e9fc225eca 100644 --- a/src/effects/emote.c +++ b/src/effects/emote.c @@ -217,8 +217,8 @@ void emote_appendGfx(void* effect) { Matrix4f sp58; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); if (type != 1) { shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); @@ -234,9 +234,9 @@ void emote_appendGfx(void* effect) { shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_09002170_336DE0); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_09002170_336DE0); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } else { if (part->unk_38 == 0) { for (i = 0; i < 3; i++, part++) { @@ -249,17 +249,17 @@ void emote_appendGfx(void* effect) { shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 235, 28, 0, 255); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_09002578_3371E8); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 235, 28, 0, 255); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_09002578_3371E8); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } return; } - gSPMatrix(gMasterGfxPos++, matrix, G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, matrix, G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); unk_38 = part->unk_38; dlist = D_E0020CA4[type]; @@ -271,14 +271,14 @@ void emote_appendGfx(void* effect) { h = 16; uls = 128 - unk_38 * 16; ult = 0; - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 220, 0, 0, 255); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 220, 0, 0, 255); break; case 2: w = 32; h = 48; uls = 128 - unk_38 * 32; ult = 0; - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 220, 0, 0, 255); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 220, 0, 0, 255); break; case 3: w = 32; @@ -286,7 +286,7 @@ void emote_appendGfx(void* effect) { uls = 128 - unk_38 * 32; ult = 0; idx = (part->unk_2C * 3) % (ARRAY_COUNT(D_E0020D94) / 3); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, D_E0020D94[idx], D_E0020D94[idx + 1], D_E0020D94[idx + 2], 255); + gDPSetPrimColor(gMainGfxPos++, 0, 0, D_E0020D94[idx], D_E0020D94[idx + 1], D_E0020D94[idx + 2], 255); break; case 4: w = 32; @@ -297,14 +297,14 @@ void emote_appendGfx(void* effect) { } if (dlist != NULL) { - gSPDisplayList(gMasterGfxPos++, dlist); + gSPDisplayList(gMainGfxPos++, dlist); } - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, uls * 4, ult * 4, (uls + w) * 4, (ult + h) * 4); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, uls * 4, ult * 4, (uls + w) * 4, (ult + h) * 4); if (dlist2 != NULL) { - gSPDisplayList(gMasterGfxPos++, dlist2); + gSPDisplayList(gMainGfxPos++, dlist2); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/ending_decals.c b/src/effects/ending_decals.c index 0167012f6e..1ca8ef82c5 100644 --- a/src/effects/ending_decals.c +++ b/src/effects/ending_decals.c @@ -142,13 +142,13 @@ void ending_decals_appendGfx(void* effect) { dlist1 = D_E00685F4[data->type]; dlist2 = D_E00685B0[data->type]; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, data->scale, data->pos.x, data->pos.y, data->pos.z); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); temp_f64 = data->haloAlpha; if (unk_20 % 2 == 0) { @@ -157,21 +157,21 @@ void ending_decals_appendGfx(void* effect) { alpha = temp_f64; } - gDPSetEnvColor(gMasterGfxPos++, 26, 121, 29, 158); - gDPSetColorDither(gMasterGfxPos++, G_CD_BAYER); - gDPSetAlphaDither(gMasterGfxPos++, G_AD_PATTERN); - gSPDisplayList(gMasterGfxPos++, dlist1); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, data->unk_24, data->unk_25, data->unk_26, alpha); - gDPSetEnvColor(gMasterGfxPos++, data->unk_27, data->unk_28, data->unk_29, 0); + gDPSetEnvColor(gMainGfxPos++, 26, 121, 29, 158); + gDPSetColorDither(gMainGfxPos++, G_CD_BAYER); + gDPSetAlphaDither(gMainGfxPos++, G_AD_PATTERN); + gSPDisplayList(gMainGfxPos++, dlist1); + gDPSetPrimColor(gMainGfxPos++, 0, 0, data->unk_24, data->unk_25, data->unk_26, alpha); + gDPSetEnvColor(gMainGfxPos++, data->unk_27, data->unk_28, data->unk_29, 0); if (dlist2 == D_09001E40_36CD20) { dlist2 = D_E00685BC[unk_20 % 14]; } - gSPDisplayList(gMasterGfxPos++, dlist2); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPPipeSync(gMasterGfxPos++); - gDPSetColorDither(gMasterGfxPos++, G_CD_DISABLE); - gDPSetAlphaDither(gMasterGfxPos++, G_AD_DISABLE); - gDPPipeSync(gMasterGfxPos++); + gSPDisplayList(gMainGfxPos++, dlist2); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMainGfxPos++); + gDPSetColorDither(gMainGfxPos++, G_CD_DISABLE); + gDPSetAlphaDither(gMainGfxPos++, G_AD_DISABLE); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/energy_in_out.c b/src/effects/energy_in_out.c index 9f0ef8f2f8..cc5b23b475 100644 --- a/src/effects/energy_in_out.c +++ b/src/effects/energy_in_out.c @@ -252,22 +252,22 @@ void energy_in_out_appendGfx(void* effect) { Matrix4f sp60; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, scale, part->pos.x, part->pos.y, part->pos.z); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, part->unk_18, part->unk_1C, part->unk_20, unk_24); - gDPSetEnvColor(gMasterGfxPos++, part->unk_28, part->unk_2C, part->unk_30, 0); - gSPDisplayList(gMasterGfxPos++, D_09000200_3D6130); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, part->unk_18, part->unk_1C, part->unk_20, unk_24); + gDPSetEnvColor(gMainGfxPos++, part->unk_28, part->unk_2C, part->unk_30, 0); + gSPDisplayList(gMainGfxPos++, D_09000200_3D6130); part++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, part++) { f32 scale = part->scale; - gDPSetPrimColor(gMasterGfxPos++, 0, 0, unk_18, unk_1C, unk_20, (unk_24 * part->unk_24) / 255); + gDPSetPrimColor(gMainGfxPos++, 0, 0, unk_18, unk_1C, unk_20, (unk_24 * part->unk_24) / 255); shim_guRotateF(sp20, part->unk_3C, 0.0f, 0.0f, 1.0f); shim_guTranslateF(sp60, part->pos.x + unk_38, 0.0f, 0.0f); @@ -280,10 +280,10 @@ void energy_in_out_appendGfx(void* effect) { shim_guMtxCatF(sp60, sp20, sp20); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_E00D6E40[unk_00]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_E00D6E40[unk_00]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/energy_orb_wave.c b/src/effects/energy_orb_wave.c index 7e05f935ba..62342a3fd8 100644 --- a/src/effects/energy_orb_wave.c +++ b/src/effects/energy_orb_wave.c @@ -233,43 +233,43 @@ void energy_orb_wave_appendGfx(void* effect) { Matrix4f sp18; Matrix4f sp58; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); shim_guScaleF(sp58, data->scale, data->scale, data->scale); shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(gMasterGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, data->unk_20, data->unk_24, data->unk_28, unk_2C); - gDPSetColorDither(gMasterGfxPos++, G_CD_BAYER); - gDPSetAlphaDither(gMasterGfxPos++, G_AD_PATTERN); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, data->unk_20, data->unk_24, data->unk_28, unk_2C); + gDPSetColorDither(gMainGfxPos++, G_CD_BAYER); + gDPSetAlphaDither(gMainGfxPos++, G_AD_PATTERN); if (unk_00 < 3) { - gSPDisplayList(gMasterGfxPos++, D_09001000_3A5320); + gSPDisplayList(gMainGfxPos++, D_09001000_3A5320); shim_guRotateF(sp18, unk_14, 0.0f, 0.0f, 1.0f); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_090011D0_3A54F0); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPSetColorDither(gMasterGfxPos++, G_CD_MAGICSQ); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_090011D0_3A54F0); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPSetColorDither(gMainGfxPos++, G_CD_MAGICSQ); shim_guRotateF(sp18, -unk_14 * 8, 0.0f, 0.0f, 1.0f); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_090011F0_3A5510); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_090011F0_3A5510); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } else { - gSPDisplayList(gMasterGfxPos++, D_090010A8_3A53C8); - gSPDisplayList(gMasterGfxPos++, D_09001210_3A5530); + gSPDisplayList(gMainGfxPos++, D_090010A8_3A53C8); + gSPDisplayList(gMainGfxPos++, D_09001210_3A5530); } - gDPSetColorDither(gMasterGfxPos++, G_CD_DISABLE); - gDPSetAlphaDither(gMasterGfxPos++, G_AD_DISABLE); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gDPSetColorDither(gMainGfxPos++, G_CD_DISABLE); + gDPSetAlphaDither(gMainGfxPos++, G_AD_DISABLE); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/energy_shockwave.c b/src/effects/energy_shockwave.c index f08162e198..ff471dbde5 100644 --- a/src/effects/energy_shockwave.c +++ b/src/effects/energy_shockwave.c @@ -144,27 +144,27 @@ void energy_shockwave_appendGfx(void* effect) { s32 uls2; s32 ult2; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, D_09000E60_376370); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 179, 30, data->unk_24); - gDPSetEnvColor(gMasterGfxPos++, data->unk_50, data->unk_51, data->unk_52, 128); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gSPDisplayList(gMainGfxPos++, D_09000E60_376370); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 179, 30, data->unk_24); + gDPSetEnvColor(gMainGfxPos++, data->unk_50, data->unk_51, data->unk_52, 128); uls = data->unk_30 * 4; ult = data->unk_34 * 4; uls2 = data->unk_38 * 4; ult2 = data->unk_3C * 4; - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, uls, ult, uls + 252, ult + 252); - gDPSetTileSize(gMasterGfxPos++, 1, uls2, ult2, uls2 + 124, ult2 + 124); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, uls, ult, uls + 252, ult + 252); + gDPSetTileSize(gMainGfxPos++, 1, uls2, ult2, uls2 + 124, ult2 + 124); shim_guTranslateF(sp10, data->unk_04, data->unk_08, data->unk_0C); shim_guScaleF(sp50, data->unk_1C, data->unk_1C, data->unk_1C); shim_guMtxCatF(sp50, sp10, sp10); shim_guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_09000DC0_3762D0); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPPipeSync(gMasterGfxPos++); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_09000DC0_3762D0); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/explosion.c b/src/effects/explosion.c index 35227710e5..2e45d6c9e3 100644 --- a/src/effects/explosion.c +++ b/src/effects/explosion.c @@ -168,8 +168,8 @@ void explosion_appendGfx(void* effect) { s32 primB; s32 cond; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guTranslateF(sp18, part->pos.x, part->pos.y, part->pos.z); shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); @@ -178,23 +178,23 @@ void explosion_appendGfx(void* effect) { part++; - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (part->unk_00 != -1) { - gSPDisplayList(gMasterGfxPos++, D_09000840_3447B0); + gSPDisplayList(gMainGfxPos++, D_09000840_3447B0); shim_guScaleF(sp18, part->unk_20, part->unk_20, 1.0f); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 255, 240, part->unk_38); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_090008F0_344860); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 240, part->unk_38); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_090008F0_344860); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } part++; - gSPDisplayList(gMasterGfxPos++, D_09000910_344880); + gSPDisplayList(gMainGfxPos++, D_09000910_344880); shim_guScaleF(sp18, part->unk_20, part->unk_20, part->unk_20); shim_guRotateF(sp58, part->unk_28, 0.0f, 0.0f, 1.0f); @@ -220,9 +220,9 @@ void explosion_appendGfx(void* effect) { primB = 255; } - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 255, primB, primAlpha); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_E00328B0[unk_34 % 3]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, primB, primAlpha); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_E00328B0[unk_34 % 3]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/falling_leaves.c b/src/effects/falling_leaves.c index 99bd78fd9f..40e86c58f2 100644 --- a/src/effects/falling_leaves.c +++ b/src/effects/falling_leaves.c @@ -128,9 +128,9 @@ void falling_leaves_appendGfx(void* effect) { Matrix4f sp98; s32 i; - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, D_09001100_3601E0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 20, 100, 20, part->unk_24); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gSPDisplayList(gMainGfxPos++, D_09001100_3601E0); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 20, 100, 20, part->unk_24); shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); @@ -146,8 +146,8 @@ void falling_leaves_appendGfx(void* effect) { shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_090011B0_360290); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_090011B0_360290); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } diff --git a/src/effects/fire_breath.c b/src/effects/fire_breath.c index 7ba6582a59..665efe544c 100644 --- a/src/effects/fire_breath.c +++ b/src/effects/fire_breath.c @@ -188,8 +188,8 @@ void fire_breath_appendGfx(void* effect) { Gfx* dlist2 = D_E006EC0C[type]; s32 unk_5C = data->unk_5C; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); if (type == FIRE_BREATH_SMALL) { shim_guTranslateF(sp18, data->initPos.x, data->initPos.y, data->initPos.z); @@ -197,18 +197,18 @@ void fire_breath_appendGfx(void* effect) { shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_09000C20_374000); - gSPDisplayList(gMasterGfxPos++, D_09000C00_373FE0); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_09000C20_374000); + gSPDisplayList(gMainGfxPos++, D_09000C00_373FE0); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } - gSPDisplayList(gMasterGfxPos++, dlist2); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, data->primR, data->primG, data->primB, data->alpha); - gDPSetEnvColor(gMasterGfxPos++, data->envR, data->envG, data->envB, envAlpha); - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, ((unk_5C * 32) + 0) * 4, 0, ((unk_5C * 32) + 32) * 4, 128); - gDPSetTileSize(gMasterGfxPos++, 1, ((unk_5C * 32) + 32) * 4, 0, ((unk_5C * 32) + 64) * 4, 128); + gSPDisplayList(gMainGfxPos++, dlist2); + gDPSetPrimColor(gMainGfxPos++, 0, 0, data->primR, data->primG, data->primB, data->alpha); + gDPSetEnvColor(gMainGfxPos++, data->envR, data->envG, data->envB, envAlpha); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, ((unk_5C * 32) + 0) * 4, 0, ((unk_5C * 32) + 32) * 4, 128); + gDPSetTileSize(gMainGfxPos++, 1, ((unk_5C * 32) + 32) * 4, 0, ((unk_5C * 32) + 64) * 4, 128); shim_guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); @@ -217,8 +217,8 @@ void fire_breath_appendGfx(void* effect) { shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, dlist); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, dlist); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/fire_flower.c b/src/effects/fire_flower.c index 090764b6bd..f48074c16b 100644 --- a/src/effects/fire_flower.c +++ b/src/effects/fire_flower.c @@ -209,24 +209,24 @@ void fire_flower_appendGfx(void* effect) { Matrix4f sp58; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guTranslateF(sp18, part->pos.x, part->pos.y, part->pos.z); shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 0, 0, part->unk_3C); - gDPSetEnvColor(gMasterGfxPos++, 255, 0, 0, part->unk_38); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 0, 0, part->unk_3C); + gDPSetEnvColor(gMainGfxPos++, 255, 0, 0, part->unk_38); if ((u32) (unk_04 - 4) < 3U) { shim_guTranslateF(sp18, 0.0f, 16.0f, 0.0f); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_09000DE0_381180); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_09000DE0_381180); part++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, part++) { @@ -236,23 +236,23 @@ void fire_flower_appendGfx(void* effect) { shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, part->unk_00 != 0 ? D_09000ED8_381278 : D_09000EB8_381258); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, part->unk_00 != 0 ? D_09000ED8_381278 : D_09000EB8_381258); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } - gSPDisplayList(gMasterGfxPos++, D_09000D40_3810E0); + gSPDisplayList(gMainGfxPos++, D_09000D40_3810E0); gDPLoadTextureTile_4b( - gMasterGfxPos++, D_09000000_3803A0[3 - unk_34], + gMainGfxPos++, D_09000000_3803A0[3 - unk_34], G_IM_FMT_CI, 32, 0, 0, 0, 31, 31, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD); gDPLoadMultiTile_4b( - gMasterGfxPos++, D_09000000_3803A0[2 - unk_34], + gMainGfxPos++, D_09000000_3803A0[2 - unk_34], 0x0080, 1, G_IM_FMT_CI, 32, 0, 0, 0, 31, 31, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD); @@ -264,8 +264,8 @@ void fire_flower_appendGfx(void* effect) { shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_09000EF8_381298); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_09000EF8_381298); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/firework.c b/src/effects/firework.c index dd1900c28e..267593a971 100644 --- a/src/effects/firework.c +++ b/src/effects/firework.c @@ -193,15 +193,15 @@ void func_E00863B4(EffectInstance* effect) { s32 cond; f32 unk_28; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effect->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effect->graphics->data)); unk_28 = part->unk_28; shim_guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, unk_28, part->unk_04, part->unk_08, part->unk_0C); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); envA = (temp_f32 - temp_s32) * 256.0f; primA = part->unk_2C; @@ -249,17 +249,17 @@ void func_E00863B4(EffectInstance* effect) { break; } - savedGfxPos = gMasterGfxPos++; - gSPDisplayList(gMasterGfxPos++, D_E0086AB4[unk_00]); + savedGfxPos = gMainGfxPos++; + gSPDisplayList(gMainGfxPos++, D_E0086AB4[unk_00]); part++; if (cond) { - gDPSetTileSize(gMasterGfxPos++, 1, 0, 0, 0, 0); + gDPSetTileSize(gMainGfxPos++, 1, 0, 0, 0, 0); } for (i = 1; i < effect->numParts; i++, part++) { - gSPDisplayList(gMasterGfxPos++, D_E0086AB4[part->unk_00]); + gSPDisplayList(gMainGfxPos++, D_E0086AB4[part->unk_00]); shim_guRotateF(sp20, part->unk_1C, 0.0f, 0.0f, 1.0f); shim_guRotateF(sp60, part->unk_24, 0.0f, 1.0f, 0.0f); @@ -268,26 +268,26 @@ void func_E00863B4(EffectInstance* effect) { shim_guMtxCatF(sp60, sp20, sp20); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_E0086AA0[temp_s32]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_E0086AA0[temp_s32]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } - gSPEndDisplayList(gMasterGfxPos++); - gSPBranchList(savedGfxPos, gMasterGfxPos); + gSPEndDisplayList(gMainGfxPos++); + gSPBranchList(savedGfxPos, gMainGfxPos); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, primR, primG, primB, primA); - gDPSetEnvColor(gMasterGfxPos++, envR, envG, engB, envA); - gSPDisplayList(gMasterGfxPos++, savedGfxPos + 1); + gDPSetPrimColor(gMainGfxPos++, 0, 0, primR, primG, primB, primA); + gDPSetEnvColor(gMainGfxPos++, envR, envG, engB, envA); + gSPDisplayList(gMainGfxPos++, savedGfxPos + 1); shim_guRotateF(sp20, 120.0f, 1.0f, 1.0f, 1.0f); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, savedGfxPos + 1); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, savedGfxPos + 1); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPPipeSync(gMasterGfxPos++); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, savedGfxPos + 1); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, savedGfxPos + 1); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMainGfxPos++); } } diff --git a/src/effects/firework_rocket.c b/src/effects/firework_rocket.c index a4969b9911..c6127691d9 100644 --- a/src/effects/firework_rocket.c +++ b/src/effects/firework_rocket.c @@ -254,8 +254,8 @@ void firework_rocket_appendGfx(void* effect) { firework_rocket_blur_alpha = minBlurAlpha; } - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); mtx_0_0 = camera->perspectiveMatrix[0][0]; mtx_0_1 = camera->perspectiveMatrix[0][1]; @@ -274,13 +274,13 @@ void firework_rocket_appendGfx(void* effect) { mtx_3_2 = camera->perspectiveMatrix[3][2]; mtx_3_3 = camera->perspectiveMatrix[3][3]; - gSPDisplayList(gMasterGfxPos++, D_E010ACCC[variation]); + gSPDisplayList(gMainGfxPos++, D_E010ACCC[variation]); centerX = data->pos.x; centerY = data->pos.y; centerZ = data->pos.z; radius = data->radius; - gDPSetPrimColor(gMasterGfxPos++, 0, 0, data->r, data->g, data->b, minBlurAlpha); - gDPSetEnvColor(gMasterGfxPos++, data->r, data->g, data->b, 0); + gDPSetPrimColor(gMainGfxPos++, 0, 0, data->r, data->g, data->b, minBlurAlpha); + gDPSetEnvColor(gMainGfxPos++, data->r, data->g, data->b, 0); if (isExploded == TRUE) { sparkDir = D_E010AF68[variation].sparks; @@ -330,7 +330,7 @@ void firework_rocket_appendGfx(void* effect) { y += camera->viewportStartY; y *= 4.0f; - gSPScisTextureRectangle(gMasterGfxPos++, + gSPScisTextureRectangle(gMainGfxPos++, x, y, x + 8.0f, y + 8.0f, G_TX_RENDERTILE, 4 << 5, 4 << 5, 16 << 10, 16 << 10); } diff --git a/src/effects/flame.c b/src/effects/flame.c index e2661c79a9..2e526d71c0 100644 --- a/src/effects/flame.c +++ b/src/effects/flame.c @@ -153,16 +153,16 @@ void flame_appendGfx(void* effect) { Matrix4f sp58; Matrix4f sp98; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); if (D_E0040880 != gGameStatusPtr->frameCounter) { D_E0040880 = gGameStatusPtr->frameCounter; - gSPDisplayList(gMasterGfxPos++, D_09000918_3544C8); - gDPSetTileSize(gMasterGfxPos++, 1, uls, ult, uls + 128, ult + 256); - gSPDisplayList(gMasterGfxPos++, D_090009E0_354590); - gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, VIRTUAL_TO_PHYSICAL(nuGfxCfb_ptr)); - gDPSetScissorFrac(gMasterGfxPos++, G_SC_NON_INTERLACE, + gSPDisplayList(gMainGfxPos++, D_09000918_3544C8); + gDPSetTileSize(gMainGfxPos++, 1, uls, ult, uls + 128, ult + 256); + gSPDisplayList(gMainGfxPos++, D_090009E0_354590); + gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, VIRTUAL_TO_PHYSICAL(nuGfxCfb_ptr)); + gDPSetScissorFrac(gMainGfxPos++, G_SC_NON_INTERLACE, camera->viewportStartX * 4.0f, camera->viewportStartY * 4.0f, (camera->viewportStartX + camera->viewportW) * 4.0f, @@ -171,11 +171,11 @@ void flame_appendGfx(void* effect) { unkStruct = &D_E0040840[unk_00]; - gSPDisplayList(gMasterGfxPos++, unkStruct->unk_0C); - gDPSetKeyR(gMasterGfxPos++, unkStruct->unk_03, unkStruct->unk_00, 0); - gDPSetKeyGB(gMasterGfxPos++, unkStruct->unk_03, unkStruct->unk_01, 0, unkStruct->unk_03, unkStruct->unk_02, 0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, unkStruct->unk_07, unkStruct->unk_07, unkStruct->unk_07, 0); - gDPSetEnvColor(gMasterGfxPos++, unkStruct->unk_04, unkStruct->unk_05, unkStruct->unk_06, 0); + gSPDisplayList(gMainGfxPos++, unkStruct->unk_0C); + gDPSetKeyR(gMainGfxPos++, unkStruct->unk_03, unkStruct->unk_00, 0); + gDPSetKeyGB(gMainGfxPos++, unkStruct->unk_03, unkStruct->unk_01, 0, unkStruct->unk_03, unkStruct->unk_02, 0); + gDPSetPrimColor(gMainGfxPos++, 0, 0, unkStruct->unk_07, unkStruct->unk_07, unkStruct->unk_07, 0); + gDPSetEnvColor(gMainGfxPos++, unkStruct->unk_04, unkStruct->unk_05, unkStruct->unk_06, 0); shim_guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); @@ -184,9 +184,9 @@ void flame_appendGfx(void* effect) { shim_guMtxCatF(sp58, sp98, sp98); shim_guMtxF2L(sp98, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_090008F8_3544A8); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPPipeSync(gMasterGfxPos++); + gSPDisplayList(gMainGfxPos++, D_090008F8_3544A8); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/flashing_box_shockwave.c b/src/effects/flashing_box_shockwave.c index e0fd846e16..10e09cfd5c 100644 --- a/src/effects/flashing_box_shockwave.c +++ b/src/effects/flashing_box_shockwave.c @@ -144,31 +144,31 @@ void flashing_box_shockwave_appendGfx(void* effect) { shim_guRotateF(sp98, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); shim_guMtxCatF(sp98, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, data->unk_30, data->unk_34, data->unk_38, data->unk_18); - gDPSetEnvColor(gMasterGfxPos++, data->unk_3C, data->unk_40, data->unk_44, 0); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, data->unk_30, data->unk_34, data->unk_38, data->unk_18); + gDPSetEnvColor(gMainGfxPos++, data->unk_3C, data->unk_40, data->unk_44, 0); if ((unk_00 == 0 || unk_00 == 1) && unk_20 % 2) { shim_guScaleF(sp18, data->unk_28, data->unk_2C, 15.0f / 14); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_09000600_3936A0); - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, unk_20 * 8, unk_20 * 8, unk_20 * 8 + 128, unk_20 * 8 + 128); - gSPDisplayList(gMasterGfxPos++, D_090008E8_393988); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_09000600_3936A0); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, unk_20 * 8, unk_20 * 8, unk_20 * 8 + 128, unk_20 * 8 + 128); + gSPDisplayList(gMainGfxPos++, D_090008E8_393988); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } if (unk_00 >= 1 && unk_00 <= 3) { if (unk_00 == 1) { - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 255, 0, data->unk_14); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 0, data->unk_14); } shim_guTranslateF(sp18, 0.0f, data->unk_2C, 0.0f); @@ -176,11 +176,11 @@ void flashing_box_shockwave_appendGfx(void* effect) { shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_09000950_3939F0); - gSPDisplayList(gMasterGfxPos++, D_09000FF8_394098); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_09000950_3939F0); + gSPDisplayList(gMainGfxPos++, D_09000FF8_394098); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/floating_cloud_puff.c b/src/effects/floating_cloud_puff.c index 3352c9cac9..16e6ef92d9 100644 --- a/src/effects/floating_cloud_puff.c +++ b/src/effects/floating_cloud_puff.c @@ -121,19 +121,19 @@ void floating_cloud_puff_appendGfx(void* effect) { Matrix4f sp10; Matrix4f sp50; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guTranslateF(sp10, data->unk_04, data->unk_08, data->unk_0C); shim_guScaleF(sp50, scale, scale, scale); shim_guMtxCatF(sp50, sp10, sp10); shim_guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(gMasterGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, data->unk_18, data->unk_1C, data->unk_20, unk_24); - gDPSetEnvColor(gMasterGfxPos++, data->unk_28, data->unk_2C, data->unk_30, 0); - gSPDisplayList(gMasterGfxPos++, D_09000080_3D4F10); - gSPDisplayList(gMasterGfxPos++, D_09000168_3D4FF8); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, data->unk_18, data->unk_1C, data->unk_20, unk_24); + gDPSetEnvColor(gMainGfxPos++, data->unk_28, data->unk_2C, data->unk_30, 0); + gSPDisplayList(gMainGfxPos++, D_09000080_3D4F10); + gSPDisplayList(gMainGfxPos++, D_09000168_3D4FF8); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/floating_flower.c b/src/effects/floating_flower.c index 437b30cc3d..5e0ea2f3e4 100644 --- a/src/effects/floating_flower.c +++ b/src/effects/floating_flower.c @@ -147,15 +147,15 @@ void floating_flower_appendGfx(void* effect) { u32 alpha; u8 rgb, a; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->graphics->data)); shim_guPositionF(mtxTransform, part->rot.x, part->rot.y, 0.0f, 1.0f, part->pos.x, part->pos.y, part->pos.z); shim_guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); a = alpha = 255; - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); if (*gBackgroundFogModePtr == FOG_MODE_1) { shim_get_background_color_blend(&rgb, &rgb, &rgb, &a); @@ -163,8 +163,8 @@ void floating_flower_appendGfx(void* effect) { } if (alpha != 0) { - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, alpha); - gSPDisplayList(gMasterGfxPos++, D_090002F0_330750); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, alpha); + gSPDisplayList(gMainGfxPos++, D_090002F0_330750); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } diff --git a/src/effects/floating_rock.c b/src/effects/floating_rock.c index 0843bd15b8..f2ba37d77d 100644 --- a/src/effects/floating_rock.c +++ b/src/effects/floating_rock.c @@ -111,23 +111,23 @@ void floating_rock_appendGfx(void* effect) { s32 unk_44 = data->unk_44; Matrix4f sp20; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guPositionF(sp20, data->unk_24, data->unk_2C, data->unk_28, data->unk_3C, data->unk_04, data->unk_08, data->unk_0C); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 215, 215, 110, unk_44); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 215, 215, 110, unk_44); if (unk_44 != 255) { - gDPSetRenderMode(gMasterGfxPos++, G_RM_AA_ZB_XLU_SURF, G_RM_AA_ZB_XLU_SURF2); + gDPSetRenderMode(gMainGfxPos++, G_RM_AA_ZB_XLU_SURF, G_RM_AA_ZB_XLU_SURF2); } else { - gDPSetRenderMode(gMasterGfxPos++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2); + gDPSetRenderMode(gMainGfxPos++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2); } - gSPDisplayList(gMasterGfxPos++, D_09000450_396540); - gSPDisplayList(gMasterGfxPos++, D_E0098510[data->unk_00]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPPipeSync(gMasterGfxPos++); + gSPDisplayList(gMainGfxPos++, D_09000450_396540); + gSPDisplayList(gMainGfxPos++, D_E0098510[data->unk_00]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/flower_splash.c b/src/effects/flower_splash.c index c3f2b9cfd5..f3c2814be6 100644 --- a/src/effects/flower_splash.c +++ b/src/effects/flower_splash.c @@ -147,8 +147,8 @@ void flower_splash_appendGfx(void* effect) { FlowerFXData* data = effectTemp->data.flowerSplash; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->graphics->data)); for (i = 0; i < effectTemp->numParts; i++, data++) { if (data->alive) { @@ -156,12 +156,12 @@ void flower_splash_appendGfx(void* effect) { gDisplayContext->matrixStack[gMatrixListPos] = data->transformMtx; - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 112, 96, 24, data->primAlpha); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gDPSetPrimColor(gMainGfxPos++, 0, 0, 112, 96, 24, data->primAlpha); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, dlist); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, dlist); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/flower_trail.c b/src/effects/flower_trail.c index 44a8fc93b8..d61fb276df 100644 --- a/src/effects/flower_trail.c +++ b/src/effects/flower_trail.c @@ -164,8 +164,8 @@ void flower_trail_appendGfx(void* argEffect) { Gfx* dlist; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effect->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effect->graphics->data)); for (i = 0; i < effect->numParts; i++, part++) { if (part->alive) { @@ -177,13 +177,13 @@ void flower_trail_appendGfx(void* argEffect) { gDisplayContext->matrixStack[gMatrixListPos] = part->transformMtx; - gDPPipeSync(gMasterGfxPos++); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 112, 96, 24, part->primAlpha); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gDPPipeSync(gMainGfxPos++); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 112, 96, 24, part->primAlpha); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, dlist); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, dlist); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/footprint.c b/src/effects/footprint.c index 18e24e2e4e..7ef4c9bb29 100644 --- a/src/effects/footprint.c +++ b/src/effects/footprint.c @@ -119,8 +119,8 @@ void footprint_appendGfx(void* effect) { FootprintFXData* part = effectTemp->data.footprint; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->graphics->data)); for (i = 0; i < effectTemp->numParts; i++, part++) { if (part->alive) { @@ -128,12 +128,12 @@ void footprint_appendGfx(void* effect) { gDisplayContext->matrixStack[gMatrixListPos] = part->mtx; - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 112, 96, 24, part->alpha); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gDPSetPrimColor(gMainGfxPos++, 0, 0, 112, 96, 24, part->alpha); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, dlist); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, dlist); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/fright_jar.c b/src/effects/fright_jar.c index 7b74379e7e..2c755824aa 100644 --- a/src/effects/fright_jar.c +++ b/src/effects/fright_jar.c @@ -123,27 +123,27 @@ void fright_jar_appendGfx(void* effect) { Matrix4f sp50; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guTranslateF(sp10, data->unk_04, data->unk_08, data->unk_0C); shim_guScaleF(sp50, -data->unk_28, data->unk_28, data->unk_28); shim_guMtxCatF(sp50, sp10, sp10); shim_guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(gMasterGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_09008BE0_3CA780); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_09008BE0_3CA780); idx = 54 - unk_14; if (idx < 0) { idx = 0; } - gSPVertex(gMasterGfxPos++, &D_09004040_3C5BE0[idx], 22, 0); + gSPVertex(gMainGfxPos++, &D_09004040_3C5BE0[idx], 22, 0); alpha = D_E00C2990[unk_14 % 16]; - gDPSetEnvColor(gMasterGfxPos++, 0, 0, 0, alpha); + gDPSetEnvColor(gMainGfxPos++, 0, 0, 0, alpha); for (i = 0; i < 10; i++) { s32 temp1; @@ -163,59 +163,59 @@ void fright_jar_appendGfx(void* effect) { temp3 = 255.0f; } - gDPSetPrimColor(gMasterGfxPos++, 0, 0, data->unk_18, data->unk_1C, data->unk_20, temp3); - gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 64, &D_09002020_3C3BC0); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 8, 0, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 7, 14, G_TX_NOMIRROR | G_TX_CLAMP, 7, 14); - gDPLoadSync(gMasterGfxPos++); - gDPLoadTile(gMasterGfxPos++, G_TX_LOADTILE, 0, temp1 * 4, 254, (temp1 + 15) * 4); - gDPPipeSync(gMasterGfxPos++); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_CI, G_IM_SIZ_4b, 8, 0, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 7, 14, G_TX_NOMIRROR | G_TX_CLAMP, 7, 14); - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, 0, temp1 * 4, 508, (temp1 + 15) * 4); - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, 0, temp2 * 128.0f * 4.0f, 2000, 2000); - gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 64, &D_09000000_3C1BA0); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 8, 0x80, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 7, 14, G_TX_NOMIRROR | G_TX_CLAMP, 7, 14); - gDPLoadSync(gMasterGfxPos++); - gDPLoadTile(gMasterGfxPos++, G_TX_LOADTILE, 0, temp1 * 4, 254, (temp1 + 15) * 4); - gDPPipeSync(gMasterGfxPos++); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_CI, G_IM_SIZ_4b, 8, 0x80, 1, 1, G_TX_NOMIRROR | G_TX_CLAMP, 7, 14, G_TX_NOMIRROR | G_TX_CLAMP, 7, 14); - gDPSetTileSize(gMasterGfxPos++, 1, 0, temp1 * 4, 508, (temp1 + 15) * 4); - gDPSetTileSize(gMasterGfxPos++, 1, 0, temp2 * 128.0f * 4.0f, 2000, 2000); + gDPSetPrimColor(gMainGfxPos++, 0, 0, data->unk_18, data->unk_1C, data->unk_20, temp3); + gDPSetTextureImage(gMainGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 64, &D_09002020_3C3BC0); + gDPSetTile(gMainGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 8, 0, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 7, 14, G_TX_NOMIRROR | G_TX_CLAMP, 7, 14); + gDPLoadSync(gMainGfxPos++); + gDPLoadTile(gMainGfxPos++, G_TX_LOADTILE, 0, temp1 * 4, 254, (temp1 + 15) * 4); + gDPPipeSync(gMainGfxPos++); + gDPSetTile(gMainGfxPos++, G_IM_FMT_CI, G_IM_SIZ_4b, 8, 0, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 7, 14, G_TX_NOMIRROR | G_TX_CLAMP, 7, 14); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, 0, temp1 * 4, 508, (temp1 + 15) * 4); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, 0, temp2 * 128.0f * 4.0f, 2000, 2000); + gDPSetTextureImage(gMainGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 64, &D_09000000_3C1BA0); + gDPSetTile(gMainGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 8, 0x80, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 7, 14, G_TX_NOMIRROR | G_TX_CLAMP, 7, 14); + gDPLoadSync(gMainGfxPos++); + gDPLoadTile(gMainGfxPos++, G_TX_LOADTILE, 0, temp1 * 4, 254, (temp1 + 15) * 4); + gDPPipeSync(gMainGfxPos++); + gDPSetTile(gMainGfxPos++, G_IM_FMT_CI, G_IM_SIZ_4b, 8, 0x80, 1, 1, G_TX_NOMIRROR | G_TX_CLAMP, 7, 14, G_TX_NOMIRROR | G_TX_CLAMP, 7, 14); + gDPSetTileSize(gMainGfxPos++, 1, 0, temp1 * 4, 508, (temp1 + 15) * 4); + gDPSetTileSize(gMainGfxPos++, 1, 0, temp2 * 128.0f * 4.0f, 2000, 2000); switch (i) { case 0: - gSP2Triangles(gMasterGfxPos++, 0, 1, 2, 0, 0, 2, 3, 0); + gSP2Triangles(gMainGfxPos++, 0, 1, 2, 0, 0, 2, 3, 0); break; case 1: - gSP2Triangles(gMasterGfxPos++, 1, 4, 5, 0, 1, 5, 2, 0); + gSP2Triangles(gMainGfxPos++, 1, 4, 5, 0, 1, 5, 2, 0); break; case 2: - gSP2Triangles(gMasterGfxPos++, 4, 6, 7, 0, 4, 7, 5, 0); + gSP2Triangles(gMainGfxPos++, 4, 6, 7, 0, 4, 7, 5, 0); break; case 3: - gSP2Triangles(gMasterGfxPos++, 6, 8, 9, 0, 6, 9, 7, 0); + gSP2Triangles(gMainGfxPos++, 6, 8, 9, 0, 6, 9, 7, 0); break; case 4: - gSP2Triangles(gMasterGfxPos++, 8, 10, 11, 0, 8, 11, 9, 0); + gSP2Triangles(gMainGfxPos++, 8, 10, 11, 0, 8, 11, 9, 0); break; case 5: - gSP2Triangles(gMasterGfxPos++, 10, 12, 13, 0, 10, 13, 11, 0); + gSP2Triangles(gMainGfxPos++, 10, 12, 13, 0, 10, 13, 11, 0); break; case 6: - gSP2Triangles(gMasterGfxPos++, 12, 14, 15, 0, 12, 15, 13, 0); + gSP2Triangles(gMainGfxPos++, 12, 14, 15, 0, 12, 15, 13, 0); break; case 7: - gSP2Triangles(gMasterGfxPos++, 14, 16, 17, 0, 14, 17, 15, 0); + gSP2Triangles(gMainGfxPos++, 14, 16, 17, 0, 14, 17, 15, 0); break; case 8: - gSP2Triangles(gMasterGfxPos++, 16, 18, 19, 0, 16, 19, 17, 0); + gSP2Triangles(gMainGfxPos++, 16, 18, 19, 0, 16, 19, 17, 0); break; case 9: - gSP2Triangles(gMasterGfxPos++, 18, 20, 21, 0, 18, 21, 19, 0); + gSP2Triangles(gMainGfxPos++, 18, 20, 21, 0, 18, 21, 19, 0); break; } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/gather_energy_pink.c b/src/effects/gather_energy_pink.c index c5e95ba856..8fb990441f 100644 --- a/src/effects/gather_energy_pink.c +++ b/src/effects/gather_energy_pink.c @@ -171,9 +171,9 @@ void gather_energy_pink_appendGfx(void* effect) { s32 idx; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, dlist); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gSPDisplayList(gMainGfxPos++, dlist); shim_guTranslateF(sp20, part->posB.x, part->posB.y, part->posB.z); shim_guScaleF(sp60, part->unk_1C, part->unk_1C, 1.0f); @@ -182,7 +182,7 @@ void gather_energy_pink_appendGfx(void* effect) { shim_guMtxCatF(sp60, sp20, sp20); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); switch (unk_00) { case 1: @@ -195,7 +195,7 @@ void gather_energy_pink_appendGfx(void* effect) { shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); idx = part->unk_2C * 3; alpha = part->unk_24; @@ -209,20 +209,20 @@ void gather_energy_pink_appendGfx(void* effect) { idx += 30; idx %= 24; - gDPSetEnvColor(gMasterGfxPos++, 0, 0, 0, alpha / 2); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, D_E0026A00[idx], 0, D_E0026A00[idx + 2], alpha); + gDPSetEnvColor(gMainGfxPos++, 0, 0, 0, alpha / 2); + gDPSetPrimColor(gMainGfxPos++, 0, 0, D_E0026A00[idx], 0, D_E0026A00[idx + 2], alpha); tempX = part->unk_30; tempY = part->unk_40; tempX2 = part->unk_38; tempY2 = part->unk_48; - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, tempX, tempY, tempX + 256, tempY + 256); - gDPSetTileSize(gMasterGfxPos++, 1, tempX2, tempY2, tempX2 + 256, tempY2 + 256); - gSPDisplayList(gMasterGfxPos++, dlist2); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, tempX, tempY, tempX + 256, tempY + 256); + gDPSetTileSize(gMainGfxPos++, 1, tempX2, tempY2, tempX2 + 256, tempY2 + 256); + gSPDisplayList(gMainGfxPos++, dlist2); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCameraID], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - gDPPipeSync(gMasterGfxPos++); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCameraID], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/gather_magic.c b/src/effects/gather_magic.c index b2f913fc09..2e0c98e30e 100644 --- a/src/effects/gather_magic.c +++ b/src/effects/gather_magic.c @@ -161,35 +161,35 @@ void gather_magic_appendGfx(void* effect) { Matrix4f sp98; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guTranslateF(sp18, part->unk_08, part->unk_0C, part->unk_10); shim_guRotateF(sp98, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); shim_guMtxCatF(sp98, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_09000080_38F790); - gDPSetEnvColor(gMasterGfxPos++, part->unk_3C, part->unk_40, part->unk_44, 0); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_09000080_38F790); + gDPSetEnvColor(gMainGfxPos++, part->unk_3C, part->unk_40, part->unk_44, 0); part++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, part++) { f32 scale = part->unk_28; if (scale != 0.0f) { - gDPSetPrimColor(gMasterGfxPos++, 0, 0, unk_30, unk_34, unk_38, part->unk_14); + gDPSetPrimColor(gMainGfxPos++, 0, 0, unk_30, unk_34, unk_38, part->unk_14); shim_guTranslateF(sp18, part->unk_08, part->unk_0C, part->unk_10); shim_guScaleF(sp58, scale, scale, scale); shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_E008E890[i & 1]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_E008E890[i & 1]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/got_item_outline.c b/src/effects/got_item_outline.c index de7bc37978..29f8ab260f 100644 --- a/src/effects/got_item_outline.c +++ b/src/effects/got_item_outline.c @@ -116,16 +116,16 @@ void got_item_outline_appendGfx(void* effect) { s32 i; if (unk_18 != 0.0f) { - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, D_09008100_34DC40); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gSPDisplayList(gMainGfxPos++, D_09008100_34DC40); if (unk_00 == 0) { - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 255, 255, data->unk_1C); - gDPSetEnvColor(gMasterGfxPos++, 0, 0, 0, 255); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 255, data->unk_1C); + gDPSetEnvColor(gMainGfxPos++, 0, 0, 0, 255); } else { - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 255, 255, data->unk_1C); - gDPSetEnvColor(gMasterGfxPos++, 255, 255, 0, 255); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 255, data->unk_1C); + gDPSetEnvColor(gMainGfxPos++, 255, 255, 0, 255); } shim_guTranslateF(sp18, data->unk_04, data->unk_08, data->unk_0C); @@ -140,7 +140,7 @@ void got_item_outline_appendGfx(void* effect) { shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); for (i = 0; i < 4; i++) { char* temp; @@ -151,21 +151,21 @@ void got_item_outline_appendGfx(void* effect) { temp = D_09004000_349B40[i]; } - gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_IA, G_IM_SIZ_8b, 128, temp); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_IA, G_IM_SIZ_8b, 16, 0, G_TX_LOADTILE, 0, + gDPSetTextureImage(gMainGfxPos++, G_IM_FMT_IA, G_IM_SIZ_8b, 128, temp); + gDPSetTile(gMainGfxPos++, G_IM_FMT_IA, G_IM_SIZ_8b, 16, 0, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); - gDPLoadSync(gMasterGfxPos++); - gDPLoadTile(gMasterGfxPos++, G_TX_LOADTILE, 0, 0, 508, 124); - gDPPipeSync(gMasterGfxPos++); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_IA, G_IM_SIZ_8b, 16, 0, G_TX_RENDERTILE, 0, + gDPLoadSync(gMainGfxPos++); + gDPLoadTile(gMainGfxPos++, G_TX_LOADTILE, 0, 0, 508, 124); + gDPPipeSync(gMainGfxPos++); + gDPSetTile(gMainGfxPos++, G_IM_FMT_IA, G_IM_SIZ_8b, 16, 0, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, 0, 0, 508, 124); - gSPDisplayList(gMasterGfxPos++, D_E0036630[i]); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, 0, 0, 508, 124); + gSPDisplayList(gMainGfxPos++, D_E0036630[i]); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPPipeSync(gMasterGfxPos++); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMainGfxPos++); } } diff --git a/src/effects/green_impact.c b/src/effects/green_impact.c index 42c2c70118..e782781357 100644 --- a/src/effects/green_impact.c +++ b/src/effects/green_impact.c @@ -159,14 +159,14 @@ void green_impact_appendGfx(void* effect) { envG = part->unk_53.g; envB = part->unk_53.b; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, dlist); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gSPDisplayList(gMainGfxPos++, dlist); shim_guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, part->unk_04, part->unk_08, part->unk_0C); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); alpha = part->unk_38; primR2 = primR; @@ -176,9 +176,9 @@ void green_impact_appendGfx(void* effect) { envG2 = envG; envB2 = envB; - savedGfxPos = gMasterGfxPos; - gMasterGfxPos++; - savedGfxPos2 = gMasterGfxPos; + savedGfxPos = gMainGfxPos; + gMainGfxPos++; + savedGfxPos2 = gMainGfxPos; part++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, part++) { @@ -194,28 +194,28 @@ void green_impact_appendGfx(void* effect) { dlist2 = D_09000540_365EF0; - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, 0, (s32) part->unk_3C, 252, (s32) part->unk_3C + 124); - gDPSetTileSize(gMasterGfxPos++, 1, 0, (s32) part->unk_44, 124, (s32) part->unk_44 + 124); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, dlist2); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, 0, (s32) part->unk_3C, 252, (s32) part->unk_3C + 124); + gDPSetTileSize(gMainGfxPos++, 1, 0, (s32) part->unk_44, 124, (s32) part->unk_44 + 124); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, dlist2); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } - gSPEndDisplayList(gMasterGfxPos++); - gSPBranchList(savedGfxPos, gMasterGfxPos); + gSPEndDisplayList(gMainGfxPos++); + gSPBranchList(savedGfxPos, gMainGfxPos); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, primR2, primG2, primB2, alpha); - gDPSetEnvColor(gMasterGfxPos++, envR2, envG2, envB2, 0); - gSPClearGeometryMode(gMasterGfxPos++, G_CULL_BOTH); - gSPSetGeometryMode(gMasterGfxPos++, G_CULL_FRONT); - gSPDisplayList(gMasterGfxPos++, savedGfxPos2); + gDPSetPrimColor(gMainGfxPos++, 0, 0, primR2, primG2, primB2, alpha); + gDPSetEnvColor(gMainGfxPos++, envR2, envG2, envB2, 0); + gSPClearGeometryMode(gMainGfxPos++, G_CULL_BOTH); + gSPSetGeometryMode(gMainGfxPos++, G_CULL_FRONT); + gSPDisplayList(gMainGfxPos++, savedGfxPos2); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, primR, primG, primB, alpha); - gDPSetEnvColor(gMasterGfxPos++, envR, envG, envB, 0); - gSPClearGeometryMode(gMasterGfxPos++, G_CULL_BOTH); - gSPSetGeometryMode(gMasterGfxPos++, G_CULL_BACK); - gSPDisplayList(gMasterGfxPos++, savedGfxPos2); + gDPSetPrimColor(gMainGfxPos++, 0, 0, primR, primG, primB, alpha); + gDPSetEnvColor(gMainGfxPos++, envR, envG, envB, 0); + gSPClearGeometryMode(gMainGfxPos++, G_CULL_BOTH); + gSPSetGeometryMode(gMainGfxPos++, G_CULL_BACK); + gSPDisplayList(gMainGfxPos++, savedGfxPos2); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/hieroglyphs.c b/src/effects/hieroglyphs.c index 82785bf2d3..1a6ac48dd4 100644 --- a/src/effects/hieroglyphs.c +++ b/src/effects/hieroglyphs.c @@ -122,34 +122,34 @@ void hieroglyphs_appendGfx(void* effect) { Matrix4f sp60; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guTranslateF(sp20, data->pos.x, data->pos.y, data->pos.z); shim_guScaleF(sp60, data->unk_38, data->unk_38, data->unk_38); shim_guMtxCatF(sp60, sp20, sp20); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(gMasterGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, data->unk_18, data->unk_1C, data->unk_20, unk_24); - gDPSetEnvColor(gMasterGfxPos++, data->unk_28, data->unk_2C, data->unk_30, data->unk_34); - gSPDisplayList(gMasterGfxPos++, D_E00E29F0[0]); - gSPBranchList(gMasterGfxPos, gMasterGfxPos + 52); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, data->unk_18, data->unk_1C, data->unk_20, unk_24); + gDPSetEnvColor(gMainGfxPos++, data->unk_28, data->unk_2C, data->unk_30, data->unk_34); + gSPDisplayList(gMainGfxPos++, D_E00E29F0[0]); + gSPBranchList(gMainGfxPos, gMainGfxPos + 52); - savedGfxPos = gMasterGfxPos + 1; + savedGfxPos = gMainGfxPos + 1; gDPSetTileSize(savedGfxPos, G_TX_RENDERTILE, (lifeTime * 2 ) * 4, 0, (lifeTime * 2 + 127) * 4, 31 * 4); - gMasterGfxPos += 2; + gMainGfxPos += 2; shim_guRotateF(sp20, 20.0f, 1.0f, 0.0f, 0.0f); shim_guPositionF(sp60, 0.0f, shim_sin_deg(lifeTime * 8 + 78.75) * -30.0f, 0.0f, 1.0f, 6.0f, 0.0f, 0.0f); shim_guMtxCatF(sp60, sp20, sp20); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); for (i = 0; i < 16; i++) { f32 angle = i * 48 + lifeTime * 8; @@ -157,19 +157,19 @@ void hieroglyphs_appendGfx(void* effect) { shim_guPositionF(sp20, 0.0f, shim_sin_deg(angle) * 30.0f, 6.0f, (f32) i * 0.01 + 1.0, 8.0f, 0.0f, 0.0f); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPVertex(gMasterGfxPos++, &D_090010A8_3DDDF8[i * 2], 2, i * 2); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPVertex(gMainGfxPos++, &D_090010A8_3DDDF8[i * 2], 2, i * 2); } for (i = 0; i < 15; i++) { s32 i2 = i * 2; - gSP2Triangles(gMasterGfxPos++, + gSP2Triangles(gMainGfxPos++, i2 , i2 + 2, i2 + 1, i2, i2 + 1, i2 + 2, i2 + 3, i2); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gSPEndDisplayList(gMasterGfxPos++); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gSPEndDisplayList(gMainGfxPos++); for (i = 0; i < 2; i++) { s32 idx = (lifeTime + i * 4) % 17; @@ -177,12 +177,12 @@ void hieroglyphs_appendGfx(void* effect) { shim_guPositionF(sp20, 0.0f, 0.0f, -0x11A + i * 0x24, 1.0f, 0.0f, 0.0f, 0.0f); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, D_E00E29F4[idx], D_E00E2A08[idx], D_E00E2A1C[idx], data->unk_24); - gDPSetEnvColor(gMasterGfxPos++, 255, 255, 255, 0); - gSPDisplayList(gMasterGfxPos++, savedGfxPos); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, D_E00E29F4[idx], D_E00E2A08[idx], D_E00E2A1C[idx], data->unk_24); + gDPSetEnvColor(gMainGfxPos++, 255, 255, 255, 0); + gSPDisplayList(gMainGfxPos++, savedGfxPos); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/huff_puff_breath.c b/src/effects/huff_puff_breath.c index 0fcec1d4a8..293cd0febd 100644 --- a/src/effects/huff_puff_breath.c +++ b/src/effects/huff_puff_breath.c @@ -134,8 +134,8 @@ void huff_puff_breath_appendGfx(void* effect) { Matrix4f sp18; Matrix4f sp58; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); shim_guRotateF(sp58, data->angle, 0.0f, 0.0f, 1.0f); @@ -144,12 +144,12 @@ void huff_puff_breath_appendGfx(void* effect) { shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(gMasterGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, data->primR, data->primG, data->primB, primA); - gDPSetEnvColor(gMasterGfxPos++, data->envR, data->envG, data->envB, data->envA); - gSPDisplayList(gMasterGfxPos++, D_E00DC648[unk_00]); - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, uls, ult, uls + 31 * 4, ult + 15 * 4); - gSPDisplayList(gMasterGfxPos++, D_E00DC640[unk_00]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, data->primR, data->primG, data->primB, primA); + gDPSetEnvColor(gMainGfxPos++, data->envR, data->envG, data->envB, data->envA); + gSPDisplayList(gMainGfxPos++, D_E00DC648[unk_00]); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, uls, ult, uls + 31 * 4, ult + 15 * 4); + gSPDisplayList(gMainGfxPos++, D_E00DC640[unk_00]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/ice_pillar.c b/src/effects/ice_pillar.c index b9eaed4fae..c4ebcc34c5 100644 --- a/src/effects/ice_pillar.c +++ b/src/effects/ice_pillar.c @@ -153,8 +153,8 @@ void ice_pillar_appendGfx(void* effect) { Matrix4f sp10, sp50; Camera* camera; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); camera = &gCameras[gCurrentCameraID]; shim_guTranslateF(sp10, data->pos.x, data->pos.y, data->pos.z); @@ -162,12 +162,12 @@ void ice_pillar_appendGfx(void* effect) { shim_guMtxCatF(sp50, sp10, sp10); shim_guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(gMasterGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, data->prim.r, data->prim.g, data->prim.b, alpha); - gDPSetEnvColor(gMasterGfxPos++, data->env.r, data->env.g, data->env.b, data->env.a); - gSPDisplayList(gMasterGfxPos++, D_E011E800[0]); - gSPDisplayList(gMasterGfxPos++, D_E011E7F0[data->unk_24]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, data->prim.r, data->prim.g, data->prim.b, alpha); + gDPSetEnvColor(gMainGfxPos++, data->env.r, data->env.g, data->env.b, data->env.a); + gSPDisplayList(gMainGfxPos++, D_E011E800[0]); + gSPDisplayList(gMainGfxPos++, D_E011E7F0[data->unk_24]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/ice_shard.c b/src/effects/ice_shard.c index c7d9b25a4b..3702aed7f3 100644 --- a/src/effects/ice_shard.c +++ b/src/effects/ice_shard.c @@ -140,41 +140,41 @@ void ice_shard_appendGfx(void* effect) { Matrix4f sp20; Matrix4f unused; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, data->scale, data->pos.x, data->pos.y, data->pos.z); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); shim_guRotateF(sp20, data->rotation, 0.0f, 0.0f, 1.0f); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_E01108B4[0]); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_E01108B4[0]); texCoordS = (type % 2) * 32; texCoordT = (s32) (data->animFrame * 4.0f) * 32; envAlpha = (data->animFrame * 4.0f - (s32) data->animFrame * 4) * 256.0f; - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, (texCoordS ) * 4, (texCoordT ) * 4, (texCoordS + 31) * 4, (texCoordT + 31) * 4); - gDPSetTileSize(gMasterGfxPos++, 1, + gDPSetTileSize(gMainGfxPos++, 1, (texCoordS ) * 4, (texCoordT + 32) * 4, (texCoordS + 31) * 4, (texCoordT + 63) * 4); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, data->primCol.r, data->primCol.g, data->primCol.b, alpha); - gDPSetEnvColor(gMasterGfxPos++, data->envCol.r, data->envCol.g, data->envCol.b, envAlpha); - gSPDisplayList(gMasterGfxPos++, D_E01108B0[0]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, data->primCol.r, data->primCol.g, data->primCol.b, alpha); + gDPSetEnvColor(gMainGfxPos++, data->envCol.r, data->envCol.g, data->envCol.b, envAlpha); + gSPDisplayList(gMainGfxPos++, D_E01108B0[0]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); if (type % 2 == 1 && (s32) (data->animFrame * 4.0f) == 3) { - gDPSetPrimColor(gMasterGfxPos++, 0, 0, data->primCol.r, data->primCol.g, data->primCol.b, alpha * envAlpha / 255); - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, PRIMITIVE, SHADE, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, SHADE, 0, PRIMITIVE, 0); - gSPDisplayList(gMasterGfxPos++, D_09001168_3F9E28); + gDPSetPrimColor(gMainGfxPos++, 0, 0, data->primCol.r, data->primCol.g, data->primCol.b, alpha * envAlpha / 255); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, PRIMITIVE, SHADE, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, SHADE, 0, PRIMITIVE, 0); + gSPDisplayList(gMainGfxPos++, D_09001168_3F9E28); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/landing_dust.c b/src/effects/landing_dust.c index 160b9413e2..88e5ea463a 100644 --- a/src/effects/landing_dust.c +++ b/src/effects/landing_dust.c @@ -279,9 +279,9 @@ void landing_dust_appendGfx(void* effect) { dlist1 = sDlists[type]; dlist2 = sDlists2[type]; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, dlist2); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gSPDisplayList(gMainGfxPos++, dlist2); spD8 = temp_t0 & 7; spDC = temp_t0 & 0x40; @@ -291,20 +291,20 @@ void landing_dust_appendGfx(void* effect) { shim_guMtxCatF(mtx2, mtx1, mtx3); shim_guMtxF2L(mtx3, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); switch (type) { case 0: case 1: - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 230, 222, 222, 110); - gDPSetEnvColor(gMasterGfxPos++, 0, 0, 0, envAlpha); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 230, 222, 222, 110); + gDPSetEnvColor(gMainGfxPos++, 0, 0, 0, envAlpha); break; case 2: case 3: case 4: - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 230, 222, 222, 130); - gDPSetEnvColor(gMasterGfxPos++, 0, 0, 0, envAlpha); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 230, 222, 222, 130); + gDPSetEnvColor(gMainGfxPos++, 0, 0, 0, envAlpha); break; } @@ -317,16 +317,16 @@ void landing_dust_appendGfx(void* effect) { temp_lo = spD8 * phi_a0; temp = temp_lo + phi_a0; - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, temp_lo * 4, 0, temp * 4, phi_a0 * 4); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, temp_lo * 4, 0, temp * 4, phi_a0 * 4); if (spDC) { - gDPSetTileSize(gMasterGfxPos++, 1, temp * 4, phi_a0 * 4, (temp_lo + (phi_a0 * 2)) * 4, phi_a0 * 8); + gDPSetTileSize(gMainGfxPos++, 1, temp * 4, phi_a0 * 4, (temp_lo + (phi_a0 * 2)) * 4, phi_a0 * 8); } else { - gDPSetTileSize(gMasterGfxPos++, 1, temp * 4, 0, (temp_lo + (phi_a0 * 2)) * 4, phi_a0 * 4); + gDPSetTileSize(gMainGfxPos++, 1, temp * 4, 0, (temp_lo + (phi_a0 * 2)) * 4, phi_a0 * 4); } if (type == 2) { - gSPDisplayList(gMasterGfxPos++, dlist1); + gSPDisplayList(gMainGfxPos++, dlist1); } part++; @@ -334,12 +334,12 @@ void landing_dust_appendGfx(void* effect) { for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, part++) { shim_guTranslateF(mtx1, part->x, part->y, part->z); shim_guMtxF2L(mtx1, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, dlist1); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, dlist1); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPPipeSync(gMasterGfxPos++); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/lens_flare.c b/src/effects/lens_flare.c index dbcacedf0f..f7bdd9bfa1 100644 --- a/src/effects/lens_flare.c +++ b/src/effects/lens_flare.c @@ -113,9 +113,9 @@ void lens_flare_appendGfx(void* effect) { Matrix4f sp58; Matrix4f sp98; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, D_E0034788[unk_00]); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gSPDisplayList(gMainGfxPos++, D_E0034788[unk_00]); shim_guTranslateF(sp18, data->unk_04, data->unk_08, data->unk_0C); shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); @@ -131,10 +131,10 @@ void lens_flare_appendGfx(void* effect) { idx %= ARRAY_COUNT(D_E0034790); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, D_E0034790[idx], D_E0034790[idx + 1], D_E0034790[idx + 2], primA); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_E0034780[0]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, D_E0034790[idx], D_E0034790[idx + 1], D_E0034790[idx + 2], primA); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_E0034780[0]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } primA = data->unk_24; @@ -149,12 +149,12 @@ void lens_flare_appendGfx(void* effect) { shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, D_E0034790[idx], D_E0034790[idx + 1], D_E0034790[idx + 2], primA); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 255, 255, primA); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_E0034780[unk_00]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, D_E0034790[idx], D_E0034790[idx + 1], D_E0034790[idx + 2], primA); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 255, primA); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_E0034780[unk_00]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/light_rays.c b/src/effects/light_rays.c index 015756cf54..39d5deee4d 100644 --- a/src/effects/light_rays.c +++ b/src/effects/light_rays.c @@ -273,8 +273,8 @@ void func_E006A85C(LightRaysFXData* part) { s32 uls2 = part->unk_3C * 4.0f; s32 ult2 = part->unk_40 * 4.0f; - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, uls, ult, uls + 512, ult + 256); - gDPSetTileSize(gMasterGfxPos++, 1, uls2, ult2, uls2 + 512, ult2 + 256); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, uls, ult, uls + 512, ult + 256); + gDPSetTileSize(gMainGfxPos++, 1, uls2, ult2, uls2 + 512, ult2 + 256); } void light_rays_appendGfx(void* effect) { @@ -287,9 +287,9 @@ void light_rays_appendGfx(void* effect) { Matrix4f mtxTranslate; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, dlist2); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gSPDisplayList(gMainGfxPos++, dlist2); shim_guTranslateF(mtxTranslate, part->pos.x, part->pos.y, part->pos.z); @@ -344,7 +344,7 @@ void light_rays_appendGfx(void* effect) { shim_guScaleF(mtxTemp, scaleX, scaleY, scaleZ); shim_guMtxCatF(mtxTemp, mtxTransform, mtxTransform); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 255, 240, part->alpha); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 240, part->alpha); } else { shim_guRotateF(mtxTemp, part->rotation.y, 0.0f, 1.0f, 0.0f); shim_guMtxCatF(mtxTemp, mtxTransform, mtxTransform); @@ -353,15 +353,15 @@ void light_rays_appendGfx(void* effect) { shim_guTranslateF(mtxTemp, part->unk_58, 0.0f, 0.0f); shim_guMtxCatF(mtxTemp, mtxTransform, mtxTransform); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 255, 181, part->alpha); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 181, part->alpha); } shim_guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, dlist); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, dlist); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/lightning.c b/src/effects/lightning.c index f8b9fd1c0c..91ec30fee8 100644 --- a/src/effects/lightning.c +++ b/src/effects/lightning.c @@ -223,8 +223,8 @@ void lightning_appendGfx(void* effect) { Matrix4f sp60; u16 perspNorm; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); if (unk_00 != 1 || unk_18 >= 18) { s32 ult2; @@ -233,7 +233,7 @@ void lightning_appendGfx(void* effect) { s32 ult; f32* unk_28; // TODO required to match - gSPDisplayList(gMasterGfxPos++, dlist2); + gSPDisplayList(gMainGfxPos++, dlist2); uls = data->unk_1C * 4.0f; ult = data->unk_20 * 4.0f; @@ -248,13 +248,13 @@ void lightning_appendGfx(void* effect) { shim_guPerspectiveF(sp20, &perspNorm, 30.0f, (f32) camera->viewportW / (f32) camera->viewportH, 4.0f, 16384.0f, 1.0f); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); shim_guTranslateF(sp20, data->unk_04, data->unk_08, -500.0f); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 47, 198, 255); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 47, 198, 255); break; default: shim_guTranslateF(sp20, data->unk_04, data->unk_08, data->unk_0C); @@ -264,21 +264,21 @@ void lightning_appendGfx(void* effect) { shim_guMtxCatF(sp60, sp20, sp20); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 255, 0, data->unk_10); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 0, data->unk_10); break; } - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, uls, ult, uls + 1020, ult + 124); - gDPSetTileSize(gMasterGfxPos++, 1, uls2, ult2, uls2 + 1020, ult2 + 124); - gSPDisplayList(gMasterGfxPos++, dlist); - gDPPipeSync(gMasterGfxPos++); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, uls, ult, uls + 1020, ult + 124); + gDPSetTileSize(gMainGfxPos++, 1, uls2, ult2, uls2 + 1020, ult2 + 124); + gSPDisplayList(gMainGfxPos++, dlist); + gDPPipeSync(gMainGfxPos++); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); if (unk_00 < 3) { - gSPMatrix(gMasterGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCameraID], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gMainGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCameraID], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } } diff --git a/src/effects/lightning_bolt.c b/src/effects/lightning_bolt.c index 04a7353423..29a5771df3 100644 --- a/src/effects/lightning_bolt.c +++ b/src/effects/lightning_bolt.c @@ -205,16 +205,16 @@ void lightning_bolt_appendGfx(void* effect) { type = data->type; widthScale = data->widthScale; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guScaleF(sp10, 0.1f, 0.1f, 0.1f); shim_guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, data->outerColor.r, data->outerColor.g, data->outerColor.b, alpha); - gDPSetEnvColor(gMasterGfxPos++, data->innerColor.r, data->innerColor.g, data->innerColor.b, 128); - gSPDisplayList(gMasterGfxPos++, D_09001000_3BBEA0); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, data->outerColor.r, data->outerColor.g, data->outerColor.b, alpha); + gDPSetEnvColor(gMainGfxPos++, data->innerColor.r, data->innerColor.g, data->innerColor.b, 128); + gSPDisplayList(gMainGfxPos++, D_09001000_3BBEA0); temp_a0 = lifetime - 1; if (type != 2) { @@ -250,10 +250,10 @@ void lightning_bolt_appendGfx(void* effect) { data->edgeLength[i] = (f32) preset->width[i] * 0.1; } - vtxBuffer = (Vtx_t*) (gMasterGfxPos + 1); - vtx = (Vtx_t*) (gMasterGfxPos + 1); - gSPBranchList(gMasterGfxPos, gMasterGfxPos + 0x31); - gMasterGfxPos += 0x31; + vtxBuffer = (Vtx_t*) (gMainGfxPos + 1); + vtx = (Vtx_t*) (gMainGfxPos + 1); + gSPBranchList(gMainGfxPos, gMainGfxPos + 0x31); + gMainGfxPos += 0x31; for (i = 0; i < ARRAY_COUNT(data->boltVertexPosX); i++) { if (i == 0) { @@ -310,13 +310,13 @@ void lightning_bolt_appendGfx(void* effect) { quadCount = i; - gSPVertex(gMasterGfxPos++, vtxBuffer, i * 2, 0); - gSPClearGeometryMode(gMasterGfxPos++, G_SHADING_SMOOTH); + gSPVertex(gMainGfxPos++, vtxBuffer, i * 2, 0); + gSPClearGeometryMode(gMainGfxPos++, G_SHADING_SMOOTH); for (i = 0; i < quadCount - 1; i++) { - gSP2Triangles(gMasterGfxPos++, i * 2 + 1, i * 2 + 0, i * 2 + 2, 0, + gSP2Triangles(gMainGfxPos++, i * 2 + 1, i * 2 + 0, i * 2 + 2, 0, i * 2 + 1, i * 2 + 2, i * 2 + 3, 0); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/lil_oink.c b/src/effects/lil_oink.c index 908d90c8a8..589b104b7a 100644 --- a/src/effects/lil_oink.c +++ b/src/effects/lil_oink.c @@ -175,11 +175,11 @@ void lil_oink_appendGfx(void* effect) { s32 angle = data->lifetime * 30; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x9, VIRTUAL_TO_PHYSICAL(eff->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x9, VIRTUAL_TO_PHYSICAL(eff->graphics->data)); - gSPDisplayList(gMasterGfxPos++, D_09002D70_401FC0); - gSPLookAt(gMasterGfxPos++, &gDisplayContext->lookAt); + gSPDisplayList(gMainGfxPos++, D_09002D70_401FC0); + gSPLookAt(gMainGfxPos++, &gDisplayContext->lookAt); for (i = 0; i < MAX_LIL_OINKS; i++) { if (data->flags[i] & LIL_OINK_FLAG_VISIBLE) { @@ -187,17 +187,17 @@ void lil_oink_appendGfx(void* effect) { data->x[i], data->y[i] + data->jumpOffset[i], data->z[i]); shim_guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_E0114718[data->type[i]]); + gSPDisplayList(gMainGfxPos++, D_E0114718[data->type[i]]); if (data->type[i] == LIL_OINK_TYPE_SILVER || data->type[i] == LIL_OINK_TYPE_GOLD) { f32 shineVariation = shim_sin_deg(angle) * 63.0f; s8 primColor = shineVariation + 63.0f; - gDPSetPrimColor(gMasterGfxPos++, 0, 0, primColor, primColor, primColor, 0); + gDPSetPrimColor(gMainGfxPos++, 0, 0, primColor, primColor, primColor, 0); } - gSPDisplayList(gMasterGfxPos++, lil_oink_FramesGfx[data->type[i]][data->gfxFrame[i]]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, lil_oink_FramesGfx[data->type[i]][data->gfxFrame[i]]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } angle += 20; } diff --git a/src/effects/merlin_house_stars.c b/src/effects/merlin_house_stars.c index 098e66c2bc..b2d41f4dfb 100644 --- a/src/effects/merlin_house_stars.c +++ b/src/effects/merlin_house_stars.c @@ -134,29 +134,29 @@ void merlin_house_stars_appendGfx(void* effect) { s32 uls; s32 ult; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guTranslateF(sp10, data->unk_0C, data->unk_10, data->unk_14); shim_guScaleF(sp50, 0.96f, 0.96f, 0.96f); shim_guMtxCatF(sp50, sp10, sp10); shim_guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, 127); - gDPSetEnvColor(gMasterGfxPos++, 0, 0, 0, unk_18); - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, 1, TEXEL1, 0, PRIMITIVE, TEXEL0, 0, 0, 0, COMBINED, COMBINED, 0, ENVIRONMENT, 0); - gSPDisplayList(gMasterGfxPos++, D_09001000_3A6BE0); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, 127); + gDPSetEnvColor(gMainGfxPos++, 0, 0, 0, unk_18); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, 1, TEXEL1, 0, PRIMITIVE, TEXEL0, 0, 0, 0, COMBINED, COMBINED, 0, ENVIRONMENT, 0); + gSPDisplayList(gMainGfxPos++, D_09001000_3A6BE0); uls = data->unk_1C * 4.0f; ult = data->unk_20 * 4.0f; - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, uls, ult, uls + 252, ult + 252); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, uls, ult, uls + 252, ult + 252); uls = data->unk_24 * 4.0f; ult = data->unk_28 * 4.0f; - gDPSetTileSize(gMasterGfxPos++, 1, uls, ult, uls + 252, ult + 252); + gDPSetTileSize(gMainGfxPos++, 1, uls, ult, uls + 252, ult + 252); - gSPDisplayList(gMasterGfxPos++, D_09001418_3A6FF8); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPPipeSync(gMasterGfxPos++); + gSPDisplayList(gMainGfxPos++, D_09001418_3A6FF8); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/misc_particles.c b/src/effects/misc_particles.c index f662774845..047085cc8a 100644 --- a/src/effects/misc_particles.c +++ b/src/effects/misc_particles.c @@ -306,10 +306,10 @@ void misc_particles_appendGfx(void* effect) { Matrix4f unused; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gDPSetEnvColor(gMasterGfxPos++, particle->glowColor.r, particle->glowColor.g, particle->glowColor.b, particle->glowColor.a); - gSPDisplayList(gMasterGfxPos++, D_E00E4DA8[variation]); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPSetEnvColor(gMainGfxPos++, particle->glowColor.r, particle->glowColor.g, particle->glowColor.b, particle->glowColor.a); + gSPDisplayList(gMainGfxPos++, D_E00E4DA8[variation]); particle++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, particle++) { @@ -317,22 +317,22 @@ void misc_particles_appendGfx(void* effect) { shim_guPositionF(mtxTransform, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, particle->scale * alphaScale, particle->pos.x, particle->pos.y, particle->pos.z); shim_guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 80 - particle->animTime, particle->innerColor.r, particle->innerColor.g, particle->innerColor.b, alphaScale * particle->innerColor.a); - gDPSetTileSize(gMasterGfxPos++, 1, + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 80 - particle->animTime, particle->innerColor.r, particle->innerColor.g, particle->innerColor.b, alphaScale * particle->innerColor.a); + gDPSetTileSize(gMainGfxPos++, 1, (s32) particle->unk_5C * 4, (s32) particle->unk_60 * 4, ((s32) particle->unk_5C + 15) * 4, ((s32) particle->unk_60 + 15) * 4); if (variation == 2) { - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, ((i & 0x1F) * 32 ) * 4, 31 * 4, ((i & 0x1F) * 32 + 31) * 4, 31 * 4); } - gSPDisplayList(gMasterGfxPos++, D_E00E4D90[variation]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_E00E4D90[variation]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } } diff --git a/src/effects/motion_blur_flame.c b/src/effects/motion_blur_flame.c index 5f9f80768b..c5ab7b9ab7 100644 --- a/src/effects/motion_blur_flame.c +++ b/src/effects/motion_blur_flame.c @@ -149,9 +149,9 @@ void motion_blur_flame_appendGfx(void* effect) { s32 t6; s32 var_v1; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, D_E00A29D0[temp_a2]); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gSPDisplayList(gMainGfxPos++, D_E00A29D0[temp_a2]); for (i = 0; i < 4; i++) { f32 temp_f12 = data->unk_1C[i]; @@ -178,7 +178,7 @@ void motion_blur_flame_appendGfx(void* effect) { temp_v0_2 = (data->unk_60 * temp_a0) >> 9; temp_v0_3 = (data->unk_64 * temp_a0) >> 9; - gDPSetPrimColor(gMasterGfxPos++, 0, 0, + gDPSetPrimColor(gMainGfxPos++, 0, 0, (temp_v1 * temp_a0) >> 8, (temp_v0_2 * temp_a0) >> 8, (temp_v0_3 * temp_a0) >> 8, @@ -198,7 +198,7 @@ void motion_blur_flame_appendGfx(void* effect) { envB = 127; } - gDPSetEnvColor(gMasterGfxPos++, envR, envG, envB, 0); + gDPSetEnvColor(gMainGfxPos++, envR, envG, envB, 0); s3 = sp48 - temp_s5; t6 = s3 + temp_s5 * 2; @@ -234,14 +234,14 @@ void motion_blur_flame_appendGfx(void* effect) { break; } - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, (s32) (s3 * temp_s1->unk_08) * 4, (s32) (temp_s1->unk_04 * 20 - var_t2_2 * temp_s1->unk_14 * temp_s1->unk_0C) * 4, (s32) (s3 * temp_s1->unk_08 + temp_s1->unk_00) * 4, (s32) (temp_s1->unk_04 * 21 - var_t2_2 * temp_s1->unk_14 * temp_s1->unk_0C) * 4); for (var_t4 = 0; var_t4 < 2; var_t4++) { - gDPLoadMultiTile(gMasterGfxPos++, VIRTUAL_TO_PHYSICAL(nuGfxCfb_ptr + uly * SCREEN_WIDTH), + gDPLoadMultiTile(gMainGfxPos++, VIRTUAL_TO_PHYSICAL(nuGfxCfb_ptr + uly * SCREEN_WIDTH), 0x0100, 1, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, SCREEN_HEIGHT, s3 + var_a1, 0, @@ -250,7 +250,7 @@ void motion_blur_flame_appendGfx(void* effect) { 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 9, 8, G_TX_NOLOD, G_TX_NOLOD ); - gSPTextureRectangle(gMasterGfxPos++, + gSPTextureRectangle(gMainGfxPos++, (s3 + var_a1) * 4, uly * 4, t6 * 4, @@ -261,7 +261,7 @@ void motion_blur_flame_appendGfx(void* effect) { 0x0400, 0x0400 ); - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } var_t2_2++; } diff --git a/src/effects/moving_cloud.c b/src/effects/moving_cloud.c index 8036185021..a85be959d9 100644 --- a/src/effects/moving_cloud.c +++ b/src/effects/moving_cloud.c @@ -183,19 +183,19 @@ void moving_cloud_appendGfx(void* effect) { Matrix4f sp10; Matrix4f sp50; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guTranslateF(sp10, data->unk_04, data->unk_08, data->unk_0C); shim_guScaleF(sp50, data->unk_44, data->unk_44, data->unk_44); shim_guMtxCatF(sp50, sp10, sp10); shim_guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(gMasterGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, data->unk_24, data->unk_28, data->unk_2C, unk_30); - gDPSetEnvColor(gMasterGfxPos++, data->unk_34, data->unk_38, data->unk_3C, data->unk_40); - gSPDisplayList(gMasterGfxPos++, D_E00E8634[0]); - gSPDisplayList(gMasterGfxPos++, D_E00E8630[0]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, data->unk_24, data->unk_28, data->unk_2C, unk_30); + gDPSetEnvColor(gMainGfxPos++, data->unk_34, data->unk_38, data->unk_3C, data->unk_40); + gSPDisplayList(gMainGfxPos++, D_E00E8634[0]); + gSPDisplayList(gMainGfxPos++, D_E00E8630[0]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/music_note.c b/src/effects/music_note.c index 1290eb82c0..c682d4e884 100644 --- a/src/effects/music_note.c +++ b/src/effects/music_note.c @@ -140,10 +140,10 @@ void music_note_appendGfx(void* data) { rgbOffset = (colorIdx * 3) % ARRAY_COUNT(D_E004C67C); rgbOffset = (colorIdx * 3) % ARRAY_COUNT(D_E004C67C); - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, D_09000FC0_35B5A0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gSPDisplayList(gMainGfxPos++, D_09000FC0_35B5A0); + gDPSetPrimColor(gMainGfxPos++, 0, 0, D_E004C67C[rgbOffset], D_E004C67C[rgbOffset + 1], D_E004C67C[rgbOffset + 2], fxData->unk_14 ); shim_guTranslateF(sp18, fxData->pos.x, fxData->pos.y, fxData->pos.z); @@ -152,8 +152,8 @@ void music_note_appendGfx(void* data) { shim_guScaleF(sp58, fxData->unk_10, fxData->unk_10, 0.0f); shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_E004C660[dlistIdx]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPPipeSync(gMasterGfxPos++); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_E004C660[dlistIdx]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/partner_buff.c b/src/effects/partner_buff.c index 76261678c1..3af84fb99a 100644 --- a/src/effects/partner_buff.c +++ b/src/effects/partner_buff.c @@ -183,20 +183,20 @@ void func_E011A3A0(EffectInstance* effect) { void func_E011A3BC(s16 alpha) { if (alpha == 255) { - gDPSetRenderMode(gMasterGfxPos++, AA_EN | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | + gDPSetRenderMode(gMainGfxPos++, AA_EN | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM), GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM)); - gDPSetCombineMode(gMasterGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); + gDPSetCombineMode(gMainGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); } else { - gDPSetRenderMode(gMasterGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, + gDPSetRenderMode(gMainGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, alpha); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, alpha); } } void func_E011A48C(s32 posX, s32 posY, s32 tile, f32 scale) { - gSPScisTextureRectangle(gMasterGfxPos++, + gSPScisTextureRectangle(gMainGfxPos++, posX * 4, posY * 4, (posX + 32) * 4, @@ -206,7 +206,7 @@ void func_E011A48C(s32 posX, s32 posY, s32 tile, f32 scale) { 1024, scale, -scale); - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } void func_E011A700(EffectInstance* effect) { @@ -222,10 +222,10 @@ void func_E011A700(EffectInstance* effect) { s32 i; if (data->unk_02 != 0) { - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, D_E011AC20[0]); + gSPDisplayList(gMainGfxPos++, D_E011AC20[0]); numShown = 0; for (i = 0; i < ARRAY_COUNT(data->unk_0C); i++) { @@ -233,15 +233,15 @@ void func_E011A700(EffectInstance* effect) { alpha = buffData->alpha; if (alpha != 0) { - gSPTexture(gMasterGfxPos++, 0xFFFF, 0xFFFF, 2, i, G_ON); + gSPTexture(gMainGfxPos++, 0xFFFF, 0xFFFF, 2, i, G_ON); func_E011A3BC(alpha); func_E011A48C(20 + numShown * 32, 50, i, 1024.0f); numShown++; } } - gSPTexture(gMasterGfxPos++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); - gDPSetTextureLUT(gMasterGfxPos++, G_TT_NONE); + gSPTexture(gMainGfxPos++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); + gDPSetTextureLUT(gMainGfxPos++, G_TT_NONE); numShown = 0; for (i = 0; i < ARRAY_COUNT(data->unk_0C); i++) { @@ -270,7 +270,7 @@ void func_E011A700(EffectInstance* effect) { } dlist = D_E011AC24[idx]; if (dlist != NULL) { - gSPDisplayList(gMasterGfxPos++, dlist); + gSPDisplayList(gMainGfxPos++, dlist); scale = D_E011AC4C[(s16)stateTimer] * 0.01f; temp2 = (-(scale - 1.0f) * 16.0f) + 0.5; x = temp2 + 20 + numShown * 32; @@ -281,7 +281,7 @@ void func_E011A700(EffectInstance* effect) { dlist = D_E011AC24[turnsDisplay]; if (dlist != NULL) { - gSPDisplayList(gMasterGfxPos++, dlist); + gSPDisplayList(gMainGfxPos++, dlist); temp1 = D_E011AC64[(s16)stateTimer]; temp2 = -temp1; scale = D_E011AC58[(s16)stateTimer] * 0.01f; @@ -293,12 +293,12 @@ void func_E011A700(EffectInstance* effect) { } } - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, camera->viewportStartX, camera->viewportStartY, camera->viewportStartX + camera->viewportW, camera->viewportStartY + camera->viewportH ); - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } } diff --git a/src/effects/peach_star_beam.c b/src/effects/peach_star_beam.c index 2975b96589..0f5aa79540 100644 --- a/src/effects/peach_star_beam.c +++ b/src/effects/peach_star_beam.c @@ -171,9 +171,9 @@ void peach_star_beam_appendGfx(void* effect) { f32 partX, partY, partZ; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x9, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, D_09005090_3EAFC0); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x9, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gSPDisplayList(gMainGfxPos++, D_09005090_3EAFC0); for (i = 0; i < ARRAY_COUNT(data->spirits); i++) { part = &data->spirits[i]; @@ -192,13 +192,13 @@ void peach_star_beam_appendGfx(void* effect) { shim_guPositionF(sp20, 0.0f, 0.0f, 0.0f, SPRITE_WORLD_SCALE_F, partX, partY, partZ); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 128, 128, 128, 255); - gDPSetEnvColor(gMasterGfxPos++, 128, 128, 128, 127); - gSPDisplayList(gMasterGfxPos++, D_E010CA38[i]); - gSPDisplayList(gMasterGfxPos++, D_E010CA18[i]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 128, 128, 128, 255); + gDPSetEnvColor(gMainGfxPos++, 128, 128, 128, 127); + gSPDisplayList(gMainGfxPos++, D_E010CA38[i]); + gSPDisplayList(gMainGfxPos++, D_E010CA18[i]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } } @@ -208,15 +208,15 @@ void peach_star_beam_appendGfx(void* effect) { shim_guMtxCatF(sp60, sp20, sp20); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(gMasterGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, data->primR, data->primG, data->primB, alpha); - gDPSetEnvColor(gMasterGfxPos++, data->envR, data->envG, data->envB, data->envA); - gSPDisplayList(gMasterGfxPos++, D_E010CA14[0]); - gSPDisplayList(gMasterGfxPos++, D_E010CA10[0]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_09005090_3EAFC0); + gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, data->primR, data->primG, data->primB, alpha); + gDPSetEnvColor(gMainGfxPos++, data->envR, data->envG, data->envB, data->envA); + gSPDisplayList(gMainGfxPos++, D_E010CA14[0]); + gSPDisplayList(gMainGfxPos++, D_E010CA10[0]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_09005090_3EAFC0); for (i = 0; i < ARRAY_COUNT(data->spirits); i++) { part = &data->spirits[i]; @@ -236,13 +236,13 @@ void peach_star_beam_appendGfx(void* effect) { shim_guPositionF(sp20, 0.0f, 0.0f, 0.0f, 0.67f, partX, partY, partZ); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 128, 128, 128, 255); - gDPSetEnvColor(gMasterGfxPos++, 128, 128, 128, 127); - gSPDisplayList(gMasterGfxPos++, D_E010CA38[i]); - gSPDisplayList(gMasterGfxPos++, D_E010CA18[i]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 128, 128, 128, 255); + gDPSetEnvColor(gMainGfxPos++, 128, 128, 128, 127); + gSPDisplayList(gMainGfxPos++, D_E010CA38[i]); + gSPDisplayList(gMainGfxPos++, D_E010CA18[i]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } } diff --git a/src/effects/pink_sparkles.c b/src/effects/pink_sparkles.c index cfc2a79ab0..3dad00df48 100644 --- a/src/effects/pink_sparkles.c +++ b/src/effects/pink_sparkles.c @@ -240,9 +240,9 @@ void pink_sparkles_appendGfx(void* effect) { s32 colorIdx; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, D_09000F20_338EE0); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gSPDisplayList(gMainGfxPos++, D_09000F20_338EE0); colorIdx = (part->unk_20 - 1) * 3; @@ -280,12 +280,12 @@ void pink_sparkles_appendGfx(void* effect) { primB = 255; } - gDPSetPrimColor(gMasterGfxPos++, 0, 0, primR, primG, primB, 255); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_E01248A0[unk_28 & 7]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, primR, primG, primB, 255); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_E01248A0[unk_28 & 7]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/purple_ring.c b/src/effects/purple_ring.c index 8e20783dd8..f4150e1f68 100644 --- a/src/effects/purple_ring.c +++ b/src/effects/purple_ring.c @@ -195,10 +195,10 @@ void purple_ring_appendGfx(void* effect) { Matrix4f sp10; Matrix4f sp50; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, D_09000200_352EE0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, data->unk_74, data->unk_75, data->unk_76, data->unk_68); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gSPDisplayList(gMainGfxPos++, D_09000200_352EE0); + gDPSetPrimColor(gMainGfxPos++, 0, 0, data->unk_74, data->unk_75, data->unk_76, data->unk_68); shim_guTranslateF(sp10, data->unk_04, data->unk_08, data->unk_0C); shim_guMtxCatF(data->unk_1C, sp10, sp10); @@ -206,9 +206,9 @@ void purple_ring_appendGfx(void* effect) { shim_guMtxCatF(sp50, sp10, sp10); shim_guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, 0, unk_5C, temp * 4, unk_5C + temp); - gSPDisplayList(gMasterGfxPos++, D_090004E8_3531C8); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPPipeSync(gMasterGfxPos++); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, 0, unk_5C, temp * 4, unk_5C + temp); + gSPDisplayList(gMainGfxPos++, D_090004E8_3531C8); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/quizmo_answer.c b/src/effects/quizmo_answer.c index 178a84cba3..1af98abcd2 100644 --- a/src/effects/quizmo_answer.c +++ b/src/effects/quizmo_answer.c @@ -18,21 +18,21 @@ EffectInstance* quizmo_answer_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3) { effect = shim_create_effect_instance(&bp); effect->data.quizmoAnswer = NULL; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effect->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effect->graphics->data)); if (arg0 == 0) { - gSPDisplayList(gMasterGfxPos++, D_09000400_3A2840); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 64, 64, 230); + gSPDisplayList(gMainGfxPos++, D_09000400_3A2840); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 64, 64, 230); } else { - gSPDisplayList(gMasterGfxPos++, D_090004A8_3A28E8); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 80, 80, 255, 230); + gSPDisplayList(gMainGfxPos++, D_090004A8_3A28E8); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 80, 80, 255, 230); } - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 0, 0, 320, 240); - gSPTextureRectangle(gMasterGfxPos++, 512, 304, 768, 560, G_TX_RENDERTILE, 0, 1024, 1024, 1024); - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x00, NULL); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, 0, 0, 320, 240); + gSPTextureRectangle(gMainGfxPos++, 512, 304, 768, 560, G_TX_RENDERTILE, 0, 1024, 1024, 1024); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x00, NULL); shim_remove_effect(effect); return NULL; diff --git a/src/effects/quizmo_assistant.c b/src/effects/quizmo_assistant.c index 8f4209005d..fe6c83590f 100644 --- a/src/effects/quizmo_assistant.c +++ b/src/effects/quizmo_assistant.c @@ -105,8 +105,8 @@ void quizmo_assistant_appendGfx(void* effect) { Matrix4f sp18; Matrix4f sp58; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guTranslateF(sp18, data->position.x, data->position.y, data->position.z); shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); @@ -117,9 +117,9 @@ void quizmo_assistant_appendGfx(void* effect) { shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, fadeInAmt, fadeInAmt, fadeInAmt, 255); - gSPDisplayList(gMasterGfxPos++, D_E011C514[0]); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, fadeInAmt, fadeInAmt, fadeInAmt, 255); + gSPDisplayList(gMainGfxPos++, D_E011C514[0]); switch (data->anim) { case 0: @@ -134,7 +134,7 @@ void quizmo_assistant_appendGfx(void* effect) { break; } - gSPDisplayList(gMasterGfxPos++, D_E011C500[idx]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPPipeSync(gMasterGfxPos++); + gSPDisplayList(gMainGfxPos++, D_E011C500[idx]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/quizmo_audience.c b/src/effects/quizmo_audience.c index b726a9da4b..e2a9e2ea6b 100644 --- a/src/effects/quizmo_audience.c +++ b/src/effects/quizmo_audience.c @@ -187,30 +187,30 @@ void quizmo_audience_appendGfx(void* effect) { s32 primColor = data->primColor; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, primColor, primColor, primColor, 255); - gSPDisplayList(gMasterGfxPos++, D_09003110_3AA8B0); + gDPSetPrimColor(gMainGfxPos++, 0, 0, primColor, primColor, primColor, 255); + gSPDisplayList(gMainGfxPos++, D_09003110_3AA8B0); for (i = 0; i < MAX_QUIZMO_AUDIENCE; i++) { shim_guTranslateF(sp18, data->compX[i], data->compY[i], 0.0f); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, quizmo_audience_renderAudienceMember[i]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, quizmo_audience_renderAudienceMember[i]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPPipeSync(gMasterGfxPos++); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/quizmo_stage.c b/src/effects/quizmo_stage.c index dcbfa1d9a7..08c00e01b3 100644 --- a/src/effects/quizmo_stage.c +++ b/src/effects/quizmo_stage.c @@ -111,64 +111,64 @@ void quizmo_stage_appendGfx(void* effect) { Matrix4f sp18; Matrix4f sp58; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guTranslateF(sp18, data->origin.x, data->origin.y, data->origin.z); shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, microphoneRaiseAmt, microphoneRaiseAmt, microphoneRaiseAmt, 255); - gDPSetCombineLERP(gMasterGfxPos++, TEXEL0, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, COMBINED, 0, PRIMITIVE, 0, 0, 0, 0, COMBINED); - gSPDisplayList(gMasterGfxPos++, D_09007230_39FDF0); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, microphoneRaiseAmt, microphoneRaiseAmt, microphoneRaiseAmt, 255); + gDPSetCombineLERP(gMainGfxPos++, TEXEL0, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, COMBINED, 0, PRIMITIVE, 0, 0, 0, 0, COMBINED); + gSPDisplayList(gMainGfxPos++, D_09007230_39FDF0); if (data->unk_3C != 255) { - gSPMatrix(gMasterGfxPos++, &D_09004148_39CD08[2], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &D_09004148_39CD08[2], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); shim_guRotateF(sp18, (data->rearWallRaiseAmt * 180) / 255 - 180, 1.0f, 0.0f, 0.0f); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_09006E28_39F9E8); - gSPDisplayList(gMasterGfxPos++, D_09001518_39A0D8); - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, data->lightScrollAmt, 0, data->lightScrollAmt + 252, 60); - gSPDisplayList(gMasterGfxPos++, D_09006DA0_39F960); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gSPMatrix(gMasterGfxPos++, &D_09004148_39CD08[0], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_09006E28_39F9E8); + gSPDisplayList(gMainGfxPos++, D_09001518_39A0D8); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, data->lightScrollAmt, 0, data->lightScrollAmt + 252, 60); + gSPDisplayList(gMainGfxPos++, D_09006DA0_39F960); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &D_09004148_39CD08[0], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); shim_guRotateF(sp18, 90 - (data->leftWallRaiseAmt * 90) / 255, 0.0f, 0.0f, 1.0f); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_09006FB0_39FB70); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gSPMatrix(gMasterGfxPos++, &D_09004148_39CD08[1], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_09006FB0_39FB70); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &D_09004148_39CD08[1], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); shim_guRotateF(sp18, (data->rightWallRaiseAmt * 90) / 255 - 90, 0.0f, 0.0f, 1.0f); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_09006F20_39FAE0); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_090070E8_39FCA8); - gSPDisplayList(gMasterGfxPos++, D_09007030_39FBF0); - gSPDisplayList(gMasterGfxPos++, D_09001518_39A0D8); - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, data->lightScrollAmt, 0, data->lightScrollAmt + 252, 60); - gSPDisplayList(gMasterGfxPos++, D_09006FD8_39FB98); - gSPMatrix(gMasterGfxPos++, &D_09004148_39CD08[3], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_09006F20_39FAE0); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_090070E8_39FCA8); + gSPDisplayList(gMainGfxPos++, D_09007030_39FBF0); + gSPDisplayList(gMainGfxPos++, D_09001518_39A0D8); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, data->lightScrollAmt, 0, data->lightScrollAmt + 252, 60); + gSPDisplayList(gMainGfxPos++, D_09006FD8_39FB98); + gSPMatrix(gMainGfxPos++, &D_09004148_39CD08[3], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); shim_guRotateF(sp18, 90 - (data->podiumRaiseAmt * 90) / 255, 1.0f, 0.0f, 0.0f); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_09006D48_39F908); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_09000218_398DD8); - gSPDisplayList(gMasterGfxPos++, D_09007090_39FC50); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_09006D48_39F908); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_09000218_398DD8); + gSPDisplayList(gMainGfxPos++, D_09007090_39FC50); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPPipeSync(gMasterGfxPos++); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/radial_shimmer.c b/src/effects/radial_shimmer.c index 582123b17f..43a28631f7 100644 --- a/src/effects/radial_shimmer.c +++ b/src/effects/radial_shimmer.c @@ -310,8 +310,8 @@ void radial_shimmer_appendGfx(void* effect) { dlist1 = D_E0066C8C[temp_s5]; dlist2 = D_E0066C50[temp_s5]; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guTranslateF(sp20, data->unk_10, data->unk_14, data->unk_18); shim_guScaleF(sp60, data->unk_1C, data->unk_1C, 1.0f); @@ -320,20 +320,20 @@ void radial_shimmer_appendGfx(void* effect) { shim_guMtxCatF(sp60, sp20, sp20); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); shim_guTranslateF(sp20, 0.0f, 0.0f, data->unk_64); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); alpha = data->unk_24; - gDPSetEnvColor(gMasterGfxPos++, data->unk_6B, data->unk_6C, data->unk_6D, 127); - gSPDisplayList(gMasterGfxPos++, dlist1); + gDPSetEnvColor(gMainGfxPos++, data->unk_6B, data->unk_6C, data->unk_6D, 127); + gSPDisplayList(gMainGfxPos++, dlist1); for (i = 0; i < effectTemp->numParts; i++, data++) { - gDPSetPrimColor(gMasterGfxPos++, 0, 0, data->unk_68, data->unk_69, data->unk_6A, alpha); + gDPSetPrimColor(gMainGfxPos++, 0, 0, data->unk_68, data->unk_69, data->unk_6A, alpha); switch (temp_s5) { case 0: @@ -360,13 +360,13 @@ void radial_shimmer_appendGfx(void* effect) { temp_f4 = data->unk_38; temp_f6 = data->unk_48; - gDPSetTileSize(gMasterGfxPos++, 0, temp_f0, temp_f2, temp_f0 + other * 4, temp_f2 + var_a3 * 4); - gDPSetTileSize(gMasterGfxPos++, G_TX_MIRROR, temp_f4, temp_f6, temp_f4 + other * 4, temp_f6 + var_a3 * 4); - gSPDisplayList(gMasterGfxPos++, dlist2); + gDPSetTileSize(gMainGfxPos++, 0, temp_f0, temp_f2, temp_f0 + other * 4, temp_f2 + var_a3 * 4); + gDPSetTileSize(gMainGfxPos++, G_TX_MIRROR, temp_f4, temp_f6, temp_f4 + other * 4, temp_f6 + var_a3 * 4); + gSPDisplayList(gMainGfxPos++, dlist2); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCameraID], + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCameraID], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/radiating_energy_orb.c b/src/effects/radiating_energy_orb.c index 0de1f80dd5..3355346362 100644 --- a/src/effects/radiating_energy_orb.c +++ b/src/effects/radiating_energy_orb.c @@ -143,32 +143,32 @@ void radiating_energy_orb_appendGfx(void* effect) { unk_14 *= 0.95; } - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guTranslateF(sp18, part->unk_08, part->unk_0C, part->unk_10); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(gMasterGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 64, 64, unk_14); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 64, 64, unk_14); shim_guRotateF(sp18, temp_s2 * 2 + unk_1C, 0.0f, 0.0f, 1.0f); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_090012A8_3A2008); - gSPDisplayList(gMasterGfxPos++, D_09001510_3A2270); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_09001200_3A1F60); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_090012A8_3A2008); + gSPDisplayList(gMainGfxPos++, D_09001510_3A2270); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_09001200_3A1F60); part++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, part++) { f32 scale = part->unk_28; if (scale != 0.0f) { - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 255, 255, (part->unk_14 * unk_14) >> 8); - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 255, (part->unk_14 * unk_14) >> 8); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); shim_guRotateF(sp18, part->unk_20, 0.0f, 0.0f, 1.0f); shim_guTranslateF(sp58, part->unk_2C, 0.0f, 0.0f); @@ -177,9 +177,9 @@ void radiating_energy_orb_appendGfx(void* effect) { shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_E009EDFC[0]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_E009EDFC[0]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); shim_guRotateF(sp18, part->unk_20, 0.0f, 0.0f, 1.0f); shim_guTranslateF(sp58, part->unk_2C + 5.0f, 0.0f, 0.0f); @@ -188,12 +188,12 @@ void radiating_energy_orb_appendGfx(void* effect) { shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_E009EDF8[0]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 0, 255, (part->unk_14 * unk_14) >> 9); - gDPSetEnvColor(gMasterGfxPos++, 255, 128, 255, 0); - gDPSetCombineLERP(gMasterGfxPos++, ENVIRONMENT, PRIMITIVE, TEXEL0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, ENVIRONMENT, PRIMITIVE, TEXEL0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_E009EDF8[0]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 0, 255, (part->unk_14 * unk_14) >> 9); + gDPSetEnvColor(gMainGfxPos++, 255, 128, 255, 0); + gDPSetCombineLERP(gMainGfxPos++, ENVIRONMENT, PRIMITIVE, TEXEL0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, ENVIRONMENT, PRIMITIVE, TEXEL0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); shim_guRotateF(sp18, part->unk_20 + 14.0f, 0.0f, 0.0f, 1.0f); shim_guRotateF(sp58, (i * 10) % 45 + unk_1C, 0.0f, 1.0f, 0.0f); @@ -204,10 +204,10 @@ void radiating_energy_orb_appendGfx(void* effect) { shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_E009EDF4[0]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 64, 64, (part->unk_14 * unk_14) >> 8); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_E009EDF4[0]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 64, 64, (part->unk_14 * unk_14) >> 8); shim_guRotateF(sp18, part->unk_20 + 34.0f + unk_1C, 0.0f, 0.0f, 1.0f); shim_guRotateF(sp58, i * 35, 0.0f, 1.0f, 0.0f); @@ -218,11 +218,11 @@ void radiating_energy_orb_appendGfx(void* effect) { shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_E009EDF0[0]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_E009EDF0[0]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/recover.c b/src/effects/recover.c index f6b90e8ead..48a18bdc6d 100644 --- a/src/effects/recover.c +++ b/src/effects/recover.c @@ -173,15 +173,15 @@ void func_E0080448(EffectInstance* effect) { Matrix4f sp58; Matrix4f sp98; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); shim_guMtxCatF(sp58, sp18, sp98); shim_guMtxF2L(sp98, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); unk_00 = part->unk_00; unk_40 = part->unk_40; @@ -189,17 +189,17 @@ void func_E0080448(EffectInstance* effect) { part++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, part++) { if (part->unk_34 <= 0) { - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, part->unk_28); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, part->unk_28); if (part->unk_28 == 255) { - gDPSetRenderMode(gMasterGfxPos++, AA_EN | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM), AA_EN | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM)); - gDPSetCombineMode(gMasterGfxPos++, G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA); + gDPSetRenderMode(gMainGfxPos++, AA_EN | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM), AA_EN | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM)); + gDPSetCombineMode(gMainGfxPos++, G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA); } else { - gDPSetRenderMode(gMasterGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); - gDPSetCombineLERP(gMasterGfxPos++, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, TEXEL0, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, TEXEL0, 0); + gDPSetRenderMode(gMainGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); + gDPSetCombineLERP(gMainGfxPos++, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, TEXEL0, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, TEXEL0, 0); } - gSPDisplayList(gMasterGfxPos++, (unk_00 == 0 || unk_00 == 2) ? + gSPDisplayList(gMainGfxPos++, (unk_00 == 0 || unk_00 == 2) ? (unk_44 == 0 ? D_09003200_385000 : D_09003298_385098) : D_09003330_385130); @@ -208,38 +208,38 @@ void func_E0080448(EffectInstance* effect) { shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); shim_guRotateF(sp18, part->unk_1C, 0.0f, 0.0f, 1.0f); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); if (i == 1 && unk_00 != 2) { - gSPDisplayList(gMasterGfxPos++, D_090033D0_3851D0); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_090034D0_3852D0); + gSPDisplayList(gMainGfxPos++, D_090033D0_3851D0); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_090034D0_3852D0); if (unk_40 < 0xA && unk_44 == 0) { - gSPDisplayList(gMasterGfxPos++, D_E0080AC0[unk_40]); - gSPDisplayList(gMasterGfxPos++, unk_00 == 0 ? D_09003410_385210 : D_09003470_385270); + gSPDisplayList(gMainGfxPos++, D_E0080AC0[unk_40]); + gSPDisplayList(gMainGfxPos++, unk_00 == 0 ? D_09003410_385210 : D_09003470_385270); } else { s32 ones = unk_40 % 10; s32 tens = unk_44 == 0 ? (unk_40 / 10) : 10; - gSPDisplayList(gMasterGfxPos++, D_E0080AC0[ones]); - gSPDisplayList(gMasterGfxPos++, unk_00 == 0 ? D_09003450_385250 : D_090034B0_3852B0); - gSPDisplayList(gMasterGfxPos++, D_E0080AC0[tens]); - gSPDisplayList(gMasterGfxPos++, unk_00 == 0 ? D_09003430_385230 : D_09003490_385290); + gSPDisplayList(gMainGfxPos++, D_E0080AC0[ones]); + gSPDisplayList(gMainGfxPos++, unk_00 == 0 ? D_09003450_385250 : D_090034B0_3852B0); + gSPDisplayList(gMainGfxPos++, D_E0080AC0[tens]); + gSPDisplayList(gMainGfxPos++, unk_00 == 0 ? D_09003430_385230 : D_09003490_385290); } } else { - gSPDisplayList(gMasterGfxPos++, D_090033F0_3851F0); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_090033F0_3851F0); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/red_impact.c b/src/effects/red_impact.c index afcdabfcdb..e74cde997e 100644 --- a/src/effects/red_impact.c +++ b/src/effects/red_impact.c @@ -166,14 +166,14 @@ void red_impact_appendGfx(void* effect) { Matrix4f sp60; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, dlist); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gSPDisplayList(gMainGfxPos++, dlist); shim_guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, part->unk_04, part->unk_08, part->unk_0C); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); alpha = part->unk_38; primR2 = primR; @@ -183,8 +183,8 @@ void red_impact_appendGfx(void* effect) { envG2 = envG; envB2 = envB; - savedGfxPos = gMasterGfxPos; - gMasterGfxPos++; + savedGfxPos = gMainGfxPos; + gMainGfxPos++; savedGfxPos2 = savedGfxPos + 1; part++; @@ -201,28 +201,28 @@ void red_impact_appendGfx(void* effect) { dlist2 = D_09000940_359CF0; - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, 0, (s32) part->unk_3C, 0x00FC, (s32) part->unk_3C + 0x7C); - gDPSetTileSize(gMasterGfxPos++, 1, 0, (s32) part->unk_44, 0x007C, (s32) part->unk_44 + 0x7C); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, dlist2); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, 0, (s32) part->unk_3C, 0x00FC, (s32) part->unk_3C + 0x7C); + gDPSetTileSize(gMainGfxPos++, 1, 0, (s32) part->unk_44, 0x007C, (s32) part->unk_44 + 0x7C); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, dlist2); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } - gSPEndDisplayList(gMasterGfxPos++); - gSPBranchList(savedGfxPos, gMasterGfxPos); + gSPEndDisplayList(gMainGfxPos++); + gSPBranchList(savedGfxPos, gMainGfxPos); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, primR2, primG2, primB2, alpha); - gDPSetEnvColor(gMasterGfxPos++, envR2, envG2, envB2, 0); - gSPClearGeometryMode(gMasterGfxPos++, G_CULL_BOTH); - gSPSetGeometryMode(gMasterGfxPos++, G_CULL_FRONT); - gSPDisplayList(gMasterGfxPos++, savedGfxPos2); + gDPSetPrimColor(gMainGfxPos++, 0, 0, primR2, primG2, primB2, alpha); + gDPSetEnvColor(gMainGfxPos++, envR2, envG2, envB2, 0); + gSPClearGeometryMode(gMainGfxPos++, G_CULL_BOTH); + gSPSetGeometryMode(gMainGfxPos++, G_CULL_FRONT); + gSPDisplayList(gMainGfxPos++, savedGfxPos2); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, primR, primG, primB, alpha); - gDPSetEnvColor(gMasterGfxPos++, envR, envG, envB, 0); - gSPClearGeometryMode(gMasterGfxPos++, G_CULL_BOTH); - gSPSetGeometryMode(gMasterGfxPos++, G_CULL_BACK); - gSPDisplayList(gMasterGfxPos++, savedGfxPos2); + gDPSetPrimColor(gMainGfxPos++, 0, 0, primR, primG, primB, alpha); + gDPSetEnvColor(gMainGfxPos++, envR, envG, envB, 0); + gSPClearGeometryMode(gMainGfxPos++, G_CULL_BOTH); + gSPSetGeometryMode(gMainGfxPos++, G_CULL_BACK); + gSPDisplayList(gMainGfxPos++, savedGfxPos2); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/ring_blast.c b/src/effects/ring_blast.c index 9282c6ddcc..65ed36adfa 100644 --- a/src/effects/ring_blast.c +++ b/src/effects/ring_blast.c @@ -94,16 +94,16 @@ void ring_blast_appendGfx(void* effect) { Matrix4f sp20; Matrix4f sp60; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, dlist2); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gSPDisplayList(gMainGfxPos++, dlist2); shim_guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, data->unk_10, data->pos.x, data->pos.y, data->pos.z); shim_guRotateF(sp60, data->unk_24, 0.0f, 0.0f, 1.0f); shim_guMtxCatF(sp60, sp20, sp20); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); if (unk_00 == 0) { f32 var_f4 = 1.0f; @@ -115,31 +115,31 @@ void ring_blast_appendGfx(void* effect) { } } - gDPSetPrimColor(gMasterGfxPos++, 0, 0, var_f4 * 255.0f, var_f4 * 18.0f, var_f4 * 59.0f, 0); - gDPSetEnvColor(gMasterGfxPos++, var_f4 * 255.0f, var_f4 * 53.0f, var_f4 * 24.0f, envAlpha); - gDPSetKeyR(gMasterGfxPos++, var_f4 * 211.0f, 0, 0); - gDPSetKeyGB(gMasterGfxPos++, var_f4 * 255.0f, 0, 0, var_f4 * 216.0f, 0, 0); - gDPSetCombineLERP(gMasterGfxPos++, TEXEL1, TEXEL0, ENV_ALPHA, TEXEL0, TEXEL1, TEXEL0, ENVIRONMENT, TEXEL0, PRIMITIVE, CENTER, COMBINED, ENVIRONMENT, 0, 0, 0, COMBINED); + gDPSetPrimColor(gMainGfxPos++, 0, 0, var_f4 * 255.0f, var_f4 * 18.0f, var_f4 * 59.0f, 0); + gDPSetEnvColor(gMainGfxPos++, var_f4 * 255.0f, var_f4 * 53.0f, var_f4 * 24.0f, envAlpha); + gDPSetKeyR(gMainGfxPos++, var_f4 * 211.0f, 0, 0); + gDPSetKeyGB(gMainGfxPos++, var_f4 * 255.0f, 0, 0, var_f4 * 216.0f, 0, 0); + gDPSetCombineLERP(gMainGfxPos++, TEXEL1, TEXEL0, ENV_ALPHA, TEXEL0, TEXEL1, TEXEL0, ENVIRONMENT, TEXEL0, PRIMITIVE, CENTER, COMBINED, ENVIRONMENT, 0, 0, 0, COMBINED); } else { - gDPSetCombineLERP(gMasterGfxPos++, TEXEL1, TEXEL0, ENV_ALPHA, TEXEL0, TEXEL1, TEXEL0, ENVIRONMENT, TEXEL0, 1, COMBINED, PRIMITIVE, COMBINED, 0, 0, 0, COMBINED); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 255, 40, 127); - gDPSetEnvColor(gMasterGfxPos++, 255, 255, 139, envAlpha); + gDPSetCombineLERP(gMainGfxPos++, TEXEL1, TEXEL0, ENV_ALPHA, TEXEL0, TEXEL1, TEXEL0, ENVIRONMENT, TEXEL0, 1, COMBINED, PRIMITIVE, COMBINED, 0, 0, 0, COMBINED); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 40, 127); + gDPSetEnvColor(gMainGfxPos++, 255, 255, 139, envAlpha); } - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, (unk_20_s32 * 32 ) * 4, 0, (unk_20_s32 * 32 + 32) * 4, 32 * 4); if (cond) { - gDPSetTileSize(gMasterGfxPos++, 1, + gDPSetTileSize(gMainGfxPos++, 1, (unk_20_s32 * 32 + 32) * 4, 32 * 4, (unk_20_s32 * 32 + 64) * 4, 64 * 4); } else { - gDPSetTileSize(gMasterGfxPos++, 1, + gDPSetTileSize(gMainGfxPos++, 1, (unk_20_s32 * 32 + 32) * 4, 0, (unk_20_s32 * 32 + 64) * 4, 32 * 4); } - gSPDisplayList(gMasterGfxPos++, dlist); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, dlist); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/rising_bubble.c b/src/effects/rising_bubble.c index 0bf9e45d36..b1225f9d19 100644 --- a/src/effects/rising_bubble.c +++ b/src/effects/rising_bubble.c @@ -111,20 +111,20 @@ void rising_bubble_appendGfx(void* effect) { Matrix4f sp20; Matrix4f sp60; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); if (data->pos.y >= data->unk_24) { s32 uls; s32 ult; - gSPDisplayList(gMasterGfxPos++, D_E0046614[0]); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 127, 127, 127, data->unk_14); + gSPDisplayList(gMainGfxPos++, D_E0046614[0]); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 127, 127, 127, data->unk_14); uls = 0; ult = data->unk_20; - gDPSetTileSize(gMasterGfxPos++, 1, + gDPSetTileSize(gMainGfxPos++, 1, (uls ) * 4, (ult ) * 4, (uls + 32) * 4, (ult + 32) * 4); @@ -132,22 +132,22 @@ void rising_bubble_appendGfx(void* effect) { shim_guScaleF(sp60, data->unk_10, 1.0f, data->unk_10); shim_guMtxCatF(sp60, sp20, sp20); } else { - gSPDisplayList(gMasterGfxPos++, D_E0046618[0]); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 255, 255, data->unk_14); - gDPSetEnvColor(gMasterGfxPos++, 128, 128, 255, data->unk_14); + gSPDisplayList(gMainGfxPos++, D_E0046618[0]); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 255, data->unk_14); + gDPSetEnvColor(gMainGfxPos++, 128, 128, 255, data->unk_14); shim_guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, data->unk_10, data->pos.x, data->pos.y, data->pos.z); } shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); if (data->pos.y >= data->unk_24) { - gSPDisplayList(gMasterGfxPos++, D_E0046600[0]); + gSPDisplayList(gMainGfxPos++, D_E0046600[0]); } else { - gSPDisplayList(gMasterGfxPos++, D_E0046604[(lifeTime >> 1) & 3]); + gSPDisplayList(gMainGfxPos++, D_E0046604[(lifeTime >> 1) & 3]); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPPipeSync(gMasterGfxPos++); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/shape_spell.c b/src/effects/shape_spell.c index c5f7ab9672..f171ad8c73 100644 --- a/src/effects/shape_spell.c +++ b/src/effects/shape_spell.c @@ -167,12 +167,12 @@ void shape_spell_appendGfx(void* effect) { s32 i; s32 j; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, D_09001080_33AFE0); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gSPDisplayList(gMainGfxPos++, D_09001080_33AFE0); - savedGfxPos = gMasterGfxPos++; - savedGfxPos2 = gMasterGfxPos; + savedGfxPos = gMainGfxPos++; + savedGfxPos2 = gMainGfxPos; isChild = data->isChild; primA = data->unk_34; unk_10 = data->unk_10; @@ -208,7 +208,7 @@ void shape_spell_appendGfx(void* effect) { shim_guPositionF(sp20, 0.0f, var_f30, 0.0f, unk_28, unk_10, unk_14, unk_18); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); shim_guTranslateF(sp20, shim_sin_deg(angle) * factor, @@ -235,27 +235,27 @@ void shape_spell_appendGfx(void* effect) { shim_guMtxF2L(sp20, sp60[2]); for (j = 0; j < 3; j++) { - gSPMatrix(gMasterGfxPos++, sp60[j], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, + gSPMatrix(gMainGfxPos++, sp60[j], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, func_E00243BC(D_E0024CC0[j].unk_01, D_E0024CC0[j].unk_00), func_E00243BC(D_E0024CC0[j].unk_02, D_E0024CC0[j].unk_00), func_E00243BC(D_E0024CC0[j].unk_03, D_E0024CC0[j].unk_00), primA); - gDPSetEnvColor(gMasterGfxPos++, + gDPSetEnvColor(gMainGfxPos++, func_E0024324(D_E0024CC0[j].unk_01, D_E0024CC0[j].unk_00), func_E0024324(D_E0024CC0[j].unk_02, D_E0024CC0[j].unk_00), func_E0024324(D_E0024CC0[j].unk_03, D_E0024CC0[j].unk_00), 255); - gSPDisplayList(gMasterGfxPos++, !isChild ? + gSPDisplayList(gMainGfxPos++, !isChild ? D_E0024CC0[j].unk_04 : D_E0024CC0[j].unk_08); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } - gSPEndDisplayList(gMasterGfxPos++); - gSPBranchList(savedGfxPos, gMasterGfxPos); + gSPEndDisplayList(gMainGfxPos++); + gSPBranchList(savedGfxPos, gMainGfxPos); if (!isChild) { var_f30 = 0.0f; @@ -266,10 +266,10 @@ void shape_spell_appendGfx(void* effect) { shim_guPositionF(sp20, 0.0f, var_f30, 0.0f, 1.0f, data->pos.x, data->pos.y, data->pos.z); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); if (!isChild) { - gSPDisplayList(gMasterGfxPos++, savedGfxPos2); + gSPDisplayList(gMainGfxPos++, savedGfxPos2); } else { shim_guRotateF(sp20, 30.0f, 0.0f, 0.0f, 1.0f); @@ -277,11 +277,11 @@ void shape_spell_appendGfx(void* effect) { shim_guMtxF2L(sp20, mtx); for (i = 0; i < 12; i++) { - gSPMatrix(gMasterGfxPos++, mtx, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, savedGfxPos2); + gSPMatrix(gMainGfxPos++, mtx, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, savedGfxPos2); } } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPPipeSync(gMasterGfxPos++); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/shattering_stones.c b/src/effects/shattering_stones.c index 75e7c9ec7c..1b34cd3c87 100644 --- a/src/effects/shattering_stones.c +++ b/src/effects/shattering_stones.c @@ -146,8 +146,8 @@ void shattering_stones_appendGfx(void* effect) { Matrix4f spE0; s32 i; - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, D_09000C00_341480); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gSPDisplayList(gMainGfxPos++, D_09000C00_341480); if (part->unk_24 == 0) { shim_guTranslateF(sp20, part->unk_00, part->unk_04, part->unk_08); @@ -163,10 +163,10 @@ void shattering_stones_appendGfx(void* effect) { shim_guMtxCatF(sp60, spA0, spA0); shim_guMtxF2L(spA0, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 102, 109, 123, part->unk_28); - gSPDisplayList(gMasterGfxPos++, D_E002C940[0]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 102, 109, 123, part->unk_28); + gSPDisplayList(gMainGfxPos++, D_E002C940[0]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } else { s32 unk_28 = part->unk_28; @@ -188,10 +188,10 @@ void shattering_stones_appendGfx(void* effect) { shim_guMtxCatF(sp60, sp20, sp20); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 150, 150, 200, unk_28); - gSPDisplayList(gMasterGfxPos++, dlist); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 150, 150, 200, unk_28); + gSPDisplayList(gMainGfxPos++, dlist); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } } diff --git a/src/effects/shimmer_burst.c b/src/effects/shimmer_burst.c index 0a74b4df72..f64d318c6d 100644 --- a/src/effects/shimmer_burst.c +++ b/src/effects/shimmer_burst.c @@ -210,20 +210,20 @@ void shimmer_burst_appendGfx(void* effect) { Matrix4f sp60; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guTranslateF(sp20, part->unk_04, part->unk_08, part->unk_0C); shim_guScaleF(sp60, part->unk_60, part->unk_60, part->unk_60); shim_guMtxCatF(sp60, sp20, sp20); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetEnvColor(gMasterGfxPos++, part->unk_40, part->unk_44, part->unk_48, part->unk_5C); - gSPDisplayList(gMasterGfxPos++, D_09000F20_338EE0); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gDPSetEnvColor(gMainGfxPos++, part->unk_40, part->unk_44, part->unk_48, part->unk_5C); + gSPDisplayList(gMainGfxPos++, D_09000F20_338EE0); - savedGfxPos = gMasterGfxPos; - gMasterGfxPos++; + savedGfxPos = gMainGfxPos; + gMainGfxPos++; part++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, part++) { @@ -231,29 +231,29 @@ void shimmer_burst_appendGfx(void* effect) { shim_guPositionF(sp20, 0.0f, 0.0f, part->unk_34, part->unk_60 * temp_f20, part->unk_04, part->unk_08, part->unk_0C); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, unk_50, unk_54, unk_58, part->unk_4C * temp_f20); - gSPDisplayList(gMasterGfxPos++, D_E0070CD0[i & 7]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, unk_50, unk_54, unk_58, part->unk_4C * temp_f20); + gSPDisplayList(gMainGfxPos++, D_E0070CD0[i & 7]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } - gSPEndDisplayList(gMasterGfxPos++); - gSPBranchList(savedGfxPos, gMasterGfxPos); - gSPDisplayList(gMasterGfxPos++, savedGfxPos + 1); + gSPEndDisplayList(gMainGfxPos++); + gSPBranchList(savedGfxPos, gMainGfxPos); + gSPDisplayList(gMainGfxPos++, savedGfxPos + 1); shim_guRotateF(sp20, 120.0f, 0.4f, 0.0f, 0.8f); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, savedGfxPos + 1); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, savedGfxPos + 1); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); shim_guRotateF(sp20, -120.0f, 0.4f, 0.0f, 0.8f); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, savedGfxPos + 1); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, savedGfxPos + 1); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/shimmer_wave.c b/src/effects/shimmer_wave.c index 468f79af8c..51f0b1c09a 100644 --- a/src/effects/shimmer_wave.c +++ b/src/effects/shimmer_wave.c @@ -195,20 +195,20 @@ void shimmer_wave_appendGfx(void* effect) { Matrix4f sp60; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guTranslateF(sp20, part->unk_04, part->unk_08, part->unk_0C); shim_guScaleF(sp60, part->unk_60, part->unk_60, part->unk_60); shim_guMtxCatF(sp60, sp20, sp20); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetEnvColor(gMasterGfxPos++, part->unk_40, part->unk_44, part->unk_48, part->unk_5C); - gSPDisplayList(gMasterGfxPos++, D_09000F20_338EE0); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gDPSetEnvColor(gMainGfxPos++, part->unk_40, part->unk_44, part->unk_48, part->unk_5C); + gSPDisplayList(gMainGfxPos++, D_09000F20_338EE0); - savedGfxPos = gMasterGfxPos; - gMasterGfxPos++; + savedGfxPos = gMainGfxPos; + gMainGfxPos++; part++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, part++) { @@ -216,29 +216,29 @@ void shimmer_wave_appendGfx(void* effect) { shim_guPositionF(sp20, 0.0f, 0.0f, part->unk_34, part->unk_60 * temp_4C, part->unk_04, part->unk_08, part->unk_0C); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, unk_50, unk_54, unk_58, part->unk_4C * temp_4C); - gSPDisplayList(gMasterGfxPos++, D_E0074B60[i & 7]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, unk_50, unk_54, unk_58, part->unk_4C * temp_4C); + gSPDisplayList(gMainGfxPos++, D_E0074B60[i & 7]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } - gSPEndDisplayList(gMasterGfxPos++); - gSPBranchList(savedGfxPos, gMasterGfxPos); - gSPDisplayList(gMasterGfxPos++, savedGfxPos + 1); + gSPEndDisplayList(gMainGfxPos++); + gSPBranchList(savedGfxPos, gMainGfxPos); + gSPDisplayList(gMainGfxPos++, savedGfxPos + 1); shim_guRotateF(sp20, 120.0f, 0.0f, 1.0f, 0.0f); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, savedGfxPos + 1); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, savedGfxPos + 1); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); shim_guRotateF(sp20, -120.0f, 0.0f, 1.0f, 0.0f); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, savedGfxPos + 1); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, savedGfxPos + 1); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/shiny_flare.c b/src/effects/shiny_flare.c index 81ea707183..6a8a5692b8 100644 --- a/src/effects/shiny_flare.c +++ b/src/effects/shiny_flare.c @@ -106,26 +106,26 @@ void shiny_flare_appendGfx(void* effect) { Matrix4f sp10; Matrix4f sp50; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guTranslateF(sp10, data->pos.x, data->pos.y, data->pos.z); shim_guScaleF(sp50, scale, scale, scale); shim_guMtxCatF(sp50, sp10, sp10); shim_guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(gMasterGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_09000240_3D79B0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, data->unk_18, data->unk_1C, data->unk_20, unk_24); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_09000240_3D79B0); + gDPSetPrimColor(gMainGfxPos++, 0, 0, data->unk_18, data->unk_1C, data->unk_20, unk_24); idx = data->lifeTime * 3; - gDPSetPrimColor(gMasterGfxPos++, 0, 0, + gDPSetPrimColor(gMainGfxPos++, 0, 0, D_E00DA500[idx % ARRAY_COUNT(D_E00DA500) ], D_E00DA500[idx % ARRAY_COUNT(D_E00DA500) + 1], D_E00DA500[idx % ARRAY_COUNT(D_E00DA500) + 2], unk_24); - gSPDisplayList(gMasterGfxPos++, D_090002E0_3D7A50); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_090002E0_3D7A50); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/shockwave.c b/src/effects/shockwave.c index de62e177e9..e80a9a9878 100644 --- a/src/effects/shockwave.c +++ b/src/effects/shockwave.c @@ -305,21 +305,21 @@ void shockwave_appendGfx(void* effect) { envB2 = envB >> 2; } - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, dlist2); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gSPDisplayList(gMainGfxPos++, dlist2); shim_guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, data->pos.x, data->pos.y, data->pos.z); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); primA = data->alpha; - savedGfxPos = gMasterGfxPos; - gMasterGfxPos++; - savedGfxPos2 = gMasterGfxPos; + savedGfxPos = gMainGfxPos; + gMainGfxPos++; + savedGfxPos2 = gMainGfxPos; data++; for (i = 1; i < ((EffectInstance*) effect)->numParts; i++, data++) { @@ -333,28 +333,28 @@ void shockwave_appendGfx(void* effect) { shim_guMtxCatF(sp60, sp20, sp20); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, 0, (s32) data->unk_3C, 0x00FC, (s32) data->unk_3C + 0x7C); - gDPSetTileSize(gMasterGfxPos++, 1, 0, (s32) data->unk_44, 0x007C, (s32) data->unk_44 + 0x7C); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, 0, (s32) data->unk_3C, 0x00FC, (s32) data->unk_3C + 0x7C); + gDPSetTileSize(gMainGfxPos++, 1, 0, (s32) data->unk_44, 0x007C, (s32) data->unk_44 + 0x7C); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, dlist); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, dlist); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } - gSPEndDisplayList(gMasterGfxPos++); - gSPBranchList(savedGfxPos, gMasterGfxPos); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, primR2, primG2, primB2, primA); - gDPSetEnvColor(gMasterGfxPos++, envR2, envG2, envB2, 0); - gSPClearGeometryMode(gMasterGfxPos++, G_CULL_BOTH); - gSPSetGeometryMode(gMasterGfxPos++, G_CULL_FRONT); - gSPDisplayList(gMasterGfxPos++, savedGfxPos2); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, primR, primG, primB, primA); - gDPSetEnvColor(gMasterGfxPos++, envR, envG, envB, 0); - gSPClearGeometryMode(gMasterGfxPos++, G_CULL_BOTH); - gSPSetGeometryMode(gMasterGfxPos++, G_CULL_BACK); - gSPDisplayList(gMasterGfxPos++, savedGfxPos2); - gDPSetColorDither(gMasterGfxPos++, G_CD_DISABLE); - gDPSetAlphaDither(gMasterGfxPos++, G_AD_DISABLE); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPEndDisplayList(gMainGfxPos++); + gSPBranchList(savedGfxPos, gMainGfxPos); + gDPSetPrimColor(gMainGfxPos++, 0, 0, primR2, primG2, primB2, primA); + gDPSetEnvColor(gMainGfxPos++, envR2, envG2, envB2, 0); + gSPClearGeometryMode(gMainGfxPos++, G_CULL_BOTH); + gSPSetGeometryMode(gMainGfxPos++, G_CULL_FRONT); + gSPDisplayList(gMainGfxPos++, savedGfxPos2); + gDPSetPrimColor(gMainGfxPos++, 0, 0, primR, primG, primB, primA); + gDPSetEnvColor(gMainGfxPos++, envR, envG, envB, 0); + gSPClearGeometryMode(gMainGfxPos++, G_CULL_BOTH); + gSPSetGeometryMode(gMainGfxPos++, G_CULL_BACK); + gSPDisplayList(gMainGfxPos++, savedGfxPos2); + gDPSetColorDither(gMainGfxPos++, G_CD_DISABLE); + gDPSetAlphaDither(gMainGfxPos++, G_AD_DISABLE); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/sleep_bubble.c b/src/effects/sleep_bubble.c index 20078ddad5..435ca65bb1 100644 --- a/src/effects/sleep_bubble.c +++ b/src/effects/sleep_bubble.c @@ -130,62 +130,62 @@ void sleep_bubble_appendGfx(void* effect) { s32 timeLeft; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); timeLeft = data->timeLeft; if (timeLeft == 0) { - gSPDisplayList(gMasterGfxPos++, D_09000440_35D950); + gSPDisplayList(gMainGfxPos++, D_09000440_35D950); } else if (timeLeft == 1) { - gSPDisplayList(gMasterGfxPos++, D_09000390_35D8A0); + gSPDisplayList(gMainGfxPos++, D_09000390_35D8A0); } else { - gSPDisplayList(gMasterGfxPos++, D_090002E0_35D7F0); + gSPDisplayList(gMainGfxPos++, D_090002E0_35D7F0); } shim_guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPVertex(gMasterGfxPos++, &D_09000180_35D690[1], 1, 0); + gSPVertex(gMainGfxPos++, &D_09000180_35D690[1], 1, 0); shim_guRotateF(sp18, data->unk_10, 0.0f, 0.0f, 1.0f); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); shim_guRotateF(sp18, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); shim_guTranslateF(sp58, data->unk_C4, data->unk_C8, 0.0f); shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPVertex(gMasterGfxPos++, &D_09000180_35D690[0], 1, 1); + gSPVertex(gMainGfxPos++, &D_09000180_35D690[0], 1, 1); for (i = 0; i < ARRAY_COUNT(data->points); i++) { shim_guTranslateF(sp18, data->points[i].x, data->points[i].y, 0.0f); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPVertex(gMasterGfxPos++, &D_09000180_35D690[i + 2], 1, i + 2); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPVertex(gMainGfxPos++, &D_09000180_35D690[i + 2], 1, i + 2); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); if (timeLeft < 100) { - gSP1Triangle(gMasterGfxPos++, 21, 2, 1, 0); + gSP1Triangle(gMainGfxPos++, 21, 2, 1, 0); for (i = 0; i < ARRAY_COUNT(data->points) - 1; i++) { - gSP1Triangle(gMasterGfxPos++, i + 2, i + 3, 1, 0); + gSP1Triangle(gMainGfxPos++, i + 2, i + 3, 1, 0); } } else { - gSP1Triangle(gMasterGfxPos++, 0, 1, 2, 0); - gSP1Triangle(gMasterGfxPos++, 0, 21, 1, 0); + gSP1Triangle(gMainGfxPos++, 0, 1, 2, 0); + gSP1Triangle(gMainGfxPos++, 0, 21, 1, 0); for (i = 0; i < ARRAY_COUNT(data->points) - 1; i++) { - gSP1Triangle(gMasterGfxPos++, i + 2, i + 3, 1, 0); + gSP1Triangle(gMainGfxPos++, i + 2, i + 3, 1, 0); } } } diff --git a/src/effects/small_gold_sparkle.c b/src/effects/small_gold_sparkle.c index 0607162fee..e79be843a4 100644 --- a/src/effects/small_gold_sparkle.c +++ b/src/effects/small_gold_sparkle.c @@ -120,14 +120,14 @@ void small_gold_sparkle_appendGfx(void* effect) { shim_guRotateF(sp98, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); shim_guMtxF2L(sp98, &gDisplayContext->matrixStack[gMatrixListPos]); spD8 = &gDisplayContext->matrixStack[gMatrixListPos++]; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guTranslateF(sp18, part->unk_08, part->unk_0C, part->unk_10); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_090002C0_392700); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 255, 15, 255); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_090002C0_392700); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 15, 255); part++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, part++) { @@ -140,15 +140,15 @@ void small_gold_sparkle_appendGfx(void* effect) { shim_guMtxCatF(sp58, sp18, sp18); } shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPMatrix(gMasterGfxPos++, spD8, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, sDlists[part->unk_04 >> 1]); - gSPDisplayList(gMasterGfxPos++, D_09000470_3928B0); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, spD8, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, sDlists[part->unk_04 >> 1]); + gSPDisplayList(gMainGfxPos++, D_09000470_3928B0); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPPipeSync(gMasterGfxPos++); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/smoke_burst.c b/src/effects/smoke_burst.c index 4358e23325..943f51c784 100644 --- a/src/effects/smoke_burst.c +++ b/src/effects/smoke_burst.c @@ -109,36 +109,36 @@ void smoke_burst_appendGfx(void* effect) { Matrix4f sp20; Matrix4f sp60; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, dlist2); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gSPDisplayList(gMainGfxPos++, dlist2); shim_guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, data->unk_10, data->pos.x, data->pos.y, data->pos.z); shim_guRotateF(sp60, 20.0f, 0.0f, 0.0f, 1.0f); shim_guMtxCatF(sp60, sp20, sp20); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, data->rgba.r, data->rgba.g, data->rgba.b, data->rgba.a); - gDPSetEnvColor(gMasterGfxPos++, 0, 0, 0, envAlpha); - gDPSetAlphaCompare(gMasterGfxPos++, G_AC_DITHER); - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, data->rgba.r, data->rgba.g, data->rgba.b, data->rgba.a); + gDPSetEnvColor(gMainGfxPos++, 0, 0, 0, envAlpha); + gDPSetAlphaCompare(gMainGfxPos++, G_AC_DITHER); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, (unk_20_s32 * 32 ) * 4, 0, (unk_20_s32 * 32 + 31) * 4, 31 * 4); temp_a1 = unk_20_s32 * 32 + 32; if (cond) { - gDPSetTileSize(gMasterGfxPos++, 1, + gDPSetTileSize(gMainGfxPos++, 1, (temp_a1 ) * 4, 32 * 4, (temp_a1 + 31) * 4, 63 * 4); } else { - gDPSetTileSize(gMasterGfxPos++, 1, + gDPSetTileSize(gMainGfxPos++, 1, (temp_a1 ) * 4, 0, (temp_a1 + 31) * 4, 31 * 4); } - gSPDisplayList(gMasterGfxPos++, dlist); - gDPSetAlphaCompare(gMasterGfxPos++, G_AC_NONE); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, dlist); + gDPSetAlphaCompare(gMainGfxPos++, G_AC_NONE); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/smoke_impact.c b/src/effects/smoke_impact.c index 26568e2c68..03f1814901 100644 --- a/src/effects/smoke_impact.c +++ b/src/effects/smoke_impact.c @@ -130,35 +130,35 @@ void smoke_impact_appendGfx(void* effect) { Matrix4f sp98; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, dlist2); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gSPDisplayList(gMainGfxPos++, dlist2); shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); shim_guMtxCatF(sp58, sp18, sp98); shim_guMtxF2L(sp98, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); if (unk_00 < 2) { - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 230, 222, 222, 130); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 230, 222, 222, 130); } else { - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 40, 10, 160); - gDPSetAlphaCompare(gMasterGfxPos++, G_AC_DITHER); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 40, 10, 160); + gDPSetAlphaCompare(gMainGfxPos++, G_AC_DITHER); } - gDPSetEnvColor(gMasterGfxPos++, 0, 0, 0, envAlpha); - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, + gDPSetEnvColor(gMainGfxPos++, 0, 0, 0, envAlpha); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, (unk_30_s32 * 32 ) * 4, 0, (unk_30_s32 * 32 + 32) * 4, 32 * 4); if (cond) { - gDPSetTileSize(gMasterGfxPos++, 1, + gDPSetTileSize(gMainGfxPos++, 1, (unk_30_s32 * 32 + 32) * 4, 32 * 4, (unk_30_s32 * 32 + 64) * 4, 64 * 4); } else { - gDPSetTileSize(gMasterGfxPos++, 1, + gDPSetTileSize(gMainGfxPos++, 1, (unk_30_s32 * 32 + 32) * 4, 0, (unk_30_s32 * 32 + 64) * 4, 32 * 4); } @@ -168,16 +168,16 @@ void smoke_impact_appendGfx(void* effect) { shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, dlist); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, dlist); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); if (unk_00 == 2) { - gDPSetAlphaCompare(gMasterGfxPos++, G_AC_NONE); + gDPSetAlphaCompare(gMainGfxPos++, G_AC_NONE); } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/smoke_ring.c b/src/effects/smoke_ring.c index 082cb17c48..1431e20499 100644 --- a/src/effects/smoke_ring.c +++ b/src/effects/smoke_ring.c @@ -136,30 +136,30 @@ void smoke_ring_appendGfx(void* effect) { dlist = D_09002B40_32B9E0; } - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, D_09002950_32B7F0); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gSPDisplayList(gMainGfxPos++, D_09002950_32B7F0); shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); shim_guMtxCatF(sp58, sp18, sp98); shim_guMtxF2L(sp98, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 238, 220, 215, 160); - gDPSetEnvColor(gMasterGfxPos++, 0, 0, 0, envAlpha); - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 238, 220, 215, 160); + gDPSetEnvColor(gMainGfxPos++, 0, 0, 0, envAlpha); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, (temp_s5 * 32 ) * 4, 0, (temp_s5 * 32 + 0x1F) * 4, 31 * 4); temp_a3 = temp_s5 * 32 + 32; if (spD8 != 0) { - gDPSetTileSize(gMasterGfxPos++, 1, + gDPSetTileSize(gMainGfxPos++, 1, (temp_a3 ) * 4, 32 * 4, (temp_a3 + 31) * 4, 63 * 4); } else { - gDPSetTileSize(gMasterGfxPos++, 1, + gDPSetTileSize(gMainGfxPos++, 1, (temp_a3 ) * 4, 0, (temp_a3 + 31) * 4, 31 * 4); } @@ -169,11 +169,11 @@ void smoke_ring_appendGfx(void* effect) { shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, dlist); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, dlist); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPPipeSync(gMasterGfxPos++); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/snaking_static.c b/src/effects/snaking_static.c index 0c452632e0..3989cc0ba0 100644 --- a/src/effects/snaking_static.c +++ b/src/effects/snaking_static.c @@ -170,23 +170,23 @@ void snaking_static_appendGfx(void* effect) { s32 primB = data->unk_20; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); shim_guScaleF(sp58, data->unk_38, data->unk_38, data->unk_38); shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(gMasterGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetEnvColor(gMasterGfxPos++, data->unk_28, data->unk_2C, data->unk_30, 0); - gSPDisplayList(gMasterGfxPos++, D_09001000_3B3D90); + gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetEnvColor(gMainGfxPos++, data->unk_28, data->unk_2C, data->unk_30, 0); + gSPDisplayList(gMainGfxPos++, D_09001000_3B3D90); data++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, data++) { - gDPSetPrimColor(gMasterGfxPos++, 0, 0, primR, primG, primB, (data->unk_24 * unk_24) / 255); + gDPSetPrimColor(gMainGfxPos++, 0, 0, primR, primG, primB, (data->unk_24 * unk_24) / 255); shim_guTranslateF(sp18, data->pos.x, data->pos.y, 0.0f); shim_guRotateF(sp58, data->unk_3C, 0.0f, 0.0f, 1.0f); shim_guMtxCatF(sp58, sp18, sp18); @@ -194,14 +194,14 @@ void snaking_static_appendGfx(void* effect) { shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, data->unk_40 * 64, 0, (data->unk_40 * 64) | 0x3C, 0x007C); - gDPSetTileSize(gMasterGfxPos++, 1, (lifeTime * 12), 0, ((lifeTime * 3) + 0x1F) * 4, 0x007C); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, data->unk_40 * 64, 0, (data->unk_40 * 64) | 0x3C, 0x007C); + gDPSetTileSize(gMainGfxPos++, 1, (lifeTime * 12), 0, ((lifeTime * 3) + 0x1F) * 4, 0x007C); - gSPDisplayList(gMasterGfxPos++, D_090010F8_3B3E88); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_090010F8_3B3E88); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } - gDPSetAlphaCompare(gMasterGfxPos++, G_AC_NONE); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gDPSetAlphaCompare(gMainGfxPos++, G_AC_NONE); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/snowfall.c b/src/effects/snowfall.c index 2d322ef610..7f0eb5d5ff 100644 --- a/src/effects/snowfall.c +++ b/src/effects/snowfall.c @@ -183,11 +183,11 @@ void snowfall_appendGfx(void* effect) { } if (unk_28 != 0) { - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, D_09000C00_38DC70); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 255, 255, unk_28); + gSPDisplayList(gMainGfxPos++, D_09000C00_38DC70); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 255, unk_28); shim_guRotateF(sp18, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); @@ -200,15 +200,15 @@ void snowfall_appendGfx(void* effect) { shim_guTranslateF(sp18, data->unk_08, data->unk_0C, data->unk_10); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(gMasterGfxPos++, mtx, + gSPMatrix(gMainGfxPos++, mtx, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, dlist); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, dlist); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } } } diff --git a/src/effects/snowflake.c b/src/effects/snowflake.c index c149fa7323..1a821c497b 100644 --- a/src/effects/snowflake.c +++ b/src/effects/snowflake.c @@ -122,25 +122,25 @@ void snowflake_appendGfx(void* effect) { EffectInstance* effectTemp = effect; SnowflakeFXData* data = effectTemp->data.snowflake; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->graphics->data)); - gSPDisplayList(gMasterGfxPos++, D_09000900_331800); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->graphics->data)); + gSPDisplayList(gMainGfxPos++, D_09000900_331800); shim_guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); shim_guRotateF(spD8, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); shim_guMtxCatF(spD8, sp18, sp118); shim_guMtxF2L(sp118, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, 255); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, 255); shim_guRotateF(sp58, data->unk_18, 1.0f, 0.0f, 0.0f); shim_guRotateF(sp98, data->unk_1C, 0.0f, 1.0f, 0.0f); shim_guMtxCatF(sp58, sp98, sp118); shim_guMtxF2L(sp118, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_090009E8_3318E8); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_090009E8_3318E8); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/snowman_doll.c b/src/effects/snowman_doll.c index 8b651e8a7d..7b0caab8ba 100644 --- a/src/effects/snowman_doll.c +++ b/src/effects/snowman_doll.c @@ -292,15 +292,15 @@ void snowman_doll_appendGfx(void* effect) { Matrix4f sp18; Matrix4f sp58; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guTranslateF(sp18, data->unk_04, data->unk_08, data->unk_0C); shim_guScaleF(sp58, data->unk_28, data->unk_28, data->unk_28); shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); shim_guTranslateF(sp18, data->unk_30, data->unk_34, data->unk_38); shim_guScaleF(sp58, data->unk_48, data->unk_4C, data->unk_48); @@ -309,10 +309,10 @@ void snowman_doll_appendGfx(void* effect) { shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, data->unk_18, data->unk_1C, data->unk_20, unk_24); - gSPDisplayList(gMasterGfxPos++, D_090037A8_3C1148); - gSPDisplayList(gMasterGfxPos++, D_09003818_3C11B8); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, data->unk_18, data->unk_1C, data->unk_20, unk_24); + gSPDisplayList(gMainGfxPos++, D_090037A8_3C1148); + gSPDisplayList(gMainGfxPos++, D_09003818_3C11B8); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/something_rotating.c b/src/effects/something_rotating.c index 2a691217a8..5fb6ddee01 100644 --- a/src/effects/something_rotating.c +++ b/src/effects/something_rotating.c @@ -274,7 +274,7 @@ void func_E01166E8(s32 arg0, SomethingRotatingFXData* part) { shim_guMtxCatF(sp60, sp20, sp20); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); } @@ -284,36 +284,36 @@ void something_rotating_appendGfx(void* effect) { s32 l, t; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, D_090042E0_3FE790); - gDPSetEnvColor(gMasterGfxPos++, 0, 0, 0, 255); + gSPDisplayList(gMainGfxPos++, D_090042E0_3FE790); + gDPSetEnvColor(gMainGfxPos++, 0, 0, 0, 255); data++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, data++) { if (data->state != 5) { func_E01166E8(1, data); if (data->primAlpha != 255) { - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, data->primAlpha); - gDPSetEnvColor(gMasterGfxPos++, data->env.r, data->env.g, data->env.b, 0x78); - gSPDisplayList(gMasterGfxPos++, D_E0116C6C[0]); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, data->primAlpha); + gDPSetEnvColor(gMainGfxPos++, data->env.r, data->env.g, data->env.b, 0x78); + gSPDisplayList(gMainGfxPos++, D_E0116C6C[0]); l = ((unk_14 * 4.0f) * 100.0f) * (1.0 / 1024); t = ((unk_14 * 4.0f) * 40.0f) * (1.0 / 1024); - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, l, t, l + 0xFC, t + 0xFC); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, l, t, l + 0xFC, t + 0xFC); l = ((unk_14 * 4.0f) * 200.0f) * (1.0 / 1024); t = ((unk_14 * 4.0f) * 90.0f) * (1.0 / 1024); - gDPSetTileSize(gMasterGfxPos++, 1, l, t, l + 0xFC, t + 0xFC); - gSPDisplayList(gMasterGfxPos++, D_E0116C64[0]); + gDPSetTileSize(gMainGfxPos++, 1, l, t, l + 0xFC, t + 0xFC); + gSPDisplayList(gMainGfxPos++, D_E0116C64[0]); } else { - gSPDisplayList(gMasterGfxPos++, D_E0116C68[0]); - gDPSetEnvColor(gMasterGfxPos++, data->env.r, data->env.g, data->env.b, data->unk_25); - gSPDisplayList(gMasterGfxPos++, D_E0116C70[i - 1]); - gSPDisplayList(gMasterGfxPos++, D_E0116C60[0]); + gSPDisplayList(gMainGfxPos++, D_E0116C68[0]); + gDPSetEnvColor(gMainGfxPos++, data->env.r, data->env.g, data->env.b, data->unk_25); + gSPDisplayList(gMainGfxPos++, D_E0116C70[i - 1]); + gSPDisplayList(gMainGfxPos++, D_E0116C60[0]); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } } diff --git a/src/effects/sparkles.c b/src/effects/sparkles.c index 7b4b4fb816..bfb454dd63 100644 --- a/src/effects/sparkles.c +++ b/src/effects/sparkles.c @@ -250,9 +250,9 @@ void sparkles_appendGfx(void* effect) { s32 colorIdx; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, D_09000F20_338EE0); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gSPDisplayList(gMainGfxPos++, D_09000F20_338EE0); colorIdx = (part->unk_20 - 1) * 3; @@ -277,12 +277,12 @@ void sparkles_appendGfx(void* effect) { colorIdx %= ARRAY_COUNT(D_E0022CF0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, D_E0022CF0[colorIdx], D_E0022CF0[colorIdx + 1], D_E0022CF0[colorIdx + 2], 255); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_E0022CD0[unk_2C & 7]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, D_E0022CF0[colorIdx], D_E0022CF0[colorIdx + 1], D_E0022CF0[colorIdx + 2], 255); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_E0022CD0[unk_2C & 7]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/spiky_white_aura.c b/src/effects/spiky_white_aura.c index e2b5e7f01b..839e48c7ba 100644 --- a/src/effects/spiky_white_aura.c +++ b/src/effects/spiky_white_aura.c @@ -181,9 +181,9 @@ void spiky_white_aura_appendGfx(void* effect) { Matrix4f sp58; s32 i; - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, D_09000440_34EBB0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 255, 255, part->unk_24); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gSPDisplayList(gMainGfxPos++, D_09000440_34EBB0); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 255, part->unk_24); for (i = 0; i < ((EffectInstance*)effect)->numParts; i++, part++) { shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); @@ -195,9 +195,9 @@ void spiky_white_aura_appendGfx(void* effect) { shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gDPPipeSync(gMasterGfxPos++); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_090004E8_34EC58); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMainGfxPos++); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_090004E8_34EC58); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } diff --git a/src/effects/spirit_card.c b/src/effects/spirit_card.c index 26fed76565..a702a82060 100644 --- a/src/effects/spirit_card.c +++ b/src/effects/spirit_card.c @@ -143,26 +143,26 @@ void func_E0112330(s32 arg0, SpiritCardFXData* data) { shim_guMtxCatF(sp60, sp20, sp20); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); } void spirit_card_appendGfx(void* effect) { SpiritCardFXData* data = ((EffectInstance*)effect)->data.spiritCard; s32 unk_00 = data->unk_00; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, D_090042E0_3FE790); - gDPSetEnvColor(gMasterGfxPos++, 0, 0, 0, 255); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gSPDisplayList(gMainGfxPos++, D_090042E0_3FE790); + gDPSetEnvColor(gMainGfxPos++, 0, 0, 0, 255); if (unk_00 < 2) { func_E0112330(0, data); - gSPDisplayList(gMasterGfxPos++, D_E0112638[0]); - gSPDisplayList(gMasterGfxPos++, D_E0112640[data->chapter]); - gSPDisplayList(gMasterGfxPos++, D_E0112630[0]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_E0112638[0]); + gSPDisplayList(gMainGfxPos++, D_E0112640[data->chapter]); + gSPDisplayList(gMainGfxPos++, D_E0112630[0]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/squirt.c b/src/effects/squirt.c index 252d6e561a..743c156a0d 100644 --- a/src/effects/squirt.c +++ b/src/effects/squirt.c @@ -172,22 +172,22 @@ void squirt_appendGfx(void* effect) { f32 var_f22; f32 theta; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guTranslateF(sp10, 0.0f, 0.0f, 0.0f); shim_guScaleF(sp50, 0.05f, 0.05f, 0.05f); shim_guMtxCatF(sp50, sp10, sp10); shim_guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, data->unk_34, data->unk_38, data->unk_3C, data->unk_40); - gDPSetEnvColor(gMasterGfxPos++, data->unk_44, data->unk_48, data->unk_4C, 200); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, data->unk_34, data->unk_38, data->unk_3C, data->unk_40); + gDPSetEnvColor(gMainGfxPos++, data->unk_44, data->unk_48, data->unk_4C, 200); - gSPBranchList(gMasterGfxPos, &gMasterGfxPos[49]); - savedGfxPos = gMasterGfxPos + 1; + gSPBranchList(gMainGfxPos, &gMainGfxPos[49]); + savedGfxPos = gMainGfxPos + 1; - gMasterGfxPos = &gMasterGfxPos[49]; + gMainGfxPos = &gMainGfxPos[49]; vtx = (Vtx_t*) savedGfxPos; for (i = 0; i < 12; i++) { @@ -244,10 +244,10 @@ void squirt_appendGfx(void* effect) { vtx++; } - gSPVertex(gMasterGfxPos++, savedGfxPos, i * 2, 0); + gSPVertex(gMainGfxPos++, savedGfxPos, i * 2, 0); savedIdx = i; - gSPDisplayList(gMasterGfxPos++, unk_00 == 0 ? D_09000800_3B5B40 : D_090008A8_3B5BE8); + gSPDisplayList(gMainGfxPos++, unk_00 == 0 ? D_09000800_3B5B40 : D_090008A8_3B5BE8); for (i = 0; i < savedIdx - 1; i++) { s32 i2 = i * 2; @@ -255,11 +255,11 @@ void squirt_appendGfx(void* effect) { if (i < zero) { continue; } - gSP2Triangles(gMasterGfxPos++, + gSP2Triangles(gMainGfxPos++, i2, i2 + 2, i2 + 1, i2, i2 + 1, i2 + 2, i2 + 3, i2); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPPipeSync(gMasterGfxPos++); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/star.c b/src/effects/star.c index bdfcaeb438..9bb0b54c63 100644 --- a/src/effects/star.c +++ b/src/effects/star.c @@ -211,26 +211,26 @@ void star_appendGfx(void* effect) { Matrix4f sp60; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, unk_240, data->unk_04, data->unk_08, data->unk_0C); shim_guRotateF(sp60, data->unk_24, 0.0f, 0.0f, 1.0f); shim_guMtxCatF(sp60, sp20, sp20); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 80, unk_244, unk_248, unk_24C, 255); - gDPSetEnvColor(gMasterGfxPos++, 127, 127, 127, 127); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 80, unk_244, unk_248, unk_24C, 255); + gDPSetEnvColor(gMainGfxPos++, 127, 127, 127, 127); - gSPDisplayList(gMasterGfxPos++, (data->unk_38 >= 2) ? D_09001650_333CF0 : D_09001530_333BD0); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPPipeSync(gMasterGfxPos++); + gSPDisplayList(gMainGfxPos++, (data->unk_38 >= 2) ? D_09001650_333CF0 : D_09001530_333BD0); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMainGfxPos++); if (unk_38 == 3) { - gSPDisplayList(gMasterGfxPos++, D_090017D0_333E70); + gSPDisplayList(gMainGfxPos++, D_090017D0_333E70); } else { - gSPDisplayList(gMasterGfxPos++, D_09001780_333E20); + gSPDisplayList(gMainGfxPos++, D_09001780_333E20); } data->unk_3C++; @@ -250,18 +250,18 @@ void star_appendGfx(void* effect) { idx = (baseIdx - i + 8) % 8; gDisplayContext->matrixStack[gMatrixListPos] = data->unk_40[idx]; - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPVertex(gMasterGfxPos++, &D_09001400_333AA0[i * 2], 2, i * 2); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPVertex(gMainGfxPos++, &D_09001400_333AA0[i * 2], 2, i * 2); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } for (i = 0; i < 4; i++) { s32 i2 = i * 2; - gSP2Triangles(gMasterGfxPos++, + gSP2Triangles(gMainGfxPos++, i2 , i2 + 1, i2 + 2, i2, i2 + 1, i2 + 3, i2 + 2, i2 + 1); } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } } diff --git a/src/effects/star_outline.c b/src/effects/star_outline.c index 3bec6feb77..1706631d96 100644 --- a/src/effects/star_outline.c +++ b/src/effects/star_outline.c @@ -206,9 +206,9 @@ void star_outline_appendGfx(void* effect) { unk_34 = 0; } - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, D_E0126BC8[0]); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gSPDisplayList(gMainGfxPos++, D_E0126BC8[0]); if (unk_34 != 0) { shim_guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, (f32) ((f64) data->unk_54 * 0.4), data->pos.x, data->pos.y, data->pos.z); @@ -216,18 +216,18 @@ void star_outline_appendGfx(void* effect) { shim_guMtxCatF(sp60, sp20, sp20); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (data->unk_00 == 0) { - gDPSetRenderMode(gMasterGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); + gDPSetRenderMode(gMainGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); } else { - gDPSetRenderMode(gMasterGfxPos++, G_RM_ZB_CLD_SURF, G_RM_ZB_CLD_SURF2); + gDPSetRenderMode(gMainGfxPos++, G_RM_ZB_CLD_SURF, G_RM_ZB_CLD_SURF2); } - gDPSetPrimColor(gMasterGfxPos++, 0, 0, unk_18, unk_1C, unk_20, unk_34 >> 1); - gDPSetEnvColor(gMasterGfxPos++, unk_28, unk_2C, unk_30, unk_34 >> 1); - gSPDisplayList(gMasterGfxPos++, D_E0126BC4[0]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, unk_18, unk_1C, unk_20, unk_34 >> 1); + gDPSetEnvColor(gMainGfxPos++, unk_28, unk_2C, unk_30, unk_34 >> 1); + gSPDisplayList(gMainGfxPos++, D_E0126BC4[0]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } shim_guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, data->unk_38 * 0.4, data->pos.x, data->pos.y, data->pos.z); @@ -235,25 +235,25 @@ void star_outline_appendGfx(void* effect) { shim_guMtxCatF(sp60, sp20, sp20); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (unk_34 != 0) { if (data->unk_00 == 0) { - gDPSetRenderMode(gMasterGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); + gDPSetRenderMode(gMainGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); } else { - gDPSetRenderMode(gMasterGfxPos++, G_RM_ZB_CLD_SURF, G_RM_ZB_CLD_SURF2); + gDPSetRenderMode(gMainGfxPos++, G_RM_ZB_CLD_SURF, G_RM_ZB_CLD_SURF2); } - gSPDisplayList(gMasterGfxPos++, D_E0126BC4[0]); + gSPDisplayList(gMainGfxPos++, D_E0126BC4[0]); } if (data->unk_00 == 0) { - gDPSetRenderMode(gMasterGfxPos++, G_RM_AA_XLU_SURF, G_RM_AA_XLU_SURF2); + gDPSetRenderMode(gMainGfxPos++, G_RM_AA_XLU_SURF, G_RM_AA_XLU_SURF2); } else { - gDPSetRenderMode(gMasterGfxPos++, G_RM_AA_ZB_XLU_SURF, G_RM_AA_ZB_XLU_SURF2); + gDPSetRenderMode(gMainGfxPos++, G_RM_AA_ZB_XLU_SURF, G_RM_AA_ZB_XLU_SURF2); } - gDPSetPrimColor(gMasterGfxPos++, 0, 0, unk_18, unk_1C, unk_20, unk_24); - gDPSetEnvColor(gMasterGfxPos++, unk_28, unk_2C, unk_30, unk_24); - gSPDisplayList(gMasterGfxPos++, D_E0126BC0[0]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, unk_18, unk_1C, unk_20, unk_24); + gDPSetEnvColor(gMainGfxPos++, unk_28, unk_2C, unk_30, unk_24); + gSPDisplayList(gMainGfxPos++, D_E0126BC0[0]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/star_spirits_energy.c b/src/effects/star_spirits_energy.c index c1fa2ae2ae..1be72b312e 100644 --- a/src/effects/star_spirits_energy.c +++ b/src/effects/star_spirits_energy.c @@ -342,17 +342,17 @@ void star_spirits_energy_appendGfx(void* effect) { Matrix4f sp20; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, data->unk_3C, data->unk_08, data->unk_0C, data->unk_10); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_E0122BA4[0]); - gDPSetEnvColor(gMasterGfxPos++, data->unk_2C, data->unk_30, data->unk_34, data->unk_38); + gSPDisplayList(gMainGfxPos++, D_E0122BA4[0]); + gDPSetEnvColor(gMainGfxPos++, data->unk_2C, data->unk_30, data->unk_34, data->unk_38); for (i = 0; i < 4; i++) { if (unk_04 != 1 || i != 2) { @@ -360,16 +360,16 @@ void star_spirits_energy_appendGfx(void* effect) { shim_guPositionF(sp20, 0.0f, 0.0f, 0.0f, data->unk_40[i], 0.0f, 0.0f, 0.0f); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, data->unk_1C, data->unk_20, data->unk_24, data->unk_50[i]); - gSPDisplayList(gMasterGfxPos++, D_E0122B90[i]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, data->unk_1C, data->unk_20, data->unk_24, data->unk_50[i]); + gSPDisplayList(gMainGfxPos++, D_E0122B90[i]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); if (unk_04 == 2 || unk_04 == 3) { alpha = 0; @@ -383,10 +383,10 @@ void star_spirits_energy_appendGfx(void* effect) { } if (alpha > 0) { - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 208, 208, 208, alpha); - gSPDisplayList(gMasterGfxPos++, D_E0122BA0[0]); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 208, 208, 208, alpha); + gSPDisplayList(gMainGfxPos++, D_E0122BA0[0]); } } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/stars_burst.c b/src/effects/stars_burst.c index abfacd068e..056a9b4774 100644 --- a/src/effects/stars_burst.c +++ b/src/effects/stars_burst.c @@ -137,9 +137,9 @@ void stars_burst_appendGfx(void* effect) { s32 baseIdx; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, D_090004C0_343500); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gSPDisplayList(gMainGfxPos++, D_090004C0_343500); unk_2C = part->unk_2C; @@ -152,7 +152,7 @@ void stars_burst_appendGfx(void* effect) { s32 gIdx = baseIdx + 1 + i * 3; s32 bIdx = baseIdx + 2 + i * 3; - gDPSetPrimColor(gMasterGfxPos++, 0, 0, D_E0042780[rIdx % 36], D_E0042780[gIdx % 36], D_E0042780[bIdx % 36], unk_2C); + gDPSetPrimColor(gMainGfxPos++, 0, 0, D_E0042780[rIdx % 36], D_E0042780[gIdx % 36], D_E0042780[bIdx % 36], unk_2C); shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); @@ -161,8 +161,8 @@ void stars_burst_appendGfx(void* effect) { shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, dlist); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, dlist); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } diff --git a/src/effects/stars_orbiting.c b/src/effects/stars_orbiting.c index 5bceb691c9..bcfafd3c97 100644 --- a/src/effects/stars_orbiting.c +++ b/src/effects/stars_orbiting.c @@ -112,17 +112,17 @@ void func_E005E334(EffectInstance* effect) { Gfx* dlist = D_E005E670[0]; Gfx* dlist2 = D_E005E674[0]; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, dlist2); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gSPDisplayList(gMainGfxPos++, dlist2); shim_guTranslateF(sp18, part->pos.x, part->pos.y, part->pos.z); shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); shim_guMtxCatF(sp58, sp18, sp98); shim_guMtxF2L(sp98, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 220, 220, 40, 255); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 220, 220, 40, 255); part++; for (i = 1; i < effect->numParts; i++, part++) { @@ -131,11 +131,11 @@ void func_E005E334(EffectInstance* effect) { shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, dlist); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, dlist); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } diff --git a/src/effects/stars_shimmer.c b/src/effects/stars_shimmer.c index 254723441c..0fa60fbb72 100644 --- a/src/effects/stars_shimmer.c +++ b/src/effects/stars_shimmer.c @@ -291,9 +291,9 @@ void stars_shimmer_appendGfx(void* effect) { type = data->state; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, D_09000F20_338EE0); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gSPDisplayList(gMainGfxPos++, D_09000F20_338EE0); temp_s4 = (data->lifeTime - 1) * 3; shim_guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); @@ -315,7 +315,7 @@ void stars_shimmer_appendGfx(void* effect) { gf = 0.8f; bf = 0.7f; if (data->unk_00 != 0) { - gDPSetRenderMode(gMasterGfxPos++, G_RM_ZB_CLD_SURF, G_RM_ZB_CLD_SURF2); + gDPSetRenderMode(gMainGfxPos++, G_RM_ZB_CLD_SURF, G_RM_ZB_CLD_SURF2); } break; case 5: @@ -353,12 +353,12 @@ void stars_shimmer_appendGfx(void* effect) { if (b > 255) { b = 255; } - gDPSetPrimColor(gMasterGfxPos++, 0, 0, r, g, b, 255); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gDPSetPrimColor(gMainGfxPos++, 0, 0, r, g, b, 255); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_E0044DB0[unk_28 & 7]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_E0044DB0[unk_28 & 7]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/stars_spread.c b/src/effects/stars_spread.c index 0b692d01e2..4aecbaff4a 100644 --- a/src/effects/stars_spread.c +++ b/src/effects/stars_spread.c @@ -126,17 +126,17 @@ void stars_spread_appendGfx(void* effect) { Matrix4f sp58; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, D_09000440_360E70); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gSPDisplayList(gMainGfxPos++, D_09000440_360E70); shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 220, 220, 40, 230); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 220, 220, 40, 230); part++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, part++) { @@ -147,10 +147,10 @@ void stars_spread_appendGfx(void* effect) { shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, dlist); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, dlist); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/stat_change.c b/src/effects/stat_change.c index 104882b8cb..a6c68427d2 100644 --- a/src/effects/stat_change.c +++ b/src/effects/stat_change.c @@ -242,20 +242,20 @@ void func_E00AC2A4(EffectInstance* effect) { Matrix4f sp60; if (data->scaleX != 0.0f && data->scaleY != 0.0f) { - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, data->scale, data->pos.x, data->pos.y, data->pos.z); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); if (data->unk_24 == 255) { - gDPSetRenderMode(gMasterGfxPos++, AA_EN | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM), AA_EN | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM)); - gDPSetCombineMode(gMasterGfxPos++, G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA); + gDPSetRenderMode(gMainGfxPos++, AA_EN | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM), AA_EN | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM)); + gDPSetCombineMode(gMainGfxPos++, G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA); } else { - gDPSetRenderMode(gMasterGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); - gDPSetCombineLERP(gMasterGfxPos++, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, TEXEL0, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, TEXEL0, 0); + gDPSetRenderMode(gMainGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); + gDPSetCombineLERP(gMainGfxPos++, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, TEXEL0, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, TEXEL0, 0); } shim_guTranslateF(sp20, 0.0f, data->unk_40, 0.0f); @@ -263,17 +263,17 @@ void func_E00AC2A4(EffectInstance* effect) { shim_guMtxCatF(sp60, sp20, sp20); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_E00AC7B0[arrowType]); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, data->unk_24); - gSPDisplayList(gMasterGfxPos++, D_E00AC7BC[arrowType]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_090028E0_3B1FE0); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_E00AC7B0[arrowType]); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, data->unk_24); + gSPDisplayList(gMainGfxPos++, D_E00AC7BC[arrowType]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_090028E0_3B1FE0); shim_guTranslateF(sp20, 0.0f, data->unk_3C, 0.0f); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); if (arrowValue < 0) { idx = -arrowValue; @@ -281,18 +281,18 @@ void func_E00AC2A4(EffectInstance* effect) { idx = arrowValue; } - gSPDisplayList(gMasterGfxPos++, D_E00AC7C8[idx % 10]); - gSPDisplayList(gMasterGfxPos++, D_090028C0_3B1FC0); + gSPDisplayList(gMainGfxPos++, D_E00AC7C8[idx % 10]); + gSPDisplayList(gMainGfxPos++, D_090028C0_3B1FC0); if (arrowValue >= 0) { - gSPDisplayList(gMasterGfxPos++, D_E00AC7C8[11]); + gSPDisplayList(gMainGfxPos++, D_E00AC7C8[11]); } else { - gSPDisplayList(gMasterGfxPos++, D_E00AC7C8[10]); + gSPDisplayList(gMainGfxPos++, D_E00AC7C8[10]); } - gSPDisplayList(gMasterGfxPos++, D_090028A0_3B1FA0); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPPipeSync(gMasterGfxPos++); + gSPDisplayList(gMainGfxPos++, D_090028A0_3B1FA0); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMainGfxPos++); } } diff --git a/src/effects/static_status.c b/src/effects/static_status.c index 9ec1244a94..cfde0512c7 100644 --- a/src/effects/static_status.c +++ b/src/effects/static_status.c @@ -197,17 +197,17 @@ void static_status_appendGfx(void* effect) { Matrix4f sp60; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guTranslateF(sp20, part->unk_04, part->unk_08, part->unk_0C); shim_guScaleF(sp60, part->unk_34, part->unk_34, part->unk_34); shim_guMtxCatF(sp60, sp20, sp20); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(gMasterGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_E00E6888[unk_00]); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_E00E6888[unk_00]); part++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, part++) { @@ -215,12 +215,12 @@ void static_status_appendGfx(void* effect) { shim_guPositionF(sp20, 0.0f, 0.0f, part->unk_24, part->unk_34, part->unk_04, part->unk_08, 0.0f); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, (unk_30 * part->unk_30) >> 8); - gSPDisplayList(gMasterGfxPos++, D_E00E6880[unk_00]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, (unk_30 * part->unk_30) >> 8); + gSPDisplayList(gMainGfxPos++, D_E00E6880[unk_00]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/steam_burst.c b/src/effects/steam_burst.c index 440e1fd2ac..ae34694792 100644 --- a/src/effects/steam_burst.c +++ b/src/effects/steam_burst.c @@ -119,28 +119,28 @@ void steam_burst_appendGfx(void* effect) { Matrix4f sp98; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, dlist2); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gSPDisplayList(gMainGfxPos++, dlist2); shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); shim_guMtxCatF(sp58, sp18, sp98); shim_guMtxF2L(sp98, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 230, 222, 222, 130); - gDPSetEnvColor(gMasterGfxPos++, 0, 0, 0, envAlpha); - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 230, 222, 222, 130); + gDPSetEnvColor(gMainGfxPos++, 0, 0, 0, envAlpha); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, (unk_30_s32 * 32 ) * 4, 0, (unk_30_s32 * 32 + 32) * 4, 32 * 4); if (cond) { - gDPSetTileSize(gMasterGfxPos++, 1, + gDPSetTileSize(gMainGfxPos++, 1, (unk_30_s32 * 32 + 32) * 4, 32 * 4, (unk_30_s32 * 32 + 64) * 4, 64 * 4); } else { - gDPSetTileSize(gMasterGfxPos++, 1, + gDPSetTileSize(gMainGfxPos++, 1, (unk_30_s32 * 32 + 32) * 4, 0, (unk_30_s32 * 32 + 64) * 4, 32 * 4); } @@ -150,10 +150,10 @@ void steam_burst_appendGfx(void* effect) { shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, dlist); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, dlist); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/stop_watch.c b/src/effects/stop_watch.c index 5421e6b3e6..8b64dc4a56 100644 --- a/src/effects/stop_watch.c +++ b/src/effects/stop_watch.c @@ -188,22 +188,22 @@ void stop_watch_appendGfx(void* effect) { Matrix4f sp60; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guTranslateF(sp20, data->unk_04, data->unk_08, data->unk_0C); shim_guScaleF(sp60, data->unk_28, data->unk_28, data->unk_28); shim_guMtxCatF(sp60, sp20, sp20); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(gMasterGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_09001000_3CC890); - gDPSetEnvColor(gMasterGfxPos++, 0, 0, 0, data->unk_2C); - gSPBranchList(gMasterGfxPos, &gMasterGfxPos[65]); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_09001000_3CC890); + gDPSetEnvColor(gMainGfxPos++, 0, 0, 0, data->unk_2C); + gSPBranchList(gMainGfxPos, &gMainGfxPos[65]); - vtxBuffer = (Vtx_t*) (gMasterGfxPos + 1); - gMasterGfxPos = &gMasterGfxPos[65]; + vtxBuffer = (Vtx_t*) (gMainGfxPos + 1); + gMainGfxPos = &gMainGfxPos[65]; for (i = 0; i < 16; i++) { Vtx_t* vtx = &vtxBuffer[i * 2]; @@ -226,36 +226,36 @@ void stop_watch_appendGfx(void* effect) { vtx->tc[1] = i * 128; } - gSPBranchList(gMasterGfxPos, &gMasterGfxPos[20]); + gSPBranchList(gMainGfxPos, &gMainGfxPos[20]); - gMasterGfxPos++; - savedGfxPos = gMasterGfxPos; + gMainGfxPos++; + savedGfxPos = gMainGfxPos; shim_guScaleF(sp20, 0.01f, 0.01f, 0.01f); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPVertex(gMasterGfxPos++, vtxBuffer, 32, 0); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPVertex(gMainGfxPos++, vtxBuffer, 32, 0); for (i = 0; i < 15; i++) { s32 i2 = i * 2; - gSP2Triangles(gMasterGfxPos++, + gSP2Triangles(gMainGfxPos++, i2 , i2 + 2, i2 + 1, i2, i2 + 1, i2 + 2, i2 + 3, i2); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gSPEndDisplayList(gMasterGfxPos++); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gSPEndDisplayList(gMainGfxPos++); for (i = 0; i < 10; i++) { shim_guPositionF(sp20, data->unk_AC[i], data->unk_D4[i], data->unk_FC[i], D_E00C49D0[i % 4] * 0.01, data->unk_34[i], data->unk_5C[i], data->unk_84[i]); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, D_E00C49D4[i], D_E00C49E8[i], D_E00C49FC[i], unk_24 * data->unk_124[i] / 255); - gSPDisplayList(gMasterGfxPos++, savedGfxPos); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, D_E00C49D4[i], D_E00C49E8[i], D_E00C49FC[i], unk_24 * data->unk_124[i] / 255); + gSPDisplayList(gMainGfxPos++, savedGfxPos); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/sun.c b/src/effects/sun.c index b8dc7e496d..100317baf3 100644 --- a/src/effects/sun.c +++ b/src/effects/sun.c @@ -160,8 +160,8 @@ void sun_appendGfx(void* argEffect) { fromRight = data->shineFromRight; if (alpha != 0) { - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x9, VIRTUAL_TO_PHYSICAL(effect->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x9, VIRTUAL_TO_PHYSICAL(effect->graphics->data)); if (!fromRight) { shim_guOrthoF(mtx, -1600.0f, 1600.0f, -1200.0f, 1200.0f, -100.0f, 100.0f, 1.0f); @@ -170,25 +170,25 @@ void sun_appendGfx(void* argEffect) { } shim_guMtxF2L(mtx, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); shim_guTranslateF(mtx, 0.0f, 0.0f, 0.0f); shim_guMtxF2L(mtx, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, data->primColor.r, data->primColor.g, data->primColor.b, alpha >> 1); - gDPSetEnvColor(gMasterGfxPos++, data->envColor.r, data->envColor.g, data->envColor.b, data->envColor.a); - gSPDisplayList(gMasterGfxPos++, D_E0120794[0]); + gDPSetPrimColor(gMainGfxPos++, 0, 0, data->primColor.r, data->primColor.g, data->primColor.b, alpha >> 1); + gDPSetEnvColor(gMainGfxPos++, data->envColor.r, data->envColor.g, data->envColor.b, data->envColor.a); + gSPDisplayList(gMainGfxPos++, D_E0120794[0]); for (i = 0; i < ARRAY_COUNT(data->texScrollAmt); i++) { offsetS = data->texScrollAmt[i] * 4.0f; - gDPSetTileSize(gMasterGfxPos++, 1, offsetS + (44 * i), 0, offsetS + (44 * i) + 252, 124); - gSPDisplayList(gMasterGfxPos++, D_E0120780[i]); + gDPSetTileSize(gMainGfxPos++, 1, offsetS + (44 * i), 0, offsetS + (44 * i) + 252, 124); + gSPDisplayList(gMainGfxPos++, D_E0120780[i]); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCameraID], + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCameraID], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } } diff --git a/src/effects/sweat.c b/src/effects/sweat.c index b082c52a39..c3b906e513 100644 --- a/src/effects/sweat.c +++ b/src/effects/sweat.c @@ -86,8 +86,8 @@ void sweat_appendGfx(void* effect) { Matrix4f sp18; Matrix4f sp58; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); @@ -96,13 +96,13 @@ void sweat_appendGfx(void* effect) { shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (data->unk_10 > 0.0f) { - gSPDisplayList(gMasterGfxPos++, data->unk_00 == 0 ? D_09000200_35C750 : D_090002C8_35C818); + gSPDisplayList(gMainGfxPos++, data->unk_00 == 0 ? D_09000200_35C750 : D_090002C8_35C818); } else { - gSPDisplayList(gMasterGfxPos++, data->unk_00 == 0 ? D_09000390_35C8E0 : D_09000460_35C9B0); + gSPDisplayList(gMainGfxPos++, data->unk_00 == 0 ? D_09000390_35C8E0 : D_09000460_35C9B0); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/tattle_window.c b/src/effects/tattle_window.c index 39e4de2e29..952fd2215d 100644 --- a/src/effects/tattle_window.c +++ b/src/effects/tattle_window.c @@ -184,7 +184,7 @@ void func_E00D8288(s32 l, s32 t, s32 r, s32 b) { b = SCREEN_HEIGHT - 1; } - gDPFillRectangle(gMasterGfxPos++, l, t, r, b); + gDPFillRectangle(gMainGfxPos++, l, t, r, b); } void func_E00D8334(TattleWindowFXData* data, s32 left, s32 top, s32 right, s32 bottom) { @@ -194,18 +194,18 @@ void func_E00D8334(TattleWindowFXData* data, s32 left, s32 top, s32 right, s32 b s32 l, t, r, b; if (data->unk_34 > 0 || data->unk_35 > 0) { - gDPPipeSync(gMasterGfxPos++); - gSPTexture(gMasterGfxPos++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF); - gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); - gDPSetTexturePersp(gMasterGfxPos++, G_TP_NONE); - gDPSetTextureDetail(gMasterGfxPos++, G_TD_CLAMP); - gDPSetTextureLOD(gMasterGfxPos++, G_TL_TILE); - gDPSetTextureLUT(gMasterGfxPos++, G_TT_NONE); - gDPSetTextureFilter(gMasterGfxPos++, G_TF_AVERAGE); - gDPSetTextureConvert(gMasterGfxPos++, G_TC_FILT); - gDPSetRenderMode(gMasterGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); - gDPSetCombineMode(gMasterGfxPos++, G_CC_PRIMITIVE, G_CC_PRIMITIVE); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 24, 48, 96, 255); + gDPPipeSync(gMainGfxPos++); + gSPTexture(gMainGfxPos++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF); + gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE); + gDPSetTexturePersp(gMainGfxPos++, G_TP_NONE); + gDPSetTextureDetail(gMainGfxPos++, G_TD_CLAMP); + gDPSetTextureLOD(gMainGfxPos++, G_TL_TILE); + gDPSetTextureLUT(gMainGfxPos++, G_TT_NONE); + gDPSetTextureFilter(gMainGfxPos++, G_TF_AVERAGE); + gDPSetTextureConvert(gMainGfxPos++, G_TC_FILT); + gDPSetRenderMode(gMainGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); + gDPSetCombineMode(gMainGfxPos++, G_CC_PRIMITIVE, G_CC_PRIMITIVE); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 24, 48, 96, 255); l = left + 4; r = (left + right) - 4; t = top + 4; @@ -223,8 +223,8 @@ void func_E00D8630(EffectInstance* effect) { TattleWindowFXData* data = effect->data.tattleWindow; s32 flags; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); if (data->scale == 1.0f && data->rot.x == 0.0f && data->rot.y == 0.0f && data->rot.z == 0.0f) { flags = 0; @@ -242,5 +242,5 @@ void func_E00D8630(EffectInstance* effect) { data->scale, data->scale, data->rot.x, data->rot.y, data->rot.z, (void (*)(void*)) func_E00D8334, data, NULL, SCREEN_WIDTH, SCREEN_HEIGHT, NULL); - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/throw_spiny.c b/src/effects/throw_spiny.c index c52aeb9737..0b9083c887 100644 --- a/src/effects/throw_spiny.c +++ b/src/effects/throw_spiny.c @@ -165,8 +165,8 @@ void throw_spiny_appendGfx(void* effect) { s32 temp_s6 = data->unk_00; f32 scale = data->unk_40 * SPRITE_WORLD_SCALE_D; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); shim_guScaleF(sp58, scale * data->xScale, scale * data->yScale, scale); @@ -175,10 +175,10 @@ void throw_spiny_appendGfx(void* effect) { shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(gMasterGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, data->unk_30, data->unk_34, data->unk_38, temp_s5); - gSPDisplayList(gMasterGfxPos++, D_E00C8710[temp_s6]); - gSPDisplayList(gMasterGfxPos++, D_090009F0_3D04E0); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, data->unk_30, data->unk_34, data->unk_38, temp_s5); + gSPDisplayList(gMainGfxPos++, D_E00C8710[temp_s6]); + gSPDisplayList(gMainGfxPos++, D_090009F0_3D04E0); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/thunderbolt_ring.c b/src/effects/thunderbolt_ring.c index 69528609db..0e95b422ab 100644 --- a/src/effects/thunderbolt_ring.c +++ b/src/effects/thunderbolt_ring.c @@ -107,17 +107,17 @@ void thunderbolt_ring_appendGfx(void* effect) { Matrix4f sp60; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, data->unk_28, data->pos.x, data->pos.y, data->pos.z); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_09000000_3B46A0); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_09000000_3B46A0); - savedGfxPos = gMasterGfxPos++; - savedGfxPos2 = gMasterGfxPos; + savedGfxPos = gMainGfxPos++; + savedGfxPos2 = gMainGfxPos; for (i = 0; i < 5; i++) { shim_guRotateF(sp20, i * 72 + 90, 0.0f, 0.0f, 1.0f); @@ -127,15 +127,15 @@ void thunderbolt_ring_appendGfx(void* effect) { shim_guMtxCatF(sp60, sp20, sp20); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_090000C8_3B4768); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_090000C8_3B4768); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } - gSPEndDisplayList(gMasterGfxPos++); - gSPBranchList(savedGfxPos, gMasterGfxPos); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, data->unk_18, data->unk_1C, data->unk_20, unk_24); - gDPSetEnvColor(gMasterGfxPos++, 255, 255, 255, 0); + gSPEndDisplayList(gMainGfxPos++); + gSPBranchList(savedGfxPos, gMainGfxPos); + gDPSetPrimColor(gMainGfxPos++, 0, 0, data->unk_18, data->unk_1C, data->unk_20, unk_24); + gDPSetEnvColor(gMainGfxPos++, 255, 255, 255, 0); for (i = 0; i < data->unk_30 + 1; i++) { f32 angle = lifeTime * 8 + i * 180 / (data->unk_30 + 1); @@ -144,11 +144,11 @@ void thunderbolt_ring_appendGfx(void* effect) { shim_guPositionF(sp20, 0.0f, 0.0f, i * 36, temp * data->unk_2C, 0.0f, 0.0f, 0.0f); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, savedGfxPos2); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, savedGfxPos2); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPPipeSync(gMasterGfxPos++); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/tubba_heart_attack.c b/src/effects/tubba_heart_attack.c index 0cddc1a83e..68317f2696 100644 --- a/src/effects/tubba_heart_attack.c +++ b/src/effects/tubba_heart_attack.c @@ -302,18 +302,18 @@ void tubba_heart_attack_appendGfx(void* effect) { Matrix4f sp58; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guTranslateF(sp18, data->unk_04, data->unk_08, data->unk_0C); shim_guScaleF(sp58, data->unk_28, data->unk_28, data->unk_28); shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, data->unk_18, data->unk_1C, data->unk_20, unk_24); - gDPSetEnvColor(gMasterGfxPos++, 0, 0, 0, 0); - gSPDisplayList(gMasterGfxPos++, D_09000400_3D2980); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, data->unk_18, data->unk_1C, data->unk_20, unk_24); + gDPSetEnvColor(gMainGfxPos++, 0, 0, 0, 0); + gSPDisplayList(gMainGfxPos++, D_09000400_3D2980); for (i = 0; i < 25; i++) { if (data->unk_6D0[i] != 0 && data->unk_6D0[i] != 7) { @@ -328,12 +328,12 @@ void tubba_heart_attack_appendGfx(void* effect) { shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPMatrix(gMasterGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_09000518_3D2A98); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_09000518_3D2A98); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/underwater.c b/src/effects/underwater.c index f09f6b0ec4..24dad70327 100644 --- a/src/effects/underwater.c +++ b/src/effects/underwater.c @@ -181,47 +181,47 @@ void underwater_appendGfx(void* effect) { data = effectTemp->data.underwater; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->graphics->data)); - gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, nuGfxZBuffer); - gSPDisplayList(gMasterGfxPos++, D_09000528); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->graphics->data)); + gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, nuGfxZBuffer); + gSPDisplayList(gMainGfxPos++, D_09000528); for (i = 0; i < 40; i++) { // todo probably a composite macro? - gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, &nuGfxCfb_ptr[0xF00 * i]); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 0x0000, G_TX_LOADTILE, 0, + gDPSetTextureImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, &nuGfxCfb_ptr[0xF00 * i]); + gDPSetTile(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); - gDPLoadSync(gMasterGfxPos++); - gDPLoadTile(gMasterGfxPos++, G_TX_LOADTILE, 0, 0, 0x04FC, 0x0014); - gDPPipeSync(gMasterGfxPos++); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 0x0000, G_TX_RENDERTILE, 0, + gDPLoadSync(gMainGfxPos++); + gDPLoadTile(gMainGfxPos++, G_TX_LOADTILE, 0, 0, 0x04FC, 0x0014); + gDPPipeSync(gMainGfxPos++); + gDPSetTile(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, 0, 0, 0x04FC, 0x0014); - gSPTextureRectangle(gMasterGfxPos++, 0, i * 0x18, 0x04FC, 20 + (i * 18), G_TX_RENDERTILE, 0, 0, 0x1000, 0x0400); - gDPPipeSync(gMasterGfxPos++); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, 0, 0, 0x04FC, 0x0014); + gSPTextureRectangle(gMainGfxPos++, 0, i * 0x18, 0x04FC, 20 + (i * 18), G_TX_RENDERTILE, 0, 0, 0x1000, 0x0400); + gDPPipeSync(gMainGfxPos++); } - gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, nuGfxCfb_ptr); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, data->unk_1C, data->unk_1D, data->unk_1E, data->unk_1F); - gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); - gDPSetCombineLERP(gMasterGfxPos++, PRIMITIVE, 0, PRIMITIVE_ALPHA, TEXEL0, 0, 0, 0, SHADE, PRIMITIVE, 0, + gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, nuGfxCfb_ptr); + gDPSetPrimColor(gMainGfxPos++, 0, 0, data->unk_1C, data->unk_1D, data->unk_1E, data->unk_1F); + gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE); + gDPSetCombineLERP(gMainGfxPos++, PRIMITIVE, 0, PRIMITIVE_ALPHA, TEXEL0, 0, 0, 0, SHADE, PRIMITIVE, 0, PRIMITIVE_ALPHA, TEXEL0, 0, 0, 0, SHADE); - gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, VIRTUAL_TO_PHYSICAL(nuGfxZBuffer)); - gDPSetRenderMode(gMasterGfxPos++, CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | G_RM_PASS, + gDPSetTextureImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, VIRTUAL_TO_PHYSICAL(nuGfxZBuffer)); + gDPSetRenderMode(gMainGfxPos++, CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | G_RM_PASS, CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1)); - gDPSetTexturePersp(gMasterGfxPos++, G_TP_PERSP); - gDPSetTextureFilter(gMasterGfxPos++, G_TF_BILERP); + gDPSetTexturePersp(gMainGfxPos++, G_TP_PERSP); + gDPSetTextureFilter(gMainGfxPos++, G_TF_BILERP); shim_guFrustumF(sp20, -80.0f, 80.0f, 60.0f, -60.0f, 160.0f, 640.0f, 1.0f); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - gSPClearGeometryMode(gMasterGfxPos++, G_CULL_BOTH | G_LIGHTING); - gSPSetGeometryMode(gMasterGfxPos++, G_SHADE | G_SHADING_SMOOTH); - gSPVertex(gMasterGfxPos++, D_09000428, 16, 0); + gSPClearGeometryMode(gMainGfxPos++, G_CULL_BOTH | G_LIGHTING); + gSPSetGeometryMode(gMainGfxPos++, G_SHADE | G_SHADING_SMOOTH); + gSPVertex(gMainGfxPos++, D_09000428, 16, 0); var_t9 = 0x18; for (i = 0; i < 12; i++) { @@ -305,13 +305,13 @@ void underwater_appendGfx(void* effect) { } var_t9 += 0x10; } - gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, nuGfxZBuffer); - gSPDisplayList(gMasterGfxPos++, D_09000570); - gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, nuGfxZBuffer); - gDPPipeSync(gMasterGfxPos++); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos], + gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, nuGfxZBuffer); + gSPDisplayList(gMainGfxPos++, D_09000570); + gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, nuGfxZBuffer); + gDPPipeSync(gMainGfxPos++); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } #else INCLUDE_ASM(s32, "effects/underwater", underwater_appendGfx); diff --git a/src/effects/walking_dust.c b/src/effects/walking_dust.c index d1f2ae0e7b..300d6701c8 100644 --- a/src/effects/walking_dust.c +++ b/src/effects/walking_dust.c @@ -130,11 +130,11 @@ void walking_dust_appendGfx(void* effect) { cond = TRUE; } - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->graphics->data)); - gSPDisplayList(gMasterGfxPos++, dlist); - gDPSetEnvColor(gMasterGfxPos++, 0, 0, 0, 127); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 230, 222, 222, 110); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->graphics->data)); + gSPDisplayList(gMainGfxPos++, dlist); + gDPSetEnvColor(gMainGfxPos++, 0, 0, 0, 127); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 230, 222, 222, 110); if (temp_t3 == 0) { phi_t1 = 24; @@ -145,12 +145,12 @@ void walking_dust_appendGfx(void* effect) { temp_lo = temp_t4 * phi_t1; temp_a0 = temp_lo + phi_t1; - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, temp_lo * 4, 0, (temp_a0 - 1) * 4, ((phi_t1 - 1) * 4)); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, temp_lo * 4, 0, (temp_a0 - 1) * 4, ((phi_t1 - 1) * 4)); if (cond) { - gDPSetTileSize(gMasterGfxPos++, 1, temp_a0 * 4, 0, ((temp_lo + (phi_t1 * 2)) - 1) * 4, 0); + gDPSetTileSize(gMainGfxPos++, 1, temp_a0 * 4, 0, ((temp_lo + (phi_t1 * 2)) - 1) * 4, 0); } else { - gDPSetTileSize(gMasterGfxPos++, 1, temp_a0 * 4, 0, ((temp_lo + (phi_t1 * 2)) - 1) * 4, (phi_t1 - 1) * 4); + gDPSetTileSize(gMainGfxPos++, 1, temp_a0 * 4, 0, ((temp_lo + (phi_t1 * 2)) - 1) * 4, (phi_t1 - 1) * 4); } for (i = 0; i < effectTemp->numParts; i++, data++) { @@ -158,10 +158,10 @@ void walking_dust_appendGfx(void* effect) { shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, dlist2); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, dlist2); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/water_block.c b/src/effects/water_block.c index 3e26060af2..5a8baf6c26 100644 --- a/src/effects/water_block.c +++ b/src/effects/water_block.c @@ -227,16 +227,16 @@ void water_block_appendGfx(void *effect) { s32 temp_s0; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->graphics->data)); shim_guTranslateF(sp20, data->pos.x, data->pos.y, data->pos.z); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPBranchList(gMasterGfxPos, &gMasterGfxPos[81]); - spA8 = (Vtx*)++gMasterGfxPos; - gMasterGfxPos = &gMasterGfxPos[80]; + gSPBranchList(gMainGfxPos, &gMainGfxPos[81]); + spA8 = (Vtx*)++gMainGfxPos; + gMainGfxPos = &gMainGfxPos[80]; temp_s0 = gGameStatusPtr->frameCounter * 4; @@ -270,33 +270,33 @@ void water_block_appendGfx(void *effect) { shim_guScaleF(sp20, 0.1f, 0.1f, 0.1f); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetEnvColor(gMasterGfxPos++, 0, 0, 255, data->unk_28); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 255, 255, spA4); - gSPDisplayList(gMasterGfxPos++, D_090003B0_3B6FA0); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetEnvColor(gMainGfxPos++, 0, 0, 255, data->unk_28); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 255, spA4); + gSPDisplayList(gMainGfxPos++, D_090003B0_3B6FA0); for (i = 0; i < NUM_WATER_BLOCK_COMPONENTS; i++) { if (data->unk_88[i] >= 0) { shim_guPositionF(sp20, 0.0f, 0.0f, 0.0f, data->unk_78[i], data->unk_38[i], data->unk_48[i], 0.0f); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_090004A0_3B7090); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_090004A0_3B7090); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } - gSPDisplayList(gMasterGfxPos++, D_09000300_3B6EF0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, data->unk_18, data->unk_1C, data->unk_20, spA4 * 0.3); - gSPClearGeometryMode(gMasterGfxPos++, G_CULL_BOTH); - gSPSetGeometryMode(gMasterGfxPos++, G_CULL_BACK); + gSPDisplayList(gMainGfxPos++, D_09000300_3B6EF0); + gDPSetPrimColor(gMainGfxPos++, 0, 0, data->unk_18, data->unk_1C, data->unk_20, spA4 * 0.3); + gSPClearGeometryMode(gMainGfxPos++, G_CULL_BOTH); + gSPSetGeometryMode(gMainGfxPos++, G_CULL_BACK); - gSPVertex(gMasterGfxPos++, spA8, 30, 0); + gSPVertex(gMainGfxPos++, spA8, 30, 0); - gSPDisplayList(gMasterGfxPos++, D_090004D8_3B70C8); + gSPDisplayList(gMainGfxPos++, D_090004D8_3B70C8); - gSPVertex(gMasterGfxPos++, &spA8[28], 12, 0); + gSPVertex(gMainGfxPos++, &spA8[28], 12, 0); - gSPDisplayList(gMasterGfxPos++, D_09000538_3B7128) - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_09000538_3B7128) + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/water_fountain.c b/src/effects/water_fountain.c index 25ab6cda3a..3f0eec7c17 100644 --- a/src/effects/water_fountain.c +++ b/src/effects/water_fountain.c @@ -235,30 +235,30 @@ void water_fountain_appendGfx(void *effect) { basePtr = D_E00B8B58; } - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); shim_guScaleF(sp58, data->unk_34, data->unk_34, data->unk_34); shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(gMasterGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_09000280_3B8AE0); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_09000280_3B8AE0); shim_guRotateF(sp18, data->unk_38, 0.0f, 0.0f, 1.0f); shim_guScaleF(sp58, data->unk_3C, data->unk_40, 1.0f); shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetEnvColor(gMasterGfxPos++, data->unk_28, data->unk_2C, data->unk_30, unk_24); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetEnvColor(gMainGfxPos++, data->unk_28, data->unk_2C, data->unk_30, unk_24); temp = sp9C + 1; if (timeLeft >= var_s6 - temp) { - gDPSetPrimColor(gMasterGfxPos++, 0, 0, unk_18, unk_1C, unk_20, unk_24); - gSPDisplayList(gMasterGfxPos++, D_09000348_3B8BA8); + gDPSetPrimColor(gMainGfxPos++, 0, 0, unk_18, unk_1C, unk_20, unk_24); + gSPDisplayList(gMainGfxPos++, D_09000348_3B8BA8); } for (i = 0; i < var_s6 / 2; i++) { @@ -276,16 +276,16 @@ void water_fountain_appendGfx(void *effect) { shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, unk_18, unk_1C, unk_20, (unk_24 * basePtr[idx].unk_08) >> 8); - gSPDisplayList(gMasterGfxPos++, D_09000328_3B8B88); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, unk_18, unk_1C, unk_20, (unk_24 * basePtr[idx].unk_08) >> 8); + gSPDisplayList(gMainGfxPos++, D_09000328_3B8B88); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } } } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPPipeSync(gMasterGfxPos++); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMainGfxPos++); } diff --git a/src/effects/water_splash.c b/src/effects/water_splash.c index 1f2423bdbb..f666a49a45 100644 --- a/src/effects/water_splash.c +++ b/src/effects/water_splash.c @@ -176,15 +176,15 @@ void water_splash_appendGfx(void* effect) { Camera* currentCamera = &gCameras[gCurrentCameraID]; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, OS_K0_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, OS_K0_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guTranslateF(sp10, sp94, temp_fp, data->unk_04.z); shim_guScaleF(sp50, data->unk_34, data->unk_34, data->unk_34); shim_guMtxCatF(sp50, sp10, sp10); shim_guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(gMasterGfxPos++, currentCamera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_09000100_3BCB90); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, currentCamera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_09000100_3BCB90); data++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, data++) { @@ -203,7 +203,7 @@ void water_splash_appendGfx(void* effect) { temp_t3 = temp_t3 & 0x3F; } - gDPLoadMultiTile(gMasterGfxPos++, OS_K0_TO_PHYSICAL(nuGfxCfb_ptr), 0x100, 1, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, 0, + gDPLoadMultiTile(gMainGfxPos++, OS_K0_TO_PHYSICAL(nuGfxCfb_ptr), 0x100, 1, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, 0, temp_t2 + 0xA0, temp_t3 + 0x78, temp_t2 + 0xBF, temp_t3 + 0x97, 0, G_TX_WRAP, G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD); @@ -211,11 +211,11 @@ void water_splash_appendGfx(void* effect) { shim_guScaleF(sp50, data->unk_34, data->unk_34, data->unk_34); shim_guMtxCatF(sp50, sp10, sp10); shim_guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 200, 255, 255, (sp90 * data->unk_30) / 255); - gDPSetEnvColor(gMasterGfxPos++, 0, 32, 32, 0); - gSPDisplayList(gMasterGfxPos++, D_E00BEAF0[(i + (gGameStatusPtr->frameCounter / 2)) & 3]); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 200, 255, 255, (sp90 * data->unk_30) / 255); + gDPSetEnvColor(gMainGfxPos++, 0, 32, 32, 0); + gSPDisplayList(gMainGfxPos++, D_E00BEAF0[(i + (gGameStatusPtr->frameCounter / 2)) & 3]); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/waterfall.c b/src/effects/waterfall.c index f385813104..2542ed711a 100644 --- a/src/effects/waterfall.c +++ b/src/effects/waterfall.c @@ -129,22 +129,22 @@ void waterfall_appendGfx(void* effect) { Matrix4f sp50; s32 i; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guTranslateF(sp10, data->unk_04, data->unk_08, data->unk_0C); shim_guScaleF(sp50, scale, scale, scale); shim_guMtxCatF(sp50, sp10, sp10); shim_guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(gMasterGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, data->unk_18, data->unk_1C, data->unk_20, unk_24); - gSPDisplayList(gMasterGfxPos++, D_09000200_3B7AD0); - gSPBranchList(gMasterGfxPos, &gMasterGfxPos[49]); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, data->unk_18, data->unk_1C, data->unk_20, unk_24); + gSPDisplayList(gMainGfxPos++, D_09000200_3B7AD0); + gSPBranchList(gMainGfxPos, &gMainGfxPos[49]); - savedGfxPos = gMasterGfxPos + 1; - gMasterGfxPos = &gMasterGfxPos[49]; + savedGfxPos = gMainGfxPos + 1; + gMainGfxPos = &gMainGfxPos[49]; vtx = (Vtx_t*) savedGfxPos; @@ -174,14 +174,14 @@ void waterfall_appendGfx(void* effect) { savedIdx = i; - gSPVertex(gMasterGfxPos++, savedGfxPos, i * 2, 0); + gSPVertex(gMainGfxPos++, savedGfxPos, i * 2, 0); for (i = 0; i < savedIdx - 1; i++) { s32 i2 = i * 2; - gSP2Triangles(gMasterGfxPos++, + gSP2Triangles(gMainGfxPos++, i2 , i2 + 2, i2 + 1, i2, i2 + 1, i2 + 2, i2 + 3, i2); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/whirlwind.c b/src/effects/whirlwind.c index e9e4394f02..7673116630 100644 --- a/src/effects/whirlwind.c +++ b/src/effects/whirlwind.c @@ -171,21 +171,21 @@ void whirlwind_appendGfx(void* effect) { spB8 = data->unk_34; spB0 = data->unk_13C * 4.0f; spB4 = data->unk_140 * 4.0f; - gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, OS_K0_TO_PHYSICAL(eff->graphics->data)); + gDPPipeSync(gMainGfxPos++); + gSPSegment(gMainGfxPos++, 0x09, OS_K0_TO_PHYSICAL(eff->graphics->data)); shim_guTranslateF(sp20, 0.0f, 0.0f, 0.0f); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_09000400_3D3D30); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_09000400_3D3D30); // Reserve 0x208 bytes (65 commands) for a vertex buffer (2x16 Vtx + space for the current command) - gSPBranchList(gMasterGfxPos, &gMasterGfxPos[65]); - vertexBuffer = (Vtx*)(gMasterGfxPos + 1); + gSPBranchList(gMainGfxPos, &gMainGfxPos[65]); + vertexBuffer = (Vtx*)(gMainGfxPos + 1); // set the current position we're writing gfx commands to past the vertex buffer - gMasterGfxPos = &gMasterGfxPos[65]; + gMainGfxPos = &gMainGfxPos[65]; // fill the vertex buffer; 2 sets of 16 verticies for (i = 0; i <= (360 / 24); i++) { @@ -205,28 +205,28 @@ void whirlwind_appendGfx(void* effect) { } // Reserve 0x88 bytes (17 commands, including this one) for a separate dynamically generated display list - gSPBranchList(gMasterGfxPos, &gMasterGfxPos[17]); + gSPBranchList(gMainGfxPos, &gMainGfxPos[17]); // Get a reference to the dynamically generated display list - triangleDisplayList = ++gMasterGfxPos; + triangleDisplayList = ++gMainGfxPos; // Generate display list for (i = 0; i < 15; i++) { - gSP2Triangles(gMasterGfxPos++, i + 0x10, i + 1, i, 0, i + 0x10, i + 0x11, i + 1, 0); + gSP2Triangles(gMainGfxPos++, i + 0x10, i + 1, i, 0, i + 0x10, i + 0x11, i + 1, 0); } // This marks the end of our dynamically generated display list, return control back to the main display list - gSPEndDisplayList(gMasterGfxPos++); + gSPEndDisplayList(gMainGfxPos++); shim_guScaleF(sp20, 0.1f, 0.1f, 0.1f); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); // Save position to later insert a branch around the commands that follow this - savedPos = gMasterGfxPos++; + savedPos = gMainGfxPos++; // Save position of main display list - whirlwindMainDisplayList = gMasterGfxPos; + whirlwindMainDisplayList = gMainGfxPos; // Generate main display list for(i = 0; i < (MAX_WHIRLWIND_SEGMENTS - 1); i++) { @@ -244,9 +244,9 @@ void whirlwind_appendGfx(void* effect) { shim_guTranslateF(sp60, temp_f20_2 * shim_sin_deg(f22), 0.0f, temp_f20_2 * shim_cos_deg(f22)); shim_guMtxCatF(sp60, sp20, sp20); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPVertex(gMasterGfxPos++, vertexBuffer, 16, 0); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPVertex(gMainGfxPos++, vertexBuffer, 16, 0); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); shim_guPositionF(sp20, 0.0f, 0.0f, data->unk_118[i + 1], 1.0f, data->unk_38[i + 1] * 10.0f, data->unk_58[i + 1] * 10.0f, data->unk_78[i + 1] * 10.0f); shim_guRotateF(sp60, data->unk_138 + i * i, 0.03f, 1.0f, 0.0f); @@ -257,27 +257,27 @@ void whirlwind_appendGfx(void* effect) { shim_guTranslateF(sp60, temp_f20_3 * shim_sin_deg(data->unk_B8[i]), 0.0f, temp_f20_3 * shim_cos_deg(data->unk_B8[i])); shim_guMtxCatF(sp60, sp20, sp20); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPVertex(gMasterGfxPos++, &vertexBuffer[16], 16, 16); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPVertex(gMainGfxPos++, &vertexBuffer[16], 16, 16); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, spB0 + i * 16, 0, (spB0 + i * 16 + 63) << 2, 31 << 2); - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE + 1, spB4 + i * 8, 0, (spB4 + i * 8 + 63) << 2, 31 << 2); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, spB0 + i * 16, 0, (spB0 + i * 16 + 63) << 2, 31 << 2); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE + 1, spB4 + i * 8, 0, (spB4 + i * 8 + 63) << 2, 31 << 2); // Call the display list to create triangles from the verticies - gSPDisplayList(gMasterGfxPos++, triangleDisplayList); + gSPDisplayList(gMainGfxPos++, triangleDisplayList); } - gSPEndDisplayList(gMasterGfxPos++); + gSPEndDisplayList(gMainGfxPos++); // Now that the length of our display list is known, insert a branch at the previously saved location - gSPBranchList(savedPos, gMasterGfxPos); - gSPClearGeometryMode(gMasterGfxPos++, G_CULL_BOTH); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, data->primR, data->primG, data->primB, primAlpha); - gDPSetEnvColor(gMasterGfxPos++, data->envR, data->envG, data->envB, 32); + gSPBranchList(savedPos, gMainGfxPos); + gSPClearGeometryMode(gMainGfxPos++, G_CULL_BOTH); + gDPSetPrimColor(gMainGfxPos++, 0, 0, data->primR, data->primG, data->primB, primAlpha); + gDPSetEnvColor(gMainGfxPos++, data->envR, data->envG, data->envB, 32); // Call the main display list - gSPDisplayList(gMasterGfxPos++, whirlwindMainDisplayList); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, whirlwindMainDisplayList); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/windy_leaves.c b/src/effects/windy_leaves.c index bf9d0f1583..7ca1eeddf0 100644 --- a/src/effects/windy_leaves.c +++ b/src/effects/windy_leaves.c @@ -241,9 +241,9 @@ void windy_leaves_appendGfx(void* effect) { dlist = D_09001258_33E868; } - gSPSegment(gMasterGfxPos++, 0x09, OS_K0_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, D_09001180_33E790); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 20, 100, 20, part->alpha); + gSPSegment(gMainGfxPos++, 0x09, OS_K0_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gSPDisplayList(gMainGfxPos++, D_09001180_33E790); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 20, 100, 20, part->alpha); shim_guTranslateF(sp18, part->unk_04.x, part->unk_04.y, part->unk_04.z); shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); shim_guMtxCatF(sp58, sp18, sp98); @@ -257,9 +257,9 @@ void windy_leaves_appendGfx(void* effect) { shim_guRotateF(sp58, part->unk_20, 0.0f, 1.0f, 0.0f); shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, dlist); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, dlist); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } diff --git a/src/entity/Block.c b/src/entity/Block.c index 3a9586cad2..ed194f9b90 100644 --- a/src/entity/Block.c +++ b/src/entity/Block.c @@ -31,7 +31,7 @@ void entity_MulticoinBlock_update_timer(Entity* entity); #define MULTICOIN_BLOCK_MAX_COINS 10 void entity_base_block_setupGfx(s32 entityIndex) { - Gfx* gfx = gMasterGfxPos; + Gfx* gfx = gMainGfxPos; Entity* entity = get_entity_by_index(entityIndex); gDPSetTextureLUT(gfx++, G_TT_NONE); @@ -45,7 +45,7 @@ void entity_base_block_setupGfx(s32 entityIndex) { gDPSetPrimColor(gfx++, 0, 0, 0, 0, 0, entity->alpha); } - gMasterGfxPos = gfx; + gMainGfxPos = gfx; } void entity_base_block_play_vanish_effect(Entity* entity) { diff --git a/src/entity/BlueWarpPipe.c b/src/entity/BlueWarpPipe.c index dcf4e325c2..1ddf9d6115 100644 --- a/src/entity/BlueWarpPipe.c +++ b/src/entity/BlueWarpPipe.c @@ -144,7 +144,7 @@ void entity_BlueWarpPipe_start_bound_script(Entity* entity) { } void entity_BlueWarpPipe_setupGfx(s32 entityIndex) { - Gfx* gfxPos = gMasterGfxPos; + Gfx* gfxPos = gMainGfxPos; Entity* entity = get_entity_by_index(entityIndex); BlueWarpPipeData* data = entity->dataBuf.bluePipe; Matrix4f sp10; @@ -157,7 +157,7 @@ void entity_BlueWarpPipe_setupGfx(s32 entityIndex) { gSPMatrix(gfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(gfxPos++, Entity_BlueWarpPipe_RenderBase); gSPPopMatrix(gfxPos++, G_MTX_MODELVIEW); - gMasterGfxPos = gfxPos; + gMainGfxPos = gfxPos; } void entity_init_BlueWarpPipe(Entity* entity) { diff --git a/src/entity/Chest.c b/src/entity/Chest.c index 5da91ed511..d4412457ca 100644 --- a/src/entity/Chest.c +++ b/src/entity/Chest.c @@ -89,7 +89,7 @@ void entity_Chest_reset_camera(Entity* entity) { } void entity_Chest_setupGfx(s32 entityIndex) { - Gfx* gfxPos = gMasterGfxPos; + Gfx* gfxPos = gMainGfxPos; Entity* entity = get_entity_by_index(entityIndex); ChestData* data = entity->dataBuf.chest; Matrix4f sp18; @@ -104,7 +104,7 @@ void entity_Chest_setupGfx(s32 entityIndex) { gfx = ENTITY_ADDR(entity, Gfx*, Entity_Chest_RenderLid); gSPDisplayList(gfxPos++, gfx); gSPPopMatrix(gfxPos++, G_MTX_MODELVIEW); - gMasterGfxPos = gfxPos; + gMainGfxPos = gfxPos; } void entity_Chest_check_opened(Entity* entity) { diff --git a/src/entity/HeartBlock.c b/src/entity/HeartBlock.c index 98c9c25f49..bbe56d7e07 100644 --- a/src/entity/HeartBlock.c +++ b/src/entity/HeartBlock.c @@ -28,7 +28,7 @@ f32 entity_HeartBlockContent_get_previous_yaw(HeartBlockContentData* data, s32 l void entity_HeartBlockContent__setupGfx(s32 entityIndex, Gfx* arg1) { Entity* entity = get_entity_by_index(entityIndex); HeartBlockContentData* data = entity->dataBuf.heartBlockContent; - Gfx* gfxPos = gMasterGfxPos; + Gfx* gfxPos = gMainGfxPos; s32 alpha; Matrix4f sp18; Gfx* dlist; @@ -70,7 +70,7 @@ void entity_HeartBlockContent__setupGfx(s32 entityIndex, Gfx* arg1) { gDPSetPrimColor(gfxPos++, 0, 0, 0, 0, 0, alpha); gSPPopMatrix(gfxPos++, G_MTX_MODELVIEW); - gMasterGfxPos = gfxPos; + gMainGfxPos = gfxPos; } void entity_HeartBlockContent_setupGfx(s32 entityIndex) { diff --git a/src/entity/HiddenPanel.c b/src/entity/HiddenPanel.c index 4345868f9a..4482643e29 100644 --- a/src/entity/HiddenPanel.c +++ b/src/entity/HiddenPanel.c @@ -27,12 +27,12 @@ void entity_HiddenPanel_setupGfx(s32 entityIndex) { guTranslateF(tempMtx, entity->position.x, data->initialY + 1.0f, entity->position.z); guMtxCatF(tempMtx, rotMtx, tempMtx); guMtxF2L(tempMtx, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, ENTITY_ADDR(entity, Gfx*, Gfx_HiddenPanel_RenderHole)); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, ENTITY_ADDR(entity, Gfx*, Gfx_HiddenPanel_RenderHole)); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } mdl_project_tex_coords(data->modelID, data->renderDList, data->entityMatrix, entity->gfxBaseAddr); - mdl_draw_hidden_panel_surface(&gMasterGfxPos, data->modelID); + mdl_draw_hidden_panel_surface(&gMainGfxPos, data->modelID); } void entity_HiddenPanel_set_ispy_notification(Entity* entity) { diff --git a/src/entity/ItemBlock.c b/src/entity/ItemBlock.c index 7b63e30a94..b5f996bb96 100644 --- a/src/entity/ItemBlock.c +++ b/src/entity/ItemBlock.c @@ -221,7 +221,7 @@ void entity_TriggerBlock_enable_player_input(void) { } void entity_ItemBlock_setupGfx(s32 entityIndex) { - Gfx* gfx = gMasterGfxPos; + Gfx* gfx = gMainGfxPos; Entity* entity = get_entity_by_index(entityIndex); gDPSetTextureLUT(gfx++, G_TT_NONE); @@ -235,7 +235,7 @@ void entity_ItemBlock_setupGfx(s32 entityIndex) { gDPSetPrimColor(gfx++, 0, 0, 0, 0, 0, entity->alpha); } - gMasterGfxPos = gfx; + gMainGfxPos = gfx; } void entity_ItemBlock_init(Entity* entity) { diff --git a/src/entity/SaveBlock.c b/src/entity/SaveBlock.c index f64ccabce1..c757019c6f 100644 --- a/src/entity/SaveBlock.c +++ b/src/entity/SaveBlock.c @@ -17,7 +17,7 @@ BSS MessagePrintState* SaveBlockTutorialPrinter; BSS MessagePrintState* SaveBlockResultPrinter; void entity_SaveBlock_setupGfx(s32 index) { - Gfx* gfxPos = gMasterGfxPos; + Gfx* gfxPos = gMainGfxPos; Entity* entity = get_entity_by_index(index); SaveBlockData* blockData = entity->dataBuf.saveBlock; Matrix4f sp18; @@ -50,7 +50,7 @@ void entity_SaveBlock_setupGfx(s32 index) { gSPDisplayList(gfxPos++, dlist); gSPPopMatrix(gfxPos++, G_MTX_MODELVIEW); - gMasterGfxPos = gfxPos; + gMainGfxPos = gfxPos; } void entity_SaveBlock_idle(Entity* entity) { diff --git a/src/entity/ShatteringBlock_common.c b/src/entity/ShatteringBlock_common.c index 8a388b2690..1da2864670 100644 --- a/src/entity/ShatteringBlock_common.c +++ b/src/entity/ShatteringBlock_common.c @@ -160,7 +160,7 @@ void entity_shattering_setupGfx(s32 entityIndex) { f32 x_inv; f32 y_inv; f32 z_inv; - Gfx* gfxPos = gMasterGfxPos; + Gfx* gfxPos = gMainGfxPos; Entity* entity = get_entity_by_index(entityIndex); ShatteringBlockData* data = entity->dataBuf.shatteringBlock; Gfx* fragmentDlist; @@ -194,7 +194,7 @@ void entity_shattering_setupGfx(s32 entityIndex) { gSPPopMatrix(gfxPos++, G_MTX_MODELVIEW); } - gMasterGfxPos = gfxPos; + gMainGfxPos = gfxPos; } EntityScript Entity_ShatteringBlock_Script = { diff --git a/src/entity/SuperBlock.c b/src/entity/SuperBlock.c index 86ff640fea..12fb0dc982 100644 --- a/src/entity/SuperBlock.c +++ b/src/entity/SuperBlock.c @@ -111,7 +111,7 @@ s8 Entity_SuperBlock_PalData[] = { }; void entity_SuperBlockContent_setupGfx(s32 entityIndex) { - Gfx* gfxPos = gMasterGfxPos; + Gfx* gfxPos = gMainGfxPos; Gfx* dlist; u8* palette; Entity* entity = get_entity_by_index(entityIndex); @@ -179,7 +179,7 @@ void entity_SuperBlockContent_setupGfx(s32 entityIndex) { gSPDisplayList(gfxPos++, dlist); gSPPopMatrix(gfxPos++, G_MTX_MODELVIEW); - gMasterGfxPos = gfxPos; + gMainGfxPos = gfxPos; } void entity_SuperBlockContent_idle(Entity* entity) { diff --git a/src/entity/WoodenCrate.c b/src/entity/WoodenCrate.c index 5a900582e0..2e41ba8968 100644 --- a/src/entity/WoodenCrate.c +++ b/src/entity/WoodenCrate.c @@ -178,7 +178,7 @@ void entity_WoodenCrate_setupGfx(s32 entityIndex) { f32 x_inv; f32 y_inv; f32 z_inv; - Gfx* gfxPos = gMasterGfxPos; + Gfx* gfxPos = gMainGfxPos; Entity* entity = get_entity_by_index(entityIndex); WoodenCrateData* data = entity->dataBuf.crate; Gfx* fragmentDlist; @@ -212,7 +212,7 @@ void entity_WoodenCrate_setupGfx(s32 entityIndex) { gSPPopMatrix(gfxPos++, G_MTX_MODELVIEW); } - gMasterGfxPos = gfxPos; + gMainGfxPos = gfxPos; } s32 entity_WoodenCrate_idle(Entity* entity) { diff --git a/src/entity/default/BoardedFloor.c b/src/entity/default/BoardedFloor.c index 68835238a5..5f661edd44 100644 --- a/src/entity/default/BoardedFloor.c +++ b/src/entity/default/BoardedFloor.c @@ -166,7 +166,7 @@ void Entity_BoardedFloor_setupGfx(s32 entityIndex) { f32 x_inv; f32 y_inv; f32 z_inv; - Gfx* gfxPos = gMasterGfxPos; + Gfx* gfxPos = gMainGfxPos; Entity* entity = get_entity_by_index(entityIndex); BoardedFloorData* data = entity->dataBuf.boardedFloor; Gfx* fragmentDlist; @@ -200,7 +200,7 @@ void Entity_BoardedFloor_setupGfx(s32 entityIndex) { gSPPopMatrix(gfxPos++, G_MTX_MODELVIEW); } - gMasterGfxPos = gfxPos; + gMainGfxPos = gfxPos; } void Entity_BoardedFloor_idle(Entity* entity) { diff --git a/src/entity/default/BombableRock.c b/src/entity/default/BombableRock.c index b0917ea9d1..6de468a935 100644 --- a/src/entity/default/BombableRock.c +++ b/src/entity/default/BombableRock.c @@ -191,7 +191,7 @@ void entity_BombableRock_setupGfx(s32 entityIndex) { f32 x_inv; f32 y_inv; f32 z_inv; - Gfx* gfxPos = gMasterGfxPos; + Gfx* gfxPos = gMainGfxPos; Entity* entity = get_entity_by_index(entityIndex); BombableRockData* data = entity->dataBuf.bombableRock; Gfx* fragmentDlist; @@ -225,7 +225,7 @@ void entity_BombableRock_setupGfx(s32 entityIndex) { gSPPopMatrix(gfxPos++, G_MTX_MODELVIEW); } - gMasterGfxPos = gfxPos; + gMainGfxPos = gfxPos; } void entity_BombableRock_idle(Entity* entity) { diff --git a/src/entity/default/Padlock.c b/src/entity/default/Padlock.c index 54316b3479..7877bd3a54 100644 --- a/src/entity/default/Padlock.c +++ b/src/entity/default/Padlock.c @@ -42,9 +42,9 @@ void entity_Padlock_setupGfx(s32 entityIndex) { guMtxCatF(sp18, sp58, sp58); guMtxF2L(sp58, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, data->shackleGfx); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, data->shackleGfx); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } void entity_Padlock_push_player(Entity* entity) { diff --git a/src/entity/jan_iwa/ArrowSign.c b/src/entity/jan_iwa/ArrowSign.c index 0aa8fab7f0..025ef448f0 100644 --- a/src/entity/jan_iwa/ArrowSign.c +++ b/src/entity/jan_iwa/ArrowSign.c @@ -7,7 +7,7 @@ extern Gfx Entity_ArrowSign_RenderRotatedSign[]; extern Mtx Entity_ArrowSign_mtxSign; void entity_ArrowSign_setupGfx(s32 entityIndex) { - Gfx* gfxPos = gMasterGfxPos; + Gfx* gfxPos = gMainGfxPos; Entity* entity = get_entity_by_index(entityIndex); ArrowSignData* data = entity->dataBuf.arrowSign; Matrix4f sp18; @@ -23,7 +23,7 @@ void entity_ArrowSign_setupGfx(s32 entityIndex) { gfx = ENTITY_ADDR(entity, Gfx*, Entity_ArrowSign_RenderRotatedSign); gSPDisplayList(gfxPos++, gfx); gSPPopMatrix(gfxPos++, G_MTX_MODELVIEW); - gMasterGfxPos = gfxPos; + gMainGfxPos = gfxPos; } void entity_ArrowSign_idle(void) { diff --git a/src/entity/jan_iwa/Plants1.c b/src/entity/jan_iwa/Plants1.c index 7bd0c35126..6bf564e0a9 100644 --- a/src/entity/jan_iwa/Plants1.c +++ b/src/entity/jan_iwa/Plants1.c @@ -28,7 +28,7 @@ BSS u16 D_802BCE34; void entity_SpinningFlower_setupGfx(s32 entityIndex) { Entity* entity = get_entity_by_index(entityIndex); SpinningFlowerData* data = entity->dataBuf.spinningFlower; - Gfx* gfxPos = gMasterGfxPos; + Gfx* gfxPos = gMainGfxPos; Matrix4f sp18; Matrix4f sp58; Matrix4f sp98; @@ -47,7 +47,7 @@ void entity_SpinningFlower_setupGfx(s32 entityIndex) { gfx = ENTITY_ADDR(entity, Gfx*, D_0A000D18_E9D618); gSPDisplayList(gfxPos++, gfx); gSPPopMatrix(gfxPos++, G_MTX_MODELVIEW); - gMasterGfxPos = gfxPos; + gMainGfxPos = gfxPos; } void func_802BB000_E2D930(Entity* entity) { @@ -149,7 +149,7 @@ void func_802BB34C_E2DC7C(void) { void entity_PinkFlowerLight_setupGfx(s32 entityIndex) { Entity* entity = get_entity_by_index(entityIndex); PinkFlowerData* data = entity->dataBuf.pinkFlower; - Gfx* gfxPos = gMasterGfxPos; + Gfx* gfxPos = gMainGfxPos; Matrix4f sp18; Matrix4f sp58; f32 sinAngle, cosAngle; @@ -174,7 +174,7 @@ void entity_PinkFlowerLight_setupGfx(s32 entityIndex) { gSPMatrix(gfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(gfxPos++, D_0A0013B8_E9C8B8); gSPPopMatrix(gfxPos++, G_MTX_MODELVIEW); - gMasterGfxPos = gfxPos; + gMainGfxPos = gfxPos; } void entity_PinkFlower_idle(Entity* entity) { diff --git a/src/entity/sbk_omo/StarBoxLauncher.c b/src/entity/sbk_omo/StarBoxLauncher.c index beeb753190..583540d92d 100644 --- a/src/entity/sbk_omo/StarBoxLauncher.c +++ b/src/entity/sbk_omo/StarBoxLauncher.c @@ -30,7 +30,7 @@ u8 D_802BCAA0_E313F0[] = { }; void entity_StarBoxLauncher_setupGfx(s32 entityIndex) { - Gfx* gfxPos = gMasterGfxPos; + Gfx* gfxPos = gMainGfxPos; Entity* entity = get_entity_by_index(entityIndex); StarBoxLauncherData* data = entity->dataBuf.starBoxLauncher; Matrix4f sp10; @@ -56,7 +56,7 @@ void entity_StarBoxLauncher_setupGfx(s32 entityIndex) { gDPSetTextureFilter(gfxPos++, G_TF_BILERP); gDPSetTileSize(gfxPos++, G_TX_RENDERTILE, data->faceTexOffset * 4, 0, (data->faceTexOffset + 124) * 4, 31 * 4); - gMasterGfxPos = gfxPos; + gMainGfxPos = gfxPos; } void entity_StarBoxLauncher_check_launch(Entity* entity) { diff --git a/src/entity/sbk_omo/Tweester.c b/src/entity/sbk_omo/Tweester.c index 6fc7192234..15b3645a61 100644 --- a/src/entity/sbk_omo/Tweester.c +++ b/src/entity/sbk_omo/Tweester.c @@ -34,10 +34,10 @@ void entity_Tweester_render_inner_whirl(s32 entityIndex) { guMtxCatF(sp58, sp18, sp18); guMtxF2L(sp18, &data->mtxInnerWhirl); gDisplayContext->matrixStack[gMatrixListPos] = data->mtxInnerWhirl; - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gfx = ENTITY_ADDR(entity, Gfx*, Entity_Tweester_RenderInnerWhirl); - gSPDisplayList(gMasterGfxPos++, gfx); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, gfx); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } void entity_Tweester_render_outer_whirl(s32 entityIndex) { @@ -52,59 +52,59 @@ void entity_Tweester_render_outer_whirl(s32 entityIndex) { guMtxCatF(sp58, sp18, sp18); guMtxF2L(sp18, &data->mtxOuterWhirl); gDisplayContext->matrixStack[gMatrixListPos] = data->mtxOuterWhirl; - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gfx = ENTITY_ADDR(entity, Gfx*, Entity_Tweester_RenderOuterWhirl); - gSPDisplayList(gMasterGfxPos++, gfx); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, gfx); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } void entity_Tweester_render_face(s32 entityIndex) { Entity* entity = get_entity_by_index(entityIndex); TweesterData* data = entity->dataBuf.tweester; - gDPPipeSync(gMasterGfxPos++); - gDPSetTextureLUT(gMasterGfxPos++, G_TT_RGBA16); - gDPLoadTLUT_pal16(gMasterGfxPos++, 0, D_0A0018A0_E58700); - gSPTexture(gMasterGfxPos++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); - gDPSetCombineMode(gMasterGfxPos++, G_CC_MODULATEIA, G_CC_MODULATEIA); - gDPSetTextureDetail(gMasterGfxPos++, G_TD_CLAMP); - gDPSetTextureLOD(gMasterGfxPos++, G_TL_TILE); - gDPLoadTextureBlock_4b(gMasterGfxPos++, D_0A0014A0_E58300, G_IM_FMT_CI, 64, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD); - gDPSetTexturePersp(gMasterGfxPos++, G_TP_PERSP); - gDPSetTextureFilter(gMasterGfxPos++, G_TF_BILERP); - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, data->faceAnimTexOffset * 4, 0, (data->faceAnimTexOffset + 124) * 4, 31 * 4); + gDPPipeSync(gMainGfxPos++); + gDPSetTextureLUT(gMainGfxPos++, G_TT_RGBA16); + gDPLoadTLUT_pal16(gMainGfxPos++, 0, D_0A0018A0_E58700); + gSPTexture(gMainGfxPos++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); + gDPSetCombineMode(gMainGfxPos++, G_CC_MODULATEIA, G_CC_MODULATEIA); + gDPSetTextureDetail(gMainGfxPos++, G_TD_CLAMP); + gDPSetTextureLOD(gMainGfxPos++, G_TL_TILE); + gDPLoadTextureBlock_4b(gMainGfxPos++, D_0A0014A0_E58300, G_IM_FMT_CI, 64, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD); + gDPSetTexturePersp(gMainGfxPos++, G_TP_PERSP); + gDPSetTextureFilter(gMainGfxPos++, G_TF_BILERP); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, data->faceAnimTexOffset * 4, 0, (data->faceAnimTexOffset + 124) * 4, 31 * 4); } void entity_Tweester_setupGfx(s32 entityIndex) { Entity* entity = get_entity_by_index(entityIndex); TweesterData* data = entity->dataBuf.tweester; - gDPPipeSync(gMasterGfxPos++); - gDPSetTextureLUT(gMasterGfxPos++, G_TT_NONE); - gSPTexture(gMasterGfxPos++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); - gDPSetCombineLERP(gMasterGfxPos++, TEXEL1, 0, TEXEL0, 0, TEXEL1, 0, TEXEL0, 0, COMBINED, 0, SHADE, 0, COMBINED, 0, SHADE, 0); - gDPSetTextureDetail(gMasterGfxPos++, G_TD_CLAMP); - gDPSetTextureLOD(gMasterGfxPos++, G_TL_TILE); - gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_I, G_IM_SIZ_8b, 32, D_0A000BF0_E57A50); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_I, G_IM_SIZ_8b, 4, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD); - gDPLoadSync(gMasterGfxPos++); - gDPLoadTile(gMasterGfxPos++, G_TX_LOADTILE, 0, 0, 0x007C, 0x007C); - gDPPipeSync(gMasterGfxPos++); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_I, G_IM_SIZ_8b, 4, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD); - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C); - gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_I, G_IM_SIZ_8b, 32, D_0A000FF0_E57E50); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_I, G_IM_SIZ_8b, 4, 0x0080, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD); - gDPLoadSync(gMasterGfxPos++); - gDPLoadTile(gMasterGfxPos++, G_TX_LOADTILE, 0, 0, 0x007C, 0x007C); - gDPPipeSync(gMasterGfxPos++); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_I, G_IM_SIZ_8b, 4, 0x0080, 1, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD); - gDPSetTileSize(gMasterGfxPos++, 1, 0, 0, 0x007C, 0x007C); - gDPSetTexturePersp(gMasterGfxPos++, G_TP_PERSP); - gDPSetTextureFilter(gMasterGfxPos++, G_TF_BILERP); - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, data->innerWhirlTexOffsetX, data->innerWhirlTexOffsetY, data->innerWhirlTexOffsetX + 124, data->innerWhirlTexOffsetY + 124); + gDPPipeSync(gMainGfxPos++); + gDPSetTextureLUT(gMainGfxPos++, G_TT_NONE); + gSPTexture(gMainGfxPos++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); + gDPSetCombineLERP(gMainGfxPos++, TEXEL1, 0, TEXEL0, 0, TEXEL1, 0, TEXEL0, 0, COMBINED, 0, SHADE, 0, COMBINED, 0, SHADE, 0); + gDPSetTextureDetail(gMainGfxPos++, G_TD_CLAMP); + gDPSetTextureLOD(gMainGfxPos++, G_TL_TILE); + gDPSetTextureImage(gMainGfxPos++, G_IM_FMT_I, G_IM_SIZ_8b, 32, D_0A000BF0_E57A50); + gDPSetTile(gMainGfxPos++, G_IM_FMT_I, G_IM_SIZ_8b, 4, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD); + gDPLoadSync(gMainGfxPos++); + gDPLoadTile(gMainGfxPos++, G_TX_LOADTILE, 0, 0, 0x007C, 0x007C); + gDPPipeSync(gMainGfxPos++); + gDPSetTile(gMainGfxPos++, G_IM_FMT_I, G_IM_SIZ_8b, 4, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C); + gDPSetTextureImage(gMainGfxPos++, G_IM_FMT_I, G_IM_SIZ_8b, 32, D_0A000FF0_E57E50); + gDPSetTile(gMainGfxPos++, G_IM_FMT_I, G_IM_SIZ_8b, 4, 0x0080, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD); + gDPLoadSync(gMainGfxPos++); + gDPLoadTile(gMainGfxPos++, G_TX_LOADTILE, 0, 0, 0x007C, 0x007C); + gDPPipeSync(gMainGfxPos++); + gDPSetTile(gMainGfxPos++, G_IM_FMT_I, G_IM_SIZ_8b, 4, 0x0080, 1, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD); + gDPSetTileSize(gMainGfxPos++, 1, 0, 0, 0x007C, 0x007C); + gDPSetTexturePersp(gMainGfxPos++, G_TP_PERSP); + gDPSetTextureFilter(gMainGfxPos++, G_TF_BILERP); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, data->innerWhirlTexOffsetX, data->innerWhirlTexOffsetY, data->innerWhirlTexOffsetX + 124, data->innerWhirlTexOffsetY + 124); entity_Tweester_render_inner_whirl(entityIndex); - gDPPipeSync(gMasterGfxPos++); - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, data->outerWhirlTexOffsetX, data->outerWhirlTexOffsetY, data->outerWhirlTexOffsetX + 124, data->outerWhirlTexOffsetY + 124); + gDPPipeSync(gMainGfxPos++); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, data->outerWhirlTexOffsetX, data->outerWhirlTexOffsetY, data->outerWhirlTexOffsetX + 124, data->outerWhirlTexOffsetY + 124); entity_Tweester_render_outer_whirl(entityIndex); entity_Tweester_render_face(entityIndex); } diff --git a/src/entity_model.c b/src/entity_model.c index fef66570d5..f8babc9b11 100644 --- a/src/entity_model.c +++ b/src/entity_model.c @@ -248,17 +248,17 @@ void appendGfx_entity_model(EntityModel* model) { Matrix4f foldMtx; gDisplayContext->matrixStack[gMatrixListPos] = model->transform; - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (!(model->flags & ENTITY_MODEL_FLAG_USE_IMAGE)) { if (!(model->flags & ENTITY_MODEL_FLAG_10000)) { s32 cond; - gDPPipeSync(gMasterGfxPos++); - gDPSetRenderMode(gMasterGfxPos++, G_RM_TEX_EDGE, G_RM_TEX_EDGE2); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 255, 255, 255); - gDPSetCombineMode(gMasterGfxPos++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); - gDPSetAlphaCompare(gMasterGfxPos++, G_AC_NONE); - gSPSetOtherMode(gMasterGfxPos++, G_SETOTHERMODE_H, G_MDSFT_ALPHADITHER, 18, G_AD_DISABLE | G_CD_DISABLE | G_CK_NONE | G_TC_FILT | G_TF_POINT | G_TT_NONE | G_TL_TILE | G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE); + gDPPipeSync(gMainGfxPos++); + gDPSetRenderMode(gMainGfxPos++, G_RM_TEX_EDGE, G_RM_TEX_EDGE2); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 255, 255); + gDPSetCombineMode(gMainGfxPos++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); + gDPSetAlphaCompare(gMainGfxPos++, G_AC_NONE); + gSPSetOtherMode(gMainGfxPos++, G_SETOTHERMODE_H, G_MDSFT_ALPHADITHER, 18, G_AD_DISABLE | G_CD_DISABLE | G_CK_NONE | G_TC_FILT | G_TF_POINT | G_TT_NONE | G_TL_TILE | G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE); cond = FALSE; if (entity_fog_enabled && !(model->flags & ENTITY_MODEL_FLAG_FOG_DISABLED)) { @@ -268,107 +268,107 @@ void appendGfx_entity_model(EntityModel* model) { case FALSE: switch (model->renderMode) { case RENDER_MODE_SURFACE_OPA: - gSPDisplayList(gMasterGfxPos++, D_8014B7F8); + gSPDisplayList(gMainGfxPos++, D_8014B7F8); break; case RENDER_MODE_DECAL_OPA: - gSPDisplayList(gMasterGfxPos++, D_8014B820); + gSPDisplayList(gMainGfxPos++, D_8014B820); break; case RENDER_MODE_INTERSECTING_OPA: - gSPDisplayList(gMasterGfxPos++, D_8014B848); + gSPDisplayList(gMainGfxPos++, D_8014B848); break; case RENDER_MODE_ALPHATEST: - gSPDisplayList(gMasterGfxPos++, D_8014B870); + gSPDisplayList(gMainGfxPos++, D_8014B870); break; case RENDER_MODE_SURFACE_XLU_LAYER1: case RENDER_MODE_SURFACE_XLU_LAYER2: case RENDER_MODE_SURFACE_XLU_LAYER3: - gSPDisplayList(gMasterGfxPos++, D_8014B898); + gSPDisplayList(gMainGfxPos++, D_8014B898); break; case RENDER_MODE_SURFACE_XLU_NO_AA: - gSPDisplayList(gMasterGfxPos++, D_8014B9B0); + gSPDisplayList(gMainGfxPos++, D_8014B9B0); break; case RENDER_MODE_DECAL_XLU: case RENDER_MODE_1E: - gSPDisplayList(gMasterGfxPos++, D_8014B8C0); + gSPDisplayList(gMainGfxPos++, D_8014B8C0); break; case RENDER_MODE_DECAL_XLU_NOAA: case RENDER_MODE_SHADOW: - gSPDisplayList(gMasterGfxPos++, D_8014B9D8); + gSPDisplayList(gMainGfxPos++, D_8014B9D8); break; case RENDER_MODE_INTERSECTING_XLU: - gSPDisplayList(gMasterGfxPos++, D_8014B8E8); + gSPDisplayList(gMainGfxPos++, D_8014B8E8); break; case RENDER_MODE_28: - gSPDisplayList(gMasterGfxPos++, D_8014BA00); + gSPDisplayList(gMainGfxPos++, D_8014BA00); break; case RENDER_MODE_ALPHATEST_ONESIDED: - gSPDisplayList(gMasterGfxPos++, D_8014B988); + gSPDisplayList(gMainGfxPos++, D_8014B988); break; case RENDER_MODE_SURFACE_OPA_NO_ZB: case RENDER_MODE_2A: - gSPDisplayList(gMasterGfxPos++, D_8014BA48); + gSPDisplayList(gMainGfxPos++, D_8014BA48); break; case RENDER_MODE_ALPHATEST_NO_ZB: case RENDER_MODE_2B: - gSPDisplayList(gMasterGfxPos++, D_8014BA70); + gSPDisplayList(gMainGfxPos++, D_8014BA70); break; case RENDER_MODE_SURFACE_XLU_NO_ZB: case RENDER_MODE_2C: - gSPDisplayList(gMasterGfxPos++, D_8014BA98); + gSPDisplayList(gMainGfxPos++, D_8014BA98); break; case RENDER_MODE_2D: - gSPDisplayList(gMasterGfxPos++, D_8014BAE8); + gSPDisplayList(gMainGfxPos++, D_8014BAE8); break; } break; case TRUE: switch (model->renderMode) { case RENDER_MODE_SURFACE_OPA: - gSPDisplayList(gMasterGfxPos++, D_8014BE78); + gSPDisplayList(gMainGfxPos++, D_8014BE78); break; case RENDER_MODE_DECAL_OPA: - gSPDisplayList(gMasterGfxPos++, D_8014BEA0); + gSPDisplayList(gMainGfxPos++, D_8014BEA0); break; case RENDER_MODE_INTERSECTING_OPA: - gSPDisplayList(gMasterGfxPos++, D_8014BEC8); + gSPDisplayList(gMainGfxPos++, D_8014BEC8); break; case RENDER_MODE_ALPHATEST: - gSPDisplayList(gMasterGfxPos++, D_8014BEF0); + gSPDisplayList(gMainGfxPos++, D_8014BEF0); break; case RENDER_MODE_SURFACE_XLU_LAYER1: - gSPDisplayList(gMasterGfxPos++, D_8014BF18); + gSPDisplayList(gMainGfxPos++, D_8014BF18); break; case RENDER_MODE_DECAL_XLU: - gSPDisplayList(gMasterGfxPos++, D_8014BF40); + gSPDisplayList(gMainGfxPos++, D_8014BF40); break; case RENDER_MODE_INTERSECTING_XLU: - gSPDisplayList(gMasterGfxPos++, D_8014BF68); + gSPDisplayList(gMainGfxPos++, D_8014BF68); break; } - gDPSetFogColor(gMasterGfxPos++, entity_fog_red, entity_fog_green, entity_fog_blue, entity_fog_alpha); - gSPFogPosition(gMasterGfxPos++, entity_fog_dist_min, entity_fog_dist_max); + gDPSetFogColor(gMainGfxPos++, entity_fog_red, entity_fog_green, entity_fog_blue, entity_fog_alpha); + gSPFogPosition(gMainGfxPos++, entity_fog_dist_min, entity_fog_dist_max); break; } - gSPClearGeometryMode(gMasterGfxPos++, G_LIGHTING); + gSPClearGeometryMode(gMainGfxPos++, G_LIGHTING); if (!entity_fog_enabled || (model->flags & ENTITY_MODEL_FLAG_FOG_DISABLED)) { - gDPSetCombineMode(gMasterGfxPos++, G_CC_MODULATEIA, G_CC_MODULATEIA); + gDPSetCombineMode(gMainGfxPos++, G_CC_MODULATEIA, G_CC_MODULATEIA); } else { - gDPSetCombineLERP(gMasterGfxPos++, TEXEL0, 0, SHADE, 0, TEXEL0, 0, 0, TEXEL0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED); + gDPSetCombineLERP(gMainGfxPos++, TEXEL0, 0, SHADE, 0, TEXEL0, 0, 0, TEXEL0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED); } } if (model->vertexArray != NULL) { - gSPSegment(gMasterGfxPos++, D_80154374, VIRTUAL_TO_PHYSICAL(model->vertexArray)); + gSPSegment(gMainGfxPos++, D_80154374, VIRTUAL_TO_PHYSICAL(model->vertexArray)); } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); if (model->fpSetupGfxCallback != NULL) { model->fpSetupGfxCallback(model->setupGfxCallbackArg0); } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); - gSPDisplayList(gMasterGfxPos++, model->gfx.displayList); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPPipeSync(gMasterGfxPos++); + gSPDisplayList(gMainGfxPos++, model->gfx.displayList); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMainGfxPos++); if (!(model->flags & ENTITY_MODEL_FLAG_REFLECT)) { return; @@ -379,18 +379,18 @@ void appendGfx_entity_model(EntityModel* model) { guMtxCatF(mtx, mtx2, mtx); guMtxF2L(mtx, &model->transform); gDisplayContext->matrixStack[gMatrixListPos] = model->transform; - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, model->gfx.displayList); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, model->gfx.displayList); } else { SpriteRasterInfo* imageData; - gDPPipeSync(gMasterGfxPos++); - gSPClearGeometryMode(gMasterGfxPos++, G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); - gSPSetGeometryMode(gMasterGfxPos++, G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH); - gSPSetLights1(gMasterGfxPos++, D_8014C268); - gSPTexture(gMasterGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); - gDPSetAlphaCompare(gMasterGfxPos++, G_AC_NONE); - gSPSetOtherMode(gMasterGfxPos++, G_SETOTHERMODE_H, G_MDSFT_ALPHADITHER, 18, G_AD_DISABLE | G_CD_DISABLE | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE); + gDPPipeSync(gMainGfxPos++); + gSPClearGeometryMode(gMainGfxPos++, G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); + gSPSetGeometryMode(gMainGfxPos++, G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH); + gSPSetLights1(gMainGfxPos++, D_8014C268); + gSPTexture(gMainGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); + gDPSetAlphaCompare(gMainGfxPos++, G_AC_NONE); + gSPSetOtherMode(gMainGfxPos++, G_SETOTHERMODE_H, G_MDSFT_ALPHADITHER, 18, G_AD_DISABLE | G_CD_DISABLE | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE); imageData = model->gfx.imageData; foldImage.raster = imageData->raster; @@ -404,8 +404,8 @@ void appendGfx_entity_model(EntityModel* model) { fold_appendGfx_component(0, &foldImage, 0, foldMtx); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPPipeSync(gMasterGfxPos++); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMainGfxPos++); } @@ -576,7 +576,7 @@ void draw_entity_model_E(s32 modelIdx, Mtx* transformMtx) { model->transform = *transformMtx; model->vertexArray = NULL; gDisplayContext->matrixStack[gMatrixListPos] = model->transform; - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (!(model->flags & ENTITY_MODEL_FLAG_USE_IMAGE)) { s32 cond = FALSE; if (entity_fog_enabled && !(model->flags & ENTITY_MODEL_FLAG_FOG_DISABLED)) { @@ -586,99 +586,99 @@ void draw_entity_model_E(s32 modelIdx, Mtx* transformMtx) { case FALSE: switch (model->renderMode) { case RENDER_MODE_SURFACE_OPA: - gSPDisplayList(gMasterGfxPos++, D_8014B7F8); + gSPDisplayList(gMainGfxPos++, D_8014B7F8); break; case RENDER_MODE_DECAL_OPA: - gSPDisplayList(gMasterGfxPos++, D_8014B820); + gSPDisplayList(gMainGfxPos++, D_8014B820); break; case RENDER_MODE_INTERSECTING_OPA: - gSPDisplayList(gMasterGfxPos++, D_8014B848); + gSPDisplayList(gMainGfxPos++, D_8014B848); break; case RENDER_MODE_ALPHATEST: - gSPDisplayList(gMasterGfxPos++, D_8014B870); + gSPDisplayList(gMainGfxPos++, D_8014B870); break; case RENDER_MODE_SURFACE_XLU_LAYER1: case RENDER_MODE_SURFACE_XLU_LAYER2: case RENDER_MODE_SURFACE_XLU_LAYER3: - gSPDisplayList(gMasterGfxPos++, D_8014B898); + gSPDisplayList(gMainGfxPos++, D_8014B898); break; case RENDER_MODE_SURFACE_XLU_NO_AA: - gSPDisplayList(gMasterGfxPos++, D_8014B9B0); + gSPDisplayList(gMainGfxPos++, D_8014B9B0); break; case RENDER_MODE_DECAL_XLU: case RENDER_MODE_1E: - gSPDisplayList(gMasterGfxPos++, D_8014B8C0); + gSPDisplayList(gMainGfxPos++, D_8014B8C0); break; case RENDER_MODE_DECAL_XLU_NOAA: case RENDER_MODE_SHADOW: - gSPDisplayList(gMasterGfxPos++, D_8014B9D8); + gSPDisplayList(gMainGfxPos++, D_8014B9D8); break; case RENDER_MODE_INTERSECTING_XLU: - gSPDisplayList(gMasterGfxPos++, D_8014B8E8); + gSPDisplayList(gMainGfxPos++, D_8014B8E8); break; case RENDER_MODE_28: - gSPDisplayList(gMasterGfxPos++, D_8014BA00); + gSPDisplayList(gMainGfxPos++, D_8014BA00); break; case RENDER_MODE_ALPHATEST_ONESIDED: - gSPDisplayList(gMasterGfxPos++, D_8014B988); + gSPDisplayList(gMainGfxPos++, D_8014B988); break; case RENDER_MODE_SURFACE_OPA_NO_ZB: case RENDER_MODE_2A: - gSPDisplayList(gMasterGfxPos++, D_8014BA48); + gSPDisplayList(gMainGfxPos++, D_8014BA48); break; case RENDER_MODE_ALPHATEST_NO_ZB: case RENDER_MODE_2B: - gSPDisplayList(gMasterGfxPos++, D_8014BA70); + gSPDisplayList(gMainGfxPos++, D_8014BA70); break; case RENDER_MODE_SURFACE_XLU_NO_ZB: case RENDER_MODE_2C: - gSPDisplayList(gMasterGfxPos++, D_8014BA98); + gSPDisplayList(gMainGfxPos++, D_8014BA98); break; case RENDER_MODE_2D: - gSPDisplayList(gMasterGfxPos++, D_8014BAE8); + gSPDisplayList(gMainGfxPos++, D_8014BAE8); break; } break; case TRUE: switch (model->renderMode) { case RENDER_MODE_SURFACE_OPA: - gSPDisplayList(gMasterGfxPos++, D_8014BE78); + gSPDisplayList(gMainGfxPos++, D_8014BE78); break; case RENDER_MODE_DECAL_OPA: - gSPDisplayList(gMasterGfxPos++, D_8014BEA0); + gSPDisplayList(gMainGfxPos++, D_8014BEA0); break; case RENDER_MODE_INTERSECTING_OPA: - gSPDisplayList(gMasterGfxPos++, D_8014BEC8); + gSPDisplayList(gMainGfxPos++, D_8014BEC8); break; case RENDER_MODE_ALPHATEST: - gSPDisplayList(gMasterGfxPos++, D_8014BEF0); + gSPDisplayList(gMainGfxPos++, D_8014BEF0); break; case RENDER_MODE_SURFACE_XLU_LAYER1: - gSPDisplayList(gMasterGfxPos++, D_8014BF18); + gSPDisplayList(gMainGfxPos++, D_8014BF18); break; case RENDER_MODE_DECAL_XLU: - gSPDisplayList(gMasterGfxPos++, D_8014BF40); + gSPDisplayList(gMainGfxPos++, D_8014BF40); break; case RENDER_MODE_INTERSECTING_XLU: - gSPDisplayList(gMasterGfxPos++, D_8014BF68); + gSPDisplayList(gMainGfxPos++, D_8014BF68); break; } - gDPSetFogColor(gMasterGfxPos++, entity_fog_red, entity_fog_green, entity_fog_blue, entity_fog_alpha); - gSPFogPosition(gMasterGfxPos++, entity_fog_dist_min, entity_fog_dist_max); + gDPSetFogColor(gMainGfxPos++, entity_fog_red, entity_fog_green, entity_fog_blue, entity_fog_alpha); + gSPFogPosition(gMainGfxPos++, entity_fog_dist_min, entity_fog_dist_max); break; } - gSPClearGeometryMode(gMasterGfxPos++, G_LIGHTING); + gSPClearGeometryMode(gMainGfxPos++, G_LIGHTING); if (!entity_fog_enabled || (model->flags & ENTITY_MODEL_FLAG_FOG_DISABLED)) { - gDPSetCombineMode(gMasterGfxPos++, G_CC_MODULATEIA, G_CC_MODULATEIA); + gDPSetCombineMode(gMainGfxPos++, G_CC_MODULATEIA, G_CC_MODULATEIA); } else { - gDPSetCombineLERP(gMasterGfxPos++, TEXEL0, 0, SHADE, 0, TEXEL0, 0, 0, TEXEL0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED); + gDPSetCombineLERP(gMainGfxPos++, TEXEL0, 0, SHADE, 0, TEXEL0, 0, 0, TEXEL0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED); } if (model->vertexArray != NULL) { - gSPSegment(gMasterGfxPos++, D_80154374, VIRTUAL_TO_PHYSICAL(model->vertexArray)); + gSPSegment(gMainGfxPos++, D_80154374, VIRTUAL_TO_PHYSICAL(model->vertexArray)); } - gSPDisplayList(gMasterGfxPos++, model->gfx.displayList); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPPipeSync(gMasterGfxPos++); + gSPDisplayList(gMainGfxPos++, model->gfx.displayList); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMainGfxPos++); if (!(model->flags & ENTITY_MODEL_FLAG_REFLECT)) { return; } @@ -688,18 +688,18 @@ void draw_entity_model_E(s32 modelIdx, Mtx* transformMtx) { guMtxCatF(mtx, mtx2, mtx); guMtxF2L(mtx, &model->transform); gDisplayContext->matrixStack[gMatrixListPos] = model->transform; - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, model->gfx.displayList); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, model->gfx.displayList); } else { SpriteRasterInfo* imageData; - gDPPipeSync(gMasterGfxPos++); - gSPClearGeometryMode(gMasterGfxPos++, G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); - gSPSetGeometryMode(gMasterGfxPos++, G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH); - gSPSetLights1(gMasterGfxPos++, D_8014C268); - gSPTexture(gMasterGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); - gDPSetAlphaCompare(gMasterGfxPos++, G_AC_NONE); - gSPSetOtherMode(gMasterGfxPos++, G_SETOTHERMODE_H, G_MDSFT_ALPHADITHER, 18, G_AD_DISABLE | G_CD_DISABLE | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE); + gDPPipeSync(gMainGfxPos++); + gSPClearGeometryMode(gMainGfxPos++, G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); + gSPSetGeometryMode(gMainGfxPos++, G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH); + gSPSetLights1(gMainGfxPos++, D_8014C268); + gSPTexture(gMainGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); + gDPSetAlphaCompare(gMainGfxPos++, G_AC_NONE); + gSPSetOtherMode(gMainGfxPos++, G_SETOTHERMODE_H, G_MDSFT_ALPHADITHER, 18, G_AD_DISABLE | G_CD_DISABLE | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE); imageData = model->gfx.imageData; foldImage.raster = imageData->raster; @@ -713,8 +713,8 @@ void draw_entity_model_E(s32 modelIdx, Mtx* transformMtx) { fold_appendGfx_component(0, &foldImage, 0, foldMtx); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPPipeSync(gMasterGfxPos++); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMainGfxPos++); } void set_entity_model_render_command_list(s32 idx, EntityModelScript* cmdList) { diff --git a/src/evt/virtual_entity.c b/src/evt/virtual_entity.c index 36640430bf..345a022662 100644 --- a/src/evt/virtual_entity.c +++ b/src/evt/virtual_entity.c @@ -8,20 +8,20 @@ extern VirtualEntityList* gCurrentVirtualEntityListPtr; s32 create_worker_backUI(void (*updateFunc)(void), void (*drawFunc)(void)); void virtual_entity_appendGfx_quad(u8 r, u8 g, u8 b, u8 a, u16 left, u16 top, u16 right, u16 bottom) { - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); if (a == 0xFF) { - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, PRIMITIVE, 0, 0, 0, 1, 0, 0, 0, PRIMITIVE, 0, 0, 0, 1); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, PRIMITIVE, 0, 0, 0, 1, 0, 0, 0, PRIMITIVE, 0, 0, 0, 1); } else { - gDPSetRenderMode(gMasterGfxPos++, G_RM_XLU_SURF, G_RM_XLU_SURF2); - gDPSetCombineMode(gMasterGfxPos++, G_CC_PRIMITIVE, G_CC_PRIMITIVE); + gDPSetRenderMode(gMainGfxPos++, G_RM_XLU_SURF, G_RM_XLU_SURF2); + gDPSetCombineMode(gMainGfxPos++, G_CC_PRIMITIVE, G_CC_PRIMITIVE); } - gDPSetPrimColor(gMasterGfxPos++, 0, 0, r, g, b, a); - gDPFillRectangle(gMasterGfxPos++, left, top, right, bottom); - gDPPipeSync(gMasterGfxPos++); - gDPSetRenderMode(gMasterGfxPos++, G_RM_TEX_EDGE, G_RM_TEX_EDGE2); - gDPSetCombineMode(gMasterGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); + gDPSetPrimColor(gMainGfxPos++, 0, 0, r, g, b, a); + gDPFillRectangle(gMainGfxPos++, left, top, right, bottom); + gDPPipeSync(gMainGfxPos++); + gDPSetRenderMode(gMainGfxPos++, G_RM_TEX_EDGE, G_RM_TEX_EDGE2); + gDPSetCombineMode(gMainGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); } void virtual_entity_render_quad(s32 r, s32 g, s32 b, s32 a, s32 posX, s32 posY, s32 width, s32 height) { diff --git a/src/filemenu/filemenu_common.c b/src/filemenu/filemenu_common.c index 47a1587d2a..4061ef0434 100644 --- a/src/filemenu/filemenu_common.c +++ b/src/filemenu/filemenu_common.c @@ -127,7 +127,7 @@ void filemenu_draw_rect(s32 ulx, s32 uly, s32 lrx, s32 lry, s32 tileDescriptor, if (ulx >= 1280 || uly >= 960 || lrx >= 2688 || lry >= 2688) { return; } - gSPScisTextureRectangle(gMasterGfxPos++, ulx, uly, lrx, lry, tileDescriptor, uls, ult, dsdx, dtdy); + gSPScisTextureRectangle(gMainGfxPos++, ulx, uly, lrx, lry, tileDescriptor, uls, ult, dsdx, dtdy); } void filemenu_set_selected(MenuPanel* menu, s32 col, s32 row) { @@ -664,11 +664,11 @@ void filemenu_update_show_name_confirm( s32 updateCounter = window->updateCounter; u32 counter; - gDPPipeSync(gMasterGfxPos++); - gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); - gDPSetCombineMode(gMasterGfxPos++, G_CC_PRIMITIVE, G_CC_PRIMITIVE); - gDPSetRenderMode(gMasterGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, 140); + gDPPipeSync(gMainGfxPos++); + gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE); + gDPSetCombineMode(gMainGfxPos++, G_CC_PRIMITIVE, G_CC_PRIMITIVE); + gDPSetRenderMode(gMainGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, 140); if (updateCounter < 10) { s32 x = updateCounter * 16; @@ -704,11 +704,11 @@ void filemenu_update_hidden_name_confirm( s32 updateCounter = window->updateCounter; if (updateCounter < ARRAY_COUNT(D_80249D48)) { - gDPPipeSync(gMasterGfxPos++); - gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); - gDPSetCombineMode(gMasterGfxPos++, G_CC_PRIMITIVE, G_CC_PRIMITIVE); - gDPSetRenderMode(gMasterGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, 140 - updateCounter * 14); + gDPPipeSync(gMainGfxPos++); + gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE); + gDPSetCombineMode(gMainGfxPos++, G_CC_PRIMITIVE, G_CC_PRIMITIVE); + gDPSetRenderMode(gMainGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, 140 - updateCounter * 14); filemenu_draw_rect(0, 0, 1280, 960, 0, 0, 0, 0, 0); *posY -= D_80249D48[updateCounter]; } else { @@ -784,16 +784,16 @@ void filemenu_draw_contents_copy_arrow(MenuPanel* menu, s32 baseX, s32 baseY, s3 temp_f28 = -atan2(startX, startZ, endX, endZ) - 90.0f; - gSPViewport(gMasterGfxPos++, &D_80249D60); + gSPViewport(gMainGfxPos++, &D_80249D60); guOrthoF(sp20, 0.0f, SCREEN_WIDTH, SCREEN_HEIGHT, 0.0f, -100.0f, 100.0f, 1.0f); guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - gSPDisplayList(gMasterGfxPos++, filemenu_dl_copyarrow); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, 128); - gDPSetEnvColor(gMasterGfxPos++, 0, 0, 0, 0); + gSPDisplayList(gMainGfxPos++, filemenu_dl_copyarrow); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, 128); + gDPSetEnvColor(gMainGfxPos++, 0, 0, 0, 0); guTranslateF(sp20, startX + 4.0f, startZ + 4.0f, 0.0f); guScaleF(sp60, -1.0f, 1.0f, 1.0f); @@ -802,23 +802,23 @@ void filemenu_draw_contents_copy_arrow(MenuPanel* menu, s32 baseX, s32 baseY, s3 guMtxCatF(sp60, sp20, sp20); guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_8024B6F0); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_8024B6F0); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); guTranslateF(sp60, D_80249D70[gGameStatusPtr->frameCounter % ARRAY_COUNT(D_80249D70)], 0.0f, 0.0f); guMtxCatF(sp60, sp20, sp20); guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetTileSize(gMasterGfxPos++, 1, (gGameStatusPtr->frameCounter * 8) % 512, 0, + gDPSetTileSize(gMainGfxPos++, 1, (gGameStatusPtr->frameCounter * 8) % 512, 0, ((gGameStatusPtr->frameCounter * 8) % 512) + 60, 0); - gSPDisplayList(gMasterGfxPos++, D_8024B708); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 230, 230, 230, 255); - gDPSetEnvColor(gMasterGfxPos++, 232, 40, 160, 0); + gSPDisplayList(gMainGfxPos++, D_8024B708); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 230, 230, 230, 255); + gDPSetEnvColor(gMainGfxPos++, 232, 40, 160, 0); guTranslateF(sp20, startX, startZ, 0.0f); guScaleF(sp60, -1.0f, 1.0f, 1.0f); @@ -827,21 +827,21 @@ void filemenu_draw_contents_copy_arrow(MenuPanel* menu, s32 baseX, s32 baseY, s3 guMtxCatF(sp60, sp20, sp20); guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_8024B6F0); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_8024B6F0); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); guTranslateF(sp60, D_80249D70[(gGameStatusPtr->frameCounter % ARRAY_COUNT(D_80249D70))], 0.0f, 0.0f); guMtxCatF(sp60, sp20, sp20); guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetTileSize(gMasterGfxPos++, 1, (gGameStatusPtr->frameCounter * 8) % 512, 0, + gDPSetTileSize(gMainGfxPos++, 1, (gGameStatusPtr->frameCounter * 8) % 512, 0, ((gGameStatusPtr->frameCounter * 8) % 512) + 60, 0); - gSPDisplayList(gMasterGfxPos++, D_8024B708); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, D_8024B708); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } } diff --git a/src/filemenu/filemenu_createfile.c b/src/filemenu/filemenu_createfile.c index 46db297038..f00727766a 100644 --- a/src/filemenu/filemenu_createfile.c +++ b/src/filemenu/filemenu_createfile.c @@ -143,14 +143,14 @@ void filemenu_draw_contents_choose_name( yOffset = 15 * row + 4; if (layer == 0) { page = currentPage; - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, baseX, baseY + yOffset, baseX + width, baseY + yOffset + changeLayoutOffset); } else { page = previousPage; - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, baseX, baseY + yOffset + changeLayoutOffset, baseX + width, @@ -194,7 +194,7 @@ void filemenu_draw_contents_choose_name( } } } - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, baseX, baseY, baseX + width, baseY + height); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, baseX, baseY, baseX + width, baseY + height); } else { for (col = 0; col < menu->numCols; col++) { for (row = 0; row < menu->numRows; row++) { diff --git a/src/filemenu/filemenu_msg.c b/src/filemenu/filemenu_msg.c index bac927c61f..3bbd0821e4 100644 --- a/src/filemenu/filemenu_msg.c +++ b/src/filemenu/filemenu_msg.c @@ -185,38 +185,38 @@ s32 filemenu_draw_char(s32 c, s32 x, s32 y, s32 flag1, s32 color, s32 flag2) { if (c < 0xA2) { charWidth = charData->charWidthTable[c]; - if (gMasterGfxPos != filemenu_savedGfxPos) { - gSPDisplayList(gMasterGfxPos++, filemenu_dl_draw_char_init); + if (gMainGfxPos != filemenu_savedGfxPos) { + gSPDisplayList(gMainGfxPos++, filemenu_dl_draw_char_init); filemenu_char_color = -1; } if (filemenu_char_color != color) { filemenu_char_color = color; - gDPLoadTLUT_pal16(gMasterGfxPos++, 0, D_802F4560[color]); + gDPLoadTLUT_pal16(gMainGfxPos++, 0, D_802F4560[color]); } if (texSizeX >= 16 && texSizeX % 16 == 0) { - gDPLoadTextureBlock_4b(gMasterGfxPos++, &raster[charRasterSize * c], G_IM_FMT_CI, + gDPLoadTextureBlock_4b(gMainGfxPos++, &raster[charRasterSize * c], G_IM_FMT_CI, texSizeX, texSizeY, 0, G_TX_WRAP, G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); } else { - gDPLoadTextureTile_4b(gMasterGfxPos++, &raster[charRasterSize * c], G_IM_FMT_CI, + gDPLoadTextureTile_4b(gMainGfxPos++, &raster[charRasterSize * c], G_IM_FMT_CI, texSizeX, texSizeY, 0, 0, texSizeX - 1, texSizeY - 1, 0, G_TX_WRAP, G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); } if (flag2) { - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); - gDPSetRenderMode(gMasterGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); + gDPSetRenderMode(gMainGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); filemenu_draw_rect((x + 2) * 4, (y + 2) * 4, (2 + x + texSizeX) * 4, (2 + y + texSizeY) * 4, 0, 0, 0, 0x400, 0x400); - gDPPipeSync(gMasterGfxPos++); - gDPSetCombineMode(gMasterGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); - gDPSetRenderMode(gMasterGfxPos++, G_RM_TEX_EDGE, G_RM_TEX_EDGE2); + gDPPipeSync(gMainGfxPos++); + gDPSetCombineMode(gMainGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); + gDPSetRenderMode(gMainGfxPos++, G_RM_TEX_EDGE, G_RM_TEX_EDGE2); } filemenu_draw_rect(x * 4, y * 4, (x + texSizeX) * 4, (y + texSizeY) * 4, 0, 0, 0, 0x400, 0x400); - filemenu_savedGfxPos = gMasterGfxPos; + filemenu_savedGfxPos = gMainGfxPos; return charWidth; } @@ -232,29 +232,29 @@ s32 filemenu_draw_char(s32 c, s32 x, s32 y, s32 flag1, s32 color, s32 flag2) { load_font_data(charset_standard_OFFSET + offset * 0x80, 0x80, &filemenu_glyphBuffer[*offsetPtr][0]); - if (gMasterGfxPos != filemenu_savedGfxPos) { - gSPDisplayList(gMasterGfxPos++, filemenu_dl_draw_char_init); + if (gMainGfxPos != filemenu_savedGfxPos) { + gSPDisplayList(gMainGfxPos++, filemenu_dl_draw_char_init); filemenu_char_color = -1; } if (filemenu_char_color != color) { filemenu_char_color = color; - gDPLoadTLUT_pal16(gMasterGfxPos++, 0, D_802F4560[color]); + gDPLoadTLUT_pal16(gMainGfxPos++, 0, D_802F4560[color]); } - gDPLoadTextureBlock_4b(gMasterGfxPos++, &filemenu_glyphBuffer[*offsetPtr][0], G_IM_FMT_CI, 16, 16, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); + gDPLoadTextureBlock_4b(gMainGfxPos++, &filemenu_glyphBuffer[*offsetPtr][0], G_IM_FMT_CI, 16, 16, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); if (flag2) { - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); - gDPSetRenderMode(gMasterGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); + gDPSetRenderMode(gMainGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); filemenu_draw_rect((x + 2) * 4, (y + 2) * 4, (x + 18) * 4, (y + 18) * 4, 0, 0, 0, 0x400, 0x400); - gDPPipeSync(gMasterGfxPos++); - gDPSetCombineMode(gMasterGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); - gDPSetRenderMode(gMasterGfxPos++, G_RM_TEX_EDGE, G_RM_TEX_EDGE2); + gDPPipeSync(gMainGfxPos++); + gDPSetCombineMode(gMainGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); + gDPSetRenderMode(gMainGfxPos++, G_RM_TEX_EDGE, G_RM_TEX_EDGE2); } filemenu_draw_rect(x * 4, y * 4, (x + 16) * 4, (y + 16) * 4, 0, 0, 0, 0x400, 0x400); - filemenu_savedGfxPos = gMasterGfxPos; + filemenu_savedGfxPos = gMainGfxPos; *offsetPtr = (*offsetPtr + 1) % 20; return 16; diff --git a/src/hud_element.c b/src/hud_element.c index 632fac2911..1f31282298 100644 --- a/src/hud_element.c +++ b/src/hud_element.c @@ -363,36 +363,36 @@ void hud_element_draw_rect(HudElement* hudElement, s16 texSizeX, s16 texSizeY, s switch (fmt) { case 0: - gDPSetRenderMode(gMasterGfxPos++, G_RM_XLU_SURF, G_RM_XLU_SURF2); - gDPSetTextureLUT(gMasterGfxPos++, G_TT_NONE); + gDPSetRenderMode(gMainGfxPos++, G_RM_XLU_SURF, G_RM_XLU_SURF2); + gDPSetTextureLUT(gMainGfxPos++, G_TT_NONE); break; case 1: if (!(hudElement->flags & HUD_ELEMENT_FLAG_TRANSPARENT)) { if (!(hudElement->flags & HUD_ELEMENT_FLAG_ANTIALIASING)) { - gDPSetRenderMode(gMasterGfxPos++, G_RM_TEX_EDGE, G_RM_TEX_EDGE2); + gDPSetRenderMode(gMainGfxPos++, G_RM_TEX_EDGE, G_RM_TEX_EDGE2); } else { - gDPSetRenderMode(gMasterGfxPos++, G_RM_AA_TEX_EDGE, G_RM_AA_TEX_EDGE2); + gDPSetRenderMode(gMainGfxPos++, G_RM_AA_TEX_EDGE, G_RM_AA_TEX_EDGE2); } } else { if (!(hudElement->flags & HUD_ELEMENT_FLAG_ANTIALIASING)) { - gDPSetRenderMode(gMasterGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); + gDPSetRenderMode(gMainGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); } else { - gDPSetRenderMode(gMasterGfxPos++, G_RM_CLD_SURF | AA_EN, G_RM_CLD_SURF2 | AA_EN); + gDPSetRenderMode(gMainGfxPos++, G_RM_CLD_SURF | AA_EN, G_RM_CLD_SURF2 | AA_EN); } } - gDPSetTextureLUT(gMasterGfxPos++, G_TT_RGBA16); - gDPLoadTLUT_pal16(gMasterGfxPos++, 0, paletteAddr); + gDPSetTextureLUT(gMainGfxPos++, G_TT_RGBA16); + gDPLoadTLUT_pal16(gMainGfxPos++, 0, paletteAddr); break; case 2: - gDPSetRenderMode(gMasterGfxPos++, G_RM_XLU_SURF, G_RM_XLU_SURF2); - gDPSetTextureLUT(gMasterGfxPos++, G_TT_NONE); + gDPSetRenderMode(gMainGfxPos++, G_RM_XLU_SURF, G_RM_XLU_SURF2); + gDPSetTextureLUT(gMainGfxPos++, G_TT_NONE); break; } if (hudElement->flags & HUD_ELEMENT_FLAG_FILTER_TEX) { - gDPSetTextureFilter(gMasterGfxPos++, G_TF_AVERAGE); + gDPSetTextureFilter(gMainGfxPos++, G_TF_AVERAGE); } else { - gDPSetTextureFilter(gMasterGfxPos++, G_TF_POINT); + gDPSetTextureFilter(gMainGfxPos++, G_TF_POINT); } ult = 0; @@ -465,7 +465,7 @@ void hud_element_draw_rect(HudElement* hudElement, s16 texSizeX, s16 texSizeY, s isLastTileX = TRUE; } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); if (isLastTileX ) { tileMode = !isLastTileY; @@ -482,112 +482,112 @@ void hud_element_draw_rect(HudElement* hudElement, s16 texSizeX, s16 texSizeY, s switch (fmt) { case 0: - gDPSetCombineMode(gMasterGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); + gDPSetCombineMode(gMainGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); if (!(hudElement->flags & HUD_ELEMENT_FLAG_TRANSPARENT)) { - gDPSetCombineMode(gMasterGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); + gDPSetCombineMode(gMainGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); } else { - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); } if (hudElement->flags & HUD_ELEMENT_FLAG_TRANSPARENT) { - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, hudElement->opacity); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, hudElement->opacity); } if (!flipX && !flipY) { - gDPLoadTextureTile(gMasterGfxPos++, imageAddr, G_IM_FMT_RGBA, G_IM_SIZ_32b, texSizeX, texSizeY, uls, ult, lrs, lrt, 0, + gDPLoadTextureTile(gMainGfxPos++, imageAddr, G_IM_FMT_RGBA, G_IM_SIZ_32b, texSizeX, texSizeY, uls, ult, lrs, lrt, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, masks, maskt, G_TX_NOLOD, G_TX_NOLOD); } else { - gDPLoadTextureTile(gMasterGfxPos++, imageAddr, G_IM_FMT_RGBA, G_IM_SIZ_32b, texSizeX, texSizeY, uls, ult, lrs, lrt, 0, + gDPLoadTextureTile(gMainGfxPos++, imageAddr, G_IM_FMT_RGBA, G_IM_SIZ_32b, texSizeX, texSizeY, uls, ult, lrs, lrt, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, masks, maskt, G_TX_NOLOD, G_TX_NOLOD); } break; case 1: if (!dropShadow) { if (hudElement->flags & HUD_ELEMENT_FLAG_TRANSPARENT) { - gDPSetCombineLERP(gMasterGfxPos++, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineLERP(gMainGfxPos++, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, TEXEL0, 0, PRIMITIVE, 0); } else { - gDPSetCombineLERP(gMasterGfxPos++, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineLERP(gMainGfxPos++, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, TEXEL0, 0, PRIMITIVE, 0); } if (hudElement->flags & HUD_ELEMENT_FLAG_TRANSPARENT) { - gDPSetPrimColor(gMasterGfxPos++, 0, 0, hudElement->tint.r, hudElement->tint.g, hudElement->tint.b, hudElement->opacity); + gDPSetPrimColor(gMainGfxPos++, 0, 0, hudElement->tint.r, hudElement->tint.g, hudElement->tint.b, hudElement->opacity); } else { - gDPSetPrimColor(gMasterGfxPos++, 0, 0, hudElement->tint.r, hudElement->tint.g, hudElement->tint.b, 255); + gDPSetPrimColor(gMainGfxPos++, 0, 0, hudElement->tint.r, hudElement->tint.g, hudElement->tint.b, 255); } } else { - gDPSetRenderMode(gMasterGfxPos++, G_RM_XLU_SURF, G_RM_XLU_SURF2); - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 40, 40, 40, 72); + gDPSetRenderMode(gMainGfxPos++, G_RM_XLU_SURF, G_RM_XLU_SURF2); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 40, 40, 40, 72); } if (!flipX && !flipY) { if (!clamp) { - gDPLoadTextureTile_4b(gMasterGfxPos++, imageAddr, G_IM_FMT_CI, texSizeX, texSizeY, uls, ult, lrs, lrt, 0, + gDPLoadTextureTile_4b(gMainGfxPos++, imageAddr, G_IM_FMT_CI, texSizeX, texSizeY, uls, ult, lrs, lrt, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, masks, maskt, G_TX_NOLOD, G_TX_NOLOD); } else { switch (tileMode) { case 0: - gDPLoadTextureTile_4b(gMasterGfxPos++, imageAddr, G_IM_FMT_CI, texSizeX, texSizeY, uls, ult, lrs, lrt, 0, + gDPLoadTextureTile_4b(gMainGfxPos++, imageAddr, G_IM_FMT_CI, texSizeX, texSizeY, uls, ult, lrs, lrt, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, masks, maskt, G_TX_NOLOD, G_TX_NOLOD); break; case 1: - gDPLoadTextureTile_4b(gMasterGfxPos++, imageAddr, G_IM_FMT_CI, texSizeX, texSizeY, uls, ult, lrs, lrt, 0, + gDPLoadTextureTile_4b(gMainGfxPos++, imageAddr, G_IM_FMT_CI, texSizeX, texSizeY, uls, ult, lrs, lrt, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, masks, maskt, G_TX_NOLOD, G_TX_NOLOD); break; case 2: - gDPLoadTextureTile_4b(gMasterGfxPos++, imageAddr, G_IM_FMT_CI, texSizeX, texSizeY, uls, ult, lrs, lrt, 0, + gDPLoadTextureTile_4b(gMainGfxPos++, imageAddr, G_IM_FMT_CI, texSizeX, texSizeY, uls, ult, lrs, lrt, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, masks, maskt, G_TX_NOLOD, G_TX_NOLOD); break; case 3: - gDPLoadTextureTile_4b(gMasterGfxPos++, imageAddr, G_IM_FMT_CI, texSizeX, texSizeY, uls, ult, lrs, lrt, 0, + gDPLoadTextureTile_4b(gMainGfxPos++, imageAddr, G_IM_FMT_CI, texSizeX, texSizeY, uls, ult, lrs, lrt, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, masks, maskt, G_TX_NOLOD, G_TX_NOLOD); break; } } } else { - gDPLoadTextureTile_4b(gMasterGfxPos++, imageAddr, G_IM_FMT_CI, texSizeX, texSizeY, uls, ult, lrs, lrt, 0, + gDPLoadTextureTile_4b(gMainGfxPos++, imageAddr, G_IM_FMT_CI, texSizeX, texSizeY, uls, ult, lrs, lrt, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, masks, maskt, G_TX_NOLOD, G_TX_NOLOD); } break; case 2: - gDPSetCombineLERP(gMasterGfxPos++, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, 0, TEXEL0, 0, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, 0, TEXEL0, 0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, hudElement->tint.r, hudElement->tint.g, hudElement->tint.b, hudElement->opacity); + gDPSetCombineLERP(gMainGfxPos++, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, 0, TEXEL0, 0, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, 0, TEXEL0, 0); + gDPSetPrimColor(gMainGfxPos++, 0, 0, hudElement->tint.r, hudElement->tint.g, hudElement->tint.b, hudElement->opacity); if (!flipX && !flipY) { if (!clamp) { switch (tileMode) { case 0: - gDPLoadTextureTile(gMasterGfxPos++, imageAddr, G_IM_FMT_IA, G_IM_SIZ_8b, texSizeX, texSizeY, uls, ult, lrs, lrt, 0, + gDPLoadTextureTile(gMainGfxPos++, imageAddr, G_IM_FMT_IA, G_IM_SIZ_8b, texSizeX, texSizeY, uls, ult, lrs, lrt, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, masks, maskt, G_TX_NOLOD, G_TX_NOLOD); break; case 1: - gDPLoadTextureTile(gMasterGfxPos++, imageAddr, G_IM_FMT_IA, G_IM_SIZ_8b, texSizeX, texSizeY, uls, ult, lrs, lrt, 0, + gDPLoadTextureTile(gMainGfxPos++, imageAddr, G_IM_FMT_IA, G_IM_SIZ_8b, texSizeX, texSizeY, uls, ult, lrs, lrt, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, masks, maskt, G_TX_NOLOD, G_TX_NOLOD); break; case 2: - gDPLoadTextureTile(gMasterGfxPos++, imageAddr, G_IM_FMT_IA, G_IM_SIZ_8b, texSizeX, texSizeY, uls, ult, lrs, lrt, 0, + gDPLoadTextureTile(gMainGfxPos++, imageAddr, G_IM_FMT_IA, G_IM_SIZ_8b, texSizeX, texSizeY, uls, ult, lrs, lrt, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, masks, maskt, G_TX_NOLOD, G_TX_NOLOD); break; case 3: - gDPLoadTextureTile(gMasterGfxPos++, imageAddr, G_IM_FMT_IA, G_IM_SIZ_8b, texSizeX, texSizeY, uls, ult, lrs, lrt, 0, + gDPLoadTextureTile(gMainGfxPos++, imageAddr, G_IM_FMT_IA, G_IM_SIZ_8b, texSizeX, texSizeY, uls, ult, lrs, lrt, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, masks, maskt, G_TX_NOLOD, G_TX_NOLOD); break; } } else { - gDPLoadTextureTile(gMasterGfxPos++, imageAddr, G_IM_FMT_IA, G_IM_SIZ_8b, texSizeX, texSizeY, uls, ult, lrs, lrt, 0, + gDPLoadTextureTile(gMainGfxPos++, imageAddr, G_IM_FMT_IA, G_IM_SIZ_8b, texSizeX, texSizeY, uls, ult, lrs, lrt, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, masks, maskt, G_TX_NOLOD, G_TX_NOLOD); } } else { - gDPLoadTextureTile(gMasterGfxPos++, imageAddr, G_IM_FMT_IA, G_IM_SIZ_8b, texSizeX, texSizeY, uls, ult, lrs, lrt, 0, + gDPLoadTextureTile(gMainGfxPos++, imageAddr, G_IM_FMT_IA, G_IM_SIZ_8b, texSizeX, texSizeY, uls, ult, lrs, lrt, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, masks, maskt, G_TX_NOLOD, G_TX_NOLOD); } break; } if (hudElement->flags & HUD_ELEMENT_FLAG_FILTER_TEX) { - gSPScisTextureRectangle(gMasterGfxPos++, ulx * 4, uly * 4, lrx * 4, lry * 4, 0, texStartX * 32 + 16, texStartY * 32 + 16, widthScale, heightScale); + gSPScisTextureRectangle(gMainGfxPos++, ulx * 4, uly * 4, lrx * 4, lry * 4, 0, texStartX * 32 + 16, texStartY * 32 + 16, widthScale, heightScale); } else { - gSPScisTextureRectangle(gMasterGfxPos++, ulx * 4, uly * 4, lrx * 4, lry * 4, 0, texStartX * 32, texStartY * 32, widthScale, heightScale); + gSPScisTextureRectangle(gMainGfxPos++, ulx * 4, uly * 4, lrx * 4, lry * 4, 0, texStartX * 32, texStartY * 32, widthScale, heightScale); } if (isLastTileX) { break; @@ -604,7 +604,7 @@ void hud_element_draw_rect(HudElement* hudElement, s16 texSizeX, s16 texSizeY, s uly += 1024.0 / heightScale * 32.0; } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } void hud_element_clear_cache(void) { @@ -1179,7 +1179,7 @@ void render_hud_elements_backUI(void) { if (D_80159180 > 2) { D_80159180 = 0; } - gSPDisplayList(gMasterGfxPos++, VIRTUAL_TO_PHYSICAL(gHudElementsDLBackUI)); + gSPDisplayList(gMainGfxPos++, VIRTUAL_TO_PHYSICAL(gHudElementsDLBackUI)); count = 0; for (i = 0; i < ARRAY_COUNT(*gHudElements); i++) { @@ -1299,7 +1299,7 @@ void render_hud_elements_frontUI(void) { s32 drawSizeX, drawSizeY, offsetX, offsetY; HudElement* hudElement; - gSPDisplayList(gMasterGfxPos++, VIRTUAL_TO_PHYSICAL(gHudElementsDLFrontUI)); + gSPDisplayList(gMainGfxPos++, VIRTUAL_TO_PHYSICAL(gHudElementsDLFrontUI)); count = 0; for (i = 0; i < ARRAY_COUNT(*gHudElements); i++) { @@ -1434,9 +1434,9 @@ void render_hud_element(HudElement* hudElement) { Vtx* vtx; if (hudElement->flags & HUD_ELEMENT_FLAG_FILTER_TEX) { - gDPSetTextureFilter(gMasterGfxPos++, G_TF_AVERAGE); + gDPSetTextureFilter(gMainGfxPos++, G_TF_AVERAGE); } else { - gDPSetTextureFilter(gMasterGfxPos++, G_TF_POINT); + gDPSetTextureFilter(gMainGfxPos++, G_TF_POINT); } if (!(hudElement->flags & HUD_ELEMENT_FLAG_FIXEDSCALE)) { @@ -1485,7 +1485,7 @@ void render_hud_element(HudElement* hudElement) { guMtxCatF(sp60, sp220, sp20); guMtxCatF(sp20, sp1A0, sp60); guMtxF2L(sp60, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); mode = 0; a0 = mode; @@ -1578,36 +1578,36 @@ void render_hud_element(HudElement* hudElement) { vtx[3].v.tc[0] = 0; vtx[3].v.tc[1] = 0; - gDPPipeSync(gMasterGfxPos++); - gDPSetCombineLERP(gMasterGfxPos++, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, 0, TEXEL0, 0, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, 0, TEXEL0, 0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, hudElement->tint.r, hudElement->tint.g, hudElement->tint.b, hudElement->opacity); + gDPPipeSync(gMainGfxPos++); + gDPSetCombineLERP(gMainGfxPos++, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, 0, TEXEL0, 0, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, 0, TEXEL0, 0); + gDPSetPrimColor(gMainGfxPos++, 0, 0, hudElement->tint.r, hudElement->tint.g, hudElement->tint.b, hudElement->opacity); if (!(hudElement->flags & HUD_ELEMENT_FLAG_TRANSPARENT)) { if (!(hudElement->flags & HUD_ELEMENT_FLAG_ANTIALIASING)) { - gDPSetRenderMode(gMasterGfxPos++, G_RM_TEX_EDGE, G_RM_TEX_EDGE2); + gDPSetRenderMode(gMainGfxPos++, G_RM_TEX_EDGE, G_RM_TEX_EDGE2); } else { - gDPSetRenderMode(gMasterGfxPos++, G_RM_AA_TEX_EDGE, G_RM_AA_TEX_EDGE2); + gDPSetRenderMode(gMainGfxPos++, G_RM_AA_TEX_EDGE, G_RM_AA_TEX_EDGE2); } } else { if (!(hudElement->flags & HUD_ELEMENT_FLAG_ANTIALIASING)) { - gDPSetRenderMode(gMasterGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); + gDPSetRenderMode(gMainGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); } else { - gDPSetRenderMode(gMasterGfxPos++, AA_EN | G_RM_CLD_SURF, AA_EN | G_RM_CLD_SURF2); + gDPSetRenderMode(gMainGfxPos++, AA_EN | G_RM_CLD_SURF, AA_EN | G_RM_CLD_SURF2); } } - gDPLoadTextureBlock(gMasterGfxPos++, hudElement->imageAddr, G_IM_FMT_IA, G_IM_SIZ_8b, width, height, 0, + gDPLoadTextureBlock(gMainGfxPos++, hudElement->imageAddr, G_IM_FMT_IA, G_IM_SIZ_8b, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gDPSetTextureLUT(gMasterGfxPos++, G_TT_NONE); - gSPVertex(gMasterGfxPos++, &transform->unk_30[D_80159180], 4, 0); - gSP1Triangle(gMasterGfxPos++, 0, 1, 2, 0); - gSP1Triangle(gMasterGfxPos++, 0, 2, 3, 0); + gDPSetTextureLUT(gMainGfxPos++, G_TT_NONE); + gSPVertex(gMainGfxPos++, &transform->unk_30[D_80159180], 4, 0); + gSP1Triangle(gMainGfxPos++, 0, 1, 2, 0); + gSP1Triangle(gMainGfxPos++, 0, 2, 3, 0); break; } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPPipeSync(gMasterGfxPos++); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMainGfxPos++); } #else INCLUDE_ASM(void, "hud_element", render_hud_element, HudElement* hudElement); @@ -1657,14 +1657,14 @@ void render_hud_elements_world(void) { } } - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 12, 20, 308, 220); - gDPPipeSync(gMasterGfxPos++); - gSPClearGeometryMode(gMasterGfxPos++, G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); - gSPSetGeometryMode(gMasterGfxPos++, G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH); - gSPSetLights1(gMasterGfxPos++, D_8014F108); - gSPTexture(gMasterGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); - gDPSetAlphaCompare(gMasterGfxPos++, G_AC_NONE); - gSPSetOtherMode(gMasterGfxPos++, G_SETOTHERMODE_H, G_MDSFT_ALPHADITHER, 18, G_AD_DISABLE | G_CD_DISABLE | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, 12, 20, 308, 220); + gDPPipeSync(gMainGfxPos++); + gSPClearGeometryMode(gMainGfxPos++, G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); + gSPSetGeometryMode(gMainGfxPos++, G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH); + gSPSetLights1(gMainGfxPos++, D_8014F108); + gSPTexture(gMainGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); + gDPSetAlphaCompare(gMainGfxPos++, G_AC_NONE); + gSPSetOtherMode(gMainGfxPos++, G_SETOTHERMODE_H, G_MDSFT_ALPHADITHER, 18, G_AD_DISABLE | G_CD_DISABLE | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE); for (i = 0; i < count; i++) { render_hud_element((*gHudElements)[sortedElements[i]]); @@ -1705,14 +1705,14 @@ void render_hud_elements_world(void) { } } - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 12, 20, 308, 220); - gDPPipeSync(gMasterGfxPos++); - gSPClearGeometryMode(gMasterGfxPos++, G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); - gSPSetGeometryMode(gMasterGfxPos++, G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH); - gSPSetLights1(gMasterGfxPos++, D_8014F108); - gSPTexture(gMasterGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); - gDPSetAlphaCompare(gMasterGfxPos++, G_AC_NONE); - gSPSetOtherMode(gMasterGfxPos++, G_SETOTHERMODE_H, G_MDSFT_ALPHADITHER, 18, G_AD_DISABLE | G_CD_DISABLE | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, 12, 20, 308, 220); + gDPPipeSync(gMainGfxPos++); + gSPClearGeometryMode(gMainGfxPos++, G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); + gSPSetGeometryMode(gMainGfxPos++, G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH); + gSPSetLights1(gMainGfxPos++, D_8014F108); + gSPTexture(gMainGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); + gDPSetAlphaCompare(gMainGfxPos++, G_AC_NONE); + gSPSetOtherMode(gMainGfxPos++, G_SETOTHERMODE_H, G_MDSFT_ALPHADITHER, 18, G_AD_DISABLE | G_CD_DISABLE | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE); for (i = 0; i < count; i++) { render_hud_element((*gHudElements)[sortedElements[i]]); @@ -1733,49 +1733,49 @@ void func_80143C48(s32 elemID, s32 arg1, s32 camID) { gCurrentCamID = camID; - gSPViewport(gMasterGfxPos++, &camera->vp); - gSPClearGeometryMode(gMasterGfxPos++, G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | + gSPViewport(gMainGfxPos++, &camera->vp); + gSPClearGeometryMode(gMainGfxPos++, G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); - gSPTexture(gMasterGfxPos++, 0, 0, 0, G_TX_RENDERTILE, G_OFF); - gDPPipelineMode(gMasterGfxPos++, G_PM_NPRIMITIVE); - gDPSetTextureLUT(gMasterGfxPos++, G_TT_NONE); - gDPSetTextureFilter(gMasterGfxPos++, G_TF_BILERP); - gDPSetCombineMode(gMasterGfxPos++, G_CC_SHADE, G_CC_SHADE); - gDPSetRenderMode(gMasterGfxPos++, G_RM_OPA_SURF, G_RM_OPA_SURF2); - gSPClipRatio(gMasterGfxPos++, FRUSTRATIO_2); - gDPPipeSync(gMasterGfxPos++); + gSPTexture(gMainGfxPos++, 0, 0, 0, G_TX_RENDERTILE, G_OFF); + gDPPipelineMode(gMainGfxPos++, G_PM_NPRIMITIVE); + gDPSetTextureLUT(gMainGfxPos++, G_TT_NONE); + gDPSetTextureFilter(gMainGfxPos++, G_TF_BILERP); + gDPSetCombineMode(gMainGfxPos++, G_CC_SHADE, G_CC_SHADE); + gDPSetRenderMode(gMainGfxPos++, G_RM_OPA_SURF, G_RM_OPA_SURF2); + gSPClipRatio(gMainGfxPos++, FRUSTRATIO_2); + gDPPipeSync(gMainGfxPos++); //clear Z buffer inside camera viewport - gDPSetCycleType(gMasterGfxPos++, G_CYC_FILL); - gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(nuGfxZBuffer)); - gDPSetFillColor(gMasterGfxPos++, GPACK_ZDZ(G_MAXFBZ, 0)<<16 | GPACK_ZDZ(G_MAXFBZ, 0)); - gDPFillRectangle(gMasterGfxPos++, camera->viewportStartX, camera->viewportStartY, + gDPSetCycleType(gMainGfxPos++, G_CYC_FILL); + gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(nuGfxZBuffer)); + gDPSetFillColor(gMainGfxPos++, GPACK_ZDZ(G_MAXFBZ, 0)<<16 | GPACK_ZDZ(G_MAXFBZ, 0)); + gDPFillRectangle(gMainGfxPos++, camera->viewportStartX, camera->viewportStartY, camera->viewportStartX + camera->viewportW - 1, camera->viewportStartY + camera->viewportH - 1); - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); - gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(nuGfxCfb_ptr)); - gDPPipeSync(gMasterGfxPos++); + gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(nuGfxCfb_ptr)); + gDPPipeSync(gMainGfxPos++); guOrthoF(camera->perspectiveMatrix, 0.0f, 320.0f, -240.0f, 0.0f, -1000.0f, 1000.0f, 1.0f); guMtxF2L(camera->perspectiveMatrix, &gDisplayContext->camPerspMatrix[gCurrentCamID]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCamID], G_MTX_NOPUSH | G_MTX_LOAD | + gSPMatrix(gMainGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCamID], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 12, 20, 308, 220); - gDPPipeSync(gMasterGfxPos++); - gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); - gSPClearGeometryMode(gMasterGfxPos++, G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, 12, 20, 308, 220); + gDPPipeSync(gMainGfxPos++); + gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE); + gSPClearGeometryMode(gMainGfxPos++, G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); - gSPSetGeometryMode(gMasterGfxPos++, G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH); - gSPSetLights1(gMasterGfxPos++, D_8014F108); - gSPTexture(gMasterGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); - gDPSetTextureLOD(gMasterGfxPos++, G_TL_TILE); - gDPSetTexturePersp(gMasterGfxPos++, G_TP_PERSP); - gDPSetColorDither(gMasterGfxPos++, G_CD_DISABLE); - gDPSetTextureDetail(gMasterGfxPos++, G_TD_CLAMP); - gDPSetTextureConvert(gMasterGfxPos++, G_TC_FILT); - gDPSetCombineKey(gMasterGfxPos++, G_CK_NONE); - gDPSetAlphaCompare(gMasterGfxPos++, G_AC_NONE); + gSPSetGeometryMode(gMainGfxPos++, G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH); + gSPSetLights1(gMainGfxPos++, D_8014F108); + gSPTexture(gMainGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); + gDPSetTextureLOD(gMainGfxPos++, G_TL_TILE); + gDPSetTexturePersp(gMainGfxPos++, G_TP_PERSP); + gDPSetColorDither(gMainGfxPos++, G_CD_DISABLE); + gDPSetTextureDetail(gMainGfxPos++, G_TD_CLAMP); + gDPSetTextureConvert(gMainGfxPos++, G_TC_FILT); + gDPSetCombineKey(gMainGfxPos++, G_CK_NONE); + gDPSetAlphaCompare(gMainGfxPos++, G_AC_NONE); } if (elemID >= 0) { @@ -1825,20 +1825,20 @@ void draw_hud_element_internal(s32 id, s32 clipMode) { if (!(elem->flags & (HUD_ELEMENT_FLAG_200000 | HUD_ELEMENT_FLAG_10000000)) && (elem->drawSizePreset >= 0)) { if (clipMode != HUD_ELEMENT_DRAW_NEXT) { if (clipMode == HUD_ELEMENT_DRAW_FIRST_WITH_CLIPPING) { - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 12, 20, SCREEN_WIDTH - 12, SCREEN_HEIGHT - 20); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, 12, 20, SCREEN_WIDTH - 12, SCREEN_HEIGHT - 20); } - gDPPipeSync(gMasterGfxPos++); - gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); - gDPSetTexturePersp(gMasterGfxPos++, G_TP_NONE); - gDPSetTextureLOD(gMasterGfxPos++, G_TL_TILE); - gDPSetTextureDetail(gMasterGfxPos++, G_TD_CLAMP); - gDPSetTextureConvert(gMasterGfxPos++, G_TC_FILT); - gDPSetCombineKey(gMasterGfxPos++, G_CK_NONE); - gDPSetAlphaCompare(gMasterGfxPos++, G_AC_NONE); - gDPNoOp(gMasterGfxPos++); - gDPSetColorDither(gMasterGfxPos++, G_CD_DISABLE); - gDPSetAlphaDither(gMasterGfxPos++, G_AD_DISABLE); - gSPTexture(gMasterGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); + gDPPipeSync(gMainGfxPos++); + gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE); + gDPSetTexturePersp(gMainGfxPos++, G_TP_NONE); + gDPSetTextureLOD(gMainGfxPos++, G_TL_TILE); + gDPSetTextureDetail(gMainGfxPos++, G_TD_CLAMP); + gDPSetTextureConvert(gMainGfxPos++, G_TC_FILT); + gDPSetCombineKey(gMainGfxPos++, G_CK_NONE); + gDPSetAlphaCompare(gMainGfxPos++, G_AC_NONE); + gDPNoOp(gMainGfxPos++); + gDPSetColorDither(gMainGfxPos++, G_CD_DISABLE); + gDPSetAlphaDither(gMainGfxPos++, G_AD_DISABLE); + gSPTexture(gMainGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); } if (!(elem->flags & HUD_ELEMENT_FLAG_FIXEDSCALE)) { diff --git a/src/i_spy.c b/src/i_spy.c index 111abe03b5..7a22346911 100644 --- a/src/i_spy.c +++ b/src/i_spy.c @@ -44,8 +44,8 @@ void appendGfx_ispy_icon(void) { guMtxCatF(matrix1, matrix2, matrix2); guMtxF2L(matrix2, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], 3); - gSPDisplayList(gMasterGfxPos++, ispy_icon_gfx); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], 3); + gSPDisplayList(gMainGfxPos++, ispy_icon_gfx); if (ISpyPtr->time < 47) { ISpyPtr->flashCount++; @@ -83,7 +83,7 @@ void appendGfx_ispy_icon(void) { foldImage.opacity = 255; fold_appendGfx_component(0, &foldImage, 0, matrix2); - gSPPopMatrix(gMasterGfxPos++, 0); + gSPPopMatrix(gMainGfxPos++, 0); } } diff --git a/src/inspect_icon.c b/src/inspect_icon.c index 102709a79c..a393f83eb0 100644 --- a/src/inspect_icon.c +++ b/src/inspect_icon.c @@ -69,9 +69,9 @@ void appendGfx_interact_prompt(void) { guMtxCatF(sp38, sp78, sp78); guMtxF2L(sp78, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, &inspect_icon_gfx); + gSPDisplayList(gMainGfxPos++, &inspect_icon_gfx); sp20.raster = inspect_icon_img; sp20.palette = inspect_icon_pal; @@ -85,7 +85,7 @@ void appendGfx_interact_prompt(void) { InspectIconPtr->brightness, InspectIconPtr->brightness, InspectIconPtr->brightness, 255, 0x448); fold_appendGfx_component(0, &sp20, 0, sp78); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } diff --git a/src/main.c b/src/main.c index 12d4c44172..9ffa45bc66 100644 --- a/src/main.c +++ b/src/main.c @@ -118,23 +118,23 @@ void gfx_task_main(void) { gMatrixListPos = 0; gDisplayContext = &D_80164000[gCurrentDisplayContextIndex]; - gMasterGfxPos = gDisplayContext->mainGfx; + gMainGfxPos = gDisplayContext->mainGfx; temp = D_80073E04; gfx_init_state(); - gDPSetDepthImage(gMasterGfxPos++, OS_K0_TO_PHYSICAL(nuGfxZBuffer)); - gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(temp)); - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); - gSPTexture(gMasterGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); - gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); - gDPSetTexturePersp(gMasterGfxPos++, G_TP_NONE); - gDPSetTextureLUT(gMasterGfxPos++, G_TT_NONE); - gDPSetRenderMode(gMasterGfxPos++, G_RM_OPA_SURF, G_RM_OPA_SURF2); - gDPSetTextureFilter(gMasterGfxPos++, G_TF_POINT); - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, 0, 0, 0, 0, TEXEL0, 0, 0, 0, 0, 0, 0, 0, TEXEL0); - gDPSetAlphaCompare(gMasterGfxPos++, G_AC_THRESHOLD); - gDPSetBlendColor(gMasterGfxPos++, 0, 0, 0, 127); - gDPLoadTextureTile_4b(gMasterGfxPos++, D_80073E10, G_IM_FMT_I, 128, 8, 0, 0, 127, 7, 0, G_TX_NOMIRROR | G_TX_WRAP, + gDPSetDepthImage(gMainGfxPos++, OS_K0_TO_PHYSICAL(nuGfxZBuffer)); + gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(temp)); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); + gSPTexture(gMainGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); + gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE); + gDPSetTexturePersp(gMainGfxPos++, G_TP_NONE); + gDPSetTextureLUT(gMainGfxPos++, G_TT_NONE); + gDPSetRenderMode(gMainGfxPos++, G_RM_OPA_SURF, G_RM_OPA_SURF2); + gDPSetTextureFilter(gMainGfxPos++, G_TF_POINT); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, 0, 0, 0, 0, TEXEL0, 0, 0, 0, 0, 0, 0, 0, TEXEL0); + gDPSetAlphaCompare(gMainGfxPos++, G_AC_THRESHOLD); + gDPSetBlendColor(gMainGfxPos++, 0, 0, 0, 127); + gDPLoadTextureTile_4b(gMainGfxPos++, D_80073E10, G_IM_FMT_I, 128, 8, 0, 0, 127, 7, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); for (i = 0; i < 20; i++) { @@ -147,25 +147,25 @@ void gfx_task_main(void) { if (t < 0) { continue; } - gSPTextureRectangle(gMasterGfxPos++, ((i * 8) + 160) * 4, + gSPTextureRectangle(gMainGfxPos++, ((i * 8) + 160) * 4, ((j * 8)) * 4, ((i * 8) + 168) * 4, ((j * 8) + 8) * 4, G_TX_RENDERTILE, (t * 8) * 32, 0, 0x0400, 0x0400); - gSPTextureRectangle(gMasterGfxPos++, ((i * 8) + 160) * 4, + gSPTextureRectangle(gMainGfxPos++, ((i * 8) + 160) * 4, (232 - (j * 8)) * 4, ((i * 8) + 168) * 4, (240 - (j * 8)) * 4, G_TX_RENDERTILE, (t * 8) * 32, 7 * 32, 0x0400, -0x0400); - gSPTextureRectangle(gMasterGfxPos++, (152 - (i * 8)) * 4, + gSPTextureRectangle(gMainGfxPos++, (152 - (i * 8)) * 4, ((j * 8)) * 4, (160 - (i * 8)) * 4, ((j * 8) + 8) * 4, G_TX_RENDERTILE, (t * 8 + 7) * 32, 0, -0x0400, 0x0400); - gSPTextureRectangle(gMasterGfxPos++, (152 - (i * 8)) * 4, + gSPTextureRectangle(gMainGfxPos++, (152 - (i * 8)) * 4, (232 - (j * 8)) * 4, (160 - (i * 8)) * 4, (240 - (j * 8)) * 4, @@ -175,9 +175,9 @@ void gfx_task_main(void) { } D_80074010++; - gDPFullSync(gMasterGfxPos++); - gSPEndDisplayList(gMasterGfxPos++); - nuGfxTaskStart(gDisplayContext->mainGfx, (u32)(gMasterGfxPos - gDisplayContext->mainGfx) * 8, NU_GFX_UCODE_F3DEX, NU_SC_TASK_LODABLE); + gDPFullSync(gMainGfxPos++); + gSPEndDisplayList(gMainGfxPos++); + nuGfxTaskStart(gDisplayContext->mainGfx, (u32)(gMainGfxPos - gDisplayContext->mainGfx) * 8, NU_GFX_UCODE_F3DEX, NU_SC_TASK_LODABLE); gCurrentDisplayContextIndex ^= 1; } diff --git a/src/main_loop.c b/src/main_loop.c index 6fb97720f3..03901e0ddf 100644 --- a/src/main_loop.c +++ b/src/main_loop.c @@ -157,32 +157,32 @@ void step_game_loop(void) { void gfx_task_background(void) { gDisplayContext = &D_80164000[gCurrentDisplayContextIndex]; - gMasterGfxPos = &gDisplayContext->backgroundGfx[0]; + gMainGfxPos = &gDisplayContext->backgroundGfx[0]; gfx_init_state(); gfx_draw_background(); - gDPFullSync(gMasterGfxPos++); - gSPEndDisplayList(gMasterGfxPos++); + gDPFullSync(gMainGfxPos++); + gSPEndDisplayList(gMainGfxPos++); // TODO these << 3 >> 3 shouldn't be necessary. There's almost definitely something we're missing here... - ASSERT((s32)((u32)((gMasterGfxPos - gDisplayContext->backgroundGfx) << 3) >> 3) < ARRAY_COUNT( + ASSERT((s32)((u32)((gMainGfxPos - gDisplayContext->backgroundGfx) << 3) >> 3) < ARRAY_COUNT( gDisplayContext->backgroundGfx)) - nuGfxTaskStart(&gDisplayContext->backgroundGfx[0], (u32)(gMasterGfxPos - gDisplayContext->backgroundGfx) * 8, + nuGfxTaskStart(&gDisplayContext->backgroundGfx[0], (u32)(gMainGfxPos - gDisplayContext->backgroundGfx) * 8, NU_GFX_UCODE_F3DEX2, NU_SC_NOSWAPBUFFER); } void gfx_draw_frame(void) { gMatrixListPos = 0; - gMasterGfxPos = &gDisplayContext->mainGfx[0]; + gMainGfxPos = &gDisplayContext->mainGfx[0]; if (gOverrideFlags & GLOBAL_OVERRIDES_8) { gCurrentDisplayContextIndex = gCurrentDisplayContextIndex ^ 1; return; } - gSPMatrix(gMasterGfxPos++, &MasterIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &MasterIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); spr_render_init(); @@ -238,12 +238,12 @@ void gfx_draw_frame(void) { } } - ASSERT((s32)(((u32)(gMasterGfxPos - gDisplayContext->mainGfx) << 3) >> 3) < ARRAY_COUNT(gDisplayContext->mainGfx)); + ASSERT((s32)(((u32)(gMainGfxPos - gDisplayContext->mainGfx) << 3) >> 3) < ARRAY_COUNT(gDisplayContext->mainGfx)); - gDPFullSync(gMasterGfxPos++); - gSPEndDisplayList(gMasterGfxPos++); + gDPFullSync(gMainGfxPos++); + gSPEndDisplayList(gMainGfxPos++); - nuGfxTaskStart(gDisplayContext->mainGfx, (u32)(gMasterGfxPos - gDisplayContext->mainGfx) * 8, NU_GFX_UCODE_F3DEX2, + nuGfxTaskStart(gDisplayContext->mainGfx, (u32)(gMainGfxPos - gDisplayContext->mainGfx) * 8, NU_GFX_UCODE_F3DEX2, NU_SC_TASK_LODABLE | NU_SC_SWAPBUFFER); gCurrentDisplayContextIndex = gCurrentDisplayContextIndex ^ 1; crash_screen_set_draw_info(nuGfxCfb_ptr, SCREEN_WIDTH, SCREEN_HEIGHT); diff --git a/src/msg.c b/src/msg.c index 762c63f66c..60055dd6f3 100644 --- a/src/msg.c +++ b/src/msg.c @@ -613,14 +613,14 @@ void render_messages(void) { for (i = 0; i < ARRAY_COUNT(gMessagePrinters); i++) { if (gMessagePrinters[i].stateFlags & MSG_STATE_FLAG_2) { - gSPViewport(gMasterGfxPos++, D_8014C280); + gSPViewport(gMainGfxPos++, D_8014C280); guOrtho(matrix, 0.0f, 319.0f, -240.0f, 0.0f, -500.0f, 500.0f, 1.0f); - gSPMatrix(gMasterGfxPos++, OS_K0_TO_PHYSICAL(matrix), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - gDPPipeSync(gMasterGfxPos++); - gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); - gSPClearGeometryMode(gMasterGfxPos++, G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | + gSPMatrix(gMainGfxPos++, OS_K0_TO_PHYSICAL(matrix), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gDPPipeSync(gMainGfxPos++); + gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE); + gSPClearGeometryMode(gMainGfxPos++, G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); - gSPSetGeometryMode(gMasterGfxPos++, G_SHADE | G_SHADING_SMOOTH); + gSPSetGeometryMode(gMainGfxPos++, G_SHADE | G_SHADING_SMOOTH); break; } } @@ -2061,8 +2061,8 @@ void msg_update_rewind_arrow(s32 printerIndex) { Matrix4f sp58; f32 temp; - gDPPipeSync(gMasterGfxPos++); - gSPDisplayList(gMasterGfxPos++, D_8014C2D8); + gDPPipeSync(gMainGfxPos++); + gSPDisplayList(gMainGfxPos++, D_8014C2D8); switch (printer->rewindArrowAnimState) { case REWIND_ARROW_STATE_INIT: @@ -2104,7 +2104,7 @@ void msg_update_rewind_arrow(s32 printerIndex) { break; } - gDPSetPrimColor(gMasterGfxPos++, 0, 0, colorR, colorG, colorB, 255); + gDPSetPrimColor(gMainGfxPos++, 0, 0, colorR, colorG, colorB, 255); if (printer->rewindArrowAnimState == REWIND_ARROW_STATE_NEUTRAL || printer->rewindArrowAnimState == REWIND_ARROW_STATE_CHANGE_COLOR || @@ -2127,11 +2127,11 @@ void msg_update_rewind_arrow(s32 printerIndex) { } guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPLoadTextureTile(gMasterGfxPos++, ui_msg_star_png, G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0, 0, 0, 15, 17, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 4, 4, G_TX_NOLOD, G_TX_NOLOD); - gDPLoadMultiTile_4b(gMasterGfxPos++, ui_msg_star_silhouette_png, 0x0100, 1, G_IM_FMT_I, 16, 0, 0, 0, 15, 18, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 4, 5, G_TX_NOLOD, G_TX_NOLOD); - gSPVertex(gMasterGfxPos++, gRewindArrowQuad, 4, 0); - gSP2Triangles(gMasterGfxPos++, 0, 2, 1, 0, 1, 2, 3, 0); + gSPMatrix(gMainGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gDPLoadTextureTile(gMainGfxPos++, ui_msg_star_png, G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0, 0, 0, 15, 17, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 4, 4, G_TX_NOLOD, G_TX_NOLOD); + gDPLoadMultiTile_4b(gMainGfxPos++, ui_msg_star_silhouette_png, 0x0100, 1, G_IM_FMT_I, 16, 0, 0, 0, 15, 18, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 4, 5, G_TX_NOLOD, G_TX_NOLOD); + gSPVertex(gMainGfxPos++, gRewindArrowQuad, 4, 0); + gSP2Triangles(gMainGfxPos++, 0, 2, 1, 0, 1, 2, 3, 0); } void msg_draw_rewind_arrow(s32 printerIndex) { @@ -2182,12 +2182,12 @@ void msg_draw_choice_pointer(MessagePrintState* printer) { shadowAlpha = opacity; } - gDPPipeSync(gMasterGfxPos++); - gDPSetTextureLUT(gMasterGfxPos++, G_TT_RGBA16); - gDPLoadTLUT_pal16(gMasterGfxPos++, 0, ui_point_right_pal); - gDPSetRenderMode(gMasterGfxPos++, G_RM_XLU_SURF, G_RM_XLU_SURF2); - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 40, 40, 40, shadowAlpha); + gDPPipeSync(gMainGfxPos++); + gDPSetTextureLUT(gMainGfxPos++, G_TT_RGBA16); + gDPLoadTLUT_pal16(gMainGfxPos++, 0, ui_point_right_pal); + gDPSetRenderMode(gMainGfxPos++, G_RM_XLU_SURF, G_RM_XLU_SURF2); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 40, 40, 40, shadowAlpha); draw_image_with_clipping(ui_point_right_png, 16, 16, G_IM_FMT_CI, G_IM_SIZ_4b, posX + 2, posY + 2, 10, 10, 300, 220); draw_ci_image_with_clipping(ui_point_right_png, 16, 16, G_IM_FMT_CI, G_IM_SIZ_4b, ui_point_right_pal, posX, posY, 20, 20, 300, 200, pointerAlpha); } @@ -2195,7 +2195,7 @@ void msg_draw_choice_pointer(MessagePrintState* printer) { void draw_digit(IMG_PTR img, s32 charset, s32 posX, s32 posY) { MessageNumber* num = &gMsgNumbers[charset]; - gDPLoadTextureTile_4b(gMasterGfxPos++, + gDPLoadTextureTile_4b(gMainGfxPos++, img, G_IM_FMT_CI, num->texWidth , num->texHeight, 0, 0, @@ -2204,7 +2204,7 @@ void draw_digit(IMG_PTR img, s32 charset, s32 posX, s32 posY) { G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPTextureRectangle(gMasterGfxPos++, + gSPTextureRectangle(gMainGfxPos++, 4 * posX, 4 * posY, 4 * (posX + num->texWidth), 4 * (posY + num->texHeight), G_TX_RENDERTILE, @@ -2243,7 +2243,7 @@ void draw_number(s32 value, s32 x, s32 y, s32 charset, s32 palette, s32 opacity, posX = x; count = i; - gSPDisplayList(gMasterGfxPos++, gMsgDlistInitDrawNumber); + gSPDisplayList(gMainGfxPos++, gMsgDlistInitDrawNumber); if (style & DRAW_NUMBER_STYLE_ALIGN_RIGHT) { for (i = count - 1; i >= 0; i--) { @@ -2267,32 +2267,32 @@ void draw_number(s32 value, s32 x, s32 y, s32 charset, s32 palette, s32 opacity, if (style & DRAW_NUMBER_STYLE_DROP_SHADOW) { for (i = 0; i < count; i++) { - gDPPipeSync(gMasterGfxPos++); - gDPSetRenderMode(gMasterGfxPos++, G_RM_XLU_SURF, G_RM_XLU_SURF2); - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 40, 40, 40, 72); + gDPPipeSync(gMainGfxPos++); + gDPSetRenderMode(gMainGfxPos++, G_RM_XLU_SURF, G_RM_XLU_SURF2); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 40, 40, 40, 72); draw_digit(raster + digits[i] * texSize, charset, digitPosX[i] + 2, y + 2); - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } } if (opacity == 255) { - gDPSetRenderMode(gMasterGfxPos++, G_RM_TEX_EDGE, G_RM_TEX_EDGE2); - gDPSetCombineMode(gMasterGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); + gDPSetRenderMode(gMainGfxPos++, G_RM_TEX_EDGE, G_RM_TEX_EDGE2); + gDPSetCombineMode(gMainGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); } else { - gDPSetRenderMode(gMasterGfxPos++, G_RM_XLU_SURF, G_RM_XLU_SURF2); - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 255, 255, opacity); + gDPSetRenderMode(gMainGfxPos++, G_RM_XLU_SURF, G_RM_XLU_SURF2); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 255, opacity); } - gDPLoadTLUT_pal16(gMasterGfxPos++, 0, D_802F4560[palette]); + gDPLoadTLUT_pal16(gMainGfxPos++, 0, D_802F4560[palette]); for (i = 0; i < count; i++) { posX = digitPosX[i]; if (posX > 0 && posX < 320) { draw_digit(raster + digits[i] * texSize, charset, posX, y); } } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } void drawbox_message_delegate(s32 data, s32 baseX, s32 baseY, s32 width, s32 height, s32 opacity, s32 darkening) { @@ -2429,7 +2429,7 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit msg_drawState = &D_80155D20; msg_drawState->printBuffer = printer->printBuffer; msg_drawState->printModeFlags = 0; - if (gMasterGfxPos != D_80151338) { + if (gMainGfxPos != D_80151338) { msg_reset_gfx_state(); } msg_drawState->printModeFlags |= (MSG_PRINT_FLAG_1 | MSG_PRINT_FLAG_100); @@ -2469,7 +2469,7 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit } if (flag & 4) { - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); } sp80bool = FALSE; @@ -2821,24 +2821,24 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit draw_ci_image_with_clipping(ui_msg_sign_corner_bottomleft_png, 16, 16, G_IM_FMT_CI, G_IM_SIZ_4b, signPalette, 20, printer->windowSize.y + 12, 10, 10, 310, 230, temp_s1_5); draw_ci_image_with_clipping(signRaster, 16, 16, G_IM_FMT_CI, G_IM_SIZ_4b, signPalette, 284, printer->windowSize.y + 12, 10, 10, 310, 230, temp_s1_5); - gDPLoadTextureTile_4b(gMasterGfxPos++, ui_msg_sign_side_top_png, G_IM_FMT_CI, 32, 0, 0, 0, 31, 15, 0, G_TX_NOMIRROR | G_TX_WRAP, + gDPLoadTextureTile_4b(gMainGfxPos++, ui_msg_sign_side_top_png, G_IM_FMT_CI, 32, 0, 0, 0, 31, 15, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 4, G_TX_NOLOD, G_TX_NOLOD); - gSPTextureRectangle(gMasterGfxPos++, 0x0090, 0x0070, 0x0470, 0x00B0, G_TX_RENDERTILE, 0, 0, 0x0400, 0x0400); - gDPLoadTextureTile_4b(gMasterGfxPos++, ui_msg_sign_side_left_png, G_IM_FMT_CI, 16, 0, 0, 0, 15, 31, 0, G_TX_NOMIRROR | G_TX_WRAP, + gSPTextureRectangle(gMainGfxPos++, 0x0090, 0x0070, 0x0470, 0x00B0, G_TX_RENDERTILE, 0, 0, 0x0400, 0x0400); + gDPLoadTextureTile_4b(gMainGfxPos++, ui_msg_sign_side_left_png, G_IM_FMT_CI, 16, 0, 0, 0, 15, 31, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 4, 5, G_TX_NOLOD, G_TX_NOLOD); - gSPTextureRectangle(gMasterGfxPos++, 0x0050, 0x00B0, 0x0090, (printer->windowSize.y + 12) * 4, G_TX_RENDERTILE, 0, 0, + gSPTextureRectangle(gMainGfxPos++, 0x0050, 0x00B0, 0x0090, (printer->windowSize.y + 12) * 4, G_TX_RENDERTILE, 0, 0, 0x0400, 0x0400); - gDPLoadTextureTile_4b(gMasterGfxPos++, ui_msg_sign_side_right_png, G_IM_FMT_CI, 16, 0, 0, 0, 15, 31, 0, G_TX_NOMIRROR | G_TX_WRAP, + gDPLoadTextureTile_4b(gMainGfxPos++, ui_msg_sign_side_right_png, G_IM_FMT_CI, 16, 0, 0, 0, 15, 31, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 4, 5, G_TX_NOLOD, G_TX_NOLOD); - gSPTextureRectangle(gMasterGfxPos++, 0x0470, 0x00B0, 0x04B0, (printer->windowSize.y + 12) * 4, G_TX_RENDERTILE, 0, 0, + gSPTextureRectangle(gMainGfxPos++, 0x0470, 0x00B0, 0x04B0, (printer->windowSize.y + 12) * 4, G_TX_RENDERTILE, 0, 0, 0x0400, 0x0400); - gDPLoadTextureTile_4b(gMasterGfxPos++, ui_msg_sign_side_bottom_png, G_IM_FMT_CI, 32, 0, 0, 0, 31, 15, 0, G_TX_NOMIRROR | G_TX_WRAP, + gDPLoadTextureTile_4b(gMainGfxPos++, ui_msg_sign_side_bottom_png, G_IM_FMT_CI, 32, 0, 0, 0, 31, 15, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 4, G_TX_NOLOD, G_TX_NOLOD); - gSPTextureRectangle(gMasterGfxPos++, 0x0090, (printer->windowSize.y + 12) * 4, 0x0470, (printer->windowSize.y + 28) * 4, + gSPTextureRectangle(gMainGfxPos++, 0x0090, (printer->windowSize.y + 12) * 4, 0x0470, (printer->windowSize.y + 28) * 4, G_TX_RENDERTILE, 0, 0, 0x0400, 0x0400); - gDPLoadTextureTile_4b(gMasterGfxPos++, ui_msg_sign_fill_png, G_IM_FMT_CI, 8, 0, 0, 0, 7, 7, 0, G_TX_NOMIRROR | G_TX_WRAP, + gDPLoadTextureTile_4b(gMainGfxPos++, ui_msg_sign_fill_png, G_IM_FMT_CI, 8, 0, 0, 0, 7, 7, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 3, 3, G_TX_NOLOD, G_TX_NOLOD); - gSPTextureRectangle(gMasterGfxPos++, 0x0090, 0x00B0, 0x0470, (printer->windowSize.y + 12) * 4, G_TX_RENDERTILE, 0, 0, + gSPTextureRectangle(gMainGfxPos++, 0x0090, 0x00B0, 0x0470, (printer->windowSize.y + 12) * 4, G_TX_RENDERTILE, 0, 0, 0x0400, 0x0400); msg_reset_gfx_state(); msg_drawState->drawBufferPos += 2; @@ -2994,16 +2994,16 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit msg_drawState->msgScale.y = (f32)(packedScaleY >> 4) + ((packedScaleY & 0xF) * 0.0625f); msg_drawState->drawBufferPos += 3; if (msg_drawState->msgScale.x > 1.0 || msg_drawState->msgScale.y > 1.0) { - gDPSetTextureFilter(gMasterGfxPos++, G_TF_POINT); + gDPSetTextureFilter(gMainGfxPos++, G_TF_POINT); } else if (msg_drawState->msgScale.x < 1.0 || msg_drawState->msgScale.y < 1.0) { - gDPSetTextureFilter(gMasterGfxPos++, G_TF_AVERAGE); + gDPSetTextureFilter(gMainGfxPos++, G_TF_AVERAGE); } break; case MSG_PRINT_FUNC_SIZE_RESET: msg_drawState->msgScale.x = 1.0f; msg_drawState->msgScale.y = 1.0f; msg_drawState->drawBufferPos++; - gDPSetTextureFilter(gMasterGfxPos++, G_TF_AVERAGE); + gDPSetTextureFilter(gMainGfxPos++, G_TF_AVERAGE); break; case MSG_PRINT_FUNC_SET_X: msg_drawState->nextPos[0] = msg_drawState->printBuffer[msg_drawState->drawBufferPos + 1] * 256 + @@ -3208,17 +3208,17 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit break; case MSG_FX_NOISE_OUTLINE: msg_drawState->effectFlags |= MSG_FX_FLAG_NOISE_OUTLINE; - gDPSetCombineLERP(gMasterGfxPos++, NOISE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, NOISE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0); + gDPSetCombineLERP(gMainGfxPos++, NOISE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, NOISE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0); msg_drawState->drawBufferPos += 2; break; case MSG_FX_STATIC: msg_drawState->effectFlags |= MSG_FX_FLAG_STATIC; - gDPSetEnvColor(gMasterGfxPos++, + gDPSetEnvColor(gMainGfxPos++, msg_drawState->printBuffer[msg_drawState->drawBufferPos + 2], msg_drawState->printBuffer[msg_drawState->drawBufferPos + 2], msg_drawState->printBuffer[msg_drawState->drawBufferPos + 2], 0); - gDPSetCombineLERP(gMasterGfxPos++, NOISE, TEXEL0, ENVIRONMENT, TEXEL0, 0, 0, 0, TEXEL0, NOISE, TEXEL0, ENVIRONMENT, + gDPSetCombineLERP(gMainGfxPos++, NOISE, TEXEL0, ENVIRONMENT, TEXEL0, 0, 0, 0, TEXEL0, NOISE, TEXEL0, ENVIRONMENT, TEXEL0, 0, 0, 0, TEXEL0); msg_drawState->drawBufferPos += 3; break; @@ -3333,8 +3333,8 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit default: if (msg_drawState->printModeFlags & MSG_PRINT_FLAG_2) { sp96 = 0xFF; - gDPPipeSync(gMasterGfxPos++); - gSPDisplayList(gMasterGfxPos++, D_8014C500); + gDPPipeSync(gMainGfxPos++); + gSPDisplayList(gMainGfxPos++, D_8014C500); } msg_drawState->charScale.x = msg_drawState->msgScale.x; msg_drawState->charScale.y = msg_drawState->msgScale.y; @@ -3400,32 +3400,32 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit palette = abs(msg_drawState->visiblePrintedCount - (u16)(gGameStatusPtr->frameCounter / 3)) % 10; } if (msg_drawState->effectFlags & MSG_FX_FLAG_DITHER_FADE) { - gDPSetAlphaDither(gMasterGfxPos++, G_AD_NOISE); - gDPSetAlphaCompare(gMasterGfxPos++, G_AC_DITHER); + gDPSetAlphaDither(gMainGfxPos++, G_AD_NOISE); + gDPSetAlphaCompare(gMainGfxPos++, G_AC_DITHER); phi_s2_5 = spB6 * (phi_s2_5 / 255.0); } if ((msg_drawState->printModeFlags & MSG_PRINT_FLAG_2) || (phi_s2_5 != sp96)) { if ((sp96 < 0xFF) && (phi_s2_5 < 0xFF)) { - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, phi_s2_5); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, phi_s2_5); } else if ((sp96 == 0xFF) && (phi_s2_5 < 0xFF)) { - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); if (printer->stateFlags & MSG_STATE_FLAG_4000) { - gDPSetRenderMode(gMasterGfxPos++, IM_RD | CVG_DST_CLAMP | ZMODE_XLU | FORCE_BL | GBL_c1(G_BL_CLR_IN, G_BL_A_IN, + gDPSetRenderMode(gMainGfxPos++, IM_RD | CVG_DST_CLAMP | ZMODE_XLU | FORCE_BL | GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA), IM_RD | CVG_DST_CLAMP | ZMODE_XLU | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)); } else { - gDPSetRenderMode(gMasterGfxPos++, IM_RD | CVG_DST_SAVE | ZMODE_XLU | FORCE_BL | GBL_c1(G_BL_CLR_IN, G_BL_A_IN, + gDPSetRenderMode(gMainGfxPos++, IM_RD | CVG_DST_SAVE | ZMODE_XLU | FORCE_BL | GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA), IM_RD | CVG_DST_SAVE | ZMODE_XLU | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)); } - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, phi_s2_5); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, phi_s2_5); } else if ((sp96 < 0xFF) && (phi_s2_5 == 0xFF)) { - gDPPipeSync(gMasterGfxPos++); - gDPSetRenderMode(gMasterGfxPos++, G_RM_TEX_EDGE, G_RM_TEX_EDGE2); - gDPSetCombineMode(gMasterGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); + gDPPipeSync(gMainGfxPos++); + gDPSetRenderMode(gMainGfxPos++, G_RM_TEX_EDGE, G_RM_TEX_EDGE2); + gDPSetCombineMode(gMainGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); } sp96 = phi_s2_5; } @@ -3560,17 +3560,17 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit msg_drawState->printModeFlags |= MSG_PRINT_FLAG_10; } if ((msg_drawState->effectFlags & MSG_FX_FLAG_DROP_SHADOW) && (phi_s2_5 == 0xFF)) { - gDPPipeSync(gMasterGfxPos++); - gDPSetRenderMode(gMasterGfxPos++, G_RM_XLU_SURF, G_RM_XLU_SURF2); - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, + gDPPipeSync(gMainGfxPos++); + gDPSetRenderMode(gMainGfxPos++, G_RM_XLU_SURF, G_RM_XLU_SURF2); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 40, 40, 40, 72); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 40, 40, 40, 72); msg_draw_char(printer, msg_drawState, msg_drawState->printBuffer[msg_drawState->drawBufferPos], palette, charPosX + 2, charPosY + 2); - gDPPipeSync(gMasterGfxPos++); - gDPSetRenderMode(gMasterGfxPos++, G_RM_TEX_EDGE, G_RM_TEX_EDGE2); - gDPSetCombineMode(gMasterGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); + gDPPipeSync(gMainGfxPos++); + gDPSetRenderMode(gMainGfxPos++, G_RM_TEX_EDGE, G_RM_TEX_EDGE2); + gDPSetCombineMode(gMainGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); } if (msg_drawState->effectFlags & MSG_FX_FLAG_BLUR) { @@ -3660,14 +3660,14 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit } } - gDPPipeSync(gMasterGfxPos++); - D_80151338 = gMasterGfxPos; + gDPPipeSync(gMainGfxPos++); + D_80151338 = gMainGfxPos; } #endif void msg_reset_gfx_state(void) { - gDPPipeSync(gMasterGfxPos++); - gSPDisplayList(gMasterGfxPos++, D_8014C500); + gDPPipeSync(gMainGfxPos++); + gSPDisplayList(gMainGfxPos++, D_8014C500); } #if VERSION_IQUE @@ -3733,20 +3733,20 @@ void msg_draw_char(MessagePrintState* printer, MessageDrawState* drawState, s32 if (drawState->printModeFlags & (MSG_PRINT_FLAG_10 | MSG_PRINT_FLAG_1)) { drawState->printModeFlags &= ~(MSG_PRINT_FLAG_10 | MSG_PRINT_FLAG_1); - gDPLoadTLUT_pal16(gMasterGfxPos++, 0, D_802F4560[palette]); + gDPLoadTLUT_pal16(gMainGfxPos++, 0, D_802F4560[palette]); } if (messageCharset->texSize.x >= 16 && messageCharset->texSize.x % 16 == 0) { - gDPLoadTextureBlock_4b(gMasterGfxPos++, messageCharset->rasters[fontVariant].raster + messageCharset->charRasterSize * charIndex, G_IM_FMT_CI, + gDPLoadTextureBlock_4b(gMainGfxPos++, messageCharset->rasters[fontVariant].raster + messageCharset->charRasterSize * charIndex, G_IM_FMT_CI, messageCharset->texSize.x, messageCharset->texSize.y, 0, G_TX_WRAP, G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); } else { - gDPLoadTextureTile_4b(gMasterGfxPos++, messageCharset->rasters[fontVariant].raster + messageCharset->charRasterSize * charIndex, G_IM_FMT_CI, + gDPLoadTextureTile_4b(gMainGfxPos++, messageCharset->rasters[fontVariant].raster + messageCharset->charRasterSize * charIndex, G_IM_FMT_CI, messageCharset->texSize.x, messageCharset->texSize.y, 0, 0, messageCharset->texSize.x - 1, messageCharset->texSize.y - 1, 0, G_TX_WRAP, G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); } - gSPTextureRectangle(gMasterGfxPos++, ulx * 4, uly * 4, lrx * 4, lry * 4, G_TX_RENDERTILE, texOffsetX, texOffsetY, + gSPTextureRectangle(gMainGfxPos++, ulx * 4, uly * 4, lrx * 4, lry * 4, G_TX_RENDERTILE, texOffsetX, texOffsetY, dsdx, dtdy); } #endif @@ -3759,29 +3759,29 @@ void msg_draw_prim_rect(u8 r, u8 g, u8 b, u8 a, u16 posX, u16 posY, u16 sizeX, u } void appendGfx_msg_prim_rect(u8 r, u8 g, u8 b, u8 a, u16 ulX, u16 ulY, u16 lrX, u16 lrY) { - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); if (a == 255) { - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, PRIMITIVE, 0, 0, 0, 1, 0, 0, 0, PRIMITIVE, 0, 0, 0, 1); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, PRIMITIVE, 0, 0, 0, 1, 0, 0, 0, PRIMITIVE, 0, 0, 0, 1); } else { - gDPSetRenderMode(gMasterGfxPos++, G_RM_XLU_SURF, G_RM_XLU_SURF2); - gDPSetCombineMode(gMasterGfxPos++, G_CC_PRIMITIVE, G_CC_PRIMITIVE); + gDPSetRenderMode(gMainGfxPos++, G_RM_XLU_SURF, G_RM_XLU_SURF2); + gDPSetCombineMode(gMainGfxPos++, G_CC_PRIMITIVE, G_CC_PRIMITIVE); } - gDPSetPrimColor(gMasterGfxPos++, 0, 0, r, g, b, a); - gDPFillRectangle(gMasterGfxPos++, ulX, ulY, lrX, lrY); - gDPPipeSync(gMasterGfxPos++); - gDPSetRenderMode(gMasterGfxPos++, G_RM_TEX_EDGE, G_RM_TEX_EDGE2); + gDPSetPrimColor(gMainGfxPos++, 0, 0, r, g, b, a); + gDPFillRectangle(gMainGfxPos++, ulX, ulY, lrX, lrY); + gDPPipeSync(gMainGfxPos++); + gDPSetRenderMode(gMainGfxPos++, G_RM_TEX_EDGE, G_RM_TEX_EDGE2); switch (msg_drawState->unk_29) { case 0: - gDPSetCombineMode(gMasterGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); + gDPSetCombineMode(gMainGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); break; case 1: - gDPSetCombineMode(gMasterGfxPos++, G_CC_MODULATEIDECALA_PRIM, G_CC_MODULATEIDECALA_PRIM); + gDPSetCombineMode(gMainGfxPos++, G_CC_MODULATEIDECALA_PRIM, G_CC_MODULATEIDECALA_PRIM); break; default: - gDPSetCombineMode(gMasterGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); + gDPSetCombineMode(gMainGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); break; } } @@ -3835,61 +3835,61 @@ void msg_draw_speech_bubble( guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), + gSPMatrix(gMainGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPPipeSync(gMasterGfxPos++); - gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); - gSPClearGeometryMode(gMasterGfxPos++, G_CULL_BOTH | G_LIGHTING); - gSPSetGeometryMode(gMasterGfxPos++, G_SHADE | G_SHADING_SMOOTH); - gDPSetColorDither(gMasterGfxPos++, G_CD_DISABLE); - gSPTexture(gMasterGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); - gDPSetTexturePersp(gMasterGfxPos++, G_TP_PERSP); + gDPPipeSync(gMainGfxPos++); + gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE); + gSPClearGeometryMode(gMainGfxPos++, G_CULL_BOTH | G_LIGHTING); + gSPSetGeometryMode(gMainGfxPos++, G_SHADE | G_SHADING_SMOOTH); + gDPSetColorDither(gMainGfxPos++, G_CD_DISABLE); + gSPTexture(gMainGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); + gDPSetTexturePersp(gMainGfxPos++, G_TP_PERSP); if (printer->maxLinesPerPage == 3) { - gDPSetTextureFilter(gMasterGfxPos++, G_TF_POINT); + gDPSetTextureFilter(gMainGfxPos++, G_TF_POINT); } else { - gDPSetTextureFilter(gMasterGfxPos++, G_TF_BILERP); + gDPSetTextureFilter(gMainGfxPos++, G_TF_BILERP); } if (opacity >= 255) { - gDPSetRenderMode(gMasterGfxPos++, AA_EN | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | + gDPSetRenderMode(gMainGfxPos++, AA_EN | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM), AA_EN | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM)); - gDPSetCombineMode(gMasterGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); + gDPSetCombineMode(gMainGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); } else { - gDPSetRenderMode(gMasterGfxPos++, IM_RD | CVG_DST_SAVE | ZMODE_XLU | FORCE_BL | + gDPSetRenderMode(gMainGfxPos++, IM_RD | CVG_DST_SAVE | ZMODE_XLU | FORCE_BL | GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA), IM_RD | CVG_DST_SAVE | ZMODE_XLU | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)); - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 32, 32, 32, opacity); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 32, 32, 32, opacity); } - gDPSetTextureLUT(gMasterGfxPos++, G_TT_RGBA16); - gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, + gDPSetTextureLUT(gMainGfxPos++, G_TT_RGBA16); + gDPSetTextureImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ui_msg_palettes[msg_drawState->framePalette]); - gDPTileSync(gMasterGfxPos++); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_4b, 0, 0x0100, G_TX_LOADTILE, 0, + gDPTileSync(gMainGfxPos++); + gDPSetTile(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_4b, 0, 0x0100, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); - gDPLoadSync(gMasterGfxPos++); - gDPLoadTLUTCmd(gMasterGfxPos++, G_TX_LOADTILE, 15); - gDPPipeSync(gMasterGfxPos++); - gDPLoadTextureTile_4b(gMasterGfxPos++, ui_msg_bubble_left_png, G_IM_FMT_CI, 32, 0, 0, 0, 31, 63, 0, + gDPLoadSync(gMainGfxPos++); + gDPLoadTLUTCmd(gMainGfxPos++, G_TX_LOADTILE, 15); + gDPPipeSync(gMainGfxPos++); + gDPLoadTextureTile_4b(gMainGfxPos++, ui_msg_bubble_left_png, G_IM_FMT_CI, 32, 0, 0, 0, 31, 63, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 5, 6, G_TX_NOLOD, G_TX_NOLOD); - gSPVertex(gMasterGfxPos++, gMsgSpeechBoxLQuad, 4, 0); - gSP2Triangles(gMasterGfxPos++, 0, 2, 1, 0, 1, 2, 3, 0); - gDPLoadTextureTile_4b(gMasterGfxPos++, ui_msg_bubble_mid_png, G_IM_FMT_CI, 8, 0, 0, 0, 7, 63, 0, + gSPVertex(gMainGfxPos++, gMsgSpeechBoxLQuad, 4, 0); + gSP2Triangles(gMainGfxPos++, 0, 2, 1, 0, 1, 2, 3, 0); + gDPLoadTextureTile_4b(gMainGfxPos++, ui_msg_bubble_mid_png, G_IM_FMT_CI, 8, 0, 0, 0, 7, 63, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 3, 6, G_TX_NOLOD, G_TX_NOLOD); - gSPVertex(gMasterGfxPos++, gMsgSpeechBoxMQuad, 4, 0); - gSP2Triangles(gMasterGfxPos++, 0, 2, 1, 0, 1, 2, 3, 0); - gDPLoadTextureTile_4b(gMasterGfxPos++, ui_msg_bubble_right_png, G_IM_FMT_CI, 32, 0, 0, 0, 31, 63, 0, + gSPVertex(gMainGfxPos++, gMsgSpeechBoxMQuad, 4, 0); + gSP2Triangles(gMainGfxPos++, 0, 2, 1, 0, 1, 2, 3, 0); + gDPLoadTextureTile_4b(gMainGfxPos++, ui_msg_bubble_right_png, G_IM_FMT_CI, 32, 0, 0, 0, 31, 63, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 5, 6, G_TX_NOLOD, G_TX_NOLOD); - gSPVertex(gMasterGfxPos++, gMsgSpeechBoxRQuad, 4, 0); - gSP2Triangles(gMasterGfxPos++, 0, 2, 1, 0, 1, 2, 3, 0); - gDPPipeSync(gMasterGfxPos++); + gSPVertex(gMainGfxPos++, gMsgSpeechBoxRQuad, 4, 0); + gSP2Triangles(gMainGfxPos++, 0, 2, 1, 0, 1, 2, 3, 0); + gDPPipeSync(gMainGfxPos++); } void msg_draw_speech_arrow(MessagePrintState* printer) { @@ -3994,17 +3994,17 @@ void msg_draw_speech_arrow(MessagePrintState* printer) { quad[3].v.ob[0] = x4; quad[3].v.ob[1] = y2; - gDPPipeSync(gMasterGfxPos++); - gDPSetRenderMode(gMasterGfxPos++, G_RM_OPA_SURF, G_RM_OPA_SURF2); - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, TEXEL0, 0, 0, 0, 1, 0, 0, 0, TEXEL0, 0, 0, 0, 1); - gDPSetTextureFilter(gMasterGfxPos++, G_TF_BILERP); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 32, 32, 32, 255); - gDPLoadTextureTile_4b(gMasterGfxPos++, ui_msg_arrow_png, G_IM_FMT_CI, 16, 0, 0, 0, 15, 15, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 4, 4, G_TX_NOLOD, G_TX_NOLOD); + gDPPipeSync(gMainGfxPos++); + gDPSetRenderMode(gMainGfxPos++, G_RM_OPA_SURF, G_RM_OPA_SURF2); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, TEXEL0, 0, 0, 0, 1, 0, 0, 0, TEXEL0, 0, 0, 0, 1); + gDPSetTextureFilter(gMainGfxPos++, G_TF_BILERP); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 32, 32, 32, 255); + gDPLoadTextureTile_4b(gMainGfxPos++, ui_msg_arrow_png, G_IM_FMT_CI, 16, 0, 0, 0, 15, 15, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 4, 4, G_TX_NOLOD, G_TX_NOLOD); guTranslateF(sp10, 0.0f, 0.0f, 0.0f); guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPVertex(gMasterGfxPos++, quad, 4, 0); - gSP2Triangles(gMasterGfxPos++, 0, 2, 1, 0, 1, 2, 3, 0); + gSPMatrix(gMainGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPVertex(gMainGfxPos++, quad, 4, 0); + gSP2Triangles(gMainGfxPos++, 0, 2, 1, 0, 1, 2, 3, 0); } void msg_draw_frame(s32 posX, s32 posY, s32 sizeX, s32 sizeY, s32 style, s32 palette, s32 fading, s32 bgAlpha, s32 frameAlpha) { @@ -4022,14 +4022,14 @@ void msg_draw_frame(s32 posX, s32 posY, s32 sizeX, s32 sizeY, s32 style, s32 pal return; } - gDPPipeSync(gMasterGfxPos++); - gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); - gDPSetTexturePersp(gMasterGfxPos++, G_TP_NONE); - gDPSetTextureLOD(gMasterGfxPos++, G_TL_TILE); - gDPSetTextureLUT(gMasterGfxPos++, G_TT_NONE); - gDPSetColorDither(gMasterGfxPos++, G_CD_DISABLE); - gDPSetAlphaDither(gMasterGfxPos++, G_AD_DISABLE); - gDPSetTextureFilter(gMasterGfxPos++, G_TF_POINT); + gDPPipeSync(gMainGfxPos++); + gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE); + gDPSetTexturePersp(gMainGfxPos++, G_TP_NONE); + gDPSetTextureLOD(gMainGfxPos++, G_TL_TILE); + gDPSetTextureLUT(gMainGfxPos++, G_TT_NONE); + gDPSetColorDither(gMainGfxPos++, G_CD_DISABLE); + gDPSetAlphaDither(gMainGfxPos++, G_AD_DISABLE); + gDPSetTextureFilter(gMainGfxPos++, G_TF_POINT); if (fading == 0 || bgAlpha != 0) { do {} while (0); @@ -4038,38 +4038,38 @@ void msg_draw_frame(s32 posX, s32 posY, s32 sizeX, s32 sizeY, s32 style, s32 pal r = ((((u16*)(ui_msg_palettes[0]))[4] >> 11) & 0x1F) * 8; g = ((((u16*)(ui_msg_palettes[0]))[4] >> 6) & 0x1F) * 8; b = ((((u16*)(ui_msg_palettes[0]))[4] >> 1) & 0x1F) * 8; - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); if (fading != 0 && bgAlpha < 255) { - gDPSetRenderMode(gMasterGfxPos++, IM_RD | CVG_DST_SAVE | ZMODE_XLU | FORCE_BL | GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA), IM_RD | CVG_DST_SAVE | ZMODE_XLU | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)); + gDPSetRenderMode(gMainGfxPos++, IM_RD | CVG_DST_SAVE | ZMODE_XLU | FORCE_BL | GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA), IM_RD | CVG_DST_SAVE | ZMODE_XLU | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)); } else { - gDPSetRenderMode(gMasterGfxPos++, G_RM_OPA_SURF, G_RM_OPA_SURF2); + gDPSetRenderMode(gMainGfxPos++, G_RM_OPA_SURF, G_RM_OPA_SURF2); } - gDPSetCombineMode(gMasterGfxPos++, G_CC_PRIMITIVE, G_CC_PRIMITIVE); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, r, g, b, bgAlpha); + gDPSetCombineMode(gMainGfxPos++, G_CC_PRIMITIVE, G_CC_PRIMITIVE); + gDPSetPrimColor(gMainGfxPos++, 0, 0, r, g, b, bgAlpha); if (posX + sizeX - 8 > 0) { - gDPScisFillRectangle(gMasterGfxPos++, posX + 8, posY + 8, posX + sizeX - 8, posY + sizeY - 8); + gDPScisFillRectangle(gMainGfxPos++, posX + 8, posY + 8, posX + sizeX - 8, posY + sizeY - 8); } break; case MSG_STYLE_INSPECT: - gDPPipeSync(gMasterGfxPos++); - gDPSetTextureFilter(gMasterGfxPos++, G_TF_AVERAGE); - gDPSetRenderMode(gMasterGfxPos++, G_RM_XLU_SURF, G_RM_XLU_SURF2); - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, TEXEL0, 0, 0, 0, PRIMITIVE, 0, 0, 0, TEXEL0, 0, 0, 0, PRIMITIVE); + gDPPipeSync(gMainGfxPos++); + gDPSetTextureFilter(gMainGfxPos++, G_TF_AVERAGE); + gDPSetRenderMode(gMainGfxPos++, G_RM_XLU_SURF, G_RM_XLU_SURF2); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, TEXEL0, 0, 0, 0, PRIMITIVE, 0, 0, 0, TEXEL0, 0, 0, 0, PRIMITIVE); if (fading == 0 || bgAlpha == 255) { - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, 216); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, 216); } else { if (bgAlpha > 216) { bgAlpha = 216; } - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, bgAlpha); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, bgAlpha); } - gDPLoadTextureBlock_4b(gMasterGfxPos++, ui_msg_background_png, G_IM_FMT_I, 64, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 6, 6, G_TX_NOLOD, G_TX_NOLOD); + gDPLoadTextureBlock_4b(gMainGfxPos++, ui_msg_background_png, G_IM_FMT_I, 64, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 6, 6, G_TX_NOLOD, G_TX_NOLOD); if (style == MSG_STYLE_INSPECT) { - gSPScisTextureRectangle(gMasterGfxPos++, (posX + 3) * 4, (posY + 3) * 4, (posX + sizeX - 3) * 4, (posY + sizeY - 3) * 4, + gSPScisTextureRectangle(gMainGfxPos++, (posX + 3) * 4, (posY + 3) * 4, (posX + sizeX - 3) * 4, (posY + sizeY - 3) * 4, G_TX_RENDERTILE, gMsgBGScrollAmtX, gMsgBGScrollAmtY, 0x400, 0x400); } else { - gSPScisTextureRectangle(gMasterGfxPos++, (posX + 5) * 4, (posY + 5) * 4, (posX + sizeX - 5) * 4, (posY + sizeY - 5) * 4, + gSPScisTextureRectangle(gMainGfxPos++, (posX + 5) * 4, (posY + 5) * 4, (posX + sizeX - 5) * 4, (posY + sizeY - 5) * 4, G_TX_RENDERTILE, gMsgBGScrollAmtX, gMsgBGScrollAmtY, 0x400, 0x400); } break; @@ -4220,23 +4220,23 @@ void msg_draw_frame(s32 posX, s32 posY, s32 sizeX, s32 sizeY, s32 style, s32 pal frameAlpha = 255; } - gDPPipeSync(gMasterGfxPos++); - gDPSetRenderMode(gMasterGfxPos++, G_RM_XLU_SURF, G_RM_XLU_SURF2); - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, frameAlpha); - gDPSetTextureLUT(gMasterGfxPos++, G_TT_RGBA16); - gDPLoadTLUT_pal16(gMasterGfxPos++, 0, ui_msg_palettes[palette]); + gDPPipeSync(gMainGfxPos++); + gDPSetRenderMode(gMainGfxPos++, G_RM_XLU_SURF, G_RM_XLU_SURF2); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, frameAlpha); + gDPSetTextureLUT(gMainGfxPos++, G_TT_RGBA16); + gDPLoadTLUT_pal16(gMainGfxPos++, 0, ui_msg_palettes[palette]); for (i = 0; i < ARRAY_COUNT(textures); i++) { if (textures[i] != NULL && quads[i].ulx < 10000) { - gDPLoadTextureTile_4b(gMasterGfxPos++, textures[i], G_IM_FMT_CI, 8, 8, 0, 0, 7, 7, 0, G_TX_WRAP, G_TX_WRAP, 3, 3, G_TX_NOLOD, G_TX_NOLOD); - gSPScisTextureRectangle(gMasterGfxPos++, quads[i].ulx, quads[i].uly, quads[i].lrx, quads[i].lry, + gDPLoadTextureTile_4b(gMainGfxPos++, textures[i], G_IM_FMT_CI, 8, 8, 0, 0, 7, 7, 0, G_TX_WRAP, G_TX_WRAP, 3, 3, G_TX_NOLOD, G_TX_NOLOD); + gSPScisTextureRectangle(gMainGfxPos++, quads[i].ulx, quads[i].uly, quads[i].lrx, quads[i].lry, G_TX_RENDERTILE, 0, 0, 0x400, 0x400); } } - gDPPipeSync(gMasterGfxPos++); - gDPSetTextureLUT(gMasterGfxPos++, G_TT_NONE); + gDPPipeSync(gMainGfxPos++); + gDPSetTextureLUT(gMainGfxPos++, G_TT_NONE); } void msg_get_glyph(s32 font, s32 variation, s32 charIndex, s32 palette, MesasgeFontGlyphData* out) { diff --git a/src/pause/pause_badges.c b/src/pause/pause_badges.c index 382704bce1..74acfc8c45 100644 --- a/src/pause/pause_badges.c +++ b/src/pause/pause_badges.c @@ -354,7 +354,7 @@ void pause_badges_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width if (y2 >= SCREEN_HEIGHT - 1) { y2 = SCREEN_HEIGHT - 1; } - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, x1, y1, x2, y2); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, x1, y1, x2, y2); badgeIndex = 0; for (i = 0; i < 3; i++) { @@ -495,12 +495,12 @@ void pause_badges_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width orbColorG1 = 255; orbColorB1 = 100; - gSPDisplayList(gMasterGfxPos++, gPauseDLOrbs); - gDPSetTextureFilter(gMasterGfxPos++, G_TF_BILERP); + gSPDisplayList(gMainGfxPos++, gPauseDLOrbs); + gDPSetTextureFilter(gMainGfxPos++, G_TF_BILERP); if (isEquipped == 0) { for (j = 0; j < numOrbs; j++) { - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 227, 227, 227, 255); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 227, 227, 227, 255); orbX = baseX + 235 + pause_badges_scroll_offset_x(posX) + 1 + (j % 5) * 6; orbY = baseY + 17 + pause_badges_scroll_offset_y(posY) + orbOffsetY; if (numOrbs >= 5) { @@ -509,9 +509,9 @@ void pause_badges_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width pause_badges_draw_bp_orbs(0, orbX, orbY); } - gDPPipeSync(gMasterGfxPos++); - gDPSetRenderMode(gMasterGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, orbColorR1, orbColorG1, orbColorB1, 128); + gDPPipeSync(gMainGfxPos++); + gDPSetRenderMode(gMainGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); + gDPSetPrimColor(gMainGfxPos++, 0, 0, orbColorR1, orbColorG1, orbColorB1, 128); for (j = 0; j < numOrbs; j++) { if (j < bpAvailable) { @@ -524,7 +524,7 @@ void pause_badges_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width } } } else { - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 255, 100, 255); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 255, 100, 255); for (j = 0; j < numOrbs; j++) { orbX = baseX + 235 + pause_badges_scroll_offset_x(posX) + 1 + (j % 5) * 6; orbY = baseY + 17 + pause_badges_scroll_offset_y(posY) + orbOffsetY; @@ -533,7 +533,7 @@ void pause_badges_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width } pause_badges_draw_bp_orbs(2, orbX, orbY); } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } } } @@ -544,7 +544,7 @@ void pause_badges_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width y1 = baseY + 1; x2 = baseX + width - 1; y2 = baseY + height - 1; - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); if (x1 <= 0) { x1 = 1; @@ -564,7 +564,7 @@ void pause_badges_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width y2 = SCREEN_HEIGHT - 1; } - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, x1, y1, x2, y2); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, x1, y1, x2, y2); if (gPauseMenuCurrentTab == 2 && gPauseBadgesLevel == 1) { if (gPauseBadgesCurrentPage > 0) { @@ -595,37 +595,37 @@ void pause_badges_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width orbColorG = 255; orbColorB = 100; maxBP = playerData->maxBP; - gSPDisplayList(gMasterGfxPos++, gPauseDLOrbs); - gDPSetTextureFilter(gMasterGfxPos++, G_TF_BILERP); + gSPDisplayList(gMainGfxPos++, gPauseDLOrbs); + gDPSetTextureFilter(gMainGfxPos++, G_TF_BILERP); for (orbIndex = 0; orbIndex < maxBP; orbIndex++) { - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 227, 227, 227, 255); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 227, 227, 227, 255); pause_badges_draw_bp_orbs(0, baseX + 11 + (orbIndex % 10) * 6, baseY + 92 + (orbIndex / 10) * 8); } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); if (canBeEquipped) { - gDPSetPrimColor(gMasterGfxPos++, 0, 0, orbColorR, orbColorG, orbColorB, 255); + gDPSetPrimColor(gMainGfxPos++, 0, 0, orbColorR, orbColorG, orbColorB, 255); for (orbIndex = 0; orbIndex < bpAvailable - costBP; orbIndex++) { pause_badges_draw_bp_orbs(2, baseX + 11 +(orbIndex % 10) * 6, baseY + 92 + (orbIndex / 10) * 8); } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); orbBlinkValue = (sin_deg(gGameStatusPtr->frameCounter * 15) + 1.0f) * 0.2 + 0.5; - gDPSetRenderMode(gMasterGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); + gDPSetRenderMode(gMainGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); orbBlinkOpacity = orbBlinkValue * 255.0f; - gDPSetPrimColor(gMasterGfxPos++, 0, 0, orbColorR, orbColorG, orbColorB, orbBlinkOpacity); + gDPSetPrimColor(gMainGfxPos++, 0, 0, orbColorR, orbColorG, orbColorB, orbBlinkOpacity); for (orbIndex = bpAvailable - costBP; orbIndex < bpAvailable; orbIndex++) { pause_badges_draw_bp_orbs(2, baseX + 11 +(orbIndex % 10) * 6, baseY + 92 + (orbIndex / 10) * 8); } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } else { - gDPSetPrimColor(gMasterGfxPos++, 0, 0, orbColorR, orbColorG, orbColorB, 255); + gDPSetPrimColor(gMainGfxPos++, 0, 0, orbColorR, orbColorG, orbColorB, 255); for (orbIndex = 0; orbIndex < bpAvailable; orbIndex++) { pause_badges_draw_bp_orbs(2, baseX + 11 + (orbIndex % 10) * 6, baseY + 92 + (orbIndex / 10) * 8); } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } draw_box(DRAW_FLAG_NO_CLIP, &gPauseWS_13, gPauseBadgesCurrentTab == 0 ? baseX + 9 : baseX, baseY + 7, 0, diff --git a/src/pause/pause_gfx.c b/src/pause/pause_gfx.c index d95154935c..2ebc59480b 100644 --- a/src/pause/pause_gfx.c +++ b/src/pause/pause_gfx.c @@ -445,7 +445,7 @@ void pause_draw_menu_label(s32 index, s32 x, s32 y) { xOffset = 160; } - gSPDisplayList(gMasterGfxPos++, gPauseDLLabels[index]); + gSPDisplayList(gMainGfxPos++, gPauseDLLabels[index]); pause_draw_rect(x * 4, y * 4, (x + xOffset) * 4, (y + 16) * 4, 0, 0, 0, 0x400, 0x400); } diff --git a/src/pause/pause_items.c b/src/pause/pause_items.c index 8f5b2a7558..6094150694 100644 --- a/src/pause/pause_items.c +++ b/src/pause/pause_items.c @@ -158,7 +158,7 @@ void pause_items_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, sp6C = baseX + 119; sp70 = baseY + 17; - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, x1, y1, x2, y2); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, x1, y1, x2, y2); for (i = 0; i < 3; i++) { for (pageIndex = 0; pageIndex < 20; pageIndex++) { @@ -258,7 +258,7 @@ void pause_items_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, y1 = baseY + 1; x2 = baseX + width - 1; y2 = baseY + height - 1; - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); if (x1 <= 0) { x1 = 1; @@ -278,7 +278,7 @@ void pause_items_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, y2 = SCREEN_HEIGHT - 1; } - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, x1, y1, x2, y2); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, x1, y1, x2, y2); if (gPauseMenuCurrentTab == 3 && gPauseItemsLevel == 1) { if (gPauseItemsCurrentPage > 0) { diff --git a/src/pause/pause_main.c b/src/pause/pause_main.c index 806d38eab9..61fa914b89 100644 --- a/src/pause/pause_main.c +++ b/src/pause/pause_main.c @@ -473,11 +473,11 @@ void pause_textbox_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 widt hud_element_draw_without_clipping(gPauseCommonIconIDs[2]); } - gDPPipeSync(gMasterGfxPos++); - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, baseX + 1, baseY + 1, baseX + width - 1, baseY + height - 1); + gDPPipeSync(gMainGfxPos++); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, baseX + 1, baseY + 1, baseX + width - 1, baseY + height - 1); draw_msg(msgID, baseX + 10, baseY - gPauseDescTextOffset, 255, MSG_PAL_STANDARD, 0); if (gPauseShownDescIconScript != 0) { - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); hud_element_set_render_pos(gPauseCommonIconIDs[3], baseX - 4, baseY + 16); hud_element_set_script(gPauseCommonIconIDs[3], gPauseShownDescIconScript); hud_element_set_flags(gPauseCommonIconIDs[3], HUD_ELEMENT_FLAG_DROP_SHADOW); @@ -509,19 +509,19 @@ void pause_tutorial_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 wid return; } - gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); - gDPSetRenderMode(gMasterGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); - gDPSetCombineMode(gMasterGfxPos++, G_CC_PRIMITIVE, G_CC_PRIMITIVE); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 55, 55, 55, 255); + gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE); + gDPSetRenderMode(gMainGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); + gDPSetCombineMode(gMainGfxPos++, G_CC_PRIMITIVE, G_CC_PRIMITIVE); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 55, 55, 55, 255); pause_draw_rect(baseX * 4, baseY * 4, (baseX + width) * 4, (baseY + 12) * 4, 0, 0, 0, 0, 0); - gDPPipeSync(gMasterGfxPos++); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 185, 185, 185, 255); + gDPPipeSync(gMainGfxPos++); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 185, 185, 185, 255); pause_draw_rect(baseX * 4, (baseY + 12) * 4, (baseX + width) * 4, (baseY + height) * 4, 0, 0, 0, 0, 0); - gDPPipeSync(gMasterGfxPos++); - gSPViewport(gMasterGfxPos++, &gPauseTutorialViewport); + gDPPipeSync(gMainGfxPos++); + gSPViewport(gMainGfxPos++, &gPauseTutorialViewport); guOrthoF(matrix1, 0.0f, 320.0f, 240.0f, 0.0f, -100.0f, 100.0f, 1.0f); guMtxF2L(matrix1, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); for (i = 0; i < 3; i++) { //needed to match @@ -547,17 +547,17 @@ void pause_tutorial_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 wid guRotateF(matrix2ptr, 180.0f, 0.0f, 1.0f, 0.0f); guMtxCatF(matrix2ptr, matrix1, matrix1); guMtxF2L(matrix1, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); func_802DE894(gPauseTutorialSprites[i], FOLD_TYPE_6, 255, 255, 255, 255, 64); spr_draw_npc_sprite(gPauseTutorialSprites[i], 0, 0, 0, matrix1); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } get_msg_properties(pause_get_menu_msg(1), &msgHeight, &msgWidth, &msgMaxLineChars, &msgNumLines, &msgMaxLinesPerPage, NULL, 1); margin = (s32)(width - msgWidth) >> 1; draw_msg(pause_get_menu_msg(1), baseX + margin, baseY, 255, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); gPauseTutorialScrollPos += pause_interp_text_scroll(gPauseTutorialState * 140 - gPauseTutorialScrollPos); - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, baseX + 1, baseY + 1, baseX + width - 1, baseY + height - 1); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, baseX + 1, baseY + 1, baseX + width - 1, baseY + height - 1); state = gPauseTutorialState; get_msg_properties(pause_get_menu_msg(gPauseTutorialDescMessages[state]), &msgHeight2, &msgWidth2, &msgMaxLineChars2, &msgNumLines2, &msgMaxLinesPerPage2, NULL, 1); margin2 = (s32)(width - msgWidth2) >> 1; @@ -822,7 +822,7 @@ void pause_draw_rect(s32 ulx, s32 uly, s32 lrx, s32 lry, s32 tileDescriptor, s32 if (ulx >= 1280 || uly >= 960 || lrx >= 2688 || lry >= 2688) { return; } - gSPScisTextureRectangle(gMasterGfxPos++, ulx, uly, lrx, lry, tileDescriptor, uls, ult, dsdx, dtdy); + gSPScisTextureRectangle(gMainGfxPos++, ulx, uly, lrx, lry, tileDescriptor, uls, ult, dsdx, dtdy); } void pause_sort_item_list(s16* arr, s32 len, s32 (*compare)(s16*, s16 *)) { diff --git a/src/pause/pause_map.c b/src/pause/pause_map.c index 05a28e641d..3eee87f685 100644 --- a/src/pause/pause_map.c +++ b/src/pause/pause_map.c @@ -210,7 +210,7 @@ void pause_map_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s Vec2b* path; s32 pathLength; - gSPDisplayList(gMasterGfxPos++, gPauseDLWorldMap); + gSPDisplayList(gMainGfxPos++, gPauseDLWorldMap); ult = -cameraX * 32; for (i = 0; i < 60; i++) { if (4 * i + 4 < 111) { @@ -219,19 +219,19 @@ void pause_map_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s tileHeight = 111 - 4 * i; } - gDPLoadTextureTile(gMasterGfxPos++, pause_world_map_png, G_IM_FMT_CI, G_IM_SIZ_8b, 320, 320, + gDPLoadTextureTile(gMainGfxPos++, pause_world_map_png, G_IM_FMT_CI, G_IM_SIZ_8b, 320, 320, 0, i * 4 - cameraY, 319, i * 4 + tileHeight - 1 - cameraY, 0, G_TX_CLAMP, G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); pause_draw_rect((baseX + 26) * 4, (baseY + 22 + 4 * i) * 4, (baseX + 260) * 4, (baseY + 22 + i * 4 + tileHeight) * 4, 0, ult, (-cameraY + i * 4) * 32, 0x400, 0x400); - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); if (4 * i + 4 >= 110) { break; } } - gSPDisplayList(gMasterGfxPos++, gPauseDLPathPoints); + gSPDisplayList(gMainGfxPos++, gPauseDLPathPoints); x1 = baseX + 26; y1 = baseY + 22; @@ -256,7 +256,7 @@ void pause_map_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s y2 = SCREEN_HEIGHT - 1; } - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, x1, y1, x2, y2); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, x1, y1, x2, y2); mapSpace = gPauseMapSpaces; camX = cameraX + baseX; @@ -271,9 +271,9 @@ void pause_map_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s } if (i != gPauseMapCursorCurrentOption) { - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 220, 80, 30, 255); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 220, 80, 30, 255); } else { - gDPSetPrimColor(gMasterGfxPos++, 0, 0, (gGameStatusPtr->frameCounter * 10) % 120 + 120, + gDPSetPrimColor(gMainGfxPos++, 0, 0, (gGameStatusPtr->frameCounter * 10) % 120 + 120, (gGameStatusPtr->frameCounter * 10) % 120 + 120, (gGameStatusPtr->frameCounter * 10) % 120, 255); } @@ -281,8 +281,8 @@ void pause_map_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s bigPointX = camX + 26 + posX; bigPointY = camY + 22 + posY; pause_draw_rect((bigPointX - 8) * 4, (bigPointY - 8) * 4, (bigPointX + 8) * 4, (bigPointY + 8) * 4, 0, 0, 0, 0x400, 0x400); - gDPPipeSync(gMasterGfxPos++); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 230, 190, 180, 255); + gDPPipeSync(gMainGfxPos++); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 230, 190, 180, 255); pathLength = mapSpace->pathLength; path = mapSpace->path; @@ -313,7 +313,7 @@ void pause_map_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s offsetUp = offset; offsetDown = offset; - gSPDisplayList(gMasterGfxPos++, gPauseDLArrows); + gSPDisplayList(gMainGfxPos++, gPauseDLArrows); if (!(gPauseMapCameraX < 0.0f)) { offsetLeft = 0; @@ -362,7 +362,7 @@ void pause_map_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s y2 = SCREEN_HEIGHT - 1; } - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, x1, y1, x2, y2); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, x1, y1, x2, y2); } draw_box(0, &gPauseWS_27, baseX + 18, baseY + 14, 0, 250, 126, opacity, darkening, 1.0f, 1.0f, 0, 0, 0, 0, 0, 0, width, height, 0); } diff --git a/src/pause/pause_partners.c b/src/pause/pause_partners.c index ac6ce5b073..9aba7b703d 100644 --- a/src/pause/pause_partners.c +++ b/src/pause/pause_partners.c @@ -294,13 +294,13 @@ void pause_partners_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 wid s32 portraitOffsetX; s32 portraitIndex; - gSPViewport(gMasterGfxPos++, &gPausePartnersViewport); + gSPViewport(gMainGfxPos++, &gPausePartnersViewport); guOrthoF(matrix, 0.0f, 320.0f, 240.0f, 0.0f, -100.0f, 100.0f, 1.0f); guMtxF2L(matrix, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); guTranslateF(matrix, 0.0f, 0.0f, 0.0f); guMtxF2L(matrix, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); for (i = 0; i < gPausePartnersNumPartners; i++) { currentPos = cos_deg(i * 360 / gPausePartnersNumPartners - gPausePartnersRotAngle) * 20.0f + 0.0f; @@ -345,7 +345,7 @@ void pause_partners_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 wid spr_draw_npc_sprite(gPausePartnersSpriteIDs[gPausePartnersPartnerIdx[index]], 0, 0, NULL, matrix); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); currentTab = gPauseMenuCurrentTab; if (currentTab == 4) { @@ -383,14 +383,14 @@ void pause_partners_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 wid portraitScrollPos = (gPausePartnersRotAngle + 360.0f) * 15000.0f * gPausePartnersNumPartners / 360.0f; portraitScrollIndex = portraitScrollPos / 15000; - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, x1, y1, x2, y2); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, x1, y1, x2, y2); portraitOffsetX = (portraitScrollIndex * 15000 - portraitScrollPos); portraitOffsetX *= 0.01; portraitIndex = portraitScrollIndex; pause_partners_load_portrait(portraitIndex % gPausePartnersNumPartners); for (i = 0; i < 2; portraitOffsetX += 150, i++) { - gSPDisplayList(gMasterGfxPos++, &gPausePartnersDL); - gDPLoadTLUT_pal256(gMasterGfxPos++, gPausePartnersPaletteBuffers[i]); + gSPDisplayList(gMainGfxPos++, &gPausePartnersDL); + gDPLoadTLUT_pal256(gMainGfxPos++, gPausePartnersPaletteBuffers[i]); for (index = 0; index < 20; index++) { if (12 * index + 12 <= 105) { @@ -399,12 +399,12 @@ void pause_partners_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 wid tileHeight = 106 - 12 * index; } - gDPLoadTextureTile(gMasterGfxPos++, gPausePartnersImageBuffers[i], G_IM_FMT_CI, G_IM_SIZ_8b, 150, 0, + gDPLoadTextureTile(gMainGfxPos++, gPausePartnersImageBuffers[i], G_IM_FMT_CI, G_IM_SIZ_8b, 150, 0, 0, 12 * index, 149, 12 * index + tileHeight - 1, 0, G_TX_CLAMP, G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); pause_draw_rect((baseX + 130 + portraitOffsetX) * 4, (baseY + 24 + 12 * index) * 4, (baseX + 280 + portraitOffsetX) * 4, (baseY + 24 + 12 * index + tileHeight) * 4, 0, 0, 12 * index * 32, 0x400, 0x400); - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); if (12 * index + 12 >= 105) { break; } @@ -435,7 +435,7 @@ void pause_partners_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 wid y2 = SCREEN_HEIGHT - 1; } - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, x1, y1, x2, y2); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, x1, y1, x2, y2); } draw_box(0, &gPauseWS_21, baseX + 122, baseY + 16, 0, 166, 121, opacity, darkening, 1.0f, 1.0f, 0, 0, 0, 0, 0, 0, width, height, 0); } diff --git a/src/pause/pause_spirits.c b/src/pause/pause_spirits.c index 5d7ecb4d0c..ceca3a5b04 100644 --- a/src/pause/pause_spirits.c +++ b/src/pause/pause_spirits.c @@ -157,24 +157,24 @@ void pause_spirits_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 widt f32 scale; PlayerData* playerData = get_player_data(); - gDPPipeSync(gMasterGfxPos++); - gSPViewport(gMasterGfxPos++, &gPauseSpiritsViewport); - gSPDisplayList(gMasterGfxPos++, gPauseDLSpiritsBg); + gDPPipeSync(gMainGfxPos++); + gSPViewport(gMainGfxPos++, &gPauseSpiritsViewport); + gSPDisplayList(gMainGfxPos++, gPauseDLSpiritsBg); for (i = 0; i < 5; i++) { - gDPLoadTextureTile_4b(gMasterGfxPos++, pause_spirits_bg_png, G_IM_FMT_CI, 128, 110, + gDPLoadTextureTile_4b(gMainGfxPos++, pause_spirits_bg_png, G_IM_FMT_CI, 128, 110, 0, i * 22, 127, i * 22 + 21, 0, G_TX_MIRROR, G_TX_CLAMP, 7, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); pause_draw_rect((baseX + 15) * 4, (baseY + 22 + i * 22) * 4, (baseX + 271) * 4, (baseY + 22 + i * 22 + 22) * 4, 0, 16, 16 + i * 704, 0x400, 0x400); - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } guOrthoF(matrix1, 0.0f, 320.0f, 240.0f, 0.0f, -1000.0f, 1000.0f, 1.0f); guMtxF2L(matrix1, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); guTranslateF(matrix1, 0.0f, 0.0f, 0.0f); guMtxF2L(matrix1, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); for (i = 0; i < gPauseSpiritsNumSpirits; i++) { @@ -211,7 +211,7 @@ void pause_spirits_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 widt spr_draw_npc_sprite(gPauseSpiritsSpriteIDs[gPauseSpiritsIndexes[index]], 0, 0, 0, matrix1); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); x1 = baseX + 7; y1 = baseY + 14; @@ -236,7 +236,7 @@ void pause_spirits_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 widt y2 = SCREEN_HEIGHT - 1; } - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, x1, y1, x2, y2); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, x1, y1, x2, y2); draw_box(0, &gPauseWS_25, baseX + 7, baseY + 14, 0, 272, 126, opacity, darkening, 1.0f, 1.0f, 0, 0, 0, 0, 0, 0, width, height, 0); if (gPauseMenuCurrentTab == 5) { diff --git a/src/pulse_stone.c b/src/pulse_stone.c index b05ea19518..38374a7720 100644 --- a/src/pulse_stone.c +++ b/src/pulse_stone.c @@ -92,9 +92,9 @@ void appendGfx_pulse_stone_icon(void) { guMtxCatF(sp18, sp58, sp58); guMtxF2L(sp58, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, pulse_stone_icon_gfx); + gSPDisplayList(gMainGfxPos++, pulse_stone_icon_gfx); dx = abs((gGameStatusPtr->mapID % 7) - 2); dy = gGameStatusPtr->mapID / 7; @@ -145,7 +145,7 @@ void appendGfx_pulse_stone_icon(void) { part.yOffset = 46; part.opacity = 255; fold_appendGfx_component(0, &part, 0, sp58); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } diff --git a/src/speech_bubble.c b/src/speech_bubble.c index e43eb2e772..c08b40fb55 100644 --- a/src/speech_bubble.c +++ b/src/speech_bubble.c @@ -56,9 +56,9 @@ void appendGfx_speech_bubble(void) { guMtxCatF(mtxTemp, mtxTransform, mtxTransform); guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, &speech_bubble_gfx); + gSPDisplayList(gMainGfxPos++, &speech_bubble_gfx); foldImg.raster = speech_bubble_img; foldImg.palette = speech_bubble_pal; @@ -72,7 +72,7 @@ void appendGfx_speech_bubble(void) { SpeechBubblePtr->brightness, SpeechBubblePtr->brightness, SpeechBubblePtr->brightness, 255, 0x440); fold_appendGfx_component(0, &foldImg, 0x40, mtxTransform); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } diff --git a/src/sprite.c b/src/sprite.c index ae863a6bf8..f68e72af3e 100644 --- a/src/sprite.c +++ b/src/sprite.c @@ -228,75 +228,75 @@ void spr_appendGfx_component_flat( Matrix4f mtx, s32 alpha ) { - gDPLoadTLUT_pal16(gMasterGfxPos++, 0, palette); + gDPLoadTLUT_pal16(gMainGfxPos++, 0, palette); if (gSpriteShadingProfile->flags & 1) { - gDPScrollMultiTile2_4b(gMasterGfxPos++, raster, G_IM_FMT_CI, width, height, + gDPScrollMultiTile2_4b(gMainGfxPos++, raster, G_IM_FMT_CI, width, height, 0, 0, width - 1, height - 1, 0, G_TX_CLAMP, G_TX_CLAMP, 8, 8, G_TX_NOLOD, G_TX_NOLOD, 256, 256); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 4, 0x0100, 2, 0, G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); - gDPSetTileSize(gMasterGfxPos++, 2, 0, 0, 63 << 2, 0); + gDPSetTile(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 4, 0x0100, 2, 0, G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); + gDPSetTileSize(gMainGfxPos++, 2, 0, 0, 63 << 2, 0); if (gSpriteShadingProfile->flags & 2) { Camera* camera = &gCameras[gCurrentCamID]; if (gGameStatusPtr->isBattle == 2) { - gSPViewport(gMasterGfxPos++, &D_802DF3E0); + gSPViewport(gMainGfxPos++, &D_802DF3E0); } else { - gSPViewport(gMasterGfxPos++, &camera->vpAlt); + gSPViewport(gMainGfxPos++, &camera->vpAlt); } if (alpha == 255) { - gDPSetRenderMode(gMasterGfxPos++, AA_EN | Z_CMP | Z_UPD | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | + gDPSetRenderMode(gMainGfxPos++, AA_EN | Z_CMP | Z_UPD | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | G_RM_PASS, AA_EN | Z_CMP | Z_UPD | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM)); } else { - gDPSetRenderMode(gMasterGfxPos++, G_RM_PASS, G_RM_ZB_CLD_SURF2); + gDPSetRenderMode(gMainGfxPos++, G_RM_PASS, G_RM_ZB_CLD_SURF2); } - gDPSetEnvColor(gMasterGfxPos++, 0, 0, 0, alpha); - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, 0, ENVIRONMENT, 0, TEXEL1, 0, 0, 0, 0, 0, 0, 0, 0, COMBINED); - gSPVertex(gMasterGfxPos++, vertices, 4, 0); - gSP2Triangles(gMasterGfxPos++, 0, 2, 1, 0, 0, 3, 2, 0); - gDPPipeSync(gMasterGfxPos++); + gDPSetEnvColor(gMainGfxPos++, 0, 0, 0, alpha); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, 0, ENVIRONMENT, 0, TEXEL1, 0, 0, 0, 0, 0, 0, 0, 0, COMBINED); + gSPVertex(gMainGfxPos++, vertices, 4, 0); + gSP2Triangles(gMainGfxPos++, 0, 2, 1, 0, 0, 3, 2, 0); + gDPPipeSync(gMainGfxPos++); } create_shading_palette(mtx, 0, 0, width, height, alpha, alpha == 255 ? 0x111238 : 0x104B50); // TODO make macro for render mode } else { - gDPScrollTextureBlock_4b(gMasterGfxPos++, raster, G_IM_FMT_CI, width, height, 0, + gDPScrollTextureBlock_4b(gMainGfxPos++, raster, G_IM_FMT_CI, width, height, 0, G_TX_CLAMP, G_TX_CLAMP, 8, 8, G_TX_NOLOD, G_TX_NOLOD, 256, 256); if (gSpriteShadingProfile->flags & 2) { Camera* camera = &gCameras[gCurrentCamID]; if (gGameStatusPtr->isBattle == 2) { - gSPViewport(gMasterGfxPos++, &D_802DF3E0); + gSPViewport(gMainGfxPos++, &D_802DF3E0); } else { - gSPViewport(gMasterGfxPos++, &camera->vpAlt); + gSPViewport(gMainGfxPos++, &camera->vpAlt); } if (alpha == 255) { - gDPSetRenderMode(gMasterGfxPos++, AA_EN | Z_CMP | Z_UPD | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | ALPHA_CVG_SEL | GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM), AA_EN | Z_CMP | Z_UPD | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | ALPHA_CVG_SEL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM)); + gDPSetRenderMode(gMainGfxPos++, AA_EN | Z_CMP | Z_UPD | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | ALPHA_CVG_SEL | GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM), AA_EN | Z_CMP | Z_UPD | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | ALPHA_CVG_SEL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM)); } else { - gDPSetRenderMode(gMasterGfxPos++, G_RM_ZB_CLD_SURF, G_RM_ZB_CLD_SURF2); + gDPSetRenderMode(gMainGfxPos++, G_RM_ZB_CLD_SURF, G_RM_ZB_CLD_SURF2); } - gDPSetEnvColor(gMasterGfxPos++, 0, 0, 0, alpha); - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, 0, ENVIRONMENT, 0, TEXEL0, 0, 0, 0, 0, 0, ENVIRONMENT, 0, + gDPSetEnvColor(gMainGfxPos++, 0, 0, 0, alpha); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, 0, ENVIRONMENT, 0, TEXEL0, 0, 0, 0, 0, 0, ENVIRONMENT, 0, TEXEL0, 0); - gSPVertex(gMasterGfxPos++, vertices, 4, 0); - gSP2Triangles(gMasterGfxPos++, 0, 2, 1, 0, 0, 3, 2, 0); - gDPPipeSync(gMasterGfxPos++); + gSPVertex(gMainGfxPos++, vertices, 4, 0); + gSP2Triangles(gMainGfxPos++, 0, 2, 1, 0, 0, 3, 2, 0); + gDPPipeSync(gMainGfxPos++); if (alpha == 255) { - gDPSetRenderMode(gMasterGfxPos++, AA_EN | Z_CMP | Z_UPD | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | + gDPSetRenderMode(gMainGfxPos++, AA_EN | Z_CMP | Z_UPD | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM), AA_EN | Z_CMP | Z_UPD | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM)); } else { - gDPSetRenderMode(gMasterGfxPos++, G_RM_ZB_CLD_SURF, G_RM_ZB_CLD_SURF2); + gDPSetRenderMode(gMainGfxPos++, G_RM_ZB_CLD_SURF, G_RM_ZB_CLD_SURF2); } - gDPSetEnvColor(gMasterGfxPos++, 100, 100, 100, 255); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, alpha); - gDPSetCombineLERP(gMasterGfxPos++, SHADE, ENVIRONMENT, TEXEL0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0, SHADE, + gDPSetEnvColor(gMainGfxPos++, 100, 100, 100, 255); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, alpha); + gDPSetCombineLERP(gMainGfxPos++, SHADE, ENVIRONMENT, TEXEL0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0, SHADE, ENVIRONMENT, TEXEL0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0); - gDPSetColorDither(gMasterGfxPos++, G_CD_MAGICSQ); + gDPSetColorDither(gMainGfxPos++, G_CD_MAGICSQ); } } @@ -304,17 +304,17 @@ void spr_appendGfx_component_flat( Camera* camera = &gCameras[gCurrentCamID]; if (gGameStatusPtr->isBattle == 2) { - gSPViewport(gMasterGfxPos++, &D_802DF3D0); + gSPViewport(gMainGfxPos++, &D_802DF3D0); D_802DF3E0.vp.vtrans[0] = D_802DF3D0.vp.vtrans[0] + gGameStatusPtr->unk_82; D_802DF3E0.vp.vtrans[1] = D_802DF3D0.vp.vtrans[1] + gGameStatusPtr->unk_83; } else { - gSPViewport(gMasterGfxPos++, &camera->vp); + gSPViewport(gMainGfxPos++, &camera->vp); } } - gSPVertex(gMasterGfxPos++, vertices, 4, 0); - gSP2Triangles(gMasterGfxPos++, 0, 2, 1, 0, 0, 3, 2, 0); - gDPPipeSync(gMasterGfxPos++); + gSPVertex(gMainGfxPos++, vertices, 4, 0); + gSP2Triangles(gMainGfxPos++, 0, 2, 1, 0, 0, 3, 2, 0); + gDPPipeSync(gMainGfxPos++); } void spr_appendGfx_component( @@ -354,21 +354,21 @@ void spr_appendGfx_component( } guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), + gSPMatrix(gMainGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (gSpriteShadingProfile->flags & 1) { if ((u8) opacity == 255) { - gSPDisplayList(gMasterGfxPos++, D_802DF460); + gSPDisplayList(gMainGfxPos++, D_802DF460); } else { - gSPDisplayList(gMasterGfxPos++, D_802DF490); + gSPDisplayList(gMainGfxPos++, D_802DF490); } } else { if ((u8) opacity == 255) { - gSPDisplayList(gMasterGfxPos++, D_802DF3F0); + gSPDisplayList(gMainGfxPos++, D_802DF3F0); } else { - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, (u8) opacity); - gSPDisplayList(gMasterGfxPos++, D_802DF428); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, (u8) opacity); + gSPDisplayList(gMainGfxPos++, D_802DF428); } } @@ -395,7 +395,7 @@ void spr_appendGfx_component( D_802DF540 &= ~(0x80000000 | 0x40000000 | 0x20000000 | 0x10000000); } } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } void spr_transform_point(s32 rotX, s32 rotY, s32 rotZ, f32 inX, f32 inY, f32 inZ, f32* outX, f32* outY, f32* outZ) { diff --git a/src/state_logos.c b/src/state_logos.c index dd5489770b..1ace20ba8a 100644 --- a/src/state_logos.c +++ b/src/state_logos.c @@ -244,25 +244,25 @@ void state_drawUI_logos(void) { void appendGfx_intro_logos(void) { s32 i; - gDPPipeSync(gMasterGfxPos++); - gDPSetRenderMode(gMasterGfxPos++, G_RM_NOOP, G_RM_NOOP2); - gDPSetCombineMode(gMasterGfxPos++, G_CC_DECALRGB, G_CC_DECALRGB); - gDPSetCycleType(gMasterGfxPos++, G_CYC_FILL); - gDPSetFillColor(gMasterGfxPos++, PACK_FILL_COLOR(224, 224, 224, 1)); - gDPFillRectangle(gMasterGfxPos++, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); + gDPSetRenderMode(gMainGfxPos++, G_RM_NOOP, G_RM_NOOP2); + gDPSetCombineMode(gMainGfxPos++, G_CC_DECALRGB, G_CC_DECALRGB); + gDPSetCycleType(gMainGfxPos++, G_CYC_FILL); + gDPSetFillColor(gMainGfxPos++, PACK_FILL_COLOR(224, 224, 224, 1)); + gDPFillRectangle(gMainGfxPos++, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); + gDPPipeSync(gMainGfxPos++); switch (gGameStatusPtr->introState) { case INTRO_STATE_0: case INTRO_STATE_1: case INTRO_STATE_2: - gSPDisplayList(gMasterGfxPos++, D_80077908); + gSPDisplayList(gMainGfxPos++, D_80077908); for (i = 0; i < 7; i++) { - gDPLoadTextureTile(gMasterGfxPos++, gLogosImage1 + i * 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 128, 112, + gDPLoadTextureTile(gMainGfxPos++, gLogosImage1 + i * 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 128, 112, 0, 0, 127, 15, 0, G_TX_WRAP, G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPTextureRectangle(gMasterGfxPos++, 96 * 4, (64 + i * 16) * 4, 224 * 4, (80 + i * 16) * 4, G_TX_RENDERTILE, 0, 0, 1024, 1024); - gDPPipeSync(gMasterGfxPos++); + gSPTextureRectangle(gMainGfxPos++, 96 * 4, (64 + i * 16) * 4, 224 * 4, (80 + i * 16) * 4, G_TX_RENDERTILE, 0, 0, 1024, 1024); + gDPPipeSync(gMainGfxPos++); } break; case INTRO_STATE_3: @@ -275,17 +275,17 @@ void appendGfx_intro_logos(void) { case INTRO_STATE_8: case INTRO_STATE_9: #endif - gSPDisplayList(gMasterGfxPos++, D_80077908); + gSPDisplayList(gMainGfxPos++, D_80077908); for (i = 0; i < 6; i++) { - gDPLoadTextureTile(gMasterGfxPos++, gLogosImage2 + i * 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 256, 48, + gDPLoadTextureTile(gMainGfxPos++, gLogosImage2 + i * 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 256, 48, 0, 0, 255, 7, 0, G_TX_WRAP, G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); gSPTextureRectangle( - gMasterGfxPos++, + gMainGfxPos++, 32 * 4, (LOGO_1_Y + i * 8) * 4, 288 * 4, (LOGO_1_Y + 8 + i * 8) * 4, G_TX_RENDERTILE, 0, 0, 1024, 1024); - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } #if !VERSION_JP break; @@ -293,17 +293,17 @@ void appendGfx_intro_logos(void) { case INTRO_STATE_7: case INTRO_STATE_8: case INTRO_STATE_9: - gSPDisplayList(gMasterGfxPos++, D_80077908); + gSPDisplayList(gMainGfxPos++, D_80077908); #endif for (i = 0; i < 14; i++) { - gDPLoadTextureTile(gMasterGfxPos++, gLogosImage3 + i * 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 256, 112, + gDPLoadTextureTile(gMainGfxPos++, gLogosImage3 + i * 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 256, 112, 0, 0, 255, 7, 0, G_TX_WRAP, G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPTextureRectangle(gMasterGfxPos++, + gSPTextureRectangle(gMainGfxPos++, 32 * 4, (LOGO_2_Y + i * 8) * 4, 288 * 4, (LOGO_2_Y + 8 + i * 8) * 4, G_TX_RENDERTILE, 0, 0, 1024, 1024); - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } break; } diff --git a/src/state_title_screen.c b/src/state_title_screen.c index afd83f89aa..27f7a156c0 100644 --- a/src/state_title_screen.c +++ b/src/state_title_screen.c @@ -349,25 +349,25 @@ void appendGfx_title_screen(void) { break; } - gDPPipeSync(gMasterGfxPos++); - gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(nuGfxCfb_ptr)); - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); - gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); - gDPPipeSync(gMasterGfxPos++); - gSPClearGeometryMode(gMasterGfxPos++, G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | + gDPPipeSync(gMainGfxPos++); + gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(nuGfxCfb_ptr)); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); + gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE); + gDPPipeSync(gMainGfxPos++); + gSPClearGeometryMode(gMainGfxPos++, G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); - gSPSetGeometryMode(gMasterGfxPos++, G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH); - gSPSetLights1(gMasterGfxPos++, D_80077A38); + gSPSetGeometryMode(gMainGfxPos++, G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH); + gSPSetLights1(gMainGfxPos++, D_80077A38); - gSPTexture(gMasterGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); - gDPSetTextureLOD(gMasterGfxPos++, G_TL_TILE); - gDPSetTexturePersp(gMasterGfxPos++, G_TP_PERSP); - gDPSetTextureFilter(gMasterGfxPos++, G_TF_BILERP); - gDPSetColorDither(gMasterGfxPos++, G_CD_DISABLE); - gDPSetTextureDetail(gMasterGfxPos++, G_TD_CLAMP); - gDPSetTextureConvert(gMasterGfxPos++, G_TC_FILT); - gDPSetCombineKey(gMasterGfxPos++, G_CK_NONE); - gDPSetAlphaCompare(gMasterGfxPos++, G_AC_NONE); + gSPTexture(gMainGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); + gDPSetTextureLOD(gMainGfxPos++, G_TL_TILE); + gDPSetTexturePersp(gMainGfxPos++, G_TP_PERSP); + gDPSetTextureFilter(gMainGfxPos++, G_TF_BILERP); + gDPSetColorDither(gMainGfxPos++, G_CD_DISABLE); + gDPSetTextureDetail(gMainGfxPos++, G_TD_CLAMP); + gDPSetTextureConvert(gMainGfxPos++, G_TC_FILT); + gDPSetCombineKey(gMainGfxPos++, G_CK_NONE); + gDPSetAlphaCompare(gMainGfxPos++, G_AC_NONE); render_frame(0); render_frame(1); } @@ -384,13 +384,13 @@ void title_screen_draw_logo(f32 arg0) { s32 yOffset; s32 i; - gSPDisplayList(gMasterGfxPos++, D_80077A50); - gDPPipeSync(gMasterGfxPos++); + gSPDisplayList(gMainGfxPos++, D_80077A50); + gDPPipeSync(gMainGfxPos++); yOffset = -100 * arg0; for (i = 0; i < TITLE_NUM_TILES; i++) { // Load a tile from the logo texture - gDPLoadTextureTile(gMasterGfxPos++, &D_800A0978[i * TITLE_TILE_PIXELS], G_IM_FMT_RGBA, G_IM_SIZ_32b, + gDPLoadTextureTile(gMainGfxPos++, &D_800A0978[i * TITLE_TILE_PIXELS], G_IM_FMT_RGBA, G_IM_SIZ_32b, TITLE_WIDTH, TITLE_TILE_HEIGHT, // width, height 0, 0, (TITLE_WIDTH - 1), (TITLE_TILE_HEIGHT - 1), // uls, ult, lrs, lrt 0, // pal @@ -398,7 +398,7 @@ void title_screen_draw_logo(f32 arg0) { G_TX_NOMASK, G_TX_NOMASK, // masks, maskt G_TX_NOLOD, G_TX_NOLOD); // shifts, shiftt // Draw a scissored texture rectangle with the loaded tile - gSPScisTextureRectangle(gMasterGfxPos++, + gSPScisTextureRectangle(gMainGfxPos++, (TITLE_POS_LEFT) << 2, // ulx (TITLE_POS_TOP + TITLE_TILE_HEIGHT * i + yOffset) << 2, // uly (TITLE_POS_LEFT + TITLE_WIDTH) << 2, // lrx @@ -406,7 +406,7 @@ void title_screen_draw_logo(f32 arg0) { G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10); } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } #if VERSION_IQUE @@ -444,14 +444,14 @@ void title_screen_draw_press_start(void) { } } - gSPDisplayList(gMasterGfxPos++, D_80077A50); - gDPSetCombineMode(gMasterGfxPos++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 248, 240, 152, D_80077A28); - gDPPipeSync(gMasterGfxPos++); - gDPLoadTextureBlock(gMasterGfxPos++, D_800A0980, G_IM_FMT_IA, G_IM_SIZ_8b, 128, VAR_1, 0, G_TX_NOMIRROR | G_TX_WRAP, + gSPDisplayList(gMainGfxPos++, D_80077A50); + gDPSetCombineMode(gMainGfxPos++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 248, 240, 152, D_80077A28); + gDPPipeSync(gMainGfxPos++); + gDPLoadTextureBlock(gMainGfxPos++, D_800A0980, G_IM_FMT_IA, G_IM_SIZ_8b, 128, VAR_1, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPTextureRectangle(gMasterGfxPos++, 384, 548, 896, VAR_2, G_TX_RENDERTILE, 0, 0, 0x0400, 0x0400); - gDPPipeSync(gMasterGfxPos++); + gSPTextureRectangle(gMainGfxPos++, 384, 548, 896, VAR_2, G_TX_RENDERTILE, 0, 0, 0x0400, 0x0400); + gDPPipeSync(gMainGfxPos++); } #if VERSION_IQUE @@ -461,39 +461,39 @@ void title_screen_draw_copyright(f32 arg0) { s32 alpha; s32 i; - gSPDisplayList(gMasterGfxPos++, &D_80077A50); + gSPDisplayList(gMainGfxPos++, &D_80077A50); #if VERSION_JP - gDPSetTextureLUT(gMasterGfxPos++, G_TT_RGBA16); + gDPSetTextureLUT(gMainGfxPos++, G_TT_RGBA16); #endif - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); alpha = 255.0f - (arg0 * 255.0f); if (alpha < 255) { if (alpha < 0) { alpha = 0; } - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, alpha); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, alpha); } #if VERSION_JP - gDPLoadTLUT_pal16(gMasterGfxPos++, 0, JP_800A0980); - gDPLoadTextureTile_4b(gMasterGfxPos++, D_800A097C, G_IM_FMT_CI, 128, 0, 0, 0, 127, 31, 0, + gDPLoadTLUT_pal16(gMainGfxPos++, 0, JP_800A0980); + gDPLoadTextureTile_4b(gMainGfxPos++, D_800A097C, G_IM_FMT_CI, 128, 0, 0, 0, 127, 31, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPTextureRectangle(gMasterGfxPos++, 388, 764, 900, 892, G_TX_RENDERTILE, + gSPTextureRectangle(gMainGfxPos++, 388, 764, 900, 892, G_TX_RENDERTILE, 0, 0, 0x0400, 0x0400); #else for (i = 0; i < 2; i++) { alpha = 0; // TODO figure out why this is needed - gDPLoadTextureTile(gMasterGfxPos++, &D_800A097C[0x240 * i], G_IM_FMT_IA, G_IM_SIZ_8b, 144, 32, 0, 0, 143, 15, 0, + gDPLoadTextureTile(gMainGfxPos++, &D_800A097C[0x240 * i], G_IM_FMT_IA, G_IM_SIZ_8b, 144, 32, 0, 0, 143, 15, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPTextureRectangle(gMasterGfxPos++, 356, 764 + (0x40 * i), 932, 828 + (0x40 * i), G_TX_RENDERTILE, + gSPTextureRectangle(gMainGfxPos++, 356, 764 + (0x40 * i), 932, 828 + (0x40 * i), G_TX_RENDERTILE, 0, 0, 0x0400, 0x0400); } #endif - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } #endif diff --git a/src/status_icons.c b/src/status_icons.c index c4a688dd86..4326ecded3 100644 --- a/src/status_icons.c +++ b/src/status_icons.c @@ -592,19 +592,19 @@ void draw_all_status_icons(void* data) { Camera* camera = &gCameras[gCurrentCameraID]; int i; - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 12, 20, SCREEN_WIDTH - 12, SCREEN_HEIGHT - 20); - gDPPipeSync(gMasterGfxPos++); - gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); - gDPSetTexturePersp(gMasterGfxPos++, G_TP_NONE); - gDPSetTextureLOD(gMasterGfxPos++, G_TL_TILE); - gDPSetTextureDetail(gMasterGfxPos++, G_TD_CLAMP); - gDPSetTextureConvert(gMasterGfxPos++, G_TC_FILT); - gDPSetCombineKey(gMasterGfxPos++, G_CK_NONE); - gDPSetAlphaCompare(gMasterGfxPos++, G_AC_NONE); - gDPNoOp(gMasterGfxPos++); - gDPSetColorDither(gMasterGfxPos++, G_CD_DISABLE); - gDPSetAlphaDither(gMasterGfxPos++, G_AD_DISABLE); - gSPTexture(gMasterGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, 12, 20, SCREEN_WIDTH - 12, SCREEN_HEIGHT - 20); + gDPPipeSync(gMainGfxPos++); + gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE); + gDPSetTexturePersp(gMainGfxPos++, G_TP_NONE); + gDPSetTextureLOD(gMainGfxPos++, G_TL_TILE); + gDPSetTextureDetail(gMainGfxPos++, G_TD_CLAMP); + gDPSetTextureConvert(gMainGfxPos++, G_TC_FILT); + gDPSetCombineKey(gMainGfxPos++, G_CK_NONE); + gDPSetAlphaCompare(gMainGfxPos++, G_AC_NONE); + gDPNoOp(gMainGfxPos++); + gDPSetColorDither(gMainGfxPos++, G_CD_DISABLE); + gDPSetAlphaDither(gMainGfxPos++, G_AD_DISABLE); + gSPTexture(gMainGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); for (i = 0, icon = D_800A0F44; i < MAX_ICONS; i++, icon++) { if (icon->flags == 0) { diff --git a/src/windows.c b/src/windows.c index ef68fd31db..41ba6fcdce 100644 --- a/src/windows.c +++ b/src/windows.c @@ -364,15 +364,15 @@ void render_window_root(void) { } } - gSPLoadGeometryMode(gMasterGfxPos++, 0); - gSPSetGeometryMode(gMasterGfxPos++, G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_SHADING_SMOOTH); - gDPPipelineMode(gMasterGfxPos++, G_PM_NPRIMITIVE); - gDPSetCombineMode(gMasterGfxPos++, G_CC_SHADE, G_CC_SHADE); - gDPSetAlphaCompare(gMasterGfxPos++, G_AC_NONE); - gSPSetOtherMode(gMasterGfxPos++, G_SETOTHERMODE_H, G_MDSFT_ALPHADITHER, 16, G_AD_DISABLE | G_CD_DISABLE | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | G_TD_CLAMP | G_TP_NONE); - gSPClipRatio(gMasterGfxPos++, FRUSTRATIO_2); - gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(nuGfxCfb_ptr)); - gDPPipeSync(gMasterGfxPos++); + gSPLoadGeometryMode(gMainGfxPos++, 0); + gSPSetGeometryMode(gMainGfxPos++, G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_SHADING_SMOOTH); + gDPPipelineMode(gMainGfxPos++, G_PM_NPRIMITIVE); + gDPSetCombineMode(gMainGfxPos++, G_CC_SHADE, G_CC_SHADE); + gDPSetAlphaCompare(gMainGfxPos++, G_AC_NONE); + gSPSetOtherMode(gMainGfxPos++, G_SETOTHERMODE_H, G_MDSFT_ALPHADITHER, 16, G_AD_DISABLE | G_CD_DISABLE | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | G_TD_CLAMP | G_TP_NONE); + gSPClipRatio(gMainGfxPos++, FRUSTRATIO_2); + gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(nuGfxCfb_ptr)); + gDPPipeSync(gMainGfxPos++); render_windows(priorityArray, WINDOW_ID_NONE, 0, 0, 0, 255, 0, NULL); } diff --git a/src/world/area_dro/dro_02/npc_merlee.c b/src/world/area_dro/dro_02/npc_merlee.c index d70d670b94..f47f98405f 100644 --- a/src/world/area_dro/dro_02/npc_merlee.c +++ b/src/world/area_dro/dro_02/npc_merlee.c @@ -209,7 +209,7 @@ u32 N(appendGfx_ritual_card)(RitualCard* card, Matrix4f mtxParent) { return 1; } - gSPDisplayList(gMasterGfxPos++, N(card_setup_gfx)); + gSPDisplayList(gMainGfxPos++, N(card_setup_gfx)); if (card->unk_00 == 1 || card->unk_00 == 4 || card->unk_00 == 5) { guTranslateF(mtxTemp, card->pos.x, card->pos.y, card->pos.z); @@ -219,53 +219,53 @@ u32 N(appendGfx_ritual_card)(RitualCard* card, Matrix4f mtxParent) { guRotateF(mtxTemp, card->pitch, 1.0f, 0.0f, 0.0f); guMtxCatF(mtxTemp, mtxTransform, mtxTransform); guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (card->unk_00 == 1 || card->unk_00 == 4) { - gSPDisplayList(gMasterGfxPos++, N(card_1_gfx)); + gSPDisplayList(gMainGfxPos++, N(card_1_gfx)); } if (card->unk_00 == 1 || card->unk_00 == 5) { spr_get_player_raster_info(&rasterInfo, card->spriteID, card->rasterIndex); - gDPSetTextureLUT(gMasterGfxPos++, G_TT_RGBA16); - gDPLoadTLUT_pal16(gMasterGfxPos++, 0, rasterInfo.defaultPal); - gDPLoadTextureTile_4b(gMasterGfxPos++, rasterInfo.raster, G_IM_FMT_CI, rasterInfo.width, rasterInfo.height, + gDPSetTextureLUT(gMainGfxPos++, G_TT_RGBA16); + gDPLoadTLUT_pal16(gMainGfxPos++, 0, rasterInfo.defaultPal); + gDPLoadTextureTile_4b(gMainGfxPos++, rasterInfo.raster, G_IM_FMT_CI, rasterInfo.width, rasterInfo.height, 0, 0, rasterInfo.width - 1, rasterInfo.height - 1, 0, G_TX_CLAMP, G_TX_CLAMP, 8, 8, G_TX_NOLOD, G_TX_NOLOD); guTranslateF(mtxTransform, card->xoffset + 30 - rasterInfo.width / 2, 0.0f, 0.0f); guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, N(card_2_gfx)); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, N(card_2_gfx)); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); return 1; } if (card->unk_00 == 2) { - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, 256 * 4, 256 * 4, 287 * 4, 287 * 4); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, 256 * 4, 256 * 4, 287 * 4, 287 * 4); guTranslateF(mtxTemp, N(RitualCards)[0].pos.x, N(RitualCards)[0].pos.y, N(RitualCards)[0].pos.z); guMtxCatF(mtxTemp, mtxParent, mtxTransform); guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); ret = fold_appendGfx_component(evt_get_variable(N(CreatorScript), RITUAL_VAR_FOLDER_1), &foldImage, FOLD_STATE_FLAG_10 | FOLD_STATE_FLAG_20, mtxTransform); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); return ret; } if (card->unk_00 == 3) { - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, 256 * 4, 256 * 4, 287 * 4, 287 * 4); + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, 256 * 4, 256 * 4, 287 * 4, 287 * 4); guTranslateF(mtxTemp, N(RitualCards)[0].pos.x, N(RitualCards)[0].pos.y, N(RitualCards)[0].pos.z); guMtxCatF(mtxTemp, mtxParent, mtxTransform); guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); fold_appendGfx_component(evt_get_variable(N(CreatorScript), RITUAL_VAR_FOLDER_2), &foldImage, FOLD_STATE_FLAG_10 | FOLD_STATE_FLAG_20, mtxTransform); fold_appendGfx_component(evt_get_variable(N(CreatorScript), RITUAL_VAR_FOLDER_3), &foldImage, FOLD_STATE_FLAG_10 | FOLD_STATE_FLAG_20, mtxTransform); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); guTranslateF(mtxTemp, N(RitualCards)[0].pos.x, N(RitualCards)[0].pos.y, N(RitualCards)[0].pos.z); guMtxCatF(mtxTemp, mtxParent, mtxTransform); guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); spr_get_player_raster_info(&rasterInfo, card->spriteID, card->rasterIndex); foldImage.raster = rasterInfo.raster; foldImage.palette = rasterInfo.defaultPal; @@ -275,7 +275,7 @@ u32 N(appendGfx_ritual_card)(RitualCard* card, Matrix4f mtxParent) { foldImage.yOffset = rasterInfo.height / 2; foldImage.opacity = 255; ret = fold_appendGfx_component(evt_get_variable(N(CreatorScript), RITUAL_VAR_FOLDER_4), &foldImage, FOLD_STATE_FLAG_10, mtxTransform); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); return ret; } diff --git a/src/world/area_end/common/Credits.inc.c b/src/world/area_end/common/Credits.inc.c index 13633d9719..a7d569428a 100644 --- a/src/world/area_end/common/Credits.inc.c +++ b/src/world/area_end/common/Credits.inc.c @@ -119,7 +119,7 @@ void N(CharAnim_FadeIn_0)(CreditsLine* line, CreditsChar* chr) { posX += (glyphPtr->charWidth * 0.5); guTranslateF(transformMtx, posX, -posY, 0.0f); guMtxF2L (transformMtx, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), + gSPMatrix(gMainGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); foldImg.raster = glyphPtr->raster; @@ -131,7 +131,7 @@ void N(CharAnim_FadeIn_0)(CreditsLine* line, CreditsChar* chr) { foldImg.opacity = 255; fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_40000 | FOLD_STATE_FLAG_NO_FILTERING | FOLD_STATE_FLAG_40, transformMtx); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } @@ -164,7 +164,7 @@ void N(CharAnim_FadeIn_1)(CreditsLine* line, CreditsChar* chr) { posX += (glyphPtr->charWidth * 0.5); guTranslateF(transformMtx, posX, -posY, 0.0f); guMtxF2L (transformMtx, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), + gSPMatrix(gMainGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); foldImg.raster = glyphPtr->raster; @@ -175,7 +175,7 @@ void N(CharAnim_FadeIn_1)(CreditsLine* line, CreditsChar* chr) { foldImg.yOffset = 0; foldImg.opacity = 255; fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_40000 | FOLD_STATE_FLAG_NO_FILTERING | FOLD_STATE_FLAG_40, transformMtx); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } void N(CharAnim_FadeIn_2)(CreditsLine* line, CreditsChar* chr) { @@ -207,7 +207,7 @@ void N(CharAnim_FadeIn_2)(CreditsLine* line, CreditsChar* chr) { guMtxCatF(tempMtx, transformMtx, transformMtx); } guMtxF2L(transformMtx, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), + gSPMatrix(gMainGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); foldImg.raster = glyphPtr->raster; @@ -219,7 +219,7 @@ void N(CharAnim_FadeIn_2)(CreditsLine* line, CreditsChar* chr) { foldImg.opacity = 255; fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_40, transformMtx); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } void N(CharAnim_FadeIn_3)(CreditsLine* line, CreditsChar* chr) { @@ -251,7 +251,7 @@ void N(CharAnim_FadeIn_3)(CreditsLine* line, CreditsChar* chr) { guMtxCatF(tempMtx, transformMtx, transformMtx); } guMtxF2L(transformMtx, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), + gSPMatrix(gMainGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); foldImg.raster = glyphPtr->raster; @@ -263,7 +263,7 @@ void N(CharAnim_FadeIn_3)(CreditsLine* line, CreditsChar* chr) { foldImg.opacity = 255; fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_NO_FILTERING | FOLD_STATE_FLAG_40, transformMtx); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } void N(CharAnim_FadeIn_4)(CreditsLine* line, CreditsChar* chr) { @@ -304,7 +304,7 @@ void N(CharAnim_FadeIn_4)(CreditsLine* line, CreditsChar* chr) { guScaleF (tempMtx, scaleAmt, scaleAmt, 1.0f); guMtxCatF(tempMtx, transformMtx, transformMtx); guMtxF2L (transformMtx, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), + gSPMatrix(gMainGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); foldImg.raster = glyphPtr->raster; @@ -316,7 +316,7 @@ void N(CharAnim_FadeIn_4)(CreditsLine* line, CreditsChar* chr) { foldImg.opacity = 255; fold_appendGfx_component(0, &foldImg, foldFlags, transformMtx); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } void N(CharAnim_FadeIn_5)(CreditsLine* line, CreditsChar* chr) { @@ -346,7 +346,7 @@ void N(CharAnim_HoldClearFold)(CreditsLine* line, CreditsChar* chr) { fold_update(0, FOLD_TYPE_NONE, 0, 0, 0, 0, 0); guTranslateF(transformMtx, posX, -posY, 0.0f); guMtxF2L (transformMtx, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), + gSPMatrix(gMainGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); msg_get_glyph(chr->font, chr->variation, chr->charIndex, chr->palette, glyphPtr); @@ -359,7 +359,7 @@ void N(CharAnim_HoldClearFold)(CreditsLine* line, CreditsChar* chr) { foldImg.opacity = 255; fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_40000 | FOLD_STATE_FLAG_NO_FILTERING | FOLD_STATE_FLAG_40, transformMtx); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } void N(CharAnim_Hold)(CreditsLine* line, CreditsChar* chr) { @@ -392,7 +392,7 @@ void N(CharAnim_FadeOut_0)(CreditsLine* line, CreditsChar* chr) { posX += (glyphPtr->charWidth * 0.5); guTranslateF(transformMtx, posX, -posY, 0.0f); guMtxF2L (transformMtx, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), + gSPMatrix(gMainGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); foldImg.raster = glyphPtr->raster; @@ -404,7 +404,7 @@ void N(CharAnim_FadeOut_0)(CreditsLine* line, CreditsChar* chr) { foldImg.opacity = 255; fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_NO_FILTERING | FOLD_STATE_FLAG_40, transformMtx); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } void N(CharAnim_FadeOut_1)(CreditsLine* line, CreditsChar* chr) { @@ -427,7 +427,7 @@ void N(CharAnim_FadeOut_1)(CreditsLine* line, CreditsChar* chr) { guScaleF(tempMtx, scaleAmt, scaleAmt, 1.0f); guMtxCatF(tempMtx, transformMtx, transformMtx); guMtxF2L (transformMtx, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), + gSPMatrix(gMainGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); foldImg.raster = glyphPtr->raster; @@ -439,7 +439,7 @@ void N(CharAnim_FadeOut_1)(CreditsLine* line, CreditsChar* chr) { foldImg.opacity = 255; fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_40, transformMtx); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } void N(CharAnim_FadeOut_2)(CreditsLine* line, CreditsChar* chr) { @@ -462,7 +462,7 @@ void N(CharAnim_FadeOut_2)(CreditsLine* line, CreditsChar* chr) { guRotateF(tempMtx, rotAngle, 0.0f, 1.0f, 0.0f); guMtxCatF(tempMtx, transformMtx, transformMtx); guMtxF2L (transformMtx, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), + gSPMatrix(gMainGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); foldImg.raster = glyphPtr->raster; @@ -474,7 +474,7 @@ void N(CharAnim_FadeOut_2)(CreditsLine* line, CreditsChar* chr) { foldImg.opacity = 255; fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_NO_FILTERING | FOLD_STATE_FLAG_40, transformMtx); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } void N(CharAnim_FadeOut_3)(CreditsLine* line, CreditsChar* chr) { @@ -726,12 +726,12 @@ void N(credits_worker_render)(void) { CreditsData* data = N(CreditsDataPtr); s32 i; - gSPViewport(gMasterGfxPos++, &N(CreditsViewport)); + gSPViewport(gMainGfxPos++, &N(CreditsViewport)); guOrtho(projMtx, 0.0f, 320.0f, -240.0f, 0.0f, -100.0f, 100.0f, 1.0f); - gSPMatrix(gMasterGfxPos++, OS_PHYSICAL_TO_K0(projMtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - gDPPipeSync(gMasterGfxPos++); - gSPClearGeometryMode(gMasterGfxPos++, G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); - gSPSetGeometryMode(gMasterGfxPos++, G_SHADE | G_SHADING_SMOOTH); + gSPMatrix(gMainGfxPos++, OS_PHYSICAL_TO_K0(projMtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gDPPipeSync(gMainGfxPos++); + gSPClearGeometryMode(gMainGfxPos++, G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); + gSPSetGeometryMode(gMainGfxPos++, G_SHADE | G_SHADING_SMOOTH); for (i = 0; i < ARRAY_COUNT(data->lines); i++) { if (data->lines[i].flags & CREDITS_LINE_FLAG_1) { diff --git a/src/world/area_end/end_01/end_01_4_opera_float.c b/src/world/area_end/end_01/end_01_4_opera_float.c index 8109832657..9fe65d72f1 100644 --- a/src/world/area_end/end_01/end_01_4_opera_float.c +++ b/src/world/area_end/end_01/end_01_4_opera_float.c @@ -111,10 +111,10 @@ API_CALLABLE(N(SetSpotlightsAlpha)) { } void N(gfx_build_set_spotlight_alpha)(void) { - gDPSetCombineLERP(gMasterGfxPos++, + gDPSetCombineLERP(gMainGfxPos++, TEXEL0, 0, SHADE, 0, SHADE, 0, PRIMITIVE, 0, TEXEL0, 0, SHADE, 0, SHADE, 0, PRIMITIVE, 0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, N(SpotlightsAlpha)); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, N(SpotlightsAlpha)); } EvtScript N(EVS_MakeSpiritAppear) = { diff --git a/src/world/area_flo/flo_10/flo_10_6_waterfx.c b/src/world/area_flo/flo_10/flo_10_6_waterfx.c index 62d8646f0b..699591daa2 100644 --- a/src/world/area_flo/flo_10/flo_10_6_waterfx.c +++ b/src/world/area_flo/flo_10/flo_10_6_waterfx.c @@ -68,12 +68,12 @@ void N(UnkModelFunc000)(s32 x1, s32 y1, s32 x2, s32 y2) { if (alpha > 255) { alpha = 255; } - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 255, 255, alpha); - gDPLoadTextureTile(gMasterGfxPos++, osVirtualToPhysical(img), G_IM_FMT_RGBA, G_IM_SIZ_16b, + gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 255, alpha); + gDPLoadTextureTile(gMainGfxPos++, osVirtualToPhysical(img), G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, 6, x1, y1 - 6 * i - 6, x2 - 1, y1 - 6 * i - 1, 0, G_TX_WRAP, G_TX_WRAP, 9, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPTextureRectangle(gMasterGfxPos++, x1 * 4, (y1 + i * 6) * 4, x2 * 4, (y1 + i * 6 + 6) * 4, + gSPTextureRectangle(gMainGfxPos++, x1 * 4, (y1 + i * 6) * 4, x2 * 4, (y1 + i * 6 + 6) * 4, G_TX_RENDERTILE, x1 * 32, (y1 - i * 6) * 32, 1024, (s32)(sin_deg(N(WavePhase) + i * 30) * 500.0f) - 500); } } @@ -84,12 +84,12 @@ void N(UnkModelFunc000)(s32 x1, s32 y1, s32 x2, s32 y2) { if (alpha > 255) { alpha = 255; } - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 255, 255, alpha); - gDPLoadTextureTile(gMasterGfxPos++, osVirtualToPhysical(img), G_IM_FMT_RGBA, G_IM_SIZ_16b, + gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 255, alpha); + gDPLoadTextureTile(gMainGfxPos++, osVirtualToPhysical(img), G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, 6, x1, y1 - 6 * i - m, x2 - 1, y1 - 6 * i - 1, 0, G_TX_WRAP, G_TX_WRAP, 9, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPTextureRectangle(gMasterGfxPos++, x1 * 4, (y1 + i * 6) * 4, x2 * 4, (y1 + i * 6 + m) * 4, + gSPTextureRectangle(gMainGfxPos++, x1 * 4, (y1 + i * 6) * 4, x2 * 4, (y1 + i * 6 + m) * 4, G_TX_RENDERTILE, x1 * 32, (y1 - i * 6) * 32, 1024, -1024); } } @@ -226,35 +226,35 @@ void N(UnkModelFunc001)(void) { temp_f20 += camera->viewportStartX; temp_f22 += camera->viewportStartY; - gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); - gDPSetRenderMode(gMasterGfxPos++, Z_CMP | CVG_DST_CLAMP | ZMODE_OPA | FORCE_BL | G_RM_PASS, + gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE); + gDPSetRenderMode(gMainGfxPos++, Z_CMP | CVG_DST_CLAMP | ZMODE_OPA | FORCE_BL | G_RM_PASS, Z_CMP | CVG_DST_CLAMP | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1)); - gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(nuGfxZBuffer)); - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, PRIMITIVE, 0, 0, 0, 0, 0, 0, 0, PRIMITIVE, 0, 0, 0, 0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 248, 240, 240, 0); - gDPPipeSync(gMasterGfxPos++); + gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(nuGfxZBuffer)); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, PRIMITIVE, 0, 0, 0, 0, 0, 0, 0, PRIMITIVE, 0, 0, 0, 0); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 248, 240, 240, 0); + gDPPipeSync(gMainGfxPos++); - gSPDisplayList(gMasterGfxPos++, model->modelNode->displayData->displayList); - gDPPipeSync(gMasterGfxPos++); + gSPDisplayList(gMainGfxPos++, model->modelNode->displayData->displayList); + gDPPipeSync(gMainGfxPos++); - gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(nuGfxCfb_ptr)); - gDPSetDepthSource(gMasterGfxPos++, G_ZS_PRIM); - gDPSetPrimDepth(gMasterGfxPos++, 32734, 0); - gDPSetRenderMode(gMasterGfxPos++, G_RM_ZB_XLU_DECAL, G_RM_ZB_XLU_DECAL2); - gDPSetTextureFilter(gMasterGfxPos++, G_TF_POINT); - gDPSetTexturePersp(gMasterGfxPos++, G_TP_NONE); - gSPTexture(gMasterGfxPos++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); - gDPSetTextureLUT(gMasterGfxPos++, G_TT_NONE); - gDPSetTextureDetail(gMasterGfxPos++, G_TD_CLAMP); - gDPSetTextureLOD(gMasterGfxPos++, G_TL_TILE); - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, TEXEL0, 0, 0, 0, PRIMITIVE, 0, 0, 0, TEXEL0, 0, 0, 0, PRIMITIVE); - gDPPipeSync(gMasterGfxPos++); + gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(nuGfxCfb_ptr)); + gDPSetDepthSource(gMainGfxPos++, G_ZS_PRIM); + gDPSetPrimDepth(gMainGfxPos++, 32734, 0); + gDPSetRenderMode(gMainGfxPos++, G_RM_ZB_XLU_DECAL, G_RM_ZB_XLU_DECAL2); + gDPSetTextureFilter(gMainGfxPos++, G_TF_POINT); + gDPSetTexturePersp(gMainGfxPos++, G_TP_NONE); + gSPTexture(gMainGfxPos++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); + gDPSetTextureLUT(gMainGfxPos++, G_TT_NONE); + gDPSetTextureDetail(gMainGfxPos++, G_TD_CLAMP); + gDPSetTextureLOD(gMainGfxPos++, G_TL_TILE); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, TEXEL0, 0, 0, 0, PRIMITIVE, 0, 0, 0, TEXEL0, 0, 0, 0, PRIMITIVE); + gDPPipeSync(gMainGfxPos++); N(UnkModelFunc000)(temp_f24, temp_f26, temp_f20, temp_f22); - gDPPipeSync(gMasterGfxPos++); - gDPSetCycleType(gMasterGfxPos++, G_CYC_2CYCLE); - gDPSetDepthSource(gMasterGfxPos++, G_ZS_PIXEL); + gDPPipeSync(gMainGfxPos++); + gDPSetCycleType(gMainGfxPos++, G_CYC_2CYCLE); + gDPSetDepthSource(gMainGfxPos++, G_ZS_PIXEL); } } diff --git a/src/world/area_flo/flo_14/flo_14_3_bubbles.c b/src/world/area_flo/flo_14/flo_14_3_bubbles.c index a460efe983..d5bd1b773a 100644 --- a/src/world/area_flo/flo_14/flo_14_3_bubbles.c +++ b/src/world/area_flo/flo_14/flo_14_3_bubbles.c @@ -230,9 +230,9 @@ void N(gfx_build_big_bubble)(void) { new_var = 0; while (new_var); // TODO required to match - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(VTX_COPY_0)); + gSPDisplayList(gMainGfxPos++, mdl_get_copied_gfx(VTX_COPY_0)); N(BubblePhase) += 1.0f; } @@ -262,7 +262,7 @@ void N(gfx_build_bubble_flower)(void) { } } - gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(VTX_COPY_1)); + gSPDisplayList(gMainGfxPos++, mdl_get_copied_gfx(VTX_COPY_1)); if (evt_get_variable(NULL, AF_FLO_BlowingBigBubble)) { if (N(FlowerPhase) > 90) { diff --git a/src/world/area_hos/hos_00/hos_00_7_shade_gfx.c b/src/world/area_hos/hos_00/hos_00_7_shade_gfx.c index 55d62d9935..db5dfb909f 100644 --- a/src/world/area_hos/hos_00/hos_00_7_shade_gfx.c +++ b/src/world/area_hos/hos_00/hos_00_7_shade_gfx.c @@ -9,9 +9,9 @@ void N(setup_gfx_background_shade)(void) { if (alpha > 216) { alpha = 216; } - gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, SHADE, SHADE, 0, PRIMITIVE, 0, 0, 0, 0, SHADE, SHADE, 0, PRIMITIVE, 0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, alpha); + gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, SHADE, SHADE, 0, PRIMITIVE, 0, 0, 0, 0, SHADE, SHADE, 0, PRIMITIVE, 0); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, alpha); } EvtScript N(EVS_SetupBackgroundShade) = { diff --git a/src/world/area_hos/hos_01/hos_01_3_model_fx.c b/src/world/area_hos/hos_01/hos_01_3_model_fx.c index d00bf2deff..36d3313eb8 100644 --- a/src/world/area_hos/hos_01/hos_01_3_model_fx.c +++ b/src/world/area_hos/hos_01/hos_01_3_model_fx.c @@ -35,10 +35,10 @@ API_CALLABLE(N(SetStarBeamMasterAlpha)) { } void N(setup_gfx_glowing_star)(void) { - gDPSetCombineLERP(gMasterGfxPos++, + gDPSetCombineLERP(gMainGfxPos++, TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, N(GlowingStarAlpha)); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, N(GlowingStarAlpha)); } API_CALLABLE(N(SetGlowingStarAlpha)) { @@ -49,10 +49,10 @@ API_CALLABLE(N(SetGlowingStarAlpha)) { } void N(setup_gfx_giving_power)(void) { - gDPSetCombineLERP(gMasterGfxPos++, + gDPSetCombineLERP(gMainGfxPos++, TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, N(GivingPowerAlpha)); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, N(GivingPowerAlpha)); } API_CALLABLE(N(SetGivingPowerAlpha)) { diff --git a/src/world/area_hos/hos_02/hos_02_3_model_fx.c b/src/world/area_hos/hos_02/hos_02_3_model_fx.c index b25340d548..21c8409673 100644 --- a/src/world/area_hos/hos_02/hos_02_3_model_fx.c +++ b/src/world/area_hos/hos_02/hos_02_3_model_fx.c @@ -10,7 +10,7 @@ void N(build_gfx_lamp_halos)(void) { N(HaloScalePhaseAngle) += (s32)RAD_TO_BINANG(25.1720); guScale(&gDisplayContext->matrixStack[gMatrixListPos], scale, scale, scale); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); } @@ -35,7 +35,7 @@ void N(build_gfx_yellow_stars)(void) { colors[2] = colors[0] * temp3 / 0x10000; } - gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(VTX_COPY_0)); + gSPDisplayList(gMainGfxPos++, mdl_get_copied_gfx(VTX_COPY_0)); N(YellowStarPhaseAngle) += (s32)RAD_TO_BINANG(25.1898); } @@ -60,7 +60,7 @@ void N(build_gfx_blue_stars)(void) { colors[2] = colors[0] * temp3 / 0x10000 + 99.6078431372549; } - gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(VTX_COPY_1)); + gSPDisplayList(gMainGfxPos++, mdl_get_copied_gfx(VTX_COPY_1)); N(BlueStarPhaseAngle) += (s32)RAD_TO_BINANG(25.1898); } @@ -85,7 +85,7 @@ void N(build_gfx_green_stars)(void) { colors[2] = colors[0] * temp3 / 0x10000 + 59.21568627450981; } - gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(VTX_COPY_2)); + gSPDisplayList(gMainGfxPos++, mdl_get_copied_gfx(VTX_COPY_2)); N(GreenStarPhaseAngle) += (s32)RAD_TO_BINANG(25.1898); } @@ -110,7 +110,7 @@ void N(build_gfx_pink_stars)(void) { colors[2] = colors[0] * temp3 / 0x10000 + 96.07843137254902; } - gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(VTX_COPY_3)); + gSPDisplayList(gMainGfxPos++, mdl_get_copied_gfx(VTX_COPY_3)); N(PinkStarPhaseAngle) += (s32)RAD_TO_BINANG(25.1898); } diff --git a/src/world/area_hos/hos_03/hos_03_3_model_fx.c b/src/world/area_hos/hos_03/hos_03_3_model_fx.c index 6e4384440d..8288010e86 100644 --- a/src/world/area_hos/hos_03/hos_03_3_model_fx.c +++ b/src/world/area_hos/hos_03/hos_03_3_model_fx.c @@ -15,7 +15,7 @@ void N(func_8024033C_A1B43C)(void) { f32 angle = sins(N(D_80243BCC_A1ECCC)) * (1.0f / 32768.0f) * 45.0f; N(D_80243BCC_A1ECCC) += 0x400; guRotate(&gDisplayContext->matrixStack[gMatrixListPos], angle, 0.0f, 1.0f, 0.0f); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); mdl_get_copied_vertices(VTX_COPY_1, &firstVertex, &copiedVertices, &numVertices); @@ -29,8 +29,8 @@ void N(func_8024033C_A1B43C)(void) { colors[2] = colors[0] * temp3 / 0x10000; } - gSPClearGeometryMode(gMasterGfxPos++, G_CULL_BOTH); - gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(VTX_COPY_1)); + gSPClearGeometryMode(gMainGfxPos++, G_CULL_BOTH); + gSPDisplayList(gMainGfxPos++, mdl_get_copied_gfx(VTX_COPY_1)); N(D_80243BCE_A1ECCE) += 0x666; } @@ -55,7 +55,7 @@ void N(func_8024060C_A1B70C)(void) { colors[2] = colors[0] * temp3 / 0x10000; } - gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(VTX_COPY_2)); + gSPDisplayList(gMainGfxPos++, mdl_get_copied_gfx(VTX_COPY_2)); N(D_80243BD0_A1ECD0) += (s32)RAD_TO_BINANG(25.1898); } @@ -76,7 +76,7 @@ void N(build_gfx_aurora)(void) { vtxDst->v.ob[1] = vtxSrc->v.ob[1] + v0 / 0x8000; } - gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(VTX_COPY_0)); + gSPDisplayList(gMainGfxPos++, mdl_get_copied_gfx(VTX_COPY_0)); N(AuroraPhaseAngle) += 0xA3; } @@ -87,7 +87,7 @@ void N(build_gfx_lamp_halos)(void) { N(HaloScalePhaseAngle) += (s32)RAD_TO_BINANG(25.1720); guScale(&gDisplayContext->matrixStack[gMatrixListPos], scale, scale, scale); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); } diff --git a/src/world/area_hos/hos_04/hos_04_3_fountains.c b/src/world/area_hos/hos_04/hos_04_3_fountains.c index cad40cec68..a6c1bedfe7 100644 --- a/src/world/area_hos/hos_04/hos_04_3_fountains.c +++ b/src/world/area_hos/hos_04/hos_04_3_fountains.c @@ -6,7 +6,7 @@ void N(setup_gfx_fountain_water)(void) { f32 temp_f0 = ((sin_rad(N(FountainPumpPhase) * (1 / 32.0f)) + 1.0f) * 0.25f) + 0.75; guScale(&gDisplayContext->matrixStack[gMatrixListPos], (temp_f0 * 0.3) + 0.5, temp_f0, (temp_f0 * 0.3) + 0.5); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); N(FountainPumpPhase)++; } @@ -16,7 +16,7 @@ void N(setup_gfx_fountain_stars)(void) { f64 t2 = sin_rad(N(FountainPumpPhase) * 0.25f) * 2.5; guTranslate(&gDisplayContext->matrixStack[gMatrixListPos], 0.0f, t1 + t2, 0.0f); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); } diff --git a/src/world/area_hos/hos_05/hos_05_5_intro.c b/src/world/area_hos/hos_05/hos_05_5_intro.c index 9bae4a5645..2e33ee5842 100644 --- a/src/world/area_hos/hos_05/hos_05_5_intro.c +++ b/src/world/area_hos/hos_05/hos_05_5_intro.c @@ -1337,40 +1337,40 @@ void N(appendGfx_image_strips)(s32 baseX, s32 baseY, IMG_PTR img, PAL_PTR pal, s return; } - gDPPipeSync(gMasterGfxPos++); - gSPDisplayList(gMasterGfxPos++, N(gfx_setup_story_viewport)); + gDPPipeSync(gMainGfxPos++); + gSPDisplayList(gMainGfxPos++, N(gfx_setup_story_viewport)); if (pal != NULL) { - gDPLoadTLUT_pal256(gMasterGfxPos++, pal); + gDPLoadTLUT_pal256(gMainGfxPos++, pal); } else { - gDPSetTextureLUT(gMasterGfxPos++, G_TT_NONE); + gDPSetTextureLUT(gMainGfxPos++, G_TT_NONE); } get_screen_overlay_params(1, &overlayType, &overlayAlphaBack); get_screen_overlay_params(0, &overlayType, &overlayAlphaFront); alpha = alpha * (255.0f - overlayAlphaBack) * (255.0f - overlayAlphaFront) / 255.0f / 255.0f; if (alpha != 255) { - gDPSetCombineLERP(gMasterGfxPos++, + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, alpha); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, alpha); } else { - gDPSetCombineMode(gMasterGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); + gDPSetCombineMode(gMainGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); } - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); - gDPSetRenderMode(gMasterGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); + gDPSetRenderMode(gMainGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); for (i = 0; i < height / lineHeight; i++) { - gDPLoadTextureTile(gMasterGfxPos++, img, pal != NULL ? G_IM_FMT_CI : G_IM_FMT_IA, G_IM_SIZ_8b, width, height, + gDPLoadTextureTile(gMainGfxPos++, img, pal != NULL ? G_IM_FMT_CI : G_IM_FMT_IA, G_IM_SIZ_8b, width, height, 0, i * lineHeight, width - 1, i * lineHeight + lineHeight - 1, 0, G_TX_WRAP, G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPScisTextureRectangle(gMasterGfxPos++, baseX * 4, (baseY + i * lineHeight) * 4, (baseX + width) * 4, + gSPScisTextureRectangle(gMainGfxPos++, baseX * 4, (baseY + i * lineHeight) * 4, (baseX + width) * 4, (baseY + i * lineHeight + lineHeight) * 4, G_TX_RENDERTILE, 0, (i * lineHeight) * 32, 1024, 1024); } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } void N(draw_background_tape)(void) { @@ -1385,23 +1385,23 @@ void N(appendGfx_image_ci)(s32 baseX, s32 baseY, IMG_PTR img, PAL_PTR pal) { s32 i; s32 m = 1; - gDPPipeSync(gMasterGfxPos++); - gDPLoadTLUT_pal256(gMasterGfxPos++, pal); + gDPPipeSync(gMainGfxPos++); + gDPLoadTLUT_pal256(gMainGfxPos++, pal); for (i = 0; i < 23; i++) { - gDPLoadTextureTile(gMasterGfxPos++, img, G_IM_FMT_CI, G_IM_SIZ_8b, 264, 162, + gDPLoadTextureTile(gMainGfxPos++, img, G_IM_FMT_CI, G_IM_SIZ_8b, 264, 162, 0, i * 7, 263, i * 7 + 7 - 1, 0, G_TX_WRAP, G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPScisTextureRectangle(gMasterGfxPos++, baseX * 4, (baseY + i * 7) * 4, (baseX + 264) * 4, (baseY + i * 7 + 7) * 4, + gSPScisTextureRectangle(gMainGfxPos++, baseX * 4, (baseY + i * 7) * 4, (baseX + 264) * 4, (baseY + i * 7 + 7) * 4, G_TX_RENDERTILE, 0, (i * 7) << 5, 1024, 1024); } if (m != 0) { - gDPLoadTextureTile(gMasterGfxPos++, img, G_IM_FMT_CI, G_IM_SIZ_8b, 264, 0, + gDPLoadTextureTile(gMainGfxPos++, img, G_IM_FMT_CI, G_IM_SIZ_8b, 264, 0, 0, i * 7, 263, i * 7 + m - 1, 0, G_TX_WRAP, G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPScisTextureRectangle(gMasterGfxPos++, baseX * 4, (baseY + i * 7) * 4, (baseX + 264) * 4, (baseY + i * 7 + m) * 4, + gSPScisTextureRectangle(gMainGfxPos++, baseX * 4, (baseY + i * 7) * 4, (baseX + 264) * 4, (baseY + i * 7 + m) * 4, G_TX_RENDERTILE, 0, (i * 7) << 5, 1024, 1024); } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } void N(worker_draw_story_graphics)(void) { @@ -1413,19 +1413,19 @@ void N(worker_draw_story_graphics)(void) { N(draw_background_tape)(); - gSPDisplayList(gMasterGfxPos++, N(gfx_setup_story_viewport)); - gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, nuGfxCfb_ptr); + gSPDisplayList(gMainGfxPos++, N(gfx_setup_story_viewport)); + gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, nuGfxCfb_ptr); if (N(StoryGraphicsPtr)->storyPageAlpha < 255) { - gDPSetRenderMode(gMasterGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, N(StoryGraphicsPtr)->storyPageAlpha); + gDPSetRenderMode(gMainGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, N(StoryGraphicsPtr)->storyPageAlpha); } get_screen_overlay_params(1, &overlayType, &overlayAlpha); if (overlayAlpha != 0.0f) { - gDPSetCombineLERP(gMasterGfxPos++, + gDPSetCombineLERP(gMainGfxPos++, PRIMITIVE, TEXEL0, PRIMITIVE_ALPHA, TEXEL0, 0, 0, 0, 1, PRIMITIVE, TEXEL0, PRIMITIVE_ALPHA, TEXEL0, 0, 0, 0, 1); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 208, 208, 208, (s32) overlayAlpha); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 208, 208, 208, (s32) overlayAlpha); } if (!N(StoryGraphicsPtr)->flipOrder) { diff --git a/src/world/area_hos/hos_05/hos_05_7_model_fx.c b/src/world/area_hos/hos_05/hos_05_7_model_fx.c index a0c4438a9e..e150536cc5 100644 --- a/src/world/area_hos/hos_05/hos_05_7_model_fx.c +++ b/src/world/area_hos/hos_05/hos_05_7_model_fx.c @@ -53,10 +53,10 @@ API_CALLABLE(N(SetWorldColorParams)) { #define NAME_SUFFIX void N(setup_gfx_light_beam)(void) { - gDPSetCombineLERP(gMasterGfxPos++, + gDPSetCombineLERP(gMainGfxPos++, TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, StarShrineLightBeamAlpha & 0xFF); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, StarShrineLightBeamAlpha & 0xFF); } API_CALLABLE(N(SetLightBeamAlpha)) { @@ -69,10 +69,10 @@ API_CALLABLE(N(SetLightBeamAlpha)) { s32 N(StarshipShimmerAmt) = 255; void N(setup_gfx_starship_shimmer)(void) { - gDPSetCombineLERP(gMasterGfxPos++, + gDPSetCombineLERP(gMainGfxPos++, TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, N(StarshipShimmerAmt)); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, N(StarshipShimmerAmt)); } API_CALLABLE(N(SetStarshipShimmerAmt)) { @@ -85,10 +85,10 @@ API_CALLABLE(N(SetStarshipShimmerAmt)) { s32 N(UnusedAlphaParam) = 255; void N(setup_gfx_unused)(void) { - gDPSetCombineLERP(gMasterGfxPos++, + gDPSetCombineLERP(gMainGfxPos++, TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, N(UnusedAlphaParam)); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, N(UnusedAlphaParam)); } API_CALLABLE(N(SetUnusedAlphaParam)) { diff --git a/src/world/area_isk/isk_05/isk_05_3_npc.c b/src/world/area_isk/isk_05/isk_05_3_npc.c index e5624b8b91..92b1357067 100644 --- a/src/world/area_isk/isk_05/isk_05_3_npc.c +++ b/src/world/area_isk/isk_05/isk_05_3_npc.c @@ -26,28 +26,28 @@ void N(func_80241610_97F0E0)(void) { SpriteRasterInfo spriteRaster; Matrix4f transformMtx, tempMtx; - gSPViewport(gMasterGfxPos++, &cam->vp); + gSPViewport(gMainGfxPos++, &cam->vp); if (!(cam->flags & CAMERA_FLAG_ORTHO)) { - gSPPerspNormalize(gMasterGfxPos++, cam->perspNorm); + gSPPerspNormalize(gMainGfxPos++, cam->perspNorm); } guMtxF2L(cam->perspectiveMatrix, &gDisplayContext->camPerspMatrix[gCurrentCameraID]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCameraID], + gSPMatrix(gMainGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCameraID], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - gDPPipeSync(gMasterGfxPos++); - gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); - gSPClearGeometryMode(gMasterGfxPos++, G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING + gDPPipeSync(gMainGfxPos++); + gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE); + gSPClearGeometryMode(gMainGfxPos++, G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); - gSPSetGeometryMode(gMasterGfxPos++, G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH); - gSPTexture(gMasterGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); - gDPSetTextureLOD(gMasterGfxPos++, G_TL_TILE); - gDPSetTexturePersp(gMasterGfxPos++, G_TP_PERSP); - gDPSetTextureFilter(gMasterGfxPos++, G_TF_BILERP); - gDPSetColorDither(gMasterGfxPos++, G_CD_DISABLE); - gDPSetTextureDetail(gMasterGfxPos++, G_TD_CLAMP); - gDPSetTextureConvert(gMasterGfxPos++, G_TC_FILT); - gDPSetCombineKey(gMasterGfxPos++, G_CK_NONE); - gDPSetAlphaCompare(gMasterGfxPos++, G_AC_NONE); + gSPSetGeometryMode(gMainGfxPos++, G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH); + gSPTexture(gMainGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); + gDPSetTextureLOD(gMainGfxPos++, G_TL_TILE); + gDPSetTexturePersp(gMainGfxPos++, G_TP_PERSP); + gDPSetTextureFilter(gMainGfxPos++, G_TF_BILERP); + gDPSetColorDither(gMainGfxPos++, G_CD_DISABLE); + gDPSetTextureDetail(gMainGfxPos++, G_TD_CLAMP); + gDPSetTextureConvert(gMainGfxPos++, G_TC_FILT); + gDPSetCombineKey(gMainGfxPos++, G_CK_NONE); + gDPSetAlphaCompare(gMainGfxPos++, G_AC_NONE); guTranslateF(transformMtx, ambush->pos.x, ambush->pos.y, ambush->pos.z); guRotateF(tempMtx, ambush->rot.y + gCameras[gCurrentCameraID].currentYaw + ambush->renderYaw, 0.0f, 1.0f, 0.0f); @@ -59,7 +59,7 @@ void N(func_80241610_97F0E0)(void) { guScaleF(tempMtx, ambush->scale.x, ambush->scale.y, ambush->scale.z); guMtxCatF(tempMtx, transformMtx, transformMtx); guMtxF2L(transformMtx, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), + gSPMatrix(gMainGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); spr_get_npc_raster_info(&spriteRaster, ambush->spriteIndex, ambush->rasterIndex); @@ -73,7 +73,7 @@ void N(func_80241610_97F0E0)(void) { fold_update(ambush->foldID, FOLD_TYPE_7, 255, 255, 255, ambush->alpha, 0); fold_appendGfx_component(ambush->foldID, &foldImg, 0, transformMtx); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } API_CALLABLE(N(func_80241B28_97F5F8)) { diff --git a/src/world/area_isk/isk_13/isk_13_3_npc.c b/src/world/area_isk/isk_13/isk_13_3_npc.c index f9b57fcb51..741293c3d0 100644 --- a/src/world/area_isk/isk_13/isk_13_3_npc.c +++ b/src/world/area_isk/isk_13/isk_13_3_npc.c @@ -25,28 +25,28 @@ void N(func_80241610_990DF0)(void) { SpriteRasterInfo spriteRaster; Matrix4f transformMtx, tempMtx; - gSPViewport(gMasterGfxPos++, &cam->vp); + gSPViewport(gMainGfxPos++, &cam->vp); if (!(cam->flags & CAMERA_FLAG_ORTHO)) { - gSPPerspNormalize(gMasterGfxPos++, cam->perspNorm); + gSPPerspNormalize(gMainGfxPos++, cam->perspNorm); } guMtxF2L(cam->perspectiveMatrix, &gDisplayContext->camPerspMatrix[gCurrentCameraID]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCameraID], + gSPMatrix(gMainGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCameraID], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - gDPPipeSync(gMasterGfxPos++); - gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); - gSPClearGeometryMode(gMasterGfxPos++, G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING + gDPPipeSync(gMainGfxPos++); + gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE); + gSPClearGeometryMode(gMainGfxPos++, G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); - gSPSetGeometryMode(gMasterGfxPos++, G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH); - gSPTexture(gMasterGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); - gDPSetTextureLOD(gMasterGfxPos++, G_TL_TILE); - gDPSetTexturePersp(gMasterGfxPos++, G_TP_PERSP); - gDPSetTextureFilter(gMasterGfxPos++, G_TF_BILERP); - gDPSetColorDither(gMasterGfxPos++, G_CD_DISABLE); - gDPSetTextureDetail(gMasterGfxPos++, G_TD_CLAMP); - gDPSetTextureConvert(gMasterGfxPos++, G_TC_FILT); - gDPSetCombineKey(gMasterGfxPos++, G_CK_NONE); - gDPSetAlphaCompare(gMasterGfxPos++, G_AC_NONE); + gSPSetGeometryMode(gMainGfxPos++, G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH); + gSPTexture(gMainGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); + gDPSetTextureLOD(gMainGfxPos++, G_TL_TILE); + gDPSetTexturePersp(gMainGfxPos++, G_TP_PERSP); + gDPSetTextureFilter(gMainGfxPos++, G_TF_BILERP); + gDPSetColorDither(gMainGfxPos++, G_CD_DISABLE); + gDPSetTextureDetail(gMainGfxPos++, G_TD_CLAMP); + gDPSetTextureConvert(gMainGfxPos++, G_TC_FILT); + gDPSetCombineKey(gMainGfxPos++, G_CK_NONE); + gDPSetAlphaCompare(gMainGfxPos++, G_AC_NONE); guTranslateF(transformMtx, ambush->pos.x, ambush->pos.y, ambush->pos.z); guRotateF(tempMtx, ambush->rot.y + gCameras[gCurrentCameraID].currentYaw + ambush->renderYaw, 0.0f, 1.0f, 0.0f); @@ -58,7 +58,7 @@ void N(func_80241610_990DF0)(void) { guScaleF(tempMtx, ambush->scale.x, ambush->scale.y, ambush->scale.z); guMtxCatF(tempMtx, transformMtx, transformMtx); guMtxF2L(transformMtx, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), + gSPMatrix(gMainGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (ambush->useBitingAnim) { @@ -79,7 +79,7 @@ void N(func_80241610_990DF0)(void) { fold_update(ambush->foldID, FOLD_TYPE_8, ambush->color.r, ambush->color.g, ambush->color.b, ambush->color.a, 0); fold_appendGfx_component(ambush->foldID, &foldImg, 0, transformMtx); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } API_CALLABLE(N(func_80241BA8_991388)) { diff --git a/src/world/area_isk/isk_14/isk_14_3_npc.c b/src/world/area_isk/isk_14/isk_14_3_npc.c index cd86fafdaf..284e358aa9 100644 --- a/src/world/area_isk/isk_14/isk_14_3_npc.c +++ b/src/world/area_isk/isk_14/isk_14_3_npc.c @@ -25,28 +25,28 @@ void N(func_80241610_993D40)(void) { SpriteRasterInfo spriteRaster; Matrix4f transformMtx, tempMtx; - gSPViewport(gMasterGfxPos++, &cam->vp); + gSPViewport(gMainGfxPos++, &cam->vp); if (!(cam->flags & CAMERA_FLAG_ORTHO)) { - gSPPerspNormalize(gMasterGfxPos++, cam->perspNorm); + gSPPerspNormalize(gMainGfxPos++, cam->perspNorm); } guMtxF2L(cam->perspectiveMatrix, &gDisplayContext->camPerspMatrix[gCurrentCameraID]); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCameraID], + gSPMatrix(gMainGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCameraID], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - gDPPipeSync(gMasterGfxPos++); - gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); - gSPClearGeometryMode(gMasterGfxPos++, G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING + gDPPipeSync(gMainGfxPos++); + gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE); + gSPClearGeometryMode(gMainGfxPos++, G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); - gSPSetGeometryMode(gMasterGfxPos++, G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH); - gSPTexture(gMasterGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); - gDPSetTextureLOD(gMasterGfxPos++, G_TL_TILE); - gDPSetTexturePersp(gMasterGfxPos++, G_TP_PERSP); - gDPSetTextureFilter(gMasterGfxPos++, G_TF_BILERP); - gDPSetColorDither(gMasterGfxPos++, G_CD_DISABLE); - gDPSetTextureDetail(gMasterGfxPos++, G_TD_CLAMP); - gDPSetTextureConvert(gMasterGfxPos++, G_TC_FILT); - gDPSetCombineKey(gMasterGfxPos++, G_CK_NONE); - gDPSetAlphaCompare(gMasterGfxPos++, G_AC_NONE); + gSPSetGeometryMode(gMainGfxPos++, G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH); + gSPTexture(gMainGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); + gDPSetTextureLOD(gMainGfxPos++, G_TL_TILE); + gDPSetTexturePersp(gMainGfxPos++, G_TP_PERSP); + gDPSetTextureFilter(gMainGfxPos++, G_TF_BILERP); + gDPSetColorDither(gMainGfxPos++, G_CD_DISABLE); + gDPSetTextureDetail(gMainGfxPos++, G_TD_CLAMP); + gDPSetTextureConvert(gMainGfxPos++, G_TC_FILT); + gDPSetCombineKey(gMainGfxPos++, G_CK_NONE); + gDPSetAlphaCompare(gMainGfxPos++, G_AC_NONE); guTranslateF(transformMtx, ambush->pos.x, ambush->pos.y, ambush->pos.z); guRotateF(tempMtx, ambush->rot.y + gCameras[gCurrentCameraID].currentYaw + ambush->renderYaw, 0.0f, 1.0f, 0.0f); @@ -58,7 +58,7 @@ void N(func_80241610_993D40)(void) { guScaleF(tempMtx, ambush->scale.x, ambush->scale.y, ambush->scale.z); guMtxCatF(tempMtx, transformMtx, transformMtx); guMtxF2L(transformMtx, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), + gSPMatrix(gMainGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); spr_get_npc_raster_info(&spriteRaster, ambush->spriteIndex, ambush->rasterIndex); @@ -71,7 +71,7 @@ void N(func_80241610_993D40)(void) { foldImg.opacity = 255; fold_appendGfx_component(ambush->foldID, &foldImg, 0, transformMtx); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } API_CALLABLE(N(func_80241AF0_994220)) { diff --git a/src/world/area_iwa/iwa_01/iwa_01_3_splash.c b/src/world/area_iwa/iwa_01/iwa_01_3_splash.c index f1d0432ac4..67da3f6772 100644 --- a/src/world/area_iwa/iwa_01/iwa_01_3_splash.c +++ b/src/world/area_iwa/iwa_01/iwa_01_3_splash.c @@ -53,19 +53,19 @@ void N(gfx_build_splashes)(s32 index) { alpha = 255; } - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 230, 255, 255, 255); - gDPSetBlendColor(gMasterGfxPos++, 0, 0, 0, alpha); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 230, 255, 255, 255); + gDPSetBlendColor(gMainGfxPos++, 0, 0, 0, alpha); guPosition(&gDisplayContext->matrixStack[gMatrixListPos], splash->rot.x, splash->rot.y, splash->rot.z, splash->scale, splash->pos.x, splash->pos.y, splash->pos.z); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, N(splash_gfx)); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, N(splash_gfx)); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } - gDPSetAlphaCompare(gMasterGfxPos++, G_AC_NONE); - gDPPipeSync(gMasterGfxPos++); + gDPSetAlphaCompare(gMainGfxPos++, G_AC_NONE); + gDPPipeSync(gMainGfxPos++); } API_CALLABLE(N(InitSplashes)) { diff --git a/src/world/area_jan/jan_13/jan_13_2_puzzle.c b/src/world/area_jan/jan_13/jan_13_2_puzzle.c index 6c113a691b..3bfb5b04e6 100644 --- a/src/world/area_jan/jan_13/jan_13_2_puzzle.c +++ b/src/world/area_jan/jan_13/jan_13_2_puzzle.c @@ -22,7 +22,7 @@ void N(setup_gfx_geyser)(void) { f32 scale = temp_f20 + temp_f21; guScale(&gDisplayContext->matrixStack[gMatrixListPos], (scale * 0.3) + 0.5, scale, (scale * 0.3) + 0.5); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); N(GeyserAnimPhase)++; } diff --git a/src/world/area_kgr/kgr_01/kgr_01_2_wiggle.c b/src/world/area_kgr/kgr_01/kgr_01_2_wiggle.c index 34dfdc5d93..5ffdef8515 100644 --- a/src/world/area_kgr/kgr_01/kgr_01_2_wiggle.c +++ b/src/world/area_kgr/kgr_01/kgr_01_2_wiggle.c @@ -63,7 +63,7 @@ void N(make_tongue_gfx)(s32 index) { mdl_get_copied_vertices(VTX_COPY_1, &vtxSrc, &vtxCopy, &numCopied); N(add_tongue_deformation)(vtxSrc, vtxCopy, numCopied, N(TongueWiggleTime)); - gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(VTX_COPY_1)); + gSPDisplayList(gMainGfxPos++, mdl_get_copied_gfx(VTX_COPY_1)); N(TongueWiggleTime) += TONGUE_WIGGLE_RATE; } diff --git a/src/world/area_kgr/kgr_02/kgr_02_2_unused.c b/src/world/area_kgr/kgr_02/kgr_02_2_unused.c index 8f8eed9835..55a7955a14 100644 --- a/src/world/area_kgr/kgr_02/kgr_02_2_unused.c +++ b/src/world/area_kgr/kgr_02/kgr_02_2_unused.c @@ -48,32 +48,32 @@ void N(func_80240160_8AA5B0)(s32 x1, s32 y1, s32 x2, s32 y2, s32 arg4) { x1 = x1 / 4 * 4; x2 = x2 / 4 * 4 + 4; - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 255, 255, 255); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 255, 255); n = (y2 - y1) / 6; m = (y2 - y1) % 6; img = nuGfxCfb_ptr; for (i = 0; i < n; i++) { - gDPLoadTextureTile(gMasterGfxPos++, osVirtualToPhysical(img), G_IM_FMT_RGBA, G_IM_SIZ_16b, + gDPLoadTextureTile(gMainGfxPos++, osVirtualToPhysical(img), G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, 6, x1, y1 + 6 * i, x2 - 1, y1 + 6 * i + 5, 0, G_TX_WRAP, G_TX_WRAP, 9, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); f0 = sin_deg(N(D_80240970_8AADC0) + i * 30); - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, (x1 + 512) * 4 + arg4 * (s32)(f0 * 4), + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, (x1 + 512) * 4 + arg4 * (s32)(f0 * 4), (y1 + i * 6) * 4, (x1 + 512) * 4 + arg4 * (s32)(f0 * 4) + 512 * 4, (y1 + i * 6) * 4 + 5 * 4); - gSPTextureRectangle(gMasterGfxPos++, x1 * 4, (y1 + i * 6) * 4, x2 * 4, (y1 + i * 6 + 6) * 4, + gSPTextureRectangle(gMainGfxPos++, x1 * 4, (y1 + i * 6) * 4, x2 * 4, (y1 + i * 6 + 6) * 4, G_TX_RENDERTILE, x1 * 32, (y1 + i * 6) * 32, 1024, 1024); } if (m != 0) { - gDPLoadTextureTile(gMasterGfxPos++, osVirtualToPhysical(img), G_IM_FMT_RGBA, G_IM_SIZ_16b, + gDPLoadTextureTile(gMainGfxPos++, osVirtualToPhysical(img), G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, m, x1, y1 + i * 6, x2 - 1, y1 + i * 6 + m - 1, 0, G_TX_WRAP, G_TX_WRAP, 9, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPTextureRectangle(gMasterGfxPos++, x1 * 4, (y1 + i * 6) * 4, x2 * 4, (y1 + i * 6 + m) * 4, + gSPTextureRectangle(gMainGfxPos++, x1 * 4, (y1 + i * 6) * 4, x2 * 4, (y1 + i * 6 + m) * 4, G_TX_RENDERTILE, x1 * 32, (y1 + i * 6) * 32, 1024, 1024); } } diff --git a/src/world/area_kkj/kkj_14/kkj_14_3_interactables.c b/src/world/area_kkj/kkj_14/kkj_14_3_interactables.c index 6d6fbe24a1..6a99b7fd51 100644 --- a/src/world/area_kkj/kkj_14/kkj_14_3_interactables.c +++ b/src/world/area_kkj/kkj_14/kkj_14_3_interactables.c @@ -209,10 +209,10 @@ API_CALLABLE(N(SetFireplaceAlpha)) { } void N(setup_gfx_fireplace)(void) { - gDPSetCycleType(gMasterGfxPos++, G_CYC_2CYCLE); - gDPSetRenderMode(gMasterGfxPos++, G_RM_PASS, G_RM_AA_ZB_XLU_SURF2); - gDPSetCombineLERP(gMasterGfxPos++, TEXEL0, 0, TEXEL1, 0, TEXEL0, 0, TEXEL1, 0, 0, 0, 0, COMBINED, 0, 0, 0, PRIMITIVE); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, N(FireplaceAlpha)); + gDPSetCycleType(gMainGfxPos++, G_CYC_2CYCLE); + gDPSetRenderMode(gMainGfxPos++, G_RM_PASS, G_RM_AA_ZB_XLU_SURF2); + gDPSetCombineLERP(gMainGfxPos++, TEXEL0, 0, TEXEL1, 0, TEXEL0, 0, TEXEL1, 0, 0, 0, 0, COMBINED, 0, 0, 0, PRIMITIVE); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, N(FireplaceAlpha)); } EvtScript N(EVS_TexPan_Fireplace) = { diff --git a/src/world/area_kkj/kkj_27/kkj_27_3_rotating_wall.c b/src/world/area_kkj/kkj_27/kkj_27_3_rotating_wall.c index 76277434b6..691a298736 100644 --- a/src/world/area_kkj/kkj_27/kkj_27_3_rotating_wall.c +++ b/src/world/area_kkj/kkj_27/kkj_27_3_rotating_wall.c @@ -25,8 +25,8 @@ API_CALLABLE(N(SetSpillLightAmount)) { void N(setup_gfx_spill_light)(void) { if (N(SpillLightAmount) > 0) { - gDPSetCombineLERP(gMasterGfxPos++, TEXEL0, 0, SHADE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, SHADE, 0, 0, 0, 0, PRIMITIVE); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, N(SpillLightAmount)); + gDPSetCombineLERP(gMainGfxPos++, TEXEL0, 0, SHADE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, SHADE, 0, 0, 0, 0, PRIMITIVE); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, N(SpillLightAmount)); } } diff --git a/src/world/area_kmr/kmr_06/kmr_06_5_sticker_sign.c b/src/world/area_kmr/kmr_06/kmr_06_5_sticker_sign.c index bfb8ad3f25..0536d8e0f8 100644 --- a/src/world/area_kmr/kmr_06/kmr_06_5_sticker_sign.c +++ b/src/world/area_kmr/kmr_06/kmr_06_5_sticker_sign.c @@ -29,7 +29,7 @@ void N(appendGfx_sticker)(void* renderData) { PAL_PTR pal = (PAL_PTR) evt_get_variable(NULL, MV_StickerPalette); u32 foldFlags = FOLD_STATE_FLAG_400; - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); guTranslateF(mtxTransform, sticker->pos.x, sticker->pos.y, sticker->pos.z); guRotateF(mtxTemp, sticker->yaw, 0.0f, 1.0f, 0.0f); guMtxCatF(mtxTemp, mtxTransform, mtxTransform); @@ -38,7 +38,7 @@ void N(appendGfx_sticker)(void* renderData) { guScaleF(mtxTemp, sticker->scale.x, sticker->scale.y, sticker->scale.z); guMtxCatF(mtxTemp, mtxTransform, mtxTransform); guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), + gSPMatrix(gMainGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); foldImage.raster = img; @@ -55,7 +55,7 @@ void N(appendGfx_sticker)(void* renderData) { fold_update(0, FOLD_TYPE_NONE, 0, 0, 0, 0, 0); fold_appendGfx_component(0, &foldImage, foldFlags, mtxTransform); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } void N(worker_render_sticker)(void) { diff --git a/src/world/area_kmr/kmr_20/kmr_20_13_records.c b/src/world/area_kmr/kmr_20/kmr_20_13_records.c index 3db17e1f2e..ff0f96d654 100644 --- a/src/world/area_kmr/kmr_20/kmr_20_13_records.c +++ b/src/world/area_kmr/kmr_20/kmr_20_13_records.c @@ -61,11 +61,11 @@ void N(appendGfx_records_impl)(GameRecords* records, s32 alpha) { s32 width; if (alpha > 0) { - gSPDisplayList(gMasterGfxPos++, N(records_screen_gfx)); - gDPPipeSync(gMasterGfxPos++); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 16, 120, 24, alpha * 0.65); - gDPFillRectangle(gMasterGfxPos++, 33, 43, 287, 192); - gDPPipeSync(gMasterGfxPos++); + gSPDisplayList(gMainGfxPos++, N(records_screen_gfx)); + gDPPipeSync(gMainGfxPos++); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 16, 120, 24, alpha * 0.65); + gDPFillRectangle(gMainGfxPos++, 33, 43, 287, 192); + gDPPipeSync(gMainGfxPos++); msg_draw_frame(30, 40, 260, 155, MSG_STYLE_INSPECT, MSG_PAL_WHITE, TRUE, alpha * 0.55, alpha); draw_msg(MSG_CH0_00FC, 206 - get_msg_width(MSG_CH0_00FC, 0), 50, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); diff --git a/src/world/area_kmr/kmr_21/kmr_21_1_main.c b/src/world/area_kmr/kmr_21/kmr_21_1_main.c index b330ea967a..fac76626e0 100644 --- a/src/world/area_kmr/kmr_21/kmr_21_1_main.c +++ b/src/world/area_kmr/kmr_21/kmr_21_1_main.c @@ -38,22 +38,22 @@ Gfx N(Gfx_TexSetup_TitleImage)[] = { void worker_render_title_image(void) { s32 i; - gSPDisplayList(gMasterGfxPos++, N(Gfx_TexSetup_TitleImage)); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, TitlePrimAlpha); - gDPPipeSync(gMasterGfxPos++); + gSPDisplayList(gMainGfxPos++, N(Gfx_TexSetup_TitleImage)); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, TitlePrimAlpha); + gDPPipeSync(gMainGfxPos++); for (i = 0; i < 56; i++) { - gDPLoadTextureTile(gMasterGfxPos++, &TitleImage[1600 * i], G_IM_FMT_RGBA, G_IM_SIZ_32b, 200, 112, + gDPLoadTextureTile(gMainGfxPos++, &TitleImage[1600 * i], G_IM_FMT_RGBA, G_IM_SIZ_32b, 200, 112, 0, 0, 199, 1, 0, G_TX_WRAP, G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPTextureRectangle(gMasterGfxPos++, + gSPTextureRectangle(gMainGfxPos++, /* ulx */ 60 * 4, /* uly */ (i * 2 + TitlePosY) * 4, /* lrx */ 260 * 4, /* lry */ ((i * 2 + 2) + TitlePosY) * 4, G_TX_RENDERTILE, 0, 0, 1024, 1024); } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } API_CALLABLE(N(LoadTitleImage)) { diff --git a/src/world/area_kmr/kmr_23/kmr_23_2_npc.c b/src/world/area_kmr/kmr_23/kmr_23_2_npc.c index bcabf20cee..9b508fb813 100644 --- a/src/world/area_kmr/kmr_23/kmr_23_2_npc.c +++ b/src/world/area_kmr/kmr_23/kmr_23_2_npc.c @@ -453,7 +453,7 @@ void func_80240DA4_9087D4(void) { f64 uly = baseY + (fullHeight * 0.5) - (D_802417D0_909200 * 0.5); f64 lrx = baseX + (fullWidth * 0.5) + (D_802417CC_9091FC * 0.5); f64 lry = baseY + (fullHeight * 0.5) + (D_802417D0_909200 * 0.5); - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, ulx, uly, lrx, lry); + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, ulx, uly, lrx, lry); draw_box(DRAW_FLAG_NO_CLIP, &D_802417D8_909208, ulx, uly, 0, D_802417CC_9091FC, D_802417D0_909200, 180, 0, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, NULL, NULL, NULL, 320, 240, NULL); } diff --git a/src/world/area_kmr/kmr_30/kmr_30_3_the_end.c b/src/world/area_kmr/kmr_30/kmr_30_3_the_end.c index 8b8684580b..428619d4ae 100644 --- a/src/world/area_kmr/kmr_30/kmr_30_3_the_end.c +++ b/src/world/area_kmr/kmr_30/kmr_30_3_the_end.c @@ -98,12 +98,12 @@ API_CALLABLE(N(UpdateTheEndAlpha)) { return ApiStatus_DONE2; } void N(gfx_build_the_end)(void) { - gDPSetCombineLERP(gMasterGfxPos++, + gDPSetCombineLERP(gMainGfxPos++, TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, TheEndModelAlpha); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, TheEndModelAlpha); } EvtScript N(EVS_Scene_TheEnd) = { diff --git a/src/world/area_mac/mac_00/mac_00_9_water_gfx.c b/src/world/area_mac/mac_00/mac_00_9_water_gfx.c index 45b9eb0fae..4ac2573fa7 100644 --- a/src/world/area_mac/mac_00/mac_00_9_water_gfx.c +++ b/src/world/area_mac/mac_00/mac_00_9_water_gfx.c @@ -6,23 +6,23 @@ MAP_RODATA_PAD(1,unk); void N(gfx_build_water)(void) { Model* model; - gDPSetDepthSource(gMasterGfxPos++, G_ZS_PRIM); - gDPSetPrimDepth(gMasterGfxPos++, 0x7FF0, 0); - gDPSetRenderMode(gMasterGfxPos++, Z_CMP | CVG_DST_CLAMP | ZMODE_OPA | FORCE_BL | G_RM_PASS, + gDPSetDepthSource(gMainGfxPos++, G_ZS_PRIM); + gDPSetPrimDepth(gMainGfxPos++, 0x7FF0, 0); + gDPSetRenderMode(gMainGfxPos++, Z_CMP | CVG_DST_CLAMP | ZMODE_OPA | FORCE_BL | G_RM_PASS, Z_CMP | CVG_DST_CLAMP | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1)); - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, PRIMITIVE, 0, 0, 0, 0, 0, 0, 0, PRIMITIVE, 0, 0, 0, 0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 128, 0); - gDPPipeSync(gMasterGfxPos++); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, PRIMITIVE, 0, 0, 0, 0, 0, 0, 0, PRIMITIVE, 0, 0, 0, 0); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 128, 0); + gDPPipeSync(gMainGfxPos++); model = get_model_from_list_index(get_model_list_index_from_tree_index(MODEL_water)); - gSPDisplayList(gMasterGfxPos++, model->modelNode->displayData->displayList); - gDPPipeSync(gMasterGfxPos++); - gDPSetCycleType(gMasterGfxPos++, G_CYC_2CYCLE); - gDPSetDepthSource(gMasterGfxPos++, G_ZS_PIXEL); - gDPSetRenderMode(gMasterGfxPos++, G_RM_PASS, G_RM_AA_ZB_XLU_SURF2); + gSPDisplayList(gMainGfxPos++, model->modelNode->displayData->displayList); + gDPPipeSync(gMainGfxPos++); + gDPSetCycleType(gMainGfxPos++, G_CYC_2CYCLE); + gDPSetDepthSource(gMainGfxPos++, G_ZS_PIXEL); + gDPSetRenderMode(gMainGfxPos++, G_RM_PASS, G_RM_AA_ZB_XLU_SURF2); - mdl_draw_hidden_panel_surface(&gMasterGfxPos, MODEL_water); + mdl_draw_hidden_panel_surface(&gMainGfxPos, MODEL_water); } EvtScript N(EVS_SetupWaterCustomGfx) = { diff --git a/src/world/area_mac/mac_01/mac_01_6_crystal_ball_gfx.c b/src/world/area_mac/mac_01/mac_01_6_crystal_ball_gfx.c index f116be9c5d..bf7f11dbd9 100644 --- a/src/world/area_mac/mac_01/mac_01_6_crystal_ball_gfx.c +++ b/src/world/area_mac/mac_01/mac_01_6_crystal_ball_gfx.c @@ -18,17 +18,17 @@ void N(gfx_build_crystal_ball_pre)(void) { -50.0f, 63.0f, 95.0f, 31.0f, 63.0f, 95.0f, 64, 64); - gSPLookAtX(gMasterGfxPos++, &gDisplayContext->lookAt.l[0]); - gSPLookAtY(gMasterGfxPos++, &gDisplayContext->lookAt.l[1]); - gDPSetHilite1Tile(gMasterGfxPos++, G_TX_RENDERTILE, &gDisplayContext->hilite, 64, 64); - gDPSetHilite2Tile(gMasterGfxPos++, G_TX_MIRROR, &gDisplayContext->hilite, 64, 64); - gSPTexture(gMasterGfxPos++, 0x1000, 0x1000, 0, G_TX_RENDERTILE, G_ON); - gSPSetGeometryMode(gMasterGfxPos++, G_TEXTURE_GEN); + gSPLookAtX(gMainGfxPos++, &gDisplayContext->lookAt.l[0]); + gSPLookAtY(gMainGfxPos++, &gDisplayContext->lookAt.l[1]); + gDPSetHilite1Tile(gMainGfxPos++, G_TX_RENDERTILE, &gDisplayContext->hilite, 64, 64); + gDPSetHilite2Tile(gMainGfxPos++, G_TX_MIRROR, &gDisplayContext->hilite, 64, 64); + gSPTexture(gMainGfxPos++, 0x1000, 0x1000, 0, G_TX_RENDERTILE, G_ON); + gSPSetGeometryMode(gMainGfxPos++, G_TEXTURE_GEN); } void N(gfx_build_crystal_ball_post)(void) { - gSPClearGeometryMode(gMasterGfxPos++, G_TEXTURE_GEN); - gSPEndDisplayList(gMasterGfxPos++); + gSPClearGeometryMode(gMainGfxPos++, G_TEXTURE_GEN); + gSPEndDisplayList(gMainGfxPos++); } void N(gfx_build_inside_crystal_ball)(void) { @@ -84,43 +84,43 @@ void N(gfx_build_inside_crystal_ball)(void) { f20 += camera->viewportStartX; f22 += camera->viewportStartY; - gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); - gDPSetRenderMode(gMasterGfxPos++, Z_CMP | CVG_DST_CLAMP | ZMODE_OPA | FORCE_BL | G_RM_PASS, Z_CMP | CVG_DST_CLAMP | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1)); - gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(nuGfxZBuffer)); - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, PRIMITIVE, 0, 0, 0, 0, 0, 0, 0, PRIMITIVE, 0, 0, 0, 0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 248, 240, 240, 0); - gDPPipeSync(gMasterGfxPos++); - gSPDisplayList(gMasterGfxPos++, model->modelNode->displayData->displayList); - gDPPipeSync(gMasterGfxPos++); - gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(nuGfxCfb_ptr)); - gDPSetDepthSource(gMasterGfxPos++, G_ZS_PRIM); - gDPSetPrimDepth(gMasterGfxPos++, 32734, 0); - gDPSetRenderMode(gMasterGfxPos++, G_RM_ZB_OPA_DECAL, G_RM_ZB_OPA_DECAL2); - gDPSetTextureFilter(gMasterGfxPos++, G_TF_POINT); - gDPSetTexturePersp(gMasterGfxPos++, G_TP_NONE); - gSPTexture(gMasterGfxPos++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); - gDPSetTextureLUT(gMasterGfxPos++, G_TT_NONE); - gDPSetTextureDetail(gMasterGfxPos++, G_TD_CLAMP); - gDPSetTextureLOD(gMasterGfxPos++, G_TL_TILE); - gDPPipeSync(gMasterGfxPos++); + gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE); + gDPSetRenderMode(gMainGfxPos++, Z_CMP | CVG_DST_CLAMP | ZMODE_OPA | FORCE_BL | G_RM_PASS, Z_CMP | CVG_DST_CLAMP | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1)); + gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(nuGfxZBuffer)); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, PRIMITIVE, 0, 0, 0, 0, 0, 0, 0, PRIMITIVE, 0, 0, 0, 0); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 248, 240, 240, 0); + gDPPipeSync(gMainGfxPos++); + gSPDisplayList(gMainGfxPos++, model->modelNode->displayData->displayList); + gDPPipeSync(gMainGfxPos++); + gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(nuGfxCfb_ptr)); + gDPSetDepthSource(gMainGfxPos++, G_ZS_PRIM); + gDPSetPrimDepth(gMainGfxPos++, 32734, 0); + gDPSetRenderMode(gMainGfxPos++, G_RM_ZB_OPA_DECAL, G_RM_ZB_OPA_DECAL2); + gDPSetTextureFilter(gMainGfxPos++, G_TF_POINT); + gDPSetTexturePersp(gMainGfxPos++, G_TP_NONE); + gSPTexture(gMainGfxPos++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); + gDPSetTextureLUT(gMainGfxPos++, G_TT_NONE); + gDPSetTextureDetail(gMainGfxPos++, G_TD_CLAMP); + gDPSetTextureLOD(gMainGfxPos++, G_TL_TILE); + gDPPipeSync(gMainGfxPos++); ulx = f20 / 32.0f * 32.0f - 8.0f; uly = f22 / 32.0f * 32.0f - 8.0f; if (ulx >= 0 && uly >= 0 && ulx + 40 < SCREEN_WIDTH && uly + 40 < SCREEN_HEIGHT) { - gDPLoadTextureTile(gMasterGfxPos++, osVirtualToPhysical(nuGfxCfb_ptr), G_IM_FMT_RGBA, G_IM_SIZ_16b, + gDPLoadTextureTile(gMainGfxPos++, osVirtualToPhysical(nuGfxCfb_ptr), G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, SCREEN_HEIGHT, ulx, uly, ulx + 31, uly + 31, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD); - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, TEXEL0, 0, 0, 0, 0, 0, 0, 0, TEXEL0, 0, 0, 0, 0); - gSPScisTextureRectangle(gMasterGfxPos++, (ulx - 8) * 4, (uly - 8) * 4, (ulx + 24) * 4, (uly + 24) * 4, + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, TEXEL0, 0, 0, 0, 0, 0, 0, 0, TEXEL0, 0, 0, 0, 0); + gSPScisTextureRectangle(gMainGfxPos++, (ulx - 8) * 4, (uly - 8) * 4, (ulx + 24) * 4, (uly + 24) * 4, G_TX_RENDERTILE, (ulx & 0x1F) << 5, (uly & 0x1F) << 5, 700, 700); } - gDPPipeSync(gMasterGfxPos++); - gDPSetDepthSource(gMasterGfxPos++, G_ZS_PIXEL); - gDPSetRenderMode(gMasterGfxPos++, G_RM_AA_ZB_XLU_SURF, G_RM_AA_ZB_XLU_SURF2); - gDPSetCombineMode(gMasterGfxPos++, G_CC_SHADE, G_CC_SHADE); - gDPSetTexturePersp(gMasterGfxPos++, G_TP_PERSP); - gSPTexture(gMasterGfxPos++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF); + gDPPipeSync(gMainGfxPos++); + gDPSetDepthSource(gMainGfxPos++, G_ZS_PIXEL); + gDPSetRenderMode(gMainGfxPos++, G_RM_AA_ZB_XLU_SURF, G_RM_AA_ZB_XLU_SURF2); + gDPSetCombineMode(gMainGfxPos++, G_CC_SHADE, G_CC_SHADE); + gDPSetTexturePersp(gMainGfxPos++, G_TP_PERSP); + gSPTexture(gMainGfxPos++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF); } EvtScript N(EVS_SetupCrystalBallGfx) = { diff --git a/src/world/area_mac/mac_01/npc/flower_gate.inc.c b/src/world/area_mac/mac_01/npc/flower_gate.inc.c index e774776334..38eff3c55a 100644 --- a/src/world/area_mac/mac_01/npc/flower_gate.inc.c +++ b/src/world/area_mac/mac_01/npc/flower_gate.inc.c @@ -197,8 +197,8 @@ API_CALLABLE(N(SetFlowerGateGlowAlpha)) { } void N(gfx_build_flower_gate_glow)(void) { - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, 1, SHADE, 0, PRIMITIVE, 0, 0, 0, 0, 1, SHADE, 0, PRIMITIVE, 0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, N(FlowerGatePrimAlpha)); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, 1, SHADE, 0, PRIMITIVE, 0, 0, 0, 0, 1, SHADE, 0, PRIMITIVE, 0); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, N(FlowerGatePrimAlpha)); } API_CALLABLE(N(SetPartnerTetherClose)) { diff --git a/src/world/area_mac/mac_01/npc/rowf_and_rhuff.inc.c b/src/world/area_mac/mac_01/npc/rowf_and_rhuff.inc.c index 9066e5e92d..b49aab2d26 100644 --- a/src/world/area_mac/mac_01/npc/rowf_and_rhuff.inc.c +++ b/src/world/area_mac/mac_01/npc/rowf_and_rhuff.inc.c @@ -78,7 +78,7 @@ void N(gfx_build_rowf_rug_with_ripples)(void) { } } - gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(VTX_COPY_0)); + gSPDisplayList(gMainGfxPos++, mdl_get_copied_gfx(VTX_COPY_0)); } API_CALLABLE(N(RevealRowfBadges)) { diff --git a/src/world/area_mac/mac_05/mac_05_7_club64_sign.c b/src/world/area_mac/mac_05/mac_05_7_club64_sign.c index 8281e2c840..395fa20ca3 100644 --- a/src/world/area_mac/mac_05/mac_05_7_club64_sign.c +++ b/src/world/area_mac/mac_05/mac_05_7_club64_sign.c @@ -85,7 +85,7 @@ void N(gfx_build_club_64)(s32 index) { colors[2] = colB * 255.0f; } - gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(VTX_COPY_3)); + gSPDisplayList(gMainGfxPos++, mdl_get_copied_gfx(VTX_COPY_3)); N(Club64SignAlphaModulus) += 0.01; if (N(Club64SignAlphaModulus) > 1.0) { N(Club64SignAlphaModulus) -= 1.0f; diff --git a/src/world/area_mgm/mgm_00/mgm_00_3_scoreboard.c b/src/world/area_mgm/mgm_00/mgm_00_3_scoreboard.c index 6eef514a4a..0cb9083223 100644 --- a/src/world/area_mgm/mgm_00/mgm_00_3_scoreboard.c +++ b/src/world/area_mgm/mgm_00/mgm_00_3_scoreboard.c @@ -48,11 +48,11 @@ Gfx N(Gfx_RecordDisplay_Init)[] = { void N(draw_record_display)(RecordDisplayData* data, s32 alpha) { if (alpha > 0) { - gSPDisplayList(gMasterGfxPos++, N(Gfx_RecordDisplay_Init)); - gDPPipeSync(gMasterGfxPos++); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 16, 120, 24, alpha * 0.65); - gDPFillRectangle(gMasterGfxPos++, 48, 53, 272, 129); - gDPPipeSync(gMasterGfxPos++); + gSPDisplayList(gMainGfxPos++, N(Gfx_RecordDisplay_Init)); + gDPPipeSync(gMainGfxPos++); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 16, 120, 24, alpha * 0.65); + gDPFillRectangle(gMainGfxPos++, 48, 53, 272, 129); + gDPPipeSync(gMainGfxPos++); msg_draw_frame(45, 50, 230, 82, MSG_STYLE_INSPECT, 0, 1, (s32)(alpha * 0.55), alpha); // cast needed if signature isn't present if (data->gameType == MINIGAME_TYPE_JUMP) { draw_msg(MSG_MGM_001C, 66, 57, alpha, MSG_PAL_TEAL, 0); diff --git a/src/world/area_mim/mim_04/mim_04_4_hint.c b/src/world/area_mim/mim_04/mim_04_4_hint.c index 9d64a127ca..def4056519 100644 --- a/src/world/area_mim/mim_04/mim_04_4_hint.c +++ b/src/world/area_mim/mim_04/mim_04_4_hint.c @@ -42,10 +42,10 @@ void N(gfx_build_evil_tree_face)(s32 index) { break; } - gDPSetCycleType(gMasterGfxPos++, G_CYC_2CYCLE); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, N(EvilTreeFaceAlpha)); - gDPSetCombineLERP(gMasterGfxPos++, TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0, COMBINED, 0, PRIMITIVE_ALPHA, 0, 0, 0, 0, COMBINED); - gDPSetRenderMode(gMasterGfxPos++, G_RM_FOG_SHADE_A, G_RM_AA_ZB_XLU_DECAL2); + gDPSetCycleType(gMainGfxPos++, G_CYC_2CYCLE); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, N(EvilTreeFaceAlpha)); + gDPSetCombineLERP(gMainGfxPos++, TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0, COMBINED, 0, PRIMITIVE_ALPHA, 0, 0, 0, 0, COMBINED); + gDPSetRenderMode(gMainGfxPos++, G_RM_FOG_SHADE_A, G_RM_AA_ZB_XLU_DECAL2); } API_CALLABLE(N(TryEvilTreeLaugh)) { diff --git a/src/world/area_mim/mim_07/mim_07_4_hint.c b/src/world/area_mim/mim_07/mim_07_4_hint.c index 9eca29bd1b..c788294f8d 100644 --- a/src/world/area_mim/mim_07/mim_07_4_hint.c +++ b/src/world/area_mim/mim_07/mim_07_4_hint.c @@ -54,10 +54,10 @@ void N(gfx_build_evil_rock_face)(s32 index) { break; } - gDPSetCycleType(gMasterGfxPos++, G_CYC_2CYCLE); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, N(EvilRockAlpha)); - gDPSetCombineLERP(gMasterGfxPos++, TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0, COMBINED, 0, PRIMITIVE_ALPHA, 0, 0, 0, 0, COMBINED); - gDPSetRenderMode(gMasterGfxPos++, G_RM_FOG_SHADE_A, G_RM_AA_ZB_XLU_DECAL2); + gDPSetCycleType(gMainGfxPos++, G_CYC_2CYCLE); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, N(EvilRockAlpha)); + gDPSetCombineLERP(gMainGfxPos++, TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0, COMBINED, 0, PRIMITIVE_ALPHA, 0, 0, 0, 0, COMBINED); + gDPSetRenderMode(gMainGfxPos++, G_RM_FOG_SHADE_A, G_RM_AA_ZB_XLU_DECAL2); } API_CALLABLE(N(TryEvilRockLaugh)) { diff --git a/src/world/area_nok/nok_04/nok_04_4_npc.c b/src/world/area_nok/nok_04/nok_04_4_npc.c index d1528d5498..0e94cd0cd2 100644 --- a/src/world/area_nok/nok_04/nok_04_4_npc.c +++ b/src/world/area_nok/nok_04/nok_04_4_npc.c @@ -291,9 +291,9 @@ void N(build_gfx_thread)(void) { } N(ThreadData).overshootVel *= 0.5; - gSPDisplayList(gMasterGfxPos++, N(ThreadGfx)); + gSPDisplayList(gMainGfxPos++, N(ThreadGfx)); guTranslate(&gDisplayContext->matrixStack[gMatrixListPos], N(ThreadData).anchorPos.x, N(ThreadData).anchorPos.y, N(ThreadData).anchorPos.z); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); segAngle = N(ThreadData).currentAngle; segLength = -N(ThreadData).currentLength; @@ -301,22 +301,22 @@ void N(build_gfx_thread)(void) { y += segLength * cos_rad(N(ThreadData).currentAngle * 0 / 180.0f * PI); guPosition(&gDisplayContext->matrixStack[gMatrixListPos], 0.0f, 0.0f, segAngle, 1.0f, 0.0f, segLength, 0.0f); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); for (i = 1; i < NUM_THREAD_SEGMENTS; i++) { segAngle = N(ThreadData).currentAngle; segLength = -N(ThreadData).currentLength; x += -segLength * sin_rad(N(ThreadData).currentAngle * i / 180.0f * PI); y += segLength * cos_rad(N(ThreadData).currentAngle * i / 180.0f * PI); - gSPVertex(gMasterGfxPos++, N(ThreadSegmentVertices), 2, 0); + gSPVertex(gMainGfxPos++, N(ThreadSegmentVertices), 2, 0); guPosition(&gDisplayContext->matrixStack[gMatrixListPos], 0.0f, 0.0f, segAngle, 1.0f, 0.0f, segLength, 0.0f); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPVertex(gMasterGfxPos++, N(ThreadSegmentVertices), 2, 2); - gSP2Triangles(gMasterGfxPos++, 0, 2, 1, 0, 2, 3, 1, 0); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPVertex(gMainGfxPos++, N(ThreadSegmentVertices), 2, 2); + gSP2Triangles(gMainGfxPos++, 0, 2, 1, 0, 2, 3, 1, 0); } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - gDPPipeSync(gMasterGfxPos++); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMainGfxPos++); N(ThreadData).endPoint.x = x; N(ThreadData).endPoint.y = y; diff --git a/src/world/area_pra/pra_29/pra_29_4_bridge.c b/src/world/area_pra/pra_29/pra_29_4_bridge.c index cca000ab43..1ad2391c95 100644 --- a/src/world/area_pra/pra_29/pra_29_4_bridge.c +++ b/src/world/area_pra/pra_29/pra_29_4_bridge.c @@ -36,12 +36,12 @@ void N(setup_gfx_bridge)(s32 index) { if (extendAmt == 0) { return; } - gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(index * 3)); + gSPDisplayList(gMainGfxPos++, mdl_get_copied_gfx(index * 3)); } else { mdl_get_copied_vertices(index * 3 + 0, &srcVtx1, &dest1, &numVertices); mdl_get_copied_vertices(index * 3 + 2, &srcVtx2, &dest2, &numVertices); N(set_bride_vertex_positions)(srcVtx1, srcVtx2, dest1, numVertices, extendAmt - 256); - gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(index * 3)); + gSPDisplayList(gMainGfxPos++, mdl_get_copied_gfx(index * 3)); } } diff --git a/src/world/area_trd/trd_05/trd_05_3_trap.c b/src/world/area_trd/trd_05/trd_05_3_trap.c index 5f2d2af383..7c0735bd97 100644 --- a/src/world/area_trd/trd_05/trd_05_3_trap.c +++ b/src/world/area_trd/trd_05/trd_05_3_trap.c @@ -21,20 +21,20 @@ void N(appendGfx_FallingSprite)(void) { Matrix4f tempMtx; u32 animFrame; - gDPPipeSync(gMasterGfxPos++); - gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); - gSPClearGeometryMode(gMasterGfxPos++, G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | + gDPPipeSync(gMainGfxPos++); + gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE); + gSPClearGeometryMode(gMainGfxPos++, G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); - gSPSetGeometryMode(gMasterGfxPos++, G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH); - gSPTexture(gMasterGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); - gDPSetTextureLOD(gMasterGfxPos++, G_TL_TILE); - gDPSetTexturePersp(gMasterGfxPos++, G_TP_PERSP); - gDPSetTextureFilter(gMasterGfxPos++, G_TF_BILERP); - gDPSetColorDither(gMasterGfxPos++, G_CD_DISABLE); - gDPSetTextureDetail(gMasterGfxPos++, G_TD_CLAMP); - gDPSetTextureConvert(gMasterGfxPos++, G_TC_FILT); - gDPSetCombineKey(gMasterGfxPos++, G_CK_NONE); - gDPSetAlphaCompare(gMasterGfxPos++, G_AC_NONE); + gSPSetGeometryMode(gMainGfxPos++, G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH); + gSPTexture(gMainGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); + gDPSetTextureLOD(gMainGfxPos++, G_TL_TILE); + gDPSetTexturePersp(gMainGfxPos++, G_TP_PERSP); + gDPSetTextureFilter(gMainGfxPos++, G_TF_BILERP); + gDPSetColorDither(gMainGfxPos++, G_CD_DISABLE); + gDPSetTextureDetail(gMainGfxPos++, G_TD_CLAMP); + gDPSetTextureConvert(gMainGfxPos++, G_TC_FILT); + gDPSetCombineKey(gMainGfxPos++, G_CK_NONE); + gDPSetAlphaCompare(gMainGfxPos++, G_AC_NONE); guTranslateF(transformMtx, falling->pos.x, falling->pos.y, falling->pos.z); guRotateF(tempMtx, falling->rot.x, 1.0f, 0.0f, 0.0f); @@ -46,7 +46,7 @@ void N(appendGfx_FallingSprite)(void) { guScaleF(tempMtx, falling->scale.x, falling->scale.y, falling->scale.z); guMtxCatF(tempMtx, transformMtx, transformMtx); guMtxF2L(transformMtx, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), + gSPMatrix(gMainGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); //TODO use SPR_RASTER_Mario8_XYZ here once they are defined @@ -72,7 +72,7 @@ void N(appendGfx_FallingSprite)(void) { recPart.opacity = 255; fold_appendGfx_component(falling->foldStateID, &recPart, 0, transformMtx); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } API_CALLABLE(N(InitializeFallingSprite)) { diff --git a/src/world/area_trd/trd_06/trd_06_2_falling.c b/src/world/area_trd/trd_06/trd_06_2_falling.c index 7b07be7555..f6a13d5863 100644 --- a/src/world/area_trd/trd_06/trd_06_2_falling.c +++ b/src/world/area_trd/trd_06/trd_06_2_falling.c @@ -24,19 +24,19 @@ void N(appendGfx_FallingSprite)(void) { u32 animFrame; FallingSprite* falling = &N(Falling); - gDPPipeSync(gMasterGfxPos++); - gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); - gSPClearGeometryMode(gMasterGfxPos++, G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); - gSPSetGeometryMode(gMasterGfxPos++, G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH); - gSPTexture(gMasterGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); - gDPSetTextureLOD(gMasterGfxPos++, G_TL_TILE); - gDPSetTexturePersp(gMasterGfxPos++, G_TP_PERSP); - gDPSetTextureFilter(gMasterGfxPos++, G_TF_BILERP); - gDPSetColorDither(gMasterGfxPos++, G_CD_DISABLE); - gDPSetTextureDetail(gMasterGfxPos++, G_TD_CLAMP); - gDPSetTextureConvert(gMasterGfxPos++, G_TC_FILT); - gDPSetCombineKey(gMasterGfxPos++, G_CK_NONE); - gDPSetAlphaCompare(gMasterGfxPos++, G_AC_NONE); + gDPPipeSync(gMainGfxPos++); + gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE); + gSPClearGeometryMode(gMainGfxPos++, G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); + gSPSetGeometryMode(gMainGfxPos++, G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH); + gSPTexture(gMainGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); + gDPSetTextureLOD(gMainGfxPos++, G_TL_TILE); + gDPSetTexturePersp(gMainGfxPos++, G_TP_PERSP); + gDPSetTextureFilter(gMainGfxPos++, G_TF_BILERP); + gDPSetColorDither(gMainGfxPos++, G_CD_DISABLE); + gDPSetTextureDetail(gMainGfxPos++, G_TD_CLAMP); + gDPSetTextureConvert(gMainGfxPos++, G_TC_FILT); + gDPSetCombineKey(gMainGfxPos++, G_CK_NONE); + gDPSetAlphaCompare(gMainGfxPos++, G_AC_NONE); guTranslateF(mtxTransform, falling->pos.x, falling->pos.y, falling->pos.z); guRotateF(mtxTemp, falling->rot.y, 0.0f, 1.0f, 0.0f); guMtxCatF(mtxTemp, mtxTransform, mtxTransform); @@ -47,7 +47,7 @@ void N(appendGfx_FallingSprite)(void) { guScaleF(mtxTemp, falling->scale.x, falling->scale.y, falling->scale.z); guMtxCatF(mtxTemp, mtxTransform, mtxTransform); guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), + gSPMatrix(gMainGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); //TODO use SPR_RASTER_Mario8_XYZ here once they are defined @@ -74,7 +74,7 @@ void N(appendGfx_FallingSprite)(void) { foldImage.yOffset = rasterInfo.height / 2; foldImage.opacity = 255; fold_appendGfx_component(falling->foldStateID, &foldImage, 0, mtxTransform); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } API_CALLABLE(N(InitializeFallingSprite)) { diff --git a/src/world/area_tst/tst_13/tst_13_1_main.c b/src/world/area_tst/tst_13/tst_13_1_main.c index ca8557508a..0d964ecc2b 100644 --- a/src/world/area_tst/tst_13/tst_13_1_main.c +++ b/src/world/area_tst/tst_13/tst_13_1_main.c @@ -298,13 +298,13 @@ void N(build_gfx_floor)(void) { guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); mdl_project_tex_coords(1, N(shockwave_gfx), sp10, NULL); - gDPPipeSync(gMasterGfxPos++); - gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); - gDPSetRenderMode(gMasterGfxPos++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2); - mdl_draw_hidden_panel_surface(&gMasterGfxPos, 1); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, N(shockwave_gfx)); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMainGfxPos++); + gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE); + gDPSetRenderMode(gMainGfxPos++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2); + mdl_draw_hidden_panel_surface(&gMainGfxPos, 1); + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(gMainGfxPos++, N(shockwave_gfx)); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/world/common/atomic/WhaleAnim.inc.c b/src/world/common/atomic/WhaleAnim.inc.c index 862c8272bf..3cf15f9b63 100644 --- a/src/world/common/atomic/WhaleAnim.inc.c +++ b/src/world/common/atomic/WhaleAnim.inc.c @@ -111,7 +111,7 @@ void N(unkAngleFunc002)(void) { mdl_get_copied_vertices(VTX_COPY_1, &firstVertex, &copiedVertices, &numVertices); N(unkVtxFunc001)(firstVertex, copiedVertices, numVertices, &N(unkAngle2)); - gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(VTX_COPY_1)); + gSPDisplayList(gMainGfxPos++, mdl_get_copied_gfx(VTX_COPY_1)); if (N(unkAngle2) >= 0) { N(unkAngle2) += 4; } @@ -128,7 +128,7 @@ void N(unkAngleFunc003)(void) { mdl_get_copied_vertices(VTX_COPY_2, &firstVertex, &copiedVertices, &numVertices); N(unkVtxFunc001)(firstVertex, copiedVertices, numVertices, &N(unkAngle3)); - gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(VTX_COPY_2)); + gSPDisplayList(gMainGfxPos++, mdl_get_copied_gfx(VTX_COPY_2)); if (N(unkAngle3) >= 0) { N(unkAngle3) += 4; } diff --git a/src/world/common/complete/KnockDownPlayer.inc.c b/src/world/common/complete/KnockDownPlayer.inc.c index 5f2ced7573..c937e6889e 100644 --- a/src/world/common/complete/KnockDownPlayer.inc.c +++ b/src/world/common/complete/KnockDownPlayer.inc.c @@ -11,21 +11,21 @@ void N(gfx_build_knocked_down_player)(void) { SpriteRasterInfo rasterInfo; Matrix4f sp40, sp80; - gDPPipeSync(gMasterGfxPos++); - gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); - gSPClearGeometryMode(gMasterGfxPos++, + gDPPipeSync(gMainGfxPos++); + gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE); + gSPClearGeometryMode(gMainGfxPos++, G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); - gSPSetGeometryMode(gMasterGfxPos++, G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH); - gSPTexture(gMasterGfxPos++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); - gDPSetTextureLOD(gMasterGfxPos++, G_TL_TILE); - gDPSetTexturePersp(gMasterGfxPos++, G_TP_PERSP); - gDPSetTextureFilter(gMasterGfxPos++, G_TF_BILERP); - gDPSetColorDither(gMasterGfxPos++, G_CD_DISABLE); - gDPSetTextureDetail(gMasterGfxPos++, G_TD_CLAMP); - gDPSetTextureConvert(gMasterGfxPos++, G_TC_FILT); - gDPSetCombineKey(gMasterGfxPos++, G_CK_NONE); - gDPSetAlphaCompare(gMasterGfxPos++, G_AC_NONE); + gSPSetGeometryMode(gMainGfxPos++, G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH); + gSPTexture(gMainGfxPos++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); + gDPSetTextureLOD(gMainGfxPos++, G_TL_TILE); + gDPSetTexturePersp(gMainGfxPos++, G_TP_PERSP); + gDPSetTextureFilter(gMainGfxPos++, G_TF_BILERP); + gDPSetColorDither(gMainGfxPos++, G_CD_DISABLE); + gDPSetTextureDetail(gMainGfxPos++, G_TD_CLAMP); + gDPSetTextureConvert(gMainGfxPos++, G_TC_FILT); + gDPSetCombineKey(gMainGfxPos++, G_CK_NONE); + gDPSetAlphaCompare(gMainGfxPos++, G_AC_NONE); guTranslateF(sp40, temp_v0->pos.x, temp_v0->pos.y, temp_v0->pos.z); guRotateF(sp80, temp_v0->rot.y, 0.0f, 1.0f, 0.0f); @@ -37,7 +37,7 @@ void N(gfx_build_knocked_down_player)(void) { guScaleF(sp80, temp_v0->scale.x, temp_v0->scale.y, temp_v0->scale.z); guMtxCatF(sp80, sp40, sp40); guMtxF2L(sp40, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, + gSPMatrix(gMainGfxPos++, OS_K0_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); @@ -51,7 +51,7 @@ void N(gfx_build_knocked_down_player)(void) { part.opacity = 255; fold_appendGfx_component(temp_v0->foldID, &part, 0.0f, sp40); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } ApiStatus N(KnockDownPlayerB)(Evt* script) { diff --git a/src/world/common/lava_piranha/part2.inc.c b/src/world/common/lava_piranha/part2.inc.c index dcd2504925..e79d272c07 100644 --- a/src/world/common/lava_piranha/part2.inc.c +++ b/src/world/common/lava_piranha/part2.inc.c @@ -195,8 +195,8 @@ void N(appendGfx_piranha_vines)(void* data) { N(VineRenderState) = 1; } - gDPPipeSync(gMasterGfxPos++); - gSPDisplayList(gMasterGfxPos++, N(lava_piranha_vine_gfx)); + gDPPipeSync(gMainGfxPos++); + gSPDisplayList(gMainGfxPos++, N(lava_piranha_vine_gfx)); for (i = 0; i < NUM_VINES; i++) { LavaPiranhaVine* vines = (LavaPiranhaVine*) evt_get_variable(NULL, MV_VinesData); @@ -210,10 +210,10 @@ void N(appendGfx_piranha_vines)(void* data) { // here and leave space behind for the gSPBranchList command followed by two vertices // for each point in numPoints - vtxBuffer = (Vtx_t*)(gMasterGfxPos + 1); - gSPBranchList(gMasterGfxPos, &gMasterGfxPos[1 + 2 * (2 * numPoints)]); - vtx = (Vtx_t*) (++gMasterGfxPos); - gMasterGfxPos = &gMasterGfxPos[2 * (2 * numPoints)]; + vtxBuffer = (Vtx_t*)(gMainGfxPos + 1); + gSPBranchList(gMainGfxPos, &gMainGfxPos[1 + 2 * (2 * numPoints)]); + vtx = (Vtx_t*) (++gMainGfxPos); + gMainGfxPos = &gMainGfxPos[2 * (2 * numPoints)]; for (j = 0; j < numPoints; j++) { posX = vine->points[j].x; @@ -263,12 +263,12 @@ void N(appendGfx_piranha_vines)(void* data) { } for (j = 0; j < numPoints - 1; j++) { - gSPVertex(gMasterGfxPos++, &vtxBuffer[2*j], 4, 0); - gSP2Triangles(gMasterGfxPos++, 1, 0, 2, 0, 1, 2, 3, 0); + gSPVertex(gMainGfxPos++, &vtxBuffer[2*j], 4, 0); + gSP2Triangles(gMainGfxPos++, 1, 0, 2, 0, 1, 2, 3, 0); } } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } void N(worker_render_piranha_vines)(void) { diff --git a/src/world/dead/area_flo/flo_10/flo_10_6_waterfx.c b/src/world/dead/area_flo/flo_10/flo_10_6_waterfx.c index a639805fe9..985a7bc8df 100644 --- a/src/world/dead/area_flo/flo_10/flo_10_6_waterfx.c +++ b/src/world/dead/area_flo/flo_10/flo_10_6_waterfx.c @@ -68,17 +68,17 @@ void N(UnkModelFunc000)(s32 x1, s32 y1, s32 x2, s32 y2) { if (alpha > 255) { alpha = 255; } - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 255, 255, alpha); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 255, alpha); - //gDPLoadTextureTile(gMasterGfxPos++, osVirtualToPhysical(img), G_IM_FMT_RGBA, G_IM_SIZ_16b, + //gDPLoadTextureTile(gMainGfxPos++, osVirtualToPhysical(img), G_IM_FMT_RGBA, G_IM_SIZ_16b, //SCREEN_WIDTH, 6, //x1, y1 - 6 * i - 6, x2 - 1, y1 - 6 * i - 1, 0, //G_TX_WRAP, G_TX_WRAP, 9, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - //gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(img)); + //gDPSetTextureImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(img)); { - Gfx *_g = (Gfx *)(gMasterGfxPos++); + Gfx *_g = (Gfx *)(gMainGfxPos++); if ((osVirtualToPhysical(img) % 8) != 0) { osSyncPrintf("GBI Error (aligned 8) File:%s Line:%d Adrs:%08x \n", @@ -89,27 +89,27 @@ void N(UnkModelFunc000)(s32 x1, s32 y1, s32 x2, s32 y2) { _g->words.w1 = (unsigned int)(osVirtualToPhysical(img)); } - gDPSetTile(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, + gDPSetTile(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, (((((x2 - 1)-(x1)+1) * G_IM_SIZ_16b_TILE_BYTES)+7)>>3), 0, G_TX_LOADTILE, 0 , G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP, 9, G_TX_NOLOD); - gDPLoadSync(gMasterGfxPos++); - gDPLoadTile(gMasterGfxPos++, G_TX_LOADTILE, + gDPLoadSync(gMainGfxPos++); + gDPLoadTile(gMainGfxPos++, G_TX_LOADTILE, (x1)<>3), 0, G_TX_RENDERTILE, 0, G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP, 9, G_TX_NOLOD); - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, (x1)< 255) { alpha = 255; } - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 255, 255, alpha); - //gDPLoadTextureTile(gMasterGfxPos++, osVirtualToPhysical(img), G_IM_FMT_RGBA, G_IM_SIZ_16b, + gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 255, alpha); + //gDPLoadTextureTile(gMainGfxPos++, osVirtualToPhysical(img), G_IM_FMT_RGBA, G_IM_SIZ_16b, // SCREEN_WIDTH, 6, // x1, y1 - 6 * i - m, x2 - 1, y1 - 6 * i - 1, 0, // G_TX_WRAP, G_TX_WRAP, 9, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - //gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(img)); + //gDPSetTextureImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(img)); { - Gfx *_g = (Gfx *)(gMasterGfxPos++); + Gfx *_g = (Gfx *)(gMainGfxPos++); if ((osVirtualToPhysical(img) % 8) != 0) { osSyncPrintf("GBI Error (aligned 8) File:%s Line:%d Adrs:%08x \n", @@ -139,27 +139,27 @@ void N(UnkModelFunc000)(s32 x1, s32 y1, s32 x2, s32 y2) { _g->words.w1 = (unsigned int)(osVirtualToPhysical(img)); } - gDPSetTile(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, + gDPSetTile(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, (((((x2 - 1)-(x1)+1) * G_IM_SIZ_16b_TILE_BYTES)+7)>>3), 0, G_TX_LOADTILE, 0 , G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP, 9, G_TX_NOLOD); - gDPLoadSync(gMasterGfxPos++); - gDPLoadTile(gMasterGfxPos++, G_TX_LOADTILE, + gDPLoadSync(gMainGfxPos++); + gDPLoadTile(gMainGfxPos++, G_TX_LOADTILE, (x1)<>3), 0, G_TX_RENDERTILE, 0, G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP, 9, G_TX_NOLOD); - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, + gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, (x1)<viewportStartX; temp_f22 += camera->viewportStartY; - gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); - gDPSetRenderMode(gMasterGfxPos++, Z_CMP | CVG_DST_CLAMP | ZMODE_OPA | FORCE_BL | G_RM_PASS, + gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE); + gDPSetRenderMode(gMainGfxPos++, Z_CMP | CVG_DST_CLAMP | ZMODE_OPA | FORCE_BL | G_RM_PASS, Z_CMP | CVG_DST_CLAMP | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1)); - new_var = gMasterGfxPos++; + new_var = gMainGfxPos++; if ((osVirtualToPhysical(nuGfxZBuffer) % 8) != 0) { osSyncPrintf("GBI Error (aligned 8) File:%s Line:%d Adrs:%08x \n", "evt_underwater.c", 175, osVirtualToPhysical(nuGfxZBuffer)); } gDPSetColorImage(new_var, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(nuGfxZBuffer)); - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, PRIMITIVE, 0, 0, 0, 0, 0, 0, 0, PRIMITIVE, 0, 0, 0, 0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 248, 240, 240, 0); - gDPPipeSync(gMasterGfxPos++); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, PRIMITIVE, 0, 0, 0, 0, 0, 0, 0, PRIMITIVE, 0, 0, 0, 0); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 248, 240, 240, 0); + gDPPipeSync(gMainGfxPos++); - gSPDisplayList(gMasterGfxPos++, model->modelNode->displayData->displayList); - gDPPipeSync(gMasterGfxPos++); + gSPDisplayList(gMainGfxPos++, model->modelNode->displayData->displayList); + gDPPipeSync(gMainGfxPos++); - new_var = gMasterGfxPos++; + new_var = gMainGfxPos++; if ((osVirtualToPhysical(nuGfxCfb_ptr) % 8) != 0) { osSyncPrintf("GBI Error (aligned 8) File:%s Line:%d Adrs:%08x \n", "evt_underwater.c", 186, osVirtualToPhysical(nuGfxCfb_ptr)); } gDPSetColorImage(new_var, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(nuGfxCfb_ptr)); - gDPSetDepthSource(gMasterGfxPos++, G_ZS_PRIM); - gDPSetPrimDepth(gMasterGfxPos++, 32734, 0); - gDPSetRenderMode(gMasterGfxPos++, G_RM_ZB_XLU_DECAL, G_RM_ZB_XLU_DECAL2); - gDPSetTextureFilter(gMasterGfxPos++, G_TF_POINT); - gDPSetTexturePersp(gMasterGfxPos++, G_TP_NONE); - gSPTexture(gMasterGfxPos++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); - gDPSetTextureLUT(gMasterGfxPos++, G_TT_NONE); - gDPSetTextureDetail(gMasterGfxPos++, G_TD_CLAMP); - gDPSetTextureLOD(gMasterGfxPos++, G_TL_TILE); - gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, TEXEL0, 0, 0, 0, PRIMITIVE, 0, 0, 0, TEXEL0, 0, 0, 0, PRIMITIVE); - gDPPipeSync(gMasterGfxPos++); + gDPSetDepthSource(gMainGfxPos++, G_ZS_PRIM); + gDPSetPrimDepth(gMainGfxPos++, 32734, 0); + gDPSetRenderMode(gMainGfxPos++, G_RM_ZB_XLU_DECAL, G_RM_ZB_XLU_DECAL2); + gDPSetTextureFilter(gMainGfxPos++, G_TF_POINT); + gDPSetTexturePersp(gMainGfxPos++, G_TP_NONE); + gSPTexture(gMainGfxPos++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); + gDPSetTextureLUT(gMainGfxPos++, G_TT_NONE); + gDPSetTextureDetail(gMainGfxPos++, G_TD_CLAMP); + gDPSetTextureLOD(gMainGfxPos++, G_TL_TILE); + gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, TEXEL0, 0, 0, 0, PRIMITIVE, 0, 0, 0, TEXEL0, 0, 0, 0, PRIMITIVE); + gDPPipeSync(gMainGfxPos++); N(UnkModelFunc000)(temp_f24, temp_f26, temp_f20, temp_f22); - gDPPipeSync(gMasterGfxPos++); - gDPSetCycleType(gMasterGfxPos++, G_CYC_2CYCLE); - gDPSetDepthSource(gMasterGfxPos++, G_ZS_PIXEL); + gDPPipeSync(gMainGfxPos++); + gDPSetCycleType(gMainGfxPos++, G_CYC_2CYCLE); + gDPSetDepthSource(gMainGfxPos++, G_ZS_PIXEL); } } diff --git a/src/world/dead/area_flo/flo_14/flo_14_3_bubbles.c b/src/world/dead/area_flo/flo_14/flo_14_3_bubbles.c index 2936558de7..1f3fe89979 100644 --- a/src/world/dead/area_flo/flo_14/flo_14_3_bubbles.c +++ b/src/world/dead/area_flo/flo_14/flo_14_3_bubbles.c @@ -230,9 +230,9 @@ void N(gfx_build_big_bubble)(void) { new_var = 0; while (new_var); // TODO required to match - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(VTX_COPY_0)); + gSPDisplayList(gMainGfxPos++, mdl_get_copied_gfx(VTX_COPY_0)); N(BubblePhase) += 1.0f; } @@ -262,7 +262,7 @@ void N(gfx_build_bubble_flower)(void) { } } - gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(VTX_COPY_1)); + gSPDisplayList(gMainGfxPos++, mdl_get_copied_gfx(VTX_COPY_1)); if (evt_get_variable(NULL, AF_FLO_BlowingBigBubble)) { if (N(FlowerPhase) > 90) { diff --git a/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c b/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c index 74b3a995ee..b49c5ec0eb 100644 --- a/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c +++ b/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c @@ -255,8 +255,8 @@ void N(appendGfx_piranha_vines)(void* data) { N(VineRenderState) = 1; } - gDPPipeSync(gMasterGfxPos++); - gSPDisplayList(gMasterGfxPos++, N(lava_piranha_vine_gfx)); + gDPPipeSync(gMainGfxPos++); + gSPDisplayList(gMainGfxPos++, N(lava_piranha_vine_gfx)); for (i = 0; i < NUM_VINES; i++) { LavaPiranhaVine* vines = (LavaPiranhaVine*) evt_get_variable(NULL, MV_VinesData); @@ -270,10 +270,10 @@ void N(appendGfx_piranha_vines)(void* data) { // here and leave space behind for the gSPBranchList command followed by two vertices // for each point in numPoints - vtxBuffer = (Vtx_t*)(gMasterGfxPos + 1); - gSPBranchList(gMasterGfxPos, &gMasterGfxPos[1 + 2 * (2 * numPoints)]); - vtx = (Vtx_t*) (++gMasterGfxPos); - gMasterGfxPos = &gMasterGfxPos[2 * (2 * numPoints)]; + vtxBuffer = (Vtx_t*)(gMainGfxPos + 1); + gSPBranchList(gMainGfxPos, &gMainGfxPos[1 + 2 * (2 * numPoints)]); + vtx = (Vtx_t*) (++gMainGfxPos); + gMainGfxPos = &gMainGfxPos[2 * (2 * numPoints)]; for (j = 0; j < numPoints; j++) { posX = vine->points[j].x; @@ -323,12 +323,12 @@ void N(appendGfx_piranha_vines)(void* data) { } for (j = 0; j < numPoints - 1; j++) { - gSPVertex(gMasterGfxPos++, &vtxBuffer[2*j], 4, 0); - gSP2Triangles(gMasterGfxPos++, 1, 0, 2, 0, 1, 2, 3, 0); + gSPVertex(gMainGfxPos++, &vtxBuffer[2*j], 4, 0); + gSP2Triangles(gMainGfxPos++, 1, 0, 2, 0, 1, 2, 3, 0); } } - gDPPipeSync(gMasterGfxPos++); + gDPPipeSync(gMainGfxPos++); } void N(worker_render_piranha_vines)(void) { diff --git a/tools/fix_bad_evt_changes.py b/tools/fix_bad_evt_changes.py index 6b77f3e0bf..e9ebfef7fa 100644 --- a/tools/fix_bad_evt_changes.py +++ b/tools/fix_bad_evt_changes.py @@ -14,7 +14,7 @@ for line in fileinput.input(): problems.append((filename, line_number, bad_symbol_name)) for filename, line_number, bad_symbol_name in problems: - url = f"https://raw.githubusercontent.com/pmret/papermario/master/{filename}" + url = f"https://raw.githubusercontent.com/pmret/papermario/main/{filename}" old_lines = requests.get(url).text.splitlines() old_line = old_lines[line_number - 1].strip() diff --git a/ver/ique/asm/bss.s b/ver/ique/asm/bss.s index 6f801ae56e..5f0540303c 100644 --- a/ver/ique/asm/bss.s +++ b/ver/ique/asm/bss.s @@ -163,7 +163,7 @@ dlabel gBGMPlayerA dlabel gFirstStrikeMessagePos .space 4 -dlabel gMasterGfxPos +dlabel gMainGfxPos .space 4 dlabel D_8009A670 diff --git a/ver/ique/asm/nonmatchings/B4580/appendGfx_animator_node.s b/ver/ique/asm/nonmatchings/B4580/appendGfx_animator_node.s index 51ca0d3522..d0574a155f 100644 --- a/ver/ique/asm/nonmatchings/B4580/appendGfx_animator_node.s +++ b/ver/ique/asm/nonmatchings/B4580/appendGfx_animator_node.s @@ -69,8 +69,8 @@ glabel appendGfx_animator_node /* B4E00 8011DF20 3C06E300 */ lui $a2, (0xE3001001 >> 16) /* B4E04 8011DF24 34C61001 */ ori $a2, $a2, (0xE3001001 & 0xFFFF) /* B4E08 8011DF28 3C07D9FD */ lui $a3, (0xD9FDFFFF >> 16) -/* B4E0C 8011DF2C 3C09800A */ lui $t1, %hi(gMasterGfxPos) -/* B4E10 8011DF30 25299244 */ addiu $t1, $t1, %lo(gMasterGfxPos) +/* B4E0C 8011DF2C 3C09800A */ lui $t1, %hi(gMainGfxPos) +/* B4E10 8011DF30 25299244 */ addiu $t1, $t1, %lo(gMainGfxPos) /* B4E14 8011DF34 34E7FFFF */ ori $a3, $a3, (0xD9FDFFFF & 0xFFFF) /* B4E18 8011DF38 8D280000 */ lw $t0, 0x0($t1) /* B4E1C 8011DF3C 96020000 */ lhu $v0, 0x0($s0) @@ -146,8 +146,8 @@ glabel appendGfx_animator_node /* B4F2C 8011E04C AC640000 */ sw $a0, 0x0($v1) /* B4F30 8011E050 AC620004 */ sw $v0, 0x4($v1) .LIQUE_8011E054: -/* B4F34 8011E054 3C10800A */ lui $s0, %hi(gMasterGfxPos) -/* B4F38 8011E058 26109244 */ addiu $s0, $s0, %lo(gMasterGfxPos) +/* B4F34 8011E054 3C10800A */ lui $s0, %hi(gMainGfxPos) +/* B4F38 8011E058 26109244 */ addiu $s0, $s0, %lo(gMainGfxPos) /* B4F3C 8011E05C 8E020000 */ lw $v0, 0x0($s0) /* B4F40 8011E060 3C11E700 */ lui $s1, (0xE7000000 >> 16) /* B4F44 8011E064 0040182D */ daddu $v1, $v0, $zero @@ -307,8 +307,8 @@ glabel appendGfx_animator_node /* B5170 8011E290 1462FFC0 */ bne $v1, $v0, .LIQUE_8011E194 /* B5174 8011E294 26940001 */ addiu $s4, $s4, 0x1 .LIQUE_8011E298: -/* B5178 8011E298 3C05800A */ lui $a1, %hi(gMasterGfxPos) -/* B517C 8011E29C 24A59244 */ addiu $a1, $a1, %lo(gMasterGfxPos) +/* B5178 8011E298 3C05800A */ lui $a1, %hi(gMainGfxPos) +/* B517C 8011E29C 24A59244 */ addiu $a1, $a1, %lo(gMainGfxPos) /* B5180 8011E2A0 0260202D */ daddu $a0, $s3, $zero /* B5184 8011E2A4 8CA30000 */ lw $v1, 0x0($a1) /* B5188 8011E2A8 3C02DF00 */ lui $v0, (0xDF000000 >> 16) @@ -323,8 +323,8 @@ glabel appendGfx_animator_node /* B51AC 8011E2CC AC820004 */ sw $v0, 0x4($a0) .LIQUE_8011E2D0: /* B51B0 8011E2D0 0000882D */ daddu $s1, $zero, $zero -/* B51B4 8011E2D4 3C03800A */ lui $v1, %hi(gMasterGfxPos) -/* B51B8 8011E2D8 24639244 */ addiu $v1, $v1, %lo(gMasterGfxPos) +/* B51B4 8011E2D4 3C03800A */ lui $v1, %hi(gMainGfxPos) +/* B51B8 8011E2D8 24639244 */ addiu $v1, $v1, %lo(gMainGfxPos) /* B51BC 8011E2DC 8C620000 */ lw $v0, 0x0($v1) /* B51C0 8011E2E0 02C0802D */ daddu $s0, $s6, $zero /* B51C4 8011E2E4 0040202D */ daddu $a0, $v0, $zero diff --git a/ver/ique/asm/nonmatchings/C50A0/draw_image_with_clipping.s b/ver/ique/asm/nonmatchings/C50A0/draw_image_with_clipping.s index bdb374ed87..3fc1944a5a 100644 --- a/ver/ique/asm/nonmatchings/C50A0/draw_image_with_clipping.s +++ b/ver/ique/asm/nonmatchings/C50A0/draw_image_with_clipping.s @@ -69,8 +69,8 @@ glabel draw_image_with_clipping /* C43F4 8012D514 018B6021 */ addu $t4, $t4, $t3 /* C43F8 8012D518 8FB50088 */ lw $s5, 0x88($sp) /* C43FC 8012D51C 8FB60088 */ lw $s6, 0x88($sp) -/* C4400 8012D520 3C08800A */ lui $t0, %hi(gMasterGfxPos) -/* C4404 8012D524 25089244 */ addiu $t0, $t0, %lo(gMasterGfxPos) +/* C4400 8012D520 3C08800A */ lui $t0, %hi(gMainGfxPos) +/* C4404 8012D524 25089244 */ addiu $t0, $t0, %lo(gMainGfxPos) /* C4408 8012D528 A3A00020 */ sb $zero, 0x20($sp) /* C440C 8012D52C AFA90024 */ sw $t1, 0x24($sp) /* C4410 8012D530 AFAC0034 */ sw $t4, 0x34($sp) diff --git a/ver/ique/asm/nonmatchings/de740_len_23f0/appendGfx_shading_palette.s b/ver/ique/asm/nonmatchings/de740_len_23f0/appendGfx_shading_palette.s index d96a970e0f..214cc57713 100644 --- a/ver/ique/asm/nonmatchings/de740_len_23f0/appendGfx_shading_palette.s +++ b/ver/ique/asm/nonmatchings/de740_len_23f0/appendGfx_shading_palette.s @@ -262,8 +262,8 @@ glabel appendGfx_shading_palette /* DE3E4 80147504 3C0CE404 */ lui $t4, (0xE4040004 >> 16) /* DE3E8 80147508 358C0004 */ ori $t4, $t4, (0xE4040004 & 0xFFFF) /* DE3EC 8014750C 3C0E1000 */ lui $t6, (0x10000400 >> 16) -/* DE3F0 80147510 3C17800A */ lui $s7, %hi(gMasterGfxPos) -/* DE3F4 80147514 26F79244 */ addiu $s7, $s7, %lo(gMasterGfxPos) +/* DE3F0 80147510 3C17800A */ lui $s7, %hi(gMainGfxPos) +/* DE3F4 80147514 26F79244 */ addiu $s7, $s7, %lo(gMainGfxPos) /* DE3F8 80147518 35CE0400 */ ori $t6, $t6, (0x10000400 & 0xFFFF) /* DE3FC 8014751C 3C05FA00 */ lui $a1, (0xFA000000 >> 16) /* DE400 80147520 00131E00 */ sll $v1, $s3, 24 @@ -485,8 +485,8 @@ glabel appendGfx_shading_palette /* DE758 80147878 AEE20000 */ sw $v0, 0x0($s7) /* DE75C 8014787C AD440048 */ sw $a0, 0x48($t2) /* DE760 80147880 AD43004C */ sw $v1, 0x4C($t2) -/* DE764 80147884 3C03800A */ lui $v1, %hi(gMasterGfxPos) -/* DE768 80147888 24639244 */ addiu $v1, $v1, %lo(gMasterGfxPos) +/* DE764 80147884 3C03800A */ lui $v1, %hi(gMainGfxPos) +/* DE768 80147888 24639244 */ addiu $v1, $v1, %lo(gMainGfxPos) /* DE76C 8014788C 8C620000 */ lw $v0, 0x0($v1) /* DE770 80147890 461ED002 */ mul.s $f0, $f26, $f30 /* DE774 80147894 00000000 */ nop diff --git a/ver/ique/asm/nonmatchings/hud_element/render_hud_element.s b/ver/ique/asm/nonmatchings/hud_element/render_hud_element.s index 286f27d13a..41a6e1ffcb 100644 --- a/ver/ique/asm/nonmatchings/hud_element/render_hud_element.s +++ b/ver/ique/asm/nonmatchings/hud_element/render_hud_element.s @@ -23,8 +23,8 @@ glabel render_hud_element /* D82AC 801413CC 30428000 */ andi $v0, $v0, 0x8000 /* D82B0 801413D0 1040000C */ beqz $v0, .LIQUE_80141404 /* D82B4 801413D4 3C05E300 */ lui $a1, (0xE3001201 >> 16) -/* D82B8 801413D8 3C03800A */ lui $v1, %hi(gMasterGfxPos) -/* D82BC 801413DC 24639244 */ addiu $v1, $v1, %lo(gMasterGfxPos) +/* D82B8 801413D8 3C03800A */ lui $v1, %hi(gMainGfxPos) +/* D82BC 801413DC 24639244 */ addiu $v1, $v1, %lo(gMainGfxPos) /* D82C0 801413E0 8C620000 */ lw $v0, 0x0($v1) /* D82C4 801413E4 34A51201 */ ori $a1, $a1, (0xE3001201 & 0xFFFF) /* D82C8 801413E8 0040202D */ daddu $a0, $v0, $zero @@ -35,8 +35,8 @@ glabel render_hud_element /* D82DC 801413FC 0805050A */ j .LIQUE_80141428 /* D82E0 80141400 AC820004 */ sw $v0, 0x4($a0) .LIQUE_80141404: -/* D82E4 80141404 3C04800A */ lui $a0, %hi(gMasterGfxPos) -/* D82E8 80141408 24849244 */ addiu $a0, $a0, %lo(gMasterGfxPos) +/* D82E4 80141404 3C04800A */ lui $a0, %hi(gMainGfxPos) +/* D82E8 80141408 24849244 */ addiu $a0, $a0, %lo(gMainGfxPos) /* D82EC 8014140C 8C820000 */ lw $v0, 0x0($a0) /* D82F0 80141410 34A51201 */ ori $a1, $a1, (0xE3001201 & 0xFFFF) /* D82F4 80141414 0040182D */ daddu $v1, $v0, $zero @@ -268,8 +268,8 @@ glabel render_hud_element /* D8660 80141780 00452821 */ addu $a1, $v0, $a1 /* D8664 80141784 3C06DA38 */ lui $a2, (0xDA380002 >> 16) /* D8668 80141788 34C60002 */ ori $a2, $a2, (0xDA380002 & 0xFFFF) -/* D866C 8014178C 3C03800A */ lui $v1, %hi(gMasterGfxPos) -/* D8670 80141790 24639244 */ addiu $v1, $v1, %lo(gMasterGfxPos) +/* D866C 8014178C 3C03800A */ lui $v1, %hi(gMainGfxPos) +/* D8670 80141790 24639244 */ addiu $v1, $v1, %lo(gMainGfxPos) /* D8674 80141794 0000382D */ daddu $a3, $zero, $zero /* D8678 80141798 8C620000 */ lw $v0, 0x0($v1) /* D867C 8014179C 96040000 */ lhu $a0, 0x0($s0) @@ -410,8 +410,8 @@ glabel render_hud_element /* D8864 80141984 3529FFFF */ ori $t1, $t1, (0xFF67FFFF & 0xFFFF) /* D8868 80141988 3C078016 */ lui $a3, %hi(D_80159180) /* D886C 8014198C 24E7B500 */ addiu $a3, $a3, %lo(D_80159180) -/* D8870 80141990 3C0C800A */ lui $t4, %hi(gMasterGfxPos) -/* D8874 80141994 258C9244 */ addiu $t4, $t4, %lo(gMasterGfxPos) +/* D8870 80141990 3C0C800A */ lui $t4, %hi(gMainGfxPos) +/* D8874 80141994 258C9244 */ addiu $t4, $t4, %lo(gMainGfxPos) /* D8878 80141998 3C068015 */ lui $a2, %hi(D_8014F0C8) /* D887C 8014199C 24C6D858 */ addiu $a2, $a2, %lo(D_8014F0C8) /* D8880 801419A0 8CE50000 */ lw $a1, 0x0($a3) @@ -562,8 +562,8 @@ glabel render_hud_element /* D8AB4 80141BD4 AD820000 */ sw $v0, 0x0($t4) /* D8AB8 80141BD8 AD640010 */ sw $a0, 0x10($t3) /* D8ABC 80141BDC AD630014 */ sw $v1, 0x14($t3) -/* D8AC0 80141BE0 3C03800A */ lui $v1, %hi(gMasterGfxPos) -/* D8AC4 80141BE4 24639244 */ addiu $v1, $v1, %lo(gMasterGfxPos) +/* D8AC0 80141BE0 3C03800A */ lui $v1, %hi(gMainGfxPos) +/* D8AC4 80141BE4 24639244 */ addiu $v1, $v1, %lo(gMainGfxPos) /* D8AC8 80141BE8 02C0382D */ daddu $a3, $s6, $zero /* D8ACC 80141BEC 3C02FD70 */ lui $v0, (0xFD700000 >> 16) /* D8AD0 80141BF0 8C660000 */ lw $a2, 0x0($v1) @@ -636,8 +636,8 @@ glabel render_hud_element /* D8BC0 80141CE0 3C080500 */ lui $t0, (0x5000204 >> 16) /* D8BC4 80141CE4 35080204 */ ori $t0, $t0, (0x5000204 & 0xFFFF) /* D8BC8 80141CE8 3C090500 */ lui $t1, (0x5000406 >> 16) -/* D8BCC 80141CEC 3C05800A */ lui $a1, %hi(gMasterGfxPos) -/* D8BD0 80141CF0 24A59244 */ addiu $a1, $a1, %lo(gMasterGfxPos) +/* D8BCC 80141CEC 3C05800A */ lui $a1, %hi(gMainGfxPos) +/* D8BD0 80141CF0 24A59244 */ addiu $a1, $a1, %lo(gMainGfxPos) /* D8BD4 80141CF4 35290406 */ ori $t1, $t1, (0x5000406 & 0xFFFF) /* D8BD8 80141CF8 8CA40000 */ lw $a0, 0x0($a1) /* D8BDC 80141CFC 3C02E700 */ lui $v0, (0xE7000000 >> 16) @@ -693,8 +693,8 @@ glabel render_hud_element /* D8CA4 80141DC4 AC80002C */ sw $zero, 0x2C($a0) /* D8CA8 80141DC8 3C03D838 */ lui $v1, (0xD8380002 >> 16) .LIQUE_80141DCC: -/* D8CAC 80141DCC 3C04800A */ lui $a0, %hi(gMasterGfxPos) -/* D8CB0 80141DD0 24849244 */ addiu $a0, $a0, %lo(gMasterGfxPos) +/* D8CAC 80141DCC 3C04800A */ lui $a0, %hi(gMainGfxPos) +/* D8CB0 80141DD0 24849244 */ addiu $a0, $a0, %lo(gMainGfxPos) /* D8CB4 80141DD4 8C820000 */ lw $v0, 0x0($a0) /* D8CB8 80141DD8 34630002 */ ori $v1, $v1, (0xD8380002 & 0xFFFF) /* D8CBC 80141DDC 0040282D */ daddu $a1, $v0, $zero diff --git a/ver/ique/asm/nonmatchings/msg/appendGfx_message.s b/ver/ique/asm/nonmatchings/msg/appendGfx_message.s index ae70c727d8..be786dee67 100644 --- a/ver/ique/asm/nonmatchings/msg/appendGfx_message.s +++ b/ver/ique/asm/nonmatchings/msg/appendGfx_message.s @@ -246,8 +246,8 @@ glabel appendGfx_message /* BD050 80126170 93B20153 */ lbu $s2, 0x153($sp) /* BD054 80126174 27C30010 */ addiu $v1, $fp, 0x10 /* BD058 80126178 AFB300EC */ sw $s3, 0xEC($sp) -/* BD05C 8012617C 3C13800A */ lui $s3, %hi(gMasterGfxPos) -/* BD060 80126180 26739244 */ addiu $s3, $s3, %lo(gMasterGfxPos) +/* BD05C 8012617C 3C13800A */ lui $s3, %hi(gMainGfxPos) +/* BD060 80126180 26739244 */ addiu $s3, $s3, %lo(gMainGfxPos) /* BD064 80126184 AFBF0104 */ sw $ra, 0x104($sp) /* BD068 80126188 AFB700FC */ sw $s7, 0xFC($sp) /* BD06C 8012618C AFB600F8 */ sw $s6, 0xF8($sp) @@ -1653,8 +1653,8 @@ glabel appendGfx_message /* BE56C 8012768C 371800B0 */ ori $t8, $t8, (0x900B0 & 0xFFFF) /* BE570 80127690 3C03802F */ lui $v1, %hi(ui_msg_sign_side_top_png) /* BE574 80127694 2463C870 */ addiu $v1, $v1, %lo(ui_msg_sign_side_top_png) -/* BE578 80127698 3C02800A */ lui $v0, %hi(gMasterGfxPos) -/* BE57C 8012769C 8C429244 */ lw $v0, %lo(gMasterGfxPos)($v0) +/* BE578 80127698 3C02800A */ lui $v0, %hi(gMainGfxPos) +/* BE57C 8012769C 8C429244 */ lw $v0, %lo(gMainGfxPos)($v0) /* BE580 801276A0 3C08F200 */ lui $t0, (0xF2000000 >> 16) /* BE584 801276A4 AFB900D0 */ sw $t9, 0xD0($sp) /* BE588 801276A8 8FB900C4 */ lw $t9, 0xC4($sp) @@ -1666,31 +1666,31 @@ glabel appendGfx_message /* BE5A0 801276C0 AC830004 */ sw $v1, 0x4($a0) /* BE5A4 801276C4 8FB800C8 */ lw $t8, 0xC8($sp) /* BE5A8 801276C8 24430008 */ addiu $v1, $v0, 0x8 -/* BE5AC 801276CC 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE5B0 801276D0 AC229244 */ sw $v0, %lo(gMasterGfxPos)($at) -/* BE5B4 801276D4 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE5B8 801276D8 AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BE5AC 801276CC 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE5B0 801276D0 AC229244 */ sw $v0, %lo(gMainGfxPos)($at) +/* BE5B4 801276D4 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE5B8 801276D8 AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BE5BC 801276DC 24430010 */ addiu $v1, $v0, 0x10 -/* BE5C0 801276E0 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE5C4 801276E4 AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BE5C0 801276E0 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE5C4 801276E4 AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BE5C8 801276E8 24430018 */ addiu $v1, $v0, 0x18 -/* BE5CC 801276EC 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE5D0 801276F0 AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BE5CC 801276EC 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE5D0 801276F0 AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BE5D4 801276F4 24430020 */ addiu $v1, $v0, 0x20 -/* BE5D8 801276F8 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE5DC 801276FC AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BE5D8 801276F8 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE5DC 801276FC AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BE5E0 80127700 24430028 */ addiu $v1, $v0, 0x28 -/* BE5E4 80127704 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE5E8 80127708 AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BE5E4 80127704 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE5E8 80127708 AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BE5EC 8012770C 24430030 */ addiu $v1, $v0, 0x30 -/* BE5F0 80127710 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE5F4 80127714 AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BE5F0 80127710 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE5F4 80127714 AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BE5F8 80127718 24430038 */ addiu $v1, $v0, 0x38 -/* BE5FC 8012771C 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE600 80127720 AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BE5FC 8012771C 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE600 80127720 AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BE604 80127724 24430040 */ addiu $v1, $v0, 0x40 -/* BE608 80127728 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE60C 8012772C AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BE608 80127728 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE60C 8012772C AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BE610 80127730 24430048 */ addiu $v1, $v0, 0x48 /* BE614 80127734 AC580000 */ sw $t8, 0x0($v0) /* BE618 80127738 8FB900CC */ lw $t9, 0xCC($sp) @@ -1712,11 +1712,11 @@ glabel appendGfx_message /* BE658 80127778 3C19F400 */ lui $t9, (0xF4000000 >> 16) /* BE65C 8012777C AC590010 */ sw $t9, 0x10($v0) /* BE660 80127780 AC470038 */ sw $a3, 0x38($v0) -/* BE664 80127784 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE668 80127788 AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BE664 80127784 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE668 80127788 AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BE66C 8012778C 24430050 */ addiu $v1, $v0, 0x50 -/* BE670 80127790 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE674 80127794 AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BE670 80127790 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE674 80127794 AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BE678 80127798 3C03802F */ lui $v1, %hi(ui_msg_sign_side_left_png) /* BE67C 8012779C 2463C970 */ addiu $v1, $v1, %lo(ui_msg_sign_side_left_png) /* BE680 801277A0 AC40003C */ sw $zero, 0x3C($v0) @@ -1741,46 +1741,46 @@ glabel appendGfx_message /* BE6CC 801277EC AC50007C */ sw $s0, 0x7C($v0) /* BE6D0 801277F0 97C40516 */ lhu $a0, 0x516($fp) /* BE6D4 801277F4 24430058 */ addiu $v1, $v0, 0x58 -/* BE6D8 801277F8 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE6DC 801277FC AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BE6D8 801277F8 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE6DC 801277FC AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BE6E0 80127800 24430060 */ addiu $v1, $v0, 0x60 -/* BE6E4 80127804 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE6E8 80127808 AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BE6E4 80127804 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE6E8 80127808 AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BE6EC 8012780C 24430068 */ addiu $v1, $v0, 0x68 -/* BE6F0 80127810 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE6F4 80127814 AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BE6F0 80127810 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE6F4 80127814 AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BE6F8 80127818 24430070 */ addiu $v1, $v0, 0x70 -/* BE6FC 8012781C 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE700 80127820 AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BE6FC 8012781C 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE700 80127820 AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BE704 80127824 24430078 */ addiu $v1, $v0, 0x78 -/* BE708 80127828 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE70C 8012782C AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BE708 80127828 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE70C 8012782C AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BE710 80127830 24430080 */ addiu $v1, $v0, 0x80 -/* BE714 80127834 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE718 80127838 AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BE714 80127834 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE718 80127838 AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BE71C 8012783C 24430088 */ addiu $v1, $v0, 0x88 -/* BE720 80127840 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE724 80127844 AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BE720 80127840 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE724 80127844 AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BE728 80127848 24430090 */ addiu $v1, $v0, 0x90 -/* BE72C 8012784C 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE730 80127850 AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BE72C 8012784C 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE730 80127850 AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BE734 80127854 24430098 */ addiu $v1, $v0, 0x98 -/* BE738 80127858 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE73C 8012785C AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BE738 80127858 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE73C 8012785C AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BE740 80127860 244300A0 */ addiu $v1, $v0, 0xA0 /* BE744 80127864 AC510084 */ sw $s1, 0x84($v0) /* BE748 80127868 AC470088 */ sw $a3, 0x88($v0) /* BE74C 8012786C AC40008C */ sw $zero, 0x8C($v0) /* BE750 80127870 AC460090 */ sw $a2, 0x90($v0) /* BE754 80127874 AC490094 */ sw $t1, 0x94($v0) -/* BE758 80127878 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE75C 8012787C AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BE758 80127878 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE75C 8012787C AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BE760 80127880 3C03802F */ lui $v1, %hi(ui_msg_sign_side_right_png) /* BE764 80127884 2463CAB0 */ addiu $v1, $v1, %lo(ui_msg_sign_side_right_png) /* BE768 80127888 AC43009C */ sw $v1, 0x9C($v0) /* BE76C 8012788C 244300A8 */ addiu $v1, $v0, 0xA8 -/* BE770 80127890 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE774 80127894 AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BE770 80127890 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE774 80127894 AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BE778 80127898 3C03E409 */ lui $v1, (0xE4090000 >> 16) /* BE77C 8012789C AC4B0098 */ sw $t3, 0x98($v0) /* BE780 801278A0 AC4A00A0 */ sw $t2, 0xA0($v0) @@ -1812,45 +1812,45 @@ glabel appendGfx_message /* BE7E8 80127908 AC4900E4 */ sw $t1, 0xE4($v0) /* BE7EC 8012790C 8FB900C4 */ lw $t9, 0xC4($sp) /* BE7F0 80127910 244300B0 */ addiu $v1, $v0, 0xB0 -/* BE7F4 80127914 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE7F8 80127918 AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BE7F4 80127914 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE7F8 80127918 AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BE7FC 8012791C 244300B8 */ addiu $v1, $v0, 0xB8 -/* BE800 80127920 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE804 80127924 AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BE800 80127920 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE804 80127924 AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BE808 80127928 244300C0 */ addiu $v1, $v0, 0xC0 -/* BE80C 8012792C 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE810 80127930 AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BE80C 8012792C 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE810 80127930 AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BE814 80127934 244300C8 */ addiu $v1, $v0, 0xC8 -/* BE818 80127938 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE81C 8012793C AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BE818 80127938 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE81C 8012793C AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BE820 80127940 244300D0 */ addiu $v1, $v0, 0xD0 -/* BE824 80127944 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE828 80127948 AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BE824 80127944 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE828 80127948 AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BE82C 8012794C 244300D8 */ addiu $v1, $v0, 0xD8 -/* BE830 80127950 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE834 80127954 AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BE830 80127950 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE834 80127954 AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BE838 80127958 244300E0 */ addiu $v1, $v0, 0xE0 -/* BE83C 8012795C 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE840 80127960 AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BE83C 8012795C 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE840 80127960 AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BE844 80127964 244300E8 */ addiu $v1, $v0, 0xE8 -/* BE848 80127968 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE84C 8012796C AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BE848 80127968 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE84C 8012796C AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BE850 80127970 244300F0 */ addiu $v1, $v0, 0xF0 -/* BE854 80127974 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE858 80127978 AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BE854 80127974 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE858 80127978 AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BE85C 8012797C 3C03802F */ lui $v1, %hi(ui_msg_sign_side_bottom_png) /* BE860 80127980 2463CBF0 */ addiu $v1, $v1, %lo(ui_msg_sign_side_bottom_png) /* BE864 80127984 AC5900E8 */ sw $t9, 0xE8($v0) /* BE868 80127988 AC4300EC */ sw $v1, 0xEC($v0) /* BE86C 8012798C 244300F8 */ addiu $v1, $v0, 0xF8 -/* BE870 80127990 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE874 80127994 AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BE870 80127990 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE874 80127994 AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BE878 80127998 24430100 */ addiu $v1, $v0, 0x100 /* BE87C 8012799C 2484000C */ addiu $a0, $a0, 0xC /* BE880 801279A0 00042080 */ sll $a0, $a0, 2 /* BE884 801279A4 30840FFF */ andi $a0, $a0, 0xFFF -/* BE888 801279A8 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE88C 801279AC AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BE888 801279A8 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE88C 801279AC AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BE890 801279B0 3C03E44B */ lui $v1, (0xE44B0000 >> 16) /* BE894 801279B4 00832025 */ or $a0, $a0, $v1 /* BE898 801279B8 8FB800C8 */ lw $t8, 0xC8($sp) @@ -1863,30 +1863,30 @@ glabel appendGfx_message /* BE8B4 801279D4 AC5900F4 */ sw $t9, 0xF4($v0) /* BE8B8 801279D8 AC4000FC */ sw $zero, 0xFC($v0) /* BE8BC 801279DC 3C19F400 */ lui $t9, (0xF4000000 >> 16) -/* BE8C0 801279E0 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE8C4 801279E4 AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BE8C0 801279E0 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE8C4 801279E4 AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BE8C8 801279E8 24430110 */ addiu $v1, $v0, 0x110 /* BE8CC 801279EC 3C18E700 */ lui $t8, (0xE7000000 >> 16) -/* BE8D0 801279F0 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE8D4 801279F4 AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BE8D0 801279F0 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE8D4 801279F4 AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BE8D8 801279F8 24430118 */ addiu $v1, $v0, 0x118 -/* BE8DC 801279FC 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE8E0 80127A00 AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BE8DC 801279FC 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE8E0 80127A00 AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BE8E4 80127A04 24430120 */ addiu $v1, $v0, 0x120 -/* BE8E8 80127A08 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE8EC 80127A0C AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BE8E8 80127A08 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE8EC 80127A0C AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BE8F0 80127A10 24430128 */ addiu $v1, $v0, 0x128 -/* BE8F4 80127A14 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE8F8 80127A18 AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BE8F4 80127A14 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE8F8 80127A18 AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BE8FC 80127A1C 24430130 */ addiu $v1, $v0, 0x130 -/* BE900 80127A20 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE904 80127A24 AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BE900 80127A20 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE904 80127A24 AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BE908 80127A28 24430138 */ addiu $v1, $v0, 0x138 -/* BE90C 80127A2C 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE910 80127A30 AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BE90C 80127A2C 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE910 80127A30 AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BE914 80127A34 24430140 */ addiu $v1, $v0, 0x140 -/* BE918 80127A38 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE91C 80127A3C AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BE918 80127A38 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE91C 80127A3C AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BE920 80127A40 24430148 */ addiu $v1, $v0, 0x148 /* BE924 80127A44 AC590100 */ sw $t9, 0x100($v0) /* BE928 80127A48 AC520104 */ sw $s2, 0x104($v0) @@ -1896,20 +1896,20 @@ glabel appendGfx_message /* BE938 80127A58 AC530114 */ sw $s3, 0x114($v0) /* BE93C 80127A5C AC480118 */ sw $t0, 0x118($v0) /* BE940 80127A60 AC55011C */ sw $s5, 0x11C($v0) -/* BE944 80127A64 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE948 80127A68 AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BE944 80127A64 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE948 80127A68 AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BE94C 80127A6C 97C30516 */ lhu $v1, 0x516($fp) /* BE950 80127A70 24440150 */ addiu $a0, $v0, 0x150 -/* BE954 80127A74 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE958 80127A78 AC249244 */ sw $a0, %lo(gMasterGfxPos)($at) +/* BE954 80127A74 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE958 80127A78 AC249244 */ sw $a0, %lo(gMainGfxPos)($at) /* BE95C 80127A7C 2463001C */ addiu $v1, $v1, 0x1C /* BE960 80127A80 00031880 */ sll $v1, $v1, 2 /* BE964 80127A84 30630FFF */ andi $v1, $v1, 0xFFF /* BE968 80127A88 00651825 */ or $v1, $v1, $a1 /* BE96C 80127A8C AC430120 */ sw $v1, 0x120($v0) /* BE970 80127A90 24430158 */ addiu $v1, $v0, 0x158 -/* BE974 80127A94 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE978 80127A98 AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BE974 80127A94 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE978 80127A98 AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BE97C 80127A9C 3C03802F */ lui $v1, %hi(ui_msg_sign_fill_png) /* BE980 80127AA0 2463CCF0 */ addiu $v1, $v1, %lo(ui_msg_sign_fill_png) /* BE984 80127AA4 97C40516 */ lhu $a0, 0x516($fp) @@ -1936,11 +1936,11 @@ glabel appendGfx_message /* BE9D8 80127AF8 AC590150 */ sw $t9, 0x150($v0) /* BE9DC 80127AFC 8FB800DC */ lw $t8, 0xDC($sp) /* BE9E0 80127B00 3C19E700 */ lui $t9, (0xE7000000 >> 16) -/* BE9E4 80127B04 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE9E8 80127B08 AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BE9E4 80127B04 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE9E8 80127B08 AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BE9EC 80127B0C 24430168 */ addiu $v1, $v0, 0x168 -/* BE9F0 80127B10 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BE9F4 80127B14 AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BE9F0 80127B10 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BE9F4 80127B14 AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BE9F8 80127B18 3403C030 */ ori $v1, $zero, 0xC030 /* BE9FC 80127B1C AC580154 */ sw $t8, 0x154($v0) /* BEA00 80127B20 AC590158 */ sw $t9, 0x158($v0) @@ -1950,14 +1950,14 @@ glabel appendGfx_message /* BEA10 80127B30 AC480168 */ sw $t0, 0x168($v0) /* BEA14 80127B34 8FB800D0 */ lw $t8, 0xD0($sp) /* BEA18 80127B38 24430170 */ addiu $v1, $v0, 0x170 -/* BEA1C 80127B3C 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BEA20 80127B40 AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BEA1C 80127B3C 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BEA20 80127B40 AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BEA24 80127B44 24430178 */ addiu $v1, $v0, 0x178 -/* BEA28 80127B48 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BEA2C 80127B4C AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BEA28 80127B48 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BEA2C 80127B4C AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BEA30 80127B50 24430180 */ addiu $v1, $v0, 0x180 -/* BEA34 80127B54 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BEA38 80127B58 AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BEA34 80127B54 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BEA38 80127B58 AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BEA3C 80127B5C 24430188 */ addiu $v1, $v0, 0x188 /* BEA40 80127B60 AC58016C */ sw $t8, 0x16C($v0) /* BEA44 80127B64 97C40516 */ lhu $a0, 0x516($fp) @@ -1969,8 +1969,8 @@ glabel appendGfx_message /* BEA5C 80127B7C AC590174 */ sw $t9, 0x174($v0) /* BEA60 80127B80 AC470178 */ sw $a3, 0x178($v0) /* BEA64 80127B84 AC40017C */ sw $zero, 0x17C($v0) -/* BEA68 80127B88 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BEA6C 80127B8C AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* BEA68 80127B88 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BEA6C 80127B8C AC239244 */ sw $v1, %lo(gMainGfxPos)($at) /* BEA70 80127B90 AC460180 */ sw $a2, 0x180($v0) /* BEA74 80127B94 AC490184 */ sw $t1, 0x184($v0) /* BEA78 80127B98 08049FE0 */ j .LIQUE_80127F80 @@ -2993,8 +2993,8 @@ glabel appendGfx_message /* BF964 80128A84 34C6FEE1 */ ori $a2, $a2, (0xFC70FEE1 & 0xFFFF) /* BF968 80128A88 3C058016 */ lui $a1, %hi(msg_drawState) /* BF96C 80128A8C 8CA580F4 */ lw $a1, %lo(msg_drawState)($a1) -/* BF970 80128A90 3C04800A */ lui $a0, %hi(gMasterGfxPos) -/* BF974 80128A94 8C849244 */ lw $a0, %lo(gMasterGfxPos)($a0) +/* BF970 80128A90 3C04800A */ lui $a0, %hi(gMainGfxPos) +/* BF974 80128A94 8C849244 */ lw $a0, %lo(gMainGfxPos)($a0) /* BF978 80128A98 8CA20038 */ lw $v0, 0x38($a1) /* BF97C 80128A9C 0080182D */ daddu $v1, $a0, $zero /* BF980 80128AA0 34420004 */ ori $v0, $v0, 0x4 @@ -3004,8 +3004,8 @@ glabel appendGfx_message /* BF990 80128AB0 AC620004 */ sw $v0, 0x4($v1) /* BF994 80128AB4 8CA20020 */ lw $v0, 0x20($a1) /* BF998 80128AB8 24840008 */ addiu $a0, $a0, 0x8 -/* BF99C 80128ABC 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BF9A0 80128AC0 AC249244 */ sw $a0, %lo(gMasterGfxPos)($at) +/* BF99C 80128ABC 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BF9A0 80128AC0 AC249244 */ sw $a0, %lo(gMainGfxPos)($at) /* BF9A4 80128AC4 24420002 */ addiu $v0, $v0, 0x2 .LIQUE_80128AC8: /* BF9A8 80128AC8 0804A8EA */ j .LIQUE_8012A3A8 @@ -3017,8 +3017,8 @@ glabel appendGfx_message /* BF9BC 80128ADC 3C030001 */ lui $v1, (0x10000 >> 16) /* BF9C0 80128AE0 3C068016 */ lui $a2, %hi(msg_drawState) /* BF9C4 80128AE4 8CC680F4 */ lw $a2, %lo(msg_drawState)($a2) -/* BF9C8 80128AE8 3C05800A */ lui $a1, %hi(gMasterGfxPos) -/* BF9CC 80128AEC 8CA59244 */ lw $a1, %lo(gMasterGfxPos)($a1) +/* BF9C8 80128AE8 3C05800A */ lui $a1, %hi(gMainGfxPos) +/* BF9CC 80128AEC 8CA59244 */ lw $a1, %lo(gMainGfxPos)($a1) /* BF9D0 80128AF0 8CC20038 */ lw $v0, 0x38($a2) /* BF9D4 80128AF4 00A0382D */ daddu $a3, $a1, $zero /* BF9D8 80128AF8 00431025 */ or $v0, $v0, $v1 @@ -3028,8 +3028,8 @@ glabel appendGfx_message /* BF9E8 80128B08 8CC20020 */ lw $v0, 0x20($a2) /* BF9EC 80128B0C 8CC3004C */ lw $v1, 0x4C($a2) /* BF9F0 80128B10 24A50008 */ addiu $a1, $a1, 0x8 -/* BF9F4 80128B14 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BF9F8 80128B18 AC259244 */ sw $a1, %lo(gMasterGfxPos)($at) +/* BF9F4 80128B14 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BF9F8 80128B18 AC259244 */ sw $a1, %lo(gMainGfxPos)($at) /* BF9FC 80128B1C 00431021 */ addu $v0, $v0, $v1 /* BFA00 80128B20 90440002 */ lbu $a0, 0x2($v0) /* BFA04 80128B24 3508F279 */ ori $t0, $t0, (0x11FCF279 & 0xFFFF) @@ -3043,8 +3043,8 @@ glabel appendGfx_message /* BFA24 80128B44 ACA80004 */ sw $t0, 0x4($a1) /* BFA28 80128B48 8CC20020 */ lw $v0, 0x20($a2) /* BFA2C 80128B4C 24A50008 */ addiu $a1, $a1, 0x8 -/* BFA30 80128B50 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BFA34 80128B54 AC259244 */ sw $a1, %lo(gMasterGfxPos)($at) +/* BFA30 80128B50 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BFA34 80128B54 AC259244 */ sw $a1, %lo(gMainGfxPos)($at) /* BFA38 80128B58 24420003 */ addiu $v0, $v0, 0x3 /* BFA3C 80128B5C 0804A8EA */ j .LIQUE_8012A3A8 /* BFA40 80128B60 ACC20020 */ sw $v0, 0x20($a2) @@ -3307,8 +3307,8 @@ glabel appendGfx_message /* BFDAC 80128ECC 30420002 */ andi $v0, $v0, 0x2 /* BFDB0 80128ED0 10400013 */ beqz $v0, .LIQUE_80128F20 /* BFDB4 80128ED4 241800FF */ addiu $t8, $zero, 0xFF -/* BFDB8 80128ED8 3C03800A */ lui $v1, %hi(gMasterGfxPos) -/* BFDBC 80128EDC 8C639244 */ lw $v1, %lo(gMasterGfxPos)($v1) +/* BFDB8 80128ED8 3C03800A */ lui $v1, %hi(gMainGfxPos) +/* BFDBC 80128EDC 8C639244 */ lw $v1, %lo(gMainGfxPos)($v1) /* BFDC0 80128EE0 A7B80096 */ sh $t8, 0x96($sp) /* BFDC4 80128EE4 0060102D */ daddu $v0, $v1, $zero /* BFDC8 80128EE8 24630008 */ addiu $v1, $v1, 0x8 @@ -3316,10 +3316,10 @@ glabel appendGfx_message /* BFDD0 80128EF0 AC590000 */ sw $t9, 0x0($v0) /* BFDD4 80128EF4 AC400004 */ sw $zero, 0x4($v0) /* BFDD8 80128EF8 24620008 */ addiu $v0, $v1, 0x8 -/* BFDDC 80128EFC 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BFDE0 80128F00 AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) -/* BFDE4 80128F04 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* BFDE8 80128F08 AC229244 */ sw $v0, %lo(gMasterGfxPos)($at) +/* BFDDC 80128EFC 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BFDE0 80128F00 AC239244 */ sw $v1, %lo(gMainGfxPos)($at) +/* BFDE4 80128F04 3C01800A */ lui $at, %hi(gMainGfxPos) +/* BFDE8 80128F08 AC229244 */ sw $v0, %lo(gMainGfxPos)($at) /* BFDEC 80128F0C 3C02DE00 */ lui $v0, (0xDE000000 >> 16) /* BFDF0 80128F10 AC620000 */ sw $v0, 0x0($v1) /* BFDF4 80128F14 3C028015 */ lui $v0, %hi(D_8014C500) @@ -3776,8 +3776,8 @@ glabel appendGfx_message /* C04C8 801295E8 00000000 */ nop /* C04CC 801295EC 46800021 */ cvt.d.w $f0, $f0 /* C04D0 801295F0 24020020 */ addiu $v0, $zero, 0x20 -/* C04D4 801295F4 3C03800A */ lui $v1, %hi(gMasterGfxPos) -/* C04D8 801295F8 8C639244 */ lw $v1, %lo(gMasterGfxPos)($v1) +/* C04D4 801295F4 3C03800A */ lui $v1, %hi(gMainGfxPos) +/* C04D8 801295F8 8C639244 */ lw $v1, %lo(gMainGfxPos)($v1) /* C04DC 801295FC 97B900AE */ lhu $t9, 0xAE($sp) /* C04E0 80129600 3C018015 */ lui $at, %hi(D_IQUE_8014F0C8) /* C04E4 80129604 D422F0C8 */ ldc1 $f2, %lo(D_IQUE_8014F0C8)($at) @@ -3793,10 +3793,10 @@ glabel appendGfx_message /* C050C 8012962C 24620008 */ addiu $v0, $v1, 0x8 /* C0510 80129630 AC850000 */ sw $a1, 0x0($a0) /* C0514 80129634 24180003 */ addiu $t8, $zero, 0x3 -/* C0518 80129638 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* C051C 8012963C AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) -/* C0520 80129640 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* C0524 80129644 AC229244 */ sw $v0, %lo(gMasterGfxPos)($at) +/* C0518 80129638 3C01800A */ lui $at, %hi(gMainGfxPos) +/* C051C 8012963C AC239244 */ sw $v1, %lo(gMainGfxPos)($at) +/* C0520 80129640 3C01800A */ lui $at, %hi(gMainGfxPos) +/* C0524 80129644 AC229244 */ sw $v0, %lo(gMainGfxPos)($at) /* C0528 80129648 AC660000 */ sw $a2, 0x0($v1) /* C052C 8012964C AC780004 */ sw $t8, 0x4($v1) /* C0530 80129650 4620230D */ trunc.w.d $f12, $f4 @@ -3823,8 +3823,8 @@ glabel appendGfx_message /* C057C 8012969C 284200FF */ slti $v0, $v0, 0xFF /* C0580 801296A0 10400006 */ beqz $v0, .LIQUE_801296BC /* C0584 801296A4 00000000 */ nop -/* C0588 801296A8 3C02800A */ lui $v0, %hi(gMasterGfxPos) -/* C058C 801296AC 8C429244 */ lw $v0, %lo(gMasterGfxPos)($v0) +/* C0588 801296A8 3C02800A */ lui $v0, %hi(gMainGfxPos) +/* C058C 801296AC 8C429244 */ lw $v0, %lo(gMainGfxPos)($v0) /* C0590 801296B0 0040182D */ daddu $v1, $v0, $zero /* C0594 801296B4 0804A5DE */ j .LIQUE_80129778 /* C0598 801296B8 24420008 */ addiu $v0, $v0, 0x8 @@ -3839,15 +3839,15 @@ glabel appendGfx_message /* C05B8 801296D8 0058102A */ slt $v0, $v0, $t8 /* C05BC 801296DC 1040002D */ beqz $v0, .LIQUE_80129794 /* C05C0 801296E0 3C19E700 */ lui $t9, (0xE7000000 >> 16) -/* C05C4 801296E4 3C05800A */ lui $a1, %hi(gMasterGfxPos) -/* C05C8 801296E8 8CA59244 */ lw $a1, %lo(gMasterGfxPos)($a1) +/* C05C4 801296E4 3C05800A */ lui $a1, %hi(gMainGfxPos) +/* C05C8 801296E8 8CA59244 */ lw $a1, %lo(gMainGfxPos)($a1) /* C05CC 801296EC 00A0102D */ daddu $v0, $a1, $zero /* C05D0 801296F0 AC590000 */ sw $t9, 0x0($v0) /* C05D4 801296F4 AC400004 */ sw $zero, 0x4($v0) /* C05D8 801296F8 8FC204FC */ lw $v0, 0x4FC($fp) /* C05DC 801296FC 24A50008 */ addiu $a1, $a1, 0x8 -/* C05E0 80129700 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* C05E4 80129704 AC259244 */ sw $a1, %lo(gMasterGfxPos)($at) +/* C05E0 80129700 3C01800A */ lui $at, %hi(gMainGfxPos) +/* C05E4 80129704 AC259244 */ sw $a1, %lo(gMainGfxPos)($at) /* C05E8 80129708 30424000 */ andi $v0, $v0, 0x4000 /* C05EC 8012970C 10400005 */ beqz $v0, .LIQUE_80129724 /* C05F0 80129710 3C04E200 */ lui $a0, (0xE200001C >> 16) @@ -3861,26 +3861,26 @@ glabel appendGfx_message /* C060C 8012972C 34634B40 */ ori $v1, $v1, (0x504B40 & 0xFFFF) .LIQUE_80129730: /* C0610 80129730 24A20008 */ addiu $v0, $a1, 0x8 -/* C0614 80129734 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* C0618 80129738 AC229244 */ sw $v0, %lo(gMasterGfxPos)($at) +/* C0614 80129734 3C01800A */ lui $at, %hi(gMainGfxPos) +/* C0618 80129738 AC229244 */ sw $v0, %lo(gMainGfxPos)($at) /* C061C 8012973C ACA40000 */ sw $a0, 0x0($a1) /* C0620 80129740 ACA30004 */ sw $v1, 0x4($a1) /* C0624 80129744 3C05FCFF */ lui $a1, (0xFCFF97FF >> 16) /* C0628 80129748 34A597FF */ ori $a1, $a1, (0xFCFF97FF & 0xFFFF) /* C062C 8012974C 3C04FF2C */ lui $a0, (0xFF2CFE7F >> 16) -/* C0630 80129750 3C03800A */ lui $v1, %hi(gMasterGfxPos) -/* C0634 80129754 8C639244 */ lw $v1, %lo(gMasterGfxPos)($v1) +/* C0630 80129750 3C03800A */ lui $v1, %hi(gMainGfxPos) +/* C0634 80129754 8C639244 */ lw $v1, %lo(gMainGfxPos)($v1) /* C0638 80129758 3484FE7F */ ori $a0, $a0, (0xFF2CFE7F & 0xFFFF) /* C063C 8012975C 0060102D */ daddu $v0, $v1, $zero /* C0640 80129760 24630008 */ addiu $v1, $v1, 0x8 /* C0644 80129764 AC450000 */ sw $a1, 0x0($v0) /* C0648 80129768 AC440004 */ sw $a0, 0x4($v0) /* C064C 8012976C 24620008 */ addiu $v0, $v1, 0x8 -/* C0650 80129770 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* C0654 80129774 AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) +/* C0650 80129770 3C01800A */ lui $at, %hi(gMainGfxPos) +/* C0654 80129774 AC239244 */ sw $v1, %lo(gMainGfxPos)($at) .LIQUE_80129778: -/* C0658 80129778 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* C065C 8012977C AC229244 */ sw $v0, %lo(gMasterGfxPos)($at) +/* C0658 80129778 3C01800A */ lui $at, %hi(gMainGfxPos) +/* C065C 8012977C AC229244 */ sw $v0, %lo(gMainGfxPos)($at) /* C0660 80129780 3C02FA00 */ lui $v0, (0xFA000000 >> 16) /* C0664 80129784 AC620000 */ sw $v0, 0x0($v1) /* C0668 80129788 324200FF */ andi $v0, $s2, 0xFF @@ -3904,8 +3904,8 @@ glabel appendGfx_message /* C06AC 801297CC 3C07FCFF */ lui $a3, (0xFCFFFFFF >> 16) /* C06B0 801297D0 34E7FFFF */ ori $a3, $a3, (0xFCFFFFFF & 0xFFFF) /* C06B4 801297D4 3C05FFFC */ lui $a1, (0xFFFCF279 >> 16) -/* C06B8 801297D8 3C03800A */ lui $v1, %hi(gMasterGfxPos) -/* C06BC 801297DC 8C639244 */ lw $v1, %lo(gMasterGfxPos)($v1) +/* C06B8 801297D8 3C03800A */ lui $v1, %hi(gMainGfxPos) +/* C06BC 801297DC 8C639244 */ lw $v1, %lo(gMainGfxPos)($v1) /* C06C0 801297E0 34A5F279 */ ori $a1, $a1, (0xFFFCF279 & 0xFFFF) /* C06C4 801297E4 0060102D */ daddu $v0, $v1, $zero /* C06C8 801297E8 24630008 */ addiu $v1, $v1, 0x8 @@ -3913,15 +3913,15 @@ glabel appendGfx_message /* C06D0 801297F0 AC580000 */ sw $t8, 0x0($v0) /* C06D4 801297F4 AC400004 */ sw $zero, 0x4($v0) /* C06D8 801297F8 24620008 */ addiu $v0, $v1, 0x8 -/* C06DC 801297FC 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* C06E0 80129800 AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) -/* C06E4 80129804 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* C06E8 80129808 AC229244 */ sw $v0, %lo(gMasterGfxPos)($at) +/* C06DC 801297FC 3C01800A */ lui $at, %hi(gMainGfxPos) +/* C06E0 80129800 AC239244 */ sw $v1, %lo(gMainGfxPos)($at) +/* C06E4 80129804 3C01800A */ lui $at, %hi(gMainGfxPos) +/* C06E8 80129808 AC229244 */ sw $v0, %lo(gMainGfxPos)($at) /* C06EC 8012980C 24620010 */ addiu $v0, $v1, 0x10 /* C06F0 80129810 AC660000 */ sw $a2, 0x0($v1) /* C06F4 80129814 AC640004 */ sw $a0, 0x4($v1) -/* C06F8 80129818 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* C06FC 8012981C AC229244 */ sw $v0, %lo(gMasterGfxPos)($at) +/* C06F8 80129818 3C01800A */ lui $at, %hi(gMainGfxPos) +/* C06FC 8012981C AC229244 */ sw $v0, %lo(gMainGfxPos)($at) /* C0700 80129820 AC670008 */ sw $a3, 0x8($v1) /* C0704 80129824 AC65000C */ sw $a1, 0xC($v1) .LIQUE_80129828: @@ -4458,8 +4458,8 @@ glabel appendGfx_message /* C0EFC 8012A01C 3C05FF2D */ lui $a1, (0xFF2DFEFF >> 16) /* C0F00 8012A020 34A5FEFF */ ori $a1, $a1, (0xFF2DFEFF & 0xFFFF) /* C0F04 8012A024 3C082828 */ lui $t0, (0x28282848 >> 16) -/* C0F08 8012A028 3C03800A */ lui $v1, %hi(gMasterGfxPos) -/* C0F0C 8012A02C 8C639244 */ lw $v1, %lo(gMasterGfxPos)($v1) +/* C0F08 8012A028 3C03800A */ lui $v1, %hi(gMainGfxPos) +/* C0F0C 8012A02C 8C639244 */ lw $v1, %lo(gMainGfxPos)($v1) /* C0F10 8012A030 35082848 */ ori $t0, $t0, (0x28282848 & 0xFFFF) /* C0F14 8012A034 0060102D */ daddu $v0, $v1, $zero /* C0F18 8012A038 24630008 */ addiu $v1, $v1, 0x8 @@ -4467,16 +4467,16 @@ glabel appendGfx_message /* C0F20 8012A040 AC590000 */ sw $t9, 0x0($v0) /* C0F24 8012A044 AC400004 */ sw $zero, 0x4($v0) /* C0F28 8012A048 24620008 */ addiu $v0, $v1, 0x8 -/* C0F2C 8012A04C 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* C0F30 8012A050 AC239244 */ sw $v1, %lo(gMasterGfxPos)($at) -/* C0F34 8012A054 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* C0F38 8012A058 AC229244 */ sw $v0, %lo(gMasterGfxPos)($at) +/* C0F2C 8012A04C 3C01800A */ lui $at, %hi(gMainGfxPos) +/* C0F30 8012A050 AC239244 */ sw $v1, %lo(gMainGfxPos)($at) +/* C0F34 8012A054 3C01800A */ lui $at, %hi(gMainGfxPos) +/* C0F38 8012A058 AC229244 */ sw $v0, %lo(gMainGfxPos)($at) /* C0F3C 8012A05C 24620010 */ addiu $v0, $v1, 0x10 -/* C0F40 8012A060 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* C0F44 8012A064 AC229244 */ sw $v0, %lo(gMasterGfxPos)($at) +/* C0F40 8012A060 3C01800A */ lui $at, %hi(gMainGfxPos) +/* C0F44 8012A064 AC229244 */ sw $v0, %lo(gMainGfxPos)($at) /* C0F48 8012A068 24620018 */ addiu $v0, $v1, 0x18 -/* C0F4C 8012A06C 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* C0F50 8012A070 AC229244 */ sw $v0, %lo(gMasterGfxPos)($at) +/* C0F4C 8012A06C 3C01800A */ lui $at, %hi(gMainGfxPos) +/* C0F50 8012A070 AC229244 */ sw $v0, %lo(gMainGfxPos)($at) /* C0F54 8012A074 3C02FA00 */ lui $v0, (0xFA000000 >> 16) /* C0F58 8012A078 AC660000 */ sw $a2, 0x0($v1) /* C0F5C 8012A07C AC640004 */ sw $a0, 0x4($v1) @@ -4525,8 +4525,8 @@ glabel appendGfx_message .LIQUE_8012A124: /* C1004 8012A124 0C04A9D7 */ jal msg_draw_char /* C1008 8012A128 00000000 */ nop -/* C100C 8012A12C 3C07800A */ lui $a3, %hi(gMasterGfxPos) -/* C1010 8012A130 8CE79244 */ lw $a3, %lo(gMasterGfxPos)($a3) +/* C100C 8012A12C 3C07800A */ lui $a3, %hi(gMainGfxPos) +/* C1010 8012A130 8CE79244 */ lw $a3, %lo(gMainGfxPos)($a3) /* C1014 8012A134 00E0102D */ daddu $v0, $a3, $zero /* C1018 8012A138 24E70008 */ addiu $a3, $a3, 0x8 /* C101C 8012A13C 3C18E700 */ lui $t8, (0xE7000000 >> 16) @@ -4535,8 +4535,8 @@ glabel appendGfx_message /* C1028 8012A148 00121400 */ sll $v0, $s2, 16 /* C102C 8012A14C 00021403 */ sra $v0, $v0, 16 /* C1030 8012A150 284200FF */ slti $v0, $v0, 0xFF -/* C1034 8012A154 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* C1038 8012A158 AC279244 */ sw $a3, %lo(gMasterGfxPos)($at) +/* C1034 8012A154 3C01800A */ lui $at, %hi(gMainGfxPos) +/* C1038 8012A158 AC279244 */ sw $a3, %lo(gMainGfxPos)($at) /* C103C 8012A15C 10400009 */ beqz $v0, .LIQUE_8012A184 /* C1040 8012A160 3C05E200 */ lui $a1, (0xE200001C >> 16) /* C1044 8012A164 34A5001C */ ori $a1, $a1, (0xE200001C & 0xFFFF) @@ -4557,13 +4557,13 @@ glabel appendGfx_message /* C107C 8012A19C 3484F279 */ ori $a0, $a0, (0xFFFCF279 & 0xFFFF) .LIQUE_8012A1A0: /* C1080 8012A1A0 24E20008 */ addiu $v0, $a3, 0x8 -/* C1084 8012A1A4 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* C1088 8012A1A8 AC229244 */ sw $v0, %lo(gMasterGfxPos)($at) +/* C1084 8012A1A4 3C01800A */ lui $at, %hi(gMainGfxPos) +/* C1088 8012A1A8 AC229244 */ sw $v0, %lo(gMainGfxPos)($at) /* C108C 8012A1AC 24E20010 */ addiu $v0, $a3, 0x10 /* C1090 8012A1B0 ACE50000 */ sw $a1, 0x0($a3) /* C1094 8012A1B4 ACE30004 */ sw $v1, 0x4($a3) -/* C1098 8012A1B8 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* C109C 8012A1BC AC229244 */ sw $v0, %lo(gMasterGfxPos)($at) +/* C1098 8012A1B8 3C01800A */ lui $at, %hi(gMainGfxPos) +/* C109C 8012A1BC AC229244 */ sw $v0, %lo(gMainGfxPos)($at) /* C10A0 8012A1C0 ACE60008 */ sw $a2, 0x8($a3) /* C10A4 8012A1C4 ACE4000C */ sw $a0, 0xC($a3) .LIQUE_8012A1C8: @@ -4903,8 +4903,8 @@ glabel appendGfx_message /* C157C 8012A69C 0C04B44C */ jal draw_ci_image_with_clipping /* C1580 8012A6A0 8E27000C */ lw $a3, 0xC($s1) .LIQUE_8012A6A4: -/* C1584 8012A6A4 3C02800A */ lui $v0, %hi(gMasterGfxPos) -/* C1588 8012A6A8 24429244 */ addiu $v0, $v0, %lo(gMasterGfxPos) +/* C1584 8012A6A4 3C02800A */ lui $v0, %hi(gMainGfxPos) +/* C1588 8012A6A8 24429244 */ addiu $v0, $v0, %lo(gMainGfxPos) /* C158C 8012A6AC 8C430000 */ lw $v1, 0x0($v0) /* C1590 8012A6B0 0060202D */ daddu $a0, $v1, $zero /* C1594 8012A6B4 24630008 */ addiu $v1, $v1, 0x8 diff --git a/ver/ique/asm/nonmatchings/msg/msg_draw_char.s b/ver/ique/asm/nonmatchings/msg/msg_draw_char.s index 2a909a8c81..cebc66699a 100644 --- a/ver/ique/asm/nonmatchings/msg/msg_draw_char.s +++ b/ver/ique/asm/nonmatchings/msg/msg_draw_char.s @@ -185,8 +185,8 @@ glabel msg_draw_char /* C18D0 8012A9F0 34E70100 */ ori $a3, $a3, (0xF5000100 & 0xFFFF) /* C18D4 8012A9F4 3C080703 */ lui $t0, (0x703C000 >> 16) /* C18D8 8012A9F8 3508C000 */ ori $t0, $t0, (0x703C000 & 0xFFFF) -/* C18DC 8012A9FC 3C05800A */ lui $a1, %hi(gMasterGfxPos) -/* C18E0 8012AA00 24A59244 */ addiu $a1, $a1, %lo(gMasterGfxPos) +/* C18DC 8012A9FC 3C05800A */ lui $a1, %hi(gMainGfxPos) +/* C18E0 8012AA00 24A59244 */ addiu $a1, $a1, %lo(gMainGfxPos) /* C18E4 8012AA04 8CA30000 */ lw $v1, 0x0($a1) /* C18E8 8012AA08 A6020034 */ sh $v0, 0x34($s0) /* C18EC 8012AA0C 3C02FD10 */ lui $v0, (0xFD100000 >> 16) @@ -236,8 +236,8 @@ glabel msg_draw_char /* C1998 8012AAB8 2C420002 */ sltiu $v0, $v0, 0x2 /* C199C 8012AABC 1040003B */ beqz $v0, .LIQUE_8012ABAC /* C19A0 8012AAC0 3C02FD50 */ lui $v0, (0xFD500000 >> 16) -/* C19A4 8012AAC4 3C05800A */ lui $a1, %hi(gMasterGfxPos) -/* C19A8 8012AAC8 24A59244 */ addiu $a1, $a1, %lo(gMasterGfxPos) +/* C19A4 8012AAC4 3C05800A */ lui $a1, %hi(gMainGfxPos) +/* C19A8 8012AAC8 24A59244 */ addiu $a1, $a1, %lo(gMainGfxPos) /* C19AC 8012AACC 3C038014 */ lui $v1, %hi(D_8013A520) /* C19B0 8012AAD0 2463A520 */ addiu $v1, $v1, %lo(D_8013A520) /* C19B4 8012AAD4 8CA40000 */ lw $a0, 0x0($a1) @@ -303,8 +303,8 @@ glabel msg_draw_char /* C1A8C 8012ABAC 2A4200A6 */ slti $v0, $s2, 0xA6 /* C1A90 8012ABB0 14400029 */ bnez $v0, .LIQUE_8012AC58 /* C1A94 8012ABB4 3C02FD50 */ lui $v0, (0xFD500000 >> 16) -/* C1A98 8012ABB8 3C05800A */ lui $a1, %hi(gMasterGfxPos) -/* C1A9C 8012ABBC 24A59244 */ addiu $a1, $a1, %lo(gMasterGfxPos) +/* C1A98 8012ABB8 3C05800A */ lui $a1, %hi(gMainGfxPos) +/* C1A9C 8012ABBC 24A59244 */ addiu $a1, $a1, %lo(gMainGfxPos) /* C1AA0 8012ABC0 24070800 */ addiu $a3, $zero, 0x800 /* C1AA4 8012ABC4 8CA30000 */ lw $v1, 0x0($a1) /* C1AA8 8012ABC8 3C048015 */ lui $a0, %hi(D_801544A0) @@ -346,8 +346,8 @@ glabel msg_draw_char /* C1B30 8012AC50 0804AB57 */ j .LIQUE_8012AD5C /* C1B34 8012AC54 00A71025 */ or $v0, $a1, $a3 .LIQUE_8012AC58: -/* C1B38 8012AC58 3C06800A */ lui $a2, %hi(gMasterGfxPos) -/* C1B3C 8012AC5C 24C69244 */ addiu $a2, $a2, %lo(gMasterGfxPos) +/* C1B38 8012AC58 3C06800A */ lui $a2, %hi(gMainGfxPos) +/* C1B3C 8012AC5C 24C69244 */ addiu $a2, $a2, %lo(gMainGfxPos) /* C1B40 8012AC60 8CC40000 */ lw $a0, 0x0($a2) /* C1B44 8012AC64 0080382D */ daddu $a3, $a0, $zero /* C1B48 8012AC68 24840008 */ addiu $a0, $a0, 0x8 @@ -417,8 +417,8 @@ glabel msg_draw_char .LIQUE_8012AD58: /* C1C38 8012AD58 00A81025 */ or $v0, $a1, $t0 .LIQUE_8012AD5C: -/* C1C3C 8012AD5C 3C05800A */ lui $a1, %hi(gMasterGfxPos) -/* C1C40 8012AD60 24A59244 */ addiu $a1, $a1, %lo(gMasterGfxPos) +/* C1C3C 8012AD5C 3C05800A */ lui $a1, %hi(gMainGfxPos) +/* C1C40 8012AD60 24A59244 */ addiu $a1, $a1, %lo(gMainGfxPos) /* C1C44 8012AD64 8CA40000 */ lw $a0, 0x0($a1) /* C1C48 8012AD68 ACC20000 */ sw $v0, 0x0($a2) /* C1C4C 8012AD6C 3C02E700 */ lui $v0, (0xE7000000 >> 16) @@ -458,8 +458,8 @@ glabel msg_draw_char /* C1CD0 8012ADF0 2C420002 */ sltiu $v0, $v0, 0x2 /* C1CD4 8012ADF4 10400018 */ beqz $v0, .LIQUE_8012AE58 /* C1CD8 8012ADF8 001219C0 */ sll $v1, $s2, 7 -/* C1CDC 8012ADFC 3C06800A */ lui $a2, %hi(gMasterGfxPos) -/* C1CE0 8012AE00 24C69244 */ addiu $a2, $a2, %lo(gMasterGfxPos) +/* C1CDC 8012ADFC 3C06800A */ lui $a2, %hi(gMainGfxPos) +/* C1CE0 8012AE00 24C69244 */ addiu $a2, $a2, %lo(gMainGfxPos) /* C1CE4 8012AE04 8CC50000 */ lw $a1, 0x0($a2) /* C1CE8 8012AE08 3C048014 */ lui $a0, %hi(D_8013A520) /* C1CEC 8012AE0C 2484A520 */ addiu $a0, $a0, %lo(D_8013A520) @@ -485,8 +485,8 @@ glabel msg_draw_char /* C1D38 8012AE58 2A4200A6 */ slti $v0, $s2, 0xA6 /* C1D3C 8012AE5C 5440001B */ bnel $v0, $zero, .LIQUE_8012AECC /* C1D40 8012AE60 3C03FD48 */ lui $v1, (0xFD480000 >> 16) -/* C1D44 8012AE64 3C06800A */ lui $a2, %hi(gMasterGfxPos) -/* C1D48 8012AE68 24C69244 */ addiu $a2, $a2, %lo(gMasterGfxPos) +/* C1D44 8012AE64 3C06800A */ lui $a2, %hi(gMainGfxPos) +/* C1D48 8012AE68 24C69244 */ addiu $a2, $a2, %lo(gMainGfxPos) /* C1D4C 8012AE6C 8CC50000 */ lw $a1, 0x0($a2) /* C1D50 8012AE70 3C048015 */ lui $a0, %hi(D_801544A0) /* C1D54 8012AE74 248444A0 */ addiu $a0, $a0, %lo(D_801544A0) @@ -512,8 +512,8 @@ glabel msg_draw_char /* C1DA4 8012AEC4 0804ABCF */ j .LIQUE_8012AF3C /* C1DA8 8012AEC8 24A30010 */ addiu $v1, $a1, 0x10 .LIQUE_8012AECC: -/* C1DAC 8012AECC 3C06800A */ lui $a2, %hi(gMasterGfxPos) -/* C1DB0 8012AED0 24C69244 */ addiu $a2, $a2, %lo(gMasterGfxPos) +/* C1DAC 8012AECC 3C06800A */ lui $a2, %hi(gMainGfxPos) +/* C1DB0 8012AED0 24C69244 */ addiu $a2, $a2, %lo(gMainGfxPos) /* C1DB4 8012AED4 8CC50000 */ lw $a1, 0x0($a2) /* C1DB8 8012AED8 00A0382D */ daddu $a3, $a1, $zero /* C1DBC 8012AEDC 24A50008 */ addiu $a1, $a1, 0x8 @@ -601,8 +601,8 @@ glabel msg_draw_char /* C1F00 8012B020 00621825 */ or $v1, $v1, $v0 /* C1F04 8012B024 ACA3002C */ sw $v1, 0x2C($a1) .LIQUE_8012B028: -/* C1F08 8012B028 3C06800A */ lui $a2, %hi(gMasterGfxPos) -/* C1F0C 8012B02C 24C69244 */ addiu $a2, $a2, %lo(gMasterGfxPos) +/* C1F08 8012B028 3C06800A */ lui $a2, %hi(gMainGfxPos) +/* C1F0C 8012B02C 24C69244 */ addiu $a2, $a2, %lo(gMainGfxPos) /* C1F10 8012B030 000C1080 */ sll $v0, $t4, 2 /* C1F14 8012B034 30420FFF */ andi $v0, $v0, 0xFFF /* C1F18 8012B038 00021300 */ sll $v0, $v0, 12 diff --git a/ver/ique/asm/nonmatchings/state_title_screen/title_screen_draw_copyright.s b/ver/ique/asm/nonmatchings/state_title_screen/title_screen_draw_copyright.s index 1f920810d2..f039182e44 100644 --- a/ver/ique/asm/nonmatchings/state_title_screen/title_screen_draw_copyright.s +++ b/ver/ique/asm/nonmatchings/state_title_screen/title_screen_draw_copyright.s @@ -5,8 +5,8 @@ glabel title_screen_draw_copyright /* 128C4 800374C4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 128C8 800374C8 3C07800A */ lui $a3, %hi(gMasterGfxPos) -/* 128CC 800374CC 24E79244 */ addiu $a3, $a3, %lo(gMasterGfxPos) +/* 128C8 800374C8 3C07800A */ lui $a3, %hi(gMainGfxPos) +/* 128CC 800374CC 24E79244 */ addiu $a3, $a3, %lo(gMainGfxPos) /* 128D0 800374D0 3C02DE00 */ lui $v0, (0xDE000000 >> 16) /* 128D4 800374D4 AFB7001C */ sw $s7, 0x1C($sp) /* 128D8 800374D8 AFB60018 */ sw $s6, 0x18($sp) @@ -58,8 +58,8 @@ glabel title_screen_draw_copyright /* 1298C 8003758C ACA20014 */ sw $v0, 0x14($a1) .LIQUE_80037590: /* 12990 80037590 0000682D */ daddu $t5, $zero, $zero -/* 12994 80037594 3C09800A */ lui $t1, %hi(gMasterGfxPos) -/* 12998 80037598 25299244 */ addiu $t1, $t1, %lo(gMasterGfxPos) +/* 12994 80037594 3C09800A */ lui $t1, %hi(gMainGfxPos) +/* 12998 80037598 25299244 */ addiu $t1, $t1, %lo(gMainGfxPos) /* 1299C 8003759C 3C10FD68 */ lui $s0, (0xFD68008F >> 16) /* 129A0 800375A0 3610008F */ ori $s0, $s0, (0xFD68008F & 0xFFFF) /* 129A4 800375A4 3C16800A */ lui $s6, %hi(D_800A097C) @@ -141,8 +141,8 @@ glabel title_screen_draw_copyright /* 12AD0 800376D0 29A20004 */ slti $v0, $t5, 0x4 /* 12AD4 800376D4 1440FFC5 */ bnez $v0, .LIQUE_800375EC /* 12AD8 800376D8 AC680044 */ sw $t0, 0x44($v1) -/* 12ADC 800376DC 3C03800A */ lui $v1, %hi(gMasterGfxPos) -/* 12AE0 800376E0 24639244 */ addiu $v1, $v1, %lo(gMasterGfxPos) +/* 12ADC 800376DC 3C03800A */ lui $v1, %hi(gMainGfxPos) +/* 12AE0 800376E0 24639244 */ addiu $v1, $v1, %lo(gMainGfxPos) /* 12AE4 800376E4 8C620000 */ lw $v0, 0x0($v1) /* 12AE8 800376E8 0040202D */ daddu $a0, $v0, $zero /* 12AEC 800376EC 24420008 */ addiu $v0, $v0, 0x8 diff --git a/ver/ique/symbol_addrs.txt b/ver/ique/symbol_addrs.txt index 3f809b31c0..e5422f34ad 100644 --- a/ver/ique/symbol_addrs.txt +++ b/ver/ique/symbol_addrs.txt @@ -428,7 +428,7 @@ piEventBuf = 0x800af6f8; piEventQueue = 0x800af6e0; // size:24 __osEventStateTab = 0x800d825c; // size:0x110 __osThreadSave = 0x800AF740; -gMasterGfxPos = 0x80099244; +gMainGfxPos = 0x80099244; piEventQueue = 0x800af6e0; // size:24 __osFinalrom = 0x80099238; diff --git a/ver/jp/asm/main.bss.s b/ver/jp/asm/main.bss.s index 9195303bbd..31adb5dae5 100644 --- a/ver/jp/asm/main.bss.s +++ b/ver/jp/asm/main.bss.s @@ -124,7 +124,7 @@ dlabel gBGMPlayerA dlabel gFirstStrikeMessagePos .space 4 -dlabel gMasterGfxPos +dlabel gMainGfxPos .space 4 dlabel D_8009A670 diff --git a/ver/jp/symbol_addrs.txt b/ver/jp/symbol_addrs.txt index 1c7eedf0f8..ba1b62e3ca 100644 --- a/ver/jp/symbol_addrs.txt +++ b/ver/jp/symbol_addrs.txt @@ -204,7 +204,7 @@ nuPiCartHandle = 0x8009A618; nuGfxCfb_ptr = 0x8009A62C; gOverrideFlags = 0x8009A630; nuGfxCfb = 0x8009A638; -gMasterGfxPos = 0x8009A64C; +gMainGfxPos = 0x8009A64C; gDisplayContext = 0x8009A654; D_8009A680 = 0x8009A660; D_8009A690 = 0x8009A670; diff --git a/ver/us/asm/bss.s b/ver/us/asm/bss.s index 5fbae33fe1..b6ebafd687 100644 --- a/ver/us/asm/bss.s +++ b/ver/us/asm/bss.s @@ -148,7 +148,7 @@ dlabel gBGMPlayerA dlabel gFirstStrikeMessagePos .space 4 -dlabel gMasterGfxPos +dlabel gMainGfxPos .space 4 dlabel D_8009A670 diff --git a/ver/us/asm/nonmatchings/325AD0/func_E02000AC.s b/ver/us/asm/nonmatchings/325AD0/func_E02000AC.s index eafa1e9680..318021d408 100644 --- a/ver/us/asm/nonmatchings/325AD0/func_E02000AC.s +++ b/ver/us/asm/nonmatchings/325AD0/func_E02000AC.s @@ -7,8 +7,8 @@ glabel func_E02000AC /* 325B84 E02000B4 34C680FF */ ori $a2, $a2, 0x80ff /* 325B88 E02000B8 AFB50034 */ sw $s5, 0x34($sp) /* 325B8C E02000BC 0000A82D */ daddu $s5, $zero, $zero -/* 325B90 E02000C0 3C02800A */ lui $v0, %hi(gMasterGfxPos) -/* 325B94 E02000C4 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) +/* 325B90 E02000C0 3C02800A */ lui $v0, %hi(gMainGfxPos) +/* 325B94 E02000C4 2442A66C */ addiu $v0, $v0, %lo(gMainGfxPos) /* 325B98 E02000C8 0040502D */ daddu $t2, $v0, $zero /* 325B9C E02000CC 3C0EF510 */ lui $t6, 0xf510 /* 325BA0 E02000D0 35CE2800 */ ori $t6, $t6, 0x2800 diff --git a/ver/us/asm/nonmatchings/80850_len_3060/update_status_menu.s b/ver/us/asm/nonmatchings/80850_len_3060/update_status_menu.s index 3e04b6f6fe..6ff05d0e4a 100644 --- a/ver/us/asm/nonmatchings/80850_len_3060/update_status_menu.s +++ b/ver/us/asm/nonmatchings/80850_len_3060/update_status_menu.s @@ -383,8 +383,8 @@ glabel update_status_menu /* 81AD0 800E8620 3C07004D */ lui $a3, 0x4d /* 81AD4 800E8624 34E70370 */ ori $a3, $a3, 0x370 /* 81AD8 800E8628 0000202D */ daddu $a0, $zero, $zero -/* 81ADC 800E862C 3C06800A */ lui $a2, %hi(gMasterGfxPos) -/* 81AE0 800E8630 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) +/* 81ADC 800E862C 3C06800A */ lui $a2, %hi(gMainGfxPos) +/* 81AE0 800E8630 24C6A66C */ addiu $a2, $a2, %lo(gMainGfxPos) /* 81AE4 800E8634 24050005 */ addiu $a1, $zero, 5 /* 81AE8 800E8638 241200FF */ addiu $s2, $zero, 0xff /* 81AEC 800E863C 24110140 */ addiu $s1, $zero, 0x140 diff --git a/ver/us/asm/nonmatchings/B4580/appendGfx_animator_node.s b/ver/us/asm/nonmatchings/B4580/appendGfx_animator_node.s index ab0cc9b974..658f0d0ecf 100644 --- a/ver/us/asm/nonmatchings/B4580/appendGfx_animator_node.s +++ b/ver/us/asm/nonmatchings/B4580/appendGfx_animator_node.s @@ -67,8 +67,8 @@ glabel appendGfx_animator_node /* B6240 8011FB40 3C06E300 */ lui $a2, 0xe300 /* B6244 8011FB44 34C61001 */ ori $a2, $a2, 0x1001 /* B6248 8011FB48 3C07D9FD */ lui $a3, 0xd9fd -/* B624C 8011FB4C 3C09800A */ lui $t1, %hi(gMasterGfxPos) -/* B6250 8011FB50 2529A66C */ addiu $t1, $t1, %lo(gMasterGfxPos) +/* B624C 8011FB4C 3C09800A */ lui $t1, %hi(gMainGfxPos) +/* B6250 8011FB50 2529A66C */ addiu $t1, $t1, %lo(gMainGfxPos) /* B6254 8011FB54 34E7FFFF */ ori $a3, $a3, 0xffff /* B6258 8011FB58 8D280000 */ lw $t0, ($t1) /* B625C 8011FB5C 96020000 */ lhu $v0, ($s0) @@ -144,8 +144,8 @@ glabel appendGfx_animator_node /* B636C 8011FC6C AC640000 */ sw $a0, ($v1) /* B6370 8011FC70 AC620004 */ sw $v0, 4($v1) .L8011FC74: -/* B6374 8011FC74 3C10800A */ lui $s0, %hi(gMasterGfxPos) -/* B6378 8011FC78 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) +/* B6374 8011FC74 3C10800A */ lui $s0, %hi(gMainGfxPos) +/* B6378 8011FC78 2610A66C */ addiu $s0, $s0, %lo(gMainGfxPos) /* B637C 8011FC7C 8E020000 */ lw $v0, ($s0) /* B6380 8011FC80 3C11E700 */ lui $s1, 0xe700 /* B6384 8011FC84 0040182D */ daddu $v1, $v0, $zero @@ -305,8 +305,8 @@ glabel appendGfx_animator_node /* B65B0 8011FEB0 1462FFC0 */ bne $v1, $v0, .L8011FDB4 /* B65B4 8011FEB4 26940001 */ addiu $s4, $s4, 1 .L8011FEB8: -/* B65B8 8011FEB8 3C05800A */ lui $a1, %hi(gMasterGfxPos) -/* B65BC 8011FEBC 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) +/* B65B8 8011FEB8 3C05800A */ lui $a1, %hi(gMainGfxPos) +/* B65BC 8011FEBC 24A5A66C */ addiu $a1, $a1, %lo(gMainGfxPos) /* B65C0 8011FEC0 0260202D */ daddu $a0, $s3, $zero /* B65C4 8011FEC4 8CA30000 */ lw $v1, ($a1) /* B65C8 8011FEC8 3C02DF00 */ lui $v0, 0xdf00 @@ -321,8 +321,8 @@ glabel appendGfx_animator_node /* B65EC 8011FEEC AC820004 */ sw $v0, 4($a0) .L8011FEF0: /* B65F0 8011FEF0 0000882D */ daddu $s1, $zero, $zero -/* B65F4 8011FEF4 3C03800A */ lui $v1, %hi(gMasterGfxPos) -/* B65F8 8011FEF8 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) +/* B65F4 8011FEF4 3C03800A */ lui $v1, %hi(gMainGfxPos) +/* B65F8 8011FEF8 2463A66C */ addiu $v1, $v1, %lo(gMainGfxPos) /* B65FC 8011FEFC 8C620000 */ lw $v0, ($v1) /* B6600 8011FF00 02C0802D */ daddu $s0, $s6, $zero /* B6604 8011FF04 0040202D */ daddu $a0, $v0, $zero diff --git a/ver/us/asm/nonmatchings/C50A0/draw_image_with_clipping.s b/ver/us/asm/nonmatchings/C50A0/draw_image_with_clipping.s index f365b7d710..002618d138 100644 --- a/ver/us/asm/nonmatchings/C50A0/draw_image_with_clipping.s +++ b/ver/us/asm/nonmatchings/C50A0/draw_image_with_clipping.s @@ -67,8 +67,8 @@ glabel draw_image_with_clipping /* C5484 8012ED84 018B6021 */ addu $t4, $t4, $t3 /* C5488 8012ED88 8FB50088 */ lw $s5, 0x88($sp) /* C548C 8012ED8C 8FB60088 */ lw $s6, 0x88($sp) -/* C5490 8012ED90 3C08800A */ lui $t0, %hi(gMasterGfxPos) -/* C5494 8012ED94 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) +/* C5490 8012ED90 3C08800A */ lui $t0, %hi(gMainGfxPos) +/* C5494 8012ED94 2508A66C */ addiu $t0, $t0, %lo(gMainGfxPos) /* C5498 8012ED98 A3A00020 */ sb $zero, 0x20($sp) /* C549C 8012ED9C AFA90024 */ sw $t1, 0x24($sp) /* C54A0 8012EDA0 AFAC0034 */ sw $t4, 0x34($sp) diff --git a/ver/us/asm/nonmatchings/de740_len_23f0/appendGfx_shading_palette.s b/ver/us/asm/nonmatchings/de740_len_23f0/appendGfx_shading_palette.s index 5803acf745..4020f06048 100644 --- a/ver/us/asm/nonmatchings/de740_len_23f0/appendGfx_shading_palette.s +++ b/ver/us/asm/nonmatchings/de740_len_23f0/appendGfx_shading_palette.s @@ -260,8 +260,8 @@ glabel appendGfx_shading_palette /* DF474 80148D74 3C0CE404 */ lui $t4, 0xe404 /* DF478 80148D78 358C0004 */ ori $t4, $t4, 4 /* DF47C 80148D7C 3C0E1000 */ lui $t6, 0x1000 -/* DF480 80148D80 3C17800A */ lui $s7, %hi(gMasterGfxPos) -/* DF484 80148D84 26F7A66C */ addiu $s7, $s7, %lo(gMasterGfxPos) +/* DF480 80148D80 3C17800A */ lui $s7, %hi(gMainGfxPos) +/* DF484 80148D84 26F7A66C */ addiu $s7, $s7, %lo(gMainGfxPos) /* DF488 80148D88 35CE0400 */ ori $t6, $t6, 0x400 /* DF48C 80148D8C 3C05FA00 */ lui $a1, 0xfa00 /* DF490 80148D90 00131E00 */ sll $v1, $s3, 0x18 @@ -483,8 +483,8 @@ glabel appendGfx_shading_palette /* DF7E8 801490E8 AEE20000 */ sw $v0, ($s7) /* DF7EC 801490EC AD440048 */ sw $a0, 0x48($t2) /* DF7F0 801490F0 AD43004C */ sw $v1, 0x4c($t2) -/* DF7F4 801490F4 3C03800A */ lui $v1, %hi(gMasterGfxPos) -/* DF7F8 801490F8 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) +/* DF7F4 801490F4 3C03800A */ lui $v1, %hi(gMainGfxPos) +/* DF7F8 801490F8 2463A66C */ addiu $v1, $v1, %lo(gMainGfxPos) /* DF7FC 801490FC 8C620000 */ lw $v0, ($v1) /* DF800 80149100 461ED002 */ mul.s $f0, $f26, $f30 /* DF804 80149104 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/blast/blast_appendGfx.s b/ver/us/asm/nonmatchings/effects/blast/blast_appendGfx.s index 796b7233d3..9790b4680d 100644 --- a/ver/us/asm/nonmatchings/effects/blast/blast_appendGfx.s +++ b/ver/us/asm/nonmatchings/effects/blast/blast_appendGfx.s @@ -10,8 +10,8 @@ glabel blast_appendGfx /* 37D698 E007C208 AFB300E4 */ sw $s3, 0xe4($sp) /* 37D69C E007C20C 3C130001 */ lui $s3, 1 /* 37D6A0 E007C210 AFB400E8 */ sw $s4, 0xe8($sp) -/* 37D6A4 E007C214 3C14800A */ lui $s4, %hi(gMasterGfxPos) -/* 37D6A8 E007C218 2694A66C */ addiu $s4, $s4, %lo(gMasterGfxPos) +/* 37D6A4 E007C214 3C14800A */ lui $s4, %hi(gMainGfxPos) +/* 37D6A8 E007C218 2694A66C */ addiu $s4, $s4, %lo(gMainGfxPos) /* 37D6AC E007C21C AFBF00F0 */ sw $ra, 0xf0($sp) /* 37D6B0 E007C220 AFB500EC */ sw $s5, 0xec($sp) /* 37D6B4 E007C224 AFB200E0 */ sw $s2, 0xe0($sp) @@ -163,8 +163,8 @@ glabel blast_appendGfx .LE007C468: /* 37D8F8 E007C468 ACA20004 */ sw $v0, 4($a1) /* 37D8FC E007C46C 3C07D838 */ lui $a3, 0xd838 -/* 37D900 E007C470 3C05800A */ lui $a1, %hi(gMasterGfxPos) -/* 37D904 E007C474 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) +/* 37D900 E007C470 3C05800A */ lui $a1, %hi(gMainGfxPos) +/* 37D904 E007C474 24A5A66C */ addiu $a1, $a1, %lo(gMainGfxPos) /* 37D908 E007C478 34E70002 */ ori $a3, $a3, 2 /* 37D90C E007C47C 3C02FB00 */ lui $v0, 0xfb00 /* 37D910 E007C480 8CA40000 */ lw $a0, ($a1) diff --git a/ver/us/asm/nonmatchings/effects/bulb_glow/bulb_glow_appendGfx.s b/ver/us/asm/nonmatchings/effects/bulb_glow/bulb_glow_appendGfx.s index 0d5b43a994..3d25e97cda 100644 --- a/ver/us/asm/nonmatchings/effects/bulb_glow/bulb_glow_appendGfx.s +++ b/ver/us/asm/nonmatchings/effects/bulb_glow/bulb_glow_appendGfx.s @@ -22,8 +22,8 @@ glabel bulb_glow_appendGfx /* 37A6B0 E00782C0 2414007F */ addiu $s4, $zero, 0x7f .LE00782C4: /* 37A6B4 E00782C4 3C05DB06 */ lui $a1, 0xdb06 -/* 37A6B8 E00782C8 3C15800A */ lui $s5, %hi(gMasterGfxPos) -/* 37A6BC E00782CC 26B5A66C */ addiu $s5, $s5, %lo(gMasterGfxPos) +/* 37A6B8 E00782C8 3C15800A */ lui $s5, %hi(gMainGfxPos) +/* 37A6BC E00782CC 26B5A66C */ addiu $s5, $s5, %lo(gMainGfxPos) /* 37A6C0 E00782D0 34A50024 */ ori $a1, $a1, 0x24 /* 37A6C4 E00782D4 8EA40000 */ lw $a0, ($s5) /* 37A6C8 E00782D8 3C02E700 */ lui $v0, 0xe700 diff --git a/ver/us/asm/nonmatchings/effects/effect_65/fx_65_appendGfx.s b/ver/us/asm/nonmatchings/effects/effect_65/fx_65_appendGfx.s index c87c473628..e4338dca8f 100644 --- a/ver/us/asm/nonmatchings/effects/effect_65/fx_65_appendGfx.s +++ b/ver/us/asm/nonmatchings/effects/effect_65/fx_65_appendGfx.s @@ -28,8 +28,8 @@ glabel fx_65_appendGfx /* 3D09E8 E00CA4E8 44800000 */ mtc1 $zero, $f0 /* 3D09EC E00CA4EC 36521630 */ ori $s2, $s2, 0x1630 /* 3D09F0 E00CA4F0 AFB3007C */ sw $s3, 0x7c($sp) -/* 3D09F4 E00CA4F4 3C13800A */ lui $s3, %hi(gMasterGfxPos) -/* 3D09F8 E00CA4F8 2673A66C */ addiu $s3, $s3, %lo(gMasterGfxPos) +/* 3D09F4 E00CA4F4 3C13800A */ lui $s3, %hi(gMainGfxPos) +/* 3D09F8 E00CA4F8 2673A66C */ addiu $s3, $s3, %lo(gMainGfxPos) /* 3D09FC E00CA4FC AFBF0094 */ sw $ra, 0x94($sp) /* 3D0A00 E00CA500 AFBE0090 */ sw $fp, 0x90($sp) /* 3D0A04 E00CA504 AFB7008C */ sw $s7, 0x8c($sp) @@ -486,8 +486,8 @@ glabel fx_65_appendGfx /* 3D10CC E00CABCC 2A82001D */ slti $v0, $s4, 0x1d /* 3D10D0 E00CABD0 10400019 */ beqz $v0, .LE00CAC38 /* 3D10D4 E00CABD4 3C050002 */ lui $a1, 2 -/* 3D10D8 E00CABD8 3C04800A */ lui $a0, %hi(gMasterGfxPos) -/* 3D10DC E00CABDC 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) +/* 3D10D8 E00CABD8 3C04800A */ lui $a0, %hi(gMainGfxPos) +/* 3D10DC E00CABDC 2484A66C */ addiu $a0, $a0, %lo(gMainGfxPos) /* 3D10E0 E00CABE0 3C080100 */ lui $t0, 0x100 /* 3D10E4 E00CABE4 35084008 */ ori $t0, $t0, 0x4008 /* 3D10E8 E00CABE8 3C070600 */ lui $a3, 0x600 @@ -513,8 +513,8 @@ glabel fx_65_appendGfx /* 3D1134 E00CAC34 AC650004 */ sw $a1, 4($v1) .LE00CAC38: /* 3D1138 E00CAC38 3C05D838 */ lui $a1, 0xd838 -/* 3D113C E00CAC3C 3C03800A */ lui $v1, %hi(gMasterGfxPos) -/* 3D1140 E00CAC40 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) +/* 3D113C E00CAC3C 3C03800A */ lui $v1, %hi(gMainGfxPos) +/* 3D1140 E00CAC40 2463A66C */ addiu $v1, $v1, %lo(gMainGfxPos) /* 3D1144 E00CAC44 8C620000 */ lw $v0, ($v1) /* 3D1148 E00CAC48 34A50002 */ ori $a1, $a1, 2 /* 3D114C E00CAC4C 0040202D */ daddu $a0, $v0, $zero diff --git a/ver/us/asm/nonmatchings/effects/underwater/underwater_appendGfx.s b/ver/us/asm/nonmatchings/effects/underwater/underwater_appendGfx.s index 61618469b3..788e86c6a3 100644 --- a/ver/us/asm/nonmatchings/effects/underwater/underwater_appendGfx.s +++ b/ver/us/asm/nonmatchings/effects/underwater/underwater_appendGfx.s @@ -8,8 +8,8 @@ glabel underwater_appendGfx /* 3B91FC E00BA62C 3C07FF10 */ lui $a3, 0xff10 /* 3B9200 E00BA630 34E7013F */ ori $a3, $a3, 0x13f /* 3B9204 E00BA634 0000682D */ daddu $t5, $zero, $zero -/* 3B9208 E00BA638 3C02800A */ lui $v0, %hi(gMasterGfxPos) -/* 3B920C E00BA63C 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) +/* 3B9208 E00BA638 3C02800A */ lui $v0, %hi(gMainGfxPos) +/* 3B920C E00BA63C 2442A66C */ addiu $v0, $v0, %lo(gMainGfxPos) /* 3B9210 E00BA640 0040402D */ daddu $t0, $v0, $zero /* 3B9214 E00BA644 AFB200B8 */ sw $s2, 0xb8($sp) /* 3B9218 E00BA648 3C12FD10 */ lui $s2, 0xfd10 @@ -154,8 +154,8 @@ glabel underwater_appendGfx /* 3B9440 E00BA870 27A40020 */ addiu $a0, $sp, 0x20 /* 3B9444 E00BA874 3C130001 */ lui $s3, 1 /* 3B9448 E00BA878 36731630 */ ori $s3, $s3, 0x1630 -/* 3B944C E00BA87C 3C10800A */ lui $s0, %hi(gMasterGfxPos) -/* 3B9450 E00BA880 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) +/* 3B944C E00BA87C 3C10800A */ lui $s0, %hi(gMainGfxPos) +/* 3B9450 E00BA880 2610A66C */ addiu $s0, $s0, %lo(gMainGfxPos) /* 3B9454 E00BA884 8E080000 */ lw $t0, ($s0) /* 3B9458 E00BA888 3C05C2A0 */ lui $a1, 0xc2a0 /* 3B945C E00BA88C 3C03800A */ lui $v1, %hi(nuGfxCfb_ptr) @@ -490,8 +490,8 @@ glabel underwater_appendGfx /* 3B9958 E00BAD88 3C06FF10 */ lui $a2, 0xff10 /* 3B995C E00BAD8C 34C6013F */ ori $a2, $a2, 0x13f /* 3B9960 E00BAD90 3C07DA38 */ lui $a3, 0xda38 -/* 3B9964 E00BAD94 3C05800A */ lui $a1, %hi(gMasterGfxPos) -/* 3B9968 E00BAD98 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) +/* 3B9964 E00BAD94 3C05800A */ lui $a1, %hi(gMainGfxPos) +/* 3B9968 E00BAD98 24A5A66C */ addiu $a1, $a1, %lo(gMainGfxPos) /* 3B996C E00BAD9C 8CA30000 */ lw $v1, ($a1) /* 3B9970 E00BADA0 3C04800A */ lui $a0, %hi(nuGfxZBuffer) /* 3B9974 E00BADA4 8C84A5DC */ lw $a0, %lo(nuGfxZBuffer)($a0) diff --git a/ver/us/asm/nonmatchings/hud_element/render_hud_element.s b/ver/us/asm/nonmatchings/hud_element/render_hud_element.s index b4e472aa45..e146ef77d3 100644 --- a/ver/us/asm/nonmatchings/hud_element/render_hud_element.s +++ b/ver/us/asm/nonmatchings/hud_element/render_hud_element.s @@ -21,8 +21,8 @@ glabel render_hud_element /* D933C 80142C3C 30428000 */ andi $v0, $v0, 0x8000 /* D9340 80142C40 1040000C */ beqz $v0, .L80142C74 /* D9344 80142C44 3C05E300 */ lui $a1, 0xe300 -/* D9348 80142C48 3C03800A */ lui $v1, %hi(gMasterGfxPos) -/* D934C 80142C4C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) +/* D9348 80142C48 3C03800A */ lui $v1, %hi(gMainGfxPos) +/* D934C 80142C4C 2463A66C */ addiu $v1, $v1, %lo(gMainGfxPos) /* D9350 80142C50 8C620000 */ lw $v0, ($v1) /* D9354 80142C54 34A51201 */ ori $a1, $a1, 0x1201 /* D9358 80142C58 0040202D */ daddu $a0, $v0, $zero @@ -33,8 +33,8 @@ glabel render_hud_element /* D936C 80142C6C 08050B26 */ j .L80142C98 /* D9370 80142C70 AC820004 */ sw $v0, 4($a0) .L80142C74: -/* D9374 80142C74 3C04800A */ lui $a0, %hi(gMasterGfxPos) -/* D9378 80142C78 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) +/* D9374 80142C74 3C04800A */ lui $a0, %hi(gMainGfxPos) +/* D9378 80142C78 2484A66C */ addiu $a0, $a0, %lo(gMainGfxPos) /* D937C 80142C7C 8C820000 */ lw $v0, ($a0) /* D9380 80142C80 34A51201 */ ori $a1, $a1, 0x1201 /* D9384 80142C84 0040182D */ daddu $v1, $v0, $zero @@ -266,8 +266,8 @@ glabel render_hud_element /* D96F0 80142FF0 00452821 */ addu $a1, $v0, $a1 /* D96F4 80142FF4 3C06DA38 */ lui $a2, 0xda38 /* D96F8 80142FF8 34C60002 */ ori $a2, $a2, 2 -/* D96FC 80142FFC 3C03800A */ lui $v1, %hi(gMasterGfxPos) -/* D9700 80143000 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) +/* D96FC 80142FFC 3C03800A */ lui $v1, %hi(gMainGfxPos) +/* D9700 80143000 2463A66C */ addiu $v1, $v1, %lo(gMainGfxPos) /* D9704 80143004 0000382D */ daddu $a3, $zero, $zero /* D9708 80143008 8C620000 */ lw $v0, ($v1) /* D970C 8014300C 96040000 */ lhu $a0, ($s0) @@ -408,8 +408,8 @@ glabel render_hud_element /* D98F4 801431F4 3529FFFF */ ori $t1, $t1, 0xffff /* D98F8 801431F8 3C078016 */ lui $a3, %hi(D_80159180) /* D98FC 801431FC 24E79180 */ addiu $a3, $a3, %lo(D_80159180) -/* D9900 80143200 3C0C800A */ lui $t4, %hi(gMasterGfxPos) -/* D9904 80143204 258CA66C */ addiu $t4, $t4, %lo(gMasterGfxPos) +/* D9900 80143200 3C0C800A */ lui $t4, %hi(gMainGfxPos) +/* D9904 80143204 258CA66C */ addiu $t4, $t4, %lo(gMainGfxPos) /* D9908 80143208 3C068015 */ lui $a2, %hi(D_8014F0C8) /* D990C 8014320C 24C6F0C8 */ addiu $a2, $a2, %lo(D_8014F0C8) /* D9910 80143210 8CE50000 */ lw $a1, ($a3) @@ -560,8 +560,8 @@ glabel render_hud_element /* D9B44 80143444 AD820000 */ sw $v0, ($t4) /* D9B48 80143448 AD640010 */ sw $a0, 0x10($t3) /* D9B4C 8014344C AD630014 */ sw $v1, 0x14($t3) -/* D9B50 80143450 3C03800A */ lui $v1, %hi(gMasterGfxPos) -/* D9B54 80143454 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) +/* D9B50 80143450 3C03800A */ lui $v1, %hi(gMainGfxPos) +/* D9B54 80143454 2463A66C */ addiu $v1, $v1, %lo(gMainGfxPos) /* D9B58 80143458 02C0382D */ daddu $a3, $s6, $zero /* D9B5C 8014345C 3C02FD70 */ lui $v0, 0xfd70 /* D9B60 80143460 8C660000 */ lw $a2, ($v1) @@ -634,8 +634,8 @@ glabel render_hud_element /* D9C50 80143550 3C080500 */ lui $t0, 0x500 /* D9C54 80143554 35080204 */ ori $t0, $t0, 0x204 /* D9C58 80143558 3C090500 */ lui $t1, 0x500 -/* D9C5C 8014355C 3C05800A */ lui $a1, %hi(gMasterGfxPos) -/* D9C60 80143560 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) +/* D9C5C 8014355C 3C05800A */ lui $a1, %hi(gMainGfxPos) +/* D9C60 80143560 24A5A66C */ addiu $a1, $a1, %lo(gMainGfxPos) /* D9C64 80143564 35290406 */ ori $t1, $t1, 0x406 /* D9C68 80143568 8CA40000 */ lw $a0, ($a1) /* D9C6C 8014356C 3C02E700 */ lui $v0, 0xe700 @@ -691,8 +691,8 @@ glabel render_hud_element /* D9D34 80143634 AC80002C */ sw $zero, 0x2c($a0) /* D9D38 80143638 3C03D838 */ lui $v1, 0xd838 .L8014363C: -/* D9D3C 8014363C 3C04800A */ lui $a0, %hi(gMasterGfxPos) -/* D9D40 80143640 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) +/* D9D3C 8014363C 3C04800A */ lui $a0, %hi(gMainGfxPos) +/* D9D40 80143640 2484A66C */ addiu $a0, $a0, %lo(gMainGfxPos) /* D9D44 80143644 8C820000 */ lw $v0, ($a0) /* D9D48 80143648 34630002 */ ori $v1, $v1, 2 /* D9D4C 8014364C 0040282D */ daddu $a1, $v0, $zero diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 8591e4ef0e..0f27cb11fb 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -2592,7 +2592,7 @@ D_8009A65C = 0x8009A65C; // type:data rom:0x75A5C __osFinalrom = 0x8009A660; // type:data rom:0x75A60 gBGMPlayerA = 0x8009A664; // type:data rom:0x75A64 gFirstStrikeMessagePos = 0x8009A668; // type:data rom:0x75A68 -gMasterGfxPos = 0x8009A66C; // rom:0x75A6C +gMainGfxPos = 0x8009A66C; // rom:0x75A6C D_8009A670 = 0x8009A670; // type:data rom:0x75A70 gDisplayContext = 0x8009A674; // rom:0x75A74 D_8009A678 = 0x8009A678; // type:data rom:0x75A78 diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt index 02564368bb..31d1d53fec 100644 --- a/ver/us/undefined_syms.txt +++ b/ver/us/undefined_syms.txt @@ -222,7 +222,7 @@ dead_nuGfxZBuffer = nuGfxZBuffer + 0x6F54; dead_gCurrentCamID = gCurrentCamID + 0x6F58; dead_nuGfxCfb_ptr = nuGfxCfb_ptr + 0x6F58; dead_gOverrideFlags = gOverrideFlags + 0x6F58; -dead_gMasterGfxPos = gMasterGfxPos + 0x6F58; +dead_gMainGfxPos = gMainGfxPos + 0x6F58; dead_gDisplayContext = gDisplayContext + 0x6F58; dead_gCurrentEncounter = gCurrentEncounter + 0x6FE0; dead_gCameras = gCameras + 0x7000;