Merge pull request #126 from yenatch/master

map scripts + ai + disabled line ending correction
This commit is contained in:
Bryan Bishop 2013-05-06 22:15:41 -07:00
commit 2a44711fa7
32 changed files with 8680 additions and 1167 deletions

2
.gitattributes vendored Normal file
View File

@ -0,0 +1,2 @@
# No monkey business with line endings
* text=false

View File

@ -1,212 +1,213 @@
; e927c
dbw $3c, $4b3f ; dex fanfare 50-79
dbw $3c, $4c2f ; item
dbw $3c, $4c89 ; caught mon
dbw $3c, $4941 ; pokeballs placed on table
dbw $3c, $4947 ; potion
dbw $3c, $494a ; full heal
dbw $3c, $494d ; menu
dbw $3c, $4950 ; read text
dbw $3c, $4950 ; read text
dbw $3c, $4bd5 ; dex fanfare 20-49
dbw $3c, $4cea ; dex fanfare 80-109
dbw $3c, $4953 ; poison
dbw $3c, $4956 ; got safari balls
dbw $3c, $4959 ; boot pc
dbw $3c, $495c ; shut down pc
dbw $3c, $495f ; choose pc option
dbw $3c, $4962 ; bide / escape rope
dbw $3c, $4965 ; push button
dbw $3c, $4968 ; second part of itemfinder
dbw $3c, $496b ; warp to
dbw $3c, $496e ; warp from
dbw $3c, $4971 ; change dex mode
dbw $3c, $4974 ; jump over ledge
dbw $3c, $4977 ; grass rustle
dbw $3c, $497a ; fly
dbw $3c, $497d ; wrong
dbw $3c, $4983 ; squeak
dbw $3c, $4986 ; strength
dbw $3c, $4989 ; boat
dbw $3c, $498f ; wall open
dbw $3c, $4992 ; place puzzle piece down
dbw $3c, $4995 ; enter door
dbw $3c, $4998 ; switch pokemon
dbw $3c, $499e ; score tally? ; sounds like something out of game corner
dbw $3c, $49a4 ; buy/sell
dbw $3c, $49ad ; exit building
dbw $3c, $49aa ; bump
dbw $3c, $49b0 ; save
dbw $3c, $49f8 ; pokeflute
dbw $3c, $49fb ; elevator end
dbw $3c, $49fe ; throw ball
dbw $3c, $4a04 ; smokescreen
dbw $3c, $4a0a ; ; something skidding on water?
dbw $3c, $4a10 ; run
dbw $3c, $4a13 ; slot machine start
dbw $3c, $4dbe ; fanfare
dbw $3c, $4a3d ; peck
dbw $3c, $4a40 ; kinesis
dbw $3c, $4a43 ; lick
dbw $3c, $4a46 ; pound
dbw $3c, $4a49 ; move puzzle piece
dbw $3c, $4a4c ; comet punch
dbw $3c, $4a4f ; mega punch
dbw $3c, $4a52 ; scratch
dbw $3c, $4a55 ; vicegrip
dbw $3c, $4a58 ; razor wind
dbw $3c, $4a5b ; cut
dbw $3c, $4a5e ; wing attack
dbw $3c, $4a61 ; whirlwind
dbw $3c, $4a64 ; bind
dbw $3c, $4a67 ; vine whip
dbw $3c, $4a6a ; double kick
dbw $3c, $4a6d ; mega kick
dbw $3c, $4a70 ; headbutt
dbw $3c, $4a73 ; horn attack
dbw $3c, $4a76 ; tackle
dbw $3c, $4a79 ; poison sting
dbw $3c, $4a7c ; poisonpowder
dbw $3c, $4a7f ; doubleslap
dbw $3c, $4a82 ; bite
dbw $3c, $4a88 ; jump kick
dbw $3c, $4a8b ; stomp
dbw $3c, $4a8e ; tail whip
dbw $3c, $4a91 ; karate chop
dbw $3c, $4a94 ; submission
dbw $3c, $4a97 ; water gun
dbw $3c, $4a9d ; swords dance
dbw $3c, $4aa0 ; thunder
dbw $3c, $4aa3 ; supersonic
dbw $3c, $4aac ; leer
dbw $3c, $4ab5 ; ember
dbw $3c, $4abb ; bubblebeam
dbw $3c, $4ac4 ; hydro pump
dbw $3c, $4aca ; surf
dbw $3c, $4ad3 ; psybeam
dbw $3c, $4adc ; leech seed
dbw $3c, $4ae5 ; thundershock
dbw $3c, $4aee ; psychic
dbw $3c, $4af7 ; screech
dbw $3c, $4afd ; bone club
dbw $3c, $4b03 ; sharpen
dbw $3c, $4b09 ; egg bomb
dbw $3c, $4b12 ; sing
dbw $3c, $4b18 ; sky attack
dbw $3c, $4b21 ; hyper beam
dbw $3c, $4b24 ; shine
dbw $3c, $4a1c ;
dbw $3c, $4a1f ; $60
dbw $3c, $4a22 ; tap
dbw $3c, $4a25 ; tap
dbw $3c, $4a28 ; burn ; that is not a burn
dbw $3c, $4a2b ; title screen sound
dbw $3c, $4a2e ; similar to $60
dbw $3c, $4a31 ; get coin from slots
dbw $3c, $4a34 ; pay day
dbw $3c, $4a3a ; metronome
dbw $3c, $4a19 ; call
dbw $3c, $4b2d ; hang up
dbw $3c, $4b30 ; no signal
dbw $3c, $4b2a ; sandstorm
dbw $3c, $4b33 ; elevator
dbw $3c, $52b4 ; protect
dbw $3c, $52f6 ; sketch
dbw $3c, $5314 ; rain dance
dbw $3c, $5334 ; aeroblast
dbw $3c, $5352 ; spark
dbw $3c, $5360 ; curse
dbw $3c, $537d ; rage
dbw $3c, $539c ; thief
dbw $3c, $53b0 ; thief
dbw $3c, $53ca ; spider web
dbw $3c, $53f7 ; mind reader
dbw $3c, $541d ; nighmare
dbw $3c, $5453 ; snore
dbw $3c, $5469 ; sweet kiss
dbw $3c, $547f ; sweet kiss
dbw $3c, $54a5 ; belly drum
dbw $3c, $54ba ;
dbw $3c, $54d0 ; sludge bomb
dbw $3c, $54f5 ; foresight
dbw $3c, $5515 ; spite
dbw $3c, $553a ; outrage
dbw $3c, $554d ; perish song
dbw $3c, $5570 ; giga drain
dbw $3c, $55b4 ; attract
dbw $3c, $55cc ; kinesis
dbw $3c, $55de ; zap cannon
dbw $3c, $55ef ; mean look
dbw $3c, $5621 ; heal bell
dbw $3c, $5637 ; return
dbw $3c, $5653 ; exp bar
dbw $3c, $567f ; milk drink
dbw $3c, $569f ; present
dbw $3c, $56b9 ; morning sun
dbw $3c, $4b3f ; level up
dbw $3c, $4b86 ; key item
dbw $3c, $4d56 ; fanfare
dbw $3c, $4dc7 ; register phone #
dbw $3c, $4e26 ; 3rd place
dbw $3c, $4e66 ; get egg from daycare man
dbw $3c, $4e66 ; get egg from daycare lady
dbw $3c, $4edc ; move deleted
dbw $3c, $4f5e ; 2nd place
dbw $3c, $4fe2 ; 1st place
dbw $3c, $5069 ; choose a card
dbw $3c, $5104 ; get tm
dbw $3c, $517d ; get badge
dbw $3c, $5236 ; quit slots
dbw $3c, $5775 ; nothing
dbw $3c, $5878 ; dex fanfare <20
dbw $3c, $58d2 ; dex fanfare 140-169
dbw $3c, $5951 ; dex fanfare 170-199
dbw $3c, $59d6 ; dex fanfare 200-229
dbw $3c, $5a66 ; dex fanfare >=230
dbw $3c, $5784 ; evolved
dbw $3c, $579b ; master ball
dbw $3c, $57c0 ; egg crack
dbw $3c, $57d9 ; charizard fireball (gs intro)
dbw $3c, $57ff ; pokemon appears (gs intro)
dbw $3c, $5818 ; flash
dbw $3c, $5846 ; game freak logo
dbw $3c, $5b33 ; not very effective
dbw $3c, $5b40 ; damage
dbw $3c, $5b50 ; super effective
dbw $3c, $5b63 ; ball bounce
dbw $3c, $56df ; moonlight
dbw $3c, $56fd ; encore
dbw $3c, $5721 ; beat up
dbw $3c, $574c ; batom pass
dbw $3c, $4944 ; ball wiggle
dbw $3c, $5734 ; sweet scent
dbw $3c, $5bb3 ; sweet scent
dbw $3c, $5bec ; hit end of exp bar
dbw $3c, $5c10 ; give trademon
dbw $3c, $5c3e ; get trademon
dbw $3c, $5c6c ; train arrived
dbw $3c, $675b ; stop slot
dbw $3c, $5cb4 ; 2 boops
dbw $3c, $6769 ; glass ting
dbw $3c, $6773 ; 2 glass ting
dbw $3c, $4b3f ; Dex Fanfare 50-79
dbw $3c, $4c2f ; Item
dbw $3c, $4c89 ; Caught Mon
dbw $3c, $4941 ; Pokeballs Placed On Table
dbw $3c, $4947 ; Potion
dbw $3c, $494a ; Full Heal
dbw $3c, $494d ; Menu
dbw $3c, $4950 ; Read Text
dbw $3c, $4950 ; Read Text 2
dbw $3c, $4bd5 ; Dex Fanfare 20-49
dbw $3c, $4cea ; Dex Fanfare 80-109
dbw $3c, $4953 ; Poison
dbw $3c, $4956 ; Got Safari Balls
dbw $3c, $4959 ; Boot Pc
dbw $3c, $495c ; Shut Down Pc
dbw $3c, $495f ; Choose Pc Option
dbw $3c, $4962 ; Escape Rope
dbw $3c, $4965 ; Push Button
dbw $3c, $4968 ; Second Part Of Itemfinder
dbw $3c, $496b ; Warp To
dbw $3c, $496e ; Warp From
dbw $3c, $4971 ; Change Dex Mode
dbw $3c, $4974 ; Jump Over Ledge
dbw $3c, $4977 ; Grass Rustle
dbw $3c, $497a ; Fly
dbw $3c, $497d ; Wrong
dbw $3c, $4983 ; Squeak
dbw $3c, $4986 ; Strength
dbw $3c, $4989 ; Boat
dbw $3c, $498f ; Wall Open
dbw $3c, $4992 ; Place Puzzle Piece Down
dbw $3c, $4995 ; Enter Door
dbw $3c, $4998 ; Switch Pokemon
dbw $3c, $499e ; Tally
dbw $3c, $49a4 ; Transaction
dbw $3c, $49ad ; Exit Building
dbw $3c, $49aa ; Bump
dbw $3c, $49b0 ; Save
dbw $3c, $49f8 ; Pokeflute
dbw $3c, $49fb ; Elevator End
dbw $3c, $49fe ; Throw Ball
dbw $3c, $4a04 ; Ball Poof
dbw $3c, $4a0a ; Unknown 3A
dbw $3c, $4a10 ; Run
dbw $3c, $4a13 ; Slot Machine Start
dbw $3c, $4dbe ; Fanfare
dbw $3c, $4a3d ; Peck
dbw $3c, $4a40 ; Kinesis
dbw $3c, $4a43 ; Lick
dbw $3c, $4a46 ; Pound
dbw $3c, $4a49 ; Move Puzzle Piece
dbw $3c, $4a4c ; Comet Punch
dbw $3c, $4a4f ; Mega Punch
dbw $3c, $4a52 ; Scratch
dbw $3c, $4a55 ; Vicegrip
dbw $3c, $4a58 ; Razor Wind
dbw $3c, $4a5b ; Cut
dbw $3c, $4a5e ; Wing Attack
dbw $3c, $4a61 ; Whirlwind
dbw $3c, $4a64 ; Bind
dbw $3c, $4a67 ; Vine Whip
dbw $3c, $4a6a ; Double Kick
dbw $3c, $4a6d ; Mega Kick
dbw $3c, $4a70 ; Headbutt
dbw $3c, $4a73 ; Horn Attack
dbw $3c, $4a76 ; Tackle
dbw $3c, $4a79 ; Poison Sting
dbw $3c, $4a7c ; Powder
dbw $3c, $4a7f ; Doubleslap
dbw $3c, $4a82 ; Bite
dbw $3c, $4a88 ; Jump Kick
dbw $3c, $4a8b ; Stomp
dbw $3c, $4a8e ; Tail Whip
dbw $3c, $4a91 ; Karate Chop
dbw $3c, $4a94 ; Submission
dbw $3c, $4a97 ; Water Gun
dbw $3c, $4a9d ; Swords Dance
dbw $3c, $4aa0 ; Thunder
dbw $3c, $4aa3 ; Supersonic
dbw $3c, $4aac ; Leer
dbw $3c, $4ab5 ; Ember
dbw $3c, $4abb ; Bubblebeam
dbw $3c, $4ac4 ; Hydro Pump
dbw $3c, $4aca ; Surf
dbw $3c, $4ad3 ; Psybeam
dbw $3c, $4adc ; Charge
dbw $3c, $4ae5 ; Thundershock
dbw $3c, $4aee ; Psychic
dbw $3c, $4af7 ; Screech
dbw $3c, $4afd ; Bone Club
dbw $3c, $4b03 ; Sharpen
dbw $3c, $4b09 ; Egg Bomb
dbw $3c, $4b12 ; Sing
dbw $3c, $4b18 ; Hyper Beam
dbw $3c, $4b21 ; Shine
dbw $3c, $4b24 ; Unknown 5F
dbw $3c, $4a1c ; Unknown 60
dbw $3c, $4a1f ; Unknown 61
dbw $3c, $4a22 ; Unknown 62
dbw $3c, $4a25 ; Unknown 63
dbw $3c, $4a28 ; Burn
dbw $3c, $4a2b ; Title Screen Entrance
dbw $3c, $4a2e ; Unknown 66
dbw $3c, $4a31 ; Get Coin From Slots
dbw $3c, $4a34 ; Pay Day
dbw $3c, $4a3a ; Metronome
dbw $3c, $4a19 ; Call
dbw $3c, $4b2d ; Hang Up
dbw $3c, $4b30 ; No Signal
dbw $3c, $4b2a ; Sandstorm
dbw $3c, $4b33 ; Elevator
dbw $3c, $52b4 ; Protect
dbw $3c, $52f6 ; Sketch
dbw $3c, $5314 ; Rain Dance
dbw $3c, $5334 ; Aeroblast
dbw $3c, $5352 ; Spark
dbw $3c, $5360 ; Curse
dbw $3c, $537d ; Rage
dbw $3c, $539c ; Thief
dbw $3c, $53b0 ; Thief 2
dbw $3c, $53ca ; Spider Web
dbw $3c, $53f7 ; Mind Reader
dbw $3c, $541d ; Nightmare
dbw $3c, $5453 ; Snore
dbw $3c, $5469 ; Sweet Kiss
dbw $3c, $547f ; Sweet Kiss 2
dbw $3c, $54a5 ; Belly Drum
dbw $3c, $54ba ; Unknown 7F
dbw $3c, $54d0 ; Sludge Bomb
dbw $3c, $54f5 ; Foresight
dbw $3c, $5515 ; Spite
dbw $3c, $553a ; Outrage
dbw $3c, $554d ; Perish Song
dbw $3c, $5570 ; Giga Drain
dbw $3c, $55b4 ; Attract
dbw $3c, $55cc ; Kinesis 2
dbw $3c, $55de ; Zap Cannon
dbw $3c, $55ef ; Mean Look
dbw $3c, $5621 ; Heal Bell
dbw $3c, $5637 ; Return
dbw $3c, $5653 ; Exp Bar
dbw $3c, $567f ; Milk Drink
dbw $3c, $569f ; Present
dbw $3c, $56b9 ; Morning Sun
dbw $3c, $4b3f ; Level Up
dbw $3c, $4b86 ; Key Item
dbw $3c, $4d56 ; Fanfare 2
dbw $3c, $4dc7 ; Register Phone #
dbw $3c, $4e26 ; 3Rd Place
dbw $3c, $4e66 ; Get Egg From Daycare Man
dbw $3c, $4e66 ; Get Egg From Daycare Lady
dbw $3c, $4edc ; Move Deleted
dbw $3c, $4f5e ; 2Nd Place
dbw $3c, $4fe2 ; 1St Place
dbw $3c, $5069 ; Choose A Card
dbw $3c, $5104 ; Get Tm
dbw $3c, $517d ; Get Badge
dbw $3c, $5236 ; Quit Slots
dbw $3c, $5775 ; Egg Crack
dbw $3c, $5878 ; Dex Fanfare < 20
dbw $3c, $58d2 ; Dex Fanfare 140-169
dbw $3c, $5951 ; Dex Fanfare 170-199
dbw $3c, $59d6 ; Dex Fanfare 200-229
dbw $3c, $5a66 ; Dex Fanfare 230 +
dbw $3c, $5784 ; Evolved
dbw $3c, $579b ; Master Ball
dbw $3c, $57c0 ; Egg Hatch
dbw $3c, $57d9 ; Gs Intro Charizard Fireball
dbw $3c, $57ff ; Gs Intro Pokemon Appears
dbw $3c, $5818 ; Flash
dbw $3c, $5846 ; Game Freak Logo Gs
dbw $3c, $5b33 ; Not Very Effective
dbw $3c, $5b40 ; Damage
dbw $3c, $5b50 ; Super Effective
dbw $3c, $5b63 ; Ball Bounce
dbw $3c, $56df ; Moonlight
dbw $3c, $56fd ; Encore
dbw $3c, $5721 ; Beat Up
dbw $3c, $574c ; Baton Pass
dbw $3c, $4944 ; Ball Wiggle
dbw $3c, $5734 ; Sweet Scent
dbw $3c, $5bb3 ; Sweet Scent 2
dbw $3c, $5bec ; Hit End Of Exp Bar
dbw $3c, $5c10 ; Give Trademon
dbw $3c, $5c3e ; Get Trademon
dbw $3c, $5c6c ; Train Arrived
dbw $3c, $675b ; Stop Slot
dbw $3c, $5cb4 ; 2 Boops
dbw $3c, $6769 ; Glass Ting
dbw $3c, $6773 ; Glass Ting 2
; Crystal adds the following SFX:
dbw $5e, $582d ; intro unown 1
dbw $5e, $583e ; intro unown 2
dbw $5e, $584f ; intro unown 3
dbw $5e, $586e ; boop
dbw $5e, $5888 ; game freak ditto transform
dbw $5e, $58a0 ; intro suicune 1
dbw $5e, $58aa ; intro pichu
dbw $5e, $58c0 ; intro suicune 2
dbw $5e, $58f4 ; intro suicune 3
dbw $5e, $5907 ; game freak ditto bounce
dbw $5e, $591d ; intro suicune 4
dbw $5e, $5942 ; game freak presents
dbw $5e, $5961 ; tingle
dbw $3c, $5cd0 ; sand?
dbw $5e, $597c ; two pc beeps
dbw $5e, $5992 ; 4 note ditty
dbw $5e, $59cb ; twinkle
dbw $5e, $582d ; Intro Unown 1
dbw $5e, $583e ; Intro Unown 2
dbw $5e, $584f ; Intro Unown 3
dbw $5e, $586e ; Ditto Pop Up
dbw $5e, $5888 ; Ditto Transform
dbw $5e, $58a0 ; Intro Suicune 1
dbw $5e, $58aa ; Intro Pichu
dbw $5e, $58c0 ; Intro Suicune 2
dbw $5e, $58f4 ; Intro Suicune 3
dbw $5e, $5907 ; Ditto Bounce
dbw $5e, $591d ; Intro Suicune 4
dbw $5e, $5942 ; Game Freak Presents
dbw $5e, $5961 ; Tingle
dbw $3c, $5cd0 ; Unknown Cb
dbw $5e, $597c ; Two Pc Beeps
dbw $5e, $5992 ; 4 Note Ditty
dbw $5e, $59cb ; Twinkle
; e94e9

3362
battle/ai/scoring.asm Normal file

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1464,6 +1464,26 @@ MAP_ROUTE_30_BERRY_SPEECH_HOUSE EQU $09
MAP_MR_POKEMONS_HOUSE EQU $0a
MAP_ROUTE_31_VIOLET_GATE EQU $0b
; elevator floors
_B4F EQU $0
_B3F EQU $1
_B2F EQU $2
_B1F EQU $3
_1F EQU $4
_2F EQU $5
_3F EQU $6
_4F EQU $7
_5F EQU $8
_6F EQU $9
_7F EQU $a
_8F EQU $b
_9F EQU $c
_10F EQU $d
_11F EQU $e
_ROOF EQU $f
; item constants
NO_ITEM EQU $00
MASTER_BALL EQU $01
@ -1689,6 +1709,58 @@ HM_05 EQU $F7
HM_06 EQU $F8
HM_07 EQU $F9
NUM_TMS EQU HM_01 - TM_01 - 2
; pockets
ITEM EQU 1
KEY_ITEM EQU 2
BALL EQU 3
TM_HM EQU 4
; item actions
CANT_SELECT EQU %01000000
CANT_TOSS EQU %10000000
; held item effects
HELD_BERRY EQU $01
HELD_LEFTOVERS EQU $03
HELD_RESTORE_PP EQU $06
HELD_CLEANSE_TAG EQU $08
HELD_HEAL_POISON EQU $0a
HELD_HEAL_FREEZE EQU $0b
HELD_HEAL_BURN EQU $0c
HELD_HEAL_SLEEP EQU $0d
HELD_HEAL_PARALYZE EQU $0e
HELD_HEAL_STATUS EQU $0f
HELD_HEAL_CONFUSION EQU $10
HELD_METAL_POWDER EQU $2a
HELD_NORMAL_BOOST EQU $32
HELD_FIGHTING_BOOST EQU $33
HELD_FLYING_BOOST EQU $34
HELD_POISON_BOOST EQU $35
HELD_GROUND_BOOST EQU $36
HELD_ROCK_BOOST EQU $37
HELD_BUG_BOOST EQU $38
HELD_GHOST_BOOST EQU $39
HELD_FIRE_BOOST EQU $3a
HELD_WATER_BOOST EQU $3b
HELD_GRASS_BOOST EQU $3c
HELD_ELECTRIC_BOOST EQU $3d
HELD_PSYCHIC_BOOST EQU $3e
HELD_ICE_BOOST EQU $3f
HELD_DRAGON_BOOST EQU $40
HELD_DARK_BOOST EQU $41
HELD_STEEL_BOOST EQU $42
HELD_ESCAPE EQU $48
HELD_CRITICAL_UP EQU $49
HELD_QUICK_CLAW EQU $4a
HELD_TRADE_EVOLVE EQU $4b
HELD_AMULET_COIN EQU $4c
HELD_BRIGHTPOWDER EQU $4d
HELD_FOCUS_BAND EQU $4f
; days of the week
SUNDAY EQU $00
MONDAY EQU $01
@ -2336,6 +2408,7 @@ EVOLVE_TRADE EQU 3
EVOLVE_HAPPINESS EQU 4
EVOLVE_STAT EQU 5
BASE_HAPPINESS EQU 70
; happiness evolution triggers
HAPPINESS_TO_EVOLVE EQU 220
TR_ANYTIME EQU 1
@ -3252,6 +3325,219 @@ MUSIC_MOBILE_CENTER EQU 102
MUSIC_MAHOGANY_MART EQU 100 ; grandfathered from gold
; sfx
SFX_DEX_FANFARE_50_79 EQU $00
SFX_ITEM EQU $01
SFX_CAUGHT_MON EQU $02
SFX_POKEBALLS_PLACED_ON_TABLE EQU $03
SFX_POTION EQU $04
SFX_FULL_HEAL EQU $05
SFX_MENU EQU $06
SFX_READ_TEXT EQU $07
SFX_READ_TEXT_2 EQU $08
SFX_DEX_FANFARE_20_49 EQU $09
SFX_DEX_FANFARE_80_109 EQU $0a
SFX_POISON EQU $0b
SFX_GOT_SAFARI_BALLS EQU $0c
SFX_BOOT_PC EQU $0d
SFX_SHUT_DOWN_PC EQU $0e
SFX_CHOOSE_PC_OPTION EQU $0f
SFX_ESCAPE_ROPE EQU $10
SFX_PUSH_BUTTON EQU $11
SFX_SECOND_PART_OF_ITEMFINDER EQU $12
SFX_WARP_TO EQU $13
SFX_WARP_FROM EQU $14
SFX_CHANGE_DEX_MODE EQU $15
SFX_JUMP_OVER_LEDGE EQU $16
SFX_GRASS_RUSTLE EQU $17
SFX_FLY EQU $18
SFX_WRONG EQU $19
SFX_SQUEAK EQU $1a
SFX_STRENGTH EQU $1b
SFX_BOAT EQU $1c
SFX_WALL_OPEN EQU $1d
SFX_PLACE_PUZZLE_PIECE_DOWN EQU $1e
SFX_ENTER_DOOR EQU $1f
SFX_SWITCH_POKEMON EQU $20
SFX_TALLY EQU $21
SFX_TRANSACTION EQU $22
SFX_EXIT_BUILDING EQU $23
SFX_BUMP EQU $24
SFX_SAVE EQU $25
SFX_POKEFLUTE EQU $26
SFX_ELEVATOR_END EQU $27
SFX_THROW_BALL EQU $28
SFX_BALL_POOF EQU $29
SFX_UNKNOWN_3A EQU $2a
SFX_RUN EQU $2b
SFX_SLOT_MACHINE_START EQU $2c
SFX_FANFARE EQU $2d
SFX_PECK EQU $2e
SFX_KINESIS EQU $2f
SFX_LICK EQU $30
SFX_POUND EQU $31
SFX_MOVE_PUZZLE_PIECE EQU $32
SFX_COMET_PUNCH EQU $33
SFX_MEGA_PUNCH EQU $34
SFX_SCRATCH EQU $35
SFX_VICEGRIP EQU $36
SFX_RAZOR_WIND EQU $37
SFX_CUT EQU $38
SFX_WING_ATTACK EQU $39
SFX_WHIRLWIND EQU $3a
SFX_BIND EQU $3b
SFX_VINE_WHIP EQU $3c
SFX_DOUBLE_KICK EQU $3d
SFX_MEGA_KICK EQU $3e
SFX_HEADBUTT EQU $3f
SFX_HORN_ATTACK EQU $40
SFX_TACKLE EQU $41
SFX_POISON_STING EQU $42
SFX_POWDER EQU $43
SFX_DOUBLESLAP EQU $44
SFX_BITE EQU $45
SFX_JUMP_KICK EQU $46
SFX_STOMP EQU $47
SFX_TAIL_WHIP EQU $48
SFX_KARATE_CHOP EQU $49
SFX_SUBMISSION EQU $4a
SFX_WATER_GUN EQU $4b
SFX_SWORDS_DANCE EQU $4c
SFX_THUNDER EQU $4d
SFX_SUPERSONIC EQU $4e
SFX_LEER EQU $4f
SFX_EMBER EQU $50
SFX_BUBBLEBEAM EQU $51
SFX_HYDRO_PUMP EQU $52
SFX_SURF EQU $53
SFX_PSYBEAM EQU $54
SFX_CHARGE EQU $55
SFX_THUNDERSHOCK EQU $56
SFX_PSYCHIC EQU $57
SFX_SCREECH EQU $58
SFX_BONE_CLUB EQU $59
SFX_SHARPEN EQU $5a
SFX_EGG_BOMB EQU $5b
SFX_SING EQU $5c
SFX_HYPER_BEAM EQU $5d
SFX_SHINE EQU $5e
SFX_UNKNOWN_5F EQU $5f
SFX_UNKNOWN_60 EQU $60
SFX_UNKNOWN_61 EQU $61
SFX_UNKNOWN_62 EQU $62
SFX_UNKNOWN_63 EQU $63
SFX_BURN EQU $64
SFX_TITLE_SCREEN_ENTRANCE EQU $65
SFX_UNKNOWN_66 EQU $66
SFX_GET_COIN_FROM_SLOTS EQU $67
SFX_PAY_DAY EQU $68
SFX_METRONOME EQU $69
SFX_CALL EQU $6a
SFX_HANG_UP EQU $6b
SFX_NO_SIGNAL EQU $6c
SFX_SANDSTORM EQU $6d
SFX_ELEVATOR EQU $6e
SFX_PROTECT EQU $6f
SFX_SKETCH EQU $70
SFX_RAIN_DANCE EQU $71
SFX_AEROBLAST EQU $72
SFX_SPARK EQU $73
SFX_CURSE EQU $74
SFX_RAGE EQU $75
SFX_THIEF EQU $76
SFX_THIEF_2 EQU $77
SFX_SPIDER_WEB EQU $78
SFX_MIND_READER EQU $79
SFX_NIGHTMARE EQU $7a
SFX_SNORE EQU $7b
SFX_SWEET_KISS EQU $7c
SFX_SWEET_KISS_2 EQU $7d
SFX_BELLY_DRUM EQU $7e
SFX_UNKNOWN_7F EQU $7f
SFX_SLUDGE_BOMB EQU $80
SFX_FORESIGHT EQU $81
SFX_SPITE EQU $82
SFX_OUTRAGE EQU $83
SFX_PERISH_SONG EQU $84
SFX_GIGA_DRAIN EQU $85
SFX_ATTRACT EQU $86
SFX_KINESIS_2 EQU $87
SFX_ZAP_CANNON EQU $88
SFX_MEAN_LOOK EQU $89
SFX_HEAL_BELL EQU $8a
SFX_RETURN EQU $8b
SFX_EXP_BAR EQU $8c
SFX_MILK_DRINK EQU $8d
SFX_PRESENT EQU $8e
SFX_MORNING_SUN EQU $8f
SFX_LEVEL_UP EQU $90
SFX_KEY_ITEM EQU $91
SFX_FANFARE_2 EQU $92
SFX_REGISTER_PHONE_# EQU $93
SFX_3RD_PLACE EQU $94
SFX_GET_EGG_FROM_DAYCARE_MAN EQU $95
SFX_GET_EGG_FROM_DAYCARE_LADY EQU $96
SFX_MOVE_DELETED EQU $97
SFX_2ND_PLACE EQU $98
SFX_1ST_PLACE EQU $99
SFX_CHOOSE_A_CARD EQU $9a
SFX_GET_TM EQU $9b
SFX_GET_BADGE EQU $9c
SFX_QUIT_SLOTS EQU $9d
SFX_EGG_CRACK EQU $9e
SFX_DEX_FANFARE_LESS_THAN_20 EQU $9f
SFX_DEX_FANFARE_140_169 EQU $a0
SFX_DEX_FANFARE_170_199 EQU $a1
SFX_DEX_FANFARE_200_229 EQU $a2
SFX_DEX_FANFARE_230_PLUS EQU $a3
SFX_EVOLVED EQU $a4
SFX_MASTER_BALL EQU $a5
SFX_EGG_HATCH EQU $a6
SFX_GS_INTRO_CHARIZARD_FIREBALL EQU $a7
SFX_GS_INTRO_POKEMON_APPEARS EQU $a8
SFX_FLASH EQU $a9
SFX_GAME_FREAK_LOGO_GS EQU $aa
SFX_NOT_VERY_EFFECTIVE EQU $ab
SFX_DAMAGE EQU $ac
SFX_SUPER_EFFECTIVE EQU $ad
SFX_BALL_BOUNCE EQU $ae
SFX_MOONLIGHT EQU $af
SFX_ENCORE EQU $b0
SFX_BEAT_UP EQU $b1
SFX_BATON_PASS EQU $b2
SFX_BALL_WIGGLE EQU $b3
SFX_SWEET_SCENT EQU $b4
SFX_SWEET_SCENT_2 EQU $b5
SFX_HIT_END_OF_EXP_BAR EQU $b6
SFX_GIVE_TRADEMON EQU $b7
SFX_GET_TRADEMON EQU $b8
SFX_TRAIN_ARRIVED EQU $b9
SFX_STOP_SLOT EQU $ba
SFX_2_BOOPS EQU $bb
SFX_GLASS_TING EQU $bc
SFX_GLASS_TING_2 EQU $bd
SFX_INTRO_UNOWN_1 EQU $be
SFX_INTRO_UNOWN_2 EQU $bf
SFX_INTRO_UNOWN_3 EQU $c0
SFX_DITTO_POP_UP EQU $c1
SFX_DITTO_TRANSFORM EQU $c2
SFX_INTRO_SUICUNE_1 EQU $c3
SFX_INTRO_PICHU EQU $c4
SFX_INTRO_SUICUNE_2 EQU $c5
SFX_INTRO_SUICUNE_3 EQU $c6
SFX_DITTO_BOUNCE EQU $c7
SFX_INTRO_SUICUNE_4 EQU $c8
SFX_GAME_FREAK_PRESENTS EQU $c9
SFX_TINGLE EQU $ca
SFX_UNKNOWN_CB EQU $cb
SFX_TWO_PC_BEEPS EQU $cc
SFX_4_NOTE_DITTY EQU $cd
SFX_TWINKLE EQU $ce
; sound
_4CH1 EQU $c0
_3CH1 EQU $80
@ -3359,6 +3645,7 @@ SPECIAL_MONCHECK EQU $0097
; predefs
PREDEF_FLAG EQU $03
PREDEF_FILLPP EQU $05
PREDEF_ADDPARTYMON EQU $06
PREDEF_FILLSTATS EQU $0C
@ -3366,6 +3653,12 @@ PREDEF_FILLMOVES EQU $1B
PREDEF_GETUNOWNLETTER EQU $2D
; flag manipulation
RESET_FLAG EQU 0
SET_FLAG EQU 1
CHECK_FLAG EQU 2
; script vars
NUM_VARS EQU $1b
VAR_MOVEMENT EQU $08
@ -3450,6 +3743,7 @@ SUBSTATUS_IN_LOVE EQU 7
SUBSTATUS_ENCORED EQU 6
SUBSTATUS_ENDURE EQU 5
SUBSTATUS_PERISH EQU 4
SUBSTATUS_IDENTIFIED EQU 3
SUBSTATUS_PROTECT EQU 2
SUBSTATUS_CURSE EQU 1
SUBSTATUS_NIGHTMARE EQU 0
@ -3469,18 +3763,28 @@ SUBSTATUS_RAGE EQU 6
SUBSTATUS_RECHARGE EQU 5
SUBSTATUS_SUBSTITUTE EQU 4
SUBSTATUS_FOCUS_ENERGY EQU 2
SUBSTATUS_MIST EQU 1
SUBSTATUS_UNLEASH EQU 0
SUBSTATUS_CANT_RUN EQU 7
SUBSTATUS_DESTINY_BOND EQU 6
SUBSTATUS_LOCK_ON EQU 5
SUBSTATUS_TOXIC EQU 0
SCREENS_REFLECT EQU 4
SCREENS_LIGHT_SCREEN EQU 3
SCREENS_SAFEGUARD EQU 2
SCREENS_SPIKES EQU 0
; status
SLP EQU 7
PSN EQU 1 << 3
BRN EQU 1 << 4
FRZ EQU 1 << 5
PAR EQU 1 << 6
SLP EQU 7 ; 7 turns
PSN EQU 3
BRN EQU 4
FRZ EQU 5
PAR EQU 6
@ -3522,13 +3826,13 @@ EFFECT_TOXIC EQU $21
EFFECT_PAY_DAY EQU $22
EFFECT_LIGHT_SCREEN EQU $23
EFFECT_TRI_ATTACK EQU $24
; unused EQU $25
EFFECT_UNUSED_25 EQU $25 ; unused
EFFECT_OHKO EQU $26
EFFECT_RAZOR_WIND EQU $27
EFFECT_SUPER_FANG EQU $28
EFFECT_STATIC_DAMAGE EQU $29
EFFECT_BIND EQU $2a
; unused EQU $2b
EFFECT_UNUSED_2B EQU $2b ; unused
EFFECT_DOUBLE_HIT EQU $2c
EFFECT_JUMP_KICK EQU $2d
EFFECT_MIST EQU $2e
@ -3563,7 +3867,7 @@ EFFECT_EVASION_DOWN_HIT EQU $4a
EFFECT_SKY_ATTACK EQU $4b
EFFECT_CONFUSE_HIT EQU $4c
EFFECT_TWINEEDLE EQU $4d
; unused EQU $4e
EFFECT_UNUSED_4E EQU $4e ; unused
EFFECT_SUBSTITUTE EQU $4f
EFFECT_HYPER_BEAM EQU $50
EFFECT_RAGE EQU $51
@ -3595,7 +3899,7 @@ EFFECT_MEAN_LOOK EQU $6a
EFFECT_NIGHTMARE EQU $6b
EFFECT_FLAME_WHEEL EQU $6c
EFFECT_CURSE EQU $6d
; unused EQU $6e
EFFECT_UNUSED_6E EQU $6e ; unused
EFFECT_PROTECT EQU $6f
EFFECT_SPIKES EQU $70
EFFECT_FORESIGHT EQU $71
@ -3615,8 +3919,8 @@ EFFECT_MAGNITUDE EQU $7e
EFFECT_BATON_PASS EQU $7f
EFFECT_PURSUIT EQU $80
EFFECT_RAPID_SPIN EQU $81
; unused EQU $82
; unused EQU $83
EFFECT_UNUSED_82 EQU $82 ; unused
EFFECT_UNUSED_83 EQU $83 ; unused
EFFECT_MORNING_SUN EQU $84
EFFECT_SYNTHESIS EQU $85
EFFECT_MOONLIGHT EQU $86

