thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2025-11-11 07:54:46 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ZetaNull/jep-hack

Browse source
This commit is contained in:
Zeta_Null 2023-10-23 14:27:15 -04:00
parent aeaf084598 abc7ecab24
commit 1df5c043fc
28 changed files with 172 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
constants/map_constants.asm
View file

@ -166,7 +166,7 @@ ENDM
map_const ECRUTEAK_GYM, 5, 9 ; 7
map_const ECRUTEAK_ITEMFINDER_HOUSE, 4, 4 ; 8
map_const ECRUTEAK_CITY, 20, 18 ; 9
map_const BELLCHIME_TRAIL, 6, 12
map_const BELLCHIME_TRAIL, 12, 7
endgroup
newgroup BLACKTHORN ; 5
@ -211,9 +211,9 @@ ENDM
map_const ROUTE_24, 10, 9 ; 15
map_const ROUTE_25, 30, 9 ; 16
map_const CERULEAN_CITY, 20, 18 ; 17
map_const CERULEAN_CAVE_1F, 9, 15
map_const CERULEAN_CAVE_2F, 9, 15
map_const CERULEAN_CAVE_B1F, 9, 15
map_const CERULEAN_CAVE_1F, 17, 12
map_const CERULEAN_CAVE_2F, 17, 11
map_const CERULEAN_CAVE_B1F, 17, 11
endgroup
newgroup AZALEA ; 8
@ -316,8 +316,8 @@ ENDM
map_const PEWTER_POKECENTER_1F, 5, 4 ; 6
map_const PEWTER_POKECENTER_2F_BETA, 8, 4 ; 7
map_const PEWTER_SNOOZE_SPEECH_HOUSE, 4, 4 ; 8
map_const PEWTER_MUSEUM_OF_SCIENCE_1F, 4, 10
map_const PEWTER_MUSEUM_OF_SCIENCE_2F, 4, 7
map_const PEWTER_MUSEUM_OF_SCIENCE_1F, 10, 4
map_const PEWTER_MUSEUM_OF_SCIENCE_2F, 7, 4
endgroup
newgroup FAST_SHIP ; 15
@ -457,7 +457,7 @@ ENDM
map_const ROUTE_2_NUGGET_HOUSE, 4, 4 ; 11
map_const ROUTE_2_GATE, 5, 4 ; 12
map_const VICTORY_ROAD_GATE, 10, 9 ; 13
map_const VIRIDIAN_FOREST, 27, 15
map_const VIRIDIAN_FOREST, 19, 26
map_const VIRIDIAN_FOREST_VIRIDIAN_GATE, 4, 5
map_const VIRIDIAN_FOREST_PEWTER_GATE, 4, 5
endgroup

2
data/maps/maps.asm
View file

@ -491,7 +491,7 @@ MapGroup_Viridian:
map Route2NuggetHouse, TILESET_HOUSE, INDOOR, LANDMARK_ROUTE_2, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map Route2Gate, TILESET_GATE, GATE, LANDMARK_ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map VictoryRoadGate, TILESET_GATE, GATE, LANDMARK_ROUTE_26, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map ViridianForest, TILESET_FOREST, CAVE, LANDMARK_VIRIDIAN_FOREST, MUSIC_UNION_CAVE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map ViridianForest, TILESET_FOREST, CAVE, LANDMARK_VIRIDIAN_FOREST, MUSIC_ROUTE_2, FALSE, PALETTE_AUTO, FISHGROUP_SHORE ; MUSIC_ROUTE_2 is the viridian forest remix
map ViridianForestViridianGate, TILESET_GATE, GATE, LANDMARK_ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map ViridianForestPewterGate, TILESET_GATE, GATE, LANDMARK_ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_DAY, FISHGROUP_SHORE
assert_table_length NUM_VIRIDIAN_MAPS

1
data/maps/scenes.asm
View file

@ -84,4 +84,5 @@ MapScenes::
scene_var MOUNT_MOON_SQUARE, wMountMoonSquareSceneID
scene_var MOBILE_TRADE_ROOM, wMobileTradeRoomSceneID
scene_var MOBILE_BATTLE_ROOM, wMobileBattleRoomSceneID
scene_var CERULEAN_CAVE_1F, wCeruleanCave1FSceneID
db -1 ; end

BIN
data/tilesets/kanto_attributes.bin
View file

Binary file not shown.

1
data/tilesets/kanto_collision.asm
View file

@ -126,3 +126,4 @@
tilecoll WALL, WALL, WALL, WALL ; 7d
tilecoll WALL, WALL, WALL, WALL ; 7e
tilecoll WALL, WALL, WALL, WALL ; 7f
tilecoll WALL, WALL, DOOR, WALL ; 80

BIN
data/tilesets/kanto_metatiles.bin
View file

Binary file not shown.

BIN
data/tilesets/park_attributes.bin
View file

Binary file not shown.

2
data/tilesets/park_collision.asm
View file

@ -62,3 +62,5 @@
tilecoll WALL, WALL, WALL, WALL ; 3d
tilecoll WALL, WALL, WALL, WALL ; 3e
tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 3f
tilecoll WALL, FLOOR, WALL, WARP_CARPET_DOWN ; 40
tilecoll FLOOR, WALL, WARP_CARPET_DOWN, WALL ; 41

BIN
data/tilesets/park_metatiles.bin
View file

Binary file not shown.

22
gfx/tilesets.asm
View file

@ -234,15 +234,6 @@ INCBIN "data/tilesets/johto_modern_metatiles.bin"
TilesetJohtoModernColl::
INCLUDE "data/tilesets/johto_modern_collision.asm"
TilesetTraditionalHouseGFX::
INCBIN "gfx/tilesets/traditional_house.2bpp.lz"
TilesetTraditionalHouseMeta::
INCBIN "data/tilesets/traditional_house_metatiles.bin"
TilesetTraditionalHouseColl::
INCLUDE "data/tilesets/traditional_house_collision.asm"
SECTION "Tileset Data 6", ROMX
@ -462,4 +453,15 @@ TilesetAerodactylWordRoomAttr::
INCBIN "data/tilesets/aerodactyl_word_room_attributes.bin"
TilesetNihon1Attr::
INCBIN "data/tilesets/nihon01_attributes.bin"
INCBIN "data/tilesets/nihon01_attributes.bin"
SECTION "Tileset Data 12", ROMX
TilesetTraditionalHouseGFX::
INCBIN "gfx/tilesets/traditional_house.2bpp.lz"
TilesetTraditionalHouseMeta::
INCBIN "data/tilesets/traditional_house_metatiles.bin"
TilesetTraditionalHouseColl::
INCLUDE "data/tilesets/traditional_house_collision.asm"

3
home/map.asm
View file

@ -1503,6 +1503,9 @@ SaveScreen_LoadConnection::
jr nz, .row
ret
GenericFinishBridge::
ld a, 1
ld [wOverworldDelaySkip], a
GetMovementPermissions::
xor a
ld [wTilePermissions], a

10
macros/asserts.asm
View file

@ -63,3 +63,13 @@ MACRO end_water_wildmons
assert WATER_WILDDATA_LENGTH == @ - {CURRENT_WATER_WILDMONS_LABEL}, \
"def_water_wildmons {CURRENT_WATER_WILDMONS_MAP}: expected {d:WATER_WILDDATA_LENGTH} bytes"
ENDM
MACRO jmp
if _NARG == 1
jp \1
else
jp \1, \2
shift
endc
assert warn, (\1) - @ > 127 || (\1) - @ < -129, "jp can be jr"
ENDM

8
macros/code.asm
View file

@ -94,3 +94,11 @@ if _NARG == 0
sine_table 32
endc
ENDM
MACRO changebridgeblock
; lb de, \1 + 4, \2 + 4
; call GetBlockLocation
ld hl, wOverworldMapBlocks + (\2 / 2 + 3) * (\4_WIDTH + 6) + \1 / 2 + 3
; hard-coding the above calculation for efficiency
ld [hl], \3
ENDM

9
macros/scripts/events.asm
View file

@ -1077,4 +1077,13 @@ MACRO checkmaplockedmons
db checkmaplockedmons_command
ENDM
MACRO callthisasm
; "callasm .asm\@" causes a "File stack dump too long, got truncated"
; error due to the long filename:linenumber trace of nested macros.
db callasm_command
dba .asm\@
end
.asm\@
ENDM
DEF NUM_EVENT_COMMANDS EQU const_value

48
maps/CeruleanCave1F.asm
View file

@ -2,6 +2,48 @@ CeruleanCave1F_MapScripts:
def_scene_scripts
def_callbacks
CeruleanCave1FTileScript:
checkscene
iftrue .underfoot
callasm CeruleanCave1F_OverheadBridgeAsm
endcallback
.underfoot:
callasm CeruleanCave1F_UnderfootBridgeAsm
endcallback
CeruleanCave1F_OverheadBridgeAsm:
changebridgeblock 20, 2, $ea, CERULEAN_CAVE_1F
changebridgeblock 22, 2, $eb, CERULEAN_CAVE_1F
changebridgeblock 20, 4, $ee, CERULEAN_CAVE_1F
changebridgeblock 22, 4, $ef, CERULEAN_CAVE_1F
changebridgeblock 20, 6, $59, CERULEAN_CAVE_1F
changebridgeblock 22, 6, $5b, CERULEAN_CAVE_1F
jmp BufferScreen
CeruleanCave1F_UnderfootBridgeAsm:
changebridgeblock 20, 2, $e8, CERULEAN_CAVE_1F
changebridgeblock 22, 2, $e9, CERULEAN_CAVE_1F
changebridgeblock 20, 4, $ec, CERULEAN_CAVE_1F
changebridgeblock 22, 4, $ed, CERULEAN_CAVE_1F
changebridgeblock 20, 6, $55, CERULEAN_CAVE_1F
changebridgeblock 22, 6, $57, CERULEAN_CAVE_1F
jmp BufferScreen
CeruleanCave1FBridgeOverheadTrigger:
callasm CeruleanCave1F_OverheadBridgeAsm
callthisasm
xor a
jr CeruleanCave1F_FinishBridge
CeruleanCave1FBridgeUnderfootTrigger:
callasm CeruleanCave1F_UnderfootBridgeAsm
callthisasm
ld a, $1
CeruleanCave1F_FinishBridge:
ld [wWalkingOnBridge], a
ld [wCeruleanCave1FSceneID], a ; setscene a
jmp GenericFinishBridge
CeruleanCave1F_MapEvents:
def_warp_events
@ -15,6 +57,12 @@ CeruleanCave1F_MapEvents:
warp_event 5, 15, CERULEAN_CAVE_2F, 6
def_coord_events
coord_event 20, 4, 1, CeruleanCave1FBridgeOverheadTrigger
coord_event 20, 5, 1, CeruleanCave1FBridgeOverheadTrigger
coord_event 23, 4, 1, CeruleanCave1FBridgeOverheadTrigger
coord_event 23, 5, 1, CeruleanCave1FBridgeOverheadTrigger
coord_event 21, 7, 0, CeruleanCave1FBridgeUnderfootTrigger
coord_event 22, 7, 0, CeruleanCave1FBridgeUnderfootTrigger
def_bg_events
bg_event 10, 13, BGEVENT_ITEM + ULTRA_BALL, EVENT_CERULEAN_CAVE_1F_HIDDEN_ULTRA_BALL

1
maps/CeruleanCaveB1F.asm
View file

@ -34,6 +34,7 @@ CeruleanCaveB1F_MapEvents:
def_bg_events
bg_event 8, 6, BGEVENT_ITEM + MAX_REVIVE, EVENT_CERULEAN_CAVE_B1F_HIDDEN_MAX_REVIVE
bg_event 24, 11, BGEVENT_ITEM + ULTRA_BALL, EVENT_CERULEAN_CAVE_B1F_HIDDEN_ULTRA_BALL
bg_event 7, 13, BGEVENT_ITEM, CeruleanCityHiddenBerserkGene
def_object_events
object_event 7, 13, SPRITE_JYNX, SPRITEMOVEDATA_POKEMON, 0, MEWTWO, -1, -1, PAL_NPC_PURPLE, OBJECTTYPE_SCRIPT, 0, CeruleanCaveMewtwo, EVENT_CERULEAN_CAVE_MEWTWO

4
maps/CeruleanCity.ablk
View file

@ -6,9 +6,9 @@
t
n1m0m+%
n1m0mWp
t
tttm%Ct
tttmKt
t

3
maps/CeruleanCity.asm
View file

@ -283,6 +283,7 @@ CeruleanCity_MapEvents:
warp_event 19, 21, CERULEAN_POKECENTER_1F, 1
warp_event 30, 23, CERULEAN_GYM, 1
warp_event 25, 29, CERULEAN_MART, 2
warp_event 2, 11, CERULEAN_CAVE_1F, 1
def_coord_events
@ -295,7 +296,7 @@ CeruleanCity_MapEvents:
bg_event 14, 29, BGEVENT_READ, CeruleanLockedDoor
bg_event 20, 21, BGEVENT_READ, CeruleanCityPokecenterSign
bg_event 26, 29, BGEVENT_READ, CeruleanCityMartSign
bg_event 2, 12, BGEVENT_ITEM, CeruleanCityHiddenBerserkGene
;bg_event 2, 12, BGEVENT_ITEM, CeruleanCityHiddenBerserkGene ; To be moved to where Mewtwo will have been sitting.
def_object_events
object_event 15, 23, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanCityCooltrainerMScript, -1

2
maps/FuchsiaCity.ablk
View file

@ -1,7 +1,7 @@

 T!
ooo7}~ttttntmVUw
ooo7€~ttttntmVUw
t
6nwtttt{oowwwwwwwttt{tttn{{

30
maps/FuchsiaCity.asm
View file

@ -68,12 +68,12 @@ FuchsiaCityPokefanMText:
done
FuchsiaCityTeacherText:
text "The SAFARI ZONE is"
line "closed… It's sad,"
para "considering it's"
line "FUCHSIA's main"
cont "attraction."
text "I caught a"
line "TRAMPEL in the"
cont "SAFARI ZONE!"
para "I should show"
line "it to my class!"
done
FuchsiaCitySignText:
@ -93,12 +93,8 @@ FuchsiaGymSignText:
done
SafariZoneOfficeSignText:
text "There's a notice"
line "here…"
para "SAFARI ZONE OFFICE"
line "is closed until"
cont "further notice."
text "#MON PARADISE"
line "SAFARI ZONE"
done
WardensHomeSignText:
@ -107,12 +103,8 @@ WardensHomeSignText:
done
SafariZoneClosedSignText:
text "The WARDEN is"
line "traveling abroad."
para "Therefore, the"
line "SAFARI ZONE is"
cont "closed."
text "SAFARI GAME"
line "#MON-U-CATCH!"
done
NoLitteringSignText:
@ -132,7 +124,7 @@ FuchsiaCity_MapEvents:
warp_event 11, 27, BILLS_BROTHERS_HOUSE, 1
warp_event 19, 27, FUCHSIA_POKECENTER_1F, 1
warp_event 27, 27, SAFARI_ZONE_WARDENS_HOME, 1
warp_event 18, 3, SAFARI_ZONE_FUCHSIA_GATE_BETA, 3 ; inaccessible
warp_event 18, 3, SAFARI_ZONE_FUCHSIA_GATE_BETA, 3
warp_event 37, 22, ROUTE_15_FUCHSIA_GATE, 1
warp_event 37, 23, ROUTE_15_FUCHSIA_GATE, 2
warp_event 7, 35, ROUTE_19_FUCHSIA_GATE, 1

2
maps/PewterCity.ablk
View file

@ -5,7 +5,7 @@ RRRRRRRRRRRR?;tt  T!tt
,)ttuqqv7}~t
ttn,)/7}}~/B,)
ttn,)/7}€~/B,)

9
maps/PewterCity.asm
View file

@ -129,12 +129,8 @@ PewterGymSignText:
done
PewterMuseumSignText:
text "There's a notice"
line "here…"
para "PEWTER MUSEUM OF"
line "SCIENCE is closed"
cont "for renovations…"
text "PEWTER MUSEUM OF"
line "SCIENCE"
done
PewterCityMtMoonGiftShopSignText:
@ -159,6 +155,7 @@ PewterCity_MapEvents:
warp_event 23, 17, PEWTER_MART, 2
warp_event 13, 25, PEWTER_POKECENTER_1F, 1
warp_event 7, 29, PEWTER_SNOOZE_SPEECH_HOUSE, 1
warp_event 14, 7, PEWTER_MUSEUM_OF_SCIENCE_1F, 1
def_coord_events

21
maps/Route2.ablk
View file

@ -3,22 +3,17 @@
>??;
11111$W%
n2ll1tt
n
11111lnll
1nlnl
1nnnnLL111nnnnmm2llnnnnmL/ononmm/mo
o
o
mOPl
l
l T!n|}~ROMRR/UUUUUn
2l1tt
OPm
11111 T!
17}~11112ll//
OP T! !|}~RO|~R/UUUUUn

17
maps/Route2.asm
View file

@ -3,7 +3,6 @@
const ROUTE2_BUG_CATCHER2
const ROUTE2_BUG_CATCHER3
const ROUTE2_POKE_BALL1
const ROUTE2_POKE_BALL2
const ROUTE2_POKE_BALL3
const ROUTE2_POKE_BALL4
const ROUTE2_FRUIT_TREE
@ -153,23 +152,23 @@ Route2_MapEvents:
warp_event 16, 27, ROUTE_2_GATE, 1
warp_event 17, 27, ROUTE_2_GATE, 2
warp_event 12, 7, DIGLETTS_CAVE, 3
warp_event 5, 33, VIRIDIAN_FOREST_VIRIDIAN_GATE, 1
warp_event 2, 11, VIRIDIAN_FOREST_PEWTER_GATE, 3
warp_event 3, 11, VIRIDIAN_FOREST_PEWTER_GATE, 4
def_coord_events
def_bg_events
bg_event 7, 51, BGEVENT_READ, Route2Sign
bg_event 11, 9, BGEVENT_READ, Route2DiglettsCaveSign
bg_event 7, 23, BGEVENT_ITEM, Route2HiddenMaxEther
bg_event 4, 14, BGEVENT_ITEM, Route2HiddenFullHeal
bg_event 4, 27, BGEVENT_ITEM, Route2HiddenFullRestore
bg_event 11, 30, BGEVENT_ITEM, Route2HiddenRevive
bg_event 19, 32, BGEVENT_ITEM, Route2HiddenMaxEther
bg_event 8, 33, BGEVENT_ITEM, Route2HiddenRevive
def_object_events
object_event 10, 45, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 5, TrainerBugCatcherRob, -1
object_event 6, 4, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherEd, -1
object_event 0, 40, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherDoug, -1
object_event 0, 29, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2DireHit, EVENT_ROUTE_2_DIRE_HIT
object_event 2, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2MaxPotion, EVENT_ROUTE_2_MAX_POTION
object_event 19, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Carbos, EVENT_ROUTE_2_CARBOS
object_event 14, 44, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2DireHit, EVENT_ROUTE_2_DIRE_HIT
object_event 11, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Carbos, EVENT_ROUTE_2_CARBOS
object_event 14, 50, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Elixer, EVENT_ROUTE_2_ELIXER
object_event 10, 14, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route2FruitTree, -1
object_event 2, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route2FruitTree, -1

4
maps/Route4.ablk
View file

@ -9,14 +9,14 @@ X
$WW+%
Z/[Y
XX
Z/a)
Z)
Y
XZ/C)/[
Z/ook)
Z/oo\k)

2
maps/SafariZoneBeta.ablk
View file

@ -1 +1 @@
?//'#33+
@A())*,--.0112

49
maps/ViridianForest.asm
View file

@ -62,7 +62,7 @@ BugCatcherDaneSeenText:
text "Welcome to"
line "Viridian Forest."
cont "Enjoy my Bug-type"
cont "#mon."
cont "#MON!"
done
BugCatcherDaneBeatenText:
@ -88,11 +88,11 @@ BugCatcherDionBeatenText:
done
BugCatcherDionAfterBattleText:
text "Bug-type #mon"
text "Bug-type #MON"
line "make all kinds of"
cont "sounds."
para "For bug #mon"
para "For bug #MON"
line "fans, knowing how"
cont "to distinguish"
cont "them is key!"
@ -100,11 +100,11 @@ BugCatcherDionAfterBattleText:
BugCatcherStaceySeenText:
text "Wow, that's a HUGE"
line "#mon!"
line "#MON!"
para "…"
line "…What kind of"
cont "trainer?!"
cont "TRAINER?!"
done
BugCatcherStaceyBeatenText:
@ -116,14 +116,14 @@ BugCatcherStaceyAfterBattleText:
text "Has anyone ever"
line "told you that from"
cont "behind you look"
cont "like a Venonat?"
cont "like a VENONAT?"
done
BugCatcherEllisSeenText:
text "There's nothing"
line "more efficient and"
cont "beautiful than a"
cont "Bug-type #mon."
cont "Bug-type #MON."
done
BugCatcherEllisBeatenText:
@ -139,20 +139,20 @@ BugCatcherEllisAfterBattleText:
BugCatcherAbnerSeenText:
text "Many people prefer"
line "solid bug #mon"
line "solid bug #MON"
cont "over squishy bug"
cont "#mon."
cont "#MON."
done
BugCatcherAbnerBeatenText:
text "Thanks for your"
line "hard work, my"
cont "lovely #mon…"
cont "lovely #MON…"
done
BugCatcherAbnerAfterBattleText:
text "Doesn't matter what"
line "kind of #mon--"
line "kind of #MON--"
para "as long as you"
line "like them, they"
@ -161,15 +161,15 @@ BugCatcherAbnerAfterBattleText:
ViridianForestSignText1:
text "Leaving"
line "Viridian Forest"
cont "Pewter City Ahead"
line "VIRIDIAN FOREST"
cont "PEWTER CITY ahead"
done
ViridianForestSignText2:
text "Trainer Tips"
para "Hold on to that"
line "Big Mushroom!"
line "BIG MUSHROOM!"
para "Some maniacs will"
line "pay lots of money"
@ -179,21 +179,22 @@ ViridianForestSignText2:
ViridianForestSignText3:
text "Trainer Tips"
para "Grass-type #mon"
line "are unaffected by"
para "powder and spore"
line "moves!"
para "Weaken #MON"
line "before trying"
cont "to catch them!"
para "When healthy,"
line "they may escape!"
done
ViridianForestSignText4:
text "For poison, use"
line "Antidote! Get it"
cont "at #mon Marts!"
line "ANTIDOTE! Get it"
cont "at #MON MARTs!"
done
ViridianForestSignText5:
text "Trainer Tips"
text "TRAINER TIPS"
para "Poison-type #-"
line "mon can't be poi-"
@ -201,9 +202,9 @@ ViridianForestSignText5:
done
ViridianForestSignText6:
text "Trainer Tips"
text "TRAINER TIPS"
para "Weaken #mon"
para "Weaken #MON"
line "before attempting"
cont "capture!"

6
ram/wram.asm
View file

@ -1838,7 +1838,7 @@ wBufferMon:: party_struct wBufferMon
ds 8
wMonOrItemNameBuffer:: ds NAME_LENGTH
ds NAME_LENGTH
wOverworldDelaySkip:: db
SECTION UNION "Miscellaneous WRAM 1", WRAMX
@ -3120,6 +3120,7 @@ wFastShipB1FSceneID:: db
wMountMoonSquareSceneID:: db
wMobileTradeRoomSceneID:: db
wMobileBattleRoomSceneID:: db
wCeruleanCave1FSceneID:: db
ds 49
@ -3235,6 +3236,9 @@ wdc41:: ds 1
wdc42:: ds 8
wBuenasPassword:: db
wBlueCardBalance:: db
wWalkingOnBridge:: db
wDailyRematchFlags:: ds 4
wDailyPhoneItemFlags:: ds 4
wDailyPhoneTimeOfDayFlags:: ds 4