Commit graph

250 commits

Author SHA1 Message Date
Zeta_Null
1c9dafa527 Water Sport doesnt Work Commit 2
I forgot the Sunglow Well underwater files, whoops
2024-12-29 22:13:37 -05:00
Zeta_Null
2207e15bc7 Water Sport doesnt seem to work correctly? 2024-12-29 22:11:46 -05:00
Zeta_Null
fd7ae97fbd Merge branch 'master' of https://github.com/ZetaNull/jep-hack 2024-12-28 16:31:05 -05:00
Zeta_Null
b7a9f6569a ABLK files and Steven 2024-12-28 16:30:57 -05:00
Llinos Evans
093bda0253 Strong Arm, Water Sport, and more HMs.
This adds Rock Climb functionality to Strong Arm and Dive functionality to Water Sport, as discussed in the server. HMs have been added, but we need 16bit Items to add Wind Ride, and I haven't finished their functionality.

The Rock Climb tile is a bit terrible, it's not easy to notice. Maybe change so that it works well with yellow or another colour?

This does not build due to issues with effect_commands.asm, but since Zeta is meant to be working on the mapping and Water Sport anyway, it seems to be up his alley.

I ported over much of the underwater assets Rangi was using as they looked very pretty. I imagine it'll be fun to utilise going forward. May as well, right?

I shall now lay down in a dark room.

Review: c21561ea71 (diff-5508f3b794fc68821ba35e94b6a293b2aaaa16c02a1b34fac70d03fd2f74c4b2R113)
2024-12-28 06:26:01 +00:00
Zeta_Null
1f43ea285c Merge branch 'master' of https://github.com/ZetaNull/jep-hack 2024-12-21 17:57:32 -05:00
Llinos Evans
b02dd40973 More sprites and Burned Tower fix
Feraligatr has colour issues pls fix
2024-12-21 22:56:10 +00:00
Zeta_Null
eeff49ca07 Merge branch 'master' of https://github.com/ZetaNull/jep-hack 2024-12-21 17:47:51 -05:00
Zeta_Null
6b06da949a Sunglow Flypoint Setup 2024-12-21 17:47:33 -05:00
Llinos Evans
9c02788f7d post-test fixes
Fixed Cianwood Gym Trainers
Fixed Mt. Mortar Suicune instacrash
2024-12-21 22:31:56 +00:00
Zeta_Null
63558a935f I forgot files. whoops 2024-12-21 16:07:54 -05:00
Zeta_Null
f98a639b52 WIP Sunglow City (missing some shit, remind me to get to it later) 2024-12-20 23:52:18 -05:00
Zeta_Null
67790a0e73 Colored Badges 2024-12-19 17:51:57 -05:00
Llinos Evans
1f1f59874e Gates, Marts, and Pokecenters!
Ruddy Town is now populated, and Gates, Marts, and Pokecenters now populate the areas. Nihon is more mapped out!
2024-12-19 21:47:03 +00:00
Zeta_Null
7efbb642d5 Johto Boy and HP Fix
Mildly scuffed implementation of blue checking your gender to be able to call you Johto Boy/Girl/Kid

Also fixed how fucking slow HP drain is when you have a lot. May require a make tidy to go into effect.
2024-12-10 15:57:25 -05:00
Zeta_Null
52a8f2cf20 Aventurine City, Bank Split, Initial KEP Fuchsia Port
Had to split bank 2 because I ran out of unreferenced code to comment out when adding Aventurine

Fuchsia was pissing me off so I applied the changes from KEP when adding the safari zone graphics, though it's not currently super close to what it was like in LGPE

Aventurine is very early stages but it's in there :V
2024-12-09 22:29:07 -05:00
Zeta_Null
5e703191ce More White City Stuff 2024-11-13 13:46:38 -05:00
Zeta_Null
6373ba855f White city 2024-11-12 19:19:22 -05:00
Zeta_Null
9a80501cd1 Ruddy Town!
we're probably going to need to split bank 2 eventually I am running out of unreferenced code to comment out lol
2024-11-07 16:55:20 -05:00
Zeta_Null
4aaf325c76 Ruddy map draft. Currently unimplemented. 2024-11-02 13:15:24 -04:00
Zeta_Null
40dc3352b2 More official Nihon mart stuff 2024-10-30 19:07:54 -04:00
Zeta_Null
2eec67d7fd idle animation 2024-10-29 18:02:18 -04:00
Zeta_Null
ef35ac92f5 Ajawalcan sprite and animation! 2024-10-29 17:45:23 -04:00
Llinos Evans
d7d348eaca Fix route numbers and add wild data
BWAAAAAH ZETAAAA
2024-10-29 18:42:26 +00:00
Zeta_Null
e4a9df2a82 Route 52 tweak to better fit the actual way things are meant to look on the region map 2024-10-29 01:41:19 -04:00
Zeta_Null
0ff271b1c2 meh okay ill just tweak the layout, might as well 2024-10-29 01:25:02 -04:00
Zeta_Null
53fe16d8a9 I need to stop forgetting to include some of the map files lol 2024-10-29 00:59:20 -04:00
Zeta_Null
c724dd3977 Route 53; needs refinement and lacks encounter data
Right side of the map is visibly slightly cut off. Whoops. I'll probably adjust it later. Left side is fine, though.
2024-10-29 00:58:15 -04:00
Zeta_Null
1d464d7dd4 I fucking forgot to include route 52's files, whoops
Also comes with the map for route 53, though unimplemented.
2024-10-28 22:24:27 -04:00
Zeta_Null
3a43c2009f Merge branch 'master' of https://github.com/ZetaNull/jep-hack 2024-10-28 14:20:49 -04:00
Zeta_Null
1729f91f26 Whoops I fucked up a thing lol 2024-10-28 14:20:32 -04:00
Llinos Evans
5d9cf1aac2 Populate Coral City
Added various NPCs and signs to Coral City, giving some lore and such. Very basic and barebones.

I also added some extensive notes on what the city is meant to be, it's very misunderstood.
2024-10-27 10:59:35 +00:00
Llinos Evans
94436d0ef6 Fixed build issue, flypoints for coral/savoy, populate savoy
Savoy City is now full of savvy younglings ready to bombard people with old slang. I wanted it to be a capitalistic hellscape where all the young ones trying to keep up with the trends. A few older people, as well as those entering, do not appreciate the babel.
2024-10-26 23:09:40 +01:00
Zeta_Null
7a6d9b3b46 Coral City (High-Tech) 2024-10-24 18:12:34 -04:00
Zeta_Null
71739fddc2 some fine-tuning with the nihon maps 2024-10-24 03:02:10 -04:00
Zeta_Null
54c72fd12e Mart music and Music credits + Sepia Tweaks 2024-10-23 14:14:49 -04:00
Zeta_Null
c00670604d Gate. 2024-10-23 02:51:43 -04:00
Zeta_Null
eb10621ac6 I dont understand why that was making the error it was but yeah okay I guess we're good here 2024-10-23 02:11:35 -04:00
Zeta_Null
8a8e17cf01 Wait hold on did I fuck up the asm file here somehow 2024-10-23 01:37:42 -04:00
Zeta_Null
da5862a041 Savoy City Map. Files arent properly included yet because for some reason things just don't build when I try. 2024-10-23 01:34:35 -04:00
Zeta_Null
42357756bc some fairly minor nihon tweaks 2024-10-22 19:44:06 -04:00
Zeta_Null
c84c56eb86 Quiet Cave Tileset 2024-10-20 02:36:28 -04:00
Zeta_Null
83c8b7a0e7 Kanto Safari Zone Maps finished. Also whoops I forgot to include the maps last time 2024-10-17 02:48:50 -04:00
Zeta_Null
0d1b70ee56 Kanto Safari Zone Area 2 2024-10-17 02:05:36 -04:00
Zeta_Null
3949670f4f Begin work on the Kanto Safari Zone.
Some maps are broken up or edited to allow for seamless transitions instead of needing several warps. (Area 1 is split vertically, Area 2 needs a horizontal split. The connection between area 1 and 2 also will have to be shifted up from where it is in RBY to prevent border blocks showing up where they shouldn't.)
2024-10-16 14:58:11 -04:00
Zeta_Null
bb65f6a796 Whoops I forgot to save part of the thing for the four island connection lol 2024-10-15 21:29:29 -04:00
Zeta_Null
fc56ea0fda Basic four island stuff. Get to unused routes later 2024-10-15 21:26:07 -04:00
Zeta_Null
541c3dcdff Whoops I forgot to finish this lol 2024-10-15 14:27:33 -04:00
Zeta_Null
1dc596e162 Three Island layouts 2024-10-14 16:12:59 -04:00
Zeta_Null
8b9927bc6f Three Island and properly implement nihon region check for the trainer battle theme (double check this doesnt accidentally also effect sevii) 2024-10-12 17:52:52 -04:00