From 4262a0de0df36f47a4fff197bdbf4127370c7c16 Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Fri, 19 May 2023 16:57:36 +0100 Subject: [PATCH] Rock Tunnel fossils I am not sure why the fossils don't show properly at the moment - it isn't related to going past $FF, as the Old Amber shows. Dome and Wing specifically don't show properly and need fixing down the line. --- README.md | 3 ++- constants/hide_show_constants.asm | 4 ++++ data/maps/hide_show_data.asm | 7 ++++++- data/maps/objects/RockTunnelB1F.asm | 6 ++++-- maps/RockTunnel1F.blk | 3 ++- scripts/RockTunnelB1F.asm | 4 ++++ 6 files changed, 22 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 87050ff2..73eaba7b 100644 --- a/README.md +++ b/README.md @@ -190,7 +190,8 @@ Known Bugs - Only portions of spinner tiles animate. - Occasionally, menu text sets itself to scroll. - The lone Rocket in Viridian Gym's basement needs to be directly spoken to to be battled. -- Pokedex is very laggy during a playthrough. +- Pokedex is very laggy during a playthrough, and seen/owned are being weird (possibly due to a change made when adding extra starters..?) +- Dome and Wing Fossils in Rock Tunnel B1F don't show properly. - The Tradeback Tutor doesn't work properly with Rhydon for reasons likely related to its index number of 1. - The Vermilion Passes are very unstable (Faraway warps are weird unless you battle, Citrine outright crashes). - The Brunswick Trail Bird event is unfinished, Zapdos causes it to crash. diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm index 9c3d3fb6..1870f53a 100644 --- a/constants/hide_show_constants.asm +++ b/constants/hide_show_constants.asm @@ -264,4 +264,8 @@ DEF SHOW EQU $15 const HS_MT_MOON_CRATER_ITEM_11 ; FB const HS_GIOVANNIS_ROOM_ITEM_1 ; FC const HS_GIOVANNIS_ROOM_ITEM_2 ; FD + const HS_ROCK_TUNNEL_B1F_DOME ; FE + const HS_ROCK_TUNNEL_B1F_HELIX ; FF uh oh + const HS_ROCK_TUNNEL_B1F_AMBER ; $100 seems this still works? + const HS_ROCK_TUNNEL_B1F_WING ; $101 DEF NUM_HS_OBJECTS EQU const_value diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm index e2011a8f..4ac45ce3 100644 --- a/data/maps/hide_show_data.asm +++ b/data/maps/hide_show_data.asm @@ -251,7 +251,7 @@ MapHSPointers: dw NoHS dw NoHS dw NoHS - dw NoHS + dw RockTunnelB1FHS dw GiovannisRoomHS dw NoHS ; Battle Tent dw NoHS ; Mt Moon Square @@ -606,6 +606,11 @@ MtMoonCraterHS: GiovannisRoomHS: db GIOVANNIS_ROOM, $05, SHOW ; HS_GIOVANNIS_ROOM_ITEM_1 db GIOVANNIS_ROOM, $06, SHOW ; HS_GIOVANNIS_ROOM_ITEM_2 +RockTunnelB1FHS: + db ROCK_TUNNEL_B1F, $0A, SHOW ; HS_ROCK_TUNNEL_B1F_DOME + db ROCK_TUNNEL_B1F, $0B, SHOW ; HS_ROCK_TUNNEL_B1F_HELIX + db ROCK_TUNNEL_B1F, $0C, SHOW ; HS_ROCK_TUNNEL_B1F_AMBER + db ROCK_TUNNEL_B1F, $0D, SHOW ; HS_ROCK_TUNNEL_B1F_WING db $FF, $01, SHOW ; end assert_table_length NUM_HS_OBJECTS + 1 diff --git a/data/maps/objects/RockTunnelB1F.asm b/data/maps/objects/RockTunnelB1F.asm index bb4170ca..6b01802f 100644 --- a/data/maps/objects/RockTunnelB1F.asm +++ b/data/maps/objects/RockTunnelB1F.asm @@ -19,7 +19,9 @@ RockTunnelB1F_Object: object_event 33, 5, SPRITE_HIKER, STAY, RIGHT, 7, OPP_HIKER, 11 object_event 26, 30, SPRITE_SUPER_NERD, STAY, DOWN, 8, OPP_POKEMANIAC, 5 object_event 22, 5, SPRITE_YOUNGSTER, STAY, RIGHT, 9 - ;object_event 7, 23, SPRITE_FOSSIL, STAY, NONE, 10, HELIX_FOSSIL - ;object_event 6, 23, SPRITE_FOSSIL, STAY, NONE, 11, DOME_FOSSIL + object_event 7, 23, SPRITE_FOSSIL, STAY, NONE, 10, HELIX_FOSSIL + object_event 6, 23, SPRITE_FOSSIL, STAY, NONE, 11, DOME_FOSSIL + object_event 8, 24, SPRITE_OLD_AMBER, STAY, NONE, 12, OLD_AMBER + object_event 5, 24, SPRITE_FOSSIL, STAY, NONE, 13, WING_FOSSIL def_warps_to ROCK_TUNNEL_B1F diff --git a/maps/RockTunnel1F.blk b/maps/RockTunnel1F.blk index 2e5b39c0..9f2c674d 100644 --- a/maps/RockTunnel1F.blk +++ b/maps/RockTunnel1F.blk @@ -1 +1,2 @@ - " "(>(__N !!" " "^(mvvvvvvrvv " " "vvj[[o(vfvLHvvvvvvQr " " " " "TUMnnnL^*jko^p^^r>NQRMN \ No newline at end of file + " "(>(vvv__Nvv + "(mr "}}j[[o(}}H-TUMnnnL^*jko^p^^r>NQRMN \ No newline at end of file diff --git a/scripts/RockTunnelB1F.asm b/scripts/RockTunnelB1F.asm index aa19b692..f88dd681 100644 --- a/scripts/RockTunnelB1F.asm +++ b/scripts/RockTunnelB1F.asm @@ -22,6 +22,10 @@ RockTunnelB1F_TextPointers: dw RockTunnel2Text7 dw RockTunnel2Text8 dw RockSlideGuy + dw PickUpItemText ; Helix + dw PickUpItemText ; Dome + dw PickUpItemText ; Amber + dw PickUpItemText ; Wing ; dw KabutopsText RockTunnel2TrainerHeaders: