thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-16 18:30:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Running Shoes and 30 Item Bag

Browse source 
need to fix layout link to futureproof it better but for now it works. Mart changes save space in wRAM.
This commit is contained in:
emaskyesmogon 2022-09-27 16:55:15 -06:00
parent d8cb5a331f
commit 9d13923e8e
19 changed files with 86 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
constants/menu_constants.asm
View file

@ -1,4 +1,4 @@
DEF BAG_ITEM_CAPACITY EQU 20
DEF BAG_ITEM_CAPACITY EQU 30
DEF PC_ITEM_CAPACITY EQU 50
; text box IDs

51
data/items/marts.asm
View file

@ -1,50 +1 @@
; mart inventories are below
; they are texts
ViridianCashierText::
script_mart POKE_BALL, ANTIDOTE, PARLYZ_HEAL, BURN_HEAL
PewterCashierText::
script_mart POKE_BALL, POTION, ESCAPE_ROPE, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL
CeruleanCashierText::
script_mart POKE_BALL, POTION, REPEL, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL
BikeShopCashierText:: ; unreferenced
script_mart BICYCLE
VermilionCashierText::
script_mart POKE_BALL, SUPER_POTION, ICE_HEAL, AWAKENING, PARLYZ_HEAL, REPEL
LavenderCashierText::
script_mart GREAT_BALL, SUPER_POTION, REVIVE, ESCAPE_ROPE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, PARLYZ_HEAL
CeladonMart2Clerk1Text::
script_mart GREAT_BALL, SUPER_POTION, REVIVE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, AWAKENING, PARLYZ_HEAL
CeladonMart2Clerk2Text::
script_mart TM_DOUBLE_TEAM, TM_REFLECT, TM_RAZOR_WIND, TM_HORN_DRILL, TM_EGG_BOMB, TM_MEGA_PUNCH, TM_MEGA_KICK, TM_DRAGON_RAGE, TM_SUBMISSION
CeladonMart4ClerkText::
script_mart POKE_DOLL, FIRE_STONE, THUNDER_STONE, WATER_STONE, LEAF_STONE, SUN_STONE
CeladonMart5Clerk1Text::
script_mart X_ACCURACY, GUARD_SPEC, DIRE_HIT, X_ATTACK, X_DEFEND, X_SPEED, X_SPECIAL
CeladonMart5Clerk2Text::
script_mart HP_UP, PROTEIN, IRON, CARBOS, CALCIUM
FuchsiaCashierText::
script_mart ULTRA_BALL, GREAT_BALL, SUPER_POTION, REVIVE, FULL_HEAL, SUPER_REPEL
UnusedCashierText:: ; unreferenced
script_mart GREAT_BALL, HYPER_POTION, SUPER_POTION, FULL_HEAL, REVIVE
CinnabarCashierText::
script_mart ULTRA_BALL, GREAT_BALL, HYPER_POTION, MAX_REPEL, ESCAPE_ROPE, FULL_HEAL, REVIVE
SaffronCashierText::
script_mart GREAT_BALL, HYPER_POTION, MAX_REPEL, ESCAPE_ROPE, FULL_HEAL, REVIVE
IndigoCashierText::
script_mart ULTRA_BALL, GREAT_BALL, FULL_RESTORE, MAX_POTION, FULL_HEAL, REVIVE, MAX_REPEL
; mart inventories are now in the scripts file for the respective mart to save space - Ema

2
home.asm
View file

@ -39,8 +39,6 @@ INCLUDE "home/timer.asm"
INCLUDE "home/audio.asm"
INCLUDE "home/update_sprites.asm"
INCLUDE "data/items/marts.asm"
INCLUDE "home/overworld_text.asm"
INCLUDE "home/uncompress.asm"
INCLUDE "home/reset_player_sprite.asm"

21
home/overworld.asm
View file

@ -284,8 +284,29 @@ OverworldLoopLessDelay::
ld a, [wd736]
bit 6, a ; jumping a ledge?
jr nz, .normalPlayerSpriteAdvancement
; Bike is normally 2x walking speed
; Holding B makes the bike even faster
ld a, [hJoyHeld]
and B_BUTTON
jr z, .notMachBike
call DoBikeSpeedup
call DoBikeSpeedup
.notMachBike
call DoBikeSpeedup
jr .notRunning
.normalPlayerSpriteAdvancement
; surf at 2x walking speed
ld a, [wWalkBikeSurfState]
cp $02
jr z, .surfFaster
; holding B makes you surf at 2x walking speed
ld a, [hJoyHeld]
and B_BUTTON
jr z, .notRunning
.surfFaster
call DoBikeSpeedup
.notRunning
; original code continues here
call AdvancePlayerSprite
ld a, [wWalkCounter]
and a

2
layout.link
View file

@ -194,7 +194,7 @@ WRAM0
"Party Data"
"Main Data"
"Current Box Data"
org $df02
org $df03
"Stack"
VRAM
"VRAM"

21
ram/wram.asm
View file

@ -1741,9 +1741,7 @@ wPokedexOwnedEnd::
wPokedexSeen:: flag_array NUM_POKEMON
wPokedexSeenEnd::
wNumBagItems:: db
; item, quantity
wBagItems:: ds BAG_ITEM_CAPACITY * 2 + 1
ds 28 ;;;;;;; moved bag code lower down to make bigger bag space
wPlayerMoney:: ds 3 ; BCD
@ -1834,7 +1832,20 @@ wWarpEntries:: ds 32 * 4 ; Y, X, warp ID, map ID
; if $ff, the player's coordinates are not updated when entering the map
wDestinationWarpID:: db
ds 128
;;;;;;;;;; note: CHANGED: this empty space is now used for bigger bag space - TY Vortiene
UNION
; original size of this empty space
ds 128
NEXTU
wNumBagItems:: db
; item, quantity
wBagItems:: ds BAG_ITEM_CAPACITY * 2 + 1 ; now holds 30 items
;;;;
; 66 bytes left to use
ENDU
;;;;;;;;;;
; number of signs in the current map (up to 16)
wNumSigns:: db
@ -2331,5 +2342,5 @@ wBoxDataEnd::
SECTION "Stack", WRAM0
; the stack grows downward
ds $FE - 1
ds $FD - 1
wStack:: db

3
scripts/BikeShop.asm
View file

@ -145,3 +145,6 @@ BikeShopText_1d85c:
BikeShopText_1d861:
text_far _BikeShopText_1d861
text_end
BikeShopCashierText:: ; unreferenced
script_mart BICYCLE

6
scripts/CeladonMart2F.asm
View file

@ -19,3 +19,9 @@ CeladonMart2Text4:
CeladonMart2Text5:
text_far _CeladonMart2Text5
text_end
CeladonMart2Clerk1Text::
script_mart GREAT_BALL, SUPER_POTION, REVIVE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, AWAKENING, PARLYZ_HEAL
CeladonMart2Clerk2Text::
script_mart TM_DOUBLE_TEAM, TM_REFLECT, TM_RAZOR_WIND, TM_HORN_DRILL, TM_EGG_BOMB, TM_MEGA_PUNCH, TM_MEGA_KICK, TM_DRAGON_RAGE, TM_SUBMISSION

3
scripts/CeladonMart4F.asm
View file

@ -18,3 +18,6 @@ CeladonMart4Text3:
CeladonMart4Text4:
text_far _CeladonMart4Text4
text_end
CeladonMart4ClerkText::
script_mart POKE_DOLL, FIRE_STONE, THUNDER_STONE, WATER_STONE, LEAF_STONE, SUN_STONE

6
scripts/CeladonMart5F.asm
View file

@ -19,3 +19,9 @@ CeladonMart5Text2:
CeladonMart5Text5:
text_far _CeladonMart5Text5
text_end
CeladonMart5Clerk1Text::
script_mart X_ACCURACY, GUARD_SPEC, DIRE_HIT, X_ATTACK, X_DEFEND, X_SPEED, X_SPECIAL
CeladonMart5Clerk2Text::
script_mart HP_UP, PROTEIN, IRON, CARBOS, CALCIUM

3
scripts/CeruleanMart.asm
View file

@ -13,3 +13,6 @@ CeruleanMartText2:
CeruleanMartText3:
text_far _CeruleanMartText3
text_end
CeruleanCashierText::
script_mart POKE_BALL, POTION, REPEL, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL

3
scripts/CinnabarMart.asm
View file

@ -13,3 +13,6 @@ CinnabarMartText2:
CinnabarMartText3:
text_far _CinnabarMartText3
text_end
CinnabarCashierText::
script_mart ULTRA_BALL, GREAT_BALL, HYPER_POTION, MAX_REPEL, ESCAPE_ROPE, FULL_HEAL, REVIVE

3
scripts/FuchsiaMart.asm
View file

@ -13,3 +13,6 @@ FuchsiaMartText2:
FuchsiaMartText3:
text_far _FuchsiaMartText3
text_end
FuchsiaCashierText::
script_mart ULTRA_BALL, GREAT_BALL, SUPER_POTION, REVIVE, FULL_HEAL, SUPER_REPEL

3
scripts/IndigoPlateauLobby.asm
View file

@ -34,3 +34,6 @@ IndigoPlateauLobbyText3:
IndigoTradeNurseText:
script_cable_club_receptionist
IndigoCashierText::
script_mart ULTRA_BALL, GREAT_BALL, FULL_RESTORE, MAX_POTION, FULL_HEAL, REVIVE, MAX_REPEL

3
scripts/LavenderMart.asm
View file

@ -30,3 +30,6 @@ LavenderMartText3:
.NuggetText
text_far _LavenderMartNuggetText
text_end
LavenderCashierText::
script_mart GREAT_BALL, SUPER_POTION, REVIVE, ESCAPE_ROPE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, PARLYZ_HEAL

3
scripts/PewterMart.asm
View file

@ -28,3 +28,6 @@ PewterMartText3:
.Text
text_far _PewterMartText3
text_end
PewterCashierText::
script_mart POKE_BALL, POTION, ESCAPE_ROPE, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL

4
scripts/SaffronMart.asm
View file

@ -13,3 +13,7 @@ SaffronMartText2:
SaffronMartText3:
text_far _SaffronMartText3
text_end
SaffronCashierText::
script_mart GREAT_BALL, HYPER_POTION, MAX_REPEL, ESCAPE_ROPE, FULL_HEAL, REVIVE

3
scripts/VermilionMart.asm
View file

@ -13,3 +13,6 @@ VermilionMartText2:
VermilionMartText3:
text_far _VermilionMartText3
text_end
VermilionCashierText::
script_mart POKE_BALL, SUPER_POTION, ICE_HEAL, AWAKENING, PARLYZ_HEAL, REPEL

3
scripts/ViridianMart.asm
View file

@ -93,3 +93,6 @@ ViridianMartText2:
ViridianMartText3:
text_far _ViridianMartText3
text_end
ViridianCashierText::
script_mart POTION, POKE_BALL, ANTIDOTE, PARLYZ_HEAL, BURN_HEAL