View File

@ -99,6 +99,7 @@ chars = {
0xEA: "é",
0xEB: "",
0xED: "",
0xEE: "",
0xEF: "",
0xF0: "¥",
0xF1: "×",

View File

@ -1475,7 +1475,7 @@ ScriptPointerLabelAfterBank.parse = _parse_script_pointer_bytes
class PointerLabelToScriptPointer(PointerLabelParam):
def parse(self):
PointerLabelParam.parse(self)
address = calculate_pointer_from_bytes_at(self.address, bank=self.bank)
address = calculate_pointer_from_bytes_at(self.parsed_address, bank=self.bank)
address2 = calculate_pointer_from_bytes_at(address, bank="reverse") # maybe not "reverse"?
self.script = parse_script_engine_script_at(address2, origin=False, map_group=self.map_group, map_id=self.map_id, force=self.force, debug=self.debug)

View File

@ -1,5 +1,26 @@
; Graciously aped from http://nocash.emubase.de/pandocs.htm .
; MBC3
MBC3SRamEnable EQU $0000
MBC3RomBank EQU $2000
MBC3SRamBank EQU $4000
MBC3LatchClock EQU $6000
MBC3RTC EQU $a000
SRAM_DISABLE EQU $00
SRAM_ENABLE EQU $0a
RTC_S EQU $08 ; Seconds 0-59 (0-3Bh)
RTC_M EQU $09 ; Minutes 0-59 (0-3Bh)
RTC_H EQU $0a ; Hours 0-23 (0-17h)
RTC_DL EQU $0b ; Lower 8 bits of Day Counter (0-FFh)
RTC_DH EQU $0c ; Upper 1 bit of Day Counter, Carry Bit, Halt Flag
; Bit 0 Most significant bit of Day Counter (Bit 8)
; Bit 6 Halt (0=Active, 1=Stop Timer)
; Bit 7 Day Counter Carry Bit (1=Counter Overflow)
; Hardware registers
rJOYP EQU $ff00 ; Joypad (R/W)
rSB EQU $ff01 ; Serial transfer data (R/W)
rSC EQU $ff02 ; Serial Transfer Control (R/W)

2053
items/item_attributes.asm Normal file

File diff suppressed because it is too large Load Diff

1847
main.asm

File diff suppressed because it is too large Load Diff

View File

@ -4,7 +4,7 @@ BattleTower1F_MapScriptHeader: ; 0x9e393
; triggers
dw UnknownScript_0x9e39d, $0000
dw $63d3, $0000
dw UnknownScript_0x9e3d3, $0000
; callback count
db 0
@ -39,6 +39,7 @@ UnknownScript_0x9e3c7: ; 0x9e3c7
special $0086
UnknownScript_0x9e3d1: ; 0x9e3d1
dotrigger $1
UnknownScript_0x9e3d3: ; 0x9e3d3
end
; 0x9e3d4
@ -57,7 +58,7 @@ UnknownScript_0x9e3e0: ; 0x9e3e0
UnknownScript_0x9e3e2: ; 0x9e3e2
writebyte $2
special $0086
if_equal $3, $74e4 ; wtf ?
if_equal $3, BattleTowerBattleRoomScript_0x9f4e4
loadfont
2writetext UnknownText_0x9e5ab
keeptextopen
@ -119,7 +120,7 @@ UnknownScript_0x9e454: ; 0x9e454
warpsound
disappear $2
stopfollow
applymovement $0, $6576
applymovement $0, MovementData_0x9e576
warpcheck
end
; 0x9e47a
@ -177,9 +178,21 @@ UnknownScript_0x9e4bb: ; 0x9e4bb
end
; 0x9e4be
INCBIN "baserom.gbc",$9e4be,$9e4e4 - $9e4be
UnknownScript_0x9e4e4: ; 0x9e4e4
UnknownScript_0x9e4be: ; 0x9e4be
2writetext UnknownText_0x9ef1f
yesorno
iffalse UnknownScript_0x9e3fc
special $0004
iffalse UnknownScript_0x9e3fc
writebyte $1
special $0086
special $0075
if_equal $a, UnknownScript_0x9e3fc
if_not_equal $0, UnknownScript_0x9e550
2writetext UnknownText_0x9e9eb
spriteface $2, $2
2writetext UnknownText_0x9ea1b
closetext
spriteface $2, $0
loadmovesprites
@ -282,6 +295,7 @@ MovementData_0x9e571: ; 0x9e571
step_up
step_up
step_up
MovementData_0x9e576: ; 0x9e576
step_up
step_end
; 0x9e578

View File

@ -108,6 +108,7 @@ UnknownScript_0x9f4d9: ; 0x9f4d9
pause 60
special $002f
warpfacing $1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F, $7, $7
BattleTowerBattleRoomScript_0x9f4e4: ; 0x9f4e4
loadfont
2writetext UnknownText_0x9eaef
2jump UnknownScript_0x9e47a
@ -136,7 +137,12 @@ UnknownScript_0x9f4f7: ; 0x9f4f7
end
; 0x9f50b
INCBIN "baserom.gbc",$9f50b,$9f52e-$9f50b
UnknownText_0x9f50b: ; 0x9f50b
db $0, "You'll be returned", $4f
db "after you SAVE.", $57
; 0x9f52e
BattleTowerBattleRoom_MapEventHeader: ; 0x9f52e
; filler

View File

@ -21,11 +21,25 @@ UnknownScript_0x9f5c0: ; 0x9f5c0
UnknownScript_0x9f5c1: ; 0x9f5c1
follow $2, $0
3callasm $27, $75cb
3callasm BANK(Function_0x9f5cb), Function_0x9f5cb
2jump UnknownScript_0x9f5dc
; 0x9f5cb
INCBIN "baserom.gbc",$9f5cb,$9f5dc - $9f5cb
Function_0x9f5cb: ; 0x9f5cb
ld a, [rSVBK]
push af
ld a, 3
ld [rSVBK], a
ld a, [$d800]
ld [ScriptVar], a
pop af
ld [rSVBK], a
ret
; 0x9f5dc
UnknownScript_0x9f5dc: ; 0x9f5dc
if_equal $3, UnknownScript_0x9f603

View File

@ -11,11 +11,59 @@ BlackthornGym2F_MapScriptHeader: ; 0x195722
; 0x195727
UnknownScript_0x195727: ; 0x195727
writecmdqueue $572b
writecmdqueue CmdQueue_0x19572b
return
; 0x19572b
INCBIN "baserom.gbc",$19572b,$33
CmdQueue_0x19572b: ; 0x19572b
dbw 2, StoneTable_0x195730 ; check if any stones are sitting on a warp
db 0, 0 ; filler
; 0x195730
StoneTable_0x195730: ; 0x195730
db 5, 4 ; warp, person
dw UnknownScript_0x19573d
db 3, 5 ; warp, person
dw UnknownScript_0x195742
db 4, 6 ; warp, person
dw UnknownScript_0x195747
db $ff ; end
; 0x19573d
UnknownScript_0x19573d: ; 0x19573d
disappear 4
2jump UnknownScript_0x19574c
; 0x195742
UnknownScript_0x195742: ; 0x195742
disappear 5
2jump UnknownScript_0x19574c
; 0x195747
UnknownScript_0x195747: ; 0x195747
disappear 6
2jump UnknownScript_0x19574c
; 0x19574c
UnknownScript_0x19574c: ; 0x19574c
pause 30
2call UnknownScript_0x195758
loadfont
2writetext UnknownText_0x1958a5
closetext
loadmovesprites
end
; 0x195758
UnknownScript_0x195758: ; 0x195758
playsound $001b
earthquake 80
end
; 0x19575e
UnknownScript_0x19575e: ; 0x19575e
jumpstd $000e

View File

@ -28,7 +28,7 @@ MapCeladonDeptStore6FSignpost5Script: ; 0x71180
2writetext UnknownText_0x71250
UnknownScript_0x71184: ; 0x71184
special $0051
loadmenudata $5203
loadmenudata MenuDataHeader_0x71203
interpretmenu2
writebackup
if_equal $1, UnknownScript_0x7119a
@ -89,8 +89,24 @@ UnknownScript_0x711fc: ; 0x711fc
2jump UnknownScript_0x71184
; 0x71203
; menu data
INCBIN "baserom.gbc",$71203,$47
MenuDataHeader_0x71203: ; 0x71203
db $40 ; flags
db 02, 00 ; start coords
db 11, 19 ; end coords
dw MenuData2_0x7120b
db 1 ; default option
; 0x7120b
MenuData2_0x7120b: ; 0x7120b
db $80 ; flags
db 4 ; items
db "FRESH WATER ¥200@"
db "SODA POP ¥300@"
db "LEMONADE ¥350@"
db "CANCEL@"
; 0x71249
MapCeladonDeptStore6FSignpost0Script: ; 0x7124a
jumptext UnknownText_0x7133e

View File

@ -8,7 +8,7 @@ CeladonDeptStoreElevator_MapScriptHeader: ; 0x713ab
MapCeladonDeptStoreElevatorSignpost0Script: ; 0x713ad
loadfont
elevator $53be
elevator Elevator_0x713be
loadmovesprites
iffalse UnknownScript_0x713bd
pause 5
@ -19,19 +19,18 @@ UnknownScript_0x713bd: ; 0x713bd
end
; 0x713be
; elevator
UnknownText_0x713be: ; 0x713be
text_waitbutton
text_box $1504, 5, 5
store_at $615
text_waitbutton
store_at $715
text_dunno2
store_at $815
start_asm
; 0x713d0
INCBIN "baserom.gbc",$713d0,$713d8 - $713d0
Elevator_0x713be: ; 0x713be
db 6 ; floors
db _1F, 4, GROUP_CELADON_DEPT_STORE_1F, MAP_CELADON_DEPT_STORE_1F
db _2F, 3, GROUP_CELADON_DEPT_STORE_2F, MAP_CELADON_DEPT_STORE_2F
db _3F, 3, GROUP_CELADON_DEPT_STORE_3F, MAP_CELADON_DEPT_STORE_3F
db _4F, 3, GROUP_CELADON_DEPT_STORE_4F, MAP_CELADON_DEPT_STORE_4F
db _5F, 3, GROUP_CELADON_DEPT_STORE_5F, MAP_CELADON_DEPT_STORE_5F
db _6F, 2, GROUP_CELADON_DEPT_STORE_6F, MAP_CELADON_DEPT_STORE_6F
db $ff ; end
; 0x713d8
CeladonDeptStoreElevator_MapEventHeader: ; 0x713d8
; filler

View File

@ -24,7 +24,7 @@ MapCeladonGameCornerPrizeRoomSignpost0Script: ; 0x726ef
2writetext UnknownText_0x72974
UnknownScript_0x726fd: ; 0x726fd
special $004f
loadmenudata $6790
loadmenudata MenuDataHeader_0x72790
interpretmenu2
writebackup
if_equal $1, UnknownScript_0x72714
@ -111,8 +111,24 @@ UnknownScript_0x7278a: ; 0x7278a
end
; 0x72790
; menu data
INCBIN "baserom.gbc",$72790,$38
MenuDataHeader_0x72790: ; 0x72790
db $40 ; flags
db 02, 00 ; start coords
db 11, 15 ; end coords
dw MenuData2_0x72798
db 1 ; default option
; 0x72798
MenuData2_0x72798: ; 0x72798
db $80 ; flags
db 4 ; items
db "TM32 1500@"
db "TM29 3500@"
db "TM15 7500@"
db "CANCEL@"
; 0x727c8
MapCeladonGameCornerPrizeRoomSignpost1Script: ; 0x727c8
faceplayer
@ -124,7 +140,7 @@ MapCeladonGameCornerPrizeRoomSignpost1Script: ; 0x727c8
UnknownScript_0x727d3: ; 0x727d3
2writetext UnknownText_0x72974
special $004f
loadmenudata $6877
loadmenudata MenuDataHeader_0x72877
interpretmenu2
writebackup
if_equal $1, UnknownScript_0x727ed
@ -190,8 +206,24 @@ UnknownScript_0x72849: ; 0x72849
2jump UnknownScript_0x727d3
; 0x72877
; menu data
INCBIN "baserom.gbc",$72877,$41
MenuDataHeader_0x72877: ; 0x72877
db $40 ; flags
db 02, 00 ; start coords
db 11, 17 ; end coords
dw MenuData2_0x7287f
db 1 ; default option
; 0x7287f
MenuData2_0x7287f: ; 0x7287f
db $80 ; flags
db 4 ; items
db "PIKACHU 2222@"
db "PORYGON 5555@"
db "LARVITAR 8888@"
db "CANCEL@"
; 0x728b8
UnknownText_0x728b8: ; 0x728b8
db $0, "I wanted PORYGON,", $4f

View File

@ -29,7 +29,7 @@ UnknownScript_0x18d030: ; 0x18d030
setbit1 $0001
2writetext UnknownText_0x18d3bc
keeptextopen
loadmenudata $5215
loadmenudata MenuDataHeader_0x18d215
interpretmenu2
writebackup
if_equal $1, UnknownScript_0x18d0a9
@ -42,7 +42,7 @@ UnknownScript_0x18d049: ; 0x18d049
setbit1 $0002
2writetext UnknownText_0x18d3d3
keeptextopen
loadmenudata $5234
loadmenudata MenuDataHeader_0x18d234
interpretmenu2
writebackup
if_equal $1, UnknownScript_0x18d0a9
@ -52,7 +52,7 @@ UnknownScript_0x18d061: ; 0x18d061
setbit1 $0003
2writetext UnknownText_0x18d3f3
keeptextopen
loadmenudata $5258
loadmenudata MenuDataHeader_0x18d258
interpretmenu2
writebackup
if_equal $1, UnknownScript_0x18d0cb
@ -62,7 +62,7 @@ UnknownScript_0x18d079: ; 0x18d079
setbit1 $0004
2writetext UnknownText_0x18d420
keeptextopen
loadmenudata $5283
loadmenudata MenuDataHeader_0x18d283
interpretmenu2
writebackup
if_equal $1, UnknownScript_0x18d0a9
@ -72,7 +72,7 @@ UnknownScript_0x18d091: ; 0x18d091
setbit1 $0005
2writetext UnknownText_0x18d44a
keeptextopen
loadmenudata $52a5
loadmenudata MenuDataHeader_0x18d2a5
interpretmenu2
writebackup
if_equal $1, UnknownScript_0x18d0cb
@ -274,7 +274,91 @@ UnknownScript_0x18d20d: ; 0x18d20d
end
; 0x18d215
INCBIN "baserom.gbc",$18d215,$aa
MenuDataHeader_0x18d215: ; 0x18d215
db $40 ; flags
db 04, 08 ; start coords
db 11, 19 ; end coords
dw MenuData2_0x18d21d
db 1 ; default option
; 0x18d21d
MenuData2_0x18d21d: ; 0x18d21d
db $81 ; flags
db 3 ; items
db "Pal@"
db "Underling@"
db "Friend@"
; 0x18d234
MenuDataHeader_0x18d234: ; 0x18d234
db $40 ; flags
db 04, 09 ; start coords
db 11, 19 ; end coords
dw MenuData2_0x18d23c
db 1 ; default option
; 0x18d23c
MenuData2_0x18d23c: ; 0x18d23c
db $81 ; flags
db 3 ; items
db "Strategy@"
db "Raising@"
db "Cheating@"
; 0x18d258
MenuDataHeader_0x18d258: ; 0x18d258
db $40 ; flags
db 04, 05 ; start coords
db 11, 19 ; end coords
dw MenuData2_0x18d260
db 1 ; default option
; 0x18d260
MenuData2_0x18d260: ; 0x18d260
db $81 ; flags
db 3 ; items
db "Weak person@"
db "Tough person@"
db "Anybody@"
; 0x18d283
MenuDataHeader_0x18d283: ; 0x18d283
db $40 ; flags
db 04, 08 ; start coords
db 11, 19 ; end coords
dw MenuData2_0x18d28b
db 1 ; default option
; 0x18d28b
MenuData2_0x18d28b: ; 0x18d28b
db $81 ; flags
db 3 ; items
db "Love@"
db "Violence@"
db "Knowledge@"
; 0x18d2a5
MenuDataHeader_0x18d2a5: ; 0x18d2a5
db $40 ; flags
db 04, 12 ; start coords
db 11, 19 ; end coords
dw MenuData2_0x18d2ad
db 1 ; default option
; 0x18d2ad
MenuData2_0x18d2ad: ; 0x18d2ad
db $81 ; flags
db 3 ; items
db "Tough@"
db "Both@"
db "Weak@"
; 0x18d2bf
MovementData_0x18d2bf: ; 0x18d2bf
slow_step_up

View File

@ -143,9 +143,7 @@ CooltrainerfCaraScript: ; 0x18c92a
end
; 0x18c932
INCBIN "baserom.gbc",$18c932,$14
TrainerTwinsLeaandpia1: ; 0x18c946
TrainerTwinsLeaandpia1: ; 0x18c932
; bit/flag number
dw $5bf
@ -156,17 +154,45 @@ TrainerTwinsLeaandpia1: ; 0x18c946
dw TwinsLeaandpia1SeenText
; text when trainer beaten
;dw TwinsLeaandpia1BeatenText
dw $4f06
dw TwinsLeaandpia1BeatenText
; script when lost
dw $0000
; script when talk again
dw TwinsLeaandpia1Script
; 0x18c93e
TwinsLeaandpia1Script: ; 0x18c93e
talkaftercancel
loadfont
2writetext UnknownText_0x18ced3
closetext
loadmovesprites
end
; 0x18c946
TrainerTwinsLeaandpia2: ; 0x18c946
; bit/flag number
dw $5bf
; trainer group && trainer id
db TWINS, LEAANDPIA1
; text when seen
dw TwinsLeaandpia2SeenText
; text when trainer beaten
dw TwinsLeaandpia2BeatenText
; script when lost
dw $0000
; script when talk again
dw TwinsLeaandpia2Script
; 0x18c952
TwinsLeaandpia1Script: ; 0x18c952
TwinsLeaandpia2Script: ; 0x18c952
talkaftercancel
loadfont
2writetext UnknownText_0x18cf0f
@ -395,7 +421,7 @@ UnknownText_0x18ce11: ; 0x18ce11
db "approval.", $57
; 0x18ceab
UnknownText_0x18ceab: ; 0x18ceab
TwinsLeaandpia1SeenText: ; 0x18ceab
db $0, "It's a stranger we", $4f
db "don't know.", $57
; 0x18cec9
@ -409,11 +435,11 @@ UnknownText_0x18ced3: ; 0x18ced3
db "to battle LANCE.", $57
; 0x18cef8
TwinsLeaandpia1SeenText: ; 0x18cef8
TwinsLeaandpia2SeenText: ; 0x18cef8
db $0, "Who are you?", $57
; 0x18cf06
UnknownText_0x18cf06: ; 0x18cf06
TwinsLeaandpia2BeatenText: ; 0x18cf06
db $0, "Meanie.", $57
; 0x18cf0f
@ -464,7 +490,7 @@ DragonsDenB1F_MapEventHeader: ; 0x18cf73
person_event $23, 12, 24, $7, $0, 255, 255, $82, 4, TrainerCooltrainermDarin, $ffff
person_event $24, 12, 12, $6, $0, 255, 255, $82, 3, TrainerCooltrainerfCara, $ffff
person_event $26, 21, 8, $9, $0, 255, 255, $82, 1, $4932, $ffff
person_event $26, 22, 8, $9, $0, 255, 255, $82, 1, TrainerTwinsLeaandpia1, $ffff
person_event $26, 22, 8, $9, $0, 255, 255, $82, 1, TrainerTwinsLeaandpia2, $ffff
person_event $54, 8, 34, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c9a1, $07bf
person_event $54, 24, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c9a3, $07c0
; 0x18d014

View File

@ -65,7 +65,7 @@ MapEarlsPokemonAcademySignpost3Script: ; 0x68a9f
loadfont
2writetext UnknownText_0x68eb2
UnknownScript_0x68aa3: ; 0x68aa3
loadmenudata $4ae1
loadmenudata MenuDataHeader_0x68ae1
interpretmenu
writebackup
if_equal $1, UnknownScript_0x68abe
@ -107,8 +107,32 @@ UnknownScript_0x68ada: ; 0x68ada
2jump UnknownScript_0x68aa3
; 0x68ae1
; menu data
INCBIN "baserom.gbc",$68ae1,$2a
MenuDataHeader_0x68ae1: ; 0x68ae1
db $40 ; flags
db 00, 00 ; start coords
db 08, 11 ; end coords
dw MenuData2_0x68ae9
db 1 ; default option
; 0x68ae9
MenuData2_0x68ae9: ; 0x68ae9
db $80 ; flags
dn 3, 2 ; rows, columns
db 5 ; spacing
dbw BANK(UnknownText_0x68af2), UnknownText_0x68af2
dbw $1a, $0000
; 0x68af2
UnknownText_0x68af2: ; 0x68af2
db "PSN@"
db "PAR@"
db "SLP@"
db "BRN@"
db "FRZ@"
db "QUIT@"
; 0x68b0b
UnknownScript_0x68b0b: ; 0x68b0b
loadfont

View File

@ -56,7 +56,7 @@ UnknownScript_0x198909: ; 0x198909
checkcoins 4000
if_equal $2, UnknownScript_0x1989dd
2writetext UnknownText_0x1990ce
loadmenudata $4967
loadmenudata MenuDataHeader_0x198967
interpretmenu2
writebackup
if_equal $1, UnknownScript_0x19893a
@ -89,7 +89,24 @@ UnknownScript_0x198958: ; 0x198958
2jump UnknownScript_0x1989d7
; 0x198967
INCBIN "baserom.gbc",$198967,$33
MenuDataHeader_0x198967: ; 0x198967
db $40 ; flags
db 02, 00 ; start coords
db 11, 15 ; end coords
dw MenuData2_0x19896f
db 1 ; default option
; 0x19896f
MenuData2_0x19896f: ; 0x19896f
db $80 ; flags
db 4 ; items
db "FLAMETHROWER@"
db "THUNDERBOLT@"
db "ICE BEAM@"
db "CANCEL@"
; 0x19899a
UnknownScript_0x19899a: ; 0x19899a
2writetext UnknownText_0x1990b4

View File

@ -11,7 +11,7 @@ MapGoldenrodDeptStore6FSignpost5Script: ; 0x563f5
2writetext UnknownText_0x564cb
UnknownScript_0x563f9: ; 0x563f9
special $0051
loadmenudata $6478
loadmenudata MenuDataHeader_0x56478
interpretmenu2
writebackup
if_equal $1, UnknownScript_0x5640f
@ -72,8 +72,24 @@ UnknownScript_0x56471: ; 0x56471
2jump UnknownScript_0x563f9
; 0x56478
; menu data
INCBIN "baserom.gbc",$56478,$564bf - $56478
MenuDataHeader_0x56478: ; 0x56478
db $40 ; flags
db 02, 00 ; start coords
db 11, 19 ; end coords
dw MenuData2_0x56480
db 1 ; default option
; 0x56480
MenuData2_0x56480: ; 0x56480
db $80 ; flags
db 4 ; items
db "FRESH WATER ¥200@"
db "SODA POP ¥300@"
db "LEMONADE ¥350@"
db "CANCEL@"
; 0x564bf
UnknownScript_0x564bf: ; 0x564bf
jumptextfaceplayer UnknownText_0x5654b

View File

@ -8,7 +8,7 @@ GoldenrodDeptStoreElevator_MapScriptHeader: ; 0x56697
MapGoldenrodDeptStoreElevatorSignpost0Script: ; 0x56699
loadfont
elevator $66e0
elevator Elevator_0x566e0
loadmovesprites
iffalse UnknownScript_0x566df
pause 5
@ -48,7 +48,19 @@ UnknownScript_0x566df: ; 0x566df
end
; 0x566e0
INCBIN "baserom.gbc",$566e0,$566fe - $566e0
Elevator_0x566e0: ; 0x566e0
db 7 ; floors
db _B1F, 2, GROUP_GOLDENROD_DEPT_STORE_B1F, MAP_GOLDENROD_DEPT_STORE_B1F
db _1F, 4, GROUP_GOLDENROD_DEPT_STORE_1F, MAP_GOLDENROD_DEPT_STORE_1F
db _2F, 3, GROUP_GOLDENROD_DEPT_STORE_2F, MAP_GOLDENROD_DEPT_STORE_2F
db _3F, 3, GROUP_GOLDENROD_DEPT_STORE_3F, MAP_GOLDENROD_DEPT_STORE_3F
db _4F, 3, GROUP_GOLDENROD_DEPT_STORE_4F, MAP_GOLDENROD_DEPT_STORE_4F
db _5F, 3, GROUP_GOLDENROD_DEPT_STORE_5F, MAP_GOLDENROD_DEPT_STORE_5F
db _6F, 2, GROUP_GOLDENROD_DEPT_STORE_6F, MAP_GOLDENROD_DEPT_STORE_6F
db $ff ; end
; 0x566fe
GoldenrodDeptStoreElevator_MapEventHeader: ; 0x566fe
; filler

View File

@ -55,7 +55,7 @@ UnknownScript_0x56c28: ; 0x56c28
2writetext UnknownText_0x56e8b
UnknownScript_0x56c36: ; 056c36
special $004f
loadmenudata $6cc9
loadmenudata MenuDataHeader_0x56cc9
interpretmenu2
writebackup
if_equal $1, UnknownScript_0x56c4d
@ -142,8 +142,24 @@ UnknownScript_0x56cc3: ; 0x56cc3
end
; 0x56cc9
; menu data
INCBIN "baserom.gbc",$56cc9,$38
MenuDataHeader_0x56cc9: ; 0x56cc9
db $40 ; flags
db 02, 00 ; start coords
db 11, 15 ; end coords
dw MenuData2_0x56cd1
db 1 ; default option
; 0x56cd1
MenuData2_0x56cd1: ; 0x56cd1
db $80 ; flags
db 4 ; items
db "TM25 5500@"
db "TM14 5500@"
db "TM38 5500@"
db "CANCEL@"
; 0x56d01
UnknownScript_0x56d01: ; 0x56d01
faceplayer
@ -155,7 +171,7 @@ UnknownScript_0x56d01: ; 0x56d01
UnknownScript_0x56d0c: ; 0x56d0c
2writetext UnknownText_0x56e8b
special $004f
loadmenudata $6db0
loadmenudata MenuDataHeader_0x56db0
interpretmenu2
writebackup
if_equal $1, UnknownScript_0x56d26
@ -221,8 +237,24 @@ UnknownScript_0x56d82: ; 0x56d82
2jump UnknownScript_0x56d0c
; 0x56db0
; menu data
INCBIN "baserom.gbc",$56db0,$56df1 - $56db0
MenuDataHeader_0x56db0: ; 0x56db0
db $40 ; flags
db 02, 00 ; start coords
db 11, 17 ; end coords
dw MenuData2_0x56db8
db 1 ; default option
; 0x56db8
MenuData2_0x56db8: ; 0x56db8
db $80 ; flags
db 4 ; items
db "ABRA 100@"
db "CUBONE 800@"
db "WOBBUFFET 1500@"
db "CANCEL@"
; 0x56df1
UnknownScript_0x56df1: ; 0x56df1
faceplayer

View File

@ -24,7 +24,7 @@ MapGoldenrodPokeComCenter2FMobileSignpost0Script: ; 0x625da
closetext
UnknownScript_0x625df: ; 0x625df
reloadmappart
loadmenudata $6602
loadmenudata MenuDataHeader_0x62602
interpretmenu2
writebackup
if_equal $1, UnknownScript_0x625f0
@ -51,7 +51,23 @@ UnknownScript_0x62600: ; 0x62600
end
; 0x62602
INCBIN "baserom.gbc",$62602,$62624 - $62602
MenuDataHeader_0x62602: ; 0x62602
db $40 ; flags
db 00, 00 ; start coords
db 08, 15 ; end coords
dw MenuData2_0x6260a
db 1 ; default option
; 0x6260a
MenuData2_0x6260a: ; 0x6260a
db $80 ; flags
db 3 ; items
db "# つうしん クラブ@" ; # COM CLUB
db "モバイルセンター@" ; MOBILE CENTER
db "やめる@" ; QUIT
; 0x62624
MapGoldenrodPokeComCenter2FMobileSignpost1Script: ; 0x62624
loadfont
@ -86,8 +102,23 @@ UnknownScript_0x6264a: ; 0x6264a
end
; 0x6264c
; menu data
INCBIN "baserom.gbc",$6264c,$25
MenuDataHeader_0x6264c: ; 0x6264c
db $40 ; flags
db 00, 00 ; start coords
db 08, 15 ; end coords
dw MenuData2_0x62654
db 1 ; default option
; 0x62654
MenuData2_0x62654: ; 0x62654
db $80 ; flags
db 3 ; items
db "でんわ",$1f,"つかうとき@" ; Use phone
db "でんわ",$4a,"つながらないとき@" ; Don't use phone
db "やめる@" ; QUIT
; 0x62673
MapGoldenrodPokeComCenter2FMobileSignpost2Script: ; 0x62671
jumptext UnknownText_0x62b26

View File

@ -11,11 +11,71 @@ IcePathB1F_MapScriptHeader: ; 0x7e4b9
; 0x7e4be
UnknownScript_0x7e4be: ; 0x7e4be
writecmdqueue $64c2
writecmdqueue CmdQueue_0x7e4c2
return
; 0x7e4c2
INCBIN "baserom.gbc",$7e4c2,$7e50a - $7e4c2
CmdQueue_0x7e4c2: ; 0x7e4c2
dbw 2, StoneTable_0x7e4c7 ; check if any stones are sitting on a warp
db 0, 0 ; filler
; 0x7e4c7
StoneTable_0x7e4c7: ; 0x7e4c7
db 3, 2 ; warp, person
dw UnknownScript_0x7e4d8
db 4, 3 ; warp, person
dw UnknownScript_0x7e4e0
db 5, 4 ; warp, person
dw UnknownScript_0x7e4e8
db 6, 5 ; warp, person
dw UnknownScript_0x7e4f0
db $ff ; end
; 0x7e4d8
UnknownScript_0x7e4d8: ; 0x7e4d8
disappear 2
clearbit1 $070d
2jump UnknownScript_0x7e4f8
; 0x7e4e0
UnknownScript_0x7e4e0: ; 0x7e4e0
disappear 3
clearbit1 $070e
2jump UnknownScript_0x7e4f8
; 0x7e4e8
UnknownScript_0x7e4e8: ; 0x7e4e8
disappear 4
clearbit1 $070f
2jump UnknownScript_0x7e4f8
; 0x7e4f0
UnknownScript_0x7e4f0: ; 0x7e4f0
disappear 5
clearbit1 $0710
2jump UnknownScript_0x7e4f8
; 0x7e4f8
UnknownScript_0x7e4f8: ; 0x7e4f8
pause 30
2call UnknownScript_0x7e504
loadfont
2writetext UnknownText_0x7e512
closetext
loadmovesprites
end
; 0x7e504
UnknownScript_0x7e504: ; 0x7e504
playsound $001b
earthquake 80
end
; 0x7e50a
UnknownScript_0x7e50a: ; 0x7e50a
jumpstd $000e
@ -30,7 +90,12 @@ MapIcePathB1FSignpostItem0: ; 0x7e50f
db MAX_POTION
; 0x7e512
INCBIN "baserom.gbc",$7e512,$1b
UnknownText_0x7e512: ; 0x7e512
db $0, "The boulder fell", $4f
db "through.", $57
; 0x7e52d
IcePathB1F_MapEventHeader: ; 0x7e52d
; filler

View File

@ -34,7 +34,9 @@ UnknownScript_0x7abc5: ; 0x7abc5
return
; 0x7abc9
INCBIN "baserom.gbc",$7abc9,$7abcc - $7abc9
db 0, 0, 0 ; filler
UnknownScript_0x7abcc: ; 0x7abcc
describedecoration $1

View File

@ -141,22 +141,37 @@ PsychicNathanScript: ; 0x58095
end
; 0x5809d
UnknownScript_0x5809d: ; 0x5809d
musicfadeout $2905, $1
; 0x580a2
; probably not a script?
UnknownScript_0x580a2: ; 0x580a2
db $e5
itemtotext THUNDERSTONE, $42
2call $a900
pokenamemem EXEGGCUTE, $47
TrainerSuperNerdStan: ; 0x5809d
; bit/flag number
dw $581
; trainer group && trainer id
db SUPER_NERD, STAN
; text when seen
dw UnknownText_0x581e5
; text when trainer beaten
dw UnknownText_0x58217
; script when lost
dw $0000
; script when talk again
dw UnknownScript_0x580a9
; 0x580a9
UnknownScript_0x580a9: ; 0x580a9
talkaftercancel
loadfont
2writetext UnknownText_0x58250
closetext
loadmovesprites
end
; 0x580b1
MapRuinsofAlphOutsideSignpost0Script: ; 0x580b1
jumptext UnknownText_0x58325
; 0x580b4

View File

@ -287,6 +287,7 @@ chars = {
"é": 0xEA,
"": 0xEB,
"": 0xED,
"": 0xEE,
"": 0xEF,
"¥": 0xF0,
"×": 0xF1,

View File

@ -252,7 +252,7 @@ Script_jumptextfaceplayer: ; 0x96e45
ld [$d450], a
ld b, $25
ld hl, $6e79
jp $759d
jp ScriptJump
; 0x96e5f
Script_jumptext: ; 0x96e5f
@ -268,7 +268,7 @@ Script_jumptext: ; 0x96e5f
ld [$d450], a
ld b, $25
ld hl, $6e7a
jp $759d
jp ScriptJump
; 0x96e79
INCBIN "baserom.gbc",$96e79,$96e81 - $96e79
@ -286,7 +286,7 @@ Script_3jumptext: ; 0x96e81
ld [$d450], a
ld b, $25
ld hl, $6e7a
jp $759d
jp ScriptJump
; 0x96e9b
Script_2writetext: ; 0x96e9b
@ -550,13 +550,13 @@ Script_specialsound: ; 0x96fe4
ld hl, $543d
rst $8
ld a, [$d142]
cp $4
ld de, $009b
jr z, .asm_96ff7 ; 0x96ff2 $3
ld de, $0001
.asm_96ff7
cp TM_HM
ld de, SFX_GET_TM
jr z, .play
ld de, SFX_ITEM
.play
call StartSFX
call $3c55
call WaitSFX
ret
; 0x96ffe
@ -681,7 +681,7 @@ Script_describedecoration: ; 0x970df
rst $8
ld h, d
ld l, e
jp $759d
jp ScriptJump
; 0x970ee
Script_fruittree: ; 0x970ee
@ -690,10 +690,10 @@ Script_fruittree: ; 0x970ee
; tree_id (SingleByteParam)
call GetScriptByte
ld [$d03e], a
ld b, $11
ld hl, $4000
jp $759d
ld [CurFruitTree], a
ld b, BANK(FruitTreeScript)
ld hl, FruitTreeScript
jp ScriptJump
; 0x970fc
Script_loadwilddata: ; 0x970fc
@ -743,7 +743,7 @@ Script_scripttalkafter: ; 0x97125
ld l, a
ld a, [$d03e]
ld b, a
jp $759d
jp ScriptJump
; 0x97132
Script_trainerstatus: ; 0x97132
@ -877,7 +877,7 @@ Script_playsound: ; 0x971b7
Script_waitbutton: ; 0x971c3
; script command 0x86
call $3c55
call WaitSFX
ret
; 0x971c7
@ -1417,7 +1417,7 @@ Script_returnafterbattle: ; 0x97459
jr nz, .asm_97470 ; 0x97466 $8
ld b, $4
ld hl, $64c1
jp $759d
jp ScriptJump
.asm_97470
bit 0, d
jr z, .asm_9747c ; 0x97472 $8
@ -1510,14 +1510,14 @@ ScriptCall: ; 0x974cb
ld [hli], a
ld a, [ScriptPos]
ld [hli], a
ld a, [$d43b]
ld a, [ScriptPos + 1]
ld [hl], a
ld a, b
ld [ScriptBank], a
ld a, e
ld [ScriptPos], a
ld a, d
ld [$d43b], a
ld [ScriptPos + 1], a
ret
; 0x974f3
@ -1539,7 +1539,7 @@ Script_2jump: ; 0x974fe
ld h, a
ld a, [ScriptBank]
ld b, a
jp $759d
jp ScriptJump
; 0x9750d
Script_3jump: ; 0x9750d
@ -1553,7 +1553,7 @@ Script_3jump: ; 0x9750d
ld l, a
call GetScriptByte
ld h, a
jp $759d
jp ScriptJump
; 0x9751c
Script_2ptjump: ; 0x9751c
@ -1570,7 +1570,7 @@ Script_2ptjump: ; 0x9751c
ld a, [hli]
ld h, [hl]
ld l, a
jp $759d
jp ScriptJump
; 0x9752c
Script_iffalse: ; 0x9752c
@ -1655,7 +1655,7 @@ Script_jumpstd: ; 0x9756e
; predefined_script (MultiByteParam)
call $757b
jr Unknown_9759d ; 0x97571 $2a
jr ScriptJump ; 0x97571 $2a
; 0x97573
Script_callstd: ; 0x97573
@ -1693,13 +1693,13 @@ Unknown_97596: ; 0x97596
ret
; 0x9759d
Unknown_9759d: ; 0x9759d
ScriptJump: ; 0x9759d
ld a, b
ld [ScriptBank], a
ld a, l
ld [ScriptPos], a
ld a, h
ld [$d43b], a
ld [ScriptPos + 1], a
ret
; 0x975aa
@ -3041,7 +3041,7 @@ Unknown_0x97b9a: ; 0x97b9a
ld [ScriptPos], a
ld a, [hl]
ld d, a
ld [$d43b], a
ld [ScriptPos + 1], a
and a
ret
.asm_97bbe

File diff suppressed because it is too large Load Diff

129
wram.asm
View File

@ -510,7 +510,7 @@ PlayerSubStatus1: ; c668
; 6 encore
; 5 endure
; 4 perish song
; 3
; 3 identified
; 2 protect
; 1 curse
; 0 nightmare
@ -528,7 +528,7 @@ PlayerSubStatus2: ; c669
ds 1
PlayerSubStatus3: ; c66a
; bit
; 7 confusion
; 7 confused
; 6 flying
; 5 underground
; 4 charged
@ -545,19 +545,19 @@ PlayerSubStatus4: ; c66b
; 4 substitute
; 3
; 2 focus energy
; 1
; 1 mist
; 0 bide: unleashed energy
ds 1
PlayerSubStatus5: ; c66c
; bit
; 7
; 7 cant run
; 6 destiny bond
; 5 lock-on
; 4
; 3
; 2
; 1
; 0
; 0 toxic
ds 1
EnemySubStatus1: ; c66d
@ -596,20 +596,22 @@ EnemyRolloutCount: ; c67a
EnemyConfuseCount: ; c67b
ds 1
ds 1
EnemyEncoreCount: ; c67d
EnemyDisableCount: ; c67d
ds 1
EnemyPerishCount: ; c67e
EnemyEncoreCount: ; c67e
ds 1
EnemyPerishCount: ; c67f
ds 1
EnemyFuryCutterCount: ; c680
ds 1
ds 1
PlayerDamageTaken: ; c681
PlayerDamageTaken: ; c682
ds 2
EnemyDamageTaken: ; c683
EnemyDamageTaken: ; c684
ds 2
ds 4
ds 3
ds 1
@ -688,7 +690,7 @@ AlreadyDisobeyed: ; c6f4
DisabledMove: ; c6f5
ds 1
EnemyEncoredMove: ; c6f6
EnemyDisabledMove: ; c6f6
ds 1
ds 1
@ -706,13 +708,15 @@ AlreadyFailed: ; c6fb
ds 3
PlayerScreens: ; c6ff
; bit 4: reflect
; bit 3: light screen
; bit
; 4 reflect
; 3 light screen
; 2 safeguard
; 0 spikes
ds 1
EnemyScreens: ; c700
; bit 4: reflect
; bit 3: light screen
; see PlayerScreens
ds 1
ds 1
@ -893,7 +897,14 @@ StartFlypoint: ; d005
EndFlypoint: ; d006
ds 1
ds 108
ds 55
CurFruitTree: ; d03e
ds 1
CurFruit: ; d03f
ds 1
ds 51
StringBuffer1: ; d073
ds 19
@ -918,7 +929,12 @@ VramState: ; d0ed
; flickers when climbing waterfall
ds 1
ds 26
ds 24
CurItem: ; d106
ds 1
ds 1
CurPartySpecies: ; d108
ds 1
@ -1043,17 +1059,16 @@ MagikarpLength: ; d1ea
Buffer2: ; d1eb
ds 1
SECTION "prng2",BSS[$d1fa]
SECTION "BattleMons2",BSS[$d1fa]
LinkBattleRNs: ; d1fa
ds 10
SECTION "BattleMons2",BSS[$d204]
TempEnemyMonSpecies: ; d204
ds 1
TempBattleMonSpecies: ; d205
ds 1
EnemyMon:
EnemyMonSpecies: ; d206
ds 1
EnemyMonItem: ; d207
@ -1068,6 +1083,7 @@ EnemyMonMove3: ; d20a
ds 1
EnemyMonMove4: ; d20b
ds 1
EnemyMonMovesEnd
EnemyMonDVs:
EnemyMonAtkDefDV: ; d20c
@ -1105,6 +1121,7 @@ EnemyMonMaxHPHi: ; d218
EnemyMonMaxHPLo: ; d219
ds 1
EnemyMonStats:
EnemyMonAtk: ; d21a
ds 2
EnemyMonDef: ; d21c
@ -1115,14 +1132,23 @@ EnemyMonSpclAtk: ; d220
ds 2
EnemyMonSpclDef: ; d222
ds 2
EnemyMonStatsEnd
EnemyMonType1: ; d224
ds 1
EnemyMonType2: ; d225
ds 1
EnemyMonBaseStats: ; d226
ds 5
EnemyMonCatchRate: ; d22b
ds 1
EnemyMonBaseExp: ; d22c
ds 1
EnemyMonEnd
SECTION "Battle",BSS[$d22d]
IsInBattle: ; d22d
; 0: overworld
@ -1158,19 +1184,67 @@ OtherTrainerID: ; d231
; (Joey, Mikey, Albert, etc.)
ds 1
ds 2
ds 1
TrainerClass: ; d233
ds 1
UnownLetter: ; d234
ds 1
ds 1
CurBaseStats: ; d236
ds 32
CurBaseData: ; d236
BaseDexNo: ; d236
ds 1
BaseStats: ; d237
BaseHP: ; d237
ds 1
BaseAttack: ; d238
ds 1
BaseDefense: ; d239
ds 1
BaseSpeed: ; d23a
ds 1
BaseSpecialAttack: ; d23b
ds 1
BaseSpecialDefense: ; d23c
ds 1
BaseType: ; d23d
BaseType1: ; d23d
ds 1
BaseType2: ; d23e
ds 1
BaseCatchRate: ; d23f
ds 1
BaseExp: ; d240
ds 1
BaseItems: ; d241
ds 2
BaseGender: ; d243
ds 1
BaseUnknown1: ; d244
ds 1
BaseEggSteps: ; d245
ds 1
BaseUnknown2: ; d246
ds 1
BasePicSize: ; d247
ds 1
BasePadding: ; d248
ds 4
BaseGrowthRate: ; d24c
ds 1
BaseEggGroups: ; d24d
ds 1
BaseTMHM: ; d24e
ds 8
CurDamage: ; d256
ds 2
SECTION "TimeOfDay",BSS[$d269]
TimeOfDay: ; d269
@ -1482,6 +1556,10 @@ Box13Name: ; dbe1
Box14Name: ; dbea
ds 9
SECTION "fruittrees", BSS[$dc27]
FruitTreeFlags: ; dc27
ds 1
SECTION "steps", BSS[$dc73]
StepCount: ; dc73
ds 1
@ -1620,6 +1698,7 @@ PartyMon5OT: ; de2b
PartyMon6OT: ; de36
ds 11
PartyMonNicknames:
PartyMon1Nickname: ; de41
ds 11
PartyMon2Nickname: ; de4